diff --git a/pom.xml b/pom.xml
index d20ad1331c..3ce406d71d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
 
         <repoServerHost>oss.sonatype.org</repoServerHost>
 
-        <rosetta.bundle.version>7.10.2</rosetta.bundle.version>
+        <rosetta.bundle.version>8.0.0</rosetta.bundle.version>
         <rosetta.code-gen.version>${rosetta.bundle.version}</rosetta.code-gen.version>
         <rosetta.dsl.version>8.8.2</rosetta.dsl.version>
 
diff --git a/rosetta-source/src/main/resources/base-datetime-enum.rosetta b/rosetta-source/src/main/resources/base-datetime-enum.rosetta
new file mode 100644
index 0000000000..ae50e4818f
--- /dev/null
+++ b/rosetta-source/src/main/resources/base-datetime-enum.rosetta
@@ -0,0 +1,451 @@
+namespace cdm.base.datetime : <"Basic date and time concepts: relative date, date range, offset, business centre etc.">
+version "${project.version}"
+
+import cdm.base.*
+
+enum BusinessCenterEnum: <"The enumerated values to specify the business centers.">
+    [docReference ISDA FpML_Coding_Scheme schemeLocation "http://www.fpml.org/coding-scheme/business-center"]
+
+	AEAB <"Abu Dhabi, Business Day (as defined in 2021 ISDA Definitions Section 2.1.9 (ii))">
+	AEAD <"Abu Dhabi, Settlement Day (as defined in 2021 ISDA Definitions Section 2.1.9 (i))">
+	AEDU <"Dubai, United Arab Emirates">
+	AMYE <"Yerevan, Armenia">
+	AOLU <"Luanda, Angola">
+	ARBA <"Buenos Aires, Argentina">
+	ATVI <"Vienna, Austria">
+	AUAD <"Adelaide, Australia">
+	AUBR <"Brisbane, Australia">
+	AUCA <"Canberra, Australia">
+	AUDA <"Darwin, Australia">
+	AUME <"Melbourne, Australia">
+	AUPE <"Perth, Australia">
+	AUSY <"Sydney, Australia">
+	AZBA <"Baku, Azerbaijan">
+	BBBR <"Bridgetown, Barbados">
+	BDDH <"Dhaka, Bangladesh">
+	BEBR <"Brussels, Belgium">
+	BGSO <"Sofia, Bulgaria">
+	BHMA <"Manama, Bahrain">
+	BMHA <"Hamilton, Bermuda">
+	BNBS <"Bandar Seri Begawan, Brunei">
+	BOLP <"La Paz, Bolivia">
+	BRBD <"Brazil Business Day.">
+	BRBR <"Brasilia, Brazil.">
+	BRRJ <"Rio de Janeiro, Brazil.">
+	BRSP <"Sao Paulo, Brazil.">
+	BSNA <"Nassau, Bahamas">
+	BWGA <"Gaborone, Botswana">
+	BYMI <"Minsk, Belarus">
+	CACL <"Calgary, Canada">
+	CAFR <"Fredericton, Canada.">
+	CAMO <"Montreal, Canada">
+	CAOT <"Ottawa, Canada">
+	CATO <"Toronto, Canada">
+	CAVA <"Vancouver, Canada">
+	CAWI <"Winnipeg, Canada">
+	CHBA <"Basel, Switzerland">
+	CHGE <"Geneva, Switzerland">
+	CHZU <"Zurich, Switzerland">
+	CIAB <"Abidjan, Cote d'Ivoire">
+	CLSA <"Santiago, Chile">
+	CMYA <"Yaounde, Cameroon">
+	CNBE <"Beijing, China">
+	CNSH <"Shanghai, China">
+	COBO <"Bogota, Colombia">
+	CRSJ <"San Jose, Costa Rica">
+	CWWI <"Willemstad, Curacao">
+	CYNI <"Nicosia, Cyprus">
+	CZPR <"Prague, Czech Republic">
+	DECO <"Cologne, Germany">
+	DEDU <"Dusseldorf, Germany">
+	DEFR <"Frankfurt, Germany">
+	DEHA <"Hannover, Germany">
+	DEHH <"Hamburg, Germany">
+	DELE <"Leipzig, Germany">
+	DEMA <"Mainz, Germany">
+	DEMU <"Munich, Germany">
+	DEST <"Stuttgart, Germany">
+	DKCO <"Copenhagen, Denmark">
+	DOSD <"Santo Domingo, Dominican Republic">
+	DZAL <"Algiers, Algeria">
+	ECGU <"Guayaquil, Ecuador">
+	EETA <"Tallinn, Estonia">
+	EGCA <"Cairo, Egypt">
+	ESAS <"ESAS Settlement Day (as defined in 2006 ISDA Definitions Section 7.1 and Supplement Number 15 to the 2000 ISDA Definitions)">
+	ESBA <"Barcelona, Spain">
+	ESMA <"Madrid, Spain">
+	ESSS <"San Sebastian, Spain">
+	ETAA <"Addis Ababa, Ethiopia">
+	EUR_ICESWAP displayName "EUR-ICESWAP" <"Publication dates for ICE Swap rates based on EUR-EURIBOR rates">
+	EUTA <"TARGET Settlement Day">
+	FIHE <"Helsinki, Finland">
+	FRPA <"Paris, France">
+	GBED <"Edinburgh, Scotland">
+	GBLO <"London, United Kingdom">
+	GBP_ICESWAP displayName "GBP-ICESWAP" <"Publication dates for GBP ICE Swap rates">
+	GETB <"Tbilisi, Georgia">
+	GGSP <"Saint Peter Port, Guernsey">
+	GHAC <"Accra, Ghana">
+	GMBA <"Banjul, Gambia">
+	GNCO <"Conakry, Guinea">
+	GRAT <"Athens, Greece">
+	GUGC <"Guatemala City, Guatemala">
+	HKHK <"Hong Kong, Hong Kong">
+	HNTE <"Tegucigalpa, Honduras">
+	HRZA <"Zagreb, Republic of Croatia">
+	HUBU <"Budapest, Hungary">
+	IDJA <"Jakarta, Indonesia">
+	IEDU <"Dublin, Ireland">
+	ILJE <"Jerusalem, Israel">
+	ILS_TELBOR displayName "ILS-TELBOR" <"Publication dates of the ILS-TELBOR index.">
+	ILTA <"Tel Aviv, Israel">
+	INAH <"Ahmedabad, India">
+	INBA <"Bangalore, India">
+	INCH <"Chennai, India">
+	INHY <"Hyderabad, India">
+	INKO <"Kolkata, India">
+	INMU <"Mumbai, India">
+	INND <"New Delhi, India">
+	IQBA <"Baghdad, Iraq">
+	IRTE <"Teheran, Iran">
+	ISRE <"Reykjavik, Iceland">
+	ITMI <"Milan, Italy">
+	ITRO <"Rome, Italy">
+	ITTU <"Turin, Italy">
+	JESH <"St. Helier, Channel Islands, Jersey">
+	JMKI <"Kingston, Jamaica">
+	JOAM <"Amman, Jordan">
+	JPTO <"Tokyo, Japan">
+	KENA <"Nairobi, Kenya">
+	KHPP <"Phnom Penh, Cambodia">
+	KRSE <"Seoul, Republic of Korea">
+	KWKC <"Kuwait City, Kuwait">
+	KYGE <"George Town, Cayman Islands">
+	KZAL <"Almaty, Kazakhstan">
+	LAVI <"Vientiane, Laos">
+	LBBE <"Beirut, Lebanon">
+	LKCO <"Colombo, Sri Lanka">
+	LULU <"Luxembourg, Luxembourg">
+	LVRI <"Riga, Latvia">
+	MACA <"Casablanca, Morocco">
+	MARA <"Rabat, Morocco">
+	MCMO <"Monaco, Monaco">
+	MNUB <"Ulan Bator, Mongolia">
+	MOMA <"Macau, Macao">
+	MTVA <"Valletta, Malta">
+	MUPL <"Port Louis, Mauritius">
+	MVMA <"Male, Maldives">
+	MWLI <"Lilongwe, Malawi">
+	MXMC <"Mexico City, Mexico">
+	MYKL <"Kuala Lumpur, Malaysia">
+	MYLA <"Labuan, Malaysia">
+	MZMA <"Maputo, Mozambique">
+	NAWI <"Windhoek, Namibia">
+	NGAB <"Abuja, Nigeria">
+	NGLA <"Lagos, Nigeria">
+	NLAM <"Amsterdam, Netherlands">
+	NLRO <"Rotterdam, Netherlands">
+	NOOS <"Oslo, Norway">
+	NPKA <"Kathmandu, Nepal">
+	NYFD <"New York Fed Business Day (as defined in 2006 ISDA Definitions Section 1.9 and 2000 ISDA Definitions Section 1.9)">
+	NYSE <"New York Stock Exchange Business Day (as defined in 2006 ISDA Definitions Section 1.10 and 2000 ISDA Definitions Section 1.10)">
+	NZAU <"Auckland, New Zealand">
+	NZWE <"Wellington, New Zealand">
+	OMMU <"Muscat, Oman">
+	PAPC <"Panama City, Panama">
+	PELI <"Lima, Peru">
+	PHMA <"Manila, Philippines">
+	PHMK <"Makati, Philippines">
+	PKKA <"Karachi, Pakistan">
+	PLWA <"Warsaw, Poland">
+	PRSJ <"San Juan, Puerto Rico">
+	PTLI <"Lisbon, Portugal">
+	QADO <"Doha, Qatar">
+	ROBU <"Bucharest, Romania">
+	RSBE <"Belgrade, Serbia">
+	RUMO <"Moscow, Russian Federation">
+	SAAB <"Abha, Saudi Arabia">
+	SAJE <"Jeddah, Saudi Arabia">
+	SARI <"Riyadh, Saudi Arabia">
+	SEST <"Stockholm, Sweden">
+	SGSI <"Singapore, Singapore">
+	SILJ <"Ljubljana, Slovenia">
+	SKBR <"Bratislava, Slovakia">
+	SLFR <"Freetown, Sierra Leone">
+	SNDA <"Dakar, Senegal">
+	SVSS <"San Salvador, El Salvador">
+	THBA <"Bangkok, Thailand">
+	TNTU <"Tunis, Tunisia">
+	TRAN <"Ankara, Turkey">
+	TRIS <"Istanbul, Turkey">
+	TTPS <"Port of Spain, Trinidad and Tobago">
+	TWTA <"Taipei, Taiwan">
+	TZDA <"Dar es Salaam, Tanzania">
+	TZDO <"Dodoma, Tanzania">
+	UAKI <"Kiev, Ukraine">
+	UGKA <"Kampala, Uganda">
+	USBO <"Boston, Massachusetts, United States">
+	USCH <"Chicago, United States">
+	USCR <"Charlotte, North Carolina, United States">
+	USDC <"Washington, District of Columbia, United States">
+	USD_ICESWAP displayName "USD-ICESWAP" <"Publication dates for ICE Swap rates based on USD-LIBOR rates">
+	USD_MUNI displayName "USD-MUNI" <"Publication dates for the USD-Municipal Swap Index">
+	USDN <"Denver, United States">
+	USDT <"Detroit, Michigan, United States">
+	USGS <"U.S. Government Securities Business Day (as defined in 2006 ISDA Definitions Section 1.11 and 2000 ISDA Definitions Section 1.11)">
+	USHL <"Honolulu, Hawaii, United States">
+	USHO <"Houston, United States">
+	USLA <"Los Angeles, United States">
+	USMB <"Mobile, Alabama, United States">
+	USMN <"Minneapolis, United States">
+	USNY <"New York, United States">
+	USPO <"Portland, Oregon, United States">
+	USSA <"Sacramento, California, United States">
+	USSE <"Seattle, United States">
+	USSF <"San Francisco, United States">
+	USWT <"Wichita, United States">
+	UYMO <"Montevideo, Uruguay">
+	UZTA <"Tashkent, Uzbekistan">
+	VECA <"Caracas, Venezuela">
+	VGRT <"Road Town, Virgin Islands (British)">
+	VNHA <"Hanoi, Vietnam">
+	VNHC <"Ho Chi Minh (formerly Saigon), Vietnam">
+	YEAD <"Aden, Yemen">
+	ZAJO <"Johannesburg, South Africa">
+	ZMLU <"Lusaka, Zambia">
+	ZWHA <"Harare, Zimbabwe">
+
+enum CommodityBusinessCalendarEnum:
+    [docReference ISDA FpML_Coding_Scheme schemeLocation "http://www.fpml.org/coding-scheme/commodity-business-calendar"]
+
+	ADSM <"Abu Dhabi Securities Exchange https://www.adx.ae/">
+	AGRUS_FMB displayName "AGRUS-FMB" <"Argus Media Fertilizer Reports. http://www.argusmedia.com/Fertilizer">
+	APPI <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	ARGUS_CRUDE displayName "ARGUS-CRUDE" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	ARGUS_EUROPEAN_GAS displayName "ARGUS-EUROPEAN-GAS" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	ARGUS_EUROPEAN_PRODUCTS displayName "ARGUS-EUROPEAN-PRODUCTS" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	ARGUS_INTERNATIONAL_LPG displayName "ARGUS-INTERNATIONAL-LPG" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	ARGUS_MCCLOSKEYS_COAL_REPORT displayName "ARGUS-MCCLOSKEYS-COAL-REPORT" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	ARGUS_US_PRODUCTS displayName "ARGUS-US-PRODUCTS" <"The Argus US Products report. http://www.argusmedia.com/Petroleum/Petroleum-Products/Argus-US-Products">
+	ASX <"Australian Securities Exchange http://www.asx.com.au/">
+	AWB <"Australian Wheat Board. www.awb.com.au">
+	AWEX <"Australian Wool Exchange. http://www.awex.com.au/home.html">
+	BALTIC_EXCHANGE displayName "BALTIC-EXCHANGE" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	BANK_NEGARA_MALAYSIA_POLICY_COMMITTEE displayName "BANK-NEGARA-MALAYSIA-POLICY-COMMITTEE" <"The business calendar of the Bank Negara Malaysia Policy Committee.">
+	BELPEX <"The business calendar for the Belpex power exchange (www.belpex.be).">
+	BLUENEXT <"BlueNext Power Market.">
+	BM_F displayName "BM&F" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	BURSA_MALAYSIA_SETTLEMENT displayName "BURSA-MALAYSIA-SETTLEMENT" <"The settlement business calendar for Bursa Malaysia.">
+	BURSA_MALAYSIA_TRADING displayName "BURSA-MALAYSIA-TRADING" <"The trading business calendar for Bursa Malaysia.">
+	CANADIAN_GAS_PRICE_REPORTER displayName "CANADIAN-GAS-PRICE-REPORTER" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	CBOT_SOFT displayName "CBOT-SOFT" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	CMAI_AROMATICS_MARKET_REPORT displayName "CMAI-AROMATICS-MARKET-REPORT" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	CMAI_GLOBAL_PLASTICS_AND_POLYMERS_MARKET_REPORT displayName "CMAI-GLOBAL-PLASTICS-AND-POLYMERS-MARKET-REPORT" <"CMAI Global Plastics and Polymers Market Report. http://www.ihs.com/products/chemical/index.aspx?pu=1&rd=cmai">
+	CMAI_METHANOL_MARKET_REPORT displayName "CMAI-METHANOL-MARKET-REPORT" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	CMAI_MONOMERS_MARKET_REPORT displayName "CMAI-MONOMERS-MARKET-REPORT" <"CMAI Monomers Market Report. http://www.ihs.com/products/chemical/index.aspx?pu=1&rd=cmai">
+	CME_DAIRY displayName "CME-DAIRY" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	CME_NON_DAIRY_SOFT displayName "CME-NON-DAIRY-SOFT" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	COMEX <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	CRU <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	CRU_LONG displayName "CRU-LONG" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	DEPARTMENT_OF_ENERGY displayName "DEPARTMENT-OF-ENERGY" <"The business calendar for statistical publications by the by the United States Department of Energy (DOE).">
+	DEWITT_BENZENE_DERIVATIVES displayName "DEWITT-BENZENE-DERIVATIVES" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	DME <"Dubai Mercantile Exchange. http://www.dubaimerc.com/">
+	DOW_JONES displayName "DOW-JONES" <"Dow Jones US Calendar. http://www.dowjones.com/">
+	DOW_JONES_ENERGY_SERVICE displayName "DOW-JONES-ENERGY-SERVICE" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	DowJonesPower <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	EEX_COAL displayName "EEX-COAL" <"European Energy Exchange-Coal">
+	EEX_EMISSIONS displayName "EEX-EMISSIONS" <"European Energy Exchange-Emissions Rights">
+	EEX_GAS displayName "EEX-GAS" <"European Energy Exchange-Gas">
+	EEX_POWER displayName "EEX-POWER" <"European Energy Exchange-Power">
+	EURONEX_MATIF displayName "EURONEX-MATIF" <"TBD.">
+	FERTECON <"FERTECON Limited Information Services. http://fertecon.com/current_information_services.asp">
+	FERTILIZER_WEEK displayName "FERTILIZER-WEEK" <"Fertilizer Week. http://www.crugroup.com/market-analysis/products/fertilizerweek">
+	GAS_DAILY displayName "GAS-DAILY" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	GAS_DAILY_PRICE_GUIDE displayName "GAS-DAILY-PRICE-GUIDE" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	GLOBALCOAL <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	HEREN_REPORT displayName "HEREN-REPORT" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	ICE_10X_DAILY displayName "ICE/10X-DAILY" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	ICE_10X_MONTHLY displayName "ICE/10X-MONTHLY" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	ICE_CANADA displayName "ICE-CANADA" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	ICE_ECX displayName "ICE-ECX" <"European Climate Exchange.">
+	ICE_GAS displayName "ICE-GAS" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	ICE_OIL displayName "ICE-OIL" <"The business calendar oil and refined product contracts on ICE Futures Europe.">
+	ICE_US_AGRICULTURAL displayName "ICE-US-AGRICULTURAL" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	ICIS_PRICING_BENZENE__EUROPE_ displayName "ICIS-PRICING-BENZENE-(EUROPE)" <"The business calendar for publication of ICIS Benzene (Europe) data.">
+	ICIS_PRICING_ETHYLENE__EUROPE_ displayName "ICIS-PRICING-ETHYLENE-(EUROPE)" <"The business calendar for publication of ICIS Ethylene (Europe) data.">
+	ICIS_PRICING_POLYPROPYLENE__EUROPE_ displayName "ICIS-PRICING-POLYPROPYLENE-(EUROPE)" <"The business calendar for publication of ICIS Polyproylene (Europe) data.">
+	INSIDE_FERC displayName "INSIDE-FERC" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	JAPAN_MOF_TSRR displayName "JAPAN-MOF-TSRR" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	KCBOT <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	KUALA_LUMPUR_BANK displayName "KUALA-LUMPUR-BANK" <"The banking business calendar in Kuala Lumpur.">
+	LABUAN_BANK displayName "LABUAN-BANK" <"The business calendar for the Labuan Bank (Malaysia).">
+	LIFFE_LONDON_SOFT displayName "LIFFE-LONDON-SOFT" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	LME <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	LONDON_BULLION_MARKET displayName "LONDON-BULLION-MARKET" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	LONDON_BULLION_MARKET_GOLD_A_M_ONLY displayName "LONDON-BULLION-MARKET-GOLD-A.M-ONLY" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	LONDON_PLATINUM_PALLADIUM_MARKET displayName "LONDON-PLATINUM-PALLADIUM-MARKET" <"The London Platinum and Palladium Market in London on which members quote prices for the buying and selling of Platinum and Palladium.">
+	MGEX <"Minneapolis Grain Exchange http://www.mgex.com/">
+	N2EX <"The business calendar for the N2EX UK power exchange (https://www.n2ex.com/aboutn2ex).">
+	NASDAQ_OMX displayName "NASDAQ-OMX" <"NASDAQ-OMX (Formerly known as Nordpool). http://www.nasdaqomx.com/commodities">
+	NATURAL_GAS_WEEK displayName "NATURAL-GAS-WEEK" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	NERC <"Per 2005 ISDA Commodity Definitions, Article XIV.">
+	NGI <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	NGX <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	NUCLEAR_MARKET_REVIEW displayName "NUCLEAR-MARKET-REVIEW" <"The Nuclear Market Review report as published by Trade tech. http://www.uranium.info/nuclear_market_review.php">
+	NYMEX_ELECTRICITY displayName "NYMEX-ELECTRICITY" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	NYMEX_GAS displayName "NYMEX-GAS" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	NYMEX_NATURAL_GAS displayName "NYMEX-NATURAL-GAS" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	NYMEX_OIL displayName "NYMEX-OIL" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	OFFICIAL_BOARD_MARKETS displayName "OFFICIAL-BOARD-MARKETS" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	OPIS_LP_GAS displayName "OPIS-LP-GAS" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	OPIS_PROPANE displayName "OPIS-PROPANE" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	PAPER_PACKAGING_MONITOR displayName "PAPER-PACKAGING-MONITOR" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	PAPER_TRADER displayName "PAPER-TRADER" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	PERTAMINA <"Pertamina-Indonesia. http://www.pertamina.com/">
+	PETROCHEMWIRE <"PetroChemWire Publication Calendar. http://www.petrochemwire.com/">
+	PIX_PULP_BENCHMARK_INDICES displayName "PIX-PULP-BENCHMARK-INDICES" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	PLATTS_APAG_MARKETSCAN displayName "PLATTS-APAG-MARKETSCAN" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	PLATTS_BUNKERWIRE displayName "PLATTS-BUNKERWIRE" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	PLATTS_CLEAN_TANKERWIRE displayName "PLATTS-CLEAN-TANKERWIRE" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	PLATTS_CRUDE_OIL_MARKETWIRE displayName "PLATTS-CRUDE-OIL-MARKETWIRE" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	PLATTS_DIRTY_TANKERWIRE displayName "PLATTS-DIRTY-TANKERWIRE" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	PLATTS_EUROPEAN_GAS displayName "PLATTS-EUROPEAN-GAS" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	PLATTS_EUROPEAN_MARKETSCAN displayName "PLATTS-EUROPEAN-MARKETSCAN" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	PLATTS_METALS_ALERT displayName "PLATTS-METALS-ALERT" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	PLATTS_OILGRAM displayName "PLATTS-OILGRAM" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	PLATTS_TSI_IRON_ORE displayName "PLATTS-TSI-IRON-ORE" <"The Steel Index Iron Ore Service. http://www.thesteelindex.com/en/iron-ore">
+	PLATTS_TSI_SCRAP displayName "PLATTS-TSI-SCRAP" <"The Steel Index Scrap Reference Prices. http://www.thesteelindex.com/en/scrapprices">
+	PLATTS_TSI_STEEL displayName "PLATTS-TSI-STEEL" <"The Steel Index. http://www.thesteelindex.com/en/price-specifications">
+	PLATTS_US_MARKETSCAN displayName "PLATTS-US-MARKETSCAN" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	PULP_AND_PAPER_INTERNATIONAL displayName "PULP-AND-PAPER-INTERNATIONAL" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	PULP_AND_PAPER_WEEK displayName "PULP-AND-PAPER-WEEK" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	RIM_PRODUCTS_INTELLIGENCE_DAILY displayName "RIM-PRODUCTS-INTELLIGENCE-DAILY" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	SAFEX_SOFT displayName "SAFEX-SOFT" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	SFE_SOFT displayName "SFE-SOFT" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	SGX <"Singapore Exchange. www.sgx.com">
+	SICOM <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	SP_GSCI displayName "SP-GSCI" <"Standard and Poor's GSCI. http://us.spindices.com/index-family/commodities/sp-gsci">
+	STATISTICHES_BUNDESAMT displayName "STATISTICHES-BUNDESAMT" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	TGE <"Tokyo Grain Exchange. www.tge.or.jp">
+	TOCOM_OIL displayName "TOCOM-OIL" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	TOCOM_PRECIOUS displayName "TOCOM-PRECIOUS" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	TOCOM_SOFT displayName "TOCOM-SOFT" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+	UX_WEEKLY displayName "UX-WEEKLY" <"The Ux Consulting Company. http://www.uxc.com/products/uxw_overview.aspx">
+	WORLD_PULP_MONTHLY displayName "WORLD-PULP-MONTHLY" <"Per 2005 ISDA Commodity Definitions, Section 7.2 Certain Definitions Relating To Commodity Reference Prices.">
+
+enum BusinessDayConventionEnum: <"The enumerated values to specify the convention for adjusting any relevant date if it would otherwise fall on a day that is not a valid business day.">
+	FOLLOWING <"The non-business date will be adjusted to the first following day that is a business day">
+	FRN <"Per 2000 ISDA Definitions, Section 4.11. FRN Convention; Eurodollar Convention. FRN is included here as a type of business day convention although it does not strictly fall within ISDA's definition of a Business Day Convention and does not conform to the simple definition given above.">
+	MODFOLLOWING <"The non-business date will be adjusted to the first following day that is a business day unless that day falls in the next calendar month, in which case that date will be the first preceding day that is a business day.">
+	PRECEDING <"The non-business day will be adjusted to the first preceding day that is a business day.">
+	MODPRECEDING <"The non-business date will be adjusted to the first preceding day that is a business day unless that day falls in the previous calendar month, in which case that date will be the first following day that us a business day.">
+	NEAREST <"The non-business date will be adjusted to the nearest day that is a business day - i.e. if the non-business day falls on any day other than a Sunday or a Monday, it will be the first preceding day that is a business day, and will be the first following business day if it falls on a Sunday or a Monday.">
+	NONE <"The date will not be adjusted if it falls on a day that is not a business day.">
+	NotApplicable <"The date adjustments conventions are defined elsewhere, so it is not required to specify them here.">
+
+enum DayOfWeekEnum: <"The enumerated values to specify a day of the seven-day week.">
+	MON <"Monday">
+	TUE <"Tuesday">
+	WED <"Wednesday">
+	THU <"Thursday">
+	FRI <"Friday">
+	SAT <"Saturday">
+	SUN <"Sunday">
+
+enum DayTypeEnum: <"Lists the enumerated values to specify the day type classification used in counting the number of days between two dates.">
+	Business <"Applies when calculating the number of days between two dates the count includes only business days.">
+	Calendar <"Applies when calculating the number of days between two dates the count includes all calendar days.">
+	CurrencyBusiness <"Applies when calculating the number of days between two dates the count includes only currency business days.">
+	ExchangeBusiness <"Applies when calculating the number of days between two dates the count includes only stock exchange business days.">
+	ScheduledTradingDay <"Applies when calculating the number of days between two dates the count includes only scheduled trading days.">
+
+enum PeriodEnum: <"The enumerated values to specify the period, e.g. day, week.">
+	D <"Day">
+	W <"Week">
+	M <"Month">
+	Y <"Year">
+
+enum PeriodExtendedEnum /*extends PeriodEnum*/ : <"The enumerated values to specify a time period containing the additional value of Term.">
+	H <"Hour">
+	D <"Day">
+	W <"Week">
+	M <"Month">
+	Y <"Year">
+	T <"Term. The period commencing on the effective date and ending on the termination date. The T period always appears in association with periodMultiplier = 1, and the notation is intended for use in contexts where the interval thus qualified (e.g. accrual period, payment period, reset period, ...) spans the entire term of the trade.">
+	C <"CalculationPeriod - the period corresponds to the calculation period   For example, used in the Commodity Markets to indicate that a reference contract is the one that corresponds to the period of the calculation period.">
+
+// The next two should be rationalised with PeriodEnum into a single enum
+
+enum PeriodTimeEnum: <"The enumeration values to specify a time period containing additional values such as Term.">
+	Hour <"Period measured in hours.">
+	Minute <"Period measured in minutes.">
+	Second <"Period measured in seconds.">
+
+enum TimeUnitEnum: <"The enumeration values to qualify the allowed units of time.">
+	Second <"Second">
+	Minute <"Minute">
+	Hour <"Hour">
+	Day <"Day">
+	Week <"Week">
+	Month <"Month">
+	Year <"Year">
+	
+enum RollConventionEnum: <"The enumerated values to specify the period term as part of a periodic schedule, i.e. the calculation period end date within the regular part of the calculation period. The value could be a rule, e.g. IMM Settlement Dates, which is the 3rd Wednesday of the month, or it could be a specific day of the month, such as the first day of the applicable month.">
+	EOM <"Rolls on month end dates irrespective of the length of the month and the previous roll day.">
+	FRN <"Roll days are determined according to the FRN Convention or Euro-dollar Convention as described in ISDA 2000 definitions.">
+	IMM <"IMM Settlement Dates. The third Wednesday of the (delivery) month.">
+	IMMCAD <"The last trading day/expiration day of the Canadian Derivatives Exchange (Bourse de Montreal Inc) Three-month Canadian Bankers' Acceptance Futures (Ticker Symbol BAX). The second London banking day prior to the third Wednesday of the contract month. If the determined day is a Bourse or bank holiday in Montreal or Toronto, the last trading day shall be the previous bank business day. Per Canadian Derivatives Exchange BAX contract specification.">
+	IMMAUD <"The last trading day of the Sydney Futures Exchange 90 Day Bank Accepted Bills Futures contract (see http://www.sfe.com.au/content/sfe/trading/con_specs.pdf). One Sydney business day preceding the second Friday of the relevant settlement.">
+	IMMNZD <"The last trading day of the Sydney Futures Exchange NZ 90 Day Bank Bill Futures contract (see http://www.sfe.com.au/content/sfe/trading/con_specs.pdf). The first Wednesday after the ninth day of the relevant settlement month.">
+	SFE <"Sydney Futures Exchange 90-Day Bank Accepted Bill Futures Settlement Dates. The second Friday of the (delivery) month">
+	NONE <"The roll convention is not required. For example, in the case of a daily calculation frequency.">
+	TBILL <"13-week and 26-week U.S. Treasury Bill Auction Dates. Each Monday except for U.S. (New York) holidays when it will occur on a Tuesday.">
+	_1 displayName "1" <"Rolls on the 1st day of the month.">
+	_2 displayName "2" <"Rolls on the 2nd day of the month.">
+	_3 displayName "3" <"Rolls on the 3rd day of the month.">
+	_4 displayName "4" <"Rolls on the 4th day of the month.">
+	_5 displayName "5" <"Rolls on the 5th day of the month.">
+	_6 displayName "6" <"Rolls on the 6th day of the month.">
+	_7 displayName "7" <"Rolls on the 7th day of the month.">
+	_8 displayName "8" <"Rolls on the 8th day of the month.">
+	_9 displayName "9" <"Rolls on the 9th day of the month.">
+	_10 displayName "10" <"Rolls on the 10th day of the month.">
+	_11 displayName "11" <"Rolls on the 11th day of the month.">
+	_12 displayName "12" <"Rolls on the 12th day of the month.">
+	_13 displayName "13" <"Rolls on the 13th day of the month.">
+	_14 displayName "14" <"Rolls on the 14th day of the month.">
+	_15 displayName "15" <"Rolls on the 15th day of the month.">
+	_16 displayName "16" <"Rolls on the 16th day of the month.">
+	_17 displayName "17" <"Rolls on the 17th day of the month.">
+	_18 displayName "18" <"Rolls on the 18th day of the month.">
+	_19 displayName "19" <"Rolls on the 19th day of the month.">
+	_20 displayName "20" <"Rolls on the 20th day of the month.">
+	_21 displayName "21" <"Rolls on the 21st day of the month.">
+	_22 displayName "22" <"Rolls on the 22nd day of the month.">
+	_23 displayName "23" <"Rolls on the 23rd day of the month.">
+	_24 displayName "24" <"Rolls on the 24th day of the month.">
+	_25 displayName "25" <"Rolls on the 25th day of the month.">
+	_26 displayName "26" <"Rolls on the 26th day of the month.">
+	_27 displayName "27" <"Rolls on the 27th day of the month.">
+	_28 displayName "28" <"Rolls on the 28th day of the month.">
+	_29 displayName "29" <"Rolls on the 29th day of the month.">
+	_30 displayName "30" <"Rolls on the 30th day of the month.">
+	MON <"Rolling weekly on a Monday.">
+	TUE <"Rolling weekly on a Tuesday">
+	WED <"Rolling weekly on a Wednesday">
+	THU <"Rolling weekly on a Thursday">
+	FRI <"Rolling weekly on a Friday">
+	SAT <"Rolling weekly on a Saturday">
+	SUN <"Rolling weekly on a Sunday">
+
+enum CompoundingTypeEnum: <"The enumerated values to specify how the compounding calculation is done">
+    None <"Compounding is not applicable">
+    Business <"Compounding is done only on business days, i.e. not compounded each day on weekends or holidays.">
+    Calendar <"Compounding is done on each calendar day.">
+
+enum RoundingFrequencyEnum: <"How often is rounding performed">
+    Daily <"Rounding is done on each day">
+    PeriodEnd <"Rounding is done only at the end of the period">
+
+
diff --git a/rosetta-source/src/main/resources/base-staticdata-asset-common-enum.rosetta b/rosetta-source/src/main/resources/base-staticdata-asset-common-enum.rosetta
new file mode 100644
index 0000000000..f9ac326c4b
--- /dev/null
+++ b/rosetta-source/src/main/resources/base-staticdata-asset-common-enum.rosetta
@@ -0,0 +1,498 @@
+namespace cdm.base.staticdata.asset.common : <"Basic static asset concepts that apply across asset classes: taxonomy etc.">
+version "${project.version}"
+
+import cdm.base.*
+
+enum AssetClassEnum: <"The enumerated values to specify the FpML asset class categorization.">
+	Commodity <"Commodity.">
+	Credit <"Credit.">
+	Equity <"Equity.">
+	ForeignExchange <"ForeignExchange.">
+	InterestRate <"InterestRate.">
+	MoneyMarket <"Money Market Assets like CP and CD.">
+
+
+// enum MortgageSectorEnum: <"The enumerated values to specify a mortgage typology.">
+// 	ABS	<"Asset Backed Security.">
+// 	CDO	<"Collateralized Debt Obligation.">
+// 	CMBS <"Commercial Mortgage Backed Security.">
+// 	RMBS <"Residential Mortgage Backed Security.">
+
+enum ProductIdTypeEnum: <"Provides the enumerated values to specify the product identifier source.">
+    BBGID <"Published by Bloomberg, the BBGID is a 12-digit alphanumeric randomly generated ID covering active and non-active securities.">
+    BBGTICKER <"Published by Bloomberg as a short code to identify publicly trades shares of a particular stock on a specific exchange.">
+    CUSIP <"Derived from the Committee on Uniform Security Identification Procedures, CUSIPs are 9-character identifiers that capture an issue’s important differentiating characteristics for issuers and their financial instruments in the U.S. and Canada.">
+    FIGI <"Issued under the guidelines of the Object Management Group, the Financial Instrument Global Identifier (FIGI) is a 12 character, alphanumeric, randomly generated ID covering hundreds of millions of active and inactive instruments. The identifier acts as a Uniform Resource Identifier (URI) to link to a set of metadata that uniquely and clearly describes the instrument.">
+	ISDACRP <"Issued by the International Swaps Dealers Association as a string representing a Commodity Reference Price used for purposes of determining a relevant price for an underlying commodity in an OTC derivatives contract.">
+    ISIN <"Issued by The International Securities Identification Number (ISIN) Organization, the ISIN is a 12-character alpha-numerical code used to uniformly identify a security for trading and settlement purposes. Securities with which ISINs can be used include debt securities, such as notes or bonds as well shares, such as common stock or shares of a fund, options, derivatives, and futures. The ISIN structure is defined in ISO 6166.">
+	Name <"The name of the product.">
+    RIC <"Issued by Refinitiv (formerly Reuters), the Reuters Instrument Codes(RIC) uniquely identifies financial instruments, including where they are traded.">
+    Other <"Used when the source is not otherwise in this enumerated list because it is internal or other reasons.  The source can be identified in the scheme which is part of the identifier attribute.">
+    Sicovam <"Issued by the French Société Interprofessionnelle pour la Compensation des Valeurs Mobilières (SICOVAM) to identify French securities listed on French stock exchanges.">
+    SEDOL <"Assigned by the London Stock Exchange, the Stock Exchange Daily Official List (SEDOL) is a list of security identifiers used in the United Kingdom and Ireland for clearing purposes.  SEDOLs serve as the National Securities Identifying Number for all securities issued in the United Kingdom and are therefore part of the security's ISIN as well.">
+    UPI <"Assigned by the Derivatives Service Bureau Ltd (DSB), the Unique Product Identifier (UPI) is a unique code to describe an over-the-counter (OTC) derivatives product.  The UPI is used for identifying the product in transaction reporting data.">
+    Wertpapier <"Issued by the Institute for the Issuance and Administration of Securities in Germany (Securities Information), the Wertpapierkennnummer (WKN, WPKN, WPK or simply Wert) consists of six digits or capital letters (excluding I and O), and no check digit. It is used to identify German securities.">
+
+enum TaxonomySourceEnum: <"Represents the enumerated values to specify taxonomy sources.">
+	CFI <"Represents the ISO 10962 Classification of Financial Instruments code.">
+	ISDA <"Represents the ISDA product taxonomy.">
+	ICAD <"Represents the ISDA Collateral Asset Definition Idenifier code.">
+	EMIR <"Represents the EMIR Article 9 Asset Definition Identifier code.">
+	EU_EMIR_EligibleCollateralAssetClass <"Identifies European Union Eligible Collateral Assets classification categories based on EMIR Uncleared Margin Rules.">
+	UK_EMIR_EligibleCollateralAssetClass <"Identifies United Kingdom Eligible Collateral Assets classification categories based on UK Onshored EMIR Uncleared Margin Rules Eligible Collateral asset classes for both initial margin (IM) and variation margin (VM) posted and collected between specified entities.Please note: UK EMIR regulation will detail which eligible collateral assets classes apply to each type of entity pairing (counterparty) and which apply to posting of IM and VM.">
+	US_CFTC_PR_EligibleCollateralAssetClass <"Identifies US Eligible Collateral Assets classification categories based on Uncleared Margin Rules published by the CFTC and the US Prudential Regulator. Note: While the same basic categories exist in the CFTC and US Prudential Regulators margin rules, the precise definitions or application of those rules could differ between the two rules.">
+	Other <"Denotes a user-specific scheme or taxonomy or other external sources not listed here.">
+
+enum ISOCurrencyCodeEnum: <"The enumerated values to specify standard currency codes according to the International Standards Organization (ISO).  The set of codes in this enumerated list is sourced from ISO Standard 4217 (https://www.currency-iso.org/en/home/tables/table-a1.html), as of 29-Aug-18.">
+	[docReference ISO ISO_4217_Currency_Scheme schemeLocation "https://www.six-group.com/dam/download/financial-information/data-center/iso-currrency/lists/list-one.xml"]
+
+	AED <"UAE Dirham">
+	AFN <"Afghani">
+	ALL <"Lek">
+	AMD <"Armenian Dram">
+	ANG <"Netherlands Antillean Guilder">
+	AOA <"Kwanza">
+	ARS <"Argentine Peso">
+	AUD <"Australian Dollar">
+	AWG <"Aruban Florin">
+	AZN <"Azerbaijan Manat">
+	BAM <"Convertible Mark">
+	BBD <"Barbados Dollar">
+	BDT <"Taka">
+	BGN <"Bulgarian Lev">
+	BHD <"Bahraini Dinar">
+	BIF <"Burundi Franc">
+	BMD <"Bermudian Dollar">
+	BND <"Brunei Dollar">
+	BOB <"Boliviano">
+	BOV <"Mvdol">
+	BRL <"Brazilian Real">
+	BSD <"Bahamian Dollar">
+	BTN <"Ngultrum">
+	BWP <"Pula">
+	BYN <"Belarusian Ruble">
+	BZD <"Belize Dollar">
+	CAD <"Canadian Dollar">
+	CDF <"Congolese Franc">
+	CHE <"WIR Euro">
+	CHF <"Swiss Franc">
+	CHW <"WIR Franc">
+	CLF <"Unidad de Fomento">
+	CLP <"Chilean Peso">
+	CNY <"Yuan Renminbi">
+	COP <"Colombian Peso">
+	COU <"Unidad de Valor Real">
+	CRC <"Costa Rican Colon">
+	CUC <"Peso Convertible">
+	CUP <"Cuban Peso">
+	CVE <"Cabo Verde Escudo">
+	CZK <"Czech Koruna">
+	DJF <"Djibouti Franc">
+	DKK <"Danish Krone">
+	DOP <"Dominican Peso">
+	DZD <"Algerian Dinar">
+	EGP <"Egyptian Pound">
+	ERN <"Nakfa">
+	ETB <"Ethiopian Birr">
+	EUR <"Euro">
+	FJD <"Fiji Dollar">
+	FKP <"Falkland Islands Pound">
+	GBP <"Pound Sterling">
+	GEL <"Lari">
+	GHS <"Ghana Cedi">
+	GIP <"Gibraltar Pound">
+	GMD <"Dalasi">
+	GNF <"Guinean Franc">
+	GTQ <"Quetzal">
+	GYD <"Guyana Dollar">
+	HKD <"Hong Kong Dollar">
+	HNL <"Lempira">
+	HTG <"Gourde">
+	HUF <"Forint">
+	IDR <"Rupiah">
+	ILS <"New Israeli Sheqel">
+	INR <"Indian Rupee">
+	IQD <"Iraqi Dinar">
+	IRR <"Iranian Rial">
+	ISK <"Iceland Krona">
+	JMD <"Jamaican Dollar">
+	JOD <"Jordanian Dinar">
+	JPY <"Yen">
+	KES <"Kenyan Shilling">
+	KGS <"Som">
+	KHR <"Riel">
+	KMF <"Comorian Franc ">
+	KPW <"North Korean Won">
+	KRW <"Won">
+	KWD <"Kuwaiti Dinar">
+	KYD <"Cayman Islands Dollar">
+	KZT <"Tenge">
+	LAK <"Lao Kip">
+	LBP <"Lebanese Pound">
+	LKR <"Sri Lanka Rupee">
+	LRD <"Liberian Dollar">
+	LSL <"Loti">
+	LYD <"Libyan Dinar">
+	MAD <"Moroccan Dirham">
+	MDL <"Moldovan Leu">
+	MGA <"Malagasy Ariary">
+	MKD <"Denar">
+	MMK <"Kyat">
+	MNT <"Tugrik">
+	MOP <"Pataca">
+	MRU <"Ouguiya">
+	MUR <"Mauritius Rupee">
+	MVR <"Rufiyaa">
+	MWK <"Malawi Kwacha">
+	MXN <"Mexican Peso">
+	MXV <"Mexican Unidad de Inversion (UDI)">
+	MYR <"Malaysian Ringgit">
+	MZN <"Mozambique Metical">
+	NAD <"Namibia Dollar">
+	NGN <"Naira">
+	NIO <"Cordoba Oro">
+	NOK <"Norwegian Krone">
+	NPR <"Nepalese Rupee">
+	NZD <"New Zealand Dollar">
+	OMR <"Rial Omani">
+	PAB <"Balboa">
+	PEN <"Sol">
+	PGK <"Kina">
+	PHP <"Philippine Peso">
+	PKR <"Pakistan Rupee">
+	PLN <"Zloty">
+	PYG <"Guarani">
+	QAR <"Qatari Rial">
+	RON <"Romanian Leu">
+	RSD <"Serbian Dinar">
+	RUB <"Russian Ruble">
+	RWF <"Rwanda Franc">
+	SAR <"Saudi Riyal">
+	SBD <"Solomon Islands Dollar">
+	SCR <"Seychelles Rupee">
+	SDG <"Sudanese Pound">
+	SEK <"Swedish Krona">
+	SGD <"Singapore Dollar">
+	SHP <"Saint Helena Pound">
+	SLE <"Leone">
+	SLL <"Leone">
+	SOS <"Somali Shilling">
+	SRD <"Surinam Dollar">
+	SSP <"South Sudanese Pound">
+	STN <"Dobra">
+	SVC <"El Salvador Colon">
+	SYP <"Syrian Pound">
+	SZL <"Lilangeni">
+	THB <"Baht">
+	TJS <"Somoni">
+	TMT <"Turkmenistan New Manat">
+	TND <"Tunisian Dinar">
+	TOP <"Pa’anga">
+	TRY <"Turkish Lira">
+	TTD <"Trinidad and Tobago Dollar">
+	TWD <"New Taiwan Dollar">
+	TZS <"Tanzanian Shilling">
+	UAH <"Hryvnia">
+	UGX <"Uganda Shilling">
+	USD <"US Dollar">
+	USN <"US Dollar (Next day)">
+	UYI <"Uruguay Peso en Unidades Indexadas (UI)">
+	UYU <"Peso Uruguayo">
+	UYW <"Unidad Previsional">
+	UZS <"Uzbekistan Sum">
+	VED <"Bolívar Soberano">
+	VES <"Bolívar Soberano">
+	VND <"Dong">
+	VUV <"Vatu">
+	WST <"Tala">
+	XAF <"CFA Franc BEAC">
+	XAG <"Silver">
+	XAU <"Gold">
+	XBA <"Bond Markets Unit European Composite Unit (EURCO)">
+	XBB <"Bond Markets Unit European Monetary Unit (E.M.U.-6)">
+	XBC <"Bond Markets Unit European Unit of Account 9 (E.U.A.-9)">
+	XBD <"Bond Markets Unit European Unit of Account 17 (E.U.A.-17)">
+	XCD <"East Caribbean Dollar">
+	XDR <"SDR (Special Drawing Right)">
+	XOF <"CFA Franc BCEAO">
+	XPD <"Palladium">
+	XPF <"CFP Franc">
+	XPT <"Platinum">
+	XSU <"Sucre">
+	XTS <"Codes specifically reserved for testing purposes">
+	XUA <"ADB Unit of Account">
+	XXX <"The codes assigned for transactions where no currency is involved">
+	YER <"Yemeni Rial">
+	ZAR <"Rand">
+	ZMW <"Zambian Kwacha">
+	ZWL <"Zimbabwe Dollar">
+
+enum CurrencyCodeEnum extends ISOCurrencyCodeEnum: <"Union of the enumerated values defined by the International Standards Organization (ISO) and the FpML nonISOCurrencyScheme which consists of offshore and historical currencies (https://www.fpml.org/coding-scheme/non-iso-currency), as of 28-Oct-2016.">
+	CNH <"Offshore Chinese Yuan traded in Hong Kong.">
+	CNT <"Offshore Chinese Yuan traded in Taiwan.">
+	GGP <"Guernsey Pound.">
+	IMP <"Isle of Man Pound.">
+	JEP <"Jersey Pound.">
+	KID <"Tuvaluan Dollar.">
+	MCF <"Monegasque Franc.">
+	SML <"Sammarinese Lira.">
+	VAL <"Vatican Lira.">
+	
+enum IssuerTypeEnum: <"Represents an enumeration list to identify the type of entity issuing the asset.">
+	SupraNational <"Specifies debt issued by international organisations and multilateral banks, entities constituted by treaties or with multiple sovereign members includes Multilateral development Banks.">
+	SovereignCentralBank <"Specifies Sovereign, Government Debt Securities including Central Banks.">
+	QuasiGovernment <"Specifies debt issues by institutions or bodies, typically constituted by statute, with a function mandated by the government and subject to government supervision inclusive of profit- and non-profit making bodies. Includes the US Agencies and GSEs and the EU concept of public sector entities. Excluding any entities which are also Regional Government.">
+	RegionalGovernment <"Specifies Regional Government Issued Debt including states within countries, local authorities and municipalities.">
+	Corporate <"Specifies debt issued Securities by corporate bodies including Banks.">
+	Fund <"Specifies a vehicle (with or without separate legal personality) designed for the purposes of collective investment towards a defined investment goal.">
+	SpecialPurposeVehicle <"Specifies a vehicle setup for the purpose of acquisition and financing of specific assets on a limited recourse basis. E.g. asset backed securities, including securitisations.">
+
+enum SupraNationalIssuerTypeEnum: <"Represents an enumeration list to identify the type of supranational entity issuing the asset.">
+	InternationalOrganisation <"Specifies International Financial Institution.">
+	MultilateralBank <"Specifies Multilateral Bank or Multilateral Development Bank.">
+
+enum CreditRiskEnum: <"Represents an enumeration list to identify tranched or untranched credit risk.">
+	TranchedCreditRisk <"Indicates tranched credit risk, including securitizations.">
+	UntranchedCreditRisk <"Indicates tranched credit risk, including repackagings.">
+
+enum SecurityTypeEnum: <"Represetns an enumeration list to indentify the type of security.">
+	Debt <"Identifies a security as a fixed income instrument of debt issued and securitized as a tradable asset.">
+	Equity <"Identifies a security as an Equity value of holding of shares in listed company.">
+	Fund <"Identifies a security as an Instrument representing holding in an investment fund.">
+	Warrant <"Identifies a security as a Warrant that give the right, but not the obligation, to buy or sell a security — most commonly an equity — at a certain price before expiration, or to receive the cash equivalent.">
+	Certificate <"Identifies a security as one that that offers a derivative-based economic return which is not structured as a bond, an equity or a warrant. Note that this security type is not a Certificate of Deposit (aka CD)."> 
+	LetterOfCredit <"Identifies a security as a letter of credit or documentary credit/ bankers commercial credit.  A payment mechanism used in international trade to provide economic guarantee of payment by a creditworthy issuer for payment of exported goods.">
+    ListedDerivative <"Identifies a security as a listed derivative on an exchange.">
+
+enum EquityTypeEnum: <"Represents an enumeration list to identify the type of Equity.">
+	Ordinary <"Identifies an Equity of Common stocks and shares.">
+	NonConvertiblePreference <"Identifies an Equity of Non-Convertible Preference, Shares which hold priority to receive capital return in event of issuer liquidation.">
+
+enum FundProductTypeEnum: <"Represents an enumeration list to identify the fund product type.">
+	MoneyMarketFund <"Denotes a fund that invests only in highly liquid near-term instruments such as cash, cash equivalent securities, and high credit rating debt instruments with a short-term maturity.">
+	ExchangeTradedFund <"Denotes an investment fund consisting of stocks, bonds, and/or other assets that is passively managed and traded on a stock exchange.">
+	MutualFund <"Denotes an investment fund consisting of stocks, bonds, and/or other assets that is actively managed and can only be purchased or sold through the investment manager.">
+	OtherFund <"Denotes a fund that is not an Exchange Traded Fund, Money Market Fund or Mutual Fund.">
+
+enum MaturityTypeEnum: <"Represents an enumeration list to identify the Maturity.">
+	RemainingMaturity <"Denotes a period from now until maturity date.">
+	OriginalMaturity <"Denotes a period from issuance until maturity date.">
+	FromIssuance <"Denotes a period from issuance date until now.">
+
+enum DebtClassEnum: <"Represents an enumeration list that identifies the type of debt.">
+
+	AssetBacked <"Identifies a debt instrument that has periodic income payments and value derived from or backed by a specified pool of underlying assets which could be mortgages or other obligations.">
+	Convertible <"Identifies a debt instrument that can be converted into common shares.">
+	RegCap <"Identifies a debt instrument as one issued by financial institutions to count towards regulatory capital, including term and perpetual subordinated debt, contingently convertible and others.  Excludes preferred share capital.">
+	Structured <"Identifies a debt instrument athat has non-standard interest or principal features, with full recourse to the issuer.">
+	Vanilla <"Identifies a debt instrument that has a periodic coupon, a defined maturity, and is not backed by any specific asset. The seniority and the structure of the income and principal payments can optionally be defined in DebtType.DebtEconomics.">
+	HolderConvertible <"Identifies a debt instrument that can be converted primarily at the election of the holder into common shares of the Issuer.">
+	HolderExchangeable <"Identifies a debt instrument that can be converted primarily at the election of the holder into common shares of a party other than the Issuer.">
+	IssuerConvertible <"Identifies a debt instrument that can be converted at the election of the Issuer into common shares of the Issuer.  Also known as reverse convertible.">
+	IssuerExchangeable <"Identifies a debt instrument that can be converted at the election of the Issuer into common shares of a party other than the Issuer.  Also known as reverse exchangeable.">
+
+enum DebtSeniorityEnum: <"Specifies the order of repayment in the event of a sale or bankruptcy of the issuer or a related party (eg guarantor).">
+	Secured <"Denotes debt which is secured over assets of the issuer or a related party (eg guarantor).">
+	Senior <"Denotes debt  which ranks pari passu with all other unsecured creditors of the issuer.">
+	Subordinated <"Denotes debt  owed to an unsecured creditor that in the event of a liquidation can only be paid after the claims of secured and senior creditors have been met.">
+
+enum DebtInterestEnum: <"Represents an enumeration list that specifies the general rule for periodic interest rate payment.">
+	Fixed <"Denotes payment calculated with reference to a fixed interest rate.">
+	Floating <"Denotes payment calculated with reference to a floating interest rate.">
+	InflationLinked <"Denotes payment calculated with reference to one or more specified inflation rates.">
+	IndexLinked <"Denotes payment calculated with reference to one or more price or other indices (other than inflation rates).">
+    InterestOnly <"Denotes a stripped bond representing only the interest component.">	
+	OtherStructured  <"Denotes payment calculated with reference to other underlyings (not being floating interest rates, inflation rates or indices) or with a non-linear relationship to floating interest rates, inflation rates or indices.">
+	InverseFloating <"Denotes payment calculated with reference to the inverse of a floating interest rate.">
+    ZeroCoupon <"Denotes a zero coupon bond that does not pay intetrest.">
+
+enum DebtPrincipalEnum: <"Represents an enumeration list that specifies the general rule for repayment of principal.">
+	Bullet <"Denotes that the principal is paid all at once on maturity of the debt insrument. Bullet debt instruments cannot be redeemed early by an issuer, which means they are non-callable.">
+	Callable <"Denotes that the principal on the debt can be repaid early, in whole or in part, at the option of the issuer.">
+	Puttable <"Denotes that the principal on the debt can be repaid early, in whole or in part, at the option of the holder.">
+	Amortising <"Denotes that the principal on the debt is paid down regularly, along with its interest expense over the life of the debt instrument.  Includes amortising instruments with a bullet balance repayment at maturity.">
+	InflationLinked <"Denotes that the principal on the debt is calculated with reference to one or more specified inflation rates.">
+	IndexLinked <"Denotes that the  principal on the debt is calculated with reference to one or more price or other indices (other than inflation rates).">
+	OtherStructured <"Denotes that the  principal on the debt is calculated with reference to other underlyings (not being floating interest rates, inflation rates or indices) or with a non-linear relationship to floating interest rates, inflation rates or indices.">
+	PrincipalOnly <"Denotes a stripped bond representing only the principal component.">
+
+enum AssetTypeEnum: <"Represents an enumeration list to identify the asset type.">
+	Security <"Indentifies negotiable financial instrument of monetary value with an issue ownership position.">
+	Cash <"Indentifies cash in a currency form.">
+	Commodity <"Indentifies basic good used in commerce that is interchangeable with other goods of the same type.">
+	Other <"Indentifies other asset types.">
+
+enum MoneyMarketTypeEnum:
+	CommercialPaper
+	CertificateOfDeposit
+
+enum DeliveryNearbyTypeEnum:
+	CalculationPeriod <"Describes the reference contract as the one that pertains to the month-year of the calculation period. If used, the nearby count is expected to be 0.">
+	NearbyMonth <"Specifies that the reference delivery date of the underlying Commodity shall be the expiration date of the futures contract in the nth nearby month.">
+	NearbyWeek <"Specifies that the reference delivery date of the underlying Commodity shall be the expiration date of the futures contract in the nth nearby week.">
+
+enum CommodityInformationPublisherEnum: <"Defines a publication in which the price can be found. (e.g Gas Daily, Platts Bloomberg.">
+	Argus
+	ArgusMcCloskeys
+	ArgusAmericasCrudeReport
+	ArgusBiofuelReport
+	ArgusCrudeReport
+	ArgusEuropeanProductsReport
+	ArgusFMB
+	ArgusInternationalLPGReport
+	ArgusLPG
+	ArgusNatGas
+	AssocBanksSingapore
+	BandD
+	BalticExchange
+	BankOfCanada
+	BankOfEngland
+	BankOfJapan
+	Bloomberg
+	BLUENEXT
+	CAISO
+	CanadianGasPriceReporter
+	CanadianGasReporter
+	ChemicalMarketsAssociation
+	CMAIAromaticsMarketReport
+	CMAIWeeklyMethanolMarketReport
+	CRUSteelLongProductMonitor
+	CRUSteelSheetProductsMonitor
+	DowJonesEnergyService
+	DowJonesEnergyServiceScreen
+	DowJonesNatGas
+	EEX
+	ERCOT
+	EuroCentralBank
+	EURONEXMATIF
+	FederalReserve
+	FERTECON
+	FertilizerWeek
+	FHLBSF
+	GasDaily
+	GasDailyPriceGuide
+	GlobalCoale
+	GME
+	HerenReport
+	ICE
+	ICE10XDailyNaturalGas
+	ICE10XDailyPower
+	ICE10XMonthly
+	ICEDayAheadIndex
+	ICEECX
+	ICIS
+	InsideFERC
+	IPE
+	ISDA
+	ISONewEngland
+	JAPANMOFTSRR
+	LEBA
+	LondonBullionMarketAssociation
+	LONDONPLATINUMPALLADIUMMARKET
+	MegawattDaily
+	MetalBulletin
+	MISO
+	NaturalGasWeek
+	NGIBidweekSurvey
+	NYISO
+	OBM
+	OMEL
+	OPIS
+	PaperTrader
+	PIX
+	PJM
+	PlattsAsiaPacific
+	PlattsAsiaPacificArabMarketscan
+	PlattsCleanTankerwire
+	PlattsCoalTrader
+	PlattsCrudeOilMarketwire
+	PlattsDirtyTakerwire
+	PlattsENGR
+	PlattsEuropean
+	PlattsEuropeanMarketscan
+	PlattsGasDaily
+	PlattsGasDailyPriceGuide
+	PlattsInsideFERC
+	PlattsLPG
+	PlattsMarketwire
+	PlattsMegawattDaily
+	PlattsMetalsAlert
+	PlattsOilgram
+	PlattsOilgramBunkerwire
+	PlattsPolymerscan
+	PlattsTSIIronOre
+	TSIScrap
+	TSISteel
+	PlattsUS
+	PlattsUSMarketscan
+	PPM
+	PPMEurope
+	PPW
+	ReserveBankAustralia
+	ReserveBankNewZealand
+	Reuters
+	ReutersScreen
+	RIMIntelligenceProducts
+	SeaPac
+	Telerate
+	TelerateScreen
+	UXWEEKLY
+	WorldCrudeReport
+	WorldPulpMonthly
+
+enum EU_EMIR_EligibleCollateralEnum: <"Identifies European Union Eligible Collateral Assets classification categories based on EMIR Uncleared Margin Rules. Eligible Collateral asset classes for both initial margin (IM) and variation margin (VM) posted and collected between specified entities. Please note: EMIR regulation will detail which eligible collateral assets classes apply to each type of entity pairing (counterparty) and which apply to posting of IM and VM.">
+	EU_EMIRTypeA <"Denotes Cash in the form of money credited to an account in any currency, or similar claims for the repayment of money, such as money market deposits.">
+	EU_EMIRTypeB <" Denotes gold in the form of allocated pure gold bullion of recognised good delivery.">
+	EU_EMIRTypeC <" Denotes debt securities issued by Member States' central governments or central banks.">
+	EU_EMIRTypeD <" Denotes debt securities issued by Member States' regional governments or local authorities whose exposures are treated as exposures to the central government of that Member State in accordance with Article 115(2) of Regulation (EU) No 575/2013.">
+	EU_EMIRTypeE <" Denotes debt securities issued by Member States' public sector entities whose exposures are treated as exposures to the central government, regional government or local authority of that Member State in accordance with Article 116(4) of Regulation (EU) No 575/2013.">
+	EU_EMIRTypeF <" Denotes debt securities issued by Member States' regional governments or local authorities other than those referred to in (TypeD.)">
+	EU_EMIRTypeG <" Denotes debt securities issued by Member States' public sector entities other than those referred to in (TypeE).">
+	EU_EMIRTypeH <" Denotes debt securities issued by multilateral development banks listed in Article 117(2) of Regulation (EU) No 575/2013.">
+	EU_EMIRTypeI <" Denotes debt securities issued by the international organisations listed in Article 118 of Regulation (EU) No 575/2013.">
+	EU_EMIRTypeJ <" Denotes debt securities issued by third countries' governments or central banks.">
+	EU_EMIRTypeK <" Denotes debt securities issued by third countries' regional governments or local authorities that meet the requirements of (TypeD) and (TypeE).">
+	EU_EMIRTypeL <" Denotes debt securities issued by third countries' regional governments or local authorities other than those referred to in (TypeD) and (TypeE).">
+	EU_EMIRTypeM <" Denotes debt securities issued by credit institutions or investment firms including bonds referred to in Article 52(4) of Directive 2009/65/EC of the European Parliament and of the Council.">
+	EU_EMIRTypeN <" Denotes corporate bonds.">
+	EU_EMIRTypeO <" Denotes the most senior tranche of a securitisation, as defined in Article 4(61) of Regulation (EU) No 575/2013, that is not a re-securitisation as defined in Article 4(63) of that Regulation.">
+	EU_EMIRTypeP <" Denotes convertible bonds provided that they can be converted only into equities which are included in an index specified pursuant to point (a) of Article 197 (8) of Regulation (EU) No 575/2013.">
+	EU_EMIRTypeQ <" Denotes equities included in an index specified pursuant to point (a) of Article 197(8) of Regulation (EU) No 575/2013.">
+	EU_EMIRTypeR <" Denotes shares or units in undertakings for collective investments in transferable securities (UCITS), provided that the conditions set out in Article 5 of EU Regulation 2016/2251 are met.">
+
+enum UK_EMIR_EligibleCollateralEnum: <"Identifies United Kingdom Eligible Collateral Assets classification categories based on UK Onshored EMIR Uncleared Margin Rules. Eligible Collateral asset classes for both initial margin (IM) and variation margin (VM) posted and collected between specified entities. Please note: UK EMIR regulation will detail which eligible collateral assets classes apply to each type of entity pairing (counterparty) and which apply to posting of IM and VM.">
+
+	UK_EMIRTypeA <"Denotes cash in the form of money credited to an account in any currency, or similar claims for the repayment of money, such as money market deposits.">
+	UK_EMIRTypeB <"Denotes gold in the form of allocated pure gold bullion of recognised good delivery.">
+	UK_EMIRTypeC <"Denotes debt securities issued by the central government of the United Kingdom or the Bank of England.">
+	UK_EMIRTypeD <"Denotes debt securities issued by United Kingdom regional governments or local authorities whose exposures are treated as exposures to the central government of the United Kingdom in accordance with Article 115(2) of Regulation (EU) No 575/2013.">
+	UK_EMIRTypeE <"Denotes debt securities issued by United Kingdom public sector entities whose exposures are treated as exposures to the central government, regional government or local authority of the United Kingdom in accordance with Article 116(4) of Regulation (EU) No 575/2013.">
+	UK_EMIRTypeF <"Denotes debt securities issued by United Kingdom regional governments or local authorities other than those referred to in (TypeD).">
+	UK_EMIRTypeG <"Denotes debt securities issued by United Kingdom public sector entities other than those referred to in (TypeE).">
+	UK_EMIRTypeH <"Denotes debt securities issued by multilateral development banks listed in Article 117(2) of Regulation (EU) No 575/2013.">
+	UK_EMIRTypeI <"Denotes debt securities issued by the international organisations listed in Article 118 of Regulation (EU) No 575/2013.">
+	UK_EMIRTypeJ <"Denotes debt securities issued by third countries' governments or central banks.">
+	UK_EMIRTypeK <"Denotes debt securities issued by third countries' regional governments or local authorities that meet the requirements of (TypeD) and (TypeE).">
+	UK_EMIRTypeL <"Denotes debt securities issued by third countries' regional governments or local authorities other than those referred to in (TypeD) and (TypeE).">
+	UK_EMIRTypeM <"Denotes debt securities issued by credit institutions or investment firms including bonds admitted to the register of regulated covered bonds maintained under Regulation 7(1)(b) of the Regulated Covered Bonds Regulations 2008 (SI 2008/346).">
+	UK_EMIRTypeN <"Denotes corporate bonds.">
+	UK_EMIRTypeO <"Denotes the most senior tranche of a securitisation, as defined in Article 4(61) of Regulation (EU) No 575/2013, that is not a re-securitisation as defined in Article 4(63) of that Regulation.">
+	UK_EMIRTypeP <"Denotes convertible bonds provided that they can be converted only into equities which are included in an index specified pursuant to point (a) of Article 197 (8) of Regulation (EU) No 575/2013.">
+	UK_EMIRTypeQ <"Denotes equities included in an index specified pursuant to point (a) of Article 197(8) of Regulation (EU) No 575/2013.">
+	UK_EMIRTypeR <"Denotes shares or units in undertakings for UK UCITS, provided that the conditions set out in Article 5 of EU Regulation 2016/2251 (as modified by the Technical Standards (European Market Infrastructure) (EU Exit) (No. 3) Instrument 2019) are met.">
+
+enum US_CFTC_PR_EligibleCollateralEnum: <"Identifies US Eligible Collateral Assets classification categories based on Uncleared Margin Rules published by the CFTC and the US Prudential Regulator. Note: While the same basic categories exist in the CFTC and US Prudential Regulators margin rules, the precise definitions or application of those rules could differ between the two rules.">
+
+	US_CFTC_PRType1 <"Denotes immediately available cash funds denominated in USD, a major currency, a currency of settlement for the uncleared swap.">
+	US_CFTC_PRType2 <"Denotes a security that is issued by, or unconditionally guaranteed as to the timely payment of principal and interest by, the U.S. Department of the Treasury.">
+	US_CFTC_PRType3 <"Denotes a security that is issued by, or unconditionally guaranteed as to the timely payment of principal and interest by, a U.S. government agency (other than the U.S. Department of Treasury) whose obligations are fully guaranteed by the full faith and credit of the United States government.">
+	US_CFTC_PRType4 <"Denotes a security that is issued by, or fully guaranteed as to the payment of principal and interest by, the European Central Bank or a sovereign entity that is assigned no higher than a 20 percent risk weight under the capital rules applicable to swap dealers subject to regulation by a prudential regulator.">
+	US_CFTC_PRType5A <"Denotes a publicly traded debt security issued by, or an asset-backed security fully guaranteed as to the timely payment of principal and interest by, a U.S. Government-sponsored enterprise that is operating with capital support or another form of direct financial assistance received from the U.S. government that enables the repayments of the U.S. Government-sponsored enterprise's eligible securities.">
+	US_CFTC_PRType5B <"Denotes a publicly traded debt security, but not an asset backed security, that is investment grade and issued by a U.S. Government-sponsored enterprise that is not operating with capital support or another form of direct financial assistance received from the U.S. government.">
+	US_CFTC_PRType6 <"Denotes a security that is issued by, or fully guaranteed as to the payment of principal and interest by, the Bank for International Settlements, the International Monetary Fund, or a multilateral development bank.">
+	US_CFTC_PRType7 <"Denotes publicly-traded debt, but not an asset backed security, that is investment grade and is not a debt security issued by a  U.S. Government-sponsored enterprise. This category excludes a security issued by a non-bank financial institution supervised by the board of governors of the Federal Reserve System under Title I of the Dodd-Frank Wall Street Reform and Consumer Protection Act. This category also excludes a security issued by any of the following entities, by a company that would be any of the following entities if it were the organized under the laws of the United States or any State, or in either case by an affiliate of such an entity: the party posting the collateral, a bank holding company, a savings and loan holding company, a U.S. intermediate holding company, a foreign bank, a depositary institution, a securities holding company, a broker, a dealer, a futures commission merchant, a swap dealer, or a security-based swap dealer.">
+	US_CFTC_PRType8A <"Denotes a publicly traded common equity security that is included in the Standard & Poor's Composite 500 Index or related indexes. This category excludes a security issued by a non-bank financial institution supervised by the board of governors of the Federal Reserve System under Title I of the Dodd-Frank Wall Street Reform and Consumer Protection Act. This category also excludes a security issued by any of the following entities, by a company that would be any of the following entities if it were the organized under the laws of the United States or any State, or in either case by an affiliate of such an entity: the party posting the collateral, a bank holding company, a savings and loan holding company, a U.S. intermediate holding company, a foreign bank, a depositary institution, a securities holding company, a broker, a dealer, a futures commission merchant, a swap dealer, or a security-based swap dealer.">
+	US_CFTC_PRType8B <" Denotes a publicly traded common equity security that is included in the Standard & Poor's Composite 1500 Index or related indexes. This category excludes a security issued by a non-bank financial institution supervised by the board of governors of the Federal Reserve System under Title I of the Dodd-Frank Wall Street Reform and Consumer Protection Act. This category also excludes a security issued by any of the following entities, by a company that would be any of the following entities if it were the organized under the laws of the United States or any State, or in either case by an affiliate of such an entity: the party posting the collateral, a bank holding company, a savings and loan holding company, a U.S. intermediate holding company, a foreign bank, a depositary institution, a securities holding company, a broker, a dealer, a futures commission merchant, a swap dealer, or a security-based swap dealer.">
+	US_CFTC_PRType8C <"Denotes a publicly traded common equity security that is included in an index that a regulated swap entity's supervisor in a foreign jurisdiction recognizes for purposes of including publicly traded common equity as initial margin under applicable regulatory policy, if held in that foreign jurisdiction. This category excludes a security issued by a non-bank financial institution supervised by the board of governors of the Federal Reserve System under Title I of the Dodd-Frank Wall Street Reform and Consumer Protection Act. This category also excludes a security issued by any of the following entities, by a company that would be any of the following entities if it were the organized under the laws of the United States or any State, or in either case by an affiliate of such an entity: the party posting the collateral, a bank holding company, a savings and loan holding company, a U.S. intermediate holding company, a foreign bank, a depositary institution, a securities holding company, a broker, a dealer, a futures commission merchant, a swap dealer, or a security-based swap dealer.">
+	US_CFTC_PRType9<"Denotes securities in the form of redeemable securities in a pooled investment fund representing the security-holder's proportional interest in the fund's net assets and that are issued and redeemed only on the basis of the market value of the fund's net assets prepared each business day after the security-holder makes its investment commitment or redemption request to the fund, if the fund's investments are limited to the following: (A) securities that are issued by, or unconditionally guaranteed as to the timely payment of principal and interest by, the U.S. Department of the Treasury, and immediately-available cash funds denominated in U.S. dollars; or (B) securities denominated in a common currency and issued by, or fully guaranteed as to the payment of principal and interest by, the European Central Bank or a sovereign entity that is assigned no higher than a 20 percent risk weight under the capital rules applicable to swap dealers subject to regulation by a prudential regulator, and immediately-available cash funds denominated in the same currency; and (C) assets of the fund may not be transferred through securities lending, securities borrowing, repurchase agreements, reverse repurchase agreements, or other means that involve the fund having rights to acquire the same or similar assets from the transferee.">
+	US_CTFC_PRType10 <"Denotes Gold.">
diff --git a/rosetta-source/src/main/resources/base-staticdata-asset-rates-enum.rosetta b/rosetta-source/src/main/resources/base-staticdata-asset-rates-enum.rosetta
new file mode 100644
index 0000000000..0b6aaa0129
--- /dev/null
+++ b/rosetta-source/src/main/resources/base-staticdata-asset-rates-enum.rosetta
@@ -0,0 +1,729 @@
+namespace cdm.base.staticdata.asset.rates
+version "${project.version}"
+
+import cdm.base.*
+
+enum FloatingRateIndexEnum: <"The enumerated values to specify the list of floating rate index.">
+    [docReference ISDA FpML_Coding_Scheme schemeLocation "http://www.fpml.org/coding-scheme/floating-rate-index"]
+
+	AED_EBOR_Reuters displayName "AED-EBOR-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	AED_EIBOR displayName "AED-EIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	AUD_AONIA displayName "AUD-AONIA" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	AUD_AONIA_OIS_Compound_1 displayName "AUD-AONIA-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	AUD_AONIA_OIS_COMPOUND displayName "AUD-AONIA-OIS-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	AUD_AONIA_OIS_COMPOUND_SwapMarker displayName "AUD-AONIA-OIS-COMPOUND-SwapMarker" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	AUD_BBR_AUBBSW displayName "AUD-BBR-AUBBSW" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	AUD_BBR_BBSW displayName "AUD-BBR-BBSW" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	AUD_BBR_BBSW_Bloomberg displayName "AUD-BBR-BBSW-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	AUD_BBR_BBSY__BID_ displayName "AUD-BBR-BBSY (BID)" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	AUD_BBR_ISDC displayName "AUD-BBR-ISDC" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	AUD_BBSW displayName "AUD-BBSW" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	AUD_BBSW_Quarterly_Swap_Rate_ICAP displayName "AUD-BBSW Quarterly Swap Rate ICAP" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	AUD_BBSW_Semi_Annual_Swap_Rate_ICAP displayName "AUD-BBSW Semi Annual Swap Rate ICAP" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	AUD_BBSY_Bid displayName "AUD-BBSY Bid" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	AUD_LIBOR_BBA displayName "AUD-LIBOR-BBA" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	AUD_LIBOR_BBA_Bloomberg displayName "AUD-LIBOR-BBA-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	AUD_LIBOR_Reference_Banks displayName "AUD-LIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	AUD_Quarterly_Swap_Rate_ICAP displayName "AUD-Quarterly Swap Rate-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	AUD_Quarterly_Swap_Rate_ICAP_Reference_Banks displayName "AUD-Quarterly Swap Rate-ICAP-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	AUD_Semi_Annual_Swap_Rate_11_00_BGCANTOR displayName "AUD-Semi-Annual Swap Rate-11:00-BGCANTOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	AUD_Semi_Annual_Swap_Rate_BGCANTOR_Reference_Banks displayName "AUD-Semi-Annual Swap Rate-BGCANTOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	AUD_Semi_annual_Swap_Rate_ICAP displayName "AUD-Semi-annual Swap Rate-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	AUD_Semi_Annual_Swap_Rate_ICAP_Reference_Banks displayName "AUD-Semi-Annual Swap Rate-ICAP-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	AUD_Swap_Rate_Reuters displayName "AUD-Swap Rate-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	BRL_CDI displayName "BRL-CDI" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CAD_BA_CDOR displayName "CAD-BA-CDOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CAD_BA_CDOR_Bloomberg displayName "CAD-BA-CDOR-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CAD_BA_ISDD displayName "CAD-BA-ISDD" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CAD_BA_Reference_Banks displayName "CAD-BA-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CAD_BA_Reuters displayName "CAD-BA-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CAD_BA_Telerate displayName "CAD-BA-Telerate" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CAD_CDOR displayName "CAD-CDOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CAD_CORRA displayName "CAD-CORRA" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CAD_CORRA_OIS_Compound_1 displayName "CAD-CORRA-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CAD_CORRA_OIS_COMPOUND displayName "CAD-CORRA-OIS-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CAD_ISDA_Swap_Rate displayName "CAD-ISDA-Swap Rate" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CAD_LIBOR_BBA displayName "CAD-LIBOR-BBA" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CAD_LIBOR_BBA_Bloomberg displayName "CAD-LIBOR-BBA-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CAD_LIBOR_BBA_SwapMarker displayName "CAD-LIBOR-BBA-SwapMarker" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CAD_LIBOR_Reference_Banks displayName "CAD-LIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CAD_REPO_CORRA displayName "CAD-REPO-CORRA" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CAD_TBILL_ISDD displayName "CAD-TBILL-ISDD" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CAD_TBILL_Reference_Banks displayName "CAD-TBILL-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CAD_TBILL_Reuters displayName "CAD-TBILL-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CAD_TBILL_Telerate displayName "CAD-TBILL-Telerate" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CHF_3M_LIBOR_SWAP_CME_vs_LCH_ICAP displayName "CHF-3M LIBOR SWAP-CME vs LCH-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CHF_3M_LIBOR_SWAP_CME_vs_LCH_ICAP_Bloomberg displayName "CHF-3M LIBOR SWAP-CME vs LCH-ICAP-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CHF_3M_LIBOR_SWAP_EUREX_vs_LCH_ICAP displayName "CHF-3M LIBOR SWAP-EUREX vs LCH-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CHF_3M_LIBOR_SWAP_EUREX_vs_LCH_ICAP_Bloomberg displayName "CHF-3M LIBOR SWAP-EUREX vs LCH-ICAP-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CHF_6M_LIBOR_SWAP_CME_vs_LCH_ICAP displayName "CHF-6M LIBOR SWAP-CME vs LCH-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CHF_6M_LIBORSWAP_CME_vs_LCH_ICAP_Bloomberg displayName "CHF-6M LIBORSWAP-CME vs LCH-ICAP-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CHF_6M_LIBOR_SWAP_EUREX_vs_LCH_ICAP displayName "CHF-6M LIBOR SWAP-EUREX vs LCH-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CHF_6M_LIBOR_SWAP_EUREX_vs_LCH_ICAP_Bloomberg displayName "CHF-6M LIBOR SWAP-EUREX vs LCH-ICAP-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CHF_Annual_Swap_Rate displayName "CHF-Annual Swap Rate" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CHF_Annual_Swap_Rate_11_00_ICAP displayName "CHF-Annual Swap Rate-11:00-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CHF_Annual_Swap_Rate_Reference_Banks displayName "CHF-Annual Swap Rate-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CHF_Basis_Swap_3m_vs_6m_LIBOR_11_00_ICAP displayName "CHF-Basis Swap-3m vs 6m-LIBOR-11:00-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CHF_ISDAFIX_Swap_Rate displayName "CHF-ISDAFIX-Swap Rate" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CHF_LIBOR displayName "CHF-LIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CHF_LIBOR_BBA displayName "CHF-LIBOR-BBA" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CHF_LIBOR_BBA_Bloomberg displayName "CHF-LIBOR-BBA-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CHF_LIBOR_ISDA displayName "CHF-LIBOR-ISDA" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CHF_LIBOR_Reference_Banks displayName "CHF-LIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CHF_OIS_11_00_ICAP displayName "CHF-OIS-11:00-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CHF_SARON displayName "CHF-SARON" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CHF_SARON_Average_12M displayName "CHF-SARON Average 12M" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CHF_SARON_Average_1M displayName "CHF-SARON Average 1M" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CHF_SARON_Average_1W displayName "CHF-SARON Average 1W" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CHF_SARON_Average_2M displayName "CHF-SARON Average 2M" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CHF_SARON_Average_3M displayName "CHF-SARON Average 3M" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CHF_SARON_Average_6M displayName "CHF-SARON Average 6M" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CHF_SARON_Average_9M displayName "CHF-SARON Average 9M" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CHF_SARON_Compounded_Index displayName "CHF-SARON Compounded Index" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CHF_SARON_OIS_Compound_1 displayName "CHF-SARON-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CHF_SARON_OIS_COMPOUND displayName "CHF-SARON-OIS-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CHF_TOIS_OIS_COMPOUND displayName "CHF-TOIS-OIS-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CHF_USD_Basis_Swaps_11_00_ICAP displayName "CHF USD-Basis Swaps-11:00-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CL_CLICP_Bloomberg displayName "CL-CLICP-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CLP_ICP displayName "CLP-ICP" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CLP_TNA displayName "CLP-TNA" <"Refers to the Indice Camara Promedio ('ICP') rate for Chilean Pesos which, for a Reset Date, is determined and published by the Asociacion de Bancos e Instituciones Financieras de Chile A.G. ('ABIF') in accordance with the 'Reglamento Indice de Camara Promedio' of the ABIF as published in the Diario Oficial de la Republica de Chile (the 'ICP Rules') and which is reported on the ABIF website by not later than 10:00 a.m., Santiago time, on that Reset Date.">
+	CNH_HIBOR displayName "CNH-HIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CNH_HIBOR_Reference_Banks displayName "CNH-HIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CNH_HIBOR_TMA displayName "CNH-HIBOR-TMA" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CNY_7_Repo_Compounding_Date displayName "CNY 7-Repo Compounding Date" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CNY_CNREPOFIX_CFXS_Reuters displayName "CNY-CNREPOFIX=CFXS-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CNY_Deposit_Rate displayName "CNY-Deposit Rate" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CNY_Fixing_Repo_Rate displayName "CNY-Fixing Repo Rate" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CNY_LPR displayName "CNY-LPR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CNY_PBOCB_Reuters displayName "CNY-PBOCB-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CNY_Quarterly_7_day_Repo_Non_Deliverable_Swap_Rate_TRADITION displayName "CNY-Quarterly 7 day Repo Non Deliverable Swap Rate-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CNY_Quarterly_7_day_Repo_Non_Deliverable_Swap_Rate_TRADITION_Reference_Banks displayName "CNY-Quarterly 7 day Repo Non Deliverable Swap Rate-TRADITION-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CNY_Quarterly_7D_Repo_NDS_Rate_Tradition displayName "CNY-Quarterly 7D Repo NDS Rate Tradition" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CNY_Semi_Annual_Swap_Rate_11_00_BGCANTOR displayName "CNY-Semi-Annual Swap Rate-11:00-BGCANTOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CNY_Semi_Annual_Swap_Rate_Reference_Banks displayName "CNY-Semi-Annual Swap Rate-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CNY_SHIBOR displayName "CNY-SHIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CNY_SHIBOR_OIS_Compound displayName "CNY-SHIBOR-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CNY_Shibor_OIS_Compounding displayName "CNY-Shibor-OIS-Compounding" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CNY_SHIBOR_Reuters displayName "CNY-SHIBOR-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction..">
+	COP_IBR_OIS_Compound_1 displayName "COP-IBR-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	COP_IBR_OIS_COMPOUND displayName "COP-IBR-OIS-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CZK_Annual_Swap_Rate_11_00_BGCANTOR displayName "CZK-Annual Swap Rate-11:00-BGCANTOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CZK_Annual_Swap_Rate_Reference_Banks displayName "CZK-Annual Swap Rate-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CZK_CZEONIA displayName "CZK-CZEONIA" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CZK_CZEONIA_OIS_Compound displayName "CZK-CZEONIA-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CZK_PRIBOR displayName "CZK-PRIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	CZK_PRIBOR_PRBO displayName "CZK-PRIBOR-PRBO" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	CZK_PRIBOR_Reference_Banks displayName "CZK-PRIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	DKK_CIBOR displayName "DKK-CIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	DKK_CIBOR2 displayName "DKK-CIBOR2" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	DKK_CIBOR2_Bloomberg displayName "DKK-CIBOR2-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	DKK_CIBOR2_DKNA13 displayName "DKK-CIBOR2-DKNA13" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	DKK_CIBOR_DKNA13 displayName "DKK-CIBOR-DKNA13" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	DKK_CIBOR_DKNA13_Bloomberg displayName "DKK-CIBOR-DKNA13-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	DKK_CIBOR_Reference_Banks displayName "DKK-CIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	DKK_CITA displayName "DKK-CITA" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	DKK_CITA_DKNA14_COMPOUND displayName "DKK-CITA-DKNA14-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	DKK_DESTR displayName "DKK-DESTR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	DKK_DESTR_Compounded_Index displayName "DKK-DESTR Compounded Index" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	DKK_DESTR_OIS_Compound displayName "DKK-DESTR-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	DKK_DKKOIS_OIS_COMPOUND displayName "DKK-DKKOIS-OIS-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	DKK_Tom_Next_OIS_Compound displayName "DKK-Tom Next-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	EUR_3M_EURIBOR_SWAP_CME_vs_LCH_ICAP displayName "EUR-3M EURIBOR SWAP-CME vs LCH-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_3M_EURIBOR_SWAP_CME_vs_LCH_ICAP_Bloomberg displayName "EUR-3M EURIBOR SWAP-CME vs LCH-ICAP-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_3M_EURIBOR_SWAP_EUREX_vs_LCH_ICAP displayName "EUR-3M EURIBOR SWAP-EUREX vs LCH-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_3M_EURIBOR_SWAP_EUREX_vs_LCH_ICAP_Bloomberg displayName "EUR-3M EURIBOR SWAP-EUREX vs LCH-ICAP-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_6M_EURIBOR_SWAP_CME_vs_LCH_ICAP displayName "EUR-6M EURIBOR SWAP-CME vs LCH-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_6M_EURIBOR_SWAP_CME_vs_LCH_ICAP_Bloomberg displayName "EUR-6M EURIBOR SWAP-CME vs LCH-ICAP-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_6M_EURIBOR_SWAP_EUREX_vs_LCH_ICAP displayName "EUR-6M EURIBOR SWAP-EUREX vs LCH-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_6M_EURIBOR_SWAP_EUREX_vs_LCH_ICAP_Bloomberg displayName "EUR-6M EURIBOR SWAP-EUREX vs LCH-ICAP-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_Annual_Swap_Rate_10_00 displayName "EUR-Annual Swap Rate-10:00" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_Annual_Swap_Rate_10_00_BGCANTOR displayName "EUR-Annual Swap Rate-10:00-BGCANTOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_Annual_Swap_Rate_10_00_Bloomberg displayName "EUR-Annual Swap Rate-10:00-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_Annual_Swap_Rate_10_00_ICAP displayName "EUR-Annual Swap Rate-10:00-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_Annual_Swap_Rate_10_00_SwapMarker displayName "EUR-Annual Swap Rate-10:00-SwapMarker" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_Annual_Swap_Rate_10_00_TRADITION displayName "EUR-Annual Swap Rate-10:00-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_Annual_Swap_Rate_11_00 displayName "EUR-Annual Swap Rate-11:00" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_Annual_Swap_Rate_11_00_Bloomberg displayName "EUR-Annual Swap Rate-11:00-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_Annual_Swap_Rate_11_00_ICAP displayName "EUR-Annual Swap Rate-11:00-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_Annual_Swap_Rate_11_00_SwapMarker displayName "EUR-Annual Swap Rate-11:00-SwapMarker" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_Annual_Swap_Rate_3_Month displayName "EUR-Annual Swap Rate-3 Month" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_Annual_Swap_Rate_3_Month_SwapMarker displayName "EUR-Annual Swap Rate-3 Month-SwapMarker" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_Annual_Swap_Rate_4_15_TRADITION displayName "EUR-Annual Swap Rate-4:15-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_Annual_Swap_Rate_Reference_Banks displayName "EUR-Annual Swap Rate-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_Basis_Swap_EONIA_vs_3m_EUR_IBOR_Swap_Rates_A_360_10_00_ICAP displayName "EUR Basis Swap-EONIA vs 3m EUR+IBOR Swap Rates-A/360-10:00-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_CNO_TEC10 displayName "EUR-CNO TEC10" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	EUR_EONIA displayName "EUR-EONIA" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	EUR_EONIA_AVERAGE_1 displayName "EUR-EONIA-AVERAGE" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EONIA_Average displayName "EUR-EONIA-Average" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	EUR_EONIA_OIS_10_00_BGCANTOR displayName "EUR-EONIA-OIS-10:00-BGCANTOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EONIA_OIS_10_00_ICAP displayName "EUR-EONIA-OIS-10:00-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EONIA_OIS_10_00_TRADITION displayName "EUR-EONIA-OIS-10:00-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EONIA_OIS_11_00_ICAP displayName "EUR-EONIA-OIS-11:00-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EONIA_OIS_4_15_TRADITION displayName "EUR-EONIA-OIS-4:15-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EONIA_OIS_Compound_1 displayName "EUR-EONIA-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	EUR_EONIA_OIS_COMPOUND displayName "EUR-EONIA-OIS-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EONIA_OIS_COMPOUND_Bloomberg displayName "EUR-EONIA-OIS-COMPOUND-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EONIA_Swap_Index displayName "EUR-EONIA-Swap-Index" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EURIBOR displayName "EUR-EURIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	EUR_EURIBOR_Act_365 displayName "EUR-EURIBOR-Act/365" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EURIBOR_Act_365_Bloomberg displayName "EUR-EURIBOR-Act/365-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EURIBOR_Annual_Bond_Swap_vs_1m_11_00_ICAP displayName "EUR EURIBOR-Annual Bond Swap vs 1m-11:00-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EURIBOR_Basis_Swap_1m_vs_3m_Euribor_11_00_ICAP displayName "EUR EURIBOR-Basis Swap-1m vs 3m-Euribor-11:00-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EURIBOR_Basis_Swap_3m_vs_6m_11_00_ICAP displayName "EUR EURIBOR-Basis Swap-3m vs 6m-11:00-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EURIBOR_ICE_Swap_Rate_11_00 displayName "EUR-EURIBOR ICE Swap Rate-11:00" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	EUR_EURIBOR_ICE_Swap_Rate_12_00 displayName "EUR-EURIBOR ICE Swap Rate-12:00" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	EUR_EURIBOR_Reference_Banks displayName "EUR-EURIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EURIBOR_Reuters displayName "EUR-EURIBOR-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EURIBOR_Telerate displayName "EUR-EURIBOR-Telerate" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EURONIA_OIS_Compound_1 displayName "EUR-EURONIA-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	EUR_EURONIA_OIS_COMPOUND displayName "EUR-EURONIA-OIS-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EuroSTR displayName "EUR-EuroSTR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EuroSTR_Average_12M displayName "EUR-EuroSTR Average 12M" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EuroSTR_Average_1M displayName "EUR-EuroSTR Average 1M" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EuroSTR_Average_1W displayName "EUR-EuroSTR Average 1W" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EuroSTR_Average_3M displayName "EUR-EuroSTR Average 3M" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EuroSTR_Average_6M displayName "EUR-EuroSTR Average 6M" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EuroSTR_COMPOUND displayName "EUR-EuroSTR-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EuroSTR_Compounded_Index displayName "EUR-EuroSTR Compounded Index" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EuroSTR_ICE_Compounded_Index displayName "EUR-EuroSTR ICE Compounded Index" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EuroSTR_ICE_Compounded_Index_0_Floor displayName "EUR-EuroSTR ICE Compounded Index 0 Floor" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EuroSTR_ICE_Compounded_Index_0_Floor_2D_Lag displayName "EUR-EuroSTR ICE Compounded Index 0 Floor 2D Lag" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EuroSTR_ICE_Compounded_Index_0_Floor_5D_Lag displayName "EUR-EuroSTR ICE Compounded Index 0 Floor 5D Lag" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EuroSTR_ICE_Compounded_Index_2D_Lag displayName "EUR-EuroSTR ICE Compounded Index 2D Lag" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EuroSTR_ICE_Compounded_Index_5D_Lag displayName "EUR-EuroSTR ICE Compounded Index 5D Lag" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_EuroSTR_OIS_Compound displayName "EUR-EuroSTR-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	EUR_EuroSTR_Term displayName "EUR-EuroSTR Term" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	EUR_ISDA_EURIBOR_Swap_Rate_11_00 displayName "EUR-ISDA-EURIBOR Swap Rate-11:00" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_ISDA_EURIBOR_Swap_Rate_12_00 displayName "EUR-ISDA-EURIBOR Swap Rate-12:00" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_ISDA_LIBOR_Swap_Rate_10_00 displayName "EUR-ISDA-LIBOR Swap Rate-10:00" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_ISDA_LIBOR_Swap_Rate_11_00 displayName "EUR-ISDA-LIBOR Swap Rate-11:00" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_LIBOR displayName "EUR-LIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	EUR_LIBOR_BBA displayName "EUR-LIBOR-BBA" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_LIBOR_BBA_Bloomberg displayName "EUR-LIBOR-BBA-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_LIBOR_Reference_Banks displayName "EUR-LIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_TAM_CDC displayName "EUR-TAM-CDC" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_TEC10_CNO displayName "EUR-TEC10-CNO" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_TEC10_CNO_SwapMarker displayName "EUR-TEC10-CNO-SwapMarker" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_TEC10_Reference_Banks displayName "EUR-TEC10-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_TEC5_CNO displayName "EUR-TEC5-CNO" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_TEC5_CNO_SwapMarker displayName "EUR-TEC5-CNO-SwapMarker" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_TEC5_Reference_Banks displayName "EUR-TEC5-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_TMM_CDC_COMPOUND displayName "EUR-TMM-CDC-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	EUR_USD_Basis_Swaps_11_00_ICAP displayName "EUR USD-Basis Swaps-11:00-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_6M_LIBOR_SWAP_CME_vs_LCH_ICAP displayName "GBP-6M LIBOR SWAP-CME vs LCH-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_6M_LIBOR_SWAP_CME_vs_LCH_ICAP_Bloomberg displayName "GBP-6M LIBOR SWAP-CME vs LCH-ICAP-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_6M_LIBOR_SWAP_EUREX_vs_LCH_ICAP displayName "GBP-6M LIBOR SWAP-EUREX vs LCH-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_6M_LIBOR_SWAP_EUREX_vs_LCH_ICAP_Bloomberg displayName "GBP-6M LIBOR SWAP-EUREX vs LCH-ICAP-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_ISDA_Swap_Rate displayName "GBP-ISDA-Swap Rate" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_LIBOR displayName "GBP-LIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	GBP_LIBOR_BBA displayName "GBP-LIBOR-BBA" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_LIBOR_BBA_Bloomberg displayName "GBP-LIBOR-BBA-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_LIBOR_ICE_Swap_Rate displayName "GBP-LIBOR ICE Swap Rate" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	GBP_LIBOR_ISDA displayName "GBP-LIBOR-ISDA" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_LIBOR_Reference_Banks displayName "GBP-LIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_RONIA displayName "GBP-RONIA" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	GBP_RONIA_OIS_Compound displayName "GBP-RONIA-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	GBP_Semi_Annual_Swap_Rate displayName "GBP-Semi-Annual Swap Rate" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_Semi_Annual_Swap_Rate_11_00_ICAP displayName "GBP-Semi-Annual Swap Rate-11:00-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_Semi_Annual_Swap_Rate_11_00_TRADITION displayName "GBP-Semi Annual Swap Rate-11:00-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_Semi_Annual_Swap_Rate_4_15_TRADITION displayName "GBP-Semi Annual Swap Rate-4:15-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_Semi_Annual_Swap_Rate_Reference_Banks displayName "GBP-Semi-Annual Swap Rate-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_Semi_Annual_Swap_Rate_SwapMarker26 displayName "GBP-Semi-Annual Swap Rate-SwapMarker26" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_SONIA displayName "GBP-SONIA" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_SONIA_COMPOUND displayName "GBP-SONIA-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_SONIA_Compounded_Index displayName "GBP-SONIA Compounded Index" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_SONIA_ICE_Compounded_Index displayName "GBP-SONIA ICE Compounded Index" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_SONIA_ICE_Compounded_Index_0_Floor displayName "GBP-SONIA ICE Compounded Index 0 Floor" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_SONIA_ICE_Compounded_Index_0_Floor_2D_Lag displayName "GBP-SONIA ICE Compounded Index 0 Floor 2D Lag" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_SONIA_ICE_Compounded_Index_0_Floor_5D_Lag displayName "GBP-SONIA ICE Compounded Index 0 Floor 5D Lag" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_SONIA_ICE_Compounded_Index_2D_Lag displayName "GBP-SONIA ICE Compounded Index 2D Lag" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_SONIA_ICE_Compounded_Index_5D_Lag displayName "GBP-SONIA ICE Compounded Index 5D Lag" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_SONIA_ICE_Swap_Rate displayName "GBP-SONIA ICE Swap Rate" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	GBP_SONIA_ICE_Term displayName "GBP-SONIA ICE Term" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_SONIA_OIS_11_00_ICAP displayName "GBP-SONIA-OIS-11:00-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_SONIA_OIS_11_00_TRADITION displayName "GBP-SONIA-OIS-11:00-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_SONIA_OIS_4_15_TRADITION displayName "GBP-SONIA-OIS-4:15-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_SONIA_OIS_Compound displayName "GBP-SONIA-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	GBP_SONIA_Refinitiv_Term displayName "GBP-SONIA Refinitiv Term" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_SONIA_Swap_Rate displayName "GBP-SONIA Swap Rate" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_UK_Base_Rate displayName "GBP-UK Base Rate" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	GBP_USD_Basis_Swaps_11_00_ICAP displayName "GBP USD-Basis Swaps-11:00-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_WMBA_RONIA_COMPOUND displayName "GBP-WMBA-RONIA-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GBP_WMBA_SONIA_COMPOUND displayName "GBP-WMBA-SONIA-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GRD_ATHIBOR_ATHIBOR displayName "GRD-ATHIBOR-ATHIBOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GRD_ATHIBOR_Reference_Banks displayName "GRD-ATHIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GRD_ATHIBOR_Telerate displayName "GRD-ATHIBOR-Telerate" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GRD_ATHIMID_Reference_Banks displayName "GRD-ATHIMID-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	GRD_ATHIMID_Reuters displayName "GRD-ATHIMID-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	HKD_HIBOR displayName "HKD-HIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	HKD_HIBOR_HIBOR_ displayName "HKD-HIBOR-HIBOR=" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	HKD_HIBOR_HIBOR_Bloomberg displayName "HKD-HIBOR-HIBOR-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	HKD_HIBOR_HKAB displayName "HKD-HIBOR-HKAB" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	HKD_HIBOR_HKAB_Bloomberg displayName "HKD-HIBOR-HKAB-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	HKD_HIBOR_ISDC displayName "HKD-HIBOR-ISDC" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	HKD_HIBOR_Reference_Banks displayName "HKD-HIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	HKD_HONIA displayName "HKD-HONIA" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	HKD_HONIA_OIS_Compound displayName "HKD-HONIA-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	HKD_HONIX_OIS_COMPOUND displayName "HKD-HONIX-OIS-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	HKD_ISDA_Swap_Rate_11_00 displayName "HKD-ISDA-Swap Rate-11:00" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	HKD_ISDA_Swap_Rate_4_00 displayName "HKD-ISDA-Swap Rate-4:00" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	HKD_Quarterly_Annual_Swap_Rate_11_00_BGCANTOR displayName "HKD-Quarterly-Annual Swap Rate-11:00-BGCANTOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	HKD_Quarterly_Annual_Swap_Rate_11_00_TRADITION displayName "HKD-Quarterly-Annual Swap Rate-11:00-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	HKD_Quarterly_Annual_Swap_Rate_4_00_BGCANTOR displayName "HKD-Quarterly-Annual Swap Rate-4:00-BGCANTOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	HKD_Quarterly_Annual_Swap_Rate_Reference_Banks displayName "HKD-Quarterly-Annual Swap Rate-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	HKD_Quarterly_Quarterly_Swap_Rate_11_00_ICAP displayName "HKD-Quarterly-Quarterly Swap Rate-11:00-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	HKD_Quarterly_Quarterly_Swap_Rate_4_00_ICAP displayName "HKD-Quarterly-Quarterly Swap Rate-4:00-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	HKD_Quarterly_Quarterly_Swap_Rate_Reference_Banks displayName "HKD-Quarterly-Quarterly Swap Rate-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	HUF_BUBOR displayName "HUF-BUBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	HUF_BUBOR_Reference_Banks displayName "HUF-BUBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	HUF_BUBOR_Reuters displayName "HUF-BUBOR-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	HUF_HUFONIA displayName "HUF-HUFONIA" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	HUF_HUFONIA_OIS_Compound displayName "HUF-HUFONIA-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	IDR_IDMA_Bloomberg displayName "IDR-IDMA-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	IDR_IDRFIX displayName "IDR-IDRFIX" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	IDR_JIBOR displayName "IDR-JIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	IDR_JIBOR_Reuters displayName "IDR-JIBOR-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	IDR_SBI_Reuters displayName "IDR-SBI-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	IDR_Semi_Annual_Swap_Rate_11_00_BGCANTOR displayName "IDR-Semi-Annual Swap Rate-11:00-BGCANTOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	IDR_Semi_Annual_Swap_Rate_Non_deliverable_16_00_Tullett_Prebon displayName "IDR-Semi Annual Swap Rate-Non-deliverable-16:00-Tullett Prebon" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	IDR_Semi_Annual_Swap_Rate_Reference_Banks displayName "IDR-Semi-Annual Swap Rate-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	IDR_SOR_Reference_Banks displayName "IDR-SOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	IDR_SOR_Reuters displayName "IDR-SOR-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	IDR_SOR_Telerate displayName "IDR-SOR-Telerate" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	ILS_SHIR displayName "ILS-SHIR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	ILS_SHIR_OIS_Compound displayName "ILS-SHIR-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	ILS_TELBOR displayName "ILS-TELBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	ILS_TELBOR01_Reuters displayName "ILS-TELBOR01-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	ILS_TELBOR_Reference_Banks displayName "ILS-TELBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	INR_BMK displayName "INR-BMK" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	INR_CMT displayName "INR-CMT" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	INR_FBIL_MIBOR_OIS_COMPOUND displayName "INR-FBIL-MIBOR-OIS-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	INR_INBMK_REUTERS displayName "INR-INBMK-REUTERS" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	INR_MIBOR_OIS displayName "INR-MIBOR OIS" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	INR_MIBOR_OIS_Compound_1 displayName "INR-MIBOR-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	INR_MIBOR_OIS_COMPOUND displayName "INR-MIBOR-OIS-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	INR_MIFOR displayName "INR-MIFOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	INR_MIOIS displayName "INR-MIOIS" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	INR_MITOR_OIS_COMPOUND displayName "INR-MITOR-OIS-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	INR_Modified_MIFOR displayName "INR-Modified MIFOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	INR_Reference_Banks displayName "INR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	INR_Semi_Annual_Swap_Rate_11_30_BGCANTOR displayName "INR-Semi-Annual Swap Rate-11:30-BGCANTOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	INR_Semi_Annual_Swap_Rate_Non_deliverable_16_00_Tullett_Prebon displayName "INR-Semi Annual Swap Rate-Non-deliverable-16:00-Tullett Prebon" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	INR_Semi_Annual_Swap_Rate_Reference_Banks displayName "INR-Semi-Annual Swap Rate-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	ISK_REIBOR displayName "ISK-REIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	ISK_REIBOR_Reference_Banks displayName "ISK-REIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	ISK_REIBOR_Reuters displayName "ISK-REIBOR-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_Annual_Swap_Rate_11_00_TRADITION displayName "JPY-Annual Swap Rate-11:00-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_Annual_Swap_Rate_3_00_TRADITION displayName "JPY-Annual Swap Rate-3:00-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_BBSF_Bloomberg_10_00 displayName "JPY-BBSF-Bloomberg-10:00" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_BBSF_Bloomberg_15_00 displayName "JPY-BBSF-Bloomberg-15:00" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_Euroyen_TIBOR displayName "JPY-Euroyen TIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	JPY_ISDA_Swap_Rate_10_00 displayName "JPY-ISDA-Swap Rate-10:00" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_ISDA_Swap_Rate_15_00 displayName "JPY-ISDA-Swap Rate-15:00" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_LIBOR displayName "JPY-LIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	JPY_LIBOR_BBA displayName "JPY-LIBOR-BBA" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_LIBOR_BBA_Bloomberg displayName "JPY-LIBOR-BBA-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_LIBOR_FRASETT displayName "JPY-LIBOR-FRASETT" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_LIBOR_ISDA displayName "JPY-LIBOR-ISDA" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_LIBOR_Reference_Banks displayName "JPY-LIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_LIBOR_TSR_10_00 displayName "JPY-LIBOR TSR-10:00" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	JPY_LIBOR_TSR_15_00 displayName "JPY-LIBOR TSR-15:00" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	JPY_LTPR_MHBK displayName "JPY-LTPR MHBK" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	JPY_LTPR_MHCB displayName "JPY-LTPR-MHCB" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_LTPR_TBC displayName "JPY-LTPR-TBC" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_MUTANCALL_TONAR displayName "JPY-MUTANCALL-TONAR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_OIS_11_00_ICAP displayName "JPY-OIS-11:00-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_OIS_11_00_TRADITION displayName "JPY-OIS-11:00-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_OIS_3_00_TRADITION displayName "JPY-OIS-3:00-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_Quoting_Banks_LIBOR displayName "JPY-Quoting Banks-LIBOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_STPR_Quoting_Banks displayName "JPY-STPR-Quoting Banks" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TIBOR displayName "JPY-TIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	JPY_TIBOR_17096 displayName "JPY-TIBOR-17096" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TIBOR_17097 displayName "JPY-TIBOR-17097" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TIBOR_DTIBOR01 displayName "JPY-TIBOR-DTIBOR01" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TIBOR_TIBM displayName "JPY-TIBOR-TIBM" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TIBOR_TIBM__10_Banks_ displayName "JPY-TIBOR-TIBM (10 Banks)" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TIBOR_TIBM__5_Banks_ displayName "JPY-TIBOR-TIBM (5 Banks)" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TIBOR_TIBM__All_Banks_ displayName "JPY-TIBOR-TIBM (All Banks)" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TIBOR_TIBM__All_Banks__Bloomberg displayName "JPY-TIBOR-TIBM (All Banks)-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TIBOR_TIBM_Reference_Banks displayName "JPY-TIBOR-TIBM-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TIBOR_ZTIBOR displayName "JPY-TIBOR-ZTIBOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TONA displayName "JPY-TONA" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TONA_Average_180D displayName "JPY-TONA Average 180D" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TONA_Average_30D displayName "JPY-TONA Average 30D" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TONA_Average_90D displayName "JPY-TONA Average 90D" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TONA_Compounded_Index displayName "JPY-TONA Compounded Index" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TONA_ICE_Compounded_Index displayName "JPY-TONA ICE Compounded Index" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TONA_ICE_Compounded_Index_0_Floor displayName "JPY-TONA ICE Compounded Index 0 Floor" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TONA_ICE_Compounded_Index_0_Floor_2D_Lag displayName "JPY-TONA ICE Compounded Index 0 Floor 2D Lag" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TONA_ICE_Compounded_Index_0_Floor_5D_Lag displayName "JPY-TONA ICE Compounded Index 0 Floor 5D Lag" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TONA_ICE_Compounded_Index_2D_Lag displayName "JPY-TONA ICE Compounded Index 2D Lag" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TONA_ICE_Compounded_Index_5D_Lag displayName "JPY-TONA ICE Compounded Index 5D Lag" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TONA_OIS_Compound_1 displayName "JPY-TONA-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	JPY_TONA_OIS_COMPOUND displayName "JPY-TONA-OIS-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TONA_TSR_10_00 displayName "JPY-TONA TSR-10:00" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TONA_TSR_15_00 displayName "JPY-TONA TSR-15:00" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TORF_QUICK displayName "JPY-TORF QUICK" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TSR_Reference_Banks displayName "JPY-TSR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TSR_Reuters_10_00 displayName "JPY-TSR-Reuters-10:00" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TSR_Reuters_15_00 displayName "JPY-TSR-Reuters-15:00" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TSR_Telerate_10_00 displayName "JPY-TSR-Telerate-10:00" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_TSR_Telerate_15_00 displayName "JPY-TSR-Telerate-15:00" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	JPY_USD_Basis_Swaps_11_00_ICAP displayName "JPY USD-Basis Swaps-11:00-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	KRW_Bond_3222 displayName "KRW-Bond-3222" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	KRW_CD_3220 displayName "KRW-CD-3220" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	KRW_CD_91D displayName "KRW-CD 91D" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	KRW_CD_KSDA_Bloomberg displayName "KRW-CD-KSDA-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	KRW_KOFR displayName "KRW-KOFR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	KRW_KOFR_OIS_Compound displayName "KRW-KOFR-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	KRW_Quarterly_Annual_Swap_Rate_3_30_ICAP displayName "KRW-Quarterly Annual Swap Rate-3:30-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	MXN_TIIE displayName "MXN-TIIE" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	MXN_TIIE_Banxico displayName "MXN-TIIE-Banxico" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	MXN_TIIE_Banxico_Bloomberg displayName "MXN-TIIE-Banxico-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	MXN_TIIE_Banxico_Reference_Banks displayName "MXN-TIIE-Banxico-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	MXN_TIIE_ON displayName "MXN-TIIE ON" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	MXN_TIIE_ON_OIS_Compound displayName "MXN-TIIE ON-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	MXN_TIIE_Reference_Banks displayName "MXN-TIIE-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	MYR_KLIBOR displayName "MYR-KLIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	MYR_KLIBOR_BNM displayName "MYR-KLIBOR-BNM" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	MYR_KLIBOR_Reference_Banks displayName "MYR-KLIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	MYR_MYOR displayName "MYR-MYOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	MYR_MYOR_OIS_Compound displayName "MYR-MYOR-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	MYR_Quarterly_Swap_Rate_11_00_TRADITION displayName "MYR-Quarterly Swap Rate-11:00-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	MYR_Quarterly_Swap_Rate_TRADITION_Reference_Banks displayName "MYR-Quarterly Swap Rate-TRADITION-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	NOK_NIBOR displayName "NOK-NIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	NOK_NIBOR_NIBR displayName "NOK-NIBOR-NIBR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	NOK_NIBOR_NIBR_Bloomberg displayName "NOK-NIBOR-NIBR-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	NOK_NIBOR_NIBR_Reference_Banks displayName "NOK-NIBOR-NIBR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	NOK_NIBOR_OIBOR displayName "NOK-NIBOR-OIBOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	NOK_NIBOR_Reference_Banks displayName "NOK-NIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	NOK_NOWA displayName "NOK-NOWA" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	NOK_NOWA_OIS_Compound displayName "NOK-NOWA-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	NZD_BBR_BID displayName "NZD-BBR-BID" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	NZD_BBR_FRA displayName "NZD-BBR-FRA" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	NZD_BBR_ISDC displayName "NZD-BBR-ISDC" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	NZD_BBR_Reference_Banks displayName "NZD-BBR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	NZD_BBR_Telerate displayName "NZD-BBR-Telerate" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	NZD_BKBM_Bid displayName "NZD-BKBM Bid" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	NZD_BKBM_FRA displayName "NZD-BKBM FRA" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	NZD_BKBM_FRA_Swap_Rate_ICAP displayName "NZD-BKBM FRA Swap Rate ICAP" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	NZD_NZIONA displayName "NZD-NZIONA" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	NZD_NZIONA_OIS_Compound_1 displayName "NZD-NZIONA-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	NZD_NZIONA_OIS_COMPOUND displayName "NZD-NZIONA-OIS-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	NZD_Semi_Annual_Swap_Rate_11_00_BGCANTOR displayName "NZD-Semi-Annual Swap Rate-11:00-BGCANTOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	NZD_Semi_Annual_Swap_Rate_BGCANTOR_Reference_Banks displayName "NZD-Semi-Annual Swap Rate-BGCANTOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	NZD_Swap_Rate_ICAP displayName "NZD-Swap Rate-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	NZD_Swap_Rate_ICAP_Reference_Banks displayName "NZD-Swap Rate-ICAP-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	PHP_PHIREF displayName "PHP-PHIREF" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	PHP_PHIREF_BAP displayName "PHP-PHIREF-BAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	PHP_PHIREF_Bloomberg displayName "PHP-PHIREF-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	PHP_PHIREF_Reference_Banks displayName "PHP-PHIREF-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	PHP_Semi_Annual_Swap_Rate_11_00_BGCANTOR displayName "PHP-Semi-Annual Swap Rate-11:00-BGCANTOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	PHP_Semi_Annual_Swap_Rate_Reference_Banks displayName "PHP-Semi-Annual Swap Rate-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	PLN_POLONIA displayName "PLN-POLONIA" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	PLN_POLONIA_OIS_Compound_1 displayName "PLN-POLONIA-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	PLN_POLONIA_OIS_COMPOUND displayName "PLN-POLONIA-OIS-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	PLN_WIBID displayName "PLN-WIBID" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	PLN_WIBOR displayName "PLN-WIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	PLN_WIBOR_Reference_Banks displayName "PLN-WIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	PLN_WIBOR_WIBO displayName "PLN-WIBOR-WIBO" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	PLN_WIRON displayName "PLN-WIRON" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	PLN_WIRON_OIS_Compound displayName "PLN-WIRON-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	PLZ_WIBOR_Reference_Banks displayName "PLZ-WIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	PLZ_WIBOR_WIBO displayName "PLZ-WIBOR-WIBO" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	REPOFUNDS_RATE_FRANCE_OIS_COMPOUND displayName "REPOFUNDS RATE-FRANCE-OIS-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	REPOFUNDS_RATE_GERMANY_OIS_COMPOUND displayName "REPOFUNDS RATE-GERMANY-OIS-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	REPOFUNDS_RATE_ITALY_OIS_COMPOUND displayName "REPOFUNDS RATE-ITALY-OIS-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	RON_Annual_Swap_Rate_11_00_BGCANTOR displayName "RON-Annual Swap Rate-11:00-BGCANTOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	RON_Annual_Swap_Rate_Reference_Banks displayName "RON-Annual Swap Rate-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	RON_RBOR_Reuters displayName "RON-RBOR-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	RON_ROBID displayName "RON-ROBID" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	RON_ROBOR displayName "RON-ROBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	RUB_Annual_Swap_Rate_11_00_BGCANTOR displayName "RUB-Annual Swap Rate-11:00-BGCANTOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	RUB_Annual_Swap_Rate_12_45_TRADITION displayName "RUB-Annual Swap Rate-12:45-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	RUB_Annual_Swap_Rate_4_15_TRADITION displayName "RUB-Annual Swap Rate-4:15-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	RUB_Annual_Swap_Rate_Reference_Banks displayName "RUB-Annual Swap Rate-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	RUB_Annual_Swap_Rate_TRADITION_Reference_Banks displayName "RUB-Annual Swap Rate-TRADITION-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	RUB_Key_Rate_CBRF displayName "RUB-Key Rate CBRF" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	RUB_MosPrime displayName "RUB-MosPrime" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	RUB_MOSPRIME_NFEA displayName "RUB-MOSPRIME-NFEA" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	RUB_MOSPRIME_Reference_Banks displayName "RUB-MOSPRIME-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	RUB_RUONIA displayName "RUB-RUONIA" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	RUB_RUONIA_OIS_Compound_1 displayName "RUB-RUONIA-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	RUB_RUONIA_OIS_COMPOUND displayName "RUB-RUONIA-OIS-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SAR_SAIBOR displayName "SAR-SAIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	SAR_SRIOR_Reference_Banks displayName "SAR-SRIOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SAR_SRIOR_SUAA displayName "SAR-SRIOR-SUAA" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SEK_Annual_Swap_Rate displayName "SEK-Annual Swap Rate" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SEK_Annual_Swap_Rate_SESWFI displayName "SEK-Annual Swap Rate-SESWFI" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SEK_SIOR_OIS_COMPOUND displayName "SEK-SIOR-OIS-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SEK_STIBOR displayName "SEK-STIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	SEK_STIBOR_Bloomberg displayName "SEK-STIBOR-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SEK_STIBOR_OIS_Compound displayName "SEK-STIBOR-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	SEK_STIBOR_Reference_Banks displayName "SEK-STIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SEK_STIBOR_SIDE displayName "SEK-STIBOR-SIDE" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SEK_SWESTR displayName "SEK-SWESTR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SEK_SWESTR_Average_1M displayName "SEK-SWESTR Average 1M" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SEK_SWESTR_Average_1W displayName "SEK-SWESTR Average 1W" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SEK_SWESTR_Average_2M displayName "SEK-SWESTR Average 2M" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SEK_SWESTR_Average_3M displayName "SEK-SWESTR Average 3M" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SEK_SWESTR_Average_6M displayName "SEK-SWESTR Average 6M" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SEK_SWESTR_Compounded_Index displayName "SEK-SWESTR Compounded Index" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SEK_SWESTR_OIS_Compound displayName "SEK-SWESTR-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SGD_Semi_Annual_Currency_Basis_Swap_Rate_11_00_Tullett_Prebon displayName "SGD-Semi-Annual Currency Basis Swap Rate-11:00-Tullett Prebon" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SGD_Semi_Annual_Currency_Basis_Swap_Rate_16_00_Tullett_Prebon displayName "SGD-Semi-Annual Currency Basis Swap Rate-16:00-Tullett Prebon" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SGD_Semi_Annual_Swap_Rate_11_00_BGCANTOR displayName "SGD-Semi-Annual Swap Rate-11:00-BGCANTOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SGD_Semi_Annual_Swap_Rate_11_00_Tullett_Prebon displayName "SGD-Semi-Annual Swap Rate-11:00-Tullett Prebon" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SGD_Semi_Annual_Swap_Rate_11_00_TRADITION displayName "SGD-Semi-Annual Swap Rate-11.00-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SGD_Semi_Annual_Swap_Rate_16_00_Tullett_Prebon displayName "SGD-Semi-Annual Swap Rate-16:00-Tullett Prebon" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SGD_Semi_Annual_Swap_Rate_ICAP displayName "SGD-Semi-Annual Swap Rate-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SGD_Semi_Annual_Swap_Rate_ICAP_Reference_Banks displayName "SGD-Semi-Annual Swap Rate-ICAP-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SGD_Semi_Annual_Swap_Rate_Reference_Banks displayName "SGD-Semi-Annual Swap Rate-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SGD_Semi_Annual_Swap_Rate_TRADITION_Reference_Banks displayName "SGD-Semi-Annual Swap Rate-TRADITION-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SGD_SIBOR displayName "SGD-SIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	SGD_SIBOR_Reference_Banks displayName "SGD-SIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SGD_SIBOR_Reuters displayName "SGD-SIBOR-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SGD_SIBOR_Telerate displayName "SGD-SIBOR-Telerate" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SGD_SONAR_OIS_COMPOUND displayName "SGD-SONAR-OIS-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SGD_SONAR_OIS_VWAP_COMPOUND displayName "SGD-SONAR-OIS-VWAP-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SGD_SOR displayName "SGD-SOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	SGD_SORA displayName "SGD-SORA" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SGD_SORA_COMPOUND displayName "SGD-SORA-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SGD_SORA_OIS_Compound displayName "SGD-SORA-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	SGD_SOR_Reference_Banks displayName "SGD-SOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SGD_SOR_Reuters displayName "SGD-SOR-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SGD_SOR_Telerate displayName "SGD-SOR-Telerate" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SGD_SOR_VWAP displayName "SGD-SOR-VWAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SGD_SOR_VWAP_Reference_Banks displayName "SGD-SOR-VWAP-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SKK_BRIBOR_Bloomberg displayName "SKK-BRIBOR-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SKK_BRIBOR_BRBO displayName "SKK-BRIBOR-BRBO" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SKK_BRIBOR_NBSK07 displayName "SKK-BRIBOR-NBSK07" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	SKK_BRIBOR_Reference_Banks displayName "SKK-BRIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	THB_Semi_Annual_Swap_Rate_11_00_BGCANTOR displayName "THB-Semi-Annual Swap Rate-11:00-BGCANTOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	THB_Semi_Annual_Swap_Rate_Reference_Banks displayName "THB-Semi-Annual Swap Rate-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	THB_SOR_Reference_Banks displayName "THB-SOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	THB_SOR_Reuters displayName "THB-SOR-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	THB_SOR_Telerate displayName "THB-SOR-Telerate" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	THB_THBFIX displayName "THB-THBFIX" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	THB_THBFIX_Reference_Banks displayName "THB-THBFIX-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	THB_THBFIX_Reuters displayName "THB-THBFIX-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	THB_THOR displayName "THB-THOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	THB_THOR_COMPOUND displayName "THB-THOR-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	THB_THOR_OIS_Compound displayName "THB-THOR-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	TRY_Annual_Swap_Rate_11_00_TRADITION displayName "TRY Annual Swap Rate-11:00-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	TRY_Annual_Swap_Rate_11_15_BGCANTOR displayName "TRY-Annual Swap Rate-11:15-BGCANTOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	TRY_Annual_Swap_Rate_Reference_Banks displayName "TRY-Annual Swap Rate-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	TRY_Semi_Annual_Swap_Rate_TRADITION_Reference_Banks displayName "TRY-Semi-Annual Swap Rate-TRADITION-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	TRY_TLREF displayName "TRY-TLREF" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	TRY_TLREF_OIS_Compound_1 displayName "TRY-TLREF-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	TRY_TLREF_OIS_COMPOUND displayName "TRY-TLREF-OIS-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	TRY_TRLIBOR displayName "TRY-TRLIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	TRY_TRYIBOR_Reference_Banks displayName "TRY-TRYIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	TRY_TRYIBOR_Reuters displayName "TRY-TRYIBOR-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	TWD_Quarterly_Annual_Swap_Rate_11_00_BGCANTOR displayName "TWD-Quarterly-Annual Swap Rate-11:00-BGCANTOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	TWD_Quarterly_Annual_Swap_Rate_Reference_Banks displayName "TWD-Quarterly-Annual Swap Rate-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	TWD_Reference_Dealers displayName "TWD-Reference Dealers" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	TWD_Reuters_6165 displayName "TWD-Reuters-6165" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	TWD_TAIBIR01 displayName "TWD-TAIBIR01" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	TWD_TAIBIR02 displayName "TWD-TAIBIR02" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	TWD_TAIBOR displayName "TWD-TAIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	TWD_TAIBOR_Bloomberg displayName "TWD-TAIBOR-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	TWD_TAIBOR_Reuters displayName "TWD-TAIBOR-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	TWD_Telerate_6165 displayName "TWD-Telerate-6165" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	TWD_TWCPBA displayName "TWD-TWCPBA" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	UK_Base_Rate displayName "UK Base Rate" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_3M_LIBOR_SWAP_CME_vs_LCH_ICAP displayName "USD-3M LIBOR SWAP-CME vs LCH-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_3M_LIBOR_SWAP_CME_vs_LCH_ICAP_Bloomberg displayName "USD-3M LIBOR SWAP-CME vs LCH-ICAP-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_6M_LIBOR_SWAP_CME_vs_LCH_ICAP displayName "USD-6M LIBOR SWAP-CME vs LCH-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_6M_LIBOR_SWAP_CME_vs_LCH_ICAP_Bloomberg displayName "USD-6M LIBOR SWAP-CME vs LCH-ICAP-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_AMERIBOR displayName "USD-AMERIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_AMERIBOR_Average_30D displayName "USD-AMERIBOR Average 30D" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_AMERIBOR_Average_90D displayName "USD-AMERIBOR Average 90D" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_AMERIBOR_Term displayName "USD-AMERIBOR Term" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_AMERIBOR_Term_Structure displayName "USD-AMERIBOR Term Structure" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_Annual_Swap_Rate_11_00_BGCANTOR displayName "USD-Annual Swap Rate-11:00-BGCANTOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_Annual_Swap_Rate_11_00_TRADITION displayName "USD-Annual Swap Rate-11:00-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_Annual_Swap_Rate_4_00_TRADITION displayName "USD-Annual Swap Rate-4:00-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_AXI_Term displayName "USD-AXI Term" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	USD_BA_H_15 displayName "USD-BA-H.15" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_BA_Reference_Dealers displayName "USD-BA-Reference Dealers" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_BMA_Municipal_Swap_Index displayName "USD-BMA Municipal Swap Index" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_BSBY displayName "USD-BSBY" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_CD_H_15 displayName "USD-CD-H.15" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_CD_Reference_Dealers displayName "USD-CD-Reference Dealers" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_CMS_Reference_Banks displayName "USD-CMS-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_CMS_Reference_Banks_ICAP_SwapPX displayName "USD-CMS-Reference Banks-ICAP SwapPX" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_CMS_Reuters displayName "USD-CMS-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_CMS_Telerate displayName "USD-CMS-Telerate" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_CMT displayName "USD-CMT" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	USD_CMT_Average_1W displayName "USD-CMT Average 1W" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	USD_CMT_T7051 displayName "USD-CMT-T7051" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_CMT_T7052 displayName "USD-CMT-T7052" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_COF11_FHLBSF displayName "USD-COF11-FHLBSF" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_COF11_Reuters displayName "USD-COF11-Reuters" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_COF11_Telerate displayName "USD-COF11-Telerate" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_COFI displayName "USD-COFI" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	USD_CP_H_15 displayName "USD-CP-H.15" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_CP_Money_Market_Yield displayName "USD-CP-Money Market Yield" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	USD_CP_Reference_Dealers displayName "USD-CP-Reference Dealers" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_CRITR displayName "USD-CRITR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_Federal_Funds displayName "USD-Federal Funds" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	USD_Federal_Funds_H_15 displayName "USD-Federal Funds-H.15" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_Federal_Funds_H_15_Bloomberg displayName "USD-Federal Funds-H.15-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_Federal_Funds_H_15_OIS_COMPOUND displayName "USD-Federal Funds-H.15-OIS-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_Federal_Funds_OIS_Compound displayName "USD-Federal Funds-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	USD_Federal_Funds_Reference_Dealers displayName "USD-Federal Funds-Reference Dealers" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_FFCB_DISCO displayName "USD-FFCB-DISCO" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_FXI_Term displayName "USD-FXI Term" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	USD_ISDAFIX3_Swap_Rate displayName "USD-ISDAFIX3-Swap Rate" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_ISDAFIX3_Swap_Rate_3_00 displayName "USD-ISDAFIX3-Swap Rate-3:00" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_ISDA_Swap_Rate displayName "USD-ISDA-Swap Rate" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_ISDA_Swap_Rate_3_00 displayName "USD-ISDA-Swap Rate-3:00" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_LIBOR displayName "USD-LIBOR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	USD_LIBOR_BBA displayName "USD-LIBOR-BBA" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_LIBOR_BBA_Bloomberg displayName "USD-LIBOR-BBA-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_LIBOR_ICE_Swap_Rate_11_00 displayName "USD-LIBOR ICE Swap Rate-11:00" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	USD_LIBOR_ICE_Swap_Rate_15_00 displayName "USD-LIBOR ICE Swap Rate-15:00" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	USD_LIBOR_ISDA displayName "USD-LIBOR-ISDA" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_LIBOR_LIBO displayName "USD-LIBOR-LIBO" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_LIBOR_Reference_Banks displayName "USD-LIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_Municipal_Swap_Index displayName "USD-Municipal Swap Index" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	USD_Municipal_Swap_Libor_Ratio_11_00_ICAP displayName "USD-Municipal Swap Libor Ratio-11:00-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_Municipal_Swap_Rate_11_00_ICAP displayName "USD-Municipal Swap Rate-11:00-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_OIS_11_00_BGCANTOR displayName "USD-OIS-11:00-BGCANTOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_OIS_11_00_LON_ICAP displayName "USD-OIS-11:00-LON-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_OIS_11_00_NY_ICAP displayName "USD-OIS-11:00-NY-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_OIS_11_00_TRADITION displayName "USD-OIS-11:00-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_OIS_3_00_BGCANTOR displayName "USD-OIS-3:00-BGCANTOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_OIS_3_00_NY_ICAP displayName "USD-OIS-3:00-NY-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_OIS_4_00_TRADITION displayName "USD-OIS-4:00-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_Overnight_Bank_Funding_Rate displayName "USD-Overnight Bank Funding Rate" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_Prime displayName "USD-Prime" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	USD_Prime_H_15 displayName "USD-Prime-H.15" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_Prime_Reference_Banks displayName "USD-Prime-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_S_P_Index_High_Grade displayName "USD-S&P Index-High Grade" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_SandP_Index_High_Grade displayName "USD-SandP Index High Grade" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	USD_SIBOR_Reference_Banks displayName "USD-SIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_SIBOR_SIBO displayName "USD-SIBOR-SIBO" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_SIFMA_Municipal_Swap_Index displayName "USD-SIFMA Municipal Swap Index" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_SOFR displayName "USD-SOFR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_SOFR_Average_180D displayName "USD-SOFR Average 180D" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_SOFR_Average_30D displayName "USD-SOFR Average 30D" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_SOFR_Average_90D displayName "USD-SOFR Average 90D" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_SOFR_CME_Term displayName "USD-SOFR CME Term" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_SOFR_COMPOUND displayName "USD-SOFR-COMPOUND" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_SOFR_Compounded_Index displayName "USD-SOFR Compounded Index" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_SOFR_ICE_Compounded_Index displayName "USD-SOFR ICE Compounded Index" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_SOFR_ICE_Compounded_Index_0_Floor displayName "USD-SOFR ICE Compounded Index 0 Floor" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_SOFR_ICE_Compounded_Index_0_Floor_2D_Lag displayName "USD-SOFR ICE Compounded Index 0 Floor 2D Lag" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_SOFR_ICE_Compounded_Index_0_Floor_5D_Lag displayName "USD-SOFR ICE Compounded Index 0 Floor 5D Lag" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_SOFR_ICE_Compounded_Index_2D_Lag displayName "USD-SOFR ICE Compounded Index 2D Lag" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_SOFR_ICE_Compounded_Index_5D_Lag displayName "USD-SOFR ICE Compounded Index 5D Lag" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_SOFR_ICE_Swap_Rate displayName "USD-SOFR ICE Swap Rate" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix and 2006 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_SOFR_ICE_Term displayName "USD-SOFR ICE Term" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	USD_SOFR_OIS_Compound displayName "USD-SOFR-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	USD_Swap_Rate_BCMP1 displayName "USD Swap Rate-BCMP1" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_TBILL_H_15 displayName "USD-TBILL-H.15" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_TBILL_H_15_Bloomberg displayName "USD-TBILL-H.15-Bloomberg" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_TBILL_Secondary_Market displayName "USD-TBILL-Secondary Market" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_TBILL_Secondary_Market_Bond_Equivalent_Yield displayName "USD-TBILL Secondary Market-Bond Equivalent Yield" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	USD_TIBOR_ISDC displayName "USD-TIBOR-ISDC" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_TIBOR_Reference_Banks displayName "USD-TIBOR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_Treasury_19901_3_00_ICAP displayName "USD-Treasury-19901-3:00-ICAP" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_Treasury_Rate_BCMP1 displayName "USD Treasury Rate-BCMP1" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_Treasury_Rate_ICAP_BrokerTec displayName "USD-Treasury Rate-ICAP BrokerTec" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_Treasury_Rate_SwapMarker100 displayName "USD-Treasury Rate-SwapMarker100" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_Treasury_Rate_SwapMarker99 displayName "USD-Treasury Rate-SwapMarker99" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_Treasury_Rate_T19901 displayName "USD-Treasury Rate-T19901" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	USD_Treasury_Rate_T500 displayName "USD-Treasury Rate-T500" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	VND_Semi_Annual_Swap_Rate_11_00_BGCANTOR displayName "VND-Semi-Annual Swap Rate-11:00-BGCANTOR" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	VND_Semi_Annual_Swap_Rate_Reference_Banks displayName "VND-Semi-Annual Swap Rate-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	ZAR_DEPOSIT_Reference_Banks displayName "ZAR-DEPOSIT-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	ZAR_DEPOSIT_SAFEX displayName "ZAR-DEPOSIT-SAFEX" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	ZAR_JIBAR displayName "ZAR-JIBAR" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	ZAR_JIBAR_Reference_Banks displayName "ZAR-JIBAR-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	ZAR_JIBAR_SAFEX displayName "ZAR-JIBAR-SAFEX" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	ZAR_Prime_Average_1 displayName "ZAR-Prime Average" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	ZAR_PRIME_AVERAGE displayName "ZAR-PRIME-AVERAGE" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	ZAR_PRIME_AVERAGE_Reference_Banks displayName "ZAR-PRIME-AVERAGE-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	ZAR_Quarterly_Swap_Rate_1_00_TRADITION displayName "ZAR-Quarterly Swap Rate-1:00-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	ZAR_Quarterly_Swap_Rate_5_30_TRADITION displayName "ZAR-Quarterly Swap Rate-5:30-TRADITION" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	ZAR_Quarterly_Swap_Rate_TRADITION_Reference_Banks displayName "ZAR-Quarterly Swap Rate-TRADITION-Reference Banks" <"Per 2006 ISDA Definitions or Annex to the 2000 ISDA Definitions, Section 7.1 Rate Options, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	ZAR_ZARONIA displayName "ZAR-ZARONIA" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+	ZAR_ZARONIA_OIS_Compound displayName "ZAR-ZARONIA-OIS Compound" <"Per 2021 ISDA Interest Rate Derivatives Definitions Floating Rate Matrix, as amended through the date on which parties enter into the relevant transaction.">
+
+enum InflationRateIndexEnum: <"The enumerated values to specify the list of inflation rate indices.">
+    [docReference ISDA FpML_Coding_Scheme schemeLocation "http://www.fpml.org/coding-scheme/inflation-index-description"]
+
+	AUD_CPI displayName "AUD-CPI" <"Australia: AUD - Non-revised Consumer Price Index (CPI)">
+	AUS_CPI displayName "AUS-CPI" <"Austria: AUS - Non-revised Consumer Price Index (CPI)">
+	AUS_HICP displayName "AUS-HICP" <"Austria: AUS - Non-revised Harmonised Indices of Consumer Prices (HICP)">
+	BLG_CPI_GI displayName "BLG-CPI-GI" <"Belgium: BLG - Non-revised Consumer Price Index - General Index (CPI)">
+	BLG_CPI_HI displayName "BLG-CPI-HI" <"Belgium: BLG - Non-revised Consumer Price Index - Health Index (CPI)">
+	BLG_HICP displayName "BLG-HICP" <"Belgium: BLG - Non-revised Harmonised Consumer Price Index (HICP)">
+	BRL_IGPM displayName "BRL-IGPM" <"Brazil: BRL - Non-revised Price Index (IGP-M)">
+	BRL_IPCA displayName "BRL-IPCA" <"Brazil: BRL - Non-revised Consumer Price Index (IPCA)">
+	CAD_CPI displayName "CAD-CPI" <"Canada: CAD - Non-revised Consumer Price Index (CPI)">
+	CLP_CPI displayName "CLP-CPI" <"Chile: CLP - Non-revised Consumer Price Index (CPI)">
+	CNY_CPI displayName "CNY-CPI" <"China: CNY - Non-revised Consumer Price Index (CPI)">
+	CZK_CPI displayName "CZK-CPI" <"Czech Republic: CZK - Non-revised Consumer Price Index (CPI)">
+	DEK_CPI displayName "DEK-CPI" <"Denmark: DEK - Non-revised Consumer Price Index (CPI)">
+	DEK_HICP displayName "DEK-HICP" <"Denmark: DEK - Non-revised Harmonised Consumer Price Index (HICP)">
+	DEM_CPI displayName "DEM-CPI" <"Germany: DEM - Non-revised Consumer Price Index (CPI)">
+	DEM_CPI_NRW displayName "DEM-CPI-NRW" <"Germany: DEM - Non-revised Consumer Price Index for North Rhine-Westphalia">
+	DEM_HICP displayName "DEM-HICP" <"Germany: DEM - Non-revised Harmonised Consumer Price Index (HICP)">
+	ESP_CPI displayName "ESP-CPI" <"Spain: ESP - National-Non-revised Consumer Price Index (CPI)">
+	ESP_HICP displayName "ESP-HICP" <"Spain: ESP - Harmonised-Non-revised Consumer Price Index (HICP)">
+	ESP_R_CPI displayName "ESP-R-CPI" <"Spain: ESP - National-Revised Consumer Price Index (CPI).">
+	ESP_R_HICP displayName "ESP-R-HICP" <"Spain: ESP - Harmonised-Revised Consumer Price Index (HICP)">
+	EUR_AI_CPI displayName "EUR-AI-CPI" <"European Union: EUR - All Items-Non-revised Consumer Price Index">
+	EUR_AI_R_CPI displayName "EUR-AI-R-CPI" <"European Union: EUR - All Items-Revised Consumer Price Index">
+	EUR_EXT_CPI displayName "EUR-EXT-CPI" <"European Union: EUR - Excluding Tobacco-Non-revised Consumer Price Index">
+	EUR_EXT_R_CPI displayName "EUR-EXT-R-CPI" <"European Union: EUR - Excluding Tobacco-Revised Consumer Price Index">
+	FIN_CPI displayName "FIN-CPI" <"Finland: FIN - Non-revised Consumer Price Index (CPI)">
+	FIN_HICP displayName "FIN-HICP" <"Finland: FIN - Harmonised-Non-revised Consumer Price Index (HICP)">
+	FRC_EXT_CPI displayName "FRC-EXT-CPI" <"France: FRC - Excluding Tobacco-Non-Revised Consumer Price Index">
+	FRC_HICP displayName "FRC-HICP" <"France: FRC - Harmonised-Non-revised Consumer Price Index (HICP)">
+	GRD_CPI displayName "GRD-CPI" <"Greece: GRD - Non-revised Consumer Price Index (CPI)">
+	GRD_HICP displayName "GRD-HICP" <"Greece: GRD - Harmonised-Non-revised Consumer Price Index (HICP)">
+	HKD_CPI displayName "HKD-CPI" <"Hong Kong: HKD - Non-revised Consumer Price Index (CPI)">
+	HUF_CPI displayName "HUF-CPI" <"Hungary: HUF - Non-revised Consumer Price Index (CPI)">
+	IDR_CPI displayName "IDR-CPI" <"Indonesia: IDR - Non-revised Consumer Price Index (CPI)">
+	ILS_CPI displayName "ILS-CPI" <"Israel: ILS - Non-revised Consumer Price Index (CPI)">
+	IRL_CPI displayName "IRL-CPI" <"Ireland: IRL - Non-revised Consumer Price Index (CPI)">
+	IRL_HICP displayName "IRL-HICP" <"Ireland: IRL - Harmonised-Non-revised Consumer Price Index (HICP)">
+	ISK_CPI displayName "ISK-CPI" <"Iceland: ISK - Non-revised Consumer Price Index (CPI)">
+	ISK_HICP displayName "ISK-HICP" <"Iceland: ISK - Harmonised Consumer Price Index (HICP)">
+	ITL_BC_EXT_CPI displayName "ITL-BC-EXT-CPI" <"Italy: ITL - Inflation for Blue Collar Workers and Employees-Excluding Tobacco Consumer Price Index">
+	ITL_BC_INT_CPI displayName "ITL-BC-INT-CPI" <"Italy: ITL - Inflation for Blue Collar Workers and Employees-Including Tobacco Consumer Price Index">
+	ITL_HICP displayName "ITL-HICP" <"Italy: ITL - Non-revised Harmonised Consumer Price Index (HICP)">
+	ITL_WC_EXT_CPI displayName "ITL-WC-EXT-CPI" <"Italy: ITL - Whole Community - Excluding Tobacco Consumer Price Index">
+	ITL_WC_INT_CPI displayName "ITL-WC-INT-CPI" <"Italy: ITL - Whole Community - Including Tobacco Consumer Price Index">
+	JPY_CPI_EXF displayName "JPY-CPI-EXF" <"Japan: JPY - Non-revised Consumer Price Index Nationwide General Excluding Fresh Food (CPI)">
+	KRW_CPI displayName "KRW-CPI" <"South Korea: KRW - Non-revised Consumer Price Index (CPI)">
+	LUX_CPI displayName "LUX-CPI" <"Luxembourg: LUX - Non-revised Consumer Price Index (CPI)">
+	LUX_HICP displayName "LUX-HICP" <"Luxembourg: LUX - Harmonised-Non-revised Consumer Price Index (HICP)">
+	MXN_CPI displayName "MXN-CPI" <"Mexico: MXN - Non-revised Consumer Price Index (CPI)">
+	MXN_UDI displayName "MXN-UDI" <"Mexico: MXN - Unidad de Inversion Index (UDI)">
+	MYR_CPI displayName "MYR-CPI" <"Malaysia: MYR - Non-revised Consumer Price Index (CPI)">
+	NLG_CPI displayName "NLG-CPI" <"Netherlands: NLG - Non-revised Consumer Price Index (CPI)">
+	NLG_HICP displayName "NLG-HICP" <"Netherlands: NLG - Harmonised-Non-revised Consumer Price Index (HICP)">
+	NOK_CPI displayName "NOK-CPI" <"Norway: NOK - Non-revised Consumer Price Index (CPI)">
+	NZD_CPI displayName "NZD-CPI" <"New Zealand: NZD - Non-revised Consumer Price Index (CPI)">
+	PER_CPI displayName "PER-CPI" <"Peru: PER - Non-revised Consumer Price Index (CPI)">
+	PLN_CPI displayName "PLN-CPI" <"Poland: PLN - Non-Revised Consumer Price Index (CPI)">
+	POR_CPI displayName "POR-CPI" <"Portugal: POR - Non-revised Consumer Price Index (CPI)">
+	POR_HICP displayName "POR-HICP" <"Portugal: POR - Harmonised-Non-revised Consumer Price Index (HICP)">
+	RUB_CPI displayName "RUB-CPI" <"Russia: RUB - Non-revised Consumer Price Index (CPI)">
+	SEK_CPI displayName "SEK-CPI" <"Sweden: SEK - Non-revised Consumer Price Index (CPI)">
+	SGD_CPI displayName "SGD-CPI" <"Singapore: SGD - Non-revised Consumer Price Index (CPI)">
+	SWF_CPI displayName "SWF-CPI" <"Switzerland: SWF - Non-revised Consumer Price Index (CPI)">
+	TRY_CPI displayName "TRY-CPI" <"Turkey: TRY - Non-revised Consumer Price Index (CPI)">
+	TWD_CPI displayName "TWD-CPI" <"Taiwan: TWD - Non-revised Consumer Price Index (CPI)">
+	UK_CPIH displayName "UK-CPIH" <"United Kingdom: GBP - Non-revised Consumer Prices Index including Housing (UKCPIH)">
+	UK_HICP displayName "UK-HICP" <"United Kingdom: GBP - Harmonised-Non-revised Consumer Price Index (HICP)">
+	UK_RPI displayName "UK-RPI" <"United Kingdom: GBP - Non-revised Retail Price Index (UKRPI)">
+	UK_RPIX displayName "UK-RPIX" <"United Kingdom: GBP - Non-revised Retail Price Index Excluding Mortgage Interest Payments (UKRPIX)">
+	USA_CPI_U displayName "USA-CPI-U" <"United States: USA - Non-revised Consumer Price Index - Urban (CPI-U)">
+	ZAR_CPI displayName "ZAR-CPI" <"South Africa: ZAR - Non-revised Consumer Price Index (CPI)">
+	ZAR_CPIX displayName "ZAR-CPIX" <"South Africa: ZAR - Non-revised Consumer Price Index Excluding Mortgages (CPIX)">
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/allocation/allocation-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/allocation/allocation-func-output.json
index bd7ec5393f..c6a8e248e9 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/allocation/allocation-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/allocation/allocation-func-output.json
@@ -1,125 +1,195 @@
 {
+  "intent" : "Allocation",
   "eventDate" : "2018-04-01",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "60e4b249"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "60e4b249"
-          },
-          "party" : [ {
-            "businessUnit" : [ {
-              "meta" : {
-                "externalKey" : "desk1",
-                "globalKey" : "5c10b72e"
-              },
-              "name" : "NY Swaps Desk"
-            } ],
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "fdda73db"
-            },
-            "name" : {
-              "value" : "Bank X"
+    "primitiveInstruction" : {
+      "split" : {
+        "breakdown" : [ {
+          "partyChange" : {
+            "counterparty" : {
+              "role" : "Party2",
+              "partyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "LEI2CP00A1",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                      }
+                    },
+                    "identifierType" : "LEI",
+                    "meta" : {
+                      "globalKey" : "eb8ee0af"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "Fund 2"
+                  },
+                  "meta" : {
+                    "globalKey" : "c170e6a6",
+                    "externalKey" : "party3"
+                  }
+                }
+              }
             },
-            "partyId" : [ {
-              "identifier" : {
+            "tradeId" : [ {
+              "issuer" : {
+                "value" : "LEI1RPT001",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI1RPT0001"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                }
               },
-              "identifierType" : "LEI",
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "LEI1RPT001POST1",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
+                }
+              } ],
               "meta" : {
-                "globalKey" : "b8962566"
+                "globalKey" : "651634bf"
+              },
+              "identifierType" : "UniqueTransactionIdentifier"
+            } ]
+          },
+          "quantityChange" : {
+            "change" : [ {
+              "quantity" : [ {
+                "value" : {
+                  "value" : 7000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "EUR"
+                    }
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "b21aa069"
               }
             } ],
-            "person" : [ {
-              "firstName" : "jjone",
-              "meta" : {
-                "externalKey" : "trader",
-                "globalKey" : "d3962233"
-              },
-              "personId" : [ {
+            "direction" : "Replace"
+          }
+        }, {
+          "partyChange" : {
+            "counterparty" : {
+              "role" : "Party2",
+              "partyReference" : {
                 "value" : {
-                  "identifier" : {
-                    "value" : "jjones"
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "LEI3CP00A2",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                      }
+                    },
+                    "identifierType" : "LEI",
+                    "meta" : {
+                      "globalKey" : "20751bf1"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "Fund 3"
                   },
                   "meta" : {
-                    "globalKey" : "baeb8c0d"
+                    "globalKey" : "55b55969",
+                    "externalKey" : "party4"
                   }
                 }
-              } ]
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "ee963b6"
-            },
-            "name" : {
-              "value" : "Bank Y"
+              }
             },
-            "partyId" : [ {
-              "identifier" : {
+            "tradeId" : [ {
+              "issuer" : {
+                "value" : "LEI1RPT001",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI2CP0002"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                }
               },
-              "identifierType" : "LEI",
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "LEI1RPT001POST2",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
+                }
+              } ],
               "meta" : {
-                "globalKey" : "eb8edea1"
-              }
+                "globalKey" : "651634de"
+              },
+              "identifierType" : "UniqueTransactionIdentifier"
             } ]
-          }, {
-            "meta" : {
-              "externalKey" : "broker1",
-              "globalKey" : "ed0cc6d1"
-            },
-            "name" : {
-              "value" : "Up&Atem"
+          },
+          "quantityChange" : {
+            "change" : [ {
+              "quantity" : [ {
+                "value" : {
+                  "value" : 3000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "EUR"
+                    }
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "de81b365"
+              }
+            } ],
+            "direction" : "Replace"
+          }
+        }, {
+          "quantityChange" : {
+            "change" : [ {
+              "quantity" : [ {
+                "value" : {
+                  "value" : 0,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "EUR"
+                    }
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "16df72"
+              }
+            } ],
+            "direction" : "Replace"
+          }
+        } ]
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "LEI1RPT0001",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+              }
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "LEI1RPT001PREAA",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "549300OL8KL0WCQ34V31"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "8ffabe4b"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                }
               }
-            } ]
-          } ],
-          "partyRole" : [ {
-            "ownershipPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "fdda73db"
-            },
-            "partyReference" : {
-              "externalReference" : "broker1",
-              "globalReference" : "ed0cc6d1"
+            } ],
+            "meta" : {
+              "globalKey" : "e5010f07"
             },
-            "role" : "ARRANGING_BROKER"
+            "identifierType" : "UniqueTransactionIdentifier"
           } ],
+          "tradeDate" : {
+            "value" : "2018-04-01",
+            "meta" : {
+              "globalKey" : "3f1101"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "fdda73db"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ee963b6"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -130,46 +200,42 @@
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "accrualBusinessCenters0",
-                              "globalReference" : "20a71d"
-                            },
-                            "meta" : {
-                              "globalKey" : "26b869c"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "e00ca52b"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "2b934"
-                          },
-                          "period" : "Y",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "30"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "30/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2018-04-03",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -178,135 +244,133 @@
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
-                            },
-                            "unadjustedDate" : "2018-04-03"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ece3837b"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "CalcPeriodDates0",
-                          "globalKey" : "c154a58c"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2026-08-30",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "accrualBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "accrualBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
                             "meta" : {
                               "globalKey" : "a610fb90"
-                            },
-                            "unadjustedDate" : "2026-08-30"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "a610fb90"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "30/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "1d841517"
+                        },
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "20a71d",
+                              "externalReference" : "accrualBusinessCenters0"
+                            },
+                            "meta" : {
+                              "globalKey" : "26b869c"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "e00ca52b"
+                          }
+                        },
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
+                          "meta" : {
+                            "globalKey" : "17984"
+                          },
+                          "rollConvention" : "30"
+                        },
+                        "meta" : {
+                          "globalKey" : "b137acba",
+                          "externalKey" : "CalcPeriodDates0"
+                        }
                       },
                       "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "4d64aef4"
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
+                          "meta" : {
+                            "globalKey" : "78"
+                          }
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                        "payRelativeTo" : "CalculationPeriodEndDate",
                         "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
                             } ],
                             "meta" : {
-                              "externalKey" : "paymentBusinessCenters0",
-                              "globalKey" : "20a71d"
+                              "globalKey" : "20a71d",
+                              "externalKey" : "paymentBusinessCenters0"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
-                        "paymentFrequency" : {
-                          "meta" : {
-                            "globalKey" : "ac8"
-                          },
-                          "period" : "Y",
-                          "periodMultiplier" : 1
+                        "meta" : {
+                          "globalKey" : "9b0d9350"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
-                          }
-                        }
+                      "meta" : {
+                        "globalKey" : "4e1182b5"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "accrualBusinessCenters1",
-                              "globalReference" : "20a71d"
-                            },
-                            "meta" : {
-                              "globalKey" : "26bfafb"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "e00d198a"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "28cc3"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6,
-                          "rollConvention" : "30"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2018-04-03",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -315,558 +379,406 @@
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
-                            },
-                            "unadjustedDate" : "2018-04-03"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ece3837b"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "CalcPeriodDates1",
-                          "globalKey" : "fc6047de"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2026-08-30",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "accrualBusinessCenters1",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "accrualBusinessCenters1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
                             "meta" : {
                               "globalKey" : "a610fb90"
-                            },
-                            "unadjustedDate" : "2026-08-30"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "a610fb90"
                           }
+                        },
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "20a71d",
+                              "externalReference" : "accrualBusinessCenters1"
+                            },
+                            "meta" : {
+                              "globalKey" : "26bfafb"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "e00d198a"
+                          }
+                        },
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "18ad5"
+                          },
+                          "rollConvention" : "30"
+                        },
+                        "meta" : {
+                          "globalKey" : "1918eaea",
+                          "externalKey" : "CalcPeriodDates1"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "924eb82a"
-                      },
                       "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "4d64ad85"
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                        "payRelativeTo" : "CalculationPeriodEndDate",
                         "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
                             } ],
                             "meta" : {
-                              "externalKey" : "paymentBusinessCenters1",
-                              "globalKey" : "20a71d"
+                              "globalKey" : "20a71d",
+                              "externalKey" : "paymentBusinessCenters1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
-                        "paymentFrequency" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6
-                        }
-                      },
-                      "rateSpecification" : {
-                        "floatingRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
-                            }
-                          }
+                        "meta" : {
+                          "globalKey" : "8f129421"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "CalcPeriodDates1",
-                          "globalReference" : "fc6047de"
+                          "globalReference" : "1918eaea",
+                          "externalReference" : "CalcPeriodDates1"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "2d80ce65"
+                            "globalKey" : "a5cb919"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
                             } ],
                             "meta" : {
-                              "externalKey" : "fixingBusinessCenters0",
-                              "globalKey" : "20a71d"
+                              "globalKey" : "20a71d",
+                              "externalKey" : "fixingBusinessCenters0"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates0",
-                            "globalReference" : "e6388aee"
+                            "globalReference" : "5d766962",
+                            "externalReference" : "resetDates0"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates0",
-                          "globalKey" : "e6388aee"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "paymentBusinessCenters1",
-                              "globalReference" : "20a71d"
+                              "globalReference" : "20a71d",
+                              "externalReference" : "paymentBusinessCenters1"
                             },
                             "meta" : {
                               "globalKey" : "c3690944"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "a10a27d3"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "5d766962",
+                          "externalKey" : "resetDates0"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "886086b6"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "b558f833"
+                      "globalKey" : "63711561"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "5de2362"
+                  "globalKey" : "b3f64090"
                 }
               },
               "meta" : {
-                "globalKey" : "5de2362"
+                "globalKey" : "b3f64090"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "e895b765"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.05,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "value" : 0.05,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
+                    "priceType" : "InterestRate"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
                   }
                 } ],
                 "quantity" : [ {
+                  "value" : {
+                    "value" : 10000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "EUR"
+                      }
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     } ]
-                  },
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "2a21353b"
+                }
+              }, {
+                "quantity" : [ {
                   "value" : {
+                    "value" : 10000,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
-                    },
-                    "value" : 10000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "cf363520"
-                },
+                } ],
                 "observable" : {
-                  "meta" : {
-                    "globalKey" : "bf589e11"
-                  },
                   "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
                     "value" : {
                       "floatingRateIndex" : {
                         "value" : "EUR-EURIBOR-Telerate"
                       },
                       "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "959"
-                        },
+                        "periodMultiplier" : 6,
                         "period" : "M",
-                        "periodMultiplier" : 6
+                        "meta" : {
+                          "globalKey" : "107"
+                        }
                       }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
                     }
-                  }
-                },
-                "quantity" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
-                    } ]
                   },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "EUR"
-                      }
-                    },
-                    "value" : 10000
+                  "meta" : {
+                    "globalKey" : "2bba2221"
                   }
-                } ]
+                },
+                "meta" : {
+                  "globalKey" : "f2214932"
+                }
               } ]
-            } ]
-          },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f1101"
-            },
-            "value" : "2018-04-01"
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "74dee05b",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "b97c11f6",
+                "externalReference" : "party2"
+              }
+            } ]
           },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "LEI1RPT0001",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                },
-                "value" : "LEI1RPT001PREAA"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "b8962566"
               }
             } ],
-            "issuer" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-              },
-              "value" : "LEI1RPT0001"
-            },
-            "meta" : {
-              "globalKey" : "ef62af9b"
+            "name" : {
+              "value" : "Bank X"
             },
-            "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "split" : {
-        "breakdown" : [ {
-          "partyChange" : {
-            "counterparty" : {
-              "partyReference" : {
+            "businessUnit" : [ {
+              "name" : "NY Swaps Desk",
+              "meta" : {
+                "globalKey" : "5c10b72e",
+                "externalKey" : "desk1"
+              }
+            } ],
+            "person" : [ {
+              "personId" : [ {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "party3",
-                    "globalKey" : "f6a2e6"
-                  },
-                  "name" : {
-                    "value" : "Fund 2"
+                  "identifier" : {
+                    "value" : "jjones"
                   },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                      },
-                      "value" : "LEI2CP00A1"
-                    },
-                    "identifierType" : "LEI",
-                    "meta" : {
-                      "globalKey" : "eb8ee0af"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_2"
-            },
-            "tradeId" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "LEI1RPT001POST1"
+                    "globalKey" : "baeb8c0d"
+                  }
                 }
               } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-                },
-                "value" : "LEI1RPT001"
-              },
-              "meta" : {
-                "globalKey" : "494e5747"
-              },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
-          },
-          "quantityChange" : {
-            "change" : [ {
+              "firstName" : "jjone",
               "meta" : {
-                "globalKey" : "b21aa069"
-              },
-              "quantity" : [ {
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "EUR"
-                    }
-                  },
-                  "value" : 7000
-                }
-              } ]
+                "globalKey" : "d3962233",
+                "externalKey" : "trader"
+              }
             } ],
-            "direction" : "REPLACE"
-          }
-        }, {
-          "partyChange" : {
-            "counterparty" : {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "party4",
-                    "globalKey" : "35eaf5a9"
-                  },
-                  "name" : {
-                    "value" : "Fund 3"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                      },
-                      "value" : "LEI3CP00A2"
-                    },
-                    "identifierType" : "LEI",
-                    "meta" : {
-                      "globalKey" : "20751bf1"
-                    }
-                  } ]
+            "meta" : {
+              "globalKey" : "74dee05b",
+              "externalKey" : "party1"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "LEI2CP0002",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                 }
               },
-              "role" : "PARTY_2"
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "eb8edea1"
+              }
+            } ],
+            "name" : {
+              "value" : "Bank Y"
             },
-            "tradeId" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "LEI1RPT001POST2"
-                }
-              } ],
-              "issuer" : {
+            "meta" : {
+              "globalKey" : "b97c11f6",
+              "externalKey" : "party2"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "549300OL8KL0WCQ34V31",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-                },
-                "value" : "LEI1RPT001"
-              },
-              "meta" : {
-                "globalKey" : "494ecba6"
-              },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
-          },
-          "quantityChange" : {
-            "change" : [ {
-              "meta" : {
-                "globalKey" : "de81b365"
-              },
-              "quantity" : [ {
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "EUR"
-                    }
-                  },
-                  "value" : 3000
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                 }
-              } ]
-            } ],
-            "direction" : "REPLACE"
-          }
-        }, {
-          "quantityChange" : {
-            "change" : [ {
-              "meta" : {
-                "globalKey" : "16df72"
               },
-              "quantity" : [ {
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "EUR"
-                    }
-                  },
-                  "value" : 0
-                }
-              } ]
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "8ffabe4b"
+              }
             } ],
-            "direction" : "REPLACE"
+            "name" : {
+              "value" : "Up&Atem"
+            },
+            "meta" : {
+              "globalKey" : "ce0b9311",
+              "externalKey" : "broker1"
+            }
+          } ],
+          "partyRole" : [ {
+            "partyReference" : {
+              "globalReference" : "ce0b9311",
+              "externalReference" : "broker1"
+            },
+            "role" : "ArrangingBroker",
+            "ownershipPartyReference" : {
+              "globalReference" : "74dee05b",
+              "externalReference" : "party1"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "4180dc09"
           }
-        } ]
+        },
+        "meta" : {
+          "globalKey" : "4180dc09"
+        }
       }
     }
   } ],
-  "intent" : "ALLOCATION",
+  "eventQualifier" : "Allocation",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "6a2d9ebc"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "6a2d9ebc"
-      },
-      "party" : [ {
-        "businessUnit" : [ {
-          "meta" : {
-            "externalKey" : "desk1",
-            "globalKey" : "5c10b72e"
-          },
-          "name" : "NY Swaps Desk"
-        } ],
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "fdda73db"
-        },
-        "name" : {
-          "value" : "Bank X"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI1RPT0001"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "b8962566"
-          }
-        } ],
-        "person" : [ {
-          "firstName" : "jjone",
-          "meta" : {
-            "externalKey" : "trader",
-            "globalKey" : "d3962233"
-          },
-          "personId" : [ {
-            "value" : {
-              "identifier" : {
-                "value" : "jjones"
-              },
-              "meta" : {
-                "globalKey" : "baeb8c0d"
-              }
-            }
-          } ]
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "party3",
-          "globalKey" : "f6a2e6"
-        },
-        "name" : {
-          "value" : "Fund 2"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI2CP00A1"
-          },
-          "identifierType" : "LEI",
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "LEI1RPT001",
           "meta" : {
-            "globalKey" : "eb8ee0af"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "broker1",
-          "globalKey" : "ed0cc6d1"
-        },
-        "name" : {
-          "value" : "Up&Atem"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "LEI1RPT001POST1",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300OL8KL0WCQ34V31"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "8ffabe4b"
-          }
-        } ]
-      } ],
-      "partyRole" : [ {
-        "ownershipPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "fdda73db"
-        },
-        "partyReference" : {
-          "externalReference" : "broker1",
-          "globalReference" : "ed0cc6d1"
-        },
-        "role" : "ARRANGING_BROKER"
-      } ],
-      "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "fdda73db"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party3",
-            "globalReference" : "f6a2e6"
-          },
-          "role" : "PARTY_2"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+            }
+          }
         } ],
+        "meta" : {
+          "globalKey" : "651634bf"
+        },
+        "identifierType" : "UniqueTransactionIdentifier"
+      } ],
+      "tradeDate" : {
+        "value" : "2018-04-01",
+        "meta" : {
+          "globalKey" : "3f1101"
+        }
+      },
+      "tradableProduct" : {
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -877,46 +789,42 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "accrualBusinessCenters0",
-                          "globalReference" : "20a71d"
-                        },
-                        "meta" : {
-                          "globalKey" : "26b869c"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "e00ca52b"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "2b934"
-                      },
-                      "period" : "Y",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "30"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -925,135 +833,133 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "CalcPeriodDates0",
-                      "globalKey" : "c154a58c"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-08-30",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
                             } ],
                             "meta" : {
-                              "externalKey" : "accrualBusinessCenters0",
-                              "globalKey" : "20a71d"
+                              "globalKey" : "20a71d",
+                              "externalKey" : "accrualBusinessCenters0"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
                         "meta" : {
                           "globalKey" : "a610fb90"
-                        },
-                        "unadjustedDate" : "2026-08-30"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "a610fb90"
                       }
+                    },
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "20a71d",
+                          "externalReference" : "accrualBusinessCenters0"
+                        },
+                        "meta" : {
+                          "globalKey" : "26b869c"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "e00ca52b"
+                      }
+                    },
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
+                      "meta" : {
+                        "globalKey" : "17984"
+                      },
+                      "rollConvention" : "30"
+                    },
+                    "meta" : {
+                      "globalKey" : "b137acba",
+                      "externalKey" : "CalcPeriodDates0"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "30/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "1d841517"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "4d64aef4"
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
+                      "meta" : {
+                        "globalKey" : "78"
+                      }
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                    "payRelativeTo" : "CalculationPeriodEndDate",
                     "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
                         } ],
                         "meta" : {
-                          "externalKey" : "paymentBusinessCenters0",
-                          "globalKey" : "20a71d"
+                          "globalKey" : "20a71d",
+                          "externalKey" : "paymentBusinessCenters0"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365baaee"
                       }
                     },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "ac8"
-                      },
-                      "period" : "Y",
-                      "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "9b0d9350"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "4e1182b5"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "accrualBusinessCenters1",
-                          "globalReference" : "20a71d"
-                        },
-                        "meta" : {
-                          "globalKey" : "26bfafb"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "e00d198a"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "28cc3"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "30"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -1062,319 +968,294 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "CalcPeriodDates1",
-                      "globalKey" : "fc6047de"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-08-30",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
                             } ],
                             "meta" : {
-                              "externalKey" : "accrualBusinessCenters1",
-                              "globalKey" : "20a71d"
+                              "globalKey" : "20a71d",
+                              "externalKey" : "accrualBusinessCenters1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
                         "meta" : {
                           "globalKey" : "a610fb90"
-                        },
-                        "unadjustedDate" : "2026-08-30"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "a610fb90"
                       }
+                    },
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "20a71d",
+                          "externalReference" : "accrualBusinessCenters1"
+                        },
+                        "meta" : {
+                          "globalKey" : "26bfafb"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "e00d198a"
+                      }
+                    },
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "18ad5"
+                      },
+                      "rollConvention" : "30"
+                    },
+                    "meta" : {
+                      "globalKey" : "1918eaea",
+                      "externalKey" : "CalcPeriodDates1"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "924eb82a"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "4d64ad85"
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                    "payRelativeTo" : "CalculationPeriodEndDate",
                     "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
                         } ],
                         "meta" : {
-                          "externalKey" : "paymentBusinessCenters1",
-                          "globalKey" : "20a71d"
+                          "globalKey" : "20a71d",
+                          "externalKey" : "paymentBusinessCenters1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365baaee"
                       }
                     },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    }
-                  },
-                  "rateSpecification" : {
-                    "floatingRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "8f129421"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "CalcPeriodDates1",
-                      "globalReference" : "fc6047de"
+                      "globalReference" : "1918eaea",
+                      "externalReference" : "CalcPeriodDates1"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "2d80ce65"
+                        "globalKey" : "a5cb919"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
                         } ],
                         "meta" : {
-                          "externalKey" : "fixingBusinessCenters0",
-                          "globalKey" : "20a71d"
+                          "globalKey" : "20a71d",
+                          "externalKey" : "fixingBusinessCenters0"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates0",
-                        "globalReference" : "e6388aee"
+                        "globalReference" : "5d766962",
+                        "externalReference" : "resetDates0"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates0",
-                      "globalKey" : "e6388aee"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "paymentBusinessCenters1",
-                          "globalReference" : "20a71d"
+                          "globalReference" : "20a71d",
+                          "externalReference" : "paymentBusinessCenters1"
                         },
                         "meta" : {
                           "globalKey" : "c3690944"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "a10a27d3"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "5d766962",
+                      "externalKey" : "resetDates0"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "886086b6"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "b558f833"
+                  "globalKey" : "63711561"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "5de2362"
+              "globalKey" : "b3f64090"
             }
           },
           "meta" : {
-            "globalKey" : "5de2362"
+            "globalKey" : "b3f64090"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "78c7bf7d"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.05,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "value" : 0.05,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "EUR"
                   }
-                },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                },
+                "priceType" : "InterestRate"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-1"
+                } ]
+              }
+            } ],
+            "quantity" : [ {
+              "value" : {
+                "value" : 7000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "EUR"
+                  }
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "a0303023"
+            }
+          }, {
+            "quantity" : [ {
               "value" : {
+                "value" : 7000,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
-                },
-                "value" : 7000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "5f683d38"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "bf589e11"
-              },
               "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
                 "value" : {
                   "floatingRateIndex" : {
                     "value" : "EUR-EURIBOR-Telerate"
                   },
                   "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
+                    "periodMultiplier" : 6,
                     "period" : "M",
-                    "periodMultiplier" : 6
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
                 }
-              }
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
-                } ]
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "EUR"
-                  }
-                },
-                "value" : 7000
+              "meta" : {
+                "globalKey" : "2bba2221"
               }
-            } ]
-          } ]
-        } ]
-      },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f1101"
-        },
-        "value" : "2018-04-01"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
             },
-            "value" : "LEI1RPT001POST1"
-          }
+            "meta" : {
+              "globalKey" : "86da134a"
+            }
+          } ]
         } ],
-        "issuer" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-          },
-          "value" : "LEI1RPT001"
-        },
-        "meta" : {
-          "globalKey" : "494e5747"
-        },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
-    }
-  }, {
-    "meta" : {
-      "globalKey" : "5b2af59f"
-    },
-    "trade" : {
-      "meta" : {
-        "globalKey" : "5b2af59f"
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "74dee05b",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "c170e6a6",
+            "externalReference" : "party3"
+          }
+        } ]
       },
       "party" : [ {
-        "businessUnit" : [ {
-          "meta" : {
-            "externalKey" : "desk1",
-            "globalKey" : "5c10b72e"
-          },
-          "name" : "NY Swaps Desk"
-        } ],
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "fdda73db"
-        },
-        "name" : {
-          "value" : "Bank X"
-        },
         "partyId" : [ {
           "identifier" : {
+            "value" : "LEI1RPT0001",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI1RPT0001"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "b8962566"
           }
         } ],
-        "person" : [ {
-          "firstName" : "jjone",
+        "name" : {
+          "value" : "Bank X"
+        },
+        "businessUnit" : [ {
+          "name" : "NY Swaps Desk",
           "meta" : {
-            "externalKey" : "trader",
-            "globalKey" : "d3962233"
-          },
+            "globalKey" : "5c10b72e",
+            "externalKey" : "desk1"
+          }
+        } ],
+        "person" : [ {
           "personId" : [ {
             "value" : {
               "identifier" : {
@@ -1384,74 +1265,105 @@
                 "globalKey" : "baeb8c0d"
               }
             }
-          } ]
-        } ]
-      }, {
+          } ],
+          "firstName" : "jjone",
+          "meta" : {
+            "globalKey" : "d3962233",
+            "externalKey" : "trader"
+          }
+        } ],
         "meta" : {
-          "externalKey" : "party4",
-          "globalKey" : "35eaf5a9"
-        },
-        "name" : {
-          "value" : "Fund 3"
-        },
+          "globalKey" : "74dee05b",
+          "externalKey" : "party1"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "LEI2CP00A1",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI3CP00A2"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
-            "globalKey" : "20751bf1"
+            "globalKey" : "eb8ee0af"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "broker1",
-          "globalKey" : "ed0cc6d1"
-        },
+        } ],
         "name" : {
-          "value" : "Up&Atem"
+          "value" : "Fund 2"
         },
+        "meta" : {
+          "globalKey" : "c170e6a6",
+          "externalKey" : "party3"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "549300OL8KL0WCQ34V31",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300OL8KL0WCQ34V31"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "8ffabe4b"
           }
-        } ]
+        } ],
+        "name" : {
+          "value" : "Up&Atem"
+        },
+        "meta" : {
+          "globalKey" : "ce0b9311",
+          "externalKey" : "broker1"
+        }
       } ],
       "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "ce0b9311",
+          "externalReference" : "broker1"
+        },
+        "role" : "ArrangingBroker",
         "ownershipPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "fdda73db"
+          "globalReference" : "74dee05b",
+          "externalReference" : "party1"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "b50f1a08"
+      }
+    },
+    "meta" : {
+      "globalKey" : "b50f1a08"
+    }
+  }, {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "LEI1RPT001",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+          }
         },
-        "partyReference" : {
-          "externalReference" : "broker1",
-          "globalReference" : "ed0cc6d1"
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "LEI1RPT001POST2",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+            }
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "651634de"
         },
-        "role" : "ARRANGING_BROKER"
+        "identifierType" : "UniqueTransactionIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2018-04-01",
+        "meta" : {
+          "globalKey" : "3f1101"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "fdda73db"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party4",
-            "globalReference" : "35eaf5a9"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -1462,46 +1374,42 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "accrualBusinessCenters0",
-                          "globalReference" : "20a71d"
-                        },
-                        "meta" : {
-                          "globalKey" : "26b869c"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "e00ca52b"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "2b934"
-                      },
-                      "period" : "Y",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "30"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -1510,135 +1418,133 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "CalcPeriodDates0",
-                      "globalKey" : "c154a58c"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-08-30",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
                             } ],
                             "meta" : {
-                              "externalKey" : "accrualBusinessCenters0",
-                              "globalKey" : "20a71d"
+                              "globalKey" : "20a71d",
+                              "externalKey" : "accrualBusinessCenters0"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
                         "meta" : {
                           "globalKey" : "a610fb90"
-                        },
-                        "unadjustedDate" : "2026-08-30"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "a610fb90"
                       }
+                    },
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "20a71d",
+                          "externalReference" : "accrualBusinessCenters0"
+                        },
+                        "meta" : {
+                          "globalKey" : "26b869c"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "e00ca52b"
+                      }
+                    },
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
+                      "meta" : {
+                        "globalKey" : "17984"
+                      },
+                      "rollConvention" : "30"
+                    },
+                    "meta" : {
+                      "globalKey" : "b137acba",
+                      "externalKey" : "CalcPeriodDates0"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "30/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "1d841517"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "4d64aef4"
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
+                      "meta" : {
+                        "globalKey" : "78"
+                      }
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                    "payRelativeTo" : "CalculationPeriodEndDate",
                     "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
                         } ],
                         "meta" : {
-                          "externalKey" : "paymentBusinessCenters0",
-                          "globalKey" : "20a71d"
+                          "globalKey" : "20a71d",
+                          "externalKey" : "paymentBusinessCenters0"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365baaee"
                       }
                     },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "ac8"
-                      },
-                      "period" : "Y",
-                      "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "9b0d9350"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "4e1182b5"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "accrualBusinessCenters1",
-                          "globalReference" : "20a71d"
-                        },
-                        "meta" : {
-                          "globalKey" : "26bfafb"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "e00d198a"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "28cc3"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "30"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -1647,325 +1553,294 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "CalcPeriodDates1",
-                      "globalKey" : "fc6047de"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-08-30",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
                             } ],
                             "meta" : {
-                              "externalKey" : "accrualBusinessCenters1",
-                              "globalKey" : "20a71d"
+                              "globalKey" : "20a71d",
+                              "externalKey" : "accrualBusinessCenters1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
                         "meta" : {
                           "globalKey" : "a610fb90"
-                        },
-                        "unadjustedDate" : "2026-08-30"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "a610fb90"
                       }
+                    },
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "20a71d",
+                          "externalReference" : "accrualBusinessCenters1"
+                        },
+                        "meta" : {
+                          "globalKey" : "26bfafb"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "e00d198a"
+                      }
+                    },
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "18ad5"
+                      },
+                      "rollConvention" : "30"
+                    },
+                    "meta" : {
+                      "globalKey" : "1918eaea",
+                      "externalKey" : "CalcPeriodDates1"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "924eb82a"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "4d64ad85"
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                    "payRelativeTo" : "CalculationPeriodEndDate",
                     "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
                         } ],
                         "meta" : {
-                          "externalKey" : "paymentBusinessCenters1",
-                          "globalKey" : "20a71d"
+                          "globalKey" : "20a71d",
+                          "externalKey" : "paymentBusinessCenters1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365baaee"
                       }
                     },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    }
-                  },
-                  "rateSpecification" : {
-                    "floatingRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "8f129421"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "CalcPeriodDates1",
-                      "globalReference" : "fc6047de"
+                      "globalReference" : "1918eaea",
+                      "externalReference" : "CalcPeriodDates1"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "2d80ce65"
+                        "globalKey" : "a5cb919"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
                         } ],
                         "meta" : {
-                          "externalKey" : "fixingBusinessCenters0",
-                          "globalKey" : "20a71d"
+                          "globalKey" : "20a71d",
+                          "externalKey" : "fixingBusinessCenters0"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates0",
-                        "globalReference" : "e6388aee"
+                        "globalReference" : "5d766962",
+                        "externalReference" : "resetDates0"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates0",
-                      "globalKey" : "e6388aee"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "paymentBusinessCenters1",
-                          "globalReference" : "20a71d"
+                          "globalReference" : "20a71d",
+                          "externalReference" : "paymentBusinessCenters1"
                         },
                         "meta" : {
                           "globalKey" : "c3690944"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "a10a27d3"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "5d766962",
+                      "externalKey" : "resetDates0"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "886086b6"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "b558f833"
+                  "globalKey" : "63711561"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "5de2362"
+              "globalKey" : "b3f64090"
             }
           },
           "meta" : {
-            "globalKey" : "5de2362"
+            "globalKey" : "b3f64090"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "a52ed279"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.05,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "value" : 0.05,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
+                "priceType" : "InterestRate"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-1"
+                } ]
               }
             } ],
             "quantity" : [ {
+              "value" : {
+                "value" : 3000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "EUR"
+                  }
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "ab7ca7"
+            }
+          }, {
+            "quantity" : [ {
               "value" : {
+                "value" : 3000,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
-                },
-                "value" : 3000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "8bcf5034"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "bf589e11"
-              },
               "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
                 "value" : {
                   "floatingRateIndex" : {
                     "value" : "EUR-EURIBOR-Telerate"
                   },
                   "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
+                    "periodMultiplier" : 6,
                     "period" : "M",
-                    "periodMultiplier" : 6
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
                 }
-              }
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
-                } ]
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "EUR"
-                  }
-                },
-                "value" : 3000
+              "meta" : {
+                "globalKey" : "2bba2221"
               }
-            } ]
-          } ]
-        } ]
-      },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f1101"
-        },
-        "value" : "2018-04-01"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
             },
-            "value" : "LEI1RPT001POST2"
+            "meta" : {
+              "globalKey" : "44329b46"
+            }
+          } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "74dee05b",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "55b55969",
+            "externalReference" : "party4"
           }
-        } ],
-        "issuer" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-          },
-          "value" : "LEI1RPT001"
-        },
-        "meta" : {
-          "globalKey" : "494ecba6"
-        },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
-    }
-  }, {
-    "meta" : {
-      "globalKey" : "60903796"
-    },
-    "state" : {
-      "closedState" : {
-        "state" : "TERMINATED"
-      },
-      "positionState" : "CLOSED"
-    },
-    "trade" : {
-      "meta" : {
-        "globalKey" : "a35497c7"
+        } ]
       },
       "party" : [ {
-        "businessUnit" : [ {
-          "meta" : {
-            "externalKey" : "desk1",
-            "globalKey" : "5c10b72e"
-          },
-          "name" : "NY Swaps Desk"
-        } ],
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "fdda73db"
-        },
-        "name" : {
-          "value" : "Bank X"
-        },
         "partyId" : [ {
           "identifier" : {
+            "value" : "LEI1RPT0001",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI1RPT0001"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "b8962566"
           }
         } ],
-        "person" : [ {
-          "firstName" : "jjone",
+        "name" : {
+          "value" : "Bank X"
+        },
+        "businessUnit" : [ {
+          "name" : "NY Swaps Desk",
           "meta" : {
-            "externalKey" : "trader",
-            "globalKey" : "d3962233"
-          },
+            "globalKey" : "5c10b72e",
+            "externalKey" : "desk1"
+          }
+        } ],
+        "person" : [ {
           "personId" : [ {
             "value" : {
               "identifier" : {
@@ -1975,74 +1850,105 @@
                 "globalKey" : "baeb8c0d"
               }
             }
-          } ]
-        } ]
-      }, {
+          } ],
+          "firstName" : "jjone",
+          "meta" : {
+            "globalKey" : "d3962233",
+            "externalKey" : "trader"
+          }
+        } ],
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "ee963b6"
-        },
-        "name" : {
-          "value" : "Bank Y"
-        },
+          "globalKey" : "74dee05b",
+          "externalKey" : "party1"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "LEI3CP00A2",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI2CP0002"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
-            "globalKey" : "eb8edea1"
+            "globalKey" : "20751bf1"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "broker1",
-          "globalKey" : "ed0cc6d1"
-        },
+        } ],
         "name" : {
-          "value" : "Up&Atem"
+          "value" : "Fund 3"
         },
+        "meta" : {
+          "globalKey" : "55b55969",
+          "externalKey" : "party4"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "549300OL8KL0WCQ34V31",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300OL8KL0WCQ34V31"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "8ffabe4b"
           }
-        } ]
+        } ],
+        "name" : {
+          "value" : "Up&Atem"
+        },
+        "meta" : {
+          "globalKey" : "ce0b9311",
+          "externalKey" : "broker1"
+        }
       } ],
       "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "ce0b9311",
+          "externalReference" : "broker1"
+        },
+        "role" : "ArrangingBroker",
         "ownershipPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "fdda73db"
+          "globalReference" : "74dee05b",
+          "externalReference" : "party1"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "e674662b"
+      }
+    },
+    "meta" : {
+      "globalKey" : "e674662b"
+    }
+  }, {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "LEI1RPT0001",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+          }
         },
-        "partyReference" : {
-          "externalReference" : "broker1",
-          "globalReference" : "ed0cc6d1"
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "LEI1RPT001PREAA",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+            }
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "e5010f07"
         },
-        "role" : "ARRANGING_BROKER"
+        "identifierType" : "UniqueTransactionIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2018-04-01",
+        "meta" : {
+          "globalKey" : "3f1101"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "fdda73db"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ee963b6"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -2053,46 +1959,42 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "accrualBusinessCenters0",
-                          "globalReference" : "20a71d"
-                        },
-                        "meta" : {
-                          "globalKey" : "26b869c"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "e00ca52b"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "2b934"
-                      },
-                      "period" : "Y",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "30"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -2101,135 +2003,133 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "CalcPeriodDates0",
-                      "globalKey" : "c154a58c"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-08-30",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
                             } ],
                             "meta" : {
-                              "externalKey" : "accrualBusinessCenters0",
-                              "globalKey" : "20a71d"
+                              "globalKey" : "20a71d",
+                              "externalKey" : "accrualBusinessCenters0"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
                         "meta" : {
                           "globalKey" : "a610fb90"
-                        },
-                        "unadjustedDate" : "2026-08-30"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "a610fb90"
                       }
+                    },
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "20a71d",
+                          "externalReference" : "accrualBusinessCenters0"
+                        },
+                        "meta" : {
+                          "globalKey" : "26b869c"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "e00ca52b"
+                      }
+                    },
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
+                      "meta" : {
+                        "globalKey" : "17984"
+                      },
+                      "rollConvention" : "30"
+                    },
+                    "meta" : {
+                      "globalKey" : "b137acba",
+                      "externalKey" : "CalcPeriodDates0"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "30/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "1d841517"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "4d64aef4"
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
+                      "meta" : {
+                        "globalKey" : "78"
+                      }
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                    "payRelativeTo" : "CalculationPeriodEndDate",
                     "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
                         } ],
                         "meta" : {
-                          "externalKey" : "paymentBusinessCenters0",
-                          "globalKey" : "20a71d"
+                          "globalKey" : "20a71d",
+                          "externalKey" : "paymentBusinessCenters0"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365baaee"
                       }
                     },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "ac8"
-                      },
-                      "period" : "Y",
-                      "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "9b0d9350"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "4e1182b5"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "accrualBusinessCenters1",
-                          "globalReference" : "20a71d"
-                        },
-                        "meta" : {
-                          "globalKey" : "26bfafb"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "e00d198a"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "28cc3"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "30"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -2238,281 +2138,381 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
-                      }
-                    },
-                    "meta" : {
-                      "externalKey" : "CalcPeriodDates1",
-                      "globalKey" : "fc6047de"
+                      }
                     },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-08-30",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
                             } ],
                             "meta" : {
-                              "externalKey" : "accrualBusinessCenters1",
-                              "globalKey" : "20a71d"
+                              "globalKey" : "20a71d",
+                              "externalKey" : "accrualBusinessCenters1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
                         "meta" : {
                           "globalKey" : "a610fb90"
-                        },
-                        "unadjustedDate" : "2026-08-30"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "a610fb90"
                       }
+                    },
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "20a71d",
+                          "externalReference" : "accrualBusinessCenters1"
+                        },
+                        "meta" : {
+                          "globalKey" : "26bfafb"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "e00d198a"
+                      }
+                    },
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "18ad5"
+                      },
+                      "rollConvention" : "30"
+                    },
+                    "meta" : {
+                      "globalKey" : "1918eaea",
+                      "externalKey" : "CalcPeriodDates1"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "924eb82a"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "4d64ad85"
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                    "payRelativeTo" : "CalculationPeriodEndDate",
                     "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
                         } ],
                         "meta" : {
-                          "externalKey" : "paymentBusinessCenters1",
-                          "globalKey" : "20a71d"
+                          "globalKey" : "20a71d",
+                          "externalKey" : "paymentBusinessCenters1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365baaee"
                       }
                     },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    }
-                  },
-                  "rateSpecification" : {
-                    "floatingRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "8f129421"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "CalcPeriodDates1",
-                      "globalReference" : "fc6047de"
+                      "globalReference" : "1918eaea",
+                      "externalReference" : "CalcPeriodDates1"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "2d80ce65"
+                        "globalKey" : "a5cb919"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
                         } ],
                         "meta" : {
-                          "externalKey" : "fixingBusinessCenters0",
-                          "globalKey" : "20a71d"
+                          "globalKey" : "20a71d",
+                          "externalKey" : "fixingBusinessCenters0"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates0",
-                        "globalReference" : "e6388aee"
+                        "globalReference" : "5d766962",
+                        "externalReference" : "resetDates0"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates0",
-                      "globalKey" : "e6388aee"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "paymentBusinessCenters1",
-                          "globalReference" : "20a71d"
+                          "globalReference" : "20a71d",
+                          "externalReference" : "paymentBusinessCenters1"
                         },
                         "meta" : {
                           "globalKey" : "c3690944"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "a10a27d3"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "5d766962",
+                      "externalKey" : "resetDates0"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "886086b6"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "b558f833"
+                  "globalKey" : "63711561"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "5de2362"
+              "globalKey" : "b3f64090"
             }
           },
           "meta" : {
-            "globalKey" : "5de2362"
+            "globalKey" : "b3f64090"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "c6c3fe86"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.05,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "value" : 0.05,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
+                "priceType" : "InterestRate"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-1"
+                } ]
               }
             } ],
             "quantity" : [ {
+              "value" : {
+                "value" : 0,
+                "unit" : {
+                  "currency" : {
+                    "value" : "EUR"
+                  }
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "11bbd23a"
+            }
+          }, {
+            "quantity" : [ {
               "value" : {
+                "value" : 0,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
-                },
-                "value" : 0
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "ad647c41"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "bf589e11"
-              },
               "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
                 "value" : {
                   "floatingRateIndex" : {
                     "value" : "EUR-EURIBOR-Telerate"
                   },
                   "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
+                    "periodMultiplier" : 6,
                     "period" : "M",
-                    "periodMultiplier" : 6
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
                 }
-              }
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
-                } ]
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "EUR"
-                  }
-                },
-                "value" : 0
+              "meta" : {
+                "globalKey" : "2bba2221"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "ddddb13"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "74dee05b",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "b97c11f6",
+            "externalReference" : "party2"
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f1101"
-        },
-        "value" : "2018-04-01"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "LEI1RPT0001",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-            },
-            "value" : "LEI1RPT001PREAA"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "b8962566"
           }
         } ],
-        "issuer" : {
+        "name" : {
+          "value" : "Bank X"
+        },
+        "businessUnit" : [ {
+          "name" : "NY Swaps Desk",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+            "globalKey" : "5c10b72e",
+            "externalKey" : "desk1"
+          }
+        } ],
+        "person" : [ {
+          "personId" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "jjones"
+              },
+              "meta" : {
+                "globalKey" : "baeb8c0d"
+              }
+            }
+          } ],
+          "firstName" : "jjone",
+          "meta" : {
+            "globalKey" : "d3962233",
+            "externalKey" : "trader"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "74dee05b",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "LEI2CP0002",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "eb8edea1"
+          }
+        } ],
+        "name" : {
+          "value" : "Bank Y"
+        },
+        "meta" : {
+          "globalKey" : "b97c11f6",
+          "externalKey" : "party2"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "549300OL8KL0WCQ34V31",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
           },
-          "value" : "LEI1RPT0001"
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "8ffabe4b"
+          }
+        } ],
+        "name" : {
+          "value" : "Up&Atem"
         },
         "meta" : {
-          "globalKey" : "ef62af9b"
+          "globalKey" : "ce0b9311",
+          "externalKey" : "broker1"
+        }
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "ce0b9311",
+          "externalReference" : "broker1"
         },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
+        "role" : "ArrangingBroker",
+        "ownershipPartyReference" : {
+          "globalReference" : "74dee05b",
+          "externalReference" : "party1"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "d7278f29"
+      }
+    },
+    "state" : {
+      "closedState" : {
+        "state" : "Terminated"
+      },
+      "positionState" : "Closed"
+    },
+    "meta" : {
+      "globalKey" : "bb9f738"
     }
   } ],
-  "eventQualifier" : "Allocation",
   "meta" : {
-    "globalKey" : "a55b2ad1"
+    "globalKey" : "30acf055"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/clearing/clearing-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/clearing/clearing-func-output.json
index a91b4e70bc..d6ca22ee47 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/clearing/clearing-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/clearing/clearing-func-output.json
@@ -1,159 +1,176 @@
 {
+  "intent" : "Clearing",
   "eventDate" : "2018-04-01",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "182abb3a"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "182abb3a"
-          },
-          "party" : [ {
-            "businessUnit" : [ {
-              "meta" : {
-                "externalKey" : "desk1",
-                "globalKey" : "5c10b72e"
-              },
-              "name" : "NY Swaps Desk"
-            } ],
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "53076c01"
-            },
-            "name" : {
-              "value" : "Bank X"
+    "primitiveInstruction" : {
+      "split" : {
+        "breakdown" : [ {
+          "partyChange" : {
+            "counterparty" : {
+              "role" : "Party2",
+              "partyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "LEI1DCO",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                      }
+                    },
+                    "identifierType" : "LEI",
+                    "meta" : {
+                      "globalKey" : "328365bf"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "ClearItAll"
+                  },
+                  "meta" : {
+                    "globalKey" : "e92e7048",
+                    "externalKey" : "clearing-svc"
+                  }
+                }
+              }
             },
-            "partyId" : [ {
-              "identifier" : {
+            "tradeId" : [ {
+              "issuer" : {
+                "value" : "LEI1DCO",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI1RPT001"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                }
               },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "d051b20c"
-              }
-            } ],
-            "person" : [ {
-              "firstName" : "jjone",
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "LEI1DCO01BETA",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
+                }
+              } ],
               "meta" : {
-                "externalKey" : "trader",
-                "globalKey" : "d3962233"
+                "globalKey" : "dcbc5547"
               },
-              "personId" : [ {
+              "identifierType" : "UniqueTransactionIdentifier"
+            } ]
+          }
+        }, {
+          "partyChange" : {
+            "counterparty" : {
+              "role" : "Party1",
+              "partyReference" : {
                 "value" : {
-                  "identifier" : {
-                    "value" : "jjones"
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "LEI1DCO",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                      }
+                    },
+                    "identifierType" : "LEI",
+                    "meta" : {
+                      "globalKey" : "328365bf"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "ClearItAll"
                   },
                   "meta" : {
-                    "globalKey" : "baeb8c0d"
+                    "globalKey" : "e92e7048",
+                    "externalKey" : "clearing-svc"
                   }
                 }
-              } ]
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "9a7a6ea8"
-            },
-            "name" : {
-              "value" : "Bank Y"
+              }
             },
-            "partyId" : [ {
-              "identifier" : {
+            "tradeId" : [ {
+              "issuer" : {
+                "value" : "LEI1DCO",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI2CP002"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                }
               },
-              "identifierType" : "LEI",
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "LEI1DCO01GAMMA",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
+                }
+              } ],
               "meta" : {
-                "globalKey" : "771fe993"
-              }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "broker1",
-              "globalKey" : "ed0cc6d1"
-            },
-            "name" : {
-              "value" : "Up&Atem"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "549300OL8KL0WCQ34V31"
+                "globalKey" : "303ad8b0"
               },
-              "identifierType" : "LEI",
+              "identifierType" : "UniqueTransactionIdentifier"
+            } ]
+          }
+        }, {
+          "quantityChange" : {
+            "change" : [ {
+              "quantity" : [ {
+                "value" : {
+                  "value" : 0,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                      }
+                    }
+                  }
+                }
+              } ],
               "meta" : {
-                "globalKey" : "8ffabe4b"
+                "globalKey" : "171b36"
+              }
+            } ],
+            "direction" : "Replace"
+          }
+        } ]
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "LEI1RPT001",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
               }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "clearing-svc",
-              "globalKey" : "b1869788"
-            },
-            "name" : {
-              "value" : "ClearItAll"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "LEI1RPT001ALPHA",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI1DCO"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "328365bf"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                }
               }
-            } ]
-          } ],
-          "partyRole" : [ {
-            "ownershipPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "53076c01"
-            },
-            "partyReference" : {
-              "externalReference" : "clearing-svc",
-              "globalReference" : "b1869788"
+            } ],
+            "meta" : {
+              "globalKey" : "4b51b4b2"
             },
-            "role" : "CLEARING_ORGANIZATION"
+            "identifierType" : "UniqueTransactionIdentifier"
           } ],
+          "tradeDate" : {
+            "value" : "2018-04-01",
+            "meta" : {
+              "globalKey" : "3f1101"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "53076c01"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "9a7a6ea8"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
                   "primaryAssetClass" : {
-                    "value" : "INTEREST_RATE"
+                    "value" : "InterestRate"
                   }
                 }, {
                   "source" : "ISDA",
                   "value" : {
                     "name" : {
+                      "value" : "InterestRate:IRSwap:FixedFloat",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                      },
-                      "value" : "InterestRate:IRSwap:FixedFloat"
+                      }
                     }
                   }
                 }, {
@@ -164,46 +181,40 @@
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
-                            },
-                            "meta" : {
-                              "globalKey" : "da3ebeed"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7dfdd7c"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12d23"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3,
-                          "rollConvention" : "8"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2018-04-03",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -212,103 +223,108 @@
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
-                            },
-                            "unadjustedDate" : "2018-04-03"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ece3837b"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "floatingCalcPeriodDates",
-                          "globalKey" : "7d1c536e"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2026-02-08",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "USNY"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "primaryBusinessCenters",
-                                  "globalKey" : "27e4e9"
+                                  "globalKey" : "27e4e9",
+                                  "externalKey" : "primaryBusinessCenters"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "3662e8ba"
                               }
                             },
                             "meta" : {
                               "globalKey" : "f148ad32"
-                            },
-                            "unadjustedDate" : "2026-02-08"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "f148ad32"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "8c457531"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "27ad0640"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "956"
+                            "globalKey" : "204f"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 3
-                        }
-                      },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                          "rollConvention" : "8"
+                        },
+                        "meta" : {
+                          "globalKey" : "384349f8",
+                          "externalKey" : "floatingCalcPeriodDates"
+                        }
+                      },
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
+                            "globalKey" : "aa"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da3ebeed"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7dfdd7c"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "a88f300c"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "floatingCalcPeriodDates",
-                          "globalReference" : "7d1c536e"
+                          "globalReference" : "384349f8",
+                          "externalReference" : "floatingCalcPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "2fdb52ac"
+                            "globalKey" : "cb73d60"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -317,82 +333,79 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates6",
-                            "globalReference" : "3c119d44"
+                            "globalReference" : "814f4792",
+                            "externalReference" : "resetDates6"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates6",
-                          "globalKey" : "3c119d44"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "814f4792",
+                          "externalKey" : "resetDates6"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "44df37bd"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
-                            },
-                            "meta" : {
-                              "globalKey" : "da3ebeed"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7dfdd7c"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12d80"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6,
-                          "rollConvention" : "8"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "30E/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2018-04-03",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -401,498 +414,397 @@
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
-                            },
-                            "unadjustedDate" : "2018-04-03"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ece3837b"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "fixedCalcPeriodDates",
-                          "globalKey" : "48bdaca5"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2026-02-08",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "primaryBusinessCenters",
-                                  "globalReference" : "27e4e9"
+                                  "globalReference" : "27e4e9",
+                                  "externalReference" : "primaryBusinessCenters"
                                 },
                                 "meta" : {
                                   "globalKey" : "da3ebeed"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "b7dfdd7c"
                               }
                             },
                             "meta" : {
                               "globalKey" : "302a2604"
-                            },
-                            "unadjustedDate" : "2026-02-08"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "302a2604"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "30E/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "b8cbb118"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "27ad0643"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "959"
+                            "globalKey" : "2b92"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 6
+                          "rollConvention" : "8"
+                        },
+                        "meta" : {
+                          "globalKey" : "7442ed37",
+                          "externalKey" : "fixedCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
+                            "globalKey" : "107"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da3ebeed"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7dfdd7c"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "856b8369"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "e5ea95a8"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "d69a847"
+                      "globalKey" : "fcbff6cb"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "bdee4a94"
+                  "globalKey" : "ad449918"
                 }
               },
               "meta" : {
-                "globalKey" : "bdee4a94"
+                "globalKey" : "ad449918"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "e4dda770"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "5f0c6d05"
-                  },
-                  "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
-                    "value" : {
-                      "floatingRateIndex" : {
-                        "value" : "USD-LIBOR-BBA"
-                      },
-                      "indexTenor" : {
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 10000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD",
                         "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
+                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                        }
                       }
                     }
-                  }
-                },
-                "quantity" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
+                  }
+                } ],
+                "observable" : {
+                  "rateOption" : {
+                    "value" : {
+                      "floatingRateIndex" : {
+                        "value" : "USD-LIBOR-BBA"
+                      },
+                      "indexTenor" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
                         "meta" : {
-                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                          "globalKey" : "aa"
+                        }
                       }
                     },
-                    "value" : 10000
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "828026c7"
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "8532effc"
                 },
+                "meta" : {
+                  "globalKey" : "fd32a49c"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.0253,
                     "unit" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
                     },
-                    "value" : 0.0253,
                     "perUnitOf" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 10000,
                     "unit" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
-                    },
-                    "value" : 10000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "212b0f84"
+                }
               } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "fce75581",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "a4f62868",
+                "externalReference" : "party2"
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f1101"
-            },
-            "value" : "2018-04-01"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "LEI1RPT001",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                },
-                "value" : "LEI1RPT001ALPHA"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "d051b20c"
               }
             } ],
-            "issuer" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-              },
-              "value" : "LEI1RPT001"
-            },
-            "meta" : {
-              "globalKey" : "8ea9a67a"
+            "name" : {
+              "value" : "Bank X"
             },
-            "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "split" : {
-        "breakdown" : [ {
-          "partyChange" : {
-            "counterparty" : {
-              "partyReference" : {
+            "businessUnit" : [ {
+              "name" : "NY Swaps Desk",
+              "meta" : {
+                "globalKey" : "5c10b72e",
+                "externalKey" : "desk1"
+              }
+            } ],
+            "person" : [ {
+              "personId" : [ {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "clearing-svc",
-                    "globalKey" : "b1869788"
-                  },
-                  "name" : {
-                    "value" : "ClearItAll"
+                  "identifier" : {
+                    "value" : "jjones"
                   },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                      },
-                      "value" : "LEI1DCO"
-                    },
-                    "identifierType" : "LEI",
-                    "meta" : {
-                      "globalKey" : "328365bf"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_2"
-            },
-            "tradeId" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "LEI1DCO01BETA"
+                    "globalKey" : "baeb8c0d"
+                  }
                 }
               } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-                },
-                "value" : "LEI1DCO"
-              },
+              "firstName" : "jjone",
               "meta" : {
-                "globalKey" : "22185709"
-              },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
-          }
-        }, {
-          "partyChange" : {
-            "counterparty" : {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "clearing-svc",
-                    "globalKey" : "b1869788"
-                  },
-                  "name" : {
-                    "value" : "ClearItAll"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                      },
-                      "value" : "LEI1DCO"
-                    },
-                    "identifierType" : "LEI",
-                    "meta" : {
-                      "globalKey" : "328365bf"
-                    }
-                  } ]
+                "globalKey" : "d3962233",
+                "externalKey" : "trader"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "fce75581",
+              "externalKey" : "party1"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "LEI2CP002",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                 }
               },
-              "role" : "PARTY_1"
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "771fe993"
+              }
+            } ],
+            "name" : {
+              "value" : "Bank Y"
             },
-            "tradeId" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "LEI1DCO01GAMMA"
-                }
-              } ],
-              "issuer" : {
+            "meta" : {
+              "globalKey" : "a4f62868",
+              "externalKey" : "party2"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "549300OL8KL0WCQ34V31",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-                },
-                "value" : "LEI1DCO"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
               },
+              "identifierType" : "LEI",
               "meta" : {
-                "globalKey" : "9003a432"
+                "globalKey" : "8ffabe4b"
+              }
+            } ],
+            "name" : {
+              "value" : "Up&Atem"
+            },
+            "meta" : {
+              "globalKey" : "ce0b9311",
+              "externalKey" : "broker1"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "LEI1DCO",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
-          }
-        }, {
-          "quantityChange" : {
-            "change" : [ {
+              "identifierType" : "LEI",
               "meta" : {
-                "globalKey" : "171b36"
-              },
-              "quantity" : [ {
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 0
-                }
-              } ]
+                "globalKey" : "328365bf"
+              }
             } ],
-            "direction" : "REPLACE"
+            "name" : {
+              "value" : "ClearItAll"
+            },
+            "meta" : {
+              "globalKey" : "e92e7048",
+              "externalKey" : "clearing-svc"
+            }
+          } ],
+          "partyRole" : [ {
+            "partyReference" : {
+              "globalReference" : "e92e7048",
+              "externalReference" : "clearing-svc"
+            },
+            "role" : "ClearingOrganization",
+            "ownershipPartyReference" : {
+              "globalReference" : "fce75581",
+              "externalReference" : "party1"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "9e2c5770"
           }
-        } ]
+        },
+        "meta" : {
+          "globalKey" : "9e2c5770"
+        }
       }
     }
   } ],
-  "intent" : "CLEARING",
+  "eventQualifier" : "ClearedTrade",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "2feb4915"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "2feb4915"
-      },
-      "party" : [ {
-        "businessUnit" : [ {
-          "meta" : {
-            "externalKey" : "desk1",
-            "globalKey" : "5c10b72e"
-          },
-          "name" : "NY Swaps Desk"
-        } ],
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "53076c01"
-        },
-        "name" : {
-          "value" : "Bank X"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI1RPT001"
-          },
-          "identifierType" : "LEI",
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "LEI1DCO",
           "meta" : {
-            "globalKey" : "d051b20c"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
           }
-        } ],
-        "person" : [ {
-          "firstName" : "jjone",
-          "meta" : {
-            "externalKey" : "trader",
-            "globalKey" : "d3962233"
-          },
-          "personId" : [ {
-            "value" : {
-              "identifier" : {
-                "value" : "jjones"
-              },
-              "meta" : {
-                "globalKey" : "baeb8c0d"
-              }
-            }
-          } ]
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "clearing-svc",
-          "globalKey" : "b1869788"
         },
-        "name" : {
-          "value" : "ClearItAll"
-        },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "LEI1DCO01BETA",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI1DCO"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "328365bf"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+            }
           }
-        } ]
-      }, {
+        } ],
         "meta" : {
-          "externalKey" : "broker1",
-          "globalKey" : "ed0cc6d1"
-        },
-        "name" : {
-          "value" : "Up&Atem"
+          "globalKey" : "dcbc5547"
         },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300OL8KL0WCQ34V31"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "8ffabe4b"
-          }
-        } ]
-      } ],
-      "partyRole" : [ {
-        "ownershipPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "53076c01"
-        },
-        "partyReference" : {
-          "externalReference" : "clearing-svc",
-          "globalReference" : "b1869788"
-        },
-        "role" : "CLEARING_ORGANIZATION"
+        "identifierType" : "UniqueTransactionIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2018-04-01",
+        "meta" : {
+          "globalKey" : "3f1101"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "53076c01"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "clearing-svc",
-            "globalReference" : "b1869788"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
               "primaryAssetClass" : {
-                "value" : "INTEREST_RATE"
+                "value" : "InterestRate"
               }
             }, {
               "source" : "ISDA",
               "value" : {
                 "name" : {
+                  "value" : "InterestRate:IRSwap:FixedFloat",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                  },
-                  "value" : "InterestRate:IRSwap:FixedFloat"
+                  }
                 }
               }
             }, {
@@ -903,46 +815,40 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d23"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -951,103 +857,108 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "7d1c536e"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "USNY"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "27e4e9"
+                              "globalKey" : "27e4e9",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "3662e8ba"
                           }
                         },
                         "meta" : {
                           "globalKey" : "f148ad32"
-                        },
-                        "unadjustedDate" : "2026-02-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "f148ad32"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "8c457531"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0640"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "956"
+                        "globalKey" : "204f"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "384349f8",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "a88f300c"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "7d1c536e"
+                      "globalReference" : "384349f8",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "2fdb52ac"
+                        "globalKey" : "cb73d60"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -1056,82 +967,79 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates6",
-                        "globalReference" : "3c119d44"
+                        "globalReference" : "814f4792",
+                        "externalReference" : "resetDates6"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates6",
-                      "globalKey" : "3c119d44"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "814f4792",
+                      "externalKey" : "resetDates6"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "44df37bd"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d80"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30E/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -1140,345 +1048,373 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "48bdaca5"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
                         "meta" : {
                           "globalKey" : "302a2604"
-                        },
-                        "unadjustedDate" : "2026-02-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "302a2604"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "30E/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "b8cbb118"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0643"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "959"
+                        "globalKey" : "2b92"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 6
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "7442ed37",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
+                        "globalKey" : "107"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "856b8369"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e5ea95a8"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "d69a847"
+                  "globalKey" : "fcbff6cb"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "bdee4a94"
+              "globalKey" : "ad449918"
             }
           },
           "meta" : {
-            "globalKey" : "bdee4a94"
+            "globalKey" : "ad449918"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "e4dda770"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "5f0c6d05"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "USD-LIBOR-BBA"
-                  },
-                  "indexTenor" : {
+            "quantity" : [ {
+              "value" : {
+                "value" : 10000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD",
                     "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                    }
                   }
                 }
-              }
-            },
-            "quantity" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "USD-LIBOR-BBA"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                      "globalKey" : "aa"
+                    }
                   }
                 },
-                "value" : 10000
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "828026c7"
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "8532effc"
             },
+            "meta" : {
+              "globalKey" : "fd32a49c"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.0253,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "value" : 0.0253,
                 "perUnitOf" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 10000,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
-                  }
-                },
-                "value" : 10000
-              }
-            } ]
-          } ]
-        } ]
-      },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f1101"
-        },
-        "value" : "2018-04-01"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                    }
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
+              }
+            } ],
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-            },
-            "value" : "LEI1DCO01BETA"
-          }
+              "globalKey" : "212b0f84"
+            }
+          } ]
         } ],
-        "issuer" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-          },
-          "value" : "LEI1DCO"
-        },
-        "meta" : {
-          "globalKey" : "22185709"
-        },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
-    }
-  }, {
-    "meta" : {
-      "globalKey" : "30535505"
-    },
-    "trade" : {
-      "meta" : {
-        "globalKey" : "30535505"
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "fce75581",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "e92e7048",
+            "externalReference" : "clearing-svc"
+          }
+        } ]
       },
       "party" : [ {
-        "meta" : {
-          "externalKey" : "clearing-svc",
-          "globalKey" : "b1869788"
-        },
-        "name" : {
-          "value" : "ClearItAll"
-        },
         "partyId" : [ {
           "identifier" : {
+            "value" : "LEI1RPT001",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI1DCO"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
-            "globalKey" : "328365bf"
+            "globalKey" : "d051b20c"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "9a7a6ea8"
-        },
+        } ],
         "name" : {
-          "value" : "Bank Y"
+          "value" : "Bank X"
         },
+        "businessUnit" : [ {
+          "name" : "NY Swaps Desk",
+          "meta" : {
+            "globalKey" : "5c10b72e",
+            "externalKey" : "desk1"
+          }
+        } ],
+        "person" : [ {
+          "personId" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "jjones"
+              },
+              "meta" : {
+                "globalKey" : "baeb8c0d"
+              }
+            }
+          } ],
+          "firstName" : "jjone",
+          "meta" : {
+            "globalKey" : "d3962233",
+            "externalKey" : "trader"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "fce75581",
+          "externalKey" : "party1"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "LEI1DCO",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI2CP002"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
-            "globalKey" : "771fe993"
+            "globalKey" : "328365bf"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "broker1",
-          "globalKey" : "ed0cc6d1"
-        },
+        } ],
         "name" : {
-          "value" : "Up&Atem"
+          "value" : "ClearItAll"
         },
+        "meta" : {
+          "globalKey" : "e92e7048",
+          "externalKey" : "clearing-svc"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "549300OL8KL0WCQ34V31",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300OL8KL0WCQ34V31"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "8ffabe4b"
           }
-        } ]
+        } ],
+        "name" : {
+          "value" : "Up&Atem"
+        },
+        "meta" : {
+          "globalKey" : "ce0b9311",
+          "externalKey" : "broker1"
+        }
       } ],
       "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "e92e7048",
+          "externalReference" : "clearing-svc"
+        },
+        "role" : "ClearingOrganization",
         "ownershipPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "53076c01"
+          "globalReference" : "fce75581",
+          "externalReference" : "party1"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "98bf4f9"
+      }
+    },
+    "meta" : {
+      "globalKey" : "98bf4f9"
+    }
+  }, {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "LEI1DCO",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+          }
         },
-        "partyReference" : {
-          "externalReference" : "clearing-svc",
-          "globalReference" : "b1869788"
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "LEI1DCO01GAMMA",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+            }
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "303ad8b0"
         },
-        "role" : "CLEARING_ORGANIZATION"
+        "identifierType" : "UniqueTransactionIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2018-04-01",
+        "meta" : {
+          "globalKey" : "3f1101"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "clearing-svc",
-            "globalReference" : "b1869788"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "9a7a6ea8"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
               "primaryAssetClass" : {
-                "value" : "INTEREST_RATE"
+                "value" : "InterestRate"
               }
             }, {
               "source" : "ISDA",
               "value" : {
                 "name" : {
+                  "value" : "InterestRate:IRSwap:FixedFloat",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                  },
-                  "value" : "InterestRate:IRSwap:FixedFloat"
+                  }
                 }
               }
             }, {
@@ -1489,46 +1425,40 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d23"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -1537,103 +1467,108 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "7d1c536e"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "USNY"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "27e4e9"
+                              "globalKey" : "27e4e9",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "3662e8ba"
                           }
                         },
                         "meta" : {
                           "globalKey" : "f148ad32"
-                        },
-                        "unadjustedDate" : "2026-02-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "f148ad32"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "8c457531"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0640"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "956"
+                        "globalKey" : "204f"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "384349f8",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "a88f300c"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "7d1c536e"
+                      "globalReference" : "384349f8",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "2fdb52ac"
+                        "globalKey" : "cb73d60"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -1642,82 +1577,79 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates6",
-                        "globalReference" : "3c119d44"
+                        "globalReference" : "814f4792",
+                        "externalReference" : "resetDates6"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates6",
-                      "globalKey" : "3c119d44"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "814f4792",
+                      "externalKey" : "resetDates6"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "44df37bd"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d80"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30E/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -1726,395 +1658,349 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "48bdaca5"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
                         "meta" : {
                           "globalKey" : "302a2604"
-                        },
-                        "unadjustedDate" : "2026-02-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "302a2604"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "30E/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "b8cbb118"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0643"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "959"
+                        "globalKey" : "2b92"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 6
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "7442ed37",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
+                        "globalKey" : "107"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "856b8369"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e5ea95a8"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "d69a847"
+                  "globalKey" : "fcbff6cb"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "bdee4a94"
+              "globalKey" : "ad449918"
             }
           },
           "meta" : {
-            "globalKey" : "bdee4a94"
+            "globalKey" : "ad449918"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "e4dda770"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "5f0c6d05"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "USD-LIBOR-BBA"
-                  },
-                  "indexTenor" : {
+            "quantity" : [ {
+              "value" : {
+                "value" : 10000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD",
                     "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                    }
                   }
                 }
-              }
-            },
-            "quantity" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "USD-LIBOR-BBA"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                      "globalKey" : "aa"
+                    }
                   }
                 },
-                "value" : 10000
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "828026c7"
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "8532effc"
             },
+            "meta" : {
+              "globalKey" : "fd32a49c"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.0253,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "value" : 0.0253,
                 "perUnitOf" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 10000,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
-                },
-                "value" : 10000
-              }
-            } ]
-          } ]
-        } ]
-      },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f1101"
-        },
-        "value" : "2018-04-01"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-            },
-            "value" : "LEI1DCO01GAMMA"
-          }
-        } ],
-        "issuer" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-          },
-          "value" : "LEI1DCO"
-        },
-        "meta" : {
-          "globalKey" : "9003a432"
-        },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
-    }
-  }, {
-    "meta" : {
-      "globalKey" : "15758fc7"
-    },
-    "state" : {
-      "closedState" : {
-        "state" : "TERMINATED"
-      },
-      "positionState" : "CLOSED"
-    },
-    "trade" : {
-      "meta" : {
-        "globalKey" : "b658acf8"
-      },
-      "party" : [ {
-        "businessUnit" : [ {
-          "meta" : {
-            "externalKey" : "desk1",
-            "globalKey" : "5c10b72e"
-          },
-          "name" : "NY Swaps Desk"
-        } ],
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "53076c01"
-        },
-        "name" : {
-          "value" : "Bank X"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI1RPT001"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "d051b20c"
-          }
-        } ],
-        "person" : [ {
-          "firstName" : "jjone",
-          "meta" : {
-            "externalKey" : "trader",
-            "globalKey" : "d3962233"
-          },
-          "personId" : [ {
-            "value" : {
-              "identifier" : {
-                "value" : "jjones"
+                }
               },
               "meta" : {
-                "globalKey" : "baeb8c0d"
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "212b0f84"
             }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "e92e7048",
+            "externalReference" : "clearing-svc"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "a4f62868",
+            "externalReference" : "party2"
+          }
         } ]
-      }, {
-        "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "9a7a6ea8"
-        },
-        "name" : {
-          "value" : "Bank Y"
-        },
+      },
+      "party" : [ {
         "partyId" : [ {
           "identifier" : {
+            "value" : "LEI1DCO",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI2CP002"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
-            "globalKey" : "771fe993"
+            "globalKey" : "328365bf"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "broker1",
-          "globalKey" : "ed0cc6d1"
-        },
+        } ],
         "name" : {
-          "value" : "Up&Atem"
+          "value" : "ClearItAll"
         },
+        "meta" : {
+          "globalKey" : "e92e7048",
+          "externalKey" : "clearing-svc"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "LEI2CP002",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300OL8KL0WCQ34V31"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
-            "globalKey" : "8ffabe4b"
+            "globalKey" : "771fe993"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "clearing-svc",
-          "globalKey" : "b1869788"
-        },
+        } ],
         "name" : {
-          "value" : "ClearItAll"
+          "value" : "Bank Y"
         },
+        "meta" : {
+          "globalKey" : "a4f62868",
+          "externalKey" : "party2"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "549300OL8KL0WCQ34V31",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI1DCO"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
-            "globalKey" : "328365bf"
+            "globalKey" : "8ffabe4b"
           }
-        } ]
+        } ],
+        "name" : {
+          "value" : "Up&Atem"
+        },
+        "meta" : {
+          "globalKey" : "ce0b9311",
+          "externalKey" : "broker1"
+        }
       } ],
       "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "e92e7048",
+          "externalReference" : "clearing-svc"
+        },
+        "role" : "ClearingOrganization",
         "ownershipPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "53076c01"
+          "globalReference" : "fce75581",
+          "externalReference" : "party1"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "22c186a9"
+      }
+    },
+    "meta" : {
+      "globalKey" : "22c186a9"
+    }
+  }, {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "LEI1RPT001",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+          }
         },
-        "partyReference" : {
-          "externalReference" : "clearing-svc",
-          "globalReference" : "b1869788"
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "LEI1RPT001ALPHA",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+            }
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "4b51b4b2"
         },
-        "role" : "CLEARING_ORGANIZATION"
+        "identifierType" : "UniqueTransactionIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2018-04-01",
+        "meta" : {
+          "globalKey" : "3f1101"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "53076c01"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "9a7a6ea8"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
               "primaryAssetClass" : {
-                "value" : "INTEREST_RATE"
+                "value" : "InterestRate"
               }
             }, {
               "source" : "ISDA",
               "value" : {
                 "name" : {
+                  "value" : "InterestRate:IRSwap:FixedFloat",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                  },
-                  "value" : "InterestRate:IRSwap:FixedFloat"
+                  }
                 }
               }
             }, {
@@ -2125,46 +2011,40 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d23"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -2173,103 +2053,108 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "7d1c536e"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "USNY"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "27e4e9"
+                              "globalKey" : "27e4e9",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "3662e8ba"
                           }
                         },
                         "meta" : {
                           "globalKey" : "f148ad32"
-                        },
-                        "unadjustedDate" : "2026-02-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "f148ad32"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "8c457531"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0640"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "956"
+                        "globalKey" : "204f"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "384349f8",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "a88f300c"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "7d1c536e"
+                      "globalReference" : "384349f8",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "2fdb52ac"
+                        "globalKey" : "cb73d60"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -2278,82 +2163,79 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates6",
-                        "globalReference" : "3c119d44"
+                        "globalReference" : "814f4792",
+                        "externalReference" : "resetDates6"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates6",
-                      "globalKey" : "3c119d44"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "814f4792",
+                      "externalKey" : "resetDates6"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "44df37bd"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d80"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30E/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -2362,240 +2244,358 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "48bdaca5"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "302a2604"
-                        },
-                        "unadjustedDate" : "2026-02-08"
+                          "globalKey" : "302a2604"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "302a2604"
+                      }
+                    },
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "302a2604"
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "2b92"
+                      },
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "7442ed37",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "30E/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "b8cbb118"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0643"
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                    "payRelativeTo" : "CalculationPeriodEndDate",
                     "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
+                    "meta" : {
+                      "globalKey" : "856b8369"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "e5ea95a8"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "d69a847"
+                  "globalKey" : "fcbff6cb"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "bdee4a94"
+              "globalKey" : "ad449918"
             }
           },
           "meta" : {
-            "globalKey" : "bdee4a94"
+            "globalKey" : "ad449918"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "c30bee91"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "5f0c6d05"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "USD-LIBOR-BBA"
-                  },
-                  "indexTenor" : {
+            "quantity" : [ {
+              "value" : {
+                "value" : 0,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD",
                     "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                    }
                   }
                 }
-              }
-            },
-            "quantity" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "USD-LIBOR-BBA"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                      "globalKey" : "aa"
+                    }
                   }
                 },
-                "value" : 0
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "828026c7"
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "6361371d"
             },
+            "meta" : {
+              "globalKey" : "18ef367d"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.0253,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "value" : 0.0253,
                 "perUnitOf" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 0,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
-                },
-                "value" : 0
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "8c5ac83"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "fce75581",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "a4f62868",
+            "externalReference" : "party2"
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f1101"
+      "party" : [ {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "LEI1RPT001",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "d051b20c"
+          }
+        } ],
+        "name" : {
+          "value" : "Bank X"
         },
-        "value" : "2018-04-01"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+        "businessUnit" : [ {
+          "name" : "NY Swaps Desk",
+          "meta" : {
+            "globalKey" : "5c10b72e",
+            "externalKey" : "desk1"
+          }
+        } ],
+        "person" : [ {
+          "personId" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "jjones"
+              },
+              "meta" : {
+                "globalKey" : "baeb8c0d"
+              }
+            }
+          } ],
+          "firstName" : "jjone",
+          "meta" : {
+            "globalKey" : "d3962233",
+            "externalKey" : "trader"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "fce75581",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "LEI2CP002",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-            },
-            "value" : "LEI1RPT001ALPHA"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "771fe993"
           }
         } ],
-        "issuer" : {
+        "name" : {
+          "value" : "Bank Y"
+        },
+        "meta" : {
+          "globalKey" : "a4f62868",
+          "externalKey" : "party2"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "549300OL8KL0WCQ34V31",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+            "globalKey" : "8ffabe4b"
+          }
+        } ],
+        "name" : {
+          "value" : "Up&Atem"
+        },
+        "meta" : {
+          "globalKey" : "ce0b9311",
+          "externalKey" : "broker1"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "LEI1DCO",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
           },
-          "value" : "LEI1RPT001"
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "328365bf"
+          }
+        } ],
+        "name" : {
+          "value" : "ClearItAll"
         },
         "meta" : {
-          "globalKey" : "8ea9a67a"
+          "globalKey" : "e92e7048",
+          "externalKey" : "clearing-svc"
+        }
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "e92e7048",
+          "externalReference" : "clearing-svc"
         },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
+        "role" : "ClearingOrganization",
+        "ownershipPartyReference" : {
+          "globalReference" : "fce75581",
+          "externalReference" : "party1"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "7dbf5810"
+      }
+    },
+    "state" : {
+      "closedState" : {
+        "state" : "Terminated"
+      },
+      "positionState" : "Closed"
+    },
+    "meta" : {
+      "globalKey" : "9de4f49f"
     }
   } ],
-  "eventQualifier" : "ClearedTrade",
   "meta" : {
-    "globalKey" : "ed031db3"
+    "globalKey" : "a5d83871"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/compression/compression-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/compression/compression-func-output.json
index 6a8d7f31b3..ac019f702f 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/compression/compression-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/compression/compression-func-output.json
@@ -1,159 +1,74 @@
 {
+  "intent" : "Compression",
   "eventDate" : "2018-04-03",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "f9a30cad"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "f9a30cad"
-          },
-          "party" : [ {
-            "businessUnit" : [ {
-              "meta" : {
-                "externalKey" : "desk1",
-                "globalKey" : "5c10b72e"
-              },
-              "name" : "NY Swaps Desk"
-            } ],
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "fdda73db"
-            },
-            "name" : {
-              "value" : "Bank X"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI1RPT0001"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "b8962566"
-              }
-            } ],
-            "person" : [ {
-              "firstName" : "jjone",
-              "meta" : {
-                "externalKey" : "trader",
-                "globalKey" : "d3962233"
-              },
-              "personId" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "jjones"
-                  },
+    "primitiveInstruction" : {
+      "quantityChange" : {
+        "change" : [ {
+          "quantity" : [ {
+            "value" : {
+              "value" : 0,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD",
                   "meta" : {
-                    "globalKey" : "baeb8c0d"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
                   }
                 }
-              } ]
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "ee963b6"
-            },
-            "name" : {
-              "value" : "Bank Y"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI2CP0002"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "eb8edea1"
               }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "broker1",
-              "globalKey" : "ed0cc6d1"
-            },
-            "name" : {
-              "value" : "Up&Atem"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "549300OL8KL0WCQ34V31"
-              },
-              "identifierType" : "LEI",
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "171b36"
+          }
+        } ],
+        "direction" : "Replace"
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "LEI1RPT0001",
               "meta" : {
-                "globalKey" : "8ffabe4b"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
               }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "clearing-svc",
-              "globalKey" : "611719a0"
-            },
-            "name" : {
-              "value" : "ClearItAll"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "LEI1RPT0001EEE",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "549300IB5Q45JGNPND58"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "e213e7d7"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                }
               }
-            } ]
-          } ],
-          "partyRole" : [ {
-            "ownershipPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "fdda73db"
-            },
-            "partyReference" : {
-              "externalReference" : "clearing-svc",
-              "globalReference" : "611719a0"
+            } ],
+            "meta" : {
+              "globalKey" : "fe8f32df"
             },
-            "role" : "CLEARING_ORGANIZATION"
+            "identifierType" : "UniqueTransactionIdentifier"
           } ],
+          "tradeDate" : {
+            "value" : "2018-04-01",
+            "meta" : {
+              "globalKey" : "3f1101"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "fdda73db"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ee963b6"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
                   "primaryAssetClass" : {
-                    "value" : "INTEREST_RATE"
+                    "value" : "InterestRate"
                   }
                 }, {
                   "source" : "ISDA",
                   "value" : {
                     "name" : {
+                      "value" : "InterestRate:IRSwap:FixedFloat",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                      },
-                      "value" : "InterestRate:IRSwap:FixedFloat"
+                      }
                     }
                   }
                 }, {
@@ -164,46 +79,40 @@
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
-                            },
-                            "meta" : {
-                              "globalKey" : "da3ebeed"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7dfdd7c"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12d23"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3,
-                          "rollConvention" : "8"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2018-04-03",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -212,103 +121,108 @@
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
-                            },
-                            "unadjustedDate" : "2018-04-03"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ece3837b"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "floatingCalcPeriodDates",
-                          "globalKey" : "7d1c536e"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2026-02-08",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "USNY"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "primaryBusinessCenters",
-                                  "globalKey" : "27e4e9"
+                                  "globalKey" : "27e4e9",
+                                  "externalKey" : "primaryBusinessCenters"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "3662e8ba"
                               }
                             },
                             "meta" : {
                               "globalKey" : "f148ad32"
-                            },
-                            "unadjustedDate" : "2026-02-08"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "f148ad32"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "e2dfebe1"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "27ad0640"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "956"
+                            "globalKey" : "204f"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                          "rollConvention" : "8"
+                        },
+                        "meta" : {
+                          "globalKey" : "384349f8",
+                          "externalKey" : "floatingCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
+                            "globalKey" : "aa"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da3ebeed"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7dfdd7c"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "a88f300c"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "floatingCalcPeriodDates",
-                          "globalReference" : "7d1c536e"
+                          "globalReference" : "384349f8",
+                          "externalReference" : "floatingCalcPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "ab2829fc"
+                            "globalKey" : "880414b0"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -317,82 +231,79 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates71",
-                            "globalReference" : "92ac13f4"
+                            "globalReference" : "d7e9be42",
+                            "externalReference" : "resetDates71"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates71",
-                          "globalKey" : "92ac13f4"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "d7e9be42",
+                          "externalKey" : "resetDates71"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "9b79ae6d"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
-                            },
-                            "meta" : {
-                              "globalKey" : "da3ebeed"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7dfdd7c"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12d80"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6,
-                          "rollConvention" : "8"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "30E/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2018-04-03",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -401,305 +312,251 @@
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
-                            },
-                            "unadjustedDate" : "2018-04-03"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ece3837b"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "fixedCalcPeriodDates",
-                          "globalKey" : "48bdaca5"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2026-02-08",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "primaryBusinessCenters",
-                                  "globalReference" : "27e4e9"
+                                  "globalReference" : "27e4e9",
+                                  "externalReference" : "primaryBusinessCenters"
                                 },
                                 "meta" : {
                                   "globalKey" : "da3ebeed"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "b7dfdd7c"
                               }
                             },
                             "meta" : {
                               "globalKey" : "302a2604"
-                            },
-                            "unadjustedDate" : "2026-02-08"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "302a2604"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "30E/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "b8cbb118"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "27ad0643"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "959"
+                            "globalKey" : "2b92"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 6
+                          "rollConvention" : "8"
+                        },
+                        "meta" : {
+                          "globalKey" : "7442ed37",
+                          "externalKey" : "fixedCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
+                            "globalKey" : "107"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da3ebeed"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7dfdd7c"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "856b8369"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "e5ea95a8"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "30a19397"
+                      "globalKey" : "1ff7e21b"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "e12635e4"
+                  "globalKey" : "d07c8468"
                 }
               },
               "meta" : {
-                "globalKey" : "e12635e4"
+                "globalKey" : "d07c8468"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "e4dda770"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "5f0c6d05"
-                  },
-                  "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
-                    "value" : {
-                      "floatingRateIndex" : {
-                        "value" : "USD-LIBOR-BBA"
-                      },
-                      "indexTenor" : {
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 10000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD",
                         "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
+                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                        }
                       }
                     }
-                  }
-                },
-                "quantity" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
+                  }
+                } ],
+                "observable" : {
+                  "rateOption" : {
+                    "value" : {
+                      "floatingRateIndex" : {
+                        "value" : "USD-LIBOR-BBA"
+                      },
+                      "indexTenor" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
                         "meta" : {
-                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                          "globalKey" : "aa"
+                        }
                       }
                     },
-                    "value" : 10000
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "828026c7"
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "8532effc"
                 },
+                "meta" : {
+                  "globalKey" : "fd32a49c"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.0253,
                     "unit" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
                     },
-                    "value" : 0.0253,
                     "perUnitOf" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 10000,
                     "unit" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
-                    },
-                    "value" : 10000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "212b0f84"
+                }
               } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "74dee05b",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "b97c11f6",
+                "externalReference" : "party2"
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f1101"
-            },
-            "value" : "2018-04-01"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "LEI1RPT0001",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                },
-                "value" : "LEI1RPT0001EEE"
-              }
-            } ],
-            "issuer" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-              },
-              "value" : "LEI1RPT0001"
-            },
-            "meta" : {
-              "globalKey" : "ddf73d73"
-            },
-            "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "quantityChange" : {
-        "change" : [ {
-          "meta" : {
-            "globalKey" : "171b36"
-          },
-          "quantity" : [ {
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                 }
               },
-              "value" : 0
-            }
-          } ]
-        } ],
-        "direction" : "REPLACE"
-      }
-    }
-  }, {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "6e9b3e3f"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "6e9b3e3f"
-          },
-          "party" : [ {
-            "businessUnit" : [ {
+              "identifierType" : "LEI",
               "meta" : {
-                "externalKey" : "desk1",
-                "globalKey" : "5c10b72e"
-              },
-              "name" : "NY Swaps Desk"
+                "globalKey" : "b8962566"
+              }
             } ],
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "fdda73db"
-            },
             "name" : {
               "value" : "Bank X"
             },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI1RPT0001"
-              },
-              "identifierType" : "LEI",
+            "businessUnit" : [ {
+              "name" : "NY Swaps Desk",
               "meta" : {
-                "globalKey" : "b8962566"
+                "globalKey" : "5c10b72e",
+                "externalKey" : "desk1"
               }
             } ],
             "person" : [ {
-              "firstName" : "jjone",
-              "meta" : {
-                "externalKey" : "trader",
-                "globalKey" : "d3962233"
-              },
               "personId" : [ {
                 "value" : {
                   "identifier" : {
@@ -709,108 +566,166 @@
                     "globalKey" : "baeb8c0d"
                   }
                 }
-              } ]
-            } ]
-          }, {
+              } ],
+              "firstName" : "jjone",
+              "meta" : {
+                "globalKey" : "d3962233",
+                "externalKey" : "trader"
+              }
+            } ],
             "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "ee963b6"
-            },
-            "name" : {
-              "value" : "Bank Y"
-            },
+              "globalKey" : "74dee05b",
+              "externalKey" : "party1"
+            }
+          }, {
             "partyId" : [ {
               "identifier" : {
+                "value" : "LEI2CP0002",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI2CP0002"
+                }
               },
               "identifierType" : "LEI",
               "meta" : {
                 "globalKey" : "eb8edea1"
               }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "broker1",
-              "globalKey" : "ed0cc6d1"
-            },
+            } ],
             "name" : {
-              "value" : "Up&Atem"
+              "value" : "Bank Y"
             },
+            "meta" : {
+              "globalKey" : "b97c11f6",
+              "externalKey" : "party2"
+            }
+          }, {
             "partyId" : [ {
               "identifier" : {
+                "value" : "549300OL8KL0WCQ34V31",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "549300OL8KL0WCQ34V31"
+                }
               },
               "identifierType" : "LEI",
               "meta" : {
                 "globalKey" : "8ffabe4b"
               }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "clearing-svc",
-              "globalKey" : "611719a0"
-            },
+            } ],
             "name" : {
-              "value" : "ClearItAll"
+              "value" : "Up&Atem"
             },
+            "meta" : {
+              "globalKey" : "ce0b9311",
+              "externalKey" : "broker1"
+            }
+          }, {
             "partyId" : [ {
               "identifier" : {
+                "value" : "549300IB5Q45JGNPND58",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "549300IB5Q45JGNPND58"
+                }
               },
               "identifierType" : "LEI",
               "meta" : {
                 "globalKey" : "e213e7d7"
               }
-            } ]
+            } ],
+            "name" : {
+              "value" : "ClearItAll"
+            },
+            "meta" : {
+              "globalKey" : "f6a6cc60",
+              "externalKey" : "clearing-svc"
+            }
           } ],
           "partyRole" : [ {
+            "partyReference" : {
+              "globalReference" : "f6a6cc60",
+              "externalReference" : "clearing-svc"
+            },
+            "role" : "ClearingOrganization",
             "ownershipPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "fdda73db"
+              "globalReference" : "74dee05b",
+              "externalReference" : "party1"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "217fb6b7"
+          }
+        },
+        "meta" : {
+          "globalKey" : "217fb6b7"
+        }
+      }
+    }
+  }, {
+    "primitiveInstruction" : {
+      "quantityChange" : {
+        "change" : [ {
+          "quantity" : [ {
+            "value" : {
+              "value" : 0,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                  }
+                }
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "171b36"
+          }
+        } ],
+        "direction" : "Replace"
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "LEI1RPT0001",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+              }
             },
-            "partyReference" : {
-              "externalReference" : "clearing-svc",
-              "globalReference" : "611719a0"
+            "assignedIdentifier" : [ {
+              "identifier" : {
+                "value" : "LEI1RPT0001FFF",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                }
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "fe8fab1e"
             },
-            "role" : "CLEARING_ORGANIZATION"
+            "identifierType" : "UniqueTransactionIdentifier"
           } ],
+          "tradeDate" : {
+            "value" : "2018-04-01",
+            "meta" : {
+              "globalKey" : "3f1101"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "fdda73db"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ee963b6"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
                   "primaryAssetClass" : {
-                    "value" : "INTEREST_RATE"
+                    "value" : "InterestRate"
                   }
                 }, {
                   "source" : "ISDA",
                   "value" : {
                     "name" : {
+                      "value" : "InterestRate:IRSwap:FixedFloat",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                      },
-                      "value" : "InterestRate:IRSwap:FixedFloat"
+                      }
                     }
                   }
                 }, {
@@ -821,46 +736,40 @@
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
-                            },
-                            "meta" : {
-                              "globalKey" : "da3ebeed"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7dfdd7c"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12d23"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3,
-                          "rollConvention" : "8"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2018-04-03",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -869,103 +778,108 @@
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
-                            },
-                            "unadjustedDate" : "2018-04-03"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ece3837b"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "floatingCalcPeriodDates",
-                          "globalKey" : "7d1c536e"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2026-02-08",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "USNY"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "primaryBusinessCenters",
-                                  "globalKey" : "27e4e9"
+                                  "globalKey" : "27e4e9",
+                                  "externalKey" : "primaryBusinessCenters"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "3662e8ba"
                               }
                             },
                             "meta" : {
                               "globalKey" : "f148ad32"
-                            },
-                            "unadjustedDate" : "2026-02-08"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "f148ad32"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "ea919140"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "27ad0640"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "956"
+                            "globalKey" : "204f"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                          "rollConvention" : "8"
+                        },
+                        "meta" : {
+                          "globalKey" : "384349f8",
+                          "externalKey" : "floatingCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
+                            "globalKey" : "aa"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da3ebeed"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7dfdd7c"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "a88f300c"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "floatingCalcPeriodDates",
-                          "globalReference" : "7d1c536e"
+                          "globalReference" : "384349f8",
+                          "externalReference" : "floatingCalcPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "ab2829fd"
+                            "globalKey" : "880414b1"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -974,82 +888,79 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates72",
-                            "globalReference" : "9a5db953"
+                            "globalReference" : "df9b63a1",
+                            "externalReference" : "resetDates72"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates72",
-                          "globalKey" : "9a5db953"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "df9b63a1",
+                          "externalKey" : "resetDates72"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "a32b53cc"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
-                            },
-                            "meta" : {
-                              "globalKey" : "da3ebeed"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7dfdd7c"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12d80"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6,
-                          "rollConvention" : "8"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "30E/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2018-04-03",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -1058,305 +969,251 @@
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
-                            },
-                            "unadjustedDate" : "2018-04-03"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ece3837b"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "fixedCalcPeriodDates",
-                          "globalKey" : "48bdaca5"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2026-02-08",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "primaryBusinessCenters",
-                                  "globalReference" : "27e4e9"
+                                  "globalReference" : "27e4e9",
+                                  "externalReference" : "primaryBusinessCenters"
                                 },
                                 "meta" : {
                                   "globalKey" : "da3ebeed"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "b7dfdd7c"
                               }
                             },
                             "meta" : {
                               "globalKey" : "302a2604"
-                            },
-                            "unadjustedDate" : "2026-02-08"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "302a2604"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "30E/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "b8cbb118"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "27ad0643"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "959"
+                            "globalKey" : "2b92"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 6
+                          "rollConvention" : "8"
+                        },
+                        "meta" : {
+                          "globalKey" : "7442ed37",
+                          "externalKey" : "fixedCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
+                            "globalKey" : "107"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da3ebeed"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7dfdd7c"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "856b8369"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "e5ea95a8"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "243117d8"
+                      "globalKey" : "1387665c"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "d4b5ba25"
+                  "globalKey" : "c40c08a9"
                 }
               },
               "meta" : {
-                "globalKey" : "d4b5ba25"
+                "globalKey" : "c40c08a9"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "40297447"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "5f0c6d05"
-                  },
-                  "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
-                    "value" : {
-                      "floatingRateIndex" : {
-                        "value" : "USD-LIBOR-BBA"
-                      },
-                      "indexTenor" : {
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 6000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD",
                         "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
+                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                        }
                       }
                     }
-                  }
-                },
-                "quantity" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
+                  }
+                } ],
+                "observable" : {
+                  "rateOption" : {
+                    "value" : {
+                      "floatingRateIndex" : {
+                        "value" : "USD-LIBOR-BBA"
+                      },
+                      "indexTenor" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
                         "meta" : {
-                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                          "globalKey" : "aa"
+                        }
                       }
                     },
-                    "value" : 6000
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "828026c7"
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "e07ebcd3"
                 },
+                "meta" : {
+                  "globalKey" : "414190b3"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.0253,
                     "unit" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
                     },
-                    "value" : 0.0253,
                     "perUnitOf" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 6000,
                     "unit" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
-                    },
-                    "value" : 6000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "2f58dd8d"
+                }
               } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "74dee05b",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "b97c11f6",
+                "externalReference" : "party2"
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f1101"
-            },
-            "value" : "2018-04-01"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "LEI1RPT0001",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                },
-                "value" : "LEI1RPT0001FFF"
-              }
-            } ],
-            "issuer" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-              },
-              "value" : "LEI1RPT0001"
-            },
-            "meta" : {
-              "globalKey" : "dfbaa1f2"
-            },
-            "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "quantityChange" : {
-        "change" : [ {
-          "meta" : {
-            "globalKey" : "171b36"
-          },
-          "quantity" : [ {
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                 }
               },
-              "value" : 0
-            }
-          } ]
-        } ],
-        "direction" : "REPLACE"
-      }
-    }
-  }, {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "467b8001"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "467b8001"
-          },
-          "party" : [ {
-            "businessUnit" : [ {
+              "identifierType" : "LEI",
               "meta" : {
-                "externalKey" : "desk1",
-                "globalKey" : "5c10b72e"
-              },
-              "name" : "NY Swaps Desk"
+                "globalKey" : "b8962566"
+              }
             } ],
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "fdda73db"
-            },
             "name" : {
               "value" : "Bank X"
             },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI1RPT0001"
-              },
-              "identifierType" : "LEI",
+            "businessUnit" : [ {
+              "name" : "NY Swaps Desk",
               "meta" : {
-                "globalKey" : "b8962566"
+                "globalKey" : "5c10b72e",
+                "externalKey" : "desk1"
               }
             } ],
             "person" : [ {
-              "firstName" : "jjone",
-              "meta" : {
-                "externalKey" : "trader",
-                "globalKey" : "d3962233"
-              },
               "personId" : [ {
                 "value" : {
                   "identifier" : {
@@ -1366,108 +1223,166 @@
                     "globalKey" : "baeb8c0d"
                   }
                 }
-              } ]
-            } ]
-          }, {
+              } ],
+              "firstName" : "jjone",
+              "meta" : {
+                "globalKey" : "d3962233",
+                "externalKey" : "trader"
+              }
+            } ],
             "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "ee963b6"
-            },
-            "name" : {
-              "value" : "Bank Y"
-            },
+              "globalKey" : "74dee05b",
+              "externalKey" : "party1"
+            }
+          }, {
             "partyId" : [ {
               "identifier" : {
+                "value" : "LEI2CP0002",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI2CP0002"
+                }
               },
               "identifierType" : "LEI",
               "meta" : {
                 "globalKey" : "eb8edea1"
               }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "broker1",
-              "globalKey" : "ed0cc6d1"
-            },
+            } ],
             "name" : {
-              "value" : "Up&Atem"
+              "value" : "Bank Y"
             },
+            "meta" : {
+              "globalKey" : "b97c11f6",
+              "externalKey" : "party2"
+            }
+          }, {
             "partyId" : [ {
               "identifier" : {
+                "value" : "549300OL8KL0WCQ34V31",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "549300OL8KL0WCQ34V31"
+                }
               },
               "identifierType" : "LEI",
               "meta" : {
                 "globalKey" : "8ffabe4b"
               }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "clearing-svc",
-              "globalKey" : "611719a0"
-            },
+            } ],
             "name" : {
-              "value" : "ClearItAll"
+              "value" : "Up&Atem"
             },
+            "meta" : {
+              "globalKey" : "ce0b9311",
+              "externalKey" : "broker1"
+            }
+          }, {
             "partyId" : [ {
               "identifier" : {
+                "value" : "549300IB5Q45JGNPND58",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "549300IB5Q45JGNPND58"
+                }
               },
               "identifierType" : "LEI",
               "meta" : {
                 "globalKey" : "e213e7d7"
               }
-            } ]
+            } ],
+            "name" : {
+              "value" : "ClearItAll"
+            },
+            "meta" : {
+              "globalKey" : "f6a6cc60",
+              "externalKey" : "clearing-svc"
+            }
           } ],
           "partyRole" : [ {
+            "partyReference" : {
+              "globalReference" : "f6a6cc60",
+              "externalReference" : "clearing-svc"
+            },
+            "role" : "ClearingOrganization",
             "ownershipPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "fdda73db"
+              "globalReference" : "74dee05b",
+              "externalReference" : "party1"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "4bc642b5"
+          }
+        },
+        "meta" : {
+          "globalKey" : "4bc642b5"
+        }
+      }
+    }
+  }, {
+    "primitiveInstruction" : {
+      "quantityChange" : {
+        "change" : [ {
+          "quantity" : [ {
+            "value" : {
+              "value" : 0,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                  }
+                }
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "171b36"
+          }
+        } ],
+        "direction" : "Replace"
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "LEI1RPT0001",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+              }
             },
-            "partyReference" : {
-              "externalReference" : "clearing-svc",
-              "globalReference" : "611719a0"
+            "assignedIdentifier" : [ {
+              "identifier" : {
+                "value" : "LEI1RPT0001GGG",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                }
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "fe90235d"
             },
-            "role" : "CLEARING_ORGANIZATION"
+            "identifierType" : "UniqueTransactionIdentifier"
           } ],
+          "tradeDate" : {
+            "value" : "2018-04-01",
+            "meta" : {
+              "globalKey" : "3f1101"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "fdda73db"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ee963b6"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
                   "primaryAssetClass" : {
-                    "value" : "INTEREST_RATE"
+                    "value" : "InterestRate"
                   }
                 }, {
                   "source" : "ISDA",
                   "value" : {
                     "name" : {
+                      "value" : "InterestRate:IRSwap:FixedFloat",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                      },
-                      "value" : "InterestRate:IRSwap:FixedFloat"
+                      }
                     }
                   }
                 }, {
@@ -1478,46 +1393,40 @@
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
-                            },
-                            "meta" : {
-                              "globalKey" : "da3ebeed"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7dfdd7c"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12d23"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3,
-                          "rollConvention" : "8"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2018-04-03",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -1526,103 +1435,108 @@
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
-                            },
-                            "unadjustedDate" : "2018-04-03"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ece3837b"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "floatingCalcPeriodDates",
-                          "globalKey" : "7d1c536e"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2026-02-08",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "USNY"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "primaryBusinessCenters",
-                                  "globalKey" : "27e4e9"
+                                  "globalKey" : "27e4e9",
+                                  "externalKey" : "primaryBusinessCenters"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "3662e8ba"
                               }
                             },
                             "meta" : {
                               "globalKey" : "f148ad32"
-                            },
-                            "unadjustedDate" : "2026-02-08"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "f148ad32"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "f243369f"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "27ad0640"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "956"
+                            "globalKey" : "204f"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                          "rollConvention" : "8"
+                        },
+                        "meta" : {
+                          "globalKey" : "384349f8",
+                          "externalKey" : "floatingCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
+                            "globalKey" : "aa"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da3ebeed"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7dfdd7c"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "a88f300c"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "floatingCalcPeriodDates",
-                          "globalReference" : "7d1c536e"
+                          "globalReference" : "384349f8",
+                          "externalReference" : "floatingCalcPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "ab2829fe"
+                            "globalKey" : "880414b2"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -1631,82 +1545,79 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates73",
-                            "globalReference" : "a20f5eb2"
+                            "globalReference" : "e74d0900",
+                            "externalReference" : "resetDates73"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates73",
-                          "globalKey" : "a20f5eb2"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "e74d0900",
+                          "externalKey" : "resetDates73"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "aadcf92b"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
-                            },
-                            "meta" : {
-                              "globalKey" : "da3ebeed"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7dfdd7c"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12d80"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6,
-                          "rollConvention" : "8"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "30E/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2018-04-03",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -1715,508 +1626,369 @@
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
-                            },
-                            "unadjustedDate" : "2018-04-03"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ece3837b"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "fixedCalcPeriodDates",
-                          "globalKey" : "48bdaca5"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2026-02-08",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "primaryBusinessCenters",
-                                  "globalReference" : "27e4e9"
+                                  "globalReference" : "27e4e9",
+                                  "externalReference" : "primaryBusinessCenters"
                                 },
                                 "meta" : {
                                   "globalKey" : "da3ebeed"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "b7dfdd7c"
                               }
                             },
                             "meta" : {
                               "globalKey" : "302a2604"
-                            },
-                            "unadjustedDate" : "2026-02-08"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "302a2604"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "30E/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "b8cbb118"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "27ad0643"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "959"
+                            "globalKey" : "2b92"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 6
+                          "rollConvention" : "8"
+                        },
+                        "meta" : {
+                          "globalKey" : "7442ed37",
+                          "externalKey" : "fixedCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
+                            "globalKey" : "107"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da3ebeed"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7dfdd7c"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "856b8369"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "e5ea95a8"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "17c09c19"
+                      "globalKey" : "716ea9d"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "c8453e66"
+                  "globalKey" : "b79b8cea"
                 }
               },
               "meta" : {
-                "globalKey" : "c8453e66"
+                "globalKey" : "b79b8cea"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "b433906"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "5f0c6d05"
-                  },
-                  "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
-                    "value" : {
-                      "floatingRateIndex" : {
-                        "value" : "USD-LIBOR-BBA"
-                      },
-                      "indexTenor" : {
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 5000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD",
                         "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
+                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                        }
                       }
                     }
-                  }
-                },
-                "quantity" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
+                  }
+                } ],
+                "observable" : {
+                  "rateOption" : {
+                    "value" : {
+                      "floatingRateIndex" : {
+                        "value" : "USD-LIBOR-BBA"
+                      },
+                      "indexTenor" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
                         "meta" : {
-                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                          "globalKey" : "aa"
+                        }
                       }
                     },
-                    "value" : 5000
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "828026c7"
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "ab988192"
                 },
+                "meta" : {
+                  "globalKey" : "f097b2b2"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.0253,
                     "unit" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
                     },
-                    "value" : 0.0253,
                     "perUnitOf" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 5000,
                     "unit" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
-                    },
-                    "value" : 5000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "c777b0ae"
+                }
               } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "74dee05b",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "b97c11f6",
+                "externalReference" : "party2"
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f1101"
+          "party" : [ {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "LEI1RPT0001",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "b8962566"
+              }
+            } ],
+            "name" : {
+              "value" : "Bank X"
             },
-            "value" : "2018-04-01"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+            "businessUnit" : [ {
+              "name" : "NY Swaps Desk",
+              "meta" : {
+                "globalKey" : "5c10b72e",
+                "externalKey" : "desk1"
+              }
+            } ],
+            "person" : [ {
+              "personId" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "jjones"
+                  },
+                  "meta" : {
+                    "globalKey" : "baeb8c0d"
+                  }
+                }
+              } ],
+              "firstName" : "jjone",
+              "meta" : {
+                "globalKey" : "d3962233",
+                "externalKey" : "trader"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "74dee05b",
+              "externalKey" : "party1"
+            }
+          }, {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "LEI2CP0002",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                },
-                "value" : "LEI1RPT0001GGG"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "eb8edea1"
               }
             } ],
-            "issuer" : {
+            "name" : {
+              "value" : "Bank Y"
+            },
+            "meta" : {
+              "globalKey" : "b97c11f6",
+              "externalKey" : "party2"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "549300OL8KL0WCQ34V31",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                "globalKey" : "8ffabe4b"
+              }
+            } ],
+            "name" : {
+              "value" : "Up&Atem"
+            },
+            "meta" : {
+              "globalKey" : "ce0b9311",
+              "externalKey" : "broker1"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "549300IB5Q45JGNPND58",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
               },
-              "value" : "LEI1RPT0001"
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "e213e7d7"
+              }
+            } ],
+            "name" : {
+              "value" : "ClearItAll"
             },
             "meta" : {
-              "globalKey" : "e17e0671"
+              "globalKey" : "f6a6cc60",
+              "externalKey" : "clearing-svc"
+            }
+          } ],
+          "partyRole" : [ {
+            "partyReference" : {
+              "globalReference" : "f6a6cc60",
+              "externalReference" : "clearing-svc"
             },
-            "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-          } ]
+            "role" : "ClearingOrganization",
+            "ownershipPartyReference" : {
+              "globalReference" : "74dee05b",
+              "externalReference" : "party1"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "1ce9fb3"
+          }
+        },
+        "meta" : {
+          "globalKey" : "1ce9fb3"
         }
       }
-    },
-    "primitiveInstruction" : {
-      "quantityChange" : {
-        "change" : [ {
-          "meta" : {
-            "globalKey" : "171b36"
-          },
-          "quantity" : [ {
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
-                }
-              },
-              "value" : 0
-            }
-          } ]
-        } ],
-        "direction" : "REPLACE"
-      }
-    }
-  }, {
+    }
+  }, {
     "primitiveInstruction" : {
       "execution" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "fdda73db"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ee963b6"
-          },
-          "role" : "PARTY_2"
-        } ],
-        "parties" : [ {
-          "businessUnit" : [ {
-            "meta" : {
-              "externalKey" : "desk1",
-              "globalKey" : "5c10b72e"
-            },
-            "name" : "NY Swaps Desk"
-          } ],
-          "meta" : {
-            "externalKey" : "party1",
-            "globalKey" : "fdda73db"
-          },
-          "name" : {
-            "value" : "Bank X"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "LEI1RPT0001"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "b8962566"
-            }
-          } ],
-          "person" : [ {
-            "firstName" : "jjone",
-            "meta" : {
-              "externalKey" : "trader",
-              "globalKey" : "d3962233"
-            },
-            "personId" : [ {
-              "value" : {
-                "identifier" : {
-                  "value" : "jjones"
-                },
-                "meta" : {
-                  "globalKey" : "baeb8c0d"
-                }
-              }
-            } ]
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party2",
-            "globalKey" : "ee963b6"
-          },
-          "name" : {
-            "value" : "Bank Y"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "LEI2CP0002"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "eb8edea1"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "broker1",
-            "globalKey" : "ed0cc6d1"
-          },
-          "name" : {
-            "value" : "Up&Atem"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300OL8KL0WCQ34V31"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "8ffabe4b"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing-svc",
-            "globalKey" : "611719a0"
-          },
-          "name" : {
-            "value" : "ClearItAll"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND58"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e213e7d7"
-            }
-          } ]
-        } ],
-        "partyRoles" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "fdda73db"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing-svc",
-            "globalReference" : "611719a0"
-          },
-          "role" : "CLEARING_ORGANIZATION"
-        } ],
-        "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "22430af6"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d05"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 3
-                }
-              }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
-                }
-              },
-              "value" : 16000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "c2985382"
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
-                }
-              },
-              "value" : 0.0253,
-              "perUnitOf" : {
-                "currency" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
-                }
-              },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
-                }
-              },
-              "value" : 16000
-            }
-          } ]
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
               "primaryAssetClass" : {
-                "value" : "INTEREST_RATE"
+                "value" : "InterestRate"
               }
             }, {
               "source" : "ISDA",
               "value" : {
                 "name" : {
+                  "value" : "InterestRate:IRSwap:FixedFloat",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                  },
-                  "value" : "InterestRate:IRSwap:FixedFloat"
+                  }
                 }
               }
             }, {
@@ -2227,46 +1999,40 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d23"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -2275,103 +2041,108 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "7d1c536e"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "USNY"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "27e4e9"
+                              "globalKey" : "27e4e9",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "3662e8ba"
                           }
                         },
                         "meta" : {
                           "globalKey" : "f148ad32"
-                        },
-                        "unadjustedDate" : "2026-02-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "f148ad32"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "459ba97b"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0640"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "956"
+                        "globalKey" : "204f"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "384349f8",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "a88f300c"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "7d1c536e"
+                      "globalReference" : "384349f8",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "131ae8a2"
+                        "globalKey" : "eff6d356"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -2380,82 +2151,79 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates",
-                        "globalReference" : "f567d18e"
+                        "globalReference" : "3aa57bdc",
+                        "externalReference" : "resetDates"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates",
-                      "globalKey" : "f567d18e"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "3aa57bdc",
+                      "externalKey" : "resetDates"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "fe356c07"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d80"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30E/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -2464,295 +2232,413 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "48bdaca5"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
                         "meta" : {
                           "globalKey" : "302a2604"
-                        },
-                        "unadjustedDate" : "2026-02-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "302a2604"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "30E/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "b8cbb118"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0643"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "959"
+                        "globalKey" : "2b92"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 6
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "7442ed37",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
+                        "globalKey" : "107"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "856b8369"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e5ea95a8"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "d04b93bd"
+                  "globalKey" : "bfa1e241"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "80d0360a"
+              "globalKey" : "7026848e"
             }
           },
           "meta" : {
-            "globalKey" : "80d0360a"
+            "globalKey" : "7026848e"
           }
         },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f1103"
-          },
-          "value" : "2018-04-03"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-              },
-              "value" : "LEI1RPT0003EFG"
+        "priceQuantity" : [ {
+          "quantity" : [ {
+            "value" : {
+              "value" : 16000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                  }
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
           } ],
-          "issuer" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 3,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
             },
-            "value" : "LEI1RPT0001"
-          },
-          "meta" : {
-            "globalKey" : "47d2b434"
+            "meta" : {
+              "globalKey" : "828026c7"
+            }
           },
-          "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-        } ]
-      }
-    }
-  } ],
-  "intent" : "COMPRESSION",
-  "after" : [ {
-    "meta" : {
-      "globalKey" : "f6ede13a"
-    },
-    "state" : {
-      "closedState" : {
-        "state" : "TERMINATED"
-      },
-      "positionState" : "CLOSED"
-    },
-    "trade" : {
-      "meta" : {
-        "globalKey" : "97d0fe6b"
-      },
-      "party" : [ {
-        "businessUnit" : [ {
           "meta" : {
-            "externalKey" : "desk1",
-            "globalKey" : "5c10b72e"
-          },
-          "name" : "NY Swaps Desk"
-        } ],
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "fdda73db"
-        },
-        "name" : {
-          "value" : "Bank X"
-        },
-        "partyId" : [ {
-          "identifier" : {
+            "globalKey" : "e12dd8a2"
+          }
+        }, {
+          "price" : [ {
+            "value" : {
+              "value" : 0.0253,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                  }
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "USD",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                  }
+                }
+              },
+              "priceType" : "InterestRate"
+            },
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 16000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                  }
+                }
+              }
             },
-            "value" : "LEI1RPT0001"
-          },
-          "identifierType" : "LEI",
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
           "meta" : {
-            "globalKey" : "b8962566"
+            "globalKey" : "90721cbe"
           }
         } ],
-        "person" : [ {
-          "firstName" : "jjone",
-          "meta" : {
-            "externalKey" : "trader",
-            "globalKey" : "d3962233"
-          },
-          "personId" : [ {
-            "value" : {
-              "identifier" : {
-                "value" : "jjones"
-              },
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "74dee05b",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "b97c11f6",
+            "externalReference" : "party2"
+          }
+        } ],
+        "parties" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "LEI1RPT0001",
               "meta" : {
-                "globalKey" : "baeb8c0d"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
               }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "b8962566"
             }
-          } ]
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "ee963b6"
-        },
-        "name" : {
-          "value" : "Bank Y"
-        },
-        "partyId" : [ {
-          "identifier" : {
+          } ],
+          "name" : {
+            "value" : "Bank X"
+          },
+          "businessUnit" : [ {
+            "name" : "NY Swaps Desk",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              "globalKey" : "5c10b72e",
+              "externalKey" : "desk1"
+            }
+          } ],
+          "person" : [ {
+            "personId" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "jjones"
+                },
+                "meta" : {
+                  "globalKey" : "baeb8c0d"
+                }
+              }
+            } ],
+            "firstName" : "jjone",
+            "meta" : {
+              "globalKey" : "d3962233",
+              "externalKey" : "trader"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "74dee05b",
+            "externalKey" : "party1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "LEI2CP0002",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
             },
-            "value" : "LEI2CP0002"
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "eb8edea1"
+            }
+          } ],
+          "name" : {
+            "value" : "Bank Y"
           },
-          "identifierType" : "LEI",
           "meta" : {
-            "globalKey" : "eb8edea1"
+            "globalKey" : "b97c11f6",
+            "externalKey" : "party2"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "broker1",
-          "globalKey" : "ed0cc6d1"
-        },
-        "name" : {
-          "value" : "Up&Atem"
-        },
-        "partyId" : [ {
-          "identifier" : {
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300OL8KL0WCQ34V31",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              "globalKey" : "8ffabe4b"
+            }
+          } ],
+          "name" : {
+            "value" : "Up&Atem"
+          },
+          "meta" : {
+            "globalKey" : "ce0b9311",
+            "externalKey" : "broker1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300IB5Q45JGNPND58",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
             },
-            "value" : "549300OL8KL0WCQ34V31"
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e7d7"
+            }
+          } ],
+          "name" : {
+            "value" : "ClearItAll"
           },
-          "identifierType" : "LEI",
           "meta" : {
-            "globalKey" : "8ffabe4b"
+            "globalKey" : "f6a6cc60",
+            "externalKey" : "clearing-svc"
+          }
+        } ],
+        "partyRoles" : [ {
+          "partyReference" : {
+            "globalReference" : "f6a6cc60",
+            "externalReference" : "clearing-svc"
+          },
+          "role" : "ClearingOrganization",
+          "ownershipPartyReference" : {
+            "globalReference" : "74dee05b",
+            "externalReference" : "party1"
+          }
+        } ],
+        "tradeDate" : {
+          "value" : "2018-04-03",
+          "meta" : {
+            "globalKey" : "3f1103"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "clearing-svc",
-          "globalKey" : "611719a0"
-        },
-        "name" : {
-          "value" : "ClearItAll"
         },
-        "partyId" : [ {
-          "identifier" : {
+        "tradeIdentifier" : [ {
+          "issuer" : {
+            "value" : "LEI1RPT0001",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300IB5Q45JGNPND58"
+            }
           },
-          "identifierType" : "LEI",
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "LEI1RPT0003EFG",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+              }
+            }
+          } ],
           "meta" : {
-            "globalKey" : "e213e7d7"
-          }
+            "globalKey" : "feab65e0"
+          },
+          "identifierType" : "UniqueTransactionIdentifier"
         } ]
-      } ],
-      "partyRole" : [ {
-        "ownershipPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "fdda73db"
+      }
+    }
+  } ],
+  "eventQualifier" : "Compression",
+  "after" : [ {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "LEI1RPT0001",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+          }
         },
-        "partyReference" : {
-          "externalReference" : "clearing-svc",
-          "globalReference" : "611719a0"
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "LEI1RPT0001EEE",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+            }
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "fe8f32df"
         },
-        "role" : "CLEARING_ORGANIZATION"
+        "identifierType" : "UniqueTransactionIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2018-04-01",
+        "meta" : {
+          "globalKey" : "3f1101"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "fdda73db"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ee963b6"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
               "primaryAssetClass" : {
-                "value" : "INTEREST_RATE"
+                "value" : "InterestRate"
               }
             }, {
               "source" : "ISDA",
               "value" : {
                 "name" : {
+                  "value" : "InterestRate:IRSwap:FixedFloat",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                  },
-                  "value" : "InterestRate:IRSwap:FixedFloat"
+                  }
                 }
               }
             }, {
@@ -2763,46 +2649,40 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d23"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -2811,103 +2691,108 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "7d1c536e"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "USNY"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "27e4e9"
+                              "globalKey" : "27e4e9",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "3662e8ba"
                           }
                         },
                         "meta" : {
                           "globalKey" : "f148ad32"
-                        },
-                        "unadjustedDate" : "2026-02-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "f148ad32"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "e2dfebe1"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0640"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "956"
+                        "globalKey" : "204f"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "384349f8",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "a88f300c"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "7d1c536e"
+                      "globalReference" : "384349f8",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "ab2829fc"
+                        "globalKey" : "880414b0"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -2916,82 +2801,79 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates71",
-                        "globalReference" : "92ac13f4"
+                        "globalReference" : "d7e9be42",
+                        "externalReference" : "resetDates71"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates71",
-                      "globalKey" : "92ac13f4"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "d7e9be42",
+                      "externalKey" : "resetDates71"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "9b79ae6d"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d80"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30E/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -3000,284 +2882,251 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "48bdaca5"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
                         "meta" : {
                           "globalKey" : "302a2604"
-                        },
-                        "unadjustedDate" : "2026-02-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "302a2604"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "30E/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "b8cbb118"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0643"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "959"
+                        "globalKey" : "2b92"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 6
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "7442ed37",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
+                        "globalKey" : "107"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "856b8369"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e5ea95a8"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "30a19397"
+                  "globalKey" : "1ff7e21b"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "e12635e4"
+              "globalKey" : "d07c8468"
             }
           },
           "meta" : {
-            "globalKey" : "e12635e4"
+            "globalKey" : "d07c8468"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "c30bee91"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "5f0c6d05"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "USD-LIBOR-BBA"
-                  },
-                  "indexTenor" : {
+            "quantity" : [ {
+              "value" : {
+                "value" : 0,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD",
                     "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                    }
                   }
                 }
-              }
-            },
-            "quantity" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "USD-LIBOR-BBA"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                      "globalKey" : "aa"
+                    }
                   }
                 },
-                "value" : 0
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "828026c7"
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "6361371d"
             },
+            "meta" : {
+              "globalKey" : "18ef367d"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.0253,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "value" : 0.0253,
                 "perUnitOf" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 0,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
-                },
-                "value" : 0
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
-          } ]
-        } ]
-      },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f1101"
-        },
-        "value" : "2018-04-01"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
+            } ],
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-            },
-            "value" : "LEI1RPT0001EEE"
-          }
+              "globalKey" : "8c5ac83"
+            }
+          } ]
         } ],
-        "issuer" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-          },
-          "value" : "LEI1RPT0001"
-        },
-        "meta" : {
-          "globalKey" : "ddf73d73"
-        },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
-    }
-  }, {
-    "meta" : {
-      "globalKey" : "38dc2c7a"
-    },
-    "state" : {
-      "closedState" : {
-        "state" : "TERMINATED"
-      },
-      "positionState" : "CLOSED"
-    },
-    "trade" : {
-      "meta" : {
-        "globalKey" : "d9bf49ab"
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "74dee05b",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "b97c11f6",
+            "externalReference" : "party2"
+          }
+        } ]
       },
       "party" : [ {
-        "businessUnit" : [ {
-          "meta" : {
-            "externalKey" : "desk1",
-            "globalKey" : "5c10b72e"
-          },
-          "name" : "NY Swaps Desk"
-        } ],
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "fdda73db"
-        },
-        "name" : {
-          "value" : "Bank X"
-        },
         "partyId" : [ {
           "identifier" : {
+            "value" : "LEI1RPT0001",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI1RPT0001"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "b8962566"
           }
         } ],
-        "person" : [ {
-          "firstName" : "jjone",
+        "name" : {
+          "value" : "Bank X"
+        },
+        "businessUnit" : [ {
+          "name" : "NY Swaps Desk",
           "meta" : {
-            "externalKey" : "trader",
-            "globalKey" : "d3962233"
-          },
+            "globalKey" : "5c10b72e",
+            "externalKey" : "desk1"
+          }
+        } ],
+        "person" : [ {
           "personId" : [ {
             "value" : {
               "identifier" : {
@@ -3287,108 +3136,145 @@
                 "globalKey" : "baeb8c0d"
               }
             }
-          } ]
-        } ]
-      }, {
+          } ],
+          "firstName" : "jjone",
+          "meta" : {
+            "globalKey" : "d3962233",
+            "externalKey" : "trader"
+          }
+        } ],
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "ee963b6"
-        },
-        "name" : {
-          "value" : "Bank Y"
-        },
+          "globalKey" : "74dee05b",
+          "externalKey" : "party1"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "LEI2CP0002",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI2CP0002"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "eb8edea1"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "broker1",
-          "globalKey" : "ed0cc6d1"
-        },
+        } ],
         "name" : {
-          "value" : "Up&Atem"
+          "value" : "Bank Y"
         },
+        "meta" : {
+          "globalKey" : "b97c11f6",
+          "externalKey" : "party2"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "549300OL8KL0WCQ34V31",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300OL8KL0WCQ34V31"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "8ffabe4b"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "clearing-svc",
-          "globalKey" : "611719a0"
-        },
+        } ],
         "name" : {
-          "value" : "ClearItAll"
+          "value" : "Up&Atem"
         },
+        "meta" : {
+          "globalKey" : "ce0b9311",
+          "externalKey" : "broker1"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "549300IB5Q45JGNPND58",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300IB5Q45JGNPND58"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "e213e7d7"
           }
-        } ]
+        } ],
+        "name" : {
+          "value" : "ClearItAll"
+        },
+        "meta" : {
+          "globalKey" : "f6a6cc60",
+          "externalKey" : "clearing-svc"
+        }
       } ],
       "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "f6a6cc60",
+          "externalReference" : "clearing-svc"
+        },
+        "role" : "ClearingOrganization",
         "ownershipPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "fdda73db"
+          "globalReference" : "74dee05b",
+          "externalReference" : "party1"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "112b757"
+      }
+    },
+    "state" : {
+      "closedState" : {
+        "state" : "Terminated"
+      },
+      "positionState" : "Closed"
+    },
+    "meta" : {
+      "globalKey" : "7e595866"
+    }
+  }, {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "LEI1RPT0001",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+          }
         },
-        "partyReference" : {
-          "externalReference" : "clearing-svc",
-          "globalReference" : "611719a0"
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "LEI1RPT0001FFF",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+            }
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "fe8fab1e"
         },
-        "role" : "CLEARING_ORGANIZATION"
+        "identifierType" : "UniqueTransactionIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2018-04-01",
+        "meta" : {
+          "globalKey" : "3f1101"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "fdda73db"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ee963b6"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
               "primaryAssetClass" : {
-                "value" : "INTEREST_RATE"
+                "value" : "InterestRate"
               }
             }, {
               "source" : "ISDA",
               "value" : {
                 "name" : {
+                  "value" : "InterestRate:IRSwap:FixedFloat",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                  },
-                  "value" : "InterestRate:IRSwap:FixedFloat"
+                  }
                 }
               }
             }, {
@@ -3399,46 +3285,40 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d23"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -3447,103 +3327,108 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "7d1c536e"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "USNY"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "27e4e9"
+                              "globalKey" : "27e4e9",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "3662e8ba"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "f148ad32"
-                        },
-                        "unadjustedDate" : "2026-02-08"
-                      },
-                      "meta" : {
-                        "globalKey" : "f148ad32"
-                      }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "ea919140"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0640"
+                          "globalKey" : "f148ad32"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "f148ad32"
+                      }
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "956"
+                        "globalKey" : "204f"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "384349f8",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "a88f300c"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "7d1c536e"
+                      "globalReference" : "384349f8",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "ab2829fd"
+                        "globalKey" : "880414b1"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -3552,82 +3437,79 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates72",
-                        "globalReference" : "9a5db953"
+                        "globalReference" : "df9b63a1",
+                        "externalReference" : "resetDates72"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates72",
-                      "globalKey" : "9a5db953"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "df9b63a1",
+                      "externalKey" : "resetDates72"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "a32b53cc"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d80"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30E/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -3636,284 +3518,251 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "48bdaca5"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
                         "meta" : {
                           "globalKey" : "302a2604"
-                        },
-                        "unadjustedDate" : "2026-02-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "302a2604"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "30E/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "b8cbb118"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0643"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "959"
+                        "globalKey" : "2b92"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 6
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "7442ed37",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
+                        "globalKey" : "107"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "856b8369"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e5ea95a8"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "243117d8"
+                  "globalKey" : "1387665c"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "d4b5ba25"
+              "globalKey" : "c40c08a9"
             }
           },
           "meta" : {
-            "globalKey" : "d4b5ba25"
+            "globalKey" : "c40c08a9"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "c30bee91"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "5f0c6d05"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "USD-LIBOR-BBA"
-                  },
-                  "indexTenor" : {
+            "quantity" : [ {
+              "value" : {
+                "value" : 0,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD",
                     "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                    }
                   }
                 }
-              }
-            },
-            "quantity" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "USD-LIBOR-BBA"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                      "globalKey" : "aa"
+                    }
                   }
                 },
-                "value" : 0
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "828026c7"
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "6361371d"
             },
+            "meta" : {
+              "globalKey" : "18ef367d"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.0253,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "value" : 0.0253,
                 "perUnitOf" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 0,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
-                },
-                "value" : 0
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
-          } ]
-        } ]
-      },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f1101"
-        },
-        "value" : "2018-04-01"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
+            } ],
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-            },
-            "value" : "LEI1RPT0001FFF"
-          }
+              "globalKey" : "8c5ac83"
+            }
+          } ]
         } ],
-        "issuer" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-          },
-          "value" : "LEI1RPT0001"
-        },
-        "meta" : {
-          "globalKey" : "dfbaa1f2"
-        },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
-    }
-  }, {
-    "meta" : {
-      "globalKey" : "7aca77ba"
-    },
-    "state" : {
-      "closedState" : {
-        "state" : "TERMINATED"
-      },
-      "positionState" : "CLOSED"
-    },
-    "trade" : {
-      "meta" : {
-        "globalKey" : "1bad94eb"
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "74dee05b",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "b97c11f6",
+            "externalReference" : "party2"
+          }
+        } ]
       },
       "party" : [ {
-        "businessUnit" : [ {
-          "meta" : {
-            "externalKey" : "desk1",
-            "globalKey" : "5c10b72e"
-          },
-          "name" : "NY Swaps Desk"
-        } ],
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "fdda73db"
-        },
-        "name" : {
-          "value" : "Bank X"
-        },
         "partyId" : [ {
           "identifier" : {
+            "value" : "LEI1RPT0001",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI1RPT0001"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "b8962566"
           }
         } ],
-        "person" : [ {
-          "firstName" : "jjone",
+        "name" : {
+          "value" : "Bank X"
+        },
+        "businessUnit" : [ {
+          "name" : "NY Swaps Desk",
           "meta" : {
-            "externalKey" : "trader",
-            "globalKey" : "d3962233"
-          },
+            "globalKey" : "5c10b72e",
+            "externalKey" : "desk1"
+          }
+        } ],
+        "person" : [ {
           "personId" : [ {
             "value" : {
               "identifier" : {
@@ -3923,108 +3772,145 @@
                 "globalKey" : "baeb8c0d"
               }
             }
-          } ]
-        } ]
-      }, {
+          } ],
+          "firstName" : "jjone",
+          "meta" : {
+            "globalKey" : "d3962233",
+            "externalKey" : "trader"
+          }
+        } ],
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "ee963b6"
-        },
-        "name" : {
-          "value" : "Bank Y"
-        },
+          "globalKey" : "74dee05b",
+          "externalKey" : "party1"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "LEI2CP0002",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI2CP0002"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "eb8edea1"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "broker1",
-          "globalKey" : "ed0cc6d1"
-        },
+        } ],
         "name" : {
-          "value" : "Up&Atem"
+          "value" : "Bank Y"
         },
+        "meta" : {
+          "globalKey" : "b97c11f6",
+          "externalKey" : "party2"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "549300OL8KL0WCQ34V31",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300OL8KL0WCQ34V31"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "8ffabe4b"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "clearing-svc",
-          "globalKey" : "611719a0"
-        },
+        } ],
         "name" : {
-          "value" : "ClearItAll"
+          "value" : "Up&Atem"
         },
+        "meta" : {
+          "globalKey" : "ce0b9311",
+          "externalKey" : "broker1"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "549300IB5Q45JGNPND58",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300IB5Q45JGNPND58"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "e213e7d7"
           }
-        } ]
+        } ],
+        "name" : {
+          "value" : "ClearItAll"
+        },
+        "meta" : {
+          "globalKey" : "f6a6cc60",
+          "externalKey" : "clearing-svc"
+        }
       } ],
       "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "f6a6cc60",
+          "externalReference" : "clearing-svc"
+        },
+        "role" : "ClearingOrganization",
         "ownershipPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "fdda73db"
+          "globalReference" : "74dee05b",
+          "externalReference" : "party1"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "633828f5"
+      }
+    },
+    "state" : {
+      "closedState" : {
+        "state" : "Terminated"
+      },
+      "positionState" : "Closed"
+    },
+    "meta" : {
+      "globalKey" : "8710cb04"
+    }
+  }, {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "LEI1RPT0001",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+          }
         },
-        "partyReference" : {
-          "externalReference" : "clearing-svc",
-          "globalReference" : "611719a0"
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "LEI1RPT0001GGG",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+            }
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "fe90235d"
         },
-        "role" : "CLEARING_ORGANIZATION"
+        "identifierType" : "UniqueTransactionIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2018-04-01",
+        "meta" : {
+          "globalKey" : "3f1101"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "fdda73db"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ee963b6"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
               "primaryAssetClass" : {
-                "value" : "INTEREST_RATE"
+                "value" : "InterestRate"
               }
             }, {
               "source" : "ISDA",
               "value" : {
                 "name" : {
+                  "value" : "InterestRate:IRSwap:FixedFloat",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                  },
-                  "value" : "InterestRate:IRSwap:FixedFloat"
+                  }
                 }
               }
             }, {
@@ -4035,46 +3921,40 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d23"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -4083,103 +3963,108 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "7d1c536e"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "USNY"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "27e4e9"
+                              "globalKey" : "27e4e9",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "3662e8ba"
                           }
                         },
                         "meta" : {
                           "globalKey" : "f148ad32"
-                        },
-                        "unadjustedDate" : "2026-02-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "f148ad32"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "f243369f"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0640"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "956"
+                        "globalKey" : "204f"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "384349f8",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "a88f300c"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "7d1c536e"
+                      "globalReference" : "384349f8",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "ab2829fe"
+                        "globalKey" : "880414b2"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -4188,82 +4073,79 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates73",
-                        "globalReference" : "a20f5eb2"
+                        "globalReference" : "e74d0900",
+                        "externalReference" : "resetDates73"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates73",
-                      "globalKey" : "a20f5eb2"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "e74d0900",
+                      "externalKey" : "resetDates73"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "aadcf92b"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d80"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30E/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -4272,281 +4154,251 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "48bdaca5"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
                         "meta" : {
                           "globalKey" : "302a2604"
-                        },
-                        "unadjustedDate" : "2026-02-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "302a2604"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "30E/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "b8cbb118"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0643"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "959"
+                        "globalKey" : "2b92"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 6
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "7442ed37",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
+                        "globalKey" : "107"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "856b8369"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e5ea95a8"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "17c09c19"
+                  "globalKey" : "716ea9d"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "c8453e66"
+              "globalKey" : "b79b8cea"
             }
           },
           "meta" : {
-            "globalKey" : "c8453e66"
+            "globalKey" : "b79b8cea"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "c30bee91"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "5f0c6d05"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "USD-LIBOR-BBA"
-                  },
-                  "indexTenor" : {
+            "quantity" : [ {
+              "value" : {
+                "value" : 0,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD",
                     "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                    }
                   }
                 }
-              }
-            },
-            "quantity" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "USD-LIBOR-BBA"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                      "globalKey" : "aa"
+                    }
                   }
                 },
-                "value" : 0
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "828026c7"
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "6361371d"
             },
+            "meta" : {
+              "globalKey" : "18ef367d"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.0253,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "value" : 0.0253,
                 "perUnitOf" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 0,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
-                },
-                "value" : 0
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
-          } ]
-        } ]
-      },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f1101"
-        },
-        "value" : "2018-04-01"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
+            } ],
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-            },
-            "value" : "LEI1RPT0001GGG"
-          }
+              "globalKey" : "8c5ac83"
+            }
+          } ]
         } ],
-        "issuer" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-          },
-          "value" : "LEI1RPT0001"
-        },
-        "meta" : {
-          "globalKey" : "e17e0671"
-        },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
-    }
-  }, {
-    "meta" : {
-      "globalKey" : "31bb8157"
-    },
-    "state" : {
-      "positionState" : "EXECUTED"
-    },
-    "trade" : {
-      "meta" : {
-        "globalKey" : "1c599b88"
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "74dee05b",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "b97c11f6",
+            "externalReference" : "party2"
+          }
+        } ]
       },
       "party" : [ {
-        "businessUnit" : [ {
-          "meta" : {
-            "externalKey" : "desk1",
-            "globalKey" : "5c10b72e"
-          },
-          "name" : "NY Swaps Desk"
-        } ],
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "fdda73db"
-        },
-        "name" : {
-          "value" : "Bank X"
-        },
         "partyId" : [ {
           "identifier" : {
+            "value" : "LEI1RPT0001",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI1RPT0001"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
-            "globalKey" : "b8962566"
+            "globalKey" : "b8962566"
+          }
+        } ],
+        "name" : {
+          "value" : "Bank X"
+        },
+        "businessUnit" : [ {
+          "name" : "NY Swaps Desk",
+          "meta" : {
+            "globalKey" : "5c10b72e",
+            "externalKey" : "desk1"
           }
         } ],
         "person" : [ {
-          "firstName" : "jjone",
-          "meta" : {
-            "externalKey" : "trader",
-            "globalKey" : "d3962233"
-          },
           "personId" : [ {
             "value" : {
               "identifier" : {
@@ -4556,108 +4408,145 @@
                 "globalKey" : "baeb8c0d"
               }
             }
-          } ]
-        } ]
-      }, {
+          } ],
+          "firstName" : "jjone",
+          "meta" : {
+            "globalKey" : "d3962233",
+            "externalKey" : "trader"
+          }
+        } ],
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "ee963b6"
-        },
-        "name" : {
-          "value" : "Bank Y"
-        },
+          "globalKey" : "74dee05b",
+          "externalKey" : "party1"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "LEI2CP0002",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI2CP0002"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "eb8edea1"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "broker1",
-          "globalKey" : "ed0cc6d1"
-        },
+        } ],
         "name" : {
-          "value" : "Up&Atem"
+          "value" : "Bank Y"
         },
+        "meta" : {
+          "globalKey" : "b97c11f6",
+          "externalKey" : "party2"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "549300OL8KL0WCQ34V31",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300OL8KL0WCQ34V31"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "8ffabe4b"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "clearing-svc",
-          "globalKey" : "611719a0"
-        },
+        } ],
         "name" : {
-          "value" : "ClearItAll"
+          "value" : "Up&Atem"
         },
+        "meta" : {
+          "globalKey" : "ce0b9311",
+          "externalKey" : "broker1"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "549300IB5Q45JGNPND58",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300IB5Q45JGNPND58"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "e213e7d7"
           }
-        } ]
+        } ],
+        "name" : {
+          "value" : "ClearItAll"
+        },
+        "meta" : {
+          "globalKey" : "f6a6cc60",
+          "externalKey" : "clearing-svc"
+        }
       } ],
       "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "f6a6cc60",
+          "externalReference" : "clearing-svc"
+        },
+        "role" : "ClearingOrganization",
         "ownershipPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "fdda73db"
+          "globalReference" : "74dee05b",
+          "externalReference" : "party1"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "c55d9a93"
+      }
+    },
+    "state" : {
+      "closedState" : {
+        "state" : "Terminated"
+      },
+      "positionState" : "Closed"
+    },
+    "meta" : {
+      "globalKey" : "8fc83da2"
+    }
+  }, {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "LEI1RPT0001",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "partyReference" : {
-          "externalReference" : "clearing-svc",
-          "globalReference" : "611719a0"
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "LEI1RPT0003EFG",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+            }
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "feab65e0"
         },
-        "role" : "CLEARING_ORGANIZATION"
+        "identifierType" : "UniqueTransactionIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2018-04-03",
+        "meta" : {
+          "globalKey" : "3f1103"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "fdda73db"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ee963b6"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
               "primaryAssetClass" : {
-                "value" : "INTEREST_RATE"
+                "value" : "InterestRate"
               }
             }, {
               "source" : "ISDA",
               "value" : {
                 "name" : {
+                  "value" : "InterestRate:IRSwap:FixedFloat",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                  },
-                  "value" : "InterestRate:IRSwap:FixedFloat"
+                  }
                 }
               }
             }, {
@@ -4668,46 +4557,40 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d23"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -4716,103 +4599,108 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "7d1c536e"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "USNY"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "27e4e9"
+                              "globalKey" : "27e4e9",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "3662e8ba"
                           }
                         },
                         "meta" : {
                           "globalKey" : "f148ad32"
-                        },
-                        "unadjustedDate" : "2026-02-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "f148ad32"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "459ba97b"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0640"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "956"
+                        "globalKey" : "204f"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "384349f8",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "a88f300c"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "7d1c536e"
+                      "globalReference" : "384349f8",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "131ae8a2"
+                        "globalKey" : "eff6d356"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -4821,82 +4709,79 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates",
-                        "globalReference" : "f567d18e"
+                        "globalReference" : "3aa57bdc",
+                        "externalReference" : "resetDates"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates",
-                      "globalKey" : "f567d18e"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "3aa57bdc",
+                      "externalKey" : "resetDates"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "fe356c07"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d80"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30E/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -4905,240 +4790,355 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "48bdaca5"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
                         "meta" : {
                           "globalKey" : "302a2604"
-                        },
-                        "unadjustedDate" : "2026-02-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "302a2604"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "30E/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "b8cbb118"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0643"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "959"
+                        "globalKey" : "2b92"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 6
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "7442ed37",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
+                        "globalKey" : "107"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "856b8369"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e5ea95a8"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "d04b93bd"
+                  "globalKey" : "bfa1e241"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "80d0360a"
+              "globalKey" : "7026848e"
             }
           },
           "meta" : {
-            "globalKey" : "80d0360a"
+            "globalKey" : "7026848e"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "22430af6"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "5f0c6d05"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "USD-LIBOR-BBA"
-                  },
-                  "indexTenor" : {
+            "quantity" : [ {
+              "value" : {
+                "value" : 16000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD",
                     "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                    }
                   }
                 }
-              }
-            },
-            "quantity" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "USD-LIBOR-BBA"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                      "globalKey" : "aa"
+                    }
                   }
                 },
-                "value" : 16000
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "828026c7"
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "c2985382"
             },
+            "meta" : {
+              "globalKey" : "e12dd8a2"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.0253,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "value" : 0.0253,
                 "perUnitOf" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 16000,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
-                },
-                "value" : 16000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "90721cbe"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "74dee05b",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "b97c11f6",
+            "externalReference" : "party2"
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f1103"
+      "party" : [ {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "LEI1RPT0001",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "b8962566"
+          }
+        } ],
+        "name" : {
+          "value" : "Bank X"
         },
-        "value" : "2018-04-03"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+        "businessUnit" : [ {
+          "name" : "NY Swaps Desk",
+          "meta" : {
+            "globalKey" : "5c10b72e",
+            "externalKey" : "desk1"
+          }
+        } ],
+        "person" : [ {
+          "personId" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "jjones"
+              },
+              "meta" : {
+                "globalKey" : "baeb8c0d"
+              }
+            }
+          } ],
+          "firstName" : "jjone",
+          "meta" : {
+            "globalKey" : "d3962233",
+            "externalKey" : "trader"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "74dee05b",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "LEI2CP0002",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-            },
-            "value" : "LEI1RPT0003EFG"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "eb8edea1"
           }
         } ],
-        "issuer" : {
+        "name" : {
+          "value" : "Bank Y"
+        },
+        "meta" : {
+          "globalKey" : "b97c11f6",
+          "externalKey" : "party2"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "549300OL8KL0WCQ34V31",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            "globalKey" : "8ffabe4b"
+          }
+        } ],
+        "name" : {
+          "value" : "Up&Atem"
+        },
+        "meta" : {
+          "globalKey" : "ce0b9311",
+          "externalKey" : "broker1"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "549300IB5Q45JGNPND58",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
           },
-          "value" : "LEI1RPT0001"
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "e213e7d7"
+          }
+        } ],
+        "name" : {
+          "value" : "ClearItAll"
         },
         "meta" : {
-          "globalKey" : "47d2b434"
+          "globalKey" : "f6a6cc60",
+          "externalKey" : "clearing-svc"
+        }
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "f6a6cc60",
+          "externalReference" : "clearing-svc"
         },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
+        "role" : "ClearingOrganization",
+        "ownershipPartyReference" : {
+          "globalReference" : "74dee05b",
+          "externalReference" : "party1"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "ad8d9a52"
+      }
+    },
+    "state" : {
+      "positionState" : "Executed"
+    },
+    "meta" : {
+      "globalKey" : "28fc3561"
     }
   } ],
-  "eventQualifier" : "Compression",
   "meta" : {
-    "globalKey" : "81edefd1"
+    "globalKey" : "ad21b77d"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-basis-swap-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-basis-swap-func-output.json
index 4a5c0683ec..3f4a262c7d 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-basis-swap-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-basis-swap-func-output.json
@@ -1,179 +1,112 @@
 {
+  "intent" : "ContractFormation",
   "eventDate" : "2017-12-18",
   "instruction" : [ {
     "before" : {
       "value" : {
-        "meta" : {
-          "globalKey" : "51a47245"
-        },
         "trade" : {
-          "contractDetails" : {
-            "documentation" : [ {
-              "legalAgreementIdentification" : {
-                "agreementName" : {
-                  "agreementType" : "MASTER_AGREEMENT",
-                  "masterAgreementType" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-                    },
-                    "value" : "ISDA_MASTER"
-                  }
-                }
-              },
-              "meta" : {
-                "globalKey" : "c4592b87"
-              }
-            }, {
-              "legalAgreementIdentification" : {
-                "agreementName" : {
-                  "agreementType" : "CONFIRMATION",
-                  "contractualDefinitionsType" : [ {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-                    },
-                    "value" : "ISDA2006"
-                  } ]
-                }
-              },
-              "meta" : {
-                "globalKey" : "6b413360"
-              }
-            } ],
-            "meta" : {
-              "globalKey" : "bd492439"
-            }
-          },
-          "meta" : {
-            "globalKey" : "51a47245"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "27b20a6a"
+          "tradeIdentifier" : [ {
+            "issuerReference" : {
+              "globalReference" : "cc892602",
+              "externalReference" : "party2"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "LCH00023323008",
                 "meta" : {
-                  "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
-                },
-                "value" : "COUNTERPARTY"
+                  "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/trade-id"
+                }
               },
-              "meta" : {
-                "globalKey" : "27b20a6a"
-              }
-            } ]
-          }, {
+              "version" : 1
+            } ],
             "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "cc892602"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
-                },
-                "value" : "LCHLGB22XXX"
-              },
-              "meta" : {
-                "globalKey" : "cc892602"
-              }
-            } ]
+              "globalKey" : "506da433"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "2017-12-18",
+            "meta" : {
+              "globalKey" : "3f0b12"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "27b20a6a"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "cc892602"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
-                "productIdentifier" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                      },
-                      "value" : "InterestRate:IRSwap:Basis"
-                    },
-                    "meta" : {
-                      "globalKey" : "1d6b2aa0"
-                    },
-                    "source" : "OTHER"
-                  }
-                } ],
                 "productTaxonomy" : [ {
                   "primaryAssetClass" : {
+                    "value" : "InterestRate",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-                    },
-                    "value" : "INTEREST_RATE"
+                    }
                   }
                 }, {
                   "source" : "ISDA",
                   "value" : {
                     "name" : {
+                      "value" : "InterestRate:IRSwap:Basis",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                      },
-                      "value" : "InterestRate:IRSwap:Basis"
+                      }
                     }
                   }
                 }, {
                   "source" : "ISDA",
                   "productQualifier" : "InterestRate_IRSwap_Basis"
                 } ],
+                "productIdentifier" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "InterestRate:IRSwap:Basis",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                      }
+                    },
+                    "source" : "Other",
+                    "meta" : {
+                      "globalKey" : "1d6b2aa0"
+                    }
+                  }
+                } ],
                 "economicTerms" : {
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "CATO"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "1f7359"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-2"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "365a772a"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "80f3fcc7"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3,
-                          "rollConvention" : "IMMCAD"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/365.FIXED"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2020-12-14",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "CATO"
@@ -182,29 +115,23 @@
                                   "globalKey" : "1f7359"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365a772a"
                               }
                             },
                             "meta" : {
                               "globalKey" : "56fd0cdc"
-                            },
-                            "unadjustedDate" : "2020-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "56fd0cdc"
                           }
                         },
-                        "firstRegularPeriodStartDate" : "2021-03-15",
-                        "meta" : {
-                          "externalKey" : "floatingCalcPeriodDates1",
-                          "globalKey" : "bbe81c92"
-                        },
-                        "stubPeriodType" : "LONG_INITIAL",
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2022-12-19",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "CATO"
@@ -213,34 +140,20 @@
                                   "globalKey" : "1f7359"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365a772a"
                               }
                             },
                             "meta" : {
                               "globalKey" : "ad0f37f7"
-                            },
-                            "unadjustedDate" : "2022-12-19"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ad0f37f7"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/365.FIXED"
-                      },
-                      "meta" : {
-                        "globalKey" : "ca0085fb"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "externalKey" : "paymentDates1",
-                          "globalKey" : "c17da7c6"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "CATO"
@@ -249,43 +162,66 @@
                               "globalKey" : "1f7359"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365a772a"
                           }
                         },
-                        "paymentFrequency" : {
+                        "firstRegularPeriodStartDate" : "2021-03-15",
+                        "stubPeriodType" : "LongInitial",
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "956"
+                            "globalKey" : "80f2eff3"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                          "rollConvention" : "IMMCAD"
+                        },
+                        "meta" : {
+                          "globalKey" : "ccdefd78",
+                          "externalKey" : "floatingCalcPeriodDates1"
                         }
                       },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-2"
+                            "globalKey" : "aa"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "CATO"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "1f7359"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "365a772a"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "f05eae9a",
+                          "externalKey" : "paymentDates1"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "floatingCalcPeriodDates1",
-                          "globalReference" : "bbe81c92"
+                          "globalReference" : "ccdefd78",
+                          "externalReference" : "floatingCalcPeriodDates1"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : 0,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "3bafa20d"
+                            "globalKey" : "b1077415"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 0,
+                          "businessDayConvention" : "PRECEDING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "CATO"
@@ -294,17 +230,20 @@
                               "globalKey" : "1f7359"
                             }
                           },
-                          "businessDayConvention" : "PRECEDING",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates1",
-                            "globalReference" : "7720bc0c"
+                            "globalReference" : "144154c2",
+                            "externalReference" : "resetDates1"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates1",
-                          "globalKey" : "7720bc0c"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "CATO"
@@ -313,62 +252,64 @@
                               "globalKey" : "1f7359"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365a772a"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "144154c2",
+                          "externalKey" : "resetDates1"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "18bcd3b7"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "CATO"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "1f7359"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
+                            }
+                          },
+                          "spreadSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "365a772a"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "80f3fc89"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "IMMCAD"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/365.FIXED"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2020-12-14",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "CATO"
@@ -377,29 +318,23 @@
                                   "globalKey" : "1f7359"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365a772a"
                               }
                             },
                             "meta" : {
                               "globalKey" : "56fd0cdc"
-                            },
-                            "unadjustedDate" : "2020-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "56fd0cdc"
                           }
                         },
-                        "firstRegularPeriodStartDate" : "2021-01-18",
-                        "meta" : {
-                          "externalKey" : "floatingCalcPeriodDates2",
-                          "globalKey" : "362f2a17"
-                        },
-                        "stubPeriodType" : "LONG_INITIAL",
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2022-12-19",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "CATO"
@@ -408,36 +343,20 @@
                                   "globalKey" : "1f7359"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365a772a"
                               }
                             },
                             "meta" : {
                               "globalKey" : "ad0f37f7"
-                            },
-                            "unadjustedDate" : "2022-12-19"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ad0f37f7"
                           }
-                        }
-                      },
-                      "compoundingMethod" : "FLAT",
-                      "dayCountFraction" : {
-                        "value" : "ACT/365.FIXED"
-                      },
-                      "meta" : {
-                        "globalKey" : "150ee253"
-                      },
-                      "paymentDates" : {
-                        "firstPaymentDate" : "2021-03-15",
-                        "meta" : {
-                          "externalKey" : "paymentDates2",
-                          "globalKey" : "992df7d7"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "CATO"
@@ -446,51 +365,67 @@
                               "globalKey" : "1f7359"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365a772a"
                           }
                         },
-                        "paymentFrequency" : {
+                        "firstRegularPeriodStartDate" : "2021-01-18",
+                        "stubPeriodType" : "LongInitial",
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "956"
+                            "globalKey" : "80f2e871"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                          "rollConvention" : "IMMCAD"
+                        },
+                        "meta" : {
+                          "globalKey" : "d049c7b9",
+                          "externalKey" : "floatingCalcPeriodDates2"
                         }
                       },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
+                            "globalKey" : "aa"
+                          }
+                        },
+                        "firstPaymentDate" : "2021-03-15",
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "CATO"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "1f7359"
                             }
                           },
-                          "spreadSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "365a772a"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "c80efeab",
+                          "externalKey" : "paymentDates2"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "floatingCalcPeriodDates2",
-                          "globalReference" : "362f2a17"
+                          "globalReference" : "d049c7b9",
+                          "externalReference" : "floatingCalcPeriodDates2"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : 0,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "3bafa20e"
+                            "globalKey" : "b1077416"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 0,
+                          "businessDayConvention" : "PRECEDING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "CATO"
@@ -499,17 +434,20 @@
                               "globalKey" : "1f7359"
                             }
                           },
-                          "businessDayConvention" : "PRECEDING",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates2",
-                            "globalReference" : "c9bbc5c5"
+                            "globalReference" : "fb7dbabf",
+                            "externalReference" : "resetDates2"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates2",
-                          "globalKey" : "c9bbc5c5"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "6c"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "CATO"
@@ -518,355 +456,347 @@
                               "globalKey" : "1f7359"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365a772a"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "954"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 1
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "fb7dbabf",
+                          "externalKey" : "resetDates2"
+                        }
+                      },
+                      "compoundingMethod" : "Flat",
+                      "meta" : {
+                        "globalKey" : "680d94f"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "3e9ad18e"
+                      "globalKey" : "834ec746"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "50e8d987"
+                  "globalKey" : "8cf292ed"
                 }
               },
               "meta" : {
-                "globalKey" : "50e8d987"
+                "globalKey" : "8cf292ed"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "e1baed04"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "76074b0b"
-                  },
-                  "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-2"
-                      } ]
-                    },
-                    "value" : {
-                      "floatingRateIndex" : {
-                        "value" : "CAD-BA-CDOR"
-                      },
-                      "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 634000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "CAD"
                       }
                     }
-                  }
-                },
-                "quantity" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "CAD"
-                      }
-                    },
-                    "value" : 634000000
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "76391948"
-                },
+                } ],
                 "observable" : {
-                  "meta" : {
-                    "globalKey" : "76074b09"
-                  },
                   "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
                     "value" : {
                       "floatingRateIndex" : {
                         "value" : "CAD-BA-CDOR"
                       },
                       "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "954"
-                        },
+                        "periodMultiplier" : 3,
                         "period" : "M",
-                        "periodMultiplier" : 1
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
                       }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-2"
+                      } ]
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "4ae10981"
                   }
                 },
+                "meta" : {
+                  "globalKey" : "30cdb530"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.00121,
                     "unit" : {
                       "currency" : {
                         "value" : "CAD"
                       }
                     },
-                    "value" : 0.00121,
-                    "arithmeticOperator" : "ADD",
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "CAD"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate",
+                    "arithmeticOperator" : "Add"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 634000000,
                     "unit" : {
                       "currency" : {
                         "value" : "CAD"
                       }
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
+                  }
+                } ],
+                "observable" : {
+                  "rateOption" : {
+                    "value" : {
+                      "floatingRateIndex" : {
+                        "value" : "CAD-BA-CDOR"
+                      },
+                      "indexTenor" : {
+                        "periodMultiplier" : 1,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "6c"
+                        }
+                      }
                     },
-                    "value" : 634000000
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "4ae101ff"
                   }
-                } ]
+                },
+                "meta" : {
+                  "globalKey" : "35350988"
+                }
               } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "27b20a6a",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "cc892602",
+                "externalReference" : "party2"
+              }
             } ]
           },
-          "tradeDate" : {
+          "party" : [ {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "COUNTERPARTY",
+                "meta" : {
+                  "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
+                }
+              },
+              "meta" : {
+                "globalKey" : "27b20a6a"
+              }
+            } ],
             "meta" : {
-              "globalKey" : "3f0b12"
-            },
-            "value" : "2017-12-18"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+              "globalKey" : "27b20a6a",
+              "externalKey" : "party1"
+            }
+          }, {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "LCHLGB22XXX",
                 "meta" : {
-                  "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/trade-id"
-                },
-                "value" : "LCH00023323008"
+                  "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
+                }
               },
-              "version" : 1
+              "meta" : {
+                "globalKey" : "cc892602"
+              }
             } ],
-            "issuerReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "cc892602"
-            },
             "meta" : {
-              "globalKey" : "62392b73"
+              "globalKey" : "cc892602",
+              "externalKey" : "party2"
             }
-          } ]
-        }
-      }
-    }
-  } ],
-  "intent" : "CONTRACT_FORMATION",
-  "after" : [ {
-    "meta" : {
-      "globalKey" : "1df079a8"
-    },
-    "state" : {
-      "positionState" : "FORMED"
-    },
-    "trade" : {
-      "contractDetails" : {
-        "documentation" : [ {
-          "legalAgreementIdentification" : {
-            "agreementName" : {
-              "agreementType" : "MASTER_AGREEMENT",
-              "masterAgreementType" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-                },
-                "value" : "ISDA_MASTER"
+          } ],
+          "contractDetails" : {
+            "documentation" : [ {
+              "legalAgreementIdentification" : {
+                "agreementName" : {
+                  "agreementType" : "MasterAgreement",
+                  "masterAgreementType" : {
+                    "value" : "ISDAMaster",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+                    }
+                  }
+                }
+              },
+              "meta" : {
+                "globalKey" : "c4592b87"
               }
+            }, {
+              "legalAgreementIdentification" : {
+                "agreementName" : {
+                  "agreementType" : "Confirmation",
+                  "contractualDefinitionsType" : [ {
+                    "value" : "ISDA2006",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+                    }
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "6b413360"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "bd492439"
             }
           },
           "meta" : {
-            "globalKey" : "c4592b87"
-          }
-        }, {
-          "legalAgreementIdentification" : {
-            "agreementName" : {
-              "agreementType" : "CONFIRMATION",
-              "contractualDefinitionsType" : [ {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-                },
-                "value" : "ISDA2006"
-              } ]
-            }
-          },
-          "meta" : {
-            "globalKey" : "6b413360"
+            "globalKey" : "9a2dd8cf"
           }
-        } ],
+        },
         "meta" : {
-          "globalKey" : "bd492439"
+          "globalKey" : "9a2dd8cf"
         }
-      },
-      "meta" : {
-        "globalKey" : "51a47245"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "27b20a6a"
+      }
+    }
+  } ],
+  "eventQualifier" : "ContractFormation",
+  "after" : [ {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "cc892602",
+          "externalReference" : "party2"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "LCH00023323008",
             "meta" : {
-              "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
-            },
-            "value" : "COUNTERPARTY"
+              "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/trade-id"
+            }
           },
-          "meta" : {
-            "globalKey" : "27b20a6a"
-          }
-        } ]
-      }, {
+          "version" : 1
+        } ],
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "cc892602"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
-            },
-            "value" : "LCHLGB22XXX"
-          },
-          "meta" : {
-            "globalKey" : "cc892602"
-          }
-        } ]
+          "globalKey" : "506da433"
+        }
       } ],
+      "tradeDate" : {
+        "value" : "2017-12-18",
+        "meta" : {
+          "globalKey" : "3f0b12"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "27b20a6a"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "cc892602"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
-            "productIdentifier" : [ {
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                  },
-                  "value" : "InterestRate:IRSwap:Basis"
-                },
-                "meta" : {
-                  "globalKey" : "1d6b2aa0"
-                },
-                "source" : "OTHER"
-              }
-            } ],
             "productTaxonomy" : [ {
               "primaryAssetClass" : {
+                "value" : "InterestRate",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-                },
-                "value" : "INTEREST_RATE"
+                }
               }
             }, {
               "source" : "ISDA",
               "value" : {
                 "name" : {
+                  "value" : "InterestRate:IRSwap:Basis",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                  },
-                  "value" : "InterestRate:IRSwap:Basis"
+                  }
                 }
               }
             }, {
               "source" : "ISDA",
               "productQualifier" : "InterestRate_IRSwap_Basis"
             } ],
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "InterestRate:IRSwap:Basis",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                  }
+                },
+                "source" : "Other",
+                "meta" : {
+                  "globalKey" : "1d6b2aa0"
+                }
+              }
+            } ],
             "economicTerms" : {
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCenter" : [ {
-                          "value" : "CATO"
-                        } ],
-                        "meta" : {
-                          "globalKey" : "1f7359"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-2"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "365a772a"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "80f3fcc7"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "IMMCAD"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/365.FIXED"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2020-12-14",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "CATO"
@@ -875,29 +805,23 @@
                               "globalKey" : "1f7359"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365a772a"
                           }
                         },
                         "meta" : {
                           "globalKey" : "56fd0cdc"
-                        },
-                        "unadjustedDate" : "2020-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "56fd0cdc"
                       }
                     },
-                    "firstRegularPeriodStartDate" : "2021-03-15",
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates1",
-                      "globalKey" : "bbe81c92"
-                    },
-                    "stubPeriodType" : "LONG_INITIAL",
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2022-12-19",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "CATO"
@@ -906,34 +830,20 @@
                               "globalKey" : "1f7359"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365a772a"
                           }
                         },
                         "meta" : {
                           "globalKey" : "ad0f37f7"
-                        },
-                        "unadjustedDate" : "2022-12-19"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ad0f37f7"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/365.FIXED"
-                  },
-                  "meta" : {
-                    "globalKey" : "ca0085fb"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "externalKey" : "paymentDates1",
-                      "globalKey" : "c17da7c6"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CATO"
@@ -942,43 +852,66 @@
                           "globalKey" : "1f7359"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365a772a"
                       }
                     },
-                    "paymentFrequency" : {
+                    "firstRegularPeriodStartDate" : "2021-03-15",
+                    "stubPeriodType" : "LongInitial",
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "956"
+                        "globalKey" : "80f2eff3"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                      "rollConvention" : "IMMCAD"
+                    },
+                    "meta" : {
+                      "globalKey" : "ccdefd78",
+                      "externalKey" : "floatingCalcPeriodDates1"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-2"
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCenter" : [ {
+                          "value" : "CATO"
+                        } ],
+                        "meta" : {
+                          "globalKey" : "1f7359"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "365a772a"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "f05eae9a",
+                      "externalKey" : "paymentDates1"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates1",
-                      "globalReference" : "bbe81c92"
+                      "globalReference" : "ccdefd78",
+                      "externalReference" : "floatingCalcPeriodDates1"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "3bafa20d"
+                        "globalKey" : "b1077415"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
+                      "businessDayConvention" : "PRECEDING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CATO"
@@ -987,17 +920,20 @@
                           "globalKey" : "1f7359"
                         }
                       },
-                      "businessDayConvention" : "PRECEDING",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates1",
-                        "globalReference" : "7720bc0c"
+                        "globalReference" : "144154c2",
+                        "externalReference" : "resetDates1"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates1",
-                      "globalKey" : "7720bc0c"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CATO"
@@ -1006,62 +942,64 @@
                           "globalKey" : "1f7359"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365a772a"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "144154c2",
+                      "externalKey" : "resetDates1"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "18bcd3b7"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCenter" : [ {
-                          "value" : "CATO"
-                        } ],
-                        "meta" : {
-                          "globalKey" : "1f7359"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        }
+                      },
+                      "spreadSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "365a772a"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "80f3fc89"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "IMMCAD"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/365.FIXED"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2020-12-14",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "CATO"
@@ -1070,29 +1008,23 @@
                               "globalKey" : "1f7359"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365a772a"
                           }
                         },
                         "meta" : {
                           "globalKey" : "56fd0cdc"
-                        },
-                        "unadjustedDate" : "2020-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "56fd0cdc"
                       }
                     },
-                    "firstRegularPeriodStartDate" : "2021-01-18",
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates2",
-                      "globalKey" : "362f2a17"
-                    },
-                    "stubPeriodType" : "LONG_INITIAL",
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2022-12-19",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "CATO"
@@ -1101,36 +1033,20 @@
                               "globalKey" : "1f7359"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365a772a"
                           }
                         },
                         "meta" : {
                           "globalKey" : "ad0f37f7"
-                        },
-                        "unadjustedDate" : "2022-12-19"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ad0f37f7"
                       }
-                    }
-                  },
-                  "compoundingMethod" : "FLAT",
-                  "dayCountFraction" : {
-                    "value" : "ACT/365.FIXED"
-                  },
-                  "meta" : {
-                    "globalKey" : "150ee253"
-                  },
-                  "paymentDates" : {
-                    "firstPaymentDate" : "2021-03-15",
-                    "meta" : {
-                      "externalKey" : "paymentDates2",
-                      "globalKey" : "992df7d7"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CATO"
@@ -1139,51 +1055,67 @@
                           "globalKey" : "1f7359"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365a772a"
                       }
                     },
-                    "paymentFrequency" : {
+                    "firstRegularPeriodStartDate" : "2021-01-18",
+                    "stubPeriodType" : "LongInitial",
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "956"
+                        "globalKey" : "80f2e871"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                      "rollConvention" : "IMMCAD"
+                    },
+                    "meta" : {
+                      "globalKey" : "d049c7b9",
+                      "externalKey" : "floatingCalcPeriodDates2"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "firstPaymentDate" : "2021-03-15",
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCenter" : [ {
+                          "value" : "CATO"
+                        } ],
+                        "meta" : {
+                          "globalKey" : "1f7359"
                         }
                       },
-                      "spreadSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
+                      "meta" : {
+                        "globalKey" : "365a772a"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "c80efeab",
+                      "externalKey" : "paymentDates2"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates2",
-                      "globalReference" : "362f2a17"
+                      "globalReference" : "d049c7b9",
+                      "externalReference" : "floatingCalcPeriodDates2"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "3bafa20e"
+                        "globalKey" : "b1077416"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
+                      "businessDayConvention" : "PRECEDING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CATO"
@@ -1192,17 +1124,20 @@
                           "globalKey" : "1f7359"
                         }
                       },
-                      "businessDayConvention" : "PRECEDING",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates2",
-                        "globalReference" : "c9bbc5c5"
+                        "globalReference" : "fb7dbabf",
+                        "externalReference" : "resetDates2"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates2",
-                      "globalKey" : "c9bbc5c5"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "6c"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CATO"
@@ -1211,179 +1146,244 @@
                           "globalKey" : "1f7359"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365a772a"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "954"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 1
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "fb7dbabf",
+                      "externalKey" : "resetDates2"
+                    }
+                  },
+                  "compoundingMethod" : "Flat",
+                  "meta" : {
+                    "globalKey" : "680d94f"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "3e9ad18e"
+                  "globalKey" : "834ec746"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "50e8d987"
+              "globalKey" : "8cf292ed"
             }
           },
           "meta" : {
-            "globalKey" : "50e8d987"
+            "globalKey" : "8cf292ed"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "e1baed04"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "76074b0b"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-2"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "CAD-BA-CDOR"
-                  },
-                  "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+            "quantity" : [ {
+              "value" : {
+                "value" : 634000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "CAD"
                   }
                 }
-              }
-            },
-            "quantity" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "CAD"
-                  }
-                },
-                "value" : 634000000
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "76391948"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "76074b09"
-              },
               "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
                 "value" : {
                   "floatingRateIndex" : {
                     "value" : "CAD-BA-CDOR"
                   },
                   "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 3,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-2"
+                  } ]
                 }
+              },
+              "meta" : {
+                "globalKey" : "4ae10981"
               }
             },
+            "meta" : {
+              "globalKey" : "30cdb530"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.00121,
                 "unit" : {
                   "currency" : {
                     "value" : "CAD"
                   }
                 },
-                "value" : 0.00121,
-                "arithmeticOperator" : "ADD",
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "CAD"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate",
+                "arithmeticOperator" : "Add"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 634000000,
                 "unit" : {
                   "currency" : {
                     "value" : "CAD"
                   }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "CAD-BA-CDOR"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  }
                 },
-                "value" : 634000000
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "4ae101ff"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "35350988"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "27b20a6a",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "cc892602",
+            "externalReference" : "party2"
+          }
         } ]
       },
-      "tradeDate" : {
+      "party" : [ {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "COUNTERPARTY",
+            "meta" : {
+              "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
+            }
+          },
+          "meta" : {
+            "globalKey" : "27b20a6a"
+          }
+        } ],
         "meta" : {
-          "globalKey" : "3f0b12"
-        },
-        "value" : "2017-12-18"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+          "globalKey" : "27b20a6a",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "LCHLGB22XXX",
             "meta" : {
-              "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/trade-id"
-            },
-            "value" : "LCH00023323008"
+              "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
+            }
           },
-          "version" : 1
+          "meta" : {
+            "globalKey" : "cc892602"
+          }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "cc892602"
-        },
         "meta" : {
-          "globalKey" : "62392b73"
+          "globalKey" : "cc892602",
+          "externalKey" : "party2"
         }
-      } ]
+      } ],
+      "contractDetails" : {
+        "documentation" : [ {
+          "legalAgreementIdentification" : {
+            "agreementName" : {
+              "agreementType" : "MasterAgreement",
+              "masterAgreementType" : {
+                "value" : "ISDAMaster",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+                }
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "c4592b87"
+          }
+        }, {
+          "legalAgreementIdentification" : {
+            "agreementName" : {
+              "agreementType" : "Confirmation",
+              "contractualDefinitionsType" : [ {
+                "value" : "ISDA2006",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+                }
+              } ]
+            }
+          },
+          "meta" : {
+            "globalKey" : "6b413360"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "bd492439"
+        }
+      },
+      "meta" : {
+        "globalKey" : "9a2dd8cf"
+      }
+    },
+    "state" : {
+      "positionState" : "Formed"
+    },
+    "meta" : {
+      "globalKey" : "420dcd72"
     }
   } ],
-  "eventQualifier" : "ContractFormation",
   "meta" : {
-    "globalKey" : "a63a5395"
+    "globalKey" : "7418b2b1"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-credit-default-swap-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-credit-default-swap-func-output.json
index c0eafb4f6c..aa1b189a62 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-credit-default-swap-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-credit-default-swap-func-output.json
@@ -1,122 +1,35 @@
 {
+  "intent" : "ContractFormation",
   "eventDate" : "2002-12-04",
   "instruction" : [ {
     "before" : {
       "value" : {
-        "meta" : {
-          "globalKey" : "d5a01624"
-        },
         "trade" : {
-          "contractDetails" : {
-            "documentation" : [ {
-              "legalAgreementIdentification" : {
-                "agreementName" : {
-                  "agreementType" : "MASTER_AGREEMENT",
-                  "masterAgreementType" : {
-                    "value" : "ISDA_MASTER"
-                  }
-                },
-                "vintage" : 1992
-              },
-              "meta" : {
-                "globalKey" : "32000f4f"
-              }
-            }, {
-              "legalAgreementIdentification" : {
-                "agreementName" : {
-                  "agreementType" : "CONFIRMATION",
-                  "contractualDefinitionsType" : [ {
-                    "value" : "ISDA_1999_CREDIT"
-                  } ],
-                  "contractualMatrix" : [ {
-                    "matrixType" : {
-                      "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-                    }
-                  } ],
-                  "contractualTermsSupplement" : [ {
-                    "contractualTermsSupplementType" : {
-                      "value" : "ISDA_1999_CREDIT_SUCCESSOR_AND_CREDIT_EVENTS"
-                    }
-                  }, {
-                    "contractualTermsSupplementType" : {
-                      "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
-                    }
-                  } ]
-                }
-              },
-              "meta" : {
-                "globalKey" : "94128b49"
-              }
-            } ],
-            "meta" : {
-              "globalKey" : "dc022458"
-            }
-          },
-          "meta" : {
-            "globalKey" : "d5a01624"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "f845ge",
-              "globalKey" : "8e1db6b4"
-            },
-            "name" : {
-              "value" : "XYZ Bank"
+          "tradeIdentifier" : [ {
+            "issuerReference" : {
+              "globalReference" : "69c51ff4",
+              "externalReference" : "f845ge"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "RTD3ERTF37209",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                },
-                "value" : "XYZBICXXX"
+                  "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                }
               },
-              "identifierType" : "BIC",
-              "meta" : {
-                "globalKey" : "26482791"
-              }
-            } ]
-          }, {
+              "version" : 1
+            } ],
             "meta" : {
-              "externalKey" : "rsf765",
-              "globalKey" : "21f24e14"
-            },
-            "name" : {
-              "value" : "ABC Bank"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                },
-                "value" : "ABCBICXXX"
-              },
-              "identifierType" : "BIC",
-              "meta" : {
-                "globalKey" : "be37d39a"
-              }
-            } ]
+              "globalKey" : "7689fbab"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "2002-12-04",
+            "meta" : {
+              "globalKey" : "3e9304"
+            }
+          },
           "tradableProduct" : {
-            "ancillaryParty" : [ {
-              "partyReference" : [ {
-                "externalReference" : "f845ge",
-                "globalReference" : "8e1db6b4"
-              } ],
-              "role" : "CALCULATION_AGENT_INDEPENDENT"
-            } ],
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "f845ge",
-                "globalReference" : "8e1db6b4"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "rsf765",
-                "globalReference" : "21f24e14"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -124,13 +37,54 @@
                   "productQualifier" : "CreditDefaultSwap_SingleName"
                 } ],
                 "economicTerms" : {
-                  "calculationAgent" : {
-                    "calculationAgentBusinessCenter" : {
-                      "value" : "GBLO"
+                  "effectiveDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2002-12-05",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "NONE",
+                        "meta" : {
+                          "globalKey" : "24a738"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "eb0a8cfd"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "eb0a8cfd"
+                    }
+                  },
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2007-12-05",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "GBLO"
+                          }, {
+                            "value" : "USNY"
+                          }, {
+                            "value" : "JPTO"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "81e56a96"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "58681de7"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "28faf882"
+                      }
                     },
-                    "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+                    "meta" : {
+                      "globalKey" : "28faf882"
+                    }
                   },
                   "dateAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -143,84 +97,130 @@
                         "globalKey" : "81e56a96"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "58681de7"
                     }
                   },
-                  "effectiveDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "NONE",
+                  "payout" : {
+                    "interestRatePayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
+                      },
+                      "priceQuantity" : {
+                        "quantitySchedule" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "quantity-1"
+                          }
+                        },
                         "meta" : {
-                          "globalKey" : "24a738"
+                          "globalKey" : "0"
                         }
                       },
-                      "meta" : {
-                        "globalKey" : "eb0a8cfd"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
                       },
-                      "unadjustedDate" : "2002-12-05"
-                    },
-                    "meta" : {
-                      "globalKey" : "eb0a8cfd"
-                    }
-                  },
-                  "payout" : {
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "204c"
+                          },
+                          "rollConvention" : "5"
+                        },
+                        "meta" : {
+                          "globalKey" : "204c"
+                        }
+                      },
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
+                        },
+                        "firstPaymentDate" : "2003-03-05",
+                        "meta" : {
+                          "globalKey" : "7473f5c5"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "c3ce76f8"
+                      }
+                    } ],
                     "creditDefaultPayout" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "settlementTerms" : {
-                        "meta" : {
-                          "globalKey" : "45e0d7b2"
-                        },
+                        "settlementType" : "Physical",
                         "settlementCurrency" : {
                           "value" : "JPY"
                         },
-                        "settlementType" : "PHYSICAL",
+                        "meta" : {
+                          "globalKey" : "5f4774ca"
+                        },
                         "physicalSettlementTerms" : {
+                          "physicalSettlementPeriod" : {
+                            "businessDays" : 30
+                          },
                           "deliverableObligations" : {
                             "accruedInterest" : false,
+                            "category" : "BondOrLoan",
+                            "notSubordinated" : true,
+                            "specifiedCurrency" : {
+                              "applicable" : true
+                            },
+                            "notContingent" : true,
                             "assignableLoan" : {
                               "applicable" : true
                             },
-                            "category" : "BOND_OR_LOAN",
                             "consentRequiredLoan" : {
                               "applicable" : true
                             },
+                            "transferable" : true,
                             "maximumMaturity" : {
-                              "meta" : {
-                                "globalKey" : "ae5"
-                              },
+                              "periodMultiplier" : 30,
                               "period" : "Y",
-                              "periodMultiplier" : 30
-                            },
-                            "notBearer" : true,
-                            "notContingent" : true,
-                            "notSubordinated" : true,
-                            "specifiedCurrency" : {
-                              "applicable" : true
+                              "meta" : {
+                                "globalKey" : "3fb"
+                              }
                             },
-                            "transferable" : true
+                            "notBearer" : true
                           },
                           "escrow" : true,
                           "meta" : {
-                            "globalKey" : "237559c8"
-                          },
-                          "physicalSettlementPeriod" : {
-                            "businessDays" : 30
+                            "globalKey" : "3cdbf6e0"
                           }
                         }
                       },
@@ -228,434 +228,344 @@
                         "referenceInformation" : {
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "004CC9",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                              },
-                              "value" : "004CC9"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "fhjgt43",
-                              "globalKey" : "e414546d"
-                            },
                             "name" : {
                               "value" : "ACOM CO., LTD."
+                            },
+                            "meta" : {
+                              "globalKey" : "e414546d",
+                              "externalKey" : "fhjgt43"
                             }
                           },
                           "referenceObligation" : [ {
-                            "primaryObligorReference" : {
-                              "externalReference" : "fhjgt43",
-                              "globalReference" : "e414546d"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "JP310860A032",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                                    },
-                                    "value" : "JP310860A032"
+                                    }
                                   },
+                                  "source" : "ISIN",
                                   "meta" : {
                                     "globalKey" : "b94feaa3"
-                                  },
-                                  "source" : "ISIN"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "e414546d",
+                              "externalReference" : "fhjgt43"
                             }
                           } ],
                           "referencePrice" : {
+                            "value" : 1,
                             "unit" : {
                               "currency" : {
                                 "value" : "JPY"
                               }
                             },
-                            "value" : 1,
                             "perUnitOf" : {
                               "currency" : {
                                 "value" : "JPY"
                               }
                             },
-                            "priceType" : "ASSET_PRICE"
+                            "priceType" : "AssetPrice"
                           }
                         }
                       },
-                      "meta" : {
-                        "globalKey" : "76347e3d"
-                      },
                       "protectionTerms" : [ {
                         "creditEvents" : {
                           "bankruptcy" : true,
-                          "creditEventNotice" : {
-                            "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                            "publiclyAvailableInformation" : {
-                              "specifiedNumber" : 2,
-                              "standardPublicSources" : true
-                            }
-                          },
-                          "defaultRequirement" : {
-                            "unit" : {
-                              "currency" : {
-                                "value" : "JPY"
-                              }
-                            },
-                            "value" : 1000000000,
-                            "meta" : {
-                              "globalKey" : "57e64854"
-                            }
-                          },
                           "failureToPay" : {
                             "applicable" : true,
                             "paymentRequirement" : {
+                              "value" : 100000000,
                               "unit" : {
                                 "currency" : {
                                   "value" : "JPY"
                                 }
                               },
-                              "value" : 100000000,
                               "meta" : {
                                 "globalKey" : "b883af02"
                               }
                             }
                           },
-                          "meta" : {
-                            "globalKey" : "28728bbd"
-                          },
                           "restructuring" : {
                             "applicable" : true,
                             "restructuringType" : {
                               "value" : "R"
                             }
+                          },
+                          "defaultRequirement" : {
+                            "value" : 1000000000,
+                            "unit" : {
+                              "currency" : {
+                                "value" : "JPY"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "57e64854"
+                            }
+                          },
+                          "creditEventNotice" : {
+                            "notifyingParty" : [ "Party2", "Party1" ],
+                            "publiclyAvailableInformation" : {
+                              "standardPublicSources" : true,
+                              "specifiedNumber" : 2
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "8f38683"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "53d2889d"
-                        },
                         "obligations" : {
-                          "category" : "BORROWED_MONEY",
+                          "category" : "BorrowedMoney",
                           "notSubordinated" : true
-                        }
-                      } ]
-                    },
-                    "interestRatePayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
-                      },
-                      "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "quantitySchedule" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "quantity-1"
-                          }
-                        }
-                      },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12d20"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3,
-                          "rollConvention" : "5"
                         },
                         "meta" : {
-                          "globalKey" : "12d20"
+                          "globalKey" : "15515017"
                         }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
+                      } ],
                       "meta" : {
-                        "globalKey" : "a52eef0e"
-                      },
-                      "paymentDates" : {
-                        "firstPaymentDate" : "2003-03-05",
-                        "meta" : {
-                          "globalKey" : "7473fe71"
-                        },
-                        "paymentFrequency" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
-                        }
-                      },
-                      "rateSpecification" : {
-                        "fixedRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
-                          }
-                        }
+                        "globalKey" : "4b3217ad"
                       }
-                    } ],
+                    },
                     "meta" : {
-                      "globalKey" : "42aaeccb"
+                      "globalKey" : "e95566a5"
                     }
                   },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "GBLO"
-                          }, {
-                            "value" : "USNY"
-                          }, {
-                            "value" : "JPTO"
-                          } ],
-                          "meta" : {
-                            "globalKey" : "81e56a96"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "58681de7"
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "28faf882"
-                      },
-                      "unadjustedDate" : "2007-12-05"
-                    },
-                    "meta" : {
-                      "globalKey" : "28faf882"
+                  "calculationAgent" : {
+                    "calculationAgentParty" : "CalculationAgentIndependent",
+                    "calculationAgentBusinessCenter" : {
+                      "value" : "GBLO"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "dbe24bff"
+                  "globalKey" : "b552fd55"
                 }
               },
               "meta" : {
-                "globalKey" : "dbe24bff"
+                "globalKey" : "b552fd55"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "a7b31de6"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.007,
                     "unit" : {
                       "currency" : {
                         "value" : "JPY"
                       }
                     },
-                    "value" : 0.007,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "JPY"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 500000000,
                     "unit" : {
                       "currency" : {
                         "value" : "JPY"
                       }
-                    },
-                    "value" : 500000000
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "d74a447e"
-                },
-                "quantity" : [ {
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "quantity-1"
                     } ]
-                  },
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "4eb09eda"
+                }
+              }, {
+                "quantity" : [ {
                   "value" : {
+                    "value" : 500000000,
                     "unit" : {
                       "currency" : {
                         "value" : "JPY"
                       }
-                    },
-                    "value" : 500000000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "11fe4b42"
+                }
+              } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "69c51ff4",
+                "externalReference" : "f845ge"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "87501c94",
+                "externalReference" : "rsf765"
+              }
+            } ],
+            "ancillaryParty" : [ {
+              "role" : "CalculationAgentIndependent",
+              "partyReference" : [ {
+                "globalReference" : "69c51ff4",
+                "externalReference" : "f845ge"
               } ]
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3e9304"
-            },
-            "value" : "2002-12-04"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "XYZBICXXX",
                 "meta" : {
-                  "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                },
-                "value" : "RTD3ERTF37209"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                }
               },
-              "version" : 1
+              "identifierType" : "BIC",
+              "meta" : {
+                "globalKey" : "26482791"
+              }
             } ],
-            "issuerReference" : {
-              "externalReference" : "f845ge",
-              "globalReference" : "8e1db6b4"
+            "name" : {
+              "value" : "XYZ Bank"
             },
             "meta" : {
-              "globalKey" : "efb772db"
+              "globalKey" : "69c51ff4",
+              "externalKey" : "f845ge"
             }
-          } ]
-        }
-      }
-    }
-  } ],
-  "intent" : "CONTRACT_FORMATION",
-  "after" : [ {
-    "meta" : {
-      "globalKey" : "12510ae1"
-    },
-    "state" : {
-      "positionState" : "FORMED"
-    },
-    "trade" : {
-      "contractDetails" : {
-        "documentation" : [ {
-          "legalAgreementIdentification" : {
-            "agreementName" : {
-              "agreementType" : "MASTER_AGREEMENT",
-              "masterAgreementType" : {
-                "value" : "ISDA_MASTER"
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "ABCBICXXX",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                }
+              },
+              "identifierType" : "BIC",
+              "meta" : {
+                "globalKey" : "be37d39a"
               }
+            } ],
+            "name" : {
+              "value" : "ABC Bank"
             },
-            "vintage" : 1992
-          },
-          "meta" : {
-            "globalKey" : "32000f4f"
-          }
-        }, {
-          "legalAgreementIdentification" : {
-            "agreementName" : {
-              "agreementType" : "CONFIRMATION",
-              "contractualDefinitionsType" : [ {
-                "value" : "ISDA_1999_CREDIT"
-              } ],
-              "contractualMatrix" : [ {
-                "matrixType" : {
-                  "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-                }
-              } ],
-              "contractualTermsSupplement" : [ {
-                "contractualTermsSupplementType" : {
-                  "value" : "ISDA_1999_CREDIT_SUCCESSOR_AND_CREDIT_EVENTS"
-                }
-              }, {
-                "contractualTermsSupplementType" : {
-                  "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
+            "meta" : {
+              "globalKey" : "87501c94",
+              "externalKey" : "rsf765"
+            }
+          } ],
+          "contractDetails" : {
+            "documentation" : [ {
+              "legalAgreementIdentification" : {
+                "agreementName" : {
+                  "agreementType" : "MasterAgreement",
+                  "masterAgreementType" : {
+                    "value" : "ISDAMaster"
+                  }
+                },
+                "vintage" : 1992
+              },
+              "meta" : {
+                "globalKey" : "32000f4f"
+              }
+            }, {
+              "legalAgreementIdentification" : {
+                "agreementName" : {
+                  "agreementType" : "Confirmation",
+                  "contractualDefinitionsType" : [ {
+                    "value" : "ISDA1999Credit"
+                  } ],
+                  "contractualTermsSupplement" : [ {
+                    "contractualTermsSupplementType" : {
+                      "value" : "ISDA1999CreditSuccessorAndCreditEvents"
+                    }
+                  }, {
+                    "contractualTermsSupplementType" : {
+                      "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+                    }
+                  } ],
+                  "contractualMatrix" : [ {
+                    "matrixType" : {
+                      "value" : "CreditDerivativesPhysicalSettlementMatrix"
+                    }
+                  } ]
                 }
-              } ]
+              },
+              "meta" : {
+                "globalKey" : "3f0bff2d"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "86fb983c"
             }
           },
           "meta" : {
-            "globalKey" : "94128b49"
+            "globalKey" : "a9c04078"
           }
-        } ],
+        },
         "meta" : {
-          "globalKey" : "dc022458"
+          "globalKey" : "a9c04078"
         }
-      },
-      "meta" : {
-        "globalKey" : "d5a01624"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "f845ge",
-          "globalKey" : "8e1db6b4"
-        },
-        "name" : {
-          "value" : "XYZ Bank"
+      }
+    }
+  } ],
+  "eventQualifier" : "ContractFormation",
+  "after" : [ {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "69c51ff4",
+          "externalReference" : "f845ge"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "RTD3ERTF37209",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-            },
-            "value" : "XYZBICXXX"
+              "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+            }
           },
-          "identifierType" : "BIC",
-          "meta" : {
-            "globalKey" : "26482791"
-          }
-        } ]
-      }, {
+          "version" : 1
+        } ],
         "meta" : {
-          "externalKey" : "rsf765",
-          "globalKey" : "21f24e14"
-        },
-        "name" : {
-          "value" : "ABC Bank"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-            },
-            "value" : "ABCBICXXX"
-          },
-          "identifierType" : "BIC",
-          "meta" : {
-            "globalKey" : "be37d39a"
-          }
-        } ]
+          "globalKey" : "7689fbab"
+        }
       } ],
+      "tradeDate" : {
+        "value" : "2002-12-04",
+        "meta" : {
+          "globalKey" : "3e9304"
+        }
+      },
       "tradableProduct" : {
-        "ancillaryParty" : [ {
-          "partyReference" : [ {
-            "externalReference" : "f845ge",
-            "globalReference" : "8e1db6b4"
-          } ],
-          "role" : "CALCULATION_AGENT_INDEPENDENT"
-        } ],
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "f845ge",
-            "globalReference" : "8e1db6b4"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "rsf765",
-            "globalReference" : "21f24e14"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -663,13 +573,54 @@
               "productQualifier" : "CreditDefaultSwap_SingleName"
             } ],
             "economicTerms" : {
-              "calculationAgent" : {
-                "calculationAgentBusinessCenter" : {
-                  "value" : "GBLO"
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2002-12-05",
+                  "dateAdjustments" : {
+                    "businessDayConvention" : "NONE",
+                    "meta" : {
+                      "globalKey" : "24a738"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "eb0a8cfd"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb0a8cfd"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2007-12-05",
+                  "dateAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "JPTO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "81e56a96"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "58681de7"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "28faf882"
+                  }
                 },
-                "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+                "meta" : {
+                  "globalKey" : "28faf882"
+                }
               },
               "dateAdjustments" : {
+                "businessDayConvention" : "MODFOLLOWING",
                 "businessCenters" : {
                   "businessCenter" : [ {
                     "value" : "GBLO"
@@ -682,84 +633,130 @@
                     "globalKey" : "81e56a96"
                   }
                 },
-                "businessDayConvention" : "MODFOLLOWING",
                 "meta" : {
                   "globalKey" : "58681de7"
                 }
               },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "dateAdjustments" : {
-                    "businessDayConvention" : "NONE",
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "24a738"
+                      "globalKey" : "0"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "eb0a8cfd"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
                   },
-                  "unadjustedDate" : "2002-12-05"
-                },
-                "meta" : {
-                  "globalKey" : "eb0a8cfd"
-                }
-              },
-              "payout" : {
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "204c"
+                      },
+                      "rollConvention" : "5"
+                    },
+                    "meta" : {
+                      "globalKey" : "204c"
+                    }
+                  },
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "firstPaymentDate" : "2003-03-05",
+                    "meta" : {
+                      "globalKey" : "7473f5c5"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "c3ce76f8"
+                  }
+                } ],
                 "creditDefaultPayout" : {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
                   "settlementTerms" : {
-                    "meta" : {
-                      "globalKey" : "45e0d7b2"
-                    },
+                    "settlementType" : "Physical",
                     "settlementCurrency" : {
                       "value" : "JPY"
                     },
-                    "settlementType" : "PHYSICAL",
+                    "meta" : {
+                      "globalKey" : "5f4774ca"
+                    },
                     "physicalSettlementTerms" : {
+                      "physicalSettlementPeriod" : {
+                        "businessDays" : 30
+                      },
                       "deliverableObligations" : {
                         "accruedInterest" : false,
+                        "category" : "BondOrLoan",
+                        "notSubordinated" : true,
+                        "specifiedCurrency" : {
+                          "applicable" : true
+                        },
+                        "notContingent" : true,
                         "assignableLoan" : {
                           "applicable" : true
                         },
-                        "category" : "BOND_OR_LOAN",
                         "consentRequiredLoan" : {
                           "applicable" : true
                         },
+                        "transferable" : true,
                         "maximumMaturity" : {
-                          "meta" : {
-                            "globalKey" : "ae5"
-                          },
+                          "periodMultiplier" : 30,
                           "period" : "Y",
-                          "periodMultiplier" : 30
-                        },
-                        "notBearer" : true,
-                        "notContingent" : true,
-                        "notSubordinated" : true,
-                        "specifiedCurrency" : {
-                          "applicable" : true
+                          "meta" : {
+                            "globalKey" : "3fb"
+                          }
                         },
-                        "transferable" : true
+                        "notBearer" : true
                       },
                       "escrow" : true,
                       "meta" : {
-                        "globalKey" : "237559c8"
-                      },
-                      "physicalSettlementPeriod" : {
-                        "businessDays" : 30
+                        "globalKey" : "3cdbf6e0"
                       }
                     }
                   },
@@ -767,315 +764,318 @@
                     "referenceInformation" : {
                       "referenceEntity" : {
                         "entityId" : [ {
+                          "value" : "004CC9",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                          },
-                          "value" : "004CC9"
+                          }
                         } ],
-                        "meta" : {
-                          "externalKey" : "fhjgt43",
-                          "globalKey" : "e414546d"
-                        },
                         "name" : {
                           "value" : "ACOM CO., LTD."
+                        },
+                        "meta" : {
+                          "globalKey" : "e414546d",
+                          "externalKey" : "fhjgt43"
                         }
                       },
                       "referenceObligation" : [ {
-                        "primaryObligorReference" : {
-                          "externalReference" : "fhjgt43",
-                          "globalReference" : "e414546d"
-                        },
                         "security" : {
                           "productIdentifier" : [ {
                             "value" : {
                               "identifier" : {
+                                "value" : "JP310860A032",
                                 "meta" : {
                                   "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                                },
-                                "value" : "JP310860A032"
+                                }
                               },
+                              "source" : "ISIN",
                               "meta" : {
                                 "globalKey" : "b94feaa3"
-                              },
-                              "source" : "ISIN"
+                              }
                             }
                           } ],
-                          "securityType" : "DEBT"
+                          "securityType" : "Debt"
+                        },
+                        "primaryObligorReference" : {
+                          "globalReference" : "e414546d",
+                          "externalReference" : "fhjgt43"
                         }
                       } ],
                       "referencePrice" : {
+                        "value" : 1,
                         "unit" : {
                           "currency" : {
                             "value" : "JPY"
                           }
                         },
-                        "value" : 1,
                         "perUnitOf" : {
                           "currency" : {
                             "value" : "JPY"
                           }
-                        },
-                        "priceType" : "ASSET_PRICE"
-                      }
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "76347e3d"
-                  },
-                  "protectionTerms" : [ {
-                    "creditEvents" : {
-                      "bankruptcy" : true,
-                      "creditEventNotice" : {
-                        "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                        "publiclyAvailableInformation" : {
-                          "specifiedNumber" : 2,
-                          "standardPublicSources" : true
-                        }
-                      },
-                      "defaultRequirement" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "JPY"
-                          }
-                        },
-                        "value" : 1000000000,
-                        "meta" : {
-                          "globalKey" : "57e64854"
-                        }
-                      },
+                        },
+                        "priceType" : "AssetPrice"
+                      }
+                    }
+                  },
+                  "protectionTerms" : [ {
+                    "creditEvents" : {
+                      "bankruptcy" : true,
                       "failureToPay" : {
                         "applicable" : true,
                         "paymentRequirement" : {
+                          "value" : 100000000,
                           "unit" : {
                             "currency" : {
                               "value" : "JPY"
                             }
                           },
-                          "value" : 100000000,
                           "meta" : {
                             "globalKey" : "b883af02"
                           }
                         }
                       },
-                      "meta" : {
-                        "globalKey" : "28728bbd"
-                      },
                       "restructuring" : {
                         "applicable" : true,
                         "restructuringType" : {
                           "value" : "R"
                         }
+                      },
+                      "defaultRequirement" : {
+                        "value" : 1000000000,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "JPY"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "57e64854"
+                        }
+                      },
+                      "creditEventNotice" : {
+                        "notifyingParty" : [ "Party2", "Party1" ],
+                        "publiclyAvailableInformation" : {
+                          "standardPublicSources" : true,
+                          "specifiedNumber" : 2
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "8f38683"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "53d2889d"
-                    },
                     "obligations" : {
-                      "category" : "BORROWED_MONEY",
+                      "category" : "BorrowedMoney",
                       "notSubordinated" : true
-                    }
-                  } ]
-                },
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d20"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "5"
                     },
                     "meta" : {
-                      "globalKey" : "12d20"
+                      "globalKey" : "15515017"
                     }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
+                  } ],
                   "meta" : {
-                    "globalKey" : "a52eef0e"
-                  },
-                  "paymentDates" : {
-                    "firstPaymentDate" : "2003-03-05",
-                    "meta" : {
-                      "globalKey" : "7473fe71"
-                    },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    }
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
+                    "globalKey" : "4b3217ad"
                   }
-                } ],
+                },
                 "meta" : {
-                  "globalKey" : "42aaeccb"
+                  "globalKey" : "e95566a5"
                 }
               },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "dateAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "JPTO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "81e56a96"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "58681de7"
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "28faf882"
-                  },
-                  "unadjustedDate" : "2007-12-05"
-                },
-                "meta" : {
-                  "globalKey" : "28faf882"
+              "calculationAgent" : {
+                "calculationAgentParty" : "CalculationAgentIndependent",
+                "calculationAgentBusinessCenter" : {
+                  "value" : "GBLO"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "dbe24bff"
+              "globalKey" : "b552fd55"
             }
           },
           "meta" : {
-            "globalKey" : "dbe24bff"
+            "globalKey" : "b552fd55"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "a7b31de6"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.007,
                 "unit" : {
                   "currency" : {
                     "value" : "JPY"
                   }
                 },
-                "value" : 0.007,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "JPY"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 500000000,
                 "unit" : {
                   "currency" : {
                     "value" : "JPY"
                   }
-                },
-                "value" : 500000000
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "d74a447e"
-            },
-            "quantity" : [ {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "4eb09eda"
+            }
+          }, {
+            "quantity" : [ {
               "value" : {
+                "value" : 500000000,
                 "unit" : {
                   "currency" : {
                     "value" : "JPY"
                   }
-                },
-                "value" : 500000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "11fe4b42"
+            }
+          } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "69c51ff4",
+            "externalReference" : "f845ge"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "87501c94",
+            "externalReference" : "rsf765"
+          }
+        } ],
+        "ancillaryParty" : [ {
+          "role" : "CalculationAgentIndependent",
+          "partyReference" : [ {
+            "globalReference" : "69c51ff4",
+            "externalReference" : "f845ge"
           } ]
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3e9304"
+      "party" : [ {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "XYZBICXXX",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+            }
+          },
+          "identifierType" : "BIC",
+          "meta" : {
+            "globalKey" : "26482791"
+          }
+        } ],
+        "name" : {
+          "value" : "XYZ Bank"
         },
-        "value" : "2002-12-04"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+        "meta" : {
+          "globalKey" : "69c51ff4",
+          "externalKey" : "f845ge"
+        }
+      }, {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "ABCBICXXX",
             "meta" : {
-              "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-            },
-            "value" : "RTD3ERTF37209"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+            }
           },
-          "version" : 1
+          "identifierType" : "BIC",
+          "meta" : {
+            "globalKey" : "be37d39a"
+          }
         } ],
-        "issuerReference" : {
-          "externalReference" : "f845ge",
-          "globalReference" : "8e1db6b4"
+        "name" : {
+          "value" : "ABC Bank"
         },
         "meta" : {
-          "globalKey" : "efb772db"
+          "globalKey" : "87501c94",
+          "externalKey" : "rsf765"
+        }
+      } ],
+      "contractDetails" : {
+        "documentation" : [ {
+          "legalAgreementIdentification" : {
+            "agreementName" : {
+              "agreementType" : "MasterAgreement",
+              "masterAgreementType" : {
+                "value" : "ISDAMaster"
+              }
+            },
+            "vintage" : 1992
+          },
+          "meta" : {
+            "globalKey" : "32000f4f"
+          }
+        }, {
+          "legalAgreementIdentification" : {
+            "agreementName" : {
+              "agreementType" : "Confirmation",
+              "contractualDefinitionsType" : [ {
+                "value" : "ISDA1999Credit"
+              } ],
+              "contractualTermsSupplement" : [ {
+                "contractualTermsSupplementType" : {
+                  "value" : "ISDA1999CreditSuccessorAndCreditEvents"
+                }
+              }, {
+                "contractualTermsSupplementType" : {
+                  "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+                }
+              } ],
+              "contractualMatrix" : [ {
+                "matrixType" : {
+                  "value" : "CreditDerivativesPhysicalSettlementMatrix"
+                }
+              } ]
+            }
+          },
+          "meta" : {
+            "globalKey" : "3f0bff2d"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "86fb983c"
         }
-      } ]
+      },
+      "meta" : {
+        "globalKey" : "a9c04078"
+      }
+    },
+    "state" : {
+      "positionState" : "Formed"
+    },
+    "meta" : {
+      "globalKey" : "b6a4eedb"
     }
   } ],
-  "eventQualifier" : "ContractFormation",
   "meta" : {
-    "globalKey" : "77aa7925"
+    "globalKey" : "ffcb8733"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-fra-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-fra-func-output.json
index 7440bdda5c..7c5bae19b5 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-fra-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-fra-func-output.json
@@ -1,64 +1,50 @@
 {
+  "intent" : "ContractFormation",
   "eventDate" : "1991-05-14",
   "instruction" : [ {
     "before" : {
       "value" : {
-        "meta" : {
-          "globalKey" : "a96ea89f"
-        },
         "trade" : {
-          "meta" : {
-            "globalKey" : "a96ea89f"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "e1284e85"
+          "tradeIdentifier" : [ {
+            "issuerReference" : {
+              "globalReference" : "e1284e85",
+              "externalReference" : "party1"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "MB87623",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "TR24TWEY5RVRQV65HD49"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "e1284e85"
+                  "scheme" : "http://www.hsbc.com/swaps/trade-id"
+                }
               }
-            } ]
-          }, {
+            } ],
             "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "cff0a7d6"
+              "globalKey" : "1bd20f89"
+            }
+          }, {
+            "issuerReference" : {
+              "globalReference" : "cff0a7d6",
+              "externalReference" : "party2"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "AA9876",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "BFXS5XCH7N0Y05NIXW11"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "cff0a7d6"
+                  "scheme" : "http://www.abnamro.com/swaps/trade-id"
+                }
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "2a7370d4"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "1991-05-14",
+            "meta" : {
+              "globalKey" : "3e394e"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "e1284e85"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "cff0a7d6"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -69,48 +55,63 @@
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      },
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
                         }
                       },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
                       "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
                             "adjustedDate" : {
+                              "value" : "1991-07-17",
                               "meta" : {
                                 "globalKey" : "3e39d1"
-                              },
-                              "value" : "1991-07-17"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "0"
                             }
                           },
                           "meta" : {
-                            "externalKey" : "resetDate",
-                            "globalKey" : "0"
+                            "globalKey" : "0",
+                            "externalKey" : "resetDate"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
                             "adjustedDate" : {
+                              "value" : "1992-01-17",
                               "meta" : {
                                 "globalKey" : "3e4051"
-                              },
-                              "value" : "1992-01-17"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "0"
@@ -119,19 +120,15 @@
                           "meta" : {
                             "globalKey" : "0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "discountingMethod" : {
-                        "discountingType" : "FRA"
-                      },
-                      "meta" : {
-                        "globalKey" : "4af42838"
-                      },
                       "paymentDate" : {
+                        "unadjustedDate" : "1991-07-17",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "CHZU"
@@ -140,75 +137,77 @@
                               "globalKey" : "1f8e60"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "211caa4f"
                           }
                         },
                         "meta" : {
                           "globalKey" : "407eeb1e"
-                        },
-                        "unadjustedDate" : "1991-07-17"
-                      },
-                      "rateSpecification" : {
-                        "fixedRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
-                          }
                         }
+                      },
+                      "discountingMethod" : {
+                        "discountingType" : "FRA"
+                      },
+                      "meta" : {
+                        "globalKey" : "1d9421f4"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      },
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
                         }
                       },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
                       "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
                             "adjustedDate" : {
+                              "value" : "1991-07-17",
                               "meta" : {
                                 "globalKey" : "3e39d1"
-                              },
-                              "value" : "1991-07-17"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "0"
                             }
                           },
                           "meta" : {
-                            "externalKey" : "resetDate",
-                            "globalKey" : "0"
+                            "globalKey" : "0",
+                            "externalKey" : "resetDate"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
                             "adjustedDate" : {
+                              "value" : "1992-01-17",
                               "meta" : {
                                 "globalKey" : "3e4051"
-                              },
-                              "value" : "1992-01-17"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "0"
@@ -217,19 +216,15 @@
                           "meta" : {
                             "globalKey" : "0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "discountingMethod" : {
-                        "discountingType" : "FRA"
-                      },
-                      "meta" : {
-                        "globalKey" : "dc55f19f"
-                      },
                       "paymentDate" : {
+                        "unadjustedDate" : "1991-07-17",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "CHZU"
@@ -238,37 +233,23 @@
                               "globalKey" : "1f8e60"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "211caa4f"
                           }
                         },
                         "meta" : {
                           "globalKey" : "407eeb1e"
-                        },
-                        "unadjustedDate" : "1991-07-17"
-                      },
-                      "rateSpecification" : {
-                        "floatingRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
-                            }
-                          }
                         }
                       },
                       "resetDates" : {
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "f12537c9"
+                            "globalKey" : "ce01227d"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -277,225 +258,227 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDate",
-                            "globalReference" : "0"
+                            "globalReference" : "0",
+                            "externalReference" : "resetDate"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "f12537c9"
+                          "globalKey" : "ce01227d"
                         }
+                      },
+                      "discountingMethod" : {
+                        "discountingType" : "FRA"
+                      },
+                      "meta" : {
+                        "globalKey" : "44b30fd3"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "1579b067"
+                      "globalKey" : "842dfc5f"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "ff558920"
+                  "globalKey" : "6e09d518"
                 }
               },
               "meta" : {
-                "globalKey" : "ff558920"
+                "globalKey" : "6e09d518"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "103bf473"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.04,
                     "unit" : {
                       "currency" : {
                         "value" : "CHF"
                       }
                     },
-                    "value" : 0.04,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "CHF"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
+                    "priceType" : "InterestRate"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
                   }
                 } ],
                 "quantity" : [ {
+                  "value" : {
+                    "value" : 25000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "CHF"
+                      }
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     } ]
-                  },
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "f74299ed"
+                }
+              }, {
+                "quantity" : [ {
                   "value" : {
+                    "value" : 25000000,
                     "unit" : {
                       "currency" : {
                         "value" : "CHF"
                       }
-                    },
-                    "value" : 25000000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "434a0131"
-                },
+                } ],
                 "observable" : {
-                  "meta" : {
-                    "globalKey" : "6a18d5cd"
-                  },
                   "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
                     "value" : {
                       "floatingRateIndex" : {
                         "value" : "CHF-LIBOR-BBA"
                       },
                       "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "959"
-                        },
+                        "periodMultiplier" : 6,
                         "period" : "M",
-                        "periodMultiplier" : 6
+                        "meta" : {
+                          "globalKey" : "107"
+                        }
                       }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
                     }
-                  }
-                },
-                "quantity" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
-                    } ]
                   },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "CHF"
-                      }
-                    },
-                    "value" : 25000000
+                  "meta" : {
+                    "globalKey" : "d900e1e5"
                   }
-                } ]
-              } ]
+                },
+                "meta" : {
+                  "globalKey" : "9965fc03"
+                }
+              } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "e1284e85",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "cff0a7d6",
+                "externalReference" : "party2"
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3e394e"
-            },
-            "value" : "1991-05-14"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "TR24TWEY5RVRQV65HD49",
                 "meta" : {
-                  "scheme" : "http://www.hsbc.com/swaps/trade-id"
-                },
-                "value" : "MB87623"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "e1284e85"
               }
             } ],
-            "issuerReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "e1284e85"
-            },
             "meta" : {
-              "globalKey" : "4a2efcd7"
+              "globalKey" : "e1284e85",
+              "externalKey" : "party1"
             }
           }, {
-            "assignedIdentifier" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "BFXS5XCH7N0Y05NIXW11",
                 "meta" : {
-                  "scheme" : "http://www.abnamro.com/swaps/trade-id"
-                },
-                "value" : "AA9876"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "cff0a7d6"
               }
             } ],
-            "issuerReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "cff0a7d6"
-            },
             "meta" : {
-              "globalKey" : "d1084d2c"
+              "globalKey" : "cff0a7d6",
+              "externalKey" : "party2"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "52b04349"
+          }
+        },
+        "meta" : {
+          "globalKey" : "52b04349"
         }
       }
     }
   } ],
-  "intent" : "CONTRACT_FORMATION",
+  "eventQualifier" : "ContractFormation",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "66dedf42"
-    },
-    "state" : {
-      "positionState" : "FORMED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "a96ea89f"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "e1284e85"
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "e1284e85",
+          "externalReference" : "party1"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "MB87623",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "TR24TWEY5RVRQV65HD49"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "e1284e85"
+              "scheme" : "http://www.hsbc.com/swaps/trade-id"
+            }
           }
-        } ]
-      }, {
+        } ],
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "cff0a7d6"
+          "globalKey" : "1bd20f89"
+        }
+      }, {
+        "issuerReference" : {
+          "globalReference" : "cff0a7d6",
+          "externalReference" : "party2"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "AA9876",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "BFXS5XCH7N0Y05NIXW11"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "cff0a7d6"
+              "scheme" : "http://www.abnamro.com/swaps/trade-id"
+            }
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "2a7370d4"
+        }
       } ],
+      "tradeDate" : {
+        "value" : "1991-05-14",
+        "meta" : {
+          "globalKey" : "3e394e"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "e1284e85"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "cff0a7d6"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -506,48 +489,63 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
                   "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
                         "adjustedDate" : {
+                          "value" : "1991-07-17",
                           "meta" : {
                             "globalKey" : "3e39d1"
-                          },
-                          "value" : "1991-07-17"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "0"
                         }
                       },
                       "meta" : {
-                        "externalKey" : "resetDate",
-                        "globalKey" : "0"
+                        "globalKey" : "0",
+                        "externalKey" : "resetDate"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
                         "adjustedDate" : {
+                          "value" : "1992-01-17",
                           "meta" : {
                             "globalKey" : "3e4051"
-                          },
-                          "value" : "1992-01-17"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "0"
@@ -556,19 +554,15 @@
                       "meta" : {
                         "globalKey" : "0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "discountingMethod" : {
-                    "discountingType" : "FRA"
-                  },
-                  "meta" : {
-                    "globalKey" : "4af42838"
-                  },
                   "paymentDate" : {
+                    "unadjustedDate" : "1991-07-17",
                     "dateAdjustments" : {
+                      "businessDayConvention" : "FOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CHZU"
@@ -577,75 +571,77 @@
                           "globalKey" : "1f8e60"
                         }
                       },
-                      "businessDayConvention" : "FOLLOWING",
                       "meta" : {
                         "globalKey" : "211caa4f"
                       }
                     },
                     "meta" : {
                       "globalKey" : "407eeb1e"
-                    },
-                    "unadjustedDate" : "1991-07-17"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
                     }
+                  },
+                  "discountingMethod" : {
+                    "discountingType" : "FRA"
+                  },
+                  "meta" : {
+                    "globalKey" : "1d9421f4"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
                   "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
                         "adjustedDate" : {
+                          "value" : "1991-07-17",
                           "meta" : {
                             "globalKey" : "3e39d1"
-                          },
-                          "value" : "1991-07-17"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "0"
                         }
                       },
                       "meta" : {
-                        "externalKey" : "resetDate",
-                        "globalKey" : "0"
+                        "globalKey" : "0",
+                        "externalKey" : "resetDate"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
                         "adjustedDate" : {
+                          "value" : "1992-01-17",
                           "meta" : {
                             "globalKey" : "3e4051"
-                          },
-                          "value" : "1992-01-17"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "0"
@@ -654,19 +650,15 @@
                       "meta" : {
                         "globalKey" : "0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "discountingMethod" : {
-                    "discountingType" : "FRA"
-                  },
-                  "meta" : {
-                    "globalKey" : "dc55f19f"
-                  },
                   "paymentDate" : {
+                    "unadjustedDate" : "1991-07-17",
                     "dateAdjustments" : {
+                      "businessDayConvention" : "FOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CHZU"
@@ -675,37 +667,23 @@
                           "globalKey" : "1f8e60"
                         }
                       },
-                      "businessDayConvention" : "FOLLOWING",
                       "meta" : {
                         "globalKey" : "211caa4f"
                       }
                     },
                     "meta" : {
                       "globalKey" : "407eeb1e"
-                    },
-                    "unadjustedDate" : "1991-07-17"
-                  },
-                  "rateSpecification" : {
-                    "floatingRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        }
-                      }
                     }
                   },
                   "resetDates" : {
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "f12537c9"
+                        "globalKey" : "ce01227d"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -714,164 +692,186 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDate",
-                        "globalReference" : "0"
+                        "globalReference" : "0",
+                        "externalReference" : "resetDate"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "f12537c9"
+                      "globalKey" : "ce01227d"
                     }
+                  },
+                  "discountingMethod" : {
+                    "discountingType" : "FRA"
+                  },
+                  "meta" : {
+                    "globalKey" : "44b30fd3"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "1579b067"
+                  "globalKey" : "842dfc5f"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "ff558920"
+              "globalKey" : "6e09d518"
             }
           },
           "meta" : {
-            "globalKey" : "ff558920"
+            "globalKey" : "6e09d518"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "103bf473"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.04,
                 "unit" : {
                   "currency" : {
                     "value" : "CHF"
                   }
                 },
-                "value" : 0.04,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "CHF"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
+                "priceType" : "InterestRate"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-1"
+                } ]
               }
             } ],
             "quantity" : [ {
+              "value" : {
+                "value" : 25000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "CHF"
+                  }
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "f74299ed"
+            }
+          }, {
+            "quantity" : [ {
               "value" : {
+                "value" : 25000000,
                 "unit" : {
                   "currency" : {
                     "value" : "CHF"
                   }
-                },
-                "value" : 25000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "434a0131"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "6a18d5cd"
-              },
               "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
                 "value" : {
                   "floatingRateIndex" : {
                     "value" : "CHF-LIBOR-BBA"
                   },
                   "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
+                    "periodMultiplier" : 6,
                     "period" : "M",
-                    "periodMultiplier" : 6
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
                 }
-              }
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
-                } ]
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "CHF"
-                  }
-                },
-                "value" : 25000000
+              "meta" : {
+                "globalKey" : "d900e1e5"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "9965fc03"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "e1284e85",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "cff0a7d6",
+            "externalReference" : "party2"
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3e394e"
-        },
-        "value" : "1991-05-14"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "TR24TWEY5RVRQV65HD49",
             "meta" : {
-              "scheme" : "http://www.hsbc.com/swaps/trade-id"
-            },
-            "value" : "MB87623"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "e1284e85"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "e1284e85"
-        },
         "meta" : {
-          "globalKey" : "4a2efcd7"
+          "globalKey" : "e1284e85",
+          "externalKey" : "party1"
         }
       }, {
-        "assignedIdentifier" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "BFXS5XCH7N0Y05NIXW11",
             "meta" : {
-              "scheme" : "http://www.abnamro.com/swaps/trade-id"
-            },
-            "value" : "AA9876"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "cff0a7d6"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "cff0a7d6"
-        },
         "meta" : {
-          "globalKey" : "d1084d2c"
+          "globalKey" : "cff0a7d6",
+          "externalKey" : "party2"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "52b04349"
+      }
+    },
+    "state" : {
+      "positionState" : "Formed"
+    },
+    "meta" : {
+      "globalKey" : "e39f816c"
     }
   } ],
-  "eventQualifier" : "ContractFormation",
   "meta" : {
-    "globalKey" : "c11aed99"
+    "globalKey" : "789ffe6d"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-fx-forward-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-fx-forward-func-output.json
index 2c788ab27c..63912d1ce1 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-fx-forward-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-fx-forward-func-output.json
@@ -1,64 +1,50 @@
 {
+  "intent" : "ContractFormation",
   "eventDate" : "2001-11-19",
   "instruction" : [ {
     "before" : {
       "value" : {
-        "meta" : {
-          "globalKey" : "af813ef7"
-        },
         "trade" : {
-          "meta" : {
-            "globalKey" : "af813ef7"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "cff0a7d6"
+          "tradeIdentifier" : [ {
+            "issuerReference" : {
+              "globalReference" : "cff0a7d6",
+              "externalReference" : "party1"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "ABN1234",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "BFXS5XCH7N0Y05NIXW11"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "cff0a7d6"
+                  "scheme" : "http://www.abn-amro.com/fx/trade-id"
+                }
               }
-            } ]
-          }, {
+            } ],
             "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "e05045d7"
+              "globalKey" : "70c5d84"
+            }
+          }, {
+            "issuerReference" : {
+              "globalReference" : "e05045d7",
+              "externalReference" : "party2"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "DB5678",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "213800QILIUD4ROSUO03"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "e05045d7"
+                  "scheme" : "http://www.db.com/fx/trade-id"
+                }
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "96b24f95"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "2001-11-19",
+            "meta" : {
+              "globalKey" : "3e8ad3"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "e05045d7"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "cff0a7d6"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -69,35 +55,32 @@
                   "payout" : {
                     "forwardPayout" : [ {
                       "settlementTerms" : {
-                        "meta" : {
-                          "globalKey" : "3e8b15"
-                        },
                         "settlementDate" : {
+                          "valueDate" : "2001-12-21",
                           "meta" : {
                             "globalKey" : "3e8b15"
-                          },
-                          "valueDate" : "2001-12-21"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "3e8b15"
                         }
                       },
-                      "meta" : {
-                        "globalKey" : "90c7297"
-                      },
                       "underlier" : {
                         "foreignExchange" : {
                           "exchangedCurrency1" : {
                             "payerReceiver" : {
-                              "payer" : "PARTY_1",
-                              "receiver" : "PARTY_2"
+                              "payer" : "Party1",
+                              "receiver" : "Party2"
                             },
                             "priceQuantity" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
                               "quantitySchedule" : {
                                 "address" : {
                                   "scope" : "DOCUMENT",
                                   "value" : "quantity-2"
                                 }
+                              },
+                              "meta" : {
+                                "globalKey" : "0"
                               }
                             },
                             "meta" : {
@@ -106,18 +89,18 @@
                           },
                           "exchangedCurrency2" : {
                             "payerReceiver" : {
-                              "payer" : "PARTY_2",
-                              "receiver" : "PARTY_1"
+                              "payer" : "Party2",
+                              "receiver" : "Party1"
                             },
                             "priceQuantity" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
                               "quantitySchedule" : {
                                 "address" : {
                                   "scope" : "DOCUMENT",
                                   "value" : "quantity-1"
                                 }
+                              },
+                              "meta" : {
+                                "globalKey" : "0"
                               }
                             },
                             "meta" : {
@@ -128,6 +111,9 @@
                         "meta" : {
                           "globalKey" : "c086df02"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "90c7297"
                       }
                     } ],
                     "meta" : {
@@ -145,175 +131,172 @@
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "1cc815e8"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.9175,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 0.9175,
-                    "composite" : {
-                      "arithmeticOperator" : "ADD",
-                      "baseValue" : 0.913,
-                      "operand" : 0.0045,
-                      "operandType" : "FORWARD_POINT"
-                    },
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "priceType" : "EXCHANGE_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "ExchangeRate",
+                    "composite" : {
+                      "baseValue" : 0.913,
+                      "operand" : 0.0045,
+                      "arithmeticOperator" : "Add",
+                      "operandType" : "ForwardPoint"
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 10000000,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
-                    },
-                    "value" : 10000000
-                  }
-                }, {
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
+                      "value" : "quantity-2"
                     } ]
-                  },
+                  }
+                }, {
                   "value" : {
+                    "value" : 9175000,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
-                    },
-                    "value" : 9175000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    } ]
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "2ab23d92"
+                }
               } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "e05045d7",
+                "externalReference" : "party2"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "cff0a7d6",
+                "externalReference" : "party1"
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3e8ad3"
-            },
-            "value" : "2001-11-19"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "BFXS5XCH7N0Y05NIXW11",
                 "meta" : {
-                  "scheme" : "http://www.abn-amro.com/fx/trade-id"
-                },
-                "value" : "ABN1234"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "cff0a7d6"
               }
             } ],
-            "issuerReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "cff0a7d6"
-            },
             "meta" : {
-              "globalKey" : "f979bfbc"
+              "globalKey" : "cff0a7d6",
+              "externalKey" : "party1"
             }
           }, {
-            "assignedIdentifier" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "213800QILIUD4ROSUO03",
                 "meta" : {
-                  "scheme" : "http://www.db.com/fx/trade-id"
-                },
-                "value" : "DB5678"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "e05045d7"
               }
             } ],
-            "issuerReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "e05045d7"
-            },
             "meta" : {
-              "globalKey" : "483f508b"
+              "globalKey" : "e05045d7",
+              "externalKey" : "party2"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "9d94235d"
+          }
+        },
+        "meta" : {
+          "globalKey" : "9d94235d"
         }
       }
     }
   } ],
-  "intent" : "CONTRACT_FORMATION",
+  "eventQualifier" : "ContractFormation",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "cd232ab4"
-    },
-    "state" : {
-      "positionState" : "FORMED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "af813ef7"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "cff0a7d6"
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "cff0a7d6",
+          "externalReference" : "party1"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "ABN1234",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "BFXS5XCH7N0Y05NIXW11"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "cff0a7d6"
+              "scheme" : "http://www.abn-amro.com/fx/trade-id"
+            }
           }
-        } ]
-      }, {
+        } ],
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "e05045d7"
+          "globalKey" : "70c5d84"
+        }
+      }, {
+        "issuerReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "DB5678",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "213800QILIUD4ROSUO03"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "e05045d7"
+              "scheme" : "http://www.db.com/fx/trade-id"
+            }
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "96b24f95"
+        }
       } ],
+      "tradeDate" : {
+        "value" : "2001-11-19",
+        "meta" : {
+          "globalKey" : "3e8ad3"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "e05045d7"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "cff0a7d6"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -324,35 +307,32 @@
               "payout" : {
                 "forwardPayout" : [ {
                   "settlementTerms" : {
-                    "meta" : {
-                      "globalKey" : "3e8b15"
-                    },
                     "settlementDate" : {
+                      "valueDate" : "2001-12-21",
                       "meta" : {
                         "globalKey" : "3e8b15"
-                      },
-                      "valueDate" : "2001-12-21"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3e8b15"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "90c7297"
-                  },
                   "underlier" : {
                     "foreignExchange" : {
                       "exchangedCurrency1" : {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "meta" : {
@@ -361,18 +341,18 @@
                       },
                       "exchangedCurrency2" : {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "meta" : {
@@ -383,6 +363,9 @@
                     "meta" : {
                       "globalKey" : "c086df02"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "90c7297"
                   }
                 } ],
                 "meta" : {
@@ -400,114 +383,131 @@
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "1cc815e8"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.9175,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 0.9175,
-                "composite" : {
-                  "arithmeticOperator" : "ADD",
-                  "baseValue" : 0.913,
-                  "operand" : 0.0045,
-                  "operandType" : "FORWARD_POINT"
-                },
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "priceType" : "EXCHANGE_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "ExchangeRate",
+                "composite" : {
+                  "baseValue" : 0.913,
+                  "operand" : 0.0045,
+                  "arithmeticOperator" : "Add",
+                  "operandType" : "ForwardPoint"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 10000000,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
-                },
-                "value" : 10000000
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "quantity-2"
                 } ]
-              },
+              }
+            }, {
               "value" : {
+                "value" : 9175000,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 9175000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "2ab23d92"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "e05045d7",
+            "externalReference" : "party2"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "cff0a7d6",
+            "externalReference" : "party1"
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3e8ad3"
-        },
-        "value" : "2001-11-19"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "BFXS5XCH7N0Y05NIXW11",
             "meta" : {
-              "scheme" : "http://www.abn-amro.com/fx/trade-id"
-            },
-            "value" : "ABN1234"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "cff0a7d6"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "cff0a7d6"
-        },
         "meta" : {
-          "globalKey" : "f979bfbc"
+          "globalKey" : "cff0a7d6",
+          "externalKey" : "party1"
         }
       }, {
-        "assignedIdentifier" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "213800QILIUD4ROSUO03",
             "meta" : {
-              "scheme" : "http://www.db.com/fx/trade-id"
-            },
-            "value" : "DB5678"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "e05045d7"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
         "meta" : {
-          "globalKey" : "483f508b"
+          "globalKey" : "e05045d7",
+          "externalKey" : "party2"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9d94235d"
+      }
+    },
+    "state" : {
+      "positionState" : "Formed"
+    },
+    "meta" : {
+      "globalKey" : "50bac80"
     }
   } ],
-  "eventQualifier" : "ContractFormation",
   "meta" : {
-    "globalKey" : "bb21731c"
+    "globalKey" : "69b7324c"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-ir-swap-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-ir-swap-func-output.json
index eec4a56caf..2bc557661f 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-ir-swap-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-ir-swap-func-output.json
@@ -1,67 +1,35 @@
 {
+  "intent" : "ContractFormation",
   "eventDate" : "1994-12-12",
   "instruction" : [ {
     "before" : {
       "value" : {
-        "meta" : {
-          "globalKey" : "41b6d4d1"
-        },
         "trade" : {
-          "meta" : {
-            "globalKey" : "41b6d4d1"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "a82d45fc"
-            },
-            "name" : {
-              "value" : "Party A"
+          "tradeIdentifier" : [ {
+            "issuerReference" : {
+              "globalReference" : "ca05a501",
+              "externalReference" : "party2"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "SW2000",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                },
-                "value" : "PARTYAUS33"
+                  "scheme" : "http://www.barclays.com/swaps/trade-id"
+                }
               },
-              "identifierType" : "BIC",
-              "meta" : {
-                "globalKey" : "3d5ebc15"
-              }
-            } ]
-          }, {
+              "version" : 1
+            } ],
             "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "ca05a501"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                },
-                "value" : "BARCGB2L"
-              },
-              "identifierType" : "BIC",
-              "meta" : {
-                "globalKey" : "ca05a501"
-              }
-            } ]
+              "globalKey" : "958d38d8"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "1994-12-12",
+            "meta" : {
+              "globalKey" : "3e530c"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "a82d45fc"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ca05a501"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -72,46 +40,40 @@
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da36cf11"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7d7eda0"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "28c89"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6,
-                          "rollConvention" : "14"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1994-12-14",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -120,103 +82,108 @@
                             },
                             "meta" : {
                               "globalKey" : "ea1a6ec6"
-                            },
-                            "unadjustedDate" : "1994-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ea1a6ec6"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "floatingCalcPeriodDates",
-                          "globalKey" : "a54e5fcd"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1999-12-14",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "DEFR"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "primaryBusinessCenters",
-                                  "globalKey" : "1ff50d"
+                                  "globalKey" : "1ff50d",
+                                  "externalKey" : "primaryBusinessCenters"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365af8de"
                               }
                             },
                             "meta" : {
                               "globalKey" : "a8d53690"
-                            },
-                            "unadjustedDate" : "1999-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "a8d53690"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "4443c8bb"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "8c0b539f"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "959"
+                            "globalKey" : "18a9b"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 6
+                          "rollConvention" : "14"
+                        },
+                        "meta" : {
+                          "globalKey" : "3836d691",
+                          "externalKey" : "floatingCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
+                            "globalKey" : "107"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da36cf11"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7d7eda0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "8563938d"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "floatingCalcPeriodDates",
-                          "globalReference" : "a54e5fcd"
+                          "globalReference" : "3836d691",
+                          "externalReference" : "floatingCalcPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "131ae8a2"
+                            "globalKey" : "eff6d356"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -225,82 +192,79 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates",
-                            "globalReference" : "d533d3ee"
+                            "globalReference" : "25625c64",
+                            "externalReference" : "resetDates"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates",
-                          "globalKey" : "d533d3ee"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "25625c64",
+                          "externalKey" : "resetDates"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "56791807"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da36cf11"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7d7eda0"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "2b8fa"
-                          },
-                          "period" : "Y",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "14"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "30E/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1994-12-14",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -309,302 +273,303 @@
                             },
                             "meta" : {
                               "globalKey" : "ea1a6ec6"
-                            },
-                            "unadjustedDate" : "1994-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ea1a6ec6"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "fixedCalcPeriodDates",
-                          "globalKey" : "fbf296c2"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1999-12-14",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "primaryBusinessCenters",
-                                  "globalReference" : "1ff50d"
+                                  "globalReference" : "1ff50d",
+                                  "externalReference" : "primaryBusinessCenters"
                                 },
                                 "meta" : {
                                   "globalKey" : "da36cf11"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "b7d7eda0"
                               }
                             },
                             "meta" : {
                               "globalKey" : "97297aae"
-                            },
-                            "unadjustedDate" : "1999-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "97297aae"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "30E/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "8b5a674a"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "8c0b550e"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
                           "meta" : {
-                            "globalKey" : "ac8"
+                            "globalKey" : "1794a"
                           },
-                          "period" : "Y",
-                          "periodMultiplier" : 1
+                          "rollConvention" : "14"
+                        },
+                        "meta" : {
+                          "globalKey" : "a5f8cf12",
+                          "externalKey" : "fixedCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
+                            "globalKey" : "78"
                           }
-                        }
-                      }
-                    } ],
-                    "meta" : {
-                      "globalKey" : "e40a62af"
-                    }
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "88a15c60"
-                }
-              },
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da36cf11"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7d7eda0"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "b32991fe"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3703de42"
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "a74ffedb"
+                    }
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "4be6f88c"
+                }
+              },
               "meta" : {
-                "globalKey" : "88a15c60"
+                "globalKey" : "4be6f88c"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "3ce21b9b"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "53c66a4c"
-                  },
-                  "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
-                    "value" : {
-                      "floatingRateIndex" : {
-                        "value" : "EUR-LIBOR-BBA"
-                      },
-                      "indexTenor" : {
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 50000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "EUR",
                         "meta" : {
-                          "globalKey" : "959"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6
+                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                        }
                       }
                     }
-                  }
-                },
-                "quantity" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
+                  }
+                } ],
+                "observable" : {
+                  "rateOption" : {
+                    "value" : {
+                      "floatingRateIndex" : {
+                        "value" : "EUR-LIBOR-BBA"
+                      },
+                      "indexTenor" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
                         "meta" : {
-                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
+                          "globalKey" : "107"
+                        }
                       }
                     },
-                    "value" : 50000000
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "2505dd46"
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "4882fcbc"
                 },
+                "meta" : {
+                  "globalKey" : "c0d07bed"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.06,
                     "unit" : {
                       "currency" : {
+                        "value" : "EUR",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
+                        }
                       }
                     },
-                    "value" : 0.06,
                     "perUnitOf" : {
                       "currency" : {
+                        "value" : "EUR",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
+                        }
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 50000000,
                     "unit" : {
                       "currency" : {
+                        "value" : "EUR",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
+                        }
                       }
-                    },
-                    "value" : 50000000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "c7dc9ac4"
+                }
               } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "9495a03c",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "ca05a501",
+                "externalReference" : "party2"
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3e530c"
-            },
-            "value" : "1994-12-12"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "PARTYAUS33",
                 "meta" : {
-                  "scheme" : "http://www.barclays.com/swaps/trade-id"
-                },
-                "value" : "SW2000"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                }
               },
-              "version" : 1
+              "identifierType" : "BIC",
+              "meta" : {
+                "globalKey" : "3d5ebc15"
+              }
             } ],
-            "issuerReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "ca05a501"
+            "name" : {
+              "value" : "Party A"
             },
             "meta" : {
-              "globalKey" : "fc2ee432"
+              "globalKey" : "9495a03c",
+              "externalKey" : "party1"
             }
-          } ]
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "BARCGB2L",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                }
+              },
+              "identifierType" : "BIC",
+              "meta" : {
+                "globalKey" : "ca05a501"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "ca05a501",
+              "externalKey" : "party2"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "b2493d2f"
+          }
+        },
+        "meta" : {
+          "globalKey" : "b2493d2f"
         }
       }
     }
   } ],
-  "intent" : "CONTRACT_FORMATION",
+  "eventQualifier" : "ContractFormation",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "bd196ece"
-    },
-    "state" : {
-      "positionState" : "FORMED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "41b6d4d1"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "a82d45fc"
-        },
-        "name" : {
-          "value" : "Party A"
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "ca05a501",
+          "externalReference" : "party2"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "SW2000",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-            },
-            "value" : "PARTYAUS33"
+              "scheme" : "http://www.barclays.com/swaps/trade-id"
+            }
           },
-          "identifierType" : "BIC",
-          "meta" : {
-            "globalKey" : "3d5ebc15"
-          }
-        } ]
-      }, {
+          "version" : 1
+        } ],
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "ca05a501"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-            },
-            "value" : "BARCGB2L"
-          },
-          "identifierType" : "BIC",
-          "meta" : {
-            "globalKey" : "ca05a501"
-          }
-        } ]
+          "globalKey" : "958d38d8"
+        }
       } ],
+      "tradeDate" : {
+        "value" : "1994-12-12",
+        "meta" : {
+          "globalKey" : "3e530c"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "a82d45fc"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ca05a501"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -615,46 +580,40 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
-                        },
-                        "meta" : {
-                          "globalKey" : "da36cf11"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7d7eda0"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "28c89"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "14"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1994-12-14",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -663,103 +622,108 @@
                         },
                         "meta" : {
                           "globalKey" : "ea1a6ec6"
-                        },
-                        "unadjustedDate" : "1994-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "a54e5fcd"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1999-12-14",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "DEFR"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "1ff50d"
+                              "globalKey" : "1ff50d",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365af8de"
                           }
                         },
                         "meta" : {
                           "globalKey" : "a8d53690"
-                        },
-                        "unadjustedDate" : "1999-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "a8d53690"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "4443c8bb"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "8c0b539f"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da36cf11"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d7eda0"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "959"
+                        "globalKey" : "18a9b"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 6
+                      "rollConvention" : "14"
+                    },
+                    "meta" : {
+                      "globalKey" : "3836d691",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "107"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da36cf11"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7d7eda0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "8563938d"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "a54e5fcd"
+                      "globalReference" : "3836d691",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "131ae8a2"
+                        "globalKey" : "eff6d356"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -768,82 +732,79 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates",
-                        "globalReference" : "d533d3ee"
+                        "globalReference" : "25625c64",
+                        "externalReference" : "resetDates"
+                      }
+                    },
+                    "resetFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates",
-                      "globalKey" : "d533d3ee"
-                    },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da36cf11"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d7eda0"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "25625c64",
+                      "externalKey" : "resetDates"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "56791807"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
-                        },
-                        "meta" : {
-                          "globalKey" : "da36cf11"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7d7eda0"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "2b8fa"
-                      },
-                      "period" : "Y",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "14"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30E/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1994-12-14",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -852,238 +813,277 @@
                         },
                         "meta" : {
                           "globalKey" : "ea1a6ec6"
-                        },
-                        "unadjustedDate" : "1994-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "fbf296c2"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1999-12-14",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
                         "meta" : {
                           "globalKey" : "97297aae"
-                        },
-                        "unadjustedDate" : "1999-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "97297aae"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "30E/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "8b5a674a"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "8c0b550e"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da36cf11"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d7eda0"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
                       "meta" : {
-                        "globalKey" : "ac8"
+                        "globalKey" : "1794a"
                       },
-                      "period" : "Y",
-                      "periodMultiplier" : 1
+                      "rollConvention" : "14"
+                    },
+                    "meta" : {
+                      "globalKey" : "a5f8cf12",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
+                        "globalKey" : "78"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da36cf11"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7d7eda0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "b32991fe"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "3703de42"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "e40a62af"
+                  "globalKey" : "a74ffedb"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "88a15c60"
+              "globalKey" : "4be6f88c"
             }
           },
           "meta" : {
-            "globalKey" : "88a15c60"
+            "globalKey" : "4be6f88c"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "3ce21b9b"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "53c66a4c"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "EUR-LIBOR-BBA"
-                  },
-                  "indexTenor" : {
+            "quantity" : [ {
+              "value" : {
+                "value" : 50000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "EUR",
                     "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                    }
                   }
                 }
-              }
-            },
-            "quantity" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "EUR-LIBOR-BBA"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "EUR"
+                      "globalKey" : "107"
+                    }
                   }
                 },
-                "value" : 50000000
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "2505dd46"
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "4882fcbc"
             },
+            "meta" : {
+              "globalKey" : "c0d07bed"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.06,
                 "unit" : {
                   "currency" : {
+                    "value" : "EUR",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "EUR"
+                    }
                   }
                 },
-                "value" : 0.06,
                 "perUnitOf" : {
                   "currency" : {
+                    "value" : "EUR",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "EUR"
+                    }
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 50000000,
                 "unit" : {
                   "currency" : {
+                    "value" : "EUR",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "EUR"
+                    }
                   }
-                },
-                "value" : 50000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "c7dc9ac4"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "9495a03c",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "ca05a501",
+            "externalReference" : "party2"
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3e530c"
-        },
-        "value" : "1994-12-12"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "PARTYAUS33",
             "meta" : {
-              "scheme" : "http://www.barclays.com/swaps/trade-id"
-            },
-            "value" : "SW2000"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+            }
           },
-          "version" : 1
+          "identifierType" : "BIC",
+          "meta" : {
+            "globalKey" : "3d5ebc15"
+          }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ca05a501"
+        "name" : {
+          "value" : "Party A"
         },
         "meta" : {
-          "globalKey" : "fc2ee432"
+          "globalKey" : "9495a03c",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "BARCGB2L",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+            }
+          },
+          "identifierType" : "BIC",
+          "meta" : {
+            "globalKey" : "ca05a501"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "ca05a501",
+          "externalKey" : "party2"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "b2493d2f"
+      }
+    },
+    "state" : {
+      "positionState" : "Formed"
+    },
+    "meta" : {
+      "globalKey" : "c0e199d2"
     }
   } ],
-  "eventQualifier" : "ContractFormation",
   "meta" : {
-    "globalKey" : "9cb0d137"
+    "globalKey" : "a67e5f69"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-ir-swap-with-legal-agreement-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-ir-swap-with-legal-agreement-func-output.json
index 30e0bd2487..bed2855ee4 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-ir-swap-with-legal-agreement-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-ir-swap-with-legal-agreement-func-output.json
@@ -1,67 +1,97 @@
 {
+  "intent" : "ContractFormation",
   "eventDate" : "1994-12-12",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "41b6d4d1"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "41b6d4d1"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "a82d45fc"
-            },
-            "name" : {
-              "value" : "Party A"
+    "primitiveInstruction" : {
+      "contractFormation" : {
+        "legalAgreement" : [ {
+          "agreementDate" : "1994-12-12",
+          "legalAgreementIdentification" : {
+            "governingLaw" : "AsSpecifiedInMasterAgreement",
+            "agreementName" : {
+              "agreementType" : "MasterAgreement",
+              "masterAgreementType" : {
+                "value" : "ISDAMaster"
+              }
             },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+            "publisher" : "ISDA"
+          },
+          "contractualParty" : [ {
+            "value" : {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "PARTYAUS33",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                  }
                 },
-                "value" : "PARTYAUS33"
+                "identifierType" : "BIC",
+                "meta" : {
+                  "globalKey" : "3d5ebc15"
+                }
+              } ],
+              "name" : {
+                "value" : "Party A"
               },
-              "identifierType" : "BIC",
               "meta" : {
-                "globalKey" : "3d5ebc15"
+                "globalKey" : "9495a03c",
+                "externalKey" : "party1"
               }
-            } ]
+            }
           }, {
-            "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "ca05a501"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+            "value" : {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "BARCGB2L",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                  }
                 },
-                "value" : "BARCGB2L"
-              },
-              "identifierType" : "BIC",
+                "identifierType" : "BIC",
+                "meta" : {
+                  "globalKey" : "ca05a501"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "ca05a501"
+                "globalKey" : "ca05a501",
+                "externalKey" : "party2"
               }
-            } ]
+            }
           } ],
-          "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "a82d45fc"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ca05a501"
+          "meta" : {
+            "globalKey" : "131d97dc"
+          }
+        } ]
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuerReference" : {
+              "globalReference" : "ca05a501",
+              "externalReference" : "party2"
+            },
+            "assignedIdentifier" : [ {
+              "identifier" : {
+                "value" : "SW2000",
+                "meta" : {
+                  "scheme" : "http://www.barclays.com/swaps/trade-id"
+                }
               },
-              "role" : "PARTY_2"
+              "version" : 1
             } ],
+            "meta" : {
+              "globalKey" : "958d38d8"
+            }
+          } ],
+          "tradeDate" : {
+            "value" : "1994-12-12",
+            "meta" : {
+              "globalKey" : "3e530c"
+            }
+          },
+          "tradableProduct" : {
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -72,46 +102,40 @@
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da36cf11"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7d7eda0"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "28c89"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6,
-                          "rollConvention" : "14"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1994-12-14",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -120,103 +144,108 @@
                             },
                             "meta" : {
                               "globalKey" : "ea1a6ec6"
-                            },
-                            "unadjustedDate" : "1994-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ea1a6ec6"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "floatingCalcPeriodDates",
-                          "globalKey" : "a54e5fcd"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1999-12-14",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "DEFR"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "primaryBusinessCenters",
-                                  "globalKey" : "1ff50d"
+                                  "globalKey" : "1ff50d",
+                                  "externalKey" : "primaryBusinessCenters"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365af8de"
                               }
                             },
                             "meta" : {
                               "globalKey" : "a8d53690"
-                            },
-                            "unadjustedDate" : "1999-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "a8d53690"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "4443c8bb"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "8c0b539f"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "959"
+                            "globalKey" : "18a9b"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 6
+                          "rollConvention" : "14"
+                        },
+                        "meta" : {
+                          "globalKey" : "3836d691",
+                          "externalKey" : "floatingCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
+                            "globalKey" : "107"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da36cf11"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7d7eda0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "8563938d"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "floatingCalcPeriodDates",
-                          "globalReference" : "a54e5fcd"
+                          "globalReference" : "3836d691",
+                          "externalReference" : "floatingCalcPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "131ae8a2"
+                            "globalKey" : "eff6d356"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -225,82 +254,79 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates",
-                            "globalReference" : "d533d3ee"
+                            "globalReference" : "25625c64",
+                            "externalReference" : "resetDates"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates",
-                          "globalKey" : "d533d3ee"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "25625c64",
+                          "externalKey" : "resetDates"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "56791807"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da36cf11"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7d7eda0"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "2b8fa"
-                          },
-                          "period" : "Y",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "14"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "30E/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1994-12-14",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -309,427 +335,303 @@
                             },
                             "meta" : {
                               "globalKey" : "ea1a6ec6"
-                            },
-                            "unadjustedDate" : "1994-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ea1a6ec6"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "fixedCalcPeriodDates",
-                          "globalKey" : "fbf296c2"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1999-12-14",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "primaryBusinessCenters",
-                                  "globalReference" : "1ff50d"
+                                  "globalReference" : "1ff50d",
+                                  "externalReference" : "primaryBusinessCenters"
                                 },
                                 "meta" : {
                                   "globalKey" : "da36cf11"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "b7d7eda0"
                               }
                             },
                             "meta" : {
                               "globalKey" : "97297aae"
-                            },
-                            "unadjustedDate" : "1999-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "97297aae"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "30E/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "8b5a674a"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "8c0b550e"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
                           "meta" : {
-                            "globalKey" : "ac8"
+                            "globalKey" : "1794a"
                           },
-                          "period" : "Y",
-                          "periodMultiplier" : 1
+                          "rollConvention" : "14"
+                        },
+                        "meta" : {
+                          "globalKey" : "a5f8cf12",
+                          "externalKey" : "fixedCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
+                            "globalKey" : "78"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da36cf11"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7d7eda0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "b32991fe"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3703de42"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e40a62af"
+                      "globalKey" : "a74ffedb"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "88a15c60"
+                  "globalKey" : "4be6f88c"
                 }
               },
               "meta" : {
-                "globalKey" : "88a15c60"
+                "globalKey" : "4be6f88c"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "3ce21b9b"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "53c66a4c"
-                  },
-                  "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
-                    "value" : {
-                      "floatingRateIndex" : {
-                        "value" : "EUR-LIBOR-BBA"
-                      },
-                      "indexTenor" : {
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 50000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "EUR",
                         "meta" : {
-                          "globalKey" : "959"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6
+                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                        }
                       }
                     }
-                  }
-                },
-                "quantity" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
+                  }
+                } ],
+                "observable" : {
+                  "rateOption" : {
+                    "value" : {
+                      "floatingRateIndex" : {
+                        "value" : "EUR-LIBOR-BBA"
+                      },
+                      "indexTenor" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
                         "meta" : {
-                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
+                          "globalKey" : "107"
+                        }
                       }
                     },
-                    "value" : 50000000
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "2505dd46"
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "4882fcbc"
                 },
+                "meta" : {
+                  "globalKey" : "c0d07bed"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.06,
                     "unit" : {
                       "currency" : {
+                        "value" : "EUR",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
+                        }
                       }
                     },
-                    "value" : 0.06,
                     "perUnitOf" : {
                       "currency" : {
+                        "value" : "EUR",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
+                        }
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 50000000,
                     "unit" : {
                       "currency" : {
+                        "value" : "EUR",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
+                        }
                       }
-                    },
-                    "value" : 50000000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "c7dc9ac4"
+                }
               } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "9495a03c",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "ca05a501",
+                "externalReference" : "party2"
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3e530c"
-            },
-            "value" : "1994-12-12"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "PARTYAUS33",
                 "meta" : {
-                  "scheme" : "http://www.barclays.com/swaps/trade-id"
-                },
-                "value" : "SW2000"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                }
               },
-              "version" : 1
+              "identifierType" : "BIC",
+              "meta" : {
+                "globalKey" : "3d5ebc15"
+              }
             } ],
-            "issuerReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "ca05a501"
+            "name" : {
+              "value" : "Party A"
             },
             "meta" : {
-              "globalKey" : "fc2ee432"
+              "globalKey" : "9495a03c",
+              "externalKey" : "party1"
             }
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "contractFormation" : {
-        "legalAgreement" : [ {
-          "agreementDate" : "1994-12-12",
-          "contractualParty" : [ {
-            "value" : {
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "a82d45fc"
-              },
-              "name" : {
-                "value" : "Party A"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                  },
-                  "value" : "PARTYAUS33"
-                },
-                "identifierType" : "BIC",
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "BARCGB2L",
                 "meta" : {
-                  "globalKey" : "3d5ebc15"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
                 }
-              } ]
-            }
-          }, {
-            "value" : {
+              },
+              "identifierType" : "BIC",
               "meta" : {
-                "externalKey" : "party2",
                 "globalKey" : "ca05a501"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                  },
-                  "value" : "BARCGB2L"
-                },
-                "identifierType" : "BIC",
-                "meta" : {
-                  "globalKey" : "ca05a501"
-                }
-              } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "ca05a501",
+              "externalKey" : "party2"
             }
           } ],
-          "legalAgreementIdentification" : {
-            "agreementName" : {
-              "agreementType" : "MASTER_AGREEMENT",
-              "masterAgreementType" : {
-                "value" : "ISDA_MASTER"
-              }
-            },
-            "governingLaw" : "AS_SPECIFIED_IN_MASTER_AGREEMENT",
-            "publisher" : "ISDA"
-          },
           "meta" : {
-            "globalKey" : "2f1e4ab2"
+            "globalKey" : "b2493d2f"
           }
-        } ]
+        },
+        "meta" : {
+          "globalKey" : "b2493d2f"
+        }
       }
     }
   } ],
-  "intent" : "CONTRACT_FORMATION",
+  "eventQualifier" : "ContractFormation",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "cd3e3680"
-    },
-    "state" : {
-      "positionState" : "FORMED"
-    },
     "trade" : {
-      "contractDetails" : {
-        "documentation" : [ {
-          "agreementDate" : "1994-12-12",
-          "contractualParty" : [ {
-            "value" : {
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "a82d45fc"
-              },
-              "name" : {
-                "value" : "Party A"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                  },
-                  "value" : "PARTYAUS33"
-                },
-                "identifierType" : "BIC",
-                "meta" : {
-                  "globalKey" : "3d5ebc15"
-                }
-              } ]
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "ca05a501"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                  },
-                  "value" : "BARCGB2L"
-                },
-                "identifierType" : "BIC",
-                "meta" : {
-                  "globalKey" : "ca05a501"
-                }
-              } ]
-            }
-          } ],
-          "legalAgreementIdentification" : {
-            "agreementName" : {
-              "agreementType" : "MASTER_AGREEMENT",
-              "masterAgreementType" : {
-                "value" : "ISDA_MASTER"
-              }
-            },
-            "governingLaw" : "AS_SPECIFIED_IN_MASTER_AGREEMENT",
-            "publisher" : "ISDA"
-          },
-          "meta" : {
-            "globalKey" : "2f1e4ab2"
-          }
-        } ],
-        "meta" : {
-          "globalKey" : "2f1e4ab2"
-        }
-      },
-      "meta" : {
-        "globalKey" : "561a8383"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "a82d45fc"
-        },
-        "name" : {
-          "value" : "Party A"
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "ca05a501",
+          "externalReference" : "party2"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "SW2000",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-            },
-            "value" : "PARTYAUS33"
+              "scheme" : "http://www.barclays.com/swaps/trade-id"
+            }
           },
-          "identifierType" : "BIC",
-          "meta" : {
-            "globalKey" : "3d5ebc15"
-          }
-        } ]
-      }, {
+          "version" : 1
+        } ],
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "ca05a501"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-            },
-            "value" : "BARCGB2L"
-          },
-          "identifierType" : "BIC",
-          "meta" : {
-            "globalKey" : "ca05a501"
-          }
-        } ]
+          "globalKey" : "958d38d8"
+        }
       } ],
+      "tradeDate" : {
+        "value" : "1994-12-12",
+        "meta" : {
+          "globalKey" : "3e530c"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "a82d45fc"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ca05a501"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -740,46 +642,40 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
-                        },
-                        "meta" : {
-                          "globalKey" : "da36cf11"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7d7eda0"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "28c89"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "14"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1994-12-14",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -788,103 +684,108 @@
                         },
                         "meta" : {
                           "globalKey" : "ea1a6ec6"
-                        },
-                        "unadjustedDate" : "1994-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "a54e5fcd"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1999-12-14",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "DEFR"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "1ff50d"
+                              "globalKey" : "1ff50d",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365af8de"
                           }
                         },
                         "meta" : {
                           "globalKey" : "a8d53690"
-                        },
-                        "unadjustedDate" : "1999-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "a8d53690"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "4443c8bb"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "8c0b539f"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da36cf11"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d7eda0"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "959"
+                        "globalKey" : "18a9b"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 6
+                      "rollConvention" : "14"
+                    },
+                    "meta" : {
+                      "globalKey" : "3836d691",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "107"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da36cf11"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7d7eda0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "8563938d"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "a54e5fcd"
+                      "globalReference" : "3836d691",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "131ae8a2"
+                        "globalKey" : "eff6d356"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -893,82 +794,79 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates",
-                        "globalReference" : "d533d3ee"
+                        "globalReference" : "25625c64",
+                        "externalReference" : "resetDates"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates",
-                      "globalKey" : "d533d3ee"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da36cf11"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d7eda0"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "25625c64",
+                      "externalKey" : "resetDates"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "56791807"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
-                        },
-                        "meta" : {
-                          "globalKey" : "da36cf11"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7d7eda0"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "2b8fa"
-                      },
-                      "period" : "Y",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "14"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30E/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1994-12-14",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -977,238 +875,340 @@
                         },
                         "meta" : {
                           "globalKey" : "ea1a6ec6"
-                        },
-                        "unadjustedDate" : "1994-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "fbf296c2"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1999-12-14",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
                         "meta" : {
                           "globalKey" : "97297aae"
-                        },
-                        "unadjustedDate" : "1999-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "97297aae"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "30E/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "8b5a674a"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "8c0b550e"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da36cf11"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d7eda0"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
                       "meta" : {
-                        "globalKey" : "ac8"
+                        "globalKey" : "1794a"
                       },
-                      "period" : "Y",
-                      "periodMultiplier" : 1
+                      "rollConvention" : "14"
+                    },
+                    "meta" : {
+                      "globalKey" : "a5f8cf12",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
+                        "globalKey" : "78"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da36cf11"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7d7eda0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "b32991fe"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "3703de42"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "e40a62af"
+                  "globalKey" : "a74ffedb"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "88a15c60"
+              "globalKey" : "4be6f88c"
             }
           },
           "meta" : {
-            "globalKey" : "88a15c60"
+            "globalKey" : "4be6f88c"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "3ce21b9b"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "53c66a4c"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "EUR-LIBOR-BBA"
-                  },
-                  "indexTenor" : {
+            "quantity" : [ {
+              "value" : {
+                "value" : 50000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "EUR",
                     "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                    }
                   }
                 }
-              }
-            },
-            "quantity" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "EUR-LIBOR-BBA"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "EUR"
+                      "globalKey" : "107"
+                    }
                   }
                 },
-                "value" : 50000000
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "2505dd46"
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "4882fcbc"
             },
+            "meta" : {
+              "globalKey" : "c0d07bed"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.06,
                 "unit" : {
                   "currency" : {
+                    "value" : "EUR",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "EUR"
+                    }
                   }
                 },
-                "value" : 0.06,
                 "perUnitOf" : {
                   "currency" : {
+                    "value" : "EUR",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "EUR"
+                    }
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 50000000,
                 "unit" : {
                   "currency" : {
+                    "value" : "EUR",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "EUR"
+                    }
                   }
-                },
-                "value" : 50000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "c7dc9ac4"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "9495a03c",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "ca05a501",
+            "externalReference" : "party2"
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3e530c"
+      "party" : [ {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "PARTYAUS33",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+            }
+          },
+          "identifierType" : "BIC",
+          "meta" : {
+            "globalKey" : "3d5ebc15"
+          }
+        } ],
+        "name" : {
+          "value" : "Party A"
         },
-        "value" : "1994-12-12"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+        "meta" : {
+          "globalKey" : "9495a03c",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "BARCGB2L",
             "meta" : {
-              "scheme" : "http://www.barclays.com/swaps/trade-id"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+            }
+          },
+          "identifierType" : "BIC",
+          "meta" : {
+            "globalKey" : "ca05a501"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "ca05a501",
+          "externalKey" : "party2"
+        }
+      } ],
+      "contractDetails" : {
+        "documentation" : [ {
+          "agreementDate" : "1994-12-12",
+          "legalAgreementIdentification" : {
+            "governingLaw" : "AsSpecifiedInMasterAgreement",
+            "agreementName" : {
+              "agreementType" : "MasterAgreement",
+              "masterAgreementType" : {
+                "value" : "ISDAMaster"
+              }
             },
-            "value" : "SW2000"
+            "publisher" : "ISDA"
           },
-          "version" : 1
+          "contractualParty" : [ {
+            "value" : {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "PARTYAUS33",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                  }
+                },
+                "identifierType" : "BIC",
+                "meta" : {
+                  "globalKey" : "3d5ebc15"
+                }
+              } ],
+              "name" : {
+                "value" : "Party A"
+              },
+              "meta" : {
+                "globalKey" : "9495a03c",
+                "externalKey" : "party1"
+              }
+            }
+          }, {
+            "value" : {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "BARCGB2L",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                  }
+                },
+                "identifierType" : "BIC",
+                "meta" : {
+                  "globalKey" : "ca05a501"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "ca05a501",
+                "externalKey" : "party2"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "131d97dc"
+          }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ca05a501"
-        },
         "meta" : {
-          "globalKey" : "fc2ee432"
+          "globalKey" : "131d97dc"
         }
-      } ]
+      },
+      "meta" : {
+        "globalKey" : "819df80b"
+      }
+    },
+    "state" : {
+      "positionState" : "Formed"
+    },
+    "meta" : {
+      "globalKey" : "df30dae"
     }
   } ],
-  "eventQualifier" : "ContractFormation",
   "meta" : {
-    "globalKey" : "5373c6e9"
+    "globalKey" : "ca6b6c19"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-ois-swap-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-ois-swap-func-output.json
index 85a5aaa929..597d45b458 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-ois-swap-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-ois-swap-func-output.json
@@ -1,77 +1,37 @@
 {
+  "intent" : "ContractFormation",
   "eventDate" : "2001-01-25",
   "instruction" : [ {
     "before" : {
       "value" : {
-        "meta" : {
-          "globalKey" : "b2b8b6dc"
-        },
         "trade" : {
-          "meta" : {
-            "globalKey" : "b2b8b6dc"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "7cec034c"
-            },
-            "name" : {
-              "value" : "Party A"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "54930084UKLVMY22DS16"
-              },
-              "identifierType" : "LEI",
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "54930084UKLVMY22DS16",
               "meta" : {
-                "globalKey" : "121d7965"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
               }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "490e5f44"
             },
-            "name" : {
-              "value" : "Party B"
-            },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "UITD7895394",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "48750084UKLVTR22DS78"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "de31bddc"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+                }
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "3eac3060"
+            },
+            "identifierType" : "UniqueTransactionIdentifier"
           } ],
+          "tradeDate" : {
+            "value" : "2001-01-25",
+            "meta" : {
+              "globalKey" : "3e8859"
+            }
+          },
           "tradableProduct" : {
-            "ancillaryParty" : [ {
-              "partyReference" : [ {
-                "externalReference" : "party1",
-                "globalReference" : "7cec034c"
-              } ],
-              "role" : "CALCULATION_AGENT_INDEPENDENT"
-            } ],
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "7cec034c"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "490e5f44"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -79,52 +39,43 @@
                   "productQualifier" : "InterestRate_IRSwap_FixedFloat_OIS"
                 } ],
                 "economicTerms" : {
-                  "calculationAgent" : {
-                    "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-                  },
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "20a71d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da378121"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7d89fb0"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "25e2ab"
-                          },
-                          "period" : "T",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "NONE"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2001-01-29",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -133,110 +84,115 @@
                             },
                             "meta" : {
                               "globalKey" : "eae28c55"
-                            },
-                            "unadjustedDate" : "2001-01-29"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "eae28c55"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "floatingCalcPeriodDates",
-                          "globalKey" : "b89a74cb"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2001-04-29",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "primaryBusinessCenters",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "primaryBusinessCenters"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
                             "meta" : {
                               "globalKey" : "a6474bf1"
-                            },
-                            "unadjustedDate" : "2001-04-29"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "a6474bf1"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "de63b475"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "f1e87760"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "20a71d"
+                              "globalReference" : "20a71d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da378121"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d89fb0"
                           }
                         },
-                        "paymentDaysOffset" : {
-                          "meta" : {
-                            "globalKey" : "ea4baf23"
-                          },
-                          "period" : "D",
+                        "calculationPeriodFrequency" : {
                           "periodMultiplier" : 1,
-                          "dayType" : "BUSINESS"
-                        },
-                        "paymentFrequency" : {
+                          "period" : "T",
                           "meta" : {
-                            "globalKey" : "a2d"
+                            "globalKey" : "24b525"
                           },
-                          "period" : "T",
-                          "periodMultiplier" : 1
+                          "rollConvention" : "NONE"
+                        },
+                        "meta" : {
+                          "globalKey" : "b13bf71b",
+                          "externalKey" : "floatingCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
                           "meta" : {
-                            "globalKey" : "0"
+                            "globalKey" : "73"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDaysOffset" : {
+                          "periodMultiplier" : 1,
+                          "period" : "D",
+                          "meta" : {
+                            "globalKey" : "ea4abbbd"
                           },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
+                          "dayType" : "Business"
+                        },
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "20a71d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da378121"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7d89fb0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "7a3b7346"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "floatingCalcPeriodDates",
-                          "globalReference" : "b89a74cb"
+                          "globalReference" : "b13bf71b",
+                          "externalReference" : "floatingCalcPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodEndDate",
                         "fixingDates" : {
+                          "periodMultiplier" : 0,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "23728acc"
+                            "globalKey" : "98ca5cd4"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 0,
+                          "businessDayConvention" : "PRECEDING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -245,82 +201,79 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "PRECEDING",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates",
-                            "globalReference" : "c9907a5f"
+                            "globalReference" : "4a7f3e4d",
+                            "externalReference" : "resetDates"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates",
-                          "globalKey" : "c9907a5f"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "73"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "20a71d"
+                              "globalReference" : "20a71d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da378121"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d89fb0"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "a2d"
-                          },
-                          "period" : "T",
-                          "periodMultiplier" : 1
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                        "meta" : {
+                          "globalKey" : "4a7f3e4d",
+                          "externalKey" : "resetDates"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "94fe34f9"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "20a71d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da378121"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7d89fb0"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "25e2ab"
-                          },
-                          "period" : "T",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "NONE"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2001-01-29",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -329,295 +282,299 @@
                             },
                             "meta" : {
                               "globalKey" : "eae28c55"
-                            },
-                            "unadjustedDate" : "2001-01-29"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "eae28c55"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "fixedCalcPeriodDates",
-                          "globalKey" : "809dacb3"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2001-04-29",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "primaryBusinessCenters",
-                                  "globalReference" : "20a71d"
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "primaryBusinessCenters"
                                 },
                                 "meta" : {
                                   "globalKey" : "da378121"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "b7d89fb0"
                               }
                             },
                             "meta" : {
                               "globalKey" : "53ebbcd"
-                            },
-                            "unadjustedDate" : "2001-04-29"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "53ebbcd"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "99064caf"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "dcfca863"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "20a71d"
+                              "globalReference" : "20a71d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da378121"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d89fb0"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
                           "meta" : {
-                            "globalKey" : "a2d"
+                            "globalKey" : "24b525"
                           },
-                          "period" : "T",
-                          "periodMultiplier" : 1
+                          "rollConvention" : "NONE"
+                        },
+                        "meta" : {
+                          "globalKey" : "20b4d12d",
+                          "externalKey" : "fixedCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
+                            "globalKey" : "73"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "20a71d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da378121"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7d89fb0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "cdd41909"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "2e2deefb"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "ee4ca61a"
+                      "globalKey" : "db796162"
                     }
+                  },
+                  "calculationAgent" : {
+                    "calculationAgentParty" : "CalculationAgentIndependent"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "5c0c6c59"
+                  "globalKey" : "61c1cb35"
                 }
               },
               "meta" : {
-                "globalKey" : "5c0c6c59"
+                "globalKey" : "61c1cb35"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "f2809620"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "23c05191"
-                  },
-                  "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
-                    "value" : {
-                      "floatingRateIndex" : {
-                        "value" : "EUR-EONIA-OIS-COMPOUND"
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 100000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "EUR"
                       }
                     }
-                  }
-                },
-                "quantity" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "EUR"
+                  }
+                } ],
+                "observable" : {
+                  "rateOption" : {
+                    "value" : {
+                      "floatingRateIndex" : {
+                        "value" : "EUR-EONIA-OIS-COMPOUND"
                       }
                     },
-                    "value" : 100000000
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "5449e08f"
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "27beb430"
                 },
+                "meta" : {
+                  "globalKey" : "9894669e"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.051,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "value" : 0.051,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 100000000,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
-                    },
-                    "value" : 100000000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "d017d1d0"
+                }
+              } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "349a498c",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "4caf4c44",
+                "externalReference" : "party2"
+              }
+            } ],
+            "ancillaryParty" : [ {
+              "role" : "CalculationAgentIndependent",
+              "partyReference" : [ {
+                "globalReference" : "349a498c",
+                "externalReference" : "party1"
               } ]
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3e8859"
-            },
-            "value" : "2001-01-25"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "54930084UKLVMY22DS16",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-                },
-                "value" : "UITD7895394"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "121d7965"
               }
             } ],
-            "issuer" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "54930084UKLVMY22DS16"
+            "name" : {
+              "value" : "Party A"
             },
             "meta" : {
-              "globalKey" : "335bf1d6"
+              "globalKey" : "349a498c",
+              "externalKey" : "party1"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "48750084UKLVTR22DS78",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "de31bddc"
+              }
+            } ],
+            "name" : {
+              "value" : "Party B"
             },
-            "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-          } ]
+            "meta" : {
+              "globalKey" : "4caf4c44",
+              "externalKey" : "party2"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "b20f3f9c"
+          }
+        },
+        "meta" : {
+          "globalKey" : "b20f3f9c"
         }
       }
     }
   } ],
-  "intent" : "CONTRACT_FORMATION",
+  "eventQualifier" : "ContractFormation",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "317b3d59"
-    },
-    "state" : {
-      "positionState" : "FORMED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "b2b8b6dc"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "7cec034c"
-        },
-        "name" : {
-          "value" : "Party A"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "54930084UKLVMY22DS16"
-          },
-          "identifierType" : "LEI",
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "490e5f44"
-        },
-        "name" : {
-          "value" : "Party B"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "UITD7895394",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "48750084UKLVTR22DS78"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "de31bddc"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+            }
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "3eac3060"
+        },
+        "identifierType" : "UniqueTransactionIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2001-01-25",
+        "meta" : {
+          "globalKey" : "3e8859"
+        }
+      },
       "tradableProduct" : {
-        "ancillaryParty" : [ {
-          "partyReference" : [ {
-            "externalReference" : "party1",
-            "globalReference" : "7cec034c"
-          } ],
-          "role" : "CALCULATION_AGENT_INDEPENDENT"
-        } ],
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "7cec034c"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "490e5f44"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -625,52 +582,43 @@
               "productQualifier" : "InterestRate_IRSwap_FixedFloat_OIS"
             } ],
             "economicTerms" : {
-              "calculationAgent" : {
-                "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-              },
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "20a71d"
-                        },
-                        "meta" : {
-                          "globalKey" : "da378121"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7d89fb0"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "25e2ab"
-                      },
-                      "period" : "T",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "NONE"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2001-01-29",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -679,110 +627,115 @@
                         },
                         "meta" : {
                           "globalKey" : "eae28c55"
-                        },
-                        "unadjustedDate" : "2001-01-29"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "eae28c55"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "b89a74cb"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2001-04-29",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "20a71d"
+                              "globalKey" : "20a71d",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
                         "meta" : {
                           "globalKey" : "a6474bf1"
-                        },
-                        "unadjustedDate" : "2001-04-29"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "a6474bf1"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "de63b475"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "f1e87760"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "20a71d"
+                          "globalReference" : "20a71d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da378121"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d89fb0"
                       }
                     },
-                    "paymentDaysOffset" : {
-                      "meta" : {
-                        "globalKey" : "ea4baf23"
-                      },
-                      "period" : "D",
+                    "calculationPeriodFrequency" : {
                       "periodMultiplier" : 1,
-                      "dayType" : "BUSINESS"
-                    },
-                    "paymentFrequency" : {
+                      "period" : "T",
                       "meta" : {
-                        "globalKey" : "a2d"
+                        "globalKey" : "24b525"
                       },
-                      "period" : "T",
-                      "periodMultiplier" : 1
+                      "rollConvention" : "NONE"
+                    },
+                    "meta" : {
+                      "globalKey" : "b13bf71b",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
                       "meta" : {
-                        "globalKey" : "0"
+                        "globalKey" : "73"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDaysOffset" : {
+                      "periodMultiplier" : 1,
+                      "period" : "D",
+                      "meta" : {
+                        "globalKey" : "ea4abbbd"
                       },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                      "dayType" : "Business"
+                    },
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "20a71d",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da378121"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7d89fb0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "7a3b7346"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "b89a74cb"
+                      "globalReference" : "b13bf71b",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodEndDate",
                     "fixingDates" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "23728acc"
+                        "globalKey" : "98ca5cd4"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
+                      "businessDayConvention" : "PRECEDING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
@@ -791,82 +744,79 @@
                           "globalKey" : "20a71d"
                         }
                       },
-                      "businessDayConvention" : "PRECEDING",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates",
-                        "globalReference" : "c9907a5f"
+                        "globalReference" : "4a7f3e4d",
+                        "externalReference" : "resetDates"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates",
-                      "globalKey" : "c9907a5f"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
+                      "meta" : {
+                        "globalKey" : "73"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "20a71d"
+                          "globalReference" : "20a71d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da378121"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d89fb0"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "a2d"
-                      },
-                      "period" : "T",
-                      "periodMultiplier" : 1
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                    "meta" : {
+                      "globalKey" : "4a7f3e4d",
+                      "externalKey" : "resetDates"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "94fe34f9"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "20a71d"
-                        },
-                        "meta" : {
-                          "globalKey" : "da378121"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7d89fb0"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "25e2ab"
-                      },
-                      "period" : "T",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "NONE"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2001-01-29",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -875,221 +825,271 @@
                         },
                         "meta" : {
                           "globalKey" : "eae28c55"
-                        },
-                        "unadjustedDate" : "2001-01-29"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "eae28c55"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "809dacb3"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2001-04-29",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "20a71d"
+                              "globalReference" : "20a71d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da378121"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d89fb0"
                           }
                         },
                         "meta" : {
                           "globalKey" : "53ebbcd"
-                        },
-                        "unadjustedDate" : "2001-04-29"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "53ebbcd"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "99064caf"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "dcfca863"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "20a71d"
+                          "globalReference" : "20a71d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da378121"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d89fb0"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
                       "meta" : {
-                        "globalKey" : "a2d"
+                        "globalKey" : "24b525"
                       },
-                      "period" : "T",
-                      "periodMultiplier" : 1
+                      "rollConvention" : "NONE"
+                    },
+                    "meta" : {
+                      "globalKey" : "20b4d12d",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
+                        "globalKey" : "73"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "20a71d",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da378121"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7d89fb0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "cdd41909"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "2e2deefb"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "ee4ca61a"
+                  "globalKey" : "db796162"
                 }
+              },
+              "calculationAgent" : {
+                "calculationAgentParty" : "CalculationAgentIndependent"
               }
             },
             "meta" : {
-              "globalKey" : "5c0c6c59"
+              "globalKey" : "61c1cb35"
             }
           },
           "meta" : {
-            "globalKey" : "5c0c6c59"
+            "globalKey" : "61c1cb35"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "f2809620"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "23c05191"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "EUR-EONIA-OIS-COMPOUND"
+            "quantity" : [ {
+              "value" : {
+                "value" : 100000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "EUR"
                   }
                 }
-              }
-            },
-            "quantity" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "EUR"
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "EUR-EONIA-OIS-COMPOUND"
                   }
                 },
-                "value" : 100000000
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "5449e08f"
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "27beb430"
             },
+            "meta" : {
+              "globalKey" : "9894669e"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.051,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "value" : 0.051,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 100000000,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
-                },
-                "value" : 100000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "d017d1d0"
+            }
+          } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "349a498c",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "4caf4c44",
+            "externalReference" : "party2"
+          }
+        } ],
+        "ancillaryParty" : [ {
+          "role" : "CalculationAgentIndependent",
+          "partyReference" : [ {
+            "globalReference" : "349a498c",
+            "externalReference" : "party1"
           } ]
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3e8859"
-        },
-        "value" : "2001-01-25"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "54930084UKLVMY22DS16",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-            },
-            "value" : "UITD7895394"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "121d7965"
           }
         } ],
-        "issuer" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
+        "name" : {
+          "value" : "Party A"
         },
         "meta" : {
-          "globalKey" : "335bf1d6"
+          "globalKey" : "349a498c",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "48750084UKLVTR22DS78",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "de31bddc"
+          }
+        } ],
+        "name" : {
+          "value" : "Party B"
         },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
+        "meta" : {
+          "globalKey" : "4caf4c44",
+          "externalKey" : "party2"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "b20f3f9c"
+      }
+    },
+    "state" : {
+      "positionState" : "Formed"
+    },
+    "meta" : {
+      "globalKey" : "e730b4ff"
     }
   } ],
-  "eventQualifier" : "ContractFormation",
   "meta" : {
-    "globalKey" : "da21ca0"
+    "globalKey" : "e0388bd0"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-repo-fixed-rate-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-repo-fixed-rate-func-output.json
index 6200bc4873..322a416386 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-repo-fixed-rate-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-repo-fixed-rate-func-output.json
@@ -1,81 +1,88 @@
 {
+  "intent" : "ContractFormation",
   "eventDate" : "2013-10-29",
   "instruction" : [ {
     "before" : {
       "value" : {
-        "meta" : {
-          "globalKey" : "612cca1c"
-        },
         "trade" : {
-          "meta" : {
-            "globalKey" : "612cca1c"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "Party1",
-              "globalKey" : "33f59557"
+          "tradeIdentifier" : [ {
+            "issuerReference" : {
+              "globalReference" : "33f59557",
+              "externalReference" : "Party1"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "Party19235",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-                },
-                "value" : "Party 1"
-              },
-              "meta" : {
-                "globalKey" : "33f59557"
+                  "scheme" : "http://www.party1.com/swaps/trade-id"
+                }
               }
-            } ]
-          }, {
+            } ],
             "meta" : {
-              "externalKey" : "Party2",
-              "globalKey" : "33f59558"
+              "globalKey" : "89623ea4"
+            }
+          }, {
+            "issuerReference" : {
+              "globalReference" : "33f59558",
+              "externalReference" : "Party2"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "Party22000",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-                },
-                "value" : "Party 2"
-              },
-              "meta" : {
-                "globalKey" : "33f59558"
+                  "scheme" : "http://www.party2.com/swaps/trade-id"
+                }
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "f14ec0e6"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "2013-10-29",
+            "meta" : {
+              "globalKey" : "3eea9d"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "Party1",
-                "globalReference" : "33f59557"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "Party2",
-                "globalReference" : "33f59558"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "economicTerms" : {
                   "payout" : {
                     "interestRatePayout" : [ {
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/365.FIXED"
+                      },
                       "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2013-10-29",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -84,18 +91,15 @@
                             },
                             "meta" : {
                               "globalKey" : "ec535e95"
-                            },
-                            "unadjustedDate" : "2013-10-29"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ec535e95"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "21ad6787"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2013-11-04",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -104,72 +108,29 @@
                             },
                             "meta" : {
                               "globalKey" : "ec53f0fc"
-                            },
-                            "unadjustedDate" : "2013-11-04"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ec53f0fc"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "21ad6787"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/365.FIXED"
-                      },
                       "meta" : {
-                        "globalKey" : "965f0f1f"
-                      },
-                      "rateSpecification" : {
-                        "fixedRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
-                          }
-                        }
+                        "globalKey" : "c84f9bcd"
                       }
                     } ],
-                    "meta" : {
-                      "globalKey" : "62a30c68"
-                    },
                     "securityPayout" : [ {
-                      "initialMargin" : {
-                        "margin" : [ {
-                          "haircut" : -0.04762
-                        } ],
-                        "marginType" : "CASH"
-                      },
-                      "meta" : {
-                        "globalKey" : "5edb1da7"
-                      },
-                      "repoDuration" : "TERM",
                       "securityLeg" : [ {
                         "buyerSeller" : {
-                          "buyer" : "PARTY_1",
-                          "seller" : "PARTY_2"
-                        },
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "meta" : {
-                          "globalKey" : "24119d6"
-                        },
-                        "settlementAmount" : {
-                          "unit" : {
-                            "currency" : {
-                              "value" : "USD"
-                            }
-                          },
-                          "value" : 1292748.3,
-                          "meta" : {
-                            "globalKey" : "59b83060"
-                          }
+                          "buyer" : "Party1",
+                          "seller" : "Party2"
                         },
                         "settlementDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2013-10-29",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -178,36 +139,35 @@
                             },
                             "meta" : {
                               "globalKey" : "ec535e95"
-                            },
-                            "unadjustedDate" : "2013-10-29"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ec535e95"
                           }
-                        }
-                      }, {
-                        "buyerSeller" : {
-                          "buyer" : "PARTY_2",
-                          "seller" : "PARTY_1"
-                        },
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "meta" : {
-                          "externalKey" : "forwardLeg",
-                          "globalKey" : "5c3ebcc4"
                         },
                         "settlementAmount" : {
+                          "value" : 1292748.3,
                           "unit" : {
                             "currency" : {
                               "value" : "USD"
                             }
                           },
-                          "value" : 1292586.71,
                           "meta" : {
-                            "globalKey" : "eaa544d7"
+                            "globalKey" : "59b83060"
                           }
                         },
+                        "deliveryMethod" : "DeliveryVersusPayment",
+                        "meta" : {
+                          "globalKey" : "1f48568c"
+                        }
+                      }, {
+                        "buyerSeller" : {
+                          "buyer" : "Party2",
+                          "seller" : "Party1"
+                        },
                         "settlementDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2013-11-04",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -216,34 +176,56 @@
                             },
                             "meta" : {
                               "globalKey" : "ec53f0fc"
-                            },
-                            "unadjustedDate" : "2013-11-04"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ec53f0fc"
                           }
+                        },
+                        "settlementAmount" : {
+                          "value" : 1292586.71,
+                          "unit" : {
+                            "currency" : {
+                              "value" : "USD"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "eaa544d7"
+                          }
+                        },
+                        "deliveryMethod" : "DeliveryVersusPayment",
+                        "meta" : {
+                          "globalKey" : "f650339a",
+                          "externalKey" : "forwardLeg"
                         }
                       } ],
+                      "initialMargin" : {
+                        "marginType" : "Cash",
+                        "margin" : [ {
+                          "haircut" : -0.04762
+                        } ]
+                      },
+                      "repoDuration" : "Term",
                       "securityValuation" : [ {
                         "securityValuationModel" : {
                           "bondValuationModel" : {
-                            "bondPriceAndYieldModel" : {
-                              "cleanOrDirtyPrice" : {
-                                "cleanPrice" : {
-                                  "cleanPrice" : 112.33475
-                                }
-                              }
-                            },
                             "nominalAmount" : {
+                              "value" : 1096000,
                               "unit" : {
                                 "currency" : {
                                   "value" : "USD"
                                 }
                               },
-                              "value" : 1096000,
                               "meta" : {
                                 "globalKey" : "2d3b15b2"
                               }
+                            },
+                            "bondPriceAndYieldModel" : {
+                              "cleanOrDirtyPrice" : {
+                                "cleanPrice" : {
+                                  "cleanPrice" : 112.33475
+                                }
+                              }
                             }
                           }
                         },
@@ -255,210 +237,232 @@
                             }
                           } ]
                         }
-                      } ]
-                    } ]
+                      } ],
+                      "meta" : {
+                        "globalKey" : "d56c1f6f"
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "8d6beb42"
+                    }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "62a30c68"
+                  "globalKey" : "8d6beb42"
                 }
               },
               "meta" : {
-                "globalKey" : "62a30c68"
+                "globalKey" : "8d6beb42"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "2055a57c"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "8145c30a"
-                  },
-                  "productIdentifier" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-1"
-                      } ]
-                    },
-                    "value" : {
-                      "identifier" : {
-                        "meta" : {
-                          "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
-                        },
-                        "value" : "XS"
-                      },
-                      "meta" : {
-                        "globalKey" : "8145c30a"
-                      },
-                      "source" : "ISIN"
-                    }
-                  } ]
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : -0.75,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : -0.75,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 1292748.3,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    } ]
+                  }
+                } ],
+                "observable" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "XS",
+                        "meta" : {
+                          "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
+                        }
+                      },
+                      "source" : "ISIN",
+                      "meta" : {
+                        "globalKey" : "8145c30a"
+                      }
                     },
-                    "value" : 1292748.3
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-1"
+                      } ]
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a7729e36"
                   }
-                } ]
+                },
+                "meta" : {
+                  "globalKey" : "cd865d28"
+                }
               } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "33f59557",
+                "externalReference" : "Party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "33f59558",
+                "externalReference" : "Party2"
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3eea9d"
-            },
-            "value" : "2013-10-29"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "Party 1",
                 "meta" : {
-                  "scheme" : "http://www.party1.com/swaps/trade-id"
-                },
-                "value" : "Party19235"
+                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+                }
+              },
+              "meta" : {
+                "globalKey" : "33f59557"
               }
             } ],
-            "issuerReference" : {
-              "externalReference" : "Party1",
-              "globalReference" : "33f59557"
-            },
             "meta" : {
-              "globalKey" : "18737d68"
+              "globalKey" : "33f59557",
+              "externalKey" : "Party1"
             }
           }, {
-            "assignedIdentifier" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "Party 2",
                 "meta" : {
-                  "scheme" : "http://www.party2.com/swaps/trade-id"
-                },
-                "value" : "Party22000"
+                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+                }
+              },
+              "meta" : {
+                "globalKey" : "33f59558"
               }
             } ],
-            "issuerReference" : {
-              "externalReference" : "Party2",
-              "globalReference" : "33f59558"
-            },
             "meta" : {
-              "globalKey" : "96b8a2ee"
+              "globalKey" : "33f59558",
+              "externalKey" : "Party2"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "6d9af9c8"
+          }
+        },
+        "meta" : {
+          "globalKey" : "6d9af9c8"
         }
       }
     }
   } ],
-  "intent" : "CONTRACT_FORMATION",
+  "eventQualifier" : "ContractFormation",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "93ef607f"
-    },
-    "state" : {
-      "positionState" : "FORMED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "612cca1c"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "Party1",
-          "globalKey" : "33f59557"
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "33f59557",
+          "externalReference" : "Party1"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "Party19235",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-            },
-            "value" : "Party 1"
-          },
-          "meta" : {
-            "globalKey" : "33f59557"
+              "scheme" : "http://www.party1.com/swaps/trade-id"
+            }
           }
-        } ]
-      }, {
+        } ],
         "meta" : {
-          "externalKey" : "Party2",
-          "globalKey" : "33f59558"
+          "globalKey" : "89623ea4"
+        }
+      }, {
+        "issuerReference" : {
+          "globalReference" : "33f59558",
+          "externalReference" : "Party2"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "Party22000",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-            },
-            "value" : "Party 2"
-          },
-          "meta" : {
-            "globalKey" : "33f59558"
+              "scheme" : "http://www.party2.com/swaps/trade-id"
+            }
           }
-        } ]
-      } ],
-      "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "Party1",
-            "globalReference" : "33f59557"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "Party2",
-            "globalReference" : "33f59558"
-          },
-          "role" : "PARTY_2"
         } ],
+        "meta" : {
+          "globalKey" : "f14ec0e6"
+        }
+      } ],
+      "tradeDate" : {
+        "value" : "2013-10-29",
+        "meta" : {
+          "globalKey" : "3eea9d"
+        }
+      },
+      "tradableProduct" : {
         "product" : {
           "contractualProduct" : {
             "economicTerms" : {
               "payout" : {
                 "interestRatePayout" : [ {
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
                     }
                   },
+                  "dayCountFraction" : {
+                    "value" : "ACT/365.FIXED"
+                  },
                   "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2013-10-29",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -467,18 +471,15 @@
                         },
                         "meta" : {
                           "globalKey" : "ec535e95"
-                        },
-                        "unadjustedDate" : "2013-10-29"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ec535e95"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "21ad6787"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2013-11-04",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -487,72 +488,29 @@
                         },
                         "meta" : {
                           "globalKey" : "ec53f0fc"
-                        },
-                        "unadjustedDate" : "2013-11-04"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ec53f0fc"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "21ad6787"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/365.FIXED"
-                  },
                   "meta" : {
-                    "globalKey" : "965f0f1f"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
+                    "globalKey" : "c84f9bcd"
                   }
                 } ],
-                "meta" : {
-                  "globalKey" : "62a30c68"
-                },
                 "securityPayout" : [ {
-                  "initialMargin" : {
-                    "margin" : [ {
-                      "haircut" : -0.04762
-                    } ],
-                    "marginType" : "CASH"
-                  },
-                  "meta" : {
-                    "globalKey" : "5edb1da7"
-                  },
-                  "repoDuration" : "TERM",
                   "securityLeg" : [ {
                     "buyerSeller" : {
-                      "buyer" : "PARTY_1",
-                      "seller" : "PARTY_2"
-                    },
-                    "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                    "meta" : {
-                      "globalKey" : "24119d6"
-                    },
-                    "settlementAmount" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 1292748.3,
-                      "meta" : {
-                        "globalKey" : "59b83060"
-                      }
+                      "buyer" : "Party1",
+                      "seller" : "Party2"
                     },
                     "settlementDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2013-10-29",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -561,36 +519,35 @@
                         },
                         "meta" : {
                           "globalKey" : "ec535e95"
-                        },
-                        "unadjustedDate" : "2013-10-29"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ec535e95"
                       }
-                    }
-                  }, {
-                    "buyerSeller" : {
-                      "buyer" : "PARTY_2",
-                      "seller" : "PARTY_1"
-                    },
-                    "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                    "meta" : {
-                      "externalKey" : "forwardLeg",
-                      "globalKey" : "5c3ebcc4"
                     },
                     "settlementAmount" : {
+                      "value" : 1292748.3,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1292586.71,
                       "meta" : {
-                        "globalKey" : "eaa544d7"
+                        "globalKey" : "59b83060"
                       }
                     },
+                    "deliveryMethod" : "DeliveryVersusPayment",
+                    "meta" : {
+                      "globalKey" : "1f48568c"
+                    }
+                  }, {
+                    "buyerSeller" : {
+                      "buyer" : "Party2",
+                      "seller" : "Party1"
+                    },
                     "settlementDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2013-11-04",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -599,34 +556,56 @@
                         },
                         "meta" : {
                           "globalKey" : "ec53f0fc"
-                        },
-                        "unadjustedDate" : "2013-11-04"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ec53f0fc"
                       }
+                    },
+                    "settlementAmount" : {
+                      "value" : 1292586.71,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "eaa544d7"
+                      }
+                    },
+                    "deliveryMethod" : "DeliveryVersusPayment",
+                    "meta" : {
+                      "globalKey" : "f650339a",
+                      "externalKey" : "forwardLeg"
                     }
                   } ],
+                  "initialMargin" : {
+                    "marginType" : "Cash",
+                    "margin" : [ {
+                      "haircut" : -0.04762
+                    } ]
+                  },
+                  "repoDuration" : "Term",
                   "securityValuation" : [ {
                     "securityValuationModel" : {
                       "bondValuationModel" : {
-                        "bondPriceAndYieldModel" : {
-                          "cleanOrDirtyPrice" : {
-                            "cleanPrice" : {
-                              "cleanPrice" : 112.33475
-                            }
-                          }
-                        },
                         "nominalAmount" : {
+                          "value" : 1096000,
                           "unit" : {
                             "currency" : {
                               "value" : "USD"
                             }
                           },
-                          "value" : 1096000,
                           "meta" : {
                             "globalKey" : "2d3b15b2"
                           }
+                        },
+                        "bondPriceAndYieldModel" : {
+                          "cleanOrDirtyPrice" : {
+                            "cleanPrice" : {
+                              "cleanPrice" : 112.33475
+                            }
+                          }
                         }
                       }
                     },
@@ -638,132 +617,153 @@
                         }
                       } ]
                     }
-                  } ]
-                } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "d56c1f6f"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "8d6beb42"
+                }
               }
             },
             "meta" : {
-              "globalKey" : "62a30c68"
+              "globalKey" : "8d6beb42"
             }
           },
           "meta" : {
-            "globalKey" : "62a30c68"
+            "globalKey" : "8d6beb42"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "2055a57c"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "8145c30a"
-              },
-              "productIdentifier" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "productIdentifier-1"
-                  } ]
-                },
-                "value" : {
-                  "identifier" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
-                    },
-                    "value" : "XS"
-                  },
-                  "meta" : {
-                    "globalKey" : "8145c30a"
-                  },
-                  "source" : "ISIN"
-                }
-              } ]
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : -0.75,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : -0.75,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 1292748.3,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
+              }
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "XS",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
+                    }
+                  },
+                  "source" : "ISIN",
+                  "meta" : {
+                    "globalKey" : "8145c30a"
+                  }
                 },
-                "value" : 1292748.3
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "productIdentifier-1"
+                  } ]
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "a7729e36"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "cd865d28"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "33f59557",
+            "externalReference" : "Party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "33f59558",
+            "externalReference" : "Party2"
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3eea9d"
-        },
-        "value" : "2013-10-29"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "Party 1",
             "meta" : {
-              "scheme" : "http://www.party1.com/swaps/trade-id"
-            },
-            "value" : "Party19235"
+              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+            }
+          },
+          "meta" : {
+            "globalKey" : "33f59557"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59557"
-        },
         "meta" : {
-          "globalKey" : "18737d68"
+          "globalKey" : "33f59557",
+          "externalKey" : "Party1"
         }
       }, {
-        "assignedIdentifier" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "Party 2",
             "meta" : {
-              "scheme" : "http://www.party2.com/swaps/trade-id"
-            },
-            "value" : "Party22000"
+              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+            }
+          },
+          "meta" : {
+            "globalKey" : "33f59558"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59558"
-        },
         "meta" : {
-          "globalKey" : "96b8a2ee"
+          "globalKey" : "33f59558",
+          "externalKey" : "Party2"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "6d9af9c8"
+      }
+    },
+    "state" : {
+      "positionState" : "Formed"
+    },
+    "meta" : {
+      "globalKey" : "eeb6942b"
     }
   } ],
-  "eventQualifier" : "ContractFormation",
   "meta" : {
-    "globalKey" : "d283c24a"
+    "globalKey" : "17e1ac1c"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-swaption-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-swaption-func-output.json
index 43744dd96b..cc7eb10ce5 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-swaption-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-swaption-func-output.json
@@ -1,71 +1,35 @@
 {
+  "intent" : "ContractFormation",
   "eventDate" : "2000-08-30",
   "instruction" : [ {
     "before" : {
       "value" : {
-        "meta" : {
-          "globalKey" : "94dca991"
-        },
         "trade" : {
-          "meta" : {
-            "globalKey" : "d4c46d11"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "d4813763"
+          "tradeIdentifier" : [ {
+            "issuerReference" : {
+              "globalReference" : "d4813763",
+              "externalReference" : "party1"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "123",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                },
-                "value" : "party A"
+                  "scheme" : "http://www.partyA.com/trade-id"
+                }
               },
-              "identifierType" : "BIC",
-              "meta" : {
-                "globalKey" : "d4813763"
-              }
-            } ]
-          }, {
+              "version" : 1
+            } ],
             "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "d4813764"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                },
-                "value" : "party B"
-              },
-              "identifierType" : "BIC",
-              "meta" : {
-                "globalKey" : "d4813764"
-              }
-            } ]
+              "globalKey" : "72886a2b"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "2000-08-30",
+            "meta" : {
+              "globalKey" : "3e821e"
+            }
+          },
           "tradableProduct" : {
-            "ancillaryParty" : [ {
-              "partyReference" : [ {
-                "externalReference" : "party2",
-                "globalReference" : "d4813764"
-              } ],
-              "role" : "CALCULATION_AGENT_INDEPENDENT"
-            } ],
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "d4813763"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "d4813764"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -73,45 +37,24 @@
                   "productQualifier" : "InterestRate_Option_Swaption"
                 } ],
                 "economicTerms" : {
-                  "calculationAgent" : {
-                    "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-                  },
                   "payout" : {
-                    "meta" : {
-                      "globalKey" : "be62c522"
-                    },
                     "optionPayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "buyerSeller" : {
-                        "buyer" : "PARTY_1",
-                        "seller" : "PARTY_2"
+                        "buyer" : "Party1",
+                        "seller" : "Party2"
                       },
                       "exerciseTerms" : {
-                        "exerciseProcedure" : {
-                          "followUpConfirmation" : true,
-                          "manualExercise" : {
-                            "exerciseNotice" : {
-                              "businessCenter" : {
-                                "value" : "GBLO"
-                              },
-                              "exerciseNoticeGiver" : "SELLER"
-                            }
-                          }
-                        },
                         "optionStyle" : {
                           "europeanExercise" : {
-                            "earliestExerciseTime" : {
-                              "businessCenter" : {
-                                "value" : "BEBR"
-                              },
-                              "hourMinuteTime" : "09:00:00"
-                            },
                             "expirationDate" : [ {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-28",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "FOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
@@ -122,35 +65,47 @@
                                       "globalKey" : "4158421"
                                     }
                                   },
-                                  "businessDayConvention" : "FOLLOWING",
                                   "meta" : {
                                     "globalKey" : "da3b6050"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "770e7eb4"
-                                },
-                                "unadjustedDate" : "2001-08-28"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "770e7eb4"
                               }
                             } ],
+                            "earliestExerciseTime" : {
+                              "hourMinuteTime" : "09:00:00",
+                              "businessCenter" : {
+                                "value" : "BEBR"
+                              }
+                            },
                             "expirationTime" : {
+                              "hourMinuteTime" : "11:00:00",
                               "businessCenter" : {
                                 "value" : "BEBR"
-                              },
-                              "hourMinuteTime" : "11:00:00"
+                              }
                             },
                             "meta" : {
-                              "globalKey" : "70973195"
+                              "globalKey" : "83fbdc15"
                             }
                           }
+                        },
+                        "exerciseProcedure" : {
+                          "manualExercise" : {
+                            "exerciseNotice" : {
+                              "exerciseNoticeGiver" : "Seller",
+                              "businessCenter" : {
+                                "value" : "GBLO"
+                              }
+                            }
+                          },
+                          "followUpConfirmation" : true
                         }
                       },
-                      "meta" : {
-                        "globalKey" : "be62c522"
-                      },
                       "underlier" : {
                         "contractualProduct" : {
                           "productTaxonomy" : [ {
@@ -161,46 +116,42 @@
                             "payout" : {
                               "interestRatePayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-1"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
-                                "calculationPeriodDates" : {
-                                  "calculationPeriodDatesAdjustments" : {
-                                    "businessCenters" : {
-                                      "businessCentersReference" : {
-                                        "externalReference" : "accrualBusinessCenters0",
-                                        "globalReference" : "20a71d"
-                                      },
-                                      "meta" : {
-                                        "globalKey" : "26b869c"
+                                "rateSpecification" : {
+                                  "fixedRate" : {
+                                    "rateSchedule" : {
+                                      "price" : {
+                                        "address" : {
+                                          "scope" : "DOCUMENT",
+                                          "value" : "price-1"
+                                        }
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
-                                      "globalKey" : "e00ca52b"
+                                      "globalKey" : "0"
                                     }
-                                  },
-                                  "calculationPeriodFrequency" : {
-                                    "meta" : {
-                                      "globalKey" : "2b934"
-                                    },
-                                    "period" : "Y",
-                                    "periodMultiplier" : 1,
-                                    "rollConvention" : "30"
-                                  },
+                                  }
+                                },
+                                "dayCountFraction" : {
+                                  "value" : "30/360"
+                                },
+                                "calculationPeriodDates" : {
                                   "effectiveDate" : {
                                     "adjustableDate" : {
+                                      "unadjustedDate" : "2001-08-30",
                                       "dateAdjustments" : {
                                         "businessDayConvention" : "NONE",
                                         "meta" : {
@@ -209,135 +160,133 @@
                                       },
                                       "meta" : {
                                         "globalKey" : "eae921d6"
-                                      },
-                                      "unadjustedDate" : "2001-08-30"
+                                      }
                                     },
                                     "meta" : {
                                       "globalKey" : "eae921d6"
                                     }
                                   },
-                                  "meta" : {
-                                    "externalKey" : "CalcPeriodDates0",
-                                    "globalKey" : "d3cc58e7"
-                                  },
                                   "terminationDate" : {
                                     "adjustableDate" : {
+                                      "unadjustedDate" : "2006-08-30",
                                       "dateAdjustments" : {
+                                        "businessDayConvention" : "MODFOLLOWING",
                                         "businessCenters" : {
                                           "businessCenter" : [ {
                                             "value" : "EUTA"
                                           } ],
                                           "meta" : {
-                                            "externalKey" : "accrualBusinessCenters0",
-                                            "globalKey" : "20a71d"
+                                            "globalKey" : "20a71d",
+                                            "externalKey" : "accrualBusinessCenters0"
                                           }
                                         },
-                                        "businessDayConvention" : "MODFOLLOWING",
                                         "meta" : {
                                           "globalKey" : "365baaee"
                                         }
                                       },
                                       "meta" : {
                                         "globalKey" : "9ead9b90"
-                                      },
-                                      "unadjustedDate" : "2006-08-30"
+                                      }
                                     },
                                     "meta" : {
                                       "globalKey" : "9ead9b90"
                                     }
+                                  },
+                                  "calculationPeriodDatesAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
+                                    "businessCenters" : {
+                                      "businessCentersReference" : {
+                                        "globalReference" : "20a71d",
+                                        "externalReference" : "accrualBusinessCenters0"
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "26b869c"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "e00ca52b"
+                                    }
+                                  },
+                                  "calculationPeriodFrequency" : {
+                                    "periodMultiplier" : 1,
+                                    "period" : "Y",
+                                    "meta" : {
+                                      "globalKey" : "17984"
+                                    },
+                                    "rollConvention" : "30"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "2f4e2f95",
+                                    "externalKey" : "CalcPeriodDates0"
                                   }
                                 },
-                                "dayCountFraction" : {
-                                  "value" : "30/360"
-                                },
-                                "meta" : {
-                                  "globalKey" : "1b29e05c"
-                                },
                                 "paymentDates" : {
-                                  "meta" : {
-                                    "globalKey" : "4d64aef4"
+                                  "paymentFrequency" : {
+                                    "periodMultiplier" : 1,
+                                    "period" : "Y",
+                                    "meta" : {
+                                      "globalKey" : "78"
+                                    }
                                   },
-                                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                                  "payRelativeTo" : "CalculationPeriodEndDate",
                                   "paymentDatesAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
                                       } ],
                                       "meta" : {
-                                        "externalKey" : "paymentBusinessCenters0",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "paymentBusinessCenters0"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
                                       "globalKey" : "365baaee"
                                     }
                                   },
-                                  "paymentFrequency" : {
-                                    "meta" : {
-                                      "globalKey" : "ac8"
-                                    },
-                                    "period" : "Y",
-                                    "periodMultiplier" : 1
+                                  "meta" : {
+                                    "globalKey" : "9b0d9350"
                                   }
                                 },
-                                "rateSpecification" : {
-                                  "fixedRate" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
-                                    "rateSchedule" : {
-                                      "price" : {
-                                        "address" : {
-                                          "scope" : "DOCUMENT",
-                                          "value" : "price-1"
-                                        }
-                                      }
-                                    }
-                                  }
+                                "meta" : {
+                                  "globalKey" : "2b126fd0"
                                 }
                               }, {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_2",
-                                  "receiver" : "PARTY_1"
+                                  "payer" : "Party2",
+                                  "receiver" : "Party1"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
-                                "calculationPeriodDates" : {
-                                  "calculationPeriodDatesAdjustments" : {
-                                    "businessCenters" : {
-                                      "businessCentersReference" : {
-                                        "externalReference" : "accrualBusinessCenters1",
-                                        "globalReference" : "20a71d"
-                                      },
-                                      "meta" : {
-                                        "globalKey" : "26bfafb"
+                                "rateSpecification" : {
+                                  "floatingRate" : {
+                                    "rateOption" : {
+                                      "address" : {
+                                        "scope" : "DOCUMENT",
+                                        "value" : "rateOption-1"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
-                                      "globalKey" : "e00d198a"
+                                      "globalKey" : "0"
                                     }
-                                  },
-                                  "calculationPeriodFrequency" : {
-                                    "meta" : {
-                                      "globalKey" : "28cc3"
-                                    },
-                                    "period" : "M",
-                                    "periodMultiplier" : 6,
-                                    "rollConvention" : "30"
-                                  },
+                                  }
+                                },
+                                "dayCountFraction" : {
+                                  "value" : "ACT/360"
+                                },
+                                "calculationPeriodDates" : {
                                   "effectiveDate" : {
                                     "adjustableDate" : {
+                                      "unadjustedDate" : "2001-08-30",
                                       "dateAdjustments" : {
                                         "businessDayConvention" : "NONE",
                                         "meta" : {
@@ -346,312 +295,360 @@
                                       },
                                       "meta" : {
                                         "globalKey" : "eae921d6"
-                                      },
-                                      "unadjustedDate" : "2001-08-30"
+                                      }
                                     },
                                     "meta" : {
                                       "globalKey" : "eae921d6"
                                     }
                                   },
-                                  "meta" : {
-                                    "externalKey" : "CalcPeriodDates1",
-                                    "globalKey" : "ed7fb39"
-                                  },
                                   "terminationDate" : {
                                     "adjustableDate" : {
+                                      "unadjustedDate" : "2006-08-30",
                                       "dateAdjustments" : {
+                                        "businessDayConvention" : "MODFOLLOWING",
                                         "businessCenters" : {
                                           "businessCenter" : [ {
                                             "value" : "EUTA"
                                           } ],
                                           "meta" : {
-                                            "externalKey" : "accrualBusinessCenters1",
-                                            "globalKey" : "20a71d"
+                                            "globalKey" : "20a71d",
+                                            "externalKey" : "accrualBusinessCenters1"
                                           }
                                         },
-                                        "businessDayConvention" : "MODFOLLOWING",
                                         "meta" : {
                                           "globalKey" : "365baaee"
                                         }
                                       },
                                       "meta" : {
                                         "globalKey" : "9ead9b90"
-                                      },
-                                      "unadjustedDate" : "2006-08-30"
+                                      }
                                     },
                                     "meta" : {
                                       "globalKey" : "9ead9b90"
                                     }
-                                  }
-                                },
-                                "dayCountFraction" : {
-                                  "value" : "ACT/360"
-                                },
-                                "meta" : {
-                                  "globalKey" : "42ba4bb4"
-                                },
-                                "paymentDates" : {
-                                  "meta" : {
-                                    "globalKey" : "4d64ad85"
                                   },
-                                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                  "paymentDatesAdjustments" : {
+                                  "calculationPeriodDatesAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
-                                      "businessCenter" : [ {
-                                        "value" : "EUTA"
-                                      } ],
+                                      "businessCentersReference" : {
+                                        "globalReference" : "20a71d",
+                                        "externalReference" : "accrualBusinessCenters1"
+                                      },
                                       "meta" : {
-                                        "externalKey" : "paymentBusinessCenters1",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "26bfafb"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
-                                      "globalKey" : "365baaee"
+                                      "globalKey" : "e00d198a"
                                     }
                                   },
-                                  "paymentFrequency" : {
+                                  "calculationPeriodFrequency" : {
+                                    "periodMultiplier" : 6,
+                                    "period" : "M",
                                     "meta" : {
-                                      "globalKey" : "959"
+                                      "globalKey" : "18ad5"
                                     },
-                                    "period" : "M",
-                                    "periodMultiplier" : 6
+                                    "rollConvention" : "30"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "972f6dc5",
+                                    "externalKey" : "CalcPeriodDates1"
                                   }
                                 },
-                                "rateSpecification" : {
-                                  "floatingRate" : {
+                                "paymentDates" : {
+                                  "paymentFrequency" : {
+                                    "periodMultiplier" : 6,
+                                    "period" : "M",
                                     "meta" : {
-                                      "globalKey" : "0"
-                                    },
-                                    "rateOption" : {
-                                      "address" : {
-                                        "scope" : "DOCUMENT",
-                                        "value" : "rateOption-1"
+                                      "globalKey" : "107"
+                                    }
+                                  },
+                                  "payRelativeTo" : "CalculationPeriodEndDate",
+                                  "paymentDatesAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
+                                    "businessCenters" : {
+                                      "businessCenter" : [ {
+                                        "value" : "EUTA"
+                                      } ],
+                                      "meta" : {
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "paymentBusinessCenters1"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "365baaee"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "8f129421"
                                   }
                                 },
                                 "resetDates" : {
                                   "calculationPeriodDatesReference" : {
-                                    "externalReference" : "CalcPeriodDates1",
-                                    "globalReference" : "ed7fb39"
+                                    "globalReference" : "972f6dc5",
+                                    "externalReference" : "CalcPeriodDates1"
                                   },
+                                  "resetRelativeTo" : "CalculationPeriodStartDate",
                                   "fixingDates" : {
+                                    "periodMultiplier" : -2,
+                                    "period" : "D",
                                     "meta" : {
-                                      "globalKey" : "2d80ce65"
+                                      "globalKey" : "a5cb919"
                                     },
-                                    "period" : "D",
-                                    "periodMultiplier" : -2,
-                                    "dayType" : "BUSINESS",
+                                    "dayType" : "Business",
+                                    "businessDayConvention" : "NONE",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
                                       } ],
                                       "meta" : {
-                                        "externalKey" : "fixingBusinessCenters0",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "fixingBusinessCenters0"
                                       }
                                     },
-                                    "businessDayConvention" : "NONE",
                                     "dateRelativeTo" : {
-                                      "externalReference" : "resetDates0",
-                                      "globalReference" : "27280e73"
+                                      "globalReference" : "a64bcd67",
+                                      "externalReference" : "resetDates0"
                                     }
                                   },
-                                  "meta" : {
-                                    "externalKey" : "resetDates0",
-                                    "globalKey" : "27280e73"
+                                  "resetFrequency" : {
+                                    "periodMultiplier" : 6,
+                                    "period" : "M",
+                                    "meta" : {
+                                      "globalKey" : "107"
+                                    }
                                   },
                                   "resetDatesAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
                                       "businessCentersReference" : {
-                                        "externalReference" : "paymentBusinessCenters1",
-                                        "globalReference" : "20a71d"
+                                        "globalReference" : "20a71d",
+                                        "externalReference" : "paymentBusinessCenters1"
                                       },
                                       "meta" : {
                                         "globalKey" : "c3690944"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
                                       "globalKey" : "a10a27d3"
                                     }
                                   },
-                                  "resetFrequency" : {
-                                    "meta" : {
-                                      "globalKey" : "959"
-                                    },
-                                    "period" : "M",
-                                    "periodMultiplier" : 6
-                                  },
-                                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                                  "meta" : {
+                                    "globalKey" : "a64bcd67",
+                                    "externalKey" : "resetDates0"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "30f825c0"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "7f83fd8"
+                                "globalKey" : "62c23bf0"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "587d6b07"
+                            "globalKey" : "b347671f"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "587d6b07"
+                          "globalKey" : "b347671f"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "776b4b44"
                       }
-                    } ]
+                    } ],
+                    "meta" : {
+                      "globalKey" : "776b4b44"
+                    }
+                  },
+                  "calculationAgent" : {
+                    "calculationAgentParty" : "CalculationAgentIndependent"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "6b8e946d"
+                  "globalKey" : "d6f86823"
                 }
               },
               "meta" : {
-                "globalKey" : "6b8e946d"
+                "globalKey" : "d6f86823"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "7f30bbe5"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.05,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "value" : 0.05,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
+                    "priceType" : "InterestRate"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
                   }
                 } ],
                 "quantity" : [ {
+                  "value" : {
+                    "value" : 100000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "EUR"
+                      }
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     } ]
-                  },
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "66e6c0bb"
+                }
+              }, {
+                "quantity" : [ {
                   "value" : {
+                    "value" : 100000000,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
-                    },
-                    "value" : 100000000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "65d139a0"
-                },
+                } ],
                 "observable" : {
-                  "meta" : {
-                    "globalKey" : "bf589e11"
-                  },
                   "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
                     "value" : {
                       "floatingRateIndex" : {
                         "value" : "EUR-EURIBOR-Telerate"
                       },
                       "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "959"
-                        },
+                        "periodMultiplier" : 6,
                         "period" : "M",
-                        "periodMultiplier" : 6
+                        "meta" : {
+                          "globalKey" : "107"
+                        }
                       }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
                     }
-                  }
-                },
-                "quantity" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
-                    } ]
                   },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "EUR"
-                      }
-                    },
-                    "value" : 100000000
+                  "meta" : {
+                    "globalKey" : "2bba2221"
                   }
-                } ]
+                },
+                "meta" : {
+                  "globalKey" : "4820adb2"
+                }
+              } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "d4813763",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "d4813764",
+                "externalReference" : "party2"
+              }
+            } ],
+            "ancillaryParty" : [ {
+              "role" : "CalculationAgentIndependent",
+              "partyReference" : [ {
+                "globalReference" : "d4813764",
+                "externalReference" : "party2"
               } ]
             } ]
           },
-          "tradeDate" : {
+          "party" : [ {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "party A",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                }
+              },
+              "identifierType" : "BIC",
+              "meta" : {
+                "globalKey" : "d4813763"
+              }
+            } ],
             "meta" : {
-              "globalKey" : "3e821e"
-            },
-            "value" : "2000-08-30"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+              "globalKey" : "d4813763",
+              "externalKey" : "party1"
+            }
+          }, {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "party B",
                 "meta" : {
-                  "scheme" : "http://www.partyA.com/trade-id"
-                },
-                "value" : "123"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                }
               },
-              "version" : 1
+              "identifierType" : "BIC",
+              "meta" : {
+                "globalKey" : "d4813764"
+              }
             } ],
-            "issuerReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "d4813763"
-            },
             "meta" : {
-              "globalKey" : "52e63ae5"
+              "globalKey" : "d4813764",
+              "externalKey" : "party2"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "51cd49d7"
+          }
         },
         "transferHistory" : [ {
-          "meta" : {
-            "globalKey" : "6bba78c2"
-          },
           "transfer" : {
-            "payerReceiver" : {
-              "payerPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "d4813763"
-              },
-              "receiverPartyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "d4813764"
-              }
-            },
             "quantity" : {
+              "value" : 100000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
+              }
+            },
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "globalReference" : "d4813763",
+                "externalReference" : "party1"
               },
-              "value" : 100000
+              "receiverPartyReference" : {
+                "globalReference" : "d4813764",
+                "externalReference" : "party2"
+              }
             },
             "settlementDate" : {
+              "unadjustedDate" : "2000-08-30",
               "dateAdjustments" : {
+                "businessDayConvention" : "FOLLOWING",
                 "businessCenters" : {
                   "businessCenter" : [ {
                     "value" : "EUTA"
@@ -660,89 +657,53 @@
                     "globalKey" : "20a71d"
                   }
                 },
-                "businessDayConvention" : "FOLLOWING",
                 "meta" : {
                   "globalKey" : "211dc30c"
                 }
-              },
-              "unadjustedDate" : "2000-08-30"
+              }
             },
             "transferExpression" : {
-              "priceTransfer" : "PREMIUM"
+              "priceTransfer" : "Premium"
             }
+          },
+          "meta" : {
+            "globalKey" : "33666668"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "ab5a1b1"
+        }
       }
     }
   } ],
-  "intent" : "CONTRACT_FORMATION",
+  "eventQualifier" : "ContractFormation",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "6128b0f4"
-    },
-    "state" : {
-      "positionState" : "FORMED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "d4c46d11"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "d4813763"
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "d4813763",
+          "externalReference" : "party1"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "123",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-            },
-            "value" : "party A"
+              "scheme" : "http://www.partyA.com/trade-id"
+            }
           },
-          "identifierType" : "BIC",
-          "meta" : {
-            "globalKey" : "d4813763"
-          }
-        } ]
-      }, {
+          "version" : 1
+        } ],
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "d4813764"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-            },
-            "value" : "party B"
-          },
-          "identifierType" : "BIC",
-          "meta" : {
-            "globalKey" : "d4813764"
-          }
-        } ]
+          "globalKey" : "72886a2b"
+        }
       } ],
+      "tradeDate" : {
+        "value" : "2000-08-30",
+        "meta" : {
+          "globalKey" : "3e821e"
+        }
+      },
       "tradableProduct" : {
-        "ancillaryParty" : [ {
-          "partyReference" : [ {
-            "externalReference" : "party2",
-            "globalReference" : "d4813764"
-          } ],
-          "role" : "CALCULATION_AGENT_INDEPENDENT"
-        } ],
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "d4813763"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "d4813764"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -750,45 +711,24 @@
               "productQualifier" : "InterestRate_Option_Swaption"
             } ],
             "economicTerms" : {
-              "calculationAgent" : {
-                "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-              },
               "payout" : {
-                "meta" : {
-                  "globalKey" : "be62c522"
-                },
                 "optionPayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "buyerSeller" : {
-                    "buyer" : "PARTY_1",
-                    "seller" : "PARTY_2"
+                    "buyer" : "Party1",
+                    "seller" : "Party2"
                   },
                   "exerciseTerms" : {
-                    "exerciseProcedure" : {
-                      "followUpConfirmation" : true,
-                      "manualExercise" : {
-                        "exerciseNotice" : {
-                          "businessCenter" : {
-                            "value" : "GBLO"
-                          },
-                          "exerciseNoticeGiver" : "SELLER"
-                        }
-                      }
-                    },
                     "optionStyle" : {
                       "europeanExercise" : {
-                        "earliestExerciseTime" : {
-                          "businessCenter" : {
-                            "value" : "BEBR"
-                          },
-                          "hourMinuteTime" : "09:00:00"
-                        },
                         "expirationDate" : [ {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2001-08-28",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "FOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
@@ -799,35 +739,47 @@
                                   "globalKey" : "4158421"
                                 }
                               },
-                              "businessDayConvention" : "FOLLOWING",
                               "meta" : {
                                 "globalKey" : "da3b6050"
                               }
                             },
                             "meta" : {
                               "globalKey" : "770e7eb4"
-                            },
-                            "unadjustedDate" : "2001-08-28"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "770e7eb4"
                           }
                         } ],
+                        "earliestExerciseTime" : {
+                          "hourMinuteTime" : "09:00:00",
+                          "businessCenter" : {
+                            "value" : "BEBR"
+                          }
+                        },
                         "expirationTime" : {
+                          "hourMinuteTime" : "11:00:00",
                           "businessCenter" : {
                             "value" : "BEBR"
-                          },
-                          "hourMinuteTime" : "11:00:00"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "70973195"
+                          "globalKey" : "83fbdc15"
                         }
                       }
+                    },
+                    "exerciseProcedure" : {
+                      "manualExercise" : {
+                        "exerciseNotice" : {
+                          "exerciseNoticeGiver" : "Seller",
+                          "businessCenter" : {
+                            "value" : "GBLO"
+                          }
+                        }
+                      },
+                      "followUpConfirmation" : true
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "be62c522"
-                  },
                   "underlier" : {
                     "contractualProduct" : {
                       "productTaxonomy" : [ {
@@ -838,46 +790,42 @@
                         "payout" : {
                           "interestRatePayout" : [ {
                             "payerReceiver" : {
-                              "payer" : "PARTY_1",
-                              "receiver" : "PARTY_2"
+                              "payer" : "Party1",
+                              "receiver" : "Party2"
                             },
                             "priceQuantity" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
                               "quantitySchedule" : {
                                 "address" : {
                                   "scope" : "DOCUMENT",
                                   "value" : "quantity-1"
                                 }
+                              },
+                              "meta" : {
+                                "globalKey" : "0"
                               }
                             },
-                            "calculationPeriodDates" : {
-                              "calculationPeriodDatesAdjustments" : {
-                                "businessCenters" : {
-                                  "businessCentersReference" : {
-                                    "externalReference" : "accrualBusinessCenters0",
-                                    "globalReference" : "20a71d"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "26b869c"
+                            "rateSpecification" : {
+                              "fixedRate" : {
+                                "rateSchedule" : {
+                                  "price" : {
+                                    "address" : {
+                                      "scope" : "DOCUMENT",
+                                      "value" : "price-1"
+                                    }
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
-                                  "globalKey" : "e00ca52b"
+                                  "globalKey" : "0"
                                 }
-                              },
-                              "calculationPeriodFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "2b934"
-                                },
-                                "period" : "Y",
-                                "periodMultiplier" : 1,
-                                "rollConvention" : "30"
-                              },
+                              }
+                            },
+                            "dayCountFraction" : {
+                              "value" : "30/360"
+                            },
+                            "calculationPeriodDates" : {
                               "effectiveDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2001-08-30",
                                   "dateAdjustments" : {
                                     "businessDayConvention" : "NONE",
                                     "meta" : {
@@ -886,135 +834,133 @@
                                   },
                                   "meta" : {
                                     "globalKey" : "eae921d6"
-                                  },
-                                  "unadjustedDate" : "2001-08-30"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "CalcPeriodDates0",
-                                "globalKey" : "d3cc58e7"
-                              },
                               "terminationDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2006-08-30",
                                   "dateAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
                                       } ],
                                       "meta" : {
-                                        "externalKey" : "accrualBusinessCenters0",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "accrualBusinessCenters0"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
                                       "globalKey" : "365baaee"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "9ead9b90"
-                                  },
-                                  "unadjustedDate" : "2006-08-30"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
                                 }
+                              },
+                              "calculationPeriodDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
+                                "businessCenters" : {
+                                  "businessCentersReference" : {
+                                    "globalReference" : "20a71d",
+                                    "externalReference" : "accrualBusinessCenters0"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "26b869c"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "e00ca52b"
+                                }
+                              },
+                              "calculationPeriodFrequency" : {
+                                "periodMultiplier" : 1,
+                                "period" : "Y",
+                                "meta" : {
+                                  "globalKey" : "17984"
+                                },
+                                "rollConvention" : "30"
+                              },
+                              "meta" : {
+                                "globalKey" : "2f4e2f95",
+                                "externalKey" : "CalcPeriodDates0"
                               }
                             },
-                            "dayCountFraction" : {
-                              "value" : "30/360"
-                            },
-                            "meta" : {
-                              "globalKey" : "1b29e05c"
-                            },
                             "paymentDates" : {
-                              "meta" : {
-                                "globalKey" : "4d64aef4"
+                              "paymentFrequency" : {
+                                "periodMultiplier" : 1,
+                                "period" : "Y",
+                                "meta" : {
+                                  "globalKey" : "78"
+                                }
                               },
-                              "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                              "payRelativeTo" : "CalculationPeriodEndDate",
                               "paymentDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "EUTA"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "paymentBusinessCenters0",
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "20a71d",
+                                    "externalKey" : "paymentBusinessCenters0"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "365baaee"
                                 }
                               },
-                              "paymentFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "ac8"
-                                },
-                                "period" : "Y",
-                                "periodMultiplier" : 1
+                              "meta" : {
+                                "globalKey" : "9b0d9350"
                               }
                             },
-                            "rateSpecification" : {
-                              "fixedRate" : {
-                                "meta" : {
-                                  "globalKey" : "0"
-                                },
-                                "rateSchedule" : {
-                                  "price" : {
-                                    "address" : {
-                                      "scope" : "DOCUMENT",
-                                      "value" : "price-1"
-                                    }
-                                  }
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "2b126fd0"
                             }
                           }, {
                             "payerReceiver" : {
-                              "payer" : "PARTY_2",
-                              "receiver" : "PARTY_1"
+                              "payer" : "Party2",
+                              "receiver" : "Party1"
                             },
                             "priceQuantity" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
                               "quantitySchedule" : {
                                 "address" : {
                                   "scope" : "DOCUMENT",
                                   "value" : "quantity-2"
                                 }
+                              },
+                              "meta" : {
+                                "globalKey" : "0"
                               }
                             },
-                            "calculationPeriodDates" : {
-                              "calculationPeriodDatesAdjustments" : {
-                                "businessCenters" : {
-                                  "businessCentersReference" : {
-                                    "externalReference" : "accrualBusinessCenters1",
-                                    "globalReference" : "20a71d"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "26bfafb"
+                            "rateSpecification" : {
+                              "floatingRate" : {
+                                "rateOption" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "rateOption-1"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
-                                "meta" : {
-                                  "globalKey" : "e00d198a"
-                                }
-                              },
-                              "calculationPeriodFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "28cc3"
-                                },
-                                "period" : "M",
-                                "periodMultiplier" : 6,
-                                "rollConvention" : "30"
-                              },
+                                "meta" : {
+                                  "globalKey" : "0"
+                                }
+                              }
+                            },
+                            "dayCountFraction" : {
+                              "value" : "ACT/360"
+                            },
+                            "calculationPeriodDates" : {
                               "effectiveDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2001-08-30",
                                   "dateAdjustments" : {
                                     "businessDayConvention" : "NONE",
                                     "meta" : {
@@ -1023,312 +969,363 @@
                                   },
                                   "meta" : {
                                     "globalKey" : "eae921d6"
-                                  },
-                                  "unadjustedDate" : "2001-08-30"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "CalcPeriodDates1",
-                                "globalKey" : "ed7fb39"
-                              },
                               "terminationDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2006-08-30",
                                   "dateAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
                                       } ],
                                       "meta" : {
-                                        "externalKey" : "accrualBusinessCenters1",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "accrualBusinessCenters1"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
                                       "globalKey" : "365baaee"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "9ead9b90"
-                                  },
-                                  "unadjustedDate" : "2006-08-30"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
                                 }
+                              },
+                              "calculationPeriodDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
+                                "businessCenters" : {
+                                  "businessCentersReference" : {
+                                    "globalReference" : "20a71d",
+                                    "externalReference" : "accrualBusinessCenters1"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "26bfafb"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "e00d198a"
+                                }
+                              },
+                              "calculationPeriodFrequency" : {
+                                "periodMultiplier" : 6,
+                                "period" : "M",
+                                "meta" : {
+                                  "globalKey" : "18ad5"
+                                },
+                                "rollConvention" : "30"
+                              },
+                              "meta" : {
+                                "globalKey" : "972f6dc5",
+                                "externalKey" : "CalcPeriodDates1"
                               }
                             },
-                            "dayCountFraction" : {
-                              "value" : "ACT/360"
-                            },
-                            "meta" : {
-                              "globalKey" : "42ba4bb4"
-                            },
                             "paymentDates" : {
-                              "meta" : {
-                                "globalKey" : "4d64ad85"
+                              "paymentFrequency" : {
+                                "periodMultiplier" : 6,
+                                "period" : "M",
+                                "meta" : {
+                                  "globalKey" : "107"
+                                }
                               },
-                              "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                              "payRelativeTo" : "CalculationPeriodEndDate",
                               "paymentDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "EUTA"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "paymentBusinessCenters1",
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "20a71d",
+                                    "externalKey" : "paymentBusinessCenters1"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "365baaee"
                                 }
                               },
-                              "paymentFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "959"
-                                },
-                                "period" : "M",
-                                "periodMultiplier" : 6
-                              }
-                            },
-                            "rateSpecification" : {
-                              "floatingRate" : {
-                                "meta" : {
-                                  "globalKey" : "0"
-                                },
-                                "rateOption" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "rateOption-1"
-                                  }
-                                }
+                              "meta" : {
+                                "globalKey" : "8f129421"
                               }
                             },
                             "resetDates" : {
                               "calculationPeriodDatesReference" : {
-                                "externalReference" : "CalcPeriodDates1",
-                                "globalReference" : "ed7fb39"
+                                "globalReference" : "972f6dc5",
+                                "externalReference" : "CalcPeriodDates1"
                               },
+                              "resetRelativeTo" : "CalculationPeriodStartDate",
                               "fixingDates" : {
+                                "periodMultiplier" : -2,
+                                "period" : "D",
                                 "meta" : {
-                                  "globalKey" : "2d80ce65"
+                                  "globalKey" : "a5cb919"
                                 },
-                                "period" : "D",
-                                "periodMultiplier" : -2,
-                                "dayType" : "BUSINESS",
+                                "dayType" : "Business",
+                                "businessDayConvention" : "NONE",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "EUTA"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "fixingBusinessCenters0",
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "20a71d",
+                                    "externalKey" : "fixingBusinessCenters0"
                                   }
                                 },
-                                "businessDayConvention" : "NONE",
                                 "dateRelativeTo" : {
-                                  "externalReference" : "resetDates0",
-                                  "globalReference" : "27280e73"
+                                  "globalReference" : "a64bcd67",
+                                  "externalReference" : "resetDates0"
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "resetDates0",
-                                "globalKey" : "27280e73"
+                              "resetFrequency" : {
+                                "periodMultiplier" : 6,
+                                "period" : "M",
+                                "meta" : {
+                                  "globalKey" : "107"
+                                }
                               },
                               "resetDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "paymentBusinessCenters1",
-                                    "globalReference" : "20a71d"
+                                    "globalReference" : "20a71d",
+                                    "externalReference" : "paymentBusinessCenters1"
                                   },
                                   "meta" : {
                                     "globalKey" : "c3690944"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "a10a27d3"
                                 }
                               },
-                              "resetFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "959"
-                                },
-                                "period" : "M",
-                                "periodMultiplier" : 6
-                              },
-                              "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                              "meta" : {
+                                "globalKey" : "a64bcd67",
+                                "externalKey" : "resetDates0"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "30f825c0"
                             }
                           } ],
                           "meta" : {
-                            "globalKey" : "7f83fd8"
+                            "globalKey" : "62c23bf0"
                           }
                         }
                       },
                       "meta" : {
-                        "globalKey" : "587d6b07"
+                        "globalKey" : "b347671f"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "587d6b07"
+                      "globalKey" : "b347671f"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "776b4b44"
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "776b4b44"
+                }
+              },
+              "calculationAgent" : {
+                "calculationAgentParty" : "CalculationAgentIndependent"
               }
             },
             "meta" : {
-              "globalKey" : "6b8e946d"
+              "globalKey" : "d6f86823"
             }
           },
           "meta" : {
-            "globalKey" : "6b8e946d"
+            "globalKey" : "d6f86823"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "7f30bbe5"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.05,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "value" : 0.05,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
+                "priceType" : "InterestRate"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-1"
+                } ]
               }
             } ],
             "quantity" : [ {
+              "value" : {
+                "value" : 100000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "EUR"
+                  }
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "66e6c0bb"
+            }
+          }, {
+            "quantity" : [ {
               "value" : {
+                "value" : 100000000,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
-                },
-                "value" : 100000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "65d139a0"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "bf589e11"
-              },
               "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
                 "value" : {
                   "floatingRateIndex" : {
                     "value" : "EUR-EURIBOR-Telerate"
                   },
                   "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
+                    "periodMultiplier" : 6,
                     "period" : "M",
-                    "periodMultiplier" : 6
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
                 }
-              }
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
-                } ]
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "EUR"
-                  }
-                },
-                "value" : 100000000
+              "meta" : {
+                "globalKey" : "2bba2221"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "4820adb2"
+            }
+          } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "d4813763",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "d4813764",
+            "externalReference" : "party2"
+          }
+        } ],
+        "ancillaryParty" : [ {
+          "role" : "CalculationAgentIndependent",
+          "partyReference" : [ {
+            "globalReference" : "d4813764",
+            "externalReference" : "party2"
           } ]
         } ]
       },
-      "tradeDate" : {
+      "party" : [ {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "party A",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+            }
+          },
+          "identifierType" : "BIC",
+          "meta" : {
+            "globalKey" : "d4813763"
+          }
+        } ],
         "meta" : {
-          "globalKey" : "3e821e"
-        },
-        "value" : "2000-08-30"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+          "globalKey" : "d4813763",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "party B",
             "meta" : {
-              "scheme" : "http://www.partyA.com/trade-id"
-            },
-            "value" : "123"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+            }
           },
-          "version" : 1
+          "identifierType" : "BIC",
+          "meta" : {
+            "globalKey" : "d4813764"
+          }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "d4813763"
-        },
         "meta" : {
-          "globalKey" : "52e63ae5"
+          "globalKey" : "d4813764",
+          "externalKey" : "party2"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "51cd49d7"
+      }
+    },
+    "state" : {
+      "positionState" : "Formed"
     },
     "transferHistory" : [ {
-      "meta" : {
-        "globalKey" : "6bba78c2"
-      },
       "transfer" : {
-        "payerReceiver" : {
-          "payerPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "d4813763"
-          },
-          "receiverPartyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "d4813764"
-          }
-        },
         "quantity" : {
+          "value" : 100000,
           "unit" : {
             "currency" : {
               "value" : "EUR"
             }
+          }
+        },
+        "payerReceiver" : {
+          "payerPartyReference" : {
+            "globalReference" : "d4813763",
+            "externalReference" : "party1"
           },
-          "value" : 100000
+          "receiverPartyReference" : {
+            "globalReference" : "d4813764",
+            "externalReference" : "party2"
+          }
         },
         "settlementDate" : {
+          "unadjustedDate" : "2000-08-30",
           "dateAdjustments" : {
+            "businessDayConvention" : "FOLLOWING",
             "businessCenters" : {
               "businessCenter" : [ {
                 "value" : "EUTA"
@@ -1337,21 +1334,24 @@
                 "globalKey" : "20a71d"
               }
             },
-            "businessDayConvention" : "FOLLOWING",
             "meta" : {
               "globalKey" : "211dc30c"
             }
-          },
-          "unadjustedDate" : "2000-08-30"
+          }
         },
         "transferExpression" : {
-          "priceTransfer" : "PREMIUM"
+          "priceTransfer" : "Premium"
         }
+      },
+      "meta" : {
+        "globalKey" : "33666668"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "1f2c3aae"
+    }
   } ],
-  "eventQualifier" : "ContractFormation",
   "meta" : {
-    "globalKey" : "3edbf89"
+    "globalKey" : "ce7ef7d7"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/corporate-actions/corporate-actions-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/corporate-actions/corporate-actions-func-output.json
index 092d05da35..00a6fc53f9 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/corporate-actions/corporate-actions-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/corporate-actions/corporate-actions-func-output.json
@@ -1,89 +1,80 @@
 {
-  "effectiveDate" : "2009-02-01",
   "eventDate" : "2009-02-01",
+  "effectiveDate" : "2009-02-01",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "3a9c6ed8"
-        },
-        "trade" : {
-          "contractDetails" : {
-            "documentation" : [ {
-              "agreementDate" : "2009-01-01",
-              "legalAgreementIdentification" : {
-                "agreementName" : {
-                  "agreementType" : "MASTER_CONFIRMATION",
-                  "masterConfirmationType" : {
-                    "value" : "ISDA_2007_EQUITY_EUROPEAN"
+    "primitiveInstruction" : {
+      "observation" : {
+        "observationEvent" : {
+          "corporateAction" : {
+            "corporateActionType" : "StockSplit",
+            "exDate" : "2009-02-01",
+            "payDate" : "2009-02-01",
+            "underlier" : {
+              "security" : {
+                "productIdentifier" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "VOLKSWAGEN AG VZO O.N."
+                    },
+                    "source" : "Name",
+                    "meta" : {
+                      "globalKey" : "9a053a24"
+                    }
                   }
-                }
+                } ],
+                "securityType" : "Equity"
               },
               "meta" : {
-                "globalKey" : "1f32caf8"
+                "globalKey" : "20fd9d21"
               }
-            } ],
-            "meta" : {
-              "globalKey" : "1f32caf8"
             }
-          },
-          "meta" : {
-            "globalKey" : "3a9c6ed8"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "partyA",
-              "globalKey" : "f5d99210"
-            },
-            "name" : {
-              "value" : "Party 1234 Ltd"
+          }
+        }
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuerReference" : {
+              "globalReference" : "4666b900",
+              "externalReference" : "partyA"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "1147071",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-                },
-                "value" : "PARTY1234"
-              },
-              "meta" : {
-                "globalKey" : "3ba25808"
+                  "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
+                }
               }
-            } ]
-          }, {
+            } ],
             "meta" : {
-              "externalKey" : "partyB",
-              "globalKey" : "b2a7210"
-            },
-            "name" : {
-              "value" : "Party 5678 Ltd"
+              "globalKey" : "2135e2cc"
+            }
+          }, {
+            "issuerReference" : {
+              "globalReference" : "c79dbb00",
+              "externalReference" : "partyB"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "1147071",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-                },
-                "value" : "PARTY5678"
-              },
-              "meta" : {
-                "globalKey" : "3ba43908"
+                  "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
+                }
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "f5d111eb"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "2009-01-19",
+            "meta" : {
+              "globalKey" : "3ec853"
+            }
+          },
           "tradableProduct" : {
-            "adjustment" : "STANDARD",
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "partyA",
-                "globalReference" : "f5d99210"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "partyB",
-                "globalReference" : "b2a7210"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -93,7 +84,9 @@
                 "economicTerms" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-01-19",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "DEFR"
@@ -102,40 +95,89 @@
                             "globalKey" : "1ff50d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211d10fc"
                         }
                       },
                       "meta" : {
                         "globalKey" : "6e7d8489"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "6e7d8489",
+                      "externalKey" : "equityEffectiveDate"
+                    }
+                  },
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2009-03-19",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "DEFR"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "1ff50d"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "211d10fc"
+                        }
                       },
-                      "unadjustedDate" : "2009-01-19"
+                      "meta" : {
+                        "globalKey" : "48e9d409"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "equityEffectiveDate",
-                      "globalKey" : "6e7d8489"
+                      "globalKey" : "48e9d409"
                     }
                   },
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
+                        "quantityReference" : {
+                          "globalReference" : "4cf",
+                          "externalReference" : "equityNotionalAmount"
+                        },
                         "meta" : {
                           "globalKey" : "965f6c"
-                        },
-                        "quantityReference" : {
-                          "externalReference" : "equityNotionalAmount",
-                          "globalReference" : "4cf"
                         }
                       },
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
+                            }
+                          },
+                          "spreadSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
                       "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2009-01-21",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "FOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
@@ -144,28 +186,24 @@
                                   "globalKey" : "20a71d"
                                 }
                               },
-                              "businessDayConvention" : "FOLLOWING",
                               "meta" : {
                                 "globalKey" : "211dc30c"
                               }
                             },
                             "meta" : {
                               "globalKey" : "71e7e7d7"
-                            },
-                            "unadjustedDate" : "2009-01-21"
+                            }
                           },
                           "meta" : {
-                            "externalKey" : "interestEffectiveDate",
-                            "globalKey" : "71e7e7d7"
+                            "globalKey" : "71e7e7d7",
+                            "externalKey" : "interestEffectiveDate"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "interestCalcPeriodDates",
-                          "globalKey" : "3048096c"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2009-03-23",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "FOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
@@ -174,132 +212,108 @@
                                   "globalKey" : "20a71d"
                                 }
                               },
-                              "businessDayConvention" : "FOLLOWING",
                               "meta" : {
                                 "globalKey" : "211dc30c"
                               }
                             },
                             "meta" : {
                               "globalKey" : "4fbde895"
-                            },
-                            "unadjustedDate" : "2009-03-23"
+                            }
                           },
                           "meta" : {
-                            "externalKey" : "interestTerminationDate",
-                            "globalKey" : "4fbde895"
+                            "globalKey" : "4fbde895",
+                            "externalKey" : "interestTerminationDate"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "3048096c",
+                          "externalKey" : "interestCalcPeriodDates"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "cc98ee4d"
-                      },
                       "paymentDates" : {
-                        "meta" : {
-                          "externalKey" : "interestLegPaymentDates",
-                          "globalKey" : "b6b78bb2"
-                        },
                         "paymentDateSchedule" : {
                           "interimPaymentDates" : [ {
-                            "meta" : {
-                              "globalKey" : "b6b78bb2"
-                            },
                             "periodicDates" : {
-                              "endDate" : {
-                                "meta" : {
-                                  "globalKey" : "97eae877"
-                                },
+                              "startDate" : {
                                 "relativeDate" : {
+                                  "periodMultiplier" : 0,
+                                  "period" : "D",
                                   "meta" : {
-                                    "globalKey" : "97eae877"
+                                    "globalKey" : "df205212"
                                   },
-                                  "period" : "D",
-                                  "periodMultiplier" : 0,
-                                  "businessDayConvention" : "NOT_APPLICABLE",
+                                  "businessDayConvention" : "NotApplicable",
                                   "dateRelativeTo" : {
-                                    "externalReference" : "interestTerminationDate",
-                                    "globalReference" : "4fbde895"
+                                    "globalReference" : "71e7e7d7",
+                                    "externalReference" : "interestEffectiveDate"
                                   }
+                                },
+                                "meta" : {
+                                  "globalKey" : "df205212"
                                 }
                               },
-                              "periodDatesAdjustments" : {
-                                "businessCenters" : {
-                                  "businessCenter" : [ {
-                                    "value" : "EUTA"
-                                  } ],
+                              "endDate" : {
+                                "relativeDate" : {
+                                  "periodMultiplier" : 0,
+                                  "period" : "D",
                                   "meta" : {
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "944b936f"
+                                  },
+                                  "businessDayConvention" : "NotApplicable",
+                                  "dateRelativeTo" : {
+                                    "globalReference" : "4fbde895",
+                                    "externalReference" : "interestTerminationDate"
                                   }
                                 },
-                                "businessDayConvention" : "FOLLOWING",
                                 "meta" : {
-                                  "globalKey" : "211dc30c"
+                                  "globalKey" : "944b936f"
                                 }
                               },
                               "periodFrequency" : {
+                                "periodMultiplier" : 1,
+                                "period" : "M",
                                 "meta" : {
-                                  "globalKey" : "28bf3"
+                                  "globalKey" : "177db"
                                 },
-                                "period" : "M",
-                                "periodMultiplier" : 1,
                                 "rollConvention" : "19"
                               },
-                              "startDate" : {
-                                "meta" : {
-                                  "globalKey" : "e2bfa71a"
-                                },
-                                "relativeDate" : {
+                              "periodDatesAdjustments" : {
+                                "businessDayConvention" : "FOLLOWING",
+                                "businessCenters" : {
+                                  "businessCenter" : [ {
+                                    "value" : "EUTA"
+                                  } ],
                                   "meta" : {
-                                    "globalKey" : "e2bfa71a"
-                                  },
-                                  "period" : "D",
-                                  "periodMultiplier" : 0,
-                                  "businessDayConvention" : "NOT_APPLICABLE",
-                                  "dateRelativeTo" : {
-                                    "externalReference" : "interestEffectiveDate",
-                                    "globalReference" : "71e7e7d7"
+                                    "globalKey" : "20a71d"
                                   }
+                                },
+                                "meta" : {
+                                  "globalKey" : "211dc30c"
                                 }
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "5c33c394"
                             }
                           } ]
-                        }
-                      },
-                      "rateSpecification" : {
-                        "floatingRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
-                            }
-                          },
-                          "spreadSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
-                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "5c33c394",
+                          "externalKey" : "interestLegPaymentDates"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "interestCalcPeriodDates",
-                          "globalReference" : "3048096c"
+                          "globalReference" : "3048096c",
+                          "externalReference" : "interestCalcPeriodDates"
                         },
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "36741a11"
+                            "globalKey" : "135004c5"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "CURRENCY_BUSINESS",
+                          "dayType" : "CurrencyBusiness",
+                          "businessDayConvention" : "PRECEDING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -308,73 +322,169 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "PRECEDING",
                           "dateRelativeTo" : {
-                            "externalReference" : "interestLegPaymentDates",
-                            "globalReference" : "b6b78bb2"
+                            "globalReference" : "5c33c394",
+                            "externalReference" : "interestLegPaymentDates"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "9aa8401c"
-                        },
                         "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "954"
-                          },
+                          "periodMultiplier" : 1,
                           "period" : "M",
-                          "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "6c"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "369de000"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "725535c3"
                       }
                     } ],
-                    "meta" : {
-                      "globalKey" : "a2460383"
-                    },
                     "performancePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "externalKey" : "equityNotionalAmount",
-                          "globalKey" : "4cf"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
                         },
-                        "reset" : true
+                        "reset" : true,
+                        "meta" : {
+                          "globalKey" : "4cf",
+                          "externalKey" : "equityNotionalAmount"
+                        }
                       },
                       "settlementTerms" : {
-                        "meta" : {
-                          "globalKey" : "10da2"
-                        },
                         "settlementCurrency" : {
                           "value" : "EUR"
+                        },
+                        "meta" : {
+                          "globalKey" : "10da2"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "returnLeg",
-                        "globalKey" : "8d30d436"
+                      "valuationDates" : {
+                        "valuationDatesInterim" : {
+                          "determinationMethod" : "ValuationTime",
+                          "valuationDates" : {
+                            "periodicDates" : {
+                              "startDate" : {
+                                "relativeDate" : {
+                                  "periodMultiplier" : 0,
+                                  "period" : "D",
+                                  "meta" : {
+                                    "globalKey" : "9229ce57"
+                                  },
+                                  "businessDayConvention" : "NotApplicable",
+                                  "dateRelativeTo" : {
+                                    "globalReference" : "6e7d8489",
+                                    "externalReference" : "equityEffectiveDate"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "9229ce57"
+                                }
+                              },
+                              "endDate" : {
+                                "relativeDate" : {
+                                  "periodMultiplier" : 0,
+                                  "period" : "D",
+                                  "meta" : {
+                                    "globalKey" : "b635d2a0"
+                                  },
+                                  "businessDayConvention" : "NotApplicable",
+                                  "dateRelativeTo" : {
+                                    "globalReference" : "48e9d409",
+                                    "externalReference" : "finalValuationDate"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "b635d2a0"
+                                }
+                              },
+                              "periodFrequency" : {
+                                "periodMultiplier" : 1,
+                                "period" : "M",
+                                "meta" : {
+                                  "globalKey" : "177db"
+                                },
+                                "rollConvention" : "19"
+                              },
+                              "periodDatesAdjustments" : {
+                                "businessDayConvention" : "FOLLOWING",
+                                "businessCenters" : {
+                                  "businessCenter" : [ {
+                                    "value" : "DEFR"
+                                  } ],
+                                  "meta" : {
+                                    "globalKey" : "1ff50d"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "211d10fc"
+                                }
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "1cc8abb8",
+                              "externalKey" : "interimValuationDate"
+                            }
+                          },
+                          "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                          "meta" : {
+                            "globalKey" : "105dba0f"
+                          }
+                        },
+                        "valuationDatesFinal" : {
+                          "determinationMethod" : "HedgeExecution",
+                          "valuationDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2009-03-19",
+                              "dateAdjustments" : {
+                                "businessDayConvention" : "FOLLOWING",
+                                "businessCenters" : {
+                                  "businessCenter" : [ {
+                                    "value" : "DEFR"
+                                  } ],
+                                  "meta" : {
+                                    "globalKey" : "1ff50d"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "211d10fc"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "48e9d409"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "48e9d409",
+                              "externalKey" : "finalValuationDate"
+                            }
+                          },
+                          "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                          "meta" : {
+                            "globalKey" : "1e864b5f"
+                          }
+                        }
                       },
                       "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "99224396"
-                        },
                         "paymentDateSchedule" : {
-                          "finalPaymentDate" : {
-                            "meta" : {
-                              "globalKey" : "815a0f35"
-                            },
-                            "relativeDate" : {
+                          "interimPaymentDates" : [ {
+                            "relativeDates" : {
+                              "periodMultiplier" : 2,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "815a0f35"
+                                "globalKey" : "24ad6927"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 2,
-                              "dayType" : "CURRENCY_BUSINESS",
+                              "dayType" : "CurrencyBusiness",
+                              "businessDayConvention" : "FOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
@@ -383,24 +493,24 @@
                                   "globalKey" : "20a71d"
                                 }
                               },
-                              "businessDayConvention" : "FOLLOWING",
                               "dateRelativeTo" : {
-                                "externalReference" : "finalValuationDate",
-                                "globalReference" : "48e9d409"
+                                "globalReference" : "1cc8abb8",
+                                "externalReference" : "interimValuationDate"
                               }
-                            }
-                          },
-                          "interimPaymentDates" : [ {
-                            "meta" : {
-                              "globalKey" : "964475eb"
                             },
-                            "relativeDates" : {
+                            "meta" : {
+                              "globalKey" : "24ad6927"
+                            }
+                          } ],
+                          "finalPaymentDate" : {
+                            "relativeDate" : {
+                              "periodMultiplier" : 2,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "964475eb"
+                                "globalKey" : "fc30271"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 2,
-                              "dayType" : "CURRENCY_BUSINESS",
+                              "dayType" : "CurrencyBusiness",
+                              "businessDayConvention" : "FOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
@@ -409,33 +519,18 @@
                                   "globalKey" : "20a71d"
                                 }
                               },
-                              "businessDayConvention" : "FOLLOWING",
                               "dateRelativeTo" : {
-                                "externalReference" : "interimValuationDate",
-                                "globalReference" : "b5ba6138"
-                              }
-                            }
-                          } ]
-                        }
-                      },
-                      "returnTerms" : {
-                        "dividendReturnTerms" : {
-                          "dividendPayoutRatio" : [ {
-                            "cashRatio" : 1,
-                            "nonCashRatio" : 1,
-                            "totalRatio" : 1
-                          } ],
-                          "dividendPeriod" : [ {
-                            "dividendPaymentDate" : {
-                              "dividendDateReference" : {
-                                "dateReference" : "CASH_SETTLEMENT_PAYMENT_DATE"
+                                "globalReference" : "48e9d409",
+                                "externalReference" : "finalValuationDate"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "fc30271"
                             }
-                          } ],
-                          "firstOrSecondPeriod" : "SECOND_PERIOD"
+                          }
                         },
-                        "priceReturnTerms" : {
-                          "returnType" : "TOTAL"
+                        "meta" : {
+                          "globalKey" : "35da2aea"
                         }
                       },
                       "underlier" : {
@@ -456,478 +551,319 @@
                           "globalKey" : "0"
                         }
                       },
-                      "valuationDates" : {
-                        "valuationDatesFinal" : {
-                          "determinationMethod" : "HEDGE_EXECUTION",
-                          "meta" : {
-                            "globalKey" : "1e864b5f"
-                          },
-                          "valuationDate" : {
-                            "adjustableDate" : {
-                              "dateAdjustments" : {
-                                "businessCenters" : {
-                                  "businessCenter" : [ {
-                                    "value" : "DEFR"
-                                  } ],
-                                  "meta" : {
-                                    "globalKey" : "1ff50d"
-                                  }
-                                },
-                                "businessDayConvention" : "FOLLOWING",
-                                "meta" : {
-                                  "globalKey" : "211d10fc"
-                                }
-                              },
-                              "meta" : {
-                                "globalKey" : "48e9d409"
-                              },
-                              "unadjustedDate" : "2009-03-19"
-                            },
-                            "meta" : {
-                              "externalKey" : "finalValuationDate",
-                              "globalKey" : "48e9d409"
-                            }
-                          },
-                          "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
+                      "returnTerms" : {
+                        "priceReturnTerms" : {
+                          "returnType" : "Total"
                         },
-                        "valuationDatesInterim" : {
-                          "determinationMethod" : "VALUATION_TIME",
-                          "meta" : {
-                            "globalKey" : "a94f6f8f"
-                          },
-                          "valuationDates" : {
-                            "meta" : {
-                              "externalKey" : "interimValuationDate",
-                              "globalKey" : "b5ba6138"
-                            },
-                            "periodicDates" : {
-                              "endDate" : {
-                                "meta" : {
-                                  "globalKey" : "b9d527a8"
-                                },
-                                "relativeDate" : {
-                                  "meta" : {
-                                    "globalKey" : "b9d527a8"
-                                  },
-                                  "period" : "D",
-                                  "periodMultiplier" : 0,
-                                  "businessDayConvention" : "NOT_APPLICABLE",
-                                  "dateRelativeTo" : {
-                                    "externalReference" : "finalValuationDate",
-                                    "globalReference" : "48e9d409"
-                                  }
-                                }
-                              },
-                              "periodDatesAdjustments" : {
-                                "businessCenters" : {
-                                  "businessCenter" : [ {
-                                    "value" : "DEFR"
-                                  } ],
-                                  "meta" : {
-                                    "globalKey" : "1ff50d"
-                                  }
-                                },
-                                "businessDayConvention" : "FOLLOWING",
-                                "meta" : {
-                                  "globalKey" : "211d10fc"
-                                }
-                              },
-                              "periodFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "28bf3"
-                                },
-                                "period" : "M",
-                                "periodMultiplier" : 1,
-                                "rollConvention" : "19"
-                              },
-                              "startDate" : {
-                                "meta" : {
-                                  "globalKey" : "95c9235f"
-                                },
-                                "relativeDate" : {
-                                  "meta" : {
-                                    "globalKey" : "95c9235f"
-                                  },
-                                  "period" : "D",
-                                  "periodMultiplier" : 0,
-                                  "businessDayConvention" : "NOT_APPLICABLE",
-                                  "dateRelativeTo" : {
-                                    "externalReference" : "equityEffectiveDate",
-                                    "globalReference" : "6e7d8489"
-                                  }
-                                }
+                        "dividendReturnTerms" : {
+                          "dividendPayoutRatio" : [ {
+                            "totalRatio" : 1,
+                            "cashRatio" : 1,
+                            "nonCashRatio" : 1
+                          } ],
+                          "firstOrSecondPeriod" : "SecondPeriod",
+                          "dividendPeriod" : [ {
+                            "dividendPaymentDate" : {
+                              "dividendDateReference" : {
+                                "dateReference" : "CashSettlementPaymentDate"
                               }
                             }
-                          },
-                          "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
-                        }
-                      }
-                    } ]
-                  },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "DEFR"
-                          } ],
-                          "meta" : {
-                            "globalKey" : "1ff50d"
-                          }
-                        },
-                        "businessDayConvention" : "FOLLOWING",
-                        "meta" : {
-                          "globalKey" : "211d10fc"
+                          } ]
                         }
                       },
                       "meta" : {
-                        "globalKey" : "48e9d409"
-                      },
-                      "unadjustedDate" : "2009-03-19"
-                    },
+                        "globalKey" : "18839304",
+                        "externalKey" : "returnLeg"
+                      }
+                    } ],
                     "meta" : {
-                      "globalKey" : "48e9d409"
+                      "globalKey" : "108cd7c7"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "a324693a"
+                  "globalKey" : "39c61dfe"
                 }
               },
               "meta" : {
-                "globalKey" : "a324693a"
+                "globalKey" : "39c61dfe"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "a822a61e"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "affa401e"
-                  },
-                  "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
-                    "value" : {
-                      "floatingRateIndex" : {
-                        "value" : "EUR-EURIBOR-Reuters"
-                      },
-                      "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "954"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 1
-                      }
-                    }
-                  }
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.0001234,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "value" : 0.0001234,
-                    "arithmeticOperator" : "ADD",
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
+                    "priceType" : "InterestRate",
+                    "arithmeticOperator" : "Add"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "c3f90ce8"
-                },
+                } ],
                 "observable" : {
-                  "meta" : {
-                    "globalKey" : "9cba2463"
-                  },
-                  "productIdentifier" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-1"
-                      } ]
-                    },
+                  "rateOption" : {
                     "value" : {
-                      "identifier" : {
-                        "meta" : {
-                          "scheme" : "http://www.fpml.org/instrument-id"
-                        },
-                        "value" : ".GDAXI"
-                      },
-                      "meta" : {
-                        "globalKey" : "3901e477"
+                      "floatingRateIndex" : {
+                        "value" : "EUR-EURIBOR-Reuters"
                       },
-                      "source" : "OTHER"
-                    }
-                  }, {
+                      "indexTenor" : {
+                        "periodMultiplier" : 1,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "6c"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-2"
+                        "value" : "rateOption-1"
                       } ]
-                    },
-                    "value" : {
-                      "identifier" : {
-                        "value" : "GERMAN SE XETRA DAX INDEX"
-                      },
-                      "meta" : {
-                        "globalKey" : "811cd67a"
-                      },
-                      "source" : "NAME"
                     }
-                  } ]
+                  },
+                  "meta" : {
+                    "globalKey" : "4f4caf8a"
+                  }
                 },
+                "meta" : {
+                  "globalKey" : "79106fb2"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 100,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "value" : 100,
                     "perUnitOf" : {
-                      "financialUnit" : "SHARE"
+                      "financialUnit" : "Share"
                     },
-                    "priceType" : "ASSET_PRICE"
+                    "priceType" : "AssetPrice"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-2"
+                    } ]
                   }
                 } ],
                 "quantity" : [ {
+                  "value" : {
+                    "value" : 100000,
+                    "unit" : {
+                      "financialUnit" : "IndexUnit"
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "financialUnit" : "INDEX_UNIT"
-                    },
-                    "value" : 100000
                   }
                 }, {
+                  "value" : {
+                    "value" : 10000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "EUR"
+                      }
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "EUR"
+                  }
+                } ],
+                "observable" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : ".GDAXI",
+                        "meta" : {
+                          "scheme" : "http://www.fpml.org/instrument-id"
+                        }
+                      },
+                      "source" : "Other",
+                      "meta" : {
+                        "globalKey" : "3901e477"
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-1"
+                      } ]
+                    }
+                  }, {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "GERMAN SE XETRA DAX INDEX"
+                      },
+                      "source" : "Name",
+                      "meta" : {
+                        "globalKey" : "811cd67a"
                       }
                     },
-                    "value" : 10000000
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-2"
+                      } ]
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "fa8a67fd"
                   }
-                } ]
+                },
+                "meta" : {
+                  "globalKey" : "9e17d168"
+                }
               } ]
-            } ]
-          },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3ec853"
-            },
-            "value" : "2009-01-19"
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "4666b900",
+                "externalReference" : "partyA"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "c79dbb00",
+                "externalReference" : "partyB"
+              }
+            } ],
+            "adjustment" : "Standard"
           },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "PARTY1234",
                 "meta" : {
-                  "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
-                },
-                "value" : "1147071"
+                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ba25808"
               }
             } ],
-            "issuerReference" : {
-              "externalReference" : "partyA",
-              "globalReference" : "f5d99210"
+            "name" : {
+              "value" : "Party 1234 Ltd"
             },
             "meta" : {
-              "globalKey" : "8dd06c72"
+              "globalKey" : "4666b900",
+              "externalKey" : "partyA"
             }
           }, {
-            "assignedIdentifier" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "PARTY5678",
                 "meta" : {
-                  "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
-                },
-                "value" : "1147071"
+                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ba43908"
               }
             } ],
-            "issuerReference" : {
-              "externalReference" : "partyB",
-              "globalReference" : "b2a7210"
+            "name" : {
+              "value" : "Party 5678 Ltd"
             },
             "meta" : {
-              "globalKey" : "d80787b3"
+              "globalKey" : "c79dbb00",
+              "externalKey" : "partyB"
             }
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "observation" : {
-        "observationEvent" : {
-          "corporateAction" : {
-            "corporateActionType" : "STOCK_SPLIT",
-            "exDate" : "2009-02-01",
-            "payDate" : "2009-02-01",
-            "underlier" : {
-              "meta" : {
-                "globalKey" : "20fd9d21"
-              },
-              "security" : {
-                "productIdentifier" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "VOLKSWAGEN AG VZO O.N."
-                    },
-                    "meta" : {
-                      "globalKey" : "9a053a24"
-                    },
-                    "source" : "NAME"
+          } ],
+          "contractDetails" : {
+            "documentation" : [ {
+              "agreementDate" : "2009-01-01",
+              "legalAgreementIdentification" : {
+                "agreementName" : {
+                  "agreementType" : "MasterConfirmation",
+                  "masterConfirmationType" : {
+                    "value" : "ISDA2007EquityEuropean"
                   }
-                } ],
-                "securityType" : "EQUITY"
+                }
+              },
+              "meta" : {
+                "globalKey" : "1f32caf8"
               }
+            } ],
+            "meta" : {
+              "globalKey" : "1f32caf8"
             }
+          },
+          "meta" : {
+            "globalKey" : "7b4a704e"
           }
+        },
+        "meta" : {
+          "globalKey" : "7b4a704e"
         }
       }
     }
   } ],
+  "eventQualifier" : "CorporateActionDetermined",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "4af136a6"
-    },
-    "observationHistory" : [ {
-      "corporateAction" : {
-        "corporateActionType" : "STOCK_SPLIT",
-        "exDate" : "2009-02-01",
-        "payDate" : "2009-02-01",
-        "underlier" : {
-          "meta" : {
-            "globalKey" : "20fd9d21"
-          },
-          "security" : {
-            "productIdentifier" : [ {
-              "value" : {
-                "identifier" : {
-                  "value" : "VOLKSWAGEN AG VZO O.N."
-                },
-                "meta" : {
-                  "globalKey" : "9a053a24"
-                },
-                "source" : "NAME"
-              }
-            } ],
-            "securityType" : "EQUITY"
-          }
-        }
-      }
-    } ],
     "trade" : {
-      "contractDetails" : {
-        "documentation" : [ {
-          "agreementDate" : "2009-01-01",
-          "legalAgreementIdentification" : {
-            "agreementName" : {
-              "agreementType" : "MASTER_CONFIRMATION",
-              "masterConfirmationType" : {
-                "value" : "ISDA_2007_EQUITY_EUROPEAN"
-              }
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "4666b900",
+          "externalReference" : "partyA"
+        },
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "1147071",
+            "meta" : {
+              "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
             }
-          },
-          "meta" : {
-            "globalKey" : "1f32caf8"
           }
         } ],
         "meta" : {
-          "globalKey" : "1f32caf8"
+          "globalKey" : "2135e2cc"
         }
-      },
-      "meta" : {
-        "globalKey" : "3a9c6ed8"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "partyA",
-          "globalKey" : "f5d99210"
-        },
-        "name" : {
-          "value" : "Party 1234 Ltd"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-            },
-            "value" : "PARTY1234"
-          },
-          "meta" : {
-            "globalKey" : "3ba25808"
-          }
-        } ]
       }, {
-        "meta" : {
-          "externalKey" : "partyB",
-          "globalKey" : "b2a7210"
-        },
-        "name" : {
-          "value" : "Party 5678 Ltd"
+        "issuerReference" : {
+          "globalReference" : "c79dbb00",
+          "externalReference" : "partyB"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "1147071",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-            },
-            "value" : "PARTY5678"
-          },
-          "meta" : {
-            "globalKey" : "3ba43908"
+              "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
+            }
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "f5d111eb"
+        }
       } ],
+      "tradeDate" : {
+        "value" : "2009-01-19",
+        "meta" : {
+          "globalKey" : "3ec853"
+        }
+      },
       "tradableProduct" : {
-        "adjustment" : "STANDARD",
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "partyA",
-            "globalReference" : "f5d99210"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "partyB",
-            "globalReference" : "b2a7210"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -937,7 +873,9 @@
             "economicTerms" : {
               "effectiveDate" : {
                 "adjustableDate" : {
+                  "unadjustedDate" : "2009-01-19",
                   "dateAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "DEFR"
@@ -946,40 +884,89 @@
                         "globalKey" : "1ff50d"
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
                       "globalKey" : "211d10fc"
                     }
                   },
                   "meta" : {
                     "globalKey" : "6e7d8489"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "6e7d8489",
+                  "externalKey" : "equityEffectiveDate"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2009-03-19",
+                  "dateAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "DEFR"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "1ff50d"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "211d10fc"
+                    }
                   },
-                  "unadjustedDate" : "2009-01-19"
+                  "meta" : {
+                    "globalKey" : "48e9d409"
+                  }
                 },
                 "meta" : {
-                  "externalKey" : "equityEffectiveDate",
-                  "globalKey" : "6e7d8489"
+                  "globalKey" : "48e9d409"
                 }
               },
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
+                    "quantityReference" : {
+                      "globalReference" : "4cf",
+                      "externalReference" : "equityNotionalAmount"
+                    },
                     "meta" : {
                       "globalKey" : "965f6c"
-                    },
-                    "quantityReference" : {
-                      "externalReference" : "equityNotionalAmount",
-                      "globalReference" : "4cf"
                     }
                   },
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        }
+                      },
+                      "spreadSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
                   "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2009-01-21",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -988,28 +975,24 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "211dc30c"
                           }
                         },
                         "meta" : {
                           "globalKey" : "71e7e7d7"
-                        },
-                        "unadjustedDate" : "2009-01-21"
+                        }
                       },
                       "meta" : {
-                        "externalKey" : "interestEffectiveDate",
-                        "globalKey" : "71e7e7d7"
+                        "globalKey" : "71e7e7d7",
+                        "externalKey" : "interestEffectiveDate"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "interestCalcPeriodDates",
-                      "globalKey" : "3048096c"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2009-03-23",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -1018,132 +1001,108 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "211dc30c"
                           }
                         },
                         "meta" : {
                           "globalKey" : "4fbde895"
-                        },
-                        "unadjustedDate" : "2009-03-23"
+                        }
                       },
                       "meta" : {
-                        "externalKey" : "interestTerminationDate",
-                        "globalKey" : "4fbde895"
+                        "globalKey" : "4fbde895",
+                        "externalKey" : "interestTerminationDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "3048096c",
+                      "externalKey" : "interestCalcPeriodDates"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "cc98ee4d"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "externalKey" : "interestLegPaymentDates",
-                      "globalKey" : "b6b78bb2"
-                    },
                     "paymentDateSchedule" : {
                       "interimPaymentDates" : [ {
-                        "meta" : {
-                          "globalKey" : "b6b78bb2"
-                        },
                         "periodicDates" : {
-                          "endDate" : {
-                            "meta" : {
-                              "globalKey" : "97eae877"
-                            },
+                          "startDate" : {
                             "relativeDate" : {
+                              "periodMultiplier" : 0,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "97eae877"
+                                "globalKey" : "df205212"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 0,
-                              "businessDayConvention" : "NOT_APPLICABLE",
+                              "businessDayConvention" : "NotApplicable",
                               "dateRelativeTo" : {
-                                "externalReference" : "interestTerminationDate",
-                                "globalReference" : "4fbde895"
+                                "globalReference" : "71e7e7d7",
+                                "externalReference" : "interestEffectiveDate"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "df205212"
                             }
                           },
-                          "periodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "EUTA"
-                              } ],
+                          "endDate" : {
+                            "relativeDate" : {
+                              "periodMultiplier" : 0,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "20a71d"
+                                "globalKey" : "944b936f"
+                              },
+                              "businessDayConvention" : "NotApplicable",
+                              "dateRelativeTo" : {
+                                "globalReference" : "4fbde895",
+                                "externalReference" : "interestTerminationDate"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
-                              "globalKey" : "211dc30c"
+                              "globalKey" : "944b936f"
                             }
                           },
                           "periodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "28bf3"
+                              "globalKey" : "177db"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 1,
                             "rollConvention" : "19"
                           },
-                          "startDate" : {
-                            "meta" : {
-                              "globalKey" : "e2bfa71a"
-                            },
-                            "relativeDate" : {
+                          "periodDatesAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "EUTA"
+                              } ],
                               "meta" : {
-                                "globalKey" : "e2bfa71a"
-                              },
-                              "period" : "D",
-                              "periodMultiplier" : 0,
-                              "businessDayConvention" : "NOT_APPLICABLE",
-                              "dateRelativeTo" : {
-                                "externalReference" : "interestEffectiveDate",
-                                "globalReference" : "71e7e7d7"
+                                "globalKey" : "20a71d"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "211dc30c"
                             }
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "5c33c394"
                         }
                       } ]
-                    }
-                  },
-                  "rateSpecification" : {
-                    "floatingRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        }
-                      },
-                      "spreadSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "5c33c394",
+                      "externalKey" : "interestLegPaymentDates"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "interestCalcPeriodDates",
-                      "globalReference" : "3048096c"
+                      "globalReference" : "3048096c",
+                      "externalReference" : "interestCalcPeriodDates"
                     },
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "36741a11"
+                        "globalKey" : "135004c5"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "CURRENCY_BUSINESS",
+                      "dayType" : "CurrencyBusiness",
+                      "businessDayConvention" : "PRECEDING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
@@ -1152,73 +1111,169 @@
                           "globalKey" : "20a71d"
                         }
                       },
-                      "businessDayConvention" : "PRECEDING",
                       "dateRelativeTo" : {
-                        "externalReference" : "interestLegPaymentDates",
-                        "globalReference" : "b6b78bb2"
+                        "globalReference" : "5c33c394",
+                        "externalReference" : "interestLegPaymentDates"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "9aa8401c"
-                    },
                     "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "954"
-                      },
+                      "periodMultiplier" : 1,
                       "period" : "M",
-                      "periodMultiplier" : 1
+                      "meta" : {
+                        "globalKey" : "6c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "369de000"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "725535c3"
                   }
                 } ],
-                "meta" : {
-                  "globalKey" : "a2460383"
-                },
                 "performancePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "externalKey" : "equityNotionalAmount",
-                      "globalKey" : "4cf"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
                     },
-                    "reset" : true
+                    "reset" : true,
+                    "meta" : {
+                      "globalKey" : "4cf",
+                      "externalKey" : "equityNotionalAmount"
+                    }
                   },
                   "settlementTerms" : {
-                    "meta" : {
-                      "globalKey" : "10da2"
-                    },
                     "settlementCurrency" : {
                       "value" : "EUR"
+                    },
+                    "meta" : {
+                      "globalKey" : "10da2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "returnLeg",
-                    "globalKey" : "8d30d436"
+                  "valuationDates" : {
+                    "valuationDatesInterim" : {
+                      "determinationMethod" : "ValuationTime",
+                      "valuationDates" : {
+                        "periodicDates" : {
+                          "startDate" : {
+                            "relativeDate" : {
+                              "periodMultiplier" : 0,
+                              "period" : "D",
+                              "meta" : {
+                                "globalKey" : "9229ce57"
+                              },
+                              "businessDayConvention" : "NotApplicable",
+                              "dateRelativeTo" : {
+                                "globalReference" : "6e7d8489",
+                                "externalReference" : "equityEffectiveDate"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "9229ce57"
+                            }
+                          },
+                          "endDate" : {
+                            "relativeDate" : {
+                              "periodMultiplier" : 0,
+                              "period" : "D",
+                              "meta" : {
+                                "globalKey" : "b635d2a0"
+                              },
+                              "businessDayConvention" : "NotApplicable",
+                              "dateRelativeTo" : {
+                                "globalReference" : "48e9d409",
+                                "externalReference" : "finalValuationDate"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "b635d2a0"
+                            }
+                          },
+                          "periodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "177db"
+                            },
+                            "rollConvention" : "19"
+                          },
+                          "periodDatesAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "DEFR"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "1ff50d"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "211d10fc"
+                            }
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "1cc8abb8",
+                          "externalKey" : "interimValuationDate"
+                        }
+                      },
+                      "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                      "meta" : {
+                        "globalKey" : "105dba0f"
+                      }
+                    },
+                    "valuationDatesFinal" : {
+                      "determinationMethod" : "HedgeExecution",
+                      "valuationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2009-03-19",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "DEFR"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "1ff50d"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "211d10fc"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "48e9d409"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "48e9d409",
+                          "externalKey" : "finalValuationDate"
+                        }
+                      },
+                      "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                      "meta" : {
+                        "globalKey" : "1e864b5f"
+                      }
+                    }
                   },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "99224396"
-                    },
                     "paymentDateSchedule" : {
-                      "finalPaymentDate" : {
-                        "meta" : {
-                          "globalKey" : "815a0f35"
-                        },
-                        "relativeDate" : {
+                      "interimPaymentDates" : [ {
+                        "relativeDates" : {
+                          "periodMultiplier" : 2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "815a0f35"
+                            "globalKey" : "24ad6927"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 2,
-                          "dayType" : "CURRENCY_BUSINESS",
+                          "dayType" : "CurrencyBusiness",
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -1227,24 +1282,24 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "dateRelativeTo" : {
-                            "externalReference" : "finalValuationDate",
-                            "globalReference" : "48e9d409"
+                            "globalReference" : "1cc8abb8",
+                            "externalReference" : "interimValuationDate"
                           }
-                        }
-                      },
-                      "interimPaymentDates" : [ {
-                        "meta" : {
-                          "globalKey" : "964475eb"
                         },
-                        "relativeDates" : {
+                        "meta" : {
+                          "globalKey" : "24ad6927"
+                        }
+                      } ],
+                      "finalPaymentDate" : {
+                        "relativeDate" : {
+                          "periodMultiplier" : 2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "964475eb"
+                            "globalKey" : "fc30271"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 2,
-                          "dayType" : "CURRENCY_BUSINESS",
+                          "dayType" : "CurrencyBusiness",
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -1253,33 +1308,18 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "dateRelativeTo" : {
-                            "externalReference" : "interimValuationDate",
-                            "globalReference" : "b5ba6138"
-                          }
-                        }
-                      } ]
-                    }
-                  },
-                  "returnTerms" : {
-                    "dividendReturnTerms" : {
-                      "dividendPayoutRatio" : [ {
-                        "cashRatio" : 1,
-                        "nonCashRatio" : 1,
-                        "totalRatio" : 1
-                      } ],
-                      "dividendPeriod" : [ {
-                        "dividendPaymentDate" : {
-                          "dividendDateReference" : {
-                            "dateReference" : "CASH_SETTLEMENT_PAYMENT_DATE"
+                            "globalReference" : "48e9d409",
+                            "externalReference" : "finalValuationDate"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "fc30271"
                         }
-                      } ],
-                      "firstOrSecondPeriod" : "SECOND_PERIOD"
+                      }
                     },
-                    "priceReturnTerms" : {
-                      "returnType" : "TOTAL"
+                    "meta" : {
+                      "globalKey" : "35da2aea"
                     }
                   },
                   "underlier" : {
@@ -1300,341 +1340,301 @@
                       "globalKey" : "0"
                     }
                   },
-                  "valuationDates" : {
-                    "valuationDatesFinal" : {
-                      "determinationMethod" : "HEDGE_EXECUTION",
-                      "meta" : {
-                        "globalKey" : "1e864b5f"
-                      },
-                      "valuationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "DEFR"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "1ff50d"
-                              }
-                            },
-                            "businessDayConvention" : "FOLLOWING",
-                            "meta" : {
-                              "globalKey" : "211d10fc"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "48e9d409"
-                          },
-                          "unadjustedDate" : "2009-03-19"
-                        },
-                        "meta" : {
-                          "externalKey" : "finalValuationDate",
-                          "globalKey" : "48e9d409"
-                        }
-                      },
-                      "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
-                    },
-                    "valuationDatesInterim" : {
-                      "determinationMethod" : "VALUATION_TIME",
-                      "meta" : {
-                        "globalKey" : "a94f6f8f"
-                      },
-                      "valuationDates" : {
-                        "meta" : {
-                          "externalKey" : "interimValuationDate",
-                          "globalKey" : "b5ba6138"
-                        },
-                        "periodicDates" : {
-                          "endDate" : {
-                            "meta" : {
-                              "globalKey" : "b9d527a8"
-                            },
-                            "relativeDate" : {
-                              "meta" : {
-                                "globalKey" : "b9d527a8"
-                              },
-                              "period" : "D",
-                              "periodMultiplier" : 0,
-                              "businessDayConvention" : "NOT_APPLICABLE",
-                              "dateRelativeTo" : {
-                                "externalReference" : "finalValuationDate",
-                                "globalReference" : "48e9d409"
-                              }
-                            }
-                          },
-                          "periodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "DEFR"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "1ff50d"
-                              }
-                            },
-                            "businessDayConvention" : "FOLLOWING",
-                            "meta" : {
-                              "globalKey" : "211d10fc"
-                            }
-                          },
-                          "periodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28bf3"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "19"
-                          },
-                          "startDate" : {
-                            "meta" : {
-                              "globalKey" : "95c9235f"
-                            },
-                            "relativeDate" : {
-                              "meta" : {
-                                "globalKey" : "95c9235f"
-                              },
-                              "period" : "D",
-                              "periodMultiplier" : 0,
-                              "businessDayConvention" : "NOT_APPLICABLE",
-                              "dateRelativeTo" : {
-                                "externalReference" : "equityEffectiveDate",
-                                "globalReference" : "6e7d8489"
-                              }
-                            }
-                          }
-                        }
-                      },
-                      "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
-                    }
-                  }
-                } ]
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "dateAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "DEFR"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "1ff50d"
-                      }
+                  "returnTerms" : {
+                    "priceReturnTerms" : {
+                      "returnType" : "Total"
                     },
-                    "businessDayConvention" : "FOLLOWING",
-                    "meta" : {
-                      "globalKey" : "211d10fc"
+                    "dividendReturnTerms" : {
+                      "dividendPayoutRatio" : [ {
+                        "totalRatio" : 1,
+                        "cashRatio" : 1,
+                        "nonCashRatio" : 1
+                      } ],
+                      "firstOrSecondPeriod" : "SecondPeriod",
+                      "dividendPeriod" : [ {
+                        "dividendPaymentDate" : {
+                          "dividendDateReference" : {
+                            "dateReference" : "CashSettlementPaymentDate"
+                          }
+                        }
+                      } ]
                     }
                   },
                   "meta" : {
-                    "globalKey" : "48e9d409"
-                  },
-                  "unadjustedDate" : "2009-03-19"
-                },
+                    "globalKey" : "18839304",
+                    "externalKey" : "returnLeg"
+                  }
+                } ],
                 "meta" : {
-                  "globalKey" : "48e9d409"
+                  "globalKey" : "108cd7c7"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "a324693a"
+              "globalKey" : "39c61dfe"
             }
           },
           "meta" : {
-            "globalKey" : "a324693a"
+            "globalKey" : "39c61dfe"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "a822a61e"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "affa401e"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "EUR-EURIBOR-Reuters"
-                  },
-                  "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1
-                  }
-                }
-              }
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.0001234,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "value" : 0.0001234,
-                "arithmeticOperator" : "ADD",
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
+                "priceType" : "InterestRate",
+                "arithmeticOperator" : "Add"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-1"
+                } ]
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "c3f90ce8"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "9cba2463"
-              },
-              "productIdentifier" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "productIdentifier-1"
-                  } ]
-                },
+              "rateOption" : {
                 "value" : {
-                  "identifier" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/instrument-id"
-                    },
-                    "value" : ".GDAXI"
-                  },
-                  "meta" : {
-                    "globalKey" : "3901e477"
+                  "floatingRateIndex" : {
+                    "value" : "EUR-EURIBOR-Reuters"
                   },
-                  "source" : "OTHER"
-                }
-              }, {
+                  "indexTenor" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "productIdentifier-2"
+                    "value" : "rateOption-1"
                   } ]
-                },
-                "value" : {
-                  "identifier" : {
-                    "value" : "GERMAN SE XETRA DAX INDEX"
-                  },
-                  "meta" : {
-                    "globalKey" : "811cd67a"
-                  },
-                  "source" : "NAME"
                 }
-              } ]
+              },
+              "meta" : {
+                "globalKey" : "4f4caf8a"
+              }
             },
+            "meta" : {
+              "globalKey" : "79106fb2"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-2"
-                } ]
-              },
               "value" : {
+                "value" : 100,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "value" : 100,
                 "perUnitOf" : {
-                  "financialUnit" : "SHARE"
+                  "financialUnit" : "Share"
                 },
-                "priceType" : "ASSET_PRICE"
+                "priceType" : "AssetPrice"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-2"
+                } ]
               }
             } ],
             "quantity" : [ {
+              "value" : {
+                "value" : 100000,
+                "unit" : {
+                  "financialUnit" : "IndexUnit"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-2"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "financialUnit" : "INDEX_UNIT"
-                },
-                "value" : 100000
               }
             }, {
+              "value" : {
+                "value" : 10000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "EUR"
+                  }
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "EUR"
+              }
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : ".GDAXI",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/instrument-id"
+                    }
+                  },
+                  "source" : "Other",
+                  "meta" : {
+                    "globalKey" : "3901e477"
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "productIdentifier-1"
+                  } ]
+                }
+              }, {
+                "value" : {
+                  "identifier" : {
+                    "value" : "GERMAN SE XETRA DAX INDEX"
+                  },
+                  "source" : "Name",
+                  "meta" : {
+                    "globalKey" : "811cd67a"
                   }
                 },
-                "value" : 10000000
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "productIdentifier-2"
+                  } ]
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "fa8a67fd"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "9e17d168"
+            }
           } ]
-        } ]
-      },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3ec853"
-        },
-        "value" : "2009-01-19"
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "4666b900",
+            "externalReference" : "partyA"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "c79dbb00",
+            "externalReference" : "partyB"
+          }
+        } ],
+        "adjustment" : "Standard"
       },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "PARTY1234",
             "meta" : {
-              "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
-            },
-            "value" : "1147071"
+              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+            }
+          },
+          "meta" : {
+            "globalKey" : "3ba25808"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "f5d99210"
+        "name" : {
+          "value" : "Party 1234 Ltd"
         },
         "meta" : {
-          "globalKey" : "8dd06c72"
+          "globalKey" : "4666b900",
+          "externalKey" : "partyA"
         }
       }, {
-        "assignedIdentifier" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "PARTY5678",
             "meta" : {
-              "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
-            },
-            "value" : "1147071"
+              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+            }
+          },
+          "meta" : {
+            "globalKey" : "3ba43908"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "b2a7210"
+        "name" : {
+          "value" : "Party 5678 Ltd"
         },
         "meta" : {
-          "globalKey" : "d80787b3"
+          "globalKey" : "c79dbb00",
+          "externalKey" : "partyB"
+        }
+      } ],
+      "contractDetails" : {
+        "documentation" : [ {
+          "agreementDate" : "2009-01-01",
+          "legalAgreementIdentification" : {
+            "agreementName" : {
+              "agreementType" : "MasterConfirmation",
+              "masterConfirmationType" : {
+                "value" : "ISDA2007EquityEuropean"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "1f32caf8"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "1f32caf8"
+        }
+      },
+      "meta" : {
+        "globalKey" : "7b4a704e"
+      }
+    },
+    "observationHistory" : [ {
+      "corporateAction" : {
+        "corporateActionType" : "StockSplit",
+        "exDate" : "2009-02-01",
+        "payDate" : "2009-02-01",
+        "underlier" : {
+          "security" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "VOLKSWAGEN AG VZO O.N."
+                },
+                "source" : "Name",
+                "meta" : {
+                  "globalKey" : "9a053a24"
+                }
+              }
+            } ],
+            "securityType" : "Equity"
+          },
+          "meta" : {
+            "globalKey" : "20fd9d21"
+          }
         }
-      } ]
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "807866e4"
     }
   } ],
-  "eventQualifier" : "CorporateActionDetermined",
   "meta" : {
-    "globalKey" : "aaa8d2ec"
+    "globalKey" : "276ca2e8"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/corporate-actions/corporate-actions-obs-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/corporate-actions/corporate-actions-obs-func-output.json
index a34feb8fbb..96ac66a6a3 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/corporate-actions/corporate-actions-obs-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/corporate-actions/corporate-actions-obs-func-output.json
@@ -1,115 +1,80 @@
 {
-  "effectiveDate" : "2009-02-13",
   "eventDate" : "2009-02-13",
+  "effectiveDate" : "2009-02-13",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "4af136a6"
-        },
-        "observationHistory" : [ {
+    "primitiveInstruction" : {
+      "observation" : {
+        "observationEvent" : {
           "corporateAction" : {
-            "corporateActionType" : "STOCK_SPLIT",
-            "exDate" : "2009-02-01",
-            "payDate" : "2009-02-01",
+            "corporateActionType" : "CashDividend",
+            "exDate" : "2009-02-13",
+            "payDate" : "2009-02-13",
             "underlier" : {
-              "meta" : {
-                "globalKey" : "20fd9d21"
-              },
               "security" : {
                 "productIdentifier" : [ {
                   "value" : {
                     "identifier" : {
                       "value" : "VOLKSWAGEN AG VZO O.N."
                     },
+                    "source" : "Name",
                     "meta" : {
                       "globalKey" : "9a053a24"
-                    },
-                    "source" : "NAME"
+                    }
                   }
                 } ],
-                "securityType" : "EQUITY"
+                "securityType" : "Equity"
+              },
+              "meta" : {
+                "globalKey" : "20fd9d21"
               }
             }
           }
-        } ],
+        }
+      }
+    },
+    "before" : {
+      "value" : {
         "trade" : {
-          "contractDetails" : {
-            "documentation" : [ {
-              "agreementDate" : "2009-01-01",
-              "legalAgreementIdentification" : {
-                "agreementName" : {
-                  "agreementType" : "MASTER_CONFIRMATION",
-                  "masterConfirmationType" : {
-                    "value" : "ISDA_2007_EQUITY_EUROPEAN"
-                  }
+          "tradeIdentifier" : [ {
+            "issuerReference" : {
+              "globalReference" : "4666b900",
+              "externalReference" : "partyA"
+            },
+            "assignedIdentifier" : [ {
+              "identifier" : {
+                "value" : "1147071",
+                "meta" : {
+                  "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
                 }
-              },
-              "meta" : {
-                "globalKey" : "1f32caf8"
               }
             } ],
             "meta" : {
-              "globalKey" : "1f32caf8"
+              "globalKey" : "2135e2cc"
             }
-          },
-          "meta" : {
-            "globalKey" : "3a9c6ed8"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "partyA",
-              "globalKey" : "f5d99210"
-            },
-            "name" : {
-              "value" : "Party 1234 Ltd"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-                },
-                "value" : "PARTY1234"
-              },
-              "meta" : {
-                "globalKey" : "3ba25808"
-              }
-            } ]
           }, {
-            "meta" : {
-              "externalKey" : "partyB",
-              "globalKey" : "b2a7210"
-            },
-            "name" : {
-              "value" : "Party 5678 Ltd"
+            "issuerReference" : {
+              "globalReference" : "c79dbb00",
+              "externalReference" : "partyB"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "1147071",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-                },
-                "value" : "PARTY5678"
-              },
-              "meta" : {
-                "globalKey" : "3ba43908"
+                  "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
+                }
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "f5d111eb"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "2009-01-19",
+            "meta" : {
+              "globalKey" : "3ec853"
+            }
+          },
           "tradableProduct" : {
-            "adjustment" : "STANDARD",
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "partyA",
-                "globalReference" : "f5d99210"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "partyB",
-                "globalReference" : "b2a7210"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -119,7 +84,9 @@
                 "economicTerms" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-01-19",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "DEFR"
@@ -128,40 +95,89 @@
                             "globalKey" : "1ff50d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211d10fc"
                         }
                       },
                       "meta" : {
                         "globalKey" : "6e7d8489"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "6e7d8489",
+                      "externalKey" : "equityEffectiveDate"
+                    }
+                  },
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2009-03-19",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "DEFR"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "1ff50d"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "211d10fc"
+                        }
                       },
-                      "unadjustedDate" : "2009-01-19"
+                      "meta" : {
+                        "globalKey" : "48e9d409"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "equityEffectiveDate",
-                      "globalKey" : "6e7d8489"
+                      "globalKey" : "48e9d409"
                     }
                   },
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
+                        "quantityReference" : {
+                          "globalReference" : "4cf",
+                          "externalReference" : "equityNotionalAmount"
+                        },
                         "meta" : {
                           "globalKey" : "965f6c"
-                        },
-                        "quantityReference" : {
-                          "externalReference" : "equityNotionalAmount",
-                          "globalReference" : "4cf"
                         }
                       },
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
+                            }
+                          },
+                          "spreadSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
                       "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2009-01-21",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "FOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
@@ -170,28 +186,24 @@
                                   "globalKey" : "20a71d"
                                 }
                               },
-                              "businessDayConvention" : "FOLLOWING",
                               "meta" : {
                                 "globalKey" : "211dc30c"
                               }
                             },
                             "meta" : {
                               "globalKey" : "71e7e7d7"
-                            },
-                            "unadjustedDate" : "2009-01-21"
+                            }
                           },
                           "meta" : {
-                            "externalKey" : "interestEffectiveDate",
-                            "globalKey" : "71e7e7d7"
+                            "globalKey" : "71e7e7d7",
+                            "externalKey" : "interestEffectiveDate"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "interestCalcPeriodDates",
-                          "globalKey" : "3048096c"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2009-03-23",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "FOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
@@ -200,132 +212,108 @@
                                   "globalKey" : "20a71d"
                                 }
                               },
-                              "businessDayConvention" : "FOLLOWING",
                               "meta" : {
                                 "globalKey" : "211dc30c"
                               }
                             },
                             "meta" : {
                               "globalKey" : "4fbde895"
-                            },
-                            "unadjustedDate" : "2009-03-23"
+                            }
                           },
                           "meta" : {
-                            "externalKey" : "interestTerminationDate",
-                            "globalKey" : "4fbde895"
+                            "globalKey" : "4fbde895",
+                            "externalKey" : "interestTerminationDate"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "3048096c",
+                          "externalKey" : "interestCalcPeriodDates"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "cc98ee4d"
-                      },
                       "paymentDates" : {
-                        "meta" : {
-                          "externalKey" : "interestLegPaymentDates",
-                          "globalKey" : "b6b78bb2"
-                        },
                         "paymentDateSchedule" : {
                           "interimPaymentDates" : [ {
-                            "meta" : {
-                              "globalKey" : "b6b78bb2"
-                            },
                             "periodicDates" : {
-                              "endDate" : {
-                                "meta" : {
-                                  "globalKey" : "97eae877"
-                                },
+                              "startDate" : {
                                 "relativeDate" : {
+                                  "periodMultiplier" : 0,
+                                  "period" : "D",
                                   "meta" : {
-                                    "globalKey" : "97eae877"
+                                    "globalKey" : "df205212"
                                   },
-                                  "period" : "D",
-                                  "periodMultiplier" : 0,
-                                  "businessDayConvention" : "NOT_APPLICABLE",
+                                  "businessDayConvention" : "NotApplicable",
                                   "dateRelativeTo" : {
-                                    "externalReference" : "interestTerminationDate",
-                                    "globalReference" : "4fbde895"
+                                    "globalReference" : "71e7e7d7",
+                                    "externalReference" : "interestEffectiveDate"
                                   }
+                                },
+                                "meta" : {
+                                  "globalKey" : "df205212"
                                 }
                               },
-                              "periodDatesAdjustments" : {
-                                "businessCenters" : {
-                                  "businessCenter" : [ {
-                                    "value" : "EUTA"
-                                  } ],
+                              "endDate" : {
+                                "relativeDate" : {
+                                  "periodMultiplier" : 0,
+                                  "period" : "D",
                                   "meta" : {
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "944b936f"
+                                  },
+                                  "businessDayConvention" : "NotApplicable",
+                                  "dateRelativeTo" : {
+                                    "globalReference" : "4fbde895",
+                                    "externalReference" : "interestTerminationDate"
                                   }
                                 },
-                                "businessDayConvention" : "FOLLOWING",
                                 "meta" : {
-                                  "globalKey" : "211dc30c"
+                                  "globalKey" : "944b936f"
                                 }
                               },
                               "periodFrequency" : {
+                                "periodMultiplier" : 1,
+                                "period" : "M",
                                 "meta" : {
-                                  "globalKey" : "28bf3"
+                                  "globalKey" : "177db"
                                 },
-                                "period" : "M",
-                                "periodMultiplier" : 1,
                                 "rollConvention" : "19"
                               },
-                              "startDate" : {
-                                "meta" : {
-                                  "globalKey" : "e2bfa71a"
-                                },
-                                "relativeDate" : {
+                              "periodDatesAdjustments" : {
+                                "businessDayConvention" : "FOLLOWING",
+                                "businessCenters" : {
+                                  "businessCenter" : [ {
+                                    "value" : "EUTA"
+                                  } ],
                                   "meta" : {
-                                    "globalKey" : "e2bfa71a"
-                                  },
-                                  "period" : "D",
-                                  "periodMultiplier" : 0,
-                                  "businessDayConvention" : "NOT_APPLICABLE",
-                                  "dateRelativeTo" : {
-                                    "externalReference" : "interestEffectiveDate",
-                                    "globalReference" : "71e7e7d7"
+                                    "globalKey" : "20a71d"
                                   }
+                                },
+                                "meta" : {
+                                  "globalKey" : "211dc30c"
                                 }
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "5c33c394"
                             }
                           } ]
-                        }
-                      },
-                      "rateSpecification" : {
-                        "floatingRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
-                            }
-                          },
-                          "spreadSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
-                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "5c33c394",
+                          "externalKey" : "interestLegPaymentDates"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "interestCalcPeriodDates",
-                          "globalReference" : "3048096c"
+                          "globalReference" : "3048096c",
+                          "externalReference" : "interestCalcPeriodDates"
                         },
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "36741a11"
+                            "globalKey" : "135004c5"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "CURRENCY_BUSINESS",
+                          "dayType" : "CurrencyBusiness",
+                          "businessDayConvention" : "PRECEDING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -334,73 +322,169 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "PRECEDING",
                           "dateRelativeTo" : {
-                            "externalReference" : "interestLegPaymentDates",
-                            "globalReference" : "b6b78bb2"
+                            "globalReference" : "5c33c394",
+                            "externalReference" : "interestLegPaymentDates"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "9aa8401c"
-                        },
                         "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "954"
-                          },
+                          "periodMultiplier" : 1,
                           "period" : "M",
-                          "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "6c"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "369de000"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "725535c3"
                       }
                     } ],
-                    "meta" : {
-                      "globalKey" : "a2460383"
-                    },
                     "performancePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "externalKey" : "equityNotionalAmount",
-                          "globalKey" : "4cf"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
                         },
-                        "reset" : true
+                        "reset" : true,
+                        "meta" : {
+                          "globalKey" : "4cf",
+                          "externalKey" : "equityNotionalAmount"
+                        }
                       },
                       "settlementTerms" : {
-                        "meta" : {
-                          "globalKey" : "10da2"
-                        },
                         "settlementCurrency" : {
                           "value" : "EUR"
+                        },
+                        "meta" : {
+                          "globalKey" : "10da2"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "returnLeg",
-                        "globalKey" : "8d30d436"
+                      "valuationDates" : {
+                        "valuationDatesInterim" : {
+                          "determinationMethod" : "ValuationTime",
+                          "valuationDates" : {
+                            "periodicDates" : {
+                              "startDate" : {
+                                "relativeDate" : {
+                                  "periodMultiplier" : 0,
+                                  "period" : "D",
+                                  "meta" : {
+                                    "globalKey" : "9229ce57"
+                                  },
+                                  "businessDayConvention" : "NotApplicable",
+                                  "dateRelativeTo" : {
+                                    "globalReference" : "6e7d8489",
+                                    "externalReference" : "equityEffectiveDate"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "9229ce57"
+                                }
+                              },
+                              "endDate" : {
+                                "relativeDate" : {
+                                  "periodMultiplier" : 0,
+                                  "period" : "D",
+                                  "meta" : {
+                                    "globalKey" : "b635d2a0"
+                                  },
+                                  "businessDayConvention" : "NotApplicable",
+                                  "dateRelativeTo" : {
+                                    "globalReference" : "48e9d409",
+                                    "externalReference" : "finalValuationDate"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "b635d2a0"
+                                }
+                              },
+                              "periodFrequency" : {
+                                "periodMultiplier" : 1,
+                                "period" : "M",
+                                "meta" : {
+                                  "globalKey" : "177db"
+                                },
+                                "rollConvention" : "19"
+                              },
+                              "periodDatesAdjustments" : {
+                                "businessDayConvention" : "FOLLOWING",
+                                "businessCenters" : {
+                                  "businessCenter" : [ {
+                                    "value" : "DEFR"
+                                  } ],
+                                  "meta" : {
+                                    "globalKey" : "1ff50d"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "211d10fc"
+                                }
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "1cc8abb8",
+                              "externalKey" : "interimValuationDate"
+                            }
+                          },
+                          "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                          "meta" : {
+                            "globalKey" : "105dba0f"
+                          }
+                        },
+                        "valuationDatesFinal" : {
+                          "determinationMethod" : "HedgeExecution",
+                          "valuationDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2009-03-19",
+                              "dateAdjustments" : {
+                                "businessDayConvention" : "FOLLOWING",
+                                "businessCenters" : {
+                                  "businessCenter" : [ {
+                                    "value" : "DEFR"
+                                  } ],
+                                  "meta" : {
+                                    "globalKey" : "1ff50d"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "211d10fc"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "48e9d409"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "48e9d409",
+                              "externalKey" : "finalValuationDate"
+                            }
+                          },
+                          "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                          "meta" : {
+                            "globalKey" : "1e864b5f"
+                          }
+                        }
                       },
                       "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "99224396"
-                        },
                         "paymentDateSchedule" : {
-                          "finalPaymentDate" : {
-                            "meta" : {
-                              "globalKey" : "815a0f35"
-                            },
-                            "relativeDate" : {
+                          "interimPaymentDates" : [ {
+                            "relativeDates" : {
+                              "periodMultiplier" : 2,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "815a0f35"
+                                "globalKey" : "24ad6927"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 2,
-                              "dayType" : "CURRENCY_BUSINESS",
+                              "dayType" : "CurrencyBusiness",
+                              "businessDayConvention" : "FOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
@@ -409,24 +493,24 @@
                                   "globalKey" : "20a71d"
                                 }
                               },
-                              "businessDayConvention" : "FOLLOWING",
                               "dateRelativeTo" : {
-                                "externalReference" : "finalValuationDate",
-                                "globalReference" : "48e9d409"
+                                "globalReference" : "1cc8abb8",
+                                "externalReference" : "interimValuationDate"
                               }
-                            }
-                          },
-                          "interimPaymentDates" : [ {
-                            "meta" : {
-                              "globalKey" : "964475eb"
                             },
-                            "relativeDates" : {
+                            "meta" : {
+                              "globalKey" : "24ad6927"
+                            }
+                          } ],
+                          "finalPaymentDate" : {
+                            "relativeDate" : {
+                              "periodMultiplier" : 2,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "964475eb"
+                                "globalKey" : "fc30271"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 2,
-                              "dayType" : "CURRENCY_BUSINESS",
+                              "dayType" : "CurrencyBusiness",
+                              "businessDayConvention" : "FOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
@@ -435,33 +519,18 @@
                                   "globalKey" : "20a71d"
                                 }
                               },
-                              "businessDayConvention" : "FOLLOWING",
                               "dateRelativeTo" : {
-                                "externalReference" : "interimValuationDate",
-                                "globalReference" : "b5ba6138"
-                              }
-                            }
-                          } ]
-                        }
-                      },
-                      "returnTerms" : {
-                        "dividendReturnTerms" : {
-                          "dividendPayoutRatio" : [ {
-                            "cashRatio" : 1,
-                            "nonCashRatio" : 1,
-                            "totalRatio" : 1
-                          } ],
-                          "dividendPeriod" : [ {
-                            "dividendPaymentDate" : {
-                              "dividendDateReference" : {
-                                "dateReference" : "CASH_SETTLEMENT_PAYMENT_DATE"
+                                "globalReference" : "48e9d409",
+                                "externalReference" : "finalValuationDate"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "fc30271"
                             }
-                          } ],
-                          "firstOrSecondPeriod" : "SECOND_PERIOD"
+                          }
                         },
-                        "priceReturnTerms" : {
-                          "returnType" : "TOTAL"
+                        "meta" : {
+                          "globalKey" : "35da2aea"
                         }
                       },
                       "underlier" : {
@@ -482,503 +551,345 @@
                           "globalKey" : "0"
                         }
                       },
-                      "valuationDates" : {
-                        "valuationDatesFinal" : {
-                          "determinationMethod" : "HEDGE_EXECUTION",
-                          "meta" : {
-                            "globalKey" : "1e864b5f"
-                          },
-                          "valuationDate" : {
-                            "adjustableDate" : {
-                              "dateAdjustments" : {
-                                "businessCenters" : {
-                                  "businessCenter" : [ {
-                                    "value" : "DEFR"
-                                  } ],
-                                  "meta" : {
-                                    "globalKey" : "1ff50d"
-                                  }
-                                },
-                                "businessDayConvention" : "FOLLOWING",
-                                "meta" : {
-                                  "globalKey" : "211d10fc"
-                                }
-                              },
-                              "meta" : {
-                                "globalKey" : "48e9d409"
-                              },
-                              "unadjustedDate" : "2009-03-19"
-                            },
-                            "meta" : {
-                              "externalKey" : "finalValuationDate",
-                              "globalKey" : "48e9d409"
-                            }
-                          },
-                          "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
+                      "returnTerms" : {
+                        "priceReturnTerms" : {
+                          "returnType" : "Total"
                         },
-                        "valuationDatesInterim" : {
-                          "determinationMethod" : "VALUATION_TIME",
-                          "meta" : {
-                            "globalKey" : "a94f6f8f"
-                          },
-                          "valuationDates" : {
-                            "meta" : {
-                              "externalKey" : "interimValuationDate",
-                              "globalKey" : "b5ba6138"
-                            },
-                            "periodicDates" : {
-                              "endDate" : {
-                                "meta" : {
-                                  "globalKey" : "b9d527a8"
-                                },
-                                "relativeDate" : {
-                                  "meta" : {
-                                    "globalKey" : "b9d527a8"
-                                  },
-                                  "period" : "D",
-                                  "periodMultiplier" : 0,
-                                  "businessDayConvention" : "NOT_APPLICABLE",
-                                  "dateRelativeTo" : {
-                                    "externalReference" : "finalValuationDate",
-                                    "globalReference" : "48e9d409"
-                                  }
-                                }
-                              },
-                              "periodDatesAdjustments" : {
-                                "businessCenters" : {
-                                  "businessCenter" : [ {
-                                    "value" : "DEFR"
-                                  } ],
-                                  "meta" : {
-                                    "globalKey" : "1ff50d"
-                                  }
-                                },
-                                "businessDayConvention" : "FOLLOWING",
-                                "meta" : {
-                                  "globalKey" : "211d10fc"
-                                }
-                              },
-                              "periodFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "28bf3"
-                                },
-                                "period" : "M",
-                                "periodMultiplier" : 1,
-                                "rollConvention" : "19"
-                              },
-                              "startDate" : {
-                                "meta" : {
-                                  "globalKey" : "95c9235f"
-                                },
-                                "relativeDate" : {
-                                  "meta" : {
-                                    "globalKey" : "95c9235f"
-                                  },
-                                  "period" : "D",
-                                  "periodMultiplier" : 0,
-                                  "businessDayConvention" : "NOT_APPLICABLE",
-                                  "dateRelativeTo" : {
-                                    "externalReference" : "equityEffectiveDate",
-                                    "globalReference" : "6e7d8489"
-                                  }
-                                }
+                        "dividendReturnTerms" : {
+                          "dividendPayoutRatio" : [ {
+                            "totalRatio" : 1,
+                            "cashRatio" : 1,
+                            "nonCashRatio" : 1
+                          } ],
+                          "firstOrSecondPeriod" : "SecondPeriod",
+                          "dividendPeriod" : [ {
+                            "dividendPaymentDate" : {
+                              "dividendDateReference" : {
+                                "dateReference" : "CashSettlementPaymentDate"
                               }
                             }
-                          },
-                          "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
-                        }
-                      }
-                    } ]
-                  },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "DEFR"
-                          } ],
-                          "meta" : {
-                            "globalKey" : "1ff50d"
-                          }
-                        },
-                        "businessDayConvention" : "FOLLOWING",
-                        "meta" : {
-                          "globalKey" : "211d10fc"
+                          } ]
                         }
                       },
                       "meta" : {
-                        "globalKey" : "48e9d409"
-                      },
-                      "unadjustedDate" : "2009-03-19"
-                    },
+                        "globalKey" : "18839304",
+                        "externalKey" : "returnLeg"
+                      }
+                    } ],
                     "meta" : {
-                      "globalKey" : "48e9d409"
+                      "globalKey" : "108cd7c7"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "a324693a"
+                  "globalKey" : "39c61dfe"
                 }
               },
               "meta" : {
-                "globalKey" : "a324693a"
+                "globalKey" : "39c61dfe"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "a822a61e"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "affa401e"
-                  },
-                  "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
-                    "value" : {
-                      "floatingRateIndex" : {
-                        "value" : "EUR-EURIBOR-Reuters"
-                      },
-                      "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "954"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 1
-                      }
-                    }
-                  }
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.0001234,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "value" : 0.0001234,
-                    "arithmeticOperator" : "ADD",
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
+                    "priceType" : "InterestRate",
+                    "arithmeticOperator" : "Add"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "c3f90ce8"
-                },
+                } ],
                 "observable" : {
-                  "meta" : {
-                    "globalKey" : "9cba2463"
-                  },
-                  "productIdentifier" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-1"
-                      } ]
-                    },
+                  "rateOption" : {
                     "value" : {
-                      "identifier" : {
-                        "meta" : {
-                          "scheme" : "http://www.fpml.org/instrument-id"
-                        },
-                        "value" : ".GDAXI"
-                      },
-                      "meta" : {
-                        "globalKey" : "3901e477"
+                      "floatingRateIndex" : {
+                        "value" : "EUR-EURIBOR-Reuters"
                       },
-                      "source" : "OTHER"
-                    }
-                  }, {
+                      "indexTenor" : {
+                        "periodMultiplier" : 1,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "6c"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-2"
+                        "value" : "rateOption-1"
                       } ]
-                    },
-                    "value" : {
-                      "identifier" : {
-                        "value" : "GERMAN SE XETRA DAX INDEX"
-                      },
-                      "meta" : {
-                        "globalKey" : "811cd67a"
-                      },
-                      "source" : "NAME"
                     }
-                  } ]
+                  },
+                  "meta" : {
+                    "globalKey" : "4f4caf8a"
+                  }
                 },
+                "meta" : {
+                  "globalKey" : "79106fb2"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 100,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "value" : 100,
                     "perUnitOf" : {
-                      "financialUnit" : "SHARE"
+                      "financialUnit" : "Share"
                     },
-                    "priceType" : "ASSET_PRICE"
+                    "priceType" : "AssetPrice"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-2"
+                    } ]
                   }
                 } ],
                 "quantity" : [ {
+                  "value" : {
+                    "value" : 100000,
+                    "unit" : {
+                      "financialUnit" : "IndexUnit"
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "financialUnit" : "INDEX_UNIT"
-                    },
-                    "value" : 100000
                   }
                 }, {
+                  "value" : {
+                    "value" : 10000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "EUR"
+                      }
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "EUR"
+                  }
+                } ],
+                "observable" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : ".GDAXI",
+                        "meta" : {
+                          "scheme" : "http://www.fpml.org/instrument-id"
+                        }
+                      },
+                      "source" : "Other",
+                      "meta" : {
+                        "globalKey" : "3901e477"
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-1"
+                      } ]
+                    }
+                  }, {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "GERMAN SE XETRA DAX INDEX"
+                      },
+                      "source" : "Name",
+                      "meta" : {
+                        "globalKey" : "811cd67a"
                       }
                     },
-                    "value" : 10000000
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-2"
+                      } ]
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "fa8a67fd"
                   }
-                } ]
+                },
+                "meta" : {
+                  "globalKey" : "9e17d168"
+                }
               } ]
-            } ]
-          },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3ec853"
-            },
-            "value" : "2009-01-19"
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "4666b900",
+                "externalReference" : "partyA"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "c79dbb00",
+                "externalReference" : "partyB"
+              }
+            } ],
+            "adjustment" : "Standard"
           },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "PARTY1234",
                 "meta" : {
-                  "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
-                },
-                "value" : "1147071"
+                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ba25808"
               }
             } ],
-            "issuerReference" : {
-              "externalReference" : "partyA",
-              "globalReference" : "f5d99210"
+            "name" : {
+              "value" : "Party 1234 Ltd"
             },
             "meta" : {
-              "globalKey" : "8dd06c72"
+              "globalKey" : "4666b900",
+              "externalKey" : "partyA"
             }
           }, {
-            "assignedIdentifier" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "PARTY5678",
                 "meta" : {
-                  "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
-                },
-                "value" : "1147071"
+                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ba43908"
               }
             } ],
-            "issuerReference" : {
-              "externalReference" : "partyB",
-              "globalReference" : "b2a7210"
+            "name" : {
+              "value" : "Party 5678 Ltd"
             },
             "meta" : {
-              "globalKey" : "d80787b3"
+              "globalKey" : "c79dbb00",
+              "externalKey" : "partyB"
             }
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "observation" : {
-        "observationEvent" : {
+          } ],
+          "contractDetails" : {
+            "documentation" : [ {
+              "agreementDate" : "2009-01-01",
+              "legalAgreementIdentification" : {
+                "agreementName" : {
+                  "agreementType" : "MasterConfirmation",
+                  "masterConfirmationType" : {
+                    "value" : "ISDA2007EquityEuropean"
+                  }
+                }
+              },
+              "meta" : {
+                "globalKey" : "1f32caf8"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "1f32caf8"
+            }
+          },
+          "meta" : {
+            "globalKey" : "7b4a704e"
+          }
+        },
+        "observationHistory" : [ {
           "corporateAction" : {
-            "corporateActionType" : "CASH_DIVIDEND",
-            "exDate" : "2009-02-13",
-            "payDate" : "2009-02-13",
+            "corporateActionType" : "StockSplit",
+            "exDate" : "2009-02-01",
+            "payDate" : "2009-02-01",
             "underlier" : {
-              "meta" : {
-                "globalKey" : "20fd9d21"
-              },
               "security" : {
                 "productIdentifier" : [ {
                   "value" : {
                     "identifier" : {
                       "value" : "VOLKSWAGEN AG VZO O.N."
                     },
+                    "source" : "Name",
                     "meta" : {
                       "globalKey" : "9a053a24"
-                    },
-                    "source" : "NAME"
+                    }
                   }
                 } ],
-                "securityType" : "EQUITY"
+                "securityType" : "Equity"
+              },
+              "meta" : {
+                "globalKey" : "20fd9d21"
               }
             }
           }
+        } ],
+        "meta" : {
+          "globalKey" : "807866e4"
         }
       }
     }
   } ],
+  "eventQualifier" : "CorporateActionDetermined",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "bb9c04aa"
-    },
-    "observationHistory" : [ {
-      "corporateAction" : {
-        "corporateActionType" : "STOCK_SPLIT",
-        "exDate" : "2009-02-01",
-        "payDate" : "2009-02-01",
-        "underlier" : {
-          "meta" : {
-            "globalKey" : "20fd9d21"
-          },
-          "security" : {
-            "productIdentifier" : [ {
-              "value" : {
-                "identifier" : {
-                  "value" : "VOLKSWAGEN AG VZO O.N."
-                },
-                "meta" : {
-                  "globalKey" : "9a053a24"
-                },
-                "source" : "NAME"
-              }
-            } ],
-            "securityType" : "EQUITY"
-          }
-        }
-      }
-    }, {
-      "corporateAction" : {
-        "corporateActionType" : "CASH_DIVIDEND",
-        "exDate" : "2009-02-13",
-        "payDate" : "2009-02-13",
-        "underlier" : {
-          "meta" : {
-            "globalKey" : "20fd9d21"
-          },
-          "security" : {
-            "productIdentifier" : [ {
-              "value" : {
-                "identifier" : {
-                  "value" : "VOLKSWAGEN AG VZO O.N."
-                },
-                "meta" : {
-                  "globalKey" : "9a053a24"
-                },
-                "source" : "NAME"
-              }
-            } ],
-            "securityType" : "EQUITY"
-          }
-        }
-      }
-    } ],
     "trade" : {
-      "contractDetails" : {
-        "documentation" : [ {
-          "agreementDate" : "2009-01-01",
-          "legalAgreementIdentification" : {
-            "agreementName" : {
-              "agreementType" : "MASTER_CONFIRMATION",
-              "masterConfirmationType" : {
-                "value" : "ISDA_2007_EQUITY_EUROPEAN"
-              }
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "4666b900",
+          "externalReference" : "partyA"
+        },
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "1147071",
+            "meta" : {
+              "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
             }
-          },
-          "meta" : {
-            "globalKey" : "1f32caf8"
           }
         } ],
         "meta" : {
-          "globalKey" : "1f32caf8"
+          "globalKey" : "2135e2cc"
         }
-      },
-      "meta" : {
-        "globalKey" : "3a9c6ed8"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "partyA",
-          "globalKey" : "f5d99210"
-        },
-        "name" : {
-          "value" : "Party 1234 Ltd"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-            },
-            "value" : "PARTY1234"
-          },
-          "meta" : {
-            "globalKey" : "3ba25808"
-          }
-        } ]
       }, {
-        "meta" : {
-          "externalKey" : "partyB",
-          "globalKey" : "b2a7210"
-        },
-        "name" : {
-          "value" : "Party 5678 Ltd"
+        "issuerReference" : {
+          "globalReference" : "c79dbb00",
+          "externalReference" : "partyB"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "1147071",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-            },
-            "value" : "PARTY5678"
-          },
-          "meta" : {
-            "globalKey" : "3ba43908"
+              "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
+            }
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "f5d111eb"
+        }
       } ],
+      "tradeDate" : {
+        "value" : "2009-01-19",
+        "meta" : {
+          "globalKey" : "3ec853"
+        }
+      },
       "tradableProduct" : {
-        "adjustment" : "STANDARD",
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "partyA",
-            "globalReference" : "f5d99210"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "partyB",
-            "globalReference" : "b2a7210"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -988,7 +899,9 @@
             "economicTerms" : {
               "effectiveDate" : {
                 "adjustableDate" : {
+                  "unadjustedDate" : "2009-01-19",
                   "dateAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "DEFR"
@@ -997,40 +910,89 @@
                         "globalKey" : "1ff50d"
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
                       "globalKey" : "211d10fc"
                     }
                   },
                   "meta" : {
                     "globalKey" : "6e7d8489"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "6e7d8489",
+                  "externalKey" : "equityEffectiveDate"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2009-03-19",
+                  "dateAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "DEFR"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "1ff50d"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "211d10fc"
+                    }
                   },
-                  "unadjustedDate" : "2009-01-19"
+                  "meta" : {
+                    "globalKey" : "48e9d409"
+                  }
                 },
                 "meta" : {
-                  "externalKey" : "equityEffectiveDate",
-                  "globalKey" : "6e7d8489"
+                  "globalKey" : "48e9d409"
                 }
               },
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
+                    "quantityReference" : {
+                      "globalReference" : "4cf",
+                      "externalReference" : "equityNotionalAmount"
+                    },
                     "meta" : {
                       "globalKey" : "965f6c"
-                    },
-                    "quantityReference" : {
-                      "externalReference" : "equityNotionalAmount",
-                      "globalReference" : "4cf"
                     }
                   },
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        }
+                      },
+                      "spreadSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
                   "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2009-01-21",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -1039,28 +1001,24 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "211dc30c"
                           }
                         },
                         "meta" : {
                           "globalKey" : "71e7e7d7"
-                        },
-                        "unadjustedDate" : "2009-01-21"
+                        }
                       },
                       "meta" : {
-                        "externalKey" : "interestEffectiveDate",
-                        "globalKey" : "71e7e7d7"
+                        "globalKey" : "71e7e7d7",
+                        "externalKey" : "interestEffectiveDate"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "interestCalcPeriodDates",
-                      "globalKey" : "3048096c"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2009-03-23",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -1069,132 +1027,108 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "211dc30c"
                           }
                         },
                         "meta" : {
                           "globalKey" : "4fbde895"
-                        },
-                        "unadjustedDate" : "2009-03-23"
+                        }
                       },
                       "meta" : {
-                        "externalKey" : "interestTerminationDate",
-                        "globalKey" : "4fbde895"
+                        "globalKey" : "4fbde895",
+                        "externalKey" : "interestTerminationDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "3048096c",
+                      "externalKey" : "interestCalcPeriodDates"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "cc98ee4d"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "externalKey" : "interestLegPaymentDates",
-                      "globalKey" : "b6b78bb2"
-                    },
                     "paymentDateSchedule" : {
                       "interimPaymentDates" : [ {
-                        "meta" : {
-                          "globalKey" : "b6b78bb2"
-                        },
                         "periodicDates" : {
-                          "endDate" : {
-                            "meta" : {
-                              "globalKey" : "97eae877"
-                            },
+                          "startDate" : {
                             "relativeDate" : {
+                              "periodMultiplier" : 0,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "97eae877"
+                                "globalKey" : "df205212"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 0,
-                              "businessDayConvention" : "NOT_APPLICABLE",
+                              "businessDayConvention" : "NotApplicable",
                               "dateRelativeTo" : {
-                                "externalReference" : "interestTerminationDate",
-                                "globalReference" : "4fbde895"
+                                "globalReference" : "71e7e7d7",
+                                "externalReference" : "interestEffectiveDate"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "df205212"
                             }
                           },
-                          "periodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "EUTA"
-                              } ],
+                          "endDate" : {
+                            "relativeDate" : {
+                              "periodMultiplier" : 0,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "20a71d"
+                                "globalKey" : "944b936f"
+                              },
+                              "businessDayConvention" : "NotApplicable",
+                              "dateRelativeTo" : {
+                                "globalReference" : "4fbde895",
+                                "externalReference" : "interestTerminationDate"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
-                              "globalKey" : "211dc30c"
+                              "globalKey" : "944b936f"
                             }
                           },
                           "periodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "28bf3"
+                              "globalKey" : "177db"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 1,
                             "rollConvention" : "19"
                           },
-                          "startDate" : {
-                            "meta" : {
-                              "globalKey" : "e2bfa71a"
-                            },
-                            "relativeDate" : {
+                          "periodDatesAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "EUTA"
+                              } ],
                               "meta" : {
-                                "globalKey" : "e2bfa71a"
-                              },
-                              "period" : "D",
-                              "periodMultiplier" : 0,
-                              "businessDayConvention" : "NOT_APPLICABLE",
-                              "dateRelativeTo" : {
-                                "externalReference" : "interestEffectiveDate",
-                                "globalReference" : "71e7e7d7"
+                                "globalKey" : "20a71d"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "211dc30c"
                             }
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "5c33c394"
                         }
                       } ]
-                    }
-                  },
-                  "rateSpecification" : {
-                    "floatingRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        }
-                      },
-                      "spreadSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "5c33c394",
+                      "externalKey" : "interestLegPaymentDates"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "interestCalcPeriodDates",
-                      "globalReference" : "3048096c"
+                      "globalReference" : "3048096c",
+                      "externalReference" : "interestCalcPeriodDates"
                     },
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "36741a11"
+                        "globalKey" : "135004c5"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "CURRENCY_BUSINESS",
+                      "dayType" : "CurrencyBusiness",
+                      "businessDayConvention" : "PRECEDING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
@@ -1203,73 +1137,169 @@
                           "globalKey" : "20a71d"
                         }
                       },
-                      "businessDayConvention" : "PRECEDING",
                       "dateRelativeTo" : {
-                        "externalReference" : "interestLegPaymentDates",
-                        "globalReference" : "b6b78bb2"
+                        "globalReference" : "5c33c394",
+                        "externalReference" : "interestLegPaymentDates"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "9aa8401c"
-                    },
                     "resetFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "954"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 1
+                        "globalKey" : "6c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "369de000"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "725535c3"
                   }
                 } ],
-                "meta" : {
-                  "globalKey" : "a2460383"
-                },
                 "performancePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "externalKey" : "equityNotionalAmount",
-                      "globalKey" : "4cf"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
                     },
-                    "reset" : true
+                    "reset" : true,
+                    "meta" : {
+                      "globalKey" : "4cf",
+                      "externalKey" : "equityNotionalAmount"
+                    }
                   },
                   "settlementTerms" : {
-                    "meta" : {
-                      "globalKey" : "10da2"
-                    },
                     "settlementCurrency" : {
                       "value" : "EUR"
+                    },
+                    "meta" : {
+                      "globalKey" : "10da2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "returnLeg",
-                    "globalKey" : "8d30d436"
+                  "valuationDates" : {
+                    "valuationDatesInterim" : {
+                      "determinationMethod" : "ValuationTime",
+                      "valuationDates" : {
+                        "periodicDates" : {
+                          "startDate" : {
+                            "relativeDate" : {
+                              "periodMultiplier" : 0,
+                              "period" : "D",
+                              "meta" : {
+                                "globalKey" : "9229ce57"
+                              },
+                              "businessDayConvention" : "NotApplicable",
+                              "dateRelativeTo" : {
+                                "globalReference" : "6e7d8489",
+                                "externalReference" : "equityEffectiveDate"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "9229ce57"
+                            }
+                          },
+                          "endDate" : {
+                            "relativeDate" : {
+                              "periodMultiplier" : 0,
+                              "period" : "D",
+                              "meta" : {
+                                "globalKey" : "b635d2a0"
+                              },
+                              "businessDayConvention" : "NotApplicable",
+                              "dateRelativeTo" : {
+                                "globalReference" : "48e9d409",
+                                "externalReference" : "finalValuationDate"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "b635d2a0"
+                            }
+                          },
+                          "periodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "177db"
+                            },
+                            "rollConvention" : "19"
+                          },
+                          "periodDatesAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "DEFR"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "1ff50d"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "211d10fc"
+                            }
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "1cc8abb8",
+                          "externalKey" : "interimValuationDate"
+                        }
+                      },
+                      "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                      "meta" : {
+                        "globalKey" : "105dba0f"
+                      }
+                    },
+                    "valuationDatesFinal" : {
+                      "determinationMethod" : "HedgeExecution",
+                      "valuationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2009-03-19",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "DEFR"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "1ff50d"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "211d10fc"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "48e9d409"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "48e9d409",
+                          "externalKey" : "finalValuationDate"
+                        }
+                      },
+                      "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                      "meta" : {
+                        "globalKey" : "1e864b5f"
+                      }
+                    }
                   },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "99224396"
-                    },
                     "paymentDateSchedule" : {
-                      "finalPaymentDate" : {
-                        "meta" : {
-                          "globalKey" : "815a0f35"
-                        },
-                        "relativeDate" : {
+                      "interimPaymentDates" : [ {
+                        "relativeDates" : {
+                          "periodMultiplier" : 2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "815a0f35"
+                            "globalKey" : "24ad6927"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 2,
-                          "dayType" : "CURRENCY_BUSINESS",
+                          "dayType" : "CurrencyBusiness",
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -1278,24 +1308,24 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "dateRelativeTo" : {
-                            "externalReference" : "finalValuationDate",
-                            "globalReference" : "48e9d409"
+                            "globalReference" : "1cc8abb8",
+                            "externalReference" : "interimValuationDate"
                           }
-                        }
-                      },
-                      "interimPaymentDates" : [ {
-                        "meta" : {
-                          "globalKey" : "964475eb"
                         },
-                        "relativeDates" : {
+                        "meta" : {
+                          "globalKey" : "24ad6927"
+                        }
+                      } ],
+                      "finalPaymentDate" : {
+                        "relativeDate" : {
+                          "periodMultiplier" : 2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "964475eb"
+                            "globalKey" : "fc30271"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 2,
-                          "dayType" : "CURRENCY_BUSINESS",
+                          "dayType" : "CurrencyBusiness",
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -1304,33 +1334,18 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "dateRelativeTo" : {
-                            "externalReference" : "interimValuationDate",
-                            "globalReference" : "b5ba6138"
-                          }
-                        }
-                      } ]
-                    }
-                  },
-                  "returnTerms" : {
-                    "dividendReturnTerms" : {
-                      "dividendPayoutRatio" : [ {
-                        "cashRatio" : 1,
-                        "nonCashRatio" : 1,
-                        "totalRatio" : 1
-                      } ],
-                      "dividendPeriod" : [ {
-                        "dividendPaymentDate" : {
-                          "dividendDateReference" : {
-                            "dateReference" : "CASH_SETTLEMENT_PAYMENT_DATE"
+                            "globalReference" : "48e9d409",
+                            "externalReference" : "finalValuationDate"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "fc30271"
                         }
-                      } ],
-                      "firstOrSecondPeriod" : "SECOND_PERIOD"
+                      }
                     },
-                    "priceReturnTerms" : {
-                      "returnType" : "TOTAL"
+                    "meta" : {
+                      "globalKey" : "35da2aea"
                     }
                   },
                   "underlier" : {
@@ -1351,341 +1366,326 @@
                       "globalKey" : "0"
                     }
                   },
-                  "valuationDates" : {
-                    "valuationDatesFinal" : {
-                      "determinationMethod" : "HEDGE_EXECUTION",
-                      "meta" : {
-                        "globalKey" : "1e864b5f"
-                      },
-                      "valuationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "DEFR"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "1ff50d"
-                              }
-                            },
-                            "businessDayConvention" : "FOLLOWING",
-                            "meta" : {
-                              "globalKey" : "211d10fc"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "48e9d409"
-                          },
-                          "unadjustedDate" : "2009-03-19"
-                        },
-                        "meta" : {
-                          "externalKey" : "finalValuationDate",
-                          "globalKey" : "48e9d409"
-                        }
-                      },
-                      "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
+                  "returnTerms" : {
+                    "priceReturnTerms" : {
+                      "returnType" : "Total"
                     },
-                    "valuationDatesInterim" : {
-                      "determinationMethod" : "VALUATION_TIME",
-                      "meta" : {
-                        "globalKey" : "a94f6f8f"
-                      },
-                      "valuationDates" : {
-                        "meta" : {
-                          "externalKey" : "interimValuationDate",
-                          "globalKey" : "b5ba6138"
-                        },
-                        "periodicDates" : {
-                          "endDate" : {
-                            "meta" : {
-                              "globalKey" : "b9d527a8"
-                            },
-                            "relativeDate" : {
-                              "meta" : {
-                                "globalKey" : "b9d527a8"
-                              },
-                              "period" : "D",
-                              "periodMultiplier" : 0,
-                              "businessDayConvention" : "NOT_APPLICABLE",
-                              "dateRelativeTo" : {
-                                "externalReference" : "finalValuationDate",
-                                "globalReference" : "48e9d409"
-                              }
-                            }
-                          },
-                          "periodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "DEFR"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "1ff50d"
-                              }
-                            },
-                            "businessDayConvention" : "FOLLOWING",
-                            "meta" : {
-                              "globalKey" : "211d10fc"
-                            }
-                          },
-                          "periodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28bf3"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "19"
-                          },
-                          "startDate" : {
-                            "meta" : {
-                              "globalKey" : "95c9235f"
-                            },
-                            "relativeDate" : {
-                              "meta" : {
-                                "globalKey" : "95c9235f"
-                              },
-                              "period" : "D",
-                              "periodMultiplier" : 0,
-                              "businessDayConvention" : "NOT_APPLICABLE",
-                              "dateRelativeTo" : {
-                                "externalReference" : "equityEffectiveDate",
-                                "globalReference" : "6e7d8489"
-                              }
-                            }
+                    "dividendReturnTerms" : {
+                      "dividendPayoutRatio" : [ {
+                        "totalRatio" : 1,
+                        "cashRatio" : 1,
+                        "nonCashRatio" : 1
+                      } ],
+                      "firstOrSecondPeriod" : "SecondPeriod",
+                      "dividendPeriod" : [ {
+                        "dividendPaymentDate" : {
+                          "dividendDateReference" : {
+                            "dateReference" : "CashSettlementPaymentDate"
                           }
                         }
-                      },
-                      "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
-                    }
-                  }
-                } ]
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "dateAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "DEFR"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "1ff50d"
-                      }
-                    },
-                    "businessDayConvention" : "FOLLOWING",
-                    "meta" : {
-                      "globalKey" : "211d10fc"
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "48e9d409"
-                  },
-                  "unadjustedDate" : "2009-03-19"
-                },
-                "meta" : {
-                  "globalKey" : "48e9d409"
-                }
-              }
-            },
-            "meta" : {
-              "globalKey" : "a324693a"
-            }
-          },
-          "meta" : {
-            "globalKey" : "a324693a"
-          }
-        },
-        "tradeLot" : [ {
-          "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "a822a61e"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "affa401e"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "EUR-EURIBOR-Reuters"
+                      } ]
+                    }
                   },
-                  "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "18839304",
+                    "externalKey" : "returnLeg"
                   }
+                } ],
+                "meta" : {
+                  "globalKey" : "108cd7c7"
                 }
               }
             },
+            "meta" : {
+              "globalKey" : "39c61dfe"
+            }
+          },
+          "meta" : {
+            "globalKey" : "39c61dfe"
+          }
+        },
+        "tradeLot" : [ {
+          "priceQuantity" : [ {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.0001234,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "value" : 0.0001234,
-                "arithmeticOperator" : "ADD",
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
+                "priceType" : "InterestRate",
+                "arithmeticOperator" : "Add"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-1"
+                } ]
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "c3f90ce8"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "9cba2463"
-              },
-              "productIdentifier" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "productIdentifier-1"
-                  } ]
-                },
+              "rateOption" : {
                 "value" : {
-                  "identifier" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/instrument-id"
-                    },
-                    "value" : ".GDAXI"
-                  },
-                  "meta" : {
-                    "globalKey" : "3901e477"
+                  "floatingRateIndex" : {
+                    "value" : "EUR-EURIBOR-Reuters"
                   },
-                  "source" : "OTHER"
-                }
-              }, {
+                  "indexTenor" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "productIdentifier-2"
+                    "value" : "rateOption-1"
                   } ]
-                },
-                "value" : {
-                  "identifier" : {
-                    "value" : "GERMAN SE XETRA DAX INDEX"
-                  },
-                  "meta" : {
-                    "globalKey" : "811cd67a"
-                  },
-                  "source" : "NAME"
                 }
-              } ]
+              },
+              "meta" : {
+                "globalKey" : "4f4caf8a"
+              }
             },
+            "meta" : {
+              "globalKey" : "79106fb2"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-2"
-                } ]
-              },
               "value" : {
+                "value" : 100,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "value" : 100,
                 "perUnitOf" : {
-                  "financialUnit" : "SHARE"
+                  "financialUnit" : "Share"
                 },
-                "priceType" : "ASSET_PRICE"
+                "priceType" : "AssetPrice"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-2"
+                } ]
               }
             } ],
             "quantity" : [ {
+              "value" : {
+                "value" : 100000,
+                "unit" : {
+                  "financialUnit" : "IndexUnit"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-2"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "financialUnit" : "INDEX_UNIT"
-                },
-                "value" : 100000
               }
             }, {
+              "value" : {
+                "value" : 10000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "EUR"
+                  }
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "EUR"
+              }
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : ".GDAXI",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/instrument-id"
+                    }
+                  },
+                  "source" : "Other",
+                  "meta" : {
+                    "globalKey" : "3901e477"
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "productIdentifier-1"
+                  } ]
+                }
+              }, {
+                "value" : {
+                  "identifier" : {
+                    "value" : "GERMAN SE XETRA DAX INDEX"
+                  },
+                  "source" : "Name",
+                  "meta" : {
+                    "globalKey" : "811cd67a"
                   }
                 },
-                "value" : 10000000
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "productIdentifier-2"
+                  } ]
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "fa8a67fd"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "9e17d168"
+            }
           } ]
-        } ]
-      },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3ec853"
-        },
-        "value" : "2009-01-19"
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "4666b900",
+            "externalReference" : "partyA"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "c79dbb00",
+            "externalReference" : "partyB"
+          }
+        } ],
+        "adjustment" : "Standard"
       },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "PARTY1234",
             "meta" : {
-              "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
-            },
-            "value" : "1147071"
+              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+            }
+          },
+          "meta" : {
+            "globalKey" : "3ba25808"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "f5d99210"
+        "name" : {
+          "value" : "Party 1234 Ltd"
         },
         "meta" : {
-          "globalKey" : "8dd06c72"
+          "globalKey" : "4666b900",
+          "externalKey" : "partyA"
         }
       }, {
-        "assignedIdentifier" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "PARTY5678",
             "meta" : {
-              "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
-            },
-            "value" : "1147071"
+              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+            }
+          },
+          "meta" : {
+            "globalKey" : "3ba43908"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "b2a7210"
+        "name" : {
+          "value" : "Party 5678 Ltd"
         },
         "meta" : {
-          "globalKey" : "d80787b3"
+          "globalKey" : "c79dbb00",
+          "externalKey" : "partyB"
+        }
+      } ],
+      "contractDetails" : {
+        "documentation" : [ {
+          "agreementDate" : "2009-01-01",
+          "legalAgreementIdentification" : {
+            "agreementName" : {
+              "agreementType" : "MasterConfirmation",
+              "masterConfirmationType" : {
+                "value" : "ISDA2007EquityEuropean"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "1f32caf8"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "1f32caf8"
+        }
+      },
+      "meta" : {
+        "globalKey" : "7b4a704e"
+      }
+    },
+    "observationHistory" : [ {
+      "corporateAction" : {
+        "corporateActionType" : "StockSplit",
+        "exDate" : "2009-02-01",
+        "payDate" : "2009-02-01",
+        "underlier" : {
+          "security" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "VOLKSWAGEN AG VZO O.N."
+                },
+                "source" : "Name",
+                "meta" : {
+                  "globalKey" : "9a053a24"
+                }
+              }
+            } ],
+            "securityType" : "Equity"
+          },
+          "meta" : {
+            "globalKey" : "20fd9d21"
+          }
+        }
+      }
+    }, {
+      "corporateAction" : {
+        "corporateActionType" : "CashDividend",
+        "exDate" : "2009-02-13",
+        "payDate" : "2009-02-13",
+        "underlier" : {
+          "security" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "VOLKSWAGEN AG VZO O.N."
+                },
+                "source" : "Name",
+                "meta" : {
+                  "globalKey" : "9a053a24"
+                }
+              }
+            } ],
+            "securityType" : "Equity"
+          },
+          "meta" : {
+            "globalKey" : "20fd9d21"
+          }
         }
-      } ]
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "7f24f0bc"
     }
   } ],
-  "eventQualifier" : "CorporateActionDetermined",
   "meta" : {
-    "globalKey" : "ce460"
+    "globalKey" : "9db9cdbc"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/credit-event/credit-event-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/credit-event/credit-event-func-output.json
index a76c3339bd..9b4a0cfc62 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/credit-event/credit-event-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/credit-event/credit-event-func-output.json
@@ -1,90 +1,62 @@
 {
-  "effectiveDate" : "2022-02-04",
   "eventDate" : "2022-02-04",
+  "effectiveDate" : "2022-02-04",
   "instruction" : [ {
+    "primitiveInstruction" : {
+      "observation" : {
+        "observationEvent" : {
+          "creditEvent" : {
+            "creditEventType" : "Bankruptcy",
+            "eventDeterminationDate" : "2022-02-04",
+            "auctionDate" : "2022-03-03",
+            "referenceInformation" : {
+              "referenceEntity" : {
+                "entityId" : [ {
+                  "value" : "UE2136O97NLB5BYP9H04"
+                } ],
+                "name" : {
+                  "value" : "McDonald's Corporation"
+                },
+                "meta" : {
+                  "globalKey" : "17442720"
+                }
+              },
+              "noReferenceObligation" : true
+            }
+          }
+        }
+      }
+    },
     "before" : {
       "value" : {
-        "meta" : {
-          "globalKey" : "9d1f7f3c"
-        },
         "trade" : {
-          "contractDetails" : {
-            "documentation" : [ {
-              "agreementDate" : "2004-10-18",
-              "legalAgreementIdentification" : {
-                "agreementName" : {
-                  "agreementType" : "MASTER_CONFIRMATION",
-                  "masterConfirmationType" : {
-                    "value" : "DJ.CDX.NA"
-                  }
-                }
-              },
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "1031234567",
               "meta" : {
-                "globalKey" : "ae7fb3d4"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
               }
-            } ],
-            "meta" : {
-              "globalKey" : "ae7fb3d4"
-            }
-          },
-          "meta" : {
-            "globalKey" : "70d3965c"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "7cec034c"
-            },
-            "name" : {
-              "value" : "Party A"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "56323",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "54930084UKLVMY22DS16"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "121d7965"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+                }
               }
-            } ]
-          }, {
+            } ],
             "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "490e5f44"
-            },
-            "name" : {
-              "value" : "Party B"
+              "globalKey" : "1ecdb5a5"
             },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "48750084UKLVTR22DS78"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "de31bddc"
-              }
-            } ]
+            "identifierType" : "UniqueTransactionIdentifier"
           } ],
+          "tradeDate" : {
+            "value" : "2005-01-24",
+            "meta" : {
+              "globalKey" : "3ea858"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "490e5f44"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "7cec034c"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -94,346 +66,301 @@
                 "economicTerms" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2004-03-23",
                       "meta" : {
                         "globalKey" : "3ea0d7"
-                      },
-                      "unadjustedDate" : "2004-03-23"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "3ea0d7"
                     }
                   },
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2009-03-20",
+                      "meta" : {
+                        "globalKey" : "3ec8d4"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3ec8d4"
+                    }
+                  },
                   "payout" : {
-                    "creditDefaultPayout" : {
+                    "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "generalTerms" : {
-                        "indexReferenceInformation" : {
-                          "indexName" : {
-                            "value" : "Dow Jones CDX NA IG.2"
-                          },
-                          "indexAnnexDate" : "2004-07-06",
-                          "indexAnnexSource" : {
-                            "value" : "PUBLISHER"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
+                            }
                           },
-                          "indexSeries" : 2,
                           "meta" : {
-                            "globalKey" : "92a91d81"
+                            "globalKey" : "0"
                           }
                         }
                       },
                       "meta" : {
-                        "globalKey" : "c762cfa0"
+                        "globalKey" : "5a5ff79f"
                       }
-                    },
-                    "interestRatePayout" : [ {
+                    } ],
+                    "creditDefaultPayout" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "meta" : {
-                        "globalKey" : "5a5ff79f"
-                      },
-                      "rateSpecification" : {
-                        "fixedRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
+                      "generalTerms" : {
+                        "indexReferenceInformation" : {
+                          "indexName" : {
+                            "value" : "Dow Jones CDX NA IG.2"
                           },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
+                          "indexSeries" : 2,
+                          "indexAnnexDate" : "2004-07-06",
+                          "indexAnnexSource" : {
+                            "value" : "Publisher"
+                          },
+                          "meta" : {
+                            "globalKey" : "53b8689"
                           }
                         }
-                      }
-                    } ],
-                    "meta" : {
-                      "globalKey" : "a049273f"
-                    }
-                  },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3ec8d4"
                       },
-                      "unadjustedDate" : "2009-03-20"
+                      "meta" : {
+                        "globalKey" : "39f538a8"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "3ec8d4"
+                      "globalKey" : "383edb69"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "2933c1d7"
+                  "globalKey" : "ed169df"
                 }
               },
               "meta" : {
-                "globalKey" : "2933c1d7"
+                "globalKey" : "ed169df"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "56a5905f"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.006,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 0.006,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "2ebbcc83"
-                },
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "7e0c7b81"
+                }
+              }, {
+                "quantity" : [ {
                   "value" : {
+                    "value" : 25000000,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
-                    },
-                    "value" : 25000000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    } ]
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "a8bdc3dd"
+                }
               } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "4caf4c44",
+                "externalReference" : "party2"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "349a498c",
+                "externalReference" : "party1"
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3ea858"
-            },
-            "value" : "2005-01-24"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "54930084UKLVMY22DS16",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-                },
-                "value" : "56323"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "121d7965"
               }
             } ],
-            "issuer" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
-              },
-              "value" : "1031234567"
+            "name" : {
+              "value" : "Party A"
             },
             "meta" : {
-              "globalKey" : "84d7eae5"
+              "globalKey" : "349a498c",
+              "externalKey" : "party1"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "48750084UKLVTR22DS78",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "de31bddc"
+              }
+            } ],
+            "name" : {
+              "value" : "Party B"
             },
-            "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-          } ]
+            "meta" : {
+              "globalKey" : "4caf4c44",
+              "externalKey" : "party2"
+            }
+          } ],
+          "contractDetails" : {
+            "documentation" : [ {
+              "agreementDate" : "2004-10-18",
+              "legalAgreementIdentification" : {
+                "agreementName" : {
+                  "agreementType" : "MasterConfirmation",
+                  "masterConfirmationType" : {
+                    "value" : "DJ.CDX.NA"
+                  }
+                }
+              },
+              "meta" : {
+                "globalKey" : "ae7fb3d4"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "ae7fb3d4"
+            }
+          },
+          "meta" : {
+            "globalKey" : "80c60e0e"
+          }
         },
         "transferHistory" : [ {
-          "meta" : {
-            "globalKey" : "2e32cae0"
-          },
           "transfer" : {
-            "payerReceiver" : {
-              "payerPartyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "490e5f44"
-              },
-              "receiverPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "7cec034c"
-              }
-            },
             "quantity" : {
+              "value" : 16000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
+              }
+            },
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "globalReference" : "4caf4c44",
+                "externalReference" : "party2"
               },
-              "value" : 16000
+              "receiverPartyReference" : {
+                "globalReference" : "349a498c",
+                "externalReference" : "party1"
+              }
             },
             "transferExpression" : {
-              "priceTransfer" : "UPFRONT"
-            }
-          }
-        } ]
-      }
-    },
-    "primitiveInstruction" : {
-      "observation" : {
-        "observationEvent" : {
-          "creditEvent" : {
-            "auctionDate" : "2022-03-03",
-            "creditEventType" : "BANKRUPTCY",
-            "eventDeterminationDate" : "2022-02-04",
-            "referenceInformation" : {
-              "noReferenceObligation" : true,
-              "referenceEntity" : {
-                "entityId" : [ {
-                  "value" : "UE2136O97NLB5BYP9H04"
-                } ],
-                "meta" : {
-                  "globalKey" : "17442720"
-                },
-                "name" : {
-                  "value" : "McDonald's Corporation"
-                }
-              }
+              "priceTransfer" : "Upfront"
             }
+          },
+          "meta" : {
+            "globalKey" : "301d4bc"
           }
+        } ],
+        "meta" : {
+          "globalKey" : "dfa561ca"
         }
       }
     }
   } ],
+  "eventQualifier" : "CreditEventDetermined",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "d9423fff"
-    },
-    "observationHistory" : [ {
-      "creditEvent" : {
-        "auctionDate" : "2022-03-03",
-        "creditEventType" : "BANKRUPTCY",
-        "eventDeterminationDate" : "2022-02-04",
-        "referenceInformation" : {
-          "noReferenceObligation" : true,
-          "referenceEntity" : {
-            "entityId" : [ {
-              "value" : "UE2136O97NLB5BYP9H04"
-            } ],
-            "meta" : {
-              "globalKey" : "17442720"
-            },
-            "name" : {
-              "value" : "McDonald's Corporation"
-            }
-          }
-        }
-      }
-    } ],
     "trade" : {
-      "contractDetails" : {
-        "documentation" : [ {
-          "agreementDate" : "2004-10-18",
-          "legalAgreementIdentification" : {
-            "agreementName" : {
-              "agreementType" : "MASTER_CONFIRMATION",
-              "masterConfirmationType" : {
-                "value" : "DJ.CDX.NA"
-              }
-            }
-          },
-          "meta" : {
-            "globalKey" : "ae7fb3d4"
-          }
-        } ],
-        "meta" : {
-          "globalKey" : "ae7fb3d4"
-        }
-      },
-      "meta" : {
-        "globalKey" : "70d3965c"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "7cec034c"
-        },
-        "name" : {
-          "value" : "Party A"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "54930084UKLVMY22DS16"
-          },
-          "identifierType" : "LEI",
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "1031234567",
           "meta" : {
-            "globalKey" : "121d7965"
-          }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "490e5f44"
-        },
-        "name" : {
-          "value" : "Party B"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
+          }
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "56323",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "48750084UKLVTR22DS78"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "de31bddc"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+            }
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "1ecdb5a5"
+        },
+        "identifierType" : "UniqueTransactionIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2005-01-24",
+        "meta" : {
+          "globalKey" : "3ea858"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "490e5f44"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "7cec034c"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -443,218 +370,291 @@
             "economicTerms" : {
               "effectiveDate" : {
                 "adjustableDate" : {
+                  "unadjustedDate" : "2004-03-23",
                   "meta" : {
                     "globalKey" : "3ea0d7"
-                  },
-                  "unadjustedDate" : "2004-03-23"
+                  }
                 },
                 "meta" : {
                   "globalKey" : "3ea0d7"
                 }
               },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2009-03-20",
+                  "meta" : {
+                    "globalKey" : "3ec8d4"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3ec8d4"
+                }
+              },
               "payout" : {
-                "creditDefaultPayout" : {
+                "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "generalTerms" : {
-                    "indexReferenceInformation" : {
-                      "indexName" : {
-                        "value" : "Dow Jones CDX NA IG.2"
-                      },
-                      "indexAnnexDate" : "2004-07-06",
-                      "indexAnnexSource" : {
-                        "value" : "PUBLISHER"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
                       },
-                      "indexSeries" : 2,
                       "meta" : {
-                        "globalKey" : "92a91d81"
+                        "globalKey" : "0"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "c762cfa0"
+                    "globalKey" : "5a5ff79f"
                   }
-                },
-                "interestRatePayout" : [ {
+                } ],
+                "creditDefaultPayout" : {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "5a5ff79f"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
+                  "generalTerms" : {
+                    "indexReferenceInformation" : {
+                      "indexName" : {
+                        "value" : "Dow Jones CDX NA IG.2"
                       },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
+                      "indexSeries" : 2,
+                      "indexAnnexDate" : "2004-07-06",
+                      "indexAnnexSource" : {
+                        "value" : "Publisher"
+                      },
+                      "meta" : {
+                        "globalKey" : "53b8689"
                       }
                     }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "a049273f"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3ec8d4"
                   },
-                  "unadjustedDate" : "2009-03-20"
+                  "meta" : {
+                    "globalKey" : "39f538a8"
+                  }
                 },
                 "meta" : {
-                  "globalKey" : "3ec8d4"
+                  "globalKey" : "383edb69"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "2933c1d7"
+              "globalKey" : "ed169df"
             }
           },
           "meta" : {
-            "globalKey" : "2933c1d7"
+            "globalKey" : "ed169df"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "56a5905f"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.006,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 0.006,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "2ebbcc83"
-            },
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "7e0c7b81"
+            }
+          }, {
+            "quantity" : [ {
               "value" : {
+                "value" : 25000000,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 25000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "a8bdc3dd"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "4caf4c44",
+            "externalReference" : "party2"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "349a498c",
+            "externalReference" : "party1"
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3ea858"
-        },
-        "value" : "2005-01-24"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "54930084UKLVMY22DS16",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-            },
-            "value" : "56323"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "121d7965"
           }
         } ],
-        "issuer" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
-          },
-          "value" : "1031234567"
+        "name" : {
+          "value" : "Party A"
         },
         "meta" : {
-          "globalKey" : "84d7eae5"
+          "globalKey" : "349a498c",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "48750084UKLVTR22DS78",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "de31bddc"
+          }
+        } ],
+        "name" : {
+          "value" : "Party B"
         },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
+        "meta" : {
+          "globalKey" : "4caf4c44",
+          "externalKey" : "party2"
+        }
+      } ],
+      "contractDetails" : {
+        "documentation" : [ {
+          "agreementDate" : "2004-10-18",
+          "legalAgreementIdentification" : {
+            "agreementName" : {
+              "agreementType" : "MasterConfirmation",
+              "masterConfirmationType" : {
+                "value" : "DJ.CDX.NA"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "ae7fb3d4"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "ae7fb3d4"
+        }
+      },
+      "meta" : {
+        "globalKey" : "80c60e0e"
+      }
     },
     "transferHistory" : [ {
-      "meta" : {
-        "globalKey" : "2e32cae0"
-      },
       "transfer" : {
-        "payerReceiver" : {
-          "payerPartyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "490e5f44"
-          },
-          "receiverPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "7cec034c"
-          }
-        },
         "quantity" : {
+          "value" : 16000,
           "unit" : {
             "currency" : {
               "value" : "USD"
             }
+          }
+        },
+        "payerReceiver" : {
+          "payerPartyReference" : {
+            "globalReference" : "4caf4c44",
+            "externalReference" : "party2"
           },
-          "value" : 16000
+          "receiverPartyReference" : {
+            "globalReference" : "349a498c",
+            "externalReference" : "party1"
+          }
         },
         "transferExpression" : {
-          "priceTransfer" : "UPFRONT"
+          "priceTransfer" : "Upfront"
+        }
+      },
+      "meta" : {
+        "globalKey" : "301d4bc"
+      }
+    } ],
+    "observationHistory" : [ {
+      "creditEvent" : {
+        "creditEventType" : "Bankruptcy",
+        "eventDeterminationDate" : "2022-02-04",
+        "auctionDate" : "2022-03-03",
+        "referenceInformation" : {
+          "referenceEntity" : {
+            "entityId" : [ {
+              "value" : "UE2136O97NLB5BYP9H04"
+            } ],
+            "name" : {
+              "value" : "McDonald's Corporation"
+            },
+            "meta" : {
+              "globalKey" : "17442720"
+            }
+          },
+          "noReferenceObligation" : true
         }
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "609dd83"
+    }
   } ],
-  "eventQualifier" : "CreditEventDetermined",
   "meta" : {
-    "globalKey" : "89e65be0"
+    "globalKey" : "80f55ca0"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/credit-event/credit-event-obs-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/credit-event/credit-event-obs-func-output.json
index 8909137ed7..942b470c63 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/credit-event/credit-event-obs-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/credit-event/credit-event-obs-func-output.json
@@ -1,111 +1,62 @@
 {
-  "effectiveDate" : "2023-02-02",
   "eventDate" : "2023-02-02",
+  "effectiveDate" : "2023-02-02",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "d9423fff"
-        },
-        "observationHistory" : [ {
+    "primitiveInstruction" : {
+      "observation" : {
+        "observationEvent" : {
           "creditEvent" : {
-            "auctionDate" : "2022-03-03",
-            "creditEventType" : "BANKRUPTCY",
-            "eventDeterminationDate" : "2022-02-04",
+            "creditEventType" : "FailureToPay",
+            "eventDeterminationDate" : "2023-02-04",
+            "auctionDate" : "2023-03-03",
             "referenceInformation" : {
-              "noReferenceObligation" : true,
               "referenceEntity" : {
                 "entityId" : [ {
                   "value" : "UE2136O97NLB5BYP9H04"
                 } ],
-                "meta" : {
-                  "globalKey" : "17442720"
-                },
                 "name" : {
                   "value" : "McDonald's Corporation"
+                },
+                "meta" : {
+                  "globalKey" : "17442720"
                 }
-              }
+              },
+              "noReferenceObligation" : true
             }
           }
-        } ],
+        }
+      }
+    },
+    "before" : {
+      "value" : {
         "trade" : {
-          "contractDetails" : {
-            "documentation" : [ {
-              "agreementDate" : "2004-10-18",
-              "legalAgreementIdentification" : {
-                "agreementName" : {
-                  "agreementType" : "MASTER_CONFIRMATION",
-                  "masterConfirmationType" : {
-                    "value" : "DJ.CDX.NA"
-                  }
-                }
-              },
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "1031234567",
               "meta" : {
-                "globalKey" : "ae7fb3d4"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
               }
-            } ],
-            "meta" : {
-              "globalKey" : "ae7fb3d4"
-            }
-          },
-          "meta" : {
-            "globalKey" : "70d3965c"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "7cec034c"
-            },
-            "name" : {
-              "value" : "Party A"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "56323",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "54930084UKLVMY22DS16"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "121d7965"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+                }
               }
-            } ]
-          }, {
+            } ],
             "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "490e5f44"
-            },
-            "name" : {
-              "value" : "Party B"
+              "globalKey" : "1ecdb5a5"
             },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "48750084UKLVTR22DS78"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "de31bddc"
-              }
-            } ]
+            "identifierType" : "UniqueTransactionIdentifier"
           } ],
+          "tradeDate" : {
+            "value" : "2005-01-24",
+            "meta" : {
+              "globalKey" : "3ea858"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "490e5f44"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "7cec034c"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -115,366 +66,322 @@
                 "economicTerms" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2004-03-23",
                       "meta" : {
                         "globalKey" : "3ea0d7"
-                      },
-                      "unadjustedDate" : "2004-03-23"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "3ea0d7"
                     }
                   },
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2009-03-20",
+                      "meta" : {
+                        "globalKey" : "3ec8d4"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3ec8d4"
+                    }
+                  },
                   "payout" : {
-                    "creditDefaultPayout" : {
+                    "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "generalTerms" : {
-                        "indexReferenceInformation" : {
-                          "indexName" : {
-                            "value" : "Dow Jones CDX NA IG.2"
-                          },
-                          "indexAnnexDate" : "2004-07-06",
-                          "indexAnnexSource" : {
-                            "value" : "PUBLISHER"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
+                            }
                           },
-                          "indexSeries" : 2,
                           "meta" : {
-                            "globalKey" : "92a91d81"
+                            "globalKey" : "0"
                           }
                         }
                       },
                       "meta" : {
-                        "globalKey" : "c762cfa0"
+                        "globalKey" : "5a5ff79f"
                       }
-                    },
-                    "interestRatePayout" : [ {
+                    } ],
+                    "creditDefaultPayout" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "meta" : {
-                        "globalKey" : "5a5ff79f"
-                      },
-                      "rateSpecification" : {
-                        "fixedRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
+                      "generalTerms" : {
+                        "indexReferenceInformation" : {
+                          "indexName" : {
+                            "value" : "Dow Jones CDX NA IG.2"
                           },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
+                          "indexSeries" : 2,
+                          "indexAnnexDate" : "2004-07-06",
+                          "indexAnnexSource" : {
+                            "value" : "Publisher"
+                          },
+                          "meta" : {
+                            "globalKey" : "53b8689"
                           }
                         }
-                      }
-                    } ],
-                    "meta" : {
-                      "globalKey" : "a049273f"
-                    }
-                  },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3ec8d4"
                       },
-                      "unadjustedDate" : "2009-03-20"
+                      "meta" : {
+                        "globalKey" : "39f538a8"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "3ec8d4"
+                      "globalKey" : "383edb69"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "2933c1d7"
+                  "globalKey" : "ed169df"
                 }
               },
               "meta" : {
-                "globalKey" : "2933c1d7"
+                "globalKey" : "ed169df"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "56a5905f"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.006,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 0.006,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "2ebbcc83"
-                },
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "7e0c7b81"
+                }
+              }, {
+                "quantity" : [ {
                   "value" : {
+                    "value" : 25000000,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
-                    },
-                    "value" : 25000000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    } ]
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "a8bdc3dd"
+                }
               } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "4caf4c44",
+                "externalReference" : "party2"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "349a498c",
+                "externalReference" : "party1"
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3ea858"
-            },
-            "value" : "2005-01-24"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "54930084UKLVMY22DS16",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-                },
-                "value" : "56323"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "121d7965"
               }
             } ],
-            "issuer" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
-              },
-              "value" : "1031234567"
+            "name" : {
+              "value" : "Party A"
             },
             "meta" : {
-              "globalKey" : "84d7eae5"
-            },
-            "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-          } ]
-        },
-        "transferHistory" : [ {
-          "meta" : {
-            "globalKey" : "2e32cae0"
-          },
-          "transfer" : {
-            "payerReceiver" : {
-              "payerPartyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "490e5f44"
-              },
-              "receiverPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "7cec034c"
+              "globalKey" : "349a498c",
+              "externalKey" : "party1"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "48750084UKLVTR22DS78",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "de31bddc"
               }
+            } ],
+            "name" : {
+              "value" : "Party B"
             },
+            "meta" : {
+              "globalKey" : "4caf4c44",
+              "externalKey" : "party2"
+            }
+          } ],
+          "contractDetails" : {
+            "documentation" : [ {
+              "agreementDate" : "2004-10-18",
+              "legalAgreementIdentification" : {
+                "agreementName" : {
+                  "agreementType" : "MasterConfirmation",
+                  "masterConfirmationType" : {
+                    "value" : "DJ.CDX.NA"
+                  }
+                }
+              },
+              "meta" : {
+                "globalKey" : "ae7fb3d4"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "ae7fb3d4"
+            }
+          },
+          "meta" : {
+            "globalKey" : "80c60e0e"
+          }
+        },
+        "transferHistory" : [ {
+          "transfer" : {
             "quantity" : {
+              "value" : 16000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
+              }
+            },
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "globalReference" : "4caf4c44",
+                "externalReference" : "party2"
               },
-              "value" : 16000
+              "receiverPartyReference" : {
+                "globalReference" : "349a498c",
+                "externalReference" : "party1"
+              }
             },
             "transferExpression" : {
-              "priceTransfer" : "UPFRONT"
+              "priceTransfer" : "Upfront"
             }
+          },
+          "meta" : {
+            "globalKey" : "301d4bc"
           }
-        } ]
-      }
-    },
-    "primitiveInstruction" : {
-      "observation" : {
-        "observationEvent" : {
+        } ],
+        "observationHistory" : [ {
           "creditEvent" : {
-            "auctionDate" : "2023-03-03",
-            "creditEventType" : "FAILURE_TO_PAY",
-            "eventDeterminationDate" : "2023-02-04",
+            "creditEventType" : "Bankruptcy",
+            "eventDeterminationDate" : "2022-02-04",
+            "auctionDate" : "2022-03-03",
             "referenceInformation" : {
-              "noReferenceObligation" : true,
               "referenceEntity" : {
                 "entityId" : [ {
                   "value" : "UE2136O97NLB5BYP9H04"
                 } ],
-                "meta" : {
-                  "globalKey" : "17442720"
-                },
                 "name" : {
                   "value" : "McDonald's Corporation"
+                },
+                "meta" : {
+                  "globalKey" : "17442720"
                 }
-              }
+              },
+              "noReferenceObligation" : true
             }
           }
+        } ],
+        "meta" : {
+          "globalKey" : "609dd83"
         }
       }
     }
   } ],
+  "eventQualifier" : "CreditEventDetermined",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "f854a11c"
-    },
-    "observationHistory" : [ {
-      "creditEvent" : {
-        "auctionDate" : "2022-03-03",
-        "creditEventType" : "BANKRUPTCY",
-        "eventDeterminationDate" : "2022-02-04",
-        "referenceInformation" : {
-          "noReferenceObligation" : true,
-          "referenceEntity" : {
-            "entityId" : [ {
-              "value" : "UE2136O97NLB5BYP9H04"
-            } ],
-            "meta" : {
-              "globalKey" : "17442720"
-            },
-            "name" : {
-              "value" : "McDonald's Corporation"
-            }
-          }
-        }
-      }
-    }, {
-      "creditEvent" : {
-        "auctionDate" : "2023-03-03",
-        "creditEventType" : "FAILURE_TO_PAY",
-        "eventDeterminationDate" : "2023-02-04",
-        "referenceInformation" : {
-          "noReferenceObligation" : true,
-          "referenceEntity" : {
-            "entityId" : [ {
-              "value" : "UE2136O97NLB5BYP9H04"
-            } ],
-            "meta" : {
-              "globalKey" : "17442720"
-            },
-            "name" : {
-              "value" : "McDonald's Corporation"
-            }
-          }
-        }
-      }
-    } ],
     "trade" : {
-      "contractDetails" : {
-        "documentation" : [ {
-          "agreementDate" : "2004-10-18",
-          "legalAgreementIdentification" : {
-            "agreementName" : {
-              "agreementType" : "MASTER_CONFIRMATION",
-              "masterConfirmationType" : {
-                "value" : "DJ.CDX.NA"
-              }
-            }
-          },
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "1031234567",
           "meta" : {
-            "globalKey" : "ae7fb3d4"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
           }
-        } ],
-        "meta" : {
-          "globalKey" : "ae7fb3d4"
-        }
-      },
-      "meta" : {
-        "globalKey" : "70d3965c"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "7cec034c"
         },
-        "name" : {
-          "value" : "Party A"
-        },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "56323",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "54930084UKLVMY22DS16"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "121d7965"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+            }
           }
-        } ]
-      }, {
+        } ],
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "490e5f44"
+          "globalKey" : "1ecdb5a5"
         },
-        "name" : {
-          "value" : "Party B"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "48750084UKLVTR22DS78"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "de31bddc"
-          }
-        } ]
+        "identifierType" : "UniqueTransactionIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2005-01-24",
+        "meta" : {
+          "globalKey" : "3ea858"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "490e5f44"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "7cec034c"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -484,218 +391,311 @@
             "economicTerms" : {
               "effectiveDate" : {
                 "adjustableDate" : {
+                  "unadjustedDate" : "2004-03-23",
                   "meta" : {
                     "globalKey" : "3ea0d7"
-                  },
-                  "unadjustedDate" : "2004-03-23"
+                  }
                 },
                 "meta" : {
                   "globalKey" : "3ea0d7"
                 }
               },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2009-03-20",
+                  "meta" : {
+                    "globalKey" : "3ec8d4"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3ec8d4"
+                }
+              },
               "payout" : {
-                "creditDefaultPayout" : {
+                "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "generalTerms" : {
-                    "indexReferenceInformation" : {
-                      "indexName" : {
-                        "value" : "Dow Jones CDX NA IG.2"
-                      },
-                      "indexAnnexDate" : "2004-07-06",
-                      "indexAnnexSource" : {
-                        "value" : "PUBLISHER"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
                       },
-                      "indexSeries" : 2,
                       "meta" : {
-                        "globalKey" : "92a91d81"
+                        "globalKey" : "0"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "c762cfa0"
+                    "globalKey" : "5a5ff79f"
                   }
-                },
-                "interestRatePayout" : [ {
+                } ],
+                "creditDefaultPayout" : {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "5a5ff79f"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
+                  "generalTerms" : {
+                    "indexReferenceInformation" : {
+                      "indexName" : {
+                        "value" : "Dow Jones CDX NA IG.2"
                       },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
+                      "indexSeries" : 2,
+                      "indexAnnexDate" : "2004-07-06",
+                      "indexAnnexSource" : {
+                        "value" : "Publisher"
+                      },
+                      "meta" : {
+                        "globalKey" : "53b8689"
                       }
                     }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "a049273f"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3ec8d4"
                   },
-                  "unadjustedDate" : "2009-03-20"
+                  "meta" : {
+                    "globalKey" : "39f538a8"
+                  }
                 },
                 "meta" : {
-                  "globalKey" : "3ec8d4"
+                  "globalKey" : "383edb69"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "2933c1d7"
+              "globalKey" : "ed169df"
             }
           },
           "meta" : {
-            "globalKey" : "2933c1d7"
+            "globalKey" : "ed169df"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "56a5905f"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.006,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 0.006,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "2ebbcc83"
-            },
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "7e0c7b81"
+            }
+          }, {
+            "quantity" : [ {
               "value" : {
+                "value" : 25000000,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 25000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "a8bdc3dd"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "4caf4c44",
+            "externalReference" : "party2"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "349a498c",
+            "externalReference" : "party1"
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3ea858"
-        },
-        "value" : "2005-01-24"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "54930084UKLVMY22DS16",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-            },
-            "value" : "56323"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "121d7965"
           }
         } ],
-        "issuer" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
-          },
-          "value" : "1031234567"
+        "name" : {
+          "value" : "Party A"
         },
         "meta" : {
-          "globalKey" : "84d7eae5"
+          "globalKey" : "349a498c",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "48750084UKLVTR22DS78",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "de31bddc"
+          }
+        } ],
+        "name" : {
+          "value" : "Party B"
         },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
+        "meta" : {
+          "globalKey" : "4caf4c44",
+          "externalKey" : "party2"
+        }
+      } ],
+      "contractDetails" : {
+        "documentation" : [ {
+          "agreementDate" : "2004-10-18",
+          "legalAgreementIdentification" : {
+            "agreementName" : {
+              "agreementType" : "MasterConfirmation",
+              "masterConfirmationType" : {
+                "value" : "DJ.CDX.NA"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "ae7fb3d4"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "ae7fb3d4"
+        }
+      },
+      "meta" : {
+        "globalKey" : "80c60e0e"
+      }
     },
     "transferHistory" : [ {
-      "meta" : {
-        "globalKey" : "2e32cae0"
-      },
       "transfer" : {
-        "payerReceiver" : {
-          "payerPartyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "490e5f44"
-          },
-          "receiverPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "7cec034c"
-          }
-        },
         "quantity" : {
+          "value" : 16000,
           "unit" : {
             "currency" : {
               "value" : "USD"
             }
+          }
+        },
+        "payerReceiver" : {
+          "payerPartyReference" : {
+            "globalReference" : "4caf4c44",
+            "externalReference" : "party2"
           },
-          "value" : 16000
+          "receiverPartyReference" : {
+            "globalReference" : "349a498c",
+            "externalReference" : "party1"
+          }
         },
         "transferExpression" : {
-          "priceTransfer" : "UPFRONT"
+          "priceTransfer" : "Upfront"
+        }
+      },
+      "meta" : {
+        "globalKey" : "301d4bc"
+      }
+    } ],
+    "observationHistory" : [ {
+      "creditEvent" : {
+        "creditEventType" : "Bankruptcy",
+        "eventDeterminationDate" : "2022-02-04",
+        "auctionDate" : "2022-03-03",
+        "referenceInformation" : {
+          "referenceEntity" : {
+            "entityId" : [ {
+              "value" : "UE2136O97NLB5BYP9H04"
+            } ],
+            "name" : {
+              "value" : "McDonald's Corporation"
+            },
+            "meta" : {
+              "globalKey" : "17442720"
+            }
+          },
+          "noReferenceObligation" : true
+        }
+      }
+    }, {
+      "creditEvent" : {
+        "creditEventType" : "FailureToPay",
+        "eventDeterminationDate" : "2023-02-04",
+        "auctionDate" : "2023-03-03",
+        "referenceInformation" : {
+          "referenceEntity" : {
+            "entityId" : [ {
+              "value" : "UE2136O97NLB5BYP9H04"
+            } ],
+            "name" : {
+              "value" : "McDonald's Corporation"
+            },
+            "meta" : {
+              "globalKey" : "17442720"
+            }
+          },
+          "noReferenceObligation" : true
         }
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "7653a46a"
+    }
   } ],
-  "eventQualifier" : "CreditEventDetermined",
   "meta" : {
-    "globalKey" : "572e6e5a"
+    "globalKey" : "6645766e"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-basis-swap-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-basis-swap-func-output.json
index b2f011f4c5..399d406a41 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-basis-swap-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-basis-swap-func-output.json
@@ -3,247 +3,83 @@
   "instruction" : [ {
     "primitiveInstruction" : {
       "execution" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "27b20a6a"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "cc892602"
-          },
-          "role" : "PARTY_2"
-        } ],
-        "parties" : [ {
-          "meta" : {
-            "externalKey" : "party1",
-            "globalKey" : "27b20a6a"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
-              },
-              "value" : "COUNTERPARTY"
-            },
-            "meta" : {
-              "globalKey" : "27b20a6a"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party2",
-            "globalKey" : "cc892602"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
-              },
-              "value" : "LCHLGB22XXX"
-            },
-            "meta" : {
-              "globalKey" : "cc892602"
-            }
-          } ]
-        } ],
-        "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "e1baed04"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "76074b0b"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-2"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "CAD-BA-CDOR"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 3
-                }
-              }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "CAD"
-                }
-              },
-              "value" : 634000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "76391948"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "76074b09"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "CAD-BA-CDOR"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 1
-                }
-              }
-            }
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "CAD"
-                }
-              },
-              "value" : 0.00121,
-              "arithmeticOperator" : "ADD",
-              "perUnitOf" : {
-                "currency" : {
-                  "value" : "CAD"
-                }
-              },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "CAD"
-                }
-              },
-              "value" : 634000000
-            }
-          } ]
-        } ],
         "product" : {
           "contractualProduct" : {
-            "productIdentifier" : [ {
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                  },
-                  "value" : "InterestRate:IRSwap:Basis"
-                },
-                "meta" : {
-                  "globalKey" : "1d6b2aa0"
-                },
-                "source" : "OTHER"
-              }
-            } ],
             "productTaxonomy" : [ {
               "primaryAssetClass" : {
+                "value" : "InterestRate",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-                },
-                "value" : "INTEREST_RATE"
+                }
               }
             }, {
               "source" : "ISDA",
               "value" : {
                 "name" : {
+                  "value" : "InterestRate:IRSwap:Basis",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                  },
-                  "value" : "InterestRate:IRSwap:Basis"
+                  }
                 }
               }
             }, {
               "source" : "ISDA",
               "productQualifier" : "InterestRate_IRSwap_Basis"
             } ],
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "InterestRate:IRSwap:Basis",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                  }
+                },
+                "source" : "Other",
+                "meta" : {
+                  "globalKey" : "1d6b2aa0"
+                }
+              }
+            } ],
             "economicTerms" : {
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCenter" : [ {
-                          "value" : "CATO"
-                        } ],
-                        "meta" : {
-                          "globalKey" : "1f7359"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-2"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "365a772a"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "80f3fcc7"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "IMMCAD"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/365.FIXED"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2020-12-14",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "CATO"
@@ -252,29 +88,23 @@
                               "globalKey" : "1f7359"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365a772a"
                           }
                         },
                         "meta" : {
                           "globalKey" : "56fd0cdc"
-                        },
-                        "unadjustedDate" : "2020-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "56fd0cdc"
                       }
                     },
-                    "firstRegularPeriodStartDate" : "2021-03-15",
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates1",
-                      "globalKey" : "bbe81c92"
-                    },
-                    "stubPeriodType" : "LONG_INITIAL",
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2022-12-19",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "CATO"
@@ -283,34 +113,20 @@
                               "globalKey" : "1f7359"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365a772a"
                           }
                         },
                         "meta" : {
                           "globalKey" : "ad0f37f7"
-                        },
-                        "unadjustedDate" : "2022-12-19"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ad0f37f7"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/365.FIXED"
-                  },
-                  "meta" : {
-                    "globalKey" : "ca0085fb"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "externalKey" : "paymentDates1",
-                      "globalKey" : "c17da7c6"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CATO"
@@ -319,43 +135,66 @@
                           "globalKey" : "1f7359"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365a772a"
                       }
                     },
-                    "paymentFrequency" : {
+                    "firstRegularPeriodStartDate" : "2021-03-15",
+                    "stubPeriodType" : "LongInitial",
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "956"
+                        "globalKey" : "80f2eff3"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                      "rollConvention" : "IMMCAD"
+                    },
+                    "meta" : {
+                      "globalKey" : "ccdefd78",
+                      "externalKey" : "floatingCalcPeriodDates1"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-2"
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCenter" : [ {
+                          "value" : "CATO"
+                        } ],
+                        "meta" : {
+                          "globalKey" : "1f7359"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "365a772a"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "f05eae9a",
+                      "externalKey" : "paymentDates1"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates1",
-                      "globalReference" : "bbe81c92"
+                      "globalReference" : "ccdefd78",
+                      "externalReference" : "floatingCalcPeriodDates1"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "3bafa20d"
+                        "globalKey" : "b1077415"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
+                      "businessDayConvention" : "PRECEDING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CATO"
@@ -364,17 +203,20 @@
                           "globalKey" : "1f7359"
                         }
                       },
-                      "businessDayConvention" : "PRECEDING",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates1",
-                        "globalReference" : "7720bc0c"
+                        "globalReference" : "144154c2",
+                        "externalReference" : "resetDates1"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates1",
-                      "globalKey" : "7720bc0c"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CATO"
@@ -383,62 +225,64 @@
                           "globalKey" : "1f7359"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365a772a"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "144154c2",
+                      "externalKey" : "resetDates1"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "18bcd3b7"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      }
-                    }
-                  },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCenter" : [ {
-                          "value" : "CATO"
-                        } ],
-                        "meta" : {
-                          "globalKey" : "1f7359"
+                        "value" : "quantity-2"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        }
+                      },
+                      "spreadSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "365a772a"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "80f3fc89"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "IMMCAD"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/365.FIXED"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2020-12-14",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "CATO"
@@ -447,29 +291,23 @@
                               "globalKey" : "1f7359"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365a772a"
                           }
                         },
                         "meta" : {
                           "globalKey" : "56fd0cdc"
-                        },
-                        "unadjustedDate" : "2020-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "56fd0cdc"
                       }
                     },
-                    "firstRegularPeriodStartDate" : "2021-01-18",
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates2",
-                      "globalKey" : "362f2a17"
-                    },
-                    "stubPeriodType" : "LONG_INITIAL",
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2022-12-19",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "CATO"
@@ -478,36 +316,20 @@
                               "globalKey" : "1f7359"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365a772a"
                           }
                         },
                         "meta" : {
                           "globalKey" : "ad0f37f7"
-                        },
-                        "unadjustedDate" : "2022-12-19"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ad0f37f7"
                       }
-                    }
-                  },
-                  "compoundingMethod" : "FLAT",
-                  "dayCountFraction" : {
-                    "value" : "ACT/365.FIXED"
-                  },
-                  "meta" : {
-                    "globalKey" : "150ee253"
-                  },
-                  "paymentDates" : {
-                    "firstPaymentDate" : "2021-03-15",
-                    "meta" : {
-                      "externalKey" : "paymentDates2",
-                      "globalKey" : "992df7d7"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CATO"
@@ -516,51 +338,67 @@
                           "globalKey" : "1f7359"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365a772a"
                       }
                     },
-                    "paymentFrequency" : {
+                    "firstRegularPeriodStartDate" : "2021-01-18",
+                    "stubPeriodType" : "LongInitial",
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "956"
+                        "globalKey" : "80f2e871"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                      "rollConvention" : "IMMCAD"
+                    },
+                    "meta" : {
+                      "globalKey" : "d049c7b9",
+                      "externalKey" : "floatingCalcPeriodDates2"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "firstPaymentDate" : "2021-03-15",
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCenter" : [ {
+                          "value" : "CATO"
+                        } ],
+                        "meta" : {
+                          "globalKey" : "1f7359"
                         }
                       },
-                      "spreadSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
+                      "meta" : {
+                        "globalKey" : "365a772a"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "c80efeab",
+                      "externalKey" : "paymentDates2"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates2",
-                      "globalReference" : "362f2a17"
+                      "globalReference" : "d049c7b9",
+                      "externalReference" : "floatingCalcPeriodDates2"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "3bafa20e"
+                        "globalKey" : "b1077416"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
+                      "businessDayConvention" : "PRECEDING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CATO"
@@ -569,17 +407,20 @@
                           "globalKey" : "1f7359"
                         }
                       },
-                      "businessDayConvention" : "PRECEDING",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates2",
-                        "globalReference" : "c9bbc5c5"
+                        "globalReference" : "fb7dbabf",
+                        "externalReference" : "resetDates2"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates2",
-                      "globalKey" : "c9bbc5c5"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "6c"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CATO"
@@ -588,200 +429,325 @@
                           "globalKey" : "1f7359"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365a772a"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "954"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 1
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "fb7dbabf",
+                      "externalKey" : "resetDates2"
+                    }
+                  },
+                  "compoundingMethod" : "Flat",
+                  "meta" : {
+                    "globalKey" : "680d94f"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "3e9ad18e"
+                  "globalKey" : "834ec746"
+                }
+              }
+            },
+            "meta" : {
+              "globalKey" : "8cf292ed"
+            }
+          },
+          "meta" : {
+            "globalKey" : "8cf292ed"
+          }
+        },
+        "priceQuantity" : [ {
+          "quantity" : [ {
+            "value" : {
+              "value" : 634000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "CAD"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "CAD-BA-CDOR"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 3,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-2"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "4ae10981"
+            }
+          },
+          "meta" : {
+            "globalKey" : "30cdb530"
+          }
+        }, {
+          "price" : [ {
+            "value" : {
+              "value" : 0.00121,
+              "unit" : {
+                "currency" : {
+                  "value" : "CAD"
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "CAD"
+                }
+              },
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 634000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "CAD"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "CAD-BA-CDOR"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 1,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "4ae101ff"
+            }
+          },
+          "meta" : {
+            "globalKey" : "35350988"
+          }
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "27b20a6a",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "cc892602",
+            "externalReference" : "party2"
+          }
+        } ],
+        "parties" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "COUNTERPARTY",
+              "meta" : {
+                "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
+              }
+            },
+            "meta" : {
+              "globalKey" : "27b20a6a"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "27b20a6a",
+            "externalKey" : "party1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "LCHLGB22XXX",
+              "meta" : {
+                "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
               }
             },
             "meta" : {
-              "globalKey" : "50e8d987"
+              "globalKey" : "cc892602"
             }
-          },
+          } ],
           "meta" : {
-            "globalKey" : "50e8d987"
+            "globalKey" : "cc892602",
+            "externalKey" : "party2"
           }
-        },
+        } ],
         "tradeDate" : {
+          "value" : "2017-12-18",
           "meta" : {
             "globalKey" : "3f0b12"
-          },
-          "value" : "2017-12-18"
+          }
         },
         "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "cc892602",
+            "externalReference" : "party2"
+          },
           "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "LCH00023323008",
               "meta" : {
                 "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/trade-id"
-              },
-              "value" : "LCH00023323008"
+              }
             },
             "version" : 1
           } ],
-          "issuerReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "cc892602"
-          },
           "meta" : {
-            "globalKey" : "62392b73"
+            "globalKey" : "506da433"
           }
         } ]
       }
     }
   } ],
+  "eventQualifier" : "Execution",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "7b1c3a5d"
-    },
-    "state" : {
-      "positionState" : "EXECUTED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "2f87c54c"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "27b20a6a"
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "cc892602",
+          "externalReference" : "party2"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "LCH00023323008",
             "meta" : {
-              "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
-            },
-            "value" : "COUNTERPARTY"
+              "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/trade-id"
+            }
           },
-          "meta" : {
-            "globalKey" : "27b20a6a"
-          }
-        } ]
-      }, {
+          "version" : 1
+        } ],
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "cc892602"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
-            },
-            "value" : "LCHLGB22XXX"
-          },
-          "meta" : {
-            "globalKey" : "cc892602"
-          }
-        } ]
+          "globalKey" : "506da433"
+        }
       } ],
+      "tradeDate" : {
+        "value" : "2017-12-18",
+        "meta" : {
+          "globalKey" : "3f0b12"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "27b20a6a"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "cc892602"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
-            "productIdentifier" : [ {
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                  },
-                  "value" : "InterestRate:IRSwap:Basis"
-                },
-                "meta" : {
-                  "globalKey" : "1d6b2aa0"
-                },
-                "source" : "OTHER"
-              }
-            } ],
             "productTaxonomy" : [ {
               "primaryAssetClass" : {
+                "value" : "InterestRate",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-                },
-                "value" : "INTEREST_RATE"
+                }
               }
             }, {
               "source" : "ISDA",
               "value" : {
                 "name" : {
+                  "value" : "InterestRate:IRSwap:Basis",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                  },
-                  "value" : "InterestRate:IRSwap:Basis"
+                  }
                 }
               }
             }, {
               "source" : "ISDA",
               "productQualifier" : "InterestRate_IRSwap_Basis"
             } ],
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "InterestRate:IRSwap:Basis",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                  }
+                },
+                "source" : "Other",
+                "meta" : {
+                  "globalKey" : "1d6b2aa0"
+                }
+              }
+            } ],
             "economicTerms" : {
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCenter" : [ {
-                          "value" : "CATO"
-                        } ],
-                        "meta" : {
-                          "globalKey" : "1f7359"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-2"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "365a772a"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "80f3fcc7"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "IMMCAD"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/365.FIXED"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2020-12-14",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "CATO"
@@ -790,29 +756,23 @@
                               "globalKey" : "1f7359"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365a772a"
                           }
                         },
                         "meta" : {
                           "globalKey" : "56fd0cdc"
-                        },
-                        "unadjustedDate" : "2020-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "56fd0cdc"
                       }
                     },
-                    "firstRegularPeriodStartDate" : "2021-03-15",
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates1",
-                      "globalKey" : "bbe81c92"
-                    },
-                    "stubPeriodType" : "LONG_INITIAL",
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2022-12-19",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "CATO"
@@ -821,34 +781,20 @@
                               "globalKey" : "1f7359"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365a772a"
                           }
                         },
                         "meta" : {
                           "globalKey" : "ad0f37f7"
-                        },
-                        "unadjustedDate" : "2022-12-19"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ad0f37f7"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/365.FIXED"
-                  },
-                  "meta" : {
-                    "globalKey" : "ca0085fb"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "externalKey" : "paymentDates1",
-                      "globalKey" : "c17da7c6"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CATO"
@@ -857,43 +803,66 @@
                           "globalKey" : "1f7359"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365a772a"
                       }
                     },
-                    "paymentFrequency" : {
+                    "firstRegularPeriodStartDate" : "2021-03-15",
+                    "stubPeriodType" : "LongInitial",
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "956"
+                        "globalKey" : "80f2eff3"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                      "rollConvention" : "IMMCAD"
+                    },
+                    "meta" : {
+                      "globalKey" : "ccdefd78",
+                      "externalKey" : "floatingCalcPeriodDates1"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-2"
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCenter" : [ {
+                          "value" : "CATO"
+                        } ],
+                        "meta" : {
+                          "globalKey" : "1f7359"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "365a772a"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "f05eae9a",
+                      "externalKey" : "paymentDates1"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates1",
-                      "globalReference" : "bbe81c92"
+                      "globalReference" : "ccdefd78",
+                      "externalReference" : "floatingCalcPeriodDates1"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "3bafa20d"
+                        "globalKey" : "b1077415"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
+                      "businessDayConvention" : "PRECEDING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CATO"
@@ -902,17 +871,20 @@
                           "globalKey" : "1f7359"
                         }
                       },
-                      "businessDayConvention" : "PRECEDING",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates1",
-                        "globalReference" : "7720bc0c"
+                        "globalReference" : "144154c2",
+                        "externalReference" : "resetDates1"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates1",
-                      "globalKey" : "7720bc0c"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CATO"
@@ -921,62 +893,64 @@
                           "globalKey" : "1f7359"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365a772a"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "144154c2",
+                      "externalKey" : "resetDates1"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "18bcd3b7"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCenter" : [ {
-                          "value" : "CATO"
-                        } ],
-                        "meta" : {
-                          "globalKey" : "1f7359"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
-                      "meta" : {
-                        "globalKey" : "365a772a"
-                      }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "80f3fc89"
+                      "spreadSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "IMMCAD"
-                    },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/365.FIXED"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2020-12-14",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "CATO"
@@ -985,29 +959,23 @@
                               "globalKey" : "1f7359"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365a772a"
                           }
                         },
                         "meta" : {
                           "globalKey" : "56fd0cdc"
-                        },
-                        "unadjustedDate" : "2020-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "56fd0cdc"
                       }
                     },
-                    "firstRegularPeriodStartDate" : "2021-01-18",
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates2",
-                      "globalKey" : "362f2a17"
-                    },
-                    "stubPeriodType" : "LONG_INITIAL",
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2022-12-19",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "CATO"
@@ -1016,36 +984,20 @@
                               "globalKey" : "1f7359"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365a772a"
                           }
                         },
                         "meta" : {
                           "globalKey" : "ad0f37f7"
-                        },
-                        "unadjustedDate" : "2022-12-19"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ad0f37f7"
                       }
-                    }
-                  },
-                  "compoundingMethod" : "FLAT",
-                  "dayCountFraction" : {
-                    "value" : "ACT/365.FIXED"
-                  },
-                  "meta" : {
-                    "globalKey" : "150ee253"
-                  },
-                  "paymentDates" : {
-                    "firstPaymentDate" : "2021-03-15",
-                    "meta" : {
-                      "externalKey" : "paymentDates2",
-                      "globalKey" : "992df7d7"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CATO"
@@ -1054,51 +1006,67 @@
                           "globalKey" : "1f7359"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365a772a"
                       }
                     },
-                    "paymentFrequency" : {
+                    "firstRegularPeriodStartDate" : "2021-01-18",
+                    "stubPeriodType" : "LongInitial",
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "956"
+                        "globalKey" : "80f2e871"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                      "rollConvention" : "IMMCAD"
+                    },
+                    "meta" : {
+                      "globalKey" : "d049c7b9",
+                      "externalKey" : "floatingCalcPeriodDates2"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "firstPaymentDate" : "2021-03-15",
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCenter" : [ {
+                          "value" : "CATO"
+                        } ],
+                        "meta" : {
+                          "globalKey" : "1f7359"
                         }
                       },
-                      "spreadSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
+                      "meta" : {
+                        "globalKey" : "365a772a"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "c80efeab",
+                      "externalKey" : "paymentDates2"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates2",
-                      "globalReference" : "362f2a17"
+                      "globalReference" : "d049c7b9",
+                      "externalReference" : "floatingCalcPeriodDates2"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "3bafa20e"
+                        "globalKey" : "b1077416"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
+                      "businessDayConvention" : "PRECEDING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CATO"
@@ -1107,17 +1075,20 @@
                           "globalKey" : "1f7359"
                         }
                       },
-                      "businessDayConvention" : "PRECEDING",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates2",
-                        "globalReference" : "c9bbc5c5"
+                        "globalReference" : "fb7dbabf",
+                        "externalReference" : "resetDates2"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates2",
-                      "globalKey" : "c9bbc5c5"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "6c"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CATO"
@@ -1126,179 +1097,208 @@
                           "globalKey" : "1f7359"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365a772a"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "954"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 1
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "fb7dbabf",
+                      "externalKey" : "resetDates2"
+                    }
+                  },
+                  "compoundingMethod" : "Flat",
+                  "meta" : {
+                    "globalKey" : "680d94f"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "3e9ad18e"
+                  "globalKey" : "834ec746"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "50e8d987"
+              "globalKey" : "8cf292ed"
             }
           },
           "meta" : {
-            "globalKey" : "50e8d987"
+            "globalKey" : "8cf292ed"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "e1baed04"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "76074b0b"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-2"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "CAD-BA-CDOR"
-                  },
-                  "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+            "quantity" : [ {
+              "value" : {
+                "value" : 634000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "CAD"
                   }
                 }
-              }
-            },
-            "quantity" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "CAD"
-                  }
-                },
-                "value" : 634000000
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "76391948"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "76074b09"
-              },
               "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
                 "value" : {
                   "floatingRateIndex" : {
                     "value" : "CAD-BA-CDOR"
                   },
                   "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 3,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-2"
+                  } ]
                 }
+              },
+              "meta" : {
+                "globalKey" : "4ae10981"
               }
             },
+            "meta" : {
+              "globalKey" : "30cdb530"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.00121,
                 "unit" : {
                   "currency" : {
                     "value" : "CAD"
                   }
                 },
-                "value" : 0.00121,
-                "arithmeticOperator" : "ADD",
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "CAD"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate",
+                "arithmeticOperator" : "Add"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 634000000,
                 "unit" : {
                   "currency" : {
                     "value" : "CAD"
                   }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "CAD-BA-CDOR"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  }
                 },
-                "value" : 634000000
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "4ae101ff"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "35350988"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "27b20a6a",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "cc892602",
+            "externalReference" : "party2"
+          }
         } ]
       },
-      "tradeDate" : {
+      "party" : [ {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "COUNTERPARTY",
+            "meta" : {
+              "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
+            }
+          },
+          "meta" : {
+            "globalKey" : "27b20a6a"
+          }
+        } ],
         "meta" : {
-          "globalKey" : "3f0b12"
-        },
-        "value" : "2017-12-18"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+          "globalKey" : "27b20a6a",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "LCHLGB22XXX",
             "meta" : {
-              "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/trade-id"
-            },
-            "value" : "LCH00023323008"
+              "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
+            }
           },
-          "version" : 1
+          "meta" : {
+            "globalKey" : "cc892602"
+          }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "cc892602"
-        },
         "meta" : {
-          "globalKey" : "62392b73"
+          "globalKey" : "cc892602",
+          "externalKey" : "party2"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "4ce38faa"
+      }
+    },
+    "state" : {
+      "positionState" : "Executed"
+    },
+    "meta" : {
+      "globalKey" : "4aaa34b9"
     }
   } ],
-  "eventQualifier" : "Execution",
   "meta" : {
-    "globalKey" : "e98aa1f5"
+    "globalKey" : "e69145c3"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-credit-default-swap-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-credit-default-swap-func-output.json
index 602d2aa6d9..5913391771 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-credit-default-swap-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-credit-default-swap-func-output.json
@@ -3,130 +3,6 @@
   "instruction" : [ {
     "primitiveInstruction" : {
       "execution" : {
-        "ancillaryParty" : [ {
-          "partyReference" : [ {
-            "externalReference" : "f845ge",
-            "globalReference" : "8e1db6b4"
-          } ],
-          "role" : "CALCULATION_AGENT_INDEPENDENT"
-        } ],
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "f845ge",
-            "globalReference" : "8e1db6b4"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "rsf765",
-            "globalReference" : "21f24e14"
-          },
-          "role" : "PARTY_2"
-        } ],
-        "parties" : [ {
-          "meta" : {
-            "externalKey" : "f845ge",
-            "globalKey" : "8e1db6b4"
-          },
-          "name" : {
-            "value" : "XYZ Bank"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-              },
-              "value" : "XYZBICXXX"
-            },
-            "identifierType" : "BIC",
-            "meta" : {
-              "globalKey" : "26482791"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "rsf765",
-            "globalKey" : "21f24e14"
-          },
-          "name" : {
-            "value" : "ABC Bank"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-              },
-              "value" : "ABCBICXXX"
-            },
-            "identifierType" : "BIC",
-            "meta" : {
-              "globalKey" : "be37d39a"
-            }
-          } ]
-        } ],
-        "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a7b31de6"
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "JPY"
-                }
-              },
-              "value" : 0.007,
-              "perUnitOf" : {
-                "currency" : {
-                  "value" : "JPY"
-                }
-              },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "JPY"
-                }
-              },
-              "value" : 500000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d74a447e"
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "JPY"
-                }
-              },
-              "value" : 500000000
-            }
-          } ]
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -134,13 +10,54 @@
               "productQualifier" : "CreditDefaultSwap_SingleName"
             } ],
             "economicTerms" : {
-              "calculationAgent" : {
-                "calculationAgentBusinessCenter" : {
-                  "value" : "GBLO"
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2002-12-05",
+                  "dateAdjustments" : {
+                    "businessDayConvention" : "NONE",
+                    "meta" : {
+                      "globalKey" : "24a738"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "eb0a8cfd"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb0a8cfd"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2007-12-05",
+                  "dateAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "JPTO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "81e56a96"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "58681de7"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "28faf882"
+                  }
                 },
-                "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+                "meta" : {
+                  "globalKey" : "28faf882"
+                }
               },
               "dateAdjustments" : {
+                "businessDayConvention" : "MODFOLLOWING",
                 "businessCenters" : {
                   "businessCenter" : [ {
                     "value" : "GBLO"
@@ -153,84 +70,130 @@
                     "globalKey" : "81e56a96"
                   }
                 },
-                "businessDayConvention" : "MODFOLLOWING",
                 "meta" : {
                   "globalKey" : "58681de7"
                 }
               },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "dateAdjustments" : {
-                    "businessDayConvention" : "NONE",
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "24a738"
+                      "globalKey" : "0"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "eb0a8cfd"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
                   },
-                  "unadjustedDate" : "2002-12-05"
-                },
-                "meta" : {
-                  "globalKey" : "eb0a8cfd"
-                }
-              },
-              "payout" : {
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "204c"
+                      },
+                      "rollConvention" : "5"
+                    },
+                    "meta" : {
+                      "globalKey" : "204c"
+                    }
+                  },
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "firstPaymentDate" : "2003-03-05",
+                    "meta" : {
+                      "globalKey" : "7473f5c5"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "c3ce76f8"
+                  }
+                } ],
                 "creditDefaultPayout" : {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
                   "settlementTerms" : {
-                    "meta" : {
-                      "globalKey" : "45e0d7b2"
-                    },
+                    "settlementType" : "Physical",
                     "settlementCurrency" : {
                       "value" : "JPY"
                     },
-                    "settlementType" : "PHYSICAL",
+                    "meta" : {
+                      "globalKey" : "5f4774ca"
+                    },
                     "physicalSettlementTerms" : {
+                      "physicalSettlementPeriod" : {
+                        "businessDays" : 30
+                      },
                       "deliverableObligations" : {
                         "accruedInterest" : false,
+                        "category" : "BondOrLoan",
+                        "notSubordinated" : true,
+                        "specifiedCurrency" : {
+                          "applicable" : true
+                        },
+                        "notContingent" : true,
                         "assignableLoan" : {
                           "applicable" : true
                         },
-                        "category" : "BOND_OR_LOAN",
                         "consentRequiredLoan" : {
                           "applicable" : true
                         },
+                        "transferable" : true,
                         "maximumMaturity" : {
-                          "meta" : {
-                            "globalKey" : "ae5"
-                          },
+                          "periodMultiplier" : 30,
                           "period" : "Y",
-                          "periodMultiplier" : 30
-                        },
-                        "notBearer" : true,
-                        "notContingent" : true,
-                        "notSubordinated" : true,
-                        "specifiedCurrency" : {
-                          "applicable" : true
+                          "meta" : {
+                            "globalKey" : "3fb"
+                          }
                         },
-                        "transferable" : true
+                        "notBearer" : true
                       },
                       "escrow" : true,
                       "meta" : {
-                        "globalKey" : "237559c8"
-                      },
-                      "physicalSettlementPeriod" : {
-                        "businessDays" : 30
+                        "globalKey" : "3cdbf6e0"
                       }
                     }
                   },
@@ -238,321 +201,313 @@
                     "referenceInformation" : {
                       "referenceEntity" : {
                         "entityId" : [ {
+                          "value" : "004CC9",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                          },
-                          "value" : "004CC9"
+                          }
                         } ],
-                        "meta" : {
-                          "externalKey" : "fhjgt43",
-                          "globalKey" : "e414546d"
-                        },
                         "name" : {
                           "value" : "ACOM CO., LTD."
+                        },
+                        "meta" : {
+                          "globalKey" : "e414546d",
+                          "externalKey" : "fhjgt43"
                         }
                       },
                       "referenceObligation" : [ {
-                        "primaryObligorReference" : {
-                          "externalReference" : "fhjgt43",
-                          "globalReference" : "e414546d"
-                        },
                         "security" : {
                           "productIdentifier" : [ {
                             "value" : {
                               "identifier" : {
+                                "value" : "JP310860A032",
                                 "meta" : {
                                   "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                                },
-                                "value" : "JP310860A032"
+                                }
                               },
+                              "source" : "ISIN",
                               "meta" : {
                                 "globalKey" : "b94feaa3"
-                              },
-                              "source" : "ISIN"
+                              }
                             }
                           } ],
-                          "securityType" : "DEBT"
+                          "securityType" : "Debt"
+                        },
+                        "primaryObligorReference" : {
+                          "globalReference" : "e414546d",
+                          "externalReference" : "fhjgt43"
                         }
                       } ],
                       "referencePrice" : {
+                        "value" : 1,
                         "unit" : {
                           "currency" : {
                             "value" : "JPY"
                           }
                         },
-                        "value" : 1,
                         "perUnitOf" : {
                           "currency" : {
                             "value" : "JPY"
                           }
                         },
-                        "priceType" : "ASSET_PRICE"
+                        "priceType" : "AssetPrice"
                       }
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "76347e3d"
-                  },
                   "protectionTerms" : [ {
                     "creditEvents" : {
                       "bankruptcy" : true,
-                      "creditEventNotice" : {
-                        "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                        "publiclyAvailableInformation" : {
-                          "specifiedNumber" : 2,
-                          "standardPublicSources" : true
-                        }
-                      },
-                      "defaultRequirement" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "JPY"
-                          }
-                        },
-                        "value" : 1000000000,
-                        "meta" : {
-                          "globalKey" : "57e64854"
-                        }
-                      },
                       "failureToPay" : {
                         "applicable" : true,
                         "paymentRequirement" : {
+                          "value" : 100000000,
                           "unit" : {
                             "currency" : {
                               "value" : "JPY"
                             }
                           },
-                          "value" : 100000000,
                           "meta" : {
                             "globalKey" : "b883af02"
                           }
                         }
                       },
-                      "meta" : {
-                        "globalKey" : "28728bbd"
-                      },
                       "restructuring" : {
                         "applicable" : true,
                         "restructuringType" : {
                           "value" : "R"
                         }
+                      },
+                      "defaultRequirement" : {
+                        "value" : 1000000000,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "JPY"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "57e64854"
+                        }
+                      },
+                      "creditEventNotice" : {
+                        "notifyingParty" : [ "Party2", "Party1" ],
+                        "publiclyAvailableInformation" : {
+                          "standardPublicSources" : true,
+                          "specifiedNumber" : 2
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "8f38683"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "53d2889d"
-                    },
                     "obligations" : {
-                      "category" : "BORROWED_MONEY",
+                      "category" : "BorrowedMoney",
                       "notSubordinated" : true
-                    }
-                  } ]
-                },
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d20"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "5"
                     },
                     "meta" : {
-                      "globalKey" : "12d20"
+                      "globalKey" : "15515017"
                     }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
+                  } ],
                   "meta" : {
-                    "globalKey" : "a52eef0e"
-                  },
-                  "paymentDates" : {
-                    "firstPaymentDate" : "2003-03-05",
-                    "meta" : {
-                      "globalKey" : "7473fe71"
-                    },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    }
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
+                    "globalKey" : "4b3217ad"
                   }
-                } ],
+                },
                 "meta" : {
-                  "globalKey" : "42aaeccb"
+                  "globalKey" : "e95566a5"
                 }
               },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "dateAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "JPTO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "81e56a96"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "58681de7"
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "28faf882"
-                  },
-                  "unadjustedDate" : "2007-12-05"
-                },
-                "meta" : {
-                  "globalKey" : "28faf882"
+              "calculationAgent" : {
+                "calculationAgentParty" : "CalculationAgentIndependent",
+                "calculationAgentBusinessCenter" : {
+                  "value" : "GBLO"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "dbe24bff"
+              "globalKey" : "b552fd55"
             }
           },
           "meta" : {
-            "globalKey" : "dbe24bff"
+            "globalKey" : "b552fd55"
           }
         },
+        "priceQuantity" : [ {
+          "price" : [ {
+            "value" : {
+              "value" : 0.007,
+              "unit" : {
+                "currency" : {
+                  "value" : "JPY"
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "JPY"
+                }
+              },
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 500000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "JPY"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "4eb09eda"
+          }
+        }, {
+          "quantity" : [ {
+            "value" : {
+              "value" : 500000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "JPY"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "11fe4b42"
+          }
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "69c51ff4",
+            "externalReference" : "f845ge"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "87501c94",
+            "externalReference" : "rsf765"
+          }
+        } ],
+        "ancillaryParty" : [ {
+          "role" : "CalculationAgentIndependent",
+          "partyReference" : [ {
+            "globalReference" : "69c51ff4",
+            "externalReference" : "f845ge"
+          } ]
+        } ],
+        "parties" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "XYZBICXXX",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+              }
+            },
+            "identifierType" : "BIC",
+            "meta" : {
+              "globalKey" : "26482791"
+            }
+          } ],
+          "name" : {
+            "value" : "XYZ Bank"
+          },
+          "meta" : {
+            "globalKey" : "69c51ff4",
+            "externalKey" : "f845ge"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "ABCBICXXX",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+              }
+            },
+            "identifierType" : "BIC",
+            "meta" : {
+              "globalKey" : "be37d39a"
+            }
+          } ],
+          "name" : {
+            "value" : "ABC Bank"
+          },
+          "meta" : {
+            "globalKey" : "87501c94",
+            "externalKey" : "rsf765"
+          }
+        } ],
         "tradeDate" : {
+          "value" : "2002-12-04",
           "meta" : {
             "globalKey" : "3e9304"
-          },
-          "value" : "2002-12-04"
+          }
         },
         "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "69c51ff4",
+            "externalReference" : "f845ge"
+          },
           "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "RTD3ERTF37209",
               "meta" : {
                 "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-              },
-              "value" : "RTD3ERTF37209"
+              }
             },
             "version" : 1
           } ],
-          "issuerReference" : {
-            "externalReference" : "f845ge",
-            "globalReference" : "8e1db6b4"
-          },
           "meta" : {
-            "globalKey" : "efb772db"
+            "globalKey" : "7689fbab"
           }
         } ]
       }
     }
   } ],
+  "eventQualifier" : "Execution",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "4022668b"
-    },
-    "state" : {
-      "positionState" : "EXECUTED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "3b8417c"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "f845ge",
-          "globalKey" : "8e1db6b4"
-        },
-        "name" : {
-          "value" : "XYZ Bank"
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "69c51ff4",
+          "externalReference" : "f845ge"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "RTD3ERTF37209",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-            },
-            "value" : "XYZBICXXX"
+              "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+            }
           },
-          "identifierType" : "BIC",
-          "meta" : {
-            "globalKey" : "26482791"
-          }
-        } ]
-      }, {
+          "version" : 1
+        } ],
         "meta" : {
-          "externalKey" : "rsf765",
-          "globalKey" : "21f24e14"
-        },
-        "name" : {
-          "value" : "ABC Bank"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-            },
-            "value" : "ABCBICXXX"
-          },
-          "identifierType" : "BIC",
-          "meta" : {
-            "globalKey" : "be37d39a"
-          }
-        } ]
+          "globalKey" : "7689fbab"
+        }
       } ],
+      "tradeDate" : {
+        "value" : "2002-12-04",
+        "meta" : {
+          "globalKey" : "3e9304"
+        }
+      },
       "tradableProduct" : {
-        "ancillaryParty" : [ {
-          "partyReference" : [ {
-            "externalReference" : "f845ge",
-            "globalReference" : "8e1db6b4"
-          } ],
-          "role" : "CALCULATION_AGENT_INDEPENDENT"
-        } ],
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "f845ge",
-            "globalReference" : "8e1db6b4"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "rsf765",
-            "globalReference" : "21f24e14"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -560,13 +515,54 @@
               "productQualifier" : "CreditDefaultSwap_SingleName"
             } ],
             "economicTerms" : {
-              "calculationAgent" : {
-                "calculationAgentBusinessCenter" : {
-                  "value" : "GBLO"
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2002-12-05",
+                  "dateAdjustments" : {
+                    "businessDayConvention" : "NONE",
+                    "meta" : {
+                      "globalKey" : "24a738"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "eb0a8cfd"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb0a8cfd"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2007-12-05",
+                  "dateAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "JPTO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "81e56a96"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "58681de7"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "28faf882"
+                  }
                 },
-                "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+                "meta" : {
+                  "globalKey" : "28faf882"
+                }
               },
               "dateAdjustments" : {
+                "businessDayConvention" : "MODFOLLOWING",
                 "businessCenters" : {
                   "businessCenter" : [ {
                     "value" : "GBLO"
@@ -579,84 +575,130 @@
                     "globalKey" : "81e56a96"
                   }
                 },
-                "businessDayConvention" : "MODFOLLOWING",
                 "meta" : {
                   "globalKey" : "58681de7"
                 }
               },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "dateAdjustments" : {
-                    "businessDayConvention" : "NONE",
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "24a738"
+                      "globalKey" : "0"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "eb0a8cfd"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
                   },
-                  "unadjustedDate" : "2002-12-05"
-                },
-                "meta" : {
-                  "globalKey" : "eb0a8cfd"
-                }
-              },
-              "payout" : {
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "204c"
+                      },
+                      "rollConvention" : "5"
+                    },
+                    "meta" : {
+                      "globalKey" : "204c"
+                    }
+                  },
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "firstPaymentDate" : "2003-03-05",
+                    "meta" : {
+                      "globalKey" : "7473f5c5"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "c3ce76f8"
+                  }
+                } ],
                 "creditDefaultPayout" : {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
                   "settlementTerms" : {
-                    "meta" : {
-                      "globalKey" : "45e0d7b2"
-                    },
+                    "settlementType" : "Physical",
                     "settlementCurrency" : {
                       "value" : "JPY"
                     },
-                    "settlementType" : "PHYSICAL",
+                    "meta" : {
+                      "globalKey" : "5f4774ca"
+                    },
                     "physicalSettlementTerms" : {
+                      "physicalSettlementPeriod" : {
+                        "businessDays" : 30
+                      },
                       "deliverableObligations" : {
                         "accruedInterest" : false,
+                        "category" : "BondOrLoan",
+                        "notSubordinated" : true,
+                        "specifiedCurrency" : {
+                          "applicable" : true
+                        },
+                        "notContingent" : true,
                         "assignableLoan" : {
                           "applicable" : true
                         },
-                        "category" : "BOND_OR_LOAN",
                         "consentRequiredLoan" : {
                           "applicable" : true
                         },
+                        "transferable" : true,
                         "maximumMaturity" : {
-                          "meta" : {
-                            "globalKey" : "ae5"
-                          },
+                          "periodMultiplier" : 30,
                           "period" : "Y",
-                          "periodMultiplier" : 30
-                        },
-                        "notBearer" : true,
-                        "notContingent" : true,
-                        "notSubordinated" : true,
-                        "specifiedCurrency" : {
-                          "applicable" : true
+                          "meta" : {
+                            "globalKey" : "3fb"
+                          }
                         },
-                        "transferable" : true
+                        "notBearer" : true
                       },
                       "escrow" : true,
                       "meta" : {
-                        "globalKey" : "237559c8"
-                      },
-                      "physicalSettlementPeriod" : {
-                        "businessDays" : 30
+                        "globalKey" : "3cdbf6e0"
                       }
                     }
                   },
@@ -664,315 +706,273 @@
                     "referenceInformation" : {
                       "referenceEntity" : {
                         "entityId" : [ {
+                          "value" : "004CC9",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                          },
-                          "value" : "004CC9"
+                          }
                         } ],
-                        "meta" : {
-                          "externalKey" : "fhjgt43",
-                          "globalKey" : "e414546d"
-                        },
                         "name" : {
                           "value" : "ACOM CO., LTD."
+                        },
+                        "meta" : {
+                          "globalKey" : "e414546d",
+                          "externalKey" : "fhjgt43"
                         }
                       },
                       "referenceObligation" : [ {
-                        "primaryObligorReference" : {
-                          "externalReference" : "fhjgt43",
-                          "globalReference" : "e414546d"
-                        },
                         "security" : {
                           "productIdentifier" : [ {
                             "value" : {
                               "identifier" : {
+                                "value" : "JP310860A032",
                                 "meta" : {
                                   "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                                },
-                                "value" : "JP310860A032"
+                                }
                               },
+                              "source" : "ISIN",
                               "meta" : {
                                 "globalKey" : "b94feaa3"
-                              },
-                              "source" : "ISIN"
+                              }
                             }
                           } ],
-                          "securityType" : "DEBT"
+                          "securityType" : "Debt"
+                        },
+                        "primaryObligorReference" : {
+                          "globalReference" : "e414546d",
+                          "externalReference" : "fhjgt43"
                         }
                       } ],
                       "referencePrice" : {
+                        "value" : 1,
                         "unit" : {
                           "currency" : {
                             "value" : "JPY"
                           }
                         },
-                        "value" : 1,
                         "perUnitOf" : {
                           "currency" : {
                             "value" : "JPY"
                           }
                         },
-                        "priceType" : "ASSET_PRICE"
+                        "priceType" : "AssetPrice"
                       }
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "76347e3d"
-                  },
                   "protectionTerms" : [ {
                     "creditEvents" : {
                       "bankruptcy" : true,
-                      "creditEventNotice" : {
-                        "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                        "publiclyAvailableInformation" : {
-                          "specifiedNumber" : 2,
-                          "standardPublicSources" : true
-                        }
-                      },
-                      "defaultRequirement" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "JPY"
-                          }
-                        },
-                        "value" : 1000000000,
-                        "meta" : {
-                          "globalKey" : "57e64854"
-                        }
-                      },
                       "failureToPay" : {
                         "applicable" : true,
                         "paymentRequirement" : {
+                          "value" : 100000000,
                           "unit" : {
                             "currency" : {
                               "value" : "JPY"
                             }
                           },
-                          "value" : 100000000,
                           "meta" : {
                             "globalKey" : "b883af02"
                           }
                         }
                       },
-                      "meta" : {
-                        "globalKey" : "28728bbd"
-                      },
                       "restructuring" : {
                         "applicable" : true,
                         "restructuringType" : {
                           "value" : "R"
                         }
+                      },
+                      "defaultRequirement" : {
+                        "value" : 1000000000,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "JPY"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "57e64854"
+                        }
+                      },
+                      "creditEventNotice" : {
+                        "notifyingParty" : [ "Party2", "Party1" ],
+                        "publiclyAvailableInformation" : {
+                          "standardPublicSources" : true,
+                          "specifiedNumber" : 2
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "8f38683"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "53d2889d"
-                    },
                     "obligations" : {
-                      "category" : "BORROWED_MONEY",
+                      "category" : "BorrowedMoney",
                       "notSubordinated" : true
-                    }
-                  } ]
-                },
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d20"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "5"
                     },
                     "meta" : {
-                      "globalKey" : "12d20"
+                      "globalKey" : "15515017"
                     }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
+                  } ],
                   "meta" : {
-                    "globalKey" : "a52eef0e"
-                  },
-                  "paymentDates" : {
-                    "firstPaymentDate" : "2003-03-05",
-                    "meta" : {
-                      "globalKey" : "7473fe71"
-                    },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    }
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
+                    "globalKey" : "4b3217ad"
                   }
-                } ],
+                },
                 "meta" : {
-                  "globalKey" : "42aaeccb"
+                  "globalKey" : "e95566a5"
                 }
               },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "dateAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "JPTO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "81e56a96"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "58681de7"
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "28faf882"
-                  },
-                  "unadjustedDate" : "2007-12-05"
-                },
-                "meta" : {
-                  "globalKey" : "28faf882"
+              "calculationAgent" : {
+                "calculationAgentParty" : "CalculationAgentIndependent",
+                "calculationAgentBusinessCenter" : {
+                  "value" : "GBLO"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "dbe24bff"
+              "globalKey" : "b552fd55"
             }
           },
           "meta" : {
-            "globalKey" : "dbe24bff"
+            "globalKey" : "b552fd55"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "a7b31de6"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.007,
                 "unit" : {
                   "currency" : {
                     "value" : "JPY"
                   }
                 },
-                "value" : 0.007,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "JPY"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 500000000,
                 "unit" : {
                   "currency" : {
                     "value" : "JPY"
                   }
-                },
-                "value" : 500000000
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "d74a447e"
-            },
-            "quantity" : [ {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "4eb09eda"
+            }
+          }, {
+            "quantity" : [ {
               "value" : {
+                "value" : 500000000,
                 "unit" : {
                   "currency" : {
                     "value" : "JPY"
                   }
-                },
-                "value" : 500000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "11fe4b42"
+            }
+          } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "69c51ff4",
+            "externalReference" : "f845ge"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "87501c94",
+            "externalReference" : "rsf765"
+          }
+        } ],
+        "ancillaryParty" : [ {
+          "role" : "CalculationAgentIndependent",
+          "partyReference" : [ {
+            "globalReference" : "69c51ff4",
+            "externalReference" : "f845ge"
           } ]
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3e9304"
+      "party" : [ {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "XYZBICXXX",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+            }
+          },
+          "identifierType" : "BIC",
+          "meta" : {
+            "globalKey" : "26482791"
+          }
+        } ],
+        "name" : {
+          "value" : "XYZ Bank"
         },
-        "value" : "2002-12-04"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+        "meta" : {
+          "globalKey" : "69c51ff4",
+          "externalKey" : "f845ge"
+        }
+      }, {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "ABCBICXXX",
             "meta" : {
-              "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-            },
-            "value" : "RTD3ERTF37209"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+            }
           },
-          "version" : 1
+          "identifierType" : "BIC",
+          "meta" : {
+            "globalKey" : "be37d39a"
+          }
         } ],
-        "issuerReference" : {
-          "externalReference" : "f845ge",
-          "globalReference" : "8e1db6b4"
+        "name" : {
+          "value" : "ABC Bank"
         },
         "meta" : {
-          "globalKey" : "efb772db"
+          "globalKey" : "87501c94",
+          "externalKey" : "rsf765"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "e64ceb44"
+      }
+    },
+    "state" : {
+      "positionState" : "Executed"
+    },
+    "meta" : {
+      "globalKey" : "2f2b11d3"
     }
   } ],
-  "eventQualifier" : "Execution",
   "meta" : {
-    "globalKey" : "f980c38f"
+    "globalKey" : "8be6614b"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-fra-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-fra-func-output.json
index 681282f341..3b738fcf12 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-fra-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-fra-func-output.json
@@ -3,142 +3,6 @@
   "instruction" : [ {
     "primitiveInstruction" : {
       "execution" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "e1284e85"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "cff0a7d6"
-          },
-          "role" : "PARTY_2"
-        } ],
-        "parties" : [ {
-          "meta" : {
-            "externalKey" : "party1",
-            "globalKey" : "e1284e85"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "TR24TWEY5RVRQV65HD49"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e1284e85"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party2",
-            "globalKey" : "cff0a7d6"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "BFXS5XCH7N0Y05NIXW11"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "cff0a7d6"
-            }
-          } ]
-        } ],
-        "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "103bf473"
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "CHF"
-                }
-              },
-              "value" : 0.04,
-              "perUnitOf" : {
-                "currency" : {
-                  "value" : "CHF"
-                }
-              },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "CHF"
-                }
-              },
-              "value" : 25000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "434a0131"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "6a18d5cd"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "CHF-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
-              }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "CHF"
-                }
-              },
-              "value" : 25000000
-            }
-          } ]
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -149,48 +13,63 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
                     }
                   },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
                   "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
                         "adjustedDate" : {
+                          "value" : "1991-07-17",
                           "meta" : {
                             "globalKey" : "3e39d1"
-                          },
-                          "value" : "1991-07-17"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "0"
                         }
                       },
                       "meta" : {
-                        "externalKey" : "resetDate",
-                        "globalKey" : "0"
+                        "globalKey" : "0",
+                        "externalKey" : "resetDate"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
                         "adjustedDate" : {
+                          "value" : "1992-01-17",
                           "meta" : {
                             "globalKey" : "3e4051"
-                          },
-                          "value" : "1992-01-17"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "0"
@@ -199,19 +78,15 @@
                       "meta" : {
                         "globalKey" : "0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "discountingMethod" : {
-                    "discountingType" : "FRA"
-                  },
-                  "meta" : {
-                    "globalKey" : "4af42838"
-                  },
                   "paymentDate" : {
+                    "unadjustedDate" : "1991-07-17",
                     "dateAdjustments" : {
+                      "businessDayConvention" : "FOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CHZU"
@@ -220,75 +95,77 @@
                           "globalKey" : "1f8e60"
                         }
                       },
-                      "businessDayConvention" : "FOLLOWING",
                       "meta" : {
                         "globalKey" : "211caa4f"
                       }
                     },
                     "meta" : {
                       "globalKey" : "407eeb1e"
-                    },
-                    "unadjustedDate" : "1991-07-17"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
                     }
+                  },
+                  "discountingMethod" : {
+                    "discountingType" : "FRA"
+                  },
+                  "meta" : {
+                    "globalKey" : "1d9421f4"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
                   "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
                         "adjustedDate" : {
+                          "value" : "1991-07-17",
                           "meta" : {
                             "globalKey" : "3e39d1"
-                          },
-                          "value" : "1991-07-17"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "0"
                         }
                       },
                       "meta" : {
-                        "externalKey" : "resetDate",
-                        "globalKey" : "0"
+                        "globalKey" : "0",
+                        "externalKey" : "resetDate"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
                         "adjustedDate" : {
+                          "value" : "1992-01-17",
                           "meta" : {
                             "globalKey" : "3e4051"
-                          },
-                          "value" : "1992-01-17"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "0"
@@ -297,19 +174,15 @@
                       "meta" : {
                         "globalKey" : "0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "discountingMethod" : {
-                    "discountingType" : "FRA"
-                  },
-                  "meta" : {
-                    "globalKey" : "dc55f19f"
-                  },
                   "paymentDate" : {
+                    "unadjustedDate" : "1991-07-17",
                     "dateAdjustments" : {
+                      "businessDayConvention" : "FOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CHZU"
@@ -318,37 +191,23 @@
                           "globalKey" : "1f8e60"
                         }
                       },
-                      "businessDayConvention" : "FOLLOWING",
                       "meta" : {
                         "globalKey" : "211caa4f"
                       }
                     },
                     "meta" : {
                       "globalKey" : "407eeb1e"
-                    },
-                    "unadjustedDate" : "1991-07-17"
-                  },
-                  "rateSpecification" : {
-                    "floatingRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        }
-                      }
                     }
                   },
                   "resetDates" : {
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "f12537c9"
+                        "globalKey" : "ce01227d"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -357,132 +216,256 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDate",
-                        "globalReference" : "0"
+                        "globalReference" : "0",
+                        "externalReference" : "resetDate"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "f12537c9"
+                      "globalKey" : "ce01227d"
                     }
+                  },
+                  "discountingMethod" : {
+                    "discountingType" : "FRA"
+                  },
+                  "meta" : {
+                    "globalKey" : "44b30fd3"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "1579b067"
+                  "globalKey" : "842dfc5f"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "ff558920"
+              "globalKey" : "6e09d518"
             }
           },
           "meta" : {
-            "globalKey" : "ff558920"
+            "globalKey" : "6e09d518"
           }
         },
+        "priceQuantity" : [ {
+          "price" : [ {
+            "value" : {
+              "value" : 0.04,
+              "unit" : {
+                "currency" : {
+                  "value" : "CHF"
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "CHF"
+                }
+              },
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 25000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "CHF"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "f74299ed"
+          }
+        }, {
+          "quantity" : [ {
+            "value" : {
+              "value" : 25000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "CHF"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "CHF-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "d900e1e5"
+            }
+          },
+          "meta" : {
+            "globalKey" : "9965fc03"
+          }
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "e1284e85",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "cff0a7d6",
+            "externalReference" : "party2"
+          }
+        } ],
+        "parties" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "TR24TWEY5RVRQV65HD49",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e1284e85"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e1284e85",
+            "externalKey" : "party1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "BFXS5XCH7N0Y05NIXW11",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "cff0a7d6"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "cff0a7d6",
+            "externalKey" : "party2"
+          }
+        } ],
         "tradeDate" : {
+          "value" : "1991-05-14",
           "meta" : {
             "globalKey" : "3e394e"
-          },
-          "value" : "1991-05-14"
+          }
         },
         "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "e1284e85",
+            "externalReference" : "party1"
+          },
           "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "MB87623",
               "meta" : {
                 "scheme" : "http://www.hsbc.com/swaps/trade-id"
-              },
-              "value" : "MB87623"
+              }
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "e1284e85"
-          },
           "meta" : {
-            "globalKey" : "4a2efcd7"
+            "globalKey" : "1bd20f89"
           }
         }, {
+          "issuerReference" : {
+            "globalReference" : "cff0a7d6",
+            "externalReference" : "party2"
+          },
           "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "AA9876",
               "meta" : {
                 "scheme" : "http://www.abnamro.com/swaps/trade-id"
-              },
-              "value" : "AA9876"
+              }
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "cff0a7d6"
-          },
           "meta" : {
-            "globalKey" : "d1084d2c"
+            "globalKey" : "2a7370d4"
           }
         } ]
       }
     }
   } ],
+  "eventQualifier" : "Execution",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "89c43b6e"
-    },
-    "state" : {
-      "positionState" : "EXECUTED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "a96ea89f"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "e1284e85"
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "e1284e85",
+          "externalReference" : "party1"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "MB87623",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "TR24TWEY5RVRQV65HD49"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "e1284e85"
+              "scheme" : "http://www.hsbc.com/swaps/trade-id"
+            }
           }
-        } ]
-      }, {
+        } ],
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "cff0a7d6"
+          "globalKey" : "1bd20f89"
+        }
+      }, {
+        "issuerReference" : {
+          "globalReference" : "cff0a7d6",
+          "externalReference" : "party2"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "AA9876",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "BFXS5XCH7N0Y05NIXW11"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "cff0a7d6"
+              "scheme" : "http://www.abnamro.com/swaps/trade-id"
+            }
           }
-        } ]
-      } ],
-      "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "e1284e85"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "cff0a7d6"
-          },
-          "role" : "PARTY_2"
         } ],
+        "meta" : {
+          "globalKey" : "2a7370d4"
+        }
+      } ],
+      "tradeDate" : {
+        "value" : "1991-05-14",
+        "meta" : {
+          "globalKey" : "3e394e"
+        }
+      },
+      "tradableProduct" : {
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -493,48 +476,63 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
                     }
                   },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
                   "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
                         "adjustedDate" : {
+                          "value" : "1991-07-17",
                           "meta" : {
                             "globalKey" : "3e39d1"
-                          },
-                          "value" : "1991-07-17"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "0"
                         }
                       },
                       "meta" : {
-                        "externalKey" : "resetDate",
-                        "globalKey" : "0"
+                        "globalKey" : "0",
+                        "externalKey" : "resetDate"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
                         "adjustedDate" : {
+                          "value" : "1992-01-17",
                           "meta" : {
                             "globalKey" : "3e4051"
-                          },
-                          "value" : "1992-01-17"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "0"
@@ -543,19 +541,15 @@
                       "meta" : {
                         "globalKey" : "0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "discountingMethod" : {
-                    "discountingType" : "FRA"
-                  },
-                  "meta" : {
-                    "globalKey" : "4af42838"
-                  },
                   "paymentDate" : {
+                    "unadjustedDate" : "1991-07-17",
                     "dateAdjustments" : {
+                      "businessDayConvention" : "FOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CHZU"
@@ -564,75 +558,77 @@
                           "globalKey" : "1f8e60"
                         }
                       },
-                      "businessDayConvention" : "FOLLOWING",
                       "meta" : {
                         "globalKey" : "211caa4f"
                       }
                     },
                     "meta" : {
                       "globalKey" : "407eeb1e"
-                    },
-                    "unadjustedDate" : "1991-07-17"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
                     }
+                  },
+                  "discountingMethod" : {
+                    "discountingType" : "FRA"
+                  },
+                  "meta" : {
+                    "globalKey" : "1d9421f4"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
                     }
                   },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
                   "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
                         "adjustedDate" : {
+                          "value" : "1991-07-17",
                           "meta" : {
                             "globalKey" : "3e39d1"
-                          },
-                          "value" : "1991-07-17"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "0"
                         }
                       },
                       "meta" : {
-                        "externalKey" : "resetDate",
-                        "globalKey" : "0"
+                        "globalKey" : "0",
+                        "externalKey" : "resetDate"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
                         "adjustedDate" : {
+                          "value" : "1992-01-17",
                           "meta" : {
                             "globalKey" : "3e4051"
-                          },
-                          "value" : "1992-01-17"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "0"
@@ -641,19 +637,15 @@
                       "meta" : {
                         "globalKey" : "0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "discountingMethod" : {
-                    "discountingType" : "FRA"
-                  },
-                  "meta" : {
-                    "globalKey" : "dc55f19f"
-                  },
                   "paymentDate" : {
+                    "unadjustedDate" : "1991-07-17",
                     "dateAdjustments" : {
+                      "businessDayConvention" : "FOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "CHZU"
@@ -662,37 +654,23 @@
                           "globalKey" : "1f8e60"
                         }
                       },
-                      "businessDayConvention" : "FOLLOWING",
                       "meta" : {
                         "globalKey" : "211caa4f"
                       }
                     },
                     "meta" : {
                       "globalKey" : "407eeb1e"
-                    },
-                    "unadjustedDate" : "1991-07-17"
-                  },
-                  "rateSpecification" : {
-                    "floatingRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        }
-                      }
                     }
                   },
                   "resetDates" : {
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "f12537c9"
+                        "globalKey" : "ce01227d"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -701,164 +679,186 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDate",
-                        "globalReference" : "0"
+                        "globalReference" : "0",
+                        "externalReference" : "resetDate"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "f12537c9"
+                      "globalKey" : "ce01227d"
                     }
+                  },
+                  "discountingMethod" : {
+                    "discountingType" : "FRA"
+                  },
+                  "meta" : {
+                    "globalKey" : "44b30fd3"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "1579b067"
+                  "globalKey" : "842dfc5f"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "ff558920"
+              "globalKey" : "6e09d518"
             }
           },
           "meta" : {
-            "globalKey" : "ff558920"
+            "globalKey" : "6e09d518"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "103bf473"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.04,
                 "unit" : {
                   "currency" : {
                     "value" : "CHF"
                   }
                 },
-                "value" : 0.04,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "CHF"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
+                "priceType" : "InterestRate"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-1"
+                } ]
               }
             } ],
             "quantity" : [ {
+              "value" : {
+                "value" : 25000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "CHF"
+                  }
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "f74299ed"
+            }
+          }, {
+            "quantity" : [ {
               "value" : {
+                "value" : 25000000,
                 "unit" : {
                   "currency" : {
                     "value" : "CHF"
                   }
-                },
-                "value" : 25000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "434a0131"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "6a18d5cd"
-              },
               "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
                 "value" : {
                   "floatingRateIndex" : {
                     "value" : "CHF-LIBOR-BBA"
                   },
                   "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
+                    "periodMultiplier" : 6,
                     "period" : "M",
-                    "periodMultiplier" : 6
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
                 }
-              }
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
-                } ]
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "CHF"
-                  }
-                },
-                "value" : 25000000
+              "meta" : {
+                "globalKey" : "d900e1e5"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "9965fc03"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "e1284e85",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "cff0a7d6",
+            "externalReference" : "party2"
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3e394e"
-        },
-        "value" : "1991-05-14"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "TR24TWEY5RVRQV65HD49",
             "meta" : {
-              "scheme" : "http://www.hsbc.com/swaps/trade-id"
-            },
-            "value" : "MB87623"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "e1284e85"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "e1284e85"
-        },
         "meta" : {
-          "globalKey" : "4a2efcd7"
+          "globalKey" : "e1284e85",
+          "externalKey" : "party1"
         }
       }, {
-        "assignedIdentifier" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "BFXS5XCH7N0Y05NIXW11",
             "meta" : {
-              "scheme" : "http://www.abnamro.com/swaps/trade-id"
-            },
-            "value" : "AA9876"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "cff0a7d6"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "cff0a7d6"
-        },
         "meta" : {
-          "globalKey" : "d1084d2c"
+          "globalKey" : "cff0a7d6",
+          "externalKey" : "party2"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "52b04349"
+      }
+    },
+    "state" : {
+      "positionState" : "Executed"
+    },
+    "meta" : {
+      "globalKey" : "10187c98"
     }
   } ],
-  "eventQualifier" : "Execution",
   "meta" : {
-    "globalKey" : "eee65e2f"
+    "globalKey" : "e7096717"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-fx-forward-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-fx-forward-func-output.json
index f1bb799da9..1caf5fdf11 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-fx-forward-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-fx-forward-func-output.json
@@ -3,118 +3,6 @@
   "instruction" : [ {
     "primitiveInstruction" : {
       "execution" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "e05045d7"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "cff0a7d6"
-          },
-          "role" : "PARTY_2"
-        } ],
-        "parties" : [ {
-          "meta" : {
-            "externalKey" : "party1",
-            "globalKey" : "cff0a7d6"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "BFXS5XCH7N0Y05NIXW11"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "cff0a7d6"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party2",
-            "globalKey" : "e05045d7"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "213800QILIUD4ROSUO03"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e05045d7"
-            }
-          } ]
-        } ],
-        "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "1cc815e8"
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 0.9175,
-              "composite" : {
-                "arithmeticOperator" : "ADD",
-                "baseValue" : 0.913,
-                "operand" : 0.0045,
-                "operandType" : "FORWARD_POINT"
-              },
-              "perUnitOf" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 10000000
-            }
-          }, {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 9175000
-            }
-          } ]
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -125,35 +13,32 @@
               "payout" : {
                 "forwardPayout" : [ {
                   "settlementTerms" : {
-                    "meta" : {
-                      "globalKey" : "3e8b15"
-                    },
                     "settlementDate" : {
+                      "valueDate" : "2001-12-21",
                       "meta" : {
                         "globalKey" : "3e8b15"
-                      },
-                      "valueDate" : "2001-12-21"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3e8b15"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "90c7297"
-                  },
                   "underlier" : {
                     "foreignExchange" : {
                       "exchangedCurrency1" : {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "meta" : {
@@ -162,18 +47,18 @@
                       },
                       "exchangedCurrency2" : {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "meta" : {
@@ -184,6 +69,9 @@
                     "meta" : {
                       "globalKey" : "c086df02"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "90c7297"
                   }
                 } ],
                 "meta" : {
@@ -199,108 +87,203 @@
             "globalKey" : "9cce50e0"
           }
         },
+        "priceQuantity" : [ {
+          "price" : [ {
+            "value" : {
+              "value" : 0.9175,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              },
+              "priceType" : "ExchangeRate",
+              "composite" : {
+                "baseValue" : 0.913,
+                "operand" : 0.0045,
+                "arithmeticOperator" : "Add",
+                "operandType" : "ForwardPoint"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 10000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          }, {
+            "value" : {
+              "value" : 9175000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "2ab23d92"
+          }
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "e05045d7",
+            "externalReference" : "party2"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "cff0a7d6",
+            "externalReference" : "party1"
+          }
+        } ],
+        "parties" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "BFXS5XCH7N0Y05NIXW11",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "cff0a7d6"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "cff0a7d6",
+            "externalKey" : "party1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "213800QILIUD4ROSUO03",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e05045d7"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e05045d7",
+            "externalKey" : "party2"
+          }
+        } ],
         "tradeDate" : {
+          "value" : "2001-11-19",
           "meta" : {
             "globalKey" : "3e8ad3"
-          },
-          "value" : "2001-11-19"
+          }
         },
         "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "cff0a7d6",
+            "externalReference" : "party1"
+          },
           "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "ABN1234",
               "meta" : {
                 "scheme" : "http://www.abn-amro.com/fx/trade-id"
-              },
-              "value" : "ABN1234"
+              }
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "cff0a7d6"
-          },
           "meta" : {
-            "globalKey" : "f979bfbc"
+            "globalKey" : "70c5d84"
           }
         }, {
+          "issuerReference" : {
+            "globalReference" : "e05045d7",
+            "externalReference" : "party2"
+          },
           "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "DB5678",
               "meta" : {
                 "scheme" : "http://www.db.com/fx/trade-id"
-              },
-              "value" : "DB5678"
+              }
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "e05045d7"
-          },
           "meta" : {
-            "globalKey" : "483f508b"
+            "globalKey" : "96b24f95"
           }
         } ]
       }
     }
   } ],
+  "eventQualifier" : "Execution",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "21e8cc08"
-    },
-    "state" : {
-      "positionState" : "EXECUTED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "af813ef7"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "cff0a7d6"
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "cff0a7d6",
+          "externalReference" : "party1"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "ABN1234",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "BFXS5XCH7N0Y05NIXW11"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "cff0a7d6"
+              "scheme" : "http://www.abn-amro.com/fx/trade-id"
+            }
           }
-        } ]
-      }, {
+        } ],
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "e05045d7"
+          "globalKey" : "70c5d84"
+        }
+      }, {
+        "issuerReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "DB5678",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "213800QILIUD4ROSUO03"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "e05045d7"
+              "scheme" : "http://www.db.com/fx/trade-id"
+            }
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "96b24f95"
+        }
       } ],
+      "tradeDate" : {
+        "value" : "2001-11-19",
+        "meta" : {
+          "globalKey" : "3e8ad3"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "e05045d7"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "cff0a7d6"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -311,35 +294,32 @@
               "payout" : {
                 "forwardPayout" : [ {
                   "settlementTerms" : {
-                    "meta" : {
-                      "globalKey" : "3e8b15"
-                    },
                     "settlementDate" : {
+                      "valueDate" : "2001-12-21",
                       "meta" : {
                         "globalKey" : "3e8b15"
-                      },
-                      "valueDate" : "2001-12-21"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3e8b15"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "90c7297"
-                  },
                   "underlier" : {
                     "foreignExchange" : {
                       "exchangedCurrency1" : {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "meta" : {
@@ -348,18 +328,18 @@
                       },
                       "exchangedCurrency2" : {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "meta" : {
@@ -370,6 +350,9 @@
                     "meta" : {
                       "globalKey" : "c086df02"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "90c7297"
                   }
                 } ],
                 "meta" : {
@@ -387,114 +370,131 @@
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "1cc815e8"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.9175,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 0.9175,
-                "composite" : {
-                  "arithmeticOperator" : "ADD",
-                  "baseValue" : 0.913,
-                  "operand" : 0.0045,
-                  "operandType" : "FORWARD_POINT"
-                },
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "priceType" : "EXCHANGE_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "ExchangeRate",
+                "composite" : {
+                  "baseValue" : 0.913,
+                  "operand" : 0.0045,
+                  "arithmeticOperator" : "Add",
+                  "operandType" : "ForwardPoint"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 10000000,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
-                },
-                "value" : 10000000
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "quantity-2"
                 } ]
-              },
+              }
+            }, {
               "value" : {
+                "value" : 9175000,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 9175000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "2ab23d92"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "e05045d7",
+            "externalReference" : "party2"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "cff0a7d6",
+            "externalReference" : "party1"
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3e8ad3"
-        },
-        "value" : "2001-11-19"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "BFXS5XCH7N0Y05NIXW11",
             "meta" : {
-              "scheme" : "http://www.abn-amro.com/fx/trade-id"
-            },
-            "value" : "ABN1234"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "cff0a7d6"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "cff0a7d6"
-        },
         "meta" : {
-          "globalKey" : "f979bfbc"
+          "globalKey" : "cff0a7d6",
+          "externalKey" : "party1"
         }
       }, {
-        "assignedIdentifier" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "213800QILIUD4ROSUO03",
             "meta" : {
-              "scheme" : "http://www.db.com/fx/trade-id"
-            },
-            "value" : "DB5678"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "e05045d7"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
         "meta" : {
-          "globalKey" : "483f508b"
+          "globalKey" : "e05045d7",
+          "externalKey" : "party2"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9d94235d"
+      }
+    },
+    "state" : {
+      "positionState" : "Executed"
+    },
+    "meta" : {
+      "globalKey" : "3184a7ac"
     }
   } ],
-  "eventQualifier" : "Execution",
   "meta" : {
-    "globalKey" : "ea31df66"
+    "globalKey" : "43270e96"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-ir-swap-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-ir-swap-func-output.json
index c06f1109f9..f8d55daeeb 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-ir-swap-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-ir-swap-func-output.json
@@ -3,157 +3,6 @@
   "instruction" : [ {
     "primitiveInstruction" : {
       "execution" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "a82d45fc"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ca05a501"
-          },
-          "role" : "PARTY_2"
-        } ],
-        "parties" : [ {
-          "meta" : {
-            "externalKey" : "party1",
-            "globalKey" : "a82d45fc"
-          },
-          "name" : {
-            "value" : "Party A"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-              },
-              "value" : "PARTYAUS33"
-            },
-            "identifierType" : "BIC",
-            "meta" : {
-              "globalKey" : "3d5ebc15"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party2",
-            "globalKey" : "ca05a501"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-              },
-              "value" : "BARCGB2L"
-            },
-            "identifierType" : "BIC",
-            "meta" : {
-              "globalKey" : "ca05a501"
-            }
-          } ]
-        } ],
-        "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3ce21b9b"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "53c66a4c"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
-              }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
-                }
-              },
-              "value" : 50000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "4882fcbc"
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
-                }
-              },
-              "value" : 0.06,
-              "perUnitOf" : {
-                "currency" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
-                }
-              },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
-                }
-              },
-              "value" : 50000000
-            }
-          } ]
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -164,46 +13,40 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
-                        },
-                        "meta" : {
-                          "globalKey" : "da36cf11"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7d7eda0"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "28c89"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "14"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1994-12-14",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -212,103 +55,108 @@
                         },
                         "meta" : {
                           "globalKey" : "ea1a6ec6"
-                        },
-                        "unadjustedDate" : "1994-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "a54e5fcd"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1999-12-14",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "DEFR"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "1ff50d"
+                              "globalKey" : "1ff50d",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365af8de"
                           }
                         },
                         "meta" : {
                           "globalKey" : "a8d53690"
-                        },
-                        "unadjustedDate" : "1999-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "a8d53690"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "4443c8bb"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "8c0b539f"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da36cf11"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d7eda0"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "959"
+                        "globalKey" : "18a9b"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 6
+                      "rollConvention" : "14"
+                    },
+                    "meta" : {
+                      "globalKey" : "3836d691",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "107"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da36cf11"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7d7eda0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "8563938d"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "a54e5fcd"
+                      "globalReference" : "3836d691",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "131ae8a2"
+                        "globalKey" : "eff6d356"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -317,82 +165,79 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates",
-                        "globalReference" : "d533d3ee"
+                        "globalReference" : "25625c64",
+                        "externalReference" : "resetDates"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates",
-                      "globalKey" : "d533d3ee"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da36cf11"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d7eda0"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "25625c64",
+                      "externalKey" : "resetDates"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "56791807"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
-                        },
-                        "meta" : {
-                          "globalKey" : "da36cf11"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7d7eda0"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "2b8fa"
-                      },
-                      "period" : "Y",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "14"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30E/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1994-12-14",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -401,197 +246,317 @@
                         },
                         "meta" : {
                           "globalKey" : "ea1a6ec6"
-                        },
-                        "unadjustedDate" : "1994-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "fbf296c2"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1999-12-14",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
                         "meta" : {
                           "globalKey" : "97297aae"
-                        },
-                        "unadjustedDate" : "1999-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "97297aae"
                       }
+                    },
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da36cf11"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7d7eda0"
+                      }
+                    },
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
+                      "meta" : {
+                        "globalKey" : "1794a"
+                      },
+                      "rollConvention" : "14"
+                    },
+                    "meta" : {
+                      "globalKey" : "a5f8cf12",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "30E/360"
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
+                      "meta" : {
+                        "globalKey" : "78"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da36cf11"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7d7eda0"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "b32991fe"
+                    }
                   },
                   "meta" : {
-                    "globalKey" : "8b5a674a"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "8c0b550e"
-                    },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
-                        },
-                        "meta" : {
-                          "globalKey" : "da36cf11"
-                        }
-                      },
-                      "businessDayConvention" : "MODFOLLOWING",
-                      "meta" : {
-                        "globalKey" : "b7d7eda0"
-                      }
-                    },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "ac8"
-                      },
-                      "period" : "Y",
-                      "periodMultiplier" : 1
-                    }
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
+                    "globalKey" : "3703de42"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "a74ffedb"
+                }
+              }
+            },
+            "meta" : {
+              "globalKey" : "4be6f88c"
+            }
+          },
+          "meta" : {
+            "globalKey" : "4be6f88c"
+          }
+        },
+        "priceQuantity" : [ {
+          "quantity" : [ {
+            "value" : {
+              "value" : 50000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                  }
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2505dd46"
+            }
+          },
+          "meta" : {
+            "globalKey" : "c0d07bed"
+          }
+        }, {
+          "price" : [ {
+            "value" : {
+              "value" : 0.06,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                  }
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "EUR",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                  }
+                }
+              },
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 50000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
                   }
-                } ],
-                "meta" : {
-                  "globalKey" : "e40a62af"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "88a15c60"
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c7dc9ac4"
+          }
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "9495a03c",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "ca05a501",
+            "externalReference" : "party2"
+          }
+        } ],
+        "parties" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "PARTYAUS33",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+              }
+            },
+            "identifierType" : "BIC",
+            "meta" : {
+              "globalKey" : "3d5ebc15"
             }
+          } ],
+          "name" : {
+            "value" : "Party A"
           },
           "meta" : {
-            "globalKey" : "88a15c60"
+            "globalKey" : "9495a03c",
+            "externalKey" : "party1"
           }
-        },
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "BARCGB2L",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+              }
+            },
+            "identifierType" : "BIC",
+            "meta" : {
+              "globalKey" : "ca05a501"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "ca05a501",
+            "externalKey" : "party2"
+          }
+        } ],
         "tradeDate" : {
+          "value" : "1994-12-12",
           "meta" : {
             "globalKey" : "3e530c"
-          },
-          "value" : "1994-12-12"
+          }
         },
         "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "ca05a501",
+            "externalReference" : "party2"
+          },
           "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "SW2000",
               "meta" : {
                 "scheme" : "http://www.barclays.com/swaps/trade-id"
-              },
-              "value" : "SW2000"
+              }
             },
             "version" : 1
           } ],
-          "issuerReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ca05a501"
-          },
           "meta" : {
-            "globalKey" : "fc2ee432"
+            "globalKey" : "958d38d8"
           }
         } ]
       }
     }
   } ],
+  "eventQualifier" : "Execution",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "74748122"
-    },
-    "state" : {
-      "positionState" : "EXECUTED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "41b6d4d1"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "a82d45fc"
-        },
-        "name" : {
-          "value" : "Party A"
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "ca05a501",
+          "externalReference" : "party2"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "SW2000",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-            },
-            "value" : "PARTYAUS33"
+              "scheme" : "http://www.barclays.com/swaps/trade-id"
+            }
           },
-          "identifierType" : "BIC",
-          "meta" : {
-            "globalKey" : "3d5ebc15"
-          }
-        } ]
-      }, {
+          "version" : 1
+        } ],
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "ca05a501"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-            },
-            "value" : "BARCGB2L"
-          },
-          "identifierType" : "BIC",
-          "meta" : {
-            "globalKey" : "ca05a501"
-          }
-        } ]
+          "globalKey" : "958d38d8"
+        }
       } ],
+      "tradeDate" : {
+        "value" : "1994-12-12",
+        "meta" : {
+          "globalKey" : "3e530c"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "a82d45fc"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ca05a501"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -602,46 +567,40 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
-                        },
-                        "meta" : {
-                          "globalKey" : "da36cf11"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7d7eda0"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "28c89"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "14"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1994-12-14",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -650,103 +609,108 @@
                         },
                         "meta" : {
                           "globalKey" : "ea1a6ec6"
-                        },
-                        "unadjustedDate" : "1994-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "a54e5fcd"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1999-12-14",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "DEFR"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "1ff50d"
+                              "globalKey" : "1ff50d",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365af8de"
                           }
                         },
                         "meta" : {
                           "globalKey" : "a8d53690"
-                        },
-                        "unadjustedDate" : "1999-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "a8d53690"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "4443c8bb"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "8c0b539f"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da36cf11"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d7eda0"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "959"
+                        "globalKey" : "18a9b"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 6
+                      "rollConvention" : "14"
+                    },
+                    "meta" : {
+                      "globalKey" : "3836d691",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "107"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da36cf11"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7d7eda0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "8563938d"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "a54e5fcd"
+                      "globalReference" : "3836d691",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "131ae8a2"
+                        "globalKey" : "eff6d356"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -755,82 +719,79 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates",
-                        "globalReference" : "d533d3ee"
+                        "globalReference" : "25625c64",
+                        "externalReference" : "resetDates"
+                      }
+                    },
+                    "resetFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates",
-                      "globalKey" : "d533d3ee"
-                    },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da36cf11"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d7eda0"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "25625c64",
+                      "externalKey" : "resetDates"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "56791807"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
-                        },
-                        "meta" : {
-                          "globalKey" : "da36cf11"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7d7eda0"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "2b8fa"
-                      },
-                      "period" : "Y",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "14"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30E/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1994-12-14",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -839,238 +800,277 @@
                         },
                         "meta" : {
                           "globalKey" : "ea1a6ec6"
-                        },
-                        "unadjustedDate" : "1994-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "fbf296c2"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1999-12-14",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
                         "meta" : {
                           "globalKey" : "97297aae"
-                        },
-                        "unadjustedDate" : "1999-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "97297aae"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "30E/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "8b5a674a"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "8c0b550e"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da36cf11"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d7eda0"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
                       "meta" : {
-                        "globalKey" : "ac8"
+                        "globalKey" : "1794a"
                       },
-                      "period" : "Y",
-                      "periodMultiplier" : 1
+                      "rollConvention" : "14"
+                    },
+                    "meta" : {
+                      "globalKey" : "a5f8cf12",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
+                        "globalKey" : "78"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da36cf11"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7d7eda0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "b32991fe"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "3703de42"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "e40a62af"
+                  "globalKey" : "a74ffedb"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "88a15c60"
+              "globalKey" : "4be6f88c"
             }
           },
           "meta" : {
-            "globalKey" : "88a15c60"
+            "globalKey" : "4be6f88c"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "3ce21b9b"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "53c66a4c"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "EUR-LIBOR-BBA"
-                  },
-                  "indexTenor" : {
+            "quantity" : [ {
+              "value" : {
+                "value" : 50000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "EUR",
                     "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                    }
                   }
                 }
-              }
-            },
-            "quantity" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "EUR-LIBOR-BBA"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "EUR"
+                      "globalKey" : "107"
+                    }
                   }
                 },
-                "value" : 50000000
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "2505dd46"
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "4882fcbc"
             },
+            "meta" : {
+              "globalKey" : "c0d07bed"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.06,
                 "unit" : {
                   "currency" : {
+                    "value" : "EUR",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "EUR"
+                    }
                   }
                 },
-                "value" : 0.06,
                 "perUnitOf" : {
                   "currency" : {
+                    "value" : "EUR",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "EUR"
+                    }
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 50000000,
                 "unit" : {
                   "currency" : {
+                    "value" : "EUR",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "EUR"
+                    }
                   }
-                },
-                "value" : 50000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "c7dc9ac4"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "9495a03c",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "ca05a501",
+            "externalReference" : "party2"
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3e530c"
-        },
-        "value" : "1994-12-12"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "PARTYAUS33",
             "meta" : {
-              "scheme" : "http://www.barclays.com/swaps/trade-id"
-            },
-            "value" : "SW2000"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+            }
           },
-          "version" : 1
+          "identifierType" : "BIC",
+          "meta" : {
+            "globalKey" : "3d5ebc15"
+          }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ca05a501"
+        "name" : {
+          "value" : "Party A"
         },
         "meta" : {
-          "globalKey" : "fc2ee432"
+          "globalKey" : "9495a03c",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "BARCGB2L",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+            }
+          },
+          "identifierType" : "BIC",
+          "meta" : {
+            "globalKey" : "ca05a501"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "ca05a501",
+          "externalKey" : "party2"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "b2493d2f"
+      }
+    },
+    "state" : {
+      "positionState" : "Executed"
+    },
+    "meta" : {
+      "globalKey" : "ed5a94fe"
     }
   } ],
-  "eventQualifier" : "Execution",
   "meta" : {
-    "globalKey" : "1af67d71"
+    "globalKey" : "b9b95a39"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-ir-swap-with-fee-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-ir-swap-with-fee-func-output.json
index e8584a4971..39bb474df8 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-ir-swap-with-fee-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-ir-swap-with-fee-func-output.json
@@ -3,140 +3,6 @@
   "instruction" : [ {
     "primitiveInstruction" : {
       "execution" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "33f59557"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "33f59558"
-          },
-          "role" : "PARTY_2"
-        } ],
-        "parties" : [ {
-          "meta" : {
-            "externalKey" : "party1",
-            "globalKey" : "33f59557"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external"
-              },
-              "value" : "Party 1"
-            },
-            "meta" : {
-              "globalKey" : "33f59557"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party2",
-            "globalKey" : "33f59558"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external"
-              },
-              "value" : "Party 2"
-            },
-            "meta" : {
-              "globalKey" : "33f59558"
-            }
-          } ]
-        } ],
-        "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "467212c2"
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 0.03,
-              "perUnitOf" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 100000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d1e8e568"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "e4650aae"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "GBP-LIBOR-ISDA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 3
-                }
-              }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 100000
-            }
-          } ]
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -147,46 +13,44 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCenter" : [ {
-                          "value" : "GBLO"
-                        } ],
-                        "meta" : {
-                          "globalKey" : "21479e"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "365c4b6f"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "25e2ab"
-                      },
-                      "period" : "T",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "NONE"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30E/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-02-22",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -195,23 +59,23 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365c4b6f"
                           }
                         },
                         "meta" : {
                           "globalKey" : "d2fe2899"
-                        },
-                        "unadjustedDate" : "2018-02-22"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "d2fe2899"
                       }
                     },
-                    "firstPeriodStartDate" : {
+                    "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2020-02-22",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -220,27 +84,37 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365c4b6f"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "cf94775b"
-                        },
-                        "unadjustedDate" : "2018-02-20"
+                          "globalKey" : "20881899"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "cf94775b"
+                        "globalKey" : "20881899"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "N10434",
-                      "globalKey" : "2e920c27"
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCenter" : [ {
+                          "value" : "GBLO"
+                        } ],
+                        "meta" : {
+                          "globalKey" : "21479e"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "365c4b6f"
+                      }
                     },
-                    "terminationDate" : {
+                    "firstPeriodStartDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-02-20",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -249,33 +123,42 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365c4b6f"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "20881899"
-                        },
-                        "unadjustedDate" : "2020-02-22"
+                          "globalKey" : "cf94775b"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "20881899"
+                        "globalKey" : "cf94775b"
                       }
+                    },
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
+                      "meta" : {
+                        "globalKey" : "24b525"
+                      },
+                      "rollConvention" : "NONE"
+                    },
+                    "meta" : {
+                      "globalKey" : "f13835fd",
+                      "externalKey" : "N10434"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "30E/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "310aa42b"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "965ab238"
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
+                      "meta" : {
+                        "globalKey" : "73"
+                      }
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                    "payRelativeTo" : "CalculationPeriodEndDate",
                     "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -284,68 +167,55 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365c4b6f"
                       }
                     },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "a2d"
-                      },
-                      "period" : "T",
-                      "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "9285f8b6"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "6f3e7a6b"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessDayConvention" : "NONE",
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        }
+                      },
                       "meta" : {
-                        "globalKey" : "24a738"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "28c49"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "22"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-02-22",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -354,44 +224,23 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365c4b6f"
                           }
                         },
                         "meta" : {
                           "globalKey" : "d2fe2899"
-                        },
-                        "unadjustedDate" : "2018-02-22"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "d2fe2899"
                       }
                     },
-                    "firstPeriodStartDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NONE",
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "ece1e2cc"
-                        },
-                        "unadjustedDate" : "2018-02-20"
-                      },
-                      "meta" : {
-                        "globalKey" : "ece1e2cc"
-                      }
-                    },
-                    "meta" : {
-                      "externalKey" : "N10277",
-                      "globalKey" : "1c4f5a8b"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2020-02-22",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -400,34 +249,65 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365c4b6f"
                           }
                         },
                         "meta" : {
                           "globalKey" : "20881899"
-                        },
-                        "unadjustedDate" : "2020-02-22"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "20881899"
                       }
+                    },
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "NONE",
+                      "meta" : {
+                        "globalKey" : "24a738"
+                      }
+                    },
+                    "firstPeriodStartDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2018-02-20",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NONE",
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "ece1e2cc"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "ece1e2cc"
+                      }
+                    },
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "17f75"
+                      },
+                      "rollConvention" : "22"
+                    },
+                    "meta" : {
+                      "globalKey" : "a633c897",
+                      "externalKey" : "N10277"
                     }
                   },
-                  "compoundingMethod" : "FLAT",
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "8655fde"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "965ab238"
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
+                      "meta" : {
+                        "globalKey" : "73"
+                      }
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                    "payRelativeTo" : "CalculationPeriodEndDate",
                     "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -436,44 +316,27 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365c4b6f"
                       }
                     },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "a2d"
-                      },
-                      "period" : "T",
-                      "periodMultiplier" : 1
-                    }
-                  },
-                  "rateSpecification" : {
-                    "floatingRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "9285f8b6"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "N10277",
-                      "globalReference" : "1c4f5a8b"
+                      "globalReference" : "a633c897",
+                      "externalReference" : "N10277"
                     },
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "131ae8a2"
+                        "globalKey" : "eff6d356"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -482,17 +345,20 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates",
-                        "globalReference" : "cdf55bb9"
+                        "globalReference" : "fa4ca6f7",
+                        "externalReference" : "resetDates"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates",
-                      "globalKey" : "cdf55bb9"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -501,84 +367,217 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365c4b6f"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                    "meta" : {
+                      "globalKey" : "fa4ca6f7",
+                      "externalKey" : "resetDates"
                     }
+                  },
+                  "compoundingMethod" : "Flat",
+                  "meta" : {
+                    "globalKey" : "acb9ff52"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "a285c009"
+                  "globalKey" : "f45335bd"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "b54472d9"
+              "globalKey" : "711e88d"
+            }
+          },
+          "meta" : {
+            "globalKey" : "711e88d"
+          }
+        },
+        "priceQuantity" : [ {
+          "price" : [ {
+            "value" : {
+              "value" : 0.03,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              },
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 100000,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "87d0457e"
+          }
+        }, {
+          "quantity" : [ {
+            "value" : {
+              "value" : 100000,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "GBP-LIBOR-ISDA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 3,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "a83b3e3e"
+            }
+          },
+          "meta" : {
+            "globalKey" : "28ba9a94"
+          }
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "33f59557",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "33f59558",
+            "externalReference" : "party2"
+          }
+        } ],
+        "parties" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "Party 1",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external"
+              }
+            },
+            "meta" : {
+              "globalKey" : "33f59557"
             }
-          },
+          } ],
           "meta" : {
-            "globalKey" : "b54472d9"
+            "globalKey" : "33f59557",
+            "externalKey" : "party1"
           }
-        },
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "Party 2",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external"
+              }
+            },
+            "meta" : {
+              "globalKey" : "33f59558"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "33f59558",
+            "externalKey" : "party2"
+          }
+        } ],
         "tradeDate" : {
+          "value" : "2018-02-20",
           "meta" : {
             "globalKey" : "3f1094"
-          },
-          "value" : "2018-02-20"
+          }
         },
         "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "33f59557",
+            "externalReference" : "party1"
+          },
           "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "IRS858TH30",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-              },
-              "value" : "IRS858TH30"
+              }
             },
             "version" : 1
           } ],
-          "issuerReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "33f59557"
-          },
           "meta" : {
-            "globalKey" : "6af1b05"
+            "globalKey" : "1c0fb045"
           }
         } ]
       },
       "transfer" : {
         "transferState" : [ {
-          "meta" : {
-            "globalKey" : "a83421f9"
-          },
           "transfer" : {
-            "payerReceiver" : {
-              "payerPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "33f59557"
-              },
-              "receiverPartyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "33f59558"
-              }
-            },
             "quantity" : {
+              "value" : 200,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
+              }
+            },
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "globalReference" : "33f59557",
+                "externalReference" : "party1"
               },
-              "value" : 200
+              "receiverPartyReference" : {
+                "globalReference" : "33f59558",
+                "externalReference" : "party2"
+              }
             },
             "settlementDate" : {
+              "unadjustedDate" : "2018-02-22",
               "dateAdjustments" : {
+                "businessDayConvention" : "MODFOLLOWING",
                 "businessCenters" : {
                   "businessCenter" : [ {
                     "value" : "GBLO"
@@ -587,79 +586,50 @@
                     "globalKey" : "21479e"
                   }
                 },
-                "businessDayConvention" : "MODFOLLOWING",
                 "meta" : {
                   "globalKey" : "365c4b6f"
                 }
-              },
-              "unadjustedDate" : "2018-02-22"
+              }
             },
             "transferExpression" : {
-              "priceTransfer" : "UPFRONT"
+              "priceTransfer" : "Upfront"
             }
+          },
+          "meta" : {
+            "globalKey" : "d9aeb315"
           }
         } ]
       }
     }
   } ],
+  "eventQualifier" : "Execution",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "c867aa94"
-    },
-    "state" : {
-      "positionState" : "EXECUTED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "1e883cf6"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "33f59557"
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "33f59557",
+          "externalReference" : "party1"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "IRS858TH30",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external"
-            },
-            "value" : "Party 1"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+            }
           },
-          "meta" : {
-            "globalKey" : "33f59557"
-          }
-        } ]
-      }, {
+          "version" : 1
+        } ],
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "33f59558"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external"
-            },
-            "value" : "Party 2"
-          },
-          "meta" : {
-            "globalKey" : "33f59558"
-          }
-        } ]
+          "globalKey" : "1c0fb045"
+        }
       } ],
+      "tradeDate" : {
+        "value" : "2018-02-20",
+        "meta" : {
+          "globalKey" : "3f1094"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "33f59557"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "33f59558"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -670,46 +640,44 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCenter" : [ {
-                          "value" : "GBLO"
-                        } ],
-                        "meta" : {
-                          "globalKey" : "21479e"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "365c4b6f"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "25e2ab"
-                      },
-                      "period" : "T",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "NONE"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30E/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-02-22",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -718,23 +686,23 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365c4b6f"
                           }
                         },
                         "meta" : {
                           "globalKey" : "d2fe2899"
-                        },
-                        "unadjustedDate" : "2018-02-22"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "d2fe2899"
                       }
                     },
-                    "firstPeriodStartDate" : {
+                    "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2020-02-22",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -743,27 +711,37 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365c4b6f"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "cf94775b"
-                        },
-                        "unadjustedDate" : "2018-02-20"
+                          "globalKey" : "20881899"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "cf94775b"
+                        "globalKey" : "20881899"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "N10434",
-                      "globalKey" : "2e920c27"
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCenter" : [ {
+                          "value" : "GBLO"
+                        } ],
+                        "meta" : {
+                          "globalKey" : "21479e"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "365c4b6f"
+                      }
                     },
-                    "terminationDate" : {
+                    "firstPeriodStartDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-02-20",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -772,33 +750,42 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365c4b6f"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "20881899"
-                        },
-                        "unadjustedDate" : "2020-02-22"
+                          "globalKey" : "cf94775b"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "20881899"
+                        "globalKey" : "cf94775b"
                       }
+                    },
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
+                      "meta" : {
+                        "globalKey" : "24b525"
+                      },
+                      "rollConvention" : "NONE"
+                    },
+                    "meta" : {
+                      "globalKey" : "f13835fd",
+                      "externalKey" : "N10434"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "30E/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "310aa42b"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "965ab238"
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
+                      "meta" : {
+                        "globalKey" : "73"
+                      }
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                    "payRelativeTo" : "CalculationPeriodEndDate",
                     "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -807,68 +794,55 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365c4b6f"
                       }
                     },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "a2d"
-                      },
-                      "period" : "T",
-                      "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "9285f8b6"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "6f3e7a6b"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessDayConvention" : "NONE",
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        }
+                      },
                       "meta" : {
-                        "globalKey" : "24a738"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "28c49"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "22"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-02-22",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -877,44 +851,23 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365c4b6f"
                           }
                         },
                         "meta" : {
                           "globalKey" : "d2fe2899"
-                        },
-                        "unadjustedDate" : "2018-02-22"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "d2fe2899"
                       }
                     },
-                    "firstPeriodStartDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NONE",
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "ece1e2cc"
-                        },
-                        "unadjustedDate" : "2018-02-20"
-                      },
-                      "meta" : {
-                        "globalKey" : "ece1e2cc"
-                      }
-                    },
-                    "meta" : {
-                      "externalKey" : "N10277",
-                      "globalKey" : "1c4f5a8b"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2020-02-22",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -923,34 +876,65 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365c4b6f"
                           }
                         },
                         "meta" : {
                           "globalKey" : "20881899"
-                        },
-                        "unadjustedDate" : "2020-02-22"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "20881899"
                       }
+                    },
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "NONE",
+                      "meta" : {
+                        "globalKey" : "24a738"
+                      }
+                    },
+                    "firstPeriodStartDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2018-02-20",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NONE",
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "ece1e2cc"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "ece1e2cc"
+                      }
+                    },
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "17f75"
+                      },
+                      "rollConvention" : "22"
+                    },
+                    "meta" : {
+                      "globalKey" : "a633c897",
+                      "externalKey" : "N10277"
                     }
                   },
-                  "compoundingMethod" : "FLAT",
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "8655fde"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "965ab238"
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
+                      "meta" : {
+                        "globalKey" : "73"
+                      }
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                    "payRelativeTo" : "CalculationPeriodEndDate",
                     "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -959,44 +943,27 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365c4b6f"
                       }
                     },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "a2d"
-                      },
-                      "period" : "T",
-                      "periodMultiplier" : 1
-                    }
-                  },
-                  "rateSpecification" : {
-                    "floatingRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "9285f8b6"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "N10277",
-                      "globalReference" : "1c4f5a8b"
+                      "globalReference" : "a633c897",
+                      "externalReference" : "N10277"
                     },
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "131ae8a2"
+                        "globalKey" : "eff6d356"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -1005,17 +972,20 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates",
-                        "globalReference" : "cdf55bb9"
+                        "globalReference" : "fa4ca6f7",
+                        "externalReference" : "resetDates"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates",
-                      "globalKey" : "cdf55bb9"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -1024,174 +994,201 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365c4b6f"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                    "meta" : {
+                      "globalKey" : "fa4ca6f7",
+                      "externalKey" : "resetDates"
                     }
+                  },
+                  "compoundingMethod" : "Flat",
+                  "meta" : {
+                    "globalKey" : "acb9ff52"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "a285c009"
+                  "globalKey" : "f45335bd"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "b54472d9"
+              "globalKey" : "711e88d"
             }
           },
           "meta" : {
-            "globalKey" : "b54472d9"
+            "globalKey" : "711e88d"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "467212c2"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.03,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 0.03,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
+                "priceType" : "InterestRate"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-1"
+                } ]
               }
             } ],
             "quantity" : [ {
+              "value" : {
+                "value" : 100000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "GBP"
+                  }
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "87d0457e"
+            }
+          }, {
+            "quantity" : [ {
               "value" : {
+                "value" : 100000,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 100000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "d1e8e568"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "e4650aae"
-              },
               "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
                 "value" : {
                   "floatingRateIndex" : {
                     "value" : "GBP-LIBOR-ISDA"
                   },
                   "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
+                    "periodMultiplier" : 3,
                     "period" : "M",
-                    "periodMultiplier" : 3
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
                 }
-              }
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
-                } ]
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "GBP"
-                  }
-                },
-                "value" : 100000
+              "meta" : {
+                "globalKey" : "a83b3e3e"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "28ba9a94"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "33f59557",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "33f59558",
+            "externalReference" : "party2"
+          }
         } ]
       },
-      "tradeDate" : {
+      "party" : [ {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "Party 1",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external"
+            }
+          },
+          "meta" : {
+            "globalKey" : "33f59557"
+          }
+        } ],
         "meta" : {
-          "globalKey" : "3f1094"
-        },
-        "value" : "2018-02-20"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+          "globalKey" : "33f59557",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "Party 2",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-            },
-            "value" : "IRS858TH30"
+              "scheme" : "http://www.fpml.org/coding-scheme/external"
+            }
           },
-          "version" : 1
+          "meta" : {
+            "globalKey" : "33f59558"
+          }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59557"
-        },
         "meta" : {
-          "globalKey" : "6af1b05"
+          "globalKey" : "33f59558",
+          "externalKey" : "party2"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "6ba3b28e"
+      }
+    },
+    "state" : {
+      "positionState" : "Executed"
     },
     "transferHistory" : [ {
-      "meta" : {
-        "globalKey" : "a83421f9"
-      },
       "transfer" : {
-        "payerReceiver" : {
-          "payerPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "33f59557"
-          },
-          "receiverPartyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "33f59558"
-          }
-        },
         "quantity" : {
+          "value" : 200,
           "unit" : {
             "currency" : {
               "value" : "USD"
             }
+          }
+        },
+        "payerReceiver" : {
+          "payerPartyReference" : {
+            "globalReference" : "33f59557",
+            "externalReference" : "party1"
           },
-          "value" : 200
+          "receiverPartyReference" : {
+            "globalReference" : "33f59558",
+            "externalReference" : "party2"
+          }
         },
         "settlementDate" : {
+          "unadjustedDate" : "2018-02-22",
           "dateAdjustments" : {
+            "businessDayConvention" : "MODFOLLOWING",
             "businessCenters" : {
               "businessCenter" : [ {
                 "value" : "GBLO"
@@ -1200,21 +1197,24 @@
                 "globalKey" : "21479e"
               }
             },
-            "businessDayConvention" : "MODFOLLOWING",
             "meta" : {
               "globalKey" : "365c4b6f"
             }
-          },
-          "unadjustedDate" : "2018-02-22"
+          }
         },
         "transferExpression" : {
-          "priceTransfer" : "UPFRONT"
+          "priceTransfer" : "Upfront"
         }
+      },
+      "meta" : {
+        "globalKey" : "d9aeb315"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "139d8598"
+    }
   } ],
-  "eventQualifier" : "Execution",
   "meta" : {
-    "globalKey" : "650d439f"
+    "globalKey" : "784f9fe3"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-ir-swap-with-other-party-payment-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-ir-swap-with-other-party-payment-func-output.json
index 58f15237d7..2ae81dfd34 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-ir-swap-with-other-party-payment-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-ir-swap-with-other-party-payment-func-output.json
@@ -3,181 +3,6 @@
   "instruction" : [ {
     "primitiveInstruction" : {
       "execution" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "a82d45fc"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ca05a501"
-          },
-          "role" : "PARTY_2"
-        } ],
-        "parties" : [ {
-          "meta" : {
-            "externalKey" : "party1",
-            "globalKey" : "a82d45fc"
-          },
-          "name" : {
-            "value" : "Party A"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-              },
-              "value" : "PARTYAUS33"
-            },
-            "identifierType" : "BIC",
-            "meta" : {
-              "globalKey" : "3d5ebc15"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party2",
-            "globalKey" : "ca05a501"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-              },
-              "value" : "BARCGB2L"
-            },
-            "identifierType" : "BIC",
-            "meta" : {
-              "globalKey" : "ca05a501"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party3",
-            "globalKey" : "7ade9dd5"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-              },
-              "value" : "Broker"
-            },
-            "identifierType" : "BIC",
-            "meta" : {
-              "globalKey" : "7ade9dd5"
-            }
-          } ]
-        } ],
-        "partyRoles" : [ {
-          "partyReference" : {
-            "externalReference" : "party3",
-            "globalReference" : "7ade9dd5"
-          },
-          "role" : "ARRANGING_BROKER"
-        } ],
-        "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3ce21b9b"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "53c66a4c"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
-              }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
-                }
-              },
-              "value" : 50000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "4882fcbc"
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
-                }
-              },
-              "value" : 0.06,
-              "perUnitOf" : {
-                "currency" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
-                }
-              },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
-                }
-              },
-              "value" : 50000000
-            }
-          } ]
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -188,46 +13,40 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
-                        },
-                        "meta" : {
-                          "globalKey" : "da36cf11"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7d7eda0"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "28c89"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "14"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1994-12-14",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -236,103 +55,108 @@
                         },
                         "meta" : {
                           "globalKey" : "ea1a6ec6"
-                        },
-                        "unadjustedDate" : "1994-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "a54e5fcd"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1999-12-14",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "DEFR"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "1ff50d"
+                              "globalKey" : "1ff50d",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365af8de"
                           }
                         },
                         "meta" : {
                           "globalKey" : "a8d53690"
-                        },
-                        "unadjustedDate" : "1999-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "a8d53690"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "4443c8bb"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "8c0b539f"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da36cf11"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d7eda0"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "959"
+                        "globalKey" : "18a9b"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 6
+                      "rollConvention" : "14"
+                    },
+                    "meta" : {
+                      "globalKey" : "3836d691",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "107"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da36cf11"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7d7eda0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "8563938d"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "a54e5fcd"
+                      "globalReference" : "3836d691",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "131ae8a2"
+                        "globalKey" : "eff6d356"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -341,82 +165,79 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates",
-                        "globalReference" : "d533d3ee"
+                        "globalReference" : "25625c64",
+                        "externalReference" : "resetDates"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates",
-                      "globalKey" : "d533d3ee"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da36cf11"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d7eda0"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "25625c64",
+                      "externalKey" : "resetDates"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "56791807"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
-                        },
-                        "meta" : {
-                          "globalKey" : "da36cf11"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7d7eda0"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "2b8fa"
-                      },
-                      "period" : "Y",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "14"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30E/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1994-12-14",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -425,259 +246,379 @@
                         },
                         "meta" : {
                           "globalKey" : "ea1a6ec6"
-                        },
-                        "unadjustedDate" : "1994-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "fbf296c2"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1999-12-14",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
                         "meta" : {
                           "globalKey" : "97297aae"
-                        },
-                        "unadjustedDate" : "1999-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "97297aae"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "30E/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "8b5a674a"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "8c0b550e"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da36cf11"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d7eda0"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
                       "meta" : {
-                        "globalKey" : "ac8"
+                        "globalKey" : "1794a"
                       },
-                      "period" : "Y",
-                      "periodMultiplier" : 1
+                      "rollConvention" : "14"
+                    },
+                    "meta" : {
+                      "globalKey" : "a5f8cf12",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
+                        "globalKey" : "78"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da36cf11"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7d7eda0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "b32991fe"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "3703de42"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "e40a62af"
+                  "globalKey" : "a74ffedb"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "88a15c60"
+              "globalKey" : "4be6f88c"
+            }
+          },
+          "meta" : {
+            "globalKey" : "4be6f88c"
+          }
+        },
+        "priceQuantity" : [ {
+          "quantity" : [ {
+            "value" : {
+              "value" : 50000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                  }
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2505dd46"
+            }
+          },
+          "meta" : {
+            "globalKey" : "c0d07bed"
+          }
+        }, {
+          "price" : [ {
+            "value" : {
+              "value" : 0.06,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                  }
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "EUR",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                  }
+                }
+              },
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 50000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                  }
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c7dc9ac4"
+          }
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "9495a03c",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "ca05a501",
+            "externalReference" : "party2"
+          }
+        } ],
+        "parties" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "PARTYAUS33",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+              }
+            },
+            "identifierType" : "BIC",
+            "meta" : {
+              "globalKey" : "3d5ebc15"
+            }
+          } ],
+          "name" : {
+            "value" : "Party A"
+          },
+          "meta" : {
+            "globalKey" : "9495a03c",
+            "externalKey" : "party1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "BARCGB2L",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+              }
+            },
+            "identifierType" : "BIC",
+            "meta" : {
+              "globalKey" : "ca05a501"
             }
-          },
+          } ],
           "meta" : {
-            "globalKey" : "88a15c60"
+            "globalKey" : "ca05a501",
+            "externalKey" : "party2"
           }
-        },
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "Broker",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+              }
+            },
+            "identifierType" : "BIC",
+            "meta" : {
+              "globalKey" : "7ade9dd5"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "7ade9dd5",
+            "externalKey" : "party3"
+          }
+        } ],
+        "partyRoles" : [ {
+          "partyReference" : {
+            "globalReference" : "7ade9dd5",
+            "externalReference" : "party3"
+          },
+          "role" : "ArrangingBroker"
+        } ],
         "tradeDate" : {
+          "value" : "1994-12-12",
           "meta" : {
             "globalKey" : "3e530c"
-          },
-          "value" : "1994-12-12"
+          }
         },
         "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "ca05a501",
+            "externalReference" : "party2"
+          },
           "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "SW2000",
               "meta" : {
                 "scheme" : "http://www.barclays.com/swaps/trade-id"
-              },
-              "value" : "SW2000"
+              }
             },
             "version" : 1
           } ],
-          "issuerReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ca05a501"
-          },
           "meta" : {
-            "globalKey" : "fc2ee432"
+            "globalKey" : "958d38d8"
           }
         } ]
       },
       "transfer" : {
         "transferState" : [ {
-          "meta" : {
-            "globalKey" : "fc8d3528"
-          },
           "transfer" : {
-            "payerReceiver" : {
-              "payerPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "a82d45fc"
-              },
-              "receiverPartyReference" : {
-                "externalReference" : "party3",
-                "globalReference" : "7ade9dd5"
-              }
-            },
             "quantity" : {
+              "value" : 2500.4,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
+              }
+            },
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "globalReference" : "9495a03c",
+                "externalReference" : "party1"
               },
-              "value" : 2500.4
+              "receiverPartyReference" : {
+                "globalReference" : "7ade9dd5",
+                "externalReference" : "party3"
+              }
             },
             "settlementDate" : {
               "adjustedDate" : {
+                "value" : "1994-12-14",
                 "meta" : {
                   "globalKey" : "3e530e"
-                },
-                "value" : "1994-12-14"
+                }
               }
             },
             "transferExpression" : {
-              "priceTransfer" : "UPFRONT"
+              "priceTransfer" : "Upfront"
             }
+          },
+          "meta" : {
+            "globalKey" : "820ed1b4"
           }
         } ]
       }
     }
   } ],
+  "eventQualifier" : "Execution",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "ad1efadc"
-    },
-    "state" : {
-      "positionState" : "EXECUTED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "c01a903b"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "a82d45fc"
-        },
-        "name" : {
-          "value" : "Party A"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-            },
-            "value" : "PARTYAUS33"
-          },
-          "identifierType" : "BIC",
-          "meta" : {
-            "globalKey" : "3d5ebc15"
-          }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "ca05a501"
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "ca05a501",
+          "externalReference" : "party2"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "SW2000",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-            },
-            "value" : "BARCGB2L"
+              "scheme" : "http://www.barclays.com/swaps/trade-id"
+            }
           },
-          "identifierType" : "BIC",
-          "meta" : {
-            "globalKey" : "ca05a501"
-          }
-        } ]
-      }, {
+          "version" : 1
+        } ],
         "meta" : {
-          "externalKey" : "party3",
-          "globalKey" : "7ade9dd5"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-            },
-            "value" : "Broker"
-          },
-          "identifierType" : "BIC",
-          "meta" : {
-            "globalKey" : "7ade9dd5"
-          }
-        } ]
-      } ],
-      "partyRole" : [ {
-        "partyReference" : {
-          "externalReference" : "party3",
-          "globalReference" : "7ade9dd5"
-        },
-        "role" : "ARRANGING_BROKER"
+          "globalKey" : "958d38d8"
+        }
       } ],
+      "tradeDate" : {
+        "value" : "1994-12-12",
+        "meta" : {
+          "globalKey" : "3e530c"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "a82d45fc"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ca05a501"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -688,46 +629,40 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
-                        },
-                        "meta" : {
-                          "globalKey" : "da36cf11"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7d7eda0"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "28c89"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "14"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1994-12-14",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -736,103 +671,108 @@
                         },
                         "meta" : {
                           "globalKey" : "ea1a6ec6"
-                        },
-                        "unadjustedDate" : "1994-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "a54e5fcd"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1999-12-14",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "DEFR"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "1ff50d"
+                              "globalKey" : "1ff50d",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365af8de"
                           }
                         },
                         "meta" : {
                           "globalKey" : "a8d53690"
-                        },
-                        "unadjustedDate" : "1999-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "a8d53690"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "4443c8bb"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "8c0b539f"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da36cf11"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d7eda0"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "959"
+                        "globalKey" : "18a9b"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 6
+                      "rollConvention" : "14"
+                    },
+                    "meta" : {
+                      "globalKey" : "3836d691",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "107"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da36cf11"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7d7eda0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "8563938d"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "a54e5fcd"
+                      "globalReference" : "3836d691",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "131ae8a2"
+                        "globalKey" : "eff6d356"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -841,82 +781,79 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates",
-                        "globalReference" : "d533d3ee"
+                        "globalReference" : "25625c64",
+                        "externalReference" : "resetDates"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates",
-                      "globalKey" : "d533d3ee"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da36cf11"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d7eda0"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "25625c64",
+                      "externalKey" : "resetDates"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "56791807"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
-                        },
-                        "meta" : {
-                          "globalKey" : "da36cf11"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7d7eda0"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "2b8fa"
-                      },
-                      "period" : "Y",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "14"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30E/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1994-12-14",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -925,274 +862,337 @@
                         },
                         "meta" : {
                           "globalKey" : "ea1a6ec6"
-                        },
-                        "unadjustedDate" : "1994-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "fbf296c2"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "1999-12-14",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
                         "meta" : {
                           "globalKey" : "97297aae"
-                        },
-                        "unadjustedDate" : "1999-12-14"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "97297aae"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "30E/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "8b5a674a"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "8c0b550e"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "1ff50d"
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da36cf11"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d7eda0"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
                       "meta" : {
-                        "globalKey" : "ac8"
+                        "globalKey" : "1794a"
                       },
-                      "period" : "Y",
-                      "periodMultiplier" : 1
+                      "rollConvention" : "14"
+                    },
+                    "meta" : {
+                      "globalKey" : "a5f8cf12",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
+                        "globalKey" : "78"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "1ff50d",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da36cf11"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7d7eda0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "b32991fe"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "3703de42"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "e40a62af"
+                  "globalKey" : "a74ffedb"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "88a15c60"
+              "globalKey" : "4be6f88c"
             }
           },
           "meta" : {
-            "globalKey" : "88a15c60"
+            "globalKey" : "4be6f88c"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "3ce21b9b"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "53c66a4c"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "EUR-LIBOR-BBA"
-                  },
-                  "indexTenor" : {
+            "quantity" : [ {
+              "value" : {
+                "value" : 50000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "EUR",
                     "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                    }
                   }
                 }
-              }
-            },
-            "quantity" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "EUR-LIBOR-BBA"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "EUR"
+                      "globalKey" : "107"
+                    }
                   }
                 },
-                "value" : 50000000
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "2505dd46"
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "4882fcbc"
             },
+            "meta" : {
+              "globalKey" : "c0d07bed"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.06,
                 "unit" : {
                   "currency" : {
+                    "value" : "EUR",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "EUR"
+                    }
                   }
                 },
-                "value" : 0.06,
                 "perUnitOf" : {
                   "currency" : {
+                    "value" : "EUR",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "EUR"
+                    }
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 50000000,
                 "unit" : {
                   "currency" : {
+                    "value" : "EUR",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "EUR"
+                    }
                   }
-                },
-                "value" : 50000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "c7dc9ac4"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "9495a03c",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "ca05a501",
+            "externalReference" : "party2"
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3e530c"
-        },
-        "value" : "1994-12-12"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "PARTYAUS33",
             "meta" : {
-              "scheme" : "http://www.barclays.com/swaps/trade-id"
-            },
-            "value" : "SW2000"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+            }
           },
-          "version" : 1
+          "identifierType" : "BIC",
+          "meta" : {
+            "globalKey" : "3d5ebc15"
+          }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ca05a501"
+        "name" : {
+          "value" : "Party A"
         },
         "meta" : {
-          "globalKey" : "fc2ee432"
+          "globalKey" : "9495a03c",
+          "externalKey" : "party1"
         }
-      } ]
-    },
-    "transferHistory" : [ {
-      "meta" : {
-        "globalKey" : "fc8d3528"
-      },
-      "transfer" : {
-        "payerReceiver" : {
-          "payerPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "a82d45fc"
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "BARCGB2L",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+            }
           },
-          "receiverPartyReference" : {
-            "externalReference" : "party3",
-            "globalReference" : "7ade9dd5"
+          "identifierType" : "BIC",
+          "meta" : {
+            "globalKey" : "ca05a501"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "ca05a501",
+          "externalKey" : "party2"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "Broker",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+            }
+          },
+          "identifierType" : "BIC",
+          "meta" : {
+            "globalKey" : "7ade9dd5"
           }
+        } ],
+        "meta" : {
+          "globalKey" : "7ade9dd5",
+          "externalKey" : "party3"
+        }
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "7ade9dd5",
+          "externalReference" : "party3"
         },
+        "role" : "ArrangingBroker"
+      } ],
+      "meta" : {
+        "globalKey" : "e7643999"
+      }
+    },
+    "state" : {
+      "positionState" : "Executed"
+    },
+    "transferHistory" : [ {
+      "transfer" : {
         "quantity" : {
+          "value" : 2500.4,
           "unit" : {
             "currency" : {
               "value" : "USD"
             }
+          }
+        },
+        "payerReceiver" : {
+          "payerPartyReference" : {
+            "globalReference" : "9495a03c",
+            "externalReference" : "party1"
           },
-          "value" : 2500.4
+          "receiverPartyReference" : {
+            "globalReference" : "7ade9dd5",
+            "externalReference" : "party3"
+          }
         },
         "settlementDate" : {
           "adjustedDate" : {
+            "value" : "1994-12-14",
             "meta" : {
               "globalKey" : "3e530e"
-            },
-            "value" : "1994-12-14"
+            }
           }
         },
         "transferExpression" : {
-          "priceTransfer" : "UPFRONT"
+          "priceTransfer" : "Upfront"
         }
+      },
+      "meta" : {
+        "globalKey" : "820ed1b4"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "6db2a1cc"
+    }
   } ],
-  "eventQualifier" : "Execution",
   "meta" : {
-    "globalKey" : "d1874bdb"
+    "globalKey" : "e279cd13"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-ois-swap-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-ois-swap-func-output.json
index efdad4fef4..54b180ad38 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-ois-swap-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-ois-swap-func-output.json
@@ -3,148 +3,6 @@
   "instruction" : [ {
     "primitiveInstruction" : {
       "execution" : {
-        "ancillaryParty" : [ {
-          "partyReference" : [ {
-            "externalReference" : "party1",
-            "globalReference" : "7cec034c"
-          } ],
-          "role" : "CALCULATION_AGENT_INDEPENDENT"
-        } ],
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "7cec034c"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "490e5f44"
-          },
-          "role" : "PARTY_2"
-        } ],
-        "parties" : [ {
-          "meta" : {
-            "externalKey" : "party1",
-            "globalKey" : "7cec034c"
-          },
-          "name" : {
-            "value" : "Party A"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "54930084UKLVMY22DS16"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "121d7965"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party2",
-            "globalKey" : "490e5f44"
-          },
-          "name" : {
-            "value" : "Party B"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "48750084UKLVTR22DS78"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "de31bddc"
-            }
-          } ]
-        } ],
-        "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "f2809620"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "23c05191"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EONIA-OIS-COMPOUND"
-                }
-              }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "27beb430"
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 0.051,
-              "perUnitOf" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
-            }
-          } ]
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -152,52 +10,43 @@
               "productQualifier" : "InterestRate_IRSwap_FixedFloat_OIS"
             } ],
             "economicTerms" : {
-              "calculationAgent" : {
-                "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-              },
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "20a71d"
-                        },
-                        "meta" : {
-                          "globalKey" : "da378121"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7d89fb0"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "25e2ab"
-                      },
-                      "period" : "T",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "NONE"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2001-01-29",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -206,110 +55,115 @@
                         },
                         "meta" : {
                           "globalKey" : "eae28c55"
-                        },
-                        "unadjustedDate" : "2001-01-29"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "eae28c55"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "b89a74cb"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2001-04-29",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "20a71d"
+                              "globalKey" : "20a71d",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
                         "meta" : {
                           "globalKey" : "a6474bf1"
-                        },
-                        "unadjustedDate" : "2001-04-29"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "a6474bf1"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "de63b475"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "f1e87760"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "20a71d"
+                          "globalReference" : "20a71d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da378121"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d89fb0"
                       }
                     },
-                    "paymentDaysOffset" : {
-                      "meta" : {
-                        "globalKey" : "ea4baf23"
-                      },
-                      "period" : "D",
+                    "calculationPeriodFrequency" : {
                       "periodMultiplier" : 1,
-                      "dayType" : "BUSINESS"
-                    },
-                    "paymentFrequency" : {
+                      "period" : "T",
                       "meta" : {
-                        "globalKey" : "a2d"
+                        "globalKey" : "24b525"
                       },
-                      "period" : "T",
-                      "periodMultiplier" : 1
+                      "rollConvention" : "NONE"
+                    },
+                    "meta" : {
+                      "globalKey" : "b13bf71b",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
                       "meta" : {
-                        "globalKey" : "0"
+                        "globalKey" : "73"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDaysOffset" : {
+                      "periodMultiplier" : 1,
+                      "period" : "D",
+                      "meta" : {
+                        "globalKey" : "ea4abbbd"
                       },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                      "dayType" : "Business"
+                    },
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "20a71d",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da378121"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7d89fb0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "7a3b7346"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "b89a74cb"
+                      "globalReference" : "b13bf71b",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodEndDate",
                     "fixingDates" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "23728acc"
+                        "globalKey" : "98ca5cd4"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
+                      "businessDayConvention" : "PRECEDING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
@@ -318,82 +172,79 @@
                           "globalKey" : "20a71d"
                         }
                       },
-                      "businessDayConvention" : "PRECEDING",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates",
-                        "globalReference" : "c9907a5f"
+                        "globalReference" : "4a7f3e4d",
+                        "externalReference" : "resetDates"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates",
-                      "globalKey" : "c9907a5f"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
+                      "meta" : {
+                        "globalKey" : "73"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "20a71d"
+                          "globalReference" : "20a71d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da378121"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d89fb0"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "a2d"
-                      },
-                      "period" : "T",
-                      "periodMultiplier" : 1
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                    "meta" : {
+                      "globalKey" : "4a7f3e4d",
+                      "externalKey" : "resetDates"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "94fe34f9"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "20a71d"
-                        },
-                        "meta" : {
-                          "globalKey" : "da378121"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7d89fb0"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "25e2ab"
-                      },
-                      "period" : "T",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "NONE"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2001-01-29",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -402,209 +253,315 @@
                         },
                         "meta" : {
                           "globalKey" : "eae28c55"
-                        },
-                        "unadjustedDate" : "2001-01-29"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "eae28c55"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "809dacb3"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2001-04-29",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "20a71d"
+                              "globalReference" : "20a71d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da378121"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d89fb0"
                           }
                         },
                         "meta" : {
                           "globalKey" : "53ebbcd"
-                        },
-                        "unadjustedDate" : "2001-04-29"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "53ebbcd"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "99064caf"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "dcfca863"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "20a71d"
+                          "globalReference" : "20a71d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da378121"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d89fb0"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
                       "meta" : {
-                        "globalKey" : "a2d"
+                        "globalKey" : "24b525"
                       },
-                      "period" : "T",
-                      "periodMultiplier" : 1
+                      "rollConvention" : "NONE"
+                    },
+                    "meta" : {
+                      "globalKey" : "20b4d12d",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
+                        "globalKey" : "73"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "20a71d",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da378121"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7d89fb0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "cdd41909"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "2e2deefb"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "ee4ca61a"
+                  "globalKey" : "db796162"
                 }
+              },
+              "calculationAgent" : {
+                "calculationAgentParty" : "CalculationAgentIndependent"
               }
             },
             "meta" : {
-              "globalKey" : "5c0c6c59"
+              "globalKey" : "61c1cb35"
             }
           },
           "meta" : {
-            "globalKey" : "5c0c6c59"
+            "globalKey" : "61c1cb35"
           }
         },
+        "priceQuantity" : [ {
+          "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EONIA-OIS-COMPOUND"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "5449e08f"
+            }
+          },
+          "meta" : {
+            "globalKey" : "9894669e"
+          }
+        }, {
+          "price" : [ {
+            "value" : {
+              "value" : 0.051,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              },
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "d017d1d0"
+          }
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "349a498c",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "4caf4c44",
+            "externalReference" : "party2"
+          }
+        } ],
+        "ancillaryParty" : [ {
+          "role" : "CalculationAgentIndependent",
+          "partyReference" : [ {
+            "globalReference" : "349a498c",
+            "externalReference" : "party1"
+          } ]
+        } ],
+        "parties" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "54930084UKLVMY22DS16",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "121d7965"
+            }
+          } ],
+          "name" : {
+            "value" : "Party A"
+          },
+          "meta" : {
+            "globalKey" : "349a498c",
+            "externalKey" : "party1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "48750084UKLVTR22DS78",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "de31bddc"
+            }
+          } ],
+          "name" : {
+            "value" : "Party B"
+          },
+          "meta" : {
+            "globalKey" : "4caf4c44",
+            "externalKey" : "party2"
+          }
+        } ],
         "tradeDate" : {
+          "value" : "2001-01-25",
           "meta" : {
             "globalKey" : "3e8859"
-          },
-          "value" : "2001-01-25"
+          }
         },
         "tradeIdentifier" : [ {
+          "issuer" : {
+            "value" : "54930084UKLVMY22DS16",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
           "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "UITD7895394",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-              },
-              "value" : "UITD7895394"
+              }
             }
           } ],
-          "issuer" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "54930084UKLVMY22DS16"
-          },
           "meta" : {
-            "globalKey" : "335bf1d6"
+            "globalKey" : "3eac3060"
           },
-          "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
+          "identifierType" : "UniqueTransactionIdentifier"
         } ]
       }
     }
   } ],
+  "eventQualifier" : "Execution",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "31c971ad"
-    },
-    "state" : {
-      "positionState" : "EXECUTED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "b2b8b6dc"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "7cec034c"
-        },
-        "name" : {
-          "value" : "Party A"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "54930084UKLVMY22DS16"
-          },
-          "identifierType" : "LEI",
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "490e5f44"
-        },
-        "name" : {
-          "value" : "Party B"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "UITD7895394",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "48750084UKLVTR22DS78"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "de31bddc"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+            }
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "3eac3060"
+        },
+        "identifierType" : "UniqueTransactionIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2001-01-25",
+        "meta" : {
+          "globalKey" : "3e8859"
+        }
+      },
       "tradableProduct" : {
-        "ancillaryParty" : [ {
-          "partyReference" : [ {
-            "externalReference" : "party1",
-            "globalReference" : "7cec034c"
-          } ],
-          "role" : "CALCULATION_AGENT_INDEPENDENT"
-        } ],
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "7cec034c"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "490e5f44"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -612,52 +569,43 @@
               "productQualifier" : "InterestRate_IRSwap_FixedFloat_OIS"
             } ],
             "economicTerms" : {
-              "calculationAgent" : {
-                "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-              },
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "20a71d"
-                        },
-                        "meta" : {
-                          "globalKey" : "da378121"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7d89fb0"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "25e2ab"
-                      },
-                      "period" : "T",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "NONE"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2001-01-29",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -666,110 +614,115 @@
                         },
                         "meta" : {
                           "globalKey" : "eae28c55"
-                        },
-                        "unadjustedDate" : "2001-01-29"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "eae28c55"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "b89a74cb"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2001-04-29",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "20a71d"
+                              "globalKey" : "20a71d",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
                         "meta" : {
                           "globalKey" : "a6474bf1"
-                        },
-                        "unadjustedDate" : "2001-04-29"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "a6474bf1"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "de63b475"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "f1e87760"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "20a71d"
+                          "globalReference" : "20a71d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da378121"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d89fb0"
                       }
                     },
-                    "paymentDaysOffset" : {
-                      "meta" : {
-                        "globalKey" : "ea4baf23"
-                      },
-                      "period" : "D",
+                    "calculationPeriodFrequency" : {
                       "periodMultiplier" : 1,
-                      "dayType" : "BUSINESS"
-                    },
-                    "paymentFrequency" : {
+                      "period" : "T",
                       "meta" : {
-                        "globalKey" : "a2d"
+                        "globalKey" : "24b525"
                       },
-                      "period" : "T",
-                      "periodMultiplier" : 1
+                      "rollConvention" : "NONE"
+                    },
+                    "meta" : {
+                      "globalKey" : "b13bf71b",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
                       "meta" : {
-                        "globalKey" : "0"
+                        "globalKey" : "73"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDaysOffset" : {
+                      "periodMultiplier" : 1,
+                      "period" : "D",
+                      "meta" : {
+                        "globalKey" : "ea4abbbd"
                       },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                      "dayType" : "Business"
+                    },
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "20a71d",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da378121"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7d89fb0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "7a3b7346"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "b89a74cb"
+                      "globalReference" : "b13bf71b",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodEndDate",
                     "fixingDates" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "23728acc"
+                        "globalKey" : "98ca5cd4"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
+                      "businessDayConvention" : "PRECEDING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
@@ -778,82 +731,79 @@
                           "globalKey" : "20a71d"
                         }
                       },
-                      "businessDayConvention" : "PRECEDING",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates",
-                        "globalReference" : "c9907a5f"
+                        "globalReference" : "4a7f3e4d",
+                        "externalReference" : "resetDates"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates",
-                      "globalKey" : "c9907a5f"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
+                      "meta" : {
+                        "globalKey" : "73"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "20a71d"
+                          "globalReference" : "20a71d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da378121"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d89fb0"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "a2d"
-                      },
-                      "period" : "T",
-                      "periodMultiplier" : 1
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                    "meta" : {
+                      "globalKey" : "4a7f3e4d",
+                      "externalKey" : "resetDates"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "94fe34f9"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "20a71d"
-                        },
-                        "meta" : {
-                          "globalKey" : "da378121"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7d89fb0"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "25e2ab"
-                      },
-                      "period" : "T",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "NONE"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2001-01-29",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -862,221 +812,271 @@
                         },
                         "meta" : {
                           "globalKey" : "eae28c55"
-                        },
-                        "unadjustedDate" : "2001-01-29"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "eae28c55"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "809dacb3"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2001-04-29",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "20a71d"
+                              "globalReference" : "20a71d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da378121"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d89fb0"
                           }
                         },
                         "meta" : {
                           "globalKey" : "53ebbcd"
-                        },
-                        "unadjustedDate" : "2001-04-29"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "53ebbcd"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "99064caf"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "dcfca863"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "20a71d"
+                          "globalReference" : "20a71d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da378121"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7d89fb0"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
                       "meta" : {
-                        "globalKey" : "a2d"
+                        "globalKey" : "24b525"
                       },
-                      "period" : "T",
-                      "periodMultiplier" : 1
+                      "rollConvention" : "NONE"
+                    },
+                    "meta" : {
+                      "globalKey" : "20b4d12d",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
+                        "globalKey" : "73"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "20a71d",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da378121"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7d89fb0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "cdd41909"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "2e2deefb"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "ee4ca61a"
+                  "globalKey" : "db796162"
                 }
+              },
+              "calculationAgent" : {
+                "calculationAgentParty" : "CalculationAgentIndependent"
               }
             },
             "meta" : {
-              "globalKey" : "5c0c6c59"
+              "globalKey" : "61c1cb35"
             }
           },
           "meta" : {
-            "globalKey" : "5c0c6c59"
+            "globalKey" : "61c1cb35"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "f2809620"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "23c05191"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "EUR-EONIA-OIS-COMPOUND"
+            "quantity" : [ {
+              "value" : {
+                "value" : 100000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "EUR"
                   }
                 }
-              }
-            },
-            "quantity" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "EUR"
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "EUR-EONIA-OIS-COMPOUND"
                   }
                 },
-                "value" : 100000000
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "5449e08f"
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "27beb430"
             },
+            "meta" : {
+              "globalKey" : "9894669e"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.051,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "value" : 0.051,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 100000000,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
-                },
-                "value" : 100000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "d017d1d0"
+            }
+          } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "349a498c",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "4caf4c44",
+            "externalReference" : "party2"
+          }
+        } ],
+        "ancillaryParty" : [ {
+          "role" : "CalculationAgentIndependent",
+          "partyReference" : [ {
+            "globalReference" : "349a498c",
+            "externalReference" : "party1"
           } ]
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3e8859"
-        },
-        "value" : "2001-01-25"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "54930084UKLVMY22DS16",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-            },
-            "value" : "UITD7895394"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "121d7965"
           }
         } ],
-        "issuer" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
+        "name" : {
+          "value" : "Party A"
         },
         "meta" : {
-          "globalKey" : "335bf1d6"
+          "globalKey" : "349a498c",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "48750084UKLVTR22DS78",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "de31bddc"
+          }
+        } ],
+        "name" : {
+          "value" : "Party B"
         },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
+        "meta" : {
+          "globalKey" : "4caf4c44",
+          "externalKey" : "party2"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "b20f3f9c"
+      }
+    },
+    "state" : {
+      "positionState" : "Executed"
+    },
+    "meta" : {
+      "globalKey" : "13a9b02b"
     }
   } ],
-  "eventQualifier" : "Execution",
   "meta" : {
-    "globalKey" : "16d09872"
+    "globalKey" : "2926b44c"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-repo-fixed-rate-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-repo-fixed-rate-func-output.json
index eb9c0371bd..b79e176617 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-repo-fixed-rate-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-repo-fixed-rate-func-output.json
@@ -3,139 +3,44 @@
   "instruction" : [ {
     "primitiveInstruction" : {
       "execution" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "Party1",
-            "globalReference" : "33f59557"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "Party2",
-            "globalReference" : "33f59558"
-          },
-          "role" : "PARTY_2"
-        } ],
-        "parties" : [ {
-          "meta" : {
-            "externalKey" : "Party1",
-            "globalKey" : "33f59557"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-              },
-              "value" : "Party 1"
-            },
-            "meta" : {
-              "globalKey" : "33f59557"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "Party2",
-            "globalKey" : "33f59558"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-              },
-              "value" : "Party 2"
-            },
-            "meta" : {
-              "globalKey" : "33f59558"
-            }
-          } ]
-        } ],
-        "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "2055a57c"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "8145c30a"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "XS"
-                },
-                "meta" : {
-                  "globalKey" : "8145c30a"
-                },
-                "source" : "ISIN"
-              }
-            } ]
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : -0.75,
-              "perUnitOf" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 1292748.3
-            }
-          } ]
-        } ],
         "product" : {
           "contractualProduct" : {
             "economicTerms" : {
               "payout" : {
                 "interestRatePayout" : [ {
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
                     }
                   },
+                  "dayCountFraction" : {
+                    "value" : "ACT/365.FIXED"
+                  },
                   "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2013-10-29",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -144,18 +49,15 @@
                         },
                         "meta" : {
                           "globalKey" : "ec535e95"
-                        },
-                        "unadjustedDate" : "2013-10-29"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ec535e95"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "21ad6787"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2013-11-04",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -164,72 +66,29 @@
                         },
                         "meta" : {
                           "globalKey" : "ec53f0fc"
-                        },
-                        "unadjustedDate" : "2013-11-04"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ec53f0fc"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "21ad6787"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/365.FIXED"
-                  },
                   "meta" : {
-                    "globalKey" : "965f0f1f"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
+                    "globalKey" : "c84f9bcd"
                   }
                 } ],
-                "meta" : {
-                  "globalKey" : "62a30c68"
-                },
                 "securityPayout" : [ {
-                  "initialMargin" : {
-                    "margin" : [ {
-                      "haircut" : -0.04762
-                    } ],
-                    "marginType" : "CASH"
-                  },
-                  "meta" : {
-                    "globalKey" : "5edb1da7"
-                  },
-                  "repoDuration" : "TERM",
                   "securityLeg" : [ {
                     "buyerSeller" : {
-                      "buyer" : "PARTY_1",
-                      "seller" : "PARTY_2"
-                    },
-                    "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                    "meta" : {
-                      "globalKey" : "24119d6"
-                    },
-                    "settlementAmount" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 1292748.3,
-                      "meta" : {
-                        "globalKey" : "59b83060"
-                      }
+                      "buyer" : "Party1",
+                      "seller" : "Party2"
                     },
                     "settlementDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2013-10-29",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -238,36 +97,35 @@
                         },
                         "meta" : {
                           "globalKey" : "ec535e95"
-                        },
-                        "unadjustedDate" : "2013-10-29"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ec535e95"
                       }
-                    }
-                  }, {
-                    "buyerSeller" : {
-                      "buyer" : "PARTY_2",
-                      "seller" : "PARTY_1"
-                    },
-                    "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                    "meta" : {
-                      "externalKey" : "forwardLeg",
-                      "globalKey" : "5c3ebcc4"
                     },
                     "settlementAmount" : {
+                      "value" : 1292748.3,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1292586.71,
                       "meta" : {
-                        "globalKey" : "eaa544d7"
+                        "globalKey" : "59b83060"
                       }
                     },
+                    "deliveryMethod" : "DeliveryVersusPayment",
+                    "meta" : {
+                      "globalKey" : "1f48568c"
+                    }
+                  }, {
+                    "buyerSeller" : {
+                      "buyer" : "Party2",
+                      "seller" : "Party1"
+                    },
                     "settlementDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2013-11-04",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -276,34 +134,56 @@
                         },
                         "meta" : {
                           "globalKey" : "ec53f0fc"
-                        },
-                        "unadjustedDate" : "2013-11-04"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ec53f0fc"
                       }
+                    },
+                    "settlementAmount" : {
+                      "value" : 1292586.71,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "eaa544d7"
+                      }
+                    },
+                    "deliveryMethod" : "DeliveryVersusPayment",
+                    "meta" : {
+                      "globalKey" : "f650339a",
+                      "externalKey" : "forwardLeg"
                     }
                   } ],
+                  "initialMargin" : {
+                    "marginType" : "Cash",
+                    "margin" : [ {
+                      "haircut" : -0.04762
+                    } ]
+                  },
+                  "repoDuration" : "Term",
                   "securityValuation" : [ {
                     "securityValuationModel" : {
                       "bondValuationModel" : {
-                        "bondPriceAndYieldModel" : {
-                          "cleanOrDirtyPrice" : {
-                            "cleanPrice" : {
-                              "cleanPrice" : 112.33475
-                            }
-                          }
-                        },
                         "nominalAmount" : {
+                          "value" : 1096000,
                           "unit" : {
                             "currency" : {
                               "value" : "USD"
                             }
                           },
-                          "value" : 1096000,
                           "meta" : {
                             "globalKey" : "2d3b15b2"
                           }
+                        },
+                        "bondPriceAndYieldModel" : {
+                          "cleanOrDirtyPrice" : {
+                            "cleanPrice" : {
+                              "cleanPrice" : 112.33475
+                            }
+                          }
                         }
                       }
                     },
@@ -315,137 +195,261 @@
                         }
                       } ]
                     }
-                  } ]
-                } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "d56c1f6f"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "8d6beb42"
+                }
               }
             },
             "meta" : {
-              "globalKey" : "62a30c68"
+              "globalKey" : "8d6beb42"
             }
           },
           "meta" : {
-            "globalKey" : "62a30c68"
+            "globalKey" : "8d6beb42"
           }
         },
+        "priceQuantity" : [ {
+          "price" : [ {
+            "value" : {
+              "value" : -0.75,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              },
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 1292748.3,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "XS",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
+                  }
+                },
+                "source" : "ISIN",
+                "meta" : {
+                  "globalKey" : "8145c30a"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "a7729e36"
+            }
+          },
+          "meta" : {
+            "globalKey" : "cd865d28"
+          }
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "33f59557",
+            "externalReference" : "Party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "33f59558",
+            "externalReference" : "Party2"
+          }
+        } ],
+        "parties" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "Party 1",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+              }
+            },
+            "meta" : {
+              "globalKey" : "33f59557"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "33f59557",
+            "externalKey" : "Party1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "Party 2",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+              }
+            },
+            "meta" : {
+              "globalKey" : "33f59558"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "33f59558",
+            "externalKey" : "Party2"
+          }
+        } ],
         "tradeDate" : {
+          "value" : "2013-10-29",
           "meta" : {
             "globalKey" : "3eea9d"
-          },
-          "value" : "2013-10-29"
+          }
         },
         "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "33f59557",
+            "externalReference" : "Party1"
+          },
           "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "Party19235",
               "meta" : {
                 "scheme" : "http://www.party1.com/swaps/trade-id"
-              },
-              "value" : "Party19235"
+              }
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "Party1",
-            "globalReference" : "33f59557"
-          },
           "meta" : {
-            "globalKey" : "18737d68"
+            "globalKey" : "89623ea4"
           }
         }, {
+          "issuerReference" : {
+            "globalReference" : "33f59558",
+            "externalReference" : "Party2"
+          },
           "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "Party22000",
               "meta" : {
                 "scheme" : "http://www.party2.com/swaps/trade-id"
-              },
-              "value" : "Party22000"
+              }
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "Party2",
-            "globalReference" : "33f59558"
-          },
           "meta" : {
-            "globalKey" : "96b8a2ee"
+            "globalKey" : "f14ec0e6"
           }
         } ]
       }
     }
   } ],
+  "eventQualifier" : "Execution",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "29e5c3ab"
-    },
-    "state" : {
-      "positionState" : "EXECUTED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "612cca1c"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "Party1",
-          "globalKey" : "33f59557"
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "33f59557",
+          "externalReference" : "Party1"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "Party19235",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-            },
-            "value" : "Party 1"
-          },
-          "meta" : {
-            "globalKey" : "33f59557"
+              "scheme" : "http://www.party1.com/swaps/trade-id"
+            }
           }
-        } ]
-      }, {
+        } ],
         "meta" : {
-          "externalKey" : "Party2",
-          "globalKey" : "33f59558"
+          "globalKey" : "89623ea4"
+        }
+      }, {
+        "issuerReference" : {
+          "globalReference" : "33f59558",
+          "externalReference" : "Party2"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "Party22000",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-            },
-            "value" : "Party 2"
-          },
-          "meta" : {
-            "globalKey" : "33f59558"
+              "scheme" : "http://www.party2.com/swaps/trade-id"
+            }
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "f14ec0e6"
+        }
       } ],
+      "tradeDate" : {
+        "value" : "2013-10-29",
+        "meta" : {
+          "globalKey" : "3eea9d"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "Party1",
-            "globalReference" : "33f59557"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "Party2",
-            "globalReference" : "33f59558"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "economicTerms" : {
               "payout" : {
                 "interestRatePayout" : [ {
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
                     }
                   },
+                  "dayCountFraction" : {
+                    "value" : "ACT/365.FIXED"
+                  },
                   "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2013-10-29",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -454,18 +458,15 @@
                         },
                         "meta" : {
                           "globalKey" : "ec535e95"
-                        },
-                        "unadjustedDate" : "2013-10-29"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ec535e95"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "21ad6787"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2013-11-04",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -474,72 +475,29 @@
                         },
                         "meta" : {
                           "globalKey" : "ec53f0fc"
-                        },
-                        "unadjustedDate" : "2013-11-04"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ec53f0fc"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "21ad6787"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/365.FIXED"
-                  },
                   "meta" : {
-                    "globalKey" : "965f0f1f"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
+                    "globalKey" : "c84f9bcd"
                   }
                 } ],
-                "meta" : {
-                  "globalKey" : "62a30c68"
-                },
                 "securityPayout" : [ {
-                  "initialMargin" : {
-                    "margin" : [ {
-                      "haircut" : -0.04762
-                    } ],
-                    "marginType" : "CASH"
-                  },
-                  "meta" : {
-                    "globalKey" : "5edb1da7"
-                  },
-                  "repoDuration" : "TERM",
                   "securityLeg" : [ {
                     "buyerSeller" : {
-                      "buyer" : "PARTY_1",
-                      "seller" : "PARTY_2"
-                    },
-                    "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                    "meta" : {
-                      "globalKey" : "24119d6"
-                    },
-                    "settlementAmount" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 1292748.3,
-                      "meta" : {
-                        "globalKey" : "59b83060"
-                      }
+                      "buyer" : "Party1",
+                      "seller" : "Party2"
                     },
                     "settlementDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2013-10-29",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -548,36 +506,35 @@
                         },
                         "meta" : {
                           "globalKey" : "ec535e95"
-                        },
-                        "unadjustedDate" : "2013-10-29"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ec535e95"
                       }
-                    }
-                  }, {
-                    "buyerSeller" : {
-                      "buyer" : "PARTY_2",
-                      "seller" : "PARTY_1"
-                    },
-                    "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                    "meta" : {
-                      "externalKey" : "forwardLeg",
-                      "globalKey" : "5c3ebcc4"
                     },
                     "settlementAmount" : {
+                      "value" : 1292748.3,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1292586.71,
                       "meta" : {
-                        "globalKey" : "eaa544d7"
+                        "globalKey" : "59b83060"
                       }
                     },
+                    "deliveryMethod" : "DeliveryVersusPayment",
+                    "meta" : {
+                      "globalKey" : "1f48568c"
+                    }
+                  }, {
+                    "buyerSeller" : {
+                      "buyer" : "Party2",
+                      "seller" : "Party1"
+                    },
                     "settlementDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2013-11-04",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -586,34 +543,56 @@
                         },
                         "meta" : {
                           "globalKey" : "ec53f0fc"
-                        },
-                        "unadjustedDate" : "2013-11-04"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ec53f0fc"
                       }
+                    },
+                    "settlementAmount" : {
+                      "value" : 1292586.71,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "eaa544d7"
+                      }
+                    },
+                    "deliveryMethod" : "DeliveryVersusPayment",
+                    "meta" : {
+                      "globalKey" : "f650339a",
+                      "externalKey" : "forwardLeg"
                     }
                   } ],
+                  "initialMargin" : {
+                    "marginType" : "Cash",
+                    "margin" : [ {
+                      "haircut" : -0.04762
+                    } ]
+                  },
+                  "repoDuration" : "Term",
                   "securityValuation" : [ {
                     "securityValuationModel" : {
                       "bondValuationModel" : {
-                        "bondPriceAndYieldModel" : {
-                          "cleanOrDirtyPrice" : {
-                            "cleanPrice" : {
-                              "cleanPrice" : 112.33475
-                            }
-                          }
-                        },
                         "nominalAmount" : {
+                          "value" : 1096000,
                           "unit" : {
                             "currency" : {
                               "value" : "USD"
                             }
                           },
-                          "value" : 1096000,
                           "meta" : {
                             "globalKey" : "2d3b15b2"
                           }
+                        },
+                        "bondPriceAndYieldModel" : {
+                          "cleanOrDirtyPrice" : {
+                            "cleanPrice" : {
+                              "cleanPrice" : 112.33475
+                            }
+                          }
                         }
                       }
                     },
@@ -625,132 +604,153 @@
                         }
                       } ]
                     }
-                  } ]
-                } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "d56c1f6f"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "8d6beb42"
+                }
               }
             },
             "meta" : {
-              "globalKey" : "62a30c68"
+              "globalKey" : "8d6beb42"
             }
           },
           "meta" : {
-            "globalKey" : "62a30c68"
+            "globalKey" : "8d6beb42"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "2055a57c"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "8145c30a"
-              },
-              "productIdentifier" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "productIdentifier-1"
-                  } ]
-                },
-                "value" : {
-                  "identifier" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
-                    },
-                    "value" : "XS"
-                  },
-                  "meta" : {
-                    "globalKey" : "8145c30a"
-                  },
-                  "source" : "ISIN"
-                }
-              } ]
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : -0.75,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : -0.75,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 1292748.3,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
+              }
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "XS",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
+                    }
+                  },
+                  "source" : "ISIN",
+                  "meta" : {
+                    "globalKey" : "8145c30a"
+                  }
                 },
-                "value" : 1292748.3
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "productIdentifier-1"
+                  } ]
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "a7729e36"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "cd865d28"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "33f59557",
+            "externalReference" : "Party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "33f59558",
+            "externalReference" : "Party2"
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3eea9d"
-        },
-        "value" : "2013-10-29"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "Party 1",
             "meta" : {
-              "scheme" : "http://www.party1.com/swaps/trade-id"
-            },
-            "value" : "Party19235"
+              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+            }
+          },
+          "meta" : {
+            "globalKey" : "33f59557"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59557"
-        },
         "meta" : {
-          "globalKey" : "18737d68"
+          "globalKey" : "33f59557",
+          "externalKey" : "Party1"
         }
       }, {
-        "assignedIdentifier" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "Party 2",
             "meta" : {
-              "scheme" : "http://www.party2.com/swaps/trade-id"
-            },
-            "value" : "Party22000"
+              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+            }
+          },
+          "meta" : {
+            "globalKey" : "33f59558"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59558"
-        },
         "meta" : {
-          "globalKey" : "96b8a2ee"
+          "globalKey" : "33f59558",
+          "externalKey" : "Party2"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "6d9af9c8"
+      }
+    },
+    "state" : {
+      "positionState" : "Executed"
+    },
+    "meta" : {
+      "globalKey" : "1b2f8f57"
     }
   } ],
-  "eventQualifier" : "Execution",
   "meta" : {
-    "globalKey" : "fccd7de0"
+    "globalKey" : "262342ca"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-swaption-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-swaption-func-output.json
index 0b7315c718..90648cf9e4 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-swaption-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-swaption-func-output.json
@@ -3,149 +3,6 @@
   "instruction" : [ {
     "primitiveInstruction" : {
       "execution" : {
-        "ancillaryParty" : [ {
-          "partyReference" : [ {
-            "externalReference" : "party2",
-            "globalReference" : "d4813764"
-          } ],
-          "role" : "CALCULATION_AGENT_INDEPENDENT"
-        } ],
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "d4813763"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "d4813764"
-          },
-          "role" : "PARTY_2"
-        } ],
-        "parties" : [ {
-          "meta" : {
-            "externalKey" : "party1",
-            "globalKey" : "d4813763"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-              },
-              "value" : "party A"
-            },
-            "identifierType" : "BIC",
-            "meta" : {
-              "globalKey" : "d4813763"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party2",
-            "globalKey" : "d4813764"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-              },
-              "value" : "party B"
-            },
-            "identifierType" : "BIC",
-            "meta" : {
-              "globalKey" : "d4813764"
-            }
-          } ]
-        } ],
-        "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7f30bbe5"
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 0.05,
-              "perUnitOf" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "65d139a0"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EURIBOR-Telerate"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
-              }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
-            }
-          } ]
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -153,45 +10,24 @@
               "productQualifier" : "InterestRate_Option_Swaption"
             } ],
             "economicTerms" : {
-              "calculationAgent" : {
-                "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-              },
               "payout" : {
-                "meta" : {
-                  "globalKey" : "be62c522"
-                },
                 "optionPayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "buyerSeller" : {
-                    "buyer" : "PARTY_1",
-                    "seller" : "PARTY_2"
+                    "buyer" : "Party1",
+                    "seller" : "Party2"
                   },
                   "exerciseTerms" : {
-                    "exerciseProcedure" : {
-                      "followUpConfirmation" : true,
-                      "manualExercise" : {
-                        "exerciseNotice" : {
-                          "businessCenter" : {
-                            "value" : "GBLO"
-                          },
-                          "exerciseNoticeGiver" : "SELLER"
-                        }
-                      }
-                    },
                     "optionStyle" : {
                       "europeanExercise" : {
-                        "earliestExerciseTime" : {
-                          "businessCenter" : {
-                            "value" : "BEBR"
-                          },
-                          "hourMinuteTime" : "09:00:00"
-                        },
                         "expirationDate" : [ {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2001-08-28",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "FOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
@@ -202,35 +38,47 @@
                                   "globalKey" : "4158421"
                                 }
                               },
-                              "businessDayConvention" : "FOLLOWING",
                               "meta" : {
                                 "globalKey" : "da3b6050"
                               }
                             },
                             "meta" : {
                               "globalKey" : "770e7eb4"
-                            },
-                            "unadjustedDate" : "2001-08-28"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "770e7eb4"
                           }
                         } ],
+                        "earliestExerciseTime" : {
+                          "hourMinuteTime" : "09:00:00",
+                          "businessCenter" : {
+                            "value" : "BEBR"
+                          }
+                        },
                         "expirationTime" : {
+                          "hourMinuteTime" : "11:00:00",
                           "businessCenter" : {
                             "value" : "BEBR"
-                          },
-                          "hourMinuteTime" : "11:00:00"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "70973195"
+                          "globalKey" : "83fbdc15"
                         }
                       }
+                    },
+                    "exerciseProcedure" : {
+                      "manualExercise" : {
+                        "exerciseNotice" : {
+                          "exerciseNoticeGiver" : "Seller",
+                          "businessCenter" : {
+                            "value" : "GBLO"
+                          }
+                        }
+                      },
+                      "followUpConfirmation" : true
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "be62c522"
-                  },
                   "underlier" : {
                     "contractualProduct" : {
                       "productTaxonomy" : [ {
@@ -241,46 +89,42 @@
                         "payout" : {
                           "interestRatePayout" : [ {
                             "payerReceiver" : {
-                              "payer" : "PARTY_1",
-                              "receiver" : "PARTY_2"
+                              "payer" : "Party1",
+                              "receiver" : "Party2"
                             },
                             "priceQuantity" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
                               "quantitySchedule" : {
                                 "address" : {
                                   "scope" : "DOCUMENT",
                                   "value" : "quantity-1"
                                 }
+                              },
+                              "meta" : {
+                                "globalKey" : "0"
                               }
                             },
-                            "calculationPeriodDates" : {
-                              "calculationPeriodDatesAdjustments" : {
-                                "businessCenters" : {
-                                  "businessCentersReference" : {
-                                    "externalReference" : "accrualBusinessCenters0",
-                                    "globalReference" : "20a71d"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "26b869c"
+                            "rateSpecification" : {
+                              "fixedRate" : {
+                                "rateSchedule" : {
+                                  "price" : {
+                                    "address" : {
+                                      "scope" : "DOCUMENT",
+                                      "value" : "price-1"
+                                    }
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
-                                  "globalKey" : "e00ca52b"
+                                  "globalKey" : "0"
                                 }
-                              },
-                              "calculationPeriodFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "2b934"
-                                },
-                                "period" : "Y",
-                                "periodMultiplier" : 1,
-                                "rollConvention" : "30"
-                              },
+                              }
+                            },
+                            "dayCountFraction" : {
+                              "value" : "30/360"
+                            },
+                            "calculationPeriodDates" : {
                               "effectiveDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2001-08-30",
                                   "dateAdjustments" : {
                                     "businessDayConvention" : "NONE",
                                     "meta" : {
@@ -289,135 +133,133 @@
                                   },
                                   "meta" : {
                                     "globalKey" : "eae921d6"
-                                  },
-                                  "unadjustedDate" : "2001-08-30"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "CalcPeriodDates0",
-                                "globalKey" : "d3cc58e7"
-                              },
                               "terminationDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2006-08-30",
                                   "dateAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
                                       } ],
                                       "meta" : {
-                                        "externalKey" : "accrualBusinessCenters0",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "accrualBusinessCenters0"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
                                       "globalKey" : "365baaee"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "9ead9b90"
-                                  },
-                                  "unadjustedDate" : "2006-08-30"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
                                 }
+                              },
+                              "calculationPeriodDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
+                                "businessCenters" : {
+                                  "businessCentersReference" : {
+                                    "globalReference" : "20a71d",
+                                    "externalReference" : "accrualBusinessCenters0"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "26b869c"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "e00ca52b"
+                                }
+                              },
+                              "calculationPeriodFrequency" : {
+                                "periodMultiplier" : 1,
+                                "period" : "Y",
+                                "meta" : {
+                                  "globalKey" : "17984"
+                                },
+                                "rollConvention" : "30"
+                              },
+                              "meta" : {
+                                "globalKey" : "2f4e2f95",
+                                "externalKey" : "CalcPeriodDates0"
                               }
                             },
-                            "dayCountFraction" : {
-                              "value" : "30/360"
-                            },
-                            "meta" : {
-                              "globalKey" : "1b29e05c"
-                            },
                             "paymentDates" : {
-                              "meta" : {
-                                "globalKey" : "4d64aef4"
+                              "paymentFrequency" : {
+                                "periodMultiplier" : 1,
+                                "period" : "Y",
+                                "meta" : {
+                                  "globalKey" : "78"
+                                }
                               },
-                              "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                              "payRelativeTo" : "CalculationPeriodEndDate",
                               "paymentDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "EUTA"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "paymentBusinessCenters0",
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "20a71d",
+                                    "externalKey" : "paymentBusinessCenters0"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "365baaee"
                                 }
                               },
-                              "paymentFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "ac8"
-                                },
-                                "period" : "Y",
-                                "periodMultiplier" : 1
+                              "meta" : {
+                                "globalKey" : "9b0d9350"
                               }
                             },
-                            "rateSpecification" : {
-                              "fixedRate" : {
-                                "meta" : {
-                                  "globalKey" : "0"
-                                },
-                                "rateSchedule" : {
-                                  "price" : {
-                                    "address" : {
-                                      "scope" : "DOCUMENT",
-                                      "value" : "price-1"
-                                    }
-                                  }
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "2b126fd0"
                             }
                           }, {
                             "payerReceiver" : {
-                              "payer" : "PARTY_2",
-                              "receiver" : "PARTY_1"
+                              "payer" : "Party2",
+                              "receiver" : "Party1"
                             },
                             "priceQuantity" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
                               "quantitySchedule" : {
                                 "address" : {
                                   "scope" : "DOCUMENT",
                                   "value" : "quantity-2"
                                 }
+                              },
+                              "meta" : {
+                                "globalKey" : "0"
                               }
                             },
-                            "calculationPeriodDates" : {
-                              "calculationPeriodDatesAdjustments" : {
-                                "businessCenters" : {
-                                  "businessCentersReference" : {
-                                    "externalReference" : "accrualBusinessCenters1",
-                                    "globalReference" : "20a71d"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "26bfafb"
+                            "rateSpecification" : {
+                              "floatingRate" : {
+                                "rateOption" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "rateOption-1"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
-                                  "globalKey" : "e00d198a"
+                                  "globalKey" : "0"
                                 }
-                              },
-                              "calculationPeriodFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "28cc3"
-                                },
-                                "period" : "M",
-                                "periodMultiplier" : 6,
-                                "rollConvention" : "30"
-                              },
+                              }
+                            },
+                            "dayCountFraction" : {
+                              "value" : "ACT/360"
+                            },
+                            "calculationPeriodDates" : {
                               "effectiveDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2001-08-30",
                                   "dateAdjustments" : {
                                     "businessDayConvention" : "NONE",
                                     "meta" : {
@@ -426,222 +268,379 @@
                                   },
                                   "meta" : {
                                     "globalKey" : "eae921d6"
-                                  },
-                                  "unadjustedDate" : "2001-08-30"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "CalcPeriodDates1",
-                                "globalKey" : "ed7fb39"
-                              },
                               "terminationDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2006-08-30",
                                   "dateAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
                                       } ],
                                       "meta" : {
-                                        "externalKey" : "accrualBusinessCenters1",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "accrualBusinessCenters1"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
                                       "globalKey" : "365baaee"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "9ead9b90"
-                                  },
-                                  "unadjustedDate" : "2006-08-30"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
                                 }
+                              },
+                              "calculationPeriodDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
+                                "businessCenters" : {
+                                  "businessCentersReference" : {
+                                    "globalReference" : "20a71d",
+                                    "externalReference" : "accrualBusinessCenters1"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "26bfafb"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "e00d198a"
+                                }
+                              },
+                              "calculationPeriodFrequency" : {
+                                "periodMultiplier" : 6,
+                                "period" : "M",
+                                "meta" : {
+                                  "globalKey" : "18ad5"
+                                },
+                                "rollConvention" : "30"
+                              },
+                              "meta" : {
+                                "globalKey" : "972f6dc5",
+                                "externalKey" : "CalcPeriodDates1"
                               }
                             },
-                            "dayCountFraction" : {
-                              "value" : "ACT/360"
-                            },
-                            "meta" : {
-                              "globalKey" : "42ba4bb4"
-                            },
                             "paymentDates" : {
-                              "meta" : {
-                                "globalKey" : "4d64ad85"
+                              "paymentFrequency" : {
+                                "periodMultiplier" : 6,
+                                "period" : "M",
+                                "meta" : {
+                                  "globalKey" : "107"
+                                }
                               },
-                              "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                              "payRelativeTo" : "CalculationPeriodEndDate",
                               "paymentDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "EUTA"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "paymentBusinessCenters1",
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "20a71d",
+                                    "externalKey" : "paymentBusinessCenters1"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "365baaee"
                                 }
                               },
-                              "paymentFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "959"
-                                },
-                                "period" : "M",
-                                "periodMultiplier" : 6
-                              }
-                            },
-                            "rateSpecification" : {
-                              "floatingRate" : {
-                                "meta" : {
-                                  "globalKey" : "0"
-                                },
-                                "rateOption" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "rateOption-1"
-                                  }
-                                }
+                              "meta" : {
+                                "globalKey" : "8f129421"
                               }
                             },
                             "resetDates" : {
                               "calculationPeriodDatesReference" : {
-                                "externalReference" : "CalcPeriodDates1",
-                                "globalReference" : "ed7fb39"
+                                "globalReference" : "972f6dc5",
+                                "externalReference" : "CalcPeriodDates1"
                               },
+                              "resetRelativeTo" : "CalculationPeriodStartDate",
                               "fixingDates" : {
+                                "periodMultiplier" : -2,
+                                "period" : "D",
                                 "meta" : {
-                                  "globalKey" : "2d80ce65"
+                                  "globalKey" : "a5cb919"
                                 },
-                                "period" : "D",
-                                "periodMultiplier" : -2,
-                                "dayType" : "BUSINESS",
+                                "dayType" : "Business",
+                                "businessDayConvention" : "NONE",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "EUTA"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "fixingBusinessCenters0",
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "20a71d",
+                                    "externalKey" : "fixingBusinessCenters0"
                                   }
                                 },
-                                "businessDayConvention" : "NONE",
                                 "dateRelativeTo" : {
-                                  "externalReference" : "resetDates0",
-                                  "globalReference" : "27280e73"
+                                  "globalReference" : "a64bcd67",
+                                  "externalReference" : "resetDates0"
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "resetDates0",
-                                "globalKey" : "27280e73"
+                              "resetFrequency" : {
+                                "periodMultiplier" : 6,
+                                "period" : "M",
+                                "meta" : {
+                                  "globalKey" : "107"
+                                }
                               },
                               "resetDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "paymentBusinessCenters1",
-                                    "globalReference" : "20a71d"
+                                    "globalReference" : "20a71d",
+                                    "externalReference" : "paymentBusinessCenters1"
                                   },
                                   "meta" : {
                                     "globalKey" : "c3690944"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "a10a27d3"
                                 }
                               },
-                              "resetFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "959"
-                                },
-                                "period" : "M",
-                                "periodMultiplier" : 6
-                              },
-                              "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                              "meta" : {
+                                "globalKey" : "a64bcd67",
+                                "externalKey" : "resetDates0"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "30f825c0"
                             }
                           } ],
                           "meta" : {
-                            "globalKey" : "7f83fd8"
+                            "globalKey" : "62c23bf0"
                           }
                         }
                       },
                       "meta" : {
-                        "globalKey" : "587d6b07"
+                        "globalKey" : "b347671f"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "587d6b07"
+                      "globalKey" : "b347671f"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "776b4b44"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "776b4b44"
+                }
+              },
+              "calculationAgent" : {
+                "calculationAgentParty" : "CalculationAgentIndependent"
+              }
+            },
+            "meta" : {
+              "globalKey" : "d6f86823"
+            }
+          },
+          "meta" : {
+            "globalKey" : "d6f86823"
+          }
+        },
+        "priceQuantity" : [ {
+          "price" : [ {
+            "value" : {
+              "value" : 0.05,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              },
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "66e6c0bb"
+          }
+        }, {
+          "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EURIBOR-Telerate"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
                   }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
                 } ]
               }
             },
             "meta" : {
-              "globalKey" : "6b8e946d"
+              "globalKey" : "2bba2221"
+            }
+          },
+          "meta" : {
+            "globalKey" : "4820adb2"
+          }
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "d4813763",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "d4813764",
+            "externalReference" : "party2"
+          }
+        } ],
+        "ancillaryParty" : [ {
+          "role" : "CalculationAgentIndependent",
+          "partyReference" : [ {
+            "globalReference" : "d4813764",
+            "externalReference" : "party2"
+          } ]
+        } ],
+        "parties" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "party A",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+              }
+            },
+            "identifierType" : "BIC",
+            "meta" : {
+              "globalKey" : "d4813763"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "d4813763",
+            "externalKey" : "party1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "party B",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+              }
+            },
+            "identifierType" : "BIC",
+            "meta" : {
+              "globalKey" : "d4813764"
             }
-          },
+          } ],
           "meta" : {
-            "globalKey" : "6b8e946d"
+            "globalKey" : "d4813764",
+            "externalKey" : "party2"
           }
-        },
+        } ],
         "tradeDate" : {
+          "value" : "2000-08-30",
           "meta" : {
             "globalKey" : "3e821e"
-          },
-          "value" : "2000-08-30"
+          }
         },
         "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "d4813763",
+            "externalReference" : "party1"
+          },
           "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "123",
               "meta" : {
                 "scheme" : "http://www.partyA.com/trade-id"
-              },
-              "value" : "123"
+              }
             },
             "version" : 1
           } ],
-          "issuerReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "d4813763"
-          },
           "meta" : {
-            "globalKey" : "52e63ae5"
+            "globalKey" : "72886a2b"
           }
         } ]
       },
       "transfer" : {
         "transferState" : [ {
-          "meta" : {
-            "globalKey" : "6bba78c2"
-          },
           "transfer" : {
-            "payerReceiver" : {
-              "payerPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "d4813763"
-              },
-              "receiverPartyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "d4813764"
-              }
-            },
             "quantity" : {
+              "value" : 100000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
+              }
+            },
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "globalReference" : "d4813763",
+                "externalReference" : "party1"
               },
-              "value" : 100000
+              "receiverPartyReference" : {
+                "globalReference" : "d4813764",
+                "externalReference" : "party2"
+              }
             },
             "settlementDate" : {
+              "unadjustedDate" : "2000-08-30",
               "dateAdjustments" : {
+                "businessDayConvention" : "FOLLOWING",
                 "businessCenters" : {
                   "businessCenter" : [ {
                     "value" : "EUTA"
@@ -650,88 +649,50 @@
                     "globalKey" : "20a71d"
                   }
                 },
-                "businessDayConvention" : "FOLLOWING",
                 "meta" : {
                   "globalKey" : "211dc30c"
                 }
-              },
-              "unadjustedDate" : "2000-08-30"
+              }
             },
             "transferExpression" : {
-              "priceTransfer" : "PREMIUM"
+              "priceTransfer" : "Premium"
             }
+          },
+          "meta" : {
+            "globalKey" : "33666668"
           }
         } ]
       }
     }
   } ],
+  "eventQualifier" : "Execution",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "16a8b820"
-    },
-    "state" : {
-      "positionState" : "EXECUTED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "d4c46d11"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "d4813763"
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "d4813763",
+          "externalReference" : "party1"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "123",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-            },
-            "value" : "party A"
+              "scheme" : "http://www.partyA.com/trade-id"
+            }
           },
-          "identifierType" : "BIC",
-          "meta" : {
-            "globalKey" : "d4813763"
-          }
-        } ]
-      }, {
+          "version" : 1
+        } ],
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "d4813764"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-            },
-            "value" : "party B"
-          },
-          "identifierType" : "BIC",
-          "meta" : {
-            "globalKey" : "d4813764"
-          }
-        } ]
+          "globalKey" : "72886a2b"
+        }
       } ],
+      "tradeDate" : {
+        "value" : "2000-08-30",
+        "meta" : {
+          "globalKey" : "3e821e"
+        }
+      },
       "tradableProduct" : {
-        "ancillaryParty" : [ {
-          "partyReference" : [ {
-            "externalReference" : "party2",
-            "globalReference" : "d4813764"
-          } ],
-          "role" : "CALCULATION_AGENT_INDEPENDENT"
-        } ],
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "d4813763"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "d4813764"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -739,45 +700,24 @@
               "productQualifier" : "InterestRate_Option_Swaption"
             } ],
             "economicTerms" : {
-              "calculationAgent" : {
-                "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-              },
               "payout" : {
-                "meta" : {
-                  "globalKey" : "be62c522"
-                },
                 "optionPayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "buyerSeller" : {
-                    "buyer" : "PARTY_1",
-                    "seller" : "PARTY_2"
+                    "buyer" : "Party1",
+                    "seller" : "Party2"
                   },
                   "exerciseTerms" : {
-                    "exerciseProcedure" : {
-                      "followUpConfirmation" : true,
-                      "manualExercise" : {
-                        "exerciseNotice" : {
-                          "businessCenter" : {
-                            "value" : "GBLO"
-                          },
-                          "exerciseNoticeGiver" : "SELLER"
-                        }
-                      }
-                    },
                     "optionStyle" : {
                       "europeanExercise" : {
-                        "earliestExerciseTime" : {
-                          "businessCenter" : {
-                            "value" : "BEBR"
-                          },
-                          "hourMinuteTime" : "09:00:00"
-                        },
                         "expirationDate" : [ {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2001-08-28",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "FOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
@@ -788,35 +728,47 @@
                                   "globalKey" : "4158421"
                                 }
                               },
-                              "businessDayConvention" : "FOLLOWING",
                               "meta" : {
                                 "globalKey" : "da3b6050"
                               }
                             },
                             "meta" : {
                               "globalKey" : "770e7eb4"
-                            },
-                            "unadjustedDate" : "2001-08-28"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "770e7eb4"
                           }
                         } ],
+                        "earliestExerciseTime" : {
+                          "hourMinuteTime" : "09:00:00",
+                          "businessCenter" : {
+                            "value" : "BEBR"
+                          }
+                        },
                         "expirationTime" : {
+                          "hourMinuteTime" : "11:00:00",
                           "businessCenter" : {
                             "value" : "BEBR"
-                          },
-                          "hourMinuteTime" : "11:00:00"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "70973195"
+                          "globalKey" : "83fbdc15"
                         }
                       }
+                    },
+                    "exerciseProcedure" : {
+                      "manualExercise" : {
+                        "exerciseNotice" : {
+                          "exerciseNoticeGiver" : "Seller",
+                          "businessCenter" : {
+                            "value" : "GBLO"
+                          }
+                        }
+                      },
+                      "followUpConfirmation" : true
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "be62c522"
-                  },
                   "underlier" : {
                     "contractualProduct" : {
                       "productTaxonomy" : [ {
@@ -827,46 +779,42 @@
                         "payout" : {
                           "interestRatePayout" : [ {
                             "payerReceiver" : {
-                              "payer" : "PARTY_1",
-                              "receiver" : "PARTY_2"
+                              "payer" : "Party1",
+                              "receiver" : "Party2"
                             },
                             "priceQuantity" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
                               "quantitySchedule" : {
                                 "address" : {
                                   "scope" : "DOCUMENT",
                                   "value" : "quantity-1"
                                 }
+                              },
+                              "meta" : {
+                                "globalKey" : "0"
                               }
                             },
-                            "calculationPeriodDates" : {
-                              "calculationPeriodDatesAdjustments" : {
-                                "businessCenters" : {
-                                  "businessCentersReference" : {
-                                    "externalReference" : "accrualBusinessCenters0",
-                                    "globalReference" : "20a71d"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "26b869c"
+                            "rateSpecification" : {
+                              "fixedRate" : {
+                                "rateSchedule" : {
+                                  "price" : {
+                                    "address" : {
+                                      "scope" : "DOCUMENT",
+                                      "value" : "price-1"
+                                    }
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
-                                  "globalKey" : "e00ca52b"
+                                  "globalKey" : "0"
                                 }
-                              },
-                              "calculationPeriodFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "2b934"
-                                },
-                                "period" : "Y",
-                                "periodMultiplier" : 1,
-                                "rollConvention" : "30"
-                              },
+                              }
+                            },
+                            "dayCountFraction" : {
+                              "value" : "30/360"
+                            },
+                            "calculationPeriodDates" : {
                               "effectiveDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2001-08-30",
                                   "dateAdjustments" : {
                                     "businessDayConvention" : "NONE",
                                     "meta" : {
@@ -875,135 +823,133 @@
                                   },
                                   "meta" : {
                                     "globalKey" : "eae921d6"
-                                  },
-                                  "unadjustedDate" : "2001-08-30"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "CalcPeriodDates0",
-                                "globalKey" : "d3cc58e7"
-                              },
                               "terminationDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2006-08-30",
                                   "dateAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
                                       } ],
                                       "meta" : {
-                                        "externalKey" : "accrualBusinessCenters0",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "accrualBusinessCenters0"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
                                       "globalKey" : "365baaee"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "9ead9b90"
-                                  },
-                                  "unadjustedDate" : "2006-08-30"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
                                 }
+                              },
+                              "calculationPeriodDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
+                                "businessCenters" : {
+                                  "businessCentersReference" : {
+                                    "globalReference" : "20a71d",
+                                    "externalReference" : "accrualBusinessCenters0"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "26b869c"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "e00ca52b"
+                                }
+                              },
+                              "calculationPeriodFrequency" : {
+                                "periodMultiplier" : 1,
+                                "period" : "Y",
+                                "meta" : {
+                                  "globalKey" : "17984"
+                                },
+                                "rollConvention" : "30"
+                              },
+                              "meta" : {
+                                "globalKey" : "2f4e2f95",
+                                "externalKey" : "CalcPeriodDates0"
                               }
                             },
-                            "dayCountFraction" : {
-                              "value" : "30/360"
-                            },
-                            "meta" : {
-                              "globalKey" : "1b29e05c"
-                            },
                             "paymentDates" : {
-                              "meta" : {
-                                "globalKey" : "4d64aef4"
+                              "paymentFrequency" : {
+                                "periodMultiplier" : 1,
+                                "period" : "Y",
+                                "meta" : {
+                                  "globalKey" : "78"
+                                }
                               },
-                              "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                              "payRelativeTo" : "CalculationPeriodEndDate",
                               "paymentDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "EUTA"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "paymentBusinessCenters0",
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "20a71d",
+                                    "externalKey" : "paymentBusinessCenters0"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "365baaee"
                                 }
                               },
-                              "paymentFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "ac8"
-                                },
-                                "period" : "Y",
-                                "periodMultiplier" : 1
+                              "meta" : {
+                                "globalKey" : "9b0d9350"
                               }
                             },
-                            "rateSpecification" : {
-                              "fixedRate" : {
-                                "meta" : {
-                                  "globalKey" : "0"
-                                },
-                                "rateSchedule" : {
-                                  "price" : {
-                                    "address" : {
-                                      "scope" : "DOCUMENT",
-                                      "value" : "price-1"
-                                    }
-                                  }
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "2b126fd0"
                             }
                           }, {
                             "payerReceiver" : {
-                              "payer" : "PARTY_2",
-                              "receiver" : "PARTY_1"
+                              "payer" : "Party2",
+                              "receiver" : "Party1"
                             },
                             "priceQuantity" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
                               "quantitySchedule" : {
                                 "address" : {
                                   "scope" : "DOCUMENT",
                                   "value" : "quantity-2"
                                 }
+                              },
+                              "meta" : {
+                                "globalKey" : "0"
                               }
                             },
-                            "calculationPeriodDates" : {
-                              "calculationPeriodDatesAdjustments" : {
-                                "businessCenters" : {
-                                  "businessCentersReference" : {
-                                    "externalReference" : "accrualBusinessCenters1",
-                                    "globalReference" : "20a71d"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "26bfafb"
+                            "rateSpecification" : {
+                              "floatingRate" : {
+                                "rateOption" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "rateOption-1"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
-                                  "globalKey" : "e00d198a"
+                                  "globalKey" : "0"
                                 }
-                              },
-                              "calculationPeriodFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "28cc3"
-                                },
-                                "period" : "M",
-                                "periodMultiplier" : 6,
-                                "rollConvention" : "30"
-                              },
+                              }
+                            },
+                            "dayCountFraction" : {
+                              "value" : "ACT/360"
+                            },
+                            "calculationPeriodDates" : {
                               "effectiveDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2001-08-30",
                                   "dateAdjustments" : {
                                     "businessDayConvention" : "NONE",
                                     "meta" : {
@@ -1012,312 +958,363 @@
                                   },
                                   "meta" : {
                                     "globalKey" : "eae921d6"
-                                  },
-                                  "unadjustedDate" : "2001-08-30"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "CalcPeriodDates1",
-                                "globalKey" : "ed7fb39"
-                              },
                               "terminationDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2006-08-30",
                                   "dateAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
                                       } ],
                                       "meta" : {
-                                        "externalKey" : "accrualBusinessCenters1",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "accrualBusinessCenters1"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
                                       "globalKey" : "365baaee"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "9ead9b90"
-                                  },
-                                  "unadjustedDate" : "2006-08-30"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
                                 }
+                              },
+                              "calculationPeriodDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
+                                "businessCenters" : {
+                                  "businessCentersReference" : {
+                                    "globalReference" : "20a71d",
+                                    "externalReference" : "accrualBusinessCenters1"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "26bfafb"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "e00d198a"
+                                }
+                              },
+                              "calculationPeriodFrequency" : {
+                                "periodMultiplier" : 6,
+                                "period" : "M",
+                                "meta" : {
+                                  "globalKey" : "18ad5"
+                                },
+                                "rollConvention" : "30"
+                              },
+                              "meta" : {
+                                "globalKey" : "972f6dc5",
+                                "externalKey" : "CalcPeriodDates1"
                               }
                             },
-                            "dayCountFraction" : {
-                              "value" : "ACT/360"
-                            },
-                            "meta" : {
-                              "globalKey" : "42ba4bb4"
-                            },
                             "paymentDates" : {
-                              "meta" : {
-                                "globalKey" : "4d64ad85"
+                              "paymentFrequency" : {
+                                "periodMultiplier" : 6,
+                                "period" : "M",
+                                "meta" : {
+                                  "globalKey" : "107"
+                                }
                               },
-                              "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                              "payRelativeTo" : "CalculationPeriodEndDate",
                               "paymentDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "EUTA"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "paymentBusinessCenters1",
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "20a71d",
+                                    "externalKey" : "paymentBusinessCenters1"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "365baaee"
                                 }
                               },
-                              "paymentFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "959"
-                                },
-                                "period" : "M",
-                                "periodMultiplier" : 6
-                              }
-                            },
-                            "rateSpecification" : {
-                              "floatingRate" : {
-                                "meta" : {
-                                  "globalKey" : "0"
-                                },
-                                "rateOption" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "rateOption-1"
-                                  }
-                                }
+                              "meta" : {
+                                "globalKey" : "8f129421"
                               }
                             },
                             "resetDates" : {
                               "calculationPeriodDatesReference" : {
-                                "externalReference" : "CalcPeriodDates1",
-                                "globalReference" : "ed7fb39"
+                                "globalReference" : "972f6dc5",
+                                "externalReference" : "CalcPeriodDates1"
                               },
+                              "resetRelativeTo" : "CalculationPeriodStartDate",
                               "fixingDates" : {
+                                "periodMultiplier" : -2,
+                                "period" : "D",
                                 "meta" : {
-                                  "globalKey" : "2d80ce65"
+                                  "globalKey" : "a5cb919"
                                 },
-                                "period" : "D",
-                                "periodMultiplier" : -2,
-                                "dayType" : "BUSINESS",
+                                "dayType" : "Business",
+                                "businessDayConvention" : "NONE",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "EUTA"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "fixingBusinessCenters0",
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "20a71d",
+                                    "externalKey" : "fixingBusinessCenters0"
                                   }
                                 },
-                                "businessDayConvention" : "NONE",
                                 "dateRelativeTo" : {
-                                  "externalReference" : "resetDates0",
-                                  "globalReference" : "27280e73"
+                                  "globalReference" : "a64bcd67",
+                                  "externalReference" : "resetDates0"
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "resetDates0",
-                                "globalKey" : "27280e73"
+                              "resetFrequency" : {
+                                "periodMultiplier" : 6,
+                                "period" : "M",
+                                "meta" : {
+                                  "globalKey" : "107"
+                                }
                               },
                               "resetDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "paymentBusinessCenters1",
-                                    "globalReference" : "20a71d"
+                                    "globalReference" : "20a71d",
+                                    "externalReference" : "paymentBusinessCenters1"
                                   },
                                   "meta" : {
                                     "globalKey" : "c3690944"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "a10a27d3"
                                 }
                               },
-                              "resetFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "959"
-                                },
-                                "period" : "M",
-                                "periodMultiplier" : 6
-                              },
-                              "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                              "meta" : {
+                                "globalKey" : "a64bcd67",
+                                "externalKey" : "resetDates0"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "30f825c0"
                             }
                           } ],
                           "meta" : {
-                            "globalKey" : "7f83fd8"
+                            "globalKey" : "62c23bf0"
                           }
                         }
                       },
                       "meta" : {
-                        "globalKey" : "587d6b07"
+                        "globalKey" : "b347671f"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "587d6b07"
+                      "globalKey" : "b347671f"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "776b4b44"
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "776b4b44"
+                }
+              },
+              "calculationAgent" : {
+                "calculationAgentParty" : "CalculationAgentIndependent"
               }
             },
             "meta" : {
-              "globalKey" : "6b8e946d"
+              "globalKey" : "d6f86823"
             }
           },
           "meta" : {
-            "globalKey" : "6b8e946d"
+            "globalKey" : "d6f86823"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "7f30bbe5"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.05,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "value" : 0.05,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
+                "priceType" : "InterestRate"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-1"
+                } ]
               }
             } ],
             "quantity" : [ {
+              "value" : {
+                "value" : 100000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "EUR"
+                  }
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "66e6c0bb"
+            }
+          }, {
+            "quantity" : [ {
               "value" : {
+                "value" : 100000000,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
-                },
-                "value" : 100000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "65d139a0"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "bf589e11"
-              },
               "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
                 "value" : {
                   "floatingRateIndex" : {
                     "value" : "EUR-EURIBOR-Telerate"
                   },
                   "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
+                    "periodMultiplier" : 6,
                     "period" : "M",
-                    "periodMultiplier" : 6
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
                 }
-              }
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
-                } ]
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "EUR"
-                  }
-                },
-                "value" : 100000000
+              "meta" : {
+                "globalKey" : "2bba2221"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "4820adb2"
+            }
+          } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "d4813763",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "d4813764",
+            "externalReference" : "party2"
+          }
+        } ],
+        "ancillaryParty" : [ {
+          "role" : "CalculationAgentIndependent",
+          "partyReference" : [ {
+            "globalReference" : "d4813764",
+            "externalReference" : "party2"
           } ]
         } ]
       },
-      "tradeDate" : {
+      "party" : [ {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "party A",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+            }
+          },
+          "identifierType" : "BIC",
+          "meta" : {
+            "globalKey" : "d4813763"
+          }
+        } ],
         "meta" : {
-          "globalKey" : "3e821e"
-        },
-        "value" : "2000-08-30"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+          "globalKey" : "d4813763",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "party B",
             "meta" : {
-              "scheme" : "http://www.partyA.com/trade-id"
-            },
-            "value" : "123"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+            }
           },
-          "version" : 1
+          "identifierType" : "BIC",
+          "meta" : {
+            "globalKey" : "d4813764"
+          }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "d4813763"
-        },
         "meta" : {
-          "globalKey" : "52e63ae5"
+          "globalKey" : "d4813764",
+          "externalKey" : "party2"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "51cd49d7"
+      }
+    },
+    "state" : {
+      "positionState" : "Executed"
     },
     "transferHistory" : [ {
-      "meta" : {
-        "globalKey" : "6bba78c2"
-      },
       "transfer" : {
-        "payerReceiver" : {
-          "payerPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "d4813763"
-          },
-          "receiverPartyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "d4813764"
-          }
-        },
         "quantity" : {
+          "value" : 100000,
           "unit" : {
             "currency" : {
               "value" : "EUR"
             }
+          }
+        },
+        "payerReceiver" : {
+          "payerPartyReference" : {
+            "globalReference" : "d4813763",
+            "externalReference" : "party1"
           },
-          "value" : 100000
+          "receiverPartyReference" : {
+            "globalReference" : "d4813764",
+            "externalReference" : "party2"
+          }
         },
         "settlementDate" : {
+          "unadjustedDate" : "2000-08-30",
           "dateAdjustments" : {
+            "businessDayConvention" : "FOLLOWING",
             "businessCenters" : {
               "businessCenter" : [ {
                 "value" : "EUTA"
@@ -1326,21 +1323,24 @@
                 "globalKey" : "20a71d"
               }
             },
-            "businessDayConvention" : "FOLLOWING",
             "meta" : {
               "globalKey" : "211dc30c"
             }
-          },
-          "unadjustedDate" : "2000-08-30"
+          }
         },
         "transferExpression" : {
-          "priceTransfer" : "PREMIUM"
+          "priceTransfer" : "Premium"
         }
+      },
+      "meta" : {
+        "globalKey" : "33666668"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "1a9eda02"
+    }
   } ],
-  "eventQualifier" : "Execution",
   "meta" : {
-    "globalKey" : "71ce6ae3"
+    "globalKey" : "97bb22e7"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/exercise/exercise-cancellable-option-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/exercise/exercise-cancellable-option-func-output.json
index 836d87434a..52a2e7109e 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/exercise/exercise-cancellable-option-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/exercise/exercise-cancellable-option-func-output.json
@@ -1,145 +1,100 @@
 {
+  "intent" : "OptionExercise",
   "eventDate" : "2019-04-01",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "fe5591db"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "fe5591db"
-          },
-          "party" : [ {
-            "businessUnit" : [ {
-              "meta" : {
-                "externalKey" : "desk1",
-                "globalKey" : "5c10b72e"
-              },
-              "name" : "NY Swaps Desk"
-            } ],
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "fdda73db"
-            },
-            "name" : {
-              "value" : "Bank X"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI1RPT0001"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "b8962566"
+    "primitiveInstruction" : {
+      "quantityChange" : {
+        "change" : [ {
+          "quantity" : [ {
+            "value" : {
+              "value" : 12000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
               }
-            } ],
-            "person" : [ {
-              "firstName" : "jjone",
-              "meta" : {
-                "externalKey" : "trader",
-                "globalKey" : "d3962233"
-              },
-              "personId" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "jjones"
-                  },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "8bb50ed3"
+          }
+        } ],
+        "direction" : "Replace"
+      },
+      "transfer" : {
+        "transferState" : [ {
+          "transfer" : {
+            "quantity" : {
+              "value" : 2000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR",
                   "meta" : {
-                    "globalKey" : "baeb8c0d"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
                   }
                 }
-              } ]
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "ee963b6"
-            },
-            "name" : {
-              "value" : "Bank Y"
+              }
             },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI2CP0002"
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "globalReference" : "74dee05b",
+                "externalReference" : "party1"
               },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "eb8edea1"
+              "receiverPartyReference" : {
+                "globalReference" : "b97c11f6",
+                "externalReference" : "party2"
               }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "broker1",
-              "globalKey" : "ed0cc6d1"
-            },
-            "name" : {
-              "value" : "Up&Atem"
             },
-            "partyId" : [ {
-              "identifier" : {
+            "settlementDate" : {
+              "adjustedDate" : {
+                "value" : "2019-04-03",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "549300OL8KL0WCQ34V31"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "8ffabe4b"
+                  "globalKey" : "3f1903"
+                }
               }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "clearing-svc",
-              "globalKey" : "611719a0"
             },
-            "name" : {
-              "value" : "ClearItAll"
+            "transferExpression" : {
+              "scheduledTransfer" : {
+                "transferType" : "Exercise"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "489db9ae"
+          }
+        } ]
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "LEI1RPT0001",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+              }
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "LEI1RPT0001JJJJ",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "549300IB5Q45JGNPND58"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "e213e7d7"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                }
               }
-            } ]
-          } ],
-          "partyRole" : [ {
-            "ownershipPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "fdda73db"
-            },
-            "partyReference" : {
-              "externalReference" : "clearing-svc",
-              "globalReference" : "611719a0"
+            } ],
+            "meta" : {
+              "globalKey" : "7ac64538"
             },
-            "role" : "CLEARING_ORGANIZATION"
+            "identifierType" : "UniqueTransactionIdentifier"
           } ],
+          "tradeDate" : {
+            "value" : "2018-04-01",
+            "meta" : {
+              "globalKey" : "3f1101"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "fdda73db"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ee963b6"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -150,46 +105,42 @@
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "accrualBusinessCenters0",
-                              "globalReference" : "20a71d"
-                            },
-                            "meta" : {
-                              "globalKey" : "26b869c"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "e00ca52b"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "2b934"
-                          },
-                          "period" : "Y",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "30"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "30/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2018-04-03",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -198,135 +149,133 @@
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
-                            },
-                            "unadjustedDate" : "2018-04-03"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ece3837b"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "CalcPeriodDates0",
-                          "globalKey" : "c154a58c"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2026-08-30",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "accrualBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "accrualBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
                             "meta" : {
                               "globalKey" : "a610fb90"
-                            },
-                            "unadjustedDate" : "2026-08-30"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "a610fb90"
                           }
+                        },
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "20a71d",
+                              "externalReference" : "accrualBusinessCenters0"
+                            },
+                            "meta" : {
+                              "globalKey" : "26b869c"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "e00ca52b"
+                          }
+                        },
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
+                          "meta" : {
+                            "globalKey" : "17984"
+                          },
+                          "rollConvention" : "30"
+                        },
+                        "meta" : {
+                          "globalKey" : "b137acba",
+                          "externalKey" : "CalcPeriodDates0"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "30/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "1d841517"
-                      },
                       "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "4d64aef4"
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
+                          "meta" : {
+                            "globalKey" : "78"
+                          }
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                        "payRelativeTo" : "CalculationPeriodEndDate",
                         "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
                             } ],
                             "meta" : {
-                              "externalKey" : "paymentBusinessCenters0",
-                              "globalKey" : "20a71d"
+                              "globalKey" : "20a71d",
+                              "externalKey" : "paymentBusinessCenters0"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
-                        "paymentFrequency" : {
-                          "meta" : {
-                            "globalKey" : "ac8"
-                          },
-                          "period" : "Y",
-                          "periodMultiplier" : 1
+                        "meta" : {
+                          "globalKey" : "9b0d9350"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
-                          }
-                        }
+                      "meta" : {
+                        "globalKey" : "4e1182b5"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "accrualBusinessCenters1",
-                              "globalReference" : "20a71d"
-                            },
-                            "meta" : {
-                              "globalKey" : "26bfafb"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "e00d198a"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "28cc3"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6,
-                          "rollConvention" : "30"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2018-04-03",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -335,165 +284,167 @@
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
-                            },
-                            "unadjustedDate" : "2018-04-03"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ece3837b"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "CalcPeriodDates1",
-                          "globalKey" : "fc6047de"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2026-08-30",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "accrualBusinessCenters1",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "accrualBusinessCenters1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
                             "meta" : {
                               "globalKey" : "a610fb90"
-                            },
-                            "unadjustedDate" : "2026-08-30"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "a610fb90"
                           }
+                        },
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "20a71d",
+                              "externalReference" : "accrualBusinessCenters1"
+                            },
+                            "meta" : {
+                              "globalKey" : "26bfafb"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "e00d198a"
+                          }
+                        },
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "18ad5"
+                          },
+                          "rollConvention" : "30"
+                        },
+                        "meta" : {
+                          "globalKey" : "1918eaea",
+                          "externalKey" : "CalcPeriodDates1"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "924eb82a"
-                      },
                       "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "4d64ad85"
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                        "payRelativeTo" : "CalculationPeriodEndDate",
                         "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
                             } ],
                             "meta" : {
-                              "externalKey" : "paymentBusinessCenters1",
-                              "globalKey" : "20a71d"
+                              "globalKey" : "20a71d",
+                              "externalKey" : "paymentBusinessCenters1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
-                        "paymentFrequency" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6
-                        }
-                      },
-                      "rateSpecification" : {
-                        "floatingRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
-                            }
-                          }
+                        "meta" : {
+                          "globalKey" : "8f129421"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "CalcPeriodDates1",
-                          "globalReference" : "fc6047de"
+                          "globalReference" : "1918eaea",
+                          "externalReference" : "CalcPeriodDates1"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "2d80ce65"
+                            "globalKey" : "a5cb919"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
                             } ],
                             "meta" : {
-                              "externalKey" : "fixingBusinessCenters0",
-                              "globalKey" : "20a71d"
+                              "globalKey" : "20a71d",
+                              "externalKey" : "fixingBusinessCenters0"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates0",
-                            "globalReference" : "e6388aee"
+                            "globalReference" : "5d766962",
+                            "externalReference" : "resetDates0"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates0",
-                          "globalKey" : "e6388aee"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "paymentBusinessCenters1",
-                              "globalReference" : "20a71d"
+                              "globalReference" : "20a71d",
+                              "externalReference" : "paymentBusinessCenters1"
                             },
                             "meta" : {
                               "globalKey" : "c3690944"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "a10a27d3"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "5d766962",
+                          "externalKey" : "resetDates0"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "886086b6"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "b558f833"
+                      "globalKey" : "63711561"
                     }
                   },
                   "terminationProvision" : {
                     "cancelableProvision" : {
-                      "buyer" : "PARTY_2",
-                      "seller" : "PARTY_1",
+                      "buyer" : "Party2",
+                      "seller" : "Party1",
                       "europeanExercise" : {
-                        "earliestExerciseTime" : {
-                          "businessCenter" : {
-                            "value" : "BEBR"
-                          },
-                          "hourMinuteTime" : "09:00:00"
-                        },
                         "expirationDate" : [ {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2026-08-15",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "FOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "GBLO"
@@ -504,32 +455,23 @@
                                   "globalKey" : "428533f"
                                 }
                               },
-                              "businessDayConvention" : "FOLLOWING",
                               "meta" : {
                                 "globalKey" : "da4e2f6e"
                               }
                             },
                             "meta" : {
                               "globalKey" : "1bc03e7f"
-                            },
-                            "unadjustedDate" : "2026-08-15"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "1bc03e7f"
                           }
                         } ],
-                        "expirationTime" : {
-                          "businessCenter" : {
-                            "value" : "BEBR"
-                          },
-                          "hourMinuteTime" : "11:00:00"
-                        },
-                        "meta" : {
-                          "globalKey" : "e66f478e"
-                        },
                         "relevantUnderlyingDate" : {
                           "adjustableDates" : {
+                            "unadjustedDate" : [ "2026-08-30" ],
                             "dateAdjustments" : {
+                              "businessDayConvention" : "FOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
@@ -538,19 +480,32 @@
                                   "globalKey" : "20a71d"
                                 }
                               },
-                              "businessDayConvention" : "FOLLOWING",
                               "meta" : {
                                 "globalKey" : "211dc30c"
                               }
                             },
                             "meta" : {
                               "globalKey" : "90d313ae"
-                            },
-                            "unadjustedDate" : [ "2026-08-30" ]
+                            }
                           },
                           "meta" : {
                             "globalKey" : "90d313ae"
                           }
+                        },
+                        "earliestExerciseTime" : {
+                          "hourMinuteTime" : "09:00:00",
+                          "businessCenter" : {
+                            "value" : "BEBR"
+                          }
+                        },
+                        "expirationTime" : {
+                          "hourMinuteTime" : "11:00:00",
+                          "businessCenter" : {
+                            "value" : "BEBR"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "b88a378e"
                         }
                       },
                       "exerciseNotice" : {
@@ -563,336 +518,273 @@
                   }
                 },
                 "meta" : {
-                  "globalKey" : "bfafec3e"
+                  "globalKey" : "d415e050"
                 }
               },
               "meta" : {
-                "globalKey" : "bfafec3e"
+                "globalKey" : "d415e050"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "25fb1aeb"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.05,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "value" : 0.05,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
+                    "priceType" : "InterestRate"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
                   }
                 } ],
                 "quantity" : [ {
+                  "value" : {
+                    "value" : 16000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "EUR"
+                      }
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     } ]
-                  },
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "99684275"
+                }
+              }, {
+                "quantity" : [ {
                   "value" : {
+                    "value" : 16000,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
-                    },
-                    "value" : 16000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "c9b98a6"
-                },
+                } ],
                 "observable" : {
-                  "meta" : {
-                    "globalKey" : "bf589e11"
-                  },
                   "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
                     "value" : {
                       "floatingRateIndex" : {
                         "value" : "EUR-EURIBOR-Telerate"
                       },
                       "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "959"
-                        },
+                        "periodMultiplier" : 6,
                         "period" : "M",
-                        "periodMultiplier" : 6
+                        "meta" : {
+                          "globalKey" : "107"
+                        }
                       }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
                     }
-                  }
-                },
-                "quantity" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
-                    } ]
                   },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "EUR"
-                      }
-                    },
-                    "value" : 16000
+                  "meta" : {
+                    "globalKey" : "2bba2221"
                   }
-                } ]
+                },
+                "meta" : {
+                  "globalKey" : "d61c7d38"
+                }
               } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "74dee05b",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "b97c11f6",
+                "externalReference" : "party2"
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f1101"
-            },
-            "value" : "2018-04-01"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "LEI1RPT0001",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                },
-                "value" : "LEI1RPT0001JJJJ"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "b8962566"
               }
             } ],
-            "issuer" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-              },
-              "value" : "LEI1RPT0001"
-            },
-            "meta" : {
-              "globalKey" : "28b31d8c"
+            "name" : {
+              "value" : "Bank X"
             },
-            "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "quantityChange" : {
-        "change" : [ {
-          "meta" : {
-            "globalKey" : "8bb50ed3"
-          },
-          "quantity" : [ {
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
+            "businessUnit" : [ {
+              "name" : "NY Swaps Desk",
+              "meta" : {
+                "globalKey" : "5c10b72e",
+                "externalKey" : "desk1"
+              }
+            } ],
+            "person" : [ {
+              "personId" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "jjones"
+                  },
+                  "meta" : {
+                    "globalKey" : "baeb8c0d"
+                  }
                 }
-              },
-              "value" : 12000
+              } ],
+              "firstName" : "jjone",
+              "meta" : {
+                "globalKey" : "d3962233",
+                "externalKey" : "trader"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "74dee05b",
+              "externalKey" : "party1"
             }
-          } ]
-        } ],
-        "direction" : "REPLACE"
-      },
-      "transfer" : {
-        "transferState" : [ {
-          "meta" : {
-            "globalKey" : "a038982"
-          },
-          "transfer" : {
-            "payerReceiver" : {
-              "payerPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "fdda73db"
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "LEI2CP0002",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
               },
-              "receiverPartyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ee963b6"
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "eb8edea1"
               }
+            } ],
+            "name" : {
+              "value" : "Bank Y"
             },
-            "quantity" : {
-              "unit" : {
-                "currency" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+            "meta" : {
+              "globalKey" : "b97c11f6",
+              "externalKey" : "party2"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "549300OL8KL0WCQ34V31",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                 }
               },
-              "value" : 2000
-            },
-            "settlementDate" : {
-              "adjustedDate" : {
-                "meta" : {
-                  "globalKey" : "3f1903"
-                },
-                "value" : "2019-04-03"
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "8ffabe4b"
               }
+            } ],
+            "name" : {
+              "value" : "Up&Atem"
             },
-            "transferExpression" : {
-              "scheduledTransfer" : {
-                "transferType" : "EXERCISE"
-              }
-            }
-          }
-        } ]
-      }
-    }
-  } ],
-  "intent" : "OPTION_EXERCISE",
-  "after" : [ {
-    "meta" : {
-      "globalKey" : "f75d8425"
-    },
-    "trade" : {
-      "meta" : {
-        "globalKey" : "742bbce3"
-      },
-      "party" : [ {
-        "businessUnit" : [ {
-          "meta" : {
-            "externalKey" : "desk1",
-            "globalKey" : "5c10b72e"
-          },
-          "name" : "NY Swaps Desk"
-        } ],
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "fdda73db"
-        },
-        "name" : {
-          "value" : "Bank X"
-        },
-        "partyId" : [ {
-          "identifier" : {
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI1RPT0001"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "b8962566"
-          }
-        } ],
-        "person" : [ {
-          "firstName" : "jjone",
-          "meta" : {
-            "externalKey" : "trader",
-            "globalKey" : "d3962233"
-          },
-          "personId" : [ {
-            "value" : {
+              "globalKey" : "ce0b9311",
+              "externalKey" : "broker1"
+            }
+          }, {
+            "partyId" : [ {
               "identifier" : {
-                "value" : "jjones"
+                "value" : "549300IB5Q45JGNPND58",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
               },
+              "identifierType" : "LEI",
               "meta" : {
-                "globalKey" : "baeb8c0d"
+                "globalKey" : "e213e7d7"
               }
-            }
-          } ]
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "ee963b6"
-        },
-        "name" : {
-          "value" : "Bank Y"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            } ],
+            "name" : {
+              "value" : "ClearItAll"
             },
-            "value" : "LEI2CP0002"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "eb8edea1"
-          }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "broker1",
-          "globalKey" : "ed0cc6d1"
-        },
-        "name" : {
-          "value" : "Up&Atem"
-        },
-        "partyId" : [ {
-          "identifier" : {
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              "globalKey" : "f6a6cc60",
+              "externalKey" : "clearing-svc"
+            }
+          } ],
+          "partyRole" : [ {
+            "partyReference" : {
+              "globalReference" : "f6a6cc60",
+              "externalReference" : "clearing-svc"
             },
-            "value" : "549300OL8KL0WCQ34V31"
-          },
-          "identifierType" : "LEI",
+            "role" : "ClearingOrganization",
+            "ownershipPartyReference" : {
+              "globalReference" : "74dee05b",
+              "externalReference" : "party1"
+            }
+          } ],
           "meta" : {
-            "globalKey" : "8ffabe4b"
+            "globalKey" : "6fc35ab5"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "clearing-svc",
-          "globalKey" : "611719a0"
         },
-        "name" : {
-          "value" : "ClearItAll"
+        "meta" : {
+          "globalKey" : "6fc35ab5"
+        }
+      }
+    }
+  } ],
+  "eventQualifier" : "Exercise",
+  "after" : [ {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "LEI1RPT0001",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+          }
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "LEI1RPT0001JJJJ",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300IB5Q45JGNPND58"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "e213e7d7"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+            }
           }
-        } ]
-      } ],
-      "partyRole" : [ {
-        "ownershipPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "fdda73db"
-        },
-        "partyReference" : {
-          "externalReference" : "clearing-svc",
-          "globalReference" : "611719a0"
+        } ],
+        "meta" : {
+          "globalKey" : "7ac64538"
         },
-        "role" : "CLEARING_ORGANIZATION"
+        "identifierType" : "UniqueTransactionIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2018-04-01",
+        "meta" : {
+          "globalKey" : "3f1101"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "fdda73db"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ee963b6"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -903,46 +795,42 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "accrualBusinessCenters0",
-                          "globalReference" : "20a71d"
-                        },
-                        "meta" : {
-                          "globalKey" : "26b869c"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "e00ca52b"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "2b934"
-                      },
-                      "period" : "Y",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "30"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -951,135 +839,133 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "CalcPeriodDates0",
-                      "globalKey" : "c154a58c"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-08-30",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
                             } ],
                             "meta" : {
-                              "externalKey" : "accrualBusinessCenters0",
-                              "globalKey" : "20a71d"
+                              "globalKey" : "20a71d",
+                              "externalKey" : "accrualBusinessCenters0"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
                         "meta" : {
                           "globalKey" : "a610fb90"
-                        },
-                        "unadjustedDate" : "2026-08-30"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "a610fb90"
                       }
+                    },
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "20a71d",
+                          "externalReference" : "accrualBusinessCenters0"
+                        },
+                        "meta" : {
+                          "globalKey" : "26b869c"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "e00ca52b"
+                      }
+                    },
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
+                      "meta" : {
+                        "globalKey" : "17984"
+                      },
+                      "rollConvention" : "30"
+                    },
+                    "meta" : {
+                      "globalKey" : "b137acba",
+                      "externalKey" : "CalcPeriodDates0"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "30/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "1d841517"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "4d64aef4"
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
+                      "meta" : {
+                        "globalKey" : "78"
+                      }
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                    "payRelativeTo" : "CalculationPeriodEndDate",
                     "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
                         } ],
                         "meta" : {
-                          "externalKey" : "paymentBusinessCenters0",
-                          "globalKey" : "20a71d"
+                          "globalKey" : "20a71d",
+                          "externalKey" : "paymentBusinessCenters0"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365baaee"
                       }
                     },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "ac8"
-                      },
-                      "period" : "Y",
-                      "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "9b0d9350"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "4e1182b5"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "accrualBusinessCenters1",
-                          "globalReference" : "20a71d"
-                        },
-                        "meta" : {
-                          "globalKey" : "26bfafb"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "e00d198a"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "28cc3"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "30"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -1088,165 +974,167 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "CalcPeriodDates1",
-                      "globalKey" : "fc6047de"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-08-30",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
                             } ],
                             "meta" : {
-                              "externalKey" : "accrualBusinessCenters1",
-                              "globalKey" : "20a71d"
+                              "globalKey" : "20a71d",
+                              "externalKey" : "accrualBusinessCenters1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
                         "meta" : {
                           "globalKey" : "a610fb90"
-                        },
-                        "unadjustedDate" : "2026-08-30"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "a610fb90"
                       }
+                    },
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "20a71d",
+                          "externalReference" : "accrualBusinessCenters1"
+                        },
+                        "meta" : {
+                          "globalKey" : "26bfafb"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "e00d198a"
+                      }
+                    },
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "18ad5"
+                      },
+                      "rollConvention" : "30"
+                    },
+                    "meta" : {
+                      "globalKey" : "1918eaea",
+                      "externalKey" : "CalcPeriodDates1"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "924eb82a"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "4d64ad85"
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                    "payRelativeTo" : "CalculationPeriodEndDate",
                     "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
                         } ],
                         "meta" : {
-                          "externalKey" : "paymentBusinessCenters1",
-                          "globalKey" : "20a71d"
+                          "globalKey" : "20a71d",
+                          "externalKey" : "paymentBusinessCenters1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365baaee"
                       }
                     },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    }
-                  },
-                  "rateSpecification" : {
-                    "floatingRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "8f129421"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "CalcPeriodDates1",
-                      "globalReference" : "fc6047de"
+                      "globalReference" : "1918eaea",
+                      "externalReference" : "CalcPeriodDates1"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "2d80ce65"
+                        "globalKey" : "a5cb919"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
                         } ],
                         "meta" : {
-                          "externalKey" : "fixingBusinessCenters0",
-                          "globalKey" : "20a71d"
+                          "globalKey" : "20a71d",
+                          "externalKey" : "fixingBusinessCenters0"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates0",
-                        "globalReference" : "e6388aee"
+                        "globalReference" : "5d766962",
+                        "externalReference" : "resetDates0"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates0",
-                      "globalKey" : "e6388aee"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "paymentBusinessCenters1",
-                          "globalReference" : "20a71d"
+                          "globalReference" : "20a71d",
+                          "externalReference" : "paymentBusinessCenters1"
                         },
                         "meta" : {
                           "globalKey" : "c3690944"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "a10a27d3"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "5d766962",
+                      "externalKey" : "resetDates0"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "886086b6"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "b558f833"
+                  "globalKey" : "63711561"
                 }
               },
               "terminationProvision" : {
                 "cancelableProvision" : {
-                  "buyer" : "PARTY_2",
-                  "seller" : "PARTY_1",
+                  "buyer" : "Party2",
+                  "seller" : "Party1",
                   "europeanExercise" : {
-                    "earliestExerciseTime" : {
-                      "businessCenter" : {
-                        "value" : "BEBR"
-                      },
-                      "hourMinuteTime" : "09:00:00"
-                    },
                     "expirationDate" : [ {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-08-15",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -1257,32 +1145,23 @@
                               "globalKey" : "428533f"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "da4e2f6e"
                           }
                         },
                         "meta" : {
                           "globalKey" : "1bc03e7f"
-                        },
-                        "unadjustedDate" : "2026-08-15"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "1bc03e7f"
                       }
                     } ],
-                    "expirationTime" : {
-                      "businessCenter" : {
-                        "value" : "BEBR"
-                      },
-                      "hourMinuteTime" : "11:00:00"
-                    },
-                    "meta" : {
-                      "globalKey" : "e66f478e"
-                    },
                     "relevantUnderlyingDate" : {
                       "adjustableDates" : {
+                        "unadjustedDate" : [ "2026-08-30" ],
                         "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -1291,19 +1170,32 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "211dc30c"
                           }
                         },
                         "meta" : {
                           "globalKey" : "90d313ae"
-                        },
-                        "unadjustedDate" : [ "2026-08-30" ]
+                        }
                       },
                       "meta" : {
                         "globalKey" : "90d313ae"
                       }
+                    },
+                    "earliestExerciseTime" : {
+                      "hourMinuteTime" : "09:00:00",
+                      "businessCenter" : {
+                        "value" : "BEBR"
+                      }
+                    },
+                    "expirationTime" : {
+                      "hourMinuteTime" : "11:00:00",
+                      "businessCenter" : {
+                        "value" : "BEBR"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "b88a378e"
                     }
                   },
                   "exerciseNotice" : {
@@ -1316,175 +1208,283 @@
               }
             },
             "meta" : {
-              "globalKey" : "bfafec3e"
+              "globalKey" : "d415e050"
             }
           },
           "meta" : {
-            "globalKey" : "bfafec3e"
+            "globalKey" : "d415e050"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "52622de7"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.05,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "value" : 0.05,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
+                "priceType" : "InterestRate"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-1"
+                } ]
               }
             } ],
             "quantity" : [ {
+              "value" : {
+                "value" : 12000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "EUR"
+                  }
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "f9e38ef9"
+            }
+          }, {
+            "quantity" : [ {
               "value" : {
+                "value" : 12000,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
-                },
-                "value" : 12000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "3902aba2"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "bf589e11"
-              },
               "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
                 "value" : {
                   "floatingRateIndex" : {
                     "value" : "EUR-EURIBOR-Telerate"
                   },
                   "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
+                    "periodMultiplier" : 6,
                     "period" : "M",
-                    "periodMultiplier" : 6
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
                 }
-              }
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
-                } ]
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "EUR"
-                  }
-                },
-                "value" : 12000
+              "meta" : {
+                "globalKey" : "2bba2221"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "93750534"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "74dee05b",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "b97c11f6",
+            "externalReference" : "party2"
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f1101"
+      "party" : [ {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "LEI1RPT0001",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "b8962566"
+          }
+        } ],
+        "name" : {
+          "value" : "Bank X"
         },
-        "value" : "2018-04-01"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+        "businessUnit" : [ {
+          "name" : "NY Swaps Desk",
+          "meta" : {
+            "globalKey" : "5c10b72e",
+            "externalKey" : "desk1"
+          }
+        } ],
+        "person" : [ {
+          "personId" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "jjones"
+              },
+              "meta" : {
+                "globalKey" : "baeb8c0d"
+              }
+            }
+          } ],
+          "firstName" : "jjone",
+          "meta" : {
+            "globalKey" : "d3962233",
+            "externalKey" : "trader"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "74dee05b",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "LEI2CP0002",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-            },
-            "value" : "LEI1RPT0001JJJJ"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "eb8edea1"
           }
         } ],
-        "issuer" : {
+        "name" : {
+          "value" : "Bank Y"
+        },
+        "meta" : {
+          "globalKey" : "b97c11f6",
+          "externalKey" : "party2"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "549300OL8KL0WCQ34V31",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+            "globalKey" : "8ffabe4b"
+          }
+        } ],
+        "name" : {
+          "value" : "Up&Atem"
+        },
+        "meta" : {
+          "globalKey" : "ce0b9311",
+          "externalKey" : "broker1"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "549300IB5Q45JGNPND58",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
           },
-          "value" : "LEI1RPT0001"
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "e213e7d7"
+          }
+        } ],
+        "name" : {
+          "value" : "ClearItAll"
         },
         "meta" : {
-          "globalKey" : "28b31d8c"
+          "globalKey" : "f6a6cc60",
+          "externalKey" : "clearing-svc"
+        }
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "f6a6cc60",
+          "externalReference" : "clearing-svc"
         },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
+        "role" : "ClearingOrganization",
+        "ownershipPartyReference" : {
+          "globalReference" : "74dee05b",
+          "externalReference" : "party1"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fc8c735"
+      }
     },
     "transferHistory" : [ {
-      "meta" : {
-        "globalKey" : "a038982"
-      },
       "transfer" : {
-        "payerReceiver" : {
-          "payerPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "fdda73db"
-          },
-          "receiverPartyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ee963b6"
-          }
-        },
         "quantity" : {
+          "value" : 2000,
           "unit" : {
             "currency" : {
+              "value" : "EUR",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-              },
-              "value" : "EUR"
+              }
             }
+          }
+        },
+        "payerReceiver" : {
+          "payerPartyReference" : {
+            "globalReference" : "74dee05b",
+            "externalReference" : "party1"
           },
-          "value" : 2000
+          "receiverPartyReference" : {
+            "globalReference" : "b97c11f6",
+            "externalReference" : "party2"
+          }
         },
         "settlementDate" : {
           "adjustedDate" : {
+            "value" : "2019-04-03",
             "meta" : {
               "globalKey" : "3f1903"
-            },
-            "value" : "2019-04-03"
+            }
           }
         },
         "transferExpression" : {
           "scheduledTransfer" : {
-            "transferType" : "EXERCISE"
+            "transferType" : "Exercise"
           }
         }
+      },
+      "meta" : {
+        "globalKey" : "489db9ae"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "9fcc7123"
+    }
   } ],
-  "eventQualifier" : "Exercise",
   "meta" : {
-    "globalKey" : "4fe6479c"
+    "globalKey" : "ced994e0"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/exercise/exercise-cash-settled-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/exercise/exercise-cash-settled-func-output.json
index e548fbeec9..c74dfbf808 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/exercise/exercise-cash-settled-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/exercise/exercise-cash-settled-func-output.json
@@ -1,132 +1,100 @@
 {
+  "intent" : "OptionExercise",
   "eventDate" : "2019-04-01",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "c57bbc19"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "5ffcf900"
-          },
-          "party" : [ {
-            "businessUnit" : [ {
-              "meta" : {
-                "externalKey" : "desk1",
-                "globalKey" : "5c10b72e"
-              },
-              "name" : "NY Swaps Desk"
-            } ],
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "fdda73db"
-            },
-            "name" : {
-              "value" : "Bank X"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI1RPT0001"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "b8962566"
+    "primitiveInstruction" : {
+      "quantityChange" : {
+        "change" : [ {
+          "quantity" : [ {
+            "value" : {
+              "value" : 0,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
               }
-            } ],
-            "person" : [ {
-              "firstName" : "jjone",
-              "meta" : {
-                "externalKey" : "trader",
-                "globalKey" : "d3962233"
-              },
-              "personId" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "jjones"
-                  },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "16df72"
+          }
+        } ],
+        "direction" : "Replace"
+      },
+      "transfer" : {
+        "transferState" : [ {
+          "transfer" : {
+            "quantity" : {
+              "value" : 2000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR",
                   "meta" : {
-                    "globalKey" : "baeb8c0d"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
                   }
                 }
-              } ]
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "ee963b6"
+              }
             },
-            "name" : {
-              "value" : "Bank Y"
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "globalReference" : "74dee05b",
+                "externalReference" : "party1"
+              },
+              "receiverPartyReference" : {
+                "globalReference" : "b97c11f6",
+                "externalReference" : "party2"
+              }
             },
-            "partyId" : [ {
-              "identifier" : {
+            "settlementDate" : {
+              "adjustedDate" : {
+                "value" : "2019-04-03",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI2CP0002"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "eb8edea1"
+                  "globalKey" : "3f1903"
+                }
               }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "broker1",
-              "globalKey" : "ed0cc6d1"
             },
-            "name" : {
-              "value" : "Up&Atem"
+            "transferExpression" : {
+              "scheduledTransfer" : {
+                "transferType" : "Exercise"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "489db9ae"
+          }
+        } ]
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "LEI1RPT0001",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+              }
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "LEI1RPT0001HHH",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "549300OL8KL0WCQ34V31"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "8ffabe4b"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                }
               }
-            } ]
-          } ],
-          "partyRole" : [ {
-            "ownershipPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "fdda73db"
-            },
-            "partyReference" : {
-              "externalReference" : "broker1",
-              "globalReference" : "ed0cc6d1"
+            } ],
+            "meta" : {
+              "globalKey" : "fe909b9c"
             },
-            "role" : "ARRANGING_BROKER"
+            "identifierType" : "UniqueTransactionIdentifier"
           } ],
+          "tradeDate" : {
+            "value" : "2018-04-01",
+            "meta" : {
+              "globalKey" : "3f1101"
+            }
+          },
           "tradableProduct" : {
-            "ancillaryParty" : [ {
-              "partyReference" : [ {
-                "externalReference" : "party2",
-                "globalReference" : "ee963b6"
-              } ],
-              "role" : "CALCULATION_AGENT_INDEPENDENT"
-            } ],
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "fdda73db"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ee963b6"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -134,31 +102,23 @@
                   "productQualifier" : "InterestRate_Option_Swaption"
                 } ],
                 "economicTerms" : {
-                  "calculationAgent" : {
-                    "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-                  },
                   "payout" : {
-                    "meta" : {
-                      "globalKey" : "905b7ec3"
-                    },
                     "optionPayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "settlementTerms" : {
-                        "meta" : {
-                          "globalKey" : "75041c4"
-                        },
                         "settlementDate" : {
                           "adjustableOrRelativeDate" : {
                             "relativeDate" : {
+                              "periodMultiplier" : 2,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "6e5a630"
+                                "globalKey" : "954e996c"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 2,
-                              "dayType" : "BUSINESS",
+                              "dayType" : "Business",
+                              "businessDayConvention" : "NONE",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
@@ -167,39 +127,22 @@
                                   "globalKey" : "20a71d"
                                 }
                               },
-                              "businessDayConvention" : "NONE",
                               "dateRelativeTo" : {
-                                "externalReference" : "europeanExercise0",
-                                "globalReference" : "3f30e6b8"
+                                "globalReference" : "c04e26de",
+                                "externalReference" : "europeanExercise0"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "6e5a630"
+                            "globalKey" : "954e996c"
                           }
                         },
+                        "meta" : {
+                          "globalKey" : "940c5744"
+                        },
                         "cashSettlementTerms" : [ {
-                          "cashSettlementMethod" : "PAR_YIELD_CURVE_UNADJUSTED_METHOD",
-                          "meta" : {
-                            "externalKey" : "cashSettlement0",
-                            "globalKey" : "d90b9394"
-                          },
-                          "valuationDate" : {
-                            "valuationDate" : {
-                              "meta" : {
-                                "globalKey" : "7e857845"
-                              },
-                              "period" : "D",
-                              "periodMultiplier" : 0,
-                              "businessDayConvention" : "NONE",
-                              "dateRelativeTo" : {
-                                "externalReference" : "europeanExercise0",
-                                "globalReference" : "3f30e6b8"
-                              }
-                            }
-                          },
+                          "cashSettlementMethod" : "ParYieldCurveUnadjustedMethod",
                           "valuationMethod" : {
-                            "quotationMethod" : "MID",
                             "valuationSource" : {
                               "informationSource" : {
                                 "primarySource" : {
@@ -208,72 +151,48 @@
                                   }
                                 }
                               }
+                            },
+                            "quotationMethod" : "Mid"
+                          },
+                          "valuationDate" : {
+                            "valuationDate" : {
+                              "periodMultiplier" : 0,
+                              "period" : "D",
+                              "meta" : {
+                                "globalKey" : "7ae6233d"
+                              },
+                              "businessDayConvention" : "NONE",
+                              "dateRelativeTo" : {
+                                "globalReference" : "c04e26de",
+                                "externalReference" : "europeanExercise0"
+                              }
                             }
                           },
                           "valuationTime" : {
+                            "hourMinuteTime" : "11:00:00",
                             "businessCenter" : {
                               "value" : "EUTA"
-                            },
-                            "hourMinuteTime" : "11:00:00"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "f67cabd8",
+                            "externalKey" : "cashSettlement0"
                           }
                         } ]
                       },
                       "buyerSeller" : {
-                        "buyer" : "PARTY_1",
-                        "seller" : "PARTY_2"
+                        "buyer" : "Party1",
+                        "seller" : "Party2"
                       },
+                      "optionType" : "Straddle",
                       "exerciseTerms" : {
-                        "exerciseProcedure" : {
-                          "followUpConfirmation" : true,
-                          "manualExercise" : {
-                            "exerciseNotice" : {
-                              "businessCenter" : {
-                                "value" : "BEBR"
-                              },
-                              "exerciseNoticeGiver" : "BUYER"
-                            }
-                          }
-                        },
                         "optionStyle" : {
                           "europeanExercise" : {
-                            "earliestExerciseTime" : {
-                              "businessCenter" : {
-                                "value" : "GBLO"
-                              },
-                              "hourMinuteTime" : "09:00:00"
-                            },
-                            "exerciseFee" : {
-                              "payer" : "PARTY_1",
-                              "receiver" : "PARTY_2",
-                              "feeAmount" : 100000,
-                              "feePaymentDate" : {
-                                "meta" : {
-                                  "globalKey" : "d2cddbaa"
-                                },
-                                "period" : "D",
-                                "periodMultiplier" : 0,
-                                "businessCenters" : {
-                                  "businessCenter" : [ {
-                                    "value" : "EUTA"
-                                  } ],
-                                  "meta" : {
-                                    "globalKey" : "20a71d"
-                                  }
-                                },
-                                "businessDayConvention" : "NONE",
-                                "dateRelativeTo" : {
-                                  "externalReference" : "europeanExercise0",
-                                  "globalReference" : "3f30e6b8"
-                                }
-                              },
-                              "notionalReference" : {
-                                "externalReference" : "notional0",
-                                "globalReference" : "0"
-                              }
-                            },
                             "expirationDate" : [ {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2019-04-01",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "FOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
@@ -284,39 +203,79 @@
                                       "globalKey" : "4158421"
                                     }
                                   },
-                                  "businessDayConvention" : "FOLLOWING",
                                   "meta" : {
                                     "globalKey" : "da3b6050"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "4a5f542f"
-                                },
-                                "unadjustedDate" : "2019-04-01"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "4a5f542f"
                               }
                             } ],
+                            "earliestExerciseTime" : {
+                              "hourMinuteTime" : "09:00:00",
+                              "businessCenter" : {
+                                "value" : "GBLO"
+                              }
+                            },
                             "expirationTime" : {
+                              "hourMinuteTime" : "11:00:00",
                               "businessCenter" : {
                                 "value" : "GBLO"
+                              }
+                            },
+                            "exerciseFee" : {
+                              "payer" : "Party1",
+                              "receiver" : "Party2",
+                              "notionalReference" : {
+                                "globalReference" : "0",
+                                "externalReference" : "notional0"
                               },
-                              "hourMinuteTime" : "11:00:00"
+                              "feeAmount" : 100000,
+                              "feePaymentDate" : {
+                                "periodMultiplier" : 0,
+                                "period" : "D",
+                                "meta" : {
+                                  "globalKey" : "4825adb2"
+                                },
+                                "businessDayConvention" : "NONE",
+                                "businessCenters" : {
+                                  "businessCenter" : [ {
+                                    "value" : "EUTA"
+                                  } ],
+                                  "meta" : {
+                                    "globalKey" : "20a71d"
+                                  }
+                                },
+                                "dateRelativeTo" : {
+                                  "globalReference" : "c04e26de",
+                                  "externalReference" : "europeanExercise0"
+                                }
+                              }
                             },
                             "meta" : {
-                              "externalKey" : "europeanExercise0",
-                              "globalKey" : "3f30e6b8"
+                              "globalKey" : "c04e26de",
+                              "externalKey" : "europeanExercise0"
                             }
                           }
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "905b7ec3"
-                      },
-                      "optionType" : "STRADDLE",
-                      "underlier" : {
-                        "contractualProduct" : {
+                        },
+                        "exerciseProcedure" : {
+                          "manualExercise" : {
+                            "exerciseNotice" : {
+                              "exerciseNoticeGiver" : "Buyer",
+                              "businessCenter" : {
+                                "value" : "BEBR"
+                              }
+                            }
+                          },
+                          "followUpConfirmation" : true
+                        }
+                      },
+                      "underlier" : {
+                        "contractualProduct" : {
                           "productTaxonomy" : [ {
                             "source" : "ISDA",
                             "productQualifier" : "InterestRate_IRSwap_FixedFloat"
@@ -325,47 +284,43 @@
                             "payout" : {
                               "interestRatePayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "externalKey" : "notional0",
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-1"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0",
+                                    "externalKey" : "notional0"
                                   }
                                 },
-                                "calculationPeriodDates" : {
-                                  "calculationPeriodDatesAdjustments" : {
-                                    "businessCenters" : {
-                                      "businessCentersReference" : {
-                                        "externalReference" : "accrualBusinessCenters0",
-                                        "globalReference" : "20a71d"
-                                      },
-                                      "meta" : {
-                                        "globalKey" : "26b869c"
+                                "rateSpecification" : {
+                                  "fixedRate" : {
+                                    "rateSchedule" : {
+                                      "price" : {
+                                        "address" : {
+                                          "scope" : "DOCUMENT",
+                                          "value" : "price-1"
+                                        }
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
-                                      "globalKey" : "e00ca52b"
+                                      "globalKey" : "0"
                                     }
-                                  },
-                                  "calculationPeriodFrequency" : {
-                                    "meta" : {
-                                      "globalKey" : "2b934"
-                                    },
-                                    "period" : "Y",
-                                    "periodMultiplier" : 1,
-                                    "rollConvention" : "30"
-                                  },
+                                  }
+                                },
+                                "dayCountFraction" : {
+                                  "value" : "30/360"
+                                },
+                                "calculationPeriodDates" : {
                                   "effectiveDate" : {
                                     "adjustableDate" : {
+                                      "unadjustedDate" : "2019-04-03",
                                       "dateAdjustments" : {
                                         "businessDayConvention" : "NONE",
                                         "meta" : {
@@ -374,135 +329,133 @@
                                       },
                                       "meta" : {
                                         "globalKey" : "ed018b7b"
-                                      },
-                                      "unadjustedDate" : "2019-04-03"
+                                      }
                                     },
                                     "meta" : {
                                       "globalKey" : "ed018b7b"
                                     }
                                   },
-                                  "meta" : {
-                                    "externalKey" : "CalcPeriodDates0",
-                                    "globalKey" : "b67545c7"
-                                  },
                                   "terminationDate" : {
                                     "adjustableDate" : {
+                                      "unadjustedDate" : "2024-04-03",
                                       "dateAdjustments" : {
+                                        "businessDayConvention" : "MODFOLLOWING",
                                         "businessCenters" : {
                                           "businessCenter" : [ {
                                             "value" : "EUTA"
                                           } ],
                                           "meta" : {
-                                            "externalKey" : "accrualBusinessCenters0",
-                                            "globalKey" : "20a71d"
+                                            "globalKey" : "20a71d",
+                                            "externalKey" : "accrualBusinessCenters0"
                                           }
                                         },
-                                        "businessDayConvention" : "MODFOLLOWING",
                                         "meta" : {
                                           "globalKey" : "365baaee"
                                         }
                                       },
                                       "meta" : {
                                         "globalKey" : "759b93cb"
-                                      },
-                                      "unadjustedDate" : "2024-04-03"
+                                      }
                                     },
                                     "meta" : {
                                       "globalKey" : "759b93cb"
                                     }
+                                  },
+                                  "calculationPeriodDatesAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
+                                    "businessCenters" : {
+                                      "businessCentersReference" : {
+                                        "globalReference" : "20a71d",
+                                        "externalReference" : "accrualBusinessCenters0"
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "26b869c"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "e00ca52b"
+                                    }
+                                  },
+                                  "calculationPeriodFrequency" : {
+                                    "periodMultiplier" : 1,
+                                    "period" : "Y",
+                                    "meta" : {
+                                      "globalKey" : "17984"
+                                    },
+                                    "rollConvention" : "30"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "d29acc75",
+                                    "externalKey" : "CalcPeriodDates0"
                                   }
                                 },
-                                "dayCountFraction" : {
-                                  "value" : "30/360"
-                                },
-                                "meta" : {
-                                  "globalKey" : "6bad977c"
-                                },
                                 "paymentDates" : {
-                                  "meta" : {
-                                    "globalKey" : "4d64aef4"
+                                  "paymentFrequency" : {
+                                    "periodMultiplier" : 1,
+                                    "period" : "Y",
+                                    "meta" : {
+                                      "globalKey" : "78"
+                                    }
                                   },
-                                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                                  "payRelativeTo" : "CalculationPeriodEndDate",
                                   "paymentDatesAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
                                       } ],
                                       "meta" : {
-                                        "externalKey" : "paymentBusinessCenters0",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "paymentBusinessCenters0"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
                                       "globalKey" : "365baaee"
                                     }
                                   },
-                                  "paymentFrequency" : {
-                                    "meta" : {
-                                      "globalKey" : "ac8"
-                                    },
-                                    "period" : "Y",
-                                    "periodMultiplier" : 1
+                                  "meta" : {
+                                    "globalKey" : "9b0d9350"
                                   }
                                 },
-                                "rateSpecification" : {
-                                  "fixedRate" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
-                                    "rateSchedule" : {
-                                      "price" : {
-                                        "address" : {
-                                          "scope" : "DOCUMENT",
-                                          "value" : "price-1"
-                                        }
-                                      }
-                                    }
-                                  }
+                                "meta" : {
+                                  "globalKey" : "c46874b0"
                                 }
                               }, {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_2",
-                                  "receiver" : "PARTY_1"
+                                  "payer" : "Party2",
+                                  "receiver" : "Party1"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
-                                "calculationPeriodDates" : {
-                                  "calculationPeriodDatesAdjustments" : {
-                                    "businessCenters" : {
-                                      "businessCentersReference" : {
-                                        "externalReference" : "accrualBusinessCenters1",
-                                        "globalReference" : "20a71d"
-                                      },
-                                      "meta" : {
-                                        "globalKey" : "26bfafb"
+                                "rateSpecification" : {
+                                  "floatingRate" : {
+                                    "rateOption" : {
+                                      "address" : {
+                                        "scope" : "DOCUMENT",
+                                        "value" : "rateOption-1"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
-                                      "globalKey" : "e00d198a"
+                                      "globalKey" : "0"
                                     }
-                                  },
-                                  "calculationPeriodFrequency" : {
-                                    "meta" : {
-                                      "globalKey" : "28cc3"
-                                    },
-                                    "period" : "M",
-                                    "periodMultiplier" : 6,
-                                    "rollConvention" : "30"
-                                  },
+                                  }
+                                },
+                                "dayCountFraction" : {
+                                  "value" : "ACT/360"
+                                },
+                                "calculationPeriodDates" : {
                                   "effectiveDate" : {
                                     "adjustableDate" : {
+                                      "unadjustedDate" : "2019-04-03",
                                       "dateAdjustments" : {
                                         "businessDayConvention" : "NONE",
                                         "meta" : {
@@ -511,314 +464,421 @@
                                       },
                                       "meta" : {
                                         "globalKey" : "ed018b7b"
-                                      },
-                                      "unadjustedDate" : "2019-04-03"
+                                      }
                                     },
                                     "meta" : {
                                       "globalKey" : "ed018b7b"
                                     }
                                   },
-                                  "meta" : {
-                                    "externalKey" : "CalcPeriodDates1",
-                                    "globalKey" : "f180e819"
-                                  },
                                   "terminationDate" : {
                                     "adjustableDate" : {
+                                      "unadjustedDate" : "2024-04-03",
                                       "dateAdjustments" : {
+                                        "businessDayConvention" : "MODFOLLOWING",
                                         "businessCenters" : {
                                           "businessCenter" : [ {
                                             "value" : "EUTA"
                                           } ],
                                           "meta" : {
-                                            "externalKey" : "accrualBusinessCenters1",
-                                            "globalKey" : "20a71d"
+                                            "globalKey" : "20a71d",
+                                            "externalKey" : "accrualBusinessCenters1"
                                           }
                                         },
-                                        "businessDayConvention" : "MODFOLLOWING",
                                         "meta" : {
                                           "globalKey" : "365baaee"
                                         }
                                       },
                                       "meta" : {
                                         "globalKey" : "759b93cb"
-                                      },
-                                      "unadjustedDate" : "2024-04-03"
+                                      }
                                     },
                                     "meta" : {
                                       "globalKey" : "759b93cb"
                                     }
+                                  },
+                                  "calculationPeriodDatesAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
+                                    "businessCenters" : {
+                                      "businessCentersReference" : {
+                                        "globalReference" : "20a71d",
+                                        "externalReference" : "accrualBusinessCenters1"
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "26bfafb"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "e00d198a"
+                                    }
+                                  },
+                                  "calculationPeriodFrequency" : {
+                                    "periodMultiplier" : 6,
+                                    "period" : "M",
+                                    "meta" : {
+                                      "globalKey" : "18ad5"
+                                    },
+                                    "rollConvention" : "30"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "3a7c0aa5",
+                                    "externalKey" : "CalcPeriodDates1"
                                   }
                                 },
-                                "dayCountFraction" : {
-                                  "value" : "ACT/360"
-                                },
-                                "meta" : {
-                                  "globalKey" : "838bd9f4"
-                                },
                                 "paymentDates" : {
-                                  "meta" : {
-                                    "globalKey" : "4d64ad85"
+                                  "paymentFrequency" : {
+                                    "periodMultiplier" : 6,
+                                    "period" : "M",
+                                    "meta" : {
+                                      "globalKey" : "107"
+                                    }
                                   },
-                                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                                  "payRelativeTo" : "CalculationPeriodEndDate",
                                   "paymentDatesAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
                                       } ],
                                       "meta" : {
-                                        "externalKey" : "paymentBusinessCenters1",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "paymentBusinessCenters1"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
                                       "globalKey" : "365baaee"
                                     }
                                   },
-                                  "paymentFrequency" : {
-                                    "meta" : {
-                                      "globalKey" : "959"
-                                    },
-                                    "period" : "M",
-                                    "periodMultiplier" : 6
-                                  }
-                                },
-                                "rateSpecification" : {
-                                  "floatingRate" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
-                                    "rateOption" : {
-                                      "address" : {
-                                        "scope" : "DOCUMENT",
-                                        "value" : "rateOption-1"
-                                      }
-                                    }
+                                  "meta" : {
+                                    "globalKey" : "8f129421"
                                   }
                                 },
                                 "resetDates" : {
                                   "calculationPeriodDatesReference" : {
-                                    "externalReference" : "CalcPeriodDates1",
-                                    "globalReference" : "f180e819"
+                                    "globalReference" : "3a7c0aa5",
+                                    "externalReference" : "CalcPeriodDates1"
                                   },
+                                  "resetRelativeTo" : "CalculationPeriodStartDate",
                                   "fixingDates" : {
+                                    "periodMultiplier" : -2,
+                                    "period" : "D",
                                     "meta" : {
-                                      "globalKey" : "2d80ce65"
+                                      "globalKey" : "a5cb919"
                                     },
-                                    "period" : "D",
-                                    "periodMultiplier" : -2,
-                                    "dayType" : "BUSINESS",
+                                    "dayType" : "Business",
+                                    "businessDayConvention" : "NONE",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
                                       } ],
                                       "meta" : {
-                                        "externalKey" : "fixingBusinessCenters0",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "fixingBusinessCenters0"
                                       }
                                     },
-                                    "businessDayConvention" : "NONE",
                                     "dateRelativeTo" : {
-                                      "externalReference" : "resetDates0",
-                                      "globalReference" : "fa8ded93"
+                                      "globalReference" : "7d3bfc87",
+                                      "externalReference" : "resetDates0"
                                     }
                                   },
-                                  "meta" : {
-                                    "externalKey" : "resetDates0",
-                                    "globalKey" : "fa8ded93"
+                                  "resetFrequency" : {
+                                    "periodMultiplier" : 6,
+                                    "period" : "M",
+                                    "meta" : {
+                                      "globalKey" : "107"
+                                    }
                                   },
                                   "resetDatesAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
                                       "businessCentersReference" : {
-                                        "externalReference" : "paymentBusinessCenters1",
-                                        "globalReference" : "20a71d"
+                                        "globalReference" : "20a71d",
+                                        "externalReference" : "paymentBusinessCenters1"
                                       },
                                       "meta" : {
                                         "globalKey" : "c3690944"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
                                       "globalKey" : "a10a27d3"
                                     }
                                   },
-                                  "resetFrequency" : {
-                                    "meta" : {
-                                      "globalKey" : "959"
-                                    },
-                                    "period" : "M",
-                                    "periodMultiplier" : 6
-                                  },
-                                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                                  "meta" : {
+                                    "globalKey" : "7d3bfc87",
+                                    "externalKey" : "resetDates0"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "2ac2e400"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "160032f8"
+                                "globalKey" : "41255950"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "66855e27"
+                            "globalKey" : "91aa847f"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "66855e27"
+                          "globalKey" : "91aa847f"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "77575323"
                       }
-                    } ]
+                    } ],
+                    "meta" : {
+                      "globalKey" : "77575323"
+                    }
+                  },
+                  "calculationAgent" : {
+                    "calculationAgentParty" : "CalculationAgentIndependent"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "64973ad8"
+                  "globalKey" : "44a686f8"
                 }
               },
               "meta" : {
-                "globalKey" : "64973ad8"
+                "globalKey" : "44a686f8"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "87486928"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.05,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "value" : 0.05,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 13000,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
-                    },
-                    "value" : 13000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    } ]
                   }
-                } ]
-              }, {
+                } ],
                 "meta" : {
-                  "globalKey" : "6de8e6e3"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "bf589e11"
+                  "globalKey" : "61c4bbd8"
+                }
+              }, {
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 13000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "EUR"
+                      }
+                    }
                   },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
+                  }
+                } ],
+                "observable" : {
                   "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
                     "value" : {
                       "floatingRateIndex" : {
                         "value" : "EUR-EURIBOR-Telerate"
                       },
                       "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "959"
-                        },
+                        "periodMultiplier" : 6,
                         "period" : "M",
-                        "periodMultiplier" : 6
+                        "meta" : {
+                          "globalKey" : "107"
+                        }
                       }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
                     }
-                  }
-                },
-                "quantity" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
-                    } ]
                   },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "EUR"
-                      }
-                    },
-                    "value" : 13000
+                  "meta" : {
+                    "globalKey" : "2bba2221"
                   }
-                } ]
+                },
+                "meta" : {
+                  "globalKey" : "e41ee335"
+                }
+              } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "74dee05b",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "b97c11f6",
+                "externalReference" : "party2"
+              }
+            } ],
+            "ancillaryParty" : [ {
+              "role" : "CalculationAgentIndependent",
+              "partyReference" : [ {
+                "globalReference" : "b97c11f6",
+                "externalReference" : "party2"
               } ]
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f1101"
-            },
-            "value" : "2018-04-01"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "LEI1RPT0001",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                },
-                "value" : "LEI1RPT0001HHH"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "b8962566"
               }
             } ],
-            "issuer" : {
+            "name" : {
+              "value" : "Bank X"
+            },
+            "businessUnit" : [ {
+              "name" : "NY Swaps Desk",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                "globalKey" : "5c10b72e",
+                "externalKey" : "desk1"
+              }
+            } ],
+            "person" : [ {
+              "personId" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "jjones"
+                  },
+                  "meta" : {
+                    "globalKey" : "baeb8c0d"
+                  }
+                }
+              } ],
+              "firstName" : "jjone",
+              "meta" : {
+                "globalKey" : "d3962233",
+                "externalKey" : "trader"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "74dee05b",
+              "externalKey" : "party1"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "LEI2CP0002",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
               },
-              "value" : "LEI1RPT0001"
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "eb8edea1"
+              }
+            } ],
+            "name" : {
+              "value" : "Bank Y"
             },
             "meta" : {
-              "globalKey" : "e3416af0"
+              "globalKey" : "b97c11f6",
+              "externalKey" : "party2"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "549300OL8KL0WCQ34V31",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "8ffabe4b"
+              }
+            } ],
+            "name" : {
+              "value" : "Up&Atem"
             },
-            "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-          } ]
+            "meta" : {
+              "globalKey" : "ce0b9311",
+              "externalKey" : "broker1"
+            }
+          } ],
+          "partyRole" : [ {
+            "partyReference" : {
+              "globalReference" : "ce0b9311",
+              "externalReference" : "broker1"
+            },
+            "role" : "ArrangingBroker",
+            "ownershipPartyReference" : {
+              "globalReference" : "74dee05b",
+              "externalReference" : "party1"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "9c78562"
+          }
         },
         "transferHistory" : [ {
-          "meta" : {
-            "globalKey" : "d87a5519"
-          },
           "transfer" : {
-            "payerReceiver" : {
-              "payerPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "fdda73db"
-              },
-              "receiverPartyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ee963b6"
-              }
-            },
             "quantity" : {
+              "value" : 100000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
+              }
+            },
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "globalReference" : "74dee05b",
+                "externalReference" : "party1"
               },
-              "value" : 100000
+              "receiverPartyReference" : {
+                "globalReference" : "b97c11f6",
+                "externalReference" : "party2"
+              }
             },
             "settlementDate" : {
+              "unadjustedDate" : "2018-04-01",
               "dateAdjustments" : {
+                "businessDayConvention" : "FOLLOWING",
                 "businessCenters" : {
                   "businessCenter" : [ {
                     "value" : "EUTA"
@@ -827,216 +887,55 @@
                     "globalKey" : "20a71d"
                   }
                 },
-                "businessDayConvention" : "FOLLOWING",
                 "meta" : {
                   "globalKey" : "211dc30c"
                 }
-              },
-              "unadjustedDate" : "2018-04-01"
+              }
             },
             "transferExpression" : {
-              "priceTransfer" : "PREMIUM"
+              "priceTransfer" : "Premium"
             }
-          }
-        } ]
-      }
-    },
-    "primitiveInstruction" : {
-      "quantityChange" : {
-        "change" : [ {
-          "meta" : {
-            "globalKey" : "16df72"
           },
-          "quantity" : [ {
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 0
-            }
-          } ]
-        } ],
-        "direction" : "REPLACE"
-      },
-      "transfer" : {
-        "transferState" : [ {
           "meta" : {
-            "globalKey" : "a038982"
-          },
-          "transfer" : {
-            "payerReceiver" : {
-              "payerPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "fdda73db"
-              },
-              "receiverPartyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ee963b6"
-              }
-            },
-            "quantity" : {
-              "unit" : {
-                "currency" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
-                }
-              },
-              "value" : 2000
-            },
-            "settlementDate" : {
-              "adjustedDate" : {
-                "meta" : {
-                  "globalKey" : "3f1903"
-                },
-                "value" : "2019-04-03"
-              }
-            },
-            "transferExpression" : {
-              "scheduledTransfer" : {
-                "transferType" : "EXERCISE"
-              }
-            }
+            "globalKey" : "3bc7530b"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "ecdf0469"
+        }
       }
     }
   } ],
-  "intent" : "OPTION_EXERCISE",
+  "eventQualifier" : "Exercise",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "817404d6"
-    },
-    "state" : {
-      "closedState" : {
-        "state" : "TERMINATED"
-      },
-      "positionState" : "CLOSED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "facd7ec4"
-      },
-      "party" : [ {
-        "businessUnit" : [ {
-          "meta" : {
-            "externalKey" : "desk1",
-            "globalKey" : "5c10b72e"
-          },
-          "name" : "NY Swaps Desk"
-        } ],
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "fdda73db"
-        },
-        "name" : {
-          "value" : "Bank X"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI1RPT0001"
-          },
-          "identifierType" : "LEI",
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "LEI1RPT0001",
           "meta" : {
-            "globalKey" : "b8962566"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
           }
-        } ],
-        "person" : [ {
-          "firstName" : "jjone",
-          "meta" : {
-            "externalKey" : "trader",
-            "globalKey" : "d3962233"
-          },
-          "personId" : [ {
-            "value" : {
-              "identifier" : {
-                "value" : "jjones"
-              },
-              "meta" : {
-                "globalKey" : "baeb8c0d"
-              }
-            }
-          } ]
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "ee963b6"
-        },
-        "name" : {
-          "value" : "Bank Y"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "LEI1RPT0001HHH",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI2CP0002"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "eb8edea1"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+            }
           }
-        } ]
-      }, {
+        } ],
         "meta" : {
-          "externalKey" : "broker1",
-          "globalKey" : "ed0cc6d1"
-        },
-        "name" : {
-          "value" : "Up&Atem"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300OL8KL0WCQ34V31"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "8ffabe4b"
-          }
-        } ]
-      } ],
-      "partyRole" : [ {
-        "ownershipPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "fdda73db"
-        },
-        "partyReference" : {
-          "externalReference" : "broker1",
-          "globalReference" : "ed0cc6d1"
+          "globalKey" : "fe909b9c"
         },
-        "role" : "ARRANGING_BROKER"
+        "identifierType" : "UniqueTransactionIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2018-04-01",
+        "meta" : {
+          "globalKey" : "3f1101"
+        }
+      },
       "tradableProduct" : {
-        "ancillaryParty" : [ {
-          "partyReference" : [ {
-            "externalReference" : "party2",
-            "globalReference" : "ee963b6"
-          } ],
-          "role" : "CALCULATION_AGENT_INDEPENDENT"
-        } ],
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "fdda73db"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ee963b6"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -1044,31 +943,23 @@
               "productQualifier" : "InterestRate_Option_Swaption"
             } ],
             "economicTerms" : {
-              "calculationAgent" : {
-                "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-              },
               "payout" : {
-                "meta" : {
-                  "globalKey" : "905b7ec3"
-                },
                 "optionPayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "settlementTerms" : {
-                    "meta" : {
-                      "globalKey" : "75041c4"
-                    },
                     "settlementDate" : {
                       "adjustableOrRelativeDate" : {
                         "relativeDate" : {
+                          "periodMultiplier" : 2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "6e5a630"
+                            "globalKey" : "954e996c"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -1077,39 +968,22 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "europeanExercise0",
-                            "globalReference" : "3f30e6b8"
+                            "globalReference" : "c04e26de",
+                            "externalReference" : "europeanExercise0"
                           }
                         }
                       },
                       "meta" : {
-                        "globalKey" : "6e5a630"
+                        "globalKey" : "954e996c"
                       }
                     },
+                    "meta" : {
+                      "globalKey" : "940c5744"
+                    },
                     "cashSettlementTerms" : [ {
-                      "cashSettlementMethod" : "PAR_YIELD_CURVE_UNADJUSTED_METHOD",
-                      "meta" : {
-                        "externalKey" : "cashSettlement0",
-                        "globalKey" : "d90b9394"
-                      },
-                      "valuationDate" : {
-                        "valuationDate" : {
-                          "meta" : {
-                            "globalKey" : "7e857845"
-                          },
-                          "period" : "D",
-                          "periodMultiplier" : 0,
-                          "businessDayConvention" : "NONE",
-                          "dateRelativeTo" : {
-                            "externalReference" : "europeanExercise0",
-                            "globalReference" : "3f30e6b8"
-                          }
-                        }
-                      },
+                      "cashSettlementMethod" : "ParYieldCurveUnadjustedMethod",
                       "valuationMethod" : {
-                        "quotationMethod" : "MID",
                         "valuationSource" : {
                           "informationSource" : {
                             "primarySource" : {
@@ -1118,72 +992,48 @@
                               }
                             }
                           }
-                        }
-                      },
-                      "valuationTime" : {
-                        "businessCenter" : {
-                          "value" : "EUTA"
-                        },
-                        "hourMinuteTime" : "11:00:00"
-                      }
-                    } ]
-                  },
-                  "buyerSeller" : {
-                    "buyer" : "PARTY_1",
-                    "seller" : "PARTY_2"
-                  },
-                  "exerciseTerms" : {
-                    "exerciseProcedure" : {
-                      "followUpConfirmation" : true,
-                      "manualExercise" : {
-                        "exerciseNotice" : {
-                          "businessCenter" : {
-                            "value" : "BEBR"
-                          },
-                          "exerciseNoticeGiver" : "BUYER"
-                        }
-                      }
-                    },
-                    "optionStyle" : {
-                      "europeanExercise" : {
-                        "earliestExerciseTime" : {
-                          "businessCenter" : {
-                            "value" : "GBLO"
-                          },
-                          "hourMinuteTime" : "09:00:00"
                         },
-                        "exerciseFee" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2",
-                          "feeAmount" : 100000,
-                          "feePaymentDate" : {
-                            "meta" : {
-                              "globalKey" : "d2cddbaa"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "EUTA"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "20a71d"
-                              }
-                            },
-                            "businessDayConvention" : "NONE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "europeanExercise0",
-                              "globalReference" : "3f30e6b8"
-                            }
+                        "quotationMethod" : "Mid"
+                      },
+                      "valuationDate" : {
+                        "valuationDate" : {
+                          "periodMultiplier" : 0,
+                          "period" : "D",
+                          "meta" : {
+                            "globalKey" : "7ae6233d"
                           },
-                          "notionalReference" : {
-                            "externalReference" : "notional0",
-                            "globalReference" : "0"
+                          "businessDayConvention" : "NONE",
+                          "dateRelativeTo" : {
+                            "globalReference" : "c04e26de",
+                            "externalReference" : "europeanExercise0"
                           }
-                        },
+                        }
+                      },
+                      "valuationTime" : {
+                        "hourMinuteTime" : "11:00:00",
+                        "businessCenter" : {
+                          "value" : "EUTA"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "f67cabd8",
+                        "externalKey" : "cashSettlement0"
+                      }
+                    } ]
+                  },
+                  "buyerSeller" : {
+                    "buyer" : "Party1",
+                    "seller" : "Party2"
+                  },
+                  "optionType" : "Straddle",
+                  "exerciseTerms" : {
+                    "optionStyle" : {
+                      "europeanExercise" : {
                         "expirationDate" : [ {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2019-04-01",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "FOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
@@ -1194,37 +1044,77 @@
                                   "globalKey" : "4158421"
                                 }
                               },
-                              "businessDayConvention" : "FOLLOWING",
                               "meta" : {
                                 "globalKey" : "da3b6050"
                               }
                             },
                             "meta" : {
                               "globalKey" : "4a5f542f"
-                            },
-                            "unadjustedDate" : "2019-04-01"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "4a5f542f"
                           }
                         } ],
+                        "earliestExerciseTime" : {
+                          "hourMinuteTime" : "09:00:00",
+                          "businessCenter" : {
+                            "value" : "GBLO"
+                          }
+                        },
                         "expirationTime" : {
+                          "hourMinuteTime" : "11:00:00",
                           "businessCenter" : {
                             "value" : "GBLO"
+                          }
+                        },
+                        "exerciseFee" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2",
+                          "notionalReference" : {
+                            "globalReference" : "0",
+                            "externalReference" : "notional0"
                           },
-                          "hourMinuteTime" : "11:00:00"
+                          "feeAmount" : 100000,
+                          "feePaymentDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "4825adb2"
+                            },
+                            "businessDayConvention" : "NONE",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "EUTA"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "20a71d"
+                              }
+                            },
+                            "dateRelativeTo" : {
+                              "globalReference" : "c04e26de",
+                              "externalReference" : "europeanExercise0"
+                            }
+                          }
                         },
                         "meta" : {
-                          "externalKey" : "europeanExercise0",
-                          "globalKey" : "3f30e6b8"
+                          "globalKey" : "c04e26de",
+                          "externalKey" : "europeanExercise0"
                         }
                       }
+                    },
+                    "exerciseProcedure" : {
+                      "manualExercise" : {
+                        "exerciseNotice" : {
+                          "exerciseNoticeGiver" : "Buyer",
+                          "businessCenter" : {
+                            "value" : "BEBR"
+                          }
+                        }
+                      },
+                      "followUpConfirmation" : true
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "905b7ec3"
-                  },
-                  "optionType" : "STRADDLE",
                   "underlier" : {
                     "contractualProduct" : {
                       "productTaxonomy" : [ {
@@ -1235,47 +1125,43 @@
                         "payout" : {
                           "interestRatePayout" : [ {
                             "payerReceiver" : {
-                              "payer" : "PARTY_1",
-                              "receiver" : "PARTY_2"
+                              "payer" : "Party1",
+                              "receiver" : "Party2"
                             },
                             "priceQuantity" : {
-                              "meta" : {
-                                "externalKey" : "notional0",
-                                "globalKey" : "0"
-                              },
                               "quantitySchedule" : {
                                 "address" : {
                                   "scope" : "DOCUMENT",
                                   "value" : "quantity-1"
                                 }
+                              },
+                              "meta" : {
+                                "globalKey" : "0",
+                                "externalKey" : "notional0"
                               }
                             },
-                            "calculationPeriodDates" : {
-                              "calculationPeriodDatesAdjustments" : {
-                                "businessCenters" : {
-                                  "businessCentersReference" : {
-                                    "externalReference" : "accrualBusinessCenters0",
-                                    "globalReference" : "20a71d"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "26b869c"
+                            "rateSpecification" : {
+                              "fixedRate" : {
+                                "rateSchedule" : {
+                                  "price" : {
+                                    "address" : {
+                                      "scope" : "DOCUMENT",
+                                      "value" : "price-1"
+                                    }
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
-                                  "globalKey" : "e00ca52b"
+                                  "globalKey" : "0"
                                 }
-                              },
-                              "calculationPeriodFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "2b934"
-                                },
-                                "period" : "Y",
-                                "periodMultiplier" : 1,
-                                "rollConvention" : "30"
-                              },
+                              }
+                            },
+                            "dayCountFraction" : {
+                              "value" : "30/360"
+                            },
+                            "calculationPeriodDates" : {
                               "effectiveDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2019-04-03",
                                   "dateAdjustments" : {
                                     "businessDayConvention" : "NONE",
                                     "meta" : {
@@ -1284,135 +1170,133 @@
                                   },
                                   "meta" : {
                                     "globalKey" : "ed018b7b"
-                                  },
-                                  "unadjustedDate" : "2019-04-03"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "ed018b7b"
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "CalcPeriodDates0",
-                                "globalKey" : "b67545c7"
-                              },
                               "terminationDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2024-04-03",
                                   "dateAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
                                       } ],
                                       "meta" : {
-                                        "externalKey" : "accrualBusinessCenters0",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "accrualBusinessCenters0"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
                                       "globalKey" : "365baaee"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "759b93cb"
-                                  },
-                                  "unadjustedDate" : "2024-04-03"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "759b93cb"
                                 }
+                              },
+                              "calculationPeriodDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
+                                "businessCenters" : {
+                                  "businessCentersReference" : {
+                                    "globalReference" : "20a71d",
+                                    "externalReference" : "accrualBusinessCenters0"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "26b869c"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "e00ca52b"
+                                }
+                              },
+                              "calculationPeriodFrequency" : {
+                                "periodMultiplier" : 1,
+                                "period" : "Y",
+                                "meta" : {
+                                  "globalKey" : "17984"
+                                },
+                                "rollConvention" : "30"
+                              },
+                              "meta" : {
+                                "globalKey" : "d29acc75",
+                                "externalKey" : "CalcPeriodDates0"
                               }
                             },
-                            "dayCountFraction" : {
-                              "value" : "30/360"
-                            },
-                            "meta" : {
-                              "globalKey" : "6bad977c"
-                            },
                             "paymentDates" : {
-                              "meta" : {
-                                "globalKey" : "4d64aef4"
+                              "paymentFrequency" : {
+                                "periodMultiplier" : 1,
+                                "period" : "Y",
+                                "meta" : {
+                                  "globalKey" : "78"
+                                }
                               },
-                              "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                              "payRelativeTo" : "CalculationPeriodEndDate",
                               "paymentDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "EUTA"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "paymentBusinessCenters0",
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "20a71d",
+                                    "externalKey" : "paymentBusinessCenters0"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "365baaee"
                                 }
                               },
-                              "paymentFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "ac8"
-                                },
-                                "period" : "Y",
-                                "periodMultiplier" : 1
+                              "meta" : {
+                                "globalKey" : "9b0d9350"
                               }
                             },
-                            "rateSpecification" : {
-                              "fixedRate" : {
-                                "meta" : {
-                                  "globalKey" : "0"
-                                },
-                                "rateSchedule" : {
-                                  "price" : {
-                                    "address" : {
-                                      "scope" : "DOCUMENT",
-                                      "value" : "price-1"
-                                    }
-                                  }
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "c46874b0"
                             }
                           }, {
                             "payerReceiver" : {
-                              "payer" : "PARTY_2",
-                              "receiver" : "PARTY_1"
+                              "payer" : "Party2",
+                              "receiver" : "Party1"
                             },
                             "priceQuantity" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
                               "quantitySchedule" : {
                                 "address" : {
                                   "scope" : "DOCUMENT",
                                   "value" : "quantity-2"
                                 }
+                              },
+                              "meta" : {
+                                "globalKey" : "0"
                               }
                             },
-                            "calculationPeriodDates" : {
-                              "calculationPeriodDatesAdjustments" : {
-                                "businessCenters" : {
-                                  "businessCentersReference" : {
-                                    "externalReference" : "accrualBusinessCenters1",
-                                    "globalReference" : "20a71d"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "26bfafb"
+                            "rateSpecification" : {
+                              "floatingRate" : {
+                                "rateOption" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "rateOption-1"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
-                                  "globalKey" : "e00d198a"
+                                  "globalKey" : "0"
                                 }
-                              },
-                              "calculationPeriodFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "28cc3"
-                                },
-                                "period" : "M",
-                                "periodMultiplier" : 6,
-                                "rollConvention" : "30"
-                              },
+                              }
+                            },
+                            "dayCountFraction" : {
+                              "value" : "ACT/360"
+                            },
+                            "calculationPeriodDates" : {
                               "effectiveDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2019-04-03",
                                   "dateAdjustments" : {
                                     "businessDayConvention" : "NONE",
                                     "meta" : {
@@ -1421,314 +1305,427 @@
                                   },
                                   "meta" : {
                                     "globalKey" : "ed018b7b"
-                                  },
-                                  "unadjustedDate" : "2019-04-03"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "ed018b7b"
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "CalcPeriodDates1",
-                                "globalKey" : "f180e819"
-                              },
                               "terminationDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2024-04-03",
                                   "dateAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
                                       } ],
                                       "meta" : {
-                                        "externalKey" : "accrualBusinessCenters1",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "accrualBusinessCenters1"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
                                       "globalKey" : "365baaee"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "759b93cb"
-                                  },
-                                  "unadjustedDate" : "2024-04-03"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "759b93cb"
                                 }
-                              }
-                            },
-                            "dayCountFraction" : {
-                              "value" : "ACT/360"
-                            },
-                            "meta" : {
-                              "globalKey" : "838bd9f4"
-                            },
-                            "paymentDates" : {
-                              "meta" : {
-                                "globalKey" : "4d64ad85"
                               },
-                              "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                              "paymentDatesAdjustments" : {
+                              "calculationPeriodDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
-                                  "businessCenter" : [ {
-                                    "value" : "EUTA"
-                                  } ],
+                                  "businessCentersReference" : {
+                                    "globalReference" : "20a71d",
+                                    "externalReference" : "accrualBusinessCenters1"
+                                  },
                                   "meta" : {
-                                    "externalKey" : "paymentBusinessCenters1",
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "26bfafb"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
-                                  "globalKey" : "365baaee"
+                                  "globalKey" : "e00d198a"
                                 }
                               },
-                              "paymentFrequency" : {
+                              "calculationPeriodFrequency" : {
+                                "periodMultiplier" : 6,
+                                "period" : "M",
                                 "meta" : {
-                                  "globalKey" : "959"
+                                  "globalKey" : "18ad5"
                                 },
-                                "period" : "M",
-                                "periodMultiplier" : 6
+                                "rollConvention" : "30"
+                              },
+                              "meta" : {
+                                "globalKey" : "3a7c0aa5",
+                                "externalKey" : "CalcPeriodDates1"
                               }
                             },
-                            "rateSpecification" : {
-                              "floatingRate" : {
+                            "paymentDates" : {
+                              "paymentFrequency" : {
+                                "periodMultiplier" : 6,
+                                "period" : "M",
                                 "meta" : {
-                                  "globalKey" : "0"
-                                },
-                                "rateOption" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "rateOption-1"
+                                  "globalKey" : "107"
+                                }
+                              },
+                              "payRelativeTo" : "CalculationPeriodEndDate",
+                              "paymentDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
+                                "businessCenters" : {
+                                  "businessCenter" : [ {
+                                    "value" : "EUTA"
+                                  } ],
+                                  "meta" : {
+                                    "globalKey" : "20a71d",
+                                    "externalKey" : "paymentBusinessCenters1"
                                   }
+                                },
+                                "meta" : {
+                                  "globalKey" : "365baaee"
                                 }
+                              },
+                              "meta" : {
+                                "globalKey" : "8f129421"
                               }
                             },
                             "resetDates" : {
                               "calculationPeriodDatesReference" : {
-                                "externalReference" : "CalcPeriodDates1",
-                                "globalReference" : "f180e819"
+                                "globalReference" : "3a7c0aa5",
+                                "externalReference" : "CalcPeriodDates1"
                               },
+                              "resetRelativeTo" : "CalculationPeriodStartDate",
                               "fixingDates" : {
+                                "periodMultiplier" : -2,
+                                "period" : "D",
                                 "meta" : {
-                                  "globalKey" : "2d80ce65"
+                                  "globalKey" : "a5cb919"
                                 },
-                                "period" : "D",
-                                "periodMultiplier" : -2,
-                                "dayType" : "BUSINESS",
+                                "dayType" : "Business",
+                                "businessDayConvention" : "NONE",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "EUTA"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "fixingBusinessCenters0",
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "20a71d",
+                                    "externalKey" : "fixingBusinessCenters0"
                                   }
                                 },
-                                "businessDayConvention" : "NONE",
                                 "dateRelativeTo" : {
-                                  "externalReference" : "resetDates0",
-                                  "globalReference" : "fa8ded93"
+                                  "globalReference" : "7d3bfc87",
+                                  "externalReference" : "resetDates0"
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "resetDates0",
-                                "globalKey" : "fa8ded93"
+                              "resetFrequency" : {
+                                "periodMultiplier" : 6,
+                                "period" : "M",
+                                "meta" : {
+                                  "globalKey" : "107"
+                                }
                               },
                               "resetDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "paymentBusinessCenters1",
-                                    "globalReference" : "20a71d"
+                                    "globalReference" : "20a71d",
+                                    "externalReference" : "paymentBusinessCenters1"
                                   },
                                   "meta" : {
                                     "globalKey" : "c3690944"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "a10a27d3"
                                 }
                               },
-                              "resetFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "959"
-                                },
-                                "period" : "M",
-                                "periodMultiplier" : 6
-                              },
-                              "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                              "meta" : {
+                                "globalKey" : "7d3bfc87",
+                                "externalKey" : "resetDates0"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "2ac2e400"
                             }
                           } ],
                           "meta" : {
-                            "globalKey" : "160032f8"
+                            "globalKey" : "41255950"
                           }
                         }
                       },
                       "meta" : {
-                        "globalKey" : "66855e27"
+                        "globalKey" : "91aa847f"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "66855e27"
+                      "globalKey" : "91aa847f"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "77575323"
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "77575323"
+                }
+              },
+              "calculationAgent" : {
+                "calculationAgentParty" : "CalculationAgentIndependent"
               }
             },
             "meta" : {
-              "globalKey" : "64973ad8"
+              "globalKey" : "44a686f8"
             }
           },
           "meta" : {
-            "globalKey" : "64973ad8"
+            "globalKey" : "44a686f8"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "c6c3fe86"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.05,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "value" : 0.05,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
+                "priceType" : "InterestRate"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-1"
+                } ]
               }
             } ],
             "quantity" : [ {
+              "value" : {
+                "value" : 0,
+                "unit" : {
+                  "currency" : {
+                    "value" : "EUR"
+                  }
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "11bbd23a"
+            }
+          }, {
+            "quantity" : [ {
               "value" : {
+                "value" : 0,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
-                },
-                "value" : 0
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "ad647c41"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "bf589e11"
-              },
               "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
                 "value" : {
                   "floatingRateIndex" : {
                     "value" : "EUR-EURIBOR-Telerate"
                   },
                   "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
+                    "periodMultiplier" : 6,
                     "period" : "M",
-                    "periodMultiplier" : 6
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
                 }
-              }
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
-                } ]
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "EUR"
-                  }
-                },
-                "value" : 0
+              "meta" : {
+                "globalKey" : "2bba2221"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "ddddb13"
+            }
+          } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "74dee05b",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "b97c11f6",
+            "externalReference" : "party2"
+          }
+        } ],
+        "ancillaryParty" : [ {
+          "role" : "CalculationAgentIndependent",
+          "partyReference" : [ {
+            "globalReference" : "b97c11f6",
+            "externalReference" : "party2"
           } ]
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f1101"
-        },
-        "value" : "2018-04-01"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "LEI1RPT0001",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-            },
-            "value" : "LEI1RPT0001HHH"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "b8962566"
           }
         } ],
-        "issuer" : {
+        "name" : {
+          "value" : "Bank X"
+        },
+        "businessUnit" : [ {
+          "name" : "NY Swaps Desk",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+            "globalKey" : "5c10b72e",
+            "externalKey" : "desk1"
+          }
+        } ],
+        "person" : [ {
+          "personId" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "jjones"
+              },
+              "meta" : {
+                "globalKey" : "baeb8c0d"
+              }
+            }
+          } ],
+          "firstName" : "jjone",
+          "meta" : {
+            "globalKey" : "d3962233",
+            "externalKey" : "trader"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "74dee05b",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "LEI2CP0002",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "eb8edea1"
+          }
+        } ],
+        "name" : {
+          "value" : "Bank Y"
+        },
+        "meta" : {
+          "globalKey" : "b97c11f6",
+          "externalKey" : "party2"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "549300OL8KL0WCQ34V31",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
           },
-          "value" : "LEI1RPT0001"
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "8ffabe4b"
+          }
+        } ],
+        "name" : {
+          "value" : "Up&Atem"
         },
         "meta" : {
-          "globalKey" : "e3416af0"
+          "globalKey" : "ce0b9311",
+          "externalKey" : "broker1"
+        }
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "ce0b9311",
+          "externalReference" : "broker1"
         },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
-    },
-    "transferHistory" : [ {
+        "role" : "ArrangingBroker",
+        "ownershipPartyReference" : {
+          "globalReference" : "74dee05b",
+          "externalReference" : "party1"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "d87a5519"
+        "globalKey" : "c813ffa2"
+      }
+    },
+    "state" : {
+      "closedState" : {
+        "state" : "Terminated"
       },
+      "positionState" : "Closed"
+    },
+    "transferHistory" : [ {
       "transfer" : {
-        "payerReceiver" : {
-          "payerPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "fdda73db"
-          },
-          "receiverPartyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ee963b6"
-          }
-        },
         "quantity" : {
+          "value" : 100000,
           "unit" : {
             "currency" : {
               "value" : "EUR"
             }
+          }
+        },
+        "payerReceiver" : {
+          "payerPartyReference" : {
+            "globalReference" : "74dee05b",
+            "externalReference" : "party1"
           },
-          "value" : 100000
+          "receiverPartyReference" : {
+            "globalReference" : "b97c11f6",
+            "externalReference" : "party2"
+          }
         },
         "settlementDate" : {
+          "unadjustedDate" : "2018-04-01",
           "dateAdjustments" : {
+            "businessDayConvention" : "FOLLOWING",
             "businessCenters" : {
               "businessCenter" : [ {
                 "value" : "EUTA"
@@ -1737,61 +1734,64 @@
                 "globalKey" : "20a71d"
               }
             },
-            "businessDayConvention" : "FOLLOWING",
             "meta" : {
               "globalKey" : "211dc30c"
             }
-          },
-          "unadjustedDate" : "2018-04-01"
+          }
         },
         "transferExpression" : {
-          "priceTransfer" : "PREMIUM"
+          "priceTransfer" : "Premium"
         }
+      },
+      "meta" : {
+        "globalKey" : "3bc7530b"
       }
     }, {
-      "meta" : {
-        "globalKey" : "a038982"
-      },
       "transfer" : {
-        "payerReceiver" : {
-          "payerPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "fdda73db"
-          },
-          "receiverPartyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ee963b6"
-          }
-        },
         "quantity" : {
+          "value" : 2000,
           "unit" : {
             "currency" : {
+              "value" : "EUR",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-              },
-              "value" : "EUR"
+              }
             }
+          }
+        },
+        "payerReceiver" : {
+          "payerPartyReference" : {
+            "globalReference" : "74dee05b",
+            "externalReference" : "party1"
           },
-          "value" : 2000
+          "receiverPartyReference" : {
+            "globalReference" : "b97c11f6",
+            "externalReference" : "party2"
+          }
         },
         "settlementDate" : {
           "adjustedDate" : {
+            "value" : "2019-04-03",
             "meta" : {
               "globalKey" : "3f1903"
-            },
-            "value" : "2019-04-03"
+            }
           }
         },
         "transferExpression" : {
           "scheduledTransfer" : {
-            "transferType" : "EXERCISE"
+            "transferType" : "Exercise"
           }
         }
+      },
+      "meta" : {
+        "globalKey" : "489db9ae"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "ff172e72"
+    }
   } ],
-  "eventQualifier" : "Exercise",
   "meta" : {
-    "globalKey" : "5cfe87e0"
+    "globalKey" : "2a63be4c"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/exercise/exercise-partial-exercise-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/exercise/exercise-partial-exercise-func-output.json
index 73a28b1a09..3bdd536a77 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/exercise/exercise-partial-exercise-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/exercise/exercise-partial-exercise-func-output.json
@@ -1,132 +1,81 @@
 {
+  "intent" : "OptionExercise",
   "eventDate" : "2019-04-01",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "9758a434"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "17706e83"
-          },
-          "party" : [ {
-            "businessUnit" : [ {
+    "primitiveInstruction" : {
+      "exercise" : {
+        "exerciseQuantity" : {
+          "quantityChange" : {
+            "change" : [ {
+              "quantity" : [ {
+                "value" : {
+                  "value" : 11000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "EUR"
+                    }
+                  }
+                }
+              } ],
               "meta" : {
-                "externalKey" : "desk1",
-                "globalKey" : "5c10b72e"
-              },
-              "name" : "NY Swaps Desk"
+                "globalKey" : "56ced392"
+              }
             } ],
+            "direction" : "Replace"
+          }
+        },
+        "replacementTradeIdentifier" : [ {
+          "issuer" : {
+            "value" : "LEI1RPT0001",
             "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "fdda73db"
-            },
-            "name" : {
-              "value" : "Bank X"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI1RPT0001"
-              },
-              "identifierType" : "LEI",
+              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+            }
+          },
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "LEI1RPT0001IIIIEx",
               "meta" : {
-                "globalKey" : "b8962566"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
               }
-            } ],
-            "person" : [ {
-              "firstName" : "jjone",
-              "meta" : {
-                "externalKey" : "trader",
-                "globalKey" : "d3962233"
-              },
-              "personId" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "jjones"
-                  },
-                  "meta" : {
-                    "globalKey" : "baeb8c0d"
-                  }
-                }
-              } ]
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "ee963b6"
-            },
-            "name" : {
-              "value" : "Bank Y"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI2CP0002"
-              },
-              "identifierType" : "LEI",
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "9069ec85"
+          },
+          "identifierType" : "UniqueTransactionIdentifier"
+        } ]
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "LEI1RPT0001",
               "meta" : {
-                "globalKey" : "eb8edea1"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
               }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "broker1",
-              "globalKey" : "ed0cc6d1"
-            },
-            "name" : {
-              "value" : "Up&Atem"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "LEI1RPT0001IIII",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "549300OL8KL0WCQ34V31"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "8ffabe4b"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                }
               }
-            } ]
-          } ],
-          "partyRole" : [ {
-            "ownershipPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "fdda73db"
-            },
-            "partyReference" : {
-              "externalReference" : "broker1",
-              "globalReference" : "ed0cc6d1"
+            } ],
+            "meta" : {
+              "globalKey" : "7ab7b578"
             },
-            "role" : "ARRANGING_BROKER"
+            "identifierType" : "UniqueTransactionIdentifier"
           } ],
+          "tradeDate" : {
+            "value" : "2018-05-01",
+            "meta" : {
+              "globalKey" : "3f1141"
+            }
+          },
           "tradableProduct" : {
-            "ancillaryParty" : [ {
-              "partyReference" : [ {
-                "externalReference" : "party2",
-                "globalReference" : "ee963b6"
-              } ],
-              "role" : "CALCULATION_AGENT_INDEPENDENT"
-            } ],
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "fdda73db"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ee963b6"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -134,17 +83,11 @@
                   "productQualifier" : "InterestRate_Option_Swaption"
                 } ],
                 "economicTerms" : {
-                  "calculationAgent" : {
-                    "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-                  },
                   "payout" : {
-                    "meta" : {
-                      "globalKey" : "e9140f30"
-                    },
                     "optionPayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "settlementTerms" : {
                         "meta" : {
@@ -158,32 +101,17 @@
                         }
                       },
                       "buyerSeller" : {
-                        "buyer" : "PARTY_1",
-                        "seller" : "PARTY_2"
+                        "buyer" : "Party1",
+                        "seller" : "Party2"
                       },
                       "exerciseTerms" : {
-                        "exerciseProcedure" : {
-                          "followUpConfirmation" : true,
-                          "manualExercise" : {
-                            "exerciseNotice" : {
-                              "businessCenter" : {
-                                "value" : "GBLO"
-                              },
-                              "exerciseNoticeGiver" : "SELLER"
-                            }
-                          }
-                        },
                         "optionStyle" : {
                           "europeanExercise" : {
-                            "earliestExerciseTime" : {
-                              "businessCenter" : {
-                                "value" : "BEBR"
-                              },
-                              "hourMinuteTime" : "09:00:00"
-                            },
                             "expirationDate" : [ {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2021-12-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "FOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
@@ -194,35 +122,47 @@
                                       "globalKey" : "4158421"
                                     }
                                   },
-                                  "businessDayConvention" : "FOLLOWING",
                                   "meta" : {
                                     "globalKey" : "da3b6050"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "e4091772"
-                                },
-                                "unadjustedDate" : "2021-12-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "e4091772"
                               }
                             } ],
+                            "earliestExerciseTime" : {
+                              "hourMinuteTime" : "09:00:00",
+                              "businessCenter" : {
+                                "value" : "BEBR"
+                              }
+                            },
                             "expirationTime" : {
+                              "hourMinuteTime" : "11:00:00",
                               "businessCenter" : {
                                 "value" : "BEBR"
-                              },
-                              "hourMinuteTime" : "11:00:00"
+                              }
                             },
                             "meta" : {
-                              "globalKey" : "38fb3b53"
+                              "globalKey" : "3a8d6d3"
                             }
                           }
+                        },
+                        "exerciseProcedure" : {
+                          "manualExercise" : {
+                            "exerciseNotice" : {
+                              "exerciseNoticeGiver" : "Seller",
+                              "businessCenter" : {
+                                "value" : "GBLO"
+                              }
+                            }
+                          },
+                          "followUpConfirmation" : true
                         }
                       },
-                      "meta" : {
-                        "globalKey" : "e9140f30"
-                      },
                       "underlier" : {
                         "contractualProduct" : {
                           "productTaxonomy" : [ {
@@ -233,46 +173,42 @@
                             "payout" : {
                               "interestRatePayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-1"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
-                                "calculationPeriodDates" : {
-                                  "calculationPeriodDatesAdjustments" : {
-                                    "businessCenters" : {
-                                      "businessCentersReference" : {
-                                        "externalReference" : "accrualBusinessCenters0",
-                                        "globalReference" : "20a71d"
-                                      },
-                                      "meta" : {
-                                        "globalKey" : "26b869c"
+                                "rateSpecification" : {
+                                  "fixedRate" : {
+                                    "rateSchedule" : {
+                                      "price" : {
+                                        "address" : {
+                                          "scope" : "DOCUMENT",
+                                          "value" : "price-1"
+                                        }
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
-                                      "globalKey" : "e00ca52b"
+                                      "globalKey" : "0"
                                     }
-                                  },
-                                  "calculationPeriodFrequency" : {
-                                    "meta" : {
-                                      "globalKey" : "2b934"
-                                    },
-                                    "period" : "Y",
-                                    "periodMultiplier" : 1,
-                                    "rollConvention" : "30"
-                                  },
+                                  }
+                                },
+                                "dayCountFraction" : {
+                                  "value" : "30/360"
+                                },
+                                "calculationPeriodDates" : {
                                   "effectiveDate" : {
                                     "adjustableDate" : {
+                                      "unadjustedDate" : "2019-04-03",
                                       "dateAdjustments" : {
                                         "businessDayConvention" : "NONE",
                                         "meta" : {
@@ -281,135 +217,133 @@
                                       },
                                       "meta" : {
                                         "globalKey" : "ed018b7b"
-                                      },
-                                      "unadjustedDate" : "2019-04-03"
+                                      }
                                     },
                                     "meta" : {
                                       "globalKey" : "ed018b7b"
                                     }
                                   },
-                                  "meta" : {
-                                    "externalKey" : "CalcPeriodDates0",
-                                    "globalKey" : "59ea748c"
-                                  },
                                   "terminationDate" : {
                                     "adjustableDate" : {
+                                      "unadjustedDate" : "2021-12-30",
                                       "dateAdjustments" : {
+                                        "businessDayConvention" : "MODFOLLOWING",
                                         "businessCenters" : {
                                           "businessCenter" : [ {
                                             "value" : "EUTA"
                                           } ],
                                           "meta" : {
-                                            "externalKey" : "accrualBusinessCenters0",
-                                            "globalKey" : "20a71d"
+                                            "globalKey" : "20a71d",
+                                            "externalKey" : "accrualBusinessCenters0"
                                           }
                                         },
-                                        "businessDayConvention" : "MODFOLLOWING",
                                         "meta" : {
                                           "globalKey" : "365baaee"
                                         }
                                       },
                                       "meta" : {
                                         "globalKey" : "1910c290"
-                                      },
-                                      "unadjustedDate" : "2021-12-30"
+                                      }
                                     },
                                     "meta" : {
                                       "globalKey" : "1910c290"
                                     }
+                                  },
+                                  "calculationPeriodDatesAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
+                                    "businessCenters" : {
+                                      "businessCentersReference" : {
+                                        "globalReference" : "20a71d",
+                                        "externalReference" : "accrualBusinessCenters0"
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "26b869c"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "e00ca52b"
+                                    }
+                                  },
+                                  "calculationPeriodFrequency" : {
+                                    "periodMultiplier" : 1,
+                                    "period" : "Y",
+                                    "meta" : {
+                                      "globalKey" : "17984"
+                                    },
+                                    "rollConvention" : "30"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "48efbba",
+                                    "externalKey" : "CalcPeriodDates0"
                                   }
                                 },
-                                "dayCountFraction" : {
-                                  "value" : "30/360"
-                                },
-                                "meta" : {
-                                  "globalKey" : "9ab66617"
-                                },
                                 "paymentDates" : {
-                                  "meta" : {
-                                    "globalKey" : "4d64aef4"
+                                  "paymentFrequency" : {
+                                    "periodMultiplier" : 1,
+                                    "period" : "Y",
+                                    "meta" : {
+                                      "globalKey" : "78"
+                                    }
                                   },
-                                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                                  "payRelativeTo" : "CalculationPeriodEndDate",
                                   "paymentDatesAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
                                       } ],
                                       "meta" : {
-                                        "externalKey" : "paymentBusinessCenters0",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "paymentBusinessCenters0"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
                                       "globalKey" : "365baaee"
                                     }
                                   },
-                                  "paymentFrequency" : {
-                                    "meta" : {
-                                      "globalKey" : "ac8"
-                                    },
-                                    "period" : "Y",
-                                    "periodMultiplier" : 1
+                                  "meta" : {
+                                    "globalKey" : "9b0d9350"
                                   }
                                 },
-                                "rateSpecification" : {
-                                  "fixedRate" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
-                                    "rateSchedule" : {
-                                      "price" : {
-                                        "address" : {
-                                          "scope" : "DOCUMENT",
-                                          "value" : "price-1"
-                                        }
-                                      }
-                                    }
-                                  }
+                                "meta" : {
+                                  "globalKey" : "33d211b5"
                                 }
                               }, {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_2",
-                                  "receiver" : "PARTY_1"
+                                  "payer" : "Party2",
+                                  "receiver" : "Party1"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
-                                "calculationPeriodDates" : {
-                                  "calculationPeriodDatesAdjustments" : {
-                                    "businessCenters" : {
-                                      "businessCentersReference" : {
-                                        "externalReference" : "accrualBusinessCenters1",
-                                        "globalReference" : "20a71d"
-                                      },
-                                      "meta" : {
-                                        "globalKey" : "26bfafb"
+                                "rateSpecification" : {
+                                  "floatingRate" : {
+                                    "rateOption" : {
+                                      "address" : {
+                                        "scope" : "DOCUMENT",
+                                        "value" : "rateOption-1"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
-                                      "globalKey" : "e00d198a"
+                                      "globalKey" : "0"
                                     }
-                                  },
-                                  "calculationPeriodFrequency" : {
-                                    "meta" : {
-                                      "globalKey" : "28cc3"
-                                    },
-                                    "period" : "M",
-                                    "periodMultiplier" : 6,
-                                    "rollConvention" : "30"
-                                  },
+                                  }
+                                },
+                                "dayCountFraction" : {
+                                  "value" : "ACT/360"
+                                },
+                                "calculationPeriodDates" : {
                                   "effectiveDate" : {
                                     "adjustableDate" : {
+                                      "unadjustedDate" : "2019-04-03",
                                       "dateAdjustments" : {
                                         "businessDayConvention" : "NONE",
                                         "meta" : {
@@ -418,314 +352,421 @@
                                       },
                                       "meta" : {
                                         "globalKey" : "ed018b7b"
-                                      },
-                                      "unadjustedDate" : "2019-04-03"
+                                      }
                                     },
                                     "meta" : {
                                       "globalKey" : "ed018b7b"
                                     }
                                   },
-                                  "meta" : {
-                                    "externalKey" : "CalcPeriodDates1",
-                                    "globalKey" : "94f616de"
-                                  },
                                   "terminationDate" : {
                                     "adjustableDate" : {
+                                      "unadjustedDate" : "2021-12-30",
                                       "dateAdjustments" : {
+                                        "businessDayConvention" : "MODFOLLOWING",
                                         "businessCenters" : {
                                           "businessCenter" : [ {
                                             "value" : "EUTA"
                                           } ],
                                           "meta" : {
-                                            "externalKey" : "accrualBusinessCenters1",
-                                            "globalKey" : "20a71d"
+                                            "globalKey" : "20a71d",
+                                            "externalKey" : "accrualBusinessCenters1"
                                           }
                                         },
-                                        "businessDayConvention" : "MODFOLLOWING",
                                         "meta" : {
                                           "globalKey" : "365baaee"
                                         }
                                       },
                                       "meta" : {
                                         "globalKey" : "1910c290"
-                                      },
-                                      "unadjustedDate" : "2021-12-30"
+                                      }
                                     },
                                     "meta" : {
                                       "globalKey" : "1910c290"
                                     }
+                                  },
+                                  "calculationPeriodDatesAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
+                                    "businessCenters" : {
+                                      "businessCentersReference" : {
+                                        "globalReference" : "20a71d",
+                                        "externalReference" : "accrualBusinessCenters1"
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "26bfafb"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "e00d198a"
+                                    }
+                                  },
+                                  "calculationPeriodFrequency" : {
+                                    "periodMultiplier" : 6,
+                                    "period" : "M",
+                                    "meta" : {
+                                      "globalKey" : "18ad5"
+                                    },
+                                    "rollConvention" : "30"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "6c7039ea",
+                                    "externalKey" : "CalcPeriodDates1"
                                   }
                                 },
-                                "dayCountFraction" : {
-                                  "value" : "ACT/360"
-                                },
-                                "meta" : {
-                                  "globalKey" : "cbdc5a2a"
-                                },
                                 "paymentDates" : {
-                                  "meta" : {
-                                    "globalKey" : "4d64ad85"
+                                  "paymentFrequency" : {
+                                    "periodMultiplier" : 6,
+                                    "period" : "M",
+                                    "meta" : {
+                                      "globalKey" : "107"
+                                    }
                                   },
-                                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                                  "payRelativeTo" : "CalculationPeriodEndDate",
                                   "paymentDatesAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
                                       } ],
                                       "meta" : {
-                                        "externalKey" : "paymentBusinessCenters1",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "paymentBusinessCenters1"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
                                       "globalKey" : "365baaee"
                                     }
                                   },
-                                  "paymentFrequency" : {
-                                    "meta" : {
-                                      "globalKey" : "959"
-                                    },
-                                    "period" : "M",
-                                    "periodMultiplier" : 6
-                                  }
-                                },
-                                "rateSpecification" : {
-                                  "floatingRate" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
-                                    "rateOption" : {
-                                      "address" : {
-                                        "scope" : "DOCUMENT",
-                                        "value" : "rateOption-1"
-                                      }
-                                    }
+                                  "meta" : {
+                                    "globalKey" : "8f129421"
                                   }
                                 },
                                 "resetDates" : {
                                   "calculationPeriodDatesReference" : {
-                                    "externalReference" : "CalcPeriodDates1",
-                                    "globalReference" : "94f616de"
+                                    "globalReference" : "6c7039ea",
+                                    "externalReference" : "CalcPeriodDates1"
                                   },
+                                  "resetRelativeTo" : "CalculationPeriodStartDate",
                                   "fixingDates" : {
+                                    "periodMultiplier" : -2,
+                                    "period" : "D",
                                     "meta" : {
-                                      "globalKey" : "2d80ce65"
+                                      "globalKey" : "a5cb919"
                                     },
-                                    "period" : "D",
-                                    "periodMultiplier" : -2,
-                                    "dayType" : "BUSINESS",
+                                    "dayType" : "Business",
+                                    "businessDayConvention" : "NONE",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
                                       } ],
                                       "meta" : {
-                                        "externalKey" : "fixingBusinessCenters0",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "fixingBusinessCenters0"
                                       }
                                     },
-                                    "businessDayConvention" : "NONE",
                                     "dateRelativeTo" : {
-                                      "externalReference" : "resetDates0",
-                                      "globalReference" : "eaa1bee"
+                                      "globalReference" : "9b167a62",
+                                      "externalReference" : "resetDates0"
                                     }
                                   },
-                                  "meta" : {
-                                    "externalKey" : "resetDates0",
-                                    "globalKey" : "eaa1bee"
+                                  "resetFrequency" : {
+                                    "periodMultiplier" : 6,
+                                    "period" : "M",
+                                    "meta" : {
+                                      "globalKey" : "107"
+                                    }
                                   },
                                   "resetDatesAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
                                       "businessCentersReference" : {
-                                        "externalReference" : "paymentBusinessCenters1",
-                                        "globalReference" : "20a71d"
+                                        "globalReference" : "20a71d",
+                                        "externalReference" : "paymentBusinessCenters1"
                                       },
                                       "meta" : {
                                         "globalKey" : "c3690944"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
                                       "globalKey" : "a10a27d3"
                                     }
                                   },
-                                  "resetFrequency" : {
-                                    "meta" : {
-                                      "globalKey" : "959"
-                                    },
-                                    "period" : "M",
-                                    "periodMultiplier" : 6
-                                  },
-                                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                                  "meta" : {
+                                    "globalKey" : "9b167a62",
+                                    "externalKey" : "resetDates0"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "867ba8b6"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "ebb22933"
+                                "globalKey" : "4271c861"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "3c375462"
+                            "globalKey" : "92f6f390"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "3c375462"
+                          "globalKey" : "92f6f390"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "d9fbf124"
                       }
-                    } ]
+                    } ],
+                    "meta" : {
+                      "globalKey" : "d9fbf124"
+                    }
+                  },
+                  "calculationAgent" : {
+                    "calculationAgentParty" : "CalculationAgentIndependent"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "643f805"
+                  "globalKey" : "53c40bf9"
                 }
               },
               "meta" : {
-                "globalKey" : "643f805"
+                "globalKey" : "53c40bf9"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "25fb1aeb"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.05,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "value" : 0.05,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
+                    "priceType" : "InterestRate"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
                   }
                 } ],
                 "quantity" : [ {
+                  "value" : {
+                    "value" : 16000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "EUR"
+                      }
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     } ]
-                  },
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "99684275"
+                }
+              }, {
+                "quantity" : [ {
                   "value" : {
+                    "value" : 16000,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
-                    },
-                    "value" : 16000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "c9b98a6"
-                },
+                } ],
                 "observable" : {
-                  "meta" : {
-                    "globalKey" : "bf589e11"
-                  },
                   "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
                     "value" : {
                       "floatingRateIndex" : {
                         "value" : "EUR-EURIBOR-Telerate"
                       },
                       "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "959"
-                        },
+                        "periodMultiplier" : 6,
                         "period" : "M",
-                        "periodMultiplier" : 6
+                        "meta" : {
+                          "globalKey" : "107"
+                        }
                       }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
                     }
-                  }
-                },
-                "quantity" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
-                    } ]
                   },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "EUR"
-                      }
-                    },
-                    "value" : 16000
+                  "meta" : {
+                    "globalKey" : "2bba2221"
                   }
-                } ]
+                },
+                "meta" : {
+                  "globalKey" : "d61c7d38"
+                }
+              } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "74dee05b",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "b97c11f6",
+                "externalReference" : "party2"
+              }
+            } ],
+            "ancillaryParty" : [ {
+              "role" : "CalculationAgentIndependent",
+              "partyReference" : [ {
+                "globalReference" : "b97c11f6",
+                "externalReference" : "party2"
               } ]
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f1141"
-            },
-            "value" : "2018-05-01"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "LEI1RPT0001",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                },
-                "value" : "LEI1RPT0001IIII"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "b8962566"
               }
             } ],
-            "issuer" : {
+            "name" : {
+              "value" : "Bank X"
+            },
+            "businessUnit" : [ {
+              "name" : "NY Swaps Desk",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                "globalKey" : "5c10b72e",
+                "externalKey" : "desk1"
+              }
+            } ],
+            "person" : [ {
+              "personId" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "jjones"
+                  },
+                  "meta" : {
+                    "globalKey" : "baeb8c0d"
+                  }
+                }
+              } ],
+              "firstName" : "jjone",
+              "meta" : {
+                "globalKey" : "d3962233",
+                "externalKey" : "trader"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "74dee05b",
+              "externalKey" : "party1"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "LEI2CP0002",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
               },
-              "value" : "LEI1RPT0001"
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "eb8edea1"
+              }
+            } ],
+            "name" : {
+              "value" : "Bank Y"
             },
             "meta" : {
-              "globalKey" : "f2097dcc"
+              "globalKey" : "b97c11f6",
+              "externalKey" : "party2"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "549300OL8KL0WCQ34V31",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "8ffabe4b"
+              }
+            } ],
+            "name" : {
+              "value" : "Up&Atem"
             },
-            "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-          } ]
+            "meta" : {
+              "globalKey" : "ce0b9311",
+              "externalKey" : "broker1"
+            }
+          } ],
+          "partyRole" : [ {
+            "partyReference" : {
+              "globalReference" : "ce0b9311",
+              "externalReference" : "broker1"
+            },
+            "role" : "ArrangingBroker",
+            "ownershipPartyReference" : {
+              "globalReference" : "74dee05b",
+              "externalReference" : "party1"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "f1e37cbd"
+          }
         },
         "transferHistory" : [ {
-          "meta" : {
-            "globalKey" : "a087e697"
-          },
           "transfer" : {
-            "payerReceiver" : {
-              "payerPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "fdda73db"
-              },
-              "receiverPartyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ee963b6"
-              }
-            },
             "quantity" : {
+              "value" : 100000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
+              }
+            },
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "globalReference" : "74dee05b",
+                "externalReference" : "party1"
               },
-              "value" : 100000
+              "receiverPartyReference" : {
+                "globalReference" : "b97c11f6",
+                "externalReference" : "party2"
+              }
             },
             "settlementDate" : {
+              "unadjustedDate" : "2018-05-03",
               "dateAdjustments" : {
+                "businessDayConvention" : "FOLLOWING",
                 "businessCenters" : {
                   "businessCenter" : [ {
                     "value" : "EUTA"
@@ -734,191 +775,55 @@
                     "globalKey" : "20a71d"
                   }
                 },
-                "businessDayConvention" : "FOLLOWING",
                 "meta" : {
                   "globalKey" : "211dc30c"
                 }
-              },
-              "unadjustedDate" : "2018-05-03"
+              }
             },
             "transferExpression" : {
-              "priceTransfer" : "PREMIUM"
-            }
-          }
-        } ]
-      }
-    },
-    "primitiveInstruction" : {
-      "exercise" : {
-        "exerciseQuantity" : {
-          "quantityChange" : {
-            "change" : [ {
-              "meta" : {
-                "globalKey" : "56ced392"
-              },
-              "quantity" : [ {
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "EUR"
-                    }
-                  },
-                  "value" : 11000
-                }
-              } ]
-            } ],
-            "direction" : "REPLACE"
-          }
-        },
-        "replacementTradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-              },
-              "value" : "LEI1RPT0001IIIIEx"
+              "priceTransfer" : "Premium"
             }
-          } ],
-          "issuer" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-            },
-            "value" : "LEI1RPT0001"
           },
           "meta" : {
-            "globalKey" : "640a2599"
-          },
-          "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-        } ]
+            "globalKey" : "3d4e489"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "4da5b3ac"
+        }
       }
     }
   } ],
-  "intent" : "OPTION_EXERCISE",
+  "eventQualifier" : "Exercise",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "f838f42a"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "aabc244d"
-      },
-      "party" : [ {
-        "businessUnit" : [ {
-          "meta" : {
-            "externalKey" : "desk1",
-            "globalKey" : "5c10b72e"
-          },
-          "name" : "NY Swaps Desk"
-        } ],
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "fdda73db"
-        },
-        "name" : {
-          "value" : "Bank X"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI1RPT0001"
-          },
-          "identifierType" : "LEI",
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "LEI1RPT0001",
           "meta" : {
-            "globalKey" : "b8962566"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
           }
-        } ],
-        "person" : [ {
-          "firstName" : "jjone",
-          "meta" : {
-            "externalKey" : "trader",
-            "globalKey" : "d3962233"
-          },
-          "personId" : [ {
-            "value" : {
-              "identifier" : {
-                "value" : "jjones"
-              },
-              "meta" : {
-                "globalKey" : "baeb8c0d"
-              }
-            }
-          } ]
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "ee963b6"
         },
-        "name" : {
-          "value" : "Bank Y"
-        },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "LEI1RPT0001IIII",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI2CP0002"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "eb8edea1"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+            }
           }
-        } ]
-      }, {
+        } ],
         "meta" : {
-          "externalKey" : "broker1",
-          "globalKey" : "ed0cc6d1"
+          "globalKey" : "7ab7b578"
         },
-        "name" : {
-          "value" : "Up&Atem"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300OL8KL0WCQ34V31"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "8ffabe4b"
-          }
-        } ]
-      } ],
-      "partyRole" : [ {
-        "ownershipPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "fdda73db"
-        },
-        "partyReference" : {
-          "externalReference" : "broker1",
-          "globalReference" : "ed0cc6d1"
-        },
-        "role" : "ARRANGING_BROKER"
+        "identifierType" : "UniqueTransactionIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2018-05-01",
+        "meta" : {
+          "globalKey" : "3f1141"
+        }
+      },
       "tradableProduct" : {
-        "ancillaryParty" : [ {
-          "partyReference" : [ {
-            "externalReference" : "party2",
-            "globalReference" : "ee963b6"
-          } ],
-          "role" : "CALCULATION_AGENT_INDEPENDENT"
-        } ],
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "fdda73db"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ee963b6"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -926,17 +831,11 @@
               "productQualifier" : "InterestRate_Option_Swaption"
             } ],
             "economicTerms" : {
-              "calculationAgent" : {
-                "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-              },
               "payout" : {
-                "meta" : {
-                  "globalKey" : "e9140f30"
-                },
                 "optionPayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "settlementTerms" : {
                     "meta" : {
@@ -950,32 +849,17 @@
                     }
                   },
                   "buyerSeller" : {
-                    "buyer" : "PARTY_1",
-                    "seller" : "PARTY_2"
+                    "buyer" : "Party1",
+                    "seller" : "Party2"
                   },
                   "exerciseTerms" : {
-                    "exerciseProcedure" : {
-                      "followUpConfirmation" : true,
-                      "manualExercise" : {
-                        "exerciseNotice" : {
-                          "businessCenter" : {
-                            "value" : "GBLO"
-                          },
-                          "exerciseNoticeGiver" : "SELLER"
-                        }
-                      }
-                    },
                     "optionStyle" : {
                       "europeanExercise" : {
-                        "earliestExerciseTime" : {
-                          "businessCenter" : {
-                            "value" : "BEBR"
-                          },
-                          "hourMinuteTime" : "09:00:00"
-                        },
                         "expirationDate" : [ {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2021-12-30",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "FOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
@@ -986,35 +870,47 @@
                                   "globalKey" : "4158421"
                                 }
                               },
-                              "businessDayConvention" : "FOLLOWING",
                               "meta" : {
                                 "globalKey" : "da3b6050"
                               }
                             },
                             "meta" : {
                               "globalKey" : "e4091772"
-                            },
-                            "unadjustedDate" : "2021-12-30"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "e4091772"
                           }
                         } ],
+                        "earliestExerciseTime" : {
+                          "hourMinuteTime" : "09:00:00",
+                          "businessCenter" : {
+                            "value" : "BEBR"
+                          }
+                        },
                         "expirationTime" : {
+                          "hourMinuteTime" : "11:00:00",
                           "businessCenter" : {
                             "value" : "BEBR"
-                          },
-                          "hourMinuteTime" : "11:00:00"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "38fb3b53"
+                          "globalKey" : "3a8d6d3"
                         }
                       }
+                    },
+                    "exerciseProcedure" : {
+                      "manualExercise" : {
+                        "exerciseNotice" : {
+                          "exerciseNoticeGiver" : "Seller",
+                          "businessCenter" : {
+                            "value" : "GBLO"
+                          }
+                        }
+                      },
+                      "followUpConfirmation" : true
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "e9140f30"
-                  },
                   "underlier" : {
                     "contractualProduct" : {
                       "productTaxonomy" : [ {
@@ -1025,46 +921,42 @@
                         "payout" : {
                           "interestRatePayout" : [ {
                             "payerReceiver" : {
-                              "payer" : "PARTY_1",
-                              "receiver" : "PARTY_2"
+                              "payer" : "Party1",
+                              "receiver" : "Party2"
                             },
                             "priceQuantity" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
                               "quantitySchedule" : {
                                 "address" : {
                                   "scope" : "DOCUMENT",
                                   "value" : "quantity-1"
                                 }
+                              },
+                              "meta" : {
+                                "globalKey" : "0"
                               }
                             },
-                            "calculationPeriodDates" : {
-                              "calculationPeriodDatesAdjustments" : {
-                                "businessCenters" : {
-                                  "businessCentersReference" : {
-                                    "externalReference" : "accrualBusinessCenters0",
-                                    "globalReference" : "20a71d"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "26b869c"
+                            "rateSpecification" : {
+                              "fixedRate" : {
+                                "rateSchedule" : {
+                                  "price" : {
+                                    "address" : {
+                                      "scope" : "DOCUMENT",
+                                      "value" : "price-1"
+                                    }
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
-                                  "globalKey" : "e00ca52b"
+                                  "globalKey" : "0"
                                 }
-                              },
-                              "calculationPeriodFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "2b934"
-                                },
-                                "period" : "Y",
-                                "periodMultiplier" : 1,
-                                "rollConvention" : "30"
-                              },
+                              }
+                            },
+                            "dayCountFraction" : {
+                              "value" : "30/360"
+                            },
+                            "calculationPeriodDates" : {
                               "effectiveDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2019-04-03",
                                   "dateAdjustments" : {
                                     "businessDayConvention" : "NONE",
                                     "meta" : {
@@ -1073,135 +965,133 @@
                                   },
                                   "meta" : {
                                     "globalKey" : "ed018b7b"
-                                  },
-                                  "unadjustedDate" : "2019-04-03"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "ed018b7b"
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "CalcPeriodDates0",
-                                "globalKey" : "59ea748c"
-                              },
                               "terminationDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2021-12-30",
                                   "dateAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
                                       } ],
                                       "meta" : {
-                                        "externalKey" : "accrualBusinessCenters0",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "accrualBusinessCenters0"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
                                       "globalKey" : "365baaee"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "1910c290"
-                                  },
-                                  "unadjustedDate" : "2021-12-30"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "1910c290"
                                 }
+                              },
+                              "calculationPeriodDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
+                                "businessCenters" : {
+                                  "businessCentersReference" : {
+                                    "globalReference" : "20a71d",
+                                    "externalReference" : "accrualBusinessCenters0"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "26b869c"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "e00ca52b"
+                                }
+                              },
+                              "calculationPeriodFrequency" : {
+                                "periodMultiplier" : 1,
+                                "period" : "Y",
+                                "meta" : {
+                                  "globalKey" : "17984"
+                                },
+                                "rollConvention" : "30"
+                              },
+                              "meta" : {
+                                "globalKey" : "48efbba",
+                                "externalKey" : "CalcPeriodDates0"
                               }
                             },
-                            "dayCountFraction" : {
-                              "value" : "30/360"
-                            },
-                            "meta" : {
-                              "globalKey" : "9ab66617"
-                            },
                             "paymentDates" : {
-                              "meta" : {
-                                "globalKey" : "4d64aef4"
+                              "paymentFrequency" : {
+                                "periodMultiplier" : 1,
+                                "period" : "Y",
+                                "meta" : {
+                                  "globalKey" : "78"
+                                }
                               },
-                              "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                              "payRelativeTo" : "CalculationPeriodEndDate",
                               "paymentDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "EUTA"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "paymentBusinessCenters0",
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "20a71d",
+                                    "externalKey" : "paymentBusinessCenters0"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "365baaee"
                                 }
                               },
-                              "paymentFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "ac8"
-                                },
-                                "period" : "Y",
-                                "periodMultiplier" : 1
+                              "meta" : {
+                                "globalKey" : "9b0d9350"
                               }
                             },
-                            "rateSpecification" : {
-                              "fixedRate" : {
-                                "meta" : {
-                                  "globalKey" : "0"
-                                },
-                                "rateSchedule" : {
-                                  "price" : {
-                                    "address" : {
-                                      "scope" : "DOCUMENT",
-                                      "value" : "price-1"
-                                    }
-                                  }
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "33d211b5"
                             }
                           }, {
                             "payerReceiver" : {
-                              "payer" : "PARTY_2",
-                              "receiver" : "PARTY_1"
+                              "payer" : "Party2",
+                              "receiver" : "Party1"
                             },
                             "priceQuantity" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
                               "quantitySchedule" : {
                                 "address" : {
                                   "scope" : "DOCUMENT",
                                   "value" : "quantity-2"
                                 }
+                              },
+                              "meta" : {
+                                "globalKey" : "0"
                               }
                             },
-                            "calculationPeriodDates" : {
-                              "calculationPeriodDatesAdjustments" : {
-                                "businessCenters" : {
-                                  "businessCentersReference" : {
-                                    "externalReference" : "accrualBusinessCenters1",
-                                    "globalReference" : "20a71d"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "26bfafb"
+                            "rateSpecification" : {
+                              "floatingRate" : {
+                                "rateOption" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "rateOption-1"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
-                                  "globalKey" : "e00d198a"
+                                  "globalKey" : "0"
                                 }
-                              },
-                              "calculationPeriodFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "28cc3"
-                                },
-                                "period" : "M",
-                                "periodMultiplier" : 6,
-                                "rollConvention" : "30"
-                              },
+                              }
+                            },
+                            "dayCountFraction" : {
+                              "value" : "ACT/360"
+                            },
+                            "calculationPeriodDates" : {
                               "effectiveDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2019-04-03",
                                   "dateAdjustments" : {
                                     "businessDayConvention" : "NONE",
                                     "meta" : {
@@ -1210,378 +1100,321 @@
                                   },
                                   "meta" : {
                                     "globalKey" : "ed018b7b"
-                                  },
-                                  "unadjustedDate" : "2019-04-03"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "ed018b7b"
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "CalcPeriodDates1",
-                                "globalKey" : "94f616de"
-                              },
                               "terminationDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2021-12-30",
                                   "dateAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
                                       } ],
                                       "meta" : {
-                                        "externalKey" : "accrualBusinessCenters1",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "accrualBusinessCenters1"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
                                       "globalKey" : "365baaee"
                                     }
                                   },
                                   "meta" : {
-                                    "globalKey" : "1910c290"
-                                  },
-                                  "unadjustedDate" : "2021-12-30"
+                                    "globalKey" : "1910c290"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "1910c290"
+                                }
+                              },
+                              "calculationPeriodDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
+                                "businessCenters" : {
+                                  "businessCentersReference" : {
+                                    "globalReference" : "20a71d",
+                                    "externalReference" : "accrualBusinessCenters1"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "26bfafb"
+                                  }
                                 },
                                 "meta" : {
-                                  "globalKey" : "1910c290"
+                                  "globalKey" : "e00d198a"
                                 }
+                              },
+                              "calculationPeriodFrequency" : {
+                                "periodMultiplier" : 6,
+                                "period" : "M",
+                                "meta" : {
+                                  "globalKey" : "18ad5"
+                                },
+                                "rollConvention" : "30"
+                              },
+                              "meta" : {
+                                "globalKey" : "6c7039ea",
+                                "externalKey" : "CalcPeriodDates1"
                               }
                             },
-                            "dayCountFraction" : {
-                              "value" : "ACT/360"
-                            },
-                            "meta" : {
-                              "globalKey" : "cbdc5a2a"
-                            },
                             "paymentDates" : {
-                              "meta" : {
-                                "globalKey" : "4d64ad85"
+                              "paymentFrequency" : {
+                                "periodMultiplier" : 6,
+                                "period" : "M",
+                                "meta" : {
+                                  "globalKey" : "107"
+                                }
                               },
-                              "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                              "payRelativeTo" : "CalculationPeriodEndDate",
                               "paymentDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "EUTA"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "paymentBusinessCenters1",
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "20a71d",
+                                    "externalKey" : "paymentBusinessCenters1"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "365baaee"
                                 }
                               },
-                              "paymentFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "959"
-                                },
-                                "period" : "M",
-                                "periodMultiplier" : 6
-                              }
-                            },
-                            "rateSpecification" : {
-                              "floatingRate" : {
-                                "meta" : {
-                                  "globalKey" : "0"
-                                },
-                                "rateOption" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "rateOption-1"
-                                  }
-                                }
+                              "meta" : {
+                                "globalKey" : "8f129421"
                               }
                             },
                             "resetDates" : {
                               "calculationPeriodDatesReference" : {
-                                "externalReference" : "CalcPeriodDates1",
-                                "globalReference" : "94f616de"
+                                "globalReference" : "6c7039ea",
+                                "externalReference" : "CalcPeriodDates1"
                               },
+                              "resetRelativeTo" : "CalculationPeriodStartDate",
                               "fixingDates" : {
+                                "periodMultiplier" : -2,
+                                "period" : "D",
                                 "meta" : {
-                                  "globalKey" : "2d80ce65"
+                                  "globalKey" : "a5cb919"
                                 },
-                                "period" : "D",
-                                "periodMultiplier" : -2,
-                                "dayType" : "BUSINESS",
+                                "dayType" : "Business",
+                                "businessDayConvention" : "NONE",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "EUTA"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "fixingBusinessCenters0",
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "20a71d",
+                                    "externalKey" : "fixingBusinessCenters0"
                                   }
                                 },
-                                "businessDayConvention" : "NONE",
                                 "dateRelativeTo" : {
-                                  "externalReference" : "resetDates0",
-                                  "globalReference" : "eaa1bee"
+                                  "globalReference" : "9b167a62",
+                                  "externalReference" : "resetDates0"
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "resetDates0",
-                                "globalKey" : "eaa1bee"
+                              "resetFrequency" : {
+                                "periodMultiplier" : 6,
+                                "period" : "M",
+                                "meta" : {
+                                  "globalKey" : "107"
+                                }
                               },
                               "resetDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "paymentBusinessCenters1",
-                                    "globalReference" : "20a71d"
+                                    "globalReference" : "20a71d",
+                                    "externalReference" : "paymentBusinessCenters1"
                                   },
                                   "meta" : {
                                     "globalKey" : "c3690944"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "a10a27d3"
                                 }
                               },
-                              "resetFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "959"
-                                },
-                                "period" : "M",
-                                "periodMultiplier" : 6
-                              },
-                              "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                              "meta" : {
+                                "globalKey" : "9b167a62",
+                                "externalKey" : "resetDates0"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "867ba8b6"
                             }
                           } ],
                           "meta" : {
-                            "globalKey" : "ebb22933"
+                            "globalKey" : "4271c861"
                           }
                         }
                       },
                       "meta" : {
-                        "globalKey" : "3c375462"
+                        "globalKey" : "92f6f390"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "3c375462"
+                      "globalKey" : "92f6f390"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "d9fbf124"
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "d9fbf124"
+                }
+              },
+              "calculationAgent" : {
+                "calculationAgentParty" : "CalculationAgentIndependent"
               }
             },
             "meta" : {
-              "globalKey" : "643f805"
+              "globalKey" : "53c40bf9"
             }
           },
           "meta" : {
-            "globalKey" : "643f805"
+            "globalKey" : "53c40bf9"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "1d7bf2a6"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.05,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "value" : 0.05,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
+                "priceType" : "InterestRate"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-1"
+                } ]
               }
             } ],
             "quantity" : [ {
+              "value" : {
+                "value" : 11000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "EUR"
+                  }
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "9202621a"
+            }
+          }, {
+            "quantity" : [ {
               "value" : {
+                "value" : 11000,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
-                },
-                "value" : 11000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "41c7061"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "bf589e11"
-              },
               "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
                 "value" : {
                   "floatingRateIndex" : {
                     "value" : "EUR-EURIBOR-Telerate"
                   },
                   "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
+                    "periodMultiplier" : 6,
                     "period" : "M",
-                    "periodMultiplier" : 6
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
                 }
-              }
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
-                } ]
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "EUR"
-                  }
-                },
-                "value" : 11000
-              }
-            } ]
-          } ]
-        } ]
-      },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f1141"
-        },
-        "value" : "2018-05-01"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-            },
-            "value" : "LEI1RPT0001IIII"
-          }
-        } ],
-        "issuer" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-          },
-          "value" : "LEI1RPT0001"
-        },
-        "meta" : {
-          "globalKey" : "f2097dcc"
-        },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
-    },
-    "transferHistory" : [ {
-      "meta" : {
-        "globalKey" : "a087e697"
-      },
-      "transfer" : {
-        "payerReceiver" : {
-          "payerPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "fdda73db"
-          },
-          "receiverPartyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ee963b6"
-          }
-        },
-        "quantity" : {
-          "unit" : {
-            "currency" : {
-              "value" : "EUR"
-            }
-          },
-          "value" : 100000
-        },
-        "settlementDate" : {
-          "dateAdjustments" : {
-            "businessCenters" : {
-              "businessCenter" : [ {
-                "value" : "EUTA"
-              } ],
               "meta" : {
-                "globalKey" : "20a71d"
+                "globalKey" : "2bba2221"
               }
             },
-            "businessDayConvention" : "FOLLOWING",
             "meta" : {
-              "globalKey" : "211dc30c"
+              "globalKey" : "42cb2733"
             }
-          },
-          "unadjustedDate" : "2018-05-03"
-        },
-        "transferExpression" : {
-          "priceTransfer" : "PREMIUM"
-        }
-      }
-    } ]
-  }, {
-    "meta" : {
-      "globalKey" : "176edd98"
-    },
-    "state" : {
-      "positionState" : "EXECUTED"
-    },
-    "trade" : {
-      "meta" : {
-        "globalKey" : "ba5d07c7"
+          } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "74dee05b",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "b97c11f6",
+            "externalReference" : "party2"
+          }
+        } ],
+        "ancillaryParty" : [ {
+          "role" : "CalculationAgentIndependent",
+          "partyReference" : [ {
+            "globalReference" : "b97c11f6",
+            "externalReference" : "party2"
+          } ]
+        } ]
       },
       "party" : [ {
-        "businessUnit" : [ {
-          "meta" : {
-            "externalKey" : "desk1",
-            "globalKey" : "5c10b72e"
-          },
-          "name" : "NY Swaps Desk"
-        } ],
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "fdda73db"
-        },
-        "name" : {
-          "value" : "Bank X"
-        },
         "partyId" : [ {
           "identifier" : {
+            "value" : "LEI1RPT0001",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI1RPT0001"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "b8962566"
           }
         } ],
-        "person" : [ {
-          "firstName" : "jjone",
+        "name" : {
+          "value" : "Bank X"
+        },
+        "businessUnit" : [ {
+          "name" : "NY Swaps Desk",
           "meta" : {
-            "externalKey" : "trader",
-            "globalKey" : "d3962233"
-          },
+            "globalKey" : "5c10b72e",
+            "externalKey" : "desk1"
+          }
+        } ],
+        "person" : [ {
           "personId" : [ {
             "value" : {
               "identifier" : {
@@ -1591,81 +1424,150 @@
                 "globalKey" : "baeb8c0d"
               }
             }
-          } ]
-        } ]
-      }, {
+          } ],
+          "firstName" : "jjone",
+          "meta" : {
+            "globalKey" : "d3962233",
+            "externalKey" : "trader"
+          }
+        } ],
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "ee963b6"
-        },
-        "name" : {
-          "value" : "Bank Y"
-        },
+          "globalKey" : "74dee05b",
+          "externalKey" : "party1"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "LEI2CP0002",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI2CP0002"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "eb8edea1"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "broker1",
-          "globalKey" : "ed0cc6d1"
-        },
+        } ],
         "name" : {
-          "value" : "Up&Atem"
+          "value" : "Bank Y"
         },
+        "meta" : {
+          "globalKey" : "b97c11f6",
+          "externalKey" : "party2"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "549300OL8KL0WCQ34V31",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300OL8KL0WCQ34V31"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "8ffabe4b"
           }
-        } ]
+        } ],
+        "name" : {
+          "value" : "Up&Atem"
+        },
+        "meta" : {
+          "globalKey" : "ce0b9311",
+          "externalKey" : "broker1"
+        }
       } ],
       "partyRole" : [ {
-        "ownershipPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "fdda73db"
-        },
         "partyReference" : {
-          "externalReference" : "broker1",
-          "globalReference" : "ed0cc6d1"
+          "globalReference" : "ce0b9311",
+          "externalReference" : "broker1"
         },
-        "role" : "ARRANGING_BROKER"
+        "role" : "ArrangingBroker",
+        "ownershipPartyReference" : {
+          "globalReference" : "74dee05b",
+          "externalReference" : "party1"
+        }
       } ],
-      "tradableProduct" : {
-        "ancillaryParty" : [ {
-          "partyReference" : [ {
-            "externalReference" : "party2",
-            "globalReference" : "ee963b6"
-          } ],
-          "role" : "CALCULATION_AGENT_INDEPENDENT"
-        } ],
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "fdda73db"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ee963b6"
+      "meta" : {
+        "globalKey" : "3fd745d"
+      }
+    },
+    "transferHistory" : [ {
+      "transfer" : {
+        "quantity" : {
+          "value" : 100000,
+          "unit" : {
+            "currency" : {
+              "value" : "EUR"
+            }
+          }
+        },
+        "payerReceiver" : {
+          "payerPartyReference" : {
+            "globalReference" : "74dee05b",
+            "externalReference" : "party1"
           },
-          "role" : "PARTY_2"
+          "receiverPartyReference" : {
+            "globalReference" : "b97c11f6",
+            "externalReference" : "party2"
+          }
+        },
+        "settlementDate" : {
+          "unadjustedDate" : "2018-05-03",
+          "dateAdjustments" : {
+            "businessDayConvention" : "FOLLOWING",
+            "businessCenters" : {
+              "businessCenter" : [ {
+                "value" : "EUTA"
+              } ],
+              "meta" : {
+                "globalKey" : "20a71d"
+              }
+            },
+            "meta" : {
+              "globalKey" : "211dc30c"
+            }
+          }
+        },
+        "transferExpression" : {
+          "priceTransfer" : "Premium"
+        }
+      },
+      "meta" : {
+        "globalKey" : "3d4e489"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "3359380c"
+    }
+  }, {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "LEI1RPT0001",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+          }
+        },
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "LEI1RPT0001IIIIEx",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+            }
+          }
         } ],
+        "meta" : {
+          "globalKey" : "9069ec85"
+        },
+        "identifierType" : "UniqueTransactionIdentifier"
+      } ],
+      "tradeDate" : {
+        "value" : "2018-05-01",
+        "meta" : {
+          "globalKey" : "3f1141"
+        }
+      },
+      "tradableProduct" : {
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -1676,46 +1578,42 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "accrualBusinessCenters0",
-                          "globalReference" : "20a71d"
-                        },
-                        "meta" : {
-                          "globalKey" : "26b869c"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "e00ca52b"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "2b934"
-                      },
-                      "period" : "Y",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "30"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2019-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -1724,135 +1622,133 @@
                         },
                         "meta" : {
                           "globalKey" : "ed018b7b"
-                        },
-                        "unadjustedDate" : "2019-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ed018b7b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "CalcPeriodDates0",
-                      "globalKey" : "59ea748c"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2021-12-30",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
                             } ],
                             "meta" : {
-                              "externalKey" : "accrualBusinessCenters0",
-                              "globalKey" : "20a71d"
+                              "globalKey" : "20a71d",
+                              "externalKey" : "accrualBusinessCenters0"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
                         "meta" : {
                           "globalKey" : "1910c290"
-                        },
-                        "unadjustedDate" : "2021-12-30"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "1910c290"
                       }
+                    },
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "20a71d",
+                          "externalReference" : "accrualBusinessCenters0"
+                        },
+                        "meta" : {
+                          "globalKey" : "26b869c"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "e00ca52b"
+                      }
+                    },
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
+                      "meta" : {
+                        "globalKey" : "17984"
+                      },
+                      "rollConvention" : "30"
+                    },
+                    "meta" : {
+                      "globalKey" : "48efbba",
+                      "externalKey" : "CalcPeriodDates0"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "30/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "9ab66617"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "4d64aef4"
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
+                      "meta" : {
+                        "globalKey" : "78"
+                      }
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                    "payRelativeTo" : "CalculationPeriodEndDate",
                     "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
                         } ],
                         "meta" : {
-                          "externalKey" : "paymentBusinessCenters0",
-                          "globalKey" : "20a71d"
+                          "globalKey" : "20a71d",
+                          "externalKey" : "paymentBusinessCenters0"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365baaee"
                       }
                     },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "ac8"
-                      },
-                      "period" : "Y",
-                      "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "9b0d9350"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "33d211b5"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "accrualBusinessCenters1",
-                          "globalReference" : "20a71d"
-                        },
-                        "meta" : {
-                          "globalKey" : "26bfafb"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "e00d198a"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "28cc3"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "30"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2019-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -1861,281 +1757,385 @@
                         },
                         "meta" : {
                           "globalKey" : "ed018b7b"
-                        },
-                        "unadjustedDate" : "2019-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ed018b7b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "CalcPeriodDates1",
-                      "globalKey" : "94f616de"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2021-12-30",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
                             } ],
                             "meta" : {
-                              "externalKey" : "accrualBusinessCenters1",
-                              "globalKey" : "20a71d"
+                              "globalKey" : "20a71d",
+                              "externalKey" : "accrualBusinessCenters1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
                         "meta" : {
                           "globalKey" : "1910c290"
-                        },
-                        "unadjustedDate" : "2021-12-30"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "1910c290"
                       }
+                    },
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "20a71d",
+                          "externalReference" : "accrualBusinessCenters1"
+                        },
+                        "meta" : {
+                          "globalKey" : "26bfafb"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "e00d198a"
+                      }
+                    },
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "18ad5"
+                      },
+                      "rollConvention" : "30"
+                    },
+                    "meta" : {
+                      "globalKey" : "6c7039ea",
+                      "externalKey" : "CalcPeriodDates1"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "cbdc5a2a"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "4d64ad85"
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                    "payRelativeTo" : "CalculationPeriodEndDate",
                     "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
                         } ],
                         "meta" : {
-                          "externalKey" : "paymentBusinessCenters1",
-                          "globalKey" : "20a71d"
+                          "globalKey" : "20a71d",
+                          "externalKey" : "paymentBusinessCenters1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365baaee"
                       }
                     },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    }
-                  },
-                  "rateSpecification" : {
-                    "floatingRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "8f129421"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "CalcPeriodDates1",
-                      "globalReference" : "94f616de"
+                      "globalReference" : "6c7039ea",
+                      "externalReference" : "CalcPeriodDates1"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "2d80ce65"
+                        "globalKey" : "a5cb919"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
                         } ],
                         "meta" : {
-                          "externalKey" : "fixingBusinessCenters0",
-                          "globalKey" : "20a71d"
+                          "globalKey" : "20a71d",
+                          "externalKey" : "fixingBusinessCenters0"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates0",
-                        "globalReference" : "eaa1bee"
+                        "globalReference" : "9b167a62",
+                        "externalReference" : "resetDates0"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates0",
-                      "globalKey" : "eaa1bee"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "paymentBusinessCenters1",
-                          "globalReference" : "20a71d"
+                          "globalReference" : "20a71d",
+                          "externalReference" : "paymentBusinessCenters1"
                         },
                         "meta" : {
                           "globalKey" : "c3690944"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "a10a27d3"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "9b167a62",
+                      "externalKey" : "resetDates0"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "867ba8b6"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "ebb22933"
+                  "globalKey" : "4271c861"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "3c375462"
+              "globalKey" : "92f6f390"
             }
           },
           "meta" : {
-            "globalKey" : "3c375462"
+            "globalKey" : "92f6f390"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "25fb1aeb"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.05,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "value" : 0.05,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
+                "priceType" : "InterestRate"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-1"
+                } ]
               }
             } ],
             "quantity" : [ {
+              "value" : {
+                "value" : 16000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "EUR"
+                  }
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "99684275"
+            }
+          }, {
+            "quantity" : [ {
               "value" : {
+                "value" : 16000,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
-                },
-                "value" : 16000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "c9b98a6"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "bf589e11"
-              },
               "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
                 "value" : {
                   "floatingRateIndex" : {
                     "value" : "EUR-EURIBOR-Telerate"
                   },
                   "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
+                    "periodMultiplier" : 6,
                     "period" : "M",
-                    "periodMultiplier" : 6
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
                 }
-              }
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
-                } ]
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "EUR"
-                  }
-                },
-                "value" : 16000
+              "meta" : {
+                "globalKey" : "2bba2221"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "d61c7d38"
+            }
+          } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "74dee05b",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "b97c11f6",
+            "externalReference" : "party2"
+          }
+        } ],
+        "ancillaryParty" : [ {
+          "role" : "CalculationAgentIndependent",
+          "partyReference" : [ {
+            "globalReference" : "b97c11f6",
+            "externalReference" : "party2"
           } ]
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f1141"
-        },
-        "value" : "2018-05-01"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "LEI1RPT0001",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-            },
-            "value" : "LEI1RPT0001IIIIEx"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "b8962566"
           }
         } ],
-        "issuer" : {
+        "name" : {
+          "value" : "Bank X"
+        },
+        "businessUnit" : [ {
+          "name" : "NY Swaps Desk",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+            "globalKey" : "5c10b72e",
+            "externalKey" : "desk1"
+          }
+        } ],
+        "person" : [ {
+          "personId" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "jjones"
+              },
+              "meta" : {
+                "globalKey" : "baeb8c0d"
+              }
+            }
+          } ],
+          "firstName" : "jjone",
+          "meta" : {
+            "globalKey" : "d3962233",
+            "externalKey" : "trader"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "74dee05b",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "LEI2CP0002",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "eb8edea1"
+          }
+        } ],
+        "name" : {
+          "value" : "Bank Y"
+        },
+        "meta" : {
+          "globalKey" : "b97c11f6",
+          "externalKey" : "party2"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "549300OL8KL0WCQ34V31",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
           },
-          "value" : "LEI1RPT0001"
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "8ffabe4b"
+          }
+        } ],
+        "name" : {
+          "value" : "Up&Atem"
         },
         "meta" : {
-          "globalKey" : "640a2599"
+          "globalKey" : "ce0b9311",
+          "externalKey" : "broker1"
+        }
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "ce0b9311",
+          "externalReference" : "broker1"
         },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
+        "role" : "ArrangingBroker",
+        "ownershipPartyReference" : {
+          "globalReference" : "74dee05b",
+          "externalReference" : "party1"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "ef537969"
+      }
+    },
+    "state" : {
+      "positionState" : "Executed"
+    },
+    "meta" : {
+      "globalKey" : "10c6aab8"
     }
   } ],
-  "eventQualifier" : "Exercise",
   "meta" : {
-    "globalKey" : "d367a5f4"
+    "globalKey" : "5de0c5f2"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/exercise/exercise-swaption-full-physical-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/exercise/exercise-swaption-full-physical-func-output.json
index 0e48bc1bfa..b31a7abc0e 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/exercise/exercise-swaption-full-physical-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/exercise/exercise-swaption-full-physical-func-output.json
@@ -1,71 +1,59 @@
 {
+  "intent" : "OptionExercise",
   "eventDate" : "2001-08-28",
   "instruction" : [ {
+    "primitiveInstruction" : {
+      "exercise" : {
+        "exerciseQuantity" : {
+          "quantityChange" : {
+            "change" : [ {
+              "quantity" : [ {
+                "value" : {
+                  "value" : 0,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "EUR"
+                    }
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "16df72"
+              }
+            } ],
+            "direction" : "Replace"
+          }
+        }
+      }
+    },
     "before" : {
       "value" : {
-        "meta" : {
-          "globalKey" : "869b5c34"
-        },
         "trade" : {
-          "meta" : {
-            "globalKey" : "872a42ce"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "d4813763"
+          "tradeIdentifier" : [ {
+            "issuerReference" : {
+              "globalReference" : "d4813763",
+              "externalReference" : "party1"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "123",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                },
-                "value" : "party A"
+                  "scheme" : "http://www.partyA.com/trade-id"
+                }
               },
-              "identifierType" : "BIC",
-              "meta" : {
-                "globalKey" : "d4813763"
-              }
-            } ]
-          }, {
+              "version" : 1
+            } ],
             "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "d4813764"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                },
-                "value" : "party B"
-              },
-              "identifierType" : "BIC",
-              "meta" : {
-                "globalKey" : "d4813764"
-              }
-            } ]
+              "globalKey" : "72886a2b"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "2000-08-30",
+            "meta" : {
+              "globalKey" : "3e821e"
+            }
+          },
           "tradableProduct" : {
-            "ancillaryParty" : [ {
-              "partyReference" : [ {
-                "externalReference" : "party2",
-                "globalReference" : "d4813764"
-              } ],
-              "role" : "CALCULATION_AGENT_INDEPENDENT"
-            } ],
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "d4813763"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "d4813764"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -73,17 +61,11 @@
                   "productQualifier" : "InterestRate_Option_Swaption"
                 } ],
                 "economicTerms" : {
-                  "calculationAgent" : {
-                    "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-                  },
                   "payout" : {
-                    "meta" : {
-                      "globalKey" : "af802cd3"
-                    },
                     "optionPayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "settlementTerms" : {
                         "meta" : {
@@ -97,32 +79,17 @@
                         }
                       },
                       "buyerSeller" : {
-                        "buyer" : "PARTY_1",
-                        "seller" : "PARTY_2"
+                        "buyer" : "Party1",
+                        "seller" : "Party2"
                       },
                       "exerciseTerms" : {
-                        "exerciseProcedure" : {
-                          "followUpConfirmation" : true,
-                          "manualExercise" : {
-                            "exerciseNotice" : {
-                              "businessCenter" : {
-                                "value" : "GBLO"
-                              },
-                              "exerciseNoticeGiver" : "SELLER"
-                            }
-                          }
-                        },
                         "optionStyle" : {
                           "europeanExercise" : {
-                            "earliestExerciseTime" : {
-                              "businessCenter" : {
-                                "value" : "BEBR"
-                              },
-                              "hourMinuteTime" : "09:00:00"
-                            },
                             "expirationDate" : [ {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-28",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "FOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
@@ -133,35 +100,47 @@
                                       "globalKey" : "4158421"
                                     }
                                   },
-                                  "businessDayConvention" : "FOLLOWING",
                                   "meta" : {
                                     "globalKey" : "da3b6050"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "770e7eb4"
-                                },
-                                "unadjustedDate" : "2001-08-28"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "770e7eb4"
                               }
                             } ],
+                            "earliestExerciseTime" : {
+                              "hourMinuteTime" : "09:00:00",
+                              "businessCenter" : {
+                                "value" : "BEBR"
+                              }
+                            },
                             "expirationTime" : {
+                              "hourMinuteTime" : "11:00:00",
                               "businessCenter" : {
                                 "value" : "BEBR"
-                              },
-                              "hourMinuteTime" : "11:00:00"
+                              }
                             },
                             "meta" : {
-                              "globalKey" : "70973195"
+                              "globalKey" : "83fbdc15"
                             }
                           }
+                        },
+                        "exerciseProcedure" : {
+                          "manualExercise" : {
+                            "exerciseNotice" : {
+                              "exerciseNoticeGiver" : "Seller",
+                              "businessCenter" : {
+                                "value" : "GBLO"
+                              }
+                            }
+                          },
+                          "followUpConfirmation" : true
                         }
                       },
-                      "meta" : {
-                        "globalKey" : "af802cd3"
-                      },
                       "underlier" : {
                         "contractualProduct" : {
                           "productTaxonomy" : [ {
@@ -172,46 +151,42 @@
                             "payout" : {
                               "interestRatePayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-1"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
-                                "calculationPeriodDates" : {
-                                  "calculationPeriodDatesAdjustments" : {
-                                    "businessCenters" : {
-                                      "businessCentersReference" : {
-                                        "externalReference" : "accrualBusinessCenters0",
-                                        "globalReference" : "20a71d"
-                                      },
-                                      "meta" : {
-                                        "globalKey" : "26b869c"
+                                "rateSpecification" : {
+                                  "fixedRate" : {
+                                    "rateSchedule" : {
+                                      "price" : {
+                                        "address" : {
+                                          "scope" : "DOCUMENT",
+                                          "value" : "price-1"
+                                        }
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
-                                      "globalKey" : "e00ca52b"
+                                      "globalKey" : "0"
                                     }
-                                  },
-                                  "calculationPeriodFrequency" : {
-                                    "meta" : {
-                                      "globalKey" : "2b934"
-                                    },
-                                    "period" : "Y",
-                                    "periodMultiplier" : 1,
-                                    "rollConvention" : "30"
-                                  },
+                                  }
+                                },
+                                "dayCountFraction" : {
+                                  "value" : "30/360"
+                                },
+                                "calculationPeriodDates" : {
                                   "effectiveDate" : {
                                     "adjustableDate" : {
+                                      "unadjustedDate" : "2001-08-30",
                                       "dateAdjustments" : {
                                         "businessDayConvention" : "NONE",
                                         "meta" : {
@@ -220,135 +195,133 @@
                                       },
                                       "meta" : {
                                         "globalKey" : "eae921d6"
-                                      },
-                                      "unadjustedDate" : "2001-08-30"
+                                      }
                                     },
                                     "meta" : {
                                       "globalKey" : "eae921d6"
                                     }
                                   },
-                                  "meta" : {
-                                    "externalKey" : "CalcPeriodDates0",
-                                    "globalKey" : "d3cc58e7"
-                                  },
                                   "terminationDate" : {
                                     "adjustableDate" : {
+                                      "unadjustedDate" : "2006-08-30",
                                       "dateAdjustments" : {
+                                        "businessDayConvention" : "MODFOLLOWING",
                                         "businessCenters" : {
                                           "businessCenter" : [ {
                                             "value" : "EUTA"
                                           } ],
                                           "meta" : {
-                                            "externalKey" : "accrualBusinessCenters0",
-                                            "globalKey" : "20a71d"
+                                            "globalKey" : "20a71d",
+                                            "externalKey" : "accrualBusinessCenters0"
                                           }
                                         },
-                                        "businessDayConvention" : "MODFOLLOWING",
                                         "meta" : {
                                           "globalKey" : "365baaee"
                                         }
                                       },
                                       "meta" : {
                                         "globalKey" : "9ead9b90"
-                                      },
-                                      "unadjustedDate" : "2006-08-30"
+                                      }
                                     },
                                     "meta" : {
                                       "globalKey" : "9ead9b90"
                                     }
+                                  },
+                                  "calculationPeriodDatesAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
+                                    "businessCenters" : {
+                                      "businessCentersReference" : {
+                                        "globalReference" : "20a71d",
+                                        "externalReference" : "accrualBusinessCenters0"
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "26b869c"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "e00ca52b"
+                                    }
+                                  },
+                                  "calculationPeriodFrequency" : {
+                                    "periodMultiplier" : 1,
+                                    "period" : "Y",
+                                    "meta" : {
+                                      "globalKey" : "17984"
+                                    },
+                                    "rollConvention" : "30"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "2f4e2f95",
+                                    "externalKey" : "CalcPeriodDates0"
                                   }
                                 },
-                                "dayCountFraction" : {
-                                  "value" : "30/360"
-                                },
-                                "meta" : {
-                                  "globalKey" : "1b29e05c"
-                                },
                                 "paymentDates" : {
-                                  "meta" : {
-                                    "globalKey" : "4d64aef4"
+                                  "paymentFrequency" : {
+                                    "periodMultiplier" : 1,
+                                    "period" : "Y",
+                                    "meta" : {
+                                      "globalKey" : "78"
+                                    }
                                   },
-                                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                                  "payRelativeTo" : "CalculationPeriodEndDate",
                                   "paymentDatesAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
                                       } ],
                                       "meta" : {
-                                        "externalKey" : "paymentBusinessCenters0",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "paymentBusinessCenters0"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
                                       "globalKey" : "365baaee"
                                     }
                                   },
-                                  "paymentFrequency" : {
-                                    "meta" : {
-                                      "globalKey" : "ac8"
-                                    },
-                                    "period" : "Y",
-                                    "periodMultiplier" : 1
+                                  "meta" : {
+                                    "globalKey" : "9b0d9350"
                                   }
                                 },
-                                "rateSpecification" : {
-                                  "fixedRate" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
-                                    "rateSchedule" : {
-                                      "price" : {
-                                        "address" : {
-                                          "scope" : "DOCUMENT",
-                                          "value" : "price-1"
-                                        }
-                                      }
-                                    }
-                                  }
+                                "meta" : {
+                                  "globalKey" : "2b126fd0"
                                 }
                               }, {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_2",
-                                  "receiver" : "PARTY_1"
+                                  "payer" : "Party2",
+                                  "receiver" : "Party1"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
-                                "calculationPeriodDates" : {
-                                  "calculationPeriodDatesAdjustments" : {
-                                    "businessCenters" : {
-                                      "businessCentersReference" : {
-                                        "externalReference" : "accrualBusinessCenters1",
-                                        "globalReference" : "20a71d"
-                                      },
-                                      "meta" : {
-                                        "globalKey" : "26bfafb"
+                                "rateSpecification" : {
+                                  "floatingRate" : {
+                                    "rateOption" : {
+                                      "address" : {
+                                        "scope" : "DOCUMENT",
+                                        "value" : "rateOption-1"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
-                                      "globalKey" : "e00d198a"
+                                      "globalKey" : "0"
                                     }
-                                  },
-                                  "calculationPeriodFrequency" : {
-                                    "meta" : {
-                                      "globalKey" : "28cc3"
-                                    },
-                                    "period" : "M",
-                                    "periodMultiplier" : 6,
-                                    "rollConvention" : "30"
-                                  },
+                                  }
+                                },
+                                "dayCountFraction" : {
+                                  "value" : "ACT/360"
+                                },
+                                "calculationPeriodDates" : {
                                   "effectiveDate" : {
                                     "adjustableDate" : {
+                                      "unadjustedDate" : "2001-08-30",
                                       "dateAdjustments" : {
                                         "businessDayConvention" : "NONE",
                                         "meta" : {
@@ -357,312 +330,360 @@
                                       },
                                       "meta" : {
                                         "globalKey" : "eae921d6"
-                                      },
-                                      "unadjustedDate" : "2001-08-30"
+                                      }
                                     },
                                     "meta" : {
                                       "globalKey" : "eae921d6"
                                     }
                                   },
-                                  "meta" : {
-                                    "externalKey" : "CalcPeriodDates1",
-                                    "globalKey" : "ed7fb39"
-                                  },
                                   "terminationDate" : {
                                     "adjustableDate" : {
+                                      "unadjustedDate" : "2006-08-30",
                                       "dateAdjustments" : {
+                                        "businessDayConvention" : "MODFOLLOWING",
                                         "businessCenters" : {
                                           "businessCenter" : [ {
                                             "value" : "EUTA"
                                           } ],
                                           "meta" : {
-                                            "externalKey" : "accrualBusinessCenters1",
-                                            "globalKey" : "20a71d"
+                                            "globalKey" : "20a71d",
+                                            "externalKey" : "accrualBusinessCenters1"
                                           }
                                         },
-                                        "businessDayConvention" : "MODFOLLOWING",
                                         "meta" : {
                                           "globalKey" : "365baaee"
                                         }
                                       },
                                       "meta" : {
                                         "globalKey" : "9ead9b90"
-                                      },
-                                      "unadjustedDate" : "2006-08-30"
+                                      }
                                     },
                                     "meta" : {
                                       "globalKey" : "9ead9b90"
                                     }
+                                  },
+                                  "calculationPeriodDatesAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
+                                    "businessCenters" : {
+                                      "businessCentersReference" : {
+                                        "globalReference" : "20a71d",
+                                        "externalReference" : "accrualBusinessCenters1"
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "26bfafb"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "e00d198a"
+                                    }
+                                  },
+                                  "calculationPeriodFrequency" : {
+                                    "periodMultiplier" : 6,
+                                    "period" : "M",
+                                    "meta" : {
+                                      "globalKey" : "18ad5"
+                                    },
+                                    "rollConvention" : "30"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "972f6dc5",
+                                    "externalKey" : "CalcPeriodDates1"
                                   }
                                 },
-                                "dayCountFraction" : {
-                                  "value" : "ACT/360"
-                                },
-                                "meta" : {
-                                  "globalKey" : "42ba4bb4"
-                                },
                                 "paymentDates" : {
-                                  "meta" : {
-                                    "globalKey" : "4d64ad85"
+                                  "paymentFrequency" : {
+                                    "periodMultiplier" : 6,
+                                    "period" : "M",
+                                    "meta" : {
+                                      "globalKey" : "107"
+                                    }
                                   },
-                                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                                  "payRelativeTo" : "CalculationPeriodEndDate",
                                   "paymentDatesAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
                                       } ],
                                       "meta" : {
-                                        "externalKey" : "paymentBusinessCenters1",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "paymentBusinessCenters1"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
                                       "globalKey" : "365baaee"
                                     }
                                   },
-                                  "paymentFrequency" : {
-                                    "meta" : {
-                                      "globalKey" : "959"
-                                    },
-                                    "period" : "M",
-                                    "periodMultiplier" : 6
-                                  }
-                                },
-                                "rateSpecification" : {
-                                  "floatingRate" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
-                                    "rateOption" : {
-                                      "address" : {
-                                        "scope" : "DOCUMENT",
-                                        "value" : "rateOption-1"
-                                      }
-                                    }
+                                  "meta" : {
+                                    "globalKey" : "8f129421"
                                   }
                                 },
                                 "resetDates" : {
                                   "calculationPeriodDatesReference" : {
-                                    "externalReference" : "CalcPeriodDates1",
-                                    "globalReference" : "ed7fb39"
+                                    "globalReference" : "972f6dc5",
+                                    "externalReference" : "CalcPeriodDates1"
                                   },
+                                  "resetRelativeTo" : "CalculationPeriodStartDate",
                                   "fixingDates" : {
+                                    "periodMultiplier" : -2,
+                                    "period" : "D",
                                     "meta" : {
-                                      "globalKey" : "2d80ce65"
+                                      "globalKey" : "a5cb919"
                                     },
-                                    "period" : "D",
-                                    "periodMultiplier" : -2,
-                                    "dayType" : "BUSINESS",
+                                    "dayType" : "Business",
+                                    "businessDayConvention" : "NONE",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
                                       } ],
                                       "meta" : {
-                                        "externalKey" : "fixingBusinessCenters0",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "fixingBusinessCenters0"
                                       }
                                     },
-                                    "businessDayConvention" : "NONE",
                                     "dateRelativeTo" : {
-                                      "externalReference" : "resetDates0",
-                                      "globalReference" : "27280e73"
+                                      "globalReference" : "a64bcd67",
+                                      "externalReference" : "resetDates0"
                                     }
                                   },
-                                  "meta" : {
-                                    "externalKey" : "resetDates0",
-                                    "globalKey" : "27280e73"
+                                  "resetFrequency" : {
+                                    "periodMultiplier" : 6,
+                                    "period" : "M",
+                                    "meta" : {
+                                      "globalKey" : "107"
+                                    }
                                   },
                                   "resetDatesAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
                                       "businessCentersReference" : {
-                                        "externalReference" : "paymentBusinessCenters1",
-                                        "globalReference" : "20a71d"
+                                        "globalReference" : "20a71d",
+                                        "externalReference" : "paymentBusinessCenters1"
                                       },
                                       "meta" : {
                                         "globalKey" : "c3690944"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
                                       "globalKey" : "a10a27d3"
                                     }
                                   },
-                                  "resetFrequency" : {
-                                    "meta" : {
-                                      "globalKey" : "959"
-                                    },
-                                    "period" : "M",
-                                    "periodMultiplier" : 6
-                                  },
-                                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                                  "meta" : {
+                                    "globalKey" : "a64bcd67",
+                                    "externalKey" : "resetDates0"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "30f825c0"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "7f83fd8"
+                                "globalKey" : "62c23bf0"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "587d6b07"
+                            "globalKey" : "b347671f"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "587d6b07"
+                          "globalKey" : "b347671f"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "6888b2f5"
                       }
-                    } ]
+                    } ],
+                    "meta" : {
+                      "globalKey" : "6888b2f5"
+                    }
+                  },
+                  "calculationAgent" : {
+                    "calculationAgentParty" : "CalculationAgentIndependent"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "ccb015a8"
+                  "globalKey" : "72279d8a"
                 }
               },
               "meta" : {
-                "globalKey" : "ccb015a8"
+                "globalKey" : "72279d8a"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "7f30bbe5"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.05,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "value" : 0.05,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
+                    "priceType" : "InterestRate"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
                   }
                 } ],
                 "quantity" : [ {
+                  "value" : {
+                    "value" : 100000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "EUR"
+                      }
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     } ]
-                  },
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "66e6c0bb"
+                }
+              }, {
+                "quantity" : [ {
                   "value" : {
+                    "value" : 100000000,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
-                    },
-                    "value" : 100000000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "65d139a0"
-                },
+                } ],
                 "observable" : {
-                  "meta" : {
-                    "globalKey" : "bf589e11"
-                  },
                   "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
                     "value" : {
                       "floatingRateIndex" : {
                         "value" : "EUR-EURIBOR-Telerate"
                       },
                       "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "959"
-                        },
+                        "periodMultiplier" : 6,
                         "period" : "M",
-                        "periodMultiplier" : 6
+                        "meta" : {
+                          "globalKey" : "107"
+                        }
                       }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
                     }
-                  }
-                },
-                "quantity" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
-                    } ]
                   },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "EUR"
-                      }
-                    },
-                    "value" : 100000000
+                  "meta" : {
+                    "globalKey" : "2bba2221"
                   }
-                } ]
+                },
+                "meta" : {
+                  "globalKey" : "4820adb2"
+                }
+              } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "d4813763",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "d4813764",
+                "externalReference" : "party2"
+              }
+            } ],
+            "ancillaryParty" : [ {
+              "role" : "CalculationAgentIndependent",
+              "partyReference" : [ {
+                "globalReference" : "d4813764",
+                "externalReference" : "party2"
               } ]
             } ]
           },
-          "tradeDate" : {
+          "party" : [ {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "party A",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                }
+              },
+              "identifierType" : "BIC",
+              "meta" : {
+                "globalKey" : "d4813763"
+              }
+            } ],
             "meta" : {
-              "globalKey" : "3e821e"
-            },
-            "value" : "2000-08-30"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+              "globalKey" : "d4813763",
+              "externalKey" : "party1"
+            }
+          }, {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "party B",
                 "meta" : {
-                  "scheme" : "http://www.partyA.com/trade-id"
-                },
-                "value" : "123"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                }
               },
-              "version" : 1
+              "identifierType" : "BIC",
+              "meta" : {
+                "globalKey" : "d4813764"
+              }
             } ],
-            "issuerReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "d4813763"
-            },
             "meta" : {
-              "globalKey" : "52e63ae5"
+              "globalKey" : "d4813764",
+              "externalKey" : "party2"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "ff174b48"
+          }
         },
         "transferHistory" : [ {
-          "meta" : {
-            "globalKey" : "6bba78c2"
-          },
           "transfer" : {
-            "payerReceiver" : {
-              "payerPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "d4813763"
-              },
-              "receiverPartyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "d4813764"
-              }
-            },
             "quantity" : {
+              "value" : 100000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
+              }
+            },
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "globalReference" : "d4813763",
+                "externalReference" : "party1"
               },
-              "value" : 100000
+              "receiverPartyReference" : {
+                "globalReference" : "d4813764",
+                "externalReference" : "party2"
+              }
             },
             "settlementDate" : {
+              "unadjustedDate" : "2000-08-30",
               "dateAdjustments" : {
+                "businessDayConvention" : "FOLLOWING",
                 "businessCenters" : {
                   "businessCenter" : [ {
                     "value" : "EUTA"
@@ -671,116 +692,53 @@
                     "globalKey" : "20a71d"
                   }
                 },
-                "businessDayConvention" : "FOLLOWING",
                 "meta" : {
                   "globalKey" : "211dc30c"
                 }
-              },
-              "unadjustedDate" : "2000-08-30"
+              }
             },
             "transferExpression" : {
-              "priceTransfer" : "PREMIUM"
+              "priceTransfer" : "Premium"
             }
+          },
+          "meta" : {
+            "globalKey" : "33666668"
           }
-        } ]
-      }
-    },
-    "primitiveInstruction" : {
-      "exercise" : {
-        "exerciseQuantity" : {
-          "quantityChange" : {
-            "change" : [ {
-              "meta" : {
-                "globalKey" : "16df72"
-              },
-              "quantity" : [ {
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "EUR"
-                    }
-                  },
-                  "value" : 0
-                }
-              } ]
-            } ],
-            "direction" : "REPLACE"
-          }
+        } ],
+        "meta" : {
+          "globalKey" : "81b7b220"
         }
       }
     }
   } ],
-  "intent" : "OPTION_EXERCISE",
+  "eventQualifier" : "Exercise",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "c0359c3"
-    },
-    "state" : {
-      "closedState" : {
-        "state" : "TERMINATED"
-      },
-      "positionState" : "CLOSED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "638c9310"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "d4813763"
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "d4813763",
+          "externalReference" : "party1"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "123",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-            },
-            "value" : "party A"
+              "scheme" : "http://www.partyA.com/trade-id"
+            }
           },
-          "identifierType" : "BIC",
-          "meta" : {
-            "globalKey" : "d4813763"
-          }
-        } ]
-      }, {
+          "version" : 1
+        } ],
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "d4813764"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-            },
-            "value" : "party B"
-          },
-          "identifierType" : "BIC",
-          "meta" : {
-            "globalKey" : "d4813764"
-          }
-        } ]
+          "globalKey" : "72886a2b"
+        }
       } ],
+      "tradeDate" : {
+        "value" : "2000-08-30",
+        "meta" : {
+          "globalKey" : "3e821e"
+        }
+      },
       "tradableProduct" : {
-        "ancillaryParty" : [ {
-          "partyReference" : [ {
-            "externalReference" : "party2",
-            "globalReference" : "d4813764"
-          } ],
-          "role" : "CALCULATION_AGENT_INDEPENDENT"
-        } ],
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "d4813763"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "d4813764"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -788,17 +746,11 @@
               "productQualifier" : "InterestRate_Option_Swaption"
             } ],
             "economicTerms" : {
-              "calculationAgent" : {
-                "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-              },
               "payout" : {
-                "meta" : {
-                  "globalKey" : "af802cd3"
-                },
                 "optionPayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "settlementTerms" : {
                     "meta" : {
@@ -812,32 +764,17 @@
                     }
                   },
                   "buyerSeller" : {
-                    "buyer" : "PARTY_1",
-                    "seller" : "PARTY_2"
+                    "buyer" : "Party1",
+                    "seller" : "Party2"
                   },
                   "exerciseTerms" : {
-                    "exerciseProcedure" : {
-                      "followUpConfirmation" : true,
-                      "manualExercise" : {
-                        "exerciseNotice" : {
-                          "businessCenter" : {
-                            "value" : "GBLO"
-                          },
-                          "exerciseNoticeGiver" : "SELLER"
-                        }
-                      }
-                    },
                     "optionStyle" : {
                       "europeanExercise" : {
-                        "earliestExerciseTime" : {
-                          "businessCenter" : {
-                            "value" : "BEBR"
-                          },
-                          "hourMinuteTime" : "09:00:00"
-                        },
                         "expirationDate" : [ {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2001-08-28",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "FOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
@@ -848,35 +785,47 @@
                                   "globalKey" : "4158421"
                                 }
                               },
-                              "businessDayConvention" : "FOLLOWING",
                               "meta" : {
                                 "globalKey" : "da3b6050"
                               }
                             },
                             "meta" : {
                               "globalKey" : "770e7eb4"
-                            },
-                            "unadjustedDate" : "2001-08-28"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "770e7eb4"
                           }
                         } ],
+                        "earliestExerciseTime" : {
+                          "hourMinuteTime" : "09:00:00",
+                          "businessCenter" : {
+                            "value" : "BEBR"
+                          }
+                        },
                         "expirationTime" : {
+                          "hourMinuteTime" : "11:00:00",
                           "businessCenter" : {
                             "value" : "BEBR"
-                          },
-                          "hourMinuteTime" : "11:00:00"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "70973195"
+                          "globalKey" : "83fbdc15"
                         }
                       }
+                    },
+                    "exerciseProcedure" : {
+                      "manualExercise" : {
+                        "exerciseNotice" : {
+                          "exerciseNoticeGiver" : "Seller",
+                          "businessCenter" : {
+                            "value" : "GBLO"
+                          }
+                        }
+                      },
+                      "followUpConfirmation" : true
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "af802cd3"
-                  },
                   "underlier" : {
                     "contractualProduct" : {
                       "productTaxonomy" : [ {
@@ -887,46 +836,42 @@
                         "payout" : {
                           "interestRatePayout" : [ {
                             "payerReceiver" : {
-                              "payer" : "PARTY_1",
-                              "receiver" : "PARTY_2"
+                              "payer" : "Party1",
+                              "receiver" : "Party2"
                             },
                             "priceQuantity" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
                               "quantitySchedule" : {
                                 "address" : {
                                   "scope" : "DOCUMENT",
                                   "value" : "quantity-1"
                                 }
+                              },
+                              "meta" : {
+                                "globalKey" : "0"
                               }
                             },
-                            "calculationPeriodDates" : {
-                              "calculationPeriodDatesAdjustments" : {
-                                "businessCenters" : {
-                                  "businessCentersReference" : {
-                                    "externalReference" : "accrualBusinessCenters0",
-                                    "globalReference" : "20a71d"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "26b869c"
+                            "rateSpecification" : {
+                              "fixedRate" : {
+                                "rateSchedule" : {
+                                  "price" : {
+                                    "address" : {
+                                      "scope" : "DOCUMENT",
+                                      "value" : "price-1"
+                                    }
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
-                                  "globalKey" : "e00ca52b"
+                                  "globalKey" : "0"
                                 }
-                              },
-                              "calculationPeriodFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "2b934"
-                                },
-                                "period" : "Y",
-                                "periodMultiplier" : 1,
-                                "rollConvention" : "30"
-                              },
+                              }
+                            },
+                            "dayCountFraction" : {
+                              "value" : "30/360"
+                            },
+                            "calculationPeriodDates" : {
                               "effectiveDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2001-08-30",
                                   "dateAdjustments" : {
                                     "businessDayConvention" : "NONE",
                                     "meta" : {
@@ -935,135 +880,133 @@
                                   },
                                   "meta" : {
                                     "globalKey" : "eae921d6"
-                                  },
-                                  "unadjustedDate" : "2001-08-30"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "CalcPeriodDates0",
-                                "globalKey" : "d3cc58e7"
-                              },
                               "terminationDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2006-08-30",
                                   "dateAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
                                       } ],
                                       "meta" : {
-                                        "externalKey" : "accrualBusinessCenters0",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "accrualBusinessCenters0"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
                                       "globalKey" : "365baaee"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "9ead9b90"
-                                  },
-                                  "unadjustedDate" : "2006-08-30"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
                                 }
+                              },
+                              "calculationPeriodDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
+                                "businessCenters" : {
+                                  "businessCentersReference" : {
+                                    "globalReference" : "20a71d",
+                                    "externalReference" : "accrualBusinessCenters0"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "26b869c"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "e00ca52b"
+                                }
+                              },
+                              "calculationPeriodFrequency" : {
+                                "periodMultiplier" : 1,
+                                "period" : "Y",
+                                "meta" : {
+                                  "globalKey" : "17984"
+                                },
+                                "rollConvention" : "30"
+                              },
+                              "meta" : {
+                                "globalKey" : "2f4e2f95",
+                                "externalKey" : "CalcPeriodDates0"
                               }
                             },
-                            "dayCountFraction" : {
-                              "value" : "30/360"
-                            },
-                            "meta" : {
-                              "globalKey" : "1b29e05c"
-                            },
                             "paymentDates" : {
-                              "meta" : {
-                                "globalKey" : "4d64aef4"
+                              "paymentFrequency" : {
+                                "periodMultiplier" : 1,
+                                "period" : "Y",
+                                "meta" : {
+                                  "globalKey" : "78"
+                                }
                               },
-                              "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                              "payRelativeTo" : "CalculationPeriodEndDate",
                               "paymentDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "EUTA"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "paymentBusinessCenters0",
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "20a71d",
+                                    "externalKey" : "paymentBusinessCenters0"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "365baaee"
                                 }
                               },
-                              "paymentFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "ac8"
-                                },
-                                "period" : "Y",
-                                "periodMultiplier" : 1
+                              "meta" : {
+                                "globalKey" : "9b0d9350"
                               }
                             },
-                            "rateSpecification" : {
-                              "fixedRate" : {
-                                "meta" : {
-                                  "globalKey" : "0"
-                                },
-                                "rateSchedule" : {
-                                  "price" : {
-                                    "address" : {
-                                      "scope" : "DOCUMENT",
-                                      "value" : "price-1"
-                                    }
-                                  }
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "2b126fd0"
                             }
                           }, {
                             "payerReceiver" : {
-                              "payer" : "PARTY_2",
-                              "receiver" : "PARTY_1"
+                              "payer" : "Party2",
+                              "receiver" : "Party1"
                             },
                             "priceQuantity" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
                               "quantitySchedule" : {
                                 "address" : {
                                   "scope" : "DOCUMENT",
                                   "value" : "quantity-2"
                                 }
+                              },
+                              "meta" : {
+                                "globalKey" : "0"
                               }
                             },
-                            "calculationPeriodDates" : {
-                              "calculationPeriodDatesAdjustments" : {
-                                "businessCenters" : {
-                                  "businessCentersReference" : {
-                                    "externalReference" : "accrualBusinessCenters1",
-                                    "globalReference" : "20a71d"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "26bfafb"
+                            "rateSpecification" : {
+                              "floatingRate" : {
+                                "rateOption" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "rateOption-1"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
-                                  "globalKey" : "e00d198a"
+                                  "globalKey" : "0"
                                 }
-                              },
-                              "calculationPeriodFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "28cc3"
-                                },
-                                "period" : "M",
-                                "periodMultiplier" : 6,
-                                "rollConvention" : "30"
-                              },
+                              }
+                            },
+                            "dayCountFraction" : {
+                              "value" : "ACT/360"
+                            },
+                            "calculationPeriodDates" : {
                               "effectiveDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2001-08-30",
                                   "dateAdjustments" : {
                                     "businessDayConvention" : "NONE",
                                     "meta" : {
@@ -1072,312 +1015,366 @@
                                   },
                                   "meta" : {
                                     "globalKey" : "eae921d6"
-                                  },
-                                  "unadjustedDate" : "2001-08-30"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "CalcPeriodDates1",
-                                "globalKey" : "ed7fb39"
-                              },
                               "terminationDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2006-08-30",
                                   "dateAdjustments" : {
+                                    "businessDayConvention" : "MODFOLLOWING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
                                       } ],
                                       "meta" : {
-                                        "externalKey" : "accrualBusinessCenters1",
-                                        "globalKey" : "20a71d"
+                                        "globalKey" : "20a71d",
+                                        "externalKey" : "accrualBusinessCenters1"
                                       }
                                     },
-                                    "businessDayConvention" : "MODFOLLOWING",
                                     "meta" : {
                                       "globalKey" : "365baaee"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "9ead9b90"
-                                  },
-                                  "unadjustedDate" : "2006-08-30"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
                                 }
-                              }
-                            },
-                            "dayCountFraction" : {
-                              "value" : "ACT/360"
-                            },
-                            "meta" : {
-                              "globalKey" : "42ba4bb4"
-                            },
-                            "paymentDates" : {
-                              "meta" : {
-                                "globalKey" : "4d64ad85"
                               },
-                              "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                              "paymentDatesAdjustments" : {
+                              "calculationPeriodDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
-                                  "businessCenter" : [ {
-                                    "value" : "EUTA"
-                                  } ],
+                                  "businessCentersReference" : {
+                                    "globalReference" : "20a71d",
+                                    "externalReference" : "accrualBusinessCenters1"
+                                  },
                                   "meta" : {
-                                    "externalKey" : "paymentBusinessCenters1",
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "26bfafb"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
-                                  "globalKey" : "365baaee"
+                                  "globalKey" : "e00d198a"
                                 }
                               },
-                              "paymentFrequency" : {
+                              "calculationPeriodFrequency" : {
+                                "periodMultiplier" : 6,
+                                "period" : "M",
                                 "meta" : {
-                                  "globalKey" : "959"
+                                  "globalKey" : "18ad5"
                                 },
-                                "period" : "M",
-                                "periodMultiplier" : 6
+                                "rollConvention" : "30"
+                              },
+                              "meta" : {
+                                "globalKey" : "972f6dc5",
+                                "externalKey" : "CalcPeriodDates1"
                               }
                             },
-                            "rateSpecification" : {
-                              "floatingRate" : {
+                            "paymentDates" : {
+                              "paymentFrequency" : {
+                                "periodMultiplier" : 6,
+                                "period" : "M",
                                 "meta" : {
-                                  "globalKey" : "0"
-                                },
-                                "rateOption" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "rateOption-1"
+                                  "globalKey" : "107"
+                                }
+                              },
+                              "payRelativeTo" : "CalculationPeriodEndDate",
+                              "paymentDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
+                                "businessCenters" : {
+                                  "businessCenter" : [ {
+                                    "value" : "EUTA"
+                                  } ],
+                                  "meta" : {
+                                    "globalKey" : "20a71d",
+                                    "externalKey" : "paymentBusinessCenters1"
                                   }
+                                },
+                                "meta" : {
+                                  "globalKey" : "365baaee"
                                 }
+                              },
+                              "meta" : {
+                                "globalKey" : "8f129421"
                               }
                             },
                             "resetDates" : {
                               "calculationPeriodDatesReference" : {
-                                "externalReference" : "CalcPeriodDates1",
-                                "globalReference" : "ed7fb39"
+                                "globalReference" : "972f6dc5",
+                                "externalReference" : "CalcPeriodDates1"
                               },
+                              "resetRelativeTo" : "CalculationPeriodStartDate",
                               "fixingDates" : {
+                                "periodMultiplier" : -2,
+                                "period" : "D",
                                 "meta" : {
-                                  "globalKey" : "2d80ce65"
+                                  "globalKey" : "a5cb919"
                                 },
-                                "period" : "D",
-                                "periodMultiplier" : -2,
-                                "dayType" : "BUSINESS",
+                                "dayType" : "Business",
+                                "businessDayConvention" : "NONE",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "EUTA"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "fixingBusinessCenters0",
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "20a71d",
+                                    "externalKey" : "fixingBusinessCenters0"
                                   }
                                 },
-                                "businessDayConvention" : "NONE",
                                 "dateRelativeTo" : {
-                                  "externalReference" : "resetDates0",
-                                  "globalReference" : "27280e73"
+                                  "globalReference" : "a64bcd67",
+                                  "externalReference" : "resetDates0"
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "resetDates0",
-                                "globalKey" : "27280e73"
+                              "resetFrequency" : {
+                                "periodMultiplier" : 6,
+                                "period" : "M",
+                                "meta" : {
+                                  "globalKey" : "107"
+                                }
                               },
                               "resetDatesAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "paymentBusinessCenters1",
-                                    "globalReference" : "20a71d"
+                                    "globalReference" : "20a71d",
+                                    "externalReference" : "paymentBusinessCenters1"
                                   },
                                   "meta" : {
                                     "globalKey" : "c3690944"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "a10a27d3"
                                 }
                               },
-                              "resetFrequency" : {
-                                "meta" : {
-                                  "globalKey" : "959"
-                                },
-                                "period" : "M",
-                                "periodMultiplier" : 6
-                              },
-                              "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                              "meta" : {
+                                "globalKey" : "a64bcd67",
+                                "externalKey" : "resetDates0"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "30f825c0"
                             }
                           } ],
                           "meta" : {
-                            "globalKey" : "7f83fd8"
+                            "globalKey" : "62c23bf0"
                           }
                         }
                       },
                       "meta" : {
-                        "globalKey" : "587d6b07"
+                        "globalKey" : "b347671f"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "587d6b07"
+                      "globalKey" : "b347671f"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "6888b2f5"
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "6888b2f5"
+                }
+              },
+              "calculationAgent" : {
+                "calculationAgentParty" : "CalculationAgentIndependent"
               }
             },
             "meta" : {
-              "globalKey" : "ccb015a8"
+              "globalKey" : "72279d8a"
             }
           },
           "meta" : {
-            "globalKey" : "ccb015a8"
+            "globalKey" : "72279d8a"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "c6c3fe86"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.05,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "value" : 0.05,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
+                "priceType" : "InterestRate"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-1"
+                } ]
               }
             } ],
             "quantity" : [ {
+              "value" : {
+                "value" : 0,
+                "unit" : {
+                  "currency" : {
+                    "value" : "EUR"
+                  }
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "11bbd23a"
+            }
+          }, {
+            "quantity" : [ {
               "value" : {
+                "value" : 0,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
-                },
-                "value" : 0
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "ad647c41"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "bf589e11"
-              },
               "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
                 "value" : {
                   "floatingRateIndex" : {
                     "value" : "EUR-EURIBOR-Telerate"
                   },
                   "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
+                    "periodMultiplier" : 6,
                     "period" : "M",
-                    "periodMultiplier" : 6
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
                 }
-              }
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
-                } ]
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "EUR"
-                  }
-                },
-                "value" : 0
+              "meta" : {
+                "globalKey" : "2bba2221"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "ddddb13"
+            }
+          } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "d4813763",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "d4813764",
+            "externalReference" : "party2"
+          }
+        } ],
+        "ancillaryParty" : [ {
+          "role" : "CalculationAgentIndependent",
+          "partyReference" : [ {
+            "globalReference" : "d4813764",
+            "externalReference" : "party2"
           } ]
         } ]
       },
-      "tradeDate" : {
+      "party" : [ {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "party A",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+            }
+          },
+          "identifierType" : "BIC",
+          "meta" : {
+            "globalKey" : "d4813763"
+          }
+        } ],
         "meta" : {
-          "globalKey" : "3e821e"
-        },
-        "value" : "2000-08-30"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+          "globalKey" : "d4813763",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "party B",
             "meta" : {
-              "scheme" : "http://www.partyA.com/trade-id"
-            },
-            "value" : "123"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+            }
           },
-          "version" : 1
+          "identifierType" : "BIC",
+          "meta" : {
+            "globalKey" : "d4813764"
+          }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "d4813763"
-        },
         "meta" : {
-          "globalKey" : "52e63ae5"
+          "globalKey" : "d4813764",
+          "externalKey" : "party2"
         }
-      } ]
-    },
-    "transferHistory" : [ {
+      } ],
       "meta" : {
-        "globalKey" : "6bba78c2"
+        "globalKey" : "18a6f668"
+      }
+    },
+    "state" : {
+      "closedState" : {
+        "state" : "Terminated"
       },
+      "positionState" : "Closed"
+    },
+    "transferHistory" : [ {
       "transfer" : {
-        "payerReceiver" : {
-          "payerPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "d4813763"
-          },
-          "receiverPartyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "d4813764"
-          }
-        },
         "quantity" : {
+          "value" : 100000,
           "unit" : {
             "currency" : {
               "value" : "EUR"
             }
+          }
+        },
+        "payerReceiver" : {
+          "payerPartyReference" : {
+            "globalReference" : "d4813763",
+            "externalReference" : "party1"
           },
-          "value" : 100000
+          "receiverPartyReference" : {
+            "globalReference" : "d4813764",
+            "externalReference" : "party2"
+          }
         },
         "settlementDate" : {
+          "unadjustedDate" : "2000-08-30",
           "dateAdjustments" : {
+            "businessDayConvention" : "FOLLOWING",
             "businessCenters" : {
               "businessCenter" : [ {
                 "value" : "EUTA"
@@ -1386,85 +1383,31 @@
                 "globalKey" : "20a71d"
               }
             },
-            "businessDayConvention" : "FOLLOWING",
             "meta" : {
               "globalKey" : "211dc30c"
             }
-          },
-          "unadjustedDate" : "2000-08-30"
+          }
         },
         "transferExpression" : {
-          "priceTransfer" : "PREMIUM"
+          "priceTransfer" : "Premium"
         }
+      },
+      "meta" : {
+        "globalKey" : "33666668"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "globalKey" : "64504223"
-    },
-    "state" : {
-      "positionState" : "EXECUTED"
-    },
+      "globalKey" : "6a19a091"
+    }
+  }, {
     "trade" : {
-      "meta" : {
-        "globalKey" : "40b5d3d2"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "d4813763"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-            },
-            "value" : "party A"
-          },
-          "identifierType" : "BIC",
-          "meta" : {
-            "globalKey" : "d4813763"
-          }
-        } ]
-      }, {
+      "tradeDate" : {
+        "value" : "2000-08-30",
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "d4813764"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-            },
-            "value" : "party B"
-          },
-          "identifierType" : "BIC",
-          "meta" : {
-            "globalKey" : "d4813764"
-          }
-        } ]
-      } ],
+          "globalKey" : "3e821e"
+        }
+      },
       "tradableProduct" : {
-        "ancillaryParty" : [ {
-          "partyReference" : [ {
-            "externalReference" : "party2",
-            "globalReference" : "d4813764"
-          } ],
-          "role" : "CALCULATION_AGENT_INDEPENDENT"
-        } ],
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "d4813763"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "d4813764"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -1475,46 +1418,42 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "accrualBusinessCenters0",
-                          "globalReference" : "20a71d"
-                        },
-                        "meta" : {
-                          "globalKey" : "26b869c"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "e00ca52b"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "2b934"
-                      },
-                      "period" : "Y",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "30"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2001-08-30",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -1523,135 +1462,133 @@
                         },
                         "meta" : {
                           "globalKey" : "eae921d6"
-                        },
-                        "unadjustedDate" : "2001-08-30"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "eae921d6"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "CalcPeriodDates0",
-                      "globalKey" : "d3cc58e7"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2006-08-30",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
                             } ],
                             "meta" : {
-                              "externalKey" : "accrualBusinessCenters0",
-                              "globalKey" : "20a71d"
+                              "globalKey" : "20a71d",
+                              "externalKey" : "accrualBusinessCenters0"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
                         "meta" : {
                           "globalKey" : "9ead9b90"
-                        },
-                        "unadjustedDate" : "2006-08-30"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "9ead9b90"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "30/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "1b29e05c"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "4d64aef4"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
-                        "businessCenter" : [ {
-                          "value" : "EUTA"
-                        } ],
+                        "businessCentersReference" : {
+                          "globalReference" : "20a71d",
+                          "externalReference" : "accrualBusinessCenters0"
+                        },
                         "meta" : {
-                          "externalKey" : "paymentBusinessCenters0",
-                          "globalKey" : "20a71d"
+                          "globalKey" : "26b869c"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "365baaee"
+                        "globalKey" : "e00ca52b"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
                       "meta" : {
-                        "globalKey" : "ac8"
+                        "globalKey" : "17984"
                       },
-                      "period" : "Y",
-                      "periodMultiplier" : 1
+                      "rollConvention" : "30"
+                    },
+                    "meta" : {
+                      "globalKey" : "2f4e2f95",
+                      "externalKey" : "CalcPeriodDates0"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
+                        "globalKey" : "78"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCenter" : [ {
+                          "value" : "EUTA"
+                        } ],
+                        "meta" : {
+                          "globalKey" : "20a71d",
+                          "externalKey" : "paymentBusinessCenters0"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "365baaee"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "9b0d9350"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "2b126fd0"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "accrualBusinessCenters1",
-                          "globalReference" : "20a71d"
-                        },
-                        "meta" : {
-                          "globalKey" : "26bfafb"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "e00d198a"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "28cc3"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "30"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2001-08-30",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -1660,261 +1597,324 @@
                         },
                         "meta" : {
                           "globalKey" : "eae921d6"
-                        },
-                        "unadjustedDate" : "2001-08-30"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "eae921d6"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "CalcPeriodDates1",
-                      "globalKey" : "ed7fb39"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2006-08-30",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
                             } ],
                             "meta" : {
-                              "externalKey" : "accrualBusinessCenters1",
-                              "globalKey" : "20a71d"
+                              "globalKey" : "20a71d",
+                              "externalKey" : "accrualBusinessCenters1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
                         "meta" : {
                           "globalKey" : "9ead9b90"
-                        },
-                        "unadjustedDate" : "2006-08-30"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "9ead9b90"
                       }
+                    },
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "20a71d",
+                          "externalReference" : "accrualBusinessCenters1"
+                        },
+                        "meta" : {
+                          "globalKey" : "26bfafb"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "e00d198a"
+                      }
+                    },
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "18ad5"
+                      },
+                      "rollConvention" : "30"
+                    },
+                    "meta" : {
+                      "globalKey" : "972f6dc5",
+                      "externalKey" : "CalcPeriodDates1"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "42ba4bb4"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "4d64ad85"
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                    "payRelativeTo" : "CalculationPeriodEndDate",
                     "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
                         } ],
                         "meta" : {
-                          "externalKey" : "paymentBusinessCenters1",
-                          "globalKey" : "20a71d"
+                          "globalKey" : "20a71d",
+                          "externalKey" : "paymentBusinessCenters1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365baaee"
                       }
                     },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    }
-                  },
-                  "rateSpecification" : {
-                    "floatingRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "8f129421"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "CalcPeriodDates1",
-                      "globalReference" : "ed7fb39"
+                      "globalReference" : "972f6dc5",
+                      "externalReference" : "CalcPeriodDates1"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "2d80ce65"
+                        "globalKey" : "a5cb919"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
                         } ],
                         "meta" : {
-                          "externalKey" : "fixingBusinessCenters0",
-                          "globalKey" : "20a71d"
+                          "globalKey" : "20a71d",
+                          "externalKey" : "fixingBusinessCenters0"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates0",
-                        "globalReference" : "27280e73"
+                        "globalReference" : "a64bcd67",
+                        "externalReference" : "resetDates0"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates0",
-                      "globalKey" : "27280e73"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "paymentBusinessCenters1",
-                          "globalReference" : "20a71d"
+                          "globalReference" : "20a71d",
+                          "externalReference" : "paymentBusinessCenters1"
                         },
                         "meta" : {
                           "globalKey" : "c3690944"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "a10a27d3"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "a64bcd67",
+                      "externalKey" : "resetDates0"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "30f825c0"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "7f83fd8"
+                  "globalKey" : "62c23bf0"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "587d6b07"
+              "globalKey" : "b347671f"
             }
           },
           "meta" : {
-            "globalKey" : "587d6b07"
+            "globalKey" : "b347671f"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "7f30bbe5"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.05,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "value" : 0.05,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
+                "priceType" : "InterestRate"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-1"
+                } ]
               }
             } ],
             "quantity" : [ {
+              "value" : {
+                "value" : 100000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "EUR"
+                  }
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "66e6c0bb"
+            }
+          }, {
+            "quantity" : [ {
               "value" : {
+                "value" : 100000000,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
-                },
-                "value" : 100000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "65d139a0"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "bf589e11"
-              },
               "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
                 "value" : {
                   "floatingRateIndex" : {
                     "value" : "EUR-EURIBOR-Telerate"
                   },
                   "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
+                    "periodMultiplier" : 6,
                     "period" : "M",
-                    "periodMultiplier" : 6
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
                 }
-              }
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
-                } ]
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "EUR"
-                  }
-                },
-                "value" : 100000000
+              "meta" : {
+                "globalKey" : "2bba2221"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "4820adb2"
+            }
+          } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "d4813763",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "d4813764",
+            "externalReference" : "party2"
+          }
+        } ],
+        "ancillaryParty" : [ {
+          "role" : "CalculationAgentIndependent",
+          "partyReference" : [ {
+            "globalReference" : "d4813764",
+            "externalReference" : "party2"
           } ]
         } ]
       },
-      "tradeDate" : {
+      "party" : [ {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "party A",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+            }
+          },
+          "identifierType" : "BIC",
+          "meta" : {
+            "globalKey" : "d4813763"
+          }
+        } ],
         "meta" : {
-          "globalKey" : "3e821e"
-        },
-        "value" : "2000-08-30"
+          "globalKey" : "d4813763",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "party B",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+            }
+          },
+          "identifierType" : "BIC",
+          "meta" : {
+            "globalKey" : "d4813764"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "d4813764",
+          "externalKey" : "party2"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "5148bc28"
       }
+    },
+    "state" : {
+      "positionState" : "Executed"
+    },
+    "meta" : {
+      "globalKey" : "ca7639b7"
     }
   } ],
-  "eventQualifier" : "Exercise",
   "meta" : {
-    "globalKey" : "83d81a58"
+    "globalKey" : "2811e982"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/index-transition/index-transition-vanilla-swap-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/index-transition/index-transition-vanilla-swap-func-output.json
index 8d86aa0896..e402a5ab26 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/index-transition/index-transition-vanilla-swap-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/index-transition/index-transition-vanilla-swap-func-output.json
@@ -1,70 +1,83 @@
 {
+  "intent" : "IndexTransition",
   "eventDate" : "2000-10-01",
   "instruction" : [ {
+    "primitiveInstruction" : {
+      "indexTransition" : {
+        "priceQuantity" : [ {
+          "price" : [ {
+            "value" : {
+              "value" : 0.003,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              },
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EURIBOR-Reuters"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
+                }
+              }
+            },
+            "meta" : {
+              "globalKey" : "affa37d1"
+            }
+          },
+          "meta" : {
+            "globalKey" : "c03040ba"
+          }
+        } ],
+        "effectiveDate" : "2000-10-03"
+      }
+    },
     "before" : {
       "value" : {
-        "meta" : {
-          "globalKey" : "69e44c5e"
-        },
         "trade" : {
-          "meta" : {
-            "globalKey" : "69e44c5e"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "7cec034c"
-            },
-            "name" : {
-              "value" : "Party A"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "54930084UKLVMY22DS16"
-              },
-              "identifierType" : "LEI",
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "54930084UKLVMY22DS16",
               "meta" : {
-                "globalKey" : "121d7965"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
               }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "490e5f44"
-            },
-            "name" : {
-              "value" : "Party B"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "UITD7895394",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "48750084UKLVTR22DS78"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "de31bddc"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+                }
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "3eac3060"
+            },
+            "identifierType" : "UniqueTransactionIdentifier"
           } ],
+          "tradeDate" : {
+            "value" : "2000-04-03",
+            "meta" : {
+              "globalKey" : "3e8103"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "7cec034c"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "490e5f44"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -75,46 +88,48 @@
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "20a71d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da378121"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
+                            }
+                          },
+                          "spreadSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
-                            "globalKey" : "c8cd2ad2"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12d7d"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6,
-                          "rollConvention" : "5"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2000-04-05",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -123,131 +138,128 @@
                             },
                             "meta" : {
                               "globalKey" : "eac6fafd"
-                            },
-                            "unadjustedDate" : "2000-04-05"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "eac6fafd"
                           }
                         },
-                        "firstPeriodStartDate" : {
-                          "adjustableDate" : {
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
-                              "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "eac60abd"
-                            },
-                            "unadjustedDate" : "2000-03-05"
-                          },
-                          "meta" : {
-                            "globalKey" : "eac60abd"
-                          }
-                        },
-                        "firstRegularPeriodStartDate" : "2000-10-05",
-                        "lastRegularPeriodEndDate" : "2004-10-05",
-                        "meta" : {
-                          "externalKey" : "floatingCalcPeriodDates",
-                          "globalKey" : "6024a5f6"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2005-01-05",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "FOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "primaryBusinessCenters",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "primaryBusinessCenters"
                                 }
                               },
-                              "businessDayConvention" : "FOLLOWING",
                               "meta" : {
                                 "globalKey" : "211dc30c"
                               }
                             },
                             "meta" : {
                               "globalKey" : "bb867de7"
-                            },
-                            "unadjustedDate" : "2005-01-05"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "bb867de7"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "fff93ecf"
-                      },
-                      "paymentDates" : {
-                        "firstPaymentDate" : "2000-10-05",
-                        "meta" : {
-                          "globalKey" : "fd659432"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "20a71d"
+                              "globalReference" : "20a71d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da378121"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "c8cd2ad2"
                           }
                         },
-                        "paymentFrequency" : {
-                          "meta" : {
-                            "globalKey" : "959"
+                        "firstPeriodStartDate" : {
+                          "adjustableDate" : {
+                            "unadjustedDate" : "2000-03-05",
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "eac60abd"
+                            }
                           },
+                          "meta" : {
+                            "globalKey" : "eac60abd"
+                          }
+                        },
+                        "firstRegularPeriodStartDate" : "2000-10-05",
+                        "lastRegularPeriodEndDate" : "2004-10-05",
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 6,
                           "period" : "M",
-                          "periodMultiplier" : 6
+                          "meta" : {
+                            "globalKey" : "2b8f"
+                          },
+                          "rollConvention" : "5"
+                        },
+                        "meta" : {
+                          "globalKey" : "9dd6a276",
+                          "externalKey" : "floatingCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
+                            "globalKey" : "107"
+                          }
+                        },
+                        "firstPaymentDate" : "2000-10-05",
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "20a71d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da378121"
                             }
                           },
-                          "spreadSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "c8cd2ad2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "9cf6b3c4"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "floatingCalcPeriodDates",
-                          "globalReference" : "6024a5f6"
+                          "globalReference" : "9dd6a276",
+                          "externalReference" : "floatingCalcPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "10c06461"
+                            "globalKey" : "ed9c4f15"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -256,103 +268,100 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates",
-                            "globalReference" : "8722b9cc"
+                            "globalReference" : "de8ac9aa",
+                            "externalReference" : "resetDates"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates",
-                          "globalKey" : "8722b9cc"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "20a71d"
+                              "globalReference" : "20a71d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da378121"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "c8cd2ad2"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "de8ac9aa",
+                          "externalKey" : "resetDates"
+                        }
                       },
                       "stubPeriod" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "floatingCalcPeriodDates",
-                          "globalReference" : "6024a5f6"
+                          "globalReference" : "9dd6a276",
+                          "externalReference" : "floatingCalcPeriodDates"
+                        },
+                        "initialStub" : {
+                          "stubRate" : 0.05125
                         },
                         "finalStub" : {
                           "floatingRate" : [ {
                             "floatingRateIndex" : "EUR-EURIBOR-Telerate",
                             "indexTenor" : {
-                              "meta" : {
-                                "globalKey" : "956"
-                              },
+                              "periodMultiplier" : 3,
                               "period" : "M",
-                              "periodMultiplier" : 3
+                              "meta" : {
+                                "globalKey" : "aa"
+                              }
                             }
                           } ]
-                        },
-                        "initialStub" : {
-                          "stubRate" : 0.05125
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3d1285a3"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "20a71d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da378121"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-2"
+                              }
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
-                            "globalKey" : "c8cd2ad2"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "159ee"
-                          },
-                          "period" : "Y",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "5"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "30/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2000-04-05",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -361,381 +370,339 @@
                             },
                             "meta" : {
                               "globalKey" : "eac6fafd"
-                            },
-                            "unadjustedDate" : "2000-04-05"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "eac6fafd"
                           }
                         },
-                        "firstPeriodStartDate" : {
-                          "adjustableDate" : {
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
-                              "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "eac60abd"
-                            },
-                            "unadjustedDate" : "2000-03-05"
-                          },
-                          "meta" : {
-                            "globalKey" : "eac60abd"
-                          }
-                        },
-                        "firstRegularPeriodStartDate" : "2000-10-05",
-                        "lastRegularPeriodEndDate" : "2004-10-05",
-                        "meta" : {
-                          "externalKey" : "fixedCalcPeriodDates",
-                          "globalKey" : "a8481bd7"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2005-01-05",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "FOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "primaryBusinessCenters",
-                                  "globalReference" : "20a71d"
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "primaryBusinessCenters"
                                 },
                                 "meta" : {
                                   "globalKey" : "da378121"
                                 }
                               },
-                              "businessDayConvention" : "FOLLOWING",
                               "meta" : {
                                 "globalKey" : "c8cd2ad2"
                               }
                             },
                             "meta" : {
                               "globalKey" : "8a55be17"
-                            },
-                            "unadjustedDate" : "2005-01-05"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "8a55be17"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "30/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "74299e7d"
-                      },
-                      "paymentDates" : {
-                        "firstPaymentDate" : "2000-10-05",
-                        "meta" : {
-                          "globalKey" : "fd6595a1"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "20a71d"
+                              "globalReference" : "20a71d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da378121"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "c8cd2ad2"
                           }
                         },
-                        "paymentFrequency" : {
-                          "meta" : {
-                            "globalKey" : "ac8"
+                        "firstPeriodStartDate" : {
+                          "adjustableDate" : {
+                            "unadjustedDate" : "2000-03-05",
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "eac60abd"
+                            }
                           },
+                          "meta" : {
+                            "globalKey" : "eac60abd"
+                          }
+                        },
+                        "firstRegularPeriodStartDate" : "2000-10-05",
+                        "lastRegularPeriodEndDate" : "2004-10-05",
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
                           "period" : "Y",
-                          "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "1a3e"
+                          },
+                          "rollConvention" : "5"
+                        },
+                        "meta" : {
+                          "globalKey" : "71aba38f",
+                          "externalKey" : "fixedCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-2"
-                              }
+                            "globalKey" : "78"
+                          }
+                        },
+                        "firstPaymentDate" : "2000-10-05",
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "20a71d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da378121"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "c8cd2ad2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "cabcb235"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "533798d"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "ace3124e"
+                      "globalKey" : "c1f4520a"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "9471c37f"
+                  "globalKey" : "a983033b"
                 }
               },
               "meta" : {
-                "globalKey" : "9471c37f"
+                "globalKey" : "a983033b"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "d1e27334"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "bf589e11"
-                  },
-                  "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
-                    "value" : {
-                      "floatingRateIndex" : {
-                        "value" : "EUR-EURIBOR-Telerate"
-                      },
-                      "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "959"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6
-                      }
-                    }
-                  }
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.001,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "value" : 0.001,
-                    "arithmeticOperator" : "ADD",
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate",
+                    "arithmeticOperator" : "Add"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 75000000,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
-                    },
-                    "value" : 75000000
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "389ebddb"
-                },
-                "price" : [ {
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "price-2"
+                      "value" : "quantity-1"
                     } ]
+                  }
+                } ],
+                "observable" : {
+                  "rateOption" : {
+                    "value" : {
+                      "floatingRateIndex" : {
+                        "value" : "EUR-EURIBOR-Telerate"
+                      },
+                      "indexTenor" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "107"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
+                    }
                   },
+                  "meta" : {
+                    "globalKey" : "2bba2221"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "d218229e"
+                }
+              }, {
+                "price" : [ {
                   "value" : {
+                    "value" : 0.0525,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "value" : 0.0525,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "price-2"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 75000000,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
-                    },
-                    "value" : 75000000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "db38fd85"
+                }
               } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "349a498c",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "4caf4c44",
+                "externalReference" : "party2"
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3e8103"
-            },
-            "value" : "2000-04-03"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "54930084UKLVMY22DS16",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-                },
-                "value" : "UITD7895394"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "121d7965"
               }
             } ],
-            "issuer" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "54930084UKLVMY22DS16"
+            "name" : {
+              "value" : "Party A"
             },
             "meta" : {
-              "globalKey" : "335bf1d6"
-            },
-            "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "indexTransition" : {
-        "effectiveDate" : "2000-10-03",
-        "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "c3ccaebe"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "affa4023"
-            },
-            "rateOption" : {
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EURIBOR-Reuters"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
-              }
+              "globalKey" : "349a498c",
+              "externalKey" : "party1"
             }
-          },
-          "price" : [ {
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 0.003,
-              "arithmeticOperator" : "ADD",
-              "perUnitOf" : {
-                "currency" : {
-                  "value" : "EUR"
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "48750084UKLVTR22DS78",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "de31bddc"
+              }
+            } ],
+            "name" : {
+              "value" : "Party B"
+            },
+            "meta" : {
+              "globalKey" : "4caf4c44",
+              "externalKey" : "party2"
             }
-          } ]
-        } ]
+          } ],
+          "meta" : {
+            "globalKey" : "ce6755c0"
+          }
+        },
+        "meta" : {
+          "globalKey" : "ce6755c0"
+        }
       }
     }
   } ],
-  "intent" : "INDEX_TRANSITION",
+  "eventQualifier" : "IndexTransition",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "ed491c73"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "ed491c73"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "7cec034c"
-        },
-        "name" : {
-          "value" : "Party A"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "54930084UKLVMY22DS16"
-          },
-          "identifierType" : "LEI",
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "490e5f44"
-        },
-        "name" : {
-          "value" : "Party B"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "UITD7895394",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "48750084UKLVTR22DS78"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "de31bddc"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+            }
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "3eac3060"
+        },
+        "identifierType" : "UniqueTransactionIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2000-04-03",
+        "meta" : {
+          "globalKey" : "3e8103"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "7cec034c"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "490e5f44"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -746,46 +713,48 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "20a71d"
-                        },
-                        "meta" : {
-                          "globalKey" : "da378121"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        }
+                      },
+                      "spreadSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "FOLLOWING",
                       "meta" : {
-                        "globalKey" : "c8cd2ad2"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d7d"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "5"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2000-04-05",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -794,131 +763,128 @@
                         },
                         "meta" : {
                           "globalKey" : "eac6fafd"
-                        },
-                        "unadjustedDate" : "2000-04-05"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "eac6fafd"
                       }
                     },
-                    "firstPeriodStartDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NONE",
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "eac60abd"
-                        },
-                        "unadjustedDate" : "2000-03-05"
-                      },
-                      "meta" : {
-                        "globalKey" : "eac60abd"
-                      }
-                    },
-                    "firstRegularPeriodStartDate" : "2000-10-05",
-                    "lastRegularPeriodEndDate" : "2004-10-05",
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "6024a5f6"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2005-01-05",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "20a71d"
+                              "globalKey" : "20a71d",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "211dc30c"
                           }
                         },
                         "meta" : {
                           "globalKey" : "bb867de7"
-                        },
-                        "unadjustedDate" : "2005-01-05"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "bb867de7"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "fff93ecf"
-                  },
-                  "paymentDates" : {
-                    "firstPaymentDate" : "2000-10-05",
-                    "meta" : {
-                      "globalKey" : "fd659432"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "FOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "20a71d"
+                          "globalReference" : "20a71d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da378121"
                         }
                       },
-                      "businessDayConvention" : "FOLLOWING",
                       "meta" : {
                         "globalKey" : "c8cd2ad2"
                       }
                     },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "959"
+                    "firstPeriodStartDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2000-03-05",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NONE",
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "eac60abd"
+                        }
                       },
+                      "meta" : {
+                        "globalKey" : "eac60abd"
+                      }
+                    },
+                    "firstRegularPeriodStartDate" : "2000-10-05",
+                    "lastRegularPeriodEndDate" : "2004-10-05",
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
                       "period" : "M",
-                      "periodMultiplier" : 6
+                      "meta" : {
+                        "globalKey" : "2b8f"
+                      },
+                      "rollConvention" : "5"
+                    },
+                    "meta" : {
+                      "globalKey" : "9dd6a276",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "107"
+                      }
+                    },
+                    "firstPaymentDate" : "2000-10-05",
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "FOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "20a71d",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da378121"
                         }
                       },
-                      "spreadSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
+                      "meta" : {
+                        "globalKey" : "c8cd2ad2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "9cf6b3c4"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "6024a5f6"
+                      "globalReference" : "9dd6a276",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "10c06461"
+                        "globalKey" : "ed9c4f15"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
@@ -927,120 +893,100 @@
                           "globalKey" : "20a71d"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates",
-                        "globalReference" : "8722b9cc"
+                        "globalReference" : "de8ac9aa",
+                        "externalReference" : "resetDates"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates",
-                      "globalKey" : "8722b9cc"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "FOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "20a71d"
+                          "globalReference" : "20a71d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da378121"
                         }
                       },
-                      "businessDayConvention" : "FOLLOWING",
                       "meta" : {
                         "globalKey" : "c8cd2ad2"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "de8ac9aa",
+                      "externalKey" : "resetDates"
+                    }
                   },
                   "stubPeriod" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "6024a5f6"
+                      "globalReference" : "9dd6a276",
+                      "externalReference" : "floatingCalcPeriodDates"
+                    },
+                    "initialStub" : {
+                      "stubRate" : 0.05125
                     },
                     "finalStub" : {
                       "floatingRate" : [ {
                         "floatingRateIndex" : "EUR-EURIBOR-Telerate",
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
                       } ]
-                    },
-                    "initialStub" : {
-                      "stubRate" : 0.05125
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "3d1285a3"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "20a71d"
-                        },
-                        "meta" : {
-                          "globalKey" : "da378121"
-                        }
-                      },
-                      "businessDayConvention" : "FOLLOWING",
-                      "meta" : {
-                        "globalKey" : "c8cd2ad2"
-                      }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "159ee"
-                      },
-                      "period" : "Y",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "5"
-                    },
-                    "effectiveDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NONE",
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "eac6fafd"
-                        },
-                        "unadjustedDate" : "2000-04-05"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-2"
+                          }
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "eac6fafd"
+                        "globalKey" : "0"
                       }
-                    },
-                    "firstPeriodStartDate" : {
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30/360"
+                  },
+                  "calculationPeriodDates" : {
+                    "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2000-04-05",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -1048,255 +994,309 @@
                           }
                         },
                         "meta" : {
-                          "globalKey" : "eac60abd"
-                        },
-                        "unadjustedDate" : "2000-03-05"
+                          "globalKey" : "eac6fafd"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "eac60abd"
+                        "globalKey" : "eac6fafd"
                       }
                     },
-                    "firstRegularPeriodStartDate" : "2000-10-05",
-                    "lastRegularPeriodEndDate" : "2004-10-05",
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "a8481bd7"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2005-01-05",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "20a71d"
+                              "globalReference" : "20a71d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da378121"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "c8cd2ad2"
                           }
                         },
                         "meta" : {
                           "globalKey" : "8a55be17"
-                        },
-                        "unadjustedDate" : "2005-01-05"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "8a55be17"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "30/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "74299e7d"
-                  },
-                  "paymentDates" : {
-                    "firstPaymentDate" : "2000-10-05",
-                    "meta" : {
-                      "globalKey" : "fd6595a1"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "FOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "20a71d"
+                          "globalReference" : "20a71d",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da378121"
                         }
                       },
-                      "businessDayConvention" : "FOLLOWING",
                       "meta" : {
                         "globalKey" : "c8cd2ad2"
                       }
                     },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "ac8"
+                    "firstPeriodStartDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2000-03-05",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NONE",
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "eac60abd"
+                        }
                       },
+                      "meta" : {
+                        "globalKey" : "eac60abd"
+                      }
+                    },
+                    "firstRegularPeriodStartDate" : "2000-10-05",
+                    "lastRegularPeriodEndDate" : "2004-10-05",
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
                       "period" : "Y",
-                      "periodMultiplier" : 1
+                      "meta" : {
+                        "globalKey" : "1a3e"
+                      },
+                      "rollConvention" : "5"
+                    },
+                    "meta" : {
+                      "globalKey" : "71aba38f",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-2"
-                          }
+                        "globalKey" : "78"
+                      }
+                    },
+                    "firstPaymentDate" : "2000-10-05",
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "FOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "20a71d",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da378121"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "c8cd2ad2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "cabcb235"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "533798d"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "ace3124e"
+                  "globalKey" : "c1f4520a"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "9471c37f"
+              "globalKey" : "a983033b"
             }
           },
           "meta" : {
-            "globalKey" : "9471c37f"
+            "globalKey" : "a983033b"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "b603d7f"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "affa4023"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "EUR-EURIBOR-Reuters"
-                  },
-                  "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                }
-              }
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.004,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "value" : 0.004,
-                "arithmeticOperator" : "ADD",
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate",
+                "arithmeticOperator" : "Add"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 75000000,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
-                },
-                "value" : 75000000
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "389ebddb"
-            },
-            "price" : [ {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-2"
+                  "value" : "quantity-1"
                 } ]
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "EUR-EURIBOR-Reuters"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
               },
+              "meta" : {
+                "globalKey" : "4f4cc24f"
+              }
+            },
+            "meta" : {
+              "globalKey" : "fb36bc29"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 0.0525,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "value" : 0.0525,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 75000000,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
-                },
-                "value" : 75000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "db38fd85"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "349a498c",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "4caf4c44",
+            "externalReference" : "party2"
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3e8103"
-        },
-        "value" : "2000-04-03"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "54930084UKLVMY22DS16",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-            },
-            "value" : "UITD7895394"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "121d7965"
           }
         } ],
-        "issuer" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
+        "name" : {
+          "value" : "Party A"
         },
         "meta" : {
-          "globalKey" : "335bf1d6"
+          "globalKey" : "349a498c",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "48750084UKLVTR22DS78",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "de31bddc"
+          }
+        } ],
+        "name" : {
+          "value" : "Party B"
         },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
+        "meta" : {
+          "globalKey" : "4caf4c44",
+          "externalKey" : "party2"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "cc3790b"
+      }
+    },
+    "meta" : {
+      "globalKey" : "cc3790b"
     }
   } ],
-  "eventQualifier" : "IndexTransition",
   "meta" : {
-    "globalKey" : "bc4cb7ef"
+    "globalKey" : "58efb4f"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/index-transition/index-transition-xccy-swap-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/index-transition/index-transition-xccy-swap-func-output.json
index 573a989ba2..dec22d1166 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/index-transition/index-transition-xccy-swap-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/index-transition/index-transition-xccy-swap-func-output.json
@@ -1,154 +1,224 @@
 {
+  "intent" : "IndexTransition",
   "eventDate" : "2018-06-17",
   "instruction" : [ {
+    "primitiveInstruction" : {
+      "indexTransition" : {
+        "priceQuantity" : [ {
+          "price" : [ {
+            "value" : {
+              "value" : 0.002,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              },
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-ISDA",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
+                  }
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 3,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
+                }
+              }
+            },
+            "meta" : {
+              "globalKey" : "1215e6d3"
+            }
+          },
+          "meta" : {
+            "globalKey" : "26e24c3b"
+          }
+        }, {
+          "price" : [ {
+            "value" : {
+              "value" : 0.001,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              },
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EURIBOR-Reuters",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
+                  }
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 3,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
+                }
+              }
+            },
+            "meta" : {
+              "globalKey" : "affa3774"
+            }
+          },
+          "meta" : {
+            "globalKey" : "1edc845b"
+          }
+        } ],
+        "effectiveDate" : "2018-06-19"
+      }
+    },
     "before" : {
       "value" : {
-        "meta" : {
-          "globalKey" : "fcaf272b"
-        },
         "trade" : {
-          "meta" : {
-            "globalKey" : "b2edd6cd"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "7cec034c"
-            },
-            "name" : {
-              "value" : "Party A"
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "54930084UKLVMY22DS16",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "DRTY123456",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "54930084UKLVMY22DS16"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "121d7965"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+                }
               }
-            } ]
-          }, {
+            } ],
             "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "490e5f44"
+              "globalKey" : "717b78f7"
             },
-            "name" : {
-              "value" : "Party B"
+            "identifierType" : "UniqueTransactionIdentifier"
+          }, {
+            "issuer" : {
+              "value" : "1031234567",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
+              }
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "UITD7895394",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "48750084UKLVTR22DS78"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "de31bddc"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/usi"
+                }
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "af42d69a"
+            },
+            "identifierType" : "UniqueSwapIdentifier"
           } ],
+          "tradeDate" : {
+            "value" : "2018-03-19",
+            "meta" : {
+              "globalKey" : "3f10d3",
+              "externalKey" : "tradeDate"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "7cec034c"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "490e5f44"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
-                "productIdentifier" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "meta" : {
-                        "scheme" : "http://www.dtcc.com/coding-scheme/external/GTR-Product-Id"
-                      },
-                      "value" : "InterestRate:CrossCurrency:Basis"
-                    },
-                    "meta" : {
-                      "globalKey" : "b0bf3e75"
-                    },
-                    "source" : "OTHER"
-                  }
-                } ],
                 "productTaxonomy" : [ {
                   "primaryAssetClass" : {
-                    "value" : "INTEREST_RATE"
+                    "value" : "InterestRate"
                   }
                 }, {
                   "source" : "CFI",
                   "value" : {
                     "name" : {
+                      "value" : "SRAXCC",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/external/product-classification/iso10962"
-                      },
-                      "value" : "SRAXCC"
+                      }
                     }
                   }
                 }, {
                   "source" : "EMIR",
                   "value" : {
                     "name" : {
+                      "value" : "SW",
                       "meta" : {
                         "scheme" : "http://www.dtcc.com/coding-scheme/external/product-classification/emir-contract-type"
-                      },
-                      "value" : "SW"
+                      }
                     }
                   }
                 }, {
                   "source" : "ISDA",
                   "productQualifier" : "InterestRate_CrossCurrency_Basis"
                 } ],
+                "productIdentifier" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "InterestRate:CrossCurrency:Basis",
+                      "meta" : {
+                        "scheme" : "http://www.dtcc.com/coding-scheme/external/GTR-Product-Id"
+                      }
+                    },
+                    "source" : "Other",
+                    "meta" : {
+                      "globalKey" : "b0bf3e75"
+                    }
+                  }
+                } ],
                 "economicTerms" : {
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "ba27ac63"
+                        "quantitySchedule" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "quantity-1"
+                          }
+                        },
+                        "quantityReference" : {
+                          "globalReference" : "0",
+                          "externalReference" : "fixed_notional_schedule"
                         },
                         "quantityMultiplier" : {
                           "fxLinkedNotionalSchedule" : {
-                            "fixingTime" : {
-                              "businessCenter" : {
-                                "value" : "GBLO"
-                              },
-                              "hourMinuteTime" : "11:00:00"
-                            },
-                            "fxSpotRateSource" : {
-                              "primarySource" : {
-                                "sourcePage" : {
-                                  "value" : "WM Company LDN 11am Mid"
-                                },
-                                "sourcePageHeading" : "USD/EUR",
-                                "sourceProvider" : {
-                                  "value" : "TELERATE"
-                                }
-                              }
-                            },
                             "varyingNotionalCurrency" : {
                               "value" : "USD"
                             },
                             "varyingNotionalFixingDates" : {
+                              "periodMultiplier" : 2,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "1e03c090"
+                                "globalKey" : "22aecdb2"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 2,
-                              "dayType" : "BUSINESS",
+                              "dayType" : "Business",
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "GBLO"
@@ -157,19 +227,36 @@
                                   "globalKey" : "21479e"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "dateRelativeTo" : {
-                                "externalReference" : "tradeDate",
-                                "globalReference" : "3f10d3"
+                                "globalReference" : "3f10d3",
+                                "externalReference" : "tradeDate"
+                              }
+                            },
+                            "fxSpotRateSource" : {
+                              "primarySource" : {
+                                "sourceProvider" : {
+                                  "value" : "Telerate"
+                                },
+                                "sourcePage" : {
+                                  "value" : "WM Company LDN 11am Mid"
+                                },
+                                "sourcePageHeading" : "USD/EUR"
+                              }
+                            },
+                            "fixingTime" : {
+                              "hourMinuteTime" : "11:00:00",
+                              "businessCenter" : {
+                                "value" : "GBLO"
                               }
                             },
                             "varyingNotionalInterimExchangePaymentDates" : {
+                              "periodMultiplier" : 2,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "1e03c090"
+                                "globalKey" : "22aecdb2"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 2,
-                              "dayType" : "BUSINESS",
+                              "dayType" : "Business",
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "GBLO"
@@ -178,71 +265,63 @@
                                   "globalKey" : "21479e"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "dateRelativeTo" : {
-                                "externalReference" : "tradeDate",
-                                "globalReference" : "3f10d3"
+                                "globalReference" : "3f10d3",
+                                "externalReference" : "tradeDate"
                               }
                             }
                           }
                         },
-                        "quantityReference" : {
-                          "externalReference" : "fixed_notional_schedule",
-                          "globalReference" : "0"
-                        },
-                        "quantitySchedule" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "quantity-1"
-                          }
+                        "meta" : {
+                          "globalKey" : "12a4deb9"
                         }
                       },
                       "principalPayment" : {
-                        "finalPayment" : false,
                         "initialPayment" : false,
+                        "finalPayment" : false,
                         "intermediatePayment" : true,
                         "meta" : {
                           "globalKey" : "12be2f"
                         }
                       },
                       "settlementTerms" : {
-                        "meta" : {
-                          "globalKey" : "14966"
-                        },
                         "settlementCurrency" : {
                           "value" : "USD"
+                        },
+                        "meta" : {
+                          "globalKey" : "14966"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "GBLO"
-                            }, {
-                              "value" : "USNY"
-                            }, {
-                              "value" : "EUTA"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "81e33772"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-2"
+                            }
+                          },
+                          "spreadSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "5865eac3"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "28c48"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3,
-                          "rollConvention" : "21"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2018-03-21",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "GBLO"
@@ -255,33 +334,23 @@
                                   "globalKey" : "81e33772"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "5865eac3"
                               }
                             },
                             "meta" : {
                               "globalKey" : "733f98e"
-                            },
-                            "unadjustedDate" : "2018-03-21"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "733f98e"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "d0e5304",
-                          "globalKey" : "40e712a7"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f38d5"
-                              },
-                              "value" : "2023-03-21"
-                            },
+                            "unadjustedDate" : "2023-03-21",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "GBLO"
@@ -294,38 +363,26 @@
                                   "globalKey" : "81e33772"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "5865eac3"
                               }
                             },
+                            "adjustedDate" : {
+                              "value" : "2023-03-21",
+                              "meta" : {
+                                "globalKey" : "3f38d5"
+                              }
+                            },
                             "meta" : {
                               "globalKey" : "80e0d18e"
-                            },
-                            "unadjustedDate" : "2023-03-21"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "80e0d18e"
                           }
-                        }
-                      },
-                      "cashflowRepresentation" : {
-                        "cashflowsMatchParameters" : false
-                      },
-                      "compoundingMethod" : "NONE",
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "e1cfbe25"
-                      },
-                      "paymentDates" : {
-                        "firstPaymentDate" : "2018-06-21",
-                        "meta" : {
-                          "globalKey" : "b7434d18"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -338,52 +395,69 @@
                               "globalKey" : "81e33772"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "5865eac3"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "956"
+                            "globalKey" : "17f74"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                          "rollConvention" : "21"
+                        },
+                        "meta" : {
+                          "globalKey" : "a071381b",
+                          "externalKey" : "d0e5304"
                         }
                       },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-2"
+                            "globalKey" : "aa"
+                          }
+                        },
+                        "firstPaymentDate" : "2018-06-21",
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "GBLO"
+                            }, {
+                              "value" : "USNY"
+                            }, {
+                              "value" : "EUTA"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "81e33772"
                             }
                           },
-                          "spreadSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "5865eac3"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "4c3bd2be"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "d0e5304",
-                          "globalReference" : "40e712a7"
+                          "globalReference" : "a071381b",
+                          "externalReference" : "d0e5304"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "7a0be842"
+                            "globalKey" : "56e7d2f6"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -392,17 +466,20 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "d0e5651",
-                            "globalReference" : "c8a25ede"
+                            "globalReference" : "e4775784",
+                            "externalReference" : "d0e5651"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "d0e5651",
-                          "globalKey" : "c8a25ede"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -411,147 +488,149 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365c4b6f"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "e4775784",
+                          "externalKey" : "d0e5651"
+                        }
+                      },
+                      "compoundingMethod" : "None",
+                      "cashflowRepresentation" : {
+                        "cashflowsMatchParameters" : false
+                      },
+                      "meta" : {
+                        "globalKey" : "73c54395"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "externalKey" : "fixed_notional_schedule",
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0",
+                          "externalKey" : "fixed_notional_schedule"
                         }
                       },
                       "principalPayment" : {
-                        "finalPayment" : true,
                         "initialPayment" : true,
+                        "finalPayment" : true,
                         "intermediatePayment" : true,
-                        "meta" : {
-                          "globalKey" : "747c1b93"
-                        },
                         "principalPaymentSchedule" : {
-                          "finalPrincipalPayment" : {
-                            "meta" : {
-                              "globalKey" : "37cbd860"
+                          "initialPrincipalPayment" : {
+                            "principalPaymentDate" : {
+                              "adjustedDate" : {
+                                "value" : "2018-03-21",
+                                "meta" : {
+                                  "globalKey" : "3f10d5"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "0"
+                              }
                             },
                             "payerReceiver" : {
-                              "payer" : "PARTY_2",
-                              "receiver" : "PARTY_1"
+                              "payer" : "Party1",
+                              "receiver" : "Party2"
                             },
                             "principalAmount" : {
+                              "value" : 1400,
                               "unit" : {
                                 "currency" : {
                                   "value" : "EUR"
                                 }
                               },
-                              "value" : 1400,
                               "meta" : {
                                 "globalKey" : "7b889f5f"
                               }
                             },
+                            "meta" : {
+                              "globalKey" : "39f638fe"
+                            }
+                          },
+                          "finalPrincipalPayment" : {
                             "principalPaymentDate" : {
                               "adjustedDate" : {
+                                "value" : "2023-03-21",
                                 "meta" : {
                                   "globalKey" : "3f38d5"
-                                },
-                                "value" : "2023-03-21"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "0"
                               }
-                            }
-                          },
-                          "initialPrincipalPayment" : {
-                            "meta" : {
-                              "globalKey" : "4d0e6c2"
                             },
                             "payerReceiver" : {
-                              "payer" : "PARTY_1",
-                              "receiver" : "PARTY_2"
+                              "payer" : "Party2",
+                              "receiver" : "Party1"
                             },
                             "principalAmount" : {
+                              "value" : 1400,
                               "unit" : {
                                 "currency" : {
                                   "value" : "EUR"
                                 }
                               },
-                              "value" : 1400,
                               "meta" : {
                                 "globalKey" : "7b889f5f"
                               }
                             },
-                            "principalPaymentDate" : {
-                              "adjustedDate" : {
-                                "meta" : {
-                                  "globalKey" : "3f10d5"
-                                },
-                                "value" : "2018-03-21"
-                              },
-                              "meta" : {
-                                "globalKey" : "0"
-                              }
+                            "meta" : {
+                              "globalKey" : "6d279ba0"
                             }
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "5aab838f"
                         }
                       },
                       "settlementTerms" : {
-                        "meta" : {
-                          "globalKey" : "10da2"
-                        },
                         "settlementCurrency" : {
                           "value" : "EUR"
+                        },
+                        "meta" : {
+                          "globalKey" : "10da2"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "GBLO"
-                            }, {
-                              "value" : "USNY"
-                            }, {
-                              "value" : "EUTA"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "81e33772"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
+                            }
+                          },
+                          "spreadSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-2"
+                              }
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "5865eac3"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "28c48"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3,
-                          "rollConvention" : "21"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2018-03-21",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "GBLO"
@@ -564,33 +643,23 @@
                                   "globalKey" : "81e33772"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "5865eac3"
                               }
                             },
                             "meta" : {
                               "globalKey" : "733f98e"
-                            },
-                            "unadjustedDate" : "2018-03-21"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "733f98e"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "d0e6023",
-                          "globalKey" : "40e712a7"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f38d5"
-                              },
-                              "value" : "2023-03-21"
-                            },
+                            "unadjustedDate" : "2023-03-21",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "GBLO"
@@ -603,38 +672,26 @@
                                   "globalKey" : "81e33772"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "5865eac3"
                               }
                             },
+                            "adjustedDate" : {
+                              "value" : "2023-03-21",
+                              "meta" : {
+                                "globalKey" : "3f38d5"
+                              }
+                            },
                             "meta" : {
                               "globalKey" : "80e0d18e"
-                            },
-                            "unadjustedDate" : "2023-03-21"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "80e0d18e"
                           }
-                        }
-                      },
-                      "cashflowRepresentation" : {
-                        "cashflowsMatchParameters" : false
-                      },
-                      "compoundingMethod" : "NONE",
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "c7a79a6"
-                      },
-                      "paymentDates" : {
-                        "firstPaymentDate" : "2018-06-21",
-                        "meta" : {
-                          "globalKey" : "b7434d18"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -647,52 +704,69 @@
                               "globalKey" : "81e33772"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "5865eac3"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "956"
+                            "globalKey" : "17f74"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                          "rollConvention" : "21"
+                        },
+                        "meta" : {
+                          "globalKey" : "a071381b",
+                          "externalKey" : "d0e6023"
                         }
                       },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
+                            "globalKey" : "aa"
+                          }
+                        },
+                        "firstPaymentDate" : "2018-06-21",
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "GBLO"
+                            }, {
+                              "value" : "USNY"
+                            }, {
+                              "value" : "EUTA"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "81e33772"
                             }
                           },
-                          "spreadSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-2"
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "5865eac3"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "4c3bd2be"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "d0e6023",
-                          "globalReference" : "40e712a7"
+                          "globalReference" : "a071381b",
+                          "externalReference" : "d0e6023"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "77b1cd44"
+                            "globalKey" : "548db7f8"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -701,17 +775,20 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "d0e6369",
-                            "globalReference" : "304ea85a"
+                            "globalReference" : "9519045e",
+                            "externalReference" : "d0e6369"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "d0e6369",
-                          "globalKey" : "304ea85a"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -720,507 +797,408 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "9519045e",
+                          "externalKey" : "d0e6369"
+                        }
+                      },
+                      "compoundingMethod" : "None",
+                      "cashflowRepresentation" : {
+                        "cashflowsMatchParameters" : false
+                      },
+                      "meta" : {
+                        "globalKey" : "9c0ac79a"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "8912cf21"
+                      "globalKey" : "a77895a5"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "a51ed160"
+                  "globalKey" : "fbf2a43c"
                 }
               },
               "meta" : {
-                "globalKey" : "a51ed160"
+                "globalKey" : "fbf2a43c"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "fe8da185"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "5f0c6d05"
-                  },
-                  "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-2"
-                      } ]
-                    },
-                    "value" : {
-                      "floatingRateIndex" : {
-                        "meta" : {
-                          "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
-                        },
-                        "value" : "USD-LIBOR-BBA"
-                      },
-                      "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
-                      }
-                    }
-                  }
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 0,
-                    "arithmeticOperator" : "ADD",
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate",
+                    "arithmeticOperator" : "Add"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 1726.62,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
-                    },
-                    "value" : 1726.62
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    } ]
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "16825d59"
-                },
+                } ],
                 "observable" : {
-                  "meta" : {
-                    "globalKey" : "bf589e0e"
-                  },
                   "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
                     "value" : {
                       "floatingRateIndex" : {
+                        "value" : "USD-LIBOR-BBA",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
-                        },
-                        "value" : "EUR-EURIBOR-Telerate"
+                        }
                       },
                       "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
+                        "periodMultiplier" : 3,
                         "period" : "M",
-                        "periodMultiplier" : 3
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
                       }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-2"
+                      } ]
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "828026c7"
                   }
                 },
+                "meta" : {
+                  "globalKey" : "9869dec9"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
-                  },
                   "value" : {
+                    "value" : -0.0045,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "value" : -0.0045,
-                    "arithmeticOperator" : "ADD",
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "EUR"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate",
+                    "arithmeticOperator" : "Add"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "price-2"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 1400,
                     "unit" : {
                       "currency" : {
                         "value" : "EUR"
                       }
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
+                  }
+                } ],
+                "observable" : {
+                  "rateOption" : {
+                    "value" : {
+                      "floatingRateIndex" : {
+                        "value" : "EUR-EURIBOR-Telerate",
+                        "meta" : {
+                          "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
+                        }
+                      },
+                      "indexTenor" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
+                      }
                     },
-                    "value" : 1400
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "2bba16de"
                   }
-                } ]
+                },
+                "meta" : {
+                  "globalKey" : "ae6f5a1d"
+                }
               } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "349a498c",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "4caf4c44",
+                "externalReference" : "party2"
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "externalKey" : "tradeDate",
-              "globalKey" : "3f10d3"
-            },
-            "value" : "2018-03-19"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "54930084UKLVMY22DS16",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-                },
-                "value" : "DRTY123456"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "121d7965"
               }
             } ],
-            "issuer" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "54930084UKLVMY22DS16"
+            "name" : {
+              "value" : "Party A"
             },
             "meta" : {
-              "globalKey" : "ef7b70ad"
-            },
-            "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
+              "globalKey" : "349a498c",
+              "externalKey" : "party1"
+            }
           }, {
-            "assignedIdentifier" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "48750084UKLVTR22DS78",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/usi"
-                },
-                "value" : "UITD7895394"
-              }
-            } ],
-            "issuer" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
-              },
-              "value" : "1031234567"
-            },
-            "meta" : {
-              "globalKey" : "81c425a"
-            },
-            "identifierType" : "UNIQUE_SWAP_IDENTIFIER"
-          } ]
-        },
-        "transferHistory" : [ {
-          "meta" : {
-            "externalKey" : "SDB123-AB5.EUR.20180209.0",
-            "globalKey" : "aabfced8"
-          },
-          "transfer" : {
-            "payerReceiver" : {
-              "payerPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "7cec034c"
-              },
-              "receiverPartyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "490e5f44"
-              }
-            },
-            "quantity" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 5
-            },
-            "settlementDate" : {
-              "adjustedDate" : {
-                "meta" : {
-                  "globalKey" : "3f1089"
-                },
-                "value" : "2018-02-09"
-              }
-            },
-            "transferExpression" : {
-              "priceTransfer" : "UPFRONT"
-            }
-          }
-        } ]
-      }
-    },
-    "primitiveInstruction" : {
-      "indexTransition" : {
-        "effectiveDate" : "2018-06-19",
-        "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "2ed35961"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "1215ef7f"
-            },
-            "rateOption" : {
-              "value" : {
-                "floatingRateIndex" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
-                  },
-                  "value" : "USD-LIBOR-ISDA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 3
-                }
-              }
-            }
-          },
-          "price" : [ {
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 0.002,
-              "arithmeticOperator" : "ADD",
-              "perUnitOf" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "842ee09f"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "affa4020"
-            },
-            "rateOption" : {
-              "value" : {
-                "floatingRateIndex" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
-                  },
-                  "value" : "EUR-EURIBOR-Reuters"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 3
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                 }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "de31bddc"
               }
+            } ],
+            "name" : {
+              "value" : "Party B"
+            },
+            "meta" : {
+              "globalKey" : "4caf4c44",
+              "externalKey" : "party2"
             }
-          },
-          "price" : [ {
-            "value" : {
+          } ],
+          "meta" : {
+            "globalKey" : "f8884b93"
+          }
+        },
+        "transferHistory" : [ {
+          "transfer" : {
+            "quantity" : {
+              "value" : 5,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
+              }
+            },
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "globalReference" : "349a498c",
+                "externalReference" : "party1"
               },
-              "value" : 0.001,
-              "arithmeticOperator" : "ADD",
-              "perUnitOf" : {
-                "currency" : {
-                  "value" : "EUR"
+              "receiverPartyReference" : {
+                "globalReference" : "4caf4c44",
+                "externalReference" : "party2"
+              }
+            },
+            "settlementDate" : {
+              "adjustedDate" : {
+                "value" : "2018-02-09",
+                "meta" : {
+                  "globalKey" : "3f1089"
                 }
-              },
-              "priceType" : "INTEREST_RATE"
+              }
+            },
+            "transferExpression" : {
+              "priceTransfer" : "Upfront"
             }
-          } ]
-        } ]
+          },
+          "meta" : {
+            "globalKey" : "14800dc4",
+            "externalKey" : "SDB123-AB5.EUR.20180209.0"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "42662f11"
+        }
       }
     }
   } ],
-  "intent" : "INDEX_TRANSITION",
+  "eventQualifier" : "IndexTransition",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "5ad589c"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "8960dfbc"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "7cec034c"
-        },
-        "name" : {
-          "value" : "Party A"
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "54930084UKLVMY22DS16",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "DRTY123456",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "54930084UKLVMY22DS16"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "121d7965"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+            }
           }
-        } ]
-      }, {
+        } ],
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "490e5f44"
+          "globalKey" : "717b78f7"
         },
-        "name" : {
-          "value" : "Party B"
+        "identifierType" : "UniqueTransactionIdentifier"
+      }, {
+        "issuer" : {
+          "value" : "1031234567",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
+          }
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "UITD7895394",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "48750084UKLVTR22DS78"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "de31bddc"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/usi"
+            }
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "af42d69a"
+        },
+        "identifierType" : "UniqueSwapIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2018-03-19",
+        "meta" : {
+          "globalKey" : "3f10d3",
+          "externalKey" : "tradeDate"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "7cec034c"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "490e5f44"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
-            "productIdentifier" : [ {
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.dtcc.com/coding-scheme/external/GTR-Product-Id"
-                  },
-                  "value" : "InterestRate:CrossCurrency:Basis"
-                },
-                "meta" : {
-                  "globalKey" : "b0bf3e75"
-                },
-                "source" : "OTHER"
-              }
-            } ],
             "productTaxonomy" : [ {
               "primaryAssetClass" : {
-                "value" : "INTEREST_RATE"
+                "value" : "InterestRate"
               }
             }, {
               "source" : "CFI",
               "value" : {
                 "name" : {
+                  "value" : "SRAXCC",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/product-classification/iso10962"
-                  },
-                  "value" : "SRAXCC"
+                  }
                 }
               }
             }, {
               "source" : "EMIR",
               "value" : {
                 "name" : {
+                  "value" : "SW",
                   "meta" : {
                     "scheme" : "http://www.dtcc.com/coding-scheme/external/product-classification/emir-contract-type"
-                  },
-                  "value" : "SW"
+                  }
                 }
               }
             }, {
               "source" : "ISDA",
               "productQualifier" : "InterestRate_CrossCurrency_Basis"
             } ],
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "InterestRate:CrossCurrency:Basis",
+                  "meta" : {
+                    "scheme" : "http://www.dtcc.com/coding-scheme/external/GTR-Product-Id"
+                  }
+                },
+                "source" : "Other",
+                "meta" : {
+                  "globalKey" : "b0bf3e75"
+                }
+              }
+            } ],
             "economicTerms" : {
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "ba27ac63"
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "quantityReference" : {
+                      "globalReference" : "0",
+                      "externalReference" : "fixed_notional_schedule"
                     },
                     "quantityMultiplier" : {
                       "fxLinkedNotionalSchedule" : {
-                        "fixingTime" : {
-                          "businessCenter" : {
-                            "value" : "GBLO"
-                          },
-                          "hourMinuteTime" : "11:00:00"
-                        },
-                        "fxSpotRateSource" : {
-                          "primarySource" : {
-                            "sourcePage" : {
-                              "value" : "WM Company LDN 11am Mid"
-                            },
-                            "sourcePageHeading" : "USD/EUR",
-                            "sourceProvider" : {
-                              "value" : "TELERATE"
-                            }
-                          }
-                        },
                         "varyingNotionalCurrency" : {
                           "value" : "USD"
                         },
                         "varyingNotionalFixingDates" : {
+                          "periodMultiplier" : 2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "1e03c090"
+                            "globalKey" : "22aecdb2"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -1229,19 +1207,36 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "dateRelativeTo" : {
-                            "externalReference" : "tradeDate",
-                            "globalReference" : "3f10d3"
+                            "globalReference" : "3f10d3",
+                            "externalReference" : "tradeDate"
+                          }
+                        },
+                        "fxSpotRateSource" : {
+                          "primarySource" : {
+                            "sourceProvider" : {
+                              "value" : "Telerate"
+                            },
+                            "sourcePage" : {
+                              "value" : "WM Company LDN 11am Mid"
+                            },
+                            "sourcePageHeading" : "USD/EUR"
+                          }
+                        },
+                        "fixingTime" : {
+                          "hourMinuteTime" : "11:00:00",
+                          "businessCenter" : {
+                            "value" : "GBLO"
                           }
                         },
                         "varyingNotionalInterimExchangePaymentDates" : {
+                          "periodMultiplier" : 2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "1e03c090"
+                            "globalKey" : "22aecdb2"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -1250,71 +1245,63 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "dateRelativeTo" : {
-                            "externalReference" : "tradeDate",
-                            "globalReference" : "3f10d3"
+                            "globalReference" : "3f10d3",
+                            "externalReference" : "tradeDate"
                           }
                         }
                       }
                     },
-                    "quantityReference" : {
-                      "externalReference" : "fixed_notional_schedule",
-                      "globalReference" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
+                    "meta" : {
+                      "globalKey" : "12a4deb9"
                     }
                   },
                   "principalPayment" : {
-                    "finalPayment" : false,
                     "initialPayment" : false,
+                    "finalPayment" : false,
                     "intermediatePayment" : true,
                     "meta" : {
                       "globalKey" : "12be2f"
                     }
                   },
                   "settlementTerms" : {
-                    "meta" : {
-                      "globalKey" : "14966"
-                    },
                     "settlementCurrency" : {
                       "value" : "USD"
+                    },
+                    "meta" : {
+                      "globalKey" : "14966"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCenter" : [ {
-                          "value" : "GBLO"
-                        }, {
-                          "value" : "USNY"
-                        }, {
-                          "value" : "EUTA"
-                        } ],
-                        "meta" : {
-                          "globalKey" : "81e33772"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-2"
+                        }
+                      },
+                      "spreadSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "5865eac3"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "28c48"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "21"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-03-21",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -1327,33 +1314,23 @@
                               "globalKey" : "81e33772"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "5865eac3"
                           }
                         },
                         "meta" : {
                           "globalKey" : "733f98e"
-                        },
-                        "unadjustedDate" : "2018-03-21"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "733f98e"
                       }
-                    },
-                    "meta" : {
-                      "externalKey" : "d0e5304",
-                      "globalKey" : "40e712a7"
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "adjustedDate" : {
-                          "meta" : {
-                            "globalKey" : "3f38d5"
-                          },
-                          "value" : "2023-03-21"
-                        },
+                    },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2023-03-21",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -1366,38 +1343,26 @@
                               "globalKey" : "81e33772"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "5865eac3"
                           }
                         },
+                        "adjustedDate" : {
+                          "value" : "2023-03-21",
+                          "meta" : {
+                            "globalKey" : "3f38d5"
+                          }
+                        },
                         "meta" : {
                           "globalKey" : "80e0d18e"
-                        },
-                        "unadjustedDate" : "2023-03-21"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "80e0d18e"
                       }
-                    }
-                  },
-                  "cashflowRepresentation" : {
-                    "cashflowsMatchParameters" : false
-                  },
-                  "compoundingMethod" : "NONE",
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "e1cfbe25"
-                  },
-                  "paymentDates" : {
-                    "firstPaymentDate" : "2018-06-21",
-                    "meta" : {
-                      "globalKey" : "b7434d18"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -1410,52 +1375,69 @@
                           "globalKey" : "81e33772"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "5865eac3"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "956"
+                        "globalKey" : "17f74"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                      "rollConvention" : "21"
+                    },
+                    "meta" : {
+                      "globalKey" : "a071381b",
+                      "externalKey" : "d0e5304"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-2"
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "firstPaymentDate" : "2018-06-21",
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCenter" : [ {
+                          "value" : "GBLO"
+                        }, {
+                          "value" : "USNY"
+                        }, {
+                          "value" : "EUTA"
+                        } ],
+                        "meta" : {
+                          "globalKey" : "81e33772"
                         }
                       },
-                      "spreadSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
+                      "meta" : {
+                        "globalKey" : "5865eac3"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "4c3bd2be"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "d0e5304",
-                      "globalReference" : "40e712a7"
+                      "globalReference" : "a071381b",
+                      "externalReference" : "d0e5304"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "7a0be842"
+                        "globalKey" : "56e7d2f6"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -1464,17 +1446,20 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "d0e5651",
-                        "globalReference" : "c8a25ede"
+                        "globalReference" : "e4775784",
+                        "externalReference" : "d0e5651"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "d0e5651",
-                      "globalKey" : "c8a25ede"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -1483,147 +1468,149 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365c4b6f"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "e4775784",
+                      "externalKey" : "d0e5651"
+                    }
+                  },
+                  "compoundingMethod" : "None",
+                  "cashflowRepresentation" : {
+                    "cashflowsMatchParameters" : false
+                  },
+                  "meta" : {
+                    "globalKey" : "73c54395"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "externalKey" : "fixed_notional_schedule",
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0",
+                      "externalKey" : "fixed_notional_schedule"
                     }
                   },
                   "principalPayment" : {
-                    "finalPayment" : true,
                     "initialPayment" : true,
+                    "finalPayment" : true,
                     "intermediatePayment" : true,
-                    "meta" : {
-                      "globalKey" : "747c1b93"
-                    },
                     "principalPaymentSchedule" : {
-                      "finalPrincipalPayment" : {
-                        "meta" : {
-                          "globalKey" : "37cbd860"
+                      "initialPrincipalPayment" : {
+                        "principalPaymentDate" : {
+                          "adjustedDate" : {
+                            "value" : "2018-03-21",
+                            "meta" : {
+                              "globalKey" : "3f10d5"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
                         },
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "principalAmount" : {
+                          "value" : 1400,
                           "unit" : {
                             "currency" : {
                               "value" : "EUR"
                             }
                           },
-                          "value" : 1400,
                           "meta" : {
                             "globalKey" : "7b889f5f"
                           }
                         },
+                        "meta" : {
+                          "globalKey" : "39f638fe"
+                        }
+                      },
+                      "finalPrincipalPayment" : {
                         "principalPaymentDate" : {
                           "adjustedDate" : {
+                            "value" : "2023-03-21",
                             "meta" : {
                               "globalKey" : "3f38d5"
-                            },
-                            "value" : "2023-03-21"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
                           }
-                        }
-                      },
-                      "initialPrincipalPayment" : {
-                        "meta" : {
-                          "globalKey" : "4d0e6c2"
                         },
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "principalAmount" : {
+                          "value" : 1400,
                           "unit" : {
                             "currency" : {
                               "value" : "EUR"
                             }
                           },
-                          "value" : 1400,
                           "meta" : {
                             "globalKey" : "7b889f5f"
                           }
                         },
-                        "principalPaymentDate" : {
-                          "adjustedDate" : {
-                            "meta" : {
-                              "globalKey" : "3f10d5"
-                            },
-                            "value" : "2018-03-21"
-                          },
-                          "meta" : {
-                            "globalKey" : "0"
-                          }
+                        "meta" : {
+                          "globalKey" : "6d279ba0"
                         }
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "5aab838f"
                     }
                   },
                   "settlementTerms" : {
-                    "meta" : {
-                      "globalKey" : "10da2"
-                    },
                     "settlementCurrency" : {
                       "value" : "EUR"
+                    },
+                    "meta" : {
+                      "globalKey" : "10da2"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCenter" : [ {
-                          "value" : "GBLO"
-                        }, {
-                          "value" : "USNY"
-                        }, {
-                          "value" : "EUTA"
-                        } ],
-                        "meta" : {
-                          "globalKey" : "81e33772"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        }
+                      },
+                      "spreadSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-2"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "5865eac3"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "28c48"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "21"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-03-21",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -1636,33 +1623,23 @@
                               "globalKey" : "81e33772"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "5865eac3"
                           }
                         },
                         "meta" : {
                           "globalKey" : "733f98e"
-                        },
-                        "unadjustedDate" : "2018-03-21"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "733f98e"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "d0e6023",
-                      "globalKey" : "40e712a7"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
-                        "adjustedDate" : {
-                          "meta" : {
-                            "globalKey" : "3f38d5"
-                          },
-                          "value" : "2023-03-21"
-                        },
+                        "unadjustedDate" : "2023-03-21",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -1675,38 +1652,26 @@
                               "globalKey" : "81e33772"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "5865eac3"
                           }
                         },
+                        "adjustedDate" : {
+                          "value" : "2023-03-21",
+                          "meta" : {
+                            "globalKey" : "3f38d5"
+                          }
+                        },
                         "meta" : {
                           "globalKey" : "80e0d18e"
-                        },
-                        "unadjustedDate" : "2023-03-21"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "80e0d18e"
                       }
-                    }
-                  },
-                  "cashflowRepresentation" : {
-                    "cashflowsMatchParameters" : false
-                  },
-                  "compoundingMethod" : "NONE",
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "c7a79a6"
-                  },
-                  "paymentDates" : {
-                    "firstPaymentDate" : "2018-06-21",
-                    "meta" : {
-                      "globalKey" : "b7434d18"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -1719,52 +1684,69 @@
                           "globalKey" : "81e33772"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "5865eac3"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "956"
+                        "globalKey" : "17f74"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                      "rollConvention" : "21"
+                    },
+                    "meta" : {
+                      "globalKey" : "a071381b",
+                      "externalKey" : "d0e6023"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "firstPaymentDate" : "2018-06-21",
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCenter" : [ {
+                          "value" : "GBLO"
+                        }, {
+                          "value" : "USNY"
+                        }, {
+                          "value" : "EUTA"
+                        } ],
+                        "meta" : {
+                          "globalKey" : "81e33772"
                         }
                       },
-                      "spreadSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-2"
-                          }
-                        }
+                      "meta" : {
+                        "globalKey" : "5865eac3"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "4c3bd2be"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "d0e6023",
-                      "globalReference" : "40e712a7"
+                      "globalReference" : "a071381b",
+                      "externalReference" : "d0e6023"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "77b1cd44"
+                        "globalKey" : "548db7f8"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
@@ -1773,17 +1755,20 @@
                           "globalKey" : "20a71d"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "d0e6369",
-                        "globalReference" : "304ea85a"
+                        "globalReference" : "9519045e",
+                        "externalReference" : "d0e6369"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "d0e6369",
-                      "globalKey" : "304ea85a"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
@@ -1792,267 +1777,282 @@
                           "globalKey" : "20a71d"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365baaee"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "9519045e",
+                      "externalKey" : "d0e6369"
+                    }
+                  },
+                  "compoundingMethod" : "None",
+                  "cashflowRepresentation" : {
+                    "cashflowsMatchParameters" : false
+                  },
+                  "meta" : {
+                    "globalKey" : "9c0ac79a"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "8912cf21"
+                  "globalKey" : "a77895a5"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "a51ed160"
+              "globalKey" : "fbf2a43c"
             }
           },
           "meta" : {
-            "globalKey" : "a51ed160"
+            "globalKey" : "fbf2a43c"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "a82e8d07"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "1215ef7f"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-2"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
-                    },
-                    "value" : "USD-LIBOR-ISDA"
-                  },
-                  "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                }
-              }
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.002,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 0.002,
-                "arithmeticOperator" : "ADD",
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate",
+                "arithmeticOperator" : "Add"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 1726.62,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 1726.62
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "5aa0b006"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "affa4020"
-              },
               "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
                 "value" : {
                   "floatingRateIndex" : {
+                    "value" : "USD-LIBOR-ISDA",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
-                    },
-                    "value" : "EUR-EURIBOR-Reuters"
+                    }
                   },
                   "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
+                    "periodMultiplier" : 3,
                     "period" : "M",
-                    "periodMultiplier" : 3
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-2"
+                  } ]
                 }
+              },
+              "meta" : {
+                "globalKey" : "30a6f38d"
               }
             },
+            "meta" : {
+              "globalKey" : "bd6314cb"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-2"
-                } ]
-              },
               "value" : {
+                "value" : -0.0035,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "value" : -0.0035,
-                "arithmeticOperator" : "ADD",
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "EUR"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate",
+                "arithmeticOperator" : "Add"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 1400,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "EUR-EURIBOR-Reuters",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
+                    }
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  }
                 },
-                "value" : 1400
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "4f4cb70c"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "98b0e98a"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "349a498c",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "4caf4c44",
+            "externalReference" : "party2"
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "externalKey" : "tradeDate",
-          "globalKey" : "3f10d3"
-        },
-        "value" : "2018-03-19"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "54930084UKLVMY22DS16",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-            },
-            "value" : "DRTY123456"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "121d7965"
           }
         } ],
-        "issuer" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
+        "name" : {
+          "value" : "Party A"
         },
         "meta" : {
-          "globalKey" : "ef7b70ad"
-        },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
+          "globalKey" : "349a498c",
+          "externalKey" : "party1"
+        }
       }, {
-        "assignedIdentifier" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "48750084UKLVTR22DS78",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/usi"
-            },
-            "value" : "UITD7895394"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "de31bddc"
           }
         } ],
-        "issuer" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
-          },
-          "value" : "1031234567"
+        "name" : {
+          "value" : "Party B"
         },
         "meta" : {
-          "globalKey" : "81c425a"
-        },
-        "identifierType" : "UNIQUE_SWAP_IDENTIFIER"
-      } ]
+          "globalKey" : "4caf4c44",
+          "externalKey" : "party2"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "8fab8e82"
+      }
     },
     "transferHistory" : [ {
-      "meta" : {
-        "externalKey" : "SDB123-AB5.EUR.20180209.0",
-        "globalKey" : "aabfced8"
-      },
       "transfer" : {
-        "payerReceiver" : {
-          "payerPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "7cec034c"
-          },
-          "receiverPartyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "490e5f44"
-          }
-        },
         "quantity" : {
+          "value" : 5,
           "unit" : {
             "currency" : {
               "value" : "EUR"
             }
+          }
+        },
+        "payerReceiver" : {
+          "payerPartyReference" : {
+            "globalReference" : "349a498c",
+            "externalReference" : "party1"
           },
-          "value" : 5
+          "receiverPartyReference" : {
+            "globalReference" : "4caf4c44",
+            "externalReference" : "party2"
+          }
         },
         "settlementDate" : {
           "adjustedDate" : {
+            "value" : "2018-02-09",
             "meta" : {
               "globalKey" : "3f1089"
-            },
-            "value" : "2018-02-09"
+            }
           }
         },
         "transferExpression" : {
-          "priceTransfer" : "UPFRONT"
+          "priceTransfer" : "Upfront"
         }
+      },
+      "meta" : {
+        "globalKey" : "14800dc4",
+        "externalKey" : "SDB123-AB5.EUR.20180209.0"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "a7966682"
+    }
   } ],
-  "eventQualifier" : "IndexTransition",
   "meta" : {
-    "globalKey" : "c6078d85"
+    "globalKey" : "f1f2a2af"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/novation/full-novation-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/novation/full-novation-func-output.json
index 5942c5097f..f874c8f32e 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/novation/full-novation-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/novation/full-novation-func-output.json
@@ -1,159 +1,127 @@
 {
+  "intent" : "Novation",
   "eventDate" : "2018-04-03",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "f3e58db4"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "f3e58db4"
-          },
-          "party" : [ {
-            "businessUnit" : [ {
-              "meta" : {
-                "externalKey" : "desk1",
-                "globalKey" : "5c10b72e"
-              },
-              "name" : "NY Swaps Desk"
-            } ],
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "fdda73db"
-            },
-            "name" : {
-              "value" : "Bank X"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI1RPT0001"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "b8962566"
-              }
-            } ],
-            "person" : [ {
-              "firstName" : "jjone",
-              "meta" : {
-                "externalKey" : "trader",
-                "globalKey" : "d3962233"
-              },
-              "personId" : [ {
+    "primitiveInstruction" : {
+      "split" : {
+        "breakdown" : [ {
+          "partyChange" : {
+            "counterparty" : {
+              "role" : "Party1",
+              "partyReference" : {
                 "value" : {
-                  "identifier" : {
-                    "value" : "jjones"
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "LEI3RPT0003",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                      }
+                    },
+                    "identifierType" : "LEI",
+                    "meta" : {
+                      "globalKey" : "88587f26"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "Bank Z"
                   },
                   "meta" : {
-                    "globalKey" : "baeb8c0d"
+                    "globalKey" : "4a5fa53c",
+                    "externalKey" : "party3"
                   }
                 }
-              } ]
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "ee963b6"
-            },
-            "name" : {
-              "value" : "Bank Y"
+              }
             },
-            "partyId" : [ {
-              "identifier" : {
+            "tradeId" : [ {
+              "issuer" : {
+                "value" : "LEI3RPT0003",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI2CP0002"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                }
               },
-              "identifierType" : "LEI",
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "LEI3RPT0003CCC",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
+                }
+              } ],
               "meta" : {
-                "globalKey" : "eb8edea1"
-              }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "broker1",
-              "globalKey" : "ed0cc6d1"
-            },
-            "name" : {
-              "value" : "Up&Atem"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "549300OL8KL0WCQ34V31"
+                "globalKey" : "1d8d35e1"
               },
-              "identifierType" : "LEI",
+              "identifierType" : "UniqueTransactionIdentifier"
+            } ]
+          }
+        }, {
+          "quantityChange" : {
+            "change" : [ {
+              "quantity" : [ {
+                "value" : {
+                  "value" : 0,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                      }
+                    }
+                  }
+                }
+              } ],
               "meta" : {
-                "globalKey" : "8ffabe4b"
+                "globalKey" : "171b36"
+              }
+            } ],
+            "direction" : "Replace"
+          }
+        } ]
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "LEI1RPT0001",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
               }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "clearing-svc",
-              "globalKey" : "611719a0"
-            },
-            "name" : {
-              "value" : "ClearItAll"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "LEI1RPT0001CCCC",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "549300IB5Q45JGNPND58"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "e213e7d7"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                }
               }
-            } ]
-          } ],
-          "partyRole" : [ {
-            "ownershipPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "fdda73db"
-            },
-            "partyReference" : {
-              "externalReference" : "clearing-svc",
-              "globalReference" : "611719a0"
+            } ],
+            "meta" : {
+              "globalKey" : "7a6056f8"
             },
-            "role" : "CLEARING_ORGANIZATION"
+            "identifierType" : "UniqueTransactionIdentifier"
           } ],
+          "tradeDate" : {
+            "value" : "2018-04-01",
+            "meta" : {
+              "globalKey" : "3f1101"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "fdda73db"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ee963b6"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
                   "primaryAssetClass" : {
-                    "value" : "INTEREST_RATE"
+                    "value" : "InterestRate"
                   }
                 }, {
                   "source" : "ISDA",
                   "value" : {
                     "name" : {
+                      "value" : "InterestRate:IRSwap:FixedFloat",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                      },
-                      "value" : "InterestRate:IRSwap:FixedFloat"
+                      }
                     }
                   }
                 }, {
@@ -164,46 +132,40 @@
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
-                            },
-                            "meta" : {
-                              "globalKey" : "da3ebeed"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7dfdd7c"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12d23"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3,
-                          "rollConvention" : "8"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2018-04-03",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -212,103 +174,108 @@
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
-                            },
-                            "unadjustedDate" : "2018-04-03"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ece3837b"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "floatingCalcPeriodDates",
-                          "globalKey" : "7d1c536e"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2026-02-08",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "USNY"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "primaryBusinessCenters",
-                                  "globalKey" : "27e4e9"
+                                  "globalKey" : "27e4e9",
+                                  "externalKey" : "primaryBusinessCenters"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "3662e8ba"
                               }
                             },
                             "meta" : {
                               "globalKey" : "f148ad32"
-                            },
-                            "unadjustedDate" : "2026-02-08"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "f148ad32"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "7ce22a73"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "27ad0640"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "956"
+                            "globalKey" : "204f"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                          "rollConvention" : "8"
+                        },
+                        "meta" : {
+                          "globalKey" : "384349f8",
+                          "externalKey" : "floatingCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
+                            "globalKey" : "aa"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da3ebeed"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7dfdd7c"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "a88f300c"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "floatingCalcPeriodDates",
-                          "globalReference" : "7d1c536e"
+                          "globalReference" : "384349f8",
+                          "externalReference" : "floatingCalcPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "2fdb52aa"
+                            "globalKey" : "cb73d5e"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -317,82 +284,79 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates4",
-                            "globalReference" : "2cae5286"
+                            "globalReference" : "71ebfcd4",
+                            "externalReference" : "resetDates4"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates4",
-                          "globalKey" : "2cae5286"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "71ebfcd4",
+                          "externalKey" : "resetDates4"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "357becff"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
-                            },
-                            "meta" : {
-                              "globalKey" : "da3ebeed"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7dfdd7c"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12d80"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6,
-                          "rollConvention" : "8"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "30E/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2018-04-03",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -401,445 +365,397 @@
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
-                            },
-                            "unadjustedDate" : "2018-04-03"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ece3837b"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "fixedCalcPeriodDates",
-                          "globalKey" : "48bdaca5"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2026-02-08",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "primaryBusinessCenters",
-                                  "globalReference" : "27e4e9"
+                                  "globalReference" : "27e4e9",
+                                  "externalReference" : "primaryBusinessCenters"
                                 },
                                 "meta" : {
                                   "globalKey" : "da3ebeed"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "b7dfdd7c"
                               }
                             },
                             "meta" : {
                               "globalKey" : "302a2604"
-                            },
-                            "unadjustedDate" : "2026-02-08"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "302a2604"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "30E/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "b8cbb118"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "27ad0643"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "959"
+                            "globalKey" : "2b92"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 6
+                          "rollConvention" : "8"
+                        },
+                        "meta" : {
+                          "globalKey" : "7442ed37",
+                          "externalKey" : "fixedCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
+                            "globalKey" : "107"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da3ebeed"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7dfdd7c"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "856b8369"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "e5ea95a8"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "264a9fc5"
+                      "globalKey" : "15a0ee49"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "d6cf4212"
+                  "globalKey" : "c6259096"
                 }
               },
               "meta" : {
-                "globalKey" : "d6cf4212"
+                "globalKey" : "c6259096"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "e4dda770"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "5f0c6d05"
-                  },
-                  "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
-                    "value" : {
-                      "floatingRateIndex" : {
-                        "value" : "USD-LIBOR-BBA"
-                      },
-                      "indexTenor" : {
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 10000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD",
                         "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
+                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                        }
                       }
                     }
-                  }
-                },
-                "quantity" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
+                  }
+                } ],
+                "observable" : {
+                  "rateOption" : {
+                    "value" : {
+                      "floatingRateIndex" : {
+                        "value" : "USD-LIBOR-BBA"
+                      },
+                      "indexTenor" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
                         "meta" : {
-                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                          "globalKey" : "aa"
+                        }
                       }
                     },
-                    "value" : 10000
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "828026c7"
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "8532effc"
                 },
+                "meta" : {
+                  "globalKey" : "fd32a49c"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.0253,
                     "unit" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
                     },
-                    "value" : 0.0253,
                     "perUnitOf" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 10000,
                     "unit" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
-                    },
-                    "value" : 10000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "212b0f84"
+                }
               } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "74dee05b",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "b97c11f6",
+                "externalReference" : "party2"
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f1101"
-            },
-            "value" : "2018-04-01"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "LEI1RPT0001",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                },
-                "value" : "LEI1RPT0001CCCC"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "b8962566"
               }
             } ],
-            "issuer" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-              },
-              "value" : "LEI1RPT0001"
-            },
-            "meta" : {
-              "globalKey" : "aa0fbf4c"
+            "name" : {
+              "value" : "Bank X"
             },
-            "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "split" : {
-        "breakdown" : [ {
-          "partyChange" : {
-            "counterparty" : {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "party3",
-                    "globalKey" : "abc11bbc"
-                  },
-                  "name" : {
-                    "value" : "Bank Z"
+            "businessUnit" : [ {
+              "name" : "NY Swaps Desk",
+              "meta" : {
+                "globalKey" : "5c10b72e",
+                "externalKey" : "desk1"
+              }
+            } ],
+            "person" : [ {
+              "personId" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "jjones"
                   },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                      },
-                      "value" : "LEI3RPT0003"
-                    },
-                    "identifierType" : "LEI",
-                    "meta" : {
-                      "globalKey" : "88587f26"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_1"
-            },
-            "tradeId" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "LEI3RPT0003CCC"
+                    "globalKey" : "baeb8c0d"
+                  }
                 }
               } ],
-              "issuer" : {
+              "firstName" : "jjone",
+              "meta" : {
+                "globalKey" : "d3962233",
+                "externalKey" : "trader"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "74dee05b",
+              "externalKey" : "party1"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "LEI2CP0002",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-                },
-                "value" : "LEI3RPT0003"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
               },
+              "identifierType" : "LEI",
               "meta" : {
-                "globalKey" : "30815c75"
+                "globalKey" : "eb8edea1"
+              }
+            } ],
+            "name" : {
+              "value" : "Bank Y"
+            },
+            "meta" : {
+              "globalKey" : "b97c11f6",
+              "externalKey" : "party2"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "549300OL8KL0WCQ34V31",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
-          }
-        }, {
-          "quantityChange" : {
-            "change" : [ {
+              "identifierType" : "LEI",
               "meta" : {
-                "globalKey" : "171b36"
-              },
-              "quantity" : [ {
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 0
+                "globalKey" : "8ffabe4b"
+              }
+            } ],
+            "name" : {
+              "value" : "Up&Atem"
+            },
+            "meta" : {
+              "globalKey" : "ce0b9311",
+              "externalKey" : "broker1"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "549300IB5Q45JGNPND58",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                 }
-              } ]
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "e213e7d7"
+              }
             } ],
-            "direction" : "REPLACE"
+            "name" : {
+              "value" : "ClearItAll"
+            },
+            "meta" : {
+              "globalKey" : "f6a6cc60",
+              "externalKey" : "clearing-svc"
+            }
+          } ],
+          "partyRole" : [ {
+            "partyReference" : {
+              "globalReference" : "f6a6cc60",
+              "externalReference" : "clearing-svc"
+            },
+            "role" : "ClearingOrganization",
+            "ownershipPartyReference" : {
+              "globalReference" : "74dee05b",
+              "externalReference" : "party1"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "2f17c8a2"
           }
-        } ]
+        },
+        "meta" : {
+          "globalKey" : "2f17c8a2"
+        }
       }
     }
   } ],
-  "intent" : "NOVATION",
+  "eventQualifier" : "Novation",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "2d494f79"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "2d494f79"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party3",
-          "globalKey" : "abc11bbc"
-        },
-        "name" : {
-          "value" : "Bank Z"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI3RPT0003"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "88587f26"
-          }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "ee963b6"
-        },
-        "name" : {
-          "value" : "Bank Y"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI2CP0002"
-          },
-          "identifierType" : "LEI",
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "LEI3RPT0003",
           "meta" : {
-            "globalKey" : "eb8edea1"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "broker1",
-          "globalKey" : "ed0cc6d1"
-        },
-        "name" : {
-          "value" : "Up&Atem"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "LEI3RPT0003CCC",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300OL8KL0WCQ34V31"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "8ffabe4b"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+            }
           }
-        } ]
-      }, {
+        } ],
         "meta" : {
-          "externalKey" : "clearing-svc",
-          "globalKey" : "611719a0"
-        },
-        "name" : {
-          "value" : "ClearItAll"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300IB5Q45JGNPND58"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "e213e7d7"
-          }
-        } ]
-      } ],
-      "partyRole" : [ {
-        "ownershipPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "fdda73db"
+          "globalKey" : "1d8d35e1"
         },
-        "partyReference" : {
-          "externalReference" : "clearing-svc",
-          "globalReference" : "611719a0"
-        },
-        "role" : "CLEARING_ORGANIZATION"
+        "identifierType" : "UniqueTransactionIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2018-04-01",
+        "meta" : {
+          "globalKey" : "3f1101"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party3",
-            "globalReference" : "abc11bbc"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ee963b6"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
               "primaryAssetClass" : {
-                "value" : "INTEREST_RATE"
+                "value" : "InterestRate"
               }
             }, {
               "source" : "ISDA",
               "value" : {
                 "name" : {
+                  "value" : "InterestRate:IRSwap:FixedFloat",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                  },
-                  "value" : "InterestRate:IRSwap:FixedFloat"
+                  }
                 }
               }
             }, {
@@ -850,46 +766,40 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d23"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -898,103 +808,108 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "7d1c536e"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "USNY"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "27e4e9"
+                              "globalKey" : "27e4e9",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "3662e8ba"
                           }
                         },
                         "meta" : {
                           "globalKey" : "f148ad32"
-                        },
-                        "unadjustedDate" : "2026-02-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "f148ad32"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "7ce22a73"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0640"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "956"
+                        "globalKey" : "204f"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "384349f8",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "a88f300c"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "7d1c536e"
+                      "globalReference" : "384349f8",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "2fdb52aa"
+                        "globalKey" : "cb73d5e"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -1003,82 +918,79 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates4",
-                        "globalReference" : "2cae5286"
+                        "globalReference" : "71ebfcd4",
+                        "externalReference" : "resetDates4"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates4",
-                      "globalKey" : "2cae5286"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "71ebfcd4",
+                      "externalKey" : "resetDates4"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "357becff"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d80"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30E/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -1087,395 +999,369 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "48bdaca5"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
                         "meta" : {
                           "globalKey" : "302a2604"
-                        },
-                        "unadjustedDate" : "2026-02-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "302a2604"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "30E/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "b8cbb118"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0643"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "959"
+                        "globalKey" : "2b92"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 6
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "7442ed37",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
+                        "globalKey" : "107"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "856b8369"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e5ea95a8"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "264a9fc5"
+                  "globalKey" : "15a0ee49"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "d6cf4212"
+              "globalKey" : "c6259096"
             }
           },
           "meta" : {
-            "globalKey" : "d6cf4212"
+            "globalKey" : "c6259096"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "e4dda770"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "5f0c6d05"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "USD-LIBOR-BBA"
-                  },
-                  "indexTenor" : {
+            "quantity" : [ {
+              "value" : {
+                "value" : 10000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD",
                     "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                    }
                   }
                 }
-              }
-            },
-            "quantity" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "USD-LIBOR-BBA"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                      "globalKey" : "aa"
+                    }
                   }
                 },
-                "value" : 10000
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "828026c7"
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "8532effc"
             },
+            "meta" : {
+              "globalKey" : "fd32a49c"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.0253,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "value" : 0.0253,
                 "perUnitOf" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 10000,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
-                },
-                "value" : 10000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
-          } ]
-        } ]
-      },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f1101"
-        },
-        "value" : "2018-04-01"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
+            } ],
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-            },
-            "value" : "LEI3RPT0003CCC"
-          }
+              "globalKey" : "212b0f84"
+            }
+          } ]
         } ],
-        "issuer" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-          },
-          "value" : "LEI3RPT0003"
-        },
-        "meta" : {
-          "globalKey" : "30815c75"
-        },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
-    }
-  }, {
-    "meta" : {
-      "globalKey" : "f1306241"
-    },
-    "state" : {
-      "closedState" : {
-        "state" : "TERMINATED"
-      },
-      "positionState" : "CLOSED"
-    },
-    "trade" : {
-      "meta" : {
-        "globalKey" : "92137f72"
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "4a5fa53c",
+            "externalReference" : "party3"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "b97c11f6",
+            "externalReference" : "party2"
+          }
+        } ]
       },
       "party" : [ {
-        "businessUnit" : [ {
-          "meta" : {
-            "externalKey" : "desk1",
-            "globalKey" : "5c10b72e"
-          },
-          "name" : "NY Swaps Desk"
-        } ],
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "fdda73db"
-        },
-        "name" : {
-          "value" : "Bank X"
-        },
         "partyId" : [ {
           "identifier" : {
+            "value" : "LEI3RPT0003",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI1RPT0001"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
-            "globalKey" : "b8962566"
+            "globalKey" : "88587f26"
           }
         } ],
-        "person" : [ {
-          "firstName" : "jjone",
-          "meta" : {
-            "externalKey" : "trader",
-            "globalKey" : "d3962233"
-          },
-          "personId" : [ {
-            "value" : {
-              "identifier" : {
-                "value" : "jjones"
-              },
-              "meta" : {
-                "globalKey" : "baeb8c0d"
-              }
-            }
-          } ]
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "ee963b6"
-        },
         "name" : {
-          "value" : "Bank Y"
+          "value" : "Bank Z"
         },
+        "meta" : {
+          "globalKey" : "4a5fa53c",
+          "externalKey" : "party3"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "LEI2CP0002",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI2CP0002"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "eb8edea1"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "broker1",
-          "globalKey" : "ed0cc6d1"
-        },
+        } ],
         "name" : {
-          "value" : "Up&Atem"
+          "value" : "Bank Y"
         },
+        "meta" : {
+          "globalKey" : "b97c11f6",
+          "externalKey" : "party2"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "549300OL8KL0WCQ34V31",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300OL8KL0WCQ34V31"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "8ffabe4b"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "clearing-svc",
-          "globalKey" : "611719a0"
-        },
+        } ],
         "name" : {
-          "value" : "ClearItAll"
+          "value" : "Up&Atem"
         },
+        "meta" : {
+          "globalKey" : "ce0b9311",
+          "externalKey" : "broker1"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "549300IB5Q45JGNPND58",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300IB5Q45JGNPND58"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "e213e7d7"
           }
-        } ]
+        } ],
+        "name" : {
+          "value" : "ClearItAll"
+        },
+        "meta" : {
+          "globalKey" : "f6a6cc60",
+          "externalKey" : "clearing-svc"
+        }
       } ],
       "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "f6a6cc60",
+          "externalReference" : "clearing-svc"
+        },
+        "role" : "ClearingOrganization",
         "ownershipPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "fdda73db"
+          "globalReference" : "74dee05b",
+          "externalReference" : "party1"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "8e85bac3"
+      }
+    },
+    "meta" : {
+      "globalKey" : "8e85bac3"
+    }
+  }, {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "LEI1RPT0001",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+          }
         },
-        "partyReference" : {
-          "externalReference" : "clearing-svc",
-          "globalReference" : "611719a0"
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "LEI1RPT0001CCCC",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+            }
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "7a6056f8"
         },
-        "role" : "CLEARING_ORGANIZATION"
+        "identifierType" : "UniqueTransactionIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2018-04-01",
+        "meta" : {
+          "globalKey" : "3f1101"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "fdda73db"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ee963b6"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
               "primaryAssetClass" : {
-                "value" : "INTEREST_RATE"
+                "value" : "InterestRate"
               }
             }, {
               "source" : "ISDA",
               "value" : {
                 "name" : {
+                  "value" : "InterestRate:IRSwap:FixedFloat",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                  },
-                  "value" : "InterestRate:IRSwap:FixedFloat"
+                  }
                 }
               }
             }, {
@@ -1486,46 +1372,40 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d23"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -1534,103 +1414,108 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "7d1c536e"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "USNY"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "27e4e9"
+                              "globalKey" : "27e4e9",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "3662e8ba"
                           }
                         },
                         "meta" : {
                           "globalKey" : "f148ad32"
-                        },
-                        "unadjustedDate" : "2026-02-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "f148ad32"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "7ce22a73"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0640"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "956"
+                        "globalKey" : "204f"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "384349f8",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "a88f300c"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "7d1c536e"
+                      "globalReference" : "384349f8",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "2fdb52aa"
+                        "globalKey" : "cb73d5e"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -1639,82 +1524,79 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates4",
-                        "globalReference" : "2cae5286"
+                        "globalReference" : "71ebfcd4",
+                        "externalReference" : "resetDates4"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates4",
-                      "globalKey" : "2cae5286"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "71ebfcd4",
+                      "externalKey" : "resetDates4"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "357becff"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d80"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30E/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -1723,240 +1605,358 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "48bdaca5"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
                         "meta" : {
                           "globalKey" : "302a2604"
-                        },
-                        "unadjustedDate" : "2026-02-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "302a2604"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "30E/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "b8cbb118"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0643"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "959"
+                        "globalKey" : "2b92"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 6
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "7442ed37",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
+                        "globalKey" : "107"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "856b8369"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e5ea95a8"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "264a9fc5"
+                  "globalKey" : "15a0ee49"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "d6cf4212"
+              "globalKey" : "c6259096"
             }
           },
           "meta" : {
-            "globalKey" : "d6cf4212"
+            "globalKey" : "c6259096"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "c30bee91"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "5f0c6d05"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "USD-LIBOR-BBA"
-                  },
-                  "indexTenor" : {
+            "quantity" : [ {
+              "value" : {
+                "value" : 0,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD",
                     "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                    }
                   }
                 }
-              }
-            },
-            "quantity" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "USD-LIBOR-BBA"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                      "globalKey" : "aa"
+                    }
                   }
                 },
-                "value" : 0
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "828026c7"
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "6361371d"
             },
+            "meta" : {
+              "globalKey" : "18ef367d"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.0253,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "value" : 0.0253,
                 "perUnitOf" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 0,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
-                },
-                "value" : 0
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "8c5ac83"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "74dee05b",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "b97c11f6",
+            "externalReference" : "party2"
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f1101"
+      "party" : [ {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "LEI1RPT0001",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "b8962566"
+          }
+        } ],
+        "name" : {
+          "value" : "Bank X"
         },
-        "value" : "2018-04-01"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+        "businessUnit" : [ {
+          "name" : "NY Swaps Desk",
+          "meta" : {
+            "globalKey" : "5c10b72e",
+            "externalKey" : "desk1"
+          }
+        } ],
+        "person" : [ {
+          "personId" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "jjones"
+              },
+              "meta" : {
+                "globalKey" : "baeb8c0d"
+              }
+            }
+          } ],
+          "firstName" : "jjone",
+          "meta" : {
+            "globalKey" : "d3962233",
+            "externalKey" : "trader"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "74dee05b",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "LEI2CP0002",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-            },
-            "value" : "LEI1RPT0001CCCC"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "eb8edea1"
           }
         } ],
-        "issuer" : {
+        "name" : {
+          "value" : "Bank Y"
+        },
+        "meta" : {
+          "globalKey" : "b97c11f6",
+          "externalKey" : "party2"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "549300OL8KL0WCQ34V31",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+            "globalKey" : "8ffabe4b"
+          }
+        } ],
+        "name" : {
+          "value" : "Up&Atem"
+        },
+        "meta" : {
+          "globalKey" : "ce0b9311",
+          "externalKey" : "broker1"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "549300IB5Q45JGNPND58",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
           },
-          "value" : "LEI1RPT0001"
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "e213e7d7"
+          }
+        } ],
+        "name" : {
+          "value" : "ClearItAll"
         },
         "meta" : {
-          "globalKey" : "aa0fbf4c"
+          "globalKey" : "f6a6cc60",
+          "externalKey" : "clearing-svc"
+        }
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "f6a6cc60",
+          "externalReference" : "clearing-svc"
         },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
+        "role" : "ClearingOrganization",
+        "ownershipPartyReference" : {
+          "globalReference" : "74dee05b",
+          "externalReference" : "party1"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "eaac942"
+      }
+    },
+    "state" : {
+      "closedState" : {
+        "state" : "Terminated"
+      },
+      "positionState" : "Closed"
+    },
+    "meta" : {
+      "globalKey" : "fc707cd1"
     }
   } ],
-  "eventQualifier" : "Novation",
   "meta" : {
-    "globalKey" : "2feebad0"
+    "globalKey" : "1748151a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/novation/partial-novation-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/novation/partial-novation-func-output.json
index 4d5a00d50b..2e4d419cae 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/novation/partial-novation-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/novation/partial-novation-func-output.json
@@ -1,159 +1,148 @@
 {
+  "intent" : "Novation",
   "eventDate" : "2018-04-04",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "6aba1435"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "6aba1435"
-          },
-          "party" : [ {
-            "businessUnit" : [ {
-              "meta" : {
-                "externalKey" : "desk1",
-                "globalKey" : "5c10b72e"
-              },
-              "name" : "NY Swaps Desk"
-            } ],
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "fdda73db"
-            },
-            "name" : {
-              "value" : "Bank X"
+    "primitiveInstruction" : {
+      "split" : {
+        "breakdown" : [ {
+          "partyChange" : {
+            "counterparty" : {
+              "role" : "Party1",
+              "partyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "LEI3RPT0003",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                      }
+                    },
+                    "identifierType" : "LEI",
+                    "meta" : {
+                      "globalKey" : "88587f26"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "Bank Z"
+                  },
+                  "meta" : {
+                    "globalKey" : "4a5fa53c",
+                    "externalKey" : "party3"
+                  }
+                }
+              }
             },
-            "partyId" : [ {
-              "identifier" : {
+            "tradeId" : [ {
+              "issuer" : {
+                "value" : "LEI3RPT0003",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI1RPT0001"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                }
               },
-              "identifierType" : "LEI",
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "LEI3RPT0003DDDD",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
+                }
+              } ],
               "meta" : {
-                "globalKey" : "b8962566"
+                "globalKey" : "6a5e1eb8"
+              },
+              "identifierType" : "UniqueTransactionIdentifier"
+            } ]
+          },
+          "quantityChange" : {
+            "change" : [ {
+              "quantity" : [ {
+                "value" : {
+                  "value" : 5000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                      }
+                    }
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "484e65ab"
               }
             } ],
-            "person" : [ {
-              "firstName" : "jjone",
-              "meta" : {
-                "externalKey" : "trader",
-                "globalKey" : "d3962233"
-              },
-              "personId" : [ {
+            "direction" : "Replace"
+          }
+        }, {
+          "quantityChange" : {
+            "change" : [ {
+              "quantity" : [ {
                 "value" : {
-                  "identifier" : {
-                    "value" : "jjones"
-                  },
-                  "meta" : {
-                    "globalKey" : "baeb8c0d"
+                  "value" : 8000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                      }
+                    }
                   }
                 }
-              } ]
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "ee963b6"
-            },
-            "name" : {
-              "value" : "Bank Y"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI2CP0002"
-              },
-              "identifierType" : "LEI",
+              } ],
               "meta" : {
-                "globalKey" : "eb8edea1"
+                "globalKey" : "e701176e"
               }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "broker1",
-              "globalKey" : "ed0cc6d1"
-            },
-            "name" : {
-              "value" : "Up&Atem"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "549300OL8KL0WCQ34V31"
-              },
-              "identifierType" : "LEI",
+            } ],
+            "direction" : "Replace"
+          }
+        } ]
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "LEI1RPT0001",
               "meta" : {
-                "globalKey" : "8ffabe4b"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
               }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "clearing-svc",
-              "globalKey" : "611719a0"
-            },
-            "name" : {
-              "value" : "ClearItAll"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "LEI1RPT0001DDDD",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "549300IB5Q45JGNPND58"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "e213e7d7"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                }
               }
-            } ]
-          } ],
-          "partyRole" : [ {
-            "ownershipPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "fdda73db"
-            },
-            "partyReference" : {
-              "externalReference" : "clearing-svc",
-              "globalReference" : "611719a0"
+            } ],
+            "meta" : {
+              "globalKey" : "7a6ee6b8"
             },
-            "role" : "CLEARING_ORGANIZATION"
+            "identifierType" : "UniqueTransactionIdentifier"
           } ],
+          "tradeDate" : {
+            "value" : "2018-04-01",
+            "meta" : {
+              "globalKey" : "3f1101"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "fdda73db"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ee963b6"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
                   "primaryAssetClass" : {
-                    "value" : "INTEREST_RATE"
+                    "value" : "InterestRate"
                   }
                 }, {
                   "source" : "ISDA",
                   "value" : {
                     "name" : {
+                      "value" : "InterestRate:IRSwap:FixedFloat",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                      },
-                      "value" : "InterestRate:IRSwap:FixedFloat"
+                      }
                     }
                   }
                 }, {
@@ -164,46 +153,40 @@
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
-                            },
-                            "meta" : {
-                              "globalKey" : "da3ebeed"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7dfdd7c"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12d23"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3,
-                          "rollConvention" : "8"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2018-04-03",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -212,103 +195,108 @@
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
-                            },
-                            "unadjustedDate" : "2018-04-03"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ece3837b"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "floatingCalcPeriodDates",
-                          "globalKey" : "7d1c536e"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2026-02-08",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "USNY"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "primaryBusinessCenters",
-                                  "globalKey" : "27e4e9"
+                                  "globalKey" : "27e4e9",
+                                  "externalKey" : "primaryBusinessCenters"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "3662e8ba"
                               }
                             },
                             "meta" : {
                               "globalKey" : "f148ad32"
-                            },
-                            "unadjustedDate" : "2026-02-08"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "f148ad32"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "8493cfd2"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "27ad0640"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "956"
+                            "globalKey" : "204f"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                          "rollConvention" : "8"
+                        },
+                        "meta" : {
+                          "globalKey" : "384349f8",
+                          "externalKey" : "floatingCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
-                            }
+                            "globalKey" : "aa"
                           }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da3ebeed"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7dfdd7c"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "a88f300c"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "floatingCalcPeriodDates",
-                          "globalReference" : "7d1c536e"
+                          "globalReference" : "384349f8",
+                          "externalReference" : "floatingCalcPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "2fdb52ab"
+                            "globalKey" : "cb73d5f"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -317,82 +305,79 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates5",
-                            "globalReference" : "345ff7e5"
+                            "globalReference" : "799da233",
+                            "externalReference" : "resetDates5"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates5",
-                          "globalKey" : "345ff7e5"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "799da233",
+                          "externalKey" : "resetDates5"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3d2d925e"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
-                            },
-                            "meta" : {
-                              "globalKey" : "da3ebeed"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7dfdd7c"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12d80"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6,
-                          "rollConvention" : "8"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "30E/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2018-04-03",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -401,466 +386,397 @@
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
-                            },
-                            "unadjustedDate" : "2018-04-03"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ece3837b"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "fixedCalcPeriodDates",
-                          "globalKey" : "48bdaca5"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2026-02-08",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "primaryBusinessCenters",
-                                  "globalReference" : "27e4e9"
+                                  "globalReference" : "27e4e9",
+                                  "externalReference" : "primaryBusinessCenters"
                                 },
                                 "meta" : {
                                   "globalKey" : "da3ebeed"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "b7dfdd7c"
                               }
                             },
                             "meta" : {
                               "globalKey" : "302a2604"
-                            },
-                            "unadjustedDate" : "2026-02-08"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "302a2604"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "30E/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "b8cbb118"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "27ad0643"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "959"
+                            "globalKey" : "2b92"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 6
+                          "rollConvention" : "8"
+                        },
+                        "meta" : {
+                          "globalKey" : "7442ed37",
+                          "externalKey" : "fixedCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
+                            "globalKey" : "107"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da3ebeed"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7dfdd7c"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "856b8369"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "e5ea95a8"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "19da2406"
+                      "globalKey" : "930728a"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "ca5ec653"
+                  "globalKey" : "b9b514d7"
                 }
               },
               "meta" : {
-                "globalKey" : "ca5ec653"
+                "globalKey" : "b9b514d7"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "e4dda770"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "5f0c6d05"
-                  },
-                  "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
-                    "value" : {
-                      "floatingRateIndex" : {
-                        "value" : "USD-LIBOR-BBA"
-                      },
-                      "indexTenor" : {
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 10000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD",
                         "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
+                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                        }
                       }
                     }
-                  }
-                },
-                "quantity" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
+                  }
+                } ],
+                "observable" : {
+                  "rateOption" : {
+                    "value" : {
+                      "floatingRateIndex" : {
+                        "value" : "USD-LIBOR-BBA"
+                      },
+                      "indexTenor" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
                         "meta" : {
-                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                          "globalKey" : "aa"
+                        }
                       }
                     },
-                    "value" : 10000
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "828026c7"
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "8532effc"
                 },
+                "meta" : {
+                  "globalKey" : "fd32a49c"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.0253,
                     "unit" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
                     },
-                    "value" : 0.0253,
                     "perUnitOf" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 10000,
                     "unit" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
-                    },
-                    "value" : 10000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "212b0f84"
+                }
               } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "74dee05b",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "b97c11f6",
+                "externalReference" : "party2"
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f1101"
-            },
-            "value" : "2018-04-01"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "LEI1RPT0001",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                },
-                "value" : "LEI1RPT0001DDDD"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "b8962566"
               }
             } ],
-            "issuer" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-              },
-              "value" : "LEI1RPT0001"
-            },
-            "meta" : {
-              "globalKey" : "e0b95f0c"
+            "name" : {
+              "value" : "Bank X"
             },
-            "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "split" : {
-        "breakdown" : [ {
-          "partyChange" : {
-            "counterparty" : {
-              "partyReference" : {
+            "businessUnit" : [ {
+              "name" : "NY Swaps Desk",
+              "meta" : {
+                "globalKey" : "5c10b72e",
+                "externalKey" : "desk1"
+              }
+            } ],
+            "person" : [ {
+              "personId" : [ {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "party3",
-                    "globalKey" : "abc11bbc"
-                  },
-                  "name" : {
-                    "value" : "Bank Z"
+                  "identifier" : {
+                    "value" : "jjones"
                   },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                      },
-                      "value" : "LEI3RPT0003"
-                    },
-                    "identifierType" : "LEI",
-                    "meta" : {
-                      "globalKey" : "88587f26"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_1"
-            },
-            "tradeId" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "LEI3RPT0003DDDD"
+                    "globalKey" : "baeb8c0d"
+                  }
                 }
               } ],
-              "issuer" : {
+              "firstName" : "jjone",
+              "meta" : {
+                "globalKey" : "d3962233",
+                "externalKey" : "trader"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "74dee05b",
+              "externalKey" : "party1"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "LEI2CP0002",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-                },
-                "value" : "LEI3RPT0003"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
               },
+              "identifierType" : "LEI",
               "meta" : {
-                "globalKey" : "8cbb6b8c"
+                "globalKey" : "eb8edea1"
+              }
+            } ],
+            "name" : {
+              "value" : "Bank Y"
+            },
+            "meta" : {
+              "globalKey" : "b97c11f6",
+              "externalKey" : "party2"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "549300OL8KL0WCQ34V31",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
-          },
-          "quantityChange" : {
-            "change" : [ {
+              "identifierType" : "LEI",
               "meta" : {
-                "globalKey" : "484e65ab"
-              },
-              "quantity" : [ {
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 5000
-                }
-              } ]
+                "globalKey" : "8ffabe4b"
+              }
             } ],
-            "direction" : "REPLACE"
-          }
-        }, {
-          "quantityChange" : {
-            "change" : [ {
-              "meta" : {
-                "globalKey" : "e701176e"
-              },
-              "quantity" : [ {
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 8000
+            "name" : {
+              "value" : "Up&Atem"
+            },
+            "meta" : {
+              "globalKey" : "ce0b9311",
+              "externalKey" : "broker1"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "549300IB5Q45JGNPND58",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                 }
-              } ]
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "e213e7d7"
+              }
             } ],
-            "direction" : "REPLACE"
+            "name" : {
+              "value" : "ClearItAll"
+            },
+            "meta" : {
+              "globalKey" : "f6a6cc60",
+              "externalKey" : "clearing-svc"
+            }
+          } ],
+          "partyRole" : [ {
+            "partyReference" : {
+              "globalReference" : "f6a6cc60",
+              "externalReference" : "clearing-svc"
+            },
+            "role" : "ClearingOrganization",
+            "ownershipPartyReference" : {
+              "globalReference" : "74dee05b",
+              "externalReference" : "party1"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "7ded4081"
           }
-        } ]
+        },
+        "meta" : {
+          "globalKey" : "7ded4081"
+        }
       }
     }
   } ],
-  "intent" : "NOVATION",
+  "eventQualifier" : "PartialNovation",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "92aa2225"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "92aa2225"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party3",
-          "globalKey" : "abc11bbc"
-        },
-        "name" : {
-          "value" : "Bank Z"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI3RPT0003"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "88587f26"
-          }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "ee963b6"
-        },
-        "name" : {
-          "value" : "Bank Y"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI2CP0002"
-          },
-          "identifierType" : "LEI",
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "LEI3RPT0003",
           "meta" : {
-            "globalKey" : "eb8edea1"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "broker1",
-          "globalKey" : "ed0cc6d1"
-        },
-        "name" : {
-          "value" : "Up&Atem"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "LEI3RPT0003DDDD",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300OL8KL0WCQ34V31"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "8ffabe4b"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+            }
           }
-        } ]
-      }, {
+        } ],
         "meta" : {
-          "externalKey" : "clearing-svc",
-          "globalKey" : "611719a0"
-        },
-        "name" : {
-          "value" : "ClearItAll"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300IB5Q45JGNPND58"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "e213e7d7"
-          }
-        } ]
-      } ],
-      "partyRole" : [ {
-        "ownershipPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "fdda73db"
-        },
-        "partyReference" : {
-          "externalReference" : "clearing-svc",
-          "globalReference" : "611719a0"
+          "globalKey" : "6a5e1eb8"
         },
-        "role" : "CLEARING_ORGANIZATION"
+        "identifierType" : "UniqueTransactionIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2018-04-01",
+        "meta" : {
+          "globalKey" : "3f1101"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party3",
-            "globalReference" : "abc11bbc"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ee963b6"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
               "primaryAssetClass" : {
-                "value" : "INTEREST_RATE"
+                "value" : "InterestRate"
               }
             }, {
               "source" : "ISDA",
               "value" : {
                 "name" : {
+                  "value" : "InterestRate:IRSwap:FixedFloat",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                  },
-                  "value" : "InterestRate:IRSwap:FixedFloat"
+                  }
                 }
               }
             }, {
@@ -871,46 +787,40 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d23"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -919,103 +829,108 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "7d1c536e"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "USNY"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "27e4e9"
+                              "globalKey" : "27e4e9",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "3662e8ba"
                           }
                         },
                         "meta" : {
                           "globalKey" : "f148ad32"
-                        },
-                        "unadjustedDate" : "2026-02-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "f148ad32"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "8493cfd2"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0640"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "956"
+                        "globalKey" : "204f"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "384349f8",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "a88f300c"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "7d1c536e"
+                      "globalReference" : "384349f8",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
-                      "meta" : {
-                        "globalKey" : "2fdb52ab"
-                      },
-                      "period" : "D",
                       "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "period" : "D",
+                      "meta" : {
+                        "globalKey" : "cb73d5f"
+                      },
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -1024,82 +939,79 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates5",
-                        "globalReference" : "345ff7e5"
+                        "globalReference" : "799da233",
+                        "externalReference" : "resetDates5"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates5",
-                      "globalKey" : "345ff7e5"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "799da233",
+                      "externalKey" : "resetDates5"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3d2d925e"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d80"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30E/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -1108,389 +1020,369 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "48bdaca5"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
                         "meta" : {
                           "globalKey" : "302a2604"
-                        },
-                        "unadjustedDate" : "2026-02-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "302a2604"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "30E/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "b8cbb118"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0643"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "959"
+                        "globalKey" : "2b92"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 6
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "7442ed37",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
+                        "globalKey" : "107"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "856b8369"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e5ea95a8"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "19da2406"
+                  "globalKey" : "930728a"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "ca5ec653"
+              "globalKey" : "b9b514d7"
             }
           },
           "meta" : {
-            "globalKey" : "ca5ec653"
+            "globalKey" : "b9b514d7"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "b433906"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "5f0c6d05"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "USD-LIBOR-BBA"
-                  },
-                  "indexTenor" : {
+            "quantity" : [ {
+              "value" : {
+                "value" : 5000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD",
                     "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                    }
                   }
                 }
-              }
-            },
-            "quantity" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "USD-LIBOR-BBA"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                      "globalKey" : "aa"
+                    }
                   }
                 },
-                "value" : 5000
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "828026c7"
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "ab988192"
             },
+            "meta" : {
+              "globalKey" : "f097b2b2"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.0253,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "value" : 0.0253,
                 "perUnitOf" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 5000,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
-                },
-                "value" : 5000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
-          } ]
-        } ]
-      },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f1101"
-        },
-        "value" : "2018-04-01"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
+            } ],
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-            },
-            "value" : "LEI3RPT0003DDDD"
-          }
+              "globalKey" : "c777b0ae"
+            }
+          } ]
         } ],
-        "issuer" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-          },
-          "value" : "LEI3RPT0003"
-        },
-        "meta" : {
-          "globalKey" : "8cbb6b8c"
-        },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
-    }
-  }, {
-    "meta" : {
-      "globalKey" : "71e00d83"
-    },
-    "trade" : {
-      "meta" : {
-        "globalKey" : "71e00d83"
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "4a5fa53c",
+            "externalReference" : "party3"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "b97c11f6",
+            "externalReference" : "party2"
+          }
+        } ]
       },
       "party" : [ {
-        "businessUnit" : [ {
-          "meta" : {
-            "externalKey" : "desk1",
-            "globalKey" : "5c10b72e"
-          },
-          "name" : "NY Swaps Desk"
-        } ],
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "fdda73db"
-        },
-        "name" : {
-          "value" : "Bank X"
-        },
         "partyId" : [ {
           "identifier" : {
+            "value" : "LEI3RPT0003",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI1RPT0001"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
-            "globalKey" : "b8962566"
+            "globalKey" : "88587f26"
           }
         } ],
-        "person" : [ {
-          "firstName" : "jjone",
-          "meta" : {
-            "externalKey" : "trader",
-            "globalKey" : "d3962233"
-          },
-          "personId" : [ {
-            "value" : {
-              "identifier" : {
-                "value" : "jjones"
-              },
-              "meta" : {
-                "globalKey" : "baeb8c0d"
-              }
-            }
-          } ]
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "ee963b6"
-        },
         "name" : {
-          "value" : "Bank Y"
+          "value" : "Bank Z"
         },
+        "meta" : {
+          "globalKey" : "4a5fa53c",
+          "externalKey" : "party3"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "LEI2CP0002",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI2CP0002"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "eb8edea1"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "broker1",
-          "globalKey" : "ed0cc6d1"
-        },
+        } ],
         "name" : {
-          "value" : "Up&Atem"
+          "value" : "Bank Y"
         },
+        "meta" : {
+          "globalKey" : "b97c11f6",
+          "externalKey" : "party2"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "549300OL8KL0WCQ34V31",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300OL8KL0WCQ34V31"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "8ffabe4b"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "clearing-svc",
-          "globalKey" : "611719a0"
-        },
+        } ],
         "name" : {
-          "value" : "ClearItAll"
+          "value" : "Up&Atem"
         },
+        "meta" : {
+          "globalKey" : "ce0b9311",
+          "externalKey" : "broker1"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
+            "value" : "549300IB5Q45JGNPND58",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300IB5Q45JGNPND58"
+            }
           },
           "identifierType" : "LEI",
           "meta" : {
             "globalKey" : "e213e7d7"
           }
-        } ]
+        } ],
+        "name" : {
+          "value" : "ClearItAll"
+        },
+        "meta" : {
+          "globalKey" : "f6a6cc60",
+          "externalKey" : "clearing-svc"
+        }
       } ],
       "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "f6a6cc60",
+          "externalReference" : "clearing-svc"
+        },
+        "role" : "ClearingOrganization",
         "ownershipPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "fdda73db"
+          "globalReference" : "74dee05b",
+          "externalReference" : "party1"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "de0f8d8d"
+      }
+    },
+    "meta" : {
+      "globalKey" : "de0f8d8d"
+    }
+  }, {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "LEI1RPT0001",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+          }
         },
-        "partyReference" : {
-          "externalReference" : "clearing-svc",
-          "globalReference" : "611719a0"
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "LEI1RPT0001DDDD",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+            }
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "7a6ee6b8"
         },
-        "role" : "CLEARING_ORGANIZATION"
+        "identifierType" : "UniqueTransactionIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2018-04-01",
+        "meta" : {
+          "globalKey" : "3f1101"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "fdda73db"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "ee963b6"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
               "primaryAssetClass" : {
-                "value" : "INTEREST_RATE"
+                "value" : "InterestRate"
               }
             }, {
               "source" : "ISDA",
               "value" : {
                 "name" : {
+                  "value" : "InterestRate:IRSwap:FixedFloat",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                  },
-                  "value" : "InterestRate:IRSwap:FixedFloat"
+                  }
                 }
               }
             }, {
@@ -1501,46 +1393,40 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d23"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -1549,103 +1435,108 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "7d1c536e"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "USNY"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "27e4e9"
+                              "globalKey" : "27e4e9",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "3662e8ba"
                           }
                         },
                         "meta" : {
                           "globalKey" : "f148ad32"
-                        },
-                        "unadjustedDate" : "2026-02-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "f148ad32"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "8493cfd2"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0640"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "956"
+                        "globalKey" : "204f"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "384349f8",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "a88f300c"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "7d1c536e"
+                      "globalReference" : "384349f8",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "2fdb52ab"
+                        "globalKey" : "cb73d5f"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -1654,82 +1545,79 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates5",
-                        "globalReference" : "345ff7e5"
+                        "globalReference" : "799da233",
+                        "externalReference" : "resetDates5"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates5",
-                      "globalKey" : "345ff7e5"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "799da233",
+                      "externalKey" : "resetDates5"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3d2d925e"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d80"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30E/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -1738,240 +1626,352 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "48bdaca5"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2026-02-08",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
                         "meta" : {
                           "globalKey" : "302a2604"
-                        },
-                        "unadjustedDate" : "2026-02-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "302a2604"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "30E/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "b8cbb118"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0643"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "959"
+                        "globalKey" : "2b92"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 6
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "7442ed37",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
+                        "globalKey" : "107"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "856b8369"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e5ea95a8"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "19da2406"
+                  "globalKey" : "930728a"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "ca5ec653"
+              "globalKey" : "b9b514d7"
             }
           },
           "meta" : {
-            "globalKey" : "ca5ec653"
+            "globalKey" : "b9b514d7"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "a9f5eac9"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "5f0c6d05"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "USD-LIBOR-BBA"
-                  },
-                  "indexTenor" : {
+            "quantity" : [ {
+              "value" : {
+                "value" : 8000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD",
                     "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                    }
                   }
                 }
-              }
-            },
-            "quantity" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "USD-LIBOR-BBA"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                      "globalKey" : "aa"
+                    }
                   }
                 },
-                "value" : 8000
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "828026c7"
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "4a4b3355"
             },
+            "meta" : {
+              "globalKey" : "e2954cb5"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.0253,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "value" : 0.0253,
                 "perUnitOf" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 8000,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
-                },
-                "value" : 8000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "ff1b374b"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "74dee05b",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "b97c11f6",
+            "externalReference" : "party2"
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f1101"
+      "party" : [ {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "LEI1RPT0001",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "b8962566"
+          }
+        } ],
+        "name" : {
+          "value" : "Bank X"
         },
-        "value" : "2018-04-01"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+        "businessUnit" : [ {
+          "name" : "NY Swaps Desk",
+          "meta" : {
+            "globalKey" : "5c10b72e",
+            "externalKey" : "desk1"
+          }
+        } ],
+        "person" : [ {
+          "personId" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "jjones"
+              },
+              "meta" : {
+                "globalKey" : "baeb8c0d"
+              }
+            }
+          } ],
+          "firstName" : "jjone",
+          "meta" : {
+            "globalKey" : "d3962233",
+            "externalKey" : "trader"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "74dee05b",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "LEI2CP0002",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-            },
-            "value" : "LEI1RPT0001DDDD"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "eb8edea1"
           }
         } ],
-        "issuer" : {
+        "name" : {
+          "value" : "Bank Y"
+        },
+        "meta" : {
+          "globalKey" : "b97c11f6",
+          "externalKey" : "party2"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "549300OL8KL0WCQ34V31",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+            "globalKey" : "8ffabe4b"
+          }
+        } ],
+        "name" : {
+          "value" : "Up&Atem"
+        },
+        "meta" : {
+          "globalKey" : "ce0b9311",
+          "externalKey" : "broker1"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "549300IB5Q45JGNPND58",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
           },
-          "value" : "LEI1RPT0001"
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "e213e7d7"
+          }
+        } ],
+        "name" : {
+          "value" : "ClearItAll"
         },
         "meta" : {
-          "globalKey" : "e0b95f0c"
+          "globalKey" : "f6a6cc60",
+          "externalKey" : "clearing-svc"
+        }
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "f6a6cc60",
+          "externalReference" : "clearing-svc"
         },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
+        "role" : "ClearingOrganization",
+        "ownershipPartyReference" : {
+          "globalReference" : "74dee05b",
+          "externalReference" : "party1"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "9e488421"
+      }
+    },
+    "meta" : {
+      "globalKey" : "9e488421"
     }
   } ],
-  "eventQualifier" : "PartialNovation",
   "meta" : {
-    "globalKey" : "c78637f4"
+    "globalKey" : "b2721d8a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/full-termination-equity-swap-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/full-termination-equity-swap-func-output.json
index b2da1fe55b..164f785b47 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/full-termination-equity-swap-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/full-termination-equity-swap-func-output.json
@@ -1,122 +1,119 @@
 {
   "eventDate" : "2021-11-11",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "509af759"
-        },
-        "trade" : {
-          "contractDetails" : {
-            "documentation" : [ {
-              "legalAgreementIdentification" : {
-                "agreementName" : {
-                  "agreementType" : "MASTER_AGREEMENT",
-                  "masterAgreementType" : {
-                    "value" : "ISDA_MASTER"
-                  }
-                },
-                "vintage" : 2002
-              },
-              "meta" : {
-                "globalKey" : "328cfa59"
+    "primitiveInstruction" : {
+      "quantityChange" : {
+        "change" : [ {
+          "quantity" : [ {
+            "value" : {
+              "value" : 760400,
+              "unit" : {
+                "financialUnit" : "Share"
               }
-            }, {
-              "legalAgreementIdentification" : {
-                "agreementName" : {
-                  "agreementType" : "CONFIRMATION",
-                  "contractualDefinitionsType" : [ {
-                    "value" : "ISDA2000"
-                  }, {
-                    "value" : "ISDA_2002_EQUITY"
-                  } ]
+            }
+          }, {
+            "value" : {
+              "value" : 28469376,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "abe8ee3"
+          }
+        } ],
+        "direction" : "Decrease"
+      },
+      "transfer" : {
+        "transferState" : [ {
+          "transfer" : {
+            "quantity" : {
+              "value" : 2000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
                 }
+              }
+            },
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "globalReference" : "33f59568",
+                "externalReference" : "party2"
               },
-              "meta" : {
-                "globalKey" : "ed9ef3fc"
+              "receiverPartyReference" : {
+                "globalReference" : "33f59567",
+                "externalReference" : "party1"
               }
-            } ],
-            "governingLaw" : {
-              "value" : "GBEN"
             },
-            "meta" : {
-              "globalKey" : "92c7c587"
+            "settlementDate" : {
+              "adjustedDate" : {
+                "value" : "2001-09-24",
+                "meta" : {
+                  "globalKey" : "3e8a58"
+                }
+              }
+            },
+            "transferExpression" : {
+              "priceTransfer" : "Termination"
             }
           },
           "meta" : {
-            "globalKey" : "509af759"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "33f59567"
+            "globalKey" : "64b538a6"
+          }
+        } ]
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuerReference" : {
+              "globalReference" : "33f59567",
+              "externalReference" : "party1"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "6234",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-                },
-                "value" : "Party A"
-              },
-              "meta" : {
-                "globalKey" : "33f59567"
+                  "scheme" : "http://www.partyA.com/eqs-trade-id"
+                }
               }
-            } ]
-          }, {
+            } ],
             "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "33f59568"
+              "globalKey" : "c921d6eb"
+            }
+          }, {
+            "issuerReference" : {
+              "globalReference" : "33f59568",
+              "externalReference" : "party2"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "6569",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-                },
-                "value" : "Party B"
-              },
-              "meta" : {
-                "globalKey" : "33f59568"
+                  "scheme" : "http://www.partyB.com/eqs-trade-id"
+                }
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "310383ce"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "2001-09-24",
+            "meta" : {
+              "globalKey" : "3e8a58",
+              "externalKey" : "TradeDate"
+            }
+          },
           "tradableProduct" : {
-            "adjustment" : "EXECUTION",
-            "ancillaryParty" : [ {
-              "partyReference" : [ {
-                "externalReference" : "party1",
-                "globalReference" : "33f59567"
-              } ],
-              "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-            }, {
-              "partyReference" : [ {
-                "externalReference" : "party1",
-                "globalReference" : "33f59567"
-              } ],
-              "role" : "EXTRAORDINARY_DIVIDENDS_PARTY"
-            }, {
-              "partyReference" : [ {
-                "externalReference" : "party1",
-                "globalReference" : "33f59567"
-              } ],
-              "role" : "CALCULATION_AGENT_INDEPENDENT"
-            } ],
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "33f59568"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "33f59567"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
-                  "source" : "OTHER",
+                  "source" : "Other",
                   "value" : {
                     "name" : {
                       "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleName"
@@ -127,313 +124,305 @@
                   "productQualifier" : "EquitySwap_TotalReturnBasicPerformance_SingleName"
                 } ],
                 "economicTerms" : {
-                  "calculationAgent" : {
-                    "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-                  },
                   "effectiveDate" : {
-                    "meta" : {
-                      "externalKey" : "EffectiveDate",
-                      "globalKey" : "dbcf5078"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 3,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "dbcf5078"
+                        "globalKey" : "a2cb5f8a"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 3,
-                      "dayType" : "EXCHANGE_BUSINESS",
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "dayType" : "ExchangeBusiness",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "TradeDate",
-                        "globalReference" : "3e8a58"
+                        "globalReference" : "3e8a58",
+                        "externalReference" : "TradeDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "a2cb5f8a",
+                      "externalKey" : "EffectiveDate"
                     }
                   },
-                  "extraordinaryEvents" : {
-                    "additionalDisruptionEvents" : {
-                      "changeInLaw" : true,
-                      "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                      "failureToDeliver" : true,
-                      "hedgingDisruption" : true,
-                      "increasedCostOfHedging" : false,
-                      "increasedCostOfStockBorrow" : false,
-                      "insolvencyFiling" : false,
-                      "lossOfStockBorrow" : true
-                    },
-                    "compositionOfCombinedConsideration" : true,
-                    "mergerEvents" : {
-                      "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                      "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                      "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-                    },
-                    "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-                    "representations" : {
-                      "additionalAcknowledgements" : true,
-                      "agreementsRegardingHedging" : true,
-                      "nonReliance" : true
+                  "terminationDate" : {
+                    "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
+                      "meta" : {
+                        "globalKey" : "edf02740"
+                      },
+                      "businessDayConvention" : "NotApplicable",
+                      "dateRelativeTo" : {
+                        "globalReference" : "bee88507",
+                        "externalReference" : "FinalEquityPaymentDate"
+                      }
                     },
-                    "tenderOfferEvents" : {
-                      "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                      "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                      "shareForShare" : "MODIFIED_CALCULATION_AGENT"
+                    "meta" : {
+                      "globalKey" : "edf02740",
+                      "externalKey" : "TerminationDate"
                     }
                   },
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "2fdf0b8c"
-                        },
-                        "quantityReference" : {
-                          "externalReference" : "EquityNotionalAmount",
-                          "globalReference" : "4cf"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "quantityReference" : {
+                          "globalReference" : "4cf",
+                          "externalReference" : "EquityNotionalAmount"
+                        },
+                        "meta" : {
+                          "globalKey" : "2fdf0b8c"
+                        }
+                      },
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
+                            }
+                          },
+                          "spreadSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-2"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
                         }
                       },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
                       "calculationPeriodDates" : {
                         "effectiveDate" : {
-                          "meta" : {
-                            "globalKey" : "dbcf5078"
-                          },
                           "relativeDate" : {
+                            "periodMultiplier" : 3,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "dbcf5078"
+                              "globalKey" : "a2cb5f8a"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 3,
-                            "dayType" : "EXCHANGE_BUSINESS",
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "dayType" : "ExchangeBusiness",
+                            "businessDayConvention" : "NotApplicable",
                             "dateRelativeTo" : {
-                              "externalReference" : "TradeDate",
-                              "globalReference" : "3e8a58"
+                              "globalReference" : "3e8a58",
+                              "externalReference" : "TradeDate"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "a2cb5f8a"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "InterestLegPeriodDates",
-                          "globalKey" : "e7334d0"
-                        },
                         "terminationDate" : {
-                          "meta" : {
-                            "globalKey" : "f18f7c48"
-                          },
                           "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "f18f7c48"
+                              "globalKey" : "edf02740"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "dateRelativeTo" : {
-                              "externalReference" : "FinalEquityPaymentDate",
-                              "globalReference" : "86542f29"
+                              "globalReference" : "bee88507",
+                              "externalReference" : "FinalEquityPaymentDate"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "edf02740"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "2fce1876",
+                          "externalKey" : "InterestLegPeriodDates"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "8306e5d6"
-                      },
                       "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "9b9d36de"
-                        },
                         "paymentDateSchedule" : {
                           "interimPaymentDates" : [ {
-                            "meta" : {
-                              "globalKey" : "9b9d36de"
-                            },
                             "relativeDates" : {
+                              "periodMultiplier" : 0,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "9b9d36de"
+                                "globalKey" : "97fde1d6"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 0,
-                              "businessDayConvention" : "NOT_APPLICABLE",
+                              "businessDayConvention" : "NotApplicable",
                               "dateRelativeTo" : {
-                                "externalReference" : "EquityPaymentDate",
-                                "globalReference" : "fb15beed"
+                                "globalReference" : "1a999e73",
+                                "externalReference" : "EquityPaymentDate"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "97fde1d6"
                             }
                           } ]
-                        }
-                      },
-                      "rateSpecification" : {
-                        "floatingRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
-                            }
-                          },
-                          "spreadSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-2"
-                              }
-                            }
-                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "97fde1d6"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "InterestLegPeriodDates",
-                          "globalReference" : "e7334d0"
+                          "globalReference" : "2fce1876",
+                          "externalReference" : "InterestLegPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "meta" : {
-                          "globalKey" : "9ab7a6fd"
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "globalKey" : "bc128aa3"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3cd0e14e"
                       }
                     } ],
-                    "meta" : {
-                      "globalKey" : "3d9bbe0"
-                    },
                     "performancePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "externalKey" : "EquityNotionalAmount",
-                          "globalKey" : "4cf"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
                         },
-                        "reset" : true
+                        "reset" : true,
+                        "meta" : {
+                          "globalKey" : "4cf",
+                          "externalKey" : "EquityNotionalAmount"
+                        }
                       },
                       "settlementTerms" : {
-                        "meta" : {
-                          "globalKey" : "7610bbd9"
-                        },
+                        "settlementType" : "Cash",
                         "settlementCurrency" : {
                           "value" : "USD"
                         },
-                        "settlementType" : "CASH"
-                      },
-                      "meta" : {
-                        "globalKey" : "bd1fe08a"
-                      },
-                      "paymentDates" : {
                         "meta" : {
-                          "externalKey" : "EquityPaymentDate",
-                          "globalKey" : "fb15beed"
-                        },
-                        "paymentDateSchedule" : {
-                          "finalPaymentDate" : {
-                            "meta" : {
-                              "externalKey" : "FinalEquityPaymentDate",
-                              "globalKey" : "86542f29"
-                            },
-                            "relativeDate" : {
-                              "meta" : {
-                                "globalKey" : "86542f29"
+                          "globalKey" : "7610bbd9"
+                        }
+                      },
+                      "valuationDates" : {
+                        "valuationDatesInterim" : {
+                          "determinationMethod" : "ValuationTime",
+                          "valuationDates" : {
+                            "adjustableDates" : {
+                              "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ],
+                              "dateAdjustments" : {
+                                "businessDayConvention" : "NotApplicable",
+                                "meta" : {
+                                  "globalKey" : "3a4b88ab"
+                                }
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 3,
-                              "dayType" : "CURRENCY_BUSINESS",
-                              "businessCentersReference" : {
-                                "externalReference" : "PrimaryBusinessCenter",
-                                "globalReference" : "27e4e9"
+                              "meta" : {
+                                "globalKey" : "e80e5233"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "e80e5233",
+                              "externalKey" : "InterimValuationDate"
+                            }
+                          },
+                          "valuationTimeType" : "Close",
+                          "meta" : {
+                            "globalKey" : "374dddc6"
+                          }
+                        },
+                        "valuationDatesFinal" : {
+                          "determinationMethod" : "HedgeExecution",
+                          "valuationDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2002-09-24",
+                              "dateAdjustments" : {
+                                "businessDayConvention" : "NotApplicable",
+                                "meta" : {
+                                  "globalKey" : "3a4b88ab"
+                                }
                               },
-                              "businessDayConvention" : "FOLLOWING",
-                              "dateRelativeTo" : {
-                                "externalReference" : "FinalValuationDate",
-                                "globalReference" : "252ee503"
+                              "meta" : {
+                                "globalKey" : "252ee503"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "252ee503",
+                              "externalKey" : "FinalValuationDate"
                             }
                           },
+                          "meta" : {
+                            "globalKey" : "96fa6685"
+                          }
+                        }
+                      },
+                      "paymentDates" : {
+                        "paymentDateSchedule" : {
                           "interimPaymentDates" : [ {
-                            "meta" : {
-                              "externalKey" : "InterimEquityPaymentDate",
-                              "globalKey" : "2519d1b6"
-                            },
                             "relativeDates" : {
+                              "periodMultiplier" : 3,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "2519d1b6"
+                                "globalKey" : "dfe60714"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 3,
-                              "dayType" : "CURRENCY_BUSINESS",
+                              "dayType" : "CurrencyBusiness",
+                              "businessDayConvention" : "FOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "USNY"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "PrimaryBusinessCenter",
-                                  "globalKey" : "27e4e9"
+                                  "globalKey" : "27e4e9",
+                                  "externalKey" : "PrimaryBusinessCenter"
                                 }
                               },
-                              "businessDayConvention" : "FOLLOWING",
                               "dateRelativeTo" : {
-                                "externalReference" : "InterimValuationDate",
-                                "globalReference" : "e80e5233"
+                                "globalReference" : "e80e5233",
+                                "externalReference" : "InterimValuationDate"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "dfe60714",
+                              "externalKey" : "InterimEquityPaymentDate"
                             }
-                          } ]
-                        }
-                      },
-                      "returnTerms" : {
-                        "dividendReturnTerms" : {
-                          "dividendCurrency" : {
-                            "determinationMethod" : "DIVIDEND_CURRENCY"
-                          },
-                          "dividendEntitlement" : "EX_DATE",
-                          "dividendPayoutRatio" : [ {
-                            "totalRatio" : 1
                           } ],
-                          "dividendPeriod" : [ {
-                            "dividendPaymentDate" : {
-                              "dividendDateReference" : {
-                                "dateReference" : "EQUITY_PAYMENT_DATE"
-                              }
-                            },
-                            "endDate" : {
-                              "dividendDate" : {
-                                "externalReference" : "TerminationDate",
-                                "globalReference" : "f18f7c48"
+                          "finalPaymentDate" : {
+                            "relativeDate" : {
+                              "periodMultiplier" : 3,
+                              "period" : "D",
+                              "meta" : {
+                                "globalKey" : "bee88507"
+                              },
+                              "dayType" : "CurrencyBusiness",
+                              "businessDayConvention" : "FOLLOWING",
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "PrimaryBusinessCenter"
+                              },
+                              "dateRelativeTo" : {
+                                "globalReference" : "252ee503",
+                                "externalReference" : "FinalValuationDate"
                               }
                             },
-                            "startDate" : {
-                              "dividendDate" : {
-                                "externalReference" : "TradeDate",
-                                "globalReference" : "3e8a58"
-                              }
+                            "meta" : {
+                              "globalKey" : "bee88507",
+                              "externalKey" : "FinalEquityPaymentDate"
                             }
-                          } ],
-                          "dividendReinvestment" : false,
-                          "excessDividendAmount" : "RECORD_AMOUNT",
-                          "extraordinaryDividendsParty" : "EXTRAORDINARY_DIVIDENDS_PARTY"
+                          }
                         },
-                        "priceReturnTerms" : {
-                          "returnType" : "TOTAL"
+                        "meta" : {
+                          "globalKey" : "1a999e73",
+                          "externalKey" : "EquityPaymentDate"
                         }
                       },
                       "underlier" : {
-                        "meta" : {
-                          "globalKey" : "7a5b92c5"
-                        },
                         "security" : {
                           "productIdentifier" : [ {
                             "address" : {
@@ -446,469 +435,407 @@
                               "value" : "productIdentifier-2"
                             }
                           } ],
-                          "securityType" : "EQUITY"
+                          "securityType" : "Equity"
+                        },
+                        "meta" : {
+                          "globalKey" : "7a5b92c5"
                         }
                       },
-                      "valuationDates" : {
-                        "valuationDatesFinal" : {
-                          "determinationMethod" : "HEDGE_EXECUTION",
-                          "meta" : {
-                            "globalKey" : "96fa6685"
-                          },
-                          "valuationDate" : {
-                            "adjustableDate" : {
-                              "dateAdjustments" : {
-                                "businessDayConvention" : "NOT_APPLICABLE",
-                                "meta" : {
-                                  "globalKey" : "3a4b88ab"
-                                }
-                              },
-                              "meta" : {
-                                "globalKey" : "252ee503"
-                              },
-                              "unadjustedDate" : "2002-09-24"
-                            },
-                            "meta" : {
-                              "externalKey" : "FinalValuationDate",
-                              "globalKey" : "252ee503"
-                            }
-                          }
+                      "returnTerms" : {
+                        "priceReturnTerms" : {
+                          "returnType" : "Total"
                         },
-                        "valuationDatesInterim" : {
-                          "determinationMethod" : "VALUATION_TIME",
-                          "meta" : {
-                            "globalKey" : "374dddc6"
+                        "dividendReturnTerms" : {
+                          "dividendPayoutRatio" : [ {
+                            "totalRatio" : 1
+                          } ],
+                          "dividendReinvestment" : false,
+                          "dividendEntitlement" : "ExDate",
+                          "extraordinaryDividendsParty" : "ExtraordinaryDividendsParty",
+                          "excessDividendAmount" : "RecordAmount",
+                          "dividendCurrency" : {
+                            "determinationMethod" : "DividendCurrency"
                           },
-                          "valuationDates" : {
-                            "adjustableDates" : {
-                              "dateAdjustments" : {
-                                "businessDayConvention" : "NOT_APPLICABLE",
-                                "meta" : {
-                                  "globalKey" : "3a4b88ab"
-                                }
-                              },
-                              "meta" : {
-                                "globalKey" : "e80e5233"
-                              },
-                              "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ]
+                          "dividendPeriod" : [ {
+                            "startDate" : {
+                              "dividendDate" : {
+                                "globalReference" : "3e8a58",
+                                "externalReference" : "TradeDate"
+                              }
                             },
-                            "meta" : {
-                              "externalKey" : "InterimValuationDate",
-                              "globalKey" : "e80e5233"
+                            "endDate" : {
+                              "dividendDate" : {
+                                "globalReference" : "edf02740",
+                                "externalReference" : "TerminationDate"
+                              }
+                            },
+                            "dividendPaymentDate" : {
+                              "dividendDateReference" : {
+                                "dateReference" : "EquityPaymentDate"
+                              }
                             }
-                          },
-                          "valuationTimeType" : "CLOSE"
+                          } ]
                         }
-                      }
-                    } ]
-                  },
-                  "terminationDate" : {
-                    "meta" : {
-                      "externalKey" : "TerminationDate",
-                      "globalKey" : "f18f7c48"
-                    },
-                    "relativeDate" : {
-                      "meta" : {
-                        "globalKey" : "f18f7c48"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
-                      "businessDayConvention" : "NOT_APPLICABLE",
-                      "dateRelativeTo" : {
-                        "externalReference" : "FinalEquityPaymentDate",
-                        "globalReference" : "86542f29"
+                      "meta" : {
+                        "globalKey" : "5d54351a"
                       }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "d204e9e8"
                     }
+                  },
+                  "extraordinaryEvents" : {
+                    "mergerEvents" : {
+                      "shareForShare" : "ModifiedCalculationAgent",
+                      "shareForOther" : "ModifiedCalculationAgent",
+                      "shareForCombined" : "ModifiedCalculationAgent"
+                    },
+                    "tenderOfferEvents" : {
+                      "shareForShare" : "ModifiedCalculationAgent",
+                      "shareForOther" : "ModifiedCalculationAgent",
+                      "shareForCombined" : "ModifiedCalculationAgent"
+                    },
+                    "compositionOfCombinedConsideration" : true,
+                    "additionalDisruptionEvents" : {
+                      "changeInLaw" : true,
+                      "failureToDeliver" : true,
+                      "insolvencyFiling" : false,
+                      "hedgingDisruption" : true,
+                      "increasedCostOfHedging" : false,
+                      "lossOfStockBorrow" : true,
+                      "increasedCostOfStockBorrow" : false,
+                      "determiningParty" : "DisruptionEventsDeterminingParty"
+                    },
+                    "representations" : {
+                      "nonReliance" : true,
+                      "agreementsRegardingHedging" : true,
+                      "additionalAcknowledgements" : true
+                    },
+                    "nationalizationOrInsolvency" : "CancellationAndPayment"
+                  },
+                  "calculationAgent" : {
+                    "calculationAgentParty" : "CalculationAgentIndependent"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "95be1b14"
+                  "globalKey" : "8b69cf3e"
                 }
               },
               "meta" : {
-                "globalKey" : "95be1b14"
+                "globalKey" : "8b69cf3e"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "417e440b"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "26bb033f"
-                  },
-                  "productIdentifier" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-1"
-                      } ]
-                    },
-                    "value" : {
-                      "identifier" : {
-                        "meta" : {
-                          "scheme" : "http://www.abc.com/instrumentId"
-                        },
-                        "value" : "SHPGY.O"
-                      },
-                      "meta" : {
-                        "globalKey" : "8c85a05e"
-                      },
-                      "source" : "OTHER"
-                    }
-                  }, {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-2"
-                      } ]
-                    },
-                    "value" : {
-                      "identifier" : {
-                        "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
-                      },
-                      "meta" : {
-                        "globalKey" : "5518dd"
-                      },
-                      "source" : "NAME"
-                    }
-                  } ]
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 37.44,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 37.44,
                     "perUnitOf" : {
-                      "financialUnit" : "SHARE"
+                      "financialUnit" : "Share"
                     },
-                    "priceType" : "ASSET_PRICE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "AssetPrice"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 760400,
                     "unit" : {
-                      "financialUnit" : "SHARE"
-                    },
-                    "value" : 760400
-                  }
-                }, {
+                      "financialUnit" : "Share"
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
+                      "value" : "quantity-2"
                     } ]
-                  },
+                  }
+                }, {
                   "value" : {
+                    "value" : 28469376,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
-                    },
-                    "value" : 28469376
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    } ]
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "7dd9ec3"
-                },
+                } ],
                 "observable" : {
-                  "meta" : {
-                    "globalKey" : "5f0c6d03"
-                  },
-                  "rateOption" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "SHPGY.O",
+                        "meta" : {
+                          "scheme" : "http://www.abc.com/instrumentId"
+                        }
+                      },
+                      "source" : "Other",
+                      "meta" : {
+                        "globalKey" : "8c85a05e"
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                        "value" : "productIdentifier-1"
                       } ]
-                    },
+                    }
+                  }, {
                     "value" : {
-                      "floatingRateIndex" : {
-                        "value" : "USD-LIBOR-BBA"
+                      "identifier" : {
+                        "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
                       },
-                      "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "954"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 1
+                      "source" : "Name",
+                      "meta" : {
+                        "globalKey" : "5518dd"
                       }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-2"
+                      } ]
                     }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "b0a564a1"
                   }
                 },
+                "meta" : {
+                  "globalKey" : "b4fad14b"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.002,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 0.002,
-                    "arithmeticOperator" : "ADD",
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
+                    "priceType" : "InterestRate",
+                    "arithmeticOperator" : "Add"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-2"
+                    } ]
+                  }
+                } ],
+                "observable" : {
+                  "rateOption" : {
+                    "value" : {
+                      "floatingRateIndex" : {
+                        "value" : "USD-LIBOR-BBA"
+                      },
+                      "indexTenor" : {
+                        "periodMultiplier" : 1,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "6c"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "82801f45"
                   }
-                } ]
+                },
+                "meta" : {
+                  "globalKey" : "95c8caad"
+                }
               } ]
-            } ]
-          },
-          "tradeDate" : {
-            "meta" : {
-              "externalKey" : "TradeDate",
-              "globalKey" : "3e8a58"
-            },
-            "value" : "2001-09-24"
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "33f59568",
+                "externalReference" : "party2"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "33f59567",
+                "externalReference" : "party1"
+              }
+            } ],
+            "ancillaryParty" : [ {
+              "role" : "DisruptionEventsDeterminingParty",
+              "partyReference" : [ {
+                "globalReference" : "33f59567",
+                "externalReference" : "party1"
+              } ]
+            }, {
+              "role" : "ExtraordinaryDividendsParty",
+              "partyReference" : [ {
+                "globalReference" : "33f59567",
+                "externalReference" : "party1"
+              } ]
+            }, {
+              "role" : "CalculationAgentIndependent",
+              "partyReference" : [ {
+                "globalReference" : "33f59567",
+                "externalReference" : "party1"
+              } ]
+            } ],
+            "adjustment" : "Execution"
           },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "Party A",
                 "meta" : {
-                  "scheme" : "http://www.partyA.com/eqs-trade-id"
-                },
-                "value" : "6234"
+                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+                }
+              },
+              "meta" : {
+                "globalKey" : "33f59567"
               }
             } ],
-            "issuerReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "33f59567"
-            },
             "meta" : {
-              "globalKey" : "3b465e4f"
+              "globalKey" : "33f59567",
+              "externalKey" : "party1"
             }
           }, {
-            "assignedIdentifier" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "Party B",
                 "meta" : {
-                  "scheme" : "http://www.partyB.com/eqs-trade-id"
-                },
-                "value" : "6569"
+                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+                }
+              },
+              "meta" : {
+                "globalKey" : "33f59568"
               }
             } ],
-            "issuerReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "33f59568"
-            },
             "meta" : {
-              "globalKey" : "384471b6"
-            }
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "quantityChange" : {
-        "change" : [ {
-          "meta" : {
-            "globalKey" : "abe8ee3"
-          },
-          "quantity" : [ {
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 760400
-            }
-          }, {
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 28469376
+              "globalKey" : "33f59568",
+              "externalKey" : "party2"
             }
-          } ]
-        } ],
-        "direction" : "DECREASE"
-      },
-      "transfer" : {
-        "transferState" : [ {
-          "meta" : {
-            "globalKey" : "15235c62"
-          },
-          "transfer" : {
-            "payerReceiver" : {
-              "payerPartyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "33f59568"
+          } ],
+          "contractDetails" : {
+            "documentation" : [ {
+              "legalAgreementIdentification" : {
+                "agreementName" : {
+                  "agreementType" : "MasterAgreement",
+                  "masterAgreementType" : {
+                    "value" : "ISDAMaster"
+                  }
+                },
+                "vintage" : 2002
               },
-              "receiverPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "33f59567"
+              "meta" : {
+                "globalKey" : "328cfa59"
               }
-            },
-            "quantity" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
+            }, {
+              "legalAgreementIdentification" : {
+                "agreementName" : {
+                  "agreementType" : "Confirmation",
+                  "contractualDefinitionsType" : [ {
+                    "value" : "ISDA2000"
+                  }, {
+                    "value" : "ISDA2002Equity"
+                  } ]
                 }
               },
-              "value" : 2000
-            },
-            "settlementDate" : {
-              "adjustedDate" : {
-                "meta" : {
-                  "globalKey" : "3e8a58"
-                },
-                "value" : "2001-09-24"
+              "meta" : {
+                "globalKey" : "ed9ef3fc"
               }
+            } ],
+            "governingLaw" : {
+              "value" : "GBEN"
             },
-            "transferExpression" : {
-              "priceTransfer" : "TERMINATION"
+            "meta" : {
+              "globalKey" : "92c7c587"
             }
+          },
+          "meta" : {
+            "globalKey" : "6fd3bec7"
           }
-        } ]
+        },
+        "meta" : {
+          "globalKey" : "6fd3bec7"
+        }
       }
     }
   } ],
+  "eventQualifier" : "Termination",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "57adcbb8"
-    },
-    "state" : {
-      "closedState" : {
-        "state" : "TERMINATED"
-      },
-      "positionState" : "CLOSED"
-    },
     "trade" : {
-      "contractDetails" : {
-        "documentation" : [ {
-          "legalAgreementIdentification" : {
-            "agreementName" : {
-              "agreementType" : "MASTER_AGREEMENT",
-              "masterAgreementType" : {
-                "value" : "ISDA_MASTER"
-              }
-            },
-            "vintage" : 2002
-          },
-          "meta" : {
-            "globalKey" : "328cfa59"
-          }
-        }, {
-          "legalAgreementIdentification" : {
-            "agreementName" : {
-              "agreementType" : "CONFIRMATION",
-              "contractualDefinitionsType" : [ {
-                "value" : "ISDA2000"
-              }, {
-                "value" : "ISDA_2002_EQUITY"
-              } ]
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        },
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "6234",
+            "meta" : {
+              "scheme" : "http://www.partyA.com/eqs-trade-id"
             }
-          },
-          "meta" : {
-            "globalKey" : "ed9ef3fc"
           }
         } ],
-        "governingLaw" : {
-          "value" : "GBEN"
-        },
         "meta" : {
-          "globalKey" : "92c7c587"
+          "globalKey" : "c921d6eb"
         }
-      },
-      "meta" : {
-        "globalKey" : "279301b"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "33f59567"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-            },
-            "value" : "Party A"
-          },
-          "meta" : {
-            "globalKey" : "33f59567"
-          }
-        } ]
       }, {
-        "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "33f59568"
+        "issuerReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "6569",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-            },
-            "value" : "Party B"
-          },
-          "meta" : {
-            "globalKey" : "33f59568"
+              "scheme" : "http://www.partyB.com/eqs-trade-id"
+            }
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "310383ce"
+        }
       } ],
+      "tradeDate" : {
+        "value" : "2001-09-24",
+        "meta" : {
+          "globalKey" : "3e8a58",
+          "externalKey" : "TradeDate"
+        }
+      },
       "tradableProduct" : {
-        "adjustment" : "EXECUTION",
-        "ancillaryParty" : [ {
-          "partyReference" : [ {
-            "externalReference" : "party1",
-            "globalReference" : "33f59567"
-          } ],
-          "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-        }, {
-          "partyReference" : [ {
-            "externalReference" : "party1",
-            "globalReference" : "33f59567"
-          } ],
-          "role" : "EXTRAORDINARY_DIVIDENDS_PARTY"
-        }, {
-          "partyReference" : [ {
-            "externalReference" : "party1",
-            "globalReference" : "33f59567"
-          } ],
-          "role" : "CALCULATION_AGENT_INDEPENDENT"
-        } ],
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "33f59568"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "33f59567"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
-              "source" : "OTHER",
+              "source" : "Other",
               "value" : {
                 "name" : {
                   "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleName"
@@ -919,154 +846,66 @@
               "productQualifier" : "EquitySwap_TotalReturnBasicPerformance_SingleName"
             } ],
             "economicTerms" : {
-              "calculationAgent" : {
-                "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-              },
               "effectiveDate" : {
-                "meta" : {
-                  "externalKey" : "EffectiveDate",
-                  "globalKey" : "dbcf5078"
-                },
                 "relativeDate" : {
+                  "periodMultiplier" : 3,
+                  "period" : "D",
                   "meta" : {
-                    "globalKey" : "dbcf5078"
+                    "globalKey" : "a2cb5f8a"
                   },
-                  "period" : "D",
-                  "periodMultiplier" : 3,
-                  "dayType" : "EXCHANGE_BUSINESS",
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "dayType" : "ExchangeBusiness",
+                  "businessDayConvention" : "NotApplicable",
                   "dateRelativeTo" : {
-                    "externalReference" : "TradeDate",
-                    "globalReference" : "3e8a58"
+                    "globalReference" : "3e8a58",
+                    "externalReference" : "TradeDate"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "a2cb5f8a",
+                  "externalKey" : "EffectiveDate"
                 }
               },
-              "extraordinaryEvents" : {
-                "additionalDisruptionEvents" : {
-                  "changeInLaw" : true,
-                  "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                  "failureToDeliver" : true,
-                  "hedgingDisruption" : true,
-                  "increasedCostOfHedging" : false,
-                  "increasedCostOfStockBorrow" : false,
-                  "insolvencyFiling" : false,
-                  "lossOfStockBorrow" : true
-                },
-                "compositionOfCombinedConsideration" : true,
-                "mergerEvents" : {
-                  "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                  "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                  "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-                },
-                "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-                "representations" : {
-                  "additionalAcknowledgements" : true,
-                  "agreementsRegardingHedging" : true,
-                  "nonReliance" : true
+              "terminationDate" : {
+                "relativeDate" : {
+                  "periodMultiplier" : 0,
+                  "period" : "D",
+                  "meta" : {
+                    "globalKey" : "edf02740"
+                  },
+                  "businessDayConvention" : "NotApplicable",
+                  "dateRelativeTo" : {
+                    "globalReference" : "bee88507",
+                    "externalReference" : "FinalEquityPaymentDate"
+                  }
                 },
-                "tenderOfferEvents" : {
-                  "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                  "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                  "shareForShare" : "MODIFIED_CALCULATION_AGENT"
+                "meta" : {
+                  "globalKey" : "edf02740",
+                  "externalKey" : "TerminationDate"
                 }
               },
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "2fdf0b8c"
-                    },
-                    "quantityReference" : {
-                      "externalReference" : "EquityNotionalAmount",
-                      "globalReference" : "4cf"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
-                    }
-                  },
-                  "calculationPeriodDates" : {
-                    "effectiveDate" : {
-                      "meta" : {
-                        "globalKey" : "dbcf5078"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "dbcf5078"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "EXCHANGE_BUSINESS",
-                        "businessDayConvention" : "NOT_APPLICABLE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "TradeDate",
-                          "globalReference" : "3e8a58"
-                        }
-                      }
                     },
-                    "meta" : {
-                      "externalKey" : "InterestLegPeriodDates",
-                      "globalKey" : "e7334d0"
+                    "quantityReference" : {
+                      "globalReference" : "4cf",
+                      "externalReference" : "EquityNotionalAmount"
                     },
-                    "terminationDate" : {
-                      "meta" : {
-                        "globalKey" : "f18f7c48"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "f18f7c48"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessDayConvention" : "NOT_APPLICABLE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "FinalEquityPaymentDate",
-                          "globalReference" : "86542f29"
-                        }
-                      }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "8306e5d6"
-                  },
-                  "paymentDates" : {
                     "meta" : {
-                      "globalKey" : "9b9d36de"
-                    },
-                    "paymentDateSchedule" : {
-                      "interimPaymentDates" : [ {
-                        "meta" : {
-                          "globalKey" : "9b9d36de"
-                        },
-                        "relativeDates" : {
-                          "meta" : {
-                            "globalKey" : "9b9d36de"
-                          },
-                          "period" : "D",
-                          "periodMultiplier" : 0,
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "dateRelativeTo" : {
-                            "externalReference" : "EquityPaymentDate",
-                            "globalReference" : "fb15beed"
-                          }
-                        }
-                      } ]
+                      "globalKey" : "2fdf0b8c"
                     }
                   },
                   "rateSpecification" : {
                     "floatingRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "rateOption" : {
                         "address" : {
                           "scope" : "DOCUMENT",
@@ -1080,152 +919,232 @@
                             "value" : "price-2"
                           }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
+                    "effectiveDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "a2cb5f8a"
+                        },
+                        "dayType" : "ExchangeBusiness",
+                        "businessDayConvention" : "NotApplicable",
+                        "dateRelativeTo" : {
+                          "globalReference" : "3e8a58",
+                          "externalReference" : "TradeDate"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "a2cb5f8a"
+                      }
+                    },
+                    "terminationDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "edf02740"
+                        },
+                        "businessDayConvention" : "NotApplicable",
+                        "dateRelativeTo" : {
+                          "globalReference" : "bee88507",
+                          "externalReference" : "FinalEquityPaymentDate"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "edf02740"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "2fce1876",
+                      "externalKey" : "InterestLegPeriodDates"
+                    }
+                  },
+                  "paymentDates" : {
+                    "paymentDateSchedule" : {
+                      "interimPaymentDates" : [ {
+                        "relativeDates" : {
+                          "periodMultiplier" : 0,
+                          "period" : "D",
+                          "meta" : {
+                            "globalKey" : "97fde1d6"
+                          },
+                          "businessDayConvention" : "NotApplicable",
+                          "dateRelativeTo" : {
+                            "globalReference" : "1a999e73",
+                            "externalReference" : "EquityPaymentDate"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "97fde1d6"
+                        }
+                      } ]
+                    },
+                    "meta" : {
+                      "globalKey" : "97fde1d6"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "InterestLegPeriodDates",
-                      "globalReference" : "e7334d0"
+                      "globalReference" : "2fce1876",
+                      "externalReference" : "InterestLegPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "meta" : {
-                      "globalKey" : "9ab7a6fd"
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                      "globalKey" : "bc128aa3"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3cd0e14e"
                   }
                 } ],
-                "meta" : {
-                  "globalKey" : "3d9bbe0"
-                },
                 "performancePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "externalKey" : "EquityNotionalAmount",
-                      "globalKey" : "4cf"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
                     },
-                    "reset" : true
+                    "reset" : true,
+                    "meta" : {
+                      "globalKey" : "4cf",
+                      "externalKey" : "EquityNotionalAmount"
+                    }
                   },
                   "settlementTerms" : {
-                    "meta" : {
-                      "globalKey" : "7610bbd9"
-                    },
+                    "settlementType" : "Cash",
                     "settlementCurrency" : {
                       "value" : "USD"
                     },
-                    "settlementType" : "CASH"
-                  },
-                  "meta" : {
-                    "globalKey" : "bd1fe08a"
-                  },
-                  "paymentDates" : {
                     "meta" : {
-                      "externalKey" : "EquityPaymentDate",
-                      "globalKey" : "fb15beed"
-                    },
-                    "paymentDateSchedule" : {
-                      "finalPaymentDate" : {
-                        "meta" : {
-                          "externalKey" : "FinalEquityPaymentDate",
-                          "globalKey" : "86542f29"
-                        },
-                        "relativeDate" : {
-                          "meta" : {
-                            "globalKey" : "86542f29"
+                      "globalKey" : "7610bbd9"
+                    }
+                  },
+                  "valuationDates" : {
+                    "valuationDatesInterim" : {
+                      "determinationMethod" : "ValuationTime",
+                      "valuationDates" : {
+                        "adjustableDates" : {
+                          "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ],
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NotApplicable",
+                            "meta" : {
+                              "globalKey" : "3a4b88ab"
+                            }
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 3,
-                          "dayType" : "CURRENCY_BUSINESS",
-                          "businessCentersReference" : {
-                            "externalReference" : "PrimaryBusinessCenter",
-                            "globalReference" : "27e4e9"
+                          "meta" : {
+                            "globalKey" : "e80e5233"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "e80e5233",
+                          "externalKey" : "InterimValuationDate"
+                        }
+                      },
+                      "valuationTimeType" : "Close",
+                      "meta" : {
+                        "globalKey" : "374dddc6"
+                      }
+                    },
+                    "valuationDatesFinal" : {
+                      "determinationMethod" : "HedgeExecution",
+                      "valuationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2002-09-24",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NotApplicable",
+                            "meta" : {
+                              "globalKey" : "3a4b88ab"
+                            }
                           },
-                          "businessDayConvention" : "FOLLOWING",
-                          "dateRelativeTo" : {
-                            "externalReference" : "FinalValuationDate",
-                            "globalReference" : "252ee503"
+                          "meta" : {
+                            "globalKey" : "252ee503"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "252ee503",
+                          "externalKey" : "FinalValuationDate"
                         }
                       },
+                      "meta" : {
+                        "globalKey" : "96fa6685"
+                      }
+                    }
+                  },
+                  "paymentDates" : {
+                    "paymentDateSchedule" : {
                       "interimPaymentDates" : [ {
-                        "meta" : {
-                          "externalKey" : "InterimEquityPaymentDate",
-                          "globalKey" : "2519d1b6"
-                        },
                         "relativeDates" : {
+                          "periodMultiplier" : 3,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "2519d1b6"
+                            "globalKey" : "dfe60714"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 3,
-                          "dayType" : "CURRENCY_BUSINESS",
+                          "dayType" : "CurrencyBusiness",
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "USNY"
                             } ],
                             "meta" : {
-                              "externalKey" : "PrimaryBusinessCenter",
-                              "globalKey" : "27e4e9"
+                              "globalKey" : "27e4e9",
+                              "externalKey" : "PrimaryBusinessCenter"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "dateRelativeTo" : {
-                            "externalReference" : "InterimValuationDate",
-                            "globalReference" : "e80e5233"
+                            "globalReference" : "e80e5233",
+                            "externalReference" : "InterimValuationDate"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "dfe60714",
+                          "externalKey" : "InterimEquityPaymentDate"
                         }
-                      } ]
-                    }
-                  },
-                  "returnTerms" : {
-                    "dividendReturnTerms" : {
-                      "dividendCurrency" : {
-                        "determinationMethod" : "DIVIDEND_CURRENCY"
-                      },
-                      "dividendEntitlement" : "EX_DATE",
-                      "dividendPayoutRatio" : [ {
-                        "totalRatio" : 1
                       } ],
-                      "dividendPeriod" : [ {
-                        "dividendPaymentDate" : {
-                          "dividendDateReference" : {
-                            "dateReference" : "EQUITY_PAYMENT_DATE"
-                          }
-                        },
-                        "endDate" : {
-                          "dividendDate" : {
-                            "externalReference" : "TerminationDate",
-                            "globalReference" : "f18f7c48"
+                      "finalPaymentDate" : {
+                        "relativeDate" : {
+                          "periodMultiplier" : 3,
+                          "period" : "D",
+                          "meta" : {
+                            "globalKey" : "bee88507"
+                          },
+                          "dayType" : "CurrencyBusiness",
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCentersReference" : {
+                            "globalReference" : "27e4e9",
+                            "externalReference" : "PrimaryBusinessCenter"
+                          },
+                          "dateRelativeTo" : {
+                            "globalReference" : "252ee503",
+                            "externalReference" : "FinalValuationDate"
                           }
                         },
-                        "startDate" : {
-                          "dividendDate" : {
-                            "externalReference" : "TradeDate",
-                            "globalReference" : "3e8a58"
-                          }
+                        "meta" : {
+                          "globalKey" : "bee88507",
+                          "externalKey" : "FinalEquityPaymentDate"
                         }
-                      } ],
-                      "dividendReinvestment" : false,
-                      "excessDividendAmount" : "RECORD_AMOUNT",
-                      "extraordinaryDividendsParty" : "EXTRAORDINARY_DIVIDENDS_PARTY"
+                      }
                     },
-                    "priceReturnTerms" : {
-                      "returnType" : "TOTAL"
+                    "meta" : {
+                      "globalKey" : "1a999e73",
+                      "externalKey" : "EquityPaymentDate"
                     }
                   },
                   "underlier" : {
-                    "meta" : {
-                      "globalKey" : "7a5b92c5"
-                    },
                     "security" : {
                       "productIdentifier" : [ {
                         "address" : {
@@ -1238,319 +1157,400 @@
                           "value" : "productIdentifier-2"
                         }
                       } ],
-                      "securityType" : "EQUITY"
+                      "securityType" : "Equity"
+                    },
+                    "meta" : {
+                      "globalKey" : "7a5b92c5"
                     }
                   },
-                  "valuationDates" : {
-                    "valuationDatesFinal" : {
-                      "determinationMethod" : "HEDGE_EXECUTION",
-                      "meta" : {
-                        "globalKey" : "96fa6685"
-                      },
-                      "valuationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "meta" : {
-                              "globalKey" : "3a4b88ab"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "252ee503"
-                          },
-                          "unadjustedDate" : "2002-09-24"
-                        },
-                        "meta" : {
-                          "externalKey" : "FinalValuationDate",
-                          "globalKey" : "252ee503"
-                        }
-                      }
+                  "returnTerms" : {
+                    "priceReturnTerms" : {
+                      "returnType" : "Total"
                     },
-                    "valuationDatesInterim" : {
-                      "determinationMethod" : "VALUATION_TIME",
-                      "meta" : {
-                        "globalKey" : "374dddc6"
+                    "dividendReturnTerms" : {
+                      "dividendPayoutRatio" : [ {
+                        "totalRatio" : 1
+                      } ],
+                      "dividendReinvestment" : false,
+                      "dividendEntitlement" : "ExDate",
+                      "extraordinaryDividendsParty" : "ExtraordinaryDividendsParty",
+                      "excessDividendAmount" : "RecordAmount",
+                      "dividendCurrency" : {
+                        "determinationMethod" : "DividendCurrency"
                       },
-                      "valuationDates" : {
-                        "adjustableDates" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "meta" : {
-                              "globalKey" : "3a4b88ab"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "e80e5233"
-                          },
-                          "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ]
+                      "dividendPeriod" : [ {
+                        "startDate" : {
+                          "dividendDate" : {
+                            "globalReference" : "3e8a58",
+                            "externalReference" : "TradeDate"
+                          }
                         },
-                        "meta" : {
-                          "externalKey" : "InterimValuationDate",
-                          "globalKey" : "e80e5233"
+                        "endDate" : {
+                          "dividendDate" : {
+                            "globalReference" : "edf02740",
+                            "externalReference" : "TerminationDate"
+                          }
+                        },
+                        "dividendPaymentDate" : {
+                          "dividendDateReference" : {
+                            "dateReference" : "EquityPaymentDate"
+                          }
                         }
-                      },
-                      "valuationTimeType" : "CLOSE"
+                      } ]
                     }
-                  }
-                } ]
-              },
-              "terminationDate" : {
-                "meta" : {
-                  "externalKey" : "TerminationDate",
-                  "globalKey" : "f18f7c48"
-                },
-                "relativeDate" : {
-                  "meta" : {
-                    "globalKey" : "f18f7c48"
-                  },
-                  "period" : "D",
-                  "periodMultiplier" : 0,
-                  "businessDayConvention" : "NOT_APPLICABLE",
-                  "dateRelativeTo" : {
-                    "externalReference" : "FinalEquityPaymentDate",
-                    "globalReference" : "86542f29"
-                  }
-                }
-              }
-            },
-            "meta" : {
-              "globalKey" : "95be1b14"
-            }
-          },
-          "meta" : {
-            "globalKey" : "95be1b14"
-          }
-        },
-        "tradeLot" : [ {
-          "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "40364109"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "26bb033f"
-              },
-              "productIdentifier" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "productIdentifier-1"
-                  } ]
-                },
-                "value" : {
-                  "identifier" : {
-                    "meta" : {
-                      "scheme" : "http://www.abc.com/instrumentId"
-                    },
-                    "value" : "SHPGY.O"
-                  },
-                  "meta" : {
-                    "globalKey" : "8c85a05e"
-                  },
-                  "source" : "OTHER"
-                }
-              }, {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "productIdentifier-2"
-                  } ]
-                },
-                "value" : {
-                  "identifier" : {
-                    "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
-                  },
-                  "meta" : {
-                    "globalKey" : "5518dd"
                   },
-                  "source" : "NAME"
+                  "meta" : {
+                    "globalKey" : "5d54351a"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "d204e9e8"
                 }
-              } ]
+              },
+              "extraordinaryEvents" : {
+                "mergerEvents" : {
+                  "shareForShare" : "ModifiedCalculationAgent",
+                  "shareForOther" : "ModifiedCalculationAgent",
+                  "shareForCombined" : "ModifiedCalculationAgent"
+                },
+                "tenderOfferEvents" : {
+                  "shareForShare" : "ModifiedCalculationAgent",
+                  "shareForOther" : "ModifiedCalculationAgent",
+                  "shareForCombined" : "ModifiedCalculationAgent"
+                },
+                "compositionOfCombinedConsideration" : true,
+                "additionalDisruptionEvents" : {
+                  "changeInLaw" : true,
+                  "failureToDeliver" : true,
+                  "insolvencyFiling" : false,
+                  "hedgingDisruption" : true,
+                  "increasedCostOfHedging" : false,
+                  "lossOfStockBorrow" : true,
+                  "increasedCostOfStockBorrow" : false,
+                  "determiningParty" : "DisruptionEventsDeterminingParty"
+                },
+                "representations" : {
+                  "nonReliance" : true,
+                  "agreementsRegardingHedging" : true,
+                  "additionalAcknowledgements" : true
+                },
+                "nationalizationOrInsolvency" : "CancellationAndPayment"
+              },
+              "calculationAgent" : {
+                "calculationAgentParty" : "CalculationAgentIndependent"
+              }
             },
+            "meta" : {
+              "globalKey" : "8b69cf3e"
+            }
+          },
+          "meta" : {
+            "globalKey" : "8b69cf3e"
+          }
+        },
+        "tradeLot" : [ {
+          "priceQuantity" : [ {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 37.44,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 37.44,
                 "perUnitOf" : {
-                  "financialUnit" : "SHARE"
+                  "financialUnit" : "Share"
                 },
-                "priceType" : "ASSET_PRICE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "AssetPrice"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 0,
                 "unit" : {
-                  "financialUnit" : "SHARE"
-                },
-                "value" : 0
-              }
-            }, {
+                  "financialUnit" : "Share"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "quantity-2"
                 } ]
-              },
+              }
+            }, {
               "value" : {
+                "value" : 0,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 0
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "7dd9ec3"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "5f0c6d03"
-              },
-              "rateOption" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "SHPGY.O",
+                    "meta" : {
+                      "scheme" : "http://www.abc.com/instrumentId"
+                    }
+                  },
+                  "source" : "Other",
+                  "meta" : {
+                    "globalKey" : "8c85a05e"
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
+                    "value" : "productIdentifier-1"
                   } ]
-                },
+                }
+              }, {
                 "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "USD-LIBOR-BBA"
+                  "identifier" : {
+                    "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
                   },
-                  "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1
+                  "source" : "Name",
+                  "meta" : {
+                    "globalKey" : "5518dd"
                   }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "productIdentifier-2"
+                  } ]
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "b0a564a1"
               }
             },
+            "meta" : {
+              "globalKey" : "4bbd39c9"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-2"
-                } ]
-              },
               "value" : {
+                "value" : 0.002,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 0.002,
-                "arithmeticOperator" : "ADD",
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
+                "priceType" : "InterestRate",
+                "arithmeticOperator" : "Add"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-2"
+                } ]
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "USD-LIBOR-BBA"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "82801f45"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "95c8caad"
+            }
           } ]
-        } ]
-      },
-      "tradeDate" : {
-        "meta" : {
-          "externalKey" : "TradeDate",
-          "globalKey" : "3e8a58"
-        },
-        "value" : "2001-09-24"
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "33f59568",
+            "externalReference" : "party2"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "33f59567",
+            "externalReference" : "party1"
+          }
+        } ],
+        "ancillaryParty" : [ {
+          "role" : "DisruptionEventsDeterminingParty",
+          "partyReference" : [ {
+            "globalReference" : "33f59567",
+            "externalReference" : "party1"
+          } ]
+        }, {
+          "role" : "ExtraordinaryDividendsParty",
+          "partyReference" : [ {
+            "globalReference" : "33f59567",
+            "externalReference" : "party1"
+          } ]
+        }, {
+          "role" : "CalculationAgentIndependent",
+          "partyReference" : [ {
+            "globalReference" : "33f59567",
+            "externalReference" : "party1"
+          } ]
+        } ],
+        "adjustment" : "Execution"
       },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "Party A",
             "meta" : {
-              "scheme" : "http://www.partyA.com/eqs-trade-id"
-            },
-            "value" : "6234"
+              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+            }
+          },
+          "meta" : {
+            "globalKey" : "33f59567"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
         "meta" : {
-          "globalKey" : "3b465e4f"
+          "globalKey" : "33f59567",
+          "externalKey" : "party1"
         }
       }, {
-        "assignedIdentifier" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "Party B",
             "meta" : {
-              "scheme" : "http://www.partyB.com/eqs-trade-id"
+              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+            }
+          },
+          "meta" : {
+            "globalKey" : "33f59568"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "33f59568",
+          "externalKey" : "party2"
+        }
+      } ],
+      "contractDetails" : {
+        "documentation" : [ {
+          "legalAgreementIdentification" : {
+            "agreementName" : {
+              "agreementType" : "MasterAgreement",
+              "masterAgreementType" : {
+                "value" : "ISDAMaster"
+              }
             },
-            "value" : "6569"
+            "vintage" : 2002
+          },
+          "meta" : {
+            "globalKey" : "328cfa59"
+          }
+        }, {
+          "legalAgreementIdentification" : {
+            "agreementName" : {
+              "agreementType" : "Confirmation",
+              "contractualDefinitionsType" : [ {
+                "value" : "ISDA2000"
+              }, {
+                "value" : "ISDA2002Equity"
+              } ]
+            }
+          },
+          "meta" : {
+            "globalKey" : "ed9ef3fc"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
+        "governingLaw" : {
+          "value" : "GBEN"
         },
         "meta" : {
-          "globalKey" : "384471b6"
+          "globalKey" : "92c7c587"
         }
-      } ]
-    },
-    "transferHistory" : [ {
+      },
       "meta" : {
-        "globalKey" : "15235c62"
+        "globalKey" : "d8f19889"
+      }
+    },
+    "state" : {
+      "closedState" : {
+        "state" : "Terminated"
       },
+      "positionState" : "Closed"
+    },
+    "transferHistory" : [ {
       "transfer" : {
-        "payerReceiver" : {
-          "payerPartyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "33f59568"
-          },
-          "receiverPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "33f59567"
-          }
-        },
         "quantity" : {
+          "value" : 2000,
           "unit" : {
             "currency" : {
               "value" : "USD"
             }
+          }
+        },
+        "payerReceiver" : {
+          "payerPartyReference" : {
+            "globalReference" : "33f59568",
+            "externalReference" : "party2"
           },
-          "value" : 2000
+          "receiverPartyReference" : {
+            "globalReference" : "33f59567",
+            "externalReference" : "party1"
+          }
         },
         "settlementDate" : {
           "adjustedDate" : {
+            "value" : "2001-09-24",
             "meta" : {
               "globalKey" : "3e8a58"
-            },
-            "value" : "2001-09-24"
+            }
           }
         },
         "transferExpression" : {
-          "priceTransfer" : "TERMINATION"
+          "priceTransfer" : "Termination"
         }
+      },
+      "meta" : {
+        "globalKey" : "64b538a6"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "b1a7bd0e"
+    }
   } ],
-  "eventQualifier" : "Termination",
   "meta" : {
-    "globalKey" : "cba621ad"
+    "globalKey" : "754dab87"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/full-termination-vanilla-swap-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/full-termination-vanilla-swap-func-output.json
index a10aa0d004..8ea00a2cd2 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/full-termination-vanilla-swap-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/full-termination-vanilla-swap-func-output.json
@@ -1,151 +1,114 @@
 {
   "eventDate" : "2019-12-12",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "451ed355"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "451ed355"
-          },
-          "party" : [ {
-            "businessUnit" : [ {
-              "meta" : {
-                "externalKey" : "desk1",
-                "globalKey" : "5c10b72e"
-              },
-              "name" : "NY Swaps Desk"
-            } ],
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "4196529f"
-            },
-            "name" : {
-              "value" : "Bank X"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "5493001RKR55V4X61F71"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "d0f863bc"
-              }
-            }, {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI1RPT0001"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "b8962566"
+    "primitiveInstruction" : {
+      "quantityChange" : {
+        "change" : [ {
+          "quantity" : [ {
+            "value" : {
+              "value" : 10000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                  }
+                }
               }
-            } ],
-            "person" : [ {
-              "firstName" : "jjone",
-              "meta" : {
-                "externalKey" : "trader",
-                "globalKey" : "d3962233"
-              },
-              "personId" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "jjones"
-                  },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "21e8d415"
+          }
+        } ],
+        "direction" : "Decrease"
+      },
+      "transfer" : {
+        "transferState" : [ {
+          "transfer" : {
+            "quantity" : {
+              "value" : 2000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD",
                   "meta" : {
-                    "globalKey" : "baeb8c0d"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
                   }
                 }
-              } ]
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "a829283e"
+              }
             },
-            "name" : {
-              "value" : "Bank Y"
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "globalReference" : "9abf6e1f",
+                "externalReference" : "party1"
+              },
+              "receiverPartyReference" : {
+                "globalReference" : "d24c6fe",
+                "externalReference" : "party2"
+              }
             },
-            "partyId" : [ {
-              "identifier" : {
+            "settlementDate" : {
+              "adjustedDate" : {
+                "value" : "2018-04-01",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "549300O5MFEP1XJ40B46"
-              },
-              "identifierType" : "LEI",
+                  "globalKey" : "3f1101"
+                }
+              }
+            },
+            "transferExpression" : {
+              "priceTransfer" : "Termination"
+            }
+          },
+          "meta" : {
+            "globalKey" : "3e69c84e"
+          }
+        } ]
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "1031234567",
               "meta" : {
-                "globalKey" : "956c45f8"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
               }
-            }, {
+            },
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "LEI1RPT0001KKKK",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI2CP0002"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "eb8edea1"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                }
               }
-            } ]
-          } ],
-          "partyRole" : [ {
-            "ownershipPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "4196529f"
-            },
-            "partyReference" : {
-              "externalReference" : "clearing-svc",
-              "globalReference" : "611719a0"
-            },
-            "role" : "CLEARING_ORGANIZATION"
-          }, {
-            "ownershipPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "4196529f"
-            },
-            "partyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "4196529f"
+            } ],
+            "meta" : {
+              "globalKey" : "b0a21242"
             },
-            "role" : "REPORTING_PARTY"
+            "identifierType" : "UniqueTransactionIdentifier"
           } ],
+          "tradeDate" : {
+            "value" : "2018-04-01",
+            "meta" : {
+              "globalKey" : "3f1101"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "4196529f"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "a829283e"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
                   "primaryAssetClass" : {
-                    "value" : "INTEREST_RATE"
+                    "value" : "InterestRate"
                   }
                 }, {
                   "source" : "ISDA",
                   "value" : {
                     "name" : {
+                      "value" : "InterestRate:IRSwap:FixedFloat",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                      },
-                      "value" : "InterestRate:IRSwap:FixedFloat"
+                      }
                     }
                   }
                 }, {
@@ -156,46 +119,40 @@
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
-                            },
-                            "meta" : {
-                              "globalKey" : "da3ebeed"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7dfdd7c"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12d23"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3,
-                          "rollConvention" : "8"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2014-04-03",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -204,103 +161,108 @@
                             },
                             "meta" : {
                               "globalKey" : "ec6b637b"
-                            },
-                            "unadjustedDate" : "2014-04-03"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ec6b637b"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "floatingCalcPeriodDates",
-                          "globalKey" : "e799e95"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2025-04-01",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "USNY"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "primaryBusinessCenters",
-                                  "globalKey" : "27e4e9"
+                                  "globalKey" : "27e4e9",
+                                  "externalKey" : "primaryBusinessCenters"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "3662e8ba"
                               }
                             },
                             "meta" : {
                               "globalKey" : "18fe1859"
-                            },
-                            "unadjustedDate" : "2025-04-01"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "18fe1859"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "a7bf545b"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "27ad0640"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "956"
+                            "globalKey" : "204f"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                          "rollConvention" : "8"
+                        },
+                        "meta" : {
+                          "globalKey" : "5efe129f",
+                          "externalKey" : "floatingCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
+                            "globalKey" : "aa"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da3ebeed"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7dfdd7c"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "a88f300c"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "floatingCalcPeriodDates",
-                          "globalReference" : "e799e95"
+                          "globalReference" : "5efe129f",
+                          "externalReference" : "floatingCalcPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "131ae8a2"
+                            "globalKey" : "eff6d356"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -309,82 +271,79 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates",
-                            "globalReference" : "7c36d4c7"
+                            "globalReference" : "a7347195",
+                            "externalReference" : "resetDates"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates",
-                          "globalKey" : "7c36d4c7"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "a7347195",
+                          "externalKey" : "resetDates"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "f267267"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
-                            },
-                            "meta" : {
-                              "globalKey" : "da3ebeed"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7dfdd7c"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12d80"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6,
-                          "rollConvention" : "8"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "30E/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2018-04-03",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -393,454 +352,389 @@
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
-                            },
-                            "unadjustedDate" : "2018-04-03"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ece3837b"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "fixedCalcPeriodDates",
-                          "globalKey" : "399e1c1e"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2025-04-01",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "primaryBusinessCenters",
-                                  "globalReference" : "27e4e9"
+                                  "globalReference" : "27e4e9",
+                                  "externalReference" : "primaryBusinessCenters"
                                 },
                                 "meta" : {
                                   "globalKey" : "da3ebeed"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "b7dfdd7c"
                               }
                             },
                             "meta" : {
                               "globalKey" : "210a957d"
-                            },
-                            "unadjustedDate" : "2025-04-01"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "210a957d"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "30E/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "47969451"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "27ad0643"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "959"
+                            "globalKey" : "2b92"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 6
+                          "rollConvention" : "8"
+                        },
+                        "meta" : {
+                          "globalKey" : "a0e2ef30",
+                          "externalKey" : "fixedCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
+                            "globalKey" : "107"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da3ebeed"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7dfdd7c"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "856b8369"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "cbcd504f"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "cc1da016"
+                      "globalKey" : "2dcbba88"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "7ca24263"
+                  "globalKey" : "de505cd5"
                 }
               },
               "meta" : {
-                "globalKey" : "7ca24263"
+                "globalKey" : "de505cd5"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "e4dda770"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "5f0c6d05"
-                  },
-                  "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
-                    "value" : {
-                      "floatingRateIndex" : {
-                        "value" : "USD-LIBOR-BBA"
-                      },
-                      "indexTenor" : {
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 10000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD",
                         "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
+                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                        }
                       }
                     }
-                  }
-                },
-                "quantity" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
+                  }
+                } ],
+                "observable" : {
+                  "rateOption" : {
+                    "value" : {
+                      "floatingRateIndex" : {
+                        "value" : "USD-LIBOR-BBA"
+                      },
+                      "indexTenor" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
                         "meta" : {
-                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                          "globalKey" : "aa"
+                        }
                       }
                     },
-                    "value" : 10000
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "828026c7"
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "8532effc"
                 },
+                "meta" : {
+                  "globalKey" : "fd32a49c"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.0253,
                     "unit" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
                     },
-                    "value" : 0.0253,
                     "perUnitOf" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 10000,
                     "unit" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
-                    },
-                    "value" : 10000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "212b0f84"
+                }
               } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "9abf6e1f",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "d24c6fe",
+                "externalReference" : "party2"
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f1101"
-            },
-            "value" : "2018-04-01"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "5493001RKR55V4X61F71",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                },
-                "value" : "LEI1RPT0001KKKK"
-              }
-            } ],
-            "issuer" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
               },
-              "value" : "1031234567"
-            },
-            "meta" : {
-              "globalKey" : "f3079442"
-            },
-            "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "quantityChange" : {
-        "change" : [ {
-          "meta" : {
-            "globalKey" : "21e8d415"
-          },
-          "quantity" : [ {
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "d0f863bc"
+              }
+            }, {
+              "identifier" : {
+                "value" : "LEI1RPT0001",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                 }
               },
-              "value" : 10000
-            }
-          } ]
-        } ],
-        "direction" : "DECREASE"
-      },
-      "transfer" : {
-        "transferState" : [ {
-          "meta" : {
-            "globalKey" : "64bc47a"
-          },
-          "transfer" : {
-            "payerReceiver" : {
-              "payerPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "4196529f"
-              },
-              "receiverPartyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "a829283e"
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "b8962566"
               }
+            } ],
+            "name" : {
+              "value" : "Bank X"
             },
-            "quantity" : {
-              "unit" : {
-                "currency" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+            "businessUnit" : [ {
+              "name" : "NY Swaps Desk",
+              "meta" : {
+                "globalKey" : "5c10b72e",
+                "externalKey" : "desk1"
+              }
+            } ],
+            "person" : [ {
+              "personId" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "jjones"
                   },
-                  "value" : "USD"
+                  "meta" : {
+                    "globalKey" : "baeb8c0d"
+                  }
+                }
+              } ],
+              "firstName" : "jjone",
+              "meta" : {
+                "globalKey" : "d3962233",
+                "externalKey" : "trader"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "9abf6e1f",
+              "externalKey" : "party1"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "549300O5MFEP1XJ40B46",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                 }
               },
-              "value" : 2000
-            },
-            "settlementDate" : {
-              "adjustedDate" : {
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "956c45f8"
+              }
+            }, {
+              "identifier" : {
+                "value" : "LEI2CP0002",
                 "meta" : {
-                  "globalKey" : "3f1101"
-                },
-                "value" : "2018-04-01"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "eb8edea1"
               }
+            } ],
+            "name" : {
+              "value" : "Bank Y"
             },
-            "transferExpression" : {
-              "priceTransfer" : "TERMINATION"
+            "meta" : {
+              "globalKey" : "d24c6fe",
+              "externalKey" : "party2"
+            }
+          } ],
+          "partyRole" : [ {
+            "partyReference" : {
+              "globalReference" : "611719a0",
+              "externalReference" : "clearing-svc"
+            },
+            "role" : "ClearingOrganization",
+            "ownershipPartyReference" : {
+              "globalReference" : "9abf6e1f",
+              "externalReference" : "party1"
+            }
+          }, {
+            "partyReference" : {
+              "globalReference" : "9abf6e1f",
+              "externalReference" : "party1"
+            },
+            "role" : "ReportingParty",
+            "ownershipPartyReference" : {
+              "globalReference" : "9abf6e1f",
+              "externalReference" : "party1"
             }
+          } ],
+          "meta" : {
+            "globalKey" : "c88e9ca7"
           }
-        } ]
+        },
+        "meta" : {
+          "globalKey" : "c88e9ca7"
+        }
       }
     }
   } ],
+  "eventQualifier" : "Termination",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "6a9d016"
-    },
-    "state" : {
-      "closedState" : {
-        "state" : "TERMINATED"
-      },
-      "positionState" : "CLOSED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "e34cc513"
-      },
-      "party" : [ {
-        "businessUnit" : [ {
-          "meta" : {
-            "externalKey" : "desk1",
-            "globalKey" : "5c10b72e"
-          },
-          "name" : "NY Swaps Desk"
-        } ],
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "4196529f"
-        },
-        "name" : {
-          "value" : "Bank X"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "5493001RKR55V4X61F71"
-          },
-          "identifierType" : "LEI",
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "1031234567",
           "meta" : {
-            "globalKey" : "d0f863bc"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
           }
-        }, {
+        },
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "LEI1RPT0001KKKK",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI1RPT0001"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "b8962566"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+            }
           }
         } ],
-        "person" : [ {
-          "firstName" : "jjone",
-          "meta" : {
-            "externalKey" : "trader",
-            "globalKey" : "d3962233"
-          },
-          "personId" : [ {
-            "value" : {
-              "identifier" : {
-                "value" : "jjones"
-              },
-              "meta" : {
-                "globalKey" : "baeb8c0d"
-              }
-            }
-          } ]
-        } ]
-      }, {
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "a829283e"
-        },
-        "name" : {
-          "value" : "Bank Y"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300O5MFEP1XJ40B46"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "956c45f8"
-          }
-        }, {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI2CP0002"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "eb8edea1"
-          }
-        } ]
-      } ],
-      "partyRole" : [ {
-        "ownershipPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "4196529f"
-        },
-        "partyReference" : {
-          "externalReference" : "clearing-svc",
-          "globalReference" : "611719a0"
-        },
-        "role" : "CLEARING_ORGANIZATION"
-      }, {
-        "ownershipPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "4196529f"
-        },
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "4196529f"
+          "globalKey" : "b0a21242"
         },
-        "role" : "REPORTING_PARTY"
+        "identifierType" : "UniqueTransactionIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2018-04-01",
+        "meta" : {
+          "globalKey" : "3f1101"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "4196529f"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "a829283e"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
               "primaryAssetClass" : {
-                "value" : "INTEREST_RATE"
+                "value" : "InterestRate"
               }
             }, {
               "source" : "ISDA",
               "value" : {
                 "name" : {
+                  "value" : "InterestRate:IRSwap:FixedFloat",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                  },
-                  "value" : "InterestRate:IRSwap:FixedFloat"
+                  }
                 }
               }
             }, {
@@ -851,46 +745,40 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d23"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2014-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -899,103 +787,108 @@
                         },
                         "meta" : {
                           "globalKey" : "ec6b637b"
-                        },
-                        "unadjustedDate" : "2014-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ec6b637b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "e799e95"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2025-04-01",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "USNY"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "27e4e9"
+                              "globalKey" : "27e4e9",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "3662e8ba"
                           }
                         },
                         "meta" : {
                           "globalKey" : "18fe1859"
-                        },
-                        "unadjustedDate" : "2025-04-01"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "18fe1859"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "a7bf545b"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0640"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "956"
+                        "globalKey" : "204f"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "5efe129f",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "a88f300c"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "e799e95"
+                      "globalReference" : "5efe129f",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "131ae8a2"
+                        "globalKey" : "eff6d356"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -1004,82 +897,79 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates",
-                        "globalReference" : "7c36d4c7"
+                        "globalReference" : "a7347195",
+                        "externalReference" : "resetDates"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates",
-                      "globalKey" : "7c36d4c7"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "a7347195",
+                      "externalKey" : "resetDates"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "f267267"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d80"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30E/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -1088,279 +978,389 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "399e1c1e"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2025-04-01",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
                         "meta" : {
                           "globalKey" : "210a957d"
-                        },
-                        "unadjustedDate" : "2025-04-01"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "210a957d"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "30E/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "47969451"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0643"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "959"
+                        "globalKey" : "2b92"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 6
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "a0e2ef30",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
+                        "globalKey" : "107"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "856b8369"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "cbcd504f"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "cc1da016"
+                  "globalKey" : "2dcbba88"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "7ca24263"
+              "globalKey" : "de505cd5"
             }
           },
           "meta" : {
-            "globalKey" : "7ca24263"
+            "globalKey" : "de505cd5"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "c30bee91"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "5f0c6d05"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "USD-LIBOR-BBA"
-                  },
-                  "indexTenor" : {
+            "quantity" : [ {
+              "value" : {
+                "value" : 0,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD",
                     "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                    }
                   }
                 }
-              }
-            },
-            "quantity" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "USD-LIBOR-BBA"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                      "globalKey" : "aa"
+                    }
                   }
                 },
-                "value" : 0
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "828026c7"
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "6361371d"
             },
+            "meta" : {
+              "globalKey" : "18ef367d"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.0253,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "value" : 0.0253,
                 "perUnitOf" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 0,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
-                },
-                "value" : 0
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "8c5ac83"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "9abf6e1f",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "d24c6fe",
+            "externalReference" : "party2"
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f1101"
-        },
-        "value" : "2018-04-01"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "5493001RKR55V4X61F71",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-            },
-            "value" : "LEI1RPT0001KKKK"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "d0f863bc"
+          }
+        }, {
+          "identifier" : {
+            "value" : "LEI1RPT0001",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "b8962566"
           }
         } ],
-        "issuer" : {
+        "name" : {
+          "value" : "Bank X"
+        },
+        "businessUnit" : [ {
+          "name" : "NY Swaps Desk",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+            "globalKey" : "5c10b72e",
+            "externalKey" : "desk1"
+          }
+        } ],
+        "person" : [ {
+          "personId" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "jjones"
+              },
+              "meta" : {
+                "globalKey" : "baeb8c0d"
+              }
+            }
+          } ],
+          "firstName" : "jjone",
+          "meta" : {
+            "globalKey" : "d3962233",
+            "externalKey" : "trader"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "9abf6e1f",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "549300O5MFEP1XJ40B46",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
           },
-          "value" : "1031234567"
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "956c45f8"
+          }
+        }, {
+          "identifier" : {
+            "value" : "LEI2CP0002",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "eb8edea1"
+          }
+        } ],
+        "name" : {
+          "value" : "Bank Y"
         },
         "meta" : {
-          "globalKey" : "f3079442"
+          "globalKey" : "d24c6fe",
+          "externalKey" : "party2"
+        }
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "611719a0",
+          "externalReference" : "clearing-svc"
         },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
-    },
-    "transferHistory" : [ {
+        "role" : "ClearingOrganization",
+        "ownershipPartyReference" : {
+          "globalReference" : "9abf6e1f",
+          "externalReference" : "party1"
+        }
+      }, {
+        "partyReference" : {
+          "globalReference" : "9abf6e1f",
+          "externalReference" : "party1"
+        },
+        "role" : "ReportingParty",
+        "ownershipPartyReference" : {
+          "globalReference" : "9abf6e1f",
+          "externalReference" : "party1"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "64bc47a"
+        "globalKey" : "dedd7807"
+      }
+    },
+    "state" : {
+      "closedState" : {
+        "state" : "Terminated"
       },
+      "positionState" : "Closed"
+    },
+    "transferHistory" : [ {
       "transfer" : {
-        "payerReceiver" : {
-          "payerPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "4196529f"
-          },
-          "receiverPartyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "a829283e"
-          }
-        },
         "quantity" : {
+          "value" : 2000,
           "unit" : {
             "currency" : {
+              "value" : "USD",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-              },
-              "value" : "USD"
+              }
             }
+          }
+        },
+        "payerReceiver" : {
+          "payerPartyReference" : {
+            "globalReference" : "9abf6e1f",
+            "externalReference" : "party1"
           },
-          "value" : 2000
+          "receiverPartyReference" : {
+            "globalReference" : "d24c6fe",
+            "externalReference" : "party2"
+          }
         },
         "settlementDate" : {
           "adjustedDate" : {
+            "value" : "2018-04-01",
             "meta" : {
               "globalKey" : "3f1101"
-            },
-            "value" : "2018-04-01"
+            }
           }
         },
         "transferExpression" : {
-          "priceTransfer" : "TERMINATION"
+          "priceTransfer" : "Termination"
         }
+      },
+      "meta" : {
+        "globalKey" : "3e69c84e"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "f3b152f8"
+    }
   } ],
-  "eventQualifier" : "Termination",
   "meta" : {
-    "globalKey" : "fe0c7084"
+    "globalKey" : "c0de77ea"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/increase-equity-swap-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/increase-equity-swap-func-output.json
index bdebe4e579..3a0480272b 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/increase-equity-swap-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/increase-equity-swap-func-output.json
@@ -1,122 +1,239 @@
 {
   "eventDate" : "2021-11-11",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "47985124"
-        },
-        "trade" : {
-          "contractDetails" : {
-            "documentation" : [ {
-              "legalAgreementIdentification" : {
-                "agreementName" : {
-                  "agreementType" : "MASTER_AGREEMENT",
-                  "masterAgreementType" : {
-                    "value" : "ISDA_MASTER"
+    "primitiveInstruction" : {
+      "quantityChange" : {
+        "change" : [ {
+          "price" : [ {
+            "value" : {
+              "value" : 30,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              },
+              "perUnitOf" : {
+                "financialUnit" : "Share"
+              },
+              "priceType" : "AssetPrice"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 250000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "SHPGY.O",
+                  "meta" : {
+                    "scheme" : "http://www.abc.com/instrumentId"
                   }
                 },
-                "vintage" : 2002
+                "source" : "Other",
+                "meta" : {
+                  "globalKey" : "8c85a05e"
+                }
               },
               "meta" : {
-                "globalKey" : "328cfa59"
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
               }
-            }, {
-              "legalAgreementIdentification" : {
-                "agreementName" : {
-                  "agreementType" : "CONFIRMATION",
-                  "contractualDefinitionsType" : [ {
-                    "value" : "ISDA2000"
-                  }, {
-                    "value" : "ISDA_2002_EQUITY"
-                  } ]
+            } ],
+            "meta" : {
+              "globalKey" : "42e6b62"
+            }
+          },
+          "meta" : {
+            "globalKey" : "aa7176d4"
+          }
+        }, {
+          "price" : [ {
+            "value" : {
+              "value" : 0.002,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              },
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 7500000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 1,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
                 }
               },
               "meta" : {
-                "globalKey" : "ed9ef3fc"
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            } ],
-            "governingLaw" : {
-              "value" : "GBEN"
             },
             "meta" : {
-              "globalKey" : "92c7c587"
+              "globalKey" : "82801f45"
             }
           },
           "meta" : {
-            "globalKey" : "47985124"
+            "globalKey" : "58d735f1"
+          }
+        } ],
+        "direction" : "Increase",
+        "lotIdentifier" : [ {
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "LOT-2"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "4542496"
+          }
+        } ]
+      },
+      "transfer" : {
+        "transferState" : [ {
+          "transfer" : {
+            "quantity" : {
+              "value" : 2000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "globalReference" : "33f59568",
+                "externalReference" : "party2"
+              },
+              "receiverPartyReference" : {
+                "globalReference" : "33f59567",
+                "externalReference" : "party1"
+              }
+            },
+            "settlementDate" : {
+              "adjustedDate" : {
+                "value" : "2001-09-24",
+                "meta" : {
+                  "globalKey" : "3e8a58"
+                }
+              }
+            },
+            "transferExpression" : {
+              "priceTransfer" : "Increase"
+            }
           },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "33f59567"
+          "meta" : {
+            "globalKey" : "8b114c04"
+          }
+        } ]
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuerReference" : {
+              "globalReference" : "33f59567",
+              "externalReference" : "party1"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "6234",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-                },
-                "value" : "Party A"
-              },
-              "meta" : {
-                "globalKey" : "33f59567"
+                  "scheme" : "http://www.partyA.com/eqs-trade-id"
+                }
               }
-            } ]
-          }, {
+            } ],
             "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "33f59568"
+              "globalKey" : "c921d6eb"
+            }
+          }, {
+            "issuerReference" : {
+              "globalReference" : "33f59568",
+              "externalReference" : "party2"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "6569",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-                },
-                "value" : "Party B"
-              },
-              "meta" : {
-                "globalKey" : "33f59568"
+                  "scheme" : "http://www.partyB.com/eqs-trade-id"
+                }
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "310383ce"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "2001-09-24",
+            "meta" : {
+              "globalKey" : "3e8a58",
+              "externalKey" : "TradeDate"
+            }
+          },
           "tradableProduct" : {
-            "adjustment" : "EXECUTION",
-            "ancillaryParty" : [ {
-              "partyReference" : [ {
-                "externalReference" : "party1",
-                "globalReference" : "33f59567"
-              } ],
-              "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-            }, {
-              "partyReference" : [ {
-                "externalReference" : "party1",
-                "globalReference" : "33f59567"
-              } ],
-              "role" : "EXTRAORDINARY_DIVIDENDS_PARTY"
-            }, {
-              "partyReference" : [ {
-                "externalReference" : "party1",
-                "globalReference" : "33f59567"
-              } ],
-              "role" : "CALCULATION_AGENT_INDEPENDENT"
-            } ],
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "33f59568"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "33f59567"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
-                  "source" : "OTHER",
+                  "source" : "Other",
                   "value" : {
                     "name" : {
                       "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleName"
@@ -127,313 +244,305 @@
                   "productQualifier" : "EquitySwap_TotalReturnBasicPerformance_SingleName"
                 } ],
                 "economicTerms" : {
-                  "calculationAgent" : {
-                    "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-                  },
                   "effectiveDate" : {
-                    "meta" : {
-                      "externalKey" : "EffectiveDate",
-                      "globalKey" : "dbcf5078"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 3,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "dbcf5078"
+                        "globalKey" : "a2cb5f8a"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 3,
-                      "dayType" : "EXCHANGE_BUSINESS",
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "dayType" : "ExchangeBusiness",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "TradeDate",
-                        "globalReference" : "3e8a58"
+                        "globalReference" : "3e8a58",
+                        "externalReference" : "TradeDate"
                       }
-                    }
-                  },
-                  "extraordinaryEvents" : {
-                    "additionalDisruptionEvents" : {
-                      "changeInLaw" : true,
-                      "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                      "failureToDeliver" : true,
-                      "hedgingDisruption" : true,
-                      "increasedCostOfHedging" : false,
-                      "increasedCostOfStockBorrow" : false,
-                      "insolvencyFiling" : false,
-                      "lossOfStockBorrow" : true
-                    },
-                    "compositionOfCombinedConsideration" : true,
-                    "mergerEvents" : {
-                      "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                      "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                      "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-                    },
-                    "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-                    "representations" : {
-                      "additionalAcknowledgements" : true,
-                      "agreementsRegardingHedging" : true,
-                      "nonReliance" : true
                     },
-                    "tenderOfferEvents" : {
-                      "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                      "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                      "shareForShare" : "MODIFIED_CALCULATION_AGENT"
+                    "meta" : {
+                      "globalKey" : "a2cb5f8a",
+                      "externalKey" : "EffectiveDate"
                     }
                   },
-                  "payout" : {
-                    "interestRatePayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
-                      },
-                      "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "2fdf0b8c"
-                        },
-                        "quantityReference" : {
-                          "externalReference" : "EquityNotionalAmount",
-                          "globalReference" : "4cf"
-                        },
+                  "terminationDate" : {
+                    "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
+                      "meta" : {
+                        "globalKey" : "edf02740"
+                      },
+                      "businessDayConvention" : "NotApplicable",
+                      "dateRelativeTo" : {
+                        "globalReference" : "bee88507",
+                        "externalReference" : "FinalEquityPaymentDate"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "edf02740",
+                      "externalKey" : "TerminationDate"
+                    }
+                  },
+                  "payout" : {
+                    "interestRatePayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "priceQuantity" : {
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "quantityReference" : {
+                          "globalReference" : "4cf",
+                          "externalReference" : "EquityNotionalAmount"
+                        },
+                        "meta" : {
+                          "globalKey" : "2fdf0b8c"
+                        }
+                      },
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
+                            }
+                          },
+                          "spreadSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-2"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
                         }
                       },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
                       "calculationPeriodDates" : {
                         "effectiveDate" : {
-                          "meta" : {
-                            "globalKey" : "dbcf5078"
-                          },
                           "relativeDate" : {
+                            "periodMultiplier" : 3,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "dbcf5078"
+                              "globalKey" : "a2cb5f8a"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 3,
-                            "dayType" : "EXCHANGE_BUSINESS",
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "dayType" : "ExchangeBusiness",
+                            "businessDayConvention" : "NotApplicable",
                             "dateRelativeTo" : {
-                              "externalReference" : "TradeDate",
-                              "globalReference" : "3e8a58"
+                              "globalReference" : "3e8a58",
+                              "externalReference" : "TradeDate"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "a2cb5f8a"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "InterestLegPeriodDates",
-                          "globalKey" : "e7334d0"
-                        },
                         "terminationDate" : {
-                          "meta" : {
-                            "globalKey" : "f18f7c48"
-                          },
                           "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "f18f7c48"
+                              "globalKey" : "edf02740"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "dateRelativeTo" : {
-                              "externalReference" : "FinalEquityPaymentDate",
-                              "globalReference" : "86542f29"
+                              "globalReference" : "bee88507",
+                              "externalReference" : "FinalEquityPaymentDate"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "edf02740"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "2fce1876",
+                          "externalKey" : "InterestLegPeriodDates"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "8306e5d6"
-                      },
                       "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "9b9d36de"
-                        },
                         "paymentDateSchedule" : {
                           "interimPaymentDates" : [ {
-                            "meta" : {
-                              "globalKey" : "9b9d36de"
-                            },
                             "relativeDates" : {
+                              "periodMultiplier" : 0,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "9b9d36de"
+                                "globalKey" : "97fde1d6"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 0,
-                              "businessDayConvention" : "NOT_APPLICABLE",
+                              "businessDayConvention" : "NotApplicable",
                               "dateRelativeTo" : {
-                                "externalReference" : "EquityPaymentDate",
-                                "globalReference" : "fb15beed"
+                                "globalReference" : "1a999e73",
+                                "externalReference" : "EquityPaymentDate"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "97fde1d6"
                             }
                           } ]
-                        }
-                      },
-                      "rateSpecification" : {
-                        "floatingRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
-                            }
-                          },
-                          "spreadSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-2"
-                              }
-                            }
-                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "97fde1d6"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "InterestLegPeriodDates",
-                          "globalReference" : "e7334d0"
+                          "globalReference" : "2fce1876",
+                          "externalReference" : "InterestLegPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "meta" : {
-                          "globalKey" : "9ab7a6fd"
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "globalKey" : "bc128aa3"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3cd0e14e"
                       }
                     } ],
-                    "meta" : {
-                      "globalKey" : "3d9bbe0"
-                    },
                     "performancePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "externalKey" : "EquityNotionalAmount",
-                          "globalKey" : "4cf"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
                         },
-                        "reset" : true
+                        "reset" : true,
+                        "meta" : {
+                          "globalKey" : "4cf",
+                          "externalKey" : "EquityNotionalAmount"
+                        }
                       },
                       "settlementTerms" : {
-                        "meta" : {
-                          "globalKey" : "7610bbd9"
-                        },
+                        "settlementType" : "Cash",
                         "settlementCurrency" : {
                           "value" : "USD"
                         },
-                        "settlementType" : "CASH"
-                      },
-                      "meta" : {
-                        "globalKey" : "bd1fe08a"
-                      },
-                      "paymentDates" : {
                         "meta" : {
-                          "externalKey" : "EquityPaymentDate",
-                          "globalKey" : "fb15beed"
-                        },
-                        "paymentDateSchedule" : {
-                          "finalPaymentDate" : {
-                            "meta" : {
-                              "externalKey" : "FinalEquityPaymentDate",
-                              "globalKey" : "86542f29"
-                            },
-                            "relativeDate" : {
-                              "meta" : {
-                                "globalKey" : "86542f29"
+                          "globalKey" : "7610bbd9"
+                        }
+                      },
+                      "valuationDates" : {
+                        "valuationDatesInterim" : {
+                          "determinationMethod" : "ValuationTime",
+                          "valuationDates" : {
+                            "adjustableDates" : {
+                              "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ],
+                              "dateAdjustments" : {
+                                "businessDayConvention" : "NotApplicable",
+                                "meta" : {
+                                  "globalKey" : "3a4b88ab"
+                                }
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 3,
-                              "dayType" : "CURRENCY_BUSINESS",
-                              "businessCentersReference" : {
-                                "externalReference" : "PrimaryBusinessCenter",
-                                "globalReference" : "27e4e9"
+                              "meta" : {
+                                "globalKey" : "e80e5233"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "e80e5233",
+                              "externalKey" : "InterimValuationDate"
+                            }
+                          },
+                          "valuationTimeType" : "Close",
+                          "meta" : {
+                            "globalKey" : "374dddc6"
+                          }
+                        },
+                        "valuationDatesFinal" : {
+                          "determinationMethod" : "HedgeExecution",
+                          "valuationDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2002-09-24",
+                              "dateAdjustments" : {
+                                "businessDayConvention" : "NotApplicable",
+                                "meta" : {
+                                  "globalKey" : "3a4b88ab"
+                                }
                               },
-                              "businessDayConvention" : "FOLLOWING",
-                              "dateRelativeTo" : {
-                                "externalReference" : "FinalValuationDate",
-                                "globalReference" : "252ee503"
+                              "meta" : {
+                                "globalKey" : "252ee503"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "252ee503",
+                              "externalKey" : "FinalValuationDate"
                             }
                           },
+                          "meta" : {
+                            "globalKey" : "96fa6685"
+                          }
+                        }
+                      },
+                      "paymentDates" : {
+                        "paymentDateSchedule" : {
                           "interimPaymentDates" : [ {
-                            "meta" : {
-                              "externalKey" : "InterimEquityPaymentDate",
-                              "globalKey" : "2519d1b6"
-                            },
                             "relativeDates" : {
+                              "periodMultiplier" : 3,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "2519d1b6"
+                                "globalKey" : "dfe60714"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 3,
-                              "dayType" : "CURRENCY_BUSINESS",
+                              "dayType" : "CurrencyBusiness",
+                              "businessDayConvention" : "FOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "USNY"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "PrimaryBusinessCenter",
-                                  "globalKey" : "27e4e9"
+                                  "globalKey" : "27e4e9",
+                                  "externalKey" : "PrimaryBusinessCenter"
                                 }
                               },
-                              "businessDayConvention" : "FOLLOWING",
                               "dateRelativeTo" : {
-                                "externalReference" : "InterimValuationDate",
-                                "globalReference" : "e80e5233"
+                                "globalReference" : "e80e5233",
+                                "externalReference" : "InterimValuationDate"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "dfe60714",
+                              "externalKey" : "InterimEquityPaymentDate"
                             }
-                          } ]
-                        }
-                      },
-                      "returnTerms" : {
-                        "dividendReturnTerms" : {
-                          "dividendCurrency" : {
-                            "determinationMethod" : "DIVIDEND_CURRENCY"
-                          },
-                          "dividendEntitlement" : "EX_DATE",
-                          "dividendPayoutRatio" : [ {
-                            "totalRatio" : 1
                           } ],
-                          "dividendPeriod" : [ {
-                            "dividendPaymentDate" : {
-                              "dividendDateReference" : {
-                                "dateReference" : "EQUITY_PAYMENT_DATE"
-                              }
-                            },
-                            "endDate" : {
-                              "dividendDate" : {
-                                "externalReference" : "TerminationDate",
-                                "globalReference" : "f18f7c48"
+                          "finalPaymentDate" : {
+                            "relativeDate" : {
+                              "periodMultiplier" : 3,
+                              "period" : "D",
+                              "meta" : {
+                                "globalKey" : "bee88507"
+                              },
+                              "dayType" : "CurrencyBusiness",
+                              "businessDayConvention" : "FOLLOWING",
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "PrimaryBusinessCenter"
+                              },
+                              "dateRelativeTo" : {
+                                "globalReference" : "252ee503",
+                                "externalReference" : "FinalValuationDate"
                               }
                             },
-                            "startDate" : {
-                              "dividendDate" : {
-                                "externalReference" : "TradeDate",
-                                "globalReference" : "3e8a58"
-                              }
+                            "meta" : {
+                              "globalKey" : "bee88507",
+                              "externalKey" : "FinalEquityPaymentDate"
                             }
-                          } ],
-                          "dividendReinvestment" : false,
-                          "excessDividendAmount" : "RECORD_AMOUNT",
-                          "extraordinaryDividendsParty" : "EXTRAORDINARY_DIVIDENDS_PARTY"
+                          }
                         },
-                        "priceReturnTerms" : {
-                          "returnType" : "TOTAL"
+                        "meta" : {
+                          "globalKey" : "1a999e73",
+                          "externalKey" : "EquityPaymentDate"
                         }
                       },
                       "underlier" : {
-                        "meta" : {
-                          "globalKey" : "7a5b92c5"
-                        },
                         "security" : {
                           "productIdentifier" : [ {
                             "address" : {
@@ -446,87 +555,95 @@
                               "value" : "productIdentifier-2"
                             }
                           } ],
-                          "securityType" : "EQUITY"
+                          "securityType" : "Equity"
+                        },
+                        "meta" : {
+                          "globalKey" : "7a5b92c5"
                         }
                       },
-                      "valuationDates" : {
-                        "valuationDatesFinal" : {
-                          "determinationMethod" : "HEDGE_EXECUTION",
-                          "meta" : {
-                            "globalKey" : "96fa6685"
+                      "returnTerms" : {
+                        "priceReturnTerms" : {
+                          "returnType" : "Total"
+                        },
+                        "dividendReturnTerms" : {
+                          "dividendPayoutRatio" : [ {
+                            "totalRatio" : 1
+                          } ],
+                          "dividendReinvestment" : false,
+                          "dividendEntitlement" : "ExDate",
+                          "extraordinaryDividendsParty" : "ExtraordinaryDividendsParty",
+                          "excessDividendAmount" : "RecordAmount",
+                          "dividendCurrency" : {
+                            "determinationMethod" : "DividendCurrency"
                           },
-                          "valuationDate" : {
-                            "adjustableDate" : {
-                              "dateAdjustments" : {
-                                "businessDayConvention" : "NOT_APPLICABLE",
-                                "meta" : {
-                                  "globalKey" : "3a4b88ab"
-                                }
-                              },
-                              "meta" : {
-                                "globalKey" : "252ee503"
-                              },
-                              "unadjustedDate" : "2002-09-24"
+                          "dividendPeriod" : [ {
+                            "startDate" : {
+                              "dividendDate" : {
+                                "globalReference" : "3e8a58",
+                                "externalReference" : "TradeDate"
+                              }
                             },
-                            "meta" : {
-                              "externalKey" : "FinalValuationDate",
-                              "globalKey" : "252ee503"
-                            }
-                          }
-                        },
-                        "valuationDatesInterim" : {
-                          "determinationMethod" : "VALUATION_TIME",
-                          "meta" : {
-                            "globalKey" : "374dddc6"
-                          },
-                          "valuationDates" : {
-                            "adjustableDates" : {
-                              "dateAdjustments" : {
-                                "businessDayConvention" : "NOT_APPLICABLE",
-                                "meta" : {
-                                  "globalKey" : "3a4b88ab"
-                                }
-                              },
-                              "meta" : {
-                                "globalKey" : "e80e5233"
-                              },
-                              "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ]
+                            "endDate" : {
+                              "dividendDate" : {
+                                "globalReference" : "edf02740",
+                                "externalReference" : "TerminationDate"
+                              }
                             },
-                            "meta" : {
-                              "externalKey" : "InterimValuationDate",
-                              "globalKey" : "e80e5233"
+                            "dividendPaymentDate" : {
+                              "dividendDateReference" : {
+                                "dateReference" : "EquityPaymentDate"
+                              }
                             }
-                          },
-                          "valuationTimeType" : "CLOSE"
+                          } ]
                         }
-                      }
-                    } ]
-                  },
-                  "terminationDate" : {
-                    "meta" : {
-                      "externalKey" : "TerminationDate",
-                      "globalKey" : "f18f7c48"
-                    },
-                    "relativeDate" : {
-                      "meta" : {
-                        "globalKey" : "f18f7c48"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
-                      "businessDayConvention" : "NOT_APPLICABLE",
-                      "dateRelativeTo" : {
-                        "externalReference" : "FinalEquityPaymentDate",
-                        "globalReference" : "86542f29"
+                      "meta" : {
+                        "globalKey" : "5d54351a"
                       }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "d204e9e8"
                     }
+                  },
+                  "extraordinaryEvents" : {
+                    "mergerEvents" : {
+                      "shareForShare" : "ModifiedCalculationAgent",
+                      "shareForOther" : "ModifiedCalculationAgent",
+                      "shareForCombined" : "ModifiedCalculationAgent"
+                    },
+                    "tenderOfferEvents" : {
+                      "shareForShare" : "ModifiedCalculationAgent",
+                      "shareForOther" : "ModifiedCalculationAgent",
+                      "shareForCombined" : "ModifiedCalculationAgent"
+                    },
+                    "compositionOfCombinedConsideration" : true,
+                    "additionalDisruptionEvents" : {
+                      "changeInLaw" : true,
+                      "failureToDeliver" : true,
+                      "insolvencyFiling" : false,
+                      "hedgingDisruption" : true,
+                      "increasedCostOfHedging" : false,
+                      "lossOfStockBorrow" : true,
+                      "increasedCostOfStockBorrow" : false,
+                      "determiningParty" : "DisruptionEventsDeterminingParty"
+                    },
+                    "representations" : {
+                      "nonReliance" : true,
+                      "agreementsRegardingHedging" : true,
+                      "additionalAcknowledgements" : true
+                    },
+                    "nationalizationOrInsolvency" : "CancellationAndPayment"
+                  },
+                  "calculationAgent" : {
+                    "calculationAgentParty" : "CalculationAgentIndependent"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "95be1b14"
+                  "globalKey" : "8b69cf3e"
                 }
               },
               "meta" : {
-                "globalKey" : "95be1b14"
+                "globalKey" : "8b69cf3e"
               }
             },
             "tradeLot" : [ {
@@ -541,498 +658,314 @@
                 }
               } ],
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "417e440b"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "26bb033f"
-                  },
-                  "productIdentifier" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-1"
-                      } ]
-                    },
-                    "value" : {
-                      "identifier" : {
-                        "meta" : {
-                          "scheme" : "http://www.abc.com/instrumentId"
-                        },
-                        "value" : "SHPGY.O"
-                      },
-                      "meta" : {
-                        "globalKey" : "8c85a05e"
-                      },
-                      "source" : "OTHER"
-                    }
-                  }, {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-2"
-                      } ]
-                    },
-                    "value" : {
-                      "identifier" : {
-                        "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
-                      },
-                      "meta" : {
-                        "globalKey" : "5518dd"
-                      },
-                      "source" : "NAME"
-                    }
-                  } ]
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 37.44,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 37.44,
                     "perUnitOf" : {
-                      "financialUnit" : "SHARE"
+                      "financialUnit" : "Share"
                     },
-                    "priceType" : "ASSET_PRICE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "AssetPrice"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 760400,
                     "unit" : {
-                      "financialUnit" : "SHARE"
-                    },
-                    "value" : 760400
-                  }
-                }, {
+                      "financialUnit" : "Share"
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
+                      "value" : "quantity-2"
                     } ]
-                  },
+                  }
+                }, {
                   "value" : {
+                    "value" : 28469376,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
-                    },
-                    "value" : 28469376
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    } ]
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "7dd9ec3"
-                },
+                } ],
                 "observable" : {
-                  "meta" : {
-                    "globalKey" : "5f0c6d03"
-                  },
-                  "rateOption" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "SHPGY.O",
+                        "meta" : {
+                          "scheme" : "http://www.abc.com/instrumentId"
+                        }
+                      },
+                      "source" : "Other",
+                      "meta" : {
+                        "globalKey" : "8c85a05e"
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                        "value" : "productIdentifier-1"
                       } ]
-                    },
+                    }
+                  }, {
                     "value" : {
-                      "floatingRateIndex" : {
-                        "value" : "USD-LIBOR-BBA"
+                      "identifier" : {
+                        "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
                       },
-                      "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "954"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 1
+                      "source" : "Name",
+                      "meta" : {
+                        "globalKey" : "5518dd"
                       }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-2"
+                      } ]
                     }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "b0a564a1"
                   }
                 },
+                "meta" : {
+                  "globalKey" : "b4fad14b"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.002,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 0.002,
-                    "arithmeticOperator" : "ADD",
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
+                    "priceType" : "InterestRate",
+                    "arithmeticOperator" : "Add"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-2"
+                    } ]
                   }
-                } ]
+                } ],
+                "observable" : {
+                  "rateOption" : {
+                    "value" : {
+                      "floatingRateIndex" : {
+                        "value" : "USD-LIBOR-BBA"
+                      },
+                      "indexTenor" : {
+                        "periodMultiplier" : 1,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "6c"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "82801f45"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "95c8caad"
+                }
               } ]
-            } ]
-          },
-          "tradeDate" : {
-            "meta" : {
-              "externalKey" : "TradeDate",
-              "globalKey" : "3e8a58"
-            },
-            "value" : "2001-09-24"
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "33f59568",
+                "externalReference" : "party2"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "33f59567",
+                "externalReference" : "party1"
+              }
+            } ],
+            "ancillaryParty" : [ {
+              "role" : "DisruptionEventsDeterminingParty",
+              "partyReference" : [ {
+                "globalReference" : "33f59567",
+                "externalReference" : "party1"
+              } ]
+            }, {
+              "role" : "ExtraordinaryDividendsParty",
+              "partyReference" : [ {
+                "globalReference" : "33f59567",
+                "externalReference" : "party1"
+              } ]
+            }, {
+              "role" : "CalculationAgentIndependent",
+              "partyReference" : [ {
+                "globalReference" : "33f59567",
+                "externalReference" : "party1"
+              } ]
+            } ],
+            "adjustment" : "Execution"
           },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "Party A",
                 "meta" : {
-                  "scheme" : "http://www.partyA.com/eqs-trade-id"
-                },
-                "value" : "6234"
+                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+                }
+              },
+              "meta" : {
+                "globalKey" : "33f59567"
               }
             } ],
-            "issuerReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "33f59567"
-            },
             "meta" : {
-              "globalKey" : "3b465e4f"
+              "globalKey" : "33f59567",
+              "externalKey" : "party1"
             }
           }, {
-            "assignedIdentifier" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "Party B",
                 "meta" : {
-                  "scheme" : "http://www.partyB.com/eqs-trade-id"
-                },
-                "value" : "6569"
-              }
-            } ],
-            "issuerReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "33f59568"
-            },
-            "meta" : {
-              "globalKey" : "384471b6"
-            }
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "quantityChange" : {
-        "change" : [ {
-          "meta" : {
-            "globalKey" : "695bc1d0"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "8c85a05e"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.abc.com/instrumentId"
-                  },
-                  "value" : "SHPGY.O"
-                },
-                "meta" : {
-                  "globalKey" : "8c85a05e"
-                },
-                "source" : "OTHER"
-              }
-            } ]
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
+                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
                 }
               },
-              "value" : 30,
-              "perUnitOf" : {
-                "financialUnit" : "SHARE"
-              },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 250000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d7b3bff1"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d03"
-            },
-            "rateOption" : {
               "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 1
-                }
+                "globalKey" : "33f59568"
               }
-            }
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 0.002,
-              "arithmeticOperator" : "ADD",
-              "perUnitOf" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 7500000
-            }
-          } ]
-        } ],
-        "direction" : "INCREASE",
-        "lotIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "value" : "LOT-2"
+              "globalKey" : "33f59568",
+              "externalKey" : "party2"
             }
           } ],
-          "meta" : {
-            "globalKey" : "4542496"
-          }
-        } ]
-      },
-      "transfer" : {
-        "transferState" : [ {
-          "meta" : {
-            "globalKey" : "3b7f6fc0"
-          },
-          "transfer" : {
-            "payerReceiver" : {
-              "payerPartyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "33f59568"
+          "contractDetails" : {
+            "documentation" : [ {
+              "legalAgreementIdentification" : {
+                "agreementName" : {
+                  "agreementType" : "MasterAgreement",
+                  "masterAgreementType" : {
+                    "value" : "ISDAMaster"
+                  }
+                },
+                "vintage" : 2002
               },
-              "receiverPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "33f59567"
+              "meta" : {
+                "globalKey" : "328cfa59"
               }
-            },
-            "quantity" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
+            }, {
+              "legalAgreementIdentification" : {
+                "agreementName" : {
+                  "agreementType" : "Confirmation",
+                  "contractualDefinitionsType" : [ {
+                    "value" : "ISDA2000"
+                  }, {
+                    "value" : "ISDA2002Equity"
+                  } ]
                 }
               },
-              "value" : 2000
-            },
-            "settlementDate" : {
-              "adjustedDate" : {
-                "meta" : {
-                  "globalKey" : "3e8a58"
-                },
-                "value" : "2001-09-24"
-              }
-            },
-            "transferExpression" : {
-              "priceTransfer" : "INCREASE"
-            }
-          }
-        } ]
-      }
-    }
-  } ],
-  "after" : [ {
-    "meta" : {
-      "globalKey" : "a98cacf7"
-    },
-    "trade" : {
-      "contractDetails" : {
-        "documentation" : [ {
-          "legalAgreementIdentification" : {
-            "agreementName" : {
-              "agreementType" : "MASTER_AGREEMENT",
-              "masterAgreementType" : {
-                "value" : "ISDA_MASTER"
+              "meta" : {
+                "globalKey" : "ed9ef3fc"
               }
+            } ],
+            "governingLaw" : {
+              "value" : "GBEN"
             },
-            "vintage" : 2002
-          },
-          "meta" : {
-            "globalKey" : "328cfa59"
-          }
-        }, {
-          "legalAgreementIdentification" : {
-            "agreementName" : {
-              "agreementType" : "CONFIRMATION",
-              "contractualDefinitionsType" : [ {
-                "value" : "ISDA2000"
-              }, {
-                "value" : "ISDA_2002_EQUITY"
-              } ]
+            "meta" : {
+              "globalKey" : "92c7c587"
             }
           },
           "meta" : {
-            "globalKey" : "ed9ef3fc"
+            "globalKey" : "e1df90d2"
           }
-        } ],
-        "governingLaw" : {
-          "value" : "GBEN"
         },
         "meta" : {
-          "globalKey" : "92c7c587"
+          "globalKey" : "e1df90d2"
         }
-      },
-      "meta" : {
-        "globalKey" : "cc3394a9"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "33f59567"
+      }
+    }
+  } ],
+  "eventQualifier" : "Increase",
+  "after" : [ {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-            },
-            "value" : "Party A"
-          },
-          "meta" : {
-            "globalKey" : "33f59567"
+            "value" : "6234",
+            "meta" : {
+              "scheme" : "http://www.partyA.com/eqs-trade-id"
+            }
           }
-        } ]
-      }, {
+        } ],
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "33f59568"
+          "globalKey" : "c921d6eb"
+        }
+      }, {
+        "issuerReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "6569",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-            },
-            "value" : "Party B"
-          },
-          "meta" : {
-            "globalKey" : "33f59568"
+              "scheme" : "http://www.partyB.com/eqs-trade-id"
+            }
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "310383ce"
+        }
       } ],
+      "tradeDate" : {
+        "value" : "2001-09-24",
+        "meta" : {
+          "globalKey" : "3e8a58",
+          "externalKey" : "TradeDate"
+        }
+      },
       "tradableProduct" : {
-        "adjustment" : "EXECUTION",
-        "ancillaryParty" : [ {
-          "partyReference" : [ {
-            "externalReference" : "party1",
-            "globalReference" : "33f59567"
-          } ],
-          "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-        }, {
-          "partyReference" : [ {
-            "externalReference" : "party1",
-            "globalReference" : "33f59567"
-          } ],
-          "role" : "EXTRAORDINARY_DIVIDENDS_PARTY"
-        }, {
-          "partyReference" : [ {
-            "externalReference" : "party1",
-            "globalReference" : "33f59567"
-          } ],
-          "role" : "CALCULATION_AGENT_INDEPENDENT"
-        } ],
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "33f59568"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "33f59567"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
-              "source" : "OTHER",
+              "source" : "Other",
               "value" : {
                 "name" : {
                   "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleName"
@@ -1043,313 +976,305 @@
               "productQualifier" : "EquitySwap_TotalReturnBasicPerformance_SingleName"
             } ],
             "economicTerms" : {
-              "calculationAgent" : {
-                "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-              },
               "effectiveDate" : {
-                "meta" : {
-                  "externalKey" : "EffectiveDate",
-                  "globalKey" : "dbcf5078"
-                },
                 "relativeDate" : {
+                  "periodMultiplier" : 3,
+                  "period" : "D",
                   "meta" : {
-                    "globalKey" : "dbcf5078"
+                    "globalKey" : "a2cb5f8a"
                   },
-                  "period" : "D",
-                  "periodMultiplier" : 3,
-                  "dayType" : "EXCHANGE_BUSINESS",
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "dayType" : "ExchangeBusiness",
+                  "businessDayConvention" : "NotApplicable",
                   "dateRelativeTo" : {
-                    "externalReference" : "TradeDate",
-                    "globalReference" : "3e8a58"
+                    "globalReference" : "3e8a58",
+                    "externalReference" : "TradeDate"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "a2cb5f8a",
+                  "externalKey" : "EffectiveDate"
                 }
               },
-              "extraordinaryEvents" : {
-                "additionalDisruptionEvents" : {
-                  "changeInLaw" : true,
-                  "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                  "failureToDeliver" : true,
-                  "hedgingDisruption" : true,
-                  "increasedCostOfHedging" : false,
-                  "increasedCostOfStockBorrow" : false,
-                  "insolvencyFiling" : false,
-                  "lossOfStockBorrow" : true
-                },
-                "compositionOfCombinedConsideration" : true,
-                "mergerEvents" : {
-                  "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                  "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                  "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-                },
-                "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-                "representations" : {
-                  "additionalAcknowledgements" : true,
-                  "agreementsRegardingHedging" : true,
-                  "nonReliance" : true
+              "terminationDate" : {
+                "relativeDate" : {
+                  "periodMultiplier" : 0,
+                  "period" : "D",
+                  "meta" : {
+                    "globalKey" : "edf02740"
+                  },
+                  "businessDayConvention" : "NotApplicable",
+                  "dateRelativeTo" : {
+                    "globalReference" : "bee88507",
+                    "externalReference" : "FinalEquityPaymentDate"
+                  }
                 },
-                "tenderOfferEvents" : {
-                  "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                  "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                  "shareForShare" : "MODIFIED_CALCULATION_AGENT"
+                "meta" : {
+                  "globalKey" : "edf02740",
+                  "externalKey" : "TerminationDate"
                 }
               },
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "2fdf0b8c"
-                    },
-                    "quantityReference" : {
-                      "externalReference" : "EquityNotionalAmount",
-                      "globalReference" : "4cf"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "quantityReference" : {
+                      "globalReference" : "4cf",
+                      "externalReference" : "EquityNotionalAmount"
+                    },
+                    "meta" : {
+                      "globalKey" : "2fdf0b8c"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        }
+                      },
+                      "spreadSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-2"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
                     }
                   },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
                   "calculationPeriodDates" : {
                     "effectiveDate" : {
-                      "meta" : {
-                        "globalKey" : "dbcf5078"
-                      },
                       "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "dbcf5078"
+                          "globalKey" : "a2cb5f8a"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "EXCHANGE_BUSINESS",
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "dayType" : "ExchangeBusiness",
+                        "businessDayConvention" : "NotApplicable",
                         "dateRelativeTo" : {
-                          "externalReference" : "TradeDate",
-                          "globalReference" : "3e8a58"
+                          "globalReference" : "3e8a58",
+                          "externalReference" : "TradeDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "a2cb5f8a"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "InterestLegPeriodDates",
-                      "globalKey" : "e7334d0"
-                    },
                     "terminationDate" : {
-                      "meta" : {
-                        "globalKey" : "f18f7c48"
-                      },
                       "relativeDate" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "f18f7c48"
+                          "globalKey" : "edf02740"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "dateRelativeTo" : {
-                          "externalReference" : "FinalEquityPaymentDate",
-                          "globalReference" : "86542f29"
+                          "globalReference" : "bee88507",
+                          "externalReference" : "FinalEquityPaymentDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "edf02740"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "2fce1876",
+                      "externalKey" : "InterestLegPeriodDates"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "8306e5d6"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "9b9d36de"
-                    },
                     "paymentDateSchedule" : {
                       "interimPaymentDates" : [ {
-                        "meta" : {
-                          "globalKey" : "9b9d36de"
-                        },
                         "relativeDates" : {
+                          "periodMultiplier" : 0,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "9b9d36de"
+                            "globalKey" : "97fde1d6"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 0,
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                          "businessDayConvention" : "NotApplicable",
                           "dateRelativeTo" : {
-                            "externalReference" : "EquityPaymentDate",
-                            "globalReference" : "fb15beed"
+                            "globalReference" : "1a999e73",
+                            "externalReference" : "EquityPaymentDate"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "97fde1d6"
                         }
                       } ]
-                    }
-                  },
-                  "rateSpecification" : {
-                    "floatingRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        }
-                      },
-                      "spreadSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-2"
-                          }
-                        }
-                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "97fde1d6"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "InterestLegPeriodDates",
-                      "globalReference" : "e7334d0"
+                      "globalReference" : "2fce1876",
+                      "externalReference" : "InterestLegPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "meta" : {
-                      "globalKey" : "9ab7a6fd"
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                      "globalKey" : "bc128aa3"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3cd0e14e"
                   }
                 } ],
-                "meta" : {
-                  "globalKey" : "3d9bbe0"
-                },
                 "performancePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "externalKey" : "EquityNotionalAmount",
-                      "globalKey" : "4cf"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
                     },
-                    "reset" : true
+                    "reset" : true,
+                    "meta" : {
+                      "globalKey" : "4cf",
+                      "externalKey" : "EquityNotionalAmount"
+                    }
                   },
                   "settlementTerms" : {
-                    "meta" : {
-                      "globalKey" : "7610bbd9"
-                    },
+                    "settlementType" : "Cash",
                     "settlementCurrency" : {
                       "value" : "USD"
                     },
-                    "settlementType" : "CASH"
-                  },
-                  "meta" : {
-                    "globalKey" : "bd1fe08a"
-                  },
-                  "paymentDates" : {
                     "meta" : {
-                      "externalKey" : "EquityPaymentDate",
-                      "globalKey" : "fb15beed"
-                    },
-                    "paymentDateSchedule" : {
-                      "finalPaymentDate" : {
-                        "meta" : {
-                          "externalKey" : "FinalEquityPaymentDate",
-                          "globalKey" : "86542f29"
-                        },
-                        "relativeDate" : {
-                          "meta" : {
-                            "globalKey" : "86542f29"
+                      "globalKey" : "7610bbd9"
+                    }
+                  },
+                  "valuationDates" : {
+                    "valuationDatesInterim" : {
+                      "determinationMethod" : "ValuationTime",
+                      "valuationDates" : {
+                        "adjustableDates" : {
+                          "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ],
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NotApplicable",
+                            "meta" : {
+                              "globalKey" : "3a4b88ab"
+                            }
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 3,
-                          "dayType" : "CURRENCY_BUSINESS",
-                          "businessCentersReference" : {
-                            "externalReference" : "PrimaryBusinessCenter",
-                            "globalReference" : "27e4e9"
+                          "meta" : {
+                            "globalKey" : "e80e5233"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "e80e5233",
+                          "externalKey" : "InterimValuationDate"
+                        }
+                      },
+                      "valuationTimeType" : "Close",
+                      "meta" : {
+                        "globalKey" : "374dddc6"
+                      }
+                    },
+                    "valuationDatesFinal" : {
+                      "determinationMethod" : "HedgeExecution",
+                      "valuationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2002-09-24",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NotApplicable",
+                            "meta" : {
+                              "globalKey" : "3a4b88ab"
+                            }
                           },
-                          "businessDayConvention" : "FOLLOWING",
-                          "dateRelativeTo" : {
-                            "externalReference" : "FinalValuationDate",
-                            "globalReference" : "252ee503"
+                          "meta" : {
+                            "globalKey" : "252ee503"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "252ee503",
+                          "externalKey" : "FinalValuationDate"
                         }
                       },
+                      "meta" : {
+                        "globalKey" : "96fa6685"
+                      }
+                    }
+                  },
+                  "paymentDates" : {
+                    "paymentDateSchedule" : {
                       "interimPaymentDates" : [ {
-                        "meta" : {
-                          "externalKey" : "InterimEquityPaymentDate",
-                          "globalKey" : "2519d1b6"
-                        },
                         "relativeDates" : {
+                          "periodMultiplier" : 3,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "2519d1b6"
+                            "globalKey" : "dfe60714"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 3,
-                          "dayType" : "CURRENCY_BUSINESS",
+                          "dayType" : "CurrencyBusiness",
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "USNY"
                             } ],
                             "meta" : {
-                              "externalKey" : "PrimaryBusinessCenter",
-                              "globalKey" : "27e4e9"
+                              "globalKey" : "27e4e9",
+                              "externalKey" : "PrimaryBusinessCenter"
                             }
                           },
+                          "dateRelativeTo" : {
+                            "globalReference" : "e80e5233",
+                            "externalReference" : "InterimValuationDate"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "dfe60714",
+                          "externalKey" : "InterimEquityPaymentDate"
+                        }
+                      } ],
+                      "finalPaymentDate" : {
+                        "relativeDate" : {
+                          "periodMultiplier" : 3,
+                          "period" : "D",
+                          "meta" : {
+                            "globalKey" : "bee88507"
+                          },
+                          "dayType" : "CurrencyBusiness",
                           "businessDayConvention" : "FOLLOWING",
+                          "businessCentersReference" : {
+                            "globalReference" : "27e4e9",
+                            "externalReference" : "PrimaryBusinessCenter"
+                          },
                           "dateRelativeTo" : {
-                            "externalReference" : "InterimValuationDate",
-                            "globalReference" : "e80e5233"
-                          }
-                        }
-                      } ]
-                    }
-                  },
-                  "returnTerms" : {
-                    "dividendReturnTerms" : {
-                      "dividendCurrency" : {
-                        "determinationMethod" : "DIVIDEND_CURRENCY"
-                      },
-                      "dividendEntitlement" : "EX_DATE",
-                      "dividendPayoutRatio" : [ {
-                        "totalRatio" : 1
-                      } ],
-                      "dividendPeriod" : [ {
-                        "dividendPaymentDate" : {
-                          "dividendDateReference" : {
-                            "dateReference" : "EQUITY_PAYMENT_DATE"
-                          }
-                        },
-                        "endDate" : {
-                          "dividendDate" : {
-                            "externalReference" : "TerminationDate",
-                            "globalReference" : "f18f7c48"
+                            "globalReference" : "252ee503",
+                            "externalReference" : "FinalValuationDate"
                           }
                         },
-                        "startDate" : {
-                          "dividendDate" : {
-                            "externalReference" : "TradeDate",
-                            "globalReference" : "3e8a58"
-                          }
+                        "meta" : {
+                          "globalKey" : "bee88507",
+                          "externalKey" : "FinalEquityPaymentDate"
                         }
-                      } ],
-                      "dividendReinvestment" : false,
-                      "excessDividendAmount" : "RECORD_AMOUNT",
-                      "extraordinaryDividendsParty" : "EXTRAORDINARY_DIVIDENDS_PARTY"
+                      }
                     },
-                    "priceReturnTerms" : {
-                      "returnType" : "TOTAL"
+                    "meta" : {
+                      "globalKey" : "1a999e73",
+                      "externalKey" : "EquityPaymentDate"
                     }
                   },
                   "underlier" : {
-                    "meta" : {
-                      "globalKey" : "7a5b92c5"
-                    },
                     "security" : {
                       "productIdentifier" : [ {
                         "address" : {
@@ -1362,87 +1287,95 @@
                           "value" : "productIdentifier-2"
                         }
                       } ],
-                      "securityType" : "EQUITY"
+                      "securityType" : "Equity"
+                    },
+                    "meta" : {
+                      "globalKey" : "7a5b92c5"
                     }
                   },
-                  "valuationDates" : {
-                    "valuationDatesFinal" : {
-                      "determinationMethod" : "HEDGE_EXECUTION",
-                      "meta" : {
-                        "globalKey" : "96fa6685"
-                      },
-                      "valuationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "meta" : {
-                              "globalKey" : "3a4b88ab"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "252ee503"
-                          },
-                          "unadjustedDate" : "2002-09-24"
-                        },
-                        "meta" : {
-                          "externalKey" : "FinalValuationDate",
-                          "globalKey" : "252ee503"
-                        }
-                      }
+                  "returnTerms" : {
+                    "priceReturnTerms" : {
+                      "returnType" : "Total"
                     },
-                    "valuationDatesInterim" : {
-                      "determinationMethod" : "VALUATION_TIME",
-                      "meta" : {
-                        "globalKey" : "374dddc6"
+                    "dividendReturnTerms" : {
+                      "dividendPayoutRatio" : [ {
+                        "totalRatio" : 1
+                      } ],
+                      "dividendReinvestment" : false,
+                      "dividendEntitlement" : "ExDate",
+                      "extraordinaryDividendsParty" : "ExtraordinaryDividendsParty",
+                      "excessDividendAmount" : "RecordAmount",
+                      "dividendCurrency" : {
+                        "determinationMethod" : "DividendCurrency"
                       },
-                      "valuationDates" : {
-                        "adjustableDates" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "meta" : {
-                              "globalKey" : "3a4b88ab"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "e80e5233"
-                          },
-                          "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ]
+                      "dividendPeriod" : [ {
+                        "startDate" : {
+                          "dividendDate" : {
+                            "globalReference" : "3e8a58",
+                            "externalReference" : "TradeDate"
+                          }
                         },
-                        "meta" : {
-                          "externalKey" : "InterimValuationDate",
-                          "globalKey" : "e80e5233"
+                        "endDate" : {
+                          "dividendDate" : {
+                            "globalReference" : "edf02740",
+                            "externalReference" : "TerminationDate"
+                          }
+                        },
+                        "dividendPaymentDate" : {
+                          "dividendDateReference" : {
+                            "dateReference" : "EquityPaymentDate"
+                          }
                         }
-                      },
-                      "valuationTimeType" : "CLOSE"
+                      } ]
                     }
-                  }
-                } ]
-              },
-              "terminationDate" : {
-                "meta" : {
-                  "externalKey" : "TerminationDate",
-                  "globalKey" : "f18f7c48"
-                },
-                "relativeDate" : {
-                  "meta" : {
-                    "globalKey" : "f18f7c48"
                   },
-                  "period" : "D",
-                  "periodMultiplier" : 0,
-                  "businessDayConvention" : "NOT_APPLICABLE",
-                  "dateRelativeTo" : {
-                    "externalReference" : "FinalEquityPaymentDate",
-                    "globalReference" : "86542f29"
+                  "meta" : {
+                    "globalKey" : "5d54351a"
                   }
+                } ],
+                "meta" : {
+                  "globalKey" : "d204e9e8"
                 }
+              },
+              "extraordinaryEvents" : {
+                "mergerEvents" : {
+                  "shareForShare" : "ModifiedCalculationAgent",
+                  "shareForOther" : "ModifiedCalculationAgent",
+                  "shareForCombined" : "ModifiedCalculationAgent"
+                },
+                "tenderOfferEvents" : {
+                  "shareForShare" : "ModifiedCalculationAgent",
+                  "shareForOther" : "ModifiedCalculationAgent",
+                  "shareForCombined" : "ModifiedCalculationAgent"
+                },
+                "compositionOfCombinedConsideration" : true,
+                "additionalDisruptionEvents" : {
+                  "changeInLaw" : true,
+                  "failureToDeliver" : true,
+                  "insolvencyFiling" : false,
+                  "hedgingDisruption" : true,
+                  "increasedCostOfHedging" : false,
+                  "lossOfStockBorrow" : true,
+                  "increasedCostOfStockBorrow" : false,
+                  "determiningParty" : "DisruptionEventsDeterminingParty"
+                },
+                "representations" : {
+                  "nonReliance" : true,
+                  "agreementsRegardingHedging" : true,
+                  "additionalAcknowledgements" : true
+                },
+                "nationalizationOrInsolvency" : "CancellationAndPayment"
+              },
+              "calculationAgent" : {
+                "calculationAgentParty" : "CalculationAgentIndependent"
               }
             },
             "meta" : {
-              "globalKey" : "95be1b14"
+              "globalKey" : "8b69cf3e"
             }
           },
           "meta" : {
-            "globalKey" : "95be1b14"
+            "globalKey" : "8b69cf3e"
           }
         },
         "tradeLot" : [ {
@@ -1457,151 +1390,151 @@
             }
           } ],
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "417e440b"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "26bb033f"
-              },
-              "productIdentifier" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "productIdentifier-1"
-                  } ]
-                },
-                "value" : {
-                  "identifier" : {
-                    "meta" : {
-                      "scheme" : "http://www.abc.com/instrumentId"
-                    },
-                    "value" : "SHPGY.O"
-                  },
-                  "meta" : {
-                    "globalKey" : "8c85a05e"
-                  },
-                  "source" : "OTHER"
-                }
-              }, {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "productIdentifier-2"
-                  } ]
-                },
-                "value" : {
-                  "identifier" : {
-                    "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
-                  },
-                  "meta" : {
-                    "globalKey" : "5518dd"
-                  },
-                  "source" : "NAME"
-                }
-              } ]
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 37.44,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 37.44,
                 "perUnitOf" : {
-                  "financialUnit" : "SHARE"
+                  "financialUnit" : "Share"
                 },
-                "priceType" : "ASSET_PRICE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "AssetPrice"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 760400,
                 "unit" : {
-                  "financialUnit" : "SHARE"
-                },
-                "value" : 760400
-              }
-            }, {
+                  "financialUnit" : "Share"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "quantity-2"
                 } ]
-              },
+              }
+            }, {
               "value" : {
+                "value" : 28469376,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 28469376
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "7dd9ec3"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "5f0c6d03"
-              },
-              "rateOption" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "SHPGY.O",
+                    "meta" : {
+                      "scheme" : "http://www.abc.com/instrumentId"
+                    }
+                  },
+                  "source" : "Other",
+                  "meta" : {
+                    "globalKey" : "8c85a05e"
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
+                    "value" : "productIdentifier-1"
                   } ]
-                },
+                }
+              }, {
                 "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "USD-LIBOR-BBA"
+                  "identifier" : {
+                    "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
                   },
-                  "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1
+                  "source" : "Name",
+                  "meta" : {
+                    "globalKey" : "5518dd"
                   }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "productIdentifier-2"
+                  } ]
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "b0a564a1"
               }
             },
+            "meta" : {
+              "globalKey" : "b4fad14b"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-2"
-                } ]
-              },
               "value" : {
+                "value" : 0.002,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 0.002,
-                "arithmeticOperator" : "ADD",
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
+                "priceType" : "InterestRate",
+                "arithmeticOperator" : "Add"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-2"
+                } ]
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "USD-LIBOR-BBA"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "82801f45"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "95c8caad"
+            }
           } ]
         }, {
           "lotIdentifier" : [ {
@@ -1615,219 +1548,286 @@
             }
           } ],
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "695bc1d0"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "8c85a05e"
-              },
-              "productIdentifier" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "productIdentifier-1"
-                  } ]
-                },
-                "value" : {
-                  "identifier" : {
-                    "meta" : {
-                      "scheme" : "http://www.abc.com/instrumentId"
-                    },
-                    "value" : "SHPGY.O"
-                  },
-                  "meta" : {
-                    "globalKey" : "8c85a05e"
-                  },
-                  "source" : "OTHER"
-                }
-              } ]
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-2"
-                } ]
-              },
               "value" : {
+                "value" : 30,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 30,
                 "perUnitOf" : {
-                  "financialUnit" : "SHARE"
+                  "financialUnit" : "Share"
                 },
-                "priceType" : "ASSET_PRICE"
+                "priceType" : "AssetPrice"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-2"
+                } ]
               }
             } ],
             "quantity" : [ {
+              "value" : {
+                "value" : 250000,
+                "unit" : {
+                  "financialUnit" : "Share"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-2"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "financialUnit" : "SHARE"
-                },
-                "value" : 250000
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "d7b3bff1"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "5f0c6d03"
-              },
-              "rateOption" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "SHPGY.O",
+                    "meta" : {
+                      "scheme" : "http://www.abc.com/instrumentId"
+                    }
+                  },
+                  "source" : "Other",
+                  "meta" : {
+                    "globalKey" : "8c85a05e"
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
+                    "value" : "productIdentifier-1"
                   } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "USD-LIBOR-BBA"
-                  },
-                  "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1
-                  }
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "42e6b62"
               }
             },
+            "meta" : {
+              "globalKey" : "aa7176d4"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.002,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 0.002,
-                "arithmeticOperator" : "ADD",
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate",
+                "arithmeticOperator" : "Add"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 7500000,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "USD-LIBOR-BBA"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  }
                 },
-                "value" : 7500000
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "82801f45"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "58d735f1"
+            }
           } ]
-        } ]
-      },
-      "tradeDate" : {
-        "meta" : {
-          "externalKey" : "TradeDate",
-          "globalKey" : "3e8a58"
-        },
-        "value" : "2001-09-24"
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "33f59568",
+            "externalReference" : "party2"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "33f59567",
+            "externalReference" : "party1"
+          }
+        } ],
+        "ancillaryParty" : [ {
+          "role" : "DisruptionEventsDeterminingParty",
+          "partyReference" : [ {
+            "globalReference" : "33f59567",
+            "externalReference" : "party1"
+          } ]
+        }, {
+          "role" : "ExtraordinaryDividendsParty",
+          "partyReference" : [ {
+            "globalReference" : "33f59567",
+            "externalReference" : "party1"
+          } ]
+        }, {
+          "role" : "CalculationAgentIndependent",
+          "partyReference" : [ {
+            "globalReference" : "33f59567",
+            "externalReference" : "party1"
+          } ]
+        } ],
+        "adjustment" : "Execution"
       },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "Party A",
             "meta" : {
-              "scheme" : "http://www.partyA.com/eqs-trade-id"
-            },
-            "value" : "6234"
+              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+            }
+          },
+          "meta" : {
+            "globalKey" : "33f59567"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
         "meta" : {
-          "globalKey" : "3b465e4f"
+          "globalKey" : "33f59567",
+          "externalKey" : "party1"
         }
       }, {
-        "assignedIdentifier" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "Party B",
             "meta" : {
-              "scheme" : "http://www.partyB.com/eqs-trade-id"
+              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+            }
+          },
+          "meta" : {
+            "globalKey" : "33f59568"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "33f59568",
+          "externalKey" : "party2"
+        }
+      } ],
+      "contractDetails" : {
+        "documentation" : [ {
+          "legalAgreementIdentification" : {
+            "agreementName" : {
+              "agreementType" : "MasterAgreement",
+              "masterAgreementType" : {
+                "value" : "ISDAMaster"
+              }
             },
-            "value" : "6569"
+            "vintage" : 2002
+          },
+          "meta" : {
+            "globalKey" : "328cfa59"
+          }
+        }, {
+          "legalAgreementIdentification" : {
+            "agreementName" : {
+              "agreementType" : "Confirmation",
+              "contractualDefinitionsType" : [ {
+                "value" : "ISDA2000"
+              }, {
+                "value" : "ISDA2002Equity"
+              } ]
+            }
+          },
+          "meta" : {
+            "globalKey" : "ed9ef3fc"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
+        "governingLaw" : {
+          "value" : "GBEN"
         },
         "meta" : {
-          "globalKey" : "384471b6"
+          "globalKey" : "92c7c587"
         }
-      } ]
+      },
+      "meta" : {
+        "globalKey" : "40cdbd47"
+      }
     },
     "transferHistory" : [ {
-      "meta" : {
-        "globalKey" : "3b7f6fc0"
-      },
       "transfer" : {
-        "payerReceiver" : {
-          "payerPartyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "33f59568"
-          },
-          "receiverPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "33f59567"
-          }
-        },
         "quantity" : {
+          "value" : 2000,
           "unit" : {
             "currency" : {
               "value" : "USD"
             }
+          }
+        },
+        "payerReceiver" : {
+          "payerPartyReference" : {
+            "globalReference" : "33f59568",
+            "externalReference" : "party2"
           },
-          "value" : 2000
+          "receiverPartyReference" : {
+            "globalReference" : "33f59567",
+            "externalReference" : "party1"
+          }
         },
         "settlementDate" : {
           "adjustedDate" : {
+            "value" : "2001-09-24",
             "meta" : {
               "globalKey" : "3e8a58"
-            },
-            "value" : "2001-09-24"
+            }
           }
         },
         "transferExpression" : {
-          "priceTransfer" : "INCREASE"
+          "priceTransfer" : "Increase"
         }
+      },
+      "meta" : {
+        "globalKey" : "8b114c04"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "be8d8edd"
+    }
   } ],
-  "eventQualifier" : "Increase",
   "meta" : {
-    "globalKey" : "4d1b1045"
+    "globalKey" : "1a0b32a1"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/partial-termination-equity-swap-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/partial-termination-equity-swap-func-output.json
index 2e204b6b2d..e889813dce 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/partial-termination-equity-swap-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/partial-termination-equity-swap-func-output.json
@@ -1,122 +1,129 @@
 {
   "eventDate" : "2021-11-11",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "a98cacf7"
-        },
-        "trade" : {
-          "contractDetails" : {
-            "documentation" : [ {
-              "legalAgreementIdentification" : {
-                "agreementName" : {
-                  "agreementType" : "MASTER_AGREEMENT",
-                  "masterAgreementType" : {
-                    "value" : "ISDA_MASTER"
-                  }
-                },
-                "vintage" : 2002
-              },
-              "meta" : {
-                "globalKey" : "328cfa59"
+    "primitiveInstruction" : {
+      "quantityChange" : {
+        "change" : [ {
+          "quantity" : [ {
+            "value" : {
+              "value" : 760400,
+              "unit" : {
+                "financialUnit" : "Share"
               }
-            }, {
-              "legalAgreementIdentification" : {
-                "agreementName" : {
-                  "agreementType" : "CONFIRMATION",
-                  "contractualDefinitionsType" : [ {
-                    "value" : "ISDA2000"
-                  }, {
-                    "value" : "ISDA_2002_EQUITY"
-                  } ]
+            }
+          }, {
+            "value" : {
+              "value" : 28469376,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "abe8ee3"
+          }
+        } ],
+        "direction" : "Decrease",
+        "lotIdentifier" : [ {
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "LOT-1"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "4542495"
+          }
+        } ]
+      },
+      "transfer" : {
+        "transferState" : [ {
+          "transfer" : {
+            "quantity" : {
+              "value" : 2000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
                 }
+              }
+            },
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "globalReference" : "33f59568",
+                "externalReference" : "party2"
               },
-              "meta" : {
-                "globalKey" : "ed9ef3fc"
+              "receiverPartyReference" : {
+                "globalReference" : "33f59567",
+                "externalReference" : "party1"
               }
-            } ],
-            "governingLaw" : {
-              "value" : "GBEN"
             },
-            "meta" : {
-              "globalKey" : "92c7c587"
+            "settlementDate" : {
+              "adjustedDate" : {
+                "value" : "2001-09-24",
+                "meta" : {
+                  "globalKey" : "3e8a58"
+                }
+              }
+            },
+            "transferExpression" : {
+              "priceTransfer" : "PartialTermination"
             }
           },
           "meta" : {
-            "globalKey" : "cc3394a9"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "33f59567"
+            "globalKey" : "ff7e2c8"
+          }
+        } ]
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuerReference" : {
+              "globalReference" : "33f59567",
+              "externalReference" : "party1"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "6234",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-                },
-                "value" : "Party A"
-              },
-              "meta" : {
-                "globalKey" : "33f59567"
+                  "scheme" : "http://www.partyA.com/eqs-trade-id"
+                }
               }
-            } ]
-          }, {
+            } ],
             "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "33f59568"
+              "globalKey" : "c921d6eb"
+            }
+          }, {
+            "issuerReference" : {
+              "globalReference" : "33f59568",
+              "externalReference" : "party2"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "6569",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-                },
-                "value" : "Party B"
-              },
-              "meta" : {
-                "globalKey" : "33f59568"
+                  "scheme" : "http://www.partyB.com/eqs-trade-id"
+                }
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "310383ce"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "2001-09-24",
+            "meta" : {
+              "globalKey" : "3e8a58",
+              "externalKey" : "TradeDate"
+            }
+          },
           "tradableProduct" : {
-            "adjustment" : "EXECUTION",
-            "ancillaryParty" : [ {
-              "partyReference" : [ {
-                "externalReference" : "party1",
-                "globalReference" : "33f59567"
-              } ],
-              "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-            }, {
-              "partyReference" : [ {
-                "externalReference" : "party1",
-                "globalReference" : "33f59567"
-              } ],
-              "role" : "EXTRAORDINARY_DIVIDENDS_PARTY"
-            }, {
-              "partyReference" : [ {
-                "externalReference" : "party1",
-                "globalReference" : "33f59567"
-              } ],
-              "role" : "CALCULATION_AGENT_INDEPENDENT"
-            } ],
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "33f59568"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "33f59567"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
-                  "source" : "OTHER",
+                  "source" : "Other",
                   "value" : {
                     "name" : {
                       "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleName"
@@ -127,313 +134,305 @@
                   "productQualifier" : "EquitySwap_TotalReturnBasicPerformance_SingleName"
                 } ],
                 "economicTerms" : {
-                  "calculationAgent" : {
-                    "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-                  },
                   "effectiveDate" : {
-                    "meta" : {
-                      "externalKey" : "EffectiveDate",
-                      "globalKey" : "dbcf5078"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 3,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "dbcf5078"
+                        "globalKey" : "a2cb5f8a"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 3,
-                      "dayType" : "EXCHANGE_BUSINESS",
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "dayType" : "ExchangeBusiness",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "TradeDate",
-                        "globalReference" : "3e8a58"
+                        "globalReference" : "3e8a58",
+                        "externalReference" : "TradeDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "a2cb5f8a",
+                      "externalKey" : "EffectiveDate"
                     }
                   },
-                  "extraordinaryEvents" : {
-                    "additionalDisruptionEvents" : {
-                      "changeInLaw" : true,
-                      "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                      "failureToDeliver" : true,
-                      "hedgingDisruption" : true,
-                      "increasedCostOfHedging" : false,
-                      "increasedCostOfStockBorrow" : false,
-                      "insolvencyFiling" : false,
-                      "lossOfStockBorrow" : true
-                    },
-                    "compositionOfCombinedConsideration" : true,
-                    "mergerEvents" : {
-                      "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                      "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                      "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-                    },
-                    "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-                    "representations" : {
-                      "additionalAcknowledgements" : true,
-                      "agreementsRegardingHedging" : true,
-                      "nonReliance" : true
+                  "terminationDate" : {
+                    "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
+                      "meta" : {
+                        "globalKey" : "edf02740"
+                      },
+                      "businessDayConvention" : "NotApplicable",
+                      "dateRelativeTo" : {
+                        "globalReference" : "bee88507",
+                        "externalReference" : "FinalEquityPaymentDate"
+                      }
                     },
-                    "tenderOfferEvents" : {
-                      "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                      "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                      "shareForShare" : "MODIFIED_CALCULATION_AGENT"
+                    "meta" : {
+                      "globalKey" : "edf02740",
+                      "externalKey" : "TerminationDate"
                     }
                   },
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "2fdf0b8c"
-                        },
-                        "quantityReference" : {
-                          "externalReference" : "EquityNotionalAmount",
-                          "globalReference" : "4cf"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "quantityReference" : {
+                          "globalReference" : "4cf",
+                          "externalReference" : "EquityNotionalAmount"
+                        },
+                        "meta" : {
+                          "globalKey" : "2fdf0b8c"
+                        }
+                      },
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
+                            }
+                          },
+                          "spreadSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-2"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
                         }
                       },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
                       "calculationPeriodDates" : {
                         "effectiveDate" : {
-                          "meta" : {
-                            "globalKey" : "dbcf5078"
-                          },
                           "relativeDate" : {
+                            "periodMultiplier" : 3,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "dbcf5078"
+                              "globalKey" : "a2cb5f8a"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 3,
-                            "dayType" : "EXCHANGE_BUSINESS",
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "dayType" : "ExchangeBusiness",
+                            "businessDayConvention" : "NotApplicable",
                             "dateRelativeTo" : {
-                              "externalReference" : "TradeDate",
-                              "globalReference" : "3e8a58"
+                              "globalReference" : "3e8a58",
+                              "externalReference" : "TradeDate"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "a2cb5f8a"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "InterestLegPeriodDates",
-                          "globalKey" : "e7334d0"
-                        },
                         "terminationDate" : {
-                          "meta" : {
-                            "globalKey" : "f18f7c48"
-                          },
                           "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "f18f7c48"
+                              "globalKey" : "edf02740"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "dateRelativeTo" : {
-                              "externalReference" : "FinalEquityPaymentDate",
-                              "globalReference" : "86542f29"
+                              "globalReference" : "bee88507",
+                              "externalReference" : "FinalEquityPaymentDate"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "edf02740"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "2fce1876",
+                          "externalKey" : "InterestLegPeriodDates"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "8306e5d6"
-                      },
                       "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "9b9d36de"
-                        },
                         "paymentDateSchedule" : {
                           "interimPaymentDates" : [ {
-                            "meta" : {
-                              "globalKey" : "9b9d36de"
-                            },
                             "relativeDates" : {
+                              "periodMultiplier" : 0,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "9b9d36de"
+                                "globalKey" : "97fde1d6"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 0,
-                              "businessDayConvention" : "NOT_APPLICABLE",
+                              "businessDayConvention" : "NotApplicable",
                               "dateRelativeTo" : {
-                                "externalReference" : "EquityPaymentDate",
-                                "globalReference" : "fb15beed"
+                                "globalReference" : "1a999e73",
+                                "externalReference" : "EquityPaymentDate"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "97fde1d6"
                             }
                           } ]
-                        }
-                      },
-                      "rateSpecification" : {
-                        "floatingRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
-                            }
-                          },
-                          "spreadSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-2"
-                              }
-                            }
-                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "97fde1d6"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "InterestLegPeriodDates",
-                          "globalReference" : "e7334d0"
+                          "globalReference" : "2fce1876",
+                          "externalReference" : "InterestLegPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "meta" : {
-                          "globalKey" : "9ab7a6fd"
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "globalKey" : "bc128aa3"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3cd0e14e"
                       }
                     } ],
-                    "meta" : {
-                      "globalKey" : "3d9bbe0"
-                    },
                     "performancePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "externalKey" : "EquityNotionalAmount",
-                          "globalKey" : "4cf"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
                         },
-                        "reset" : true
+                        "reset" : true,
+                        "meta" : {
+                          "globalKey" : "4cf",
+                          "externalKey" : "EquityNotionalAmount"
+                        }
                       },
                       "settlementTerms" : {
-                        "meta" : {
-                          "globalKey" : "7610bbd9"
-                        },
+                        "settlementType" : "Cash",
                         "settlementCurrency" : {
                           "value" : "USD"
                         },
-                        "settlementType" : "CASH"
-                      },
-                      "meta" : {
-                        "globalKey" : "bd1fe08a"
-                      },
-                      "paymentDates" : {
                         "meta" : {
-                          "externalKey" : "EquityPaymentDate",
-                          "globalKey" : "fb15beed"
-                        },
-                        "paymentDateSchedule" : {
-                          "finalPaymentDate" : {
-                            "meta" : {
-                              "externalKey" : "FinalEquityPaymentDate",
-                              "globalKey" : "86542f29"
-                            },
-                            "relativeDate" : {
-                              "meta" : {
-                                "globalKey" : "86542f29"
+                          "globalKey" : "7610bbd9"
+                        }
+                      },
+                      "valuationDates" : {
+                        "valuationDatesInterim" : {
+                          "determinationMethod" : "ValuationTime",
+                          "valuationDates" : {
+                            "adjustableDates" : {
+                              "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ],
+                              "dateAdjustments" : {
+                                "businessDayConvention" : "NotApplicable",
+                                "meta" : {
+                                  "globalKey" : "3a4b88ab"
+                                }
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 3,
-                              "dayType" : "CURRENCY_BUSINESS",
-                              "businessCentersReference" : {
-                                "externalReference" : "PrimaryBusinessCenter",
-                                "globalReference" : "27e4e9"
+                              "meta" : {
+                                "globalKey" : "e80e5233"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "e80e5233",
+                              "externalKey" : "InterimValuationDate"
+                            }
+                          },
+                          "valuationTimeType" : "Close",
+                          "meta" : {
+                            "globalKey" : "374dddc6"
+                          }
+                        },
+                        "valuationDatesFinal" : {
+                          "determinationMethod" : "HedgeExecution",
+                          "valuationDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2002-09-24",
+                              "dateAdjustments" : {
+                                "businessDayConvention" : "NotApplicable",
+                                "meta" : {
+                                  "globalKey" : "3a4b88ab"
+                                }
                               },
-                              "businessDayConvention" : "FOLLOWING",
-                              "dateRelativeTo" : {
-                                "externalReference" : "FinalValuationDate",
-                                "globalReference" : "252ee503"
+                              "meta" : {
+                                "globalKey" : "252ee503"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "252ee503",
+                              "externalKey" : "FinalValuationDate"
                             }
                           },
+                          "meta" : {
+                            "globalKey" : "96fa6685"
+                          }
+                        }
+                      },
+                      "paymentDates" : {
+                        "paymentDateSchedule" : {
                           "interimPaymentDates" : [ {
-                            "meta" : {
-                              "externalKey" : "InterimEquityPaymentDate",
-                              "globalKey" : "2519d1b6"
-                            },
                             "relativeDates" : {
+                              "periodMultiplier" : 3,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "2519d1b6"
+                                "globalKey" : "dfe60714"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 3,
-                              "dayType" : "CURRENCY_BUSINESS",
+                              "dayType" : "CurrencyBusiness",
+                              "businessDayConvention" : "FOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "USNY"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "PrimaryBusinessCenter",
-                                  "globalKey" : "27e4e9"
+                                  "globalKey" : "27e4e9",
+                                  "externalKey" : "PrimaryBusinessCenter"
                                 }
                               },
-                              "businessDayConvention" : "FOLLOWING",
                               "dateRelativeTo" : {
-                                "externalReference" : "InterimValuationDate",
-                                "globalReference" : "e80e5233"
+                                "globalReference" : "e80e5233",
+                                "externalReference" : "InterimValuationDate"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "dfe60714",
+                              "externalKey" : "InterimEquityPaymentDate"
                             }
-                          } ]
-                        }
-                      },
-                      "returnTerms" : {
-                        "dividendReturnTerms" : {
-                          "dividendCurrency" : {
-                            "determinationMethod" : "DIVIDEND_CURRENCY"
-                          },
-                          "dividendEntitlement" : "EX_DATE",
-                          "dividendPayoutRatio" : [ {
-                            "totalRatio" : 1
                           } ],
-                          "dividendPeriod" : [ {
-                            "dividendPaymentDate" : {
-                              "dividendDateReference" : {
-                                "dateReference" : "EQUITY_PAYMENT_DATE"
-                              }
-                            },
-                            "endDate" : {
-                              "dividendDate" : {
-                                "externalReference" : "TerminationDate",
-                                "globalReference" : "f18f7c48"
+                          "finalPaymentDate" : {
+                            "relativeDate" : {
+                              "periodMultiplier" : 3,
+                              "period" : "D",
+                              "meta" : {
+                                "globalKey" : "bee88507"
+                              },
+                              "dayType" : "CurrencyBusiness",
+                              "businessDayConvention" : "FOLLOWING",
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "PrimaryBusinessCenter"
+                              },
+                              "dateRelativeTo" : {
+                                "globalReference" : "252ee503",
+                                "externalReference" : "FinalValuationDate"
                               }
                             },
-                            "startDate" : {
-                              "dividendDate" : {
-                                "externalReference" : "TradeDate",
-                                "globalReference" : "3e8a58"
-                              }
+                            "meta" : {
+                              "globalKey" : "bee88507",
+                              "externalKey" : "FinalEquityPaymentDate"
                             }
-                          } ],
-                          "dividendReinvestment" : false,
-                          "excessDividendAmount" : "RECORD_AMOUNT",
-                          "extraordinaryDividendsParty" : "EXTRAORDINARY_DIVIDENDS_PARTY"
+                          }
                         },
-                        "priceReturnTerms" : {
-                          "returnType" : "TOTAL"
+                        "meta" : {
+                          "globalKey" : "1a999e73",
+                          "externalKey" : "EquityPaymentDate"
                         }
                       },
                       "underlier" : {
-                        "meta" : {
-                          "globalKey" : "7a5b92c5"
-                        },
                         "security" : {
                           "productIdentifier" : [ {
                             "address" : {
@@ -446,87 +445,95 @@
                               "value" : "productIdentifier-2"
                             }
                           } ],
-                          "securityType" : "EQUITY"
+                          "securityType" : "Equity"
+                        },
+                        "meta" : {
+                          "globalKey" : "7a5b92c5"
                         }
                       },
-                      "valuationDates" : {
-                        "valuationDatesFinal" : {
-                          "determinationMethod" : "HEDGE_EXECUTION",
-                          "meta" : {
-                            "globalKey" : "96fa6685"
-                          },
-                          "valuationDate" : {
-                            "adjustableDate" : {
-                              "dateAdjustments" : {
-                                "businessDayConvention" : "NOT_APPLICABLE",
-                                "meta" : {
-                                  "globalKey" : "3a4b88ab"
-                                }
-                              },
-                              "meta" : {
-                                "globalKey" : "252ee503"
-                              },
-                              "unadjustedDate" : "2002-09-24"
-                            },
-                            "meta" : {
-                              "externalKey" : "FinalValuationDate",
-                              "globalKey" : "252ee503"
-                            }
-                          }
+                      "returnTerms" : {
+                        "priceReturnTerms" : {
+                          "returnType" : "Total"
                         },
-                        "valuationDatesInterim" : {
-                          "determinationMethod" : "VALUATION_TIME",
-                          "meta" : {
-                            "globalKey" : "374dddc6"
+                        "dividendReturnTerms" : {
+                          "dividendPayoutRatio" : [ {
+                            "totalRatio" : 1
+                          } ],
+                          "dividendReinvestment" : false,
+                          "dividendEntitlement" : "ExDate",
+                          "extraordinaryDividendsParty" : "ExtraordinaryDividendsParty",
+                          "excessDividendAmount" : "RecordAmount",
+                          "dividendCurrency" : {
+                            "determinationMethod" : "DividendCurrency"
                           },
-                          "valuationDates" : {
-                            "adjustableDates" : {
-                              "dateAdjustments" : {
-                                "businessDayConvention" : "NOT_APPLICABLE",
-                                "meta" : {
-                                  "globalKey" : "3a4b88ab"
-                                }
-                              },
-                              "meta" : {
-                                "globalKey" : "e80e5233"
-                              },
-                              "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ]
+                          "dividendPeriod" : [ {
+                            "startDate" : {
+                              "dividendDate" : {
+                                "globalReference" : "3e8a58",
+                                "externalReference" : "TradeDate"
+                              }
                             },
-                            "meta" : {
-                              "externalKey" : "InterimValuationDate",
-                              "globalKey" : "e80e5233"
+                            "endDate" : {
+                              "dividendDate" : {
+                                "globalReference" : "edf02740",
+                                "externalReference" : "TerminationDate"
+                              }
+                            },
+                            "dividendPaymentDate" : {
+                              "dividendDateReference" : {
+                                "dateReference" : "EquityPaymentDate"
+                              }
                             }
-                          },
-                          "valuationTimeType" : "CLOSE"
+                          } ]
                         }
-                      }
-                    } ]
-                  },
-                  "terminationDate" : {
-                    "meta" : {
-                      "externalKey" : "TerminationDate",
-                      "globalKey" : "f18f7c48"
-                    },
-                    "relativeDate" : {
-                      "meta" : {
-                        "globalKey" : "f18f7c48"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
-                      "businessDayConvention" : "NOT_APPLICABLE",
-                      "dateRelativeTo" : {
-                        "externalReference" : "FinalEquityPaymentDate",
-                        "globalReference" : "86542f29"
+                      "meta" : {
+                        "globalKey" : "5d54351a"
                       }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "d204e9e8"
                     }
+                  },
+                  "extraordinaryEvents" : {
+                    "mergerEvents" : {
+                      "shareForShare" : "ModifiedCalculationAgent",
+                      "shareForOther" : "ModifiedCalculationAgent",
+                      "shareForCombined" : "ModifiedCalculationAgent"
+                    },
+                    "tenderOfferEvents" : {
+                      "shareForShare" : "ModifiedCalculationAgent",
+                      "shareForOther" : "ModifiedCalculationAgent",
+                      "shareForCombined" : "ModifiedCalculationAgent"
+                    },
+                    "compositionOfCombinedConsideration" : true,
+                    "additionalDisruptionEvents" : {
+                      "changeInLaw" : true,
+                      "failureToDeliver" : true,
+                      "insolvencyFiling" : false,
+                      "hedgingDisruption" : true,
+                      "increasedCostOfHedging" : false,
+                      "lossOfStockBorrow" : true,
+                      "increasedCostOfStockBorrow" : false,
+                      "determiningParty" : "DisruptionEventsDeterminingParty"
+                    },
+                    "representations" : {
+                      "nonReliance" : true,
+                      "agreementsRegardingHedging" : true,
+                      "additionalAcknowledgements" : true
+                    },
+                    "nationalizationOrInsolvency" : "CancellationAndPayment"
+                  },
+                  "calculationAgent" : {
+                    "calculationAgentParty" : "CalculationAgentIndependent"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "95be1b14"
+                  "globalKey" : "8b69cf3e"
                 }
               },
               "meta" : {
-                "globalKey" : "95be1b14"
+                "globalKey" : "8b69cf3e"
               }
             },
             "tradeLot" : [ {
@@ -541,151 +548,151 @@
                 }
               } ],
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "417e440b"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "26bb033f"
-                  },
-                  "productIdentifier" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-1"
-                      } ]
+                "price" : [ {
+                  "value" : {
+                    "value" : 37.44,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
                     },
-                    "value" : {
-                      "identifier" : {
-                        "meta" : {
-                          "scheme" : "http://www.abc.com/instrumentId"
-                        },
-                        "value" : "SHPGY.O"
-                      },
-                      "meta" : {
-                        "globalKey" : "8c85a05e"
-                      },
-                      "source" : "OTHER"
-                    }
-                  }, {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-2"
-                      } ]
+                    "perUnitOf" : {
+                      "financialUnit" : "Share"
                     },
-                    "value" : {
-                      "identifier" : {
-                        "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
-                      },
-                      "meta" : {
-                        "globalKey" : "5518dd"
-                      },
-                      "source" : "NAME"
-                    }
-                  } ]
-                },
-                "price" : [ {
+                    "priceType" : "AssetPrice"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "price-1"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 37.44,
-                    "perUnitOf" : {
-                      "financialUnit" : "SHARE"
-                    },
-                    "priceType" : "ASSET_PRICE"
                   }
                 } ],
                 "quantity" : [ {
+                  "value" : {
+                    "value" : 760400,
+                    "unit" : {
+                      "financialUnit" : "Share"
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "financialUnit" : "SHARE"
-                    },
-                    "value" : 760400
                   }
                 }, {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 28469376,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
-                    },
-                    "value" : 28469376
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    } ]
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "7dd9ec3"
-                },
+                } ],
                 "observable" : {
-                  "meta" : {
-                    "globalKey" : "5f0c6d03"
-                  },
-                  "rateOption" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "SHPGY.O",
+                        "meta" : {
+                          "scheme" : "http://www.abc.com/instrumentId"
+                        }
+                      },
+                      "source" : "Other",
+                      "meta" : {
+                        "globalKey" : "8c85a05e"
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                        "value" : "productIdentifier-1"
                       } ]
-                    },
+                    }
+                  }, {
                     "value" : {
-                      "floatingRateIndex" : {
-                        "value" : "USD-LIBOR-BBA"
+                      "identifier" : {
+                        "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
                       },
-                      "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "954"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 1
+                      "source" : "Name",
+                      "meta" : {
+                        "globalKey" : "5518dd"
                       }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-2"
+                      } ]
                     }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "b0a564a1"
                   }
                 },
+                "meta" : {
+                  "globalKey" : "b4fad14b"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.002,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 0.002,
-                    "arithmeticOperator" : "ADD",
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
+                    "priceType" : "InterestRate",
+                    "arithmeticOperator" : "Add"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-2"
+                    } ]
                   }
-                } ]
+                } ],
+                "observable" : {
+                  "rateOption" : {
+                    "value" : {
+                      "floatingRateIndex" : {
+                        "value" : "USD-LIBOR-BBA"
+                      },
+                      "indexTenor" : {
+                        "periodMultiplier" : 1,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "6c"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "82801f45"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "95c8caad"
+                }
               } ]
             }, {
               "lotIdentifier" : [ {
@@ -699,409 +706,334 @@
                 }
               } ],
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "695bc1d0"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "8c85a05e"
-                  },
-                  "productIdentifier" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-1"
-                      } ]
-                    },
-                    "value" : {
-                      "identifier" : {
-                        "meta" : {
-                          "scheme" : "http://www.abc.com/instrumentId"
-                        },
-                        "value" : "SHPGY.O"
-                      },
-                      "meta" : {
-                        "globalKey" : "8c85a05e"
-                      },
-                      "source" : "OTHER"
-                    }
-                  } ]
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 30,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 30,
                     "perUnitOf" : {
-                      "financialUnit" : "SHARE"
+                      "financialUnit" : "Share"
                     },
-                    "priceType" : "ASSET_PRICE"
+                    "priceType" : "AssetPrice"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-2"
+                    } ]
                   }
                 } ],
                 "quantity" : [ {
+                  "value" : {
+                    "value" : 250000,
+                    "unit" : {
+                      "financialUnit" : "Share"
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "financialUnit" : "SHARE"
-                    },
-                    "value" : 250000
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "d7b3bff1"
-                },
+                } ],
                 "observable" : {
-                  "meta" : {
-                    "globalKey" : "5f0c6d03"
-                  },
-                  "rateOption" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "SHPGY.O",
+                        "meta" : {
+                          "scheme" : "http://www.abc.com/instrumentId"
+                        }
+                      },
+                      "source" : "Other",
+                      "meta" : {
+                        "globalKey" : "8c85a05e"
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                        "value" : "productIdentifier-1"
                       } ]
-                    },
-                    "value" : {
-                      "floatingRateIndex" : {
-                        "value" : "USD-LIBOR-BBA"
-                      },
-                      "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "954"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 1
-                      }
                     }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "42e6b62"
                   }
                 },
+                "meta" : {
+                  "globalKey" : "aa7176d4"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.002,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 0.002,
-                    "arithmeticOperator" : "ADD",
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate",
+                    "arithmeticOperator" : "Add"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 7500000,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    } ]
+                  }
+                } ],
+                "observable" : {
+                  "rateOption" : {
+                    "value" : {
+                      "floatingRateIndex" : {
+                        "value" : "USD-LIBOR-BBA"
+                      },
+                      "indexTenor" : {
+                        "periodMultiplier" : 1,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "6c"
+                        }
+                      }
                     },
-                    "value" : 7500000
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "82801f45"
                   }
-                } ]
+                },
+                "meta" : {
+                  "globalKey" : "58d735f1"
+                }
               } ]
-            } ]
-          },
-          "tradeDate" : {
-            "meta" : {
-              "externalKey" : "TradeDate",
-              "globalKey" : "3e8a58"
-            },
-            "value" : "2001-09-24"
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "33f59568",
+                "externalReference" : "party2"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "33f59567",
+                "externalReference" : "party1"
+              }
+            } ],
+            "ancillaryParty" : [ {
+              "role" : "DisruptionEventsDeterminingParty",
+              "partyReference" : [ {
+                "globalReference" : "33f59567",
+                "externalReference" : "party1"
+              } ]
+            }, {
+              "role" : "ExtraordinaryDividendsParty",
+              "partyReference" : [ {
+                "globalReference" : "33f59567",
+                "externalReference" : "party1"
+              } ]
+            }, {
+              "role" : "CalculationAgentIndependent",
+              "partyReference" : [ {
+                "globalReference" : "33f59567",
+                "externalReference" : "party1"
+              } ]
+            } ],
+            "adjustment" : "Execution"
           },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "Party A",
                 "meta" : {
-                  "scheme" : "http://www.partyA.com/eqs-trade-id"
-                },
-                "value" : "6234"
+                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+                }
+              },
+              "meta" : {
+                "globalKey" : "33f59567"
               }
             } ],
-            "issuerReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "33f59567"
-            },
             "meta" : {
-              "globalKey" : "3b465e4f"
+              "globalKey" : "33f59567",
+              "externalKey" : "party1"
             }
           }, {
-            "assignedIdentifier" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "Party B",
                 "meta" : {
-                  "scheme" : "http://www.partyB.com/eqs-trade-id"
-                },
-                "value" : "6569"
+                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+                }
+              },
+              "meta" : {
+                "globalKey" : "33f59568"
               }
             } ],
-            "issuerReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "33f59568"
-            },
             "meta" : {
-              "globalKey" : "384471b6"
+              "globalKey" : "33f59568",
+              "externalKey" : "party2"
             }
-          } ]
-        },
-        "transferHistory" : [ {
-          "meta" : {
-            "globalKey" : "3b7f6fc0"
-          },
-          "transfer" : {
-            "payerReceiver" : {
-              "payerPartyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "33f59568"
+          } ],
+          "contractDetails" : {
+            "documentation" : [ {
+              "legalAgreementIdentification" : {
+                "agreementName" : {
+                  "agreementType" : "MasterAgreement",
+                  "masterAgreementType" : {
+                    "value" : "ISDAMaster"
+                  }
+                },
+                "vintage" : 2002
               },
-              "receiverPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "33f59567"
+              "meta" : {
+                "globalKey" : "328cfa59"
               }
-            },
-            "quantity" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
+            }, {
+              "legalAgreementIdentification" : {
+                "agreementName" : {
+                  "agreementType" : "Confirmation",
+                  "contractualDefinitionsType" : [ {
+                    "value" : "ISDA2000"
+                  }, {
+                    "value" : "ISDA2002Equity"
+                  } ]
                 }
               },
-              "value" : 2000
-            },
-            "settlementDate" : {
-              "adjustedDate" : {
-                "meta" : {
-                  "globalKey" : "3e8a58"
-                },
-                "value" : "2001-09-24"
+              "meta" : {
+                "globalKey" : "ed9ef3fc"
               }
+            } ],
+            "governingLaw" : {
+              "value" : "GBEN"
             },
-            "transferExpression" : {
-              "priceTransfer" : "INCREASE"
+            "meta" : {
+              "globalKey" : "92c7c587"
             }
-          }
-        } ]
-      }
-    },
-    "primitiveInstruction" : {
-      "quantityChange" : {
-        "change" : [ {
-          "meta" : {
-            "globalKey" : "abe8ee3"
           },
-          "quantity" : [ {
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 760400
-            }
-          }, {
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 28469376
-            }
-          } ]
-        } ],
-        "direction" : "DECREASE",
-        "lotIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "value" : "LOT-1"
-            }
-          } ],
           "meta" : {
-            "globalKey" : "4542495"
+            "globalKey" : "40cdbd47"
           }
-        } ]
-      },
-      "transfer" : {
-        "transferState" : [ {
-          "meta" : {
-            "globalKey" : "c0660684"
-          },
+        },
+        "transferHistory" : [ {
           "transfer" : {
-            "payerReceiver" : {
-              "payerPartyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "33f59568"
-              },
-              "receiverPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "33f59567"
-              }
-            },
             "quantity" : {
+              "value" : 2000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
+              }
+            },
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "globalReference" : "33f59568",
+                "externalReference" : "party2"
               },
-              "value" : 2000
+              "receiverPartyReference" : {
+                "globalReference" : "33f59567",
+                "externalReference" : "party1"
+              }
             },
             "settlementDate" : {
               "adjustedDate" : {
+                "value" : "2001-09-24",
                 "meta" : {
                   "globalKey" : "3e8a58"
-                },
-                "value" : "2001-09-24"
+                }
               }
             },
             "transferExpression" : {
-              "priceTransfer" : "PARTIAL_TERMINATION"
+              "priceTransfer" : "Increase"
             }
+          },
+          "meta" : {
+            "globalKey" : "8b114c04"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "be8d8edd"
+        }
       }
     }
   } ],
   "after" : [ {
-    "meta" : {
-      "globalKey" : "7ffefb2d"
-    },
     "trade" : {
-      "contractDetails" : {
-        "documentation" : [ {
-          "legalAgreementIdentification" : {
-            "agreementName" : {
-              "agreementType" : "MASTER_AGREEMENT",
-              "masterAgreementType" : {
-                "value" : "ISDA_MASTER"
-              }
-            },
-            "vintage" : 2002
-          },
-          "meta" : {
-            "globalKey" : "328cfa59"
-          }
-        }, {
-          "legalAgreementIdentification" : {
-            "agreementName" : {
-              "agreementType" : "CONFIRMATION",
-              "contractualDefinitionsType" : [ {
-                "value" : "ISDA2000"
-              }, {
-                "value" : "ISDA_2002_EQUITY"
-              } ]
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        },
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "6234",
+            "meta" : {
+              "scheme" : "http://www.partyA.com/eqs-trade-id"
             }
-          },
-          "meta" : {
-            "globalKey" : "ed9ef3fc"
           }
         } ],
-        "governingLaw" : {
-          "value" : "GBEN"
-        },
         "meta" : {
-          "globalKey" : "92c7c587"
+          "globalKey" : "c921d6eb"
         }
-      },
-      "meta" : {
-        "globalKey" : "cc3394a9"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "33f59567"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-            },
-            "value" : "Party A"
-          },
-          "meta" : {
-            "globalKey" : "33f59567"
-          }
-        } ]
       }, {
-        "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "33f59568"
+        "issuerReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-            },
-            "value" : "Party B"
-          },
-          "meta" : {
-            "globalKey" : "33f59568"
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "6569",
+            "meta" : {
+              "scheme" : "http://www.partyB.com/eqs-trade-id"
+            }
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "310383ce"
+        }
       } ],
+      "tradeDate" : {
+        "value" : "2001-09-24",
+        "meta" : {
+          "globalKey" : "3e8a58",
+          "externalKey" : "TradeDate"
+        }
+      },
       "tradableProduct" : {
-        "adjustment" : "EXECUTION",
-        "ancillaryParty" : [ {
-          "partyReference" : [ {
-            "externalReference" : "party1",
-            "globalReference" : "33f59567"
-          } ],
-          "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-        }, {
-          "partyReference" : [ {
-            "externalReference" : "party1",
-            "globalReference" : "33f59567"
-          } ],
-          "role" : "EXTRAORDINARY_DIVIDENDS_PARTY"
-        }, {
-          "partyReference" : [ {
-            "externalReference" : "party1",
-            "globalReference" : "33f59567"
-          } ],
-          "role" : "CALCULATION_AGENT_INDEPENDENT"
-        } ],
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "33f59568"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "33f59567"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
-              "source" : "OTHER",
+              "source" : "Other",
               "value" : {
                 "name" : {
                   "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleName"
@@ -1112,313 +1044,305 @@
               "productQualifier" : "EquitySwap_TotalReturnBasicPerformance_SingleName"
             } ],
             "economicTerms" : {
-              "calculationAgent" : {
-                "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-              },
               "effectiveDate" : {
-                "meta" : {
-                  "externalKey" : "EffectiveDate",
-                  "globalKey" : "dbcf5078"
-                },
                 "relativeDate" : {
+                  "periodMultiplier" : 3,
+                  "period" : "D",
                   "meta" : {
-                    "globalKey" : "dbcf5078"
+                    "globalKey" : "a2cb5f8a"
                   },
-                  "period" : "D",
-                  "periodMultiplier" : 3,
-                  "dayType" : "EXCHANGE_BUSINESS",
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "dayType" : "ExchangeBusiness",
+                  "businessDayConvention" : "NotApplicable",
                   "dateRelativeTo" : {
-                    "externalReference" : "TradeDate",
-                    "globalReference" : "3e8a58"
+                    "globalReference" : "3e8a58",
+                    "externalReference" : "TradeDate"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "a2cb5f8a",
+                  "externalKey" : "EffectiveDate"
                 }
               },
-              "extraordinaryEvents" : {
-                "additionalDisruptionEvents" : {
-                  "changeInLaw" : true,
-                  "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                  "failureToDeliver" : true,
-                  "hedgingDisruption" : true,
-                  "increasedCostOfHedging" : false,
-                  "increasedCostOfStockBorrow" : false,
-                  "insolvencyFiling" : false,
-                  "lossOfStockBorrow" : true
-                },
-                "compositionOfCombinedConsideration" : true,
-                "mergerEvents" : {
-                  "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                  "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                  "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-                },
-                "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-                "representations" : {
-                  "additionalAcknowledgements" : true,
-                  "agreementsRegardingHedging" : true,
-                  "nonReliance" : true
+              "terminationDate" : {
+                "relativeDate" : {
+                  "periodMultiplier" : 0,
+                  "period" : "D",
+                  "meta" : {
+                    "globalKey" : "edf02740"
+                  },
+                  "businessDayConvention" : "NotApplicable",
+                  "dateRelativeTo" : {
+                    "globalReference" : "bee88507",
+                    "externalReference" : "FinalEquityPaymentDate"
+                  }
                 },
-                "tenderOfferEvents" : {
-                  "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                  "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                  "shareForShare" : "MODIFIED_CALCULATION_AGENT"
+                "meta" : {
+                  "globalKey" : "edf02740",
+                  "externalKey" : "TerminationDate"
                 }
               },
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "2fdf0b8c"
-                    },
-                    "quantityReference" : {
-                      "externalReference" : "EquityNotionalAmount",
-                      "globalReference" : "4cf"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "quantityReference" : {
+                      "globalReference" : "4cf",
+                      "externalReference" : "EquityNotionalAmount"
+                    },
+                    "meta" : {
+                      "globalKey" : "2fdf0b8c"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        }
+                      },
+                      "spreadSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-2"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
                     }
                   },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
                   "calculationPeriodDates" : {
                     "effectiveDate" : {
-                      "meta" : {
-                        "globalKey" : "dbcf5078"
-                      },
                       "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "dbcf5078"
+                          "globalKey" : "a2cb5f8a"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "EXCHANGE_BUSINESS",
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "dayType" : "ExchangeBusiness",
+                        "businessDayConvention" : "NotApplicable",
                         "dateRelativeTo" : {
-                          "externalReference" : "TradeDate",
-                          "globalReference" : "3e8a58"
+                          "globalReference" : "3e8a58",
+                          "externalReference" : "TradeDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "a2cb5f8a"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "InterestLegPeriodDates",
-                      "globalKey" : "e7334d0"
-                    },
                     "terminationDate" : {
-                      "meta" : {
-                        "globalKey" : "f18f7c48"
-                      },
                       "relativeDate" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "f18f7c48"
+                          "globalKey" : "edf02740"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "dateRelativeTo" : {
-                          "externalReference" : "FinalEquityPaymentDate",
-                          "globalReference" : "86542f29"
+                          "globalReference" : "bee88507",
+                          "externalReference" : "FinalEquityPaymentDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "edf02740"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "2fce1876",
+                      "externalKey" : "InterestLegPeriodDates"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "8306e5d6"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "9b9d36de"
-                    },
                     "paymentDateSchedule" : {
                       "interimPaymentDates" : [ {
-                        "meta" : {
-                          "globalKey" : "9b9d36de"
-                        },
                         "relativeDates" : {
+                          "periodMultiplier" : 0,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "9b9d36de"
+                            "globalKey" : "97fde1d6"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 0,
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                          "businessDayConvention" : "NotApplicable",
                           "dateRelativeTo" : {
-                            "externalReference" : "EquityPaymentDate",
-                            "globalReference" : "fb15beed"
+                            "globalReference" : "1a999e73",
+                            "externalReference" : "EquityPaymentDate"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "97fde1d6"
                         }
                       } ]
-                    }
-                  },
-                  "rateSpecification" : {
-                    "floatingRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        }
-                      },
-                      "spreadSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-2"
-                          }
-                        }
-                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "97fde1d6"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "InterestLegPeriodDates",
-                      "globalReference" : "e7334d0"
+                      "globalReference" : "2fce1876",
+                      "externalReference" : "InterestLegPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "meta" : {
-                      "globalKey" : "9ab7a6fd"
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                      "globalKey" : "bc128aa3"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3cd0e14e"
                   }
                 } ],
-                "meta" : {
-                  "globalKey" : "3d9bbe0"
-                },
                 "performancePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "externalKey" : "EquityNotionalAmount",
-                      "globalKey" : "4cf"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
                     },
-                    "reset" : true
+                    "reset" : true,
+                    "meta" : {
+                      "globalKey" : "4cf",
+                      "externalKey" : "EquityNotionalAmount"
+                    }
                   },
                   "settlementTerms" : {
-                    "meta" : {
-                      "globalKey" : "7610bbd9"
-                    },
+                    "settlementType" : "Cash",
                     "settlementCurrency" : {
                       "value" : "USD"
                     },
-                    "settlementType" : "CASH"
-                  },
-                  "meta" : {
-                    "globalKey" : "bd1fe08a"
-                  },
-                  "paymentDates" : {
                     "meta" : {
-                      "externalKey" : "EquityPaymentDate",
-                      "globalKey" : "fb15beed"
-                    },
-                    "paymentDateSchedule" : {
-                      "finalPaymentDate" : {
-                        "meta" : {
-                          "externalKey" : "FinalEquityPaymentDate",
-                          "globalKey" : "86542f29"
-                        },
-                        "relativeDate" : {
-                          "meta" : {
-                            "globalKey" : "86542f29"
+                      "globalKey" : "7610bbd9"
+                    }
+                  },
+                  "valuationDates" : {
+                    "valuationDatesInterim" : {
+                      "determinationMethod" : "ValuationTime",
+                      "valuationDates" : {
+                        "adjustableDates" : {
+                          "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ],
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NotApplicable",
+                            "meta" : {
+                              "globalKey" : "3a4b88ab"
+                            }
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 3,
-                          "dayType" : "CURRENCY_BUSINESS",
-                          "businessCentersReference" : {
-                            "externalReference" : "PrimaryBusinessCenter",
-                            "globalReference" : "27e4e9"
+                          "meta" : {
+                            "globalKey" : "e80e5233"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "e80e5233",
+                          "externalKey" : "InterimValuationDate"
+                        }
+                      },
+                      "valuationTimeType" : "Close",
+                      "meta" : {
+                        "globalKey" : "374dddc6"
+                      }
+                    },
+                    "valuationDatesFinal" : {
+                      "determinationMethod" : "HedgeExecution",
+                      "valuationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2002-09-24",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NotApplicable",
+                            "meta" : {
+                              "globalKey" : "3a4b88ab"
+                            }
                           },
-                          "businessDayConvention" : "FOLLOWING",
-                          "dateRelativeTo" : {
-                            "externalReference" : "FinalValuationDate",
-                            "globalReference" : "252ee503"
+                          "meta" : {
+                            "globalKey" : "252ee503"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "252ee503",
+                          "externalKey" : "FinalValuationDate"
                         }
                       },
+                      "meta" : {
+                        "globalKey" : "96fa6685"
+                      }
+                    }
+                  },
+                  "paymentDates" : {
+                    "paymentDateSchedule" : {
                       "interimPaymentDates" : [ {
-                        "meta" : {
-                          "externalKey" : "InterimEquityPaymentDate",
-                          "globalKey" : "2519d1b6"
-                        },
                         "relativeDates" : {
+                          "periodMultiplier" : 3,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "2519d1b6"
+                            "globalKey" : "dfe60714"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 3,
-                          "dayType" : "CURRENCY_BUSINESS",
+                          "dayType" : "CurrencyBusiness",
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "USNY"
                             } ],
                             "meta" : {
-                              "externalKey" : "PrimaryBusinessCenter",
-                              "globalKey" : "27e4e9"
+                              "globalKey" : "27e4e9",
+                              "externalKey" : "PrimaryBusinessCenter"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "dateRelativeTo" : {
-                            "externalReference" : "InterimValuationDate",
-                            "globalReference" : "e80e5233"
+                            "globalReference" : "e80e5233",
+                            "externalReference" : "InterimValuationDate"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "dfe60714",
+                          "externalKey" : "InterimEquityPaymentDate"
                         }
-                      } ]
-                    }
-                  },
-                  "returnTerms" : {
-                    "dividendReturnTerms" : {
-                      "dividendCurrency" : {
-                        "determinationMethod" : "DIVIDEND_CURRENCY"
-                      },
-                      "dividendEntitlement" : "EX_DATE",
-                      "dividendPayoutRatio" : [ {
-                        "totalRatio" : 1
                       } ],
-                      "dividendPeriod" : [ {
-                        "dividendPaymentDate" : {
-                          "dividendDateReference" : {
-                            "dateReference" : "EQUITY_PAYMENT_DATE"
-                          }
-                        },
-                        "endDate" : {
-                          "dividendDate" : {
-                            "externalReference" : "TerminationDate",
-                            "globalReference" : "f18f7c48"
+                      "finalPaymentDate" : {
+                        "relativeDate" : {
+                          "periodMultiplier" : 3,
+                          "period" : "D",
+                          "meta" : {
+                            "globalKey" : "bee88507"
+                          },
+                          "dayType" : "CurrencyBusiness",
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCentersReference" : {
+                            "globalReference" : "27e4e9",
+                            "externalReference" : "PrimaryBusinessCenter"
+                          },
+                          "dateRelativeTo" : {
+                            "globalReference" : "252ee503",
+                            "externalReference" : "FinalValuationDate"
                           }
                         },
-                        "startDate" : {
-                          "dividendDate" : {
-                            "externalReference" : "TradeDate",
-                            "globalReference" : "3e8a58"
-                          }
+                        "meta" : {
+                          "globalKey" : "bee88507",
+                          "externalKey" : "FinalEquityPaymentDate"
                         }
-                      } ],
-                      "dividendReinvestment" : false,
-                      "excessDividendAmount" : "RECORD_AMOUNT",
-                      "extraordinaryDividendsParty" : "EXTRAORDINARY_DIVIDENDS_PARTY"
+                      }
                     },
-                    "priceReturnTerms" : {
-                      "returnType" : "TOTAL"
+                    "meta" : {
+                      "globalKey" : "1a999e73",
+                      "externalKey" : "EquityPaymentDate"
                     }
                   },
                   "underlier" : {
-                    "meta" : {
-                      "globalKey" : "7a5b92c5"
-                    },
                     "security" : {
                       "productIdentifier" : [ {
                         "address" : {
@@ -1431,87 +1355,95 @@
                           "value" : "productIdentifier-2"
                         }
                       } ],
-                      "securityType" : "EQUITY"
+                      "securityType" : "Equity"
+                    },
+                    "meta" : {
+                      "globalKey" : "7a5b92c5"
                     }
                   },
-                  "valuationDates" : {
-                    "valuationDatesFinal" : {
-                      "determinationMethod" : "HEDGE_EXECUTION",
-                      "meta" : {
-                        "globalKey" : "96fa6685"
-                      },
-                      "valuationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "meta" : {
-                              "globalKey" : "3a4b88ab"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "252ee503"
-                          },
-                          "unadjustedDate" : "2002-09-24"
-                        },
-                        "meta" : {
-                          "externalKey" : "FinalValuationDate",
-                          "globalKey" : "252ee503"
-                        }
-                      }
+                  "returnTerms" : {
+                    "priceReturnTerms" : {
+                      "returnType" : "Total"
                     },
-                    "valuationDatesInterim" : {
-                      "determinationMethod" : "VALUATION_TIME",
-                      "meta" : {
-                        "globalKey" : "374dddc6"
+                    "dividendReturnTerms" : {
+                      "dividendPayoutRatio" : [ {
+                        "totalRatio" : 1
+                      } ],
+                      "dividendReinvestment" : false,
+                      "dividendEntitlement" : "ExDate",
+                      "extraordinaryDividendsParty" : "ExtraordinaryDividendsParty",
+                      "excessDividendAmount" : "RecordAmount",
+                      "dividendCurrency" : {
+                        "determinationMethod" : "DividendCurrency"
                       },
-                      "valuationDates" : {
-                        "adjustableDates" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "meta" : {
-                              "globalKey" : "3a4b88ab"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "e80e5233"
-                          },
-                          "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ]
+                      "dividendPeriod" : [ {
+                        "startDate" : {
+                          "dividendDate" : {
+                            "globalReference" : "3e8a58",
+                            "externalReference" : "TradeDate"
+                          }
                         },
-                        "meta" : {
-                          "externalKey" : "InterimValuationDate",
-                          "globalKey" : "e80e5233"
+                        "endDate" : {
+                          "dividendDate" : {
+                            "globalReference" : "edf02740",
+                            "externalReference" : "TerminationDate"
+                          }
+                        },
+                        "dividendPaymentDate" : {
+                          "dividendDateReference" : {
+                            "dateReference" : "EquityPaymentDate"
+                          }
                         }
-                      },
-                      "valuationTimeType" : "CLOSE"
+                      } ]
                     }
-                  }
-                } ]
-              },
-              "terminationDate" : {
-                "meta" : {
-                  "externalKey" : "TerminationDate",
-                  "globalKey" : "f18f7c48"
-                },
-                "relativeDate" : {
-                  "meta" : {
-                    "globalKey" : "f18f7c48"
                   },
-                  "period" : "D",
-                  "periodMultiplier" : 0,
-                  "businessDayConvention" : "NOT_APPLICABLE",
-                  "dateRelativeTo" : {
-                    "externalReference" : "FinalEquityPaymentDate",
-                    "globalReference" : "86542f29"
+                  "meta" : {
+                    "globalKey" : "5d54351a"
                   }
+                } ],
+                "meta" : {
+                  "globalKey" : "d204e9e8"
                 }
+              },
+              "extraordinaryEvents" : {
+                "mergerEvents" : {
+                  "shareForShare" : "ModifiedCalculationAgent",
+                  "shareForOther" : "ModifiedCalculationAgent",
+                  "shareForCombined" : "ModifiedCalculationAgent"
+                },
+                "tenderOfferEvents" : {
+                  "shareForShare" : "ModifiedCalculationAgent",
+                  "shareForOther" : "ModifiedCalculationAgent",
+                  "shareForCombined" : "ModifiedCalculationAgent"
+                },
+                "compositionOfCombinedConsideration" : true,
+                "additionalDisruptionEvents" : {
+                  "changeInLaw" : true,
+                  "failureToDeliver" : true,
+                  "insolvencyFiling" : false,
+                  "hedgingDisruption" : true,
+                  "increasedCostOfHedging" : false,
+                  "lossOfStockBorrow" : true,
+                  "increasedCostOfStockBorrow" : false,
+                  "determiningParty" : "DisruptionEventsDeterminingParty"
+                },
+                "representations" : {
+                  "nonReliance" : true,
+                  "agreementsRegardingHedging" : true,
+                  "additionalAcknowledgements" : true
+                },
+                "nationalizationOrInsolvency" : "CancellationAndPayment"
+              },
+              "calculationAgent" : {
+                "calculationAgentParty" : "CalculationAgentIndependent"
               }
             },
             "meta" : {
-              "globalKey" : "95be1b14"
+              "globalKey" : "8b69cf3e"
             }
           },
           "meta" : {
-            "globalKey" : "95be1b14"
+            "globalKey" : "8b69cf3e"
           }
         },
         "tradeLot" : [ {
@@ -1526,151 +1458,151 @@
             }
           } ],
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "417e440b"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "26bb033f"
-              },
-              "productIdentifier" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "productIdentifier-1"
-                  } ]
-                },
-                "value" : {
-                  "identifier" : {
-                    "meta" : {
-                      "scheme" : "http://www.abc.com/instrumentId"
-                    },
-                    "value" : "SHPGY.O"
-                  },
-                  "meta" : {
-                    "globalKey" : "8c85a05e"
-                  },
-                  "source" : "OTHER"
-                }
-              }, {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "productIdentifier-2"
-                  } ]
-                },
-                "value" : {
-                  "identifier" : {
-                    "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
-                  },
-                  "meta" : {
-                    "globalKey" : "5518dd"
-                  },
-                  "source" : "NAME"
-                }
-              } ]
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 37.44,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 37.44,
                 "perUnitOf" : {
-                  "financialUnit" : "SHARE"
+                  "financialUnit" : "Share"
                 },
-                "priceType" : "ASSET_PRICE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "AssetPrice"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 760400,
                 "unit" : {
-                  "financialUnit" : "SHARE"
-                },
-                "value" : 760400
-              }
-            }, {
+                  "financialUnit" : "Share"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "quantity-2"
                 } ]
-              },
+              }
+            }, {
               "value" : {
+                "value" : 28469376,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 28469376
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "7dd9ec3"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "5f0c6d03"
-              },
-              "rateOption" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "SHPGY.O",
+                    "meta" : {
+                      "scheme" : "http://www.abc.com/instrumentId"
+                    }
+                  },
+                  "source" : "Other",
+                  "meta" : {
+                    "globalKey" : "8c85a05e"
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
+                    "value" : "productIdentifier-1"
                   } ]
-                },
+                }
+              }, {
                 "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "USD-LIBOR-BBA"
+                  "identifier" : {
+                    "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
                   },
-                  "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1
+                  "source" : "Name",
+                  "meta" : {
+                    "globalKey" : "5518dd"
                   }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "productIdentifier-2"
+                  } ]
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "b0a564a1"
               }
             },
+            "meta" : {
+              "globalKey" : "b4fad14b"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-2"
-                } ]
-              },
               "value" : {
+                "value" : 0.002,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 0.002,
-                "arithmeticOperator" : "ADD",
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
+                "priceType" : "InterestRate",
+                "arithmeticOperator" : "Add"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-2"
+                } ]
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "USD-LIBOR-BBA"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "82801f45"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "95c8caad"
+            }
           } ]
         }, {
           "lotIdentifier" : [ {
@@ -1684,253 +1616,321 @@
             }
           } ],
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "695bc1d0"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "8c85a05e"
-              },
-              "productIdentifier" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "productIdentifier-1"
-                  } ]
-                },
-                "value" : {
-                  "identifier" : {
-                    "meta" : {
-                      "scheme" : "http://www.abc.com/instrumentId"
-                    },
-                    "value" : "SHPGY.O"
-                  },
-                  "meta" : {
-                    "globalKey" : "8c85a05e"
-                  },
-                  "source" : "OTHER"
-                }
-              } ]
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-2"
-                } ]
-              },
               "value" : {
+                "value" : 30,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 30,
                 "perUnitOf" : {
-                  "financialUnit" : "SHARE"
+                  "financialUnit" : "Share"
                 },
-                "priceType" : "ASSET_PRICE"
+                "priceType" : "AssetPrice"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-2"
+                } ]
               }
             } ],
             "quantity" : [ {
+              "value" : {
+                "value" : 250000,
+                "unit" : {
+                  "financialUnit" : "Share"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-2"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "financialUnit" : "SHARE"
-                },
-                "value" : 250000
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "d7b3bff1"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "5f0c6d03"
-              },
-              "rateOption" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "SHPGY.O",
+                    "meta" : {
+                      "scheme" : "http://www.abc.com/instrumentId"
+                    }
+                  },
+                  "source" : "Other",
+                  "meta" : {
+                    "globalKey" : "8c85a05e"
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
+                    "value" : "productIdentifier-1"
                   } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "USD-LIBOR-BBA"
-                  },
-                  "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1
-                  }
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "42e6b62"
               }
             },
+            "meta" : {
+              "globalKey" : "aa7176d4"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.002,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 0.002,
-                "arithmeticOperator" : "ADD",
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate",
+                "arithmeticOperator" : "Add"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 7500000,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "USD-LIBOR-BBA"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  }
                 },
-                "value" : 7500000
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "82801f45"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "58d735f1"
+            }
           } ]
-        } ]
-      },
-      "tradeDate" : {
-        "meta" : {
-          "externalKey" : "TradeDate",
-          "globalKey" : "3e8a58"
-        },
-        "value" : "2001-09-24"
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "33f59568",
+            "externalReference" : "party2"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "33f59567",
+            "externalReference" : "party1"
+          }
+        } ],
+        "ancillaryParty" : [ {
+          "role" : "DisruptionEventsDeterminingParty",
+          "partyReference" : [ {
+            "globalReference" : "33f59567",
+            "externalReference" : "party1"
+          } ]
+        }, {
+          "role" : "ExtraordinaryDividendsParty",
+          "partyReference" : [ {
+            "globalReference" : "33f59567",
+            "externalReference" : "party1"
+          } ]
+        }, {
+          "role" : "CalculationAgentIndependent",
+          "partyReference" : [ {
+            "globalReference" : "33f59567",
+            "externalReference" : "party1"
+          } ]
+        } ],
+        "adjustment" : "Execution"
       },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "Party A",
             "meta" : {
-              "scheme" : "http://www.partyA.com/eqs-trade-id"
-            },
-            "value" : "6234"
+              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+            }
+          },
+          "meta" : {
+            "globalKey" : "33f59567"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
         "meta" : {
-          "globalKey" : "3b465e4f"
+          "globalKey" : "33f59567",
+          "externalKey" : "party1"
         }
       }, {
-        "assignedIdentifier" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "Party B",
             "meta" : {
-              "scheme" : "http://www.partyB.com/eqs-trade-id"
+              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+            }
+          },
+          "meta" : {
+            "globalKey" : "33f59568"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "33f59568",
+          "externalKey" : "party2"
+        }
+      } ],
+      "contractDetails" : {
+        "documentation" : [ {
+          "legalAgreementIdentification" : {
+            "agreementName" : {
+              "agreementType" : "MasterAgreement",
+              "masterAgreementType" : {
+                "value" : "ISDAMaster"
+              }
             },
-            "value" : "6569"
+            "vintage" : 2002
+          },
+          "meta" : {
+            "globalKey" : "328cfa59"
+          }
+        }, {
+          "legalAgreementIdentification" : {
+            "agreementName" : {
+              "agreementType" : "Confirmation",
+              "contractualDefinitionsType" : [ {
+                "value" : "ISDA2000"
+              }, {
+                "value" : "ISDA2002Equity"
+              } ]
+            }
+          },
+          "meta" : {
+            "globalKey" : "ed9ef3fc"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
+        "governingLaw" : {
+          "value" : "GBEN"
         },
         "meta" : {
-          "globalKey" : "384471b6"
+          "globalKey" : "92c7c587"
         }
-      } ]
+      },
+      "meta" : {
+        "globalKey" : "40cdbd47"
+      }
     },
     "transferHistory" : [ {
-      "meta" : {
-        "globalKey" : "3b7f6fc0"
-      },
       "transfer" : {
-        "payerReceiver" : {
-          "payerPartyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "33f59568"
-          },
-          "receiverPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "33f59567"
-          }
-        },
         "quantity" : {
+          "value" : 2000,
           "unit" : {
             "currency" : {
               "value" : "USD"
             }
+          }
+        },
+        "payerReceiver" : {
+          "payerPartyReference" : {
+            "globalReference" : "33f59568",
+            "externalReference" : "party2"
           },
-          "value" : 2000
+          "receiverPartyReference" : {
+            "globalReference" : "33f59567",
+            "externalReference" : "party1"
+          }
         },
         "settlementDate" : {
           "adjustedDate" : {
+            "value" : "2001-09-24",
             "meta" : {
               "globalKey" : "3e8a58"
-            },
-            "value" : "2001-09-24"
+            }
           }
         },
         "transferExpression" : {
-          "priceTransfer" : "INCREASE"
+          "priceTransfer" : "Increase"
         }
+      },
+      "meta" : {
+        "globalKey" : "8b114c04"
       }
     }, {
-      "meta" : {
-        "globalKey" : "c0660684"
-      },
       "transfer" : {
-        "payerReceiver" : {
-          "payerPartyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "33f59568"
-          },
-          "receiverPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "33f59567"
-          }
-        },
         "quantity" : {
+          "value" : 2000,
           "unit" : {
             "currency" : {
               "value" : "USD"
             }
+          }
+        },
+        "payerReceiver" : {
+          "payerPartyReference" : {
+            "globalReference" : "33f59568",
+            "externalReference" : "party2"
           },
-          "value" : 2000
+          "receiverPartyReference" : {
+            "globalReference" : "33f59567",
+            "externalReference" : "party1"
+          }
         },
         "settlementDate" : {
           "adjustedDate" : {
+            "value" : "2001-09-24",
             "meta" : {
               "globalKey" : "3e8a58"
-            },
-            "value" : "2001-09-24"
+            }
           }
         },
         "transferExpression" : {
-          "priceTransfer" : "PARTIAL_TERMINATION"
+          "priceTransfer" : "PartialTermination"
         }
+      },
+      "meta" : {
+        "globalKey" : "ff7e2c8"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "fba2cd3"
+    }
   } ],
   "meta" : {
-    "globalKey" : "232c4d5"
+    "globalKey" : "be6ed27f"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/partial-termination-vanilla-swap-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/partial-termination-vanilla-swap-func-output.json
index a7020adba2..f99a1b419a 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/partial-termination-vanilla-swap-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/partial-termination-vanilla-swap-func-output.json
@@ -1,151 +1,114 @@
 {
   "eventDate" : "2019-12-12",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "451ed355"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "451ed355"
-          },
-          "party" : [ {
-            "businessUnit" : [ {
-              "meta" : {
-                "externalKey" : "desk1",
-                "globalKey" : "5c10b72e"
-              },
-              "name" : "NY Swaps Desk"
-            } ],
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "4196529f"
-            },
-            "name" : {
-              "value" : "Bank X"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "5493001RKR55V4X61F71"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "d0f863bc"
-              }
-            }, {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI1RPT0001"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "b8962566"
+    "primitiveInstruction" : {
+      "quantityChange" : {
+        "change" : [ {
+          "quantity" : [ {
+            "value" : {
+              "value" : 3000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                  }
+                }
               }
-            } ],
-            "person" : [ {
-              "firstName" : "jjone",
-              "meta" : {
-                "externalKey" : "trader",
-                "globalKey" : "d3962233"
-              },
-              "personId" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "jjones"
-                  },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "de81ef29"
+          }
+        } ],
+        "direction" : "Decrease"
+      },
+      "transfer" : {
+        "transferState" : [ {
+          "transfer" : {
+            "quantity" : {
+              "value" : 2000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD",
                   "meta" : {
-                    "globalKey" : "baeb8c0d"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
                   }
                 }
-              } ]
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "a829283e"
+              }
             },
-            "name" : {
-              "value" : "Bank Y"
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "globalReference" : "9abf6e1f",
+                "externalReference" : "party1"
+              },
+              "receiverPartyReference" : {
+                "globalReference" : "d24c6fe",
+                "externalReference" : "party2"
+              }
             },
-            "partyId" : [ {
-              "identifier" : {
+            "settlementDate" : {
+              "adjustedDate" : {
+                "value" : "2018-04-01",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "549300O5MFEP1XJ40B46"
-              },
-              "identifierType" : "LEI",
+                  "globalKey" : "3f1101"
+                }
+              }
+            },
+            "transferExpression" : {
+              "priceTransfer" : "PartialTermination"
+            }
+          },
+          "meta" : {
+            "globalKey" : "e9ac7270"
+          }
+        } ]
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "1031234567",
               "meta" : {
-                "globalKey" : "956c45f8"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
               }
-            }, {
+            },
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "LEI1RPT0001KKKK",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                },
-                "value" : "LEI2CP0002"
-              },
-              "identifierType" : "LEI",
-              "meta" : {
-                "globalKey" : "eb8edea1"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                }
               }
-            } ]
-          } ],
-          "partyRole" : [ {
-            "ownershipPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "4196529f"
-            },
-            "partyReference" : {
-              "externalReference" : "clearing-svc",
-              "globalReference" : "611719a0"
-            },
-            "role" : "CLEARING_ORGANIZATION"
-          }, {
-            "ownershipPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "4196529f"
-            },
-            "partyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "4196529f"
+            } ],
+            "meta" : {
+              "globalKey" : "b0a21242"
             },
-            "role" : "REPORTING_PARTY"
+            "identifierType" : "UniqueTransactionIdentifier"
           } ],
+          "tradeDate" : {
+            "value" : "2018-04-01",
+            "meta" : {
+              "globalKey" : "3f1101"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "4196529f"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "a829283e"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
                   "primaryAssetClass" : {
-                    "value" : "INTEREST_RATE"
+                    "value" : "InterestRate"
                   }
                 }, {
                   "source" : "ISDA",
                   "value" : {
                     "name" : {
+                      "value" : "InterestRate:IRSwap:FixedFloat",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                      },
-                      "value" : "InterestRate:IRSwap:FixedFloat"
+                      }
                     }
                   }
                 }, {
@@ -156,46 +119,40 @@
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
-                            },
-                            "meta" : {
-                              "globalKey" : "da3ebeed"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7dfdd7c"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12d23"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3,
-                          "rollConvention" : "8"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2014-04-03",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -204,103 +161,108 @@
                             },
                             "meta" : {
                               "globalKey" : "ec6b637b"
-                            },
-                            "unadjustedDate" : "2014-04-03"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ec6b637b"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "floatingCalcPeriodDates",
-                          "globalKey" : "e799e95"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2025-04-01",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "USNY"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "primaryBusinessCenters",
-                                  "globalKey" : "27e4e9"
+                                  "globalKey" : "27e4e9",
+                                  "externalKey" : "primaryBusinessCenters"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "3662e8ba"
                               }
                             },
                             "meta" : {
                               "globalKey" : "18fe1859"
-                            },
-                            "unadjustedDate" : "2025-04-01"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "18fe1859"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "a7bf545b"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "27ad0640"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "956"
+                            "globalKey" : "204f"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                          "rollConvention" : "8"
+                        },
+                        "meta" : {
+                          "globalKey" : "5efe129f",
+                          "externalKey" : "floatingCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
+                            "globalKey" : "aa"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da3ebeed"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7dfdd7c"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "a88f300c"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "floatingCalcPeriodDates",
-                          "globalReference" : "e799e95"
+                          "globalReference" : "5efe129f",
+                          "externalReference" : "floatingCalcPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "131ae8a2"
+                            "globalKey" : "eff6d356"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -309,82 +271,79 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates",
-                            "globalReference" : "7c36d4c7"
+                            "globalReference" : "a7347195",
+                            "externalReference" : "resetDates"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates",
-                          "globalKey" : "7c36d4c7"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "a7347195",
+                          "externalKey" : "resetDates"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "f267267"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
-                            },
-                            "meta" : {
-                              "globalKey" : "da3ebeed"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7dfdd7c"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12d80"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6,
-                          "rollConvention" : "8"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "30E/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2018-04-03",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -393,448 +352,389 @@
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
-                            },
-                            "unadjustedDate" : "2018-04-03"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ece3837b"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "fixedCalcPeriodDates",
-                          "globalKey" : "399e1c1e"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2025-04-01",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "primaryBusinessCenters",
-                                  "globalReference" : "27e4e9"
+                                  "globalReference" : "27e4e9",
+                                  "externalReference" : "primaryBusinessCenters"
                                 },
                                 "meta" : {
                                   "globalKey" : "da3ebeed"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "b7dfdd7c"
                               }
                             },
                             "meta" : {
                               "globalKey" : "210a957d"
-                            },
-                            "unadjustedDate" : "2025-04-01"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "210a957d"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "30E/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "47969451"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "27ad0643"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "959"
+                            "globalKey" : "2b92"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 6
+                          "rollConvention" : "8"
+                        },
+                        "meta" : {
+                          "globalKey" : "a0e2ef30",
+                          "externalKey" : "fixedCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
+                            "globalKey" : "107"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da3ebeed"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7dfdd7c"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "856b8369"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "cbcd504f"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "cc1da016"
+                      "globalKey" : "2dcbba88"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "7ca24263"
+                  "globalKey" : "de505cd5"
                 }
               },
               "meta" : {
-                "globalKey" : "7ca24263"
+                "globalKey" : "de505cd5"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "e4dda770"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "5f0c6d05"
-                  },
-                  "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
-                    "value" : {
-                      "floatingRateIndex" : {
-                        "value" : "USD-LIBOR-BBA"
-                      },
-                      "indexTenor" : {
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 10000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD",
                         "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
+                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                        }
                       }
                     }
-                  }
-                },
-                "quantity" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
+                  }
+                } ],
+                "observable" : {
+                  "rateOption" : {
+                    "value" : {
+                      "floatingRateIndex" : {
+                        "value" : "USD-LIBOR-BBA"
+                      },
+                      "indexTenor" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
                         "meta" : {
-                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                          "globalKey" : "aa"
+                        }
                       }
                     },
-                    "value" : 10000
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "828026c7"
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "8532effc"
                 },
+                "meta" : {
+                  "globalKey" : "fd32a49c"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.0253,
                     "unit" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
                     },
-                    "value" : 0.0253,
                     "perUnitOf" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 10000,
                     "unit" : {
                       "currency" : {
+                        "value" : "USD",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "USD"
+                        }
                       }
-                    },
-                    "value" : 10000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "212b0f84"
+                }
               } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "9abf6e1f",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "d24c6fe",
+                "externalReference" : "party2"
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f1101"
-            },
-            "value" : "2018-04-01"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "5493001RKR55V4X61F71",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                },
-                "value" : "LEI1RPT0001KKKK"
-              }
-            } ],
-            "issuer" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
               },
-              "value" : "1031234567"
-            },
-            "meta" : {
-              "globalKey" : "f3079442"
-            },
-            "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "quantityChange" : {
-        "change" : [ {
-          "meta" : {
-            "globalKey" : "de81ef29"
-          },
-          "quantity" : [ {
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "d0f863bc"
+              }
+            }, {
+              "identifier" : {
+                "value" : "LEI1RPT0001",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                 }
               },
-              "value" : 3000
-            }
-          } ]
-        } ],
-        "direction" : "DECREASE"
-      },
-      "transfer" : {
-        "transferState" : [ {
-          "meta" : {
-            "globalKey" : "b18e6e9c"
-          },
-          "transfer" : {
-            "payerReceiver" : {
-              "payerPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "4196529f"
-              },
-              "receiverPartyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "a829283e"
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "b8962566"
               }
+            } ],
+            "name" : {
+              "value" : "Bank X"
             },
-            "quantity" : {
-              "unit" : {
-                "currency" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+            "businessUnit" : [ {
+              "name" : "NY Swaps Desk",
+              "meta" : {
+                "globalKey" : "5c10b72e",
+                "externalKey" : "desk1"
+              }
+            } ],
+            "person" : [ {
+              "personId" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "jjones"
                   },
-                  "value" : "USD"
+                  "meta" : {
+                    "globalKey" : "baeb8c0d"
+                  }
+                }
+              } ],
+              "firstName" : "jjone",
+              "meta" : {
+                "globalKey" : "d3962233",
+                "externalKey" : "trader"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "9abf6e1f",
+              "externalKey" : "party1"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "549300O5MFEP1XJ40B46",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                 }
               },
-              "value" : 2000
-            },
-            "settlementDate" : {
-              "adjustedDate" : {
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "956c45f8"
+              }
+            }, {
+              "identifier" : {
+                "value" : "LEI2CP0002",
                 "meta" : {
-                  "globalKey" : "3f1101"
-                },
-                "value" : "2018-04-01"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                }
+              },
+              "identifierType" : "LEI",
+              "meta" : {
+                "globalKey" : "eb8edea1"
               }
+            } ],
+            "name" : {
+              "value" : "Bank Y"
             },
-            "transferExpression" : {
-              "priceTransfer" : "PARTIAL_TERMINATION"
+            "meta" : {
+              "globalKey" : "d24c6fe",
+              "externalKey" : "party2"
+            }
+          } ],
+          "partyRole" : [ {
+            "partyReference" : {
+              "globalReference" : "611719a0",
+              "externalReference" : "clearing-svc"
+            },
+            "role" : "ClearingOrganization",
+            "ownershipPartyReference" : {
+              "globalReference" : "9abf6e1f",
+              "externalReference" : "party1"
+            }
+          }, {
+            "partyReference" : {
+              "globalReference" : "9abf6e1f",
+              "externalReference" : "party1"
+            },
+            "role" : "ReportingParty",
+            "ownershipPartyReference" : {
+              "globalReference" : "9abf6e1f",
+              "externalReference" : "party1"
             }
+          } ],
+          "meta" : {
+            "globalKey" : "c88e9ca7"
           }
-        } ]
+        },
+        "meta" : {
+          "globalKey" : "c88e9ca7"
+        }
       }
     }
   } ],
+  "eventQualifier" : "PartialTermination",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "ce400397"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "e236c325"
-      },
-      "party" : [ {
-        "businessUnit" : [ {
-          "meta" : {
-            "externalKey" : "desk1",
-            "globalKey" : "5c10b72e"
-          },
-          "name" : "NY Swaps Desk"
-        } ],
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "4196529f"
-        },
-        "name" : {
-          "value" : "Bank X"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "5493001RKR55V4X61F71"
-          },
-          "identifierType" : "LEI",
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "1031234567",
           "meta" : {
-            "globalKey" : "d0f863bc"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
           }
-        }, {
+        },
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "LEI1RPT0001KKKK",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI1RPT0001"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "b8962566"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+            }
           }
         } ],
-        "person" : [ {
-          "firstName" : "jjone",
-          "meta" : {
-            "externalKey" : "trader",
-            "globalKey" : "d3962233"
-          },
-          "personId" : [ {
-            "value" : {
-              "identifier" : {
-                "value" : "jjones"
-              },
-              "meta" : {
-                "globalKey" : "baeb8c0d"
-              }
-            }
-          } ]
-        } ]
-      }, {
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "a829283e"
-        },
-        "name" : {
-          "value" : "Bank Y"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "549300O5MFEP1XJ40B46"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "956c45f8"
-          }
-        }, {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-            },
-            "value" : "LEI2CP0002"
-          },
-          "identifierType" : "LEI",
-          "meta" : {
-            "globalKey" : "eb8edea1"
-          }
-        } ]
-      } ],
-      "partyRole" : [ {
-        "ownershipPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "4196529f"
-        },
-        "partyReference" : {
-          "externalReference" : "clearing-svc",
-          "globalReference" : "611719a0"
-        },
-        "role" : "CLEARING_ORGANIZATION"
-      }, {
-        "ownershipPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "4196529f"
-        },
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "4196529f"
+          "globalKey" : "b0a21242"
         },
-        "role" : "REPORTING_PARTY"
+        "identifierType" : "UniqueTransactionIdentifier"
       } ],
+      "tradeDate" : {
+        "value" : "2018-04-01",
+        "meta" : {
+          "globalKey" : "3f1101"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "4196529f"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "a829283e"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
               "primaryAssetClass" : {
-                "value" : "INTEREST_RATE"
+                "value" : "InterestRate"
               }
             }, {
               "source" : "ISDA",
               "value" : {
                 "name" : {
+                  "value" : "InterestRate:IRSwap:FixedFloat",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                  },
-                  "value" : "InterestRate:IRSwap:FixedFloat"
+                  }
                 }
               }
             }, {
@@ -845,46 +745,40 @@
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d23"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2014-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -893,103 +787,108 @@
                         },
                         "meta" : {
                           "globalKey" : "ec6b637b"
-                        },
-                        "unadjustedDate" : "2014-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ec6b637b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "floatingCalcPeriodDates",
-                      "globalKey" : "e799e95"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2025-04-01",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "USNY"
                             } ],
                             "meta" : {
-                              "externalKey" : "primaryBusinessCenters",
-                              "globalKey" : "27e4e9"
+                              "globalKey" : "27e4e9",
+                              "externalKey" : "primaryBusinessCenters"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "3662e8ba"
                           }
                         },
                         "meta" : {
                           "globalKey" : "18fe1859"
-                        },
-                        "unadjustedDate" : "2025-04-01"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "18fe1859"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "a7bf545b"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0640"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "956"
+                        "globalKey" : "204f"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "5efe129f",
+                      "externalKey" : "floatingCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "floatingRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "a88f300c"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "floatingCalcPeriodDates",
-                      "globalReference" : "e799e95"
+                      "globalReference" : "5efe129f",
+                      "externalReference" : "floatingCalcPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "fixingDates" : {
+                      "periodMultiplier" : -2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "131ae8a2"
+                        "globalKey" : "eff6d356"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : -2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -998,82 +897,79 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "resetDates",
-                        "globalReference" : "7c36d4c7"
+                        "globalReference" : "a7347195",
+                        "externalReference" : "resetDates"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "resetDates",
-                      "globalKey" : "7c36d4c7"
+                    "resetFrequency" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     },
                     "resetDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "resetFrequency" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                    "meta" : {
+                      "globalKey" : "a7347195",
+                      "externalKey" : "resetDates"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "f267267"
                   }
                 }, {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
-                        },
-                        "meta" : {
-                          "globalKey" : "da3ebeed"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "b7dfdd7c"
+                        "globalKey" : "0"
                       }
-                    },
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "12d80"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6,
-                      "rollConvention" : "8"
-                    },
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "30E/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -1082,279 +978,383 @@
                         },
                         "meta" : {
                           "globalKey" : "ece3837b"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "ece3837b"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "fixedCalcPeriodDates",
-                      "globalKey" : "399e1c1e"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2025-04-01",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "27e4e9"
+                              "globalReference" : "27e4e9",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da3ebeed"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7dfdd7c"
                           }
                         },
                         "meta" : {
                           "globalKey" : "210a957d"
-                        },
-                        "unadjustedDate" : "2025-04-01"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "210a957d"
                       }
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "30E/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "47969451"
-                  },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "27ad0643"
                     },
-                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                    "paymentDatesAdjustments" : {
+                    "calculationPeriodDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenters",
-                          "globalReference" : "27e4e9"
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
                         },
                         "meta" : {
                           "globalKey" : "da3ebeed"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "b7dfdd7c"
                       }
                     },
-                    "paymentFrequency" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "959"
+                        "globalKey" : "2b92"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 6
+                      "rollConvention" : "8"
+                    },
+                    "meta" : {
+                      "globalKey" : "a0e2ef30",
+                      "externalKey" : "fixedCalcPeriodDates"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
                       "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
+                        "globalKey" : "107"
+                      }
+                    },
+                    "payRelativeTo" : "CalculationPeriodEndDate",
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenters"
+                        },
+                        "meta" : {
+                          "globalKey" : "da3ebeed"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "b7dfdd7c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "856b8369"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "cbcd504f"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "cc1da016"
+                  "globalKey" : "2dcbba88"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "7ca24263"
+              "globalKey" : "de505cd5"
             }
           },
           "meta" : {
-            "globalKey" : "7ca24263"
+            "globalKey" : "de505cd5"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "750faf88"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "5f0c6d05"
-              },
-              "rateOption" : {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
-                  } ]
-                },
-                "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "USD-LIBOR-BBA"
-                  },
-                  "indexTenor" : {
+            "quantity" : [ {
+              "value" : {
+                "value" : 7000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD",
                     "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                    }
                   }
                 }
-              }
-            },
-            "quantity" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-1"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "USD-LIBOR-BBA"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                      "globalKey" : "aa"
+                    }
                   }
                 },
-                "value" : 7000
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "828026c7"
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "1564f814"
             },
+            "meta" : {
+              "globalKey" : "91eb6eb4"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.0253,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "value" : 0.0253,
                 "perUnitOf" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 7000,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
-                },
-                "value" : 7000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "973a0a6c"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "9abf6e1f",
+            "externalReference" : "party1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "d24c6fe",
+            "externalReference" : "party2"
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f1101"
-        },
-        "value" : "2018-04-01"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "5493001RKR55V4X61F71",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-            },
-            "value" : "LEI1RPT0001KKKK"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "d0f863bc"
+          }
+        }, {
+          "identifier" : {
+            "value" : "LEI1RPT0001",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "b8962566"
           }
         } ],
-        "issuer" : {
+        "name" : {
+          "value" : "Bank X"
+        },
+        "businessUnit" : [ {
+          "name" : "NY Swaps Desk",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+            "globalKey" : "5c10b72e",
+            "externalKey" : "desk1"
+          }
+        } ],
+        "person" : [ {
+          "personId" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "jjones"
+              },
+              "meta" : {
+                "globalKey" : "baeb8c0d"
+              }
+            }
+          } ],
+          "firstName" : "jjone",
+          "meta" : {
+            "globalKey" : "d3962233",
+            "externalKey" : "trader"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "9abf6e1f",
+          "externalKey" : "party1"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "549300O5MFEP1XJ40B46",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
+          },
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "956c45f8"
+          }
+        }, {
+          "identifier" : {
+            "value" : "LEI2CP0002",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }
           },
-          "value" : "1031234567"
+          "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "eb8edea1"
+          }
+        } ],
+        "name" : {
+          "value" : "Bank Y"
         },
         "meta" : {
-          "globalKey" : "f3079442"
+          "globalKey" : "d24c6fe",
+          "externalKey" : "party2"
+        }
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "611719a0",
+          "externalReference" : "clearing-svc"
         },
-        "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-      } ]
+        "role" : "ClearingOrganization",
+        "ownershipPartyReference" : {
+          "globalReference" : "9abf6e1f",
+          "externalReference" : "party1"
+        }
+      }, {
+        "partyReference" : {
+          "globalReference" : "9abf6e1f",
+          "externalReference" : "party1"
+        },
+        "role" : "ReportingParty",
+        "ownershipPartyReference" : {
+          "globalReference" : "9abf6e1f",
+          "externalReference" : "party1"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "c0e90da7"
+      }
     },
     "transferHistory" : [ {
-      "meta" : {
-        "globalKey" : "b18e6e9c"
-      },
       "transfer" : {
-        "payerReceiver" : {
-          "payerPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "4196529f"
-          },
-          "receiverPartyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "a829283e"
-          }
-        },
         "quantity" : {
+          "value" : 2000,
           "unit" : {
             "currency" : {
+              "value" : "USD",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-              },
-              "value" : "USD"
+              }
             }
+          }
+        },
+        "payerReceiver" : {
+          "payerPartyReference" : {
+            "globalReference" : "9abf6e1f",
+            "externalReference" : "party1"
           },
-          "value" : 2000
+          "receiverPartyReference" : {
+            "globalReference" : "d24c6fe",
+            "externalReference" : "party2"
+          }
         },
         "settlementDate" : {
           "adjustedDate" : {
+            "value" : "2018-04-01",
             "meta" : {
               "globalKey" : "3f1101"
-            },
-            "value" : "2018-04-01"
+            }
           }
         },
         "transferExpression" : {
-          "priceTransfer" : "PARTIAL_TERMINATION"
+          "priceTransfer" : "PartialTermination"
         }
+      },
+      "meta" : {
+        "globalKey" : "e9ac7270"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "1e91e829"
+    }
   } ],
-  "eventQualifier" : "PartialTermination",
   "meta" : {
-    "globalKey" : "4bb44b0f"
+    "globalKey" : "966e24d1"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/stock-split/stock-split-equity-swap-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/stock-split/stock-split-equity-swap-func-output.json
index 7b0f89929d..2cb3738fff 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/stock-split/stock-split-equity-swap-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/stock-split/stock-split-equity-swap-func-output.json
@@ -1,122 +1,61 @@
 {
+  "intent" : "CorporateActionAdjustment",
   "eventDate" : "2001-11-01",
   "instruction" : [ {
+    "primitiveInstruction" : {
+      "stockSplit" : {
+        "adjustmentRatio" : 2,
+        "effectiveDate" : "2001-11-03"
+      }
+    },
     "before" : {
       "value" : {
-        "meta" : {
-          "globalKey" : "509af759"
-        },
         "trade" : {
-          "contractDetails" : {
-            "documentation" : [ {
-              "legalAgreementIdentification" : {
-                "agreementName" : {
-                  "agreementType" : "MASTER_AGREEMENT",
-                  "masterAgreementType" : {
-                    "value" : "ISDA_MASTER"
-                  }
-                },
-                "vintage" : 2002
-              },
-              "meta" : {
-                "globalKey" : "328cfa59"
-              }
-            }, {
-              "legalAgreementIdentification" : {
-                "agreementName" : {
-                  "agreementType" : "CONFIRMATION",
-                  "contractualDefinitionsType" : [ {
-                    "value" : "ISDA2000"
-                  }, {
-                    "value" : "ISDA_2002_EQUITY"
-                  } ]
+          "tradeIdentifier" : [ {
+            "issuerReference" : {
+              "globalReference" : "33f59567",
+              "externalReference" : "party1"
+            },
+            "assignedIdentifier" : [ {
+              "identifier" : {
+                "value" : "6234",
+                "meta" : {
+                  "scheme" : "http://www.partyA.com/eqs-trade-id"
                 }
-              },
-              "meta" : {
-                "globalKey" : "ed9ef3fc"
               }
             } ],
-            "governingLaw" : {
-              "value" : "GBEN"
-            },
             "meta" : {
-              "globalKey" : "92c7c587"
+              "globalKey" : "c921d6eb"
             }
-          },
-          "meta" : {
-            "globalKey" : "509af759"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "33f59567"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-                },
-                "value" : "Party A"
-              },
-              "meta" : {
-                "globalKey" : "33f59567"
-              }
-            } ]
           }, {
-            "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "33f59568"
+            "issuerReference" : {
+              "globalReference" : "33f59568",
+              "externalReference" : "party2"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "6569",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-                },
-                "value" : "Party B"
-              },
-              "meta" : {
-                "globalKey" : "33f59568"
+                  "scheme" : "http://www.partyB.com/eqs-trade-id"
+                }
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "310383ce"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "2001-09-24",
+            "meta" : {
+              "globalKey" : "3e8a58",
+              "externalKey" : "TradeDate"
+            }
+          },
           "tradableProduct" : {
-            "adjustment" : "EXECUTION",
-            "ancillaryParty" : [ {
-              "partyReference" : [ {
-                "externalReference" : "party1",
-                "globalReference" : "33f59567"
-              } ],
-              "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-            }, {
-              "partyReference" : [ {
-                "externalReference" : "party1",
-                "globalReference" : "33f59567"
-              } ],
-              "role" : "EXTRAORDINARY_DIVIDENDS_PARTY"
-            }, {
-              "partyReference" : [ {
-                "externalReference" : "party1",
-                "globalReference" : "33f59567"
-              } ],
-              "role" : "CALCULATION_AGENT_INDEPENDENT"
-            } ],
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "33f59568"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "33f59567"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
-                  "source" : "OTHER",
+                  "source" : "Other",
                   "value" : {
                     "name" : {
                       "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleName"
@@ -127,313 +66,305 @@
                   "productQualifier" : "EquitySwap_TotalReturnBasicPerformance_SingleName"
                 } ],
                 "economicTerms" : {
-                  "calculationAgent" : {
-                    "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-                  },
                   "effectiveDate" : {
-                    "meta" : {
-                      "externalKey" : "EffectiveDate",
-                      "globalKey" : "dbcf5078"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 3,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "dbcf5078"
+                        "globalKey" : "a2cb5f8a"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 3,
-                      "dayType" : "EXCHANGE_BUSINESS",
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "dayType" : "ExchangeBusiness",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "TradeDate",
-                        "globalReference" : "3e8a58"
+                        "globalReference" : "3e8a58",
+                        "externalReference" : "TradeDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "a2cb5f8a",
+                      "externalKey" : "EffectiveDate"
                     }
                   },
-                  "extraordinaryEvents" : {
-                    "additionalDisruptionEvents" : {
-                      "changeInLaw" : true,
-                      "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                      "failureToDeliver" : true,
-                      "hedgingDisruption" : true,
-                      "increasedCostOfHedging" : false,
-                      "increasedCostOfStockBorrow" : false,
-                      "insolvencyFiling" : false,
-                      "lossOfStockBorrow" : true
-                    },
-                    "compositionOfCombinedConsideration" : true,
-                    "mergerEvents" : {
-                      "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                      "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                      "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-                    },
-                    "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-                    "representations" : {
-                      "additionalAcknowledgements" : true,
-                      "agreementsRegardingHedging" : true,
-                      "nonReliance" : true
+                  "terminationDate" : {
+                    "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
+                      "meta" : {
+                        "globalKey" : "edf02740"
+                      },
+                      "businessDayConvention" : "NotApplicable",
+                      "dateRelativeTo" : {
+                        "globalReference" : "bee88507",
+                        "externalReference" : "FinalEquityPaymentDate"
+                      }
                     },
-                    "tenderOfferEvents" : {
-                      "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                      "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                      "shareForShare" : "MODIFIED_CALCULATION_AGENT"
+                    "meta" : {
+                      "globalKey" : "edf02740",
+                      "externalKey" : "TerminationDate"
                     }
                   },
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "2fdf0b8c"
-                        },
-                        "quantityReference" : {
-                          "externalReference" : "EquityNotionalAmount",
-                          "globalReference" : "4cf"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "quantityReference" : {
+                          "globalReference" : "4cf",
+                          "externalReference" : "EquityNotionalAmount"
+                        },
+                        "meta" : {
+                          "globalKey" : "2fdf0b8c"
+                        }
+                      },
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
+                            }
+                          },
+                          "spreadSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-2"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
                         }
                       },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
                       "calculationPeriodDates" : {
                         "effectiveDate" : {
-                          "meta" : {
-                            "globalKey" : "dbcf5078"
-                          },
                           "relativeDate" : {
+                            "periodMultiplier" : 3,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "dbcf5078"
+                              "globalKey" : "a2cb5f8a"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 3,
-                            "dayType" : "EXCHANGE_BUSINESS",
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "dayType" : "ExchangeBusiness",
+                            "businessDayConvention" : "NotApplicable",
                             "dateRelativeTo" : {
-                              "externalReference" : "TradeDate",
-                              "globalReference" : "3e8a58"
+                              "globalReference" : "3e8a58",
+                              "externalReference" : "TradeDate"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "a2cb5f8a"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "InterestLegPeriodDates",
-                          "globalKey" : "e7334d0"
-                        },
                         "terminationDate" : {
-                          "meta" : {
-                            "globalKey" : "f18f7c48"
-                          },
                           "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "f18f7c48"
+                              "globalKey" : "edf02740"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "dateRelativeTo" : {
-                              "externalReference" : "FinalEquityPaymentDate",
-                              "globalReference" : "86542f29"
+                              "globalReference" : "bee88507",
+                              "externalReference" : "FinalEquityPaymentDate"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "edf02740"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "2fce1876",
+                          "externalKey" : "InterestLegPeriodDates"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "8306e5d6"
-                      },
                       "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "9b9d36de"
-                        },
                         "paymentDateSchedule" : {
                           "interimPaymentDates" : [ {
-                            "meta" : {
-                              "globalKey" : "9b9d36de"
-                            },
                             "relativeDates" : {
+                              "periodMultiplier" : 0,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "9b9d36de"
+                                "globalKey" : "97fde1d6"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 0,
-                              "businessDayConvention" : "NOT_APPLICABLE",
+                              "businessDayConvention" : "NotApplicable",
                               "dateRelativeTo" : {
-                                "externalReference" : "EquityPaymentDate",
-                                "globalReference" : "fb15beed"
+                                "globalReference" : "1a999e73",
+                                "externalReference" : "EquityPaymentDate"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "97fde1d6"
                             }
                           } ]
-                        }
-                      },
-                      "rateSpecification" : {
-                        "floatingRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
-                            }
-                          },
-                          "spreadSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-2"
-                              }
-                            }
-                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "97fde1d6"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "InterestLegPeriodDates",
-                          "globalReference" : "e7334d0"
+                          "globalReference" : "2fce1876",
+                          "externalReference" : "InterestLegPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "meta" : {
-                          "globalKey" : "9ab7a6fd"
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "globalKey" : "bc128aa3"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3cd0e14e"
                       }
                     } ],
-                    "meta" : {
-                      "globalKey" : "3d9bbe0"
-                    },
                     "performancePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "externalKey" : "EquityNotionalAmount",
-                          "globalKey" : "4cf"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
                         },
-                        "reset" : true
+                        "reset" : true,
+                        "meta" : {
+                          "globalKey" : "4cf",
+                          "externalKey" : "EquityNotionalAmount"
+                        }
                       },
                       "settlementTerms" : {
-                        "meta" : {
-                          "globalKey" : "7610bbd9"
-                        },
+                        "settlementType" : "Cash",
                         "settlementCurrency" : {
                           "value" : "USD"
                         },
-                        "settlementType" : "CASH"
-                      },
-                      "meta" : {
-                        "globalKey" : "bd1fe08a"
-                      },
-                      "paymentDates" : {
                         "meta" : {
-                          "externalKey" : "EquityPaymentDate",
-                          "globalKey" : "fb15beed"
-                        },
-                        "paymentDateSchedule" : {
-                          "finalPaymentDate" : {
-                            "meta" : {
-                              "externalKey" : "FinalEquityPaymentDate",
-                              "globalKey" : "86542f29"
-                            },
-                            "relativeDate" : {
-                              "meta" : {
-                                "globalKey" : "86542f29"
-                              },
-                              "period" : "D",
-                              "periodMultiplier" : 3,
-                              "dayType" : "CURRENCY_BUSINESS",
-                              "businessCentersReference" : {
-                                "externalReference" : "PrimaryBusinessCenter",
-                                "globalReference" : "27e4e9"
+                          "globalKey" : "7610bbd9"
+                        }
+                      },
+                      "valuationDates" : {
+                        "valuationDatesInterim" : {
+                          "determinationMethod" : "ValuationTime",
+                          "valuationDates" : {
+                            "adjustableDates" : {
+                              "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ],
+                              "dateAdjustments" : {
+                                "businessDayConvention" : "NotApplicable",
+                                "meta" : {
+                                  "globalKey" : "3a4b88ab"
+                                }
                               },
-                              "businessDayConvention" : "FOLLOWING",
-                              "dateRelativeTo" : {
-                                "externalReference" : "FinalValuationDate",
-                                "globalReference" : "252ee503"
+                              "meta" : {
+                                "globalKey" : "e80e5233"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "e80e5233",
+                              "externalKey" : "InterimValuationDate"
                             }
                           },
-                          "interimPaymentDates" : [ {
-                            "meta" : {
-                              "externalKey" : "InterimEquityPaymentDate",
-                              "globalKey" : "2519d1b6"
+                          "valuationTimeType" : "Close",
+                          "meta" : {
+                            "globalKey" : "374dddc6"
+                          }
+                        },
+                        "valuationDatesFinal" : {
+                          "determinationMethod" : "HedgeExecution",
+                          "valuationDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2002-09-24",
+                              "dateAdjustments" : {
+                                "businessDayConvention" : "NotApplicable",
+                                "meta" : {
+                                  "globalKey" : "3a4b88ab"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "252ee503"
+                              }
                             },
+                            "meta" : {
+                              "globalKey" : "252ee503",
+                              "externalKey" : "FinalValuationDate"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "96fa6685"
+                          }
+                        }
+                      },
+                      "paymentDates" : {
+                        "paymentDateSchedule" : {
+                          "interimPaymentDates" : [ {
                             "relativeDates" : {
+                              "periodMultiplier" : 3,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "2519d1b6"
+                                "globalKey" : "dfe60714"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 3,
-                              "dayType" : "CURRENCY_BUSINESS",
+                              "dayType" : "CurrencyBusiness",
+                              "businessDayConvention" : "FOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "USNY"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "PrimaryBusinessCenter",
-                                  "globalKey" : "27e4e9"
+                                  "globalKey" : "27e4e9",
+                                  "externalKey" : "PrimaryBusinessCenter"
                                 }
                               },
-                              "businessDayConvention" : "FOLLOWING",
                               "dateRelativeTo" : {
-                                "externalReference" : "InterimValuationDate",
-                                "globalReference" : "e80e5233"
+                                "globalReference" : "e80e5233",
+                                "externalReference" : "InterimValuationDate"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "dfe60714",
+                              "externalKey" : "InterimEquityPaymentDate"
                             }
-                          } ]
-                        }
-                      },
-                      "returnTerms" : {
-                        "dividendReturnTerms" : {
-                          "dividendCurrency" : {
-                            "determinationMethod" : "DIVIDEND_CURRENCY"
-                          },
-                          "dividendEntitlement" : "EX_DATE",
-                          "dividendPayoutRatio" : [ {
-                            "totalRatio" : 1
                           } ],
-                          "dividendPeriod" : [ {
-                            "dividendPaymentDate" : {
-                              "dividendDateReference" : {
-                                "dateReference" : "EQUITY_PAYMENT_DATE"
-                              }
-                            },
-                            "endDate" : {
-                              "dividendDate" : {
-                                "externalReference" : "TerminationDate",
-                                "globalReference" : "f18f7c48"
+                          "finalPaymentDate" : {
+                            "relativeDate" : {
+                              "periodMultiplier" : 3,
+                              "period" : "D",
+                              "meta" : {
+                                "globalKey" : "bee88507"
+                              },
+                              "dayType" : "CurrencyBusiness",
+                              "businessDayConvention" : "FOLLOWING",
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "PrimaryBusinessCenter"
+                              },
+                              "dateRelativeTo" : {
+                                "globalReference" : "252ee503",
+                                "externalReference" : "FinalValuationDate"
                               }
                             },
-                            "startDate" : {
-                              "dividendDate" : {
-                                "externalReference" : "TradeDate",
-                                "globalReference" : "3e8a58"
-                              }
+                            "meta" : {
+                              "globalKey" : "bee88507",
+                              "externalKey" : "FinalEquityPaymentDate"
                             }
-                          } ],
-                          "dividendReinvestment" : false,
-                          "excessDividendAmount" : "RECORD_AMOUNT",
-                          "extraordinaryDividendsParty" : "EXTRAORDINARY_DIVIDENDS_PARTY"
+                          }
                         },
-                        "priceReturnTerms" : {
-                          "returnType" : "TOTAL"
+                        "meta" : {
+                          "globalKey" : "1a999e73",
+                          "externalKey" : "EquityPaymentDate"
                         }
                       },
                       "underlier" : {
-                        "meta" : {
-                          "globalKey" : "7a5b92c5"
-                        },
                         "security" : {
                           "productIdentifier" : [ {
                             "address" : {
@@ -446,405 +377,407 @@
                               "value" : "productIdentifier-2"
                             }
                           } ],
-                          "securityType" : "EQUITY"
+                          "securityType" : "Equity"
+                        },
+                        "meta" : {
+                          "globalKey" : "7a5b92c5"
                         }
                       },
-                      "valuationDates" : {
-                        "valuationDatesFinal" : {
-                          "determinationMethod" : "HEDGE_EXECUTION",
-                          "meta" : {
-                            "globalKey" : "96fa6685"
-                          },
-                          "valuationDate" : {
-                            "adjustableDate" : {
-                              "dateAdjustments" : {
-                                "businessDayConvention" : "NOT_APPLICABLE",
-                                "meta" : {
-                                  "globalKey" : "3a4b88ab"
-                                }
-                              },
-                              "meta" : {
-                                "globalKey" : "252ee503"
-                              },
-                              "unadjustedDate" : "2002-09-24"
-                            },
-                            "meta" : {
-                              "externalKey" : "FinalValuationDate",
-                              "globalKey" : "252ee503"
-                            }
-                          }
+                      "returnTerms" : {
+                        "priceReturnTerms" : {
+                          "returnType" : "Total"
                         },
-                        "valuationDatesInterim" : {
-                          "determinationMethod" : "VALUATION_TIME",
-                          "meta" : {
-                            "globalKey" : "374dddc6"
+                        "dividendReturnTerms" : {
+                          "dividendPayoutRatio" : [ {
+                            "totalRatio" : 1
+                          } ],
+                          "dividendReinvestment" : false,
+                          "dividendEntitlement" : "ExDate",
+                          "extraordinaryDividendsParty" : "ExtraordinaryDividendsParty",
+                          "excessDividendAmount" : "RecordAmount",
+                          "dividendCurrency" : {
+                            "determinationMethod" : "DividendCurrency"
                           },
-                          "valuationDates" : {
-                            "adjustableDates" : {
-                              "dateAdjustments" : {
-                                "businessDayConvention" : "NOT_APPLICABLE",
-                                "meta" : {
-                                  "globalKey" : "3a4b88ab"
-                                }
-                              },
-                              "meta" : {
-                                "globalKey" : "e80e5233"
-                              },
-                              "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ]
+                          "dividendPeriod" : [ {
+                            "startDate" : {
+                              "dividendDate" : {
+                                "globalReference" : "3e8a58",
+                                "externalReference" : "TradeDate"
+                              }
                             },
-                            "meta" : {
-                              "externalKey" : "InterimValuationDate",
-                              "globalKey" : "e80e5233"
+                            "endDate" : {
+                              "dividendDate" : {
+                                "globalReference" : "edf02740",
+                                "externalReference" : "TerminationDate"
+                              }
+                            },
+                            "dividendPaymentDate" : {
+                              "dividendDateReference" : {
+                                "dateReference" : "EquityPaymentDate"
+                              }
                             }
-                          },
-                          "valuationTimeType" : "CLOSE"
+                          } ]
                         }
-                      }
-                    } ]
-                  },
-                  "terminationDate" : {
-                    "meta" : {
-                      "externalKey" : "TerminationDate",
-                      "globalKey" : "f18f7c48"
-                    },
-                    "relativeDate" : {
-                      "meta" : {
-                        "globalKey" : "f18f7c48"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
-                      "businessDayConvention" : "NOT_APPLICABLE",
-                      "dateRelativeTo" : {
-                        "externalReference" : "FinalEquityPaymentDate",
-                        "globalReference" : "86542f29"
+                      "meta" : {
+                        "globalKey" : "5d54351a"
                       }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "d204e9e8"
                     }
+                  },
+                  "extraordinaryEvents" : {
+                    "mergerEvents" : {
+                      "shareForShare" : "ModifiedCalculationAgent",
+                      "shareForOther" : "ModifiedCalculationAgent",
+                      "shareForCombined" : "ModifiedCalculationAgent"
+                    },
+                    "tenderOfferEvents" : {
+                      "shareForShare" : "ModifiedCalculationAgent",
+                      "shareForOther" : "ModifiedCalculationAgent",
+                      "shareForCombined" : "ModifiedCalculationAgent"
+                    },
+                    "compositionOfCombinedConsideration" : true,
+                    "additionalDisruptionEvents" : {
+                      "changeInLaw" : true,
+                      "failureToDeliver" : true,
+                      "insolvencyFiling" : false,
+                      "hedgingDisruption" : true,
+                      "increasedCostOfHedging" : false,
+                      "lossOfStockBorrow" : true,
+                      "increasedCostOfStockBorrow" : false,
+                      "determiningParty" : "DisruptionEventsDeterminingParty"
+                    },
+                    "representations" : {
+                      "nonReliance" : true,
+                      "agreementsRegardingHedging" : true,
+                      "additionalAcknowledgements" : true
+                    },
+                    "nationalizationOrInsolvency" : "CancellationAndPayment"
+                  },
+                  "calculationAgent" : {
+                    "calculationAgentParty" : "CalculationAgentIndependent"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "95be1b14"
+                  "globalKey" : "8b69cf3e"
                 }
               },
               "meta" : {
-                "globalKey" : "95be1b14"
+                "globalKey" : "8b69cf3e"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "417e440b"
-                },
-                "observable" : {
+                "price" : [ {
+                  "value" : {
+                    "value" : 37.44,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
+                    },
+                    "perUnitOf" : {
+                      "financialUnit" : "Share"
+                    },
+                    "priceType" : "AssetPrice"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
+                  }
+                } ],
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 760400,
+                    "unit" : {
+                      "financialUnit" : "Share"
+                    }
+                  },
                   "meta" : {
-                    "globalKey" : "26bb033f"
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
+                  }
+                }, {
+                  "value" : {
+                    "value" : 28469376,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
+                    }
                   },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    } ]
+                  }
+                } ],
+                "observable" : {
                   "productIdentifier" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-1"
-                      } ]
-                    },
                     "value" : {
                       "identifier" : {
+                        "value" : "SHPGY.O",
                         "meta" : {
                           "scheme" : "http://www.abc.com/instrumentId"
-                        },
-                        "value" : "SHPGY.O"
+                        }
                       },
+                      "source" : "Other",
                       "meta" : {
                         "globalKey" : "8c85a05e"
-                      },
-                      "source" : "OTHER"
-                    }
-                  }, {
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-2"
+                        "value" : "productIdentifier-1"
                       } ]
-                    },
+                    }
+                  }, {
                     "value" : {
                       "identifier" : {
                         "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
                       },
+                      "source" : "Name",
                       "meta" : {
                         "globalKey" : "5518dd"
-                      },
-                      "source" : "NAME"
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "b0a564a1"
+                  }
                 },
+                "meta" : {
+                  "globalKey" : "b4fad14b"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.002,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 37.44,
                     "perUnitOf" : {
-                      "financialUnit" : "SHARE"
+                      "currency" : {
+                        "value" : "USD"
+                      }
                     },
-                    "priceType" : "ASSET_PRICE"
-                  }
-                } ],
-                "quantity" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
-                    } ]
+                    "priceType" : "InterestRate",
+                    "arithmeticOperator" : "Add"
                   },
-                  "value" : {
-                    "unit" : {
-                      "financialUnit" : "SHARE"
-                    },
-                    "value" : 760400
-                  }
-                }, {
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
+                      "value" : "price-2"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 28469376
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "7dd9ec3"
-                },
+                } ],
                 "observable" : {
-                  "meta" : {
-                    "globalKey" : "5f0c6d03"
-                  },
                   "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
                     "value" : {
                       "floatingRateIndex" : {
                         "value" : "USD-LIBOR-BBA"
                       },
                       "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "954"
-                        },
+                        "periodMultiplier" : 1,
                         "period" : "M",
-                        "periodMultiplier" : 1
+                        "meta" : {
+                          "globalKey" : "6c"
+                        }
                       }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
                     }
-                  }
-                },
-                "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
                   },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 0.002,
-                    "arithmeticOperator" : "ADD",
-                    "perUnitOf" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "priceType" : "INTEREST_RATE"
+                  "meta" : {
+                    "globalKey" : "82801f45"
                   }
-                } ]
+                },
+                "meta" : {
+                  "globalKey" : "95c8caad"
+                }
               } ]
-            } ]
-          },
-          "tradeDate" : {
-            "meta" : {
-              "externalKey" : "TradeDate",
-              "globalKey" : "3e8a58"
-            },
-            "value" : "2001-09-24"
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "33f59568",
+                "externalReference" : "party2"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "33f59567",
+                "externalReference" : "party1"
+              }
+            } ],
+            "ancillaryParty" : [ {
+              "role" : "DisruptionEventsDeterminingParty",
+              "partyReference" : [ {
+                "globalReference" : "33f59567",
+                "externalReference" : "party1"
+              } ]
+            }, {
+              "role" : "ExtraordinaryDividendsParty",
+              "partyReference" : [ {
+                "globalReference" : "33f59567",
+                "externalReference" : "party1"
+              } ]
+            }, {
+              "role" : "CalculationAgentIndependent",
+              "partyReference" : [ {
+                "globalReference" : "33f59567",
+                "externalReference" : "party1"
+              } ]
+            } ],
+            "adjustment" : "Execution"
           },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "Party A",
                 "meta" : {
-                  "scheme" : "http://www.partyA.com/eqs-trade-id"
-                },
-                "value" : "6234"
+                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+                }
+              },
+              "meta" : {
+                "globalKey" : "33f59567"
               }
             } ],
-            "issuerReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "33f59567"
-            },
             "meta" : {
-              "globalKey" : "3b465e4f"
+              "globalKey" : "33f59567",
+              "externalKey" : "party1"
             }
           }, {
-            "assignedIdentifier" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "Party B",
                 "meta" : {
-                  "scheme" : "http://www.partyB.com/eqs-trade-id"
-                },
-                "value" : "6569"
+                  "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+                }
+              },
+              "meta" : {
+                "globalKey" : "33f59568"
               }
             } ],
-            "issuerReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "33f59568"
-            },
             "meta" : {
-              "globalKey" : "384471b6"
+              "globalKey" : "33f59568",
+              "externalKey" : "party2"
             }
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "stockSplit" : {
-        "adjustmentRatio" : 2,
-        "effectiveDate" : "2001-11-03"
-      }
-    }
-  } ],
-  "intent" : "CORPORATE_ACTION_ADJUSTMENT",
-  "after" : [ {
-    "meta" : {
-      "globalKey" : "b2feba3e"
-    },
-    "trade" : {
-      "contractDetails" : {
-        "documentation" : [ {
-          "legalAgreementIdentification" : {
-            "agreementName" : {
-              "agreementType" : "MASTER_AGREEMENT",
-              "masterAgreementType" : {
-                "value" : "ISDA_MASTER"
+          } ],
+          "contractDetails" : {
+            "documentation" : [ {
+              "legalAgreementIdentification" : {
+                "agreementName" : {
+                  "agreementType" : "MasterAgreement",
+                  "masterAgreementType" : {
+                    "value" : "ISDAMaster"
+                  }
+                },
+                "vintage" : 2002
+              },
+              "meta" : {
+                "globalKey" : "328cfa59"
+              }
+            }, {
+              "legalAgreementIdentification" : {
+                "agreementName" : {
+                  "agreementType" : "Confirmation",
+                  "contractualDefinitionsType" : [ {
+                    "value" : "ISDA2000"
+                  }, {
+                    "value" : "ISDA2002Equity"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "ed9ef3fc"
               }
+            } ],
+            "governingLaw" : {
+              "value" : "GBEN"
             },
-            "vintage" : 2002
-          },
-          "meta" : {
-            "globalKey" : "328cfa59"
-          }
-        }, {
-          "legalAgreementIdentification" : {
-            "agreementName" : {
-              "agreementType" : "CONFIRMATION",
-              "contractualDefinitionsType" : [ {
-                "value" : "ISDA2000"
-              }, {
-                "value" : "ISDA_2002_EQUITY"
-              } ]
+            "meta" : {
+              "globalKey" : "92c7c587"
             }
           },
           "meta" : {
-            "globalKey" : "ed9ef3fc"
+            "globalKey" : "6fd3bec7"
           }
-        } ],
-        "governingLaw" : {
-          "value" : "GBEN"
         },
         "meta" : {
-          "globalKey" : "92c7c587"
+          "globalKey" : "6fd3bec7"
         }
-      },
-      "meta" : {
-        "globalKey" : "b2feba3e"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "party1",
-          "globalKey" : "33f59567"
+      }
+    }
+  } ],
+  "eventQualifier" : "StockSplit",
+  "after" : [ {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuerReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "6234",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-            },
-            "value" : "Party A"
-          },
-          "meta" : {
-            "globalKey" : "33f59567"
+              "scheme" : "http://www.partyA.com/eqs-trade-id"
+            }
           }
-        } ]
-      }, {
+        } ],
         "meta" : {
-          "externalKey" : "party2",
-          "globalKey" : "33f59568"
+          "globalKey" : "c921d6eb"
+        }
+      }, {
+        "issuerReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "partyId" : [ {
+        "assignedIdentifier" : [ {
           "identifier" : {
+            "value" : "6569",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-            },
-            "value" : "Party B"
-          },
-          "meta" : {
-            "globalKey" : "33f59568"
+              "scheme" : "http://www.partyB.com/eqs-trade-id"
+            }
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "310383ce"
+        }
       } ],
+      "tradeDate" : {
+        "value" : "2001-09-24",
+        "meta" : {
+          "globalKey" : "3e8a58",
+          "externalKey" : "TradeDate"
+        }
+      },
       "tradableProduct" : {
-        "adjustment" : "EXECUTION",
-        "ancillaryParty" : [ {
-          "partyReference" : [ {
-            "externalReference" : "party1",
-            "globalReference" : "33f59567"
-          } ],
-          "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-        }, {
-          "partyReference" : [ {
-            "externalReference" : "party1",
-            "globalReference" : "33f59567"
-          } ],
-          "role" : "EXTRAORDINARY_DIVIDENDS_PARTY"
-        }, {
-          "partyReference" : [ {
-            "externalReference" : "party1",
-            "globalReference" : "33f59567"
-          } ],
-          "role" : "CALCULATION_AGENT_INDEPENDENT"
-        } ],
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "33f59568"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "33f59567"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
-              "source" : "OTHER",
+              "source" : "Other",
               "value" : {
                 "name" : {
                   "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleName"
@@ -855,313 +788,305 @@
               "productQualifier" : "EquitySwap_TotalReturnBasicPerformance_SingleName"
             } ],
             "economicTerms" : {
-              "calculationAgent" : {
-                "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-              },
               "effectiveDate" : {
-                "meta" : {
-                  "externalKey" : "EffectiveDate",
-                  "globalKey" : "dbcf5078"
-                },
                 "relativeDate" : {
+                  "periodMultiplier" : 3,
+                  "period" : "D",
                   "meta" : {
-                    "globalKey" : "dbcf5078"
+                    "globalKey" : "a2cb5f8a"
                   },
-                  "period" : "D",
-                  "periodMultiplier" : 3,
-                  "dayType" : "EXCHANGE_BUSINESS",
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "dayType" : "ExchangeBusiness",
+                  "businessDayConvention" : "NotApplicable",
                   "dateRelativeTo" : {
-                    "externalReference" : "TradeDate",
-                    "globalReference" : "3e8a58"
+                    "globalReference" : "3e8a58",
+                    "externalReference" : "TradeDate"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "a2cb5f8a",
+                  "externalKey" : "EffectiveDate"
                 }
               },
-              "extraordinaryEvents" : {
-                "additionalDisruptionEvents" : {
-                  "changeInLaw" : true,
-                  "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                  "failureToDeliver" : true,
-                  "hedgingDisruption" : true,
-                  "increasedCostOfHedging" : false,
-                  "increasedCostOfStockBorrow" : false,
-                  "insolvencyFiling" : false,
-                  "lossOfStockBorrow" : true
-                },
-                "compositionOfCombinedConsideration" : true,
-                "mergerEvents" : {
-                  "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                  "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                  "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-                },
-                "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-                "representations" : {
-                  "additionalAcknowledgements" : true,
-                  "agreementsRegardingHedging" : true,
-                  "nonReliance" : true
+              "terminationDate" : {
+                "relativeDate" : {
+                  "periodMultiplier" : 0,
+                  "period" : "D",
+                  "meta" : {
+                    "globalKey" : "edf02740"
+                  },
+                  "businessDayConvention" : "NotApplicable",
+                  "dateRelativeTo" : {
+                    "globalReference" : "bee88507",
+                    "externalReference" : "FinalEquityPaymentDate"
+                  }
                 },
-                "tenderOfferEvents" : {
-                  "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                  "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                  "shareForShare" : "MODIFIED_CALCULATION_AGENT"
+                "meta" : {
+                  "globalKey" : "edf02740",
+                  "externalKey" : "TerminationDate"
                 }
               },
               "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "2fdf0b8c"
-                    },
-                    "quantityReference" : {
-                      "externalReference" : "EquityNotionalAmount",
-                      "globalReference" : "4cf"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "quantityReference" : {
+                      "globalReference" : "4cf",
+                      "externalReference" : "EquityNotionalAmount"
+                    },
+                    "meta" : {
+                      "globalKey" : "2fdf0b8c"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "floatingRate" : {
+                      "rateOption" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        }
+                      },
+                      "spreadSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-2"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
                     }
                   },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
                   "calculationPeriodDates" : {
                     "effectiveDate" : {
-                      "meta" : {
-                        "globalKey" : "dbcf5078"
-                      },
                       "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "dbcf5078"
+                          "globalKey" : "a2cb5f8a"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "EXCHANGE_BUSINESS",
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "dayType" : "ExchangeBusiness",
+                        "businessDayConvention" : "NotApplicable",
                         "dateRelativeTo" : {
-                          "externalReference" : "TradeDate",
-                          "globalReference" : "3e8a58"
+                          "globalReference" : "3e8a58",
+                          "externalReference" : "TradeDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "a2cb5f8a"
                       }
                     },
-                    "meta" : {
-                      "externalKey" : "InterestLegPeriodDates",
-                      "globalKey" : "e7334d0"
-                    },
                     "terminationDate" : {
-                      "meta" : {
-                        "globalKey" : "f18f7c48"
-                      },
                       "relativeDate" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "f18f7c48"
+                          "globalKey" : "edf02740"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "dateRelativeTo" : {
-                          "externalReference" : "FinalEquityPaymentDate",
-                          "globalReference" : "86542f29"
+                          "globalReference" : "bee88507",
+                          "externalReference" : "FinalEquityPaymentDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "edf02740"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "2fce1876",
+                      "externalKey" : "InterestLegPeriodDates"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "8306e5d6"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "9b9d36de"
-                    },
                     "paymentDateSchedule" : {
                       "interimPaymentDates" : [ {
-                        "meta" : {
-                          "globalKey" : "9b9d36de"
-                        },
                         "relativeDates" : {
+                          "periodMultiplier" : 0,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "9b9d36de"
+                            "globalKey" : "97fde1d6"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 0,
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                          "businessDayConvention" : "NotApplicable",
                           "dateRelativeTo" : {
-                            "externalReference" : "EquityPaymentDate",
-                            "globalReference" : "fb15beed"
+                            "globalReference" : "1a999e73",
+                            "externalReference" : "EquityPaymentDate"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "97fde1d6"
                         }
                       } ]
-                    }
-                  },
-                  "rateSpecification" : {
-                    "floatingRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateOption" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        }
-                      },
-                      "spreadSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-2"
-                          }
-                        }
-                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "97fde1d6"
                     }
                   },
                   "resetDates" : {
                     "calculationPeriodDatesReference" : {
-                      "externalReference" : "InterestLegPeriodDates",
-                      "globalReference" : "e7334d0"
+                      "globalReference" : "2fce1876",
+                      "externalReference" : "InterestLegPeriodDates"
                     },
+                    "resetRelativeTo" : "CalculationPeriodStartDate",
                     "meta" : {
-                      "globalKey" : "9ab7a6fd"
-                    },
-                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                      "globalKey" : "bc128aa3"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3cd0e14e"
                   }
                 } ],
-                "meta" : {
-                  "globalKey" : "3d9bbe0"
-                },
                 "performancePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_2",
-                    "receiver" : "PARTY_1"
+                    "payer" : "Party2",
+                    "receiver" : "Party1"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "externalKey" : "EquityNotionalAmount",
-                      "globalKey" : "4cf"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
                     },
-                    "reset" : true
+                    "reset" : true,
+                    "meta" : {
+                      "globalKey" : "4cf",
+                      "externalKey" : "EquityNotionalAmount"
+                    }
                   },
                   "settlementTerms" : {
-                    "meta" : {
-                      "globalKey" : "7610bbd9"
-                    },
+                    "settlementType" : "Cash",
                     "settlementCurrency" : {
                       "value" : "USD"
                     },
-                    "settlementType" : "CASH"
-                  },
-                  "meta" : {
-                    "globalKey" : "bd1fe08a"
-                  },
-                  "paymentDates" : {
                     "meta" : {
-                      "externalKey" : "EquityPaymentDate",
-                      "globalKey" : "fb15beed"
-                    },
-                    "paymentDateSchedule" : {
-                      "finalPaymentDate" : {
-                        "meta" : {
-                          "externalKey" : "FinalEquityPaymentDate",
-                          "globalKey" : "86542f29"
-                        },
-                        "relativeDate" : {
-                          "meta" : {
-                            "globalKey" : "86542f29"
+                      "globalKey" : "7610bbd9"
+                    }
+                  },
+                  "valuationDates" : {
+                    "valuationDatesInterim" : {
+                      "determinationMethod" : "ValuationTime",
+                      "valuationDates" : {
+                        "adjustableDates" : {
+                          "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ],
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NotApplicable",
+                            "meta" : {
+                              "globalKey" : "3a4b88ab"
+                            }
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 3,
-                          "dayType" : "CURRENCY_BUSINESS",
-                          "businessCentersReference" : {
-                            "externalReference" : "PrimaryBusinessCenter",
-                            "globalReference" : "27e4e9"
+                          "meta" : {
+                            "globalKey" : "e80e5233"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "e80e5233",
+                          "externalKey" : "InterimValuationDate"
+                        }
+                      },
+                      "valuationTimeType" : "Close",
+                      "meta" : {
+                        "globalKey" : "374dddc6"
+                      }
+                    },
+                    "valuationDatesFinal" : {
+                      "determinationMethod" : "HedgeExecution",
+                      "valuationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2002-09-24",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NotApplicable",
+                            "meta" : {
+                              "globalKey" : "3a4b88ab"
+                            }
                           },
-                          "businessDayConvention" : "FOLLOWING",
-                          "dateRelativeTo" : {
-                            "externalReference" : "FinalValuationDate",
-                            "globalReference" : "252ee503"
+                          "meta" : {
+                            "globalKey" : "252ee503"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "252ee503",
+                          "externalKey" : "FinalValuationDate"
                         }
                       },
+                      "meta" : {
+                        "globalKey" : "96fa6685"
+                      }
+                    }
+                  },
+                  "paymentDates" : {
+                    "paymentDateSchedule" : {
                       "interimPaymentDates" : [ {
-                        "meta" : {
-                          "externalKey" : "InterimEquityPaymentDate",
-                          "globalKey" : "2519d1b6"
-                        },
                         "relativeDates" : {
+                          "periodMultiplier" : 3,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "2519d1b6"
+                            "globalKey" : "dfe60714"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 3,
-                          "dayType" : "CURRENCY_BUSINESS",
+                          "dayType" : "CurrencyBusiness",
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "USNY"
                             } ],
                             "meta" : {
-                              "externalKey" : "PrimaryBusinessCenter",
-                              "globalKey" : "27e4e9"
+                              "globalKey" : "27e4e9",
+                              "externalKey" : "PrimaryBusinessCenter"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "dateRelativeTo" : {
-                            "externalReference" : "InterimValuationDate",
-                            "globalReference" : "e80e5233"
+                            "globalReference" : "e80e5233",
+                            "externalReference" : "InterimValuationDate"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "dfe60714",
+                          "externalKey" : "InterimEquityPaymentDate"
                         }
-                      } ]
-                    }
-                  },
-                  "returnTerms" : {
-                    "dividendReturnTerms" : {
-                      "dividendCurrency" : {
-                        "determinationMethod" : "DIVIDEND_CURRENCY"
-                      },
-                      "dividendEntitlement" : "EX_DATE",
-                      "dividendPayoutRatio" : [ {
-                        "totalRatio" : 1
                       } ],
-                      "dividendPeriod" : [ {
-                        "dividendPaymentDate" : {
-                          "dividendDateReference" : {
-                            "dateReference" : "EQUITY_PAYMENT_DATE"
-                          }
-                        },
-                        "endDate" : {
-                          "dividendDate" : {
-                            "externalReference" : "TerminationDate",
-                            "globalReference" : "f18f7c48"
+                      "finalPaymentDate" : {
+                        "relativeDate" : {
+                          "periodMultiplier" : 3,
+                          "period" : "D",
+                          "meta" : {
+                            "globalKey" : "bee88507"
+                          },
+                          "dayType" : "CurrencyBusiness",
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCentersReference" : {
+                            "globalReference" : "27e4e9",
+                            "externalReference" : "PrimaryBusinessCenter"
+                          },
+                          "dateRelativeTo" : {
+                            "globalReference" : "252ee503",
+                            "externalReference" : "FinalValuationDate"
                           }
                         },
-                        "startDate" : {
-                          "dividendDate" : {
-                            "externalReference" : "TradeDate",
-                            "globalReference" : "3e8a58"
-                          }
+                        "meta" : {
+                          "globalKey" : "bee88507",
+                          "externalKey" : "FinalEquityPaymentDate"
                         }
-                      } ],
-                      "dividendReinvestment" : false,
-                      "excessDividendAmount" : "RECORD_AMOUNT",
-                      "extraordinaryDividendsParty" : "EXTRAORDINARY_DIVIDENDS_PARTY"
+                      }
                     },
-                    "priceReturnTerms" : {
-                      "returnType" : "TOTAL"
+                    "meta" : {
+                      "globalKey" : "1a999e73",
+                      "externalKey" : "EquityPaymentDate"
                     }
                   },
                   "underlier" : {
-                    "meta" : {
-                      "globalKey" : "7a5b92c5"
-                    },
                     "security" : {
                       "productIdentifier" : [ {
                         "address" : {
@@ -1174,283 +1099,358 @@
                           "value" : "productIdentifier-2"
                         }
                       } ],
-                      "securityType" : "EQUITY"
+                      "securityType" : "Equity"
+                    },
+                    "meta" : {
+                      "globalKey" : "7a5b92c5"
                     }
                   },
-                  "valuationDates" : {
-                    "valuationDatesFinal" : {
-                      "determinationMethod" : "HEDGE_EXECUTION",
-                      "meta" : {
-                        "globalKey" : "96fa6685"
-                      },
-                      "valuationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "meta" : {
-                              "globalKey" : "3a4b88ab"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "252ee503"
-                          },
-                          "unadjustedDate" : "2002-09-24"
-                        },
-                        "meta" : {
-                          "externalKey" : "FinalValuationDate",
-                          "globalKey" : "252ee503"
-                        }
-                      }
+                  "returnTerms" : {
+                    "priceReturnTerms" : {
+                      "returnType" : "Total"
                     },
-                    "valuationDatesInterim" : {
-                      "determinationMethod" : "VALUATION_TIME",
-                      "meta" : {
-                        "globalKey" : "374dddc6"
+                    "dividendReturnTerms" : {
+                      "dividendPayoutRatio" : [ {
+                        "totalRatio" : 1
+                      } ],
+                      "dividendReinvestment" : false,
+                      "dividendEntitlement" : "ExDate",
+                      "extraordinaryDividendsParty" : "ExtraordinaryDividendsParty",
+                      "excessDividendAmount" : "RecordAmount",
+                      "dividendCurrency" : {
+                        "determinationMethod" : "DividendCurrency"
                       },
-                      "valuationDates" : {
-                        "adjustableDates" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "meta" : {
-                              "globalKey" : "3a4b88ab"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "e80e5233"
-                          },
-                          "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ]
+                      "dividendPeriod" : [ {
+                        "startDate" : {
+                          "dividendDate" : {
+                            "globalReference" : "3e8a58",
+                            "externalReference" : "TradeDate"
+                          }
                         },
-                        "meta" : {
-                          "externalKey" : "InterimValuationDate",
-                          "globalKey" : "e80e5233"
+                        "endDate" : {
+                          "dividendDate" : {
+                            "globalReference" : "edf02740",
+                            "externalReference" : "TerminationDate"
+                          }
+                        },
+                        "dividendPaymentDate" : {
+                          "dividendDateReference" : {
+                            "dateReference" : "EquityPaymentDate"
+                          }
                         }
-                      },
-                      "valuationTimeType" : "CLOSE"
+                      } ]
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "5d54351a"
                   }
-                } ]
-              },
-              "terminationDate" : {
+                } ],
                 "meta" : {
-                  "externalKey" : "TerminationDate",
-                  "globalKey" : "f18f7c48"
+                  "globalKey" : "d204e9e8"
+                }
+              },
+              "extraordinaryEvents" : {
+                "mergerEvents" : {
+                  "shareForShare" : "ModifiedCalculationAgent",
+                  "shareForOther" : "ModifiedCalculationAgent",
+                  "shareForCombined" : "ModifiedCalculationAgent"
+                },
+                "tenderOfferEvents" : {
+                  "shareForShare" : "ModifiedCalculationAgent",
+                  "shareForOther" : "ModifiedCalculationAgent",
+                  "shareForCombined" : "ModifiedCalculationAgent"
+                },
+                "compositionOfCombinedConsideration" : true,
+                "additionalDisruptionEvents" : {
+                  "changeInLaw" : true,
+                  "failureToDeliver" : true,
+                  "insolvencyFiling" : false,
+                  "hedgingDisruption" : true,
+                  "increasedCostOfHedging" : false,
+                  "lossOfStockBorrow" : true,
+                  "increasedCostOfStockBorrow" : false,
+                  "determiningParty" : "DisruptionEventsDeterminingParty"
                 },
-                "relativeDate" : {
-                  "meta" : {
-                    "globalKey" : "f18f7c48"
-                  },
-                  "period" : "D",
-                  "periodMultiplier" : 0,
-                  "businessDayConvention" : "NOT_APPLICABLE",
-                  "dateRelativeTo" : {
-                    "externalReference" : "FinalEquityPaymentDate",
-                    "globalReference" : "86542f29"
-                  }
-                }
+                "representations" : {
+                  "nonReliance" : true,
+                  "agreementsRegardingHedging" : true,
+                  "additionalAcknowledgements" : true
+                },
+                "nationalizationOrInsolvency" : "CancellationAndPayment"
+              },
+              "calculationAgent" : {
+                "calculationAgentParty" : "CalculationAgentIndependent"
               }
             },
             "meta" : {
-              "globalKey" : "95be1b14"
+              "globalKey" : "8b69cf3e"
             }
           },
           "meta" : {
-            "globalKey" : "95be1b14"
+            "globalKey" : "8b69cf3e"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "f2fe6786"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "26bb033f"
-              },
-              "productIdentifier" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "productIdentifier-1"
-                  } ]
-                },
-                "value" : {
-                  "identifier" : {
-                    "meta" : {
-                      "scheme" : "http://www.abc.com/instrumentId"
-                    },
-                    "value" : "SHPGY.O"
-                  },
-                  "meta" : {
-                    "globalKey" : "8c85a05e"
-                  },
-                  "source" : "OTHER"
-                }
-              }, {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "productIdentifier-2"
-                  } ]
-                },
-                "value" : {
-                  "identifier" : {
-                    "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
-                  },
-                  "meta" : {
-                    "globalKey" : "5518dd"
-                  },
-                  "source" : "NAME"
-                }
-              } ]
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 18.72,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 18.72,
                 "perUnitOf" : {
-                  "financialUnit" : "SHARE"
+                  "financialUnit" : "Share"
                 },
-                "priceType" : "ASSET_PRICE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "AssetPrice"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 1520800,
                 "unit" : {
-                  "financialUnit" : "SHARE"
-                },
-                "value" : 1520800
-              }
-            }, {
+                  "financialUnit" : "Share"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "quantity-2"
                 } ]
-              },
+              }
+            }, {
               "value" : {
+                "value" : 28469376,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 28469376
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
               }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "7dd9ec3"
-            },
+            } ],
             "observable" : {
-              "meta" : {
-                "globalKey" : "5f0c6d03"
-              },
-              "rateOption" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "SHPGY.O",
+                    "meta" : {
+                      "scheme" : "http://www.abc.com/instrumentId"
+                    }
+                  },
+                  "source" : "Other",
+                  "meta" : {
+                    "globalKey" : "8c85a05e"
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "rateOption-1"
+                    "value" : "productIdentifier-1"
                   } ]
-                },
+                }
+              }, {
                 "value" : {
-                  "floatingRateIndex" : {
-                    "value" : "USD-LIBOR-BBA"
+                  "identifier" : {
+                    "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
                   },
-                  "indexTenor" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1
+                  "source" : "Name",
+                  "meta" : {
+                    "globalKey" : "5518dd"
                   }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "productIdentifier-2"
+                  } ]
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "b0a564a1"
               }
             },
+            "meta" : {
+              "globalKey" : "f26dc186"
+            }
+          }, {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-2"
-                } ]
-              },
               "value" : {
+                "value" : 0.002,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 0.002,
-                "arithmeticOperator" : "ADD",
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
+                "priceType" : "InterestRate",
+                "arithmeticOperator" : "Add"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-2"
+                } ]
+              }
+            } ],
+            "observable" : {
+              "rateOption" : {
+                "value" : {
+                  "floatingRateIndex" : {
+                    "value" : "USD-LIBOR-BBA"
+                  },
+                  "indexTenor" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "rateOption-1"
+                  } ]
+                }
+              },
+              "meta" : {
+                "globalKey" : "82801f45"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "95c8caad"
+            }
           } ]
-        } ]
-      },
-      "tradeDate" : {
-        "meta" : {
-          "externalKey" : "TradeDate",
-          "globalKey" : "3e8a58"
-        },
-        "value" : "2001-09-24"
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "33f59568",
+            "externalReference" : "party2"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "33f59567",
+            "externalReference" : "party1"
+          }
+        } ],
+        "ancillaryParty" : [ {
+          "role" : "DisruptionEventsDeterminingParty",
+          "partyReference" : [ {
+            "globalReference" : "33f59567",
+            "externalReference" : "party1"
+          } ]
+        }, {
+          "role" : "ExtraordinaryDividendsParty",
+          "partyReference" : [ {
+            "globalReference" : "33f59567",
+            "externalReference" : "party1"
+          } ]
+        }, {
+          "role" : "CalculationAgentIndependent",
+          "partyReference" : [ {
+            "globalReference" : "33f59567",
+            "externalReference" : "party1"
+          } ]
+        } ],
+        "adjustment" : "Execution"
       },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "Party A",
             "meta" : {
-              "scheme" : "http://www.partyA.com/eqs-trade-id"
-            },
-            "value" : "6234"
+              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+            }
+          },
+          "meta" : {
+            "globalKey" : "33f59567"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
         "meta" : {
-          "globalKey" : "3b465e4f"
+          "globalKey" : "33f59567",
+          "externalKey" : "party1"
         }
       }, {
-        "assignedIdentifier" : [ {
+        "partyId" : [ {
           "identifier" : {
+            "value" : "Party B",
             "meta" : {
-              "scheme" : "http://www.partyB.com/eqs-trade-id"
+              "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+            }
+          },
+          "meta" : {
+            "globalKey" : "33f59568"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "33f59568",
+          "externalKey" : "party2"
+        }
+      } ],
+      "contractDetails" : {
+        "documentation" : [ {
+          "legalAgreementIdentification" : {
+            "agreementName" : {
+              "agreementType" : "MasterAgreement",
+              "masterAgreementType" : {
+                "value" : "ISDAMaster"
+              }
             },
-            "value" : "6569"
+            "vintage" : 2002
+          },
+          "meta" : {
+            "globalKey" : "328cfa59"
+          }
+        }, {
+          "legalAgreementIdentification" : {
+            "agreementName" : {
+              "agreementType" : "Confirmation",
+              "contractualDefinitionsType" : [ {
+                "value" : "ISDA2000"
+              }, {
+                "value" : "ISDA2002Equity"
+              } ]
+            }
+          },
+          "meta" : {
+            "globalKey" : "ed9ef3fc"
           }
         } ],
-        "issuerReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
+        "governingLaw" : {
+          "value" : "GBEN"
         },
         "meta" : {
-          "globalKey" : "384471b6"
+          "globalKey" : "92c7c587"
         }
-      } ]
+      },
+      "meta" : {
+        "globalKey" : "d291142c"
+      }
+    },
+    "meta" : {
+      "globalKey" : "d291142c"
     }
   } ],
-  "eventQualifier" : "StockSplit",
   "meta" : {
-    "globalKey" : "48a11ecf"
+    "globalKey" : "2db85eb9"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/Basis-ex01-LIBOR-vs-SOFR-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/Basis-ex01-LIBOR-vs-SOFR-func-output.json
index 23a6443a52..c53c63d643 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/Basis-ex01-LIBOR-vs-SOFR-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/Basis-ex01-LIBOR-vs-SOFR-func-output.json
@@ -1,124 +1,80 @@
 {
-  "account" : [ {
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "clearing_firm_accounts"
-      },
-      "value" : "010S3"
-    },
-    "meta" : {
-      "externalKey" : "account1",
-      "globalKey" : "34a0c93d"
-    },
-    "partyReference" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "ba4f"
-    },
-    "servicingParty" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "ba4f"
-    }
-  } ],
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "4d9b8ce1"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "010S3"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "34a0c93d"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              }
-            } ],
-            "clearedDate" : "2018-10-31",
-            "meta" : {
-              "globalKey" : "4d9b8ce1"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "ba4f"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "9369931",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "010"
-                },
-                "meta" : {
-                  "globalKey" : "ba4f"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "43401077-2",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "66b48bac"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "MARKIT_WIRE"
-                },
+                  "value" : "43401077",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43401965",
+                  "meta" : {
+                    "scheme" : "platform_side_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43401077",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "dbf8be89"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "66b48bac"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
               },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "66b48bac"
-              },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS9369931",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "4ac79bd4"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-31",
+              "meta" : {
+                "globalKey" : "3f129f"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "ba4f"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -129,46 +85,48 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "b01f2613"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-2"
+                              }
+                            },
+                            "spreadSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "a9f2dce2"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d1d"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "2"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -177,598 +135,704 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "ee42d129"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2022-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "b01f2613"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "a9f2dce2"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "27ab0524"
-                              },
-                              "unadjustedDate" : "2022-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "27ab0524"
                             }
-                          }
-                        },
-                        "cashflowRepresentation" : {
-                          "cashflowsMatchParameters" : true,
-                          "paymentCalculationPeriod" : [ {
-                            "adjustedPaymentDate" : "2019-02-04",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-02-04",
-                              "adjustedStartDate" : "2018-11-02",
-                              "meta" : {
-                                "globalKey" : "221e9424"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2018-10-31",
-                                  "meta" : {
-                                    "globalKey" : "7a34171"
-                                  },
-                                  "observedRate" : 0
-                                } ]
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
-                              "notionalAmount" : 100000000
-                            } ],
+                              "meta" : {
+                                "globalKey" : "b01f2613"
+                              }
+                            },
                             "meta" : {
-                              "globalKey" : "510ee8a8"
+                              "globalKey" : "a9f2dce2"
                             }
-                          }, {
-                            "adjustedPaymentDate" : "2019-05-02",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-05-02",
-                              "adjustedStartDate" : "2019-02-04",
-                              "meta" : {
-                                "globalKey" : "38468420"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2019-01-31",
-                                  "meta" : {
-                                    "globalKey" : "7a3f3b1"
-                                  },
-                                  "observedRate" : 0
-                                } ]
-                              },
-                              "notionalAmount" : 100000000
-                            } ],
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "2049"
+                            },
+                            "rollConvention" : "2"
+                          },
+                          "meta" : {
+                            "globalKey" : "4bdfc495",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "72013b62"
+                              "globalKey" : "aa"
                             }
-                          }, {
-                            "adjustedPaymentDate" : "2019-08-02",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-08-02",
-                              "adjustedStartDate" : "2019-05-02",
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
                               "meta" : {
-                                "globalKey" : "292bd203"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2019-04-30",
-                                  "meta" : {
-                                    "globalKey" : "7a40ad2"
-                                  },
-                                  "observedRate" : 0
-                                } ]
-                              },
-                              "notionalAmount" : 100000000
-                            } ],
+                                "globalKey" : "42f910b",
+                                "externalKey" : "floatPrimaryBusinessCenters"
+                              }
+                            },
                             "meta" : {
-                              "globalKey" : "9639ca05"
+                              "globalKey" : "97b8e49c"
                             }
-                          }, {
-                            "adjustedPaymentDate" : "2019-11-04",
+                          },
+                          "meta" : {
+                            "globalKey" : "e18d000c",
+                            "externalKey" : "floatingLegPaymentDates"
+                          }
+                        },
+                        "resetDates" : {
+                          "calculationPeriodDatesReference" : {
+                            "globalReference" : "4bdfc495",
+                            "externalReference" : "floatingCalcPeriodDates"
+                          },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
+                          "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "1a78799e"
+                            },
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "21479e"
+                              }
+                            },
+                            "dateRelativeTo" : {
+                              "globalReference" : "5c191cb5",
+                              "externalReference" : "floatingLegResetDates"
+                            }
+                          },
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "b01f2613"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "a9f2dce2"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "5c191cb5",
+                            "externalKey" : "floatingLegResetDates"
+                          }
+                        },
+                        "cashflowRepresentation" : {
+                          "cashflowsMatchParameters" : true,
+                          "paymentCalculationPeriod" : [ {
+                            "adjustedPaymentDate" : "2019-02-04",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2018-11-02",
+                              "adjustedEndDate" : "2019-02-04",
+                              "meta" : {
+                                "globalKey" : "5fc4ab60"
+                              },
+                              "notionalAmount" : 100000000,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2018-10-31",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a34171"
+                                  }
+                                } ]
+                              }
+                            } ],
+                            "meta" : {
+                              "globalKey" : "8eb4ffe4"
+                            }
+                          }, {
+                            "adjustedPaymentDate" : "2019-05-02",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2019-02-04",
+                              "adjustedEndDate" : "2019-05-02",
+                              "meta" : {
+                                "globalKey" : "399f4fe4"
+                              },
+                              "notionalAmount" : 100000000,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2019-01-31",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a3f3b1"
+                                  }
+                                } ]
+                              }
+                            } ],
+                            "meta" : {
+                              "globalKey" : "735a0726"
+                            }
+                          }, {
+                            "adjustedPaymentDate" : "2019-08-02",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2019-05-02",
+                              "adjustedEndDate" : "2019-08-02",
+                              "meta" : {
+                                "globalKey" : "c421d883"
+                              },
+                              "notionalAmount" : 100000000,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2019-04-30",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a40ad2"
+                                  }
+                                } ]
+                              }
+                            } ],
+                            "meta" : {
+                              "globalKey" : "312fd085"
+                            }
+                          }, {
+                            "adjustedPaymentDate" : "2019-11-04",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-11-04",
                               "adjustedStartDate" : "2019-08-02",
+                              "adjustedEndDate" : "2019-11-04",
                               "meta" : {
-                                "globalKey" : "874747e4"
+                                "globalKey" : "bbda8920"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-07-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a42231"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "50315ea8"
+                              "globalKey" : "84c49fe4"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-02-03",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-02-03",
                               "adjustedStartDate" : "2019-11-04",
+                              "adjustedEndDate" : "2020-02-03",
                               "meta" : {
-                                "globalKey" : "c9420221"
+                                "globalKey" : "a07c4143"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-10-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a43971"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "8765efa4"
+                              "globalKey" : "5ea02ec6"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-05-05",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-05-05",
                               "adjustedStartDate" : "2020-02-03",
+                              "adjustedEndDate" : "2020-05-05",
                               "meta" : {
-                                "globalKey" : "ade45525"
+                                "globalKey" : "e2779661"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-01-30",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a4eb92"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "c7e4616a"
+                              "globalKey" : "fc77a2a6"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-08-03",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-08-03",
                               "adjustedStartDate" : "2020-05-05",
+                              "adjustedEndDate" : "2020-08-03",
                               "meta" : {
-                                "globalKey" : "3bd08f21"
+                                "globalKey" : "3d295ae5"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-04-30",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a502d2"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "609afe24"
+                              "globalKey" : "61f3c9e8"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-11-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-11-02",
                               "adjustedStartDate" : "2020-08-03",
+                              "adjustedEndDate" : "2020-11-02",
                               "meta" : {
-                                "globalKey" : "f7cfa1e2"
+                                "globalKey" : "c5f70b04"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-07-30",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a51a12"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "bba8e2a4"
+                              "globalKey" : "89d04bc6"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-02-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-02-02",
                               "adjustedStartDate" : "2020-11-02",
+                              "adjustedEndDate" : "2021-02-02",
                               "meta" : {
-                                "globalKey" : "69920d64"
+                                "globalKey" : "d9ae9e4"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-10-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a53133"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "b6e993e6"
+                              "globalKey" : "5af27066"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-05-04",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-05-04",
                               "adjustedStartDate" : "2021-02-02",
+                              "adjustedEndDate" : "2021-05-04",
                               "meta" : {
-                                "globalKey" : "4fe93926"
+                                "globalKey" : "847c7a62"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-01-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a5e373"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "f91cde6a"
+                              "globalKey" : "2db01fa6"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-08-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-08-02",
                               "adjustedStartDate" : "2021-05-04",
+                              "adjustedEndDate" : "2021-08-02",
                               "meta" : {
-                                "globalKey" : "ddd57322"
+                                "globalKey" : "df2e3ee6"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-04-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a5fab3"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "91d37b24"
+                              "globalKey" : "932c46e8"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-11-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-11-02",
                               "adjustedStartDate" : "2021-08-02",
+                              "adjustedEndDate" : "2021-11-02",
                               "meta" : {
-                                "globalKey" : "cebac124"
+                                "globalKey" : "69b0c7a4"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-07-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a611f3"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "b60c09e6"
+                              "globalKey" : "51021066"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-02-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-02-02",
                               "adjustedStartDate" : "2021-11-02",
+                              "adjustedEndDate" : "2022-02-02",
                               "meta" : {
-                                "globalKey" : "42320564"
+                                "globalKey" : "e63ae1e4"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-10-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a62933"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "b30193e6"
+                              "globalKey" : "570a7066"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-05-03",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-05-03",
                               "adjustedStartDate" : "2022-02-02",
+                              "adjustedEndDate" : "2022-05-03",
                               "meta" : {
-                                "globalKey" : "f3a2f623"
+                                "globalKey" : "5b679a01"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-01-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a6dbb1"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "2c0a3466"
+                              "globalKey" : "93ced844"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-08-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-08-02",
                               "adjustedStartDate" : "2022-05-03",
+                              "adjustedEndDate" : "2022-08-02",
                               "meta" : {
-                                "globalKey" : "b4c09264"
+                                "globalKey" : "82e7fb86"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-04-28",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a6f294"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "8c36a266"
+                              "globalKey" : "5a5e0b88"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-11-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-11-02",
                               "adjustedStartDate" : "2022-08-02",
+                              "adjustedEndDate" : "2022-11-02",
                               "meta" : {
-                                "globalKey" : "a75ab924"
+                                "globalKey" : "4250bfa4"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-07-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a709f3"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "b22409e6"
+                              "globalKey" : "4d1a1066"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
                         "meta" : {
-                          "globalKey" : "d541bd47"
+                          "globalKey" : "85e0d09d"
+                        }
+                      }, {
+                        "payerReceiver" : {
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "637fde94"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "97b8e49c"
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-2"
                             }
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "rateSpecification" : {
                           "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "rateOption" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
-                                "value" : "rateOption-2"
+                                "value" : "rateOption-1"
                               }
                             },
-                            "spreadSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           }
                         },
-                        "resetDates" : {
-                          "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "ee42d129"
-                          },
-                          "fixingDates" : {
-                            "meta" : {
-                              "globalKey" : "3d9c8eea"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              } ],
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
+                          "effectiveDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
+                              "dateAdjustments" : {
+                                "businessDayConvention" : "NONE",
+                                "meta" : {
+                                  "globalKey" : "24a738"
+                                }
+                              },
                               "meta" : {
-                                "globalKey" : "21479e"
+                                "globalKey" : "ecea117a"
                               }
                             },
-                            "businessDayConvention" : "NONE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "6811e7fd"
+                            "meta" : {
+                              "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "6811e7fd"
-                          },
-                          "resetDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
+                          "terminationDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2022-11-02",
+                              "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
+                                "businessCenters" : {
+                                  "businessCentersReference" : {
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "float2PrimaryBusinessCenters"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "358892d9"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "2f5c49a8"
+                                }
                               },
                               "meta" : {
-                                "globalKey" : "b01f2613"
+                                "globalKey" : "ad1471ea"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "a9f2dce2"
+                              "globalKey" : "ad1471ea"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
-                        }
-                      }, {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-2"
-                            }
-                          }
-                        },
-                        "calculationPeriodDates" : {
                           "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "float2PrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
+                                "globalReference" : "42f910b",
+                                "externalReference" : "float2PrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "358892d9"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "2f5c49a8"
                             }
                           },
                           "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
                             "meta" : {
-                              "globalKey" : "159eb"
+                              "globalKey" : "1a3b"
                             },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
                             "rollConvention" : "2"
                           },
-                          "effectiveDate" : {
-                            "adjustableDate" : {
-                              "dateAdjustments" : {
-                                "businessDayConvention" : "NONE",
-                                "meta" : {
-                                  "globalKey" : "24a738"
-                                }
-                              },
+                          "meta" : {
+                            "globalKey" : "5bc9f293",
+                            "externalKey" : "floating2CalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4abf7e"
+                            },
+                            "dayType" : "Business"
+                          },
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
                               "meta" : {
-                                "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                                "globalKey" : "42f910b",
+                                "externalKey" : "float2PrimaryBusinessCenters"
+                              }
                             },
                             "meta" : {
-                              "globalKey" : "ecea117a"
+                              "globalKey" : "97b8e49c"
                             }
                           },
                           "meta" : {
-                            "externalKey" : "floating2CalcPeriodDates",
-                            "globalKey" : "2b410783"
+                            "globalKey" : "c943f240",
+                            "externalKey" : "floating2LegPaymentDates"
+                          }
+                        },
+                        "resetDates" : {
+                          "calculationPeriodDatesReference" : {
+                            "globalReference" : "5bc9f293",
+                            "externalReference" : "floating2CalcPeriodDates"
                           },
-                          "terminationDate" : {
-                            "adjustableDate" : {
-                              "dateAdjustments" : {
-                                "businessCenters" : {
-                                  "businessCentersReference" : {
-                                    "externalReference" : "float2PrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "358892d9"
-                                  }
-                                },
-                                "businessDayConvention" : "MODFOLLOWING",
-                                "meta" : {
-                                  "globalKey" : "2f5c49a8"
-                                }
-                              },
+                          "resetRelativeTo" : "CalculationPeriodEndDate",
+                          "fixingDates" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "1bc532b"
+                            },
+                            "businessDayConvention" : "PRECEDING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "USGS"
+                              } ],
                               "meta" : {
-                                "globalKey" : "ad1471ea"
+                                "globalKey" : "27e40a"
+                              }
+                            },
+                            "dateRelativeTo" : {
+                              "globalReference" : "4352ae0b",
+                              "externalReference" : "floatingLeg2ResetDates"
+                            }
+                          },
+                          "resetFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
+                          },
+                          "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "float2PrimaryBusinessCenters"
                               },
-                              "unadjustedDate" : "2022-11-02"
+                              "meta" : {
+                                "globalKey" : "358892d9"
+                              }
                             },
                             "meta" : {
-                              "globalKey" : "ad1471ea"
+                              "globalKey" : "2f5c49a8"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "4352ae0b",
+                            "externalKey" : "floatingLeg2ResetDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -776,502 +840,391 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2019-11-06",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-11-04",
                               "adjustedStartDate" : "2018-11-02",
+                              "adjustedEndDate" : "2019-11-04",
                               "meta" : {
-                                "globalKey" : "2824e282"
+                                "globalKey" : "36ad0d3e"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-11-01",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a43d8f"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "1997d748"
+                              "globalKey" : "28200204"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-11-04",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-11-02",
                               "adjustedStartDate" : "2019-11-04",
+                              "adjustedEndDate" : "2020-11-02",
                               "meta" : {
-                                "globalKey" : "9a621101"
+                                "globalKey" : "75afc645"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-10-30",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a53152"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "86c42fc5"
+                              "globalKey" : "6211e509"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-11-04",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-11-02",
                               "adjustedStartDate" : "2020-11-02",
+                              "adjustedEndDate" : "2021-11-02",
                               "meta" : {
-                                "globalKey" : "6f985c00"
+                                "globalKey" : "e4834c00"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-11-01",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a62d8f"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "7f7282c4"
+                              "globalKey" : "f45d72c4"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-11-04",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-11-02",
                               "adjustedStartDate" : "2021-11-02",
+                              "adjustedEndDate" : "2022-11-02",
                               "meta" : {
-                                "globalKey" : "48385400"
+                                "globalKey" : "bd234400"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-11-01",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a7258f"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "7b8a82c4"
+                              "globalKey" : "f07572c4"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
                         "meta" : {
-                          "globalKey" : "8aa15671"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floating2LegPaymentDates",
-                            "globalKey" : "86770284"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "float2PrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "97b8e49c"
-                            }
-                          },
-                          "paymentDaysOffset" : {
-                            "meta" : {
-                              "globalKey" : "ea4baf42"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 2,
-                            "dayType" : "BUSINESS"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
-                          }
-                        },
-                        "resetDates" : {
-                          "calculationPeriodDatesReference" : {
-                            "externalReference" : "floating2CalcPeriodDates",
-                            "globalReference" : "2b410783"
-                          },
-                          "fixingDates" : {
-                            "meta" : {
-                              "globalKey" : "8c648123"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "USGS"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "27e40a"
-                              }
-                            },
-                            "businessDayConvention" : "PRECEDING",
-                            "dateRelativeTo" : {
-                              "externalReference" : "floatingLeg2ResetDates",
-                              "globalReference" : "b9b62003"
-                            }
-                          },
-                          "meta" : {
-                            "externalKey" : "floatingLeg2ResetDates",
-                            "globalKey" : "b9b62003"
-                          },
-                          "resetDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "float2PrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "358892d9"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "2f5c49a8"
-                            }
-                          },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                          "globalKey" : "44fc6e4d"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "8b526d78"
+                        "globalKey" : "fb393e2a"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "d11e51c1"
+                    "globalKey" : "41052273"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "d11e51c1"
+                  "globalKey" : "41052273"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "a0407424"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-2"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-LIBOR-BBA"
-                        },
-                        "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
-                        }
-                      }
-                    }
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0002,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.0002,
-                      "arithmeticOperator" : "ADD",
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate",
+                      "arithmeticOperator" : "Add"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "e84ab7ac"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "54f5dcc9"
-                    },
                     "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-LIBOR-BBA"
+                        },
+                        "indexTenor" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
+                        }
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                          "value" : "rateOption-2"
                         } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-SOFR-COMPOUND"
-                        }
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
                   },
+                  "meta" : {
+                    "globalKey" : "584936a8"
+                  }
+                }, {
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 100000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-SOFR-COMPOUND"
                         }
                       },
-                      "value" : 100000000
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "49c5bc57"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f129f"
-              },
-              "value" : "2018-10-31"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "9369931"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "43401077-2"
+                    "globalKey" : "fbce0222"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "ba4f",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "43401077"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "010",
                   "meta" : {
-                    "scheme" : "platform_side_id"
-                  },
-                  "value" : "43401965"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ba4f"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "ba4f",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "43401077"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "2e04c915"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS9369931"
+                  "value" : "MARKIT_WIRE"
+                },
+                "meta" : {
+                  "globalKey" : "66b48bac"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "66b48bac",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "66b48bac",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2018-10-31",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "010S3",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "17709ff2"
+                "globalKey" : "a30716bd",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "509e51c9"
+            }
+          },
+          "meta" : {
+            "globalKey" : "509e51c9"
           }
         }
       }
     } ],
-    "intent" : "CONTRACT_FORMATION",
+    "eventQualifier" : "ContractFormation",
     "after" : [ {
-      "meta" : {
-        "globalKey" : "59bc601e"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
       "trade" : {
-        "account" : [ {
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "clearing_firm_accounts"
-            },
-            "value" : "010S3"
-          },
-          "meta" : {
-            "externalKey" : "account1",
-            "globalKey" : "34a0c93d"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
-          },
-          "servicingParty" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
-          }
-        } ],
-        "clearedDate" : "2018-10-31",
-        "meta" : {
-          "globalKey" : "4d9b8ce1"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "clearing_firm",
-            "globalKey" : "ba4f"
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "1051b",
+            "externalReference" : "clearing_service"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "9369931",
               "meta" : {
-                "scheme" : "clearing_member_firms"
-              },
-              "value" : "010"
-            },
-            "meta" : {
-              "globalKey" : "ba4f"
+                "scheme" : "cme_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing_service",
-            "globalKey" : "1051b"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "CME"
-            },
-            "meta" : {
-              "globalKey" : "1051b"
+              "value" : "43401077-2",
+              "meta" : {
+                "scheme" : "client_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "trade_source",
-            "globalKey" : "66b48bac"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "MARKIT_WIRE"
-            },
+              "value" : "43401077",
+              "meta" : {
+                "scheme" : "platform_trade_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "43401965",
+              "meta" : {
+                "scheme" : "platform_side_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "43401077",
+              "meta" : {
+                "scheme" : "block_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "dbf8be89"
+          }
+        }, {
+          "issuer" : {
+            "value" : "1010000023",
             "meta" : {
-              "globalKey" : "66b48bac"
+              "scheme" : "cftc_Namespace"
             }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
           },
-          "partyReference" : {
-            "externalReference" : "trade_source",
-            "globalReference" : "66b48bac"
-          },
-          "role" : "DATA_SUBMITTER"
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "CCCIRS9369931",
+              "meta" : {
+                "scheme" : "reg_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "4ac79bd4"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2018-10-31",
+          "meta" : {
+            "globalKey" : "3f129f"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "ba4f"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -1282,90 +1235,199 @@
                 "payout" : {
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    },
+                    "rateSpecification" : {
+                      "floatingRate" : {
+                        "rateOption" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "rateOption-2"
+                          }
+                        },
+                        "spreadSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
                       }
                     },
+                    "dayCountFraction" : {
+                      "value" : "ACT/360"
+                    },
                     "calculationPeriodDates" : {
+                      "effectiveDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2018-11-02",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ecea117a"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "ecea117a"
+                        }
+                      },
+                      "terminationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2022-11-02",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "b01f2613"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "a9f2dce2"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "27ab0524"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "27ab0524"
+                        }
+                      },
                       "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "42f910b"
+                            "globalReference" : "42f910b",
+                            "externalReference" : "floatPrimaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "b01f2613"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "a9f2dce2"
                         }
                       },
                       "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
                         "meta" : {
-                          "globalKey" : "12d1d"
+                          "globalKey" : "2049"
                         },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
                         "rollConvention" : "2"
                       },
-                      "effectiveDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
+                      "meta" : {
+                        "globalKey" : "4bdfc495",
+                        "externalKey" : "floatingCalcPeriodDates"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "GBLO"
+                          }, {
+                            "value" : "USNY"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "42f910b",
+                            "externalKey" : "floatPrimaryBusinessCenters"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "97b8e49c"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "e18d000c",
+                        "externalKey" : "floatingLegPaymentDates"
+                      }
+                    },
+                    "resetDates" : {
+                      "calculationPeriodDatesReference" : {
+                        "globalReference" : "4bdfc495",
+                        "externalReference" : "floatingCalcPeriodDates"
+                      },
+                      "resetRelativeTo" : "CalculationPeriodStartDate",
+                      "fixingDates" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "1a78799e"
+                        },
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "GBLO"
+                          } ],
                           "meta" : {
-                            "globalKey" : "ecea117a"
-                          },
-                          "unadjustedDate" : "2018-11-02"
+                            "globalKey" : "21479e"
+                          }
                         },
-                        "meta" : {
-                          "globalKey" : "ecea117a"
+                        "dateRelativeTo" : {
+                          "globalReference" : "5c191cb5",
+                          "externalReference" : "floatingLegResetDates"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "floatingCalcPeriodDates",
-                        "globalKey" : "ee42d129"
+                      "resetFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
                       },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "b01f2613"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "a9f2dce2"
-                            }
+                      "resetDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "42f910b",
+                            "externalReference" : "floatPrimaryBusinessCenters"
                           },
                           "meta" : {
-                            "globalKey" : "27ab0524"
-                          },
-                          "unadjustedDate" : "2022-11-02"
+                            "globalKey" : "b01f2613"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "27ab0524"
+                          "globalKey" : "a9f2dce2"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "5c191cb5",
+                        "externalKey" : "floatingLegResetDates"
                       }
                     },
                     "cashflowRepresentation" : {
@@ -1373,511 +1435,396 @@
                       "paymentCalculationPeriod" : [ {
                         "adjustedPaymentDate" : "2019-02-04",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-02-04",
                           "adjustedStartDate" : "2018-11-02",
+                          "adjustedEndDate" : "2019-02-04",
                           "meta" : {
-                            "globalKey" : "221e9424"
+                            "globalKey" : "5fc4ab60"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2018-10-31",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a34171"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "510ee8a8"
+                          "globalKey" : "8eb4ffe4"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-05-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-05-02",
                           "adjustedStartDate" : "2019-02-04",
+                          "adjustedEndDate" : "2019-05-02",
                           "meta" : {
-                            "globalKey" : "38468420"
+                            "globalKey" : "399f4fe4"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2019-01-31",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a3f3b1"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "72013b62"
+                          "globalKey" : "735a0726"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-08-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-08-02",
                           "adjustedStartDate" : "2019-05-02",
+                          "adjustedEndDate" : "2019-08-02",
                           "meta" : {
-                            "globalKey" : "292bd203"
+                            "globalKey" : "c421d883"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2019-04-30",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a40ad2"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "9639ca05"
+                          "globalKey" : "312fd085"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-11-04",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-11-04",
                           "adjustedStartDate" : "2019-08-02",
+                          "adjustedEndDate" : "2019-11-04",
                           "meta" : {
-                            "globalKey" : "874747e4"
+                            "globalKey" : "bbda8920"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2019-07-31",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a42231"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "50315ea8"
+                          "globalKey" : "84c49fe4"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-02-03",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-02-03",
                           "adjustedStartDate" : "2019-11-04",
+                          "adjustedEndDate" : "2020-02-03",
                           "meta" : {
-                            "globalKey" : "c9420221"
+                            "globalKey" : "a07c4143"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2019-10-31",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a43971"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "8765efa4"
+                          "globalKey" : "5ea02ec6"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-05-05",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-05-05",
                           "adjustedStartDate" : "2020-02-03",
+                          "adjustedEndDate" : "2020-05-05",
                           "meta" : {
-                            "globalKey" : "ade45525"
+                            "globalKey" : "e2779661"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2020-01-30",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a4eb92"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "c7e4616a"
+                          "globalKey" : "fc77a2a6"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-08-03",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-08-03",
                           "adjustedStartDate" : "2020-05-05",
+                          "adjustedEndDate" : "2020-08-03",
                           "meta" : {
-                            "globalKey" : "3bd08f21"
+                            "globalKey" : "3d295ae5"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2020-04-30",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a502d2"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "609afe24"
+                          "globalKey" : "61f3c9e8"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-11-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-11-02",
                           "adjustedStartDate" : "2020-08-03",
+                          "adjustedEndDate" : "2020-11-02",
                           "meta" : {
-                            "globalKey" : "f7cfa1e2"
+                            "globalKey" : "c5f70b04"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2020-07-30",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a51a12"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "bba8e2a4"
+                          "globalKey" : "89d04bc6"
                         }
                       }, {
                         "adjustedPaymentDate" : "2021-02-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2021-02-02",
                           "adjustedStartDate" : "2020-11-02",
+                          "adjustedEndDate" : "2021-02-02",
                           "meta" : {
-                            "globalKey" : "69920d64"
+                            "globalKey" : "d9ae9e4"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2020-10-29",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a53133"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "b6e993e6"
+                          "globalKey" : "5af27066"
                         }
                       }, {
                         "adjustedPaymentDate" : "2021-05-04",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2021-05-04",
                           "adjustedStartDate" : "2021-02-02",
+                          "adjustedEndDate" : "2021-05-04",
                           "meta" : {
-                            "globalKey" : "4fe93926"
+                            "globalKey" : "847c7a62"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2021-01-29",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a5e373"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "f91cde6a"
+                          "globalKey" : "2db01fa6"
                         }
                       }, {
                         "adjustedPaymentDate" : "2021-08-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2021-08-02",
                           "adjustedStartDate" : "2021-05-04",
+                          "adjustedEndDate" : "2021-08-02",
                           "meta" : {
-                            "globalKey" : "ddd57322"
+                            "globalKey" : "df2e3ee6"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2021-04-29",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a5fab3"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "91d37b24"
+                          "globalKey" : "932c46e8"
                         }
                       }, {
                         "adjustedPaymentDate" : "2021-11-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2021-11-02",
                           "adjustedStartDate" : "2021-08-02",
+                          "adjustedEndDate" : "2021-11-02",
                           "meta" : {
-                            "globalKey" : "cebac124"
+                            "globalKey" : "69b0c7a4"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2021-07-29",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a611f3"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "b60c09e6"
+                          "globalKey" : "51021066"
                         }
                       }, {
                         "adjustedPaymentDate" : "2022-02-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2022-02-02",
                           "adjustedStartDate" : "2021-11-02",
+                          "adjustedEndDate" : "2022-02-02",
                           "meta" : {
-                            "globalKey" : "42320564"
+                            "globalKey" : "e63ae1e4"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2021-10-29",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a62933"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "b30193e6"
+                          "globalKey" : "570a7066"
                         }
                       }, {
                         "adjustedPaymentDate" : "2022-05-03",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2022-05-03",
                           "adjustedStartDate" : "2022-02-02",
+                          "adjustedEndDate" : "2022-05-03",
                           "meta" : {
-                            "globalKey" : "f3a2f623"
+                            "globalKey" : "5b679a01"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2022-01-31",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a6dbb1"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "2c0a3466"
+                          "globalKey" : "93ced844"
                         }
                       }, {
                         "adjustedPaymentDate" : "2022-08-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2022-08-02",
                           "adjustedStartDate" : "2022-05-03",
+                          "adjustedEndDate" : "2022-08-02",
                           "meta" : {
-                            "globalKey" : "b4c09264"
+                            "globalKey" : "82e7fb86"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2022-04-28",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a6f294"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "8c36a266"
+                          "globalKey" : "5a5e0b88"
                         }
                       }, {
                         "adjustedPaymentDate" : "2022-11-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2022-11-02",
                           "adjustedStartDate" : "2022-08-02",
+                          "adjustedEndDate" : "2022-11-02",
                           "meta" : {
-                            "globalKey" : "a75ab924"
+                            "globalKey" : "4250bfa4"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2022-07-29",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a709f3"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "b22409e6"
+                          "globalKey" : "4d1a1066"
                         }
                       } ]
                     },
-                    "dayCountFraction" : {
-                      "value" : "ACT/360"
-                    },
                     "meta" : {
-                      "globalKey" : "d541bd47"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "floatingLegPaymentDates",
-                        "globalKey" : "637fde94"
-                      },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "GBLO"
-                          }, {
-                            "value" : "USNY"
-                          } ],
-                          "meta" : {
-                            "externalKey" : "floatPrimaryBusinessCenters",
-                            "globalKey" : "42f910b"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "97b8e49c"
-                        }
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
-                      }
-                    },
-                    "rateSpecification" : {
-                      "floatingRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateOption" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "rateOption-2"
-                          }
-                        },
-                        "spreadSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "resetDates" : {
-                      "calculationPeriodDatesReference" : {
-                        "externalReference" : "floatingCalcPeriodDates",
-                        "globalReference" : "ee42d129"
-                      },
-                      "fixingDates" : {
-                        "meta" : {
-                          "globalKey" : "3d9c8eea"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "GBLO"
-                          } ],
-                          "meta" : {
-                            "globalKey" : "21479e"
-                          }
-                        },
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "floatingLegResetDates",
-                          "globalReference" : "6811e7fd"
-                        }
-                      },
-                      "meta" : {
-                        "externalKey" : "floatingLegResetDates",
-                        "globalKey" : "6811e7fd"
-                      },
-                      "resetDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "42f910b"
-                          },
-                          "meta" : {
-                            "globalKey" : "b01f2613"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "a9f2dce2"
-                        }
-                      },
-                      "resetFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
-                      },
-                      "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                      "globalKey" : "85e0d09d"
                     }
                   }, {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-2"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "float2PrimaryBusinessCenters",
-                            "globalReference" : "42f910b"
-                          },
-                          "meta" : {
-                            "globalKey" : "358892d9"
+                    "rateSpecification" : {
+                      "floatingRate" : {
+                        "rateOption" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "rateOption-1"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "2f5c49a8"
-                        }
-                      },
-                      "calculationPeriodFrequency" : {
                         "meta" : {
-                          "globalKey" : "159eb"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 1,
-                        "rollConvention" : "2"
-                      },
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/360"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2018-11-02",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -1886,42 +1833,156 @@
                           },
                           "meta" : {
                             "globalKey" : "ecea117a"
-                          },
-                          "unadjustedDate" : "2018-11-02"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ecea117a"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "floating2CalcPeriodDates",
-                        "globalKey" : "2b410783"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2022-11-02",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "float2PrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
+                                "globalReference" : "42f910b",
+                                "externalReference" : "float2PrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "358892d9"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "2f5c49a8"
                             }
                           },
                           "meta" : {
                             "globalKey" : "ad1471ea"
-                          },
-                          "unadjustedDate" : "2022-11-02"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ad1471ea"
                         }
+                      },
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "42f910b",
+                            "externalReference" : "float2PrimaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "358892d9"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "2f5c49a8"
+                        }
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "1a3b"
+                        },
+                        "rollConvention" : "2"
+                      },
+                      "meta" : {
+                        "globalKey" : "5bc9f293",
+                        "externalKey" : "floating2CalcPeriodDates"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "78"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDaysOffset" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "ea4abf7e"
+                        },
+                        "dayType" : "Business"
+                      },
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "GBLO"
+                          }, {
+                            "value" : "USNY"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "42f910b",
+                            "externalKey" : "float2PrimaryBusinessCenters"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "97b8e49c"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "c943f240",
+                        "externalKey" : "floating2LegPaymentDates"
+                      }
+                    },
+                    "resetDates" : {
+                      "calculationPeriodDatesReference" : {
+                        "globalReference" : "5bc9f293",
+                        "externalReference" : "floating2CalcPeriodDates"
+                      },
+                      "resetRelativeTo" : "CalculationPeriodEndDate",
+                      "fixingDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "1bc532b"
+                        },
+                        "businessDayConvention" : "PRECEDING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "USGS"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "27e40a"
+                          }
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "4352ae0b",
+                          "externalReference" : "floatingLeg2ResetDates"
+                        }
+                      },
+                      "resetFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "78"
+                        }
+                      },
+                      "resetDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "42f910b",
+                            "externalReference" : "float2PrimaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "358892d9"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "2f5c49a8"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "4352ae0b",
+                        "externalKey" : "floatingLeg2ResetDates"
                       }
                     },
                     "cashflowRepresentation" : {
@@ -1929,453 +1990,375 @@
                       "paymentCalculationPeriod" : [ {
                         "adjustedPaymentDate" : "2019-11-06",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-11-04",
                           "adjustedStartDate" : "2018-11-02",
+                          "adjustedEndDate" : "2019-11-04",
                           "meta" : {
-                            "globalKey" : "2824e282"
+                            "globalKey" : "36ad0d3e"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2019-11-01",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a43d8f"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "1997d748"
+                          "globalKey" : "28200204"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-11-04",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-11-02",
                           "adjustedStartDate" : "2019-11-04",
+                          "adjustedEndDate" : "2020-11-02",
                           "meta" : {
-                            "globalKey" : "9a621101"
+                            "globalKey" : "75afc645"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2020-10-30",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a53152"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "86c42fc5"
+                          "globalKey" : "6211e509"
                         }
                       }, {
                         "adjustedPaymentDate" : "2021-11-04",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2021-11-02",
                           "adjustedStartDate" : "2020-11-02",
+                          "adjustedEndDate" : "2021-11-02",
                           "meta" : {
-                            "globalKey" : "6f985c00"
+                            "globalKey" : "e4834c00"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2021-11-01",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a62d8f"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "7f7282c4"
+                          "globalKey" : "f45d72c4"
                         }
                       }, {
                         "adjustedPaymentDate" : "2022-11-04",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2022-11-02",
                           "adjustedStartDate" : "2021-11-02",
+                          "adjustedEndDate" : "2022-11-02",
                           "meta" : {
-                            "globalKey" : "48385400"
+                            "globalKey" : "bd234400"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2022-11-01",
+                              "observedRate" : 0,
                               "meta" : {
-                                "globalKey" : "7a7258f"
-                              },
-                              "observedRate" : 0
-                            } ]
-                          },
-                          "notionalAmount" : 100000000
-                        } ],
-                        "meta" : {
-                          "globalKey" : "7b8a82c4"
-                        }
-                      } ]
-                    },
-                    "dayCountFraction" : {
-                      "value" : "ACT/360"
-                    },
-                    "meta" : {
-                      "globalKey" : "8aa15671"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "floating2LegPaymentDates",
-                        "globalKey" : "86770284"
-                      },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "GBLO"
-                          }, {
-                            "value" : "USNY"
-                          } ],
-                          "meta" : {
-                            "externalKey" : "float2PrimaryBusinessCenters",
-                            "globalKey" : "42f910b"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "97b8e49c"
-                        }
-                      },
-                      "paymentDaysOffset" : {
-                        "meta" : {
-                          "globalKey" : "ea4baf42"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "BUSINESS"
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "ac8"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 1
-                      }
-                    },
-                    "rateSpecification" : {
-                      "floatingRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateOption" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "rateOption-1"
-                          }
-                        }
-                      }
-                    },
-                    "resetDates" : {
-                      "calculationPeriodDatesReference" : {
-                        "externalReference" : "floating2CalcPeriodDates",
-                        "globalReference" : "2b410783"
-                      },
-                      "fixingDates" : {
-                        "meta" : {
-                          "globalKey" : "8c648123"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "USGS"
-                          } ],
-                          "meta" : {
-                            "globalKey" : "27e40a"
-                          }
-                        },
-                        "businessDayConvention" : "PRECEDING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "floatingLeg2ResetDates",
-                          "globalReference" : "b9b62003"
-                        }
-                      },
-                      "meta" : {
-                        "externalKey" : "floatingLeg2ResetDates",
-                        "globalKey" : "b9b62003"
-                      },
-                      "resetDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "float2PrimaryBusinessCenters",
-                            "globalReference" : "42f910b"
-                          },
-                          "meta" : {
-                            "globalKey" : "358892d9"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "2f5c49a8"
-                        }
-                      },
-                      "resetFrequency" : {
-                        "meta" : {
-                          "globalKey" : "ac8"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 1
-                      },
-                      "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
-                    }
-                  } ],
-                  "meta" : {
-                    "globalKey" : "8b526d78"
-                  }
-                }
-              },
-              "meta" : {
-                "globalKey" : "d11e51c1"
-              }
-            },
-            "meta" : {
-              "globalKey" : "d11e51c1"
-            }
-          },
-          "tradeLot" : [ {
-            "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "a0407424"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "5f0c6d05"
-                },
-                "rateOption" : {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "rateOption-2"
-                    } ]
-                  },
-                  "value" : {
-                    "floatingRateIndex" : {
-                      "value" : "USD-LIBOR-BBA"
+                                "globalKey" : "7a7258f"
+                              }
+                            } ]
+                          }
+                        } ],
+                        "meta" : {
+                          "globalKey" : "f07572c4"
+                        }
+                      } ]
                     },
-                    "indexTenor" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                    "meta" : {
+                      "globalKey" : "44fc6e4d"
                     }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "fb393e2a"
                   }
                 }
               },
+              "meta" : {
+                "globalKey" : "41052273"
+              }
+            },
+            "meta" : {
+              "globalKey" : "41052273"
+            }
+          },
+          "tradeLot" : [ {
+            "priceQuantity" : [ {
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.0002,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.0002,
-                  "arithmeticOperator" : "ADD",
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ],
-              "quantity" : [ {
+                  "priceType" : "InterestRate",
+                  "arithmeticOperator" : "Add"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "quantity" : [ {
                 "value" : {
+                  "value" : 100000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 100000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
                 }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "e84ab7ac"
-              },
+              } ],
               "observable" : {
-                "meta" : {
-                  "globalKey" : "54f5dcc9"
-                },
                 "rateOption" : {
+                  "value" : {
+                    "floatingRateIndex" : {
+                      "value" : "USD-LIBOR-BBA"
+                    },
+                    "indexTenor" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "rateOption-1"
+                      "value" : "rateOption-2"
                     } ]
-                  },
-                  "value" : {
-                    "floatingRateIndex" : {
-                      "value" : "USD-SOFR-COMPOUND"
-                    }
                   }
+                },
+                "meta" : {
+                  "globalKey" : "828026c7"
                 }
               },
+              "meta" : {
+                "globalKey" : "584936a8"
+              }
+            }, {
               "quantity" : [ {
+                "value" : {
+                  "value" : 100000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-2"
                   } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
+                }
+              } ],
+              "observable" : {
+                "rateOption" : {
+                  "value" : {
+                    "floatingRateIndex" : {
+                      "value" : "USD-SOFR-COMPOUND"
                     }
                   },
-                  "value" : 100000000
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "rateOption-1"
+                    } ]
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "49c5bc57"
                 }
-              } ]
-            } ]
-          } ]
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f129f"
-          },
-          "value" : "2018-10-31"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "cme_trade_id"
               },
-              "value" : "9369931"
-            }
-          }, {
-            "identifier" : {
               "meta" : {
-                "scheme" : "client_trade_id"
-              },
-              "value" : "43401077-2"
+                "globalKey" : "fbce0222"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "ba4f",
+              "externalReference" : "clearing_firm"
             }
           }, {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "platform_trade_id"
-              },
-              "value" : "43401077"
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
             }
-          }, {
+          } ]
+        },
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "010",
               "meta" : {
-                "scheme" : "platform_side_id"
-              },
-              "value" : "43401965"
+                "scheme" : "clearing_member_firms"
+              }
+            },
+            "meta" : {
+              "globalKey" : "ba4f"
             }
-          }, {
+          } ],
+          "meta" : {
+            "globalKey" : "ba4f",
+            "externalKey" : "clearing_firm"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "block_trade_id"
-              },
-              "value" : "43401077"
+              "value" : "CME"
+            },
+            "meta" : {
+              "globalKey" : "1051b"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "clearing_service",
-            "globalReference" : "1051b"
-          },
           "meta" : {
-            "globalKey" : "2e04c915"
+            "globalKey" : "1051b",
+            "externalKey" : "clearing_service"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "reg_trade_id"
-              },
-              "value" : "CCCIRS9369931"
+              "value" : "MARKIT_WIRE"
+            },
+            "meta" : {
+              "globalKey" : "66b48bac"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "66b48bac",
+            "externalKey" : "trade_source"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "66b48bac",
+            "externalReference" : "trade_source"
+          },
+          "role" : "DataSubmitter",
+          "ownershipPartyReference" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
+          }
+        } ],
+        "clearedDate" : "2018-10-31",
+        "account" : [ {
+          "partyReference" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
+          },
+          "accountNumber" : {
+            "value" : "010S3",
             "meta" : {
-              "scheme" : "cftc_Namespace"
-            },
-            "value" : "1010000023"
+              "scheme" : "clearing_firm_accounts"
+            }
+          },
+          "servicingParty" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
           },
           "meta" : {
-            "globalKey" : "17709ff2"
+            "globalKey" : "a30716bd",
+            "externalKey" : "account1"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "509e51c9"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
+      },
+      "meta" : {
+        "globalKey" : "1e43efec"
       }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "f398a463"
+      "globalKey" : "1e601f19"
     }
   },
+  "previousWorkflowStep" : {
+    "globalReference" : "afd5a3e0"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "0109369931",
       "meta" : {
         "scheme" : "cme_message_id"
-      },
-      "value" : "0109369931"
+      }
     },
     "sentBy" : {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
+      }
     },
     "sentTo" : [ {
+      "value" : "010",
       "meta" : {
         "scheme" : "cme_firm_id"
-      },
-      "value" : "010"
+      }
     }, {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
+      }
     } ]
   },
-  "meta" : {
-    "globalKey" : "397f4a51"
-  },
+  "timestamp" : [ {
+    "dateTime" : "2018-10-31T14:33:27Z",
+    "qualification" : "eventCreationDateTime"
+  }, {
+    "dateTime" : "2018-10-31T14:14:45.895Z",
+    "qualification" : "clearingReceiptDateTime"
+  } ],
   "party" : [ {
-    "meta" : {
-      "externalKey" : "clearing_firm",
-      "globalKey" : "ba4f"
-    },
     "partyId" : [ {
       "identifier" : {
+        "value" : "010",
         "meta" : {
           "scheme" : "clearing_member_firms"
-        },
-        "value" : "010"
+        }
       },
       "meta" : {
         "globalKey" : "ba4f"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "clearing_service",
-      "globalKey" : "1051b"
-    },
+      "globalKey" : "ba4f",
+      "externalKey" : "clearing_firm"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "CME"
@@ -2383,12 +2366,12 @@
       "meta" : {
         "globalKey" : "1051b"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "trade_source",
-      "globalKey" : "66b48bac"
-    },
+      "globalKey" : "1051b",
+      "externalKey" : "clearing_service"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "MARKIT_WIRE"
@@ -2396,16 +2379,33 @@
       "meta" : {
         "globalKey" : "66b48bac"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "66b48bac",
+      "externalKey" : "trade_source"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "13a3c110"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2018-10-31T14:33:27Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  }, {
-    "dateTime" : "2018-10-31T14:14:45.895Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
-  } ]
+  "account" : [ {
+    "partyReference" : {
+      "globalReference" : "ba4f",
+      "externalReference" : "clearing_firm"
+    },
+    "accountNumber" : {
+      "value" : "010S3",
+      "meta" : {
+        "scheme" : "clearing_firm_accounts"
+      }
+    },
+    "servicingParty" : {
+      "globalReference" : "ba4f",
+      "externalReference" : "clearing_firm"
+    },
+    "meta" : {
+      "globalKey" : "a30716bd",
+      "externalKey" : "account1"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "19946dcf"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/FRA-ex01-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/FRA-ex01-func-output.json
index a971ecc7d5..835f1b6e8f 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/FRA-ex01-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/FRA-ex01-func-output.json
@@ -1,124 +1,73 @@
 {
-  "account" : [ {
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "clearing_firm_accounts"
-      },
-      "value" : "999-123"
-    },
-    "meta" : {
-      "externalKey" : "account1",
-      "globalKey" : "a18b2f80"
-    },
-    "partyReference" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "dd19"
-    },
-    "servicingParty" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "dd19"
-    }
-  } ],
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "24098fef"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "999-123"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "a18b2f80"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              }
-            } ],
-            "clearedDate" : "2014-10-03",
-            "meta" : {
-              "globalKey" : "24098fef"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "dd19"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "2894761",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "999"
-                },
-                "meta" : {
-                  "globalKey" : "dd19"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "QAC_11111",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "9e635873"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "PLATFORM"
-                },
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "c14a1fc0"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "9e635873"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "9e635873"
               },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS2894761",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e12c31ab"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2014-10-03",
+              "meta" : {
+                "globalKey" : "3ef283"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "dd19"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -129,48 +78,63 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        },
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
                           }
                         },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
                         "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
                               "adjustedDate" : {
+                                "value" : "2015-01-07",
                                 "meta" : {
                                   "globalKey" : "3ef847"
-                                },
-                                "value" : "2015-01-07"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "0"
                               }
                             },
                             "meta" : {
-                              "externalKey" : "resetDate",
-                              "globalKey" : "0"
+                              "globalKey" : "0",
+                              "externalKey" : "resetDate"
                             }
                           },
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
                               "adjustedDate" : {
+                                "value" : "2015-04-08",
                                 "meta" : {
                                   "globalKey" : "3ef908"
-                                },
-                                "value" : "2015-04-08"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "0"
@@ -179,19 +143,15 @@
                             "meta" : {
                               "globalKey" : "0"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
-                        "discountingMethod" : {
-                          "discountingType" : "FRA"
-                        },
-                        "meta" : {
-                          "globalKey" : "1a3477ac"
-                        },
                         "paymentDate" : {
+                          "unadjustedDate" : "2015-01-07",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "AUSY"
@@ -200,75 +160,77 @@
                                 "globalKey" : "1ed59a"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "3659d96b"
                             }
                           },
                           "meta" : {
                             "globalKey" : "57ddf584"
-                          },
-                          "unadjustedDate" : "2015-01-07"
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
                           }
+                        },
+                        "discountingMethod" : {
+                          "discountingType" : "FRA"
+                        },
+                        "meta" : {
+                          "globalKey" : "6f3ee7f4"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        },
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
                           }
                         },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
                         "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
                               "adjustedDate" : {
+                                "value" : "2015-01-07",
                                 "meta" : {
                                   "globalKey" : "3ef847"
-                                },
-                                "value" : "2015-01-07"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "0"
                               }
                             },
                             "meta" : {
-                              "externalKey" : "resetDate",
-                              "globalKey" : "0"
+                              "globalKey" : "0",
+                              "externalKey" : "resetDate"
                             }
                           },
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
                               "adjustedDate" : {
+                                "value" : "2015-04-08",
                                 "meta" : {
                                   "globalKey" : "3ef908"
-                                },
-                                "value" : "2015-04-08"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "0"
@@ -277,19 +239,15 @@
                             "meta" : {
                               "globalKey" : "0"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
-                        "discountingMethod" : {
-                          "discountingType" : "FRA"
-                        },
-                        "meta" : {
-                          "globalKey" : "143a1642"
-                        },
                         "paymentDate" : {
+                          "unadjustedDate" : "2015-01-07",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "AUSY"
@@ -298,37 +256,23 @@
                                 "globalKey" : "1ed59a"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "3659d96b"
                             }
                           },
                           "meta" : {
                             "globalKey" : "57ddf584"
-                          },
-                          "unadjustedDate" : "2015-01-07"
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
                           }
                         },
                         "resetDates" : {
                           "fixingDates" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "5efecdf8"
+                              "globalKey" : "94a13cf0"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "PRECEDING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "AUSY"
@@ -337,288 +281,290 @@
                                 "globalKey" : "1ed59a"
                               }
                             },
-                            "businessDayConvention" : "PRECEDING",
                             "dateRelativeTo" : {
-                              "externalReference" : "resetDate",
-                              "globalReference" : "0"
+                              "globalReference" : "0",
+                              "externalReference" : "resetDate"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "5efecdf8"
+                            "globalKey" : "94a13cf0"
                           }
+                        },
+                        "discountingMethod" : {
+                          "discountingType" : "FRA"
+                        },
+                        "meta" : {
+                          "globalKey" : "29b3d386"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "e6084416"
+                        "globalKey" : "674ba12"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "cfe41ccf"
+                    "globalKey" : "f05092cb"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "cfe41ccf"
+                  "globalKey" : "f05092cb"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "13dbf5d3"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0125,
                       "unit" : {
                         "currency" : {
                           "value" : "AUD"
                         }
                       },
-                      "value" : 0.0125,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "AUD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
+                    }
+                  } ],
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 125000000,
+                      "unit" : {
                         "currency" : {
                           "value" : "AUD"
                         }
-                      },
-                      "value" : 125000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
-                }, {
+                  } ],
                   "meta" : {
-                    "globalKey" : "8bbe3e46"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "8628cdd6"
+                    "globalKey" : "67a2c48d"
+                  }
+                }, {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 125000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "AUD"
+                        }
+                      }
                     },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
+                    }
+                  } ],
+                  "observable" : {
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "AUD-BBR-BBSW"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "AUD"
-                        }
-                      },
-                      "value" : 125000000
+                    "meta" : {
+                      "globalKey" : "3eefe016"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ef283"
-              },
-              "value" : "2014-10-03"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "2894761"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "QAC_11111"
+                    "globalKey" : "1c23a5f2"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
               }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "dd19",
+                  "externalReference" : "clearing_firm"
+                }
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "999",
                   "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "22222"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "dd19"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "dd19",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "22222"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "cda8a540"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS2894761"
+                  "value" : "PLATFORM"
+                },
+                "meta" : {
+                  "globalKey" : "9e635873"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "9e635873",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "9e635873",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2014-10-03",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "999-123",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "a7071c09"
+                "globalKey" : "24a161c0",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "d9a33ea9"
+            }
+          },
+          "meta" : {
+            "globalKey" : "d9a33ea9"
           }
         }
       }
     } ],
-    "intent" : "CONTRACT_FORMATION",
+    "eventQualifier" : "ContractFormation",
     "after" : [ {
-      "meta" : {
-        "globalKey" : "7331f9ac"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
       "trade" : {
-        "account" : [ {
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "clearing_firm_accounts"
-            },
-            "value" : "999-123"
-          },
-          "meta" : {
-            "externalKey" : "account1",
-            "globalKey" : "a18b2f80"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
-          },
-          "servicingParty" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
-          }
-        } ],
-        "clearedDate" : "2014-10-03",
-        "meta" : {
-          "globalKey" : "24098fef"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "clearing_firm",
-            "globalKey" : "dd19"
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "1051b",
+            "externalReference" : "clearing_service"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "2894761",
               "meta" : {
-                "scheme" : "clearing_member_firms"
-              },
-              "value" : "999"
-            },
-            "meta" : {
-              "globalKey" : "dd19"
+                "scheme" : "cme_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing_service",
-            "globalKey" : "1051b"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "CME"
-            },
-            "meta" : {
-              "globalKey" : "1051b"
+              "value" : "QAC_11111",
+              "meta" : {
+                "scheme" : "client_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "trade_source",
-            "globalKey" : "9e635873"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "PLATFORM"
-            },
+              "value" : "22222",
+              "meta" : {
+                "scheme" : "platform_trade_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "22222",
+              "meta" : {
+                "scheme" : "block_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c14a1fc0"
+          }
+        }, {
+          "issuer" : {
+            "value" : "1010000023",
             "meta" : {
-              "globalKey" : "9e635873"
+              "scheme" : "cftc_Namespace"
             }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
-          },
-          "partyReference" : {
-            "externalReference" : "trade_source",
-            "globalReference" : "9e635873"
           },
-          "role" : "DATA_SUBMITTER"
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "CCCIRS2894761",
+              "meta" : {
+                "scheme" : "reg_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e12c31ab"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2014-10-03",
+          "meta" : {
+            "globalKey" : "3ef283"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "dd19"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -629,48 +575,63 @@
                 "payout" : {
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    },
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
                       }
                     },
+                    "dayCountFraction" : {
+                      "value" : "ACT/365.FIXED"
+                    },
                     "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2015-01-07",
                             "meta" : {
                               "globalKey" : "3ef847"
-                            },
-                            "value" : "2015-01-07"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
                           }
                         },
                         "meta" : {
-                          "externalKey" : "resetDate",
-                          "globalKey" : "0"
+                          "globalKey" : "0",
+                          "externalKey" : "resetDate"
                         }
                       },
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2015-04-08",
                             "meta" : {
                               "globalKey" : "3ef908"
-                            },
-                            "value" : "2015-04-08"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -679,19 +640,15 @@
                         "meta" : {
                           "globalKey" : "0"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "dayCountFraction" : {
-                      "value" : "ACT/365.FIXED"
-                    },
-                    "discountingMethod" : {
-                      "discountingType" : "FRA"
-                    },
-                    "meta" : {
-                      "globalKey" : "1a3477ac"
-                    },
                     "paymentDate" : {
+                      "unadjustedDate" : "2015-01-07",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "AUSY"
@@ -700,75 +657,77 @@
                             "globalKey" : "1ed59a"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "3659d96b"
                         }
                       },
                       "meta" : {
                         "globalKey" : "57ddf584"
-                      },
-                      "unadjustedDate" : "2015-01-07"
-                    },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
-                          }
-                        }
                       }
+                    },
+                    "discountingMethod" : {
+                      "discountingType" : "FRA"
+                    },
+                    "meta" : {
+                      "globalKey" : "6f3ee7f4"
                     }
                   }, {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-2"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
+                    "rateSpecification" : {
+                      "floatingRate" : {
+                        "rateOption" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "rateOption-1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/365.FIXED"
+                    },
                     "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2015-01-07",
                             "meta" : {
                               "globalKey" : "3ef847"
-                            },
-                            "value" : "2015-01-07"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
                           }
                         },
                         "meta" : {
-                          "externalKey" : "resetDate",
-                          "globalKey" : "0"
+                          "globalKey" : "0",
+                          "externalKey" : "resetDate"
                         }
                       },
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2015-04-08",
                             "meta" : {
                               "globalKey" : "3ef908"
-                            },
-                            "value" : "2015-04-08"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -777,19 +736,15 @@
                         "meta" : {
                           "globalKey" : "0"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "dayCountFraction" : {
-                      "value" : "ACT/365.FIXED"
-                    },
-                    "discountingMethod" : {
-                      "discountingType" : "FRA"
-                    },
-                    "meta" : {
-                      "globalKey" : "143a1642"
-                    },
                     "paymentDate" : {
+                      "unadjustedDate" : "2015-01-07",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "AUSY"
@@ -798,37 +753,23 @@
                             "globalKey" : "1ed59a"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "3659d96b"
                         }
                       },
                       "meta" : {
                         "globalKey" : "57ddf584"
-                      },
-                      "unadjustedDate" : "2015-01-07"
-                    },
-                    "rateSpecification" : {
-                      "floatingRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateOption" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "rateOption-1"
-                          }
-                        }
                       }
                     },
                     "resetDates" : {
                       "fixingDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "5efecdf8"
+                          "globalKey" : "94a13cf0"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "PRECEDING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "AUSY"
@@ -837,239 +778,278 @@
                             "globalKey" : "1ed59a"
                           }
                         },
-                        "businessDayConvention" : "PRECEDING",
                         "dateRelativeTo" : {
-                          "externalReference" : "resetDate",
-                          "globalReference" : "0"
+                          "globalReference" : "0",
+                          "externalReference" : "resetDate"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "5efecdf8"
+                        "globalKey" : "94a13cf0"
                       }
+                    },
+                    "discountingMethod" : {
+                      "discountingType" : "FRA"
+                    },
+                    "meta" : {
+                      "globalKey" : "29b3d386"
                     }
                   } ],
                   "meta" : {
-                    "globalKey" : "e6084416"
+                    "globalKey" : "674ba12"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "cfe41ccf"
+                "globalKey" : "f05092cb"
               }
             },
             "meta" : {
-              "globalKey" : "cfe41ccf"
+              "globalKey" : "f05092cb"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "13dbf5d3"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.0125,
                   "unit" : {
                     "currency" : {
                       "value" : "AUD"
                     }
                   },
-                  "value" : 0.0125,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "AUD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
                 }
               } ],
               "quantity" : [ {
+                "value" : {
+                  "value" : 125000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "AUD"
+                    }
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "67a2c48d"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 125000000,
                   "unit" : {
                     "currency" : {
                       "value" : "AUD"
                     }
-                  },
-                  "value" : 125000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
                 }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "8bbe3e46"
-              },
+              } ],
               "observable" : {
-                "meta" : {
-                  "globalKey" : "8628cdd6"
-                },
                 "rateOption" : {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "rateOption-1"
-                    } ]
-                  },
                   "value" : {
                     "floatingRateIndex" : {
                       "value" : "AUD-BBR-BBSW"
                     },
                     "indexTenor" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
+                      "periodMultiplier" : 3,
                       "period" : "M",
-                      "periodMultiplier" : 3
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "rateOption-1"
+                    } ]
                   }
-                }
-              },
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
                 },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "AUD"
-                    }
-                  },
-                  "value" : 125000000
+                "meta" : {
+                  "globalKey" : "3eefe016"
                 }
-              } ]
-            } ]
-          } ]
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3ef283"
-          },
-          "value" : "2014-10-03"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "cme_trade_id"
               },
-              "value" : "2894761"
-            }
-          }, {
-            "identifier" : {
               "meta" : {
-                "scheme" : "client_trade_id"
-              },
-              "value" : "QAC_11111"
+                "globalKey" : "1c23a5f2"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
             }
           }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "dd19",
+              "externalReference" : "clearing_firm"
+            }
+          } ]
+        },
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "999",
               "meta" : {
-                "scheme" : "platform_trade_id"
-              },
-              "value" : "22222"
+                "scheme" : "clearing_member_firms"
+              }
+            },
+            "meta" : {
+              "globalKey" : "dd19"
             }
-          }, {
+          } ],
+          "meta" : {
+            "globalKey" : "dd19",
+            "externalKey" : "clearing_firm"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "block_trade_id"
-              },
-              "value" : "22222"
+              "value" : "CME"
+            },
+            "meta" : {
+              "globalKey" : "1051b"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "clearing_service",
-            "globalReference" : "1051b"
-          },
           "meta" : {
-            "globalKey" : "cda8a540"
+            "globalKey" : "1051b",
+            "externalKey" : "clearing_service"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "reg_trade_id"
-              },
-              "value" : "CCCIRS2894761"
+              "value" : "PLATFORM"
+            },
+            "meta" : {
+              "globalKey" : "9e635873"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "9e635873",
+            "externalKey" : "trade_source"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "9e635873",
+            "externalReference" : "trade_source"
+          },
+          "role" : "DataSubmitter",
+          "ownershipPartyReference" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
+          }
+        } ],
+        "clearedDate" : "2014-10-03",
+        "account" : [ {
+          "partyReference" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
+          },
+          "accountNumber" : {
+            "value" : "999-123",
             "meta" : {
-              "scheme" : "cftc_Namespace"
-            },
-            "value" : "1010000023"
+              "scheme" : "clearing_firm_accounts"
+            }
+          },
+          "servicingParty" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
           },
           "meta" : {
-            "globalKey" : "a7071c09"
+            "globalKey" : "24a161c0",
+            "externalKey" : "account1"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "d9a33ea9"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
+      },
+      "meta" : {
+        "globalKey" : "79c124cc"
       }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "244568ff"
+      "globalKey" : "8cca3959"
     }
   },
+  "previousWorkflowStep" : {
+    "globalReference" : "48b85210"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "6002553802",
       "meta" : {
         "scheme" : "cme_message_id"
-      },
-      "value" : "6002553802"
+      }
     },
     "sentBy" : {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
+      }
     },
     "sentTo" : [ {
+      "value" : "999",
       "meta" : {
         "scheme" : "cme_firm_id"
-      },
-      "value" : "999"
+      }
     }, {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
+      }
     } ]
   },
-  "meta" : {
-    "globalKey" : "171bce3b"
-  },
+  "timestamp" : [ {
+    "dateTime" : "2014-10-03T12:06:24Z",
+    "qualification" : "eventCreationDateTime"
+  } ],
   "party" : [ {
-    "meta" : {
-      "externalKey" : "clearing_firm",
-      "globalKey" : "dd19"
-    },
     "partyId" : [ {
       "identifier" : {
+        "value" : "999",
         "meta" : {
           "scheme" : "clearing_member_firms"
-        },
-        "value" : "999"
+        }
       },
       "meta" : {
         "globalKey" : "dd19"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "clearing_service",
-      "globalKey" : "1051b"
-    },
+      "globalKey" : "dd19",
+      "externalKey" : "clearing_firm"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "CME"
@@ -1077,12 +1057,12 @@
       "meta" : {
         "globalKey" : "1051b"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "trade_source",
-      "globalKey" : "9e635873"
-    },
+      "globalKey" : "1051b",
+      "externalKey" : "clearing_service"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "PLATFORM"
@@ -1090,13 +1070,33 @@
       "meta" : {
         "globalKey" : "9e635873"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "9e635873",
+      "externalKey" : "trade_source"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "2b860a14"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2014-10-03T12:06:24Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+  "account" : [ {
+    "partyReference" : {
+      "globalReference" : "dd19",
+      "externalReference" : "clearing_firm"
+    },
+    "accountNumber" : {
+      "value" : "999-123",
+      "meta" : {
+        "scheme" : "clearing_firm_accounts"
+      }
+    },
+    "servicingParty" : {
+      "globalReference" : "dd19",
+      "externalReference" : "clearing_firm"
+    },
+    "meta" : {
+      "globalKey" : "24a161c0",
+      "externalKey" : "account1"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "885680ff"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/FRA-ex02-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/FRA-ex02-func-output.json
index 31177c5362..6c619a9be6 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/FRA-ex02-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/FRA-ex02-func-output.json
@@ -1,124 +1,80 @@
 {
-  "account" : [ {
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "clearing_firm_accounts"
-      },
-      "value" : "010S3"
-    },
-    "meta" : {
-      "externalKey" : "account1",
-      "globalKey" : "34a0c93d"
-    },
-    "partyReference" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "ba4f"
-    },
-    "servicingParty" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "ba4f"
-    }
-  } ],
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "324c2f67"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "010S3"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "34a0c93d"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              }
-            } ],
-            "clearedDate" : "2018-10-31",
-            "meta" : {
-              "globalKey" : "324c2f67"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "ba4f"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "9369927",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "010"
-                },
-                "meta" : {
-                  "globalKey" : "ba4f"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "43401180-2",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "66b48bac"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "MARKIT_WIRE"
-                },
+                  "value" : "43401180",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43401871",
+                  "meta" : {
+                    "scheme" : "platform_side_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43401180",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "12c3c355"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "66b48bac"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
               },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "66b48bac"
-              },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS9369927",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "4ac79bbb"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-31",
+              "meta" : {
+                "globalKey" : "3f129f"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "ba4f"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -129,48 +85,63 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        },
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
                           }
                         },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
                         "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
                               "adjustedDate" : {
+                                "value" : "2019-05-13",
                                 "meta" : {
                                   "globalKey" : "3f194d"
-                                },
-                                "value" : "2019-05-13"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "0"
                               }
                             },
                             "meta" : {
-                              "externalKey" : "resetDate",
-                              "globalKey" : "0"
+                              "globalKey" : "0",
+                              "externalKey" : "resetDate"
                             }
                           },
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
                               "adjustedDate" : {
+                                "value" : "2019-11-12",
                                 "meta" : {
                                   "globalKey" : "3f1acc"
-                                },
-                                "value" : "2019-11-12"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "0"
@@ -179,19 +150,15 @@
                             "meta" : {
                               "globalKey" : "0"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "discountingMethod" : {
-                          "discountingType" : "FRA"
-                        },
-                        "meta" : {
-                          "globalKey" : "fb2ec587"
-                        },
                         "paymentDate" : {
+                          "unadjustedDate" : "2019-05-13",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -202,75 +169,77 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
                           "meta" : {
                             "globalKey" : "deb62aaf"
-                          },
-                          "unadjustedDate" : "2019-05-13"
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
                           }
+                        },
+                        "discountingMethod" : {
+                          "discountingType" : "FRA"
+                        },
+                        "meta" : {
+                          "globalKey" : "4c31ed05"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        },
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
                           }
                         },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
                         "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
                               "adjustedDate" : {
+                                "value" : "2019-05-13",
                                 "meta" : {
                                   "globalKey" : "3f194d"
-                                },
-                                "value" : "2019-05-13"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "0"
                               }
                             },
                             "meta" : {
-                              "externalKey" : "resetDate",
-                              "globalKey" : "0"
+                              "globalKey" : "0",
+                              "externalKey" : "resetDate"
                             }
                           },
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
                               "adjustedDate" : {
+                                "value" : "2019-11-12",
                                 "meta" : {
                                   "globalKey" : "3f1acc"
-                                },
-                                "value" : "2019-11-12"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "0"
@@ -279,19 +248,15 @@
                             "meta" : {
                               "globalKey" : "0"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "discountingMethod" : {
-                          "discountingType" : "FRA"
-                        },
-                        "meta" : {
-                          "globalKey" : "33894623"
-                        },
                         "paymentDate" : {
+                          "unadjustedDate" : "2019-05-13",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -302,37 +267,23 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
                           "meta" : {
                             "globalKey" : "deb62aaf"
-                          },
-                          "unadjustedDate" : "2019-05-13"
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
                           }
                         },
                         "resetDates" : {
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "986a753e"
+                              "globalKey" : "75465ff2"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "PRECEDING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -341,295 +292,297 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "PRECEDING",
                             "dateRelativeTo" : {
-                              "externalReference" : "resetDate",
-                              "globalReference" : "0"
+                              "globalReference" : "0",
+                              "externalReference" : "resetDate"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "986a753e"
+                            "globalKey" : "75465ff2"
                           }
+                        },
+                        "discountingMethod" : {
+                          "discountingType" : "FRA"
+                        },
+                        "meta" : {
+                          "globalKey" : "b109457"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "6d531b3c"
+                        "globalKey" : "d5aba132"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "dfb1ef75"
+                    "globalKey" : "480a756b"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "dfb1ef75"
+                  "globalKey" : "480a756b"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "f07fac52"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.02345,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.02345,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
-                }, {
+                  } ],
                   "meta" : {
-                    "globalKey" : "b31c328d"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d08"
+                    "globalKey" : "1f75ddee"
+                  }
+                }, {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 100000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
                     },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
+                    }
+                  } ],
+                  "observable" : {
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
+                          "periodMultiplier" : 6,
                           "period" : "M",
-                          "periodMultiplier" : 6
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 100000000
+                    "meta" : {
+                      "globalKey" : "8280320a"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f129f"
-              },
-              "value" : "2018-10-31"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "9369927"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "43401180-2"
+                    "globalKey" : "5332145f"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "ba4f",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "43401180"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "010",
                   "meta" : {
-                    "scheme" : "platform_side_id"
-                  },
-                  "value" : "43401871"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ba4f"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "ba4f",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "43401180"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "a0f404e1"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS9369927"
+                  "value" : "MARKIT_WIRE"
+                },
+                "meta" : {
+                  "globalKey" : "66b48bac"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "66b48bac",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "66b48bac",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2018-10-31",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "010S3",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "17704219"
+                "globalKey" : "a30716bd",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "32956b03"
+            }
+          },
+          "meta" : {
+            "globalKey" : "32956b03"
           }
         }
       }
     } ],
-    "intent" : "CONTRACT_FORMATION",
+    "eventQualifier" : "ContractFormation",
     "after" : [ {
-      "meta" : {
-        "globalKey" : "12c9c70a"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
       "trade" : {
-        "account" : [ {
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "clearing_firm_accounts"
-            },
-            "value" : "010S3"
-          },
-          "meta" : {
-            "externalKey" : "account1",
-            "globalKey" : "34a0c93d"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
-          },
-          "servicingParty" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
-          }
-        } ],
-        "clearedDate" : "2018-10-31",
-        "meta" : {
-          "globalKey" : "324c2f67"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "clearing_firm",
-            "globalKey" : "ba4f"
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "1051b",
+            "externalReference" : "clearing_service"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "9369927",
               "meta" : {
-                "scheme" : "clearing_member_firms"
-              },
-              "value" : "010"
-            },
-            "meta" : {
-              "globalKey" : "ba4f"
+                "scheme" : "cme_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing_service",
-            "globalKey" : "1051b"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "CME"
-            },
-            "meta" : {
-              "globalKey" : "1051b"
+              "value" : "43401180-2",
+              "meta" : {
+                "scheme" : "client_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "trade_source",
-            "globalKey" : "66b48bac"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "MARKIT_WIRE"
-            },
+              "value" : "43401180",
+              "meta" : {
+                "scheme" : "platform_trade_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "43401871",
+              "meta" : {
+                "scheme" : "platform_side_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "43401180",
+              "meta" : {
+                "scheme" : "block_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "12c3c355"
+          }
+        }, {
+          "issuer" : {
+            "value" : "1010000023",
             "meta" : {
-              "globalKey" : "66b48bac"
+              "scheme" : "cftc_Namespace"
             }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
-          },
-          "partyReference" : {
-            "externalReference" : "trade_source",
-            "globalReference" : "66b48bac"
           },
-          "role" : "DATA_SUBMITTER"
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "CCCIRS9369927",
+              "meta" : {
+                "scheme" : "reg_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "4ac79bbb"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2018-10-31",
+          "meta" : {
+            "globalKey" : "3f129f"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "ba4f"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -640,48 +593,63 @@
                 "payout" : {
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/360"
+                    },
                     "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2019-05-13",
                             "meta" : {
                               "globalKey" : "3f194d"
-                            },
-                            "value" : "2019-05-13"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
                           }
                         },
                         "meta" : {
-                          "externalKey" : "resetDate",
-                          "globalKey" : "0"
+                          "globalKey" : "0",
+                          "externalKey" : "resetDate"
                         }
                       },
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2019-11-12",
                             "meta" : {
                               "globalKey" : "3f1acc"
-                            },
-                            "value" : "2019-11-12"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -690,19 +658,15 @@
                         "meta" : {
                           "globalKey" : "0"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "dayCountFraction" : {
-                      "value" : "ACT/360"
-                    },
-                    "discountingMethod" : {
-                      "discountingType" : "FRA"
-                    },
-                    "meta" : {
-                      "globalKey" : "fb2ec587"
-                    },
                     "paymentDate" : {
+                      "unadjustedDate" : "2019-05-13",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -713,75 +677,77 @@
                             "globalKey" : "42f910b"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b8e49c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "deb62aaf"
-                      },
-                      "unadjustedDate" : "2019-05-13"
-                    },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
-                          }
-                        }
                       }
+                    },
+                    "discountingMethod" : {
+                      "discountingType" : "FRA"
+                    },
+                    "meta" : {
+                      "globalKey" : "4c31ed05"
                     }
                   }, {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-2"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    },
+                    "rateSpecification" : {
+                      "floatingRate" : {
+                        "rateOption" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "rateOption-1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
                       }
                     },
+                    "dayCountFraction" : {
+                      "value" : "ACT/360"
+                    },
                     "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2019-05-13",
                             "meta" : {
                               "globalKey" : "3f194d"
-                            },
-                            "value" : "2019-05-13"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
                           }
                         },
                         "meta" : {
-                          "externalKey" : "resetDate",
-                          "globalKey" : "0"
+                          "globalKey" : "0",
+                          "externalKey" : "resetDate"
                         }
                       },
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2019-11-12",
                             "meta" : {
                               "globalKey" : "3f1acc"
-                            },
-                            "value" : "2019-11-12"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -790,19 +756,15 @@
                         "meta" : {
                           "globalKey" : "0"
                         }
-                      }
-                    },
-                    "dayCountFraction" : {
-                      "value" : "ACT/360"
-                    },
-                    "discountingMethod" : {
-                      "discountingType" : "FRA"
-                    },
-                    "meta" : {
-                      "globalKey" : "33894623"
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
                     },
                     "paymentDate" : {
+                      "unadjustedDate" : "2019-05-13",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -813,37 +775,23 @@
                             "globalKey" : "42f910b"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b8e49c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "deb62aaf"
-                      },
-                      "unadjustedDate" : "2019-05-13"
-                    },
-                    "rateSpecification" : {
-                      "floatingRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateOption" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "rateOption-1"
-                          }
-                        }
                       }
                     },
                     "resetDates" : {
                       "fixingDates" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "986a753e"
+                          "globalKey" : "75465ff2"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "PRECEDING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -852,246 +800,281 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "PRECEDING",
                         "dateRelativeTo" : {
-                          "externalReference" : "resetDate",
-                          "globalReference" : "0"
+                          "globalReference" : "0",
+                          "externalReference" : "resetDate"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "986a753e"
+                        "globalKey" : "75465ff2"
                       }
+                    },
+                    "discountingMethod" : {
+                      "discountingType" : "FRA"
+                    },
+                    "meta" : {
+                      "globalKey" : "b109457"
                     }
                   } ],
                   "meta" : {
-                    "globalKey" : "6d531b3c"
+                    "globalKey" : "d5aba132"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "dfb1ef75"
+                "globalKey" : "480a756b"
               }
             },
             "meta" : {
-              "globalKey" : "dfb1ef75"
+              "globalKey" : "480a756b"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "f07fac52"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.02345,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.02345,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
                 }
               } ],
               "quantity" : [ {
+                "value" : {
+                  "value" : 100000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "1f75ddee"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 100000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 100000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
                 }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "b31c328d"
-              },
+              } ],
               "observable" : {
-                "meta" : {
-                  "globalKey" : "5f0c6d08"
-                },
                 "rateOption" : {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "rateOption-1"
-                    } ]
-                  },
                   "value" : {
                     "floatingRateIndex" : {
                       "value" : "USD-LIBOR-BBA"
                     },
                     "indexTenor" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
+                      "periodMultiplier" : 6,
                       "period" : "M",
-                      "periodMultiplier" : 6
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
                     }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "rateOption-1"
+                    } ]
                   }
-                }
-              },
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
                 },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 100000000
+                "meta" : {
+                  "globalKey" : "8280320a"
                 }
-              } ]
-            } ]
-          } ]
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f129f"
-          },
-          "value" : "2018-10-31"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "cme_trade_id"
               },
-              "value" : "9369927"
-            }
-          }, {
-            "identifier" : {
               "meta" : {
-                "scheme" : "client_trade_id"
-              },
-              "value" : "43401180-2"
+                "globalKey" : "5332145f"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "ba4f",
+              "externalReference" : "clearing_firm"
             }
           }, {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "platform_trade_id"
-              },
-              "value" : "43401180"
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
             }
-          }, {
+          } ]
+        },
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "010",
               "meta" : {
-                "scheme" : "platform_side_id"
-              },
-              "value" : "43401871"
+                "scheme" : "clearing_member_firms"
+              }
+            },
+            "meta" : {
+              "globalKey" : "ba4f"
             }
-          }, {
+          } ],
+          "meta" : {
+            "globalKey" : "ba4f",
+            "externalKey" : "clearing_firm"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "block_trade_id"
-              },
-              "value" : "43401180"
+              "value" : "CME"
+            },
+            "meta" : {
+              "globalKey" : "1051b"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "clearing_service",
-            "globalReference" : "1051b"
-          },
           "meta" : {
-            "globalKey" : "a0f404e1"
+            "globalKey" : "1051b",
+            "externalKey" : "clearing_service"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "reg_trade_id"
-              },
-              "value" : "CCCIRS9369927"
+              "value" : "MARKIT_WIRE"
+            },
+            "meta" : {
+              "globalKey" : "66b48bac"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "66b48bac",
+            "externalKey" : "trade_source"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "66b48bac",
+            "externalReference" : "trade_source"
+          },
+          "role" : "DataSubmitter",
+          "ownershipPartyReference" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
+          }
+        } ],
+        "clearedDate" : "2018-10-31",
+        "account" : [ {
+          "partyReference" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
+          },
+          "accountNumber" : {
+            "value" : "010S3",
             "meta" : {
-              "scheme" : "cftc_Namespace"
-            },
-            "value" : "1010000023"
+              "scheme" : "clearing_firm_accounts"
+            }
+          },
+          "servicingParty" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
           },
           "meta" : {
-            "globalKey" : "17704219"
+            "globalKey" : "a30716bd",
+            "externalKey" : "account1"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "32956b03"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
+      },
+      "meta" : {
+        "globalKey" : "5ed9a2a6"
       }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "9c8cb0a7"
+      "globalKey" : "7db0d227"
     }
   },
+  "previousWorkflowStep" : {
+    "globalReference" : "945767f4"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "0109369927",
       "meta" : {
         "scheme" : "cme_message_id"
-      },
-      "value" : "0109369927"
+      }
     },
     "sentBy" : {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
+      }
     },
     "sentTo" : [ {
+      "value" : "010",
       "meta" : {
         "scheme" : "cme_firm_id"
-      },
-      "value" : "010"
+      }
     }, {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
+      }
     } ]
   },
-  "meta" : {
-    "globalKey" : "9001beda"
-  },
+  "timestamp" : [ {
+    "dateTime" : "2018-10-31T14:19:40Z",
+    "qualification" : "eventCreationDateTime"
+  }, {
+    "dateTime" : "2018-10-31T14:13:19.9Z",
+    "qualification" : "clearingReceiptDateTime"
+  } ],
   "party" : [ {
-    "meta" : {
-      "externalKey" : "clearing_firm",
-      "globalKey" : "ba4f"
-    },
     "partyId" : [ {
       "identifier" : {
+        "value" : "010",
         "meta" : {
           "scheme" : "clearing_member_firms"
-        },
-        "value" : "010"
+        }
       },
       "meta" : {
         "globalKey" : "ba4f"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "clearing_service",
-      "globalKey" : "1051b"
-    },
+      "globalKey" : "ba4f",
+      "externalKey" : "clearing_firm"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "CME"
@@ -1099,12 +1082,12 @@
       "meta" : {
         "globalKey" : "1051b"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "trade_source",
-      "globalKey" : "66b48bac"
-    },
+      "globalKey" : "1051b",
+      "externalKey" : "clearing_service"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "MARKIT_WIRE"
@@ -1112,16 +1095,33 @@
       "meta" : {
         "globalKey" : "66b48bac"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "66b48bac",
+      "externalKey" : "trade_source"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "80db9be0"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2018-10-31T14:19:40Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  }, {
-    "dateTime" : "2018-10-31T14:13:19.9Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
-  } ]
+  "account" : [ {
+    "partyReference" : {
+      "globalReference" : "ba4f",
+      "externalReference" : "clearing_firm"
+    },
+    "accountNumber" : {
+      "value" : "010S3",
+      "meta" : {
+        "scheme" : "clearing_firm_accounts"
+      }
+    },
+    "servicingParty" : {
+      "globalReference" : "ba4f",
+      "externalReference" : "clearing_firm"
+    },
+    "meta" : {
+      "globalKey" : "a30716bd",
+      "externalKey" : "account1"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "2bb98aae"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex01-Fixed-Float-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex01-Fixed-Float-func-output.json
index 383c3ca2c7..d9799bad43 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex01-Fixed-Float-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex01-Fixed-Float-func-output.json
@@ -1,124 +1,80 @@
 {
-  "account" : [ {
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "clearing_firm_accounts"
-      },
-      "value" : "999-123"
-    },
-    "meta" : {
-      "externalKey" : "account1",
-      "globalKey" : "a18b2f80"
-    },
-    "partyReference" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "dd19"
-    },
-    "servicingParty" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "dd19"
-    }
-  } ],
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "6e0a4c8e"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "999-123"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "a18b2f80"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              }
-            } ],
-            "clearedDate" : "2016-09-27",
-            "meta" : {
-              "globalKey" : "6e0a4c8e"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "dd19"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "2894761",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "999"
-                },
-                "meta" : {
-                  "globalKey" : "dd19"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "QAC_11111",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "9e635873"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "PLATFORM"
-                },
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "platform_side_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "7e0f4426"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "9e635873"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "9e635873"
               },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS2894761",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e12c31ab"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2016-09-27",
+              "meta" : {
+                "globalKey" : "3f025b"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "dd19"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -129,39 +85,46 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "settlementTerms" : {
-                          "meta" : {
-                            "globalKey" : "1dd4c3e1"
-                          },
                           "settlementCurrency" : {
                             "value" : "USD"
                           },
+                          "meta" : {
+                            "globalKey" : "f90e8a3f"
+                          },
                           "cashSettlementTerms" : [ {
-                            "meta" : {
-                              "globalKey" : "b942927b"
+                            "valuationMethod" : {
+                              "valuationSource" : {
+                                "settlementRateOption" : {
+                                  "settlementRateOption" : {
+                                    "value" : "KRW.KFTC18/KRW02"
+                                  }
+                                }
+                              }
                             },
                             "valuationDate" : {
                               "fxFixingDate" : {
+                                "periodMultiplier" : -2,
+                                "period" : "D",
                                 "meta" : {
-                                  "globalKey" : "d4706158"
+                                  "globalKey" : "ba92adc6"
                                 },
-                                "period" : "D",
-                                "periodMultiplier" : -2,
-                                "dayType" : "BUSINESS",
+                                "dayType" : "Business",
+                                "businessDayConvention" : "NONE",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
@@ -172,52 +135,39 @@
                                     "globalKey" : "4f80e30"
                                   }
                                 },
-                                "businessDayConvention" : "NONE",
                                 "dateRelativeToPaymentDates" : {
                                   "paymentDatesReference" : [ {
-                                    "externalReference" : "floatingLegPaymentDates",
-                                    "globalReference" : "5ccd476f"
+                                    "globalReference" : "e1ccbd11",
+                                    "externalReference" : "floatingLegPaymentDates"
                                   } ]
                                 }
                               }
                             },
-                            "valuationMethod" : {
-                              "valuationSource" : {
-                                "settlementRateOption" : {
-                                  "settlementRateOption" : {
-                                    "value" : "KRW.KFTC18/KRW02"
-                                  }
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "947c58d9"
                             }
                           } ]
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "46f4e10"
-                              },
-                              "meta" : {
-                                "globalKey" : "b05ee318"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "aa3299e7"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c4f"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "28"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2016-09-28",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -226,42 +176,149 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecac8294"
-                              },
-                              "unadjustedDate" : "2016-09-28"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecac8294"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "70e38865"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2017-09-28",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "46f4e10"
+                                    "globalReference" : "46f4e10",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "b05ee318"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "aa3299e7"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "18dd6143"
-                              },
-                              "unadjustedDate" : "2017-09-28"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "18dd6143"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "46f4e10",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "b05ee318"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "aa3299e7"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f7b"
+                            },
+                            "rollConvention" : "28"
+                          },
+                          "meta" : {
+                            "globalKey" : "1a2dbed1",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "KRSE"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "46f4e10",
+                                "externalKey" : "floatPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "97f8a1a1"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "e1ccbd11",
+                            "externalKey" : "floatingLegPaymentDates"
+                          }
+                        },
+                        "resetDates" : {
+                          "calculationPeriodDatesReference" : {
+                            "globalReference" : "1a2dbed1",
+                            "externalReference" : "floatingCalcPeriodDates"
+                          },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
+                          "fixingDates" : {
+                            "periodMultiplier" : -1,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "b674cc3a"
+                            },
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "KRSE"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "2355f9"
+                              }
+                            },
+                            "dateRelativeTo" : {
+                              "globalReference" : "c88ee6e2",
+                              "externalReference" : "floatingLegResetDates"
+                            }
+                          },
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "46f4e10",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "b05ee318"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "aa3299e7"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "c88ee6e2",
+                            "externalKey" : "floatingLegResetDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -269,232 +326,138 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2016-12-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-12-28",
                               "adjustedStartDate" : "2016-09-28",
+                              "adjustedEndDate" : "2016-12-28",
                               "meta" : {
-                                "globalKey" : "b418ca73"
+                                "globalKey" : "4f0ed0f3"
                               },
+                              "notionalAmount" : 1000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2016-09-27",
+                                  "observedRate" : 1.34528,
                                   "meta" : {
                                     "globalKey" : "7918ac42"
-                                  },
-                                  "observedRate" : 1.34528
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 1000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "a20f18f"
+                              "globalKey" : "a516f80f"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-03-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-03-28",
                               "adjustedStartDate" : "2016-12-28",
+                              "adjustedEndDate" : "2017-03-28",
                               "meta" : {
-                                "globalKey" : "b618aba6"
+                                "globalKey" : "5a218826"
                               },
+                              "notionalAmount" : 1000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2016-12-27",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a16075"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 1000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "959f1882"
+                              "globalKey" : "39a7f502"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-06-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-06-28",
                               "adjustedStartDate" : "2017-03-28",
+                              "adjustedEndDate" : "2017-06-28",
                               "meta" : {
-                                "globalKey" : "32a360e6"
+                                "globalKey" : "cd996766"
                               },
+                              "notionalAmount" : 1000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2017-03-27",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a212b5"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 1000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "457d0e82"
+                              "globalKey" : "e0731502"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-09-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-09-28",
                               "adjustedStartDate" : "2017-06-28",
+                              "adjustedEndDate" : "2017-09-28",
                               "meta" : {
-                                "globalKey" : "26f27766"
+                                "globalKey" : "c1e87de6"
                               },
+                              "notionalAmount" : 1000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2017-09-27",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a24135"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 1000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "6d1f65c2"
+                              "globalKey" : "8156c42"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
                         "meta" : {
-                          "globalKey" : "d7bddd70"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "5ccd476f"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "KRSE"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "46f4e10"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "97f8a1a1"
-                            }
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
-                          }
-                        },
-                        "resetDates" : {
-                          "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "70e38865"
-                          },
-                          "fixingDates" : {
-                            "meta" : {
-                              "globalKey" : "ad359f64"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : -1,
-                            "dayType" : "BUSINESS",
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "KRSE"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "2355f9"
-                              }
-                            },
-                            "businessDayConvention" : "NONE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "9913be2"
-                            }
-                          },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "9913be2"
-                          },
-                          "resetDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "46f4e10"
-                              },
-                              "meta" : {
-                                "globalKey" : "b05ee318"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "aa3299e7"
-                            }
-                          },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "globalKey" : "f01af92c"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "settlementTerms" : {
-                          "meta" : {
-                            "globalKey" : "334a6b4f"
-                          },
                           "settlementCurrency" : {
                             "value" : "USD"
                           },
+                          "meta" : {
+                            "globalKey" : "2b8d7611"
+                          },
                           "cashSettlementTerms" : [ {
-                            "meta" : {
-                              "globalKey" : "ceb839e9"
+                            "valuationMethod" : {
+                              "valuationSource" : {
+                                "settlementRateOption" : {
+                                  "settlementRateOption" : {
+                                    "value" : "KRW.KFTC18/KRW02"
+                                  }
+                                }
+                              }
                             },
                             "valuationDate" : {
                               "fxFixingDate" : {
+                                "periodMultiplier" : -2,
+                                "period" : "D",
                                 "meta" : {
-                                  "globalKey" : "6ef4d2a"
+                                  "globalKey" : "ed119998"
                                 },
-                                "period" : "D",
-                                "periodMultiplier" : -2,
-                                "dayType" : "BUSINESS",
+                                "dayType" : "Business",
+                                "businessDayConvention" : "NONE",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
@@ -505,52 +468,41 @@
                                     "globalKey" : "4f80e30"
                                   }
                                 },
-                                "businessDayConvention" : "NONE",
                                 "dateRelativeToPaymentDates" : {
                                   "paymentDatesReference" : [ {
-                                    "externalReference" : "fixedLegPaymentDates",
-                                    "globalReference" : "5ccd476f"
+                                    "globalReference" : "e1ccbd11",
+                                    "externalReference" : "fixedLegPaymentDates"
                                   } ]
                                 }
                               }
                             },
-                            "valuationMethod" : {
-                              "valuationSource" : {
-                                "settlementRateOption" : {
-                                  "settlementRateOption" : {
-                                    "value" : "KRW.KFTC18/KRW02"
-                                  }
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "c6fb44ab"
                             }
                           } ]
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "46f4e10"
-                              },
-                              "meta" : {
-                                "globalKey" : "fe5af00"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "9b965cf"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c4f"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "28"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2016-09-28",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -559,42 +511,95 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecac8294"
-                              },
-                              "unadjustedDate" : "2016-09-28"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecac8294"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "b8e9c235"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2017-09-28",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "fixedPrimaryBusinessCenters",
-                                    "globalReference" : "46f4e10"
+                                    "globalReference" : "46f4e10",
+                                    "externalReference" : "fixedPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "fe5af00"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "9b965cf"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "78642d2b"
-                              },
-                              "unadjustedDate" : "2017-09-28"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "78642d2b"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "46f4e10",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "fe5af00"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "9b965cf"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f7b"
+                            },
+                            "rollConvention" : "28"
+                          },
+                          "meta" : {
+                            "globalKey" : "a93c2ca1",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "KRSE"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "46f4e10",
+                                "externalKey" : "fixedPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "97f8a1a1"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "e1ccbd11",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -602,392 +607,340 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2016-12-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-12-28",
                               "adjustedStartDate" : "2016-09-28",
+                              "adjustedEndDate" : "2016-12-28",
                               "meta" : {
-                                "globalKey" : "5a8f0e7f"
+                                "globalKey" : "b5a08ce1"
                               },
-                              "fixedRate" : 0.044,
-                              "notionalAmount" : 1000000
+                              "notionalAmount" : 1000000,
+                              "fixedRate" : 0.044
                             } ],
                             "meta" : {
-                              "globalKey" : "f8019ce3"
+                              "globalKey" : "53131b45"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-03-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-03-28",
                               "adjustedStartDate" : "2016-12-28",
+                              "adjustedEndDate" : "2017-03-28",
                               "meta" : {
-                                "globalKey" : "5d2f017f"
+                                "globalKey" : "b60d69e1"
                               },
-                              "fixedRate" : 0.044,
-                              "notionalAmount" : 1000000
+                              "notionalAmount" : 1000000,
+                              "fixedRate" : 0.044
                             } ],
                             "meta" : {
-                              "globalKey" : "ca7f2223"
+                              "globalKey" : "235d8a85"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-06-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-06-28",
                               "adjustedStartDate" : "2017-03-28",
+                              "adjustedEndDate" : "2017-06-28",
                               "meta" : {
-                                "globalKey" : "5d9bde7f"
+                                "globalKey" : "b8ad5ce1"
                               },
-                              "fixedRate" : 0.044,
-                              "notionalAmount" : 1000000
+                              "notionalAmount" : 1000000,
+                              "fixedRate" : 0.044
                             } ],
                             "meta" : {
-                              "globalKey" : "128e7663"
+                              "globalKey" : "6d9ff4c5"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-09-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-09-28",
                               "adjustedStartDate" : "2017-06-28",
+                              "adjustedEndDate" : "2017-09-28",
                               "meta" : {
-                                "globalKey" : "5df5f67f"
+                                "globalKey" : "b90774e1"
                               },
-                              "fixedRate" : 0.044,
-                              "notionalAmount" : 1000000
+                              "notionalAmount" : 1000000,
+                              "fixedRate" : 0.044
                             } ],
                             "meta" : {
-                              "globalKey" : "5a8b05a3"
+                              "globalKey" : "b59c8405"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
                         "meta" : {
-                          "globalKey" : "733d1f15"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "5ccd476f"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "KRSE"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "fixedPrimaryBusinessCenters",
-                                "globalKey" : "46f4e10"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "97f8a1a1"
-                            }
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                          "globalKey" : "f0deeb0b"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "a3c263a5"
+                        "globalKey" : "6ea1705f"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "cb124956"
+                    "globalKey" : "95f15610"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "cb124956"
+                  "globalKey" : "95f15610"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "59ad81d9"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5d862026"
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 1000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "KRW"
+                        }
+                      }
                     },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
+                    }
+                  } ],
+                  "observable" : {
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "KRW-CD-KSDA-Bloomberg"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "KRW"
-                        }
-                      },
-                      "value" : 1000000
+                    "meta" : {
+                      "globalKey" : "533cd7c6"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "8e998c26"
                   },
+                  "meta" : {
+                    "globalKey" : "a3732dc5"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.044,
                       "unit" : {
                         "currency" : {
                           "value" : "KRW"
                         }
                       },
-                      "value" : 0.044,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "KRW"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 1000000,
                       "unit" : {
                         "currency" : {
                           "value" : "KRW"
                         }
-                      },
-                      "value" : 1000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f025b"
-              },
-              "value" : "2016-09-27"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
-                  },
-                  "value" : "2894761"
-                }
-              }, {
-                "identifier" : {
+                  } ],
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "QAC_11111"
+                    "globalKey" : "4497f89a"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "dd19",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "22222"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "999",
                   "meta" : {
-                    "scheme" : "platform_side_id"
-                  },
-                  "value" : "22222"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "dd19"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "dd19",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "22222"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "7595e4f2"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS2894761"
+                  "value" : "PLATFORM"
+                },
+                "meta" : {
+                  "globalKey" : "9e635873"
                 }
               } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
-              },
               "meta" : {
-                "globalKey" : "a7071c09"
+                "globalKey" : "9e635873",
+                "externalKey" : "trade_source"
               }
-            } ]
-          }
-        }
-      }
-    } ],
-    "intent" : "CONTRACT_FORMATION",
-    "after" : [ {
-      "meta" : {
-        "globalKey" : "301164b"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
-      "trade" : {
-        "account" : [ {
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "clearing_firm_accounts"
-            },
-            "value" : "999-123"
-          },
-          "meta" : {
-            "externalKey" : "account1",
-            "globalKey" : "a18b2f80"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
-          },
-          "servicingParty" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
-          }
-        } ],
-        "clearedDate" : "2016-09-27",
-        "meta" : {
-          "globalKey" : "6e0a4c8e"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "clearing_firm",
-            "globalKey" : "dd19"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "clearing_member_firms"
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "9e635873",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2016-09-27",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "999-123",
+                "meta" : {
+                  "scheme" : "clearing_firm_accounts"
+                }
               },
-              "value" : "999"
-            },
+              "servicingParty" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              },
+              "meta" : {
+                "globalKey" : "24a161c0",
+                "externalKey" : "account1"
+              }
+            } ],
             "meta" : {
-              "globalKey" : "dd19"
+              "globalKey" : "98e59efc"
             }
-          } ]
-        }, {
+          },
           "meta" : {
-            "externalKey" : "clearing_service",
-            "globalKey" : "1051b"
+            "globalKey" : "98e59efc"
+          }
+        }
+      }
+    } ],
+    "eventQualifier" : "ContractFormation",
+    "after" : [ {
+      "trade" : {
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "1051b",
+            "externalReference" : "clearing_service"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
-              "value" : "CME"
-            },
-            "meta" : {
-              "globalKey" : "1051b"
+              "value" : "2894761",
+              "meta" : {
+                "scheme" : "cme_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "trade_source",
-            "globalKey" : "9e635873"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "PLATFORM"
-            },
+              "value" : "QAC_11111",
+              "meta" : {
+                "scheme" : "client_trade_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "22222",
+              "meta" : {
+                "scheme" : "platform_trade_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "22222",
+              "meta" : {
+                "scheme" : "platform_side_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "22222",
+              "meta" : {
+                "scheme" : "block_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "7e0f4426"
+          }
+        }, {
+          "issuer" : {
+            "value" : "1010000023",
             "meta" : {
-              "globalKey" : "9e635873"
+              "scheme" : "cftc_Namespace"
             }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
-          },
-          "partyReference" : {
-            "externalReference" : "trade_source",
-            "globalReference" : "9e635873"
           },
-          "role" : "DATA_SUBMITTER"
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "CCCIRS2894761",
+              "meta" : {
+                "scheme" : "reg_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e12c31ab"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2016-09-27",
+          "meta" : {
+            "globalKey" : "3f025b"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "dd19"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -998,39 +951,46 @@
                 "payout" : {
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
                     "settlementTerms" : {
-                      "meta" : {
-                        "globalKey" : "1dd4c3e1"
-                      },
                       "settlementCurrency" : {
                         "value" : "USD"
                       },
+                      "meta" : {
+                        "globalKey" : "f90e8a3f"
+                      },
                       "cashSettlementTerms" : [ {
-                        "meta" : {
-                          "globalKey" : "b942927b"
+                        "valuationMethod" : {
+                          "valuationSource" : {
+                            "settlementRateOption" : {
+                              "settlementRateOption" : {
+                                "value" : "KRW.KFTC18/KRW02"
+                              }
+                            }
+                          }
                         },
                         "valuationDate" : {
                           "fxFixingDate" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "d4706158"
+                              "globalKey" : "ba92adc6"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USNY"
@@ -1041,52 +1001,39 @@
                                 "globalKey" : "4f80e30"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeToPaymentDates" : {
                               "paymentDatesReference" : [ {
-                                "externalReference" : "floatingLegPaymentDates",
-                                "globalReference" : "5ccd476f"
+                                "globalReference" : "e1ccbd11",
+                                "externalReference" : "floatingLegPaymentDates"
                               } ]
                             }
                           }
                         },
-                        "valuationMethod" : {
-                          "valuationSource" : {
-                            "settlementRateOption" : {
-                              "settlementRateOption" : {
-                                "value" : "KRW.KFTC18/KRW02"
-                              }
-                            }
-                          }
+                        "meta" : {
+                          "globalKey" : "947c58d9"
                         }
                       } ]
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "46f4e10"
-                          },
-                          "meta" : {
-                            "globalKey" : "b05ee318"
+                    "rateSpecification" : {
+                      "floatingRate" : {
+                        "rateOption" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "rateOption-1"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "aa3299e7"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "28c4f"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
-                        "rollConvention" : "28"
-                      },
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/365.FIXED"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2016-09-28",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -1095,42 +1042,149 @@
                           },
                           "meta" : {
                             "globalKey" : "ecac8294"
-                          },
-                          "unadjustedDate" : "2016-09-28"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ecac8294"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "floatingCalcPeriodDates",
-                        "globalKey" : "70e38865"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2017-09-28",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "46f4e10"
+                                "globalReference" : "46f4e10",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "b05ee318"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "aa3299e7"
                             }
                           },
                           "meta" : {
                             "globalKey" : "18dd6143"
-                          },
-                          "unadjustedDate" : "2017-09-28"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "18dd6143"
                         }
+                      },
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "46f4e10",
+                            "externalReference" : "floatPrimaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "b05ee318"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "aa3299e7"
+                        }
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "17f7b"
+                        },
+                        "rollConvention" : "28"
+                      },
+                      "meta" : {
+                        "globalKey" : "1a2dbed1",
+                        "externalKey" : "floatingCalcPeriodDates"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "KRSE"
+                          }, {
+                            "value" : "USNY"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "46f4e10",
+                            "externalKey" : "floatPrimaryBusinessCenters"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "97f8a1a1"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "e1ccbd11",
+                        "externalKey" : "floatingLegPaymentDates"
+                      }
+                    },
+                    "resetDates" : {
+                      "calculationPeriodDatesReference" : {
+                        "globalReference" : "1a2dbed1",
+                        "externalReference" : "floatingCalcPeriodDates"
+                      },
+                      "resetRelativeTo" : "CalculationPeriodStartDate",
+                      "fixingDates" : {
+                        "periodMultiplier" : -1,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "b674cc3a"
+                        },
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "KRSE"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "2355f9"
+                          }
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "c88ee6e2",
+                          "externalReference" : "floatingLegResetDates"
+                        }
+                      },
+                      "resetFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
+                      },
+                      "resetDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "46f4e10",
+                            "externalReference" : "floatPrimaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "b05ee318"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "aa3299e7"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "c88ee6e2",
+                        "externalKey" : "floatingLegResetDates"
                       }
                     },
                     "cashflowRepresentation" : {
@@ -1138,232 +1192,138 @@
                       "paymentCalculationPeriod" : [ {
                         "adjustedPaymentDate" : "2016-12-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2016-12-28",
                           "adjustedStartDate" : "2016-09-28",
+                          "adjustedEndDate" : "2016-12-28",
                           "meta" : {
-                            "globalKey" : "b418ca73"
+                            "globalKey" : "4f0ed0f3"
                           },
+                          "notionalAmount" : 1000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2016-09-27",
+                              "observedRate" : 1.34528,
                               "meta" : {
                                 "globalKey" : "7918ac42"
-                              },
-                              "observedRate" : 1.34528
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 1000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "a20f18f"
+                          "globalKey" : "a516f80f"
                         }
                       }, {
                         "adjustedPaymentDate" : "2017-03-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2017-03-28",
                           "adjustedStartDate" : "2016-12-28",
+                          "adjustedEndDate" : "2017-03-28",
                           "meta" : {
-                            "globalKey" : "b618aba6"
+                            "globalKey" : "5a218826"
                           },
+                          "notionalAmount" : 1000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2016-12-27",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a16075"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 1000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "959f1882"
+                          "globalKey" : "39a7f502"
                         }
                       }, {
                         "adjustedPaymentDate" : "2017-06-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2017-06-28",
                           "adjustedStartDate" : "2017-03-28",
+                          "adjustedEndDate" : "2017-06-28",
                           "meta" : {
-                            "globalKey" : "32a360e6"
+                            "globalKey" : "cd996766"
                           },
+                          "notionalAmount" : 1000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2017-03-27",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a212b5"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 1000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "457d0e82"
+                          "globalKey" : "e0731502"
                         }
                       }, {
                         "adjustedPaymentDate" : "2017-09-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2017-09-28",
                           "adjustedStartDate" : "2017-06-28",
+                          "adjustedEndDate" : "2017-09-28",
                           "meta" : {
-                            "globalKey" : "26f27766"
+                            "globalKey" : "c1e87de6"
                           },
+                          "notionalAmount" : 1000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2017-09-27",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a24135"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 1000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "6d1f65c2"
+                          "globalKey" : "8156c42"
                         }
                       } ]
                     },
-                    "dayCountFraction" : {
-                      "value" : "ACT/365.FIXED"
-                    },
                     "meta" : {
-                      "globalKey" : "d7bddd70"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "floatingLegPaymentDates",
-                        "globalKey" : "5ccd476f"
-                      },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "KRSE"
-                          }, {
-                            "value" : "USNY"
-                          } ],
-                          "meta" : {
-                            "externalKey" : "floatPrimaryBusinessCenters",
-                            "globalKey" : "46f4e10"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "97f8a1a1"
-                        }
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
-                      }
-                    },
-                    "rateSpecification" : {
-                      "floatingRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateOption" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "rateOption-1"
-                          }
-                        }
-                      }
-                    },
-                    "resetDates" : {
-                      "calculationPeriodDatesReference" : {
-                        "externalReference" : "floatingCalcPeriodDates",
-                        "globalReference" : "70e38865"
-                      },
-                      "fixingDates" : {
-                        "meta" : {
-                          "globalKey" : "ad359f64"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : -1,
-                        "dayType" : "BUSINESS",
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "KRSE"
-                          } ],
-                          "meta" : {
-                            "globalKey" : "2355f9"
-                          }
-                        },
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "floatingLegResetDates",
-                          "globalReference" : "9913be2"
-                        }
-                      },
-                      "meta" : {
-                        "externalKey" : "floatingLegResetDates",
-                        "globalKey" : "9913be2"
-                      },
-                      "resetDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "46f4e10"
-                          },
-                          "meta" : {
-                            "globalKey" : "b05ee318"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "aa3299e7"
-                        }
-                      },
-                      "resetFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
-                      },
-                      "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                      "globalKey" : "f01af92c"
                     }
                   }, {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-2"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
                     "settlementTerms" : {
-                      "meta" : {
-                        "globalKey" : "334a6b4f"
-                      },
                       "settlementCurrency" : {
                         "value" : "USD"
                       },
+                      "meta" : {
+                        "globalKey" : "2b8d7611"
+                      },
                       "cashSettlementTerms" : [ {
-                        "meta" : {
-                          "globalKey" : "ceb839e9"
+                        "valuationMethod" : {
+                          "valuationSource" : {
+                            "settlementRateOption" : {
+                              "settlementRateOption" : {
+                                "value" : "KRW.KFTC18/KRW02"
+                              }
+                            }
+                          }
                         },
                         "valuationDate" : {
                           "fxFixingDate" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "6ef4d2a"
+                              "globalKey" : "ed119998"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USNY"
@@ -1374,52 +1334,41 @@
                                 "globalKey" : "4f80e30"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeToPaymentDates" : {
                               "paymentDatesReference" : [ {
-                                "externalReference" : "fixedLegPaymentDates",
-                                "globalReference" : "5ccd476f"
+                                "globalReference" : "e1ccbd11",
+                                "externalReference" : "fixedLegPaymentDates"
                               } ]
                             }
                           }
                         },
-                        "valuationMethod" : {
-                          "valuationSource" : {
-                            "settlementRateOption" : {
-                              "settlementRateOption" : {
-                                "value" : "KRW.KFTC18/KRW02"
-                              }
-                            }
-                          }
+                        "meta" : {
+                          "globalKey" : "c6fb44ab"
                         }
                       } ]
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "fixedPrimaryBusinessCenters",
-                            "globalReference" : "46f4e10"
-                          },
-                          "meta" : {
-                            "globalKey" : "fe5af00"
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "9b965cf"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "28c4f"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
-                        "rollConvention" : "28"
-                      },
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/365.FIXED"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2016-09-28",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -1428,42 +1377,95 @@
                           },
                           "meta" : {
                             "globalKey" : "ecac8294"
-                          },
-                          "unadjustedDate" : "2016-09-28"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ecac8294"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "fixedCalcPeriodDates",
-                        "globalKey" : "b8e9c235"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2017-09-28",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "46f4e10"
+                                "globalReference" : "46f4e10",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "fe5af00"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "9b965cf"
                             }
                           },
                           "meta" : {
                             "globalKey" : "78642d2b"
-                          },
-                          "unadjustedDate" : "2017-09-28"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "78642d2b"
                         }
+                      },
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "46f4e10",
+                            "externalReference" : "fixedPrimaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "fe5af00"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "9b965cf"
+                        }
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "17f7b"
+                        },
+                        "rollConvention" : "28"
+                      },
+                      "meta" : {
+                        "globalKey" : "a93c2ca1",
+                        "externalKey" : "fixedCalcPeriodDates"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "KRSE"
+                          }, {
+                            "value" : "USNY"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "46f4e10",
+                            "externalKey" : "fixedPrimaryBusinessCenters"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "97f8a1a1"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "e1ccbd11",
+                        "externalKey" : "fixedLegPaymentDates"
                       }
                     },
                     "cashflowRepresentation" : {
@@ -1471,343 +1473,321 @@
                       "paymentCalculationPeriod" : [ {
                         "adjustedPaymentDate" : "2016-12-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2016-12-28",
                           "adjustedStartDate" : "2016-09-28",
+                          "adjustedEndDate" : "2016-12-28",
                           "meta" : {
-                            "globalKey" : "5a8f0e7f"
+                            "globalKey" : "b5a08ce1"
                           },
-                          "fixedRate" : 0.044,
-                          "notionalAmount" : 1000000
+                          "notionalAmount" : 1000000,
+                          "fixedRate" : 0.044
                         } ],
                         "meta" : {
-                          "globalKey" : "f8019ce3"
+                          "globalKey" : "53131b45"
                         }
                       }, {
                         "adjustedPaymentDate" : "2017-03-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2017-03-28",
                           "adjustedStartDate" : "2016-12-28",
+                          "adjustedEndDate" : "2017-03-28",
                           "meta" : {
-                            "globalKey" : "5d2f017f"
+                            "globalKey" : "b60d69e1"
                           },
-                          "fixedRate" : 0.044,
-                          "notionalAmount" : 1000000
+                          "notionalAmount" : 1000000,
+                          "fixedRate" : 0.044
                         } ],
                         "meta" : {
-                          "globalKey" : "ca7f2223"
+                          "globalKey" : "235d8a85"
                         }
                       }, {
                         "adjustedPaymentDate" : "2017-06-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2017-06-28",
                           "adjustedStartDate" : "2017-03-28",
+                          "adjustedEndDate" : "2017-06-28",
                           "meta" : {
-                            "globalKey" : "5d9bde7f"
+                            "globalKey" : "b8ad5ce1"
                           },
-                          "fixedRate" : 0.044,
-                          "notionalAmount" : 1000000
+                          "notionalAmount" : 1000000,
+                          "fixedRate" : 0.044
                         } ],
                         "meta" : {
-                          "globalKey" : "128e7663"
+                          "globalKey" : "6d9ff4c5"
                         }
                       }, {
                         "adjustedPaymentDate" : "2017-09-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2017-09-28",
                           "adjustedStartDate" : "2017-06-28",
+                          "adjustedEndDate" : "2017-09-28",
                           "meta" : {
-                            "globalKey" : "5df5f67f"
-                          },
-                          "fixedRate" : 0.044,
-                          "notionalAmount" : 1000000
-                        } ],
-                        "meta" : {
-                          "globalKey" : "5a8b05a3"
-                        }
-                      } ]
-                    },
-                    "dayCountFraction" : {
-                      "value" : "ACT/365.FIXED"
-                    },
-                    "meta" : {
-                      "globalKey" : "733d1f15"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "fixedLegPaymentDates",
-                        "globalKey" : "5ccd476f"
-                      },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "KRSE"
-                          }, {
-                            "value" : "USNY"
-                          } ],
-                          "meta" : {
-                            "externalKey" : "fixedPrimaryBusinessCenters",
-                            "globalKey" : "46f4e10"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
+                            "globalKey" : "b90774e1"
+                          },
+                          "notionalAmount" : 1000000,
+                          "fixedRate" : 0.044
+                        } ],
                         "meta" : {
-                          "globalKey" : "97f8a1a1"
+                          "globalKey" : "b59c8405"
                         }
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
-                      }
+                      } ]
                     },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
-                          }
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "f0deeb0b"
                     }
                   } ],
                   "meta" : {
-                    "globalKey" : "a3c263a5"
+                    "globalKey" : "6ea1705f"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "cb124956"
+                "globalKey" : "95f15610"
               }
             },
             "meta" : {
-              "globalKey" : "cb124956"
+              "globalKey" : "95f15610"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "59ad81d9"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "5d862026"
+              "quantity" : [ {
+                "value" : {
+                  "value" : 1000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "KRW"
+                    }
+                  }
                 },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
+                }
+              } ],
+              "observable" : {
                 "rateOption" : {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "rateOption-1"
-                    } ]
-                  },
                   "value" : {
                     "floatingRateIndex" : {
                       "value" : "KRW-CD-KSDA-Bloomberg"
                     },
                     "indexTenor" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
+                      "periodMultiplier" : 3,
                       "period" : "M",
-                      "periodMultiplier" : 3
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "rateOption-1"
+                    } ]
                   }
-                }
-              },
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
-                  } ]
                 },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "KRW"
-                    }
-                  },
-                  "value" : 1000000
+                "meta" : {
+                  "globalKey" : "533cd7c6"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "8e998c26"
               },
+              "meta" : {
+                "globalKey" : "a3732dc5"
+              }
+            }, {
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.044,
                   "unit" : {
                     "currency" : {
                       "value" : "KRW"
                     }
                   },
-                  "value" : 0.044,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "KRW"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ],
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "quantity" : [ {
                 "value" : {
+                  "value" : 1000000,
                   "unit" : {
                     "currency" : {
                       "value" : "KRW"
                     }
-                  },
-                  "value" : 1000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
                 }
-              } ]
-            } ]
-          } ]
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f025b"
-          },
-          "value" : "2016-09-27"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "cme_trade_id"
-              },
-              "value" : "2894761"
-            }
-          }, {
-            "identifier" : {
+              } ],
               "meta" : {
-                "scheme" : "client_trade_id"
-              },
-              "value" : "QAC_11111"
+                "globalKey" : "4497f89a"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "dd19",
+              "externalReference" : "clearing_firm"
             }
           }, {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "platform_trade_id"
-              },
-              "value" : "22222"
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
             }
-          }, {
+          } ]
+        },
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "999",
               "meta" : {
-                "scheme" : "platform_side_id"
-              },
-              "value" : "22222"
+                "scheme" : "clearing_member_firms"
+              }
+            },
+            "meta" : {
+              "globalKey" : "dd19"
             }
-          }, {
+          } ],
+          "meta" : {
+            "globalKey" : "dd19",
+            "externalKey" : "clearing_firm"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "block_trade_id"
-              },
-              "value" : "22222"
+              "value" : "CME"
+            },
+            "meta" : {
+              "globalKey" : "1051b"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "clearing_service",
-            "globalReference" : "1051b"
-          },
           "meta" : {
-            "globalKey" : "7595e4f2"
+            "globalKey" : "1051b",
+            "externalKey" : "clearing_service"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "reg_trade_id"
-              },
-              "value" : "CCCIRS2894761"
+              "value" : "PLATFORM"
+            },
+            "meta" : {
+              "globalKey" : "9e635873"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "9e635873",
+            "externalKey" : "trade_source"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "9e635873",
+            "externalReference" : "trade_source"
+          },
+          "role" : "DataSubmitter",
+          "ownershipPartyReference" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
+          }
+        } ],
+        "clearedDate" : "2016-09-27",
+        "account" : [ {
+          "partyReference" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
+          },
+          "accountNumber" : {
+            "value" : "999-123",
             "meta" : {
-              "scheme" : "cftc_Namespace"
-            },
-            "value" : "1010000023"
+              "scheme" : "clearing_firm_accounts"
+            }
+          },
+          "servicingParty" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
           },
           "meta" : {
-            "globalKey" : "a7071c09"
+            "globalKey" : "24a161c0",
+            "externalKey" : "account1"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "98e59efc"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
+      },
+      "meta" : {
+        "globalKey" : "71ecbc5f"
       }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "bc9bb5fd"
+      "globalKey" : "a7c361ff"
     }
   },
+  "previousWorkflowStep" : {
+    "globalReference" : "6318523a"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "3706576530",
       "meta" : {
         "scheme" : "cme_message_id"
-      },
-      "value" : "3706576530"
+      }
     },
     "sentBy" : {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
+      }
     },
     "sentTo" : [ {
+      "value" : "999",
       "meta" : {
         "scheme" : "cme_firm_id"
-      },
-      "value" : "999"
+      }
     }, {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
+      }
     } ]
   },
-  "meta" : {
-    "globalKey" : "8436b004"
-  },
+  "timestamp" : [ {
+    "dateTime" : "2016-09-27T12:56:03Z",
+    "qualification" : "eventCreationDateTime"
+  } ],
   "party" : [ {
-    "meta" : {
-      "externalKey" : "clearing_firm",
-      "globalKey" : "dd19"
-    },
     "partyId" : [ {
       "identifier" : {
+        "value" : "999",
         "meta" : {
           "scheme" : "clearing_member_firms"
-        },
-        "value" : "999"
+        }
       },
       "meta" : {
         "globalKey" : "dd19"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "clearing_service",
-      "globalKey" : "1051b"
-    },
+      "globalKey" : "dd19",
+      "externalKey" : "clearing_firm"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "CME"
@@ -1815,12 +1795,12 @@
       "meta" : {
         "globalKey" : "1051b"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "trade_source",
-      "globalKey" : "9e635873"
-    },
+      "globalKey" : "1051b",
+      "externalKey" : "clearing_service"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "PLATFORM"
@@ -1828,13 +1808,33 @@
       "meta" : {
         "globalKey" : "9e635873"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "9e635873",
+      "externalKey" : "trade_source"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "f0223414"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2016-09-27T12:56:03Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+  "account" : [ {
+    "partyReference" : {
+      "globalReference" : "dd19",
+      "externalReference" : "clearing_firm"
+    },
+    "accountNumber" : {
+      "value" : "999-123",
+      "meta" : {
+        "scheme" : "clearing_firm_accounts"
+      }
+    },
+    "servicingParty" : {
+      "globalReference" : "dd19",
+      "externalReference" : "clearing_firm"
+    },
+    "meta" : {
+      "globalKey" : "24a161c0",
+      "externalKey" : "account1"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "332368e8"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex02-Fixed-Float-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex02-Fixed-Float-func-output.json
index e3322f2e54..c10482d7e0 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex02-Fixed-Float-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex02-Fixed-Float-func-output.json
@@ -1,124 +1,80 @@
 {
-  "account" : [ {
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "clearing_firm_accounts"
-      },
-      "value" : "010S3"
-    },
-    "meta" : {
-      "externalKey" : "account1",
-      "globalKey" : "34a0c93d"
-    },
-    "partyReference" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "ba4f"
-    },
-    "servicingParty" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "ba4f"
-    }
-  } ],
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "bba88c7a"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "010S3"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "34a0c93d"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              }
-            } ],
-            "clearedDate" : "2018-10-31",
-            "meta" : {
-              "globalKey" : "bba88c7a"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "ba4f"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "9369929",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "010"
-                },
-                "meta" : {
-                  "globalKey" : "ba4f"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "43401154-2",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "66b48bac"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "MARKIT_WIRE"
-                },
+                  "value" : "43401154",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43401919",
+                  "meta" : {
+                    "scheme" : "platform_side_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43401154",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "aaa7591b"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "66b48bac"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
               },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "66b48bac"
-              },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS9369929",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "4ac79bbd"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-31",
+              "meta" : {
+                "globalKey" : "3f129f"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "ba4f"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -129,46 +85,42 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "fa5f1fb"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "979a8ca"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d7a"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "2"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -177,42 +129,95 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "12c49616"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2023-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "fixedPrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "fixedPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "fa5f1fb"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "979a8ca"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "acc7d90c"
-                              },
-                              "unadjustedDate" : "2023-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "acc7d90c"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "fa5f1fb"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "979a8ca"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "2b8c"
+                            },
+                            "rollConvention" : "2"
+                          },
+                          "meta" : {
+                            "globalKey" : "5d5645a8",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b",
+                                "externalKey" : "fixedPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "9e5a4d0f",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -220,239 +225,184 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2019-05-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-05-02",
                               "adjustedStartDate" : "2018-11-02",
+                              "adjustedEndDate" : "2019-05-02",
                               "meta" : {
-                                "globalKey" : "71c2601"
+                                "globalKey" : "1e163e9f"
                               },
-                              "fixedRate" : 0.02781,
-                              "notionalAmount" : 100000000
+                              "notionalAmount" : 100000000,
+                              "fixedRate" : 0.02781
                             } ],
                             "meta" : {
-                              "globalKey" : "700485ff"
+                              "globalKey" : "86fe9e9d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-11-04",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-11-04",
                               "adjustedStartDate" : "2019-05-02",
+                              "adjustedEndDate" : "2019-11-04",
                               "meta" : {
-                                "globalKey" : "7e403bf"
+                                "globalKey" : "21105121"
                               },
-                              "fixedRate" : 0.02781,
-                              "notionalAmount" : 100000000
+                              "notionalAmount" : 100000000,
+                              "fixedRate" : 0.02781
                             } ],
                             "meta" : {
-                              "globalKey" : "37b037b"
+                              "globalKey" : "1ca750dd"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-05-05",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-05-05",
                               "adjustedStartDate" : "2019-11-04",
+                              "adjustedEndDate" : "2020-05-05",
                               "meta" : {
-                                "globalKey" : "ade8aa0"
+                                "globalKey" : "21d832a0"
                               },
-                              "fixedRate" : 0.02781,
-                              "notionalAmount" : 100000000
+                              "notionalAmount" : 100000000,
+                              "fixedRate" : 0.02781
                             } ],
                             "meta" : {
-                              "globalKey" : "1faa6c7b"
+                              "globalKey" : "36a4147b"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-11-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-11-02",
                               "adjustedStartDate" : "2020-05-05",
+                              "adjustedEndDate" : "2020-11-02",
                               "meta" : {
-                                "globalKey" : "ba42644"
+                                "globalKey" : "24d2a6bc"
                               },
-                              "fixedRate" : 0.02781,
-                              "notionalAmount" : 100000000
+                              "notionalAmount" : 100000000,
+                              "fixedRate" : 0.02781
                             } ],
                             "meta" : {
-                              "globalKey" : "aa966cc2"
+                              "globalKey" : "c3c4ed3a"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-05-04",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-05-04",
                               "adjustedStartDate" : "2020-11-02",
+                              "adjustedEndDate" : "2021-05-04",
                               "meta" : {
-                                "globalKey" : "e9f0ebf"
+                                "globalKey" : "25984621"
                               },
-                              "fixedRate" : 0.02781,
-                              "notionalAmount" : 100000000
+                              "notionalAmount" : 100000000,
+                              "fixedRate" : 0.02781
                             } ],
                             "meta" : {
-                              "globalKey" : "c87b0ffb"
+                              "globalKey" : "df74475d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-11-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-11-02",
                               "adjustedStartDate" : "2021-05-04",
+                              "adjustedEndDate" : "2021-11-02",
                               "meta" : {
-                                "globalKey" : "f652283"
+                                "globalKey" : "2893325d"
                               },
-                              "fixedRate" : 0.02781,
-                              "notionalAmount" : 100000000
+                              "notionalAmount" : 100000000,
+                              "fixedRate" : 0.02781
                             } ],
                             "meta" : {
-                              "globalKey" : "551c6101"
+                              "globalKey" : "6e4a70db"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-05-03",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-05-03",
                               "adjustedStartDate" : "2021-11-02",
+                              "adjustedEndDate" : "2022-05-03",
                               "meta" : {
-                                "globalKey" : "125f9a60"
+                                "globalKey" : "29594260"
                               },
-                              "fixedRate" : 0.02781,
-                              "notionalAmount" : 100000000
+                              "notionalAmount" : 100000000,
+                              "fixedRate" : 0.02781
                             } ],
                             "meta" : {
-                              "globalKey" : "714bbafd"
+                              "globalKey" : "884562fd"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-11-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-11-02",
                               "adjustedStartDate" : "2022-05-03",
+                              "adjustedEndDate" : "2022-11-02",
                               "meta" : {
-                                "globalKey" : "13261ec2"
+                                "globalKey" : "2c53bdfe"
                               },
-                              "fixedRate" : 0.02781,
-                              "notionalAmount" : 100000000
+                              "notionalAmount" : 100000000,
+                              "fixedRate" : 0.02781
                             } ],
                             "meta" : {
-                              "globalKey" : "ffa25540"
+                              "globalKey" : "18cff47c"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-05-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-05-02",
                               "adjustedStartDate" : "2022-11-02",
+                              "adjustedEndDate" : "2023-05-02",
                               "meta" : {
-                                "globalKey" : "16202601"
+                                "globalKey" : "2d1a3e9f"
                               },
-                              "fixedRate" : 0.02781,
-                              "notionalAmount" : 100000000
+                              "notionalAmount" : 100000000,
+                              "fixedRate" : 0.02781
                             } ],
                             "meta" : {
-                              "globalKey" : "1a1c65ff"
+                              "globalKey" : "31167e9d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-11-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-11-02",
                               "adjustedStartDate" : "2023-05-02",
+                              "adjustedEndDate" : "2023-11-02",
                               "meta" : {
-                                "globalKey" : "16e71b01"
+                                "globalKey" : "3014499f"
                               },
-                              "fixedRate" : 0.02781,
-                              "notionalAmount" : 100000000
+                              "notionalAmount" : 100000000,
+                              "fixedRate" : 0.02781
                             } ],
                             "meta" : {
-                              "globalKey" : "aa28497f"
+                              "globalKey" : "c355781d"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "30/360"
-                        },
                         "meta" : {
-                          "globalKey" : "185384cb"
+                          "globalKey" : "710305d5"
+                        }
+                      }, {
+                        "payerReceiver" : {
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "637fde97"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "fixedPrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "97b8e49c"
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-2"
                             }
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "959"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "rateSpecification" : {
-                          "fixedRate" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
+                              }
+                            },
                             "meta" : {
                               "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
                             }
                           }
-                        }
-                      }, {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
                         },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-2"
-                            }
-                          }
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
                         },
                         "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "b01f2613"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "a9f2dce2"
-                            }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d1d"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "2"
-                          },
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -461,42 +411,149 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "13d8d929"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2023-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "b01f2613"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "a9f2dce2"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "4d410d24"
-                              },
-                              "unadjustedDate" : "2023-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "4d410d24"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "b01f2613"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "a9f2dce2"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "2049"
+                            },
+                            "rollConvention" : "2"
+                          },
+                          "meta" : {
+                            "globalKey" : "ce47cc95",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b",
+                                "externalKey" : "floatPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "e18d000c",
+                            "externalKey" : "floatingLegPaymentDates"
+                          }
+                        },
+                        "resetDates" : {
+                          "calculationPeriodDatesReference" : {
+                            "globalReference" : "ce47cc95",
+                            "externalReference" : "floatingCalcPeriodDates"
+                          },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
+                          "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "1a78799e"
+                            },
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "21479e"
+                              }
+                            },
+                            "dateRelativeTo" : {
+                              "globalReference" : "b12814b5",
+                              "externalReference" : "floatingLegResetDates"
+                            }
+                          },
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "b01f2613"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "a9f2dce2"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "b12814b5",
+                            "externalKey" : "floatingLegResetDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -504,828 +561,724 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2019-02-04",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-02-04",
                               "adjustedStartDate" : "2018-11-02",
+                              "adjustedEndDate" : "2019-02-04",
                               "meta" : {
-                                "globalKey" : "221e9424"
+                                "globalKey" : "5fc4ab60"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2018-10-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a34171"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "510ee8a8"
+                              "globalKey" : "8eb4ffe4"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-05-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-05-02",
                               "adjustedStartDate" : "2019-02-04",
+                              "adjustedEndDate" : "2019-05-02",
                               "meta" : {
-                                "globalKey" : "38468420"
+                                "globalKey" : "399f4fe4"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-01-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a3f3b1"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "72013b62"
+                              "globalKey" : "735a0726"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-08-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-08-02",
                               "adjustedStartDate" : "2019-05-02",
+                              "adjustedEndDate" : "2019-08-02",
                               "meta" : {
-                                "globalKey" : "292bd203"
+                                "globalKey" : "c421d883"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-04-30",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a40ad2"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "9639ca05"
+                              "globalKey" : "312fd085"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-11-04",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-11-04",
                               "adjustedStartDate" : "2019-08-02",
+                              "adjustedEndDate" : "2019-11-04",
                               "meta" : {
-                                "globalKey" : "874747e4"
+                                "globalKey" : "bbda8920"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-07-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a42231"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "50315ea8"
+                              "globalKey" : "84c49fe4"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-02-03",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-02-03",
                               "adjustedStartDate" : "2019-11-04",
+                              "adjustedEndDate" : "2020-02-03",
                               "meta" : {
-                                "globalKey" : "c9420221"
+                                "globalKey" : "a07c4143"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-10-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a43971"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "8765efa4"
+                              "globalKey" : "5ea02ec6"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-05-05",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-05-05",
                               "adjustedStartDate" : "2020-02-03",
+                              "adjustedEndDate" : "2020-05-05",
                               "meta" : {
-                                "globalKey" : "ade45525"
+                                "globalKey" : "e2779661"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-01-30",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a4eb92"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "c7e4616a"
+                              "globalKey" : "fc77a2a6"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-08-03",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-08-03",
                               "adjustedStartDate" : "2020-05-05",
+                              "adjustedEndDate" : "2020-08-03",
                               "meta" : {
-                                "globalKey" : "3bd08f21"
+                                "globalKey" : "3d295ae5"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-04-30",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a502d2"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "609afe24"
+                              "globalKey" : "61f3c9e8"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-11-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-11-02",
                               "adjustedStartDate" : "2020-08-03",
+                              "adjustedEndDate" : "2020-11-02",
                               "meta" : {
-                                "globalKey" : "f7cfa1e2"
+                                "globalKey" : "c5f70b04"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-07-30",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a51a12"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "bba8e2a4"
+                              "globalKey" : "89d04bc6"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-02-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-02-02",
                               "adjustedStartDate" : "2020-11-02",
+                              "adjustedEndDate" : "2021-02-02",
                               "meta" : {
-                                "globalKey" : "69920d64"
+                                "globalKey" : "d9ae9e4"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-10-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a53133"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "b6e993e6"
+                              "globalKey" : "5af27066"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-05-04",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-05-04",
                               "adjustedStartDate" : "2021-02-02",
+                              "adjustedEndDate" : "2021-05-04",
                               "meta" : {
-                                "globalKey" : "4fe93926"
+                                "globalKey" : "847c7a62"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-01-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a5e373"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "f91cde6a"
+                              "globalKey" : "2db01fa6"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-08-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-08-02",
                               "adjustedStartDate" : "2021-05-04",
+                              "adjustedEndDate" : "2021-08-02",
                               "meta" : {
-                                "globalKey" : "ddd57322"
+                                "globalKey" : "df2e3ee6"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-04-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a5fab3"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "91d37b24"
+                              "globalKey" : "932c46e8"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-11-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-11-02",
                               "adjustedStartDate" : "2021-08-02",
+                              "adjustedEndDate" : "2021-11-02",
                               "meta" : {
-                                "globalKey" : "cebac124"
+                                "globalKey" : "69b0c7a4"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-07-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a611f3"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "b60c09e6"
+                              "globalKey" : "51021066"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-02-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-02-02",
                               "adjustedStartDate" : "2021-11-02",
+                              "adjustedEndDate" : "2022-02-02",
                               "meta" : {
-                                "globalKey" : "42320564"
+                                "globalKey" : "e63ae1e4"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-10-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a62933"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "b30193e6"
+                              "globalKey" : "570a7066"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-05-03",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-05-03",
                               "adjustedStartDate" : "2022-02-02",
+                              "adjustedEndDate" : "2022-05-03",
                               "meta" : {
-                                "globalKey" : "f3a2f623"
+                                "globalKey" : "5b679a01"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-01-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a6dbb1"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "2c0a3466"
+                              "globalKey" : "93ced844"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-08-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-08-02",
                               "adjustedStartDate" : "2022-05-03",
+                              "adjustedEndDate" : "2022-08-02",
                               "meta" : {
-                                "globalKey" : "b4c09264"
+                                "globalKey" : "82e7fb86"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-04-28",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a6f294"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "8c36a266"
+                              "globalKey" : "5a5e0b88"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-11-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-11-02",
                               "adjustedStartDate" : "2022-08-02",
+                              "adjustedEndDate" : "2022-11-02",
                               "meta" : {
-                                "globalKey" : "a75ab924"
+                                "globalKey" : "4250bfa4"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-07-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a709f3"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "b22409e6"
+                              "globalKey" : "4d1a1066"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-02-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-02-02",
                               "adjustedStartDate" : "2022-11-02",
+                              "adjustedEndDate" : "2023-02-02",
                               "meta" : {
-                                "globalKey" : "1ad1fda2"
+                                "globalKey" : "bedada22"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-10-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a72171"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "af199424"
+                              "globalKey" : "532270a4"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-05-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-05-02",
                               "adjustedStartDate" : "2023-02-02",
+                              "adjustedEndDate" : "2023-05-02",
                               "meta" : {
-                                "globalKey" : "975cb2e2"
+                                "globalKey" : "3252b962"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2023-01-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a7d3b1"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "5ef78a24"
+                              "globalKey" : "f9ed90a4"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-08-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-08-02",
                               "adjustedStartDate" : "2023-05-02",
+                              "adjustedEndDate" : "2023-08-02",
                               "meta" : {
-                                "globalKey" : "8babb1a6"
+                                "globalKey" : "26a1b826"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2023-04-27",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a7ea75"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "8699c9a8"
+                              "globalKey" : "218fd028"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-11-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-11-02",
                               "adjustedStartDate" : "2023-08-02",
+                              "adjustedEndDate" : "2023-11-02",
                               "meta" : {
-                                "globalKey" : "7ffab162"
+                                "globalKey" : "1af0b7e2"
                               },
+                              "notionalAmount" : 100000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2023-07-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a80231"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "ae3c0a24"
+                              "globalKey" : "493210a4"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
                         "meta" : {
-                          "globalKey" : "2b3c540d"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "637fde94"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "97b8e49c"
-                            }
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
-                          }
-                        },
-                        "resetDates" : {
-                          "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "13d8d929"
-                          },
-                          "fixingDates" : {
-                            "meta" : {
-                              "globalKey" : "3d9c8eea"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "21479e"
-                              }
-                            },
-                            "businessDayConvention" : "NONE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "6632dffd"
-                            }
-                          },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "6632dffd"
-                          },
-                          "resetDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "b01f2613"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "a9f2dce2"
-                            }
-                          },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "globalKey" : "9c5ab819"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "e6b3f462"
+                        "globalKey" : "9ae16924"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "eb838993"
+                    "globalKey" : "9fb0fe55"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "eb838993"
+                  "globalKey" : "9fb0fe55"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "5200f2ce"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.02781,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.02781,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 100000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "ee1d66f2"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "7b78abf0"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 100000000
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f129f"
-              },
-              "value" : "2018-10-31"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "9369929"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "43401154-2"
+                    "globalKey" : "5332091c"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "ba4f",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "43401154"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "010",
                   "meta" : {
-                    "scheme" : "platform_side_id"
-                  },
-                  "value" : "43401919"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ba4f"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "ba4f",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "43401154"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "6d25ae27"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS9369929"
+                  "value" : "MARKIT_WIRE"
+                },
+                "meta" : {
+                  "globalKey" : "66b48bac"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "66b48bac",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "66b48bac",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2018-10-31",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "010S3",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "1770499b"
+                "globalKey" : "a30716bd",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "59c0a126"
+            }
+          },
+          "meta" : {
+            "globalKey" : "59c0a126"
           }
         }
       }
     } ],
-    "intent" : "CONTRACT_FORMATION",
+    "eventQualifier" : "ContractFormation",
     "after" : [ {
-      "meta" : {
-        "globalKey" : "c7c95fb7"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
       "trade" : {
-        "account" : [ {
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "clearing_firm_accounts"
-            },
-            "value" : "010S3"
-          },
-          "meta" : {
-            "externalKey" : "account1",
-            "globalKey" : "34a0c93d"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
-          },
-          "servicingParty" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
-          }
-        } ],
-        "clearedDate" : "2018-10-31",
-        "meta" : {
-          "globalKey" : "bba88c7a"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "clearing_firm",
-            "globalKey" : "ba4f"
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "1051b",
+            "externalReference" : "clearing_service"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "9369929",
               "meta" : {
-                "scheme" : "clearing_member_firms"
-              },
-              "value" : "010"
-            },
-            "meta" : {
-              "globalKey" : "ba4f"
+                "scheme" : "cme_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing_service",
-            "globalKey" : "1051b"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "CME"
-            },
-            "meta" : {
-              "globalKey" : "1051b"
+              "value" : "43401154-2",
+              "meta" : {
+                "scheme" : "client_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "trade_source",
-            "globalKey" : "66b48bac"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "MARKIT_WIRE"
-            },
+              "value" : "43401154",
+              "meta" : {
+                "scheme" : "platform_trade_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "43401919",
+              "meta" : {
+                "scheme" : "platform_side_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "43401154",
+              "meta" : {
+                "scheme" : "block_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "aaa7591b"
+          }
+        }, {
+          "issuer" : {
+            "value" : "1010000023",
             "meta" : {
-              "globalKey" : "66b48bac"
+              "scheme" : "cftc_Namespace"
             }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
           },
-          "partyReference" : {
-            "externalReference" : "trade_source",
-            "globalReference" : "66b48bac"
-          },
-          "role" : "DATA_SUBMITTER"
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "CCCIRS9369929",
+              "meta" : {
+                "scheme" : "reg_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "4ac79bbd"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2018-10-31",
+          "meta" : {
+            "globalKey" : "3f129f"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "ba4f"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -1336,46 +1289,42 @@
                 "payout" : {
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
-                      }
-                    },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "fixedPrimaryBusinessCenters",
-                            "globalReference" : "42f910b"
-                          },
-                          "meta" : {
-                            "globalKey" : "fa5f1fb"
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    },
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "979a8ca"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "12d7a"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6,
-                        "rollConvention" : "2"
-                      },
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "30/360"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2018-11-02",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -1384,42 +1333,95 @@
                           },
                           "meta" : {
                             "globalKey" : "ecea117a"
-                          },
-                          "unadjustedDate" : "2018-11-02"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ecea117a"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "fixedCalcPeriodDates",
-                        "globalKey" : "12c49616"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2023-11-02",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
+                                "globalReference" : "42f910b",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "fa5f1fb"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "979a8ca"
                             }
                           },
                           "meta" : {
                             "globalKey" : "acc7d90c"
-                          },
-                          "unadjustedDate" : "2023-11-02"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "acc7d90c"
                         }
+                      },
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "42f910b",
+                            "externalReference" : "fixedPrimaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "fa5f1fb"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "979a8ca"
+                        }
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "2b8c"
+                        },
+                        "rollConvention" : "2"
+                      },
+                      "meta" : {
+                        "globalKey" : "5d5645a8",
+                        "externalKey" : "fixedCalcPeriodDates"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "107"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "GBLO"
+                          }, {
+                            "value" : "USNY"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "42f910b",
+                            "externalKey" : "fixedPrimaryBusinessCenters"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "97b8e49c"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "9e5a4d0f",
+                        "externalKey" : "fixedLegPaymentDates"
                       }
                     },
                     "cashflowRepresentation" : {
@@ -1427,158 +1429,263 @@
                       "paymentCalculationPeriod" : [ {
                         "adjustedPaymentDate" : "2019-05-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-05-02",
                           "adjustedStartDate" : "2018-11-02",
+                          "adjustedEndDate" : "2019-05-02",
                           "meta" : {
-                            "globalKey" : "71c2601"
+                            "globalKey" : "1e163e9f"
                           },
-                          "fixedRate" : 0.02781,
-                          "notionalAmount" : 100000000
+                          "notionalAmount" : 100000000,
+                          "fixedRate" : 0.02781
                         } ],
                         "meta" : {
-                          "globalKey" : "700485ff"
+                          "globalKey" : "86fe9e9d"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-11-04",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-11-04",
                           "adjustedStartDate" : "2019-05-02",
+                          "adjustedEndDate" : "2019-11-04",
                           "meta" : {
-                            "globalKey" : "7e403bf"
+                            "globalKey" : "21105121"
                           },
-                          "fixedRate" : 0.02781,
-                          "notionalAmount" : 100000000
+                          "notionalAmount" : 100000000,
+                          "fixedRate" : 0.02781
                         } ],
                         "meta" : {
-                          "globalKey" : "37b037b"
+                          "globalKey" : "1ca750dd"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-05-05",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-05-05",
                           "adjustedStartDate" : "2019-11-04",
+                          "adjustedEndDate" : "2020-05-05",
                           "meta" : {
-                            "globalKey" : "ade8aa0"
+                            "globalKey" : "21d832a0"
                           },
-                          "fixedRate" : 0.02781,
-                          "notionalAmount" : 100000000
+                          "notionalAmount" : 100000000,
+                          "fixedRate" : 0.02781
                         } ],
                         "meta" : {
-                          "globalKey" : "1faa6c7b"
+                          "globalKey" : "36a4147b"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-11-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-11-02",
                           "adjustedStartDate" : "2020-05-05",
+                          "adjustedEndDate" : "2020-11-02",
                           "meta" : {
-                            "globalKey" : "ba42644"
+                            "globalKey" : "24d2a6bc"
                           },
-                          "fixedRate" : 0.02781,
-                          "notionalAmount" : 100000000
+                          "notionalAmount" : 100000000,
+                          "fixedRate" : 0.02781
                         } ],
                         "meta" : {
-                          "globalKey" : "aa966cc2"
+                          "globalKey" : "c3c4ed3a"
                         }
                       }, {
                         "adjustedPaymentDate" : "2021-05-04",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2021-05-04",
                           "adjustedStartDate" : "2020-11-02",
+                          "adjustedEndDate" : "2021-05-04",
                           "meta" : {
-                            "globalKey" : "e9f0ebf"
+                            "globalKey" : "25984621"
                           },
-                          "fixedRate" : 0.02781,
-                          "notionalAmount" : 100000000
+                          "notionalAmount" : 100000000,
+                          "fixedRate" : 0.02781
                         } ],
                         "meta" : {
-                          "globalKey" : "c87b0ffb"
+                          "globalKey" : "df74475d"
                         }
                       }, {
                         "adjustedPaymentDate" : "2021-11-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2021-11-02",
                           "adjustedStartDate" : "2021-05-04",
+                          "adjustedEndDate" : "2021-11-02",
                           "meta" : {
-                            "globalKey" : "f652283"
+                            "globalKey" : "2893325d"
                           },
-                          "fixedRate" : 0.02781,
-                          "notionalAmount" : 100000000
+                          "notionalAmount" : 100000000,
+                          "fixedRate" : 0.02781
                         } ],
                         "meta" : {
-                          "globalKey" : "551c6101"
+                          "globalKey" : "6e4a70db"
                         }
                       }, {
                         "adjustedPaymentDate" : "2022-05-03",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2022-05-03",
                           "adjustedStartDate" : "2021-11-02",
+                          "adjustedEndDate" : "2022-05-03",
                           "meta" : {
-                            "globalKey" : "125f9a60"
+                            "globalKey" : "29594260"
                           },
-                          "fixedRate" : 0.02781,
-                          "notionalAmount" : 100000000
+                          "notionalAmount" : 100000000,
+                          "fixedRate" : 0.02781
                         } ],
                         "meta" : {
-                          "globalKey" : "714bbafd"
+                          "globalKey" : "884562fd"
                         }
                       }, {
                         "adjustedPaymentDate" : "2022-11-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2022-11-02",
                           "adjustedStartDate" : "2022-05-03",
+                          "adjustedEndDate" : "2022-11-02",
                           "meta" : {
-                            "globalKey" : "13261ec2"
+                            "globalKey" : "2c53bdfe"
                           },
-                          "fixedRate" : 0.02781,
-                          "notionalAmount" : 100000000
+                          "notionalAmount" : 100000000,
+                          "fixedRate" : 0.02781
                         } ],
                         "meta" : {
-                          "globalKey" : "ffa25540"
+                          "globalKey" : "18cff47c"
                         }
                       }, {
                         "adjustedPaymentDate" : "2023-05-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2023-05-02",
                           "adjustedStartDate" : "2022-11-02",
+                          "adjustedEndDate" : "2023-05-02",
                           "meta" : {
-                            "globalKey" : "16202601"
+                            "globalKey" : "2d1a3e9f"
                           },
-                          "fixedRate" : 0.02781,
-                          "notionalAmount" : 100000000
+                          "notionalAmount" : 100000000,
+                          "fixedRate" : 0.02781
                         } ],
                         "meta" : {
-                          "globalKey" : "1a1c65ff"
+                          "globalKey" : "31167e9d"
                         }
                       }, {
                         "adjustedPaymentDate" : "2023-11-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2023-11-02",
                           "adjustedStartDate" : "2023-05-02",
+                          "adjustedEndDate" : "2023-11-02",
                           "meta" : {
-                            "globalKey" : "16e71b01"
+                            "globalKey" : "3014499f"
                           },
-                          "fixedRate" : 0.02781,
-                          "notionalAmount" : 100000000
+                          "notionalAmount" : 100000000,
+                          "fixedRate" : 0.02781
                         } ],
                         "meta" : {
-                          "globalKey" : "aa28497f"
+                          "globalKey" : "c355781d"
                         }
                       } ]
                     },
+                    "meta" : {
+                      "globalKey" : "710305d5"
+                    }
+                  }, {
+                    "payerReceiver" : {
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
+                    },
+                    "priceQuantity" : {
+                      "quantitySchedule" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "quantity-2"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    },
+                    "rateSpecification" : {
+                      "floatingRate" : {
+                        "rateOption" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "rateOption-1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
                     "dayCountFraction" : {
-                      "value" : "30/360"
+                      "value" : "ACT/360"
                     },
-                    "meta" : {
-                      "globalKey" : "185384cb"
+                    "calculationPeriodDates" : {
+                      "effectiveDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2018-11-02",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ecea117a"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "ecea117a"
+                        }
+                      },
+                      "terminationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2023-11-02",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "b01f2613"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "a9f2dce2"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "4d410d24"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "4d410d24"
+                        }
+                      },
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "42f910b",
+                            "externalReference" : "floatPrimaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "b01f2613"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "a9f2dce2"
+                        }
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "2049"
+                        },
+                        "rollConvention" : "2"
+                      },
+                      "meta" : {
+                        "globalKey" : "ce47cc95",
+                        "externalKey" : "floatingCalcPeriodDates"
+                      }
                     },
                     "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "fixedLegPaymentDates",
-                        "globalKey" : "637fde97"
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
                       },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                      "payRelativeTo" : "CalculationPeriodEndDate",
                       "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -1586,124 +1693,71 @@
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "fixedPrimaryBusinessCenters",
-                            "globalKey" : "42f910b"
+                            "globalKey" : "42f910b",
+                            "externalKey" : "floatPrimaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b8e49c"
                         }
                       },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "959"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6
+                      "meta" : {
+                        "globalKey" : "e18d000c",
+                        "externalKey" : "floatingLegPaymentDates"
                       }
                     },
-                    "rateSpecification" : {
-                      "fixedRate" : {
+                    "resetDates" : {
+                      "calculationPeriodDatesReference" : {
+                        "globalReference" : "ce47cc95",
+                        "externalReference" : "floatingCalcPeriodDates"
+                      },
+                      "resetRelativeTo" : "CalculationPeriodStartDate",
+                      "fixingDates" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "0"
+                          "globalKey" : "1a78799e"
                         },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "GBLO"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "21479e"
                           }
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "b12814b5",
+                          "externalReference" : "floatingLegResetDates"
                         }
-                      }
-                    }
-                  }, {
-                    "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
-                    },
-                    "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
                       },
-                      "quantitySchedule" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "quantity-2"
+                      "resetFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
                         }
-                      }
-                    },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
+                      },
+                      "resetDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "42f910b"
+                            "globalReference" : "42f910b",
+                            "externalReference" : "floatPrimaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "b01f2613"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "a9f2dce2"
                         }
                       },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "12d1d"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
-                        "rollConvention" : "2"
-                      },
-                      "effectiveDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "ecea117a"
-                          },
-                          "unadjustedDate" : "2018-11-02"
-                        },
-                        "meta" : {
-                          "globalKey" : "ecea117a"
-                        }
-                      },
                       "meta" : {
-                        "externalKey" : "floatingCalcPeriodDates",
-                        "globalKey" : "13d8d929"
-                      },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "b01f2613"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "a9f2dce2"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "4d410d24"
-                          },
-                          "unadjustedDate" : "2023-11-02"
-                        },
-                        "meta" : {
-                          "globalKey" : "4d410d24"
-                        }
+                        "globalKey" : "b12814b5",
+                        "externalKey" : "floatingLegResetDates"
                       }
                     },
                     "cashflowRepresentation" : {
@@ -1711,779 +1765,708 @@
                       "paymentCalculationPeriod" : [ {
                         "adjustedPaymentDate" : "2019-02-04",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-02-04",
                           "adjustedStartDate" : "2018-11-02",
+                          "adjustedEndDate" : "2019-02-04",
                           "meta" : {
-                            "globalKey" : "221e9424"
+                            "globalKey" : "5fc4ab60"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2018-10-31",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a34171"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "510ee8a8"
+                          "globalKey" : "8eb4ffe4"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-05-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-05-02",
                           "adjustedStartDate" : "2019-02-04",
+                          "adjustedEndDate" : "2019-05-02",
                           "meta" : {
-                            "globalKey" : "38468420"
+                            "globalKey" : "399f4fe4"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2019-01-31",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a3f3b1"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "72013b62"
+                          "globalKey" : "735a0726"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-08-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-08-02",
                           "adjustedStartDate" : "2019-05-02",
+                          "adjustedEndDate" : "2019-08-02",
                           "meta" : {
-                            "globalKey" : "292bd203"
+                            "globalKey" : "c421d883"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2019-04-30",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a40ad2"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "9639ca05"
+                          "globalKey" : "312fd085"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-11-04",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-11-04",
                           "adjustedStartDate" : "2019-08-02",
+                          "adjustedEndDate" : "2019-11-04",
                           "meta" : {
-                            "globalKey" : "874747e4"
+                            "globalKey" : "bbda8920"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2019-07-31",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a42231"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "50315ea8"
+                          "globalKey" : "84c49fe4"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-02-03",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-02-03",
                           "adjustedStartDate" : "2019-11-04",
+                          "adjustedEndDate" : "2020-02-03",
                           "meta" : {
-                            "globalKey" : "c9420221"
+                            "globalKey" : "a07c4143"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2019-10-31",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a43971"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "8765efa4"
+                          "globalKey" : "5ea02ec6"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-05-05",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-05-05",
                           "adjustedStartDate" : "2020-02-03",
+                          "adjustedEndDate" : "2020-05-05",
                           "meta" : {
-                            "globalKey" : "ade45525"
+                            "globalKey" : "e2779661"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2020-01-30",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a4eb92"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "c7e4616a"
+                          "globalKey" : "fc77a2a6"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-08-03",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-08-03",
                           "adjustedStartDate" : "2020-05-05",
+                          "adjustedEndDate" : "2020-08-03",
                           "meta" : {
-                            "globalKey" : "3bd08f21"
+                            "globalKey" : "3d295ae5"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2020-04-30",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a502d2"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "609afe24"
+                          "globalKey" : "61f3c9e8"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-11-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-11-02",
                           "adjustedStartDate" : "2020-08-03",
+                          "adjustedEndDate" : "2020-11-02",
                           "meta" : {
-                            "globalKey" : "f7cfa1e2"
+                            "globalKey" : "c5f70b04"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2020-07-30",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a51a12"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "bba8e2a4"
+                          "globalKey" : "89d04bc6"
                         }
                       }, {
                         "adjustedPaymentDate" : "2021-02-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2021-02-02",
                           "adjustedStartDate" : "2020-11-02",
+                          "adjustedEndDate" : "2021-02-02",
                           "meta" : {
-                            "globalKey" : "69920d64"
+                            "globalKey" : "d9ae9e4"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2020-10-29",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a53133"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "b6e993e6"
+                          "globalKey" : "5af27066"
                         }
                       }, {
                         "adjustedPaymentDate" : "2021-05-04",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2021-05-04",
                           "adjustedStartDate" : "2021-02-02",
+                          "adjustedEndDate" : "2021-05-04",
                           "meta" : {
-                            "globalKey" : "4fe93926"
+                            "globalKey" : "847c7a62"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2021-01-29",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a5e373"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "f91cde6a"
+                          "globalKey" : "2db01fa6"
                         }
                       }, {
                         "adjustedPaymentDate" : "2021-08-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2021-08-02",
                           "adjustedStartDate" : "2021-05-04",
+                          "adjustedEndDate" : "2021-08-02",
                           "meta" : {
-                            "globalKey" : "ddd57322"
+                            "globalKey" : "df2e3ee6"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2021-04-29",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a5fab3"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "91d37b24"
+                          "globalKey" : "932c46e8"
                         }
                       }, {
                         "adjustedPaymentDate" : "2021-11-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2021-11-02",
                           "adjustedStartDate" : "2021-08-02",
+                          "adjustedEndDate" : "2021-11-02",
                           "meta" : {
-                            "globalKey" : "cebac124"
+                            "globalKey" : "69b0c7a4"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2021-07-29",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a611f3"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "b60c09e6"
+                          "globalKey" : "51021066"
                         }
                       }, {
                         "adjustedPaymentDate" : "2022-02-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2022-02-02",
                           "adjustedStartDate" : "2021-11-02",
+                          "adjustedEndDate" : "2022-02-02",
                           "meta" : {
-                            "globalKey" : "42320564"
+                            "globalKey" : "e63ae1e4"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2021-10-29",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a62933"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "b30193e6"
+                          "globalKey" : "570a7066"
                         }
                       }, {
                         "adjustedPaymentDate" : "2022-05-03",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2022-05-03",
                           "adjustedStartDate" : "2022-02-02",
+                          "adjustedEndDate" : "2022-05-03",
                           "meta" : {
-                            "globalKey" : "f3a2f623"
+                            "globalKey" : "5b679a01"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2022-01-31",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a6dbb1"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "2c0a3466"
+                          "globalKey" : "93ced844"
                         }
                       }, {
                         "adjustedPaymentDate" : "2022-08-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2022-08-02",
                           "adjustedStartDate" : "2022-05-03",
+                          "adjustedEndDate" : "2022-08-02",
                           "meta" : {
-                            "globalKey" : "b4c09264"
+                            "globalKey" : "82e7fb86"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2022-04-28",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a6f294"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "8c36a266"
+                          "globalKey" : "5a5e0b88"
                         }
                       }, {
                         "adjustedPaymentDate" : "2022-11-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2022-11-02",
                           "adjustedStartDate" : "2022-08-02",
+                          "adjustedEndDate" : "2022-11-02",
                           "meta" : {
-                            "globalKey" : "a75ab924"
+                            "globalKey" : "4250bfa4"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2022-07-29",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a709f3"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "b22409e6"
+                          "globalKey" : "4d1a1066"
                         }
                       }, {
                         "adjustedPaymentDate" : "2023-02-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2023-02-02",
                           "adjustedStartDate" : "2022-11-02",
+                          "adjustedEndDate" : "2023-02-02",
                           "meta" : {
-                            "globalKey" : "1ad1fda2"
+                            "globalKey" : "bedada22"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2022-10-31",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a72171"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "af199424"
+                          "globalKey" : "532270a4"
                         }
                       }, {
                         "adjustedPaymentDate" : "2023-05-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2023-05-02",
                           "adjustedStartDate" : "2023-02-02",
+                          "adjustedEndDate" : "2023-05-02",
                           "meta" : {
-                            "globalKey" : "975cb2e2"
+                            "globalKey" : "3252b962"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2023-01-31",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a7d3b1"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "5ef78a24"
+                          "globalKey" : "f9ed90a4"
                         }
                       }, {
                         "adjustedPaymentDate" : "2023-08-02",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2023-08-02",
                           "adjustedStartDate" : "2023-05-02",
+                          "adjustedEndDate" : "2023-08-02",
                           "meta" : {
-                            "globalKey" : "8babb1a6"
+                            "globalKey" : "26a1b826"
                           },
+                          "notionalAmount" : 100000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2023-04-27",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a7ea75"
-                              },
-                              "observedRate" : 0
-                            } ]
-                          },
-                          "notionalAmount" : 100000000
-                        } ],
-                        "meta" : {
-                          "globalKey" : "8699c9a8"
-                        }
-                      }, {
-                        "adjustedPaymentDate" : "2023-11-02",
-                        "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2023-11-02",
-                          "adjustedStartDate" : "2023-08-02",
-                          "meta" : {
-                            "globalKey" : "7ffab162"
-                          },
-                          "floatingRateDefinition" : {
-                            "rateObservation" : [ {
-                              "adjustedFixingDate" : "2023-07-31",
-                              "meta" : {
-                                "globalKey" : "7a80231"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 100000000
-                        } ],
-                        "meta" : {
-                          "globalKey" : "ae3c0a24"
-                        }
-                      } ]
-                    },
-                    "dayCountFraction" : {
-                      "value" : "ACT/360"
-                    },
-                    "meta" : {
-                      "globalKey" : "2b3c540d"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "floatingLegPaymentDates",
-                        "globalKey" : "637fde94"
-                      },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "GBLO"
-                          }, {
-                            "value" : "USNY"
-                          } ],
-                          "meta" : {
-                            "externalKey" : "floatPrimaryBusinessCenters",
-                            "globalKey" : "42f910b"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "97b8e49c"
-                        }
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
-                      }
-                    },
-                    "rateSpecification" : {
-                      "floatingRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateOption" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "rateOption-1"
-                          }
-                        }
-                      }
-                    },
-                    "resetDates" : {
-                      "calculationPeriodDatesReference" : {
-                        "externalReference" : "floatingCalcPeriodDates",
-                        "globalReference" : "13d8d929"
-                      },
-                      "fixingDates" : {
-                        "meta" : {
-                          "globalKey" : "3d9c8eea"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "GBLO"
-                          } ],
-                          "meta" : {
-                            "globalKey" : "21479e"
-                          }
-                        },
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "floatingLegResetDates",
-                          "globalReference" : "6632dffd"
-                        }
-                      },
-                      "meta" : {
-                        "externalKey" : "floatingLegResetDates",
-                        "globalKey" : "6632dffd"
-                      },
-                      "resetDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "42f910b"
-                          },
-                          "meta" : {
-                            "globalKey" : "b01f2613"
                           }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
+                        } ],
                         "meta" : {
-                          "globalKey" : "a9f2dce2"
+                          "globalKey" : "218fd028"
                         }
-                      },
-                      "resetFrequency" : {
+                      }, {
+                        "adjustedPaymentDate" : "2023-11-02",
+                        "calculationPeriod" : [ {
+                          "adjustedStartDate" : "2023-08-02",
+                          "adjustedEndDate" : "2023-11-02",
+                          "meta" : {
+                            "globalKey" : "1af0b7e2"
+                          },
+                          "notionalAmount" : 100000000,
+                          "floatingRateDefinition" : {
+                            "rateObservation" : [ {
+                              "adjustedFixingDate" : "2023-07-31",
+                              "observedRate" : 0,
+                              "meta" : {
+                                "globalKey" : "7a80231"
+                              }
+                            } ]
+                          }
+                        } ],
                         "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
-                      },
-                      "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "globalKey" : "493210a4"
+                        }
+                      } ]
+                    },
+                    "meta" : {
+                      "globalKey" : "9c5ab819"
                     }
                   } ],
                   "meta" : {
-                    "globalKey" : "e6b3f462"
+                    "globalKey" : "9ae16924"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "eb838993"
+                "globalKey" : "9fb0fe55"
               }
             },
             "meta" : {
-              "globalKey" : "eb838993"
+              "globalKey" : "9fb0fe55"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "5200f2ce"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.02781,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.02781,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
                 }
               } ],
               "quantity" : [ {
+                "value" : {
+                  "value" : 100000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "ee1d66f2"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 100000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 100000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
                 }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "7b78abf0"
-              },
+              } ],
               "observable" : {
-                "meta" : {
-                  "globalKey" : "5f0c6d05"
-                },
                 "rateOption" : {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "rateOption-1"
-                    } ]
-                  },
                   "value" : {
                     "floatingRateIndex" : {
                       "value" : "USD-LIBOR-BBA"
                     },
                     "indexTenor" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
+                      "periodMultiplier" : 3,
                       "period" : "M",
-                      "periodMultiplier" : 3
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "rateOption-1"
+                    } ]
                   }
-                }
-              },
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
                 },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 100000000
+                "meta" : {
+                  "globalKey" : "828026c7"
                 }
-              } ]
-            } ]
-          } ]
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f129f"
-          },
-          "value" : "2018-10-31"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "cme_trade_id"
               },
-              "value" : "9369929"
-            }
-          }, {
-            "identifier" : {
               "meta" : {
-                "scheme" : "client_trade_id"
-              },
-              "value" : "43401154-2"
+                "globalKey" : "5332091c"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "ba4f",
+              "externalReference" : "clearing_firm"
             }
           }, {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "platform_trade_id"
-              },
-              "value" : "43401154"
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
             }
-          }, {
+          } ]
+        },
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "010",
               "meta" : {
-                "scheme" : "platform_side_id"
-              },
-              "value" : "43401919"
+                "scheme" : "clearing_member_firms"
+              }
+            },
+            "meta" : {
+              "globalKey" : "ba4f"
             }
-          }, {
+          } ],
+          "meta" : {
+            "globalKey" : "ba4f",
+            "externalKey" : "clearing_firm"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "block_trade_id"
-              },
-              "value" : "43401154"
+              "value" : "CME"
+            },
+            "meta" : {
+              "globalKey" : "1051b"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "clearing_service",
-            "globalReference" : "1051b"
-          },
           "meta" : {
-            "globalKey" : "6d25ae27"
+            "globalKey" : "1051b",
+            "externalKey" : "clearing_service"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "reg_trade_id"
-              },
-              "value" : "CCCIRS9369929"
+              "value" : "MARKIT_WIRE"
+            },
+            "meta" : {
+              "globalKey" : "66b48bac"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "66b48bac",
+            "externalKey" : "trade_source"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "66b48bac",
+            "externalReference" : "trade_source"
+          },
+          "role" : "DataSubmitter",
+          "ownershipPartyReference" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
+          }
+        } ],
+        "clearedDate" : "2018-10-31",
+        "account" : [ {
+          "partyReference" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
+          },
+          "accountNumber" : {
+            "value" : "010S3",
             "meta" : {
-              "scheme" : "cftc_Namespace"
-            },
-            "value" : "1010000023"
+              "scheme" : "clearing_firm_accounts"
+            }
+          },
+          "servicingParty" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
           },
           "meta" : {
-            "globalKey" : "1770499b"
+            "globalKey" : "a30716bd",
+            "externalKey" : "account1"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "59c0a126"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
+      },
+      "meta" : {
+        "globalKey" : "680fdc09"
       }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "d7df9955"
+      "globalKey" : "9acd4f53"
     }
   },
+  "previousWorkflowStep" : {
+    "globalReference" : "816206e4"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "0109369929",
       "meta" : {
         "scheme" : "cme_message_id"
-      },
-      "value" : "0109369929"
+      }
     },
     "sentBy" : {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
+      }
     },
     "sentTo" : [ {
+      "value" : "010",
       "meta" : {
         "scheme" : "cme_firm_id"
-      },
-      "value" : "010"
+      }
     }, {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
+      }
     } ]
   },
-  "meta" : {
-    "globalKey" : "1c6cd30d"
-  },
+  "timestamp" : [ {
+    "dateTime" : "2018-10-31T14:20:59Z",
+    "qualification" : "eventCreationDateTime"
+  }, {
+    "dateTime" : "2018-10-31T14:13:57.104Z",
+    "qualification" : "clearingReceiptDateTime"
+  } ],
   "party" : [ {
-    "meta" : {
-      "externalKey" : "clearing_firm",
-      "globalKey" : "ba4f"
-    },
     "partyId" : [ {
       "identifier" : {
+        "value" : "010",
         "meta" : {
           "scheme" : "clearing_member_firms"
-        },
-        "value" : "010"
+        }
       },
       "meta" : {
         "globalKey" : "ba4f"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "clearing_service",
-      "globalKey" : "1051b"
-    },
+      "globalKey" : "ba4f",
+      "externalKey" : "clearing_firm"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "CME"
@@ -2491,12 +2474,12 @@
       "meta" : {
         "globalKey" : "1051b"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "trade_source",
-      "globalKey" : "66b48bac"
-    },
+      "globalKey" : "1051b",
+      "externalKey" : "clearing_service"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "MARKIT_WIRE"
@@ -2504,16 +2487,33 @@
       "meta" : {
         "globalKey" : "66b48bac"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "66b48bac",
+      "externalKey" : "trade_source"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "b9213c1e"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2018-10-31T14:20:59Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  }, {
-    "dateTime" : "2018-10-31T14:13:57.104Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
-  } ]
+  "account" : [ {
+    "partyReference" : {
+      "globalReference" : "ba4f",
+      "externalReference" : "clearing_firm"
+    },
+    "accountNumber" : {
+      "value" : "010S3",
+      "meta" : {
+        "scheme" : "clearing_firm_accounts"
+      }
+    },
+    "servicingParty" : {
+      "globalReference" : "ba4f",
+      "externalReference" : "clearing_firm"
+    },
+    "meta" : {
+      "globalKey" : "a30716bd",
+      "externalKey" : "account1"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "b9fc6ad9"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex03-Fixed-Float-with-Amortizing-Schedule-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex03-Fixed-Float-with-Amortizing-Schedule-func-output.json
index be539f029d..d95ed81fc4 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex03-Fixed-Float-with-Amortizing-Schedule-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex03-Fixed-Float-with-Amortizing-Schedule-func-output.json
@@ -1,124 +1,80 @@
 {
-  "account" : [ {
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "clearing_firm_accounts"
-      },
-      "value" : "999-123"
-    },
-    "meta" : {
-      "externalKey" : "account1",
-      "globalKey" : "a18b2f80"
-    },
-    "partyReference" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "dd19"
-    },
-    "servicingParty" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "dd19"
-    }
-  } ],
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "9107b7c"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "999-123"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "a18b2f80"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              }
-            } ],
-            "clearedDate" : "2018-04-20",
-            "meta" : {
-              "globalKey" : "3ff47c43"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "dd19"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "2894761",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "999"
-                },
-                "meta" : {
-                  "globalKey" : "dd19"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "QAC-11111",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "9e635873"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "PLATFORM"
-                },
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "platform_side_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "fd5cf798"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "9e635873"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
               },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "9e635873"
-              },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS2894761",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e12c31ab"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-04-20",
+              "meta" : {
+                "globalKey" : "3f1114"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "dd19"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -129,46 +85,40 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "26cfaa"
-                              },
-                              "meta" : {
-                                "globalKey" : "ff8806b2"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "dd292541"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28ca8"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "24"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-24",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -177,42 +127,149 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3d250"
-                              },
-                              "unadjustedDate" : "2018-04-24"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3d250"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "5b49a172"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2024-04-24",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "26cfaa"
+                                    "globalReference" : "26cfaa",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "ff8806b2"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "dd292541"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "7501ce59"
-                              },
-                              "unadjustedDate" : "2024-04-24"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "7501ce59"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "26cfaa",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "ff8806b2"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "dd292541"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "18aba"
+                            },
+                            "rollConvention" : "24"
+                          },
+                          "meta" : {
+                            "globalKey" : "cf5acc04",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "SGSI"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "26cfaa",
+                                "externalKey" : "floatPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3661d37b"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "8f18bcae",
+                            "externalKey" : "floatingLegPaymentDates"
+                          }
+                        },
+                        "resetDates" : {
+                          "calculationPeriodDatesReference" : {
+                            "globalReference" : "cf5acc04",
+                            "externalReference" : "floatingCalcPeriodDates"
+                          },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
+                          "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "19aa31cc"
+                            },
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "SGSI"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42e7bcc"
+                              }
+                            },
+                            "dateRelativeTo" : {
+                              "globalReference" : "39cce434",
+                              "externalReference" : "floatingLegResetDates"
+                            }
+                          },
+                          "resetFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "107"
+                            }
+                          },
+                          "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "26cfaa",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "ff8806b2"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "dd292541"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "39cce434",
+                            "externalKey" : "floatingLegResetDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -220,415 +277,310 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2018-10-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-10-24",
                               "adjustedStartDate" : "2018-04-24",
+                              "adjustedEndDate" : "2018-10-24",
                               "meta" : {
-                                "globalKey" : "bb78b4c6"
+                                "globalKey" : "f164c1c6"
                               },
+                              "notionalAmount" : 2800000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2018-04-20",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a3119c"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 2800000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "e527af5e"
+                              "globalKey" : "1b13bc5e"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-04-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-04-24",
                               "adjustedStartDate" : "2018-10-24",
+                              "adjustedEndDate" : "2019-04-24",
                               "meta" : {
-                                "globalKey" : "db4757e8"
+                                "globalKey" : "1a463ae8"
                               },
+                              "notionalAmount" : 3500000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2018-10-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a3405a"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 3500000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "c1c7d900"
+                              "globalKey" : "c6bc00"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-10-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-10-24",
                               "adjustedStartDate" : "2019-04-24",
+                              "adjustedEndDate" : "2019-10-24",
                               "meta" : {
-                                "globalKey" : "4296b50"
+                                "globalKey" : "3a157850"
                               },
+                              "notionalAmount" : 4200000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-04-18",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a4095e"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 4200000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "51506de8"
+                              "globalKey" : "873c7ae8"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-04-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-04-24",
                               "adjustedStartDate" : "2019-10-24",
+                              "adjustedEndDate" : "2020-04-24",
                               "meta" : {
-                                "globalKey" : "19f1c725"
+                                "globalKey" : "58f0aa25"
                               },
+                              "notionalAmount" : 4900000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-10-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a4385a"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 4900000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "23ea503d"
+                              "globalKey" : "62e9333d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-10-26",
                               "adjustedStartDate" : "2020-04-24",
+                              "adjustedEndDate" : "2020-10-26",
                               "meta" : {
-                                "globalKey" : "aca0518b"
+                                "globalKey" : "7c299947"
                               },
+                              "notionalAmount" : 5600000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-04-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a501da"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 5600000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "45c83a25"
+                              "globalKey" : "155181e1"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-04-26",
                               "adjustedStartDate" : "2020-10-26",
+                              "adjustedEndDate" : "2021-04-26",
                               "meta" : {
-                                "globalKey" : "cfd8a5ad"
+                                "globalKey" : "ed788ad"
                               },
+                              "notionalAmount" : 6300000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-10-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a5305a"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 6300000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "25d214c7"
+                              "globalKey" : "64d0f7c7"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-10-25",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-10-25",
                               "adjustedStartDate" : "2021-04-26",
+                              "adjustedEndDate" : "2021-10-25",
                               "meta" : {
-                                "globalKey" : "c3d47e50"
+                                "globalKey" : "2cf1edf2"
                               },
+                              "notionalAmount" : 7000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-04-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a5f9da"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 7000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "ec2fffe9"
+                              "globalKey" : "554d6f8b"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-04-25",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-04-25",
                               "adjustedStartDate" : "2021-10-25",
+                              "adjustedEndDate" : "2022-04-25",
                               "meta" : {
-                                "globalKey" : "d7e800eb"
+                                "globalKey" : "16e6e3eb"
                               },
+                              "notionalAmount" : 7700000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-10-21",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a6283b"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 7700000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "bd150904"
+                              "globalKey" : "fc13ec04"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-10-25",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-10-25",
                               "adjustedStartDate" : "2022-04-25",
+                              "adjustedEndDate" : "2022-10-25",
                               "meta" : {
-                                "globalKey" : "ca14cf"
+                                "globalKey" : "36b621cf"
                               },
+                              "notionalAmount" : 8400000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-04-21",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a6f1bb"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 8400000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "4c9d9e68"
+                              "globalKey" : "8289ab68"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-04-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-04-24",
                               "adjustedStartDate" : "2022-10-25",
+                              "adjustedEndDate" : "2023-04-24",
                               "meta" : {
-                                "globalKey" : "ebb27c53"
+                                "globalKey" : "5de2c1f5"
                               },
+                              "notionalAmount" : 9100000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-10-20",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a7201c"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 9100000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "60131d6b"
+                              "globalKey" : "d243630d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-10-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-10-24",
                               "adjustedStartDate" : "2023-04-24",
+                              "adjustedEndDate" : "2023-10-24",
                               "meta" : {
-                                "globalKey" : "8d9700d"
+                                "globalKey" : "3ec57d0d"
                               },
+                              "notionalAmount" : 9800000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2023-04-20",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a7e99c"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 9800000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "e3e092a5"
+                              "globalKey" : "19cc9fa5"
                             }
                           }, {
                             "adjustedPaymentDate" : "2024-04-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2024-04-24",
                               "adjustedStartDate" : "2023-10-24",
+                              "adjustedEndDate" : "2024-04-24",
                               "meta" : {
-                                "globalKey" : "d0b9be96"
+                                "globalKey" : "fb8a196"
                               },
+                              "notionalAmount" : 10500000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2023-10-20",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a8181c"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 10500000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "689267ae"
+                              "globalKey" : "a7914aae"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
                         "meta" : {
-                          "globalKey" : "f673b19e"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "1a0d9dd8"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "SGSI"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "26cfaa"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "3661d37b"
-                            }
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "959"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
-                          }
-                        },
-                        "resetDates" : {
-                          "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "5b49a172"
-                          },
-                          "fixingDates" : {
-                            "meta" : {
-                              "globalKey" : "41e2418"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "SGSI"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "42e7bcc"
-                              }
-                            },
-                            "businessDayConvention" : "NONE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "9516da6a"
-                            }
-                          },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "9516da6a"
-                          },
-                          "resetDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "26cfaa"
-                              },
-                              "meta" : {
-                                "globalKey" : "ff8806b2"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "dd292541"
-                            }
-                          },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "959"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "globalKey" : "17a83b60"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "26cfaa"
-                              },
-                              "meta" : {
-                                "globalKey" : "c2a0ac9a"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "a041cb29"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28ca8"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "24"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-24",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -637,42 +589,93 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3d250"
-                              },
-                              "unadjustedDate" : "2018-04-24"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3d250"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "6654e942"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2024-04-24",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "fixedPrimaryBusinessCenters",
-                                    "globalReference" : "26cfaa"
+                                    "globalReference" : "26cfaa",
+                                    "externalReference" : "fixedPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "c2a0ac9a"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "a041cb29"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "381a7441"
-                              },
-                              "unadjustedDate" : "2024-04-24"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "381a7441"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "26cfaa",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "c2a0ac9a"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "a041cb29"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "18aba"
+                            },
+                            "rollConvention" : "24"
+                          },
+                          "meta" : {
+                            "globalKey" : "e16547d4",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "SGSI"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "26cfaa",
+                                "externalKey" : "fixedPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3661d37b"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "8f18bcae",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -680,569 +683,543 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2018-10-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-10-24",
                               "adjustedStartDate" : "2018-04-24",
+                              "adjustedEndDate" : "2018-10-24",
                               "meta" : {
-                                "globalKey" : "a45d4254"
+                                "globalKey" : "cba05bac"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 2800000
+                              "notionalAmount" : 2800000,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "ae1a0ebc"
+                              "globalKey" : "d55d2814"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-04-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-04-24",
                               "adjustedStartDate" : "2018-10-24",
+                              "adjustedEndDate" : "2019-04-24",
                               "meta" : {
-                                "globalKey" : "d71efeb8"
+                                "globalKey" : "9595cbc8"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 3500000
+                              "notionalAmount" : 3500000,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "f85bd4a0"
+                              "globalKey" : "b6d2a1b0"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-10-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-10-24",
                               "adjustedStartDate" : "2019-04-24",
+                              "adjustedEndDate" : "2019-10-24",
                               "meta" : {
-                                "globalKey" : "7ada51c"
+                                "globalKey" : "61be51e4"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 4200000
+                              "notionalAmount" : 4200000,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "b82f6984"
+                              "globalKey" : "1240164c"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-04-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-04-24",
                               "adjustedStartDate" : "2019-10-24",
+                              "adjustedEndDate" : "2020-04-24",
                               "meta" : {
-                                "globalKey" : "16999c75"
+                                "globalKey" : "d4d0e5ab"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 4900000
+                              "notionalAmount" : 4900000,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "de9b6a5d"
+                              "globalKey" : "9cd2b393"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-10-26",
                               "adjustedStartDate" : "2020-04-24",
+                              "adjustedEndDate" : "2020-10-26",
                               "meta" : {
-                                "globalKey" : "47292b97"
+                                "globalKey" : "a0f97349"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 5600000
+                              "notionalAmount" : 5600000,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "a1d9993d"
+                              "globalKey" : "fba9e0ef"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-04-26",
                               "adjustedStartDate" : "2020-10-26",
+                              "adjustedEndDate" : "2021-04-26",
                               "meta" : {
-                                "globalKey" : "79eaef7d"
+                                "globalKey" : "6aefcc23"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 6300000
+                              "notionalAmount" : 6300000,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "ec1b66a3"
+                              "globalKey" : "dd204349"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-10-25",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-10-25",
                               "adjustedStartDate" : "2021-04-26",
+                              "adjustedEndDate" : "2021-10-25",
                               "meta" : {
-                                "globalKey" : "aa792182"
+                                "globalKey" : "37184e7e"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 7000000
+                              "notionalAmount" : 7000000,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "aa39ae89"
+                              "globalKey" : "36d8db85"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-04-25",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-04-25",
                               "adjustedStartDate" : "2021-10-25",
+                              "adjustedEndDate" : "2022-04-25",
                               "meta" : {
-                                "globalKey" : "b965151a"
+                                "globalKey" : "aa2a6de6"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 7700000
+                              "notionalAmount" : 7700000,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "d0a5aba1"
+                              "globalKey" : "c16b046d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-10-25",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-10-25",
                               "adjustedStartDate" : "2022-04-25",
+                              "adjustedEndDate" : "2022-10-25",
                               "meta" : {
-                                "globalKey" : "e9f3bb7e"
+                                "globalKey" : "7652f402"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 8400000
+                              "notionalAmount" : 8400000,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "90794085"
+                              "globalKey" : "1cd87909"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-04-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-04-24",
                               "adjustedStartDate" : "2022-10-25",
+                              "adjustedEndDate" : "2023-04-24",
                               "meta" : {
-                                "globalKey" : "1cb50383"
+                                "globalKey" : "4048605d"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 9100000
+                              "notionalAmount" : 9100000,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "d905b96b"
+                              "globalKey" : "fc991645"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-10-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-10-24",
                               "adjustedStartDate" : "2023-04-24",
+                              "adjustedEndDate" : "2023-10-24",
                               "meta" : {
-                                "globalKey" : "296de11b"
+                                "globalKey" : "b58d95c5"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 9800000
+                              "notionalAmount" : 9800000,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "75038583"
+                              "globalKey" : "1233a2d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2024-04-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2024-04-24",
                               "adjustedStartDate" : "2023-10-24",
+                              "adjustedEndDate" : "2024-04-24",
                               "meta" : {
-                                "globalKey" : "2d4ae3a4"
+                                "globalKey" : "d1d0845c"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 10500000
+                              "notionalAmount" : 10500000,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "9060918c"
+                              "globalKey" : "34e63244"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
                         "meta" : {
-                          "globalKey" : "a46bf0b8"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "1a0d9dd8"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "SGSI"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "fixedPrimaryBusinessCenters",
-                                "globalKey" : "26cfaa"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "3661d37b"
-                            }
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "959"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                          "globalKey" : "5d5e81a4"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "c2df93d6"
+                        "globalKey" : "e6eb504"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "7d3bcb47"
+                    "globalKey" : "c8caec75"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "7d3bcb47"
+                  "globalKey" : "c8caec75"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "394670aa"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "d316d91"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "SGD-SOR-VWAP"
-                        },
-                        "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6
-                        }
-                      }
-                    }
-                  },
                   "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 2800000,
                       "unit" : {
                         "currency" : {
                           "value" : "SGD"
                         }
                       },
-                      "value" : 2800000,
                       "datedValue" : [ {
                         "date" : "2018-04-24",
+                        "value" : 2800000,
                         "meta" : {
                           "globalKey" : "bee4fb92"
-                        },
-                        "value" : 2800000
+                        }
                       }, {
                         "date" : "2018-10-24",
+                        "value" : 3500000,
                         "meta" : {
                           "globalKey" : "eeacdb76"
-                        },
-                        "value" : 3500000
+                        }
                       }, {
                         "date" : "2019-04-24",
+                        "value" : 4200000,
                         "meta" : {
                           "globalKey" : "1e75565a"
-                        },
-                        "value" : 4200000
+                        }
                       }, {
                         "date" : "2019-10-24",
+                        "value" : 4900000,
                         "meta" : {
                           "globalKey" : "2a677133"
-                        },
-                        "value" : 4900000
+                        }
                       }, {
                         "date" : "2020-04-24",
+                        "value" : 5600000,
                         "meta" : {
                           "globalKey" : "5a2fec17"
-                        },
-                        "value" : 5600000
+                        }
                       }, {
                         "date" : "2020-10-24",
+                        "value" : 6300000,
                         "meta" : {
                           "globalKey" : "89f7cbfb"
-                        },
-                        "value" : 6300000
+                        }
                       }, {
                         "date" : "2021-04-24",
+                        "value" : 7000000,
                         "meta" : {
                           "globalKey" : "b9c046df"
-                        },
-                        "value" : 7000000
+                        }
                       }, {
                         "date" : "2021-10-24",
+                        "value" : 7700000,
                         "meta" : {
                           "globalKey" : "c5b261b8"
-                        },
-                        "value" : 7700000
+                        }
                       }, {
                         "date" : "2022-04-24",
+                        "value" : 8400000,
                         "meta" : {
                           "globalKey" : "f57adc9c"
-                        },
-                        "value" : 8400000
+                        }
                       }, {
                         "date" : "2022-10-24",
+                        "value" : 9100000,
                         "meta" : {
                           "globalKey" : "2542bc80"
-                        },
-                        "value" : 9100000
+                        }
                       }, {
                         "date" : "2023-04-24",
+                        "value" : 9800000,
                         "meta" : {
                           "globalKey" : "31357259"
-                        },
-                        "value" : 9800000
+                        }
                       }, {
                         "date" : "2023-10-24",
+                        "value" : 10500000,
                         "meta" : {
                           "globalKey" : "32189862"
-                        },
-                        "value" : 10500000
+                        }
                       } ]
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "a99c9826"
-                  },
-                  "price" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "price-1"
+                        "value" : "quantity-1"
                       } ]
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "SGD-SOR-VWAP"
+                        },
+                        "indexTenor" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
                     },
+                    "meta" : {
+                      "globalKey" : "98fb42a1"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "92e8fbbc"
+                  }
+                }, {
+                  "price" : [ {
                     "value" : {
+                      "value" : 0.015,
                       "unit" : {
                         "currency" : {
                           "value" : "SGD"
                         }
                       },
-                      "value" : 0.015,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "SGD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 2800000,
                       "unit" : {
                         "currency" : {
                           "value" : "SGD"
                         }
                       },
-                      "value" : 2800000,
                       "datedValue" : [ {
                         "date" : "2018-04-24",
+                        "value" : 2800000,
                         "meta" : {
                           "globalKey" : "bee4fb92"
-                        },
-                        "value" : 2800000
+                        }
                       }, {
                         "date" : "2018-10-24",
+                        "value" : 3500000,
                         "meta" : {
                           "globalKey" : "eeacdb76"
-                        },
-                        "value" : 3500000
+                        }
                       }, {
                         "date" : "2019-04-24",
+                        "value" : 4200000,
                         "meta" : {
                           "globalKey" : "1e75565a"
-                        },
-                        "value" : 4200000
+                        }
                       }, {
                         "date" : "2019-10-24",
+                        "value" : 4900000,
                         "meta" : {
                           "globalKey" : "2a677133"
-                        },
-                        "value" : 4900000
+                        }
                       }, {
                         "date" : "2020-04-24",
+                        "value" : 5600000,
                         "meta" : {
                           "globalKey" : "5a2fec17"
-                        },
-                        "value" : 5600000
+                        }
                       }, {
                         "date" : "2020-10-24",
+                        "value" : 6300000,
                         "meta" : {
                           "globalKey" : "89f7cbfb"
-                        },
-                        "value" : 6300000
+                        }
                       }, {
                         "date" : "2021-04-24",
+                        "value" : 7000000,
                         "meta" : {
                           "globalKey" : "b9c046df"
-                        },
-                        "value" : 7000000
+                        }
                       }, {
                         "date" : "2021-10-24",
+                        "value" : 7700000,
                         "meta" : {
                           "globalKey" : "c5b261b8"
-                        },
-                        "value" : 7700000
+                        }
                       }, {
                         "date" : "2022-04-24",
+                        "value" : 8400000,
                         "meta" : {
                           "globalKey" : "f57adc9c"
-                        },
-                        "value" : 8400000
+                        }
                       }, {
                         "date" : "2022-10-24",
+                        "value" : 9100000,
                         "meta" : {
                           "globalKey" : "2542bc80"
-                        },
-                        "value" : 9100000
+                        }
                       }, {
                         "date" : "2023-04-24",
+                        "value" : 9800000,
                         "meta" : {
                           "globalKey" : "31357259"
-                        },
-                        "value" : 9800000
+                        }
                       }, {
                         "date" : "2023-10-24",
+                        "value" : 10500000,
                         "meta" : {
                           "globalKey" : "32189862"
-                        },
-                        "value" : 10500000
+                        }
+                      } ]
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
                       } ]
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1114"
-              },
-              "value" : "2018-04-20"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
-                  },
-                  "value" : "2894761"
-                }
-              }, {
-                "identifier" : {
+                  } ],
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "QAC-11111"
+                    "globalKey" : "89f66c9a"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "dd19",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "22222"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "999",
                   "meta" : {
-                    "scheme" : "platform_side_id"
-                  },
-                  "value" : "22222"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "dd19"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "dd19",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "22222"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "1117bae4"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS2894761"
+                  "value" : "PLATFORM"
+                },
+                "meta" : {
+                  "globalKey" : "9e635873"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "9e635873",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "9e635873",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2018-04-20",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "999-123",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "a7071c09"
+                "globalKey" : "24a161c0",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "c8e45263"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "84328cdf"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "dd19"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                }
-              },
               "quantity" : {
+                "value" : 700,
                 "unit" : {
                   "currency" : {
                     "value" : "SGD"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "dd19",
+                  "externalReference" : "clearing_firm"
                 },
-                "value" : 700
+                "receiverPartyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
+                }
               },
               "settlementDate" : {
+                "unadjustedDate" : "2018-04-24",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "SGSI"
@@ -1251,122 +1228,98 @@
                       "globalKey" : "26cfaa"
                     }
                   },
-                  "businessDayConvention" : "MODFOLLOWING",
                   "meta" : {
                     "globalKey" : "3661d37b"
                   }
-                },
-                "unadjustedDate" : "2018-04-24"
+                }
               },
               "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
+                "priceTransfer" : "Upfront"
               }
+            },
+            "meta" : {
+              "globalKey" : "94901403"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "37eb6080"
+          }
         }
       }
     } ],
-    "intent" : "CONTRACT_FORMATION",
+    "eventQualifier" : "ContractFormation",
     "after" : [ {
-      "meta" : {
-        "globalKey" : "de30dd1f"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
       "trade" : {
-        "account" : [ {
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "clearing_firm_accounts"
-            },
-            "value" : "999-123"
-          },
-          "meta" : {
-            "externalKey" : "account1",
-            "globalKey" : "a18b2f80"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
-          },
-          "servicingParty" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
-          }
-        } ],
-        "clearedDate" : "2018-04-20",
-        "meta" : {
-          "globalKey" : "3ff47c43"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "clearing_firm",
-            "globalKey" : "dd19"
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "1051b",
+            "externalReference" : "clearing_service"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "2894761",
               "meta" : {
-                "scheme" : "clearing_member_firms"
-              },
-              "value" : "999"
-            },
-            "meta" : {
-              "globalKey" : "dd19"
+                "scheme" : "cme_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing_service",
-            "globalKey" : "1051b"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "CME"
-            },
-            "meta" : {
-              "globalKey" : "1051b"
+              "value" : "QAC-11111",
+              "meta" : {
+                "scheme" : "client_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "trade_source",
-            "globalKey" : "9e635873"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "PLATFORM"
-            },
+              "value" : "22222",
+              "meta" : {
+                "scheme" : "platform_trade_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "22222",
+              "meta" : {
+                "scheme" : "platform_side_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "22222",
+              "meta" : {
+                "scheme" : "block_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "fd5cf798"
+          }
+        }, {
+          "issuer" : {
+            "value" : "1010000023",
             "meta" : {
-              "globalKey" : "9e635873"
+              "scheme" : "cftc_Namespace"
             }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
-          },
-          "partyReference" : {
-            "externalReference" : "trade_source",
-            "globalReference" : "9e635873"
           },
-          "role" : "DATA_SUBMITTER"
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "CCCIRS2894761",
+              "meta" : {
+                "scheme" : "reg_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e12c31ab"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2018-04-20",
+          "meta" : {
+            "globalKey" : "3f1114"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "dd19"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -1377,46 +1330,40 @@
                 "payout" : {
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "26cfaa"
-                          },
-                          "meta" : {
-                            "globalKey" : "ff8806b2"
+                    "rateSpecification" : {
+                      "floatingRate" : {
+                        "rateOption" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "rateOption-1"
                           }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "dd292541"
-                        }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "28ca8"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6,
-                        "rollConvention" : "24"
-                      },
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/365.FIXED"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2018-04-24",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -1425,42 +1372,149 @@
                           },
                           "meta" : {
                             "globalKey" : "ece3d250"
-                          },
-                          "unadjustedDate" : "2018-04-24"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ece3d250"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "floatingCalcPeriodDates",
-                        "globalKey" : "5b49a172"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2024-04-24",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "26cfaa"
+                                "globalReference" : "26cfaa",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "ff8806b2"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "dd292541"
                             }
                           },
                           "meta" : {
                             "globalKey" : "7501ce59"
-                          },
-                          "unadjustedDate" : "2024-04-24"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "7501ce59"
                         }
+                      },
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "26cfaa",
+                            "externalReference" : "floatPrimaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "ff8806b2"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "dd292541"
+                        }
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "18aba"
+                        },
+                        "rollConvention" : "24"
+                      },
+                      "meta" : {
+                        "globalKey" : "cf5acc04",
+                        "externalKey" : "floatingCalcPeriodDates"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "107"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "SGSI"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "26cfaa",
+                            "externalKey" : "floatPrimaryBusinessCenters"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "3661d37b"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "8f18bcae",
+                        "externalKey" : "floatingLegPaymentDates"
+                      }
+                    },
+                    "resetDates" : {
+                      "calculationPeriodDatesReference" : {
+                        "globalReference" : "cf5acc04",
+                        "externalReference" : "floatingCalcPeriodDates"
+                      },
+                      "resetRelativeTo" : "CalculationPeriodStartDate",
+                      "fixingDates" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "19aa31cc"
+                        },
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "GBLO"
+                          }, {
+                            "value" : "SGSI"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "42e7bcc"
+                          }
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "39cce434",
+                          "externalReference" : "floatingLegResetDates"
+                        }
+                      },
+                      "resetFrequency" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "107"
+                        }
+                      },
+                      "resetDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "26cfaa",
+                            "externalReference" : "floatPrimaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "ff8806b2"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "dd292541"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "39cce434",
+                        "externalKey" : "floatingLegResetDates"
                       }
                     },
                     "cashflowRepresentation" : {
@@ -1468,415 +1522,310 @@
                       "paymentCalculationPeriod" : [ {
                         "adjustedPaymentDate" : "2018-10-24",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2018-10-24",
                           "adjustedStartDate" : "2018-04-24",
+                          "adjustedEndDate" : "2018-10-24",
                           "meta" : {
-                            "globalKey" : "bb78b4c6"
+                            "globalKey" : "f164c1c6"
                           },
+                          "notionalAmount" : 2800000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2018-04-20",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a3119c"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 2800000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "e527af5e"
+                          "globalKey" : "1b13bc5e"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-04-24",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-04-24",
                           "adjustedStartDate" : "2018-10-24",
+                          "adjustedEndDate" : "2019-04-24",
                           "meta" : {
-                            "globalKey" : "db4757e8"
+                            "globalKey" : "1a463ae8"
                           },
+                          "notionalAmount" : 3500000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2018-10-22",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a3405a"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 3500000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "c1c7d900"
+                          "globalKey" : "c6bc00"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-10-24",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-10-24",
                           "adjustedStartDate" : "2019-04-24",
+                          "adjustedEndDate" : "2019-10-24",
                           "meta" : {
-                            "globalKey" : "4296b50"
+                            "globalKey" : "3a157850"
                           },
+                          "notionalAmount" : 4200000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2019-04-18",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a4095e"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 4200000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "51506de8"
+                          "globalKey" : "873c7ae8"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-04-24",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-04-24",
                           "adjustedStartDate" : "2019-10-24",
+                          "adjustedEndDate" : "2020-04-24",
                           "meta" : {
-                            "globalKey" : "19f1c725"
+                            "globalKey" : "58f0aa25"
                           },
+                          "notionalAmount" : 4900000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2019-10-22",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a4385a"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 4900000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "23ea503d"
+                          "globalKey" : "62e9333d"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-10-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-10-26",
                           "adjustedStartDate" : "2020-04-24",
+                          "adjustedEndDate" : "2020-10-26",
                           "meta" : {
-                            "globalKey" : "aca0518b"
+                            "globalKey" : "7c299947"
                           },
+                          "notionalAmount" : 5600000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2020-04-22",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a501da"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 5600000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "45c83a25"
+                          "globalKey" : "155181e1"
                         }
                       }, {
                         "adjustedPaymentDate" : "2021-04-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2021-04-26",
                           "adjustedStartDate" : "2020-10-26",
+                          "adjustedEndDate" : "2021-04-26",
                           "meta" : {
-                            "globalKey" : "cfd8a5ad"
+                            "globalKey" : "ed788ad"
                           },
+                          "notionalAmount" : 6300000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2020-10-22",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a5305a"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 6300000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "25d214c7"
+                          "globalKey" : "64d0f7c7"
                         }
                       }, {
                         "adjustedPaymentDate" : "2021-10-25",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2021-10-25",
                           "adjustedStartDate" : "2021-04-26",
+                          "adjustedEndDate" : "2021-10-25",
                           "meta" : {
-                            "globalKey" : "c3d47e50"
+                            "globalKey" : "2cf1edf2"
                           },
+                          "notionalAmount" : 7000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2021-04-22",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a5f9da"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 7000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "ec2fffe9"
+                          "globalKey" : "554d6f8b"
                         }
                       }, {
                         "adjustedPaymentDate" : "2022-04-25",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2022-04-25",
                           "adjustedStartDate" : "2021-10-25",
+                          "adjustedEndDate" : "2022-04-25",
                           "meta" : {
-                            "globalKey" : "d7e800eb"
+                            "globalKey" : "16e6e3eb"
                           },
+                          "notionalAmount" : 7700000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2021-10-21",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a6283b"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 7700000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "bd150904"
+                          "globalKey" : "fc13ec04"
                         }
                       }, {
                         "adjustedPaymentDate" : "2022-10-25",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2022-10-25",
                           "adjustedStartDate" : "2022-04-25",
+                          "adjustedEndDate" : "2022-10-25",
                           "meta" : {
-                            "globalKey" : "ca14cf"
+                            "globalKey" : "36b621cf"
                           },
+                          "notionalAmount" : 8400000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2022-04-21",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a6f1bb"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 8400000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "4c9d9e68"
+                          "globalKey" : "8289ab68"
                         }
                       }, {
                         "adjustedPaymentDate" : "2023-04-24",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2023-04-24",
                           "adjustedStartDate" : "2022-10-25",
+                          "adjustedEndDate" : "2023-04-24",
                           "meta" : {
-                            "globalKey" : "ebb27c53"
+                            "globalKey" : "5de2c1f5"
                           },
+                          "notionalAmount" : 9100000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2022-10-20",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a7201c"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 9100000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "60131d6b"
+                          "globalKey" : "d243630d"
                         }
                       }, {
                         "adjustedPaymentDate" : "2023-10-24",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2023-10-24",
                           "adjustedStartDate" : "2023-04-24",
+                          "adjustedEndDate" : "2023-10-24",
                           "meta" : {
-                            "globalKey" : "8d9700d"
-                          },
-                          "floatingRateDefinition" : {
-                            "rateObservation" : [ {
-                              "adjustedFixingDate" : "2023-04-20",
-                              "meta" : {
-                                "globalKey" : "7a7e99c"
-                              },
-                              "observedRate" : 0
-                            } ]
-                          },
-                          "notionalAmount" : 9800000
-                        } ],
-                        "meta" : {
-                          "globalKey" : "e3e092a5"
-                        }
-                      }, {
-                        "adjustedPaymentDate" : "2024-04-24",
-                        "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2024-04-24",
-                          "adjustedStartDate" : "2023-10-24",
-                          "meta" : {
-                            "globalKey" : "d0b9be96"
-                          },
-                          "floatingRateDefinition" : {
-                            "rateObservation" : [ {
-                              "adjustedFixingDate" : "2023-10-20",
-                              "meta" : {
-                                "globalKey" : "7a8181c"
-                              },
-                              "observedRate" : 0
-                            } ]
-                          },
-                          "notionalAmount" : 10500000
-                        } ],
-                        "meta" : {
-                          "globalKey" : "689267ae"
-                        }
-                      } ]
-                    },
-                    "dayCountFraction" : {
-                      "value" : "ACT/365.FIXED"
-                    },
-                    "meta" : {
-                      "globalKey" : "f673b19e"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "floatingLegPaymentDates",
-                        "globalKey" : "1a0d9dd8"
-                      },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "SGSI"
-                          } ],
-                          "meta" : {
-                            "externalKey" : "floatPrimaryBusinessCenters",
-                            "globalKey" : "26cfaa"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "3661d37b"
-                        }
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "959"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6
-                      }
-                    },
-                    "rateSpecification" : {
-                      "floatingRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateOption" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "rateOption-1"
-                          }
-                        }
-                      }
-                    },
-                    "resetDates" : {
-                      "calculationPeriodDatesReference" : {
-                        "externalReference" : "floatingCalcPeriodDates",
-                        "globalReference" : "5b49a172"
-                      },
-                      "fixingDates" : {
-                        "meta" : {
-                          "globalKey" : "41e2418"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "GBLO"
-                          }, {
-                            "value" : "SGSI"
-                          } ],
-                          "meta" : {
-                            "globalKey" : "42e7bcc"
+                            "globalKey" : "3ec57d0d"
+                          },
+                          "notionalAmount" : 9800000,
+                          "floatingRateDefinition" : {
+                            "rateObservation" : [ {
+                              "adjustedFixingDate" : "2023-04-20",
+                              "observedRate" : 0,
+                              "meta" : {
+                                "globalKey" : "7a7e99c"
+                              }
+                            } ]
                           }
-                        },
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "floatingLegResetDates",
-                          "globalReference" : "9516da6a"
+                        } ],
+                        "meta" : {
+                          "globalKey" : "19cc9fa5"
                         }
-                      },
-                      "meta" : {
-                        "externalKey" : "floatingLegResetDates",
-                        "globalKey" : "9516da6a"
-                      },
-                      "resetDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "26cfaa"
-                          },
+                      }, {
+                        "adjustedPaymentDate" : "2024-04-24",
+                        "calculationPeriod" : [ {
+                          "adjustedStartDate" : "2023-10-24",
+                          "adjustedEndDate" : "2024-04-24",
                           "meta" : {
-                            "globalKey" : "ff8806b2"
+                            "globalKey" : "fb8a196"
+                          },
+                          "notionalAmount" : 10500000,
+                          "floatingRateDefinition" : {
+                            "rateObservation" : [ {
+                              "adjustedFixingDate" : "2023-10-20",
+                              "observedRate" : 0,
+                              "meta" : {
+                                "globalKey" : "7a8181c"
+                              }
+                            } ]
                           }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
+                        } ],
                         "meta" : {
-                          "globalKey" : "dd292541"
+                          "globalKey" : "a7914aae"
                         }
-                      },
-                      "resetFrequency" : {
-                        "meta" : {
-                          "globalKey" : "959"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6
-                      },
-                      "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                      } ]
+                    },
+                    "meta" : {
+                      "globalKey" : "17a83b60"
                     }
                   }, {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-2"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "fixedPrimaryBusinessCenters",
-                            "globalReference" : "26cfaa"
-                          },
-                          "meta" : {
-                            "globalKey" : "c2a0ac9a"
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "a041cb29"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "28ca8"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6,
-                        "rollConvention" : "24"
-                      },
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/365.FIXED"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2018-04-24",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -1885,42 +1834,93 @@
                           },
                           "meta" : {
                             "globalKey" : "ece3d250"
-                          },
-                          "unadjustedDate" : "2018-04-24"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ece3d250"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "fixedCalcPeriodDates",
-                        "globalKey" : "6654e942"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2024-04-24",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "26cfaa"
+                                "globalReference" : "26cfaa",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "c2a0ac9a"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "a041cb29"
                             }
                           },
                           "meta" : {
                             "globalKey" : "381a7441"
-                          },
-                          "unadjustedDate" : "2024-04-24"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "381a7441"
                         }
+                      },
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "26cfaa",
+                            "externalReference" : "fixedPrimaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "c2a0ac9a"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "a041cb29"
+                        }
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "18aba"
+                        },
+                        "rollConvention" : "24"
+                      },
+                      "meta" : {
+                        "globalKey" : "e16547d4",
+                        "externalKey" : "fixedCalcPeriodDates"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "107"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "SGSI"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "26cfaa",
+                            "externalKey" : "fixedPrimaryBusinessCenters"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "3661d37b"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "8f18bcae",
+                        "externalKey" : "fixedLegPaymentDates"
                       }
                     },
                     "cashflowRepresentation" : {
@@ -1928,569 +1928,546 @@
                       "paymentCalculationPeriod" : [ {
                         "adjustedPaymentDate" : "2018-10-24",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2018-10-24",
                           "adjustedStartDate" : "2018-04-24",
+                          "adjustedEndDate" : "2018-10-24",
                           "meta" : {
-                            "globalKey" : "a45d4254"
+                            "globalKey" : "cba05bac"
                           },
-                          "fixedRate" : 0.015,
-                          "notionalAmount" : 2800000
+                          "notionalAmount" : 2800000,
+                          "fixedRate" : 0.015
                         } ],
                         "meta" : {
-                          "globalKey" : "ae1a0ebc"
+                          "globalKey" : "d55d2814"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-04-24",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-04-24",
                           "adjustedStartDate" : "2018-10-24",
+                          "adjustedEndDate" : "2019-04-24",
                           "meta" : {
-                            "globalKey" : "d71efeb8"
+                            "globalKey" : "9595cbc8"
                           },
-                          "fixedRate" : 0.015,
-                          "notionalAmount" : 3500000
+                          "notionalAmount" : 3500000,
+                          "fixedRate" : 0.015
                         } ],
                         "meta" : {
-                          "globalKey" : "f85bd4a0"
+                          "globalKey" : "b6d2a1b0"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-10-24",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-10-24",
                           "adjustedStartDate" : "2019-04-24",
+                          "adjustedEndDate" : "2019-10-24",
                           "meta" : {
-                            "globalKey" : "7ada51c"
+                            "globalKey" : "61be51e4"
                           },
-                          "fixedRate" : 0.015,
-                          "notionalAmount" : 4200000
+                          "notionalAmount" : 4200000,
+                          "fixedRate" : 0.015
                         } ],
                         "meta" : {
-                          "globalKey" : "b82f6984"
+                          "globalKey" : "1240164c"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-04-24",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-04-24",
                           "adjustedStartDate" : "2019-10-24",
+                          "adjustedEndDate" : "2020-04-24",
                           "meta" : {
-                            "globalKey" : "16999c75"
+                            "globalKey" : "d4d0e5ab"
                           },
-                          "fixedRate" : 0.015,
-                          "notionalAmount" : 4900000
+                          "notionalAmount" : 4900000,
+                          "fixedRate" : 0.015
                         } ],
                         "meta" : {
-                          "globalKey" : "de9b6a5d"
+                          "globalKey" : "9cd2b393"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-10-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-10-26",
                           "adjustedStartDate" : "2020-04-24",
+                          "adjustedEndDate" : "2020-10-26",
                           "meta" : {
-                            "globalKey" : "47292b97"
+                            "globalKey" : "a0f97349"
                           },
-                          "fixedRate" : 0.015,
-                          "notionalAmount" : 5600000
+                          "notionalAmount" : 5600000,
+                          "fixedRate" : 0.015
                         } ],
                         "meta" : {
-                          "globalKey" : "a1d9993d"
+                          "globalKey" : "fba9e0ef"
                         }
                       }, {
                         "adjustedPaymentDate" : "2021-04-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2021-04-26",
                           "adjustedStartDate" : "2020-10-26",
+                          "adjustedEndDate" : "2021-04-26",
                           "meta" : {
-                            "globalKey" : "79eaef7d"
+                            "globalKey" : "6aefcc23"
                           },
-                          "fixedRate" : 0.015,
-                          "notionalAmount" : 6300000
+                          "notionalAmount" : 6300000,
+                          "fixedRate" : 0.015
                         } ],
                         "meta" : {
-                          "globalKey" : "ec1b66a3"
+                          "globalKey" : "dd204349"
                         }
                       }, {
                         "adjustedPaymentDate" : "2021-10-25",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2021-10-25",
                           "adjustedStartDate" : "2021-04-26",
+                          "adjustedEndDate" : "2021-10-25",
                           "meta" : {
-                            "globalKey" : "aa792182"
+                            "globalKey" : "37184e7e"
                           },
-                          "fixedRate" : 0.015,
-                          "notionalAmount" : 7000000
+                          "notionalAmount" : 7000000,
+                          "fixedRate" : 0.015
                         } ],
                         "meta" : {
-                          "globalKey" : "aa39ae89"
+                          "globalKey" : "36d8db85"
                         }
                       }, {
                         "adjustedPaymentDate" : "2022-04-25",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2022-04-25",
                           "adjustedStartDate" : "2021-10-25",
+                          "adjustedEndDate" : "2022-04-25",
                           "meta" : {
-                            "globalKey" : "b965151a"
+                            "globalKey" : "aa2a6de6"
                           },
-                          "fixedRate" : 0.015,
-                          "notionalAmount" : 7700000
+                          "notionalAmount" : 7700000,
+                          "fixedRate" : 0.015
                         } ],
                         "meta" : {
-                          "globalKey" : "d0a5aba1"
+                          "globalKey" : "c16b046d"
                         }
                       }, {
                         "adjustedPaymentDate" : "2022-10-25",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2022-10-25",
                           "adjustedStartDate" : "2022-04-25",
+                          "adjustedEndDate" : "2022-10-25",
                           "meta" : {
-                            "globalKey" : "e9f3bb7e"
+                            "globalKey" : "7652f402"
                           },
-                          "fixedRate" : 0.015,
-                          "notionalAmount" : 8400000
+                          "notionalAmount" : 8400000,
+                          "fixedRate" : 0.015
                         } ],
                         "meta" : {
-                          "globalKey" : "90794085"
+                          "globalKey" : "1cd87909"
                         }
                       }, {
                         "adjustedPaymentDate" : "2023-04-24",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2023-04-24",
                           "adjustedStartDate" : "2022-10-25",
+                          "adjustedEndDate" : "2023-04-24",
                           "meta" : {
-                            "globalKey" : "1cb50383"
+                            "globalKey" : "4048605d"
                           },
-                          "fixedRate" : 0.015,
-                          "notionalAmount" : 9100000
+                          "notionalAmount" : 9100000,
+                          "fixedRate" : 0.015
                         } ],
                         "meta" : {
-                          "globalKey" : "d905b96b"
+                          "globalKey" : "fc991645"
                         }
                       }, {
                         "adjustedPaymentDate" : "2023-10-24",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2023-10-24",
                           "adjustedStartDate" : "2023-04-24",
+                          "adjustedEndDate" : "2023-10-24",
                           "meta" : {
-                            "globalKey" : "296de11b"
+                            "globalKey" : "b58d95c5"
                           },
-                          "fixedRate" : 0.015,
-                          "notionalAmount" : 9800000
+                          "notionalAmount" : 9800000,
+                          "fixedRate" : 0.015
                         } ],
                         "meta" : {
-                          "globalKey" : "75038583"
+                          "globalKey" : "1233a2d"
                         }
                       }, {
                         "adjustedPaymentDate" : "2024-04-24",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2024-04-24",
                           "adjustedStartDate" : "2023-10-24",
+                          "adjustedEndDate" : "2024-04-24",
                           "meta" : {
-                            "globalKey" : "2d4ae3a4"
+                            "globalKey" : "d1d0845c"
                           },
-                          "fixedRate" : 0.015,
-                          "notionalAmount" : 10500000
+                          "notionalAmount" : 10500000,
+                          "fixedRate" : 0.015
                         } ],
                         "meta" : {
-                          "globalKey" : "9060918c"
+                          "globalKey" : "34e63244"
                         }
                       } ]
                     },
-                    "dayCountFraction" : {
-                      "value" : "ACT/365.FIXED"
-                    },
                     "meta" : {
-                      "globalKey" : "a46bf0b8"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "fixedLegPaymentDates",
-                        "globalKey" : "1a0d9dd8"
-                      },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "SGSI"
-                          } ],
-                          "meta" : {
-                            "externalKey" : "fixedPrimaryBusinessCenters",
-                            "globalKey" : "26cfaa"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "3661d37b"
-                        }
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "959"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6
-                      }
-                    },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
-                          }
-                        }
-                      }
+                      "globalKey" : "5d5e81a4"
                     }
                   } ],
                   "meta" : {
-                    "globalKey" : "c2df93d6"
+                    "globalKey" : "e6eb504"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "7d3bcb47"
+                "globalKey" : "c8caec75"
               }
             },
             "meta" : {
-              "globalKey" : "7d3bcb47"
+              "globalKey" : "c8caec75"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "394670aa"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "d316d91"
-                },
-                "rateOption" : {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "rateOption-1"
-                    } ]
-                  },
-                  "value" : {
-                    "floatingRateIndex" : {
-                      "value" : "SGD-SOR-VWAP"
-                    },
-                    "indexTenor" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    }
-                  }
-                }
-              },
               "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 2800000,
                   "unit" : {
                     "currency" : {
                       "value" : "SGD"
                     }
                   },
-                  "value" : 2800000,
                   "datedValue" : [ {
                     "date" : "2018-04-24",
+                    "value" : 2800000,
                     "meta" : {
                       "globalKey" : "bee4fb92"
-                    },
-                    "value" : 2800000
+                    }
                   }, {
                     "date" : "2018-10-24",
+                    "value" : 3500000,
                     "meta" : {
                       "globalKey" : "eeacdb76"
-                    },
-                    "value" : 3500000
+                    }
                   }, {
                     "date" : "2019-04-24",
+                    "value" : 4200000,
                     "meta" : {
                       "globalKey" : "1e75565a"
-                    },
-                    "value" : 4200000
+                    }
                   }, {
                     "date" : "2019-10-24",
+                    "value" : 4900000,
                     "meta" : {
                       "globalKey" : "2a677133"
-                    },
-                    "value" : 4900000
+                    }
                   }, {
                     "date" : "2020-04-24",
+                    "value" : 5600000,
                     "meta" : {
                       "globalKey" : "5a2fec17"
-                    },
-                    "value" : 5600000
+                    }
                   }, {
                     "date" : "2020-10-24",
+                    "value" : 6300000,
                     "meta" : {
                       "globalKey" : "89f7cbfb"
-                    },
-                    "value" : 6300000
+                    }
                   }, {
                     "date" : "2021-04-24",
+                    "value" : 7000000,
                     "meta" : {
                       "globalKey" : "b9c046df"
-                    },
-                    "value" : 7000000
+                    }
                   }, {
                     "date" : "2021-10-24",
+                    "value" : 7700000,
                     "meta" : {
                       "globalKey" : "c5b261b8"
-                    },
-                    "value" : 7700000
+                    }
                   }, {
                     "date" : "2022-04-24",
+                    "value" : 8400000,
                     "meta" : {
                       "globalKey" : "f57adc9c"
-                    },
-                    "value" : 8400000
+                    }
                   }, {
                     "date" : "2022-10-24",
+                    "value" : 9100000,
                     "meta" : {
                       "globalKey" : "2542bc80"
-                    },
-                    "value" : 9100000
+                    }
                   }, {
                     "date" : "2023-04-24",
+                    "value" : 9800000,
                     "meta" : {
                       "globalKey" : "31357259"
-                    },
-                    "value" : 9800000
+                    }
                   }, {
                     "date" : "2023-10-24",
+                    "value" : 10500000,
                     "meta" : {
                       "globalKey" : "32189862"
-                    },
-                    "value" : 10500000
+                    }
                   } ]
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "a99c9826"
-              },
-              "price" : [ {
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "price-1"
+                    "value" : "quantity-1"
                   } ]
+                }
+              } ],
+              "observable" : {
+                "rateOption" : {
+                  "value" : {
+                    "floatingRateIndex" : {
+                      "value" : "SGD-SOR-VWAP"
+                    },
+                    "indexTenor" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "rateOption-1"
+                    } ]
+                  }
                 },
+                "meta" : {
+                  "globalKey" : "98fb42a1"
+                }
+              },
+              "meta" : {
+                "globalKey" : "92e8fbbc"
+              }
+            }, {
+              "price" : [ {
                 "value" : {
+                  "value" : 0.015,
                   "unit" : {
                     "currency" : {
                       "value" : "SGD"
                     }
                   },
-                  "value" : 0.015,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "SGD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ],
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "quantity" : [ {
                 "value" : {
+                  "value" : 2800000,
                   "unit" : {
                     "currency" : {
                       "value" : "SGD"
                     }
                   },
-                  "value" : 2800000,
                   "datedValue" : [ {
                     "date" : "2018-04-24",
+                    "value" : 2800000,
                     "meta" : {
                       "globalKey" : "bee4fb92"
-                    },
-                    "value" : 2800000
+                    }
                   }, {
                     "date" : "2018-10-24",
+                    "value" : 3500000,
                     "meta" : {
                       "globalKey" : "eeacdb76"
-                    },
-                    "value" : 3500000
+                    }
                   }, {
                     "date" : "2019-04-24",
+                    "value" : 4200000,
                     "meta" : {
                       "globalKey" : "1e75565a"
-                    },
-                    "value" : 4200000
+                    }
                   }, {
                     "date" : "2019-10-24",
+                    "value" : 4900000,
                     "meta" : {
                       "globalKey" : "2a677133"
-                    },
-                    "value" : 4900000
+                    }
                   }, {
                     "date" : "2020-04-24",
+                    "value" : 5600000,
                     "meta" : {
                       "globalKey" : "5a2fec17"
-                    },
-                    "value" : 5600000
+                    }
                   }, {
                     "date" : "2020-10-24",
+                    "value" : 6300000,
                     "meta" : {
                       "globalKey" : "89f7cbfb"
-                    },
-                    "value" : 6300000
+                    }
                   }, {
                     "date" : "2021-04-24",
+                    "value" : 7000000,
                     "meta" : {
                       "globalKey" : "b9c046df"
-                    },
-                    "value" : 7000000
+                    }
                   }, {
                     "date" : "2021-10-24",
+                    "value" : 7700000,
                     "meta" : {
                       "globalKey" : "c5b261b8"
-                    },
-                    "value" : 7700000
+                    }
                   }, {
                     "date" : "2022-04-24",
+                    "value" : 8400000,
                     "meta" : {
                       "globalKey" : "f57adc9c"
-                    },
-                    "value" : 8400000
+                    }
                   }, {
                     "date" : "2022-10-24",
+                    "value" : 9100000,
                     "meta" : {
                       "globalKey" : "2542bc80"
-                    },
-                    "value" : 9100000
+                    }
                   }, {
                     "date" : "2023-04-24",
+                    "value" : 9800000,
                     "meta" : {
                       "globalKey" : "31357259"
-                    },
-                    "value" : 9800000
+                    }
                   }, {
                     "date" : "2023-10-24",
+                    "value" : 10500000,
                     "meta" : {
                       "globalKey" : "32189862"
-                    },
-                    "value" : 10500000
+                    }
+                  } ]
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
                   } ]
                 }
-              } ]
-            } ]
-          } ]
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f1114"
-          },
-          "value" : "2018-04-20"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "cme_trade_id"
-              },
-              "value" : "2894761"
-            }
-          }, {
-            "identifier" : {
+              } ],
               "meta" : {
-                "scheme" : "client_trade_id"
-              },
-              "value" : "QAC-11111"
+                "globalKey" : "89f66c9a"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "dd19",
+              "externalReference" : "clearing_firm"
             }
           }, {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "platform_trade_id"
-              },
-              "value" : "22222"
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
             }
-          }, {
+          } ]
+        },
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "999",
               "meta" : {
-                "scheme" : "platform_side_id"
-              },
-              "value" : "22222"
+                "scheme" : "clearing_member_firms"
+              }
+            },
+            "meta" : {
+              "globalKey" : "dd19"
             }
-          }, {
+          } ],
+          "meta" : {
+            "globalKey" : "dd19",
+            "externalKey" : "clearing_firm"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "block_trade_id"
-              },
-              "value" : "22222"
+              "value" : "CME"
+            },
+            "meta" : {
+              "globalKey" : "1051b"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "clearing_service",
-            "globalReference" : "1051b"
-          },
           "meta" : {
-            "globalKey" : "1117bae4"
+            "globalKey" : "1051b",
+            "externalKey" : "clearing_service"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "reg_trade_id"
-              },
-              "value" : "CCCIRS2894761"
+              "value" : "PLATFORM"
+            },
+            "meta" : {
+              "globalKey" : "9e635873"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "9e635873",
+            "externalKey" : "trade_source"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "9e635873",
+            "externalReference" : "trade_source"
+          },
+          "role" : "DataSubmitter",
+          "ownershipPartyReference" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
+          }
+        } ],
+        "clearedDate" : "2018-04-20",
+        "account" : [ {
+          "partyReference" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
+          },
+          "accountNumber" : {
+            "value" : "999-123",
             "meta" : {
-              "scheme" : "cftc_Namespace"
-            },
-            "value" : "1010000023"
+              "scheme" : "clearing_firm_accounts"
+            }
+          },
+          "servicingParty" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
           },
           "meta" : {
-            "globalKey" : "a7071c09"
+            "globalKey" : "24a161c0",
+            "externalKey" : "account1"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "c8e45263"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
       },
       "transferHistory" : [ {
-        "meta" : {
-          "globalKey" : "84328cdf"
-        },
         "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "dd19"
-            },
-            "receiverPartyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            }
-          },
           "quantity" : {
+            "value" : 700,
             "unit" : {
               "currency" : {
                 "value" : "SGD"
               }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "dd19",
+              "externalReference" : "clearing_firm"
             },
-            "value" : 700
+            "receiverPartyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
+            }
           },
           "settlementDate" : {
+            "unadjustedDate" : "2018-04-24",
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "SGSI"
@@ -2499,73 +2476,79 @@
                   "globalKey" : "26cfaa"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "3661d37b"
               }
-            },
-            "unadjustedDate" : "2018-04-24"
+            }
           },
           "transferExpression" : {
-            "priceTransfer" : "UPFRONT"
+            "priceTransfer" : "Upfront"
           }
+        },
+        "meta" : {
+          "globalKey" : "94901403"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "e09527bd"
+      }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "5200dfc7"
+      "globalKey" : "3d996fe1"
     }
   },
+  "previousWorkflowStep" : {
+    "globalReference" : "516aa715"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "6008842628",
       "meta" : {
         "scheme" : "cme_message_id"
-      },
-      "value" : "6008842628"
+      }
     },
     "sentBy" : {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
+      }
     },
     "sentTo" : [ {
+      "value" : "999",
       "meta" : {
         "scheme" : "cme_firm_id"
-      },
-      "value" : "999"
+      }
     }, {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
+      }
     } ]
   },
-  "meta" : {
-    "globalKey" : "11a409e4"
-  },
+  "timestamp" : [ {
+    "dateTime" : "2018-04-20T11:23:50Z",
+    "qualification" : "eventCreationDateTime"
+  }, {
+    "dateTime" : "2018-04-20T11:23:49.254Z",
+    "qualification" : "clearingReceiptDateTime"
+  } ],
   "party" : [ {
-    "meta" : {
-      "externalKey" : "clearing_firm",
-      "globalKey" : "dd19"
-    },
     "partyId" : [ {
       "identifier" : {
+        "value" : "999",
         "meta" : {
           "scheme" : "clearing_member_firms"
-        },
-        "value" : "999"
+        }
       },
       "meta" : {
         "globalKey" : "dd19"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "clearing_service",
-      "globalKey" : "1051b"
-    },
+      "globalKey" : "dd19",
+      "externalKey" : "clearing_firm"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "CME"
@@ -2573,12 +2556,12 @@
       "meta" : {
         "globalKey" : "1051b"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "trade_source",
-      "globalKey" : "9e635873"
-    },
+      "globalKey" : "1051b",
+      "externalKey" : "clearing_service"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "PLATFORM"
@@ -2586,16 +2569,33 @@
       "meta" : {
         "globalKey" : "9e635873"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "9e635873",
+      "externalKey" : "trade_source"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "52900375"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2018-04-20T11:23:50Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  }, {
-    "dateTime" : "2018-04-20T11:23:49.254Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
-  } ]
+  "account" : [ {
+    "partyReference" : {
+      "globalReference" : "dd19",
+      "externalReference" : "clearing_firm"
+    },
+    "accountNumber" : {
+      "value" : "999-123",
+      "meta" : {
+        "scheme" : "clearing_firm_accounts"
+      }
+    },
+    "servicingParty" : {
+      "globalReference" : "dd19",
+      "externalReference" : "clearing_firm"
+    },
+    "meta" : {
+      "globalKey" : "24a161c0",
+      "externalKey" : "account1"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "8ff5ebd6"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex04-Fixed-Float-with-Compounding-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex04-Fixed-Float-with-Compounding-func-output.json
index fd8b65ae88..4ab0d7296e 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex04-Fixed-Float-with-Compounding-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex04-Fixed-Float-with-Compounding-func-output.json
@@ -1,137 +1,80 @@
 {
-  "account" : [ {
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "clearing_firm_accounts"
-      },
-      "value" : "999-123"
-    },
-    "meta" : {
-      "externalKey" : "account1",
-      "globalKey" : "a18b2f80"
-    },
-    "partyReference" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "dd19"
-    },
-    "servicingParty" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "dd19"
-    }
-  } ],
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "d4c3b719"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "999-123"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "a18b2f80"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              }
-            } ],
-            "clearedDate" : "2018-04-24",
-            "meta" : {
-              "globalKey" : "d4c3b719"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "dd19"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "2894761",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "999"
-                },
-                "meta" : {
-                  "globalKey" : "dd19"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "QAC-11111",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "9e635873"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "PLATFORM"
-                },
-                "meta" : {
-                  "globalKey" : "9e635873"
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "SEF",
-                "globalKey" : "75895dac"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "PARTY123"
-                },
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "package_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "position_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "fd5cf798"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "75895dac"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "9e635873"
               },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS2894761",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e12c31ab"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-04-24",
+              "meta" : {
+                "globalKey" : "3f1118"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "dd19"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -142,46 +85,42 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "fa5f1fb"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "979a8ca"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c4d"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "26"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2013-07-26",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -190,42 +129,95 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec508292"
-                              },
-                              "unadjustedDate" : "2013-07-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec508292"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "f0f90529"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2020-07-26",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "fixedPrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "fixedPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "fa5f1fb"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "979a8ca"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "4cc3c224"
-                              },
-                              "unadjustedDate" : "2020-07-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "4cc3c224"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "fa5f1fb"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "979a8ca"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f79"
+                            },
+                            "rollConvention" : "26"
+                          },
+                          "meta" : {
+                            "globalKey" : "730d5895",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b",
+                                "externalKey" : "fixedPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "e18d000c",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -233,491 +225,436 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2013-10-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2013-10-28",
                               "adjustedStartDate" : "2013-07-26",
+                              "adjustedEndDate" : "2013-10-28",
                               "meta" : {
-                                "globalKey" : "6a521c51"
+                                "globalKey" : "b42c558f"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "39097335"
+                              "globalKey" : "82e3ac73"
                             }
                           }, {
                             "adjustedPaymentDate" : "2014-01-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2014-01-27",
                               "adjustedStartDate" : "2013-10-28",
+                              "adjustedEndDate" : "2014-01-27",
                               "meta" : {
-                                "globalKey" : "6cf1a274"
+                                "globalKey" : "b49a178c"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "9d1b2f9"
+                              "globalKey" : "517a2811"
                             }
                           }, {
                             "adjustedPaymentDate" : "2014-04-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2014-04-28",
                               "adjustedStartDate" : "2014-01-27",
+                              "adjustedEndDate" : "2014-04-28",
                               "meta" : {
-                                "globalKey" : "6d5ef012"
+                                "globalKey" : "b73999ee"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "53965076"
+                              "globalKey" : "9d70fa52"
                             }
                           }, {
                             "adjustedPaymentDate" : "2014-07-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2014-07-28",
                               "adjustedStartDate" : "2014-04-28",
+                              "adjustedEndDate" : "2014-07-28",
                               "meta" : {
-                                "globalKey" : "6db90bd3"
+                                "globalKey" : "b794264d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "9b92e377"
+                              "globalKey" : "e56dfdf1"
                             }
                           }, {
                             "adjustedPaymentDate" : "2014-10-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2014-10-27",
                               "adjustedStartDate" : "2014-07-28",
+                              "adjustedEndDate" : "2014-10-27",
                               "meta" : {
-                                "globalKey" : "6e12af74"
+                                "globalKey" : "b7ee3a8c"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "e1da25b9"
+                              "globalKey" : "2bb5b0d1"
                             }
                           }, {
                             "adjustedPaymentDate" : "2015-01-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-01-26",
                               "adjustedStartDate" : "2014-10-27",
+                              "adjustedEndDate" : "2015-01-26",
                               "meta" : {
-                                "globalKey" : "70b22a54"
+                                "globalKey" : "b85a9f6c"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "b2a25a3a"
+                              "globalKey" : "fa4acf52"
                             }
                           }, {
                             "adjustedPaymentDate" : "2015-04-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-04-27",
                               "adjustedStartDate" : "2015-01-26",
+                              "adjustedEndDate" : "2015-04-27",
                               "meta" : {
-                                "globalKey" : "711f77f2"
+                                "globalKey" : "bafa21ce"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "fc66f7b7"
+                              "globalKey" : "4641a193"
                             }
                           }, {
                             "adjustedPaymentDate" : "2015-07-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-07-27",
                               "adjustedStartDate" : "2015-04-27",
+                              "adjustedEndDate" : "2015-07-27",
                               "meta" : {
-                                "globalKey" : "717993b3"
+                                "globalKey" : "bb54ae2d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "44638ab8"
+                              "globalKey" : "8e3ea532"
                             }
                           }, {
                             "adjustedPaymentDate" : "2015-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-10-26",
                               "adjustedStartDate" : "2015-07-27",
+                              "adjustedEndDate" : "2015-10-26",
                               "meta" : {
-                                "globalKey" : "71d33754"
+                                "globalKey" : "bbaec26c"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "8aaaccfa"
+                              "globalKey" : "d4865812"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-01-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-01-26",
                               "adjustedStartDate" : "2015-10-26",
+                              "adjustedEndDate" : "2016-01-26",
                               "meta" : {
-                                "globalKey" : "74732693"
+                                "globalKey" : "bc1b2b0d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "5d284e79"
+                              "globalKey" : "a4d052f3"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-04-26",
                               "adjustedStartDate" : "2016-01-26",
+                              "adjustedEndDate" : "2016-04-26",
                               "meta" : {
-                                "globalKey" : "74e00393"
+                                "globalKey" : "bebb1e0d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "a537a2b9"
+                              "globalKey" : "ef12bd33"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-07-26",
                               "adjustedStartDate" : "2016-04-26",
+                              "adjustedEndDate" : "2016-07-26",
                               "meta" : {
-                                "globalKey" : "753a1b93"
+                                "globalKey" : "bf15360d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "ed3431f9"
+                              "globalKey" : "370f4c73"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-10-26",
                               "adjustedStartDate" : "2016-07-26",
+                              "adjustedEndDate" : "2016-10-26",
                               "meta" : {
-                                "globalKey" : "75943393"
+                                "globalKey" : "bf6f4e0d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "3530c139"
+                              "globalKey" : "7f0bdbb3"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-01-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-01-26",
                               "adjustedStartDate" : "2016-10-26",
+                              "adjustedEndDate" : "2017-01-26",
                               "meta" : {
-                                "globalKey" : "78342693"
+                                "globalKey" : "bfdc2b0d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "7ae4679"
+                              "globalKey" : "4f564af3"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-04-26",
                               "adjustedStartDate" : "2017-01-26",
+                              "adjustedEndDate" : "2017-04-26",
                               "meta" : {
-                                "globalKey" : "78a10393"
+                                "globalKey" : "c27c1e0d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "4fbd9ab9"
+                              "globalKey" : "9998b533"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-07-26",
                               "adjustedStartDate" : "2017-04-26",
+                              "adjustedEndDate" : "2017-07-26",
                               "meta" : {
-                                "globalKey" : "78fb1b93"
+                                "globalKey" : "c2d6360d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "97ba29f9"
+                              "globalKey" : "e1954473"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-10-26",
                               "adjustedStartDate" : "2017-07-26",
+                              "adjustedEndDate" : "2017-10-26",
                               "meta" : {
-                                "globalKey" : "79553393"
+                                "globalKey" : "c3304e0d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "dfb6b939"
+                              "globalKey" : "2991d3b3"
                             }
                           }, {
                             "adjustedPaymentDate" : "2018-01-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-01-26",
                               "adjustedStartDate" : "2017-10-26",
+                              "adjustedEndDate" : "2018-01-26",
                               "meta" : {
-                                "globalKey" : "7bf52693"
+                                "globalKey" : "c39d2b0d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "b2343e79"
+                              "globalKey" : "f9dc42f3"
                             }
                           }, {
                             "adjustedPaymentDate" : "2018-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-04-26",
                               "adjustedStartDate" : "2018-01-26",
+                              "adjustedEndDate" : "2018-04-26",
                               "meta" : {
-                                "globalKey" : "7c620393"
+                                "globalKey" : "c63d1e0d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "fa4392b9"
+                              "globalKey" : "441ead33"
                             }
                           }, {
                             "adjustedPaymentDate" : "2018-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-07-26",
                               "adjustedStartDate" : "2018-04-26",
+                              "adjustedEndDate" : "2018-07-26",
                               "meta" : {
-                                "globalKey" : "7cbc1b93"
+                                "globalKey" : "c697360d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "424021f9"
+                              "globalKey" : "8c1b3c73"
                             }
                           }, {
                             "adjustedPaymentDate" : "2018-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-10-26",
                               "adjustedStartDate" : "2018-07-26",
+                              "adjustedEndDate" : "2018-10-26",
                               "meta" : {
-                                "globalKey" : "7d163393"
+                                "globalKey" : "c6f14e0d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "8a3cb139"
+                              "globalKey" : "d417cbb3"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-01-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-01-28",
                               "adjustedStartDate" : "2018-10-26",
+                              "adjustedEndDate" : "2019-01-28",
                               "meta" : {
-                                "globalKey" : "7fb70f51"
+                                "globalKey" : "c75e328f"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "6024d075"
+                              "globalKey" : "a7cbf3b3"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-04-26",
                               "adjustedStartDate" : "2019-01-28",
+                              "adjustedEndDate" : "2019-04-26",
                               "meta" : {
-                                "globalKey" : "80230b15"
+                                "globalKey" : "c9ff06cb"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "a4c9923b"
+                              "globalKey" : "eea58df1"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-07-26",
                               "adjustedStartDate" : "2019-04-26",
+                              "adjustedEndDate" : "2019-07-26",
                               "meta" : {
-                                "globalKey" : "807d1b93"
+                                "globalKey" : "ca58360d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "ecc619f9"
+                              "globalKey" : "36a13473"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-10-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-10-28",
                               "adjustedStartDate" : "2019-07-26",
+                              "adjustedEndDate" : "2019-10-28",
                               "meta" : {
-                                "globalKey" : "80d81c51"
+                                "globalKey" : "cab2558f"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "382d4335"
+                              "globalKey" : "82077c73"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-01-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-01-27",
                               "adjustedStartDate" : "2019-10-28",
+                              "adjustedEndDate" : "2020-01-27",
                               "meta" : {
-                                "globalKey" : "8377a274"
+                                "globalKey" : "cb20178c"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "8f582f9"
+                              "globalKey" : "509df811"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-04-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-04-27",
                               "adjustedStartDate" : "2020-01-27",
+                              "adjustedEndDate" : "2020-04-27",
                               "meta" : {
-                                "globalKey" : "83e47bb3"
+                                "globalKey" : "cdbf962d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "5104d378"
+                              "globalKey" : "9adfedf2"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-07-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-07-27",
                               "adjustedStartDate" : "2020-04-27",
+                              "adjustedEndDate" : "2020-07-27",
                               "meta" : {
-                                "globalKey" : "843e93b3"
+                                "globalKey" : "ce19ae2d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000
+                              "notionalAmount" : 17000000,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "990162b8"
+                              "globalKey" : "e2dc7d32"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "30/360"
-                        },
                         "meta" : {
-                          "globalKey" : "fb6ab07f"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "637fde94"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "fixedPrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "97b8e49c"
-                            }
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                          "globalKey" : "880e3049"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "b01f2613"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "a9f2dce2"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c4d"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "26"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2013-07-26",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -726,977 +663,980 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec508292"
-                              },
-                              "unadjustedDate" : "2013-07-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec508292"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "a8f2cb59"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2020-07-26",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "b01f2613"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "a9f2dce2"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "ed3cf63c"
-                              },
-                              "unadjustedDate" : "2020-07-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ed3cf63c"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "b01f2613"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "a9f2dce2"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f79"
+                            },
+                            "rollConvention" : "26"
+                          },
+                          "meta" : {
+                            "globalKey" : "e3feeac5",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b",
+                                "externalKey" : "floatPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "9e5a4d0f",
+                            "externalKey" : "floatingLegPaymentDates"
+                          }
+                        },
+                        "resetDates" : {
+                          "calculationPeriodDatesReference" : {
+                            "globalReference" : "e3feeac5",
+                            "externalReference" : "floatingCalcPeriodDates"
+                          },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
+                          "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "1a78799e"
+                            },
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "21479e"
+                              }
+                            },
+                            "dateRelativeTo" : {
+                              "globalReference" : "8c9a0085",
+                              "externalReference" : "floatingLegResetDates"
+                            }
+                          },
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "b01f2613"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "a9f2dce2"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "8c9a0085",
+                            "externalKey" : "floatingLegResetDates"
                           }
                         },
+                        "compoundingMethod" : "SpreadExclusive",
                         "cashflowRepresentation" : {
                           "cashflowsMatchParameters" : true,
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2014-01-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2013-10-28",
                               "adjustedStartDate" : "2013-07-26",
+                              "adjustedEndDate" : "2013-10-28",
                               "meta" : {
-                                "globalKey" : "ae664711"
+                                "globalKey" : "e2f9884d"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2013-07-24",
+                                  "observedRate" : 0.002643,
                                   "meta" : {
                                     "globalKey" : "57d9f269"
-                                  },
-                                  "observedRate" : 0.002643
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             }, {
-                              "adjustedEndDate" : "2014-01-27",
                               "adjustedStartDate" : "2013-10-28",
+                              "adjustedEndDate" : "2014-01-27",
                               "meta" : {
-                                "globalKey" : "f060f685"
+                                "globalKey" : "c79b35a7"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2013-10-24",
+                                  "observedRate" : 0.002381,
                                   "meta" : {
                                     "globalKey" : "57d9fee0"
-                                  },
-                                  "observedRate" : 0.002381
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "6d61a4af"
+                              "globalKey" : "d9d40715"
                             }
                           }, {
                             "adjustedPaymentDate" : "2014-07-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2014-04-28",
                               "adjustedStartDate" : "2014-01-27",
+                              "adjustedEndDate" : "2014-04-28",
                               "meta" : {
-                                "globalKey" : "a01d0e4d"
+                                "globalKey" : "7e1b22b"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2014-01-23",
+                                  "observedRate" : 0.002386,
                                   "meta" : {
                                     "globalKey" : "57dab106"
-                                  },
-                                  "observedRate" : 0.002386
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             }, {
-                              "adjustedEndDate" : "2014-07-28",
                               "adjustedStartDate" : "2014-04-28",
+                              "adjustedEndDate" : "2014-07-28",
                               "meta" : {
-                                "globalKey" : "fd1c1144"
+                                "globalKey" : "981217c4"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2014-04-24",
+                                  "observedRate" : 0.0022785,
                                   "meta" : {
                                     "globalKey" : "bed5f35e"
-                                  },
-                                  "observedRate" : 0.0022785
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "1c57c33"
+                              "globalKey" : "254e6915"
                             }
                           }, {
                             "adjustedPaymentDate" : "2015-01-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2014-10-27",
                               "adjustedStartDate" : "2014-07-28",
+                              "adjustedEndDate" : "2014-10-27",
                               "meta" : {
-                                "globalKey" : "5589a9e8"
+                                "globalKey" : "23b1130a"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2014-07-24",
+                                  "observedRate" : 0.002351,
                                   "meta" : {
                                     "globalKey" : "57dadf43"
-                                  },
-                                  "observedRate" : 0.002351
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             }, {
-                              "adjustedEndDate" : "2015-01-26",
                               "adjustedStartDate" : "2014-10-27",
+                              "adjustedEndDate" : "2015-01-26",
                               "meta" : {
-                                "globalKey" : "9265d9f0"
+                                "globalKey" : "69a01912"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2014-10-23",
+                                  "observedRate" : 0.002336,
                                   "meta" : {
                                     "globalKey" : "57daf62b"
-                                  },
-                                  "observedRate" : 0.002336
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "1a73bf62"
+                              "globalKey" : "60f66b22"
                             }
                           }, {
                             "adjustedPaymentDate" : "2015-07-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-04-27",
                               "adjustedStartDate" : "2015-01-26",
+                              "adjustedEndDate" : "2015-04-27",
                               "meta" : {
-                                "globalKey" : "4221f98d"
+                                "globalKey" : "a9e69d6b"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2015-01-22",
+                                  "observedRate" : 0.002561,
                                   "meta" : {
                                     "globalKey" : "57dbb026"
-                                  },
-                                  "observedRate" : 0.002561
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             }, {
-                              "adjustedEndDate" : "2015-07-27",
                               "adjustedStartDate" : "2015-04-27",
+                              "adjustedEndDate" : "2015-07-27",
                               "meta" : {
-                                "globalKey" : "244f3923"
+                                "globalKey" : "bf453fa3"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2015-04-23",
+                                  "observedRate" : 0.00277,
                                   "meta" : {
                                     "globalKey" : "44052f1d"
-                                  },
-                                  "observedRate" : 0.00277
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "a536bad1"
+                              "globalKey" : "c8bfa7b3"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-01-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-10-26",
                               "adjustedStartDate" : "2015-07-27",
+                              "adjustedEndDate" : "2015-10-26",
                               "meta" : {
-                                "globalKey" : "f78ea46f"
+                                "globalKey" : "c5b60d91"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2015-07-23",
+                                  "observedRate" : 0.002951,
                                   "meta" : {
                                     "globalKey" : "57dbedaa"
-                                  },
-                                  "observedRate" : 0.002951
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             }, {
-                              "adjustedEndDate" : "2016-01-26",
                               "adjustedStartDate" : "2015-10-26",
+                              "adjustedEndDate" : "2016-01-26",
                               "meta" : {
-                                "globalKey" : "695166cc"
+                                "globalKey" : "d5a434c"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2015-10-22",
+                                  "observedRate" : 0.003199,
                                   "meta" : {
                                     "globalKey" : "57dc5ba6"
-                                  },
-                                  "observedRate" : 0.003199
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "bf5bc3d7"
+                              "globalKey" : "d2ad0cf5"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-04-26",
                               "adjustedStartDate" : "2016-01-26",
+                              "adjustedEndDate" : "2016-04-26",
                               "meta" : {
-                                "globalKey" : "e5dd7921"
+                                "globalKey" : "80d37fa1"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2016-01-22",
+                                  "observedRate" : 0.006191,
                                   "meta" : {
                                     "globalKey" : "57de6afb"
-                                  },
-                                  "observedRate" : 0.006191
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             }, {
-                              "adjustedEndDate" : "2016-07-26",
                               "adjustedStartDate" : "2016-04-26",
+                              "adjustedEndDate" : "2016-07-26",
                               "meta" : {
-                                "globalKey" : "415ea427"
+                                "globalKey" : "dc54aaa7"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2016-04-22",
+                                  "observedRate" : 0.0063585,
                                   "meta" : {
                                     "globalKey" : "bf10ae01"
-                                  },
-                                  "observedRate" : 0.0063585
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "47e1e1c0"
+                              "globalKey" : "5ec591c0"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-01-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-10-26",
                               "adjustedStartDate" : "2016-07-26",
+                              "adjustedEndDate" : "2016-10-26",
                               "meta" : {
-                                "globalKey" : "baa32e88"
+                                "globalKey" : "55993508"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2016-07-22",
+                                  "observedRate" : 0.00721,
                                   "meta" : {
                                     "globalKey" : "44065062"
-                                  },
-                                  "observedRate" : 0.00721
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             }, {
-                              "adjustedEndDate" : "2017-01-26",
                               "adjustedStartDate" : "2016-10-26",
+                              "adjustedEndDate" : "2017-01-26",
                               "meta" : {
-                                "globalKey" : "a943551e"
+                                "globalKey" : "4d4c319e"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2016-10-24",
+                                  "observedRate" : 0.0088372,
                                   "meta" : {
                                     "globalKey" : "bf2f49f8"
-                                  },
-                                  "observedRate" : 0.0088372
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "33d751f0"
+                              "globalKey" : "53cdd7f0"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-04-26",
                               "adjustedStartDate" : "2017-01-26",
+                              "adjustedEndDate" : "2017-04-26",
                               "meta" : {
-                                "globalKey" : "270fd99e"
+                                "globalKey" : "c205e01e"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2017-01-24",
+                                  "observedRate" : 0.0103178,
                                   "meta" : {
                                     "globalKey" : "c071cb78"
-                                  },
-                                  "observedRate" : 0.0103178
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             }, {
-                              "adjustedEndDate" : "2017-07-26",
                               "adjustedStartDate" : "2017-04-26",
+                              "adjustedEndDate" : "2017-07-26",
                               "meta" : {
-                                "globalKey" : "b2d854b1"
+                                "globalKey" : "4dce5b31"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2017-04-24",
+                                  "observedRate" : 0.011665,
                                   "meta" : {
                                     "globalKey" : "57eb5e8b"
-                                  },
-                                  "observedRate" : 0.011665
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "94a0232d"
+                              "globalKey" : "ab83d32d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2018-01-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-10-26",
                               "adjustedStartDate" : "2017-07-26",
+                              "adjustedEndDate" : "2017-10-26",
                               "meta" : {
-                                "globalKey" : "fd73d85"
+                                "globalKey" : "aacd4405"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2017-07-24",
+                                  "observedRate" : 0.0131389,
                                   "meta" : {
                                     "globalKey" : "c09b5f5f"
-                                  },
-                                  "observedRate" : 0.0131389
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             }, {
-                              "adjustedEndDate" : "2018-01-26",
                               "adjustedStartDate" : "2017-10-26",
+                              "adjustedEndDate" : "2018-01-26",
                               "meta" : {
-                                "globalKey" : "83513079"
+                                "globalKey" : "275a0cf9"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2017-10-24",
+                                  "observedRate" : 0.0137064,
                                   "meta" : {
                                     "globalKey" : "c09e2553"
-                                  },
-                                  "observedRate" : 0.0137064
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "7f1ebfae"
+                              "globalKey" : "9f1545ae"
                             }
                           }, {
                             "adjustedPaymentDate" : "2018-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-04-26",
                               "adjustedStartDate" : "2018-01-26",
+                              "adjustedEndDate" : "2018-04-26",
                               "meta" : {
-                                "globalKey" : "136245"
+                                "globalKey" : "9b0968c5"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2018-01-24",
+                                  "observedRate" : 0.0175246,
                                   "meta" : {
                                     "globalKey" : "c0d6541f"
-                                  },
-                                  "observedRate" : 0.0175246
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             }, {
-                              "adjustedEndDate" : "2018-07-26",
                               "adjustedStartDate" : "2018-04-26",
+                              "adjustedEndDate" : "2018-07-26",
                               "meta" : {
-                                "globalKey" : "3b2f083e"
+                                "globalKey" : "d6250ebe"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2018-04-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a31218"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "5d3e9c33"
+                              "globalKey" : "74224c33"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-01-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-10-26",
                               "adjustedStartDate" : "2018-07-26",
+                              "adjustedEndDate" : "2018-10-26",
                               "meta" : {
-                                "globalKey" : "2f7e077e"
+                                "globalKey" : "ca740dfe"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2018-07-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a32958"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             }, {
-                              "adjustedEndDate" : "2019-01-28",
                               "adjustedStartDate" : "2018-10-26",
+                              "adjustedEndDate" : "2019-01-28",
                               "meta" : {
-                                "globalKey" : "cc1c240"
+                                "globalKey" : "4a67d97c"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2018-10-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a34098"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "e8acd15e"
+                              "globalKey" : "a240921a"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-04-26",
                               "adjustedStartDate" : "2019-01-28",
+                              "adjustedEndDate" : "2019-04-26",
                               "meta" : {
-                                "globalKey" : "22e9b23c"
+                                "globalKey" : "24427e00"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-01-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a3f2d8"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             }, {
-                              "adjustedEndDate" : "2019-07-26",
                               "adjustedStartDate" : "2019-04-26",
+                              "adjustedEndDate" : "2019-07-26",
                               "meta" : {
-                                "globalKey" : "13cf003e"
+                                "globalKey" : "aec506be"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-04-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a40a18"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "5c53b85c"
+                              "globalKey" : "59ecee98"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-01-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-10-28",
                               "adjustedStartDate" : "2019-07-26",
+                              "adjustedEndDate" : "2019-10-28",
                               "meta" : {
-                                "globalKey" : "71ea7600"
+                                "globalKey" : "a67db73c"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-07-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a42158"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             }, {
-                              "adjustedEndDate" : "2020-01-27",
                               "adjustedStartDate" : "2019-10-28",
+                              "adjustedEndDate" : "2020-01-27",
                               "meta" : {
-                                "globalKey" : "b3e5303d"
+                                "globalKey" : "8b1f6f5f"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-10-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a43898"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "7bcb0498"
+                              "globalKey" : "e83d66fe"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-07-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-04-27",
                               "adjustedStartDate" : "2020-01-27",
+                              "adjustedEndDate" : "2020-04-27",
                               "meta" : {
-                                "globalKey" : "2ebb0cbf"
+                                "globalKey" : "c9b1133f"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-01-23",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a4eab9"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             }, {
-                              "adjustedEndDate" : "2020-07-27",
                               "adjustedStartDate" : "2020-04-27",
+                              "adjustedEndDate" : "2020-07-27",
                               "meta" : {
-                                "globalKey" : "230a0bff"
+                                "globalKey" : "be00127f"
                               },
+                              "notionalAmount" : 17000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-04-23",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a501f9"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "9438063b"
+                              "globalKey" : "ab1bb63b"
                             }
                           } ]
                         },
-                        "compoundingMethod" : "SPREAD_EXCLUSIVE",
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
                         "meta" : {
-                          "globalKey" : "3c784efa"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "637fde97"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "97b8e49c"
-                            }
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "959"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
-                          }
-                        },
-                        "resetDates" : {
-                          "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "a8f2cb59"
-                          },
-                          "fixingDates" : {
-                            "meta" : {
-                              "globalKey" : "3d9c8eea"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "21479e"
-                              }
-                            },
-                            "businessDayConvention" : "NONE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "de5377cd"
-                            }
-                          },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "de5377cd"
-                          },
-                          "resetDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "b01f2613"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "a9f2dce2"
-                            }
-                          },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "globalKey" : "6a226ef0"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "b8050d79"
+                        "globalKey" : "ecbba139"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "1ac2f4a8"
+                    "globalKey" : "4f798868"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "1ac2f4a8"
+                  "globalKey" : "4f798868"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "7458d4fc"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.01453,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.01453,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 17000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "16c1ca84"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 17000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 17000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "455ecf5b"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
                   },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 17000000
-                    }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1118"
-              },
-              "value" : "2018-04-24"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "cme_trade_id"
-                  },
-                  "value" : "2894761"
+                    "globalKey" : "f59f22c7"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "dd19",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "QAC-11111"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "999",
                   "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "22222"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "dd19"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "dd19",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "package_trade_id"
-                  },
-                  "value" : "22222"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "position_trade_id"
-                  },
-                  "value" : "22222"
+                  "value" : "PLATFORM"
+                },
+                "meta" : {
+                  "globalKey" : "9e635873"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "1117bae4"
+                "globalKey" : "9e635873",
+                "externalKey" : "trade_source"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS2894761"
+                  "value" : "PARTY123"
+                },
+                "meta" : {
+                  "globalKey" : "75895dac"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "75895dac",
+                "externalKey" : "SEF"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "9e635873",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2018-04-24",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "999-123",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "a7071c09"
+                "globalKey" : "24a161c0",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "7514b149"
+            }
+          },
+          "meta" : {
+            "globalKey" : "7514b149"
           }
         }
       }
     } ],
-    "intent" : "CONTRACT_FORMATION",
+    "eventQualifier" : "ContractFormation",
     "after" : [ {
-      "meta" : {
-        "globalKey" : "533e133c"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
       "trade" : {
-        "account" : [ {
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "clearing_firm_accounts"
-            },
-            "value" : "999-123"
-          },
-          "meta" : {
-            "externalKey" : "account1",
-            "globalKey" : "a18b2f80"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
-          },
-          "servicingParty" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
-          }
-        } ],
-        "clearedDate" : "2018-04-24",
-        "meta" : {
-          "globalKey" : "d4c3b719"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "clearing_firm",
-            "globalKey" : "dd19"
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "1051b",
+            "externalReference" : "clearing_service"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "2894761",
               "meta" : {
-                "scheme" : "clearing_member_firms"
-              },
-              "value" : "999"
-            },
-            "meta" : {
-              "globalKey" : "dd19"
+                "scheme" : "cme_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing_service",
-            "globalKey" : "1051b"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "CME"
-            },
-            "meta" : {
-              "globalKey" : "1051b"
+              "value" : "QAC-11111",
+              "meta" : {
+                "scheme" : "client_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "trade_source",
-            "globalKey" : "9e635873"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "PLATFORM"
-            },
-            "meta" : {
-              "globalKey" : "9e635873"
+              "value" : "22222",
+              "meta" : {
+                "scheme" : "platform_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "SEF",
-            "globalKey" : "75895dac"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "PARTY123"
-            },
+              "value" : "22222",
+              "meta" : {
+                "scheme" : "package_trade_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "22222",
+              "meta" : {
+                "scheme" : "position_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "fd5cf798"
+          }
+        }, {
+          "issuer" : {
+            "value" : "1010000023",
             "meta" : {
-              "globalKey" : "75895dac"
+              "scheme" : "cftc_Namespace"
             }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
-          },
-          "partyReference" : {
-            "externalReference" : "trade_source",
-            "globalReference" : "9e635873"
           },
-          "role" : "DATA_SUBMITTER"
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "CCCIRS2894761",
+              "meta" : {
+                "scheme" : "reg_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e12c31ab"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2018-04-24",
+          "meta" : {
+            "globalKey" : "3f1118"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "dd19"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -1707,90 +1647,139 @@
                 "payout" : {
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    },
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
                       }
                     },
+                    "dayCountFraction" : {
+                      "value" : "30/360"
+                    },
                     "calculationPeriodDates" : {
+                      "effectiveDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2013-07-26",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ec508292"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "ec508292"
+                        }
+                      },
+                      "terminationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2020-07-26",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "fa5f1fb"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "979a8ca"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "4cc3c224"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "4cc3c224"
+                        }
+                      },
                       "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "fixedPrimaryBusinessCenters",
-                            "globalReference" : "42f910b"
+                            "globalReference" : "42f910b",
+                            "externalReference" : "fixedPrimaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "fa5f1fb"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "979a8ca"
                         }
                       },
                       "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
                         "meta" : {
-                          "globalKey" : "28c4d"
+                          "globalKey" : "17f79"
                         },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
                         "rollConvention" : "26"
                       },
-                      "effectiveDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "ec508292"
-                          },
-                          "unadjustedDate" : "2013-07-26"
-                        },
+                      "meta" : {
+                        "globalKey" : "730d5895",
+                        "externalKey" : "fixedCalcPeriodDates"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
                         "meta" : {
-                          "globalKey" : "ec508292"
+                          "globalKey" : "aa"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "fixedCalcPeriodDates",
-                        "globalKey" : "f0f90529"
-                      },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "fa5f1fb"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "979a8ca"
-                            }
-                          },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "GBLO"
+                          }, {
+                            "value" : "USNY"
+                          } ],
                           "meta" : {
-                            "globalKey" : "4cc3c224"
-                          },
-                          "unadjustedDate" : "2020-07-26"
+                            "globalKey" : "42f910b",
+                            "externalKey" : "fixedPrimaryBusinessCenters"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "4cc3c224"
+                          "globalKey" : "97b8e49c"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "e18d000c",
+                        "externalKey" : "fixedLegPaymentDates"
                       }
                     },
                     "cashflowRepresentation" : {
@@ -1798,491 +1787,436 @@
                       "paymentCalculationPeriod" : [ {
                         "adjustedPaymentDate" : "2013-10-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2013-10-28",
                           "adjustedStartDate" : "2013-07-26",
+                          "adjustedEndDate" : "2013-10-28",
                           "meta" : {
-                            "globalKey" : "6a521c51"
+                            "globalKey" : "b42c558f"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "39097335"
+                          "globalKey" : "82e3ac73"
                         }
                       }, {
                         "adjustedPaymentDate" : "2014-01-27",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2014-01-27",
                           "adjustedStartDate" : "2013-10-28",
+                          "adjustedEndDate" : "2014-01-27",
                           "meta" : {
-                            "globalKey" : "6cf1a274"
+                            "globalKey" : "b49a178c"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "9d1b2f9"
+                          "globalKey" : "517a2811"
                         }
                       }, {
                         "adjustedPaymentDate" : "2014-04-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2014-04-28",
                           "adjustedStartDate" : "2014-01-27",
+                          "adjustedEndDate" : "2014-04-28",
                           "meta" : {
-                            "globalKey" : "6d5ef012"
+                            "globalKey" : "b73999ee"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "53965076"
+                          "globalKey" : "9d70fa52"
                         }
                       }, {
                         "adjustedPaymentDate" : "2014-07-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2014-07-28",
                           "adjustedStartDate" : "2014-04-28",
+                          "adjustedEndDate" : "2014-07-28",
                           "meta" : {
-                            "globalKey" : "6db90bd3"
+                            "globalKey" : "b794264d"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "9b92e377"
+                          "globalKey" : "e56dfdf1"
                         }
                       }, {
                         "adjustedPaymentDate" : "2014-10-27",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2014-10-27",
                           "adjustedStartDate" : "2014-07-28",
+                          "adjustedEndDate" : "2014-10-27",
                           "meta" : {
-                            "globalKey" : "6e12af74"
+                            "globalKey" : "b7ee3a8c"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "e1da25b9"
+                          "globalKey" : "2bb5b0d1"
                         }
                       }, {
                         "adjustedPaymentDate" : "2015-01-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2015-01-26",
                           "adjustedStartDate" : "2014-10-27",
+                          "adjustedEndDate" : "2015-01-26",
                           "meta" : {
-                            "globalKey" : "70b22a54"
+                            "globalKey" : "b85a9f6c"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "b2a25a3a"
+                          "globalKey" : "fa4acf52"
                         }
                       }, {
                         "adjustedPaymentDate" : "2015-04-27",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2015-04-27",
                           "adjustedStartDate" : "2015-01-26",
+                          "adjustedEndDate" : "2015-04-27",
                           "meta" : {
-                            "globalKey" : "711f77f2"
+                            "globalKey" : "bafa21ce"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "fc66f7b7"
+                          "globalKey" : "4641a193"
                         }
                       }, {
                         "adjustedPaymentDate" : "2015-07-27",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2015-07-27",
                           "adjustedStartDate" : "2015-04-27",
+                          "adjustedEndDate" : "2015-07-27",
                           "meta" : {
-                            "globalKey" : "717993b3"
+                            "globalKey" : "bb54ae2d"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "44638ab8"
+                          "globalKey" : "8e3ea532"
                         }
                       }, {
                         "adjustedPaymentDate" : "2015-10-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2015-10-26",
                           "adjustedStartDate" : "2015-07-27",
+                          "adjustedEndDate" : "2015-10-26",
                           "meta" : {
-                            "globalKey" : "71d33754"
+                            "globalKey" : "bbaec26c"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "8aaaccfa"
+                          "globalKey" : "d4865812"
                         }
                       }, {
                         "adjustedPaymentDate" : "2016-01-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2016-01-26",
                           "adjustedStartDate" : "2015-10-26",
+                          "adjustedEndDate" : "2016-01-26",
                           "meta" : {
-                            "globalKey" : "74732693"
+                            "globalKey" : "bc1b2b0d"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "5d284e79"
+                          "globalKey" : "a4d052f3"
                         }
                       }, {
                         "adjustedPaymentDate" : "2016-04-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2016-04-26",
                           "adjustedStartDate" : "2016-01-26",
+                          "adjustedEndDate" : "2016-04-26",
                           "meta" : {
-                            "globalKey" : "74e00393"
+                            "globalKey" : "bebb1e0d"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "a537a2b9"
+                          "globalKey" : "ef12bd33"
                         }
                       }, {
                         "adjustedPaymentDate" : "2016-07-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2016-07-26",
                           "adjustedStartDate" : "2016-04-26",
+                          "adjustedEndDate" : "2016-07-26",
                           "meta" : {
-                            "globalKey" : "753a1b93"
+                            "globalKey" : "bf15360d"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "ed3431f9"
+                          "globalKey" : "370f4c73"
                         }
                       }, {
                         "adjustedPaymentDate" : "2016-10-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2016-10-26",
                           "adjustedStartDate" : "2016-07-26",
+                          "adjustedEndDate" : "2016-10-26",
                           "meta" : {
-                            "globalKey" : "75943393"
+                            "globalKey" : "bf6f4e0d"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "3530c139"
+                          "globalKey" : "7f0bdbb3"
                         }
                       }, {
                         "adjustedPaymentDate" : "2017-01-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2017-01-26",
                           "adjustedStartDate" : "2016-10-26",
+                          "adjustedEndDate" : "2017-01-26",
                           "meta" : {
-                            "globalKey" : "78342693"
+                            "globalKey" : "bfdc2b0d"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "7ae4679"
+                          "globalKey" : "4f564af3"
                         }
                       }, {
                         "adjustedPaymentDate" : "2017-04-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2017-04-26",
                           "adjustedStartDate" : "2017-01-26",
+                          "adjustedEndDate" : "2017-04-26",
                           "meta" : {
-                            "globalKey" : "78a10393"
+                            "globalKey" : "c27c1e0d"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "4fbd9ab9"
+                          "globalKey" : "9998b533"
                         }
                       }, {
                         "adjustedPaymentDate" : "2017-07-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2017-07-26",
                           "adjustedStartDate" : "2017-04-26",
+                          "adjustedEndDate" : "2017-07-26",
                           "meta" : {
-                            "globalKey" : "78fb1b93"
+                            "globalKey" : "c2d6360d"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "97ba29f9"
+                          "globalKey" : "e1954473"
                         }
                       }, {
                         "adjustedPaymentDate" : "2017-10-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2017-10-26",
                           "adjustedStartDate" : "2017-07-26",
+                          "adjustedEndDate" : "2017-10-26",
                           "meta" : {
-                            "globalKey" : "79553393"
+                            "globalKey" : "c3304e0d"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "dfb6b939"
+                          "globalKey" : "2991d3b3"
                         }
                       }, {
                         "adjustedPaymentDate" : "2018-01-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2018-01-26",
                           "adjustedStartDate" : "2017-10-26",
+                          "adjustedEndDate" : "2018-01-26",
                           "meta" : {
-                            "globalKey" : "7bf52693"
+                            "globalKey" : "c39d2b0d"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "b2343e79"
+                          "globalKey" : "f9dc42f3"
                         }
                       }, {
                         "adjustedPaymentDate" : "2018-04-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2018-04-26",
                           "adjustedStartDate" : "2018-01-26",
+                          "adjustedEndDate" : "2018-04-26",
                           "meta" : {
-                            "globalKey" : "7c620393"
+                            "globalKey" : "c63d1e0d"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "fa4392b9"
+                          "globalKey" : "441ead33"
                         }
                       }, {
                         "adjustedPaymentDate" : "2018-07-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2018-07-26",
                           "adjustedStartDate" : "2018-04-26",
+                          "adjustedEndDate" : "2018-07-26",
                           "meta" : {
-                            "globalKey" : "7cbc1b93"
+                            "globalKey" : "c697360d"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "424021f9"
+                          "globalKey" : "8c1b3c73"
                         }
                       }, {
                         "adjustedPaymentDate" : "2018-10-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2018-10-26",
                           "adjustedStartDate" : "2018-07-26",
+                          "adjustedEndDate" : "2018-10-26",
                           "meta" : {
-                            "globalKey" : "7d163393"
+                            "globalKey" : "c6f14e0d"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "8a3cb139"
+                          "globalKey" : "d417cbb3"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-01-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-01-28",
                           "adjustedStartDate" : "2018-10-26",
+                          "adjustedEndDate" : "2019-01-28",
                           "meta" : {
-                            "globalKey" : "7fb70f51"
+                            "globalKey" : "c75e328f"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "6024d075"
+                          "globalKey" : "a7cbf3b3"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-04-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-04-26",
                           "adjustedStartDate" : "2019-01-28",
+                          "adjustedEndDate" : "2019-04-26",
                           "meta" : {
-                            "globalKey" : "80230b15"
+                            "globalKey" : "c9ff06cb"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "a4c9923b"
+                          "globalKey" : "eea58df1"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-07-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-07-26",
                           "adjustedStartDate" : "2019-04-26",
+                          "adjustedEndDate" : "2019-07-26",
                           "meta" : {
-                            "globalKey" : "807d1b93"
+                            "globalKey" : "ca58360d"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "ecc619f9"
+                          "globalKey" : "36a13473"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-10-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-10-28",
                           "adjustedStartDate" : "2019-07-26",
+                          "adjustedEndDate" : "2019-10-28",
                           "meta" : {
-                            "globalKey" : "80d81c51"
+                            "globalKey" : "cab2558f"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "382d4335"
+                          "globalKey" : "82077c73"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-01-27",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-01-27",
                           "adjustedStartDate" : "2019-10-28",
+                          "adjustedEndDate" : "2020-01-27",
                           "meta" : {
-                            "globalKey" : "8377a274"
+                            "globalKey" : "cb20178c"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "8f582f9"
+                          "globalKey" : "509df811"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-04-27",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-04-27",
                           "adjustedStartDate" : "2020-01-27",
+                          "adjustedEndDate" : "2020-04-27",
                           "meta" : {
-                            "globalKey" : "83e47bb3"
+                            "globalKey" : "cdbf962d"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "5104d378"
+                          "globalKey" : "9adfedf2"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-07-27",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-07-27",
                           "adjustedStartDate" : "2020-04-27",
+                          "adjustedEndDate" : "2020-07-27",
                           "meta" : {
-                            "globalKey" : "843e93b3"
+                            "globalKey" : "ce19ae2d"
                           },
-                          "fixedRate" : 0.01453,
-                          "notionalAmount" : 17000000
+                          "notionalAmount" : 17000000,
+                          "fixedRate" : 0.01453
                         } ],
                         "meta" : {
-                          "globalKey" : "990162b8"
+                          "globalKey" : "e2dc7d32"
                         }
                       } ]
                     },
-                    "dayCountFraction" : {
-                      "value" : "30/360"
-                    },
                     "meta" : {
-                      "globalKey" : "fb6ab07f"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "fixedLegPaymentDates",
-                        "globalKey" : "637fde94"
-                      },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "GBLO"
-                          }, {
-                            "value" : "USNY"
-                          } ],
-                          "meta" : {
-                            "externalKey" : "fixedPrimaryBusinessCenters",
-                            "globalKey" : "42f910b"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "97b8e49c"
-                        }
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
-                      }
-                    },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
-                          }
-                        }
-                      }
+                      "globalKey" : "880e3049"
                     }
                   }, {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-2"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "42f910b"
-                          },
-                          "meta" : {
-                            "globalKey" : "b01f2613"
+                    "rateSpecification" : {
+                      "floatingRate" : {
+                        "rateOption" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "rateOption-1"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "a9f2dce2"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "28c4d"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
-                        "rollConvention" : "26"
-                      },
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/360"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2013-07-26",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -2291,915 +2225,964 @@
                           },
                           "meta" : {
                             "globalKey" : "ec508292"
-                          },
-                          "unadjustedDate" : "2013-07-26"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ec508292"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "floatingCalcPeriodDates",
-                        "globalKey" : "a8f2cb59"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2020-07-26",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "b01f2613"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "a9f2dce2"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "ed3cf63c"
-                          },
-                          "unadjustedDate" : "2020-07-26"
+                            "globalKey" : "ed3cf63c"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "ed3cf63c"
+                        }
+                      },
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "42f910b",
+                            "externalReference" : "floatPrimaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "b01f2613"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "a9f2dce2"
+                        }
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "17f79"
+                        },
+                        "rollConvention" : "26"
+                      },
+                      "meta" : {
+                        "globalKey" : "e3feeac5",
+                        "externalKey" : "floatingCalcPeriodDates"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "107"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "GBLO"
+                          }, {
+                            "value" : "USNY"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "42f910b",
+                            "externalKey" : "floatPrimaryBusinessCenters"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "97b8e49c"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "9e5a4d0f",
+                        "externalKey" : "floatingLegPaymentDates"
+                      }
+                    },
+                    "resetDates" : {
+                      "calculationPeriodDatesReference" : {
+                        "globalReference" : "e3feeac5",
+                        "externalReference" : "floatingCalcPeriodDates"
+                      },
+                      "resetRelativeTo" : "CalculationPeriodStartDate",
+                      "fixingDates" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "1a78799e"
+                        },
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "GBLO"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "21479e"
+                          }
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "8c9a0085",
+                          "externalReference" : "floatingLegResetDates"
+                        }
+                      },
+                      "resetFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
+                      },
+                      "resetDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "42f910b",
+                            "externalReference" : "floatPrimaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "b01f2613"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "ed3cf63c"
+                          "globalKey" : "a9f2dce2"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "8c9a0085",
+                        "externalKey" : "floatingLegResetDates"
                       }
                     },
+                    "compoundingMethod" : "SpreadExclusive",
                     "cashflowRepresentation" : {
                       "cashflowsMatchParameters" : true,
                       "paymentCalculationPeriod" : [ {
                         "adjustedPaymentDate" : "2014-01-27",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2013-10-28",
                           "adjustedStartDate" : "2013-07-26",
+                          "adjustedEndDate" : "2013-10-28",
                           "meta" : {
-                            "globalKey" : "ae664711"
+                            "globalKey" : "e2f9884d"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2013-07-24",
+                              "observedRate" : 0.002643,
                               "meta" : {
                                 "globalKey" : "57d9f269"
-                              },
-                              "observedRate" : 0.002643
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         }, {
-                          "adjustedEndDate" : "2014-01-27",
                           "adjustedStartDate" : "2013-10-28",
+                          "adjustedEndDate" : "2014-01-27",
                           "meta" : {
-                            "globalKey" : "f060f685"
+                            "globalKey" : "c79b35a7"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2013-10-24",
+                              "observedRate" : 0.002381,
                               "meta" : {
                                 "globalKey" : "57d9fee0"
-                              },
-                              "observedRate" : 0.002381
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "6d61a4af"
+                          "globalKey" : "d9d40715"
                         }
                       }, {
                         "adjustedPaymentDate" : "2014-07-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2014-04-28",
                           "adjustedStartDate" : "2014-01-27",
+                          "adjustedEndDate" : "2014-04-28",
                           "meta" : {
-                            "globalKey" : "a01d0e4d"
+                            "globalKey" : "7e1b22b"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2014-01-23",
+                              "observedRate" : 0.002386,
                               "meta" : {
                                 "globalKey" : "57dab106"
-                              },
-                              "observedRate" : 0.002386
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         }, {
-                          "adjustedEndDate" : "2014-07-28",
                           "adjustedStartDate" : "2014-04-28",
+                          "adjustedEndDate" : "2014-07-28",
                           "meta" : {
-                            "globalKey" : "fd1c1144"
+                            "globalKey" : "981217c4"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2014-04-24",
+                              "observedRate" : 0.0022785,
                               "meta" : {
                                 "globalKey" : "bed5f35e"
-                              },
-                              "observedRate" : 0.0022785
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "1c57c33"
+                          "globalKey" : "254e6915"
                         }
                       }, {
                         "adjustedPaymentDate" : "2015-01-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2014-10-27",
                           "adjustedStartDate" : "2014-07-28",
+                          "adjustedEndDate" : "2014-10-27",
                           "meta" : {
-                            "globalKey" : "5589a9e8"
+                            "globalKey" : "23b1130a"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2014-07-24",
+                              "observedRate" : 0.002351,
                               "meta" : {
                                 "globalKey" : "57dadf43"
-                              },
-                              "observedRate" : 0.002351
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         }, {
-                          "adjustedEndDate" : "2015-01-26",
                           "adjustedStartDate" : "2014-10-27",
+                          "adjustedEndDate" : "2015-01-26",
                           "meta" : {
-                            "globalKey" : "9265d9f0"
+                            "globalKey" : "69a01912"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2014-10-23",
+                              "observedRate" : 0.002336,
                               "meta" : {
                                 "globalKey" : "57daf62b"
-                              },
-                              "observedRate" : 0.002336
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "1a73bf62"
+                          "globalKey" : "60f66b22"
                         }
                       }, {
                         "adjustedPaymentDate" : "2015-07-27",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2015-04-27",
                           "adjustedStartDate" : "2015-01-26",
+                          "adjustedEndDate" : "2015-04-27",
                           "meta" : {
-                            "globalKey" : "4221f98d"
+                            "globalKey" : "a9e69d6b"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2015-01-22",
+                              "observedRate" : 0.002561,
                               "meta" : {
                                 "globalKey" : "57dbb026"
-                              },
-                              "observedRate" : 0.002561
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         }, {
-                          "adjustedEndDate" : "2015-07-27",
                           "adjustedStartDate" : "2015-04-27",
+                          "adjustedEndDate" : "2015-07-27",
                           "meta" : {
-                            "globalKey" : "244f3923"
+                            "globalKey" : "bf453fa3"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2015-04-23",
+                              "observedRate" : 0.00277,
                               "meta" : {
                                 "globalKey" : "44052f1d"
-                              },
-                              "observedRate" : 0.00277
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "a536bad1"
+                          "globalKey" : "c8bfa7b3"
                         }
                       }, {
                         "adjustedPaymentDate" : "2016-01-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2015-10-26",
                           "adjustedStartDate" : "2015-07-27",
+                          "adjustedEndDate" : "2015-10-26",
                           "meta" : {
-                            "globalKey" : "f78ea46f"
+                            "globalKey" : "c5b60d91"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2015-07-23",
+                              "observedRate" : 0.002951,
                               "meta" : {
                                 "globalKey" : "57dbedaa"
-                              },
-                              "observedRate" : 0.002951
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         }, {
-                          "adjustedEndDate" : "2016-01-26",
                           "adjustedStartDate" : "2015-10-26",
+                          "adjustedEndDate" : "2016-01-26",
                           "meta" : {
-                            "globalKey" : "695166cc"
+                            "globalKey" : "d5a434c"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2015-10-22",
+                              "observedRate" : 0.003199,
                               "meta" : {
                                 "globalKey" : "57dc5ba6"
-                              },
-                              "observedRate" : 0.003199
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "bf5bc3d7"
+                          "globalKey" : "d2ad0cf5"
                         }
                       }, {
                         "adjustedPaymentDate" : "2016-07-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2016-04-26",
                           "adjustedStartDate" : "2016-01-26",
+                          "adjustedEndDate" : "2016-04-26",
                           "meta" : {
-                            "globalKey" : "e5dd7921"
+                            "globalKey" : "80d37fa1"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2016-01-22",
+                              "observedRate" : 0.006191,
                               "meta" : {
                                 "globalKey" : "57de6afb"
-                              },
-                              "observedRate" : 0.006191
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         }, {
-                          "adjustedEndDate" : "2016-07-26",
                           "adjustedStartDate" : "2016-04-26",
+                          "adjustedEndDate" : "2016-07-26",
                           "meta" : {
-                            "globalKey" : "415ea427"
+                            "globalKey" : "dc54aaa7"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2016-04-22",
+                              "observedRate" : 0.0063585,
                               "meta" : {
                                 "globalKey" : "bf10ae01"
-                              },
-                              "observedRate" : 0.0063585
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "47e1e1c0"
+                          "globalKey" : "5ec591c0"
                         }
                       }, {
                         "adjustedPaymentDate" : "2017-01-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2016-10-26",
                           "adjustedStartDate" : "2016-07-26",
+                          "adjustedEndDate" : "2016-10-26",
                           "meta" : {
-                            "globalKey" : "baa32e88"
+                            "globalKey" : "55993508"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2016-07-22",
+                              "observedRate" : 0.00721,
                               "meta" : {
                                 "globalKey" : "44065062"
-                              },
-                              "observedRate" : 0.00721
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         }, {
-                          "adjustedEndDate" : "2017-01-26",
                           "adjustedStartDate" : "2016-10-26",
+                          "adjustedEndDate" : "2017-01-26",
                           "meta" : {
-                            "globalKey" : "a943551e"
+                            "globalKey" : "4d4c319e"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2016-10-24",
+                              "observedRate" : 0.0088372,
                               "meta" : {
                                 "globalKey" : "bf2f49f8"
-                              },
-                              "observedRate" : 0.0088372
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "33d751f0"
+                          "globalKey" : "53cdd7f0"
                         }
                       }, {
                         "adjustedPaymentDate" : "2017-07-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2017-04-26",
                           "adjustedStartDate" : "2017-01-26",
+                          "adjustedEndDate" : "2017-04-26",
                           "meta" : {
-                            "globalKey" : "270fd99e"
+                            "globalKey" : "c205e01e"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2017-01-24",
+                              "observedRate" : 0.0103178,
                               "meta" : {
                                 "globalKey" : "c071cb78"
-                              },
-                              "observedRate" : 0.0103178
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         }, {
-                          "adjustedEndDate" : "2017-07-26",
                           "adjustedStartDate" : "2017-04-26",
+                          "adjustedEndDate" : "2017-07-26",
                           "meta" : {
-                            "globalKey" : "b2d854b1"
+                            "globalKey" : "4dce5b31"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2017-04-24",
+                              "observedRate" : 0.011665,
                               "meta" : {
                                 "globalKey" : "57eb5e8b"
-                              },
-                              "observedRate" : 0.011665
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "94a0232d"
+                          "globalKey" : "ab83d32d"
                         }
                       }, {
                         "adjustedPaymentDate" : "2018-01-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2017-10-26",
                           "adjustedStartDate" : "2017-07-26",
+                          "adjustedEndDate" : "2017-10-26",
                           "meta" : {
-                            "globalKey" : "fd73d85"
+                            "globalKey" : "aacd4405"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2017-07-24",
+                              "observedRate" : 0.0131389,
                               "meta" : {
                                 "globalKey" : "c09b5f5f"
-                              },
-                              "observedRate" : 0.0131389
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         }, {
-                          "adjustedEndDate" : "2018-01-26",
                           "adjustedStartDate" : "2017-10-26",
+                          "adjustedEndDate" : "2018-01-26",
                           "meta" : {
-                            "globalKey" : "83513079"
+                            "globalKey" : "275a0cf9"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2017-10-24",
+                              "observedRate" : 0.0137064,
                               "meta" : {
                                 "globalKey" : "c09e2553"
-                              },
-                              "observedRate" : 0.0137064
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "7f1ebfae"
+                          "globalKey" : "9f1545ae"
                         }
                       }, {
                         "adjustedPaymentDate" : "2018-07-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2018-04-26",
                           "adjustedStartDate" : "2018-01-26",
+                          "adjustedEndDate" : "2018-04-26",
                           "meta" : {
-                            "globalKey" : "136245"
+                            "globalKey" : "9b0968c5"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2018-01-24",
+                              "observedRate" : 0.0175246,
                               "meta" : {
                                 "globalKey" : "c0d6541f"
-                              },
-                              "observedRate" : 0.0175246
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         }, {
-                          "adjustedEndDate" : "2018-07-26",
                           "adjustedStartDate" : "2018-04-26",
+                          "adjustedEndDate" : "2018-07-26",
                           "meta" : {
-                            "globalKey" : "3b2f083e"
+                            "globalKey" : "d6250ebe"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2018-04-24",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a31218"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "5d3e9c33"
+                          "globalKey" : "74224c33"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-01-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2018-10-26",
                           "adjustedStartDate" : "2018-07-26",
+                          "adjustedEndDate" : "2018-10-26",
                           "meta" : {
-                            "globalKey" : "2f7e077e"
+                            "globalKey" : "ca740dfe"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2018-07-24",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a32958"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         }, {
-                          "adjustedEndDate" : "2019-01-28",
                           "adjustedStartDate" : "2018-10-26",
+                          "adjustedEndDate" : "2019-01-28",
                           "meta" : {
-                            "globalKey" : "cc1c240"
+                            "globalKey" : "4a67d97c"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2018-10-24",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a34098"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "e8acd15e"
+                          "globalKey" : "a240921a"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-07-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-04-26",
                           "adjustedStartDate" : "2019-01-28",
+                          "adjustedEndDate" : "2019-04-26",
                           "meta" : {
-                            "globalKey" : "22e9b23c"
+                            "globalKey" : "24427e00"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2019-01-24",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a3f2d8"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         }, {
-                          "adjustedEndDate" : "2019-07-26",
                           "adjustedStartDate" : "2019-04-26",
+                          "adjustedEndDate" : "2019-07-26",
                           "meta" : {
-                            "globalKey" : "13cf003e"
+                            "globalKey" : "aec506be"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2019-04-24",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a40a18"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "5c53b85c"
+                          "globalKey" : "59ecee98"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-01-27",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-10-28",
                           "adjustedStartDate" : "2019-07-26",
+                          "adjustedEndDate" : "2019-10-28",
                           "meta" : {
-                            "globalKey" : "71ea7600"
+                            "globalKey" : "a67db73c"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2019-07-24",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a42158"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         }, {
-                          "adjustedEndDate" : "2020-01-27",
                           "adjustedStartDate" : "2019-10-28",
+                          "adjustedEndDate" : "2020-01-27",
                           "meta" : {
-                            "globalKey" : "b3e5303d"
+                            "globalKey" : "8b1f6f5f"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2019-10-24",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a43898"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "7bcb0498"
+                          "globalKey" : "e83d66fe"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-07-27",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-04-27",
                           "adjustedStartDate" : "2020-01-27",
+                          "adjustedEndDate" : "2020-04-27",
                           "meta" : {
-                            "globalKey" : "2ebb0cbf"
+                            "globalKey" : "c9b1133f"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2020-01-23",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a4eab9"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 17000000
+                          }
                         }, {
-                          "adjustedEndDate" : "2020-07-27",
                           "adjustedStartDate" : "2020-04-27",
+                          "adjustedEndDate" : "2020-07-27",
                           "meta" : {
-                            "globalKey" : "230a0bff"
+                            "globalKey" : "be00127f"
                           },
+                          "notionalAmount" : 17000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2020-04-23",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a501f9"
-                              },
-                              "observedRate" : 0
-                            } ]
-                          },
-                          "notionalAmount" : 17000000
-                        } ],
-                        "meta" : {
-                          "globalKey" : "9438063b"
-                        }
-                      } ]
-                    },
-                    "compoundingMethod" : "SPREAD_EXCLUSIVE",
-                    "dayCountFraction" : {
-                      "value" : "ACT/360"
-                    },
-                    "meta" : {
-                      "globalKey" : "3c784efa"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "floatingLegPaymentDates",
-                        "globalKey" : "637fde97"
-                      },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "GBLO"
-                          }, {
-                            "value" : "USNY"
-                          } ],
-                          "meta" : {
-                            "externalKey" : "floatPrimaryBusinessCenters",
-                            "globalKey" : "42f910b"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "97b8e49c"
-                        }
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "959"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6
-                      }
-                    },
-                    "rateSpecification" : {
-                      "floatingRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateOption" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "rateOption-1"
-                          }
-                        }
-                      }
-                    },
-                    "resetDates" : {
-                      "calculationPeriodDatesReference" : {
-                        "externalReference" : "floatingCalcPeriodDates",
-                        "globalReference" : "a8f2cb59"
-                      },
-                      "fixingDates" : {
-                        "meta" : {
-                          "globalKey" : "3d9c8eea"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "GBLO"
-                          } ],
-                          "meta" : {
-                            "globalKey" : "21479e"
-                          }
-                        },
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "floatingLegResetDates",
-                          "globalReference" : "de5377cd"
-                        }
-                      },
-                      "meta" : {
-                        "externalKey" : "floatingLegResetDates",
-                        "globalKey" : "de5377cd"
-                      },
-                      "resetDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "42f910b"
-                          },
-                          "meta" : {
-                            "globalKey" : "b01f2613"
+                              }
+                            } ]
                           }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
+                        } ],
                         "meta" : {
-                          "globalKey" : "a9f2dce2"
+                          "globalKey" : "ab1bb63b"
                         }
-                      },
-                      "resetFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
-                      },
-                      "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                      } ]
+                    },
+                    "meta" : {
+                      "globalKey" : "6a226ef0"
                     }
                   } ],
                   "meta" : {
-                    "globalKey" : "b8050d79"
+                    "globalKey" : "ecbba139"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "1ac2f4a8"
+                "globalKey" : "4f798868"
               }
             },
             "meta" : {
-              "globalKey" : "1ac2f4a8"
+              "globalKey" : "4f798868"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "7458d4fc"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.01453,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.01453,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
                 }
               } ],
               "quantity" : [ {
+                "value" : {
+                  "value" : 17000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "16c1ca84"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 17000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 17000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
                 }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "455ecf5b"
-              },
+              } ],
               "observable" : {
-                "meta" : {
-                  "globalKey" : "5f0c6d05"
-                },
                 "rateOption" : {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "rateOption-1"
-                    } ]
-                  },
                   "value" : {
                     "floatingRateIndex" : {
                       "value" : "USD-LIBOR-BBA"
                     },
                     "indexTenor" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
+                      "periodMultiplier" : 3,
                       "period" : "M",
-                      "periodMultiplier" : 3
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "rateOption-1"
+                    } ]
                   }
-                }
-              },
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
                 },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 17000000
+                "meta" : {
+                  "globalKey" : "828026c7"
                 }
-              } ]
-            } ]
-          } ]
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f1118"
-          },
-          "value" : "2018-04-24"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "cme_trade_id"
               },
-              "value" : "2894761"
-            }
-          }, {
-            "identifier" : {
               "meta" : {
-                "scheme" : "client_trade_id"
-              },
-              "value" : "QAC-11111"
+                "globalKey" : "f59f22c7"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "dd19",
+              "externalReference" : "clearing_firm"
             }
           }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
+            }
+          } ]
+        },
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "999",
               "meta" : {
-                "scheme" : "platform_trade_id"
-              },
-              "value" : "22222"
+                "scheme" : "clearing_member_firms"
+              }
+            },
+            "meta" : {
+              "globalKey" : "dd19"
             }
-          }, {
+          } ],
+          "meta" : {
+            "globalKey" : "dd19",
+            "externalKey" : "clearing_firm"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "package_trade_id"
-              },
-              "value" : "22222"
+              "value" : "CME"
+            },
+            "meta" : {
+              "globalKey" : "1051b"
             }
-          }, {
+          } ],
+          "meta" : {
+            "globalKey" : "1051b",
+            "externalKey" : "clearing_service"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "position_trade_id"
-              },
-              "value" : "22222"
+              "value" : "PLATFORM"
+            },
+            "meta" : {
+              "globalKey" : "9e635873"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "clearing_service",
-            "globalReference" : "1051b"
-          },
           "meta" : {
-            "globalKey" : "1117bae4"
+            "globalKey" : "9e635873",
+            "externalKey" : "trade_source"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "reg_trade_id"
-              },
-              "value" : "CCCIRS2894761"
+              "value" : "PARTY123"
+            },
+            "meta" : {
+              "globalKey" : "75895dac"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "75895dac",
+            "externalKey" : "SEF"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "9e635873",
+            "externalReference" : "trade_source"
+          },
+          "role" : "DataSubmitter",
+          "ownershipPartyReference" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
+          }
+        } ],
+        "clearedDate" : "2018-04-24",
+        "account" : [ {
+          "partyReference" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
+          },
+          "accountNumber" : {
+            "value" : "999-123",
             "meta" : {
-              "scheme" : "cftc_Namespace"
-            },
-            "value" : "1010000023"
+              "scheme" : "clearing_firm_accounts"
+            }
+          },
+          "servicingParty" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
           },
           "meta" : {
-            "globalKey" : "a7071c09"
+            "globalKey" : "24a161c0",
+            "externalKey" : "account1"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "7514b149"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
+      },
+      "meta" : {
+        "globalKey" : "fea06f6c"
       }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "3f966ae7"
+      "globalKey" : "3b29e2e7"
     }
   },
+  "previousWorkflowStep" : {
+    "globalReference" : "521765c"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "1K08850539",
       "meta" : {
         "scheme" : "cme_message_id"
-      },
-      "value" : "1K08850539"
+      }
     },
     "sentBy" : {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
+      }
     },
     "sentTo" : [ {
+      "value" : "999",
       "meta" : {
         "scheme" : "cme_firm_id"
-      },
-      "value" : "999"
+      }
     }, {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
+      }
     } ]
   },
-  "meta" : {
-    "globalKey" : "3d4dc173"
-  },
+  "timestamp" : [ {
+    "dateTime" : "2018-04-24T20:51:59Z",
+    "qualification" : "eventCreationDateTime"
+  }, {
+    "dateTime" : "2018-04-24T20:51:51Z",
+    "qualification" : "clearingReceiptDateTime"
+  } ],
   "party" : [ {
-    "meta" : {
-      "externalKey" : "clearing_firm",
-      "globalKey" : "dd19"
-    },
     "partyId" : [ {
       "identifier" : {
+        "value" : "999",
         "meta" : {
           "scheme" : "clearing_member_firms"
-        },
-        "value" : "999"
+        }
       },
       "meta" : {
         "globalKey" : "dd19"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "clearing_service",
-      "globalKey" : "1051b"
-    },
+      "globalKey" : "dd19",
+      "externalKey" : "clearing_firm"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "CME"
@@ -3207,12 +3190,12 @@
       "meta" : {
         "globalKey" : "1051b"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "trade_source",
-      "globalKey" : "9e635873"
-    },
+      "globalKey" : "1051b",
+      "externalKey" : "clearing_service"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "PLATFORM"
@@ -3220,12 +3203,12 @@
       "meta" : {
         "globalKey" : "9e635873"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "SEF",
-      "globalKey" : "75895dac"
-    },
+      "globalKey" : "9e635873",
+      "externalKey" : "trade_source"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "PARTY123"
@@ -3233,16 +3216,33 @@
       "meta" : {
         "globalKey" : "75895dac"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "75895dac",
+      "externalKey" : "SEF"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "a84836c6"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2018-04-24T20:51:59Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  }, {
-    "dateTime" : "2018-04-24T20:51:51Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
-  } ]
+  "account" : [ {
+    "partyReference" : {
+      "globalReference" : "dd19",
+      "externalReference" : "clearing_firm"
+    },
+    "accountNumber" : {
+      "value" : "999-123",
+      "meta" : {
+        "scheme" : "clearing_firm_accounts"
+      }
+    },
+    "servicingParty" : {
+      "globalReference" : "dd19",
+      "externalReference" : "clearing_firm"
+    },
+    "meta" : {
+      "globalKey" : "24a161c0",
+      "externalKey" : "account1"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "b3f2d329"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex05-Fixed-Float-with-Long-Stub-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex05-Fixed-Float-with-Long-Stub-func-output.json
index b83dca81dc..5cbac01caf 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex05-Fixed-Float-with-Long-Stub-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex05-Fixed-Float-with-Long-Stub-func-output.json
@@ -1,137 +1,94 @@
 {
-  "account" : [ {
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "clearing_firm_accounts"
-      },
-      "value" : "999-123"
-    },
-    "meta" : {
-      "externalKey" : "account1",
-      "globalKey" : "a18b2f80"
-    },
-    "partyReference" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "dd19"
-    },
-    "servicingParty" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "dd19"
-    }
-  } ],
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "8e973705"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "999-123"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "a18b2f80"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              }
-            } ],
-            "clearedDate" : "2018-04-24",
-            "meta" : {
-              "globalKey" : "8e973705"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "dd19"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "2894761",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "999"
-                },
-                "meta" : {
-                  "globalKey" : "dd19"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "QAC-11111",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "9e635873"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "PLATFORM"
-                },
-                "meta" : {
-                  "globalKey" : "9e635873"
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "SEF",
-                "globalKey" : "75895dac"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "PARTY123"
-                },
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "risk_approval_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "package_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "position_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "5eab67fc"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "75895dac"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "9e635873"
               },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS2894761",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e12c31ab"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-04-24",
+              "meta" : {
+                "globalKey" : "3f1118"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "dd19"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -142,46 +99,42 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "fa5f1fb"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "979a8ca"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28caa"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "26"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-24",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -190,44 +143,97 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3d250"
-                              },
-                              "unadjustedDate" : "2018-04-24"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3d250"
                             }
                           },
-                          "firstRegularPeriodStartDate" : "2018-10-26",
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "ab78b58f"
-                          },
-                          "stubPeriodType" : "LONG_INITIAL",
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2023-04-26",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "fixedPrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "fixedPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "fa5f1fb"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "979a8ca"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "11ffc964"
-                              },
-                              "unadjustedDate" : "2023-04-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "11ffc964"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "fa5f1fb"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "979a8ca"
+                            }
+                          },
+                          "firstRegularPeriodStartDate" : "2018-10-26",
+                          "stubPeriodType" : "LongInitial",
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "18abc"
+                            },
+                            "rollConvention" : "26"
+                          },
+                          "meta" : {
+                            "globalKey" : "b23ff5a1",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b",
+                                "externalKey" : "fixedPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "9e5a4d0f",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -235,239 +241,184 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2018-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-10-26",
                               "adjustedStartDate" : "2018-04-24",
+                              "adjustedEndDate" : "2018-10-26",
                               "meta" : {
-                                "globalKey" : "4db1c6e6"
+                                "globalKey" : "4cbf649a"
                               },
-                              "fixedRate" : 0.032,
-                              "notionalAmount" : 700000
+                              "notionalAmount" : 700000,
+                              "fixedRate" : 0.032
                             } ],
                             "meta" : {
-                              "globalKey" : "5ad8448c"
+                              "globalKey" : "59e5e240"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-04-26",
                               "adjustedStartDate" : "2018-10-26",
+                              "adjustedEndDate" : "2019-04-26",
                               "meta" : {
-                                "globalKey" : "50abd968"
+                                "globalKey" : "4d874258"
                               },
-                              "fixedRate" : 0.032,
-                              "notionalAmount" : 700000
+                              "notionalAmount" : 700000,
+                              "fixedRate" : 0.032
                             } ],
                             "meta" : {
-                              "globalKey" : "7552608e"
+                              "globalKey" : "722dc97e"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-10-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-10-28",
                               "adjustedStartDate" : "2019-04-26",
+                              "adjustedEndDate" : "2019-10-28",
                               "meta" : {
-                                "globalKey" : "5173b726"
+                                "globalKey" : "508154da"
                               },
-                              "fixedRate" : 0.032,
-                              "notionalAmount" : 700000
+                              "notionalAmount" : 700000,
+                              "fixedRate" : 0.032
                             } ],
                             "meta" : {
-                              "globalKey" : "8c8de0a"
+                              "globalKey" : "7d67bbe"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-04-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-04-27",
                               "adjustedStartDate" : "2019-10-28",
+                              "adjustedEndDate" : "2020-04-27",
                               "meta" : {
-                                "globalKey" : "546d5549"
+                                "globalKey" : "51492ed7"
                               },
-                              "fixedRate" : 0.032,
-                              "notionalAmount" : 700000
+                              "notionalAmount" : 700000,
+                              "fixedRate" : 0.032
                             } ],
                             "meta" : {
-                              "globalKey" : "218dad0e"
+                              "globalKey" : "1e69869c"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-10-26",
                               "adjustedStartDate" : "2020-04-27",
+                              "adjustedEndDate" : "2020-10-26",
                               "meta" : {
-                                "globalKey" : "5533d229"
+                                "globalKey" : "5442c1b7"
                               },
-                              "fixedRate" : 0.032,
-                              "notionalAmount" : 700000
+                              "notionalAmount" : 700000,
+                              "fixedRate" : 0.032
                             } ],
                             "meta" : {
-                              "globalKey" : "afe43fcf"
+                              "globalKey" : "aef32f5d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-04-26",
                               "adjustedStartDate" : "2020-10-26",
+                              "adjustedEndDate" : "2021-04-26",
                               "meta" : {
-                                "globalKey" : "582dd968"
+                                "globalKey" : "55094258"
                               },
-                              "fixedRate" : 0.032,
-                              "notionalAmount" : 700000
+                              "notionalAmount" : 700000,
+                              "fixedRate" : 0.032
                             } ],
                             "meta" : {
-                              "globalKey" : "ca5e508e"
+                              "globalKey" : "c739b97e"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-10-26",
                               "adjustedStartDate" : "2021-04-26",
+                              "adjustedEndDate" : "2021-10-26",
                               "meta" : {
-                                "globalKey" : "58f4ce68"
+                                "globalKey" : "58034d58"
                               },
-                              "fixedRate" : 0.032,
-                              "notionalAmount" : 700000
+                              "notionalAmount" : 700000,
+                              "fixedRate" : 0.032
                             } ],
                             "meta" : {
-                              "globalKey" : "5a6a340e"
+                              "globalKey" : "5978b2fe"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-04-26",
                               "adjustedStartDate" : "2021-10-26",
+                              "adjustedEndDate" : "2022-04-26",
                               "meta" : {
-                                "globalKey" : "5beed968"
+                                "globalKey" : "58ca4258"
                               },
-                              "fixedRate" : 0.032,
-                              "notionalAmount" : 700000
+                              "notionalAmount" : 700000,
+                              "fixedRate" : 0.032
                             } ],
                             "meta" : {
-                              "globalKey" : "74e4488e"
+                              "globalKey" : "71bfb17e"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-10-26",
                               "adjustedStartDate" : "2022-04-26",
+                              "adjustedEndDate" : "2022-10-26",
                               "meta" : {
-                                "globalKey" : "5cb5ce68"
+                                "globalKey" : "5bc44d58"
                               },
-                              "fixedRate" : 0.032,
-                              "notionalAmount" : 700000
+                              "notionalAmount" : 700000,
+                              "fixedRate" : 0.032
                             } ],
                             "meta" : {
-                              "globalKey" : "4f02c0e"
+                              "globalKey" : "3feaafe"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-04-26",
                               "adjustedStartDate" : "2022-10-26",
+                              "adjustedEndDate" : "2023-04-26",
                               "meta" : {
-                                "globalKey" : "5fafd968"
+                                "globalKey" : "5c8b4258"
                               },
-                              "fixedRate" : 0.032,
-                              "notionalAmount" : 700000
+                              "notionalAmount" : 700000,
+                              "fixedRate" : 0.032
                             } ],
                             "meta" : {
-                              "globalKey" : "1f6a408e"
+                              "globalKey" : "1c45a97e"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "30/360"
-                        },
                         "meta" : {
-                          "globalKey" : "447aa979"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "637fde97"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "fixedPrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "97b8e49c"
-                            }
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "959"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }, {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "globalKey" : "21a1d45f"
+                        }
+                      }, {
+                        "payerReceiver" : {
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "b01f2613"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "a9f2dce2"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c4d"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "26"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-24",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -476,44 +427,151 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3d250"
-                              },
-                              "unadjustedDate" : "2018-04-24"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3d250"
                             }
                           },
-                          "firstRegularPeriodStartDate" : "2018-07-26",
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "d4b9e162"
-                          },
-                          "stubPeriodType" : "LONG_INITIAL",
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2023-04-26",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "b01f2613"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "a9f2dce2"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "b278fd7c"
-                              },
-                              "unadjustedDate" : "2023-04-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "b278fd7c"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "b01f2613"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "a9f2dce2"
+                            }
+                          },
+                          "firstRegularPeriodStartDate" : "2018-07-26",
+                          "stubPeriodType" : "LongInitial",
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f79"
+                            },
+                            "rollConvention" : "26"
+                          },
+                          "meta" : {
+                            "globalKey" : "4b5e654e",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b",
+                                "externalKey" : "floatPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "e18d000c",
+                            "externalKey" : "floatingLegPaymentDates"
+                          }
+                        },
+                        "resetDates" : {
+                          "calculationPeriodDatesReference" : {
+                            "globalReference" : "4b5e654e",
+                            "externalReference" : "floatingCalcPeriodDates"
+                          },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
+                          "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "c1bdb713"
+                            },
+                            "dayType" : "Business",
+                            "businessDayConvention" : "PRECEDING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "21479e"
+                              }
+                            },
+                            "dateRelativeTo" : {
+                              "globalReference" : "5c888587",
+                              "externalReference" : "floatingLegResetDates"
+                            }
+                          },
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "b01f2613"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "a9f2dce2"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "5c888587",
+                            "externalKey" : "floatingLegResetDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -521,882 +579,778 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2018-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-07-26",
                               "adjustedStartDate" : "2018-04-24",
+                              "adjustedEndDate" : "2018-07-26",
                               "meta" : {
-                                "globalKey" : "2a54a814"
+                                "globalKey" : "5ee7e950"
                               },
+                              "notionalAmount" : 700000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2018-04-20",
+                                  "observedRate" : 0.0236253,
                                   "meta" : {
                                     "globalKey" : "c25359f9"
-                                  },
-                                  "observedRate" : 0.0236253
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "49393fee"
+                              "globalKey" : "7dcc812a"
                             }
                           }, {
                             "adjustedPaymentDate" : "2018-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-10-26",
                               "adjustedStartDate" : "2018-07-26",
+                              "adjustedEndDate" : "2018-10-26",
                               "meta" : {
-                                "globalKey" : "675d10b1"
+                                "globalKey" : "2531731"
                               },
+                              "notionalAmount" : 700000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2018-07-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a32958"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "b994e94b"
+                              "globalKey" : "548aefcb"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-01-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-01-28",
                               "adjustedStartDate" : "2018-10-26",
+                              "adjustedEndDate" : "2019-01-28",
                               "meta" : {
-                                "globalKey" : "44a0cb73"
+                                "globalKey" : "8246e2af"
                               },
+                              "notionalAmount" : 700000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2018-10-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a34098"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "48dfc7cf"
+                              "globalKey" : "8685df0b"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-04-26",
                               "adjustedStartDate" : "2019-01-28",
+                              "adjustedEndDate" : "2019-04-26",
                               "meta" : {
-                                "globalKey" : "5ac8bb6f"
+                                "globalKey" : "5c218733"
                               },
+                              "notionalAmount" : 700000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-01-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a3f2d8"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "69d21a89"
+                              "globalKey" : "6b2ae64d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-07-26",
                               "adjustedStartDate" : "2019-04-26",
+                              "adjustedEndDate" : "2019-07-26",
                               "meta" : {
-                                "globalKey" : "4bae0971"
+                                "globalKey" : "e6a40ff1"
                               },
+                              "notionalAmount" : 700000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-04-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a40a18"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "8e0aa94b"
+                              "globalKey" : "2900afcb"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-10-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-10-28",
                               "adjustedStartDate" : "2019-07-26",
+                              "adjustedEndDate" : "2019-10-28",
                               "meta" : {
-                                "globalKey" : "a9c97f33"
+                                "globalKey" : "de5cc06f"
                               },
+                              "notionalAmount" : 700000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-07-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a42158"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "48023dcf"
+                              "globalKey" : "7c957f0b"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-01-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-01-27",
                               "adjustedStartDate" : "2019-10-28",
+                              "adjustedEndDate" : "2020-01-27",
                               "meta" : {
-                                "globalKey" : "ebc43970"
+                                "globalKey" : "c2fe7892"
                               },
+                              "notionalAmount" : 700000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-10-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a43898"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "7f36cecb"
+                              "globalKey" : "56710ded"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-04-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-04-27",
                               "adjustedStartDate" : "2020-01-27",
+                              "adjustedEndDate" : "2020-04-27",
                               "meta" : {
-                                "globalKey" : "669a15f2"
+                                "globalKey" : "1901c72"
                               },
+                              "notionalAmount" : 700000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-01-23",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a4eab9"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "2d5fec0d"
+                              "globalKey" : "c855f28d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-07-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-07-27",
                               "adjustedStartDate" : "2020-04-27",
+                              "adjustedEndDate" : "2020-07-27",
                               "meta" : {
-                                "globalKey" : "5ae91532"
+                                "globalKey" : "f5df1bb2"
                               },
+                              "notionalAmount" : 700000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-04-23",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a501f9"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "55022c0d"
+                              "globalKey" : "eff8328d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-10-26",
                               "adjustedStartDate" : "2020-07-27",
+                              "adjustedEndDate" : "2020-10-26",
                               "meta" : {
-                                "globalKey" : "1a51d931"
+                                "globalKey" : "e8794253"
                               },
+                              "notionalAmount" : 700000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-07-23",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a51939"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "b379c1cb"
+                              "globalKey" : "81a12aed"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-01-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-01-26",
                               "adjustedStartDate" : "2020-10-26",
+                              "adjustedEndDate" : "2021-01-26",
                               "meta" : {
-                                "globalKey" : "8c1444b3"
+                                "globalKey" : "301d2133"
                               },
+                              "notionalAmount" : 700000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-10-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a5305a"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "aeba730d"
+                              "globalKey" : "52c34f8d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-04-26",
                               "adjustedStartDate" : "2021-01-26",
+                              "adjustedEndDate" : "2021-04-26",
                               "meta" : {
-                                "globalKey" : "89ef9f3"
+                                "globalKey" : "a3950073"
                               },
+                              "notionalAmount" : 700000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-01-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a5e29a"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "5e98690d"
+                              "globalKey" : "f98e6f8d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-07-26",
                               "adjustedStartDate" : "2021-04-26",
+                              "adjustedEndDate" : "2021-07-26",
                               "meta" : {
-                                "globalKey" : "fcedf933"
+                                "globalKey" : "97e3ffb3"
                               },
+                              "notionalAmount" : 700000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-04-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a5f9da"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "863aa90d"
+                              "globalKey" : "2130af8d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-10-26",
                               "adjustedStartDate" : "2021-07-26",
+                              "adjustedEndDate" : "2021-10-26",
                               "meta" : {
-                                "globalKey" : "f13cf873"
+                                "globalKey" : "8c32fef3"
                               },
+                              "notionalAmount" : 700000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-07-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a6111a"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "addce90d"
+                              "globalKey" : "48d2ef8d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-01-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-01-26",
                               "adjustedStartDate" : "2021-10-26",
+                              "adjustedEndDate" : "2022-01-26",
                               "meta" : {
-                                "globalKey" : "64b43cb3"
+                                "globalKey" : "8bd1933"
                               },
+                              "notionalAmount" : 700000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-10-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a6285a"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "aad2730d"
+                              "globalKey" : "4edb4f8d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-04-26",
                               "adjustedStartDate" : "2022-01-26",
+                              "adjustedEndDate" : "2022-04-26",
                               "meta" : {
-                                "globalKey" : "e13ef231"
+                                "globalKey" : "7c34f8b1"
                               },
+                              "notionalAmount" : 700000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-01-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a6dad8"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "5ab0694b"
+                              "globalKey" : "f5a66fcb"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-07-26",
                               "adjustedStartDate" : "2022-04-26",
+                              "adjustedEndDate" : "2022-07-26",
                               "meta" : {
-                                "globalKey" : "d58df133"
+                                "globalKey" : "7083f7b3"
                               },
+                              "notionalAmount" : 700000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-04-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a6f1da"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "8252a90d"
+                              "globalKey" : "1d48af8d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-10-26",
                               "adjustedStartDate" : "2022-07-26",
+                              "adjustedEndDate" : "2022-10-26",
                               "meta" : {
-                                "globalKey" : "c9dcf073"
+                                "globalKey" : "64d2f6f3"
                               },
+                              "notionalAmount" : 700000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-07-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a7091a"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "a9f4e90d"
+                              "globalKey" : "44eaef8d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-01-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-01-26",
                               "adjustedStartDate" : "2022-10-26",
+                              "adjustedEndDate" : "2023-01-26",
                               "meta" : {
-                                "globalKey" : "3d5434f1"
+                                "globalKey" : "e15d1171"
                               },
+                              "notionalAmount" : 700000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-10-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a72098"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "a6ea734b"
+                              "globalKey" : "4af34fcb"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-04-26",
                               "adjustedStartDate" : "2023-01-26",
+                              "adjustedEndDate" : "2023-04-26",
                               "meta" : {
-                                "globalKey" : "b9deea31"
+                                "globalKey" : "54d4f0b1"
                               },
+                              "notionalAmount" : 700000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2023-01-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a7d2d8"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "56c8694b"
+                              "globalKey" : "f1be6fcb"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "95f593e8"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "637fde94"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "97b8e49c"
-                            }
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
-                          }
-                        },
-                        "resetDates" : {
-                          "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "d4b9e162"
-                          },
-                          "fixingDates" : {
-                            "meta" : {
-                              "globalKey" : "e4e1cc5f"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "21479e"
-                              }
-                            },
-                            "businessDayConvention" : "PRECEDING",
-                            "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "d843714f"
-                            }
-                          },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "d843714f"
-                          },
-                          "resetDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "b01f2613"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "a9f2dce2"
-                            }
-                          },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
-                        },
                         "stubPeriod" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "d4b9e162"
+                            "globalReference" : "4b5e654e",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
                           "initialStub" : {
                             "floatingRate" : [ {
                               "floatingRateIndex" : "USD-LIBOR-BBA",
                               "indexTenor" : {
-                                "meta" : {
-                                  "globalKey" : "956"
-                                },
+                                "periodMultiplier" : 3,
                                 "period" : "M",
-                                "periodMultiplier" : 3
+                                "meta" : {
+                                  "globalKey" : "aa"
+                                }
                               }
                             }, {
                               "floatingRateIndex" : "USD-LIBOR-BBA",
                               "indexTenor" : {
-                                "meta" : {
-                                  "globalKey" : "959"
-                                },
+                                "periodMultiplier" : 6,
                                 "period" : "M",
-                                "periodMultiplier" : 6
+                                "meta" : {
+                                  "globalKey" : "107"
+                                }
                               }
                             } ]
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "91b1159a"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "77aa9f61"
+                        "globalKey" : "349eb7f9"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "cf9d4710"
+                    "globalKey" : "8c915fa8"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "cf9d4710"
+                  "globalKey" : "8c915fa8"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "dd8b87c7"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.032,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.032,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 700000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "d3e57119"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 700000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 700000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "57b053c8"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 700000
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1118"
-              },
-              "value" : "2018-04-24"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "2894761"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "QAC-11111"
+                    "globalKey" : "683bc2f4"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "dd19",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "22222"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "999",
                   "meta" : {
-                    "scheme" : "risk_approval_id"
-                  },
-                  "value" : "22222"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "dd19"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "dd19",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "22222"
-                }
-              }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "package_trade_id"
-                  },
-                  "value" : "22222"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "position_trade_id"
-                  },
-                  "value" : "22222"
+                  "value" : "PLATFORM"
+                },
+                "meta" : {
+                  "globalKey" : "9e635873"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "fc15a3c8"
+                "globalKey" : "9e635873",
+                "externalKey" : "trade_source"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS2894761"
+                  "value" : "PARTY123"
+                },
+                "meta" : {
+                  "globalKey" : "75895dac"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "75895dac",
+                "externalKey" : "SEF"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "9e635873",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2018-04-24",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "999-123",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "a7071c09"
+                "globalKey" : "24a161c0",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "e53e8fa3"
+            }
+          },
+          "meta" : {
+            "globalKey" : "e53e8fa3"
           }
         }
       }
     } ],
-    "intent" : "CONTRACT_FORMATION",
+    "eventQualifier" : "ContractFormation",
     "after" : [ {
-      "meta" : {
-        "globalKey" : "80fc3368"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
       "trade" : {
-        "account" : [ {
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "clearing_firm_accounts"
-            },
-            "value" : "999-123"
-          },
-          "meta" : {
-            "externalKey" : "account1",
-            "globalKey" : "a18b2f80"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
-          },
-          "servicingParty" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
-          }
-        } ],
-        "clearedDate" : "2018-04-24",
-        "meta" : {
-          "globalKey" : "8e973705"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "clearing_firm",
-            "globalKey" : "dd19"
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "1051b",
+            "externalReference" : "clearing_service"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "2894761",
               "meta" : {
-                "scheme" : "clearing_member_firms"
-              },
-              "value" : "999"
-            },
-            "meta" : {
-              "globalKey" : "dd19"
+                "scheme" : "cme_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing_service",
-            "globalKey" : "1051b"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "CME"
-            },
-            "meta" : {
-              "globalKey" : "1051b"
+              "value" : "QAC-11111",
+              "meta" : {
+                "scheme" : "client_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "trade_source",
-            "globalKey" : "9e635873"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "PLATFORM"
-            },
-            "meta" : {
-              "globalKey" : "9e635873"
+              "value" : "22222",
+              "meta" : {
+                "scheme" : "platform_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "SEF",
-            "globalKey" : "75895dac"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "PARTY123"
-            },
+              "value" : "22222",
+              "meta" : {
+                "scheme" : "risk_approval_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "22222",
+              "meta" : {
+                "scheme" : "block_trade_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "22222",
+              "meta" : {
+                "scheme" : "package_trade_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "22222",
+              "meta" : {
+                "scheme" : "position_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "5eab67fc"
+          }
+        }, {
+          "issuer" : {
+            "value" : "1010000023",
             "meta" : {
-              "globalKey" : "75895dac"
+              "scheme" : "cftc_Namespace"
             }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
           },
-          "partyReference" : {
-            "externalReference" : "trade_source",
-            "globalReference" : "9e635873"
-          },
-          "role" : "DATA_SUBMITTER"
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "CCCIRS2894761",
+              "meta" : {
+                "scheme" : "reg_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e12c31ab"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2018-04-24",
+          "meta" : {
+            "globalKey" : "3f1118"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "dd19"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -1407,46 +1361,42 @@
                 "payout" : {
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "fixedPrimaryBusinessCenters",
-                            "globalReference" : "42f910b"
-                          },
-                          "meta" : {
-                            "globalKey" : "fa5f1fb"
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "979a8ca"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "28caa"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6,
-                        "rollConvention" : "26"
-                      },
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "30/360"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2018-04-24",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -1455,44 +1405,97 @@
                           },
                           "meta" : {
                             "globalKey" : "ece3d250"
-                          },
-                          "unadjustedDate" : "2018-04-24"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ece3d250"
                         }
                       },
-                      "firstRegularPeriodStartDate" : "2018-10-26",
-                      "meta" : {
-                        "externalKey" : "fixedCalcPeriodDates",
-                        "globalKey" : "ab78b58f"
-                      },
-                      "stubPeriodType" : "LONG_INITIAL",
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2023-04-26",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
+                                "globalReference" : "42f910b",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "fa5f1fb"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "979a8ca"
                             }
                           },
                           "meta" : {
                             "globalKey" : "11ffc964"
-                          },
-                          "unadjustedDate" : "2023-04-26"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "11ffc964"
                         }
+                      },
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "42f910b",
+                            "externalReference" : "fixedPrimaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "fa5f1fb"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "979a8ca"
+                        }
+                      },
+                      "firstRegularPeriodStartDate" : "2018-10-26",
+                      "stubPeriodType" : "LongInitial",
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "18abc"
+                        },
+                        "rollConvention" : "26"
+                      },
+                      "meta" : {
+                        "globalKey" : "b23ff5a1",
+                        "externalKey" : "fixedCalcPeriodDates"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "107"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "GBLO"
+                          }, {
+                            "value" : "USNY"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "42f910b",
+                            "externalKey" : "fixedPrimaryBusinessCenters"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "97b8e49c"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "9e5a4d0f",
+                        "externalKey" : "fixedLegPaymentDates"
                       }
                     },
                     "cashflowRepresentation" : {
@@ -1500,285 +1503,337 @@
                       "paymentCalculationPeriod" : [ {
                         "adjustedPaymentDate" : "2018-10-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2018-10-26",
                           "adjustedStartDate" : "2018-04-24",
+                          "adjustedEndDate" : "2018-10-26",
                           "meta" : {
-                            "globalKey" : "4db1c6e6"
+                            "globalKey" : "4cbf649a"
                           },
-                          "fixedRate" : 0.032,
-                          "notionalAmount" : 700000
+                          "notionalAmount" : 700000,
+                          "fixedRate" : 0.032
                         } ],
                         "meta" : {
-                          "globalKey" : "5ad8448c"
+                          "globalKey" : "59e5e240"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-04-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-04-26",
                           "adjustedStartDate" : "2018-10-26",
+                          "adjustedEndDate" : "2019-04-26",
                           "meta" : {
-                            "globalKey" : "50abd968"
+                            "globalKey" : "4d874258"
                           },
-                          "fixedRate" : 0.032,
-                          "notionalAmount" : 700000
+                          "notionalAmount" : 700000,
+                          "fixedRate" : 0.032
                         } ],
                         "meta" : {
-                          "globalKey" : "7552608e"
+                          "globalKey" : "722dc97e"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-10-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-10-28",
                           "adjustedStartDate" : "2019-04-26",
+                          "adjustedEndDate" : "2019-10-28",
                           "meta" : {
-                            "globalKey" : "5173b726"
+                            "globalKey" : "508154da"
                           },
-                          "fixedRate" : 0.032,
-                          "notionalAmount" : 700000
+                          "notionalAmount" : 700000,
+                          "fixedRate" : 0.032
                         } ],
                         "meta" : {
-                          "globalKey" : "8c8de0a"
+                          "globalKey" : "7d67bbe"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-04-27",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-04-27",
                           "adjustedStartDate" : "2019-10-28",
+                          "adjustedEndDate" : "2020-04-27",
                           "meta" : {
-                            "globalKey" : "546d5549"
+                            "globalKey" : "51492ed7"
                           },
-                          "fixedRate" : 0.032,
-                          "notionalAmount" : 700000
+                          "notionalAmount" : 700000,
+                          "fixedRate" : 0.032
                         } ],
                         "meta" : {
-                          "globalKey" : "218dad0e"
+                          "globalKey" : "1e69869c"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-10-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-10-26",
                           "adjustedStartDate" : "2020-04-27",
+                          "adjustedEndDate" : "2020-10-26",
                           "meta" : {
-                            "globalKey" : "5533d229"
+                            "globalKey" : "5442c1b7"
                           },
-                          "fixedRate" : 0.032,
-                          "notionalAmount" : 700000
+                          "notionalAmount" : 700000,
+                          "fixedRate" : 0.032
                         } ],
                         "meta" : {
-                          "globalKey" : "afe43fcf"
+                          "globalKey" : "aef32f5d"
                         }
                       }, {
                         "adjustedPaymentDate" : "2021-04-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2021-04-26",
                           "adjustedStartDate" : "2020-10-26",
+                          "adjustedEndDate" : "2021-04-26",
                           "meta" : {
-                            "globalKey" : "582dd968"
+                            "globalKey" : "55094258"
                           },
-                          "fixedRate" : 0.032,
-                          "notionalAmount" : 700000
+                          "notionalAmount" : 700000,
+                          "fixedRate" : 0.032
                         } ],
                         "meta" : {
-                          "globalKey" : "ca5e508e"
+                          "globalKey" : "c739b97e"
                         }
                       }, {
                         "adjustedPaymentDate" : "2021-10-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2021-10-26",
                           "adjustedStartDate" : "2021-04-26",
+                          "adjustedEndDate" : "2021-10-26",
                           "meta" : {
-                            "globalKey" : "58f4ce68"
+                            "globalKey" : "58034d58"
                           },
-                          "fixedRate" : 0.032,
-                          "notionalAmount" : 700000
+                          "notionalAmount" : 700000,
+                          "fixedRate" : 0.032
                         } ],
                         "meta" : {
-                          "globalKey" : "5a6a340e"
+                          "globalKey" : "5978b2fe"
                         }
                       }, {
                         "adjustedPaymentDate" : "2022-04-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2022-04-26",
                           "adjustedStartDate" : "2021-10-26",
+                          "adjustedEndDate" : "2022-04-26",
                           "meta" : {
-                            "globalKey" : "5beed968"
+                            "globalKey" : "58ca4258"
                           },
-                          "fixedRate" : 0.032,
-                          "notionalAmount" : 700000
+                          "notionalAmount" : 700000,
+                          "fixedRate" : 0.032
                         } ],
                         "meta" : {
-                          "globalKey" : "74e4488e"
+                          "globalKey" : "71bfb17e"
                         }
                       }, {
                         "adjustedPaymentDate" : "2022-10-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2022-10-26",
                           "adjustedStartDate" : "2022-04-26",
+                          "adjustedEndDate" : "2022-10-26",
                           "meta" : {
-                            "globalKey" : "5cb5ce68"
+                            "globalKey" : "5bc44d58"
                           },
-                          "fixedRate" : 0.032,
-                          "notionalAmount" : 700000
+                          "notionalAmount" : 700000,
+                          "fixedRate" : 0.032
                         } ],
                         "meta" : {
-                          "globalKey" : "4f02c0e"
+                          "globalKey" : "3feaafe"
                         }
                       }, {
                         "adjustedPaymentDate" : "2023-04-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2023-04-26",
                           "adjustedStartDate" : "2022-10-26",
+                          "adjustedEndDate" : "2023-04-26",
                           "meta" : {
-                            "globalKey" : "5fafd968"
+                            "globalKey" : "5c8b4258"
                           },
-                          "fixedRate" : 0.032,
-                          "notionalAmount" : 700000
+                          "notionalAmount" : 700000,
+                          "fixedRate" : 0.032
                         } ],
                         "meta" : {
-                          "globalKey" : "1f6a408e"
+                          "globalKey" : "1c45a97e"
                         }
                       } ]
                     },
-                    "dayCountFraction" : {
-                      "value" : "30/360"
-                    },
                     "meta" : {
-                      "globalKey" : "447aa979"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "fixedLegPaymentDates",
-                        "globalKey" : "637fde97"
-                      },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "GBLO"
-                          }, {
-                            "value" : "USNY"
-                          } ],
-                          "meta" : {
-                            "externalKey" : "fixedPrimaryBusinessCenters",
-                            "globalKey" : "42f910b"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "97b8e49c"
-                        }
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "959"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6
-                      }
-                    },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
-                          }
-                        }
-                      }
+                      "globalKey" : "21a1d45f"
                     }
                   }, {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-2"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
+                    "rateSpecification" : {
+                      "floatingRate" : {
+                        "rateOption" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "rateOption-1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/360"
+                    },
                     "calculationPeriodDates" : {
+                      "effectiveDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2018-04-24",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ece3d250"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "ece3d250"
+                        }
+                      },
+                      "terminationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2023-04-26",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "b01f2613"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "a9f2dce2"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "b278fd7c"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "b278fd7c"
+                        }
+                      },
                       "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "42f910b"
+                            "globalReference" : "42f910b",
+                            "externalReference" : "floatPrimaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "b01f2613"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "a9f2dce2"
                         }
                       },
+                      "firstRegularPeriodStartDate" : "2018-07-26",
+                      "stubPeriodType" : "LongInitial",
                       "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
                         "meta" : {
-                          "globalKey" : "28c4d"
+                          "globalKey" : "17f79"
                         },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
                         "rollConvention" : "26"
                       },
-                      "effectiveDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
+                      "meta" : {
+                        "globalKey" : "4b5e654e",
+                        "externalKey" : "floatingCalcPeriodDates"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "GBLO"
+                          }, {
+                            "value" : "USNY"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "42f910b",
+                            "externalKey" : "floatPrimaryBusinessCenters"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "97b8e49c"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "e18d000c",
+                        "externalKey" : "floatingLegPaymentDates"
+                      }
+                    },
+                    "resetDates" : {
+                      "calculationPeriodDatesReference" : {
+                        "globalReference" : "4b5e654e",
+                        "externalReference" : "floatingCalcPeriodDates"
+                      },
+                      "resetRelativeTo" : "CalculationPeriodStartDate",
+                      "fixingDates" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "c1bdb713"
+                        },
+                        "dayType" : "Business",
+                        "businessDayConvention" : "PRECEDING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "GBLO"
+                          } ],
                           "meta" : {
-                            "globalKey" : "ece3d250"
-                          },
-                          "unadjustedDate" : "2018-04-24"
+                            "globalKey" : "21479e"
+                          }
                         },
-                        "meta" : {
-                          "globalKey" : "ece3d250"
+                        "dateRelativeTo" : {
+                          "globalReference" : "5c888587",
+                          "externalReference" : "floatingLegResetDates"
                         }
                       },
-                      "firstRegularPeriodStartDate" : "2018-07-26",
-                      "meta" : {
-                        "externalKey" : "floatingCalcPeriodDates",
-                        "globalKey" : "d4b9e162"
+                      "resetFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
                       },
-                      "stubPeriodType" : "LONG_INITIAL",
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "b01f2613"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "a9f2dce2"
-                            }
+                      "resetDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "42f910b",
+                            "externalReference" : "floatPrimaryBusinessCenters"
                           },
                           "meta" : {
-                            "globalKey" : "b278fd7c"
-                          },
-                          "unadjustedDate" : "2023-04-26"
+                            "globalKey" : "b01f2613"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "b278fd7c"
+                          "globalKey" : "a9f2dce2"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "5c888587",
+                        "externalKey" : "floatingLegResetDates"
                       }
                     },
                     "cashflowRepresentation" : {
@@ -1786,820 +1841,748 @@
                       "paymentCalculationPeriod" : [ {
                         "adjustedPaymentDate" : "2018-07-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2018-07-26",
                           "adjustedStartDate" : "2018-04-24",
+                          "adjustedEndDate" : "2018-07-26",
                           "meta" : {
-                            "globalKey" : "2a54a814"
+                            "globalKey" : "5ee7e950"
                           },
+                          "notionalAmount" : 700000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2018-04-20",
+                              "observedRate" : 0.0236253,
                               "meta" : {
                                 "globalKey" : "c25359f9"
-                              },
-                              "observedRate" : 0.0236253
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 700000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "49393fee"
+                          "globalKey" : "7dcc812a"
                         }
                       }, {
                         "adjustedPaymentDate" : "2018-10-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2018-10-26",
                           "adjustedStartDate" : "2018-07-26",
+                          "adjustedEndDate" : "2018-10-26",
                           "meta" : {
-                            "globalKey" : "675d10b1"
+                            "globalKey" : "2531731"
                           },
+                          "notionalAmount" : 700000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2018-07-24",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a32958"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 700000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "b994e94b"
+                          "globalKey" : "548aefcb"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-01-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-01-28",
                           "adjustedStartDate" : "2018-10-26",
+                          "adjustedEndDate" : "2019-01-28",
                           "meta" : {
-                            "globalKey" : "44a0cb73"
+                            "globalKey" : "8246e2af"
                           },
+                          "notionalAmount" : 700000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2018-10-24",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a34098"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 700000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "48dfc7cf"
+                          "globalKey" : "8685df0b"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-04-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-04-26",
                           "adjustedStartDate" : "2019-01-28",
+                          "adjustedEndDate" : "2019-04-26",
                           "meta" : {
-                            "globalKey" : "5ac8bb6f"
+                            "globalKey" : "5c218733"
                           },
+                          "notionalAmount" : 700000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2019-01-24",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a3f2d8"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 700000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "69d21a89"
+                          "globalKey" : "6b2ae64d"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-07-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-07-26",
                           "adjustedStartDate" : "2019-04-26",
+                          "adjustedEndDate" : "2019-07-26",
                           "meta" : {
-                            "globalKey" : "4bae0971"
+                            "globalKey" : "e6a40ff1"
                           },
+                          "notionalAmount" : 700000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2019-04-24",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a40a18"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 700000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "8e0aa94b"
+                          "globalKey" : "2900afcb"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-10-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-10-28",
                           "adjustedStartDate" : "2019-07-26",
+                          "adjustedEndDate" : "2019-10-28",
                           "meta" : {
-                            "globalKey" : "a9c97f33"
+                            "globalKey" : "de5cc06f"
                           },
+                          "notionalAmount" : 700000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2019-07-24",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a42158"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 700000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "48023dcf"
+                          "globalKey" : "7c957f0b"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-01-27",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-01-27",
                           "adjustedStartDate" : "2019-10-28",
+                          "adjustedEndDate" : "2020-01-27",
                           "meta" : {
-                            "globalKey" : "ebc43970"
+                            "globalKey" : "c2fe7892"
                           },
+                          "notionalAmount" : 700000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2019-10-24",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a43898"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 700000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "7f36cecb"
+                          "globalKey" : "56710ded"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-04-27",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-04-27",
                           "adjustedStartDate" : "2020-01-27",
+                          "adjustedEndDate" : "2020-04-27",
                           "meta" : {
-                            "globalKey" : "669a15f2"
+                            "globalKey" : "1901c72"
                           },
+                          "notionalAmount" : 700000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2020-01-23",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a4eab9"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 700000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "2d5fec0d"
+                          "globalKey" : "c855f28d"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-07-27",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-07-27",
                           "adjustedStartDate" : "2020-04-27",
+                          "adjustedEndDate" : "2020-07-27",
                           "meta" : {
-                            "globalKey" : "5ae91532"
+                            "globalKey" : "f5df1bb2"
                           },
+                          "notionalAmount" : 700000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2020-04-23",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a501f9"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 700000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "55022c0d"
+                          "globalKey" : "eff8328d"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-10-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-10-26",
                           "adjustedStartDate" : "2020-07-27",
+                          "adjustedEndDate" : "2020-10-26",
                           "meta" : {
-                            "globalKey" : "1a51d931"
+                            "globalKey" : "e8794253"
                           },
+                          "notionalAmount" : 700000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2020-07-23",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a51939"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 700000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "b379c1cb"
+                          "globalKey" : "81a12aed"
                         }
                       }, {
                         "adjustedPaymentDate" : "2021-01-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2021-01-26",
                           "adjustedStartDate" : "2020-10-26",
+                          "adjustedEndDate" : "2021-01-26",
                           "meta" : {
-                            "globalKey" : "8c1444b3"
+                            "globalKey" : "301d2133"
                           },
+                          "notionalAmount" : 700000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2020-10-22",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a5305a"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 700000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "aeba730d"
+                          "globalKey" : "52c34f8d"
                         }
                       }, {
                         "adjustedPaymentDate" : "2021-04-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2021-04-26",
                           "adjustedStartDate" : "2021-01-26",
+                          "adjustedEndDate" : "2021-04-26",
                           "meta" : {
-                            "globalKey" : "89ef9f3"
+                            "globalKey" : "a3950073"
                           },
+                          "notionalAmount" : 700000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2021-01-22",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a5e29a"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 700000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "5e98690d"
+                          "globalKey" : "f98e6f8d"
                         }
                       }, {
                         "adjustedPaymentDate" : "2021-07-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2021-07-26",
                           "adjustedStartDate" : "2021-04-26",
+                          "adjustedEndDate" : "2021-07-26",
                           "meta" : {
-                            "globalKey" : "fcedf933"
+                            "globalKey" : "97e3ffb3"
                           },
+                          "notionalAmount" : 700000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2021-04-22",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a5f9da"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 700000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "863aa90d"
+                          "globalKey" : "2130af8d"
                         }
                       }, {
                         "adjustedPaymentDate" : "2021-10-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2021-10-26",
                           "adjustedStartDate" : "2021-07-26",
+                          "adjustedEndDate" : "2021-10-26",
                           "meta" : {
-                            "globalKey" : "f13cf873"
+                            "globalKey" : "8c32fef3"
                           },
+                          "notionalAmount" : 700000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2021-07-22",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a6111a"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 700000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "addce90d"
+                          "globalKey" : "48d2ef8d"
                         }
                       }, {
                         "adjustedPaymentDate" : "2022-01-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2022-01-26",
                           "adjustedStartDate" : "2021-10-26",
+                          "adjustedEndDate" : "2022-01-26",
                           "meta" : {
-                            "globalKey" : "64b43cb3"
+                            "globalKey" : "8bd1933"
                           },
+                          "notionalAmount" : 700000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2021-10-22",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a6285a"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 700000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "aad2730d"
+                          "globalKey" : "4edb4f8d"
                         }
                       }, {
                         "adjustedPaymentDate" : "2022-04-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2022-04-26",
                           "adjustedStartDate" : "2022-01-26",
+                          "adjustedEndDate" : "2022-04-26",
                           "meta" : {
-                            "globalKey" : "e13ef231"
+                            "globalKey" : "7c34f8b1"
                           },
+                          "notionalAmount" : 700000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2022-01-24",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a6dad8"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 700000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "5ab0694b"
+                          "globalKey" : "f5a66fcb"
                         }
                       }, {
                         "adjustedPaymentDate" : "2022-07-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2022-07-26",
                           "adjustedStartDate" : "2022-04-26",
+                          "adjustedEndDate" : "2022-07-26",
                           "meta" : {
-                            "globalKey" : "d58df133"
+                            "globalKey" : "7083f7b3"
                           },
+                          "notionalAmount" : 700000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2022-04-22",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a6f1da"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 700000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "8252a90d"
+                          "globalKey" : "1d48af8d"
                         }
                       }, {
                         "adjustedPaymentDate" : "2022-10-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2022-10-26",
                           "adjustedStartDate" : "2022-07-26",
+                          "adjustedEndDate" : "2022-10-26",
                           "meta" : {
-                            "globalKey" : "c9dcf073"
+                            "globalKey" : "64d2f6f3"
                           },
+                          "notionalAmount" : 700000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2022-07-22",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a7091a"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 700000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "a9f4e90d"
+                          "globalKey" : "44eaef8d"
                         }
                       }, {
                         "adjustedPaymentDate" : "2023-01-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2023-01-26",
                           "adjustedStartDate" : "2022-10-26",
+                          "adjustedEndDate" : "2023-01-26",
                           "meta" : {
-                            "globalKey" : "3d5434f1"
+                            "globalKey" : "e15d1171"
                           },
+                          "notionalAmount" : 700000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2022-10-24",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a72098"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 700000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "a6ea734b"
+                          "globalKey" : "4af34fcb"
                         }
                       }, {
                         "adjustedPaymentDate" : "2023-04-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2023-04-26",
                           "adjustedStartDate" : "2023-01-26",
+                          "adjustedEndDate" : "2023-04-26",
                           "meta" : {
-                            "globalKey" : "b9deea31"
+                            "globalKey" : "54d4f0b1"
                           },
+                          "notionalAmount" : 700000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2023-01-24",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a7d2d8"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 700000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "56c8694b"
+                          "globalKey" : "f1be6fcb"
                         }
                       } ]
                     },
-                    "dayCountFraction" : {
-                      "value" : "ACT/360"
-                    },
-                    "meta" : {
-                      "globalKey" : "95f593e8"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "floatingLegPaymentDates",
-                        "globalKey" : "637fde94"
-                      },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "GBLO"
-                          }, {
-                            "value" : "USNY"
-                          } ],
-                          "meta" : {
-                            "externalKey" : "floatPrimaryBusinessCenters",
-                            "globalKey" : "42f910b"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "97b8e49c"
-                        }
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
-                      }
-                    },
-                    "rateSpecification" : {
-                      "floatingRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateOption" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "rateOption-1"
-                          }
-                        }
-                      }
-                    },
-                    "resetDates" : {
-                      "calculationPeriodDatesReference" : {
-                        "externalReference" : "floatingCalcPeriodDates",
-                        "globalReference" : "d4b9e162"
-                      },
-                      "fixingDates" : {
-                        "meta" : {
-                          "globalKey" : "e4e1cc5f"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "GBLO"
-                          } ],
-                          "meta" : {
-                            "globalKey" : "21479e"
-                          }
-                        },
-                        "businessDayConvention" : "PRECEDING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "floatingLegResetDates",
-                          "globalReference" : "d843714f"
-                        }
-                      },
-                      "meta" : {
-                        "externalKey" : "floatingLegResetDates",
-                        "globalKey" : "d843714f"
-                      },
-                      "resetDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "42f910b"
-                          },
-                          "meta" : {
-                            "globalKey" : "b01f2613"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "a9f2dce2"
-                        }
-                      },
-                      "resetFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
-                      },
-                      "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
-                    },
                     "stubPeriod" : {
                       "calculationPeriodDatesReference" : {
-                        "externalReference" : "floatingCalcPeriodDates",
-                        "globalReference" : "d4b9e162"
+                        "globalReference" : "4b5e654e",
+                        "externalReference" : "floatingCalcPeriodDates"
                       },
                       "initialStub" : {
                         "floatingRate" : [ {
                           "floatingRateIndex" : "USD-LIBOR-BBA",
                           "indexTenor" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
+                            "periodMultiplier" : 3,
                             "period" : "M",
-                            "periodMultiplier" : 3
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           }
                         }, {
                           "floatingRateIndex" : "USD-LIBOR-BBA",
                           "indexTenor" : {
-                            "meta" : {
-                              "globalKey" : "959"
-                            },
+                            "periodMultiplier" : 6,
                             "period" : "M",
-                            "periodMultiplier" : 6
+                            "meta" : {
+                              "globalKey" : "107"
+                            }
                           }
                         } ]
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "91b1159a"
                     }
                   } ],
                   "meta" : {
-                    "globalKey" : "77aa9f61"
+                    "globalKey" : "349eb7f9"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "cf9d4710"
+                "globalKey" : "8c915fa8"
               }
             },
             "meta" : {
-              "globalKey" : "cf9d4710"
+              "globalKey" : "8c915fa8"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "dd8b87c7"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.032,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.032,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
                 }
               } ],
               "quantity" : [ {
+                "value" : {
+                  "value" : 700000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "d3e57119"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 700000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 700000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
                 }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "57b053c8"
-              },
+              } ],
               "observable" : {
-                "meta" : {
-                  "globalKey" : "5f0c6d05"
-                },
                 "rateOption" : {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "rateOption-1"
-                    } ]
-                  },
                   "value" : {
                     "floatingRateIndex" : {
                       "value" : "USD-LIBOR-BBA"
                     },
                     "indexTenor" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
+                      "periodMultiplier" : 3,
                       "period" : "M",
-                      "periodMultiplier" : 3
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "rateOption-1"
+                    } ]
                   }
-                }
-              },
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
                 },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 700000
+                "meta" : {
+                  "globalKey" : "828026c7"
                 }
-              } ]
-            } ]
-          } ]
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f1118"
-          },
-          "value" : "2018-04-24"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "cme_trade_id"
-              },
-              "value" : "2894761"
-            }
-          }, {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "client_trade_id"
               },
-              "value" : "QAC-11111"
-            }
-          }, {
-            "identifier" : {
               "meta" : {
-                "scheme" : "platform_trade_id"
-              },
-              "value" : "22222"
+                "globalKey" : "683bc2f4"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "dd19",
+              "externalReference" : "clearing_firm"
             }
           }, {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "risk_approval_id"
-              },
-              "value" : "22222"
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
             }
-          }, {
+          } ]
+        },
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "999",
               "meta" : {
-                "scheme" : "block_trade_id"
-              },
-              "value" : "22222"
+                "scheme" : "clearing_member_firms"
+              }
+            },
+            "meta" : {
+              "globalKey" : "dd19"
             }
-          }, {
+          } ],
+          "meta" : {
+            "globalKey" : "dd19",
+            "externalKey" : "clearing_firm"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "package_trade_id"
-              },
-              "value" : "22222"
+              "value" : "CME"
+            },
+            "meta" : {
+              "globalKey" : "1051b"
             }
-          }, {
+          } ],
+          "meta" : {
+            "globalKey" : "1051b",
+            "externalKey" : "clearing_service"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "position_trade_id"
-              },
-              "value" : "22222"
+              "value" : "PLATFORM"
+            },
+            "meta" : {
+              "globalKey" : "9e635873"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "clearing_service",
-            "globalReference" : "1051b"
-          },
           "meta" : {
-            "globalKey" : "fc15a3c8"
+            "globalKey" : "9e635873",
+            "externalKey" : "trade_source"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "reg_trade_id"
-              },
-              "value" : "CCCIRS2894761"
+              "value" : "PARTY123"
+            },
+            "meta" : {
+              "globalKey" : "75895dac"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "75895dac",
+            "externalKey" : "SEF"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "9e635873",
+            "externalReference" : "trade_source"
+          },
+          "role" : "DataSubmitter",
+          "ownershipPartyReference" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
+          }
+        } ],
+        "clearedDate" : "2018-04-24",
+        "account" : [ {
+          "partyReference" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
+          },
+          "accountNumber" : {
+            "value" : "999-123",
             "meta" : {
-              "scheme" : "cftc_Namespace"
-            },
-            "value" : "1010000023"
+              "scheme" : "clearing_firm_accounts"
+            }
+          },
+          "servicingParty" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
           },
           "meta" : {
-            "globalKey" : "a7071c09"
+            "globalKey" : "24a161c0",
+            "externalKey" : "account1"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "e53e8fa3"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
+      },
+      "meta" : {
+        "globalKey" : "bcc1f46"
       }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "fe420ce7"
+      "globalKey" : "9b56d367"
     }
   },
+  "previousWorkflowStep" : {
+    "globalReference" : "e0c9a1db"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "5608850157",
       "meta" : {
         "scheme" : "cme_message_id"
-      },
-      "value" : "5608850157"
+      }
     },
     "sentBy" : {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
+      }
     },
     "sentTo" : [ {
+      "value" : "999",
       "meta" : {
         "scheme" : "cme_firm_id"
-      },
-      "value" : "999"
+      }
     }, {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
+      }
     } ]
   },
-  "meta" : {
-    "globalKey" : "4dd18d0"
-  },
+  "timestamp" : [ {
+    "dateTime" : "2018-04-24T14:29:25Z",
+    "qualification" : "eventCreationDateTime"
+  }, {
+    "dateTime" : "2018-04-24T14:29:24.693956Z",
+    "qualification" : "clearingReceiptDateTime"
+  } ],
   "party" : [ {
-    "meta" : {
-      "externalKey" : "clearing_firm",
-      "globalKey" : "dd19"
-    },
     "partyId" : [ {
       "identifier" : {
+        "value" : "999",
         "meta" : {
           "scheme" : "clearing_member_firms"
-        },
-        "value" : "999"
+        }
       },
       "meta" : {
         "globalKey" : "dd19"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "clearing_service",
-      "globalKey" : "1051b"
-    },
+      "globalKey" : "dd19",
+      "externalKey" : "clearing_firm"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "CME"
@@ -2607,12 +2590,12 @@
       "meta" : {
         "globalKey" : "1051b"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "trade_source",
-      "globalKey" : "9e635873"
-    },
+      "globalKey" : "1051b",
+      "externalKey" : "clearing_service"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "PLATFORM"
@@ -2620,12 +2603,12 @@
       "meta" : {
         "globalKey" : "9e635873"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "SEF",
-      "globalKey" : "75895dac"
-    },
+      "globalKey" : "9e635873",
+      "externalKey" : "trade_source"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "PARTY123"
@@ -2633,16 +2616,33 @@
       "meta" : {
         "globalKey" : "75895dac"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "75895dac",
+      "externalKey" : "SEF"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "6169ef5b"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2018-04-24T14:29:25Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  }, {
-    "dateTime" : "2018-04-24T14:29:24.693956Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
-  } ]
+  "account" : [ {
+    "partyReference" : {
+      "globalReference" : "dd19",
+      "externalReference" : "clearing_firm"
+    },
+    "accountNumber" : {
+      "value" : "999-123",
+      "meta" : {
+        "scheme" : "clearing_firm_accounts"
+      }
+    },
+    "servicingParty" : {
+      "globalReference" : "dd19",
+      "externalReference" : "clearing_firm"
+    },
+    "meta" : {
+      "globalKey" : "24a161c0",
+      "externalKey" : "account1"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "9ecf3f8e"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex06-Fixed-Float-Non-Deliverable-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex06-Fixed-Float-Non-Deliverable-func-output.json
index ce844d22a9..221661f844 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex06-Fixed-Float-Non-Deliverable-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex06-Fixed-Float-Non-Deliverable-func-output.json
@@ -1,124 +1,80 @@
 {
-  "account" : [ {
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "clearing_firm_accounts"
-      },
-      "value" : "999-123"
-    },
-    "meta" : {
-      "externalKey" : "account1",
-      "globalKey" : "a18b2f80"
-    },
-    "partyReference" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "dd19"
-    },
-    "servicingParty" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "dd19"
-    }
-  } ],
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "18c86f75"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "999-123"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "a18b2f80"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              }
-            } ],
-            "clearedDate" : "2016-09-27",
-            "meta" : {
-              "globalKey" : "18c86f75"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "dd19"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "2894761",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "999"
-                },
-                "meta" : {
-                  "globalKey" : "dd19"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "QAC-11111",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "9e635873"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "PLATFORM"
-                },
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "platform_side_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "fd5cf798"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "9e635873"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
               },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "9e635873"
-              },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS2894761",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e12c31ab"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2016-09-27",
+              "meta" : {
+                "globalKey" : "3f025b"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "dd19"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -129,39 +85,46 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "settlementTerms" : {
-                          "meta" : {
-                            "globalKey" : "5d919fd0"
-                          },
                           "settlementCurrency" : {
                             "value" : "USD"
                           },
+                          "meta" : {
+                            "globalKey" : "14162d5e"
+                          },
                           "cashSettlementTerms" : [ {
-                            "meta" : {
-                              "globalKey" : "d9e2916a"
+                            "valuationMethod" : {
+                              "valuationSource" : {
+                                "settlementRateOption" : {
+                                  "settlementRateOption" : {
+                                    "value" : "INR.RBIB/INR01"
+                                  }
+                                }
+                              }
                             },
                             "valuationDate" : {
                               "fxFixingDate" : {
+                                "periodMultiplier" : -2,
+                                "period" : "D",
                                 "meta" : {
-                                  "globalKey" : "6266a460"
+                                  "globalKey" : "17e162ae"
                                 },
-                                "period" : "D",
-                                "periodMultiplier" : -2,
-                                "dayType" : "BUSINESS",
+                                "dayType" : "Business",
+                                "businessDayConvention" : "NONE",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "INMU"
@@ -172,52 +135,41 @@
                                     "globalKey" : "45138fc"
                                   }
                                 },
-                                "businessDayConvention" : "NONE",
                                 "dateRelativeToPaymentDates" : {
                                   "paymentDatesReference" : [ {
-                                    "externalReference" : "fixedLegPaymentDates",
-                                    "globalReference" : "fe5a8a71"
+                                    "globalReference" : "e0d2b7f3",
+                                    "externalReference" : "fixedLegPaymentDates"
                                   } ]
                                 }
                               }
                             },
-                            "valuationMethod" : {
-                              "valuationSource" : {
-                                "settlementRateOption" : {
-                                  "settlementRateOption" : {
-                                    "value" : "INR.RBIB/INR01"
-                                  }
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "90671ef8"
                             }
                           } ]
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "45138fc"
-                              },
-                              "meta" : {
-                                "globalKey" : "fc799ec"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "99b50bb"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "2b91d"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "28"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2016-09-28",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -226,75 +178,85 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecac8294"
-                              },
-                              "unadjustedDate" : "2016-09-28"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecac8294"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "ada3345b"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2017-09-28",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "fixedPrimaryBusinessCenters",
-                                    "globalReference" : "45138fc"
+                                    "globalReference" : "45138fc",
+                                    "externalReference" : "fixedPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "fc799ec"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "99b50bb"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "78461817"
-                              },
-                              "unadjustedDate" : "2017-09-28"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "78461817"
                             }
-                          }
-                        },
-                        "cashflowRepresentation" : {
-                          "cashflowsMatchParameters" : true,
-                          "paymentCalculationPeriod" : [ {
-                            "adjustedPaymentDate" : "2017-09-28",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-09-28",
-                              "adjustedStartDate" : "2016-09-28",
-                              "meta" : {
-                                "globalKey" : "5ddac6ff"
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "45138fc",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
                               },
-                              "fixedRate" : 0.066,
-                              "notionalAmount" : 1000000
-                            } ],
+                              "meta" : {
+                                "globalKey" : "fc799ec"
+                              }
+                            },
                             "meta" : {
-                              "globalKey" : "5a6fd623"
+                              "globalKey" : "99b50bb"
                             }
-                          } ]
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
-                        "meta" : {
-                          "globalKey" : "d205b6b"
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "1796d"
+                            },
+                            "rollConvention" : "28"
+                          },
+                          "meta" : {
+                            "globalKey" : "469d196b",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
                         },
                         "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "fe5a8a71"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4ab7fc"
+                            },
+                            "dayType" : "Business"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "INMU"
@@ -302,81 +264,82 @@
                                 "value" : "USNY"
                               } ],
                               "meta" : {
-                                "externalKey" : "fixedPrimaryBusinessCenters",
-                                "globalKey" : "45138fc"
+                                "globalKey" : "45138fc",
+                                "externalKey" : "fixedPrimaryBusinessCenters"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97da8c8d"
                             }
                           },
-                          "paymentDaysOffset" : {
-                            "meta" : {
-                              "globalKey" : "ea4baf04"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "dayType" : "BUSINESS"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "e0d2b7f3",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
+                        "cashflowRepresentation" : {
+                          "cashflowsMatchParameters" : true,
+                          "paymentCalculationPeriod" : [ {
+                            "adjustedPaymentDate" : "2017-09-28",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2016-09-28",
+                              "adjustedEndDate" : "2017-09-28",
+                              "meta" : {
+                                "globalKey" : "b5bbc461"
+                              },
+                              "notionalAmount" : 1000000,
+                              "fixedRate" : 0.066
+                            } ],
+                            "meta" : {
+                              "globalKey" : "b250d385"
                             }
-                          }
+                          } ]
+                        },
+                        "meta" : {
+                          "globalKey" : "88170df3"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "settlementTerms" : {
-                          "meta" : {
-                            "globalKey" : "d3395f62"
-                          },
                           "settlementCurrency" : {
                             "value" : "USD"
                           },
+                          "meta" : {
+                            "globalKey" : "55757a8c"
+                          },
                           "cashSettlementTerms" : [ {
-                            "meta" : {
-                              "globalKey" : "4f8a50fc"
+                            "valuationMethod" : {
+                              "valuationSource" : {
+                                "settlementRateOption" : {
+                                  "settlementRateOption" : {
+                                    "value" : "INR.RBIB/INR01"
+                                  }
+                                }
+                              }
                             },
                             "valuationDate" : {
                               "fxFixingDate" : {
+                                "periodMultiplier" : -2,
+                                "period" : "D",
                                 "meta" : {
-                                  "globalKey" : "a3c5f18e"
+                                  "globalKey" : "5940afdc"
                                 },
-                                "period" : "D",
-                                "periodMultiplier" : -2,
-                                "dayType" : "BUSINESS",
+                                "dayType" : "Business",
+                                "businessDayConvention" : "NONE",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "INMU"
@@ -387,52 +350,39 @@
                                     "globalKey" : "45138fc"
                                   }
                                 },
-                                "businessDayConvention" : "NONE",
                                 "dateRelativeToPaymentDates" : {
                                   "paymentDatesReference" : [ {
-                                    "externalReference" : "floatingLegPaymentDates",
-                                    "globalReference" : "fe5a8a71"
+                                    "globalReference" : "e0d2b7f3",
+                                    "externalReference" : "floatingLegPaymentDates"
                                   } ]
                                 }
                               }
                             },
-                            "valuationMethod" : {
-                              "valuationSource" : {
-                                "settlementRateOption" : {
-                                  "settlementRateOption" : {
-                                    "value" : "INR.RBIB/INR01"
-                                  }
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "d1c66c26"
                             }
                           } ]
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "45138fc"
-                              },
-                              "meta" : {
-                                "globalKey" : "b040ce04"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "aa1484d3"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "2b91d"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "28"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2016-09-28",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -441,83 +391,85 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecac8294"
-                              },
-                              "unadjustedDate" : "2016-09-28"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecac8294"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "659cfa8b"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2017-09-28",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "45138fc"
+                                    "globalReference" : "45138fc",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "b040ce04"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "aa1484d3"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "18bf4c2f"
-                              },
-                              "unadjustedDate" : "2017-09-28"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "18bf4c2f"
                             }
-                          }
-                        },
-                        "cashflowRepresentation" : {
-                          "cashflowsMatchParameters" : true,
-                          "paymentCalculationPeriod" : [ {
-                            "adjustedPaymentDate" : "2017-09-28",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-09-28",
-                              "adjustedStartDate" : "2016-09-28",
-                              "meta" : {
-                                "globalKey" : "c7cff6c5"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2017-09-28",
-                                  "meta" : {
-                                    "globalKey" : "7a24154"
-                                  },
-                                  "observedRate" : 0
-                                } ]
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "45138fc",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
-                              "notionalAmount" : 1000000
-                            } ],
+                              "meta" : {
+                                "globalKey" : "b040ce04"
+                              }
+                            },
                             "meta" : {
-                              "globalKey" : "dfce521"
+                              "globalKey" : "aa1484d3"
                             }
-                          } ]
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
-                        "meta" : {
-                          "globalKey" : "ebcc2434"
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "1796d"
+                            },
+                            "rollConvention" : "28"
+                          },
+                          "meta" : {
+                            "globalKey" : "b78eab9b",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
                         },
                         "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "fe5a8a71"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4ab7fc"
+                            },
+                            "dayType" : "Business"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "INMU"
@@ -525,55 +477,32 @@
                                 "value" : "USNY"
                               } ],
                               "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "45138fc"
+                                "globalKey" : "45138fc",
+                                "externalKey" : "floatPrimaryBusinessCenters"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97da8c8d"
                             }
                           },
-                          "paymentDaysOffset" : {
-                            "meta" : {
-                              "globalKey" : "ea4baf04"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "dayType" : "BUSINESS"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "e0d2b7f3",
+                            "externalKey" : "floatingLegPaymentDates"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "659cfa8b"
+                            "globalReference" : "b78eab9b",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodEndDate",
                           "fixingDates" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "54620b84"
+                              "globalKey" : "c9b9dd8c"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
+                            "businessDayConvention" : "PRECEDING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "INMU"
@@ -582,312 +511,336 @@
                                 "globalKey" : "225d8d"
                               }
                             },
-                            "businessDayConvention" : "PRECEDING",
                             "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "84302cd9"
+                              "globalReference" : "8347cb17",
+                              "externalReference" : "floatingLegResetDates"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "84302cd9"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "45138fc"
+                                "globalReference" : "45138fc",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "b040ce04"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "aa1484d3"
                             }
                           },
-                          "resetFrequency" : {
+                          "meta" : {
+                            "globalKey" : "8347cb17",
+                            "externalKey" : "floatingLegResetDates"
+                          }
+                        },
+                        "cashflowRepresentation" : {
+                          "cashflowsMatchParameters" : true,
+                          "paymentCalculationPeriod" : [ {
+                            "adjustedPaymentDate" : "2017-09-28",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2016-09-28",
+                              "adjustedEndDate" : "2017-09-28",
+                              "meta" : {
+                                "globalKey" : "3cbae6c5"
+                              },
+                              "notionalAmount" : 1000000,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2017-09-28",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a24154"
+                                  }
+                                } ]
+                              }
+                            } ],
                             "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                              "globalKey" : "82e7d521"
+                            }
+                          } ]
+                        },
+                        "meta" : {
+                          "globalKey" : "cf660c1e"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "ee36c669"
+                        "globalKey" : "94be32cb"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "ffa91ae0"
+                    "globalKey" : "a6308742"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "ffa91ae0"
+                  "globalKey" : "a6308742"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "2029ada9"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.066,
                       "unit" : {
                         "currency" : {
                           "value" : "INR"
                         }
                       },
-                      "value" : 0.066,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "INR"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 1000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "INR"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "e50c0777"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 1000000,
                       "unit" : {
                         "currency" : {
                           "value" : "INR"
                         }
-                      },
-                      "value" : 1000000
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "788df4c7"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "61c6a255"
+                      }
                     },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
+                    }
+                  } ],
+                  "observable" : {
                     "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "INR-FBIL-MIBOR-OIS-COMPOUND"
+                        }
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
                           "value" : "rateOption-1"
                         } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "INR-FBIL-MIBOR-OIS-COMPOUND"
-                        }
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "INR"
-                        }
-                      },
-                      "value" : 1000000
+                    "meta" : {
+                      "globalKey" : "d70da84b"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f025b"
-              },
-              "value" : "2016-09-27"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "2894761"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "QAC-11111"
+                    "globalKey" : "f651ac0f"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "dd19",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "22222"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "999",
                   "meta" : {
-                    "scheme" : "platform_side_id"
-                  },
-                  "value" : "22222"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "dd19"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "dd19",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "22222"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "1117bae4"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS2894761"
+                  "value" : "PLATFORM"
+                },
+                "meta" : {
+                  "globalKey" : "9e635873"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "9e635873",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "9e635873",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2016-09-27",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "999-123",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "a7071c09"
+                "globalKey" : "24a161c0",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "a683d33f"
+            }
+          },
+          "meta" : {
+            "globalKey" : "a683d33f"
           }
         }
       }
     } ],
-    "intent" : "CONTRACT_FORMATION",
+    "eventQualifier" : "ContractFormation",
     "after" : [ {
-      "meta" : {
-        "globalKey" : "dbe0bc58"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
       "trade" : {
-        "account" : [ {
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "clearing_firm_accounts"
-            },
-            "value" : "999-123"
-          },
-          "meta" : {
-            "externalKey" : "account1",
-            "globalKey" : "a18b2f80"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
-          },
-          "servicingParty" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
-          }
-        } ],
-        "clearedDate" : "2016-09-27",
-        "meta" : {
-          "globalKey" : "18c86f75"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "clearing_firm",
-            "globalKey" : "dd19"
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "1051b",
+            "externalReference" : "clearing_service"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "2894761",
               "meta" : {
-                "scheme" : "clearing_member_firms"
-              },
-              "value" : "999"
-            },
-            "meta" : {
-              "globalKey" : "dd19"
+                "scheme" : "cme_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing_service",
-            "globalKey" : "1051b"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "CME"
-            },
-            "meta" : {
-              "globalKey" : "1051b"
+              "value" : "QAC-11111",
+              "meta" : {
+                "scheme" : "client_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "trade_source",
-            "globalKey" : "9e635873"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "PLATFORM"
-            },
+              "value" : "22222",
+              "meta" : {
+                "scheme" : "platform_trade_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "22222",
+              "meta" : {
+                "scheme" : "platform_side_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "22222",
+              "meta" : {
+                "scheme" : "block_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "fd5cf798"
+          }
+        }, {
+          "issuer" : {
+            "value" : "1010000023",
             "meta" : {
-              "globalKey" : "9e635873"
+              "scheme" : "cftc_Namespace"
             }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
           },
-          "partyReference" : {
-            "externalReference" : "trade_source",
-            "globalReference" : "9e635873"
-          },
-          "role" : "DATA_SUBMITTER"
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "CCCIRS2894761",
+              "meta" : {
+                "scheme" : "reg_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e12c31ab"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2016-09-27",
+          "meta" : {
+            "globalKey" : "3f025b"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "dd19"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -898,39 +851,46 @@
                 "payout" : {
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
                     "settlementTerms" : {
-                      "meta" : {
-                        "globalKey" : "5d919fd0"
-                      },
                       "settlementCurrency" : {
                         "value" : "USD"
                       },
+                      "meta" : {
+                        "globalKey" : "14162d5e"
+                      },
                       "cashSettlementTerms" : [ {
-                        "meta" : {
-                          "globalKey" : "d9e2916a"
+                        "valuationMethod" : {
+                          "valuationSource" : {
+                            "settlementRateOption" : {
+                              "settlementRateOption" : {
+                                "value" : "INR.RBIB/INR01"
+                              }
+                            }
+                          }
                         },
                         "valuationDate" : {
                           "fxFixingDate" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "6266a460"
+                              "globalKey" : "17e162ae"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "INMU"
@@ -941,52 +901,41 @@
                                 "globalKey" : "45138fc"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeToPaymentDates" : {
                               "paymentDatesReference" : [ {
-                                "externalReference" : "fixedLegPaymentDates",
-                                "globalReference" : "fe5a8a71"
+                                "globalReference" : "e0d2b7f3",
+                                "externalReference" : "fixedLegPaymentDates"
                               } ]
                             }
                           }
                         },
-                        "valuationMethod" : {
-                          "valuationSource" : {
-                            "settlementRateOption" : {
-                              "settlementRateOption" : {
-                                "value" : "INR.RBIB/INR01"
-                              }
-                            }
-                          }
+                        "meta" : {
+                          "globalKey" : "90671ef8"
                         }
                       } ]
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "fixedPrimaryBusinessCenters",
-                            "globalReference" : "45138fc"
-                          },
-                          "meta" : {
-                            "globalKey" : "fc799ec"
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "99b50bb"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "2b91d"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 1,
-                        "rollConvention" : "28"
-                      },
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/365.FIXED"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2016-09-28",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -995,75 +944,85 @@
                           },
                           "meta" : {
                             "globalKey" : "ecac8294"
-                          },
-                          "unadjustedDate" : "2016-09-28"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ecac8294"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "fixedCalcPeriodDates",
-                        "globalKey" : "ada3345b"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2017-09-28",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "45138fc"
+                                "globalReference" : "45138fc",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "fc799ec"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "99b50bb"
                             }
                           },
                           "meta" : {
                             "globalKey" : "78461817"
-                          },
-                          "unadjustedDate" : "2017-09-28"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "78461817"
                         }
-                      }
-                    },
-                    "cashflowRepresentation" : {
-                      "cashflowsMatchParameters" : true,
-                      "paymentCalculationPeriod" : [ {
-                        "adjustedPaymentDate" : "2017-09-28",
-                        "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2017-09-28",
-                          "adjustedStartDate" : "2016-09-28",
-                          "meta" : {
-                            "globalKey" : "5ddac6ff"
+                      },
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "45138fc",
+                            "externalReference" : "fixedPrimaryBusinessCenters"
                           },
-                          "fixedRate" : 0.066,
-                          "notionalAmount" : 1000000
-                        } ],
+                          "meta" : {
+                            "globalKey" : "fc799ec"
+                          }
+                        },
                         "meta" : {
-                          "globalKey" : "5a6fd623"
+                          "globalKey" : "99b50bb"
                         }
-                      } ]
-                    },
-                    "dayCountFraction" : {
-                      "value" : "ACT/365.FIXED"
-                    },
-                    "meta" : {
-                      "globalKey" : "d205b6b"
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "1796d"
+                        },
+                        "rollConvention" : "28"
+                      },
+                      "meta" : {
+                        "globalKey" : "469d196b",
+                        "externalKey" : "fixedCalcPeriodDates"
+                      }
                     },
                     "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "fixedLegPaymentDates",
-                        "globalKey" : "fe5a8a71"
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "78"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDaysOffset" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "ea4ab7fc"
+                        },
+                        "dayType" : "Business"
                       },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                       "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "INMU"
@@ -1071,81 +1030,82 @@
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "fixedPrimaryBusinessCenters",
-                            "globalKey" : "45138fc"
+                            "globalKey" : "45138fc",
+                            "externalKey" : "fixedPrimaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97da8c8d"
                         }
                       },
-                      "paymentDaysOffset" : {
-                        "meta" : {
-                          "globalKey" : "ea4baf04"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "dayType" : "BUSINESS"
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "ac8"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 1
+                      "meta" : {
+                        "globalKey" : "e0d2b7f3",
+                        "externalKey" : "fixedLegPaymentDates"
                       }
                     },
-                    "rateSpecification" : {
-                      "fixedRate" : {
+                    "cashflowRepresentation" : {
+                      "cashflowsMatchParameters" : true,
+                      "paymentCalculationPeriod" : [ {
+                        "adjustedPaymentDate" : "2017-09-28",
+                        "calculationPeriod" : [ {
+                          "adjustedStartDate" : "2016-09-28",
+                          "adjustedEndDate" : "2017-09-28",
+                          "meta" : {
+                            "globalKey" : "b5bbc461"
+                          },
+                          "notionalAmount" : 1000000,
+                          "fixedRate" : 0.066
+                        } ],
                         "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
-                          }
+                          "globalKey" : "b250d385"
                         }
-                      }
+                      } ]
+                    },
+                    "meta" : {
+                      "globalKey" : "88170df3"
                     }
                   }, {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-2"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
                     "settlementTerms" : {
-                      "meta" : {
-                        "globalKey" : "d3395f62"
-                      },
                       "settlementCurrency" : {
                         "value" : "USD"
                       },
+                      "meta" : {
+                        "globalKey" : "55757a8c"
+                      },
                       "cashSettlementTerms" : [ {
-                        "meta" : {
-                          "globalKey" : "4f8a50fc"
+                        "valuationMethod" : {
+                          "valuationSource" : {
+                            "settlementRateOption" : {
+                              "settlementRateOption" : {
+                                "value" : "INR.RBIB/INR01"
+                              }
+                            }
+                          }
                         },
                         "valuationDate" : {
                           "fxFixingDate" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "a3c5f18e"
+                              "globalKey" : "5940afdc"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "INMU"
@@ -1156,52 +1116,39 @@
                                 "globalKey" : "45138fc"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeToPaymentDates" : {
                               "paymentDatesReference" : [ {
-                                "externalReference" : "floatingLegPaymentDates",
-                                "globalReference" : "fe5a8a71"
+                                "globalReference" : "e0d2b7f3",
+                                "externalReference" : "floatingLegPaymentDates"
                               } ]
                             }
                           }
                         },
-                        "valuationMethod" : {
-                          "valuationSource" : {
-                            "settlementRateOption" : {
-                              "settlementRateOption" : {
-                                "value" : "INR.RBIB/INR01"
-                              }
-                            }
-                          }
+                        "meta" : {
+                          "globalKey" : "d1c66c26"
                         }
                       } ]
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "45138fc"
-                          },
-                          "meta" : {
-                            "globalKey" : "b040ce04"
+                    "rateSpecification" : {
+                      "floatingRate" : {
+                        "rateOption" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "rateOption-1"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "aa1484d3"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "2b91d"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 1,
-                        "rollConvention" : "28"
-                      },
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/365.FIXED"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2016-09-28",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -1210,83 +1157,85 @@
                           },
                           "meta" : {
                             "globalKey" : "ecac8294"
-                          },
-                          "unadjustedDate" : "2016-09-28"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ecac8294"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "floatingCalcPeriodDates",
-                        "globalKey" : "659cfa8b"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2017-09-28",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "45138fc"
+                                "globalReference" : "45138fc",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "b040ce04"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "aa1484d3"
                             }
                           },
                           "meta" : {
                             "globalKey" : "18bf4c2f"
-                          },
-                          "unadjustedDate" : "2017-09-28"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "18bf4c2f"
                         }
-                      }
-                    },
-                    "cashflowRepresentation" : {
-                      "cashflowsMatchParameters" : true,
-                      "paymentCalculationPeriod" : [ {
-                        "adjustedPaymentDate" : "2017-09-28",
-                        "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2017-09-28",
-                          "adjustedStartDate" : "2016-09-28",
-                          "meta" : {
-                            "globalKey" : "c7cff6c5"
-                          },
-                          "floatingRateDefinition" : {
-                            "rateObservation" : [ {
-                              "adjustedFixingDate" : "2017-09-28",
-                              "meta" : {
-                                "globalKey" : "7a24154"
-                              },
-                              "observedRate" : 0
-                            } ]
+                      },
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "45138fc",
+                            "externalReference" : "floatPrimaryBusinessCenters"
                           },
-                          "notionalAmount" : 1000000
-                        } ],
+                          "meta" : {
+                            "globalKey" : "b040ce04"
+                          }
+                        },
                         "meta" : {
-                          "globalKey" : "dfce521"
+                          "globalKey" : "aa1484d3"
                         }
-                      } ]
-                    },
-                    "dayCountFraction" : {
-                      "value" : "ACT/365.FIXED"
-                    },
-                    "meta" : {
-                      "globalKey" : "ebcc2434"
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "1796d"
+                        },
+                        "rollConvention" : "28"
+                      },
+                      "meta" : {
+                        "globalKey" : "b78eab9b",
+                        "externalKey" : "floatingCalcPeriodDates"
+                      }
                     },
                     "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "floatingLegPaymentDates",
-                        "globalKey" : "fe5a8a71"
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "78"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDaysOffset" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "ea4ab7fc"
+                        },
+                        "dayType" : "Business"
                       },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                       "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "INMU"
@@ -1294,55 +1243,32 @@
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "floatPrimaryBusinessCenters",
-                            "globalKey" : "45138fc"
+                            "globalKey" : "45138fc",
+                            "externalKey" : "floatPrimaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97da8c8d"
                         }
                       },
-                      "paymentDaysOffset" : {
-                        "meta" : {
-                          "globalKey" : "ea4baf04"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "dayType" : "BUSINESS"
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "ac8"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 1
-                      }
-                    },
-                    "rateSpecification" : {
-                      "floatingRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateOption" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "rateOption-1"
-                          }
-                        }
+                      "meta" : {
+                        "globalKey" : "e0d2b7f3",
+                        "externalKey" : "floatingLegPaymentDates"
                       }
                     },
                     "resetDates" : {
                       "calculationPeriodDatesReference" : {
-                        "externalReference" : "floatingCalcPeriodDates",
-                        "globalReference" : "659cfa8b"
+                        "globalReference" : "b78eab9b",
+                        "externalReference" : "floatingCalcPeriodDates"
                       },
+                      "resetRelativeTo" : "CalculationPeriodEndDate",
                       "fixingDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "54620b84"
+                          "globalKey" : "c9b9dd8c"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
+                        "businessDayConvention" : "PRECEDING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "INMU"
@@ -1351,263 +1277,317 @@
                             "globalKey" : "225d8d"
                           }
                         },
-                        "businessDayConvention" : "PRECEDING",
                         "dateRelativeTo" : {
-                          "externalReference" : "floatingLegResetDates",
-                          "globalReference" : "84302cd9"
+                          "globalReference" : "8347cb17",
+                          "externalReference" : "floatingLegResetDates"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "floatingLegResetDates",
-                        "globalKey" : "84302cd9"
+                      "resetFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "78"
+                        }
                       },
                       "resetDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "45138fc"
+                            "globalReference" : "45138fc",
+                            "externalReference" : "floatPrimaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "b040ce04"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "aa1484d3"
                         }
                       },
-                      "resetFrequency" : {
+                      "meta" : {
+                        "globalKey" : "8347cb17",
+                        "externalKey" : "floatingLegResetDates"
+                      }
+                    },
+                    "cashflowRepresentation" : {
+                      "cashflowsMatchParameters" : true,
+                      "paymentCalculationPeriod" : [ {
+                        "adjustedPaymentDate" : "2017-09-28",
+                        "calculationPeriod" : [ {
+                          "adjustedStartDate" : "2016-09-28",
+                          "adjustedEndDate" : "2017-09-28",
+                          "meta" : {
+                            "globalKey" : "3cbae6c5"
+                          },
+                          "notionalAmount" : 1000000,
+                          "floatingRateDefinition" : {
+                            "rateObservation" : [ {
+                              "adjustedFixingDate" : "2017-09-28",
+                              "observedRate" : 0,
+                              "meta" : {
+                                "globalKey" : "7a24154"
+                              }
+                            } ]
+                          }
+                        } ],
                         "meta" : {
-                          "globalKey" : "ac8"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 1
-                      },
-                      "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                          "globalKey" : "82e7d521"
+                        }
+                      } ]
+                    },
+                    "meta" : {
+                      "globalKey" : "cf660c1e"
                     }
                   } ],
                   "meta" : {
-                    "globalKey" : "ee36c669"
+                    "globalKey" : "94be32cb"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "ffa91ae0"
+                "globalKey" : "a6308742"
               }
             },
             "meta" : {
-              "globalKey" : "ffa91ae0"
+              "globalKey" : "a6308742"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "2029ada9"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.066,
                   "unit" : {
                     "currency" : {
                       "value" : "INR"
                     }
                   },
-                  "value" : 0.066,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "INR"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
                 }
               } ],
               "quantity" : [ {
+                "value" : {
+                  "value" : 1000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "INR"
+                    }
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e50c0777"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 1000000,
                   "unit" : {
                     "currency" : {
                       "value" : "INR"
                     }
-                  },
-                  "value" : 1000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
                 }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "788df4c7"
-              },
+              } ],
               "observable" : {
-                "meta" : {
-                  "globalKey" : "61c6a255"
-                },
                 "rateOption" : {
+                  "value" : {
+                    "floatingRateIndex" : {
+                      "value" : "INR-FBIL-MIBOR-OIS-COMPOUND"
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "rateOption-1"
                     } ]
-                  },
-                  "value" : {
-                    "floatingRateIndex" : {
-                      "value" : "INR-FBIL-MIBOR-OIS-COMPOUND"
-                    }
                   }
-                }
-              },
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
                 },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "INR"
-                    }
-                  },
-                  "value" : 1000000
+                "meta" : {
+                  "globalKey" : "d70da84b"
                 }
-              } ]
-            } ]
-          } ]
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f025b"
-          },
-          "value" : "2016-09-27"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "cme_trade_id"
               },
-              "value" : "2894761"
-            }
-          }, {
-            "identifier" : {
               "meta" : {
-                "scheme" : "client_trade_id"
-              },
-              "value" : "QAC-11111"
+                "globalKey" : "f651ac0f"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "dd19",
+              "externalReference" : "clearing_firm"
             }
           }, {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "platform_trade_id"
-              },
-              "value" : "22222"
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
             }
-          }, {
+          } ]
+        },
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "999",
               "meta" : {
-                "scheme" : "platform_side_id"
-              },
-              "value" : "22222"
+                "scheme" : "clearing_member_firms"
+              }
+            },
+            "meta" : {
+              "globalKey" : "dd19"
             }
-          }, {
+          } ],
+          "meta" : {
+            "globalKey" : "dd19",
+            "externalKey" : "clearing_firm"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "block_trade_id"
-              },
-              "value" : "22222"
+              "value" : "CME"
+            },
+            "meta" : {
+              "globalKey" : "1051b"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "clearing_service",
-            "globalReference" : "1051b"
-          },
           "meta" : {
-            "globalKey" : "1117bae4"
+            "globalKey" : "1051b",
+            "externalKey" : "clearing_service"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "reg_trade_id"
-              },
-              "value" : "CCCIRS2894761"
+              "value" : "PLATFORM"
+            },
+            "meta" : {
+              "globalKey" : "9e635873"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "9e635873",
+            "externalKey" : "trade_source"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "9e635873",
+            "externalReference" : "trade_source"
+          },
+          "role" : "DataSubmitter",
+          "ownershipPartyReference" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
+          }
+        } ],
+        "clearedDate" : "2016-09-27",
+        "account" : [ {
+          "partyReference" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
+          },
+          "accountNumber" : {
+            "value" : "999-123",
             "meta" : {
-              "scheme" : "cftc_Namespace"
-            },
-            "value" : "1010000023"
+              "scheme" : "clearing_firm_accounts"
+            }
+          },
+          "servicingParty" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
           },
           "meta" : {
-            "globalKey" : "a7071c09"
+            "globalKey" : "24a161c0",
+            "externalKey" : "account1"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "a683d33f"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
+      },
+      "meta" : {
+        "globalKey" : "90ceebe2"
       }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "68eccfe7"
+      "globalKey" : "892ad867"
     }
   },
+  "previousWorkflowStep" : {
+    "globalReference" : "994c5f0b"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "0106625451",
       "meta" : {
         "scheme" : "cme_message_id"
-      },
-      "value" : "0106625451"
+      }
     },
     "sentBy" : {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
+      }
     },
     "sentTo" : [ {
+      "value" : "999",
       "meta" : {
         "scheme" : "cme_firm_id"
-      },
-      "value" : "999"
+      }
     }, {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
+      }
     } ]
   },
-  "meta" : {
-    "globalKey" : "a9869ef"
-  },
+  "timestamp" : [ {
+    "dateTime" : "2016-09-27T10:45:25Z",
+    "qualification" : "eventCreationDateTime"
+  } ],
   "party" : [ {
-    "meta" : {
-      "externalKey" : "clearing_firm",
-      "globalKey" : "dd19"
-    },
     "partyId" : [ {
       "identifier" : {
+        "value" : "999",
         "meta" : {
           "scheme" : "clearing_member_firms"
-        },
-        "value" : "999"
+        }
       },
       "meta" : {
         "globalKey" : "dd19"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "clearing_service",
-      "globalKey" : "1051b"
-    },
+      "globalKey" : "dd19",
+      "externalKey" : "clearing_firm"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "CME"
@@ -1615,12 +1595,12 @@
       "meta" : {
         "globalKey" : "1051b"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "trade_source",
-      "globalKey" : "9e635873"
-    },
+      "globalKey" : "1051b",
+      "externalKey" : "clearing_service"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "PLATFORM"
@@ -1628,13 +1608,33 @@
       "meta" : {
         "globalKey" : "9e635873"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "9e635873",
+      "externalKey" : "trade_source"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "f411c66b"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2016-09-27T10:45:25Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+  "account" : [ {
+    "partyReference" : {
+      "globalReference" : "dd19",
+      "externalReference" : "clearing_firm"
+    },
+    "accountNumber" : {
+      "value" : "999-123",
+      "meta" : {
+        "scheme" : "clearing_firm_accounts"
+      }
+    },
+    "servicingParty" : {
+      "globalReference" : "dd19",
+      "externalReference" : "clearing_firm"
+    },
+    "meta" : {
+      "globalKey" : "24a161c0",
+      "externalKey" : "account1"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "36209387"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex07-Fixed-Float-Zero-Coupon-BRL-CDI-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex07-Fixed-Float-Zero-Coupon-BRL-CDI-func-output.json
index 7f3fafa22f..6c22eb5585 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex07-Fixed-Float-Zero-Coupon-BRL-CDI-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex07-Fixed-Float-Zero-Coupon-BRL-CDI-func-output.json
@@ -1,124 +1,80 @@
 {
-  "account" : [ {
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "clearing_firm_accounts"
-      },
-      "value" : "999-123"
-    },
-    "meta" : {
-      "externalKey" : "account1",
-      "globalKey" : "a18b2f80"
-    },
-    "partyReference" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "dd19"
-    },
-    "servicingParty" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "dd19"
-    }
-  } ],
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "dd51b34e"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "999-123"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "a18b2f80"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              }
-            } ],
-            "clearedDate" : "2015-05-20",
-            "meta" : {
-              "globalKey" : "dd51b34e"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "dd19"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "2894761",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "999"
-                },
-                "meta" : {
-                  "globalKey" : "dd19"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "QAC-11111",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "9e635873"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "PLATFORM"
-                },
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "risk_approval_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "fd5cf798"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "9e635873"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
               },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "9e635873"
-              },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS2894761",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e12c31ab"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2015-05-20",
+              "meta" : {
+                "globalKey" : "3ef954"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "dd19"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -129,39 +85,46 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "settlementTerms" : {
-                          "meta" : {
-                            "globalKey" : "e2cf4e39"
-                          },
                           "settlementCurrency" : {
                             "value" : "USD"
                           },
+                          "meta" : {
+                            "globalKey" : "e54a07e5"
+                          },
                           "cashSettlementTerms" : [ {
-                            "meta" : {
-                              "globalKey" : "4a5ab3d3"
+                            "valuationMethod" : {
+                              "valuationSource" : {
+                                "settlementRateOption" : {
+                                  "settlementRateOption" : {
+                                    "value" : "BRL.PTAX/BRL09"
+                                  }
+                                }
+                              }
                             },
                             "valuationDate" : {
                               "fxFixingDate" : {
+                                "periodMultiplier" : -1,
+                                "period" : "D",
                                 "meta" : {
-                                  "globalKey" : "6b223df1"
+                                  "globalKey" : "79e4d95b"
                                 },
-                                "period" : "D",
-                                "periodMultiplier" : -1,
-                                "dayType" : "BUSINESS",
+                                "dayType" : "Business",
+                                "businessDayConvention" : "PRECEDING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "BRBD"
@@ -172,52 +135,39 @@
                                     "globalKey" : "3f03a97"
                                   }
                                 },
-                                "businessDayConvention" : "PRECEDING",
                                 "dateRelativeToCalculationPeriodDates" : {
                                   "calculationPeriodDatesReference" : [ {
-                                    "externalReference" : "floatingLegTerminationDate",
-                                    "globalReference" : "500aa139"
+                                    "globalReference" : "500aa139",
+                                    "externalReference" : "floatingLegTerminationDate"
                                   } ]
                                 }
                               }
                             },
-                            "valuationMethod" : {
-                              "valuationSource" : {
-                                "settlementRateOption" : {
-                                  "settlementRateOption" : {
-                                    "value" : "BRL.PTAX/BRL09"
-                                  }
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "4cd56d7f"
                             }
                           } ]
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "1f3c92"
-                              },
-                              "meta" : {
-                                "globalKey" : "ff80739a"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "meta" : {
-                              "globalKey" : "17a8d0d2"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "25e2ab"
-                            },
-                            "period" : "T",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "NONE"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "CAL/252"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2015-05-20",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -226,85 +176,86 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec8a9b8c"
-                              },
-                              "unadjustedDate" : "2015-05-20"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec8a9b8c"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "5b12a968"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2015-07-01",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "NONE",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "BRBD"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "floatPrimaryBusinessCenters",
-                                    "globalKey" : "1f3c92"
+                                    "globalKey" : "1f3c92",
+                                    "externalKey" : "floatPrimaryBusinessCenters"
                                   }
                                 },
-                                "businessDayConvention" : "NONE",
                                 "meta" : {
                                   "globalKey" : "a97eaa5a"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "500aa139"
-                              },
-                              "unadjustedDate" : "2015-07-01"
+                              }
                             },
                             "meta" : {
-                              "externalKey" : "floatingLegTerminationDate",
-                              "globalKey" : "500aa139"
+                              "globalKey" : "500aa139",
+                              "externalKey" : "floatingLegTerminationDate"
                             }
-                          }
-                        },
-                        "cashflowRepresentation" : {
-                          "cashflowsMatchParameters" : true,
-                          "paymentCalculationPeriod" : [ {
-                            "adjustedPaymentDate" : "2015-07-02",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-07-01",
-                              "adjustedStartDate" : "2015-05-20",
-                              "meta" : {
-                                "globalKey" : "5dfd648"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2015-06-30",
-                                  "meta" : {
-                                    "globalKey" : "ec670a6d"
-                                  },
-                                  "observationWeight" : 1,
-                                  "observedRate" : 0
-                                } ]
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "1f3c92",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
-                              "notionalAmount" : 9856218.36
-                            } ],
+                              "meta" : {
+                                "globalKey" : "ff80739a"
+                              }
+                            },
                             "meta" : {
-                              "globalKey" : "fa10b6c6"
+                              "globalKey" : "17a8d0d2"
                             }
-                          } ]
-                        },
-                        "dayCountFraction" : {
-                          "value" : "CAL/252"
-                        },
-                        "meta" : {
-                          "globalKey" : "ef1ceff7"
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "T",
+                            "meta" : {
+                              "globalKey" : "24b525"
+                            },
+                            "rollConvention" : "NONE"
+                          },
+                          "meta" : {
+                            "globalKey" : "5997be3c",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
                         },
                         "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "5720d4fe"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "T",
+                            "meta" : {
+                              "globalKey" : "73"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 1,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4abbbd"
+                            },
+                            "dayType" : "Business"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "BRBD"
@@ -315,51 +266,27 @@
                                 "globalKey" : "3f03a97"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da1616c6"
                             }
                           },
-                          "paymentDaysOffset" : {
-                            "meta" : {
-                              "globalKey" : "ea4baf23"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 1,
-                            "dayType" : "BUSINESS"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "a2d"
-                            },
-                            "period" : "T",
-                            "periodMultiplier" : 1
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "f0df7870",
+                            "externalKey" : "floatingLegPaymentDates"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "5b12a968"
+                            "globalReference" : "5997be3c",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
                           "fixingDates" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "a15dffd4"
+                              "globalKey" : "16b5d1dc"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "BRBD"
@@ -368,87 +295,123 @@
                                 "globalKey" : "1f3c92"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "a3a17a48"
+                              "globalReference" : "4cd9061e",
+                              "externalReference" : "floatingLegResetDates"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "a3a17a48"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "63"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "1f3c92"
+                                "globalReference" : "1f3c92",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "ff80739a"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "meta" : {
                               "globalKey" : "17a8d0d2"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "83d"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "4cd9061e",
+                            "externalKey" : "floatingLegResetDates"
                           }
+                        },
+                        "cashflowRepresentation" : {
+                          "cashflowsMatchParameters" : true,
+                          "paymentCalculationPeriod" : [ {
+                            "adjustedPaymentDate" : "2015-07-02",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2015-05-20",
+                              "adjustedEndDate" : "2015-07-01",
+                              "meta" : {
+                                "globalKey" : "5106fb84"
+                              },
+                              "notionalAmount" : 9856218.36,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2015-06-30",
+                                  "observedRate" : 0,
+                                  "observationWeight" : 1,
+                                  "meta" : {
+                                    "globalKey" : "ec670fef"
+                                  }
+                                } ]
+                              }
+                            } ],
+                            "meta" : {
+                              "globalKey" : "4537dc02"
+                            }
+                          } ]
+                        },
+                        "meta" : {
+                          "globalKey" : "40feef45"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-3"
+                            }
+                          },
                           "futureValueNotional" : {
-                            "calculationPeriodNumberOfDays" : 29,
-                            "currency" : {
-                              "value" : "BRL"
-                            },
                             "quantity" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
                             },
+                            "currency" : {
+                              "value" : "BRL"
+                            },
+                            "calculationPeriodNumberOfDays" : 29,
                             "valueDate" : "2015-06-30"
                           },
                           "meta" : {
                             "globalKey" : "ec753add"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-3"
-                            }
                           }
                         },
                         "settlementTerms" : {
-                          "meta" : {
-                            "globalKey" : "1b30f30b"
-                          },
                           "settlementCurrency" : {
                             "value" : "USD"
                           },
+                          "meta" : {
+                            "globalKey" : "fa2527d3"
+                          },
                           "cashSettlementTerms" : [ {
-                            "meta" : {
-                              "globalKey" : "82bc58a5"
+                            "valuationMethod" : {
+                              "valuationSource" : {
+                                "settlementRateOption" : {
+                                  "settlementRateOption" : {
+                                    "value" : "BRL.PTAX/BRL09"
+                                  }
+                                }
+                              }
                             },
                             "valuationDate" : {
                               "fxFixingDate" : {
+                                "periodMultiplier" : -1,
+                                "period" : "D",
                                 "meta" : {
-                                  "globalKey" : "7ffd5ddf"
+                                  "globalKey" : "8ebff949"
                                 },
-                                "period" : "D",
-                                "periodMultiplier" : -1,
-                                "dayType" : "BUSINESS",
+                                "dayType" : "Business",
+                                "businessDayConvention" : "PRECEDING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "BRBD"
@@ -459,52 +422,41 @@
                                     "globalKey" : "3f03a97"
                                   }
                                 },
-                                "businessDayConvention" : "PRECEDING",
                                 "dateRelativeToCalculationPeriodDates" : {
                                   "calculationPeriodDatesReference" : [ {
-                                    "externalReference" : "fixedLegTerminationDate",
-                                    "globalReference" : "c7a84f60"
+                                    "globalReference" : "c7a84f60",
+                                    "externalReference" : "fixedLegTerminationDate"
                                   } ]
                                 }
                               }
                             },
-                            "valuationMethod" : {
-                              "valuationSource" : {
-                                "settlementRateOption" : {
-                                  "settlementRateOption" : {
-                                    "value" : "BRL.PTAX/BRL09"
-                                  }
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "61b08d6d"
                             }
                           } ]
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "1f3c92"
-                              },
-                              "meta" : {
-                                "globalKey" : "c2991982"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "meta" : {
-                              "globalKey" : "dac176ba"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "25e2ab"
-                            },
-                            "period" : "T",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "NONE"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "CAL/252"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2015-05-20",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -513,76 +465,86 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec8a9b8c"
-                              },
-                              "unadjustedDate" : "2015-05-20"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec8a9b8c"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "cd8b3ea7"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2015-07-01",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "FOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "BRBD"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "fixedPrimaryBusinessCenters",
-                                    "globalKey" : "1f3c92"
+                                    "globalKey" : "1f3c92",
+                                    "externalKey" : "fixedPrimaryBusinessCenters"
                                   }
                                 },
-                                "businessDayConvention" : "FOLLOWING",
                                 "meta" : {
                                   "globalKey" : "211c5881"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "c7a84f60"
-                              },
-                              "unadjustedDate" : "2015-07-01"
+                              }
                             },
                             "meta" : {
-                              "externalKey" : "fixedLegTerminationDate",
-                              "globalKey" : "c7a84f60"
+                              "globalKey" : "c7a84f60",
+                              "externalKey" : "fixedLegTerminationDate"
                             }
-                          }
-                        },
-                        "cashflowRepresentation" : {
-                          "cashflowsMatchParameters" : true,
-                          "paymentCalculationPeriod" : [ {
-                            "adjustedPaymentDate" : "2015-07-02",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-07-01",
-                              "adjustedStartDate" : "2015-05-20",
-                              "meta" : {
-                                "globalKey" : "9f04c8ca"
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "1f3c92",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
                               },
-                              "fixedRate" : 0.1323,
-                              "notionalAmount" : 9856218.36
-                            } ],
+                              "meta" : {
+                                "globalKey" : "c2991982"
+                              }
+                            },
                             "meta" : {
-                              "globalKey" : "47459848"
+                              "globalKey" : "dac176ba"
                             }
-                          } ]
-                        },
-                        "dayCountFraction" : {
-                          "value" : "CAL/252"
-                        },
-                        "meta" : {
-                          "globalKey" : "157d8c81"
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "T",
+                            "meta" : {
+                              "globalKey" : "24b525"
+                            },
+                            "rollConvention" : "NONE"
+                          },
+                          "meta" : {
+                            "globalKey" : "4b19dbcb",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
                         },
                         "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "5720d4fe"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "T",
+                            "meta" : {
+                              "globalKey" : "73"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 1,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4abbbd"
+                            },
+                            "dayType" : "Business"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "BRBD"
@@ -593,329 +555,320 @@
                                 "globalKey" : "3f03a97"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da1616c6"
                             }
                           },
-                          "paymentDaysOffset" : {
-                            "meta" : {
-                              "globalKey" : "ea4baf23"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 1,
-                            "dayType" : "BUSINESS"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "a2d"
-                            },
-                            "period" : "T",
-                            "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "f0df7870",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "cashflowRepresentation" : {
+                          "cashflowsMatchParameters" : true,
+                          "paymentCalculationPeriod" : [ {
+                            "adjustedPaymentDate" : "2015-07-02",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2015-05-20",
+                              "adjustedEndDate" : "2015-07-01",
+                              "meta" : {
+                                "globalKey" : "bfaee0f6"
+                              },
+                              "notionalAmount" : 9856218.36,
+                              "fixedRate" : 0.1323
+                            } ],
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
+                              "globalKey" : "67efb074"
                             }
-                          }
+                          } ]
+                        },
+                        "meta" : {
+                          "globalKey" : "f6f5fa83"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "a8048f78"
+                        "globalKey" : "bdf802c8"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "c7f7e48"
+                    "globalKey" : "2272f198"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "c7f7e48"
+                  "globalKey" : "2272f198"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "fb78437f"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "33a3d745"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "BRL-CDI"
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 9856218.36,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "BRL"
                         }
                       }
-                    }
-                  },
-                  "quantity" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "BRL"
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "BRL-CDI"
                         }
                       },
-                      "value" : 9856218.36
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "40d7115b"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "260039b"
                   },
+                  "meta" : {
+                    "globalKey" : "4d0f7677"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.1323,
                       "unit" : {
                         "currency" : {
                           "value" : "BRL"
                         }
                       },
-                      "value" : 0.1323,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "BRL"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-3"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 9856218.36,
                       "unit" : {
                         "currency" : {
                           "value" : "BRL"
                         }
-                      },
-                      "value" : 9856218.36
-                    }
-                  }, {
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "quantity-3"
                       } ]
-                    },
+                    }
+                  }, {
                     "value" : {
+                      "value" : 9998162.07,
                       "unit" : {
                         "currency" : {
                           "value" : "BRL"
                         }
-                      },
-                      "value" : 9998162.07
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ef954"
-              },
-              "value" : "2015-05-20"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
-                  },
-                  "value" : "2894761"
-                }
-              }, {
-                "identifier" : {
+                  } ],
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "QAC-11111"
+                    "globalKey" : "49a06fc5"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "dd19",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "22222"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "999",
                   "meta" : {
-                    "scheme" : "risk_approval_id"
-                  },
-                  "value" : "22222"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "dd19"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "dd19",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "22222"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "1117bae4"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS2894761"
+                  "value" : "PLATFORM"
+                },
+                "meta" : {
+                  "globalKey" : "9e635873"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "9e635873",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "9e635873",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2015-05-20",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "999-123",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "a7071c09"
+                "globalKey" : "24a161c0",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "85fb1fae"
+            }
+          },
+          "meta" : {
+            "globalKey" : "85fb1fae"
           }
         }
       }
     } ],
-    "intent" : "CONTRACT_FORMATION",
+    "eventQualifier" : "ContractFormation",
     "after" : [ {
-      "meta" : {
-        "globalKey" : "faabca4b"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
       "trade" : {
-        "account" : [ {
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "clearing_firm_accounts"
-            },
-            "value" : "999-123"
-          },
-          "meta" : {
-            "externalKey" : "account1",
-            "globalKey" : "a18b2f80"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
-          },
-          "servicingParty" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
-          }
-        } ],
-        "clearedDate" : "2015-05-20",
-        "meta" : {
-          "globalKey" : "dd51b34e"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "clearing_firm",
-            "globalKey" : "dd19"
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "1051b",
+            "externalReference" : "clearing_service"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "2894761",
               "meta" : {
-                "scheme" : "clearing_member_firms"
-              },
-              "value" : "999"
-            },
-            "meta" : {
-              "globalKey" : "dd19"
+                "scheme" : "cme_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing_service",
-            "globalKey" : "1051b"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "CME"
-            },
-            "meta" : {
-              "globalKey" : "1051b"
+              "value" : "QAC-11111",
+              "meta" : {
+                "scheme" : "client_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "trade_source",
-            "globalKey" : "9e635873"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "PLATFORM"
-            },
+              "value" : "22222",
+              "meta" : {
+                "scheme" : "platform_trade_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "22222",
+              "meta" : {
+                "scheme" : "risk_approval_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "22222",
+              "meta" : {
+                "scheme" : "block_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "fd5cf798"
+          }
+        }, {
+          "issuer" : {
+            "value" : "1010000023",
             "meta" : {
-              "globalKey" : "9e635873"
+              "scheme" : "cftc_Namespace"
             }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
-          },
-          "partyReference" : {
-            "externalReference" : "trade_source",
-            "globalReference" : "9e635873"
           },
-          "role" : "DATA_SUBMITTER"
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "CCCIRS2894761",
+              "meta" : {
+                "scheme" : "reg_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e12c31ab"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2015-05-20",
+          "meta" : {
+            "globalKey" : "3ef954"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "dd19"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -926,39 +879,46 @@
                 "payout" : {
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
                     "settlementTerms" : {
-                      "meta" : {
-                        "globalKey" : "e2cf4e39"
-                      },
                       "settlementCurrency" : {
                         "value" : "USD"
                       },
+                      "meta" : {
+                        "globalKey" : "e54a07e5"
+                      },
                       "cashSettlementTerms" : [ {
-                        "meta" : {
-                          "globalKey" : "4a5ab3d3"
+                        "valuationMethod" : {
+                          "valuationSource" : {
+                            "settlementRateOption" : {
+                              "settlementRateOption" : {
+                                "value" : "BRL.PTAX/BRL09"
+                              }
+                            }
+                          }
                         },
                         "valuationDate" : {
                           "fxFixingDate" : {
+                            "periodMultiplier" : -1,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "6b223df1"
+                              "globalKey" : "79e4d95b"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -1,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "PRECEDING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "BRBD"
@@ -969,52 +929,39 @@
                                 "globalKey" : "3f03a97"
                               }
                             },
-                            "businessDayConvention" : "PRECEDING",
                             "dateRelativeToCalculationPeriodDates" : {
                               "calculationPeriodDatesReference" : [ {
-                                "externalReference" : "floatingLegTerminationDate",
-                                "globalReference" : "500aa139"
+                                "globalReference" : "500aa139",
+                                "externalReference" : "floatingLegTerminationDate"
                               } ]
                             }
                           }
                         },
-                        "valuationMethod" : {
-                          "valuationSource" : {
-                            "settlementRateOption" : {
-                              "settlementRateOption" : {
-                                "value" : "BRL.PTAX/BRL09"
-                              }
-                            }
-                          }
+                        "meta" : {
+                          "globalKey" : "4cd56d7f"
                         }
                       } ]
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "1f3c92"
-                          },
-                          "meta" : {
-                            "globalKey" : "ff80739a"
+                    "rateSpecification" : {
+                      "floatingRate" : {
+                        "rateOption" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "rateOption-1"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "meta" : {
-                          "globalKey" : "17a8d0d2"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "25e2ab"
-                        },
-                        "period" : "T",
-                        "periodMultiplier" : 1,
-                        "rollConvention" : "NONE"
-                      },
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "CAL/252"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2015-05-20",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -1023,85 +970,86 @@
                           },
                           "meta" : {
                             "globalKey" : "ec8a9b8c"
-                          },
-                          "unadjustedDate" : "2015-05-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ec8a9b8c"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "floatingCalcPeriodDates",
-                        "globalKey" : "5b12a968"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2015-07-01",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "BRBD"
                               } ],
                               "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "1f3c92"
+                                "globalKey" : "1f3c92",
+                                "externalKey" : "floatPrimaryBusinessCenters"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "meta" : {
                               "globalKey" : "a97eaa5a"
                             }
                           },
                           "meta" : {
                             "globalKey" : "500aa139"
-                          },
-                          "unadjustedDate" : "2015-07-01"
+                          }
                         },
                         "meta" : {
-                          "externalKey" : "floatingLegTerminationDate",
-                          "globalKey" : "500aa139"
+                          "globalKey" : "500aa139",
+                          "externalKey" : "floatingLegTerminationDate"
                         }
-                      }
-                    },
-                    "cashflowRepresentation" : {
-                      "cashflowsMatchParameters" : true,
-                      "paymentCalculationPeriod" : [ {
-                        "adjustedPaymentDate" : "2015-07-02",
-                        "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2015-07-01",
-                          "adjustedStartDate" : "2015-05-20",
-                          "meta" : {
-                            "globalKey" : "5dfd648"
-                          },
-                          "floatingRateDefinition" : {
-                            "rateObservation" : [ {
-                              "adjustedFixingDate" : "2015-06-30",
-                              "meta" : {
-                                "globalKey" : "ec670a6d"
-                              },
-                              "observationWeight" : 1,
-                              "observedRate" : 0
-                            } ]
+                      },
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "NONE",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "1f3c92",
+                            "externalReference" : "floatPrimaryBusinessCenters"
                           },
-                          "notionalAmount" : 9856218.36
-                        } ],
+                          "meta" : {
+                            "globalKey" : "ff80739a"
+                          }
+                        },
                         "meta" : {
-                          "globalKey" : "fa10b6c6"
+                          "globalKey" : "17a8d0d2"
                         }
-                      } ]
-                    },
-                    "dayCountFraction" : {
-                      "value" : "CAL/252"
-                    },
-                    "meta" : {
-                      "globalKey" : "ef1ceff7"
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "T",
+                        "meta" : {
+                          "globalKey" : "24b525"
+                        },
+                        "rollConvention" : "NONE"
+                      },
+                      "meta" : {
+                        "globalKey" : "5997be3c",
+                        "externalKey" : "floatingCalcPeriodDates"
+                      }
                     },
                     "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "floatingLegPaymentDates",
-                        "globalKey" : "5720d4fe"
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "T",
+                        "meta" : {
+                          "globalKey" : "73"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDaysOffset" : {
+                        "periodMultiplier" : 1,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "ea4abbbd"
+                        },
+                        "dayType" : "Business"
                       },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                       "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "BRBD"
@@ -1112,51 +1060,27 @@
                             "globalKey" : "3f03a97"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "da1616c6"
                         }
                       },
-                      "paymentDaysOffset" : {
-                        "meta" : {
-                          "globalKey" : "ea4baf23"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 1,
-                        "dayType" : "BUSINESS"
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "a2d"
-                        },
-                        "period" : "T",
-                        "periodMultiplier" : 1
-                      }
-                    },
-                    "rateSpecification" : {
-                      "floatingRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateOption" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "rateOption-1"
-                          }
-                        }
+                      "meta" : {
+                        "globalKey" : "f0df7870",
+                        "externalKey" : "floatingLegPaymentDates"
                       }
                     },
                     "resetDates" : {
                       "calculationPeriodDatesReference" : {
-                        "externalReference" : "floatingCalcPeriodDates",
-                        "globalReference" : "5b12a968"
+                        "globalReference" : "5997be3c",
+                        "externalReference" : "floatingCalcPeriodDates"
                       },
                       "fixingDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "a15dffd4"
+                          "globalKey" : "16b5d1dc"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "BRBD"
@@ -1165,87 +1089,123 @@
                             "globalKey" : "1f3c92"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "floatingLegResetDates",
-                          "globalReference" : "a3a17a48"
+                          "globalReference" : "4cd9061e",
+                          "externalReference" : "floatingLegResetDates"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "floatingLegResetDates",
-                        "globalKey" : "a3a17a48"
+                      "resetFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "63"
+                        }
                       },
                       "resetDatesAdjustments" : {
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "1f3c92"
+                            "globalReference" : "1f3c92",
+                            "externalReference" : "floatPrimaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "ff80739a"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "meta" : {
                           "globalKey" : "17a8d0d2"
                         }
                       },
-                      "resetFrequency" : {
-                        "meta" : {
-                          "globalKey" : "83d"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 1
+                      "meta" : {
+                        "globalKey" : "4cd9061e",
+                        "externalKey" : "floatingLegResetDates"
                       }
+                    },
+                    "cashflowRepresentation" : {
+                      "cashflowsMatchParameters" : true,
+                      "paymentCalculationPeriod" : [ {
+                        "adjustedPaymentDate" : "2015-07-02",
+                        "calculationPeriod" : [ {
+                          "adjustedStartDate" : "2015-05-20",
+                          "adjustedEndDate" : "2015-07-01",
+                          "meta" : {
+                            "globalKey" : "5106fb84"
+                          },
+                          "notionalAmount" : 9856218.36,
+                          "floatingRateDefinition" : {
+                            "rateObservation" : [ {
+                              "adjustedFixingDate" : "2015-06-30",
+                              "observedRate" : 0,
+                              "observationWeight" : 1,
+                              "meta" : {
+                                "globalKey" : "ec670fef"
+                              }
+                            } ]
+                          }
+                        } ],
+                        "meta" : {
+                          "globalKey" : "4537dc02"
+                        }
+                      } ]
+                    },
+                    "meta" : {
+                      "globalKey" : "40feef45"
                     }
                   }, {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
+                      "quantitySchedule" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "quantity-3"
+                        }
+                      },
                       "futureValueNotional" : {
-                        "calculationPeriodNumberOfDays" : 29,
-                        "currency" : {
-                          "value" : "BRL"
-                        },
                         "quantity" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
                         },
+                        "currency" : {
+                          "value" : "BRL"
+                        },
+                        "calculationPeriodNumberOfDays" : 29,
                         "valueDate" : "2015-06-30"
                       },
                       "meta" : {
                         "globalKey" : "ec753add"
-                      },
-                      "quantitySchedule" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "quantity-3"
-                        }
                       }
                     },
                     "settlementTerms" : {
-                      "meta" : {
-                        "globalKey" : "1b30f30b"
-                      },
                       "settlementCurrency" : {
                         "value" : "USD"
                       },
+                      "meta" : {
+                        "globalKey" : "fa2527d3"
+                      },
                       "cashSettlementTerms" : [ {
-                        "meta" : {
-                          "globalKey" : "82bc58a5"
+                        "valuationMethod" : {
+                          "valuationSource" : {
+                            "settlementRateOption" : {
+                              "settlementRateOption" : {
+                                "value" : "BRL.PTAX/BRL09"
+                              }
+                            }
+                          }
                         },
                         "valuationDate" : {
                           "fxFixingDate" : {
+                            "periodMultiplier" : -1,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "7ffd5ddf"
+                              "globalKey" : "8ebff949"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -1,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "PRECEDING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "BRBD"
@@ -1256,52 +1216,41 @@
                                 "globalKey" : "3f03a97"
                               }
                             },
-                            "businessDayConvention" : "PRECEDING",
                             "dateRelativeToCalculationPeriodDates" : {
                               "calculationPeriodDatesReference" : [ {
-                                "externalReference" : "fixedLegTerminationDate",
-                                "globalReference" : "c7a84f60"
+                                "globalReference" : "c7a84f60",
+                                "externalReference" : "fixedLegTerminationDate"
                               } ]
                             }
                           }
                         },
-                        "valuationMethod" : {
-                          "valuationSource" : {
-                            "settlementRateOption" : {
-                              "settlementRateOption" : {
-                                "value" : "BRL.PTAX/BRL09"
-                              }
-                            }
-                          }
+                        "meta" : {
+                          "globalKey" : "61b08d6d"
                         }
                       } ]
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "fixedPrimaryBusinessCenters",
-                            "globalReference" : "1f3c92"
-                          },
-                          "meta" : {
-                            "globalKey" : "c2991982"
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "meta" : {
-                          "globalKey" : "dac176ba"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "25e2ab"
-                        },
-                        "period" : "T",
-                        "periodMultiplier" : 1,
-                        "rollConvention" : "NONE"
-                      },
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "CAL/252"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2015-05-20",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -1310,360 +1259,391 @@
                           },
                           "meta" : {
                             "globalKey" : "ec8a9b8c"
-                          },
-                          "unadjustedDate" : "2015-05-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ec8a9b8c"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "fixedCalcPeriodDates",
-                        "globalKey" : "cd8b3ea7"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2015-07-01",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "BRBD"
                               } ],
                               "meta" : {
-                                "externalKey" : "fixedPrimaryBusinessCenters",
-                                "globalKey" : "1f3c92"
+                                "globalKey" : "1f3c92",
+                                "externalKey" : "fixedPrimaryBusinessCenters"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "211c5881"
                             }
                           },
                           "meta" : {
                             "globalKey" : "c7a84f60"
-                          },
-                          "unadjustedDate" : "2015-07-01"
+                          }
                         },
                         "meta" : {
-                          "externalKey" : "fixedLegTerminationDate",
-                          "globalKey" : "c7a84f60"
+                          "globalKey" : "c7a84f60",
+                          "externalKey" : "fixedLegTerminationDate"
                         }
-                      }
-                    },
-                    "cashflowRepresentation" : {
-                      "cashflowsMatchParameters" : true,
-                      "paymentCalculationPeriod" : [ {
-                        "adjustedPaymentDate" : "2015-07-02",
-                        "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2015-07-01",
-                          "adjustedStartDate" : "2015-05-20",
-                          "meta" : {
-                            "globalKey" : "9f04c8ca"
-                          },
-                          "fixedRate" : 0.1323,
-                          "notionalAmount" : 9856218.36
-                        } ],
-                        "meta" : {
-                          "globalKey" : "47459848"
-                        }
-                      } ]
-                    },
-                    "dayCountFraction" : {
-                      "value" : "CAL/252"
-                    },
-                    "meta" : {
-                      "globalKey" : "157d8c81"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "fixedLegPaymentDates",
-                        "globalKey" : "5720d4fe"
                       },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "BRBD"
-                          }, {
-                            "value" : "USNY"
-                          } ],
+                          "businessCentersReference" : {
+                            "globalReference" : "1f3c92",
+                            "externalReference" : "fixedPrimaryBusinessCenters"
+                          },
                           "meta" : {
-                            "globalKey" : "3f03a97"
+                            "globalKey" : "c2991982"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
-                          "globalKey" : "da1616c6"
+                          "globalKey" : "dac176ba"
                         }
                       },
-                      "paymentDaysOffset" : {
-                        "meta" : {
-                          "globalKey" : "ea4baf23"
-                        },
-                        "period" : "D",
+                      "calculationPeriodFrequency" : {
                         "periodMultiplier" : 1,
-                        "dayType" : "BUSINESS"
-                      },
-                      "paymentFrequency" : {
+                        "period" : "T",
                         "meta" : {
-                          "globalKey" : "a2d"
+                          "globalKey" : "24b525"
                         },
-                        "period" : "T",
-                        "periodMultiplier" : 1
+                        "rollConvention" : "NONE"
+                      },
+                      "meta" : {
+                        "globalKey" : "4b19dbcb",
+                        "externalKey" : "fixedCalcPeriodDates"
                       }
                     },
-                    "rateSpecification" : {
-                      "fixedRate" : {
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "T",
                         "meta" : {
-                          "globalKey" : "0"
+                          "globalKey" : "73"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDaysOffset" : {
+                        "periodMultiplier" : 1,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "ea4abbbd"
                         },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
+                        "dayType" : "Business"
+                      },
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "BRBD"
+                          }, {
+                            "value" : "USNY"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "3f03a97"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "da1616c6"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "f0df7870",
+                        "externalKey" : "fixedLegPaymentDates"
                       }
+                    },
+                    "cashflowRepresentation" : {
+                      "cashflowsMatchParameters" : true,
+                      "paymentCalculationPeriod" : [ {
+                        "adjustedPaymentDate" : "2015-07-02",
+                        "calculationPeriod" : [ {
+                          "adjustedStartDate" : "2015-05-20",
+                          "adjustedEndDate" : "2015-07-01",
+                          "meta" : {
+                            "globalKey" : "bfaee0f6"
+                          },
+                          "notionalAmount" : 9856218.36,
+                          "fixedRate" : 0.1323
+                        } ],
+                        "meta" : {
+                          "globalKey" : "67efb074"
+                        }
+                      } ]
+                    },
+                    "meta" : {
+                      "globalKey" : "f6f5fa83"
                     }
                   } ],
                   "meta" : {
-                    "globalKey" : "a8048f78"
+                    "globalKey" : "bdf802c8"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "c7f7e48"
+                "globalKey" : "2272f198"
               }
             },
             "meta" : {
-              "globalKey" : "c7f7e48"
+              "globalKey" : "2272f198"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "fb78437f"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "33a3d745"
-                },
-                "rateOption" : {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "rateOption-1"
-                    } ]
-                  },
-                  "value" : {
-                    "floatingRateIndex" : {
-                      "value" : "BRL-CDI"
+              "quantity" : [ {
+                "value" : {
+                  "value" : 9856218.36,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "BRL"
                     }
                   }
-                }
-              },
-              "quantity" : [ {
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-1"
                   } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "BRL"
+                }
+              } ],
+              "observable" : {
+                "rateOption" : {
+                  "value" : {
+                    "floatingRateIndex" : {
+                      "value" : "BRL-CDI"
                     }
                   },
-                  "value" : 9856218.36
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "rateOption-1"
+                    } ]
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "40d7115b"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "260039b"
               },
+              "meta" : {
+                "globalKey" : "4d0f7677"
+              }
+            }, {
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.1323,
                   "unit" : {
                     "currency" : {
                       "value" : "BRL"
                     }
                   },
-                  "value" : 0.1323,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "BRL"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ],
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-3"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "quantity" : [ {
                 "value" : {
+                  "value" : 9856218.36,
                   "unit" : {
                     "currency" : {
                       "value" : "BRL"
                     }
-                  },
-                  "value" : 9856218.36
-                }
-              }, {
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
+                    "value" : "quantity-3"
                   } ]
-                },
+                }
+              }, {
                 "value" : {
+                  "value" : 9998162.07,
                   "unit" : {
                     "currency" : {
                       "value" : "BRL"
                     }
-                  },
-                  "value" : 9998162.07
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
                 }
-              } ]
-            } ]
-          } ]
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3ef954"
-          },
-          "value" : "2015-05-20"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "cme_trade_id"
-              },
-              "value" : "2894761"
-            }
-          }, {
-            "identifier" : {
+              } ],
               "meta" : {
-                "scheme" : "client_trade_id"
-              },
-              "value" : "QAC-11111"
+                "globalKey" : "49a06fc5"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "dd19",
+              "externalReference" : "clearing_firm"
             }
           }, {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "platform_trade_id"
-              },
-              "value" : "22222"
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
             }
-          }, {
+          } ]
+        },
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "999",
               "meta" : {
-                "scheme" : "risk_approval_id"
-              },
-              "value" : "22222"
+                "scheme" : "clearing_member_firms"
+              }
+            },
+            "meta" : {
+              "globalKey" : "dd19"
             }
-          }, {
+          } ],
+          "meta" : {
+            "globalKey" : "dd19",
+            "externalKey" : "clearing_firm"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "block_trade_id"
-              },
-              "value" : "22222"
+              "value" : "CME"
+            },
+            "meta" : {
+              "globalKey" : "1051b"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "clearing_service",
-            "globalReference" : "1051b"
-          },
           "meta" : {
-            "globalKey" : "1117bae4"
+            "globalKey" : "1051b",
+            "externalKey" : "clearing_service"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "reg_trade_id"
-              },
-              "value" : "CCCIRS2894761"
+              "value" : "PLATFORM"
+            },
+            "meta" : {
+              "globalKey" : "9e635873"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "9e635873",
+            "externalKey" : "trade_source"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "9e635873",
+            "externalReference" : "trade_source"
+          },
+          "role" : "DataSubmitter",
+          "ownershipPartyReference" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
+          }
+        } ],
+        "clearedDate" : "2015-05-20",
+        "account" : [ {
+          "partyReference" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
+          },
+          "accountNumber" : {
+            "value" : "999-123",
             "meta" : {
-              "scheme" : "cftc_Namespace"
-            },
-            "value" : "1010000023"
+              "scheme" : "clearing_firm_accounts"
+            }
+          },
+          "servicingParty" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
           },
           "meta" : {
-            "globalKey" : "a7071c09"
+            "globalKey" : "24a161c0",
+            "externalKey" : "account1"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "85fb1fae"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
+      },
+      "meta" : {
+        "globalKey" : "6fa4d891"
       }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "c7eaea3d"
+      "globalKey" : "dd0554e3"
     }
   },
+  "previousWorkflowStep" : {
+    "globalReference" : "789c2893"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "0102845192",
       "meta" : {
         "scheme" : "cme_message_id"
-      },
-      "value" : "0102845192"
+      }
     },
     "sentBy" : {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
+      }
     },
     "sentTo" : [ {
+      "value" : "999",
       "meta" : {
         "scheme" : "cme_firm_id"
-      },
-      "value" : "999"
+      }
     }, {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
+      }
     } ]
   },
-  "meta" : {
-    "globalKey" : "8fb981d"
-  },
+  "timestamp" : [ {
+    "dateTime" : "2015-05-20T16:41:23Z",
+    "qualification" : "eventCreationDateTime"
+  } ],
   "party" : [ {
-    "meta" : {
-      "externalKey" : "clearing_firm",
-      "globalKey" : "dd19"
-    },
     "partyId" : [ {
       "identifier" : {
+        "value" : "999",
         "meta" : {
           "scheme" : "clearing_member_firms"
-        },
-        "value" : "999"
+        }
       },
       "meta" : {
         "globalKey" : "dd19"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "clearing_service",
-      "globalKey" : "1051b"
-    },
+      "globalKey" : "dd19",
+      "externalKey" : "clearing_firm"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "CME"
@@ -1671,12 +1651,12 @@
       "meta" : {
         "globalKey" : "1051b"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "trade_source",
-      "globalKey" : "9e635873"
-    },
+      "globalKey" : "1051b",
+      "externalKey" : "clearing_service"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "PLATFORM"
@@ -1684,13 +1664,33 @@
       "meta" : {
         "globalKey" : "9e635873"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "9e635873",
+      "externalKey" : "trade_source"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "72c93ecb"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2015-05-20T16:41:23Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+  "account" : [ {
+    "partyReference" : {
+      "globalReference" : "dd19",
+      "externalReference" : "clearing_firm"
+    },
+    "accountNumber" : {
+      "value" : "999-123",
+      "meta" : {
+        "scheme" : "clearing_firm_accounts"
+      }
+    },
+    "servicingParty" : {
+      "globalReference" : "dd19",
+      "externalReference" : "clearing_firm"
+    },
+    "meta" : {
+      "globalKey" : "24a161c0",
+      "externalKey" : "account1"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "2bf3a8eb"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex08-Fixed-Float-Zero-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex08-Fixed-Float-Zero-func-output.json
index 1535eabaaa..7c630f9a7c 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex08-Fixed-Float-Zero-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex08-Fixed-Float-Zero-func-output.json
@@ -1,124 +1,80 @@
 {
-  "account" : [ {
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "clearing_firm_accounts"
-      },
-      "value" : "010S3"
-    },
-    "meta" : {
-      "externalKey" : "account1",
-      "globalKey" : "34a0c93d"
-    },
-    "partyReference" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "ba4f"
-    },
-    "servicingParty" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "ba4f"
-    }
-  } ],
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "9243fc1f"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "010S3"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "34a0c93d"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              }
-            } ],
-            "clearedDate" : "2018-10-31",
-            "meta" : {
-              "globalKey" : "9243fc1f"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "ba4f"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "9369921",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "010"
-                },
-                "meta" : {
-                  "globalKey" : "ba4f"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "43401224-2",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "66b48bac"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "MARKIT_WIRE"
-                },
+                  "value" : "43401224",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43401813",
+                  "meta" : {
+                    "scheme" : "platform_side_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43401224",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "f045c738"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "66b48bac"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
               },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "66b48bac"
-              },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS9369921",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "4ac79bb5"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-31",
+              "meta" : {
+                "globalKey" : "3f129f"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "ba4f"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -129,46 +85,42 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "fa5f1fb"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "979a8ca"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "25e2ab"
-                            },
-                            "period" : "T",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "NONE"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -177,75 +129,77 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "104aa107"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2019-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "fixedPrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "fixedPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "fa5f1fb"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "979a8ca"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "166fb90c"
-                              },
-                              "unadjustedDate" : "2019-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "166fb90c"
                             }
-                          }
-                        },
-                        "cashflowRepresentation" : {
-                          "cashflowsMatchParameters" : true,
-                          "paymentCalculationPeriod" : [ {
-                            "adjustedPaymentDate" : "2019-11-04",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-11-04",
-                              "adjustedStartDate" : "2018-11-02",
-                              "meta" : {
-                                "globalKey" : "7c8e01d"
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
                               },
-                              "fixedRate" : 0.02178,
-                              "notionalAmount" : 100000000
-                            } ],
+                              "meta" : {
+                                "globalKey" : "fa5f1fb"
+                              }
+                            },
                             "meta" : {
-                              "globalKey" : "35fdfd9"
+                              "globalKey" : "979a8ca"
                             }
-                          } ]
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "3367aab3"
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "T",
+                            "meta" : {
+                              "globalKey" : "24b525"
+                            },
+                            "rollConvention" : "NONE"
+                          },
+                          "meta" : {
+                            "globalKey" : "53daaf41",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
                         },
                         "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "637fdf6b"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "T",
+                            "meta" : {
+                              "globalKey" : "73"
+                            }
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                          "payRelativeTo" : "CalculationPeriodEndDate",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -253,80 +207,76 @@
                                 "value" : "USNY"
                               } ],
                               "meta" : {
-                                "externalKey" : "fixedPrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
+                                "globalKey" : "42f910b",
+                                "externalKey" : "fixedPrimaryBusinessCenters"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "a2d"
-                            },
-                            "period" : "T",
-                            "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "902c5c23",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "cashflowRepresentation" : {
+                          "cashflowsMatchParameters" : true,
+                          "paymentCalculationPeriod" : [ {
+                            "adjustedPaymentDate" : "2019-11-04",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2018-11-02",
+                              "adjustedEndDate" : "2019-11-04",
+                              "meta" : {
+                                "globalKey" : "1e1bd103"
+                              },
+                              "notionalAmount" : 100000000,
+                              "fixedRate" : 0.02178
+                            } ],
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
+                              "globalKey" : "19b2d0bf"
                             }
-                          }
+                          } ]
+                        },
+                        "meta" : {
+                          "globalKey" : "87e6040d"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "b01f2613"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "a9f2dce2"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d1d"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "2"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -335,132 +285,77 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "7d80b929"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2019-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "b01f2613"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "a9f2dce2"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "b6e8ed24"
-                              },
-                              "unadjustedDate" : "2019-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "b6e8ed24"
                             }
-                          }
-                        },
-                        "cashflowRepresentation" : {
-                          "cashflowsMatchParameters" : true,
-                          "paymentCalculationPeriod" : [ {
-                            "adjustedPaymentDate" : "2019-11-04",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-02-04",
-                              "adjustedStartDate" : "2018-11-02",
-                              "meta" : {
-                                "globalKey" : "221e9424"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2018-10-31",
-                                  "meta" : {
-                                    "globalKey" : "7a34171"
-                                  },
-                                  "observedRate" : 0
-                                } ]
-                              },
-                              "notionalAmount" : 100000000
-                            }, {
-                              "adjustedEndDate" : "2019-05-02",
-                              "adjustedStartDate" : "2019-02-04",
-                              "meta" : {
-                                "globalKey" : "38468420"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2019-01-31",
-                                  "meta" : {
-                                    "globalKey" : "7a3f3b1"
-                                  },
-                                  "observedRate" : 0
-                                } ]
-                              },
-                              "notionalAmount" : 100000000
-                            }, {
-                              "adjustedEndDate" : "2019-08-02",
-                              "adjustedStartDate" : "2019-05-02",
-                              "meta" : {
-                                "globalKey" : "292bd203"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2019-04-30",
-                                  "meta" : {
-                                    "globalKey" : "7a40ad2"
-                                  },
-                                  "observedRate" : 0
-                                } ]
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
-                              "notionalAmount" : 100000000
-                            }, {
-                              "adjustedEndDate" : "2019-11-04",
-                              "adjustedStartDate" : "2019-08-02",
                               "meta" : {
-                                "globalKey" : "874747e4"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2019-07-31",
-                                  "meta" : {
-                                    "globalKey" : "7a42231"
-                                  },
-                                  "observedRate" : 0
-                                } ]
-                              },
-                              "notionalAmount" : 100000000
-                            } ],
+                                "globalKey" : "b01f2613"
+                              }
+                            },
                             "meta" : {
-                              "globalKey" : "1802bdc1"
+                              "globalKey" : "a9f2dce2"
                             }
-                          } ]
-                        },
-                        "compoundingMethod" : "STRAIGHT",
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "53ae7c8"
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "2049"
+                            },
+                            "rollConvention" : "2"
+                          },
+                          "meta" : {
+                            "globalKey" : "c4a7ac95",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
                         },
                         "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "637fdf6b"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "T",
+                            "meta" : {
+                              "globalKey" : "73"
+                            }
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                          "payRelativeTo" : "CalculationPeriodEndDate",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -468,48 +363,33 @@
                                 "value" : "USNY"
                               } ],
                               "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
+                                "globalKey" : "42f910b",
+                                "externalKey" : "floatPrimaryBusinessCenters"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "a2d"
-                            },
-                            "period" : "T",
-                            "periodMultiplier" : 1
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "902c5c23",
+                            "externalKey" : "floatingLegPaymentDates"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "7d80b929"
+                            "globalReference" : "c4a7ac95",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "3d9c8eea"
+                              "globalKey" : "1a78799e"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -518,319 +398,392 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "6daefffd"
+                              "globalReference" : "5cec34b5",
+                              "externalReference" : "floatingLegResetDates"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "6daefffd"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "b01f2613"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "a9f2dce2"
                             }
                           },
-                          "resetFrequency" : {
+                          "meta" : {
+                            "globalKey" : "5cec34b5",
+                            "externalKey" : "floatingLegResetDates"
+                          }
+                        },
+                        "compoundingMethod" : "Straight",
+                        "cashflowRepresentation" : {
+                          "cashflowsMatchParameters" : true,
+                          "paymentCalculationPeriod" : [ {
+                            "adjustedPaymentDate" : "2019-11-04",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2018-11-02",
+                              "adjustedEndDate" : "2019-02-04",
+                              "meta" : {
+                                "globalKey" : "5fc4ab60"
+                              },
+                              "notionalAmount" : 100000000,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2018-10-31",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a34171"
+                                  }
+                                } ]
+                              }
+                            }, {
+                              "adjustedStartDate" : "2019-02-04",
+                              "adjustedEndDate" : "2019-05-02",
+                              "meta" : {
+                                "globalKey" : "399f4fe4"
+                              },
+                              "notionalAmount" : 100000000,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2019-01-31",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a3f3b1"
+                                  }
+                                } ]
+                              }
+                            }, {
+                              "adjustedStartDate" : "2019-05-02",
+                              "adjustedEndDate" : "2019-08-02",
+                              "meta" : {
+                                "globalKey" : "c421d883"
+                              },
+                              "notionalAmount" : 100000000,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2019-04-30",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a40ad2"
+                                  }
+                                } ]
+                              }
+                            }, {
+                              "adjustedStartDate" : "2019-08-02",
+                              "adjustedEndDate" : "2019-11-04",
+                              "meta" : {
+                                "globalKey" : "bbda8920"
+                              },
+                              "notionalAmount" : 100000000,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2019-07-31",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a42231"
+                                  }
+                                } ]
+                              }
+                            } ],
                             "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                              "globalKey" : "ca509385"
+                            }
+                          } ]
+                        },
+                        "meta" : {
+                          "globalKey" : "2a1195e8"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "497b0a3b"
+                        "globalKey" : "640f9235"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "b93b3d0b"
+                    "globalKey" : "d3cfc505"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "b93b3d0b"
+                  "globalKey" : "d3cfc505"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "173c8b0"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.02178,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.02178,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 100000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "2d054d50"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "7b78abf0"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
+                      }
                     },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 100000000
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f129f"
-              },
-              "value" : "2018-10-31"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "9369921"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "43401224-2"
+                    "globalKey" : "5332091c"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "ba4f",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "43401224"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "010",
                   "meta" : {
-                    "scheme" : "platform_side_id"
-                  },
-                  "value" : "43401813"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ba4f"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "ba4f",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "43401224"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "6fce5284"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS9369921"
+                  "value" : "MARKIT_WIRE"
+                },
+                "meta" : {
+                  "globalKey" : "66b48bac"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "66b48bac",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "66b48bac",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2018-10-31",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "010S3",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "17702b93"
+                "globalKey" : "a30716bd",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "e076789d"
+            }
+          },
+          "meta" : {
+            "globalKey" : "e076789d"
           }
         }
       }
     } ],
-    "intent" : "CONTRACT_FORMATION",
+    "eventQualifier" : "ContractFormation",
     "after" : [ {
-      "meta" : {
-        "globalKey" : "b17561dc"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
       "trade" : {
-        "account" : [ {
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "clearing_firm_accounts"
-            },
-            "value" : "010S3"
-          },
-          "meta" : {
-            "externalKey" : "account1",
-            "globalKey" : "34a0c93d"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
-          },
-          "servicingParty" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
-          }
-        } ],
-        "clearedDate" : "2018-10-31",
-        "meta" : {
-          "globalKey" : "9243fc1f"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "clearing_firm",
-            "globalKey" : "ba4f"
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "1051b",
+            "externalReference" : "clearing_service"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "9369921",
               "meta" : {
-                "scheme" : "clearing_member_firms"
-              },
-              "value" : "010"
-            },
-            "meta" : {
-              "globalKey" : "ba4f"
+                "scheme" : "cme_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing_service",
-            "globalKey" : "1051b"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "CME"
-            },
-            "meta" : {
-              "globalKey" : "1051b"
+              "value" : "43401224-2",
+              "meta" : {
+                "scheme" : "client_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "trade_source",
-            "globalKey" : "66b48bac"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "MARKIT_WIRE"
-            },
+              "value" : "43401224",
+              "meta" : {
+                "scheme" : "platform_trade_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "43401813",
+              "meta" : {
+                "scheme" : "platform_side_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "43401224",
+              "meta" : {
+                "scheme" : "block_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "f045c738"
+          }
+        }, {
+          "issuer" : {
+            "value" : "1010000023",
             "meta" : {
-              "globalKey" : "66b48bac"
+              "scheme" : "cftc_Namespace"
             }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
-          },
-          "partyReference" : {
-            "externalReference" : "trade_source",
-            "globalReference" : "66b48bac"
           },
-          "role" : "DATA_SUBMITTER"
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "CCCIRS9369921",
+              "meta" : {
+                "scheme" : "reg_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "4ac79bb5"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2018-10-31",
+          "meta" : {
+            "globalKey" : "3f129f"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "ba4f"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -841,46 +794,42 @@
                 "payout" : {
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "fixedPrimaryBusinessCenters",
-                            "globalReference" : "42f910b"
-                          },
-                          "meta" : {
-                            "globalKey" : "fa5f1fb"
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "979a8ca"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "25e2ab"
-                        },
-                        "period" : "T",
-                        "periodMultiplier" : 1,
-                        "rollConvention" : "NONE"
-                      },
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/360"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2018-11-02",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -889,75 +838,77 @@
                           },
                           "meta" : {
                             "globalKey" : "ecea117a"
-                          },
-                          "unadjustedDate" : "2018-11-02"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ecea117a"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "fixedCalcPeriodDates",
-                        "globalKey" : "104aa107"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2019-11-02",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
+                                "globalReference" : "42f910b",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "fa5f1fb"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "979a8ca"
                             }
                           },
                           "meta" : {
                             "globalKey" : "166fb90c"
-                          },
-                          "unadjustedDate" : "2019-11-02"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "166fb90c"
                         }
-                      }
-                    },
-                    "cashflowRepresentation" : {
-                      "cashflowsMatchParameters" : true,
-                      "paymentCalculationPeriod" : [ {
-                        "adjustedPaymentDate" : "2019-11-04",
-                        "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-11-04",
-                          "adjustedStartDate" : "2018-11-02",
-                          "meta" : {
-                            "globalKey" : "7c8e01d"
+                      },
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "42f910b",
+                            "externalReference" : "fixedPrimaryBusinessCenters"
                           },
-                          "fixedRate" : 0.02178,
-                          "notionalAmount" : 100000000
-                        } ],
+                          "meta" : {
+                            "globalKey" : "fa5f1fb"
+                          }
+                        },
                         "meta" : {
-                          "globalKey" : "35fdfd9"
+                          "globalKey" : "979a8ca"
                         }
-                      } ]
-                    },
-                    "dayCountFraction" : {
-                      "value" : "ACT/360"
-                    },
-                    "meta" : {
-                      "globalKey" : "3367aab3"
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "T",
+                        "meta" : {
+                          "globalKey" : "24b525"
+                        },
+                        "rollConvention" : "NONE"
+                      },
+                      "meta" : {
+                        "globalKey" : "53daaf41",
+                        "externalKey" : "fixedCalcPeriodDates"
+                      }
                     },
                     "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "fixedLegPaymentDates",
-                        "globalKey" : "637fdf6b"
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "T",
+                        "meta" : {
+                          "globalKey" : "73"
+                        }
                       },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                      "payRelativeTo" : "CalculationPeriodEndDate",
                       "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -965,80 +916,76 @@
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "fixedPrimaryBusinessCenters",
-                            "globalKey" : "42f910b"
+                            "globalKey" : "42f910b",
+                            "externalKey" : "fixedPrimaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b8e49c"
                         }
                       },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "a2d"
-                        },
-                        "period" : "T",
-                        "periodMultiplier" : 1
+                      "meta" : {
+                        "globalKey" : "902c5c23",
+                        "externalKey" : "fixedLegPaymentDates"
                       }
                     },
-                    "rateSpecification" : {
-                      "fixedRate" : {
+                    "cashflowRepresentation" : {
+                      "cashflowsMatchParameters" : true,
+                      "paymentCalculationPeriod" : [ {
+                        "adjustedPaymentDate" : "2019-11-04",
+                        "calculationPeriod" : [ {
+                          "adjustedStartDate" : "2018-11-02",
+                          "adjustedEndDate" : "2019-11-04",
+                          "meta" : {
+                            "globalKey" : "1e1bd103"
+                          },
+                          "notionalAmount" : 100000000,
+                          "fixedRate" : 0.02178
+                        } ],
                         "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
-                          }
+                          "globalKey" : "19b2d0bf"
                         }
-                      }
+                      } ]
+                    },
+                    "meta" : {
+                      "globalKey" : "87e6040d"
                     }
                   }, {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-2"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "42f910b"
-                          },
-                          "meta" : {
-                            "globalKey" : "b01f2613"
+                    "rateSpecification" : {
+                      "floatingRate" : {
+                        "rateOption" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "rateOption-1"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "a9f2dce2"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "12d1d"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
-                        "rollConvention" : "2"
-                      },
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/360"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2018-11-02",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -1047,132 +994,77 @@
                           },
                           "meta" : {
                             "globalKey" : "ecea117a"
-                          },
-                          "unadjustedDate" : "2018-11-02"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ecea117a"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "floatingCalcPeriodDates",
-                        "globalKey" : "7d80b929"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2019-11-02",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "b01f2613"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "a9f2dce2"
                             }
                           },
                           "meta" : {
                             "globalKey" : "b6e8ed24"
-                          },
-                          "unadjustedDate" : "2019-11-02"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "b6e8ed24"
                         }
-                      }
-                    },
-                    "cashflowRepresentation" : {
-                      "cashflowsMatchParameters" : true,
-                      "paymentCalculationPeriod" : [ {
-                        "adjustedPaymentDate" : "2019-11-04",
-                        "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-02-04",
-                          "adjustedStartDate" : "2018-11-02",
-                          "meta" : {
-                            "globalKey" : "221e9424"
-                          },
-                          "floatingRateDefinition" : {
-                            "rateObservation" : [ {
-                              "adjustedFixingDate" : "2018-10-31",
-                              "meta" : {
-                                "globalKey" : "7a34171"
-                              },
-                              "observedRate" : 0
-                            } ]
-                          },
-                          "notionalAmount" : 100000000
-                        }, {
-                          "adjustedEndDate" : "2019-05-02",
-                          "adjustedStartDate" : "2019-02-04",
-                          "meta" : {
-                            "globalKey" : "38468420"
-                          },
-                          "floatingRateDefinition" : {
-                            "rateObservation" : [ {
-                              "adjustedFixingDate" : "2019-01-31",
-                              "meta" : {
-                                "globalKey" : "7a3f3b1"
-                              },
-                              "observedRate" : 0
-                            } ]
-                          },
-                          "notionalAmount" : 100000000
-                        }, {
-                          "adjustedEndDate" : "2019-08-02",
-                          "adjustedStartDate" : "2019-05-02",
-                          "meta" : {
-                            "globalKey" : "292bd203"
-                          },
-                          "floatingRateDefinition" : {
-                            "rateObservation" : [ {
-                              "adjustedFixingDate" : "2019-04-30",
-                              "meta" : {
-                                "globalKey" : "7a40ad2"
-                              },
-                              "observedRate" : 0
-                            } ]
+                      },
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "42f910b",
+                            "externalReference" : "floatPrimaryBusinessCenters"
                           },
-                          "notionalAmount" : 100000000
-                        }, {
-                          "adjustedEndDate" : "2019-11-04",
-                          "adjustedStartDate" : "2019-08-02",
                           "meta" : {
-                            "globalKey" : "874747e4"
-                          },
-                          "floatingRateDefinition" : {
-                            "rateObservation" : [ {
-                              "adjustedFixingDate" : "2019-07-31",
-                              "meta" : {
-                                "globalKey" : "7a42231"
-                              },
-                              "observedRate" : 0
-                            } ]
-                          },
-                          "notionalAmount" : 100000000
-                        } ],
+                            "globalKey" : "b01f2613"
+                          }
+                        },
                         "meta" : {
-                          "globalKey" : "1802bdc1"
+                          "globalKey" : "a9f2dce2"
                         }
-                      } ]
-                    },
-                    "compoundingMethod" : "STRAIGHT",
-                    "dayCountFraction" : {
-                      "value" : "ACT/360"
-                    },
-                    "meta" : {
-                      "globalKey" : "53ae7c8"
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "2049"
+                        },
+                        "rollConvention" : "2"
+                      },
+                      "meta" : {
+                        "globalKey" : "c4a7ac95",
+                        "externalKey" : "floatingCalcPeriodDates"
+                      }
                     },
                     "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "floatingLegPaymentDates",
-                        "globalKey" : "637fdf6b"
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "T",
+                        "meta" : {
+                          "globalKey" : "73"
+                        }
                       },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                      "payRelativeTo" : "CalculationPeriodEndDate",
                       "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -1180,48 +1072,33 @@
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "floatPrimaryBusinessCenters",
-                            "globalKey" : "42f910b"
+                            "globalKey" : "42f910b",
+                            "externalKey" : "floatPrimaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b8e49c"
                         }
                       },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "a2d"
-                        },
-                        "period" : "T",
-                        "periodMultiplier" : 1
-                      }
-                    },
-                    "rateSpecification" : {
-                      "floatingRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateOption" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "rateOption-1"
-                          }
-                        }
+                      "meta" : {
+                        "globalKey" : "902c5c23",
+                        "externalKey" : "floatingLegPaymentDates"
                       }
                     },
                     "resetDates" : {
                       "calculationPeriodDatesReference" : {
-                        "externalReference" : "floatingCalcPeriodDates",
-                        "globalReference" : "7d80b929"
+                        "globalReference" : "c4a7ac95",
+                        "externalReference" : "floatingCalcPeriodDates"
                       },
+                      "resetRelativeTo" : "CalculationPeriodStartDate",
                       "fixingDates" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "3d9c8eea"
+                          "globalKey" : "1a78799e"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -1230,270 +1107,376 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "floatingLegResetDates",
-                          "globalReference" : "6daefffd"
+                          "globalReference" : "5cec34b5",
+                          "externalReference" : "floatingLegResetDates"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "floatingLegResetDates",
-                        "globalKey" : "6daefffd"
+                      "resetFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
                       },
                       "resetDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "42f910b"
+                            "globalReference" : "42f910b",
+                            "externalReference" : "floatPrimaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "b01f2613"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "a9f2dce2"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "5cec34b5",
+                        "externalKey" : "floatingLegResetDates"
+                      }
+                    },
+                    "compoundingMethod" : "Straight",
+                    "cashflowRepresentation" : {
+                      "cashflowsMatchParameters" : true,
+                      "paymentCalculationPeriod" : [ {
+                        "adjustedPaymentDate" : "2019-11-04",
+                        "calculationPeriod" : [ {
+                          "adjustedStartDate" : "2018-11-02",
+                          "adjustedEndDate" : "2019-02-04",
+                          "meta" : {
+                            "globalKey" : "5fc4ab60"
+                          },
+                          "notionalAmount" : 100000000,
+                          "floatingRateDefinition" : {
+                            "rateObservation" : [ {
+                              "adjustedFixingDate" : "2018-10-31",
+                              "observedRate" : 0,
+                              "meta" : {
+                                "globalKey" : "7a34171"
+                              }
+                            } ]
+                          }
+                        }, {
+                          "adjustedStartDate" : "2019-02-04",
+                          "adjustedEndDate" : "2019-05-02",
+                          "meta" : {
+                            "globalKey" : "399f4fe4"
+                          },
+                          "notionalAmount" : 100000000,
+                          "floatingRateDefinition" : {
+                            "rateObservation" : [ {
+                              "adjustedFixingDate" : "2019-01-31",
+                              "observedRate" : 0,
+                              "meta" : {
+                                "globalKey" : "7a3f3b1"
+                              }
+                            } ]
+                          }
+                        }, {
+                          "adjustedStartDate" : "2019-05-02",
+                          "adjustedEndDate" : "2019-08-02",
+                          "meta" : {
+                            "globalKey" : "c421d883"
                           },
+                          "notionalAmount" : 100000000,
+                          "floatingRateDefinition" : {
+                            "rateObservation" : [ {
+                              "adjustedFixingDate" : "2019-04-30",
+                              "observedRate" : 0,
+                              "meta" : {
+                                "globalKey" : "7a40ad2"
+                              }
+                            } ]
+                          }
+                        }, {
+                          "adjustedStartDate" : "2019-08-02",
+                          "adjustedEndDate" : "2019-11-04",
                           "meta" : {
-                            "globalKey" : "b01f2613"
+                            "globalKey" : "bbda8920"
+                          },
+                          "notionalAmount" : 100000000,
+                          "floatingRateDefinition" : {
+                            "rateObservation" : [ {
+                              "adjustedFixingDate" : "2019-07-31",
+                              "observedRate" : 0,
+                              "meta" : {
+                                "globalKey" : "7a42231"
+                              }
+                            } ]
                           }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
+                        } ],
                         "meta" : {
-                          "globalKey" : "a9f2dce2"
+                          "globalKey" : "ca509385"
                         }
-                      },
-                      "resetFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
-                      },
-                      "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                      } ]
+                    },
+                    "meta" : {
+                      "globalKey" : "2a1195e8"
                     }
                   } ],
                   "meta" : {
-                    "globalKey" : "497b0a3b"
+                    "globalKey" : "640f9235"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "b93b3d0b"
+                "globalKey" : "d3cfc505"
               }
             },
             "meta" : {
-              "globalKey" : "b93b3d0b"
+              "globalKey" : "d3cfc505"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "173c8b0"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.02178,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.02178,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
                 }
               } ],
               "quantity" : [ {
+                "value" : {
+                  "value" : 100000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "2d054d50"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 100000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 100000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
                 }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "7b78abf0"
-              },
+              } ],
               "observable" : {
-                "meta" : {
-                  "globalKey" : "5f0c6d05"
-                },
                 "rateOption" : {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "rateOption-1"
-                    } ]
-                  },
                   "value" : {
                     "floatingRateIndex" : {
                       "value" : "USD-LIBOR-BBA"
                     },
                     "indexTenor" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
+                      "periodMultiplier" : 3,
                       "period" : "M",
-                      "periodMultiplier" : 3
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "rateOption-1"
+                    } ]
                   }
-                }
-              },
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
                 },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 100000000
+                "meta" : {
+                  "globalKey" : "828026c7"
                 }
-              } ]
-            } ]
-          } ]
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f129f"
-          },
-          "value" : "2018-10-31"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "cme_trade_id"
               },
-              "value" : "9369921"
-            }
-          }, {
-            "identifier" : {
               "meta" : {
-                "scheme" : "client_trade_id"
-              },
-              "value" : "43401224-2"
+                "globalKey" : "5332091c"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "ba4f",
+              "externalReference" : "clearing_firm"
             }
           }, {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "platform_trade_id"
-              },
-              "value" : "43401224"
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
             }
-          }, {
+          } ]
+        },
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "010",
               "meta" : {
-                "scheme" : "platform_side_id"
-              },
-              "value" : "43401813"
+                "scheme" : "clearing_member_firms"
+              }
+            },
+            "meta" : {
+              "globalKey" : "ba4f"
             }
-          }, {
+          } ],
+          "meta" : {
+            "globalKey" : "ba4f",
+            "externalKey" : "clearing_firm"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "block_trade_id"
-              },
-              "value" : "43401224"
+              "value" : "CME"
+            },
+            "meta" : {
+              "globalKey" : "1051b"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "clearing_service",
-            "globalReference" : "1051b"
-          },
           "meta" : {
-            "globalKey" : "6fce5284"
+            "globalKey" : "1051b",
+            "externalKey" : "clearing_service"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "reg_trade_id"
-              },
-              "value" : "CCCIRS9369921"
+              "value" : "MARKIT_WIRE"
+            },
+            "meta" : {
+              "globalKey" : "66b48bac"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "66b48bac",
+            "externalKey" : "trade_source"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "66b48bac",
+            "externalReference" : "trade_source"
+          },
+          "role" : "DataSubmitter",
+          "ownershipPartyReference" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
+          }
+        } ],
+        "clearedDate" : "2018-10-31",
+        "account" : [ {
+          "partyReference" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
+          },
+          "accountNumber" : {
+            "value" : "010S3",
             "meta" : {
-              "scheme" : "cftc_Namespace"
-            },
-            "value" : "1010000023"
+              "scheme" : "clearing_firm_accounts"
+            }
+          },
+          "servicingParty" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
           },
           "meta" : {
-            "globalKey" : "17702b93"
+            "globalKey" : "a30716bd",
+            "externalKey" : "account1"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "e076789d"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
+      },
+      "meta" : {
+        "globalKey" : "18adb1c0"
       }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "a8c3d5f"
+      "globalKey" : "f9ade941"
     }
   },
+  "previousWorkflowStep" : {
+    "globalReference" : "99c63009"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "0109369921",
       "meta" : {
         "scheme" : "cme_message_id"
-      },
-      "value" : "0109369921"
+      }
     },
     "sentBy" : {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
+      }
     },
     "sentTo" : [ {
+      "value" : "010",
       "meta" : {
         "scheme" : "cme_firm_id"
-      },
-      "value" : "010"
+      }
     }, {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
+      }
     } ]
   },
-  "meta" : {
-    "globalKey" : "9ee52d46"
-  },
+  "timestamp" : [ {
+    "dateTime" : "2018-10-31T14:18:18Z",
+    "qualification" : "eventCreationDateTime"
+  }, {
+    "dateTime" : "2018-10-31T14:12:29.654Z",
+    "qualification" : "clearingReceiptDateTime"
+  } ],
   "party" : [ {
-    "meta" : {
-      "externalKey" : "clearing_firm",
-      "globalKey" : "ba4f"
-    },
     "partyId" : [ {
       "identifier" : {
+        "value" : "010",
         "meta" : {
           "scheme" : "clearing_member_firms"
-        },
-        "value" : "010"
+        }
       },
       "meta" : {
         "globalKey" : "ba4f"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "clearing_service",
-      "globalKey" : "1051b"
-    },
+      "globalKey" : "ba4f",
+      "externalKey" : "clearing_firm"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "CME"
@@ -1501,12 +1484,12 @@
       "meta" : {
         "globalKey" : "1051b"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "trade_source",
-      "globalKey" : "66b48bac"
-    },
+      "globalKey" : "1051b",
+      "externalKey" : "clearing_service"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "MARKIT_WIRE"
@@ -1514,16 +1497,33 @@
       "meta" : {
         "globalKey" : "66b48bac"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "66b48bac",
+      "externalKey" : "trade_source"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "da1bf469"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2018-10-31T14:18:18Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  }, {
-    "dateTime" : "2018-10-31T14:12:29.654Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
-  } ]
+  "account" : [ {
+    "partyReference" : {
+      "globalReference" : "ba4f",
+      "externalReference" : "clearing_firm"
+    },
+    "accountNumber" : {
+      "value" : "010S3",
+      "meta" : {
+        "scheme" : "clearing_firm_accounts"
+      }
+    },
+    "servicingParty" : {
+      "globalReference" : "ba4f",
+      "externalReference" : "clearing_firm"
+    },
+    "meta" : {
+      "globalKey" : "a30716bd",
+      "externalKey" : "account1"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "a2663ac"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex09-OIS-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex09-OIS-func-output.json
index 152801e40e..815ee929d8 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex09-OIS-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex09-OIS-func-output.json
@@ -1,124 +1,80 @@
 {
-  "account" : [ {
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "clearing_firm_accounts"
-      },
-      "value" : "010S3"
-    },
-    "meta" : {
-      "externalKey" : "account1",
-      "globalKey" : "34a0c93d"
-    },
-    "partyReference" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "ba4f"
-    },
-    "servicingParty" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "ba4f"
-    }
-  } ],
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "62d3f1c5"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "010S3"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "34a0c93d"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              }
-            } ],
-            "clearedDate" : "2018-10-31",
-            "meta" : {
-              "globalKey" : "62d3f1c5"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "ba4f"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "9369935",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "010"
-                },
-                "meta" : {
-                  "globalKey" : "ba4f"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "43400962-2",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "66b48bac"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "MARKIT_WIRE"
-                },
+                  "value" : "43400962",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43402071",
+                  "meta" : {
+                    "scheme" : "platform_side_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43400962",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "fb3533d0"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "66b48bac"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
               },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "66b48bac"
-              },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS9369935",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "4ac79bd8"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-31",
+              "meta" : {
+                "globalKey" : "3f129f"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "ba4f"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -129,46 +85,42 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "c2a1c1d9"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "a042e068"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "159eb"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "2"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -177,42 +129,101 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "6feaffc3"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2020-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "fixedPrimaryBusinessCenters",
-                                    "globalReference" : "27e4e9"
+                                    "globalReference" : "27e4e9",
+                                    "externalReference" : "fixedPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "c2a1c1d9"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "a042e068"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "641c212a"
-                              },
-                              "unadjustedDate" : "2020-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "641c212a"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "c2a1c1d9"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "a042e068"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "1a3b"
+                            },
+                            "rollConvention" : "2"
+                          },
+                          "meta" : {
+                            "globalKey" : "880f1e13",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4abf7e"
+                            },
+                            "dayType" : "Business"
+                          },
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "27e4e9",
+                                "externalKey" : "fixedPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3662e8ba"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "5ddd0f5e",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -220,133 +231,72 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2019-11-06",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-11-04",
                               "adjustedStartDate" : "2018-11-02",
+                              "adjustedEndDate" : "2019-11-04",
                               "meta" : {
-                                "globalKey" : "7c94179"
+                                "globalKey" : "1e1bd427"
                               },
-                              "fixedRate" : 0.02226,
-                              "notionalAmount" : 100000000
+                              "notionalAmount" : 100000000,
+                              "fixedRate" : 0.02226
                             } ],
                             "meta" : {
-                              "globalKey" : "6c9f273"
+                              "globalKey" : "1d1c8521"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-11-04",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-11-02",
                               "adjustedStartDate" : "2019-11-04",
+                              "adjustedEndDate" : "2020-11-02",
                               "meta" : {
-                                "globalKey" : "b89603d"
+                                "globalKey" : "21ddb563"
                               },
-                              "fixedRate" : 0.02226,
-                              "notionalAmount" : 100000000
+                              "notionalAmount" : 100000000,
+                              "fixedRate" : 0.02226
                             } ],
                             "meta" : {
-                              "globalKey" : "ade557f9"
+                              "globalKey" : "c439ad1f"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
                         "meta" : {
-                          "globalKey" : "79ea61b"
+                          "globalKey" : "27d0667f"
+                        }
+                      }, {
+                        "payerReceiver" : {
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "eb988f26"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "fixedPrimaryBusinessCenters",
-                                "globalKey" : "27e4e9"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "3662e8ba"
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-2"
                             }
                           },
-                          "paymentDaysOffset" : {
-                            "meta" : {
-                              "globalKey" : "ea4baf42"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 2,
-                            "dayType" : "BUSINESS"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           }
-                        }
-                      }, {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
                         },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-2"
-                            }
-                          }
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
                         },
                         "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "ff891bf1"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "dd2a3a80"
-                            }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "159eb"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "2"
-                          },
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -355,159 +305,116 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "64dfb7f3"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2020-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "27e4e9"
+                                    "globalReference" : "27e4e9",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "ff891bf1"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "dd2a3a80"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "a1037b42"
-                              },
-                              "unadjustedDate" : "2020-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "a1037b42"
                             }
-                          }
-                        },
-                        "cashflowRepresentation" : {
-                          "cashflowsMatchParameters" : true,
-                          "paymentCalculationPeriod" : [ {
-                            "adjustedPaymentDate" : "2019-11-06",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-11-04",
-                              "adjustedStartDate" : "2018-11-02",
-                              "meta" : {
-                                "globalKey" : "2824e282"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2019-11-01",
-                                  "meta" : {
-                                    "globalKey" : "7a43d8f"
-                                  },
-                                  "observedRate" : 0
-                                } ]
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
-                              "notionalAmount" : 100000000
-                            } ],
-                            "meta" : {
-                              "globalKey" : "1997d748"
-                            }
-                          }, {
-                            "adjustedPaymentDate" : "2020-11-04",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-11-02",
-                              "adjustedStartDate" : "2019-11-04",
                               "meta" : {
-                                "globalKey" : "9a621101"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2020-10-30",
-                                  "meta" : {
-                                    "globalKey" : "7a53152"
-                                  },
-                                  "observedRate" : 0
-                                } ]
-                              },
-                              "notionalAmount" : 100000000
-                            } ],
+                                "globalKey" : "ff891bf1"
+                              }
+                            },
                             "meta" : {
-                              "globalKey" : "86c42fc5"
+                              "globalKey" : "dd2a3a80"
                             }
-                          } ]
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "bfb12074"
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "1a3b"
+                            },
+                            "rollConvention" : "2"
+                          },
+                          "meta" : {
+                            "globalKey" : "7604a243",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
                         },
                         "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "eb988f26"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4abf7e"
+                            },
+                            "dayType" : "Business"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USNY"
                               } ],
                               "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "27e4e9"
+                                "globalKey" : "27e4e9",
+                                "externalKey" : "floatPrimaryBusinessCenters"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "3662e8ba"
                             }
                           },
-                          "paymentDaysOffset" : {
-                            "meta" : {
-                              "globalKey" : "ea4baf42"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 2,
-                            "dayType" : "BUSINESS"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "5ddd0f5e",
+                            "externalKey" : "floatingLegPaymentDates"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "64dfb7f3"
+                            "globalReference" : "7604a243",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodEndDate",
                           "fixingDates" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "69232be0"
+                              "globalKey" : "de7afde8"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
+                            "businessDayConvention" : "PRECEDING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USNY"
@@ -516,312 +423,358 @@
                                 "globalKey" : "27e4e9"
                               }
                             },
-                            "businessDayConvention" : "PRECEDING",
                             "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "78c2cb18"
+                              "globalReference" : "daa0910",
+                              "externalReference" : "floatingLegResetDates"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "78c2cb18"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "ff891bf1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "dd2a3a80"
                             }
                           },
-                          "resetFrequency" : {
+                          "meta" : {
+                            "globalKey" : "daa0910",
+                            "externalKey" : "floatingLegResetDates"
+                          }
+                        },
+                        "cashflowRepresentation" : {
+                          "cashflowsMatchParameters" : true,
+                          "paymentCalculationPeriod" : [ {
+                            "adjustedPaymentDate" : "2019-11-06",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2018-11-02",
+                              "adjustedEndDate" : "2019-11-04",
+                              "meta" : {
+                                "globalKey" : "36ad0d3e"
+                              },
+                              "notionalAmount" : 100000000,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2019-11-01",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a43d8f"
+                                  }
+                                } ]
+                              }
+                            } ],
                             "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                              "globalKey" : "28200204"
+                            }
+                          }, {
+                            "adjustedPaymentDate" : "2020-11-04",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2019-11-04",
+                              "adjustedEndDate" : "2020-11-02",
+                              "meta" : {
+                                "globalKey" : "75afc645"
+                              },
+                              "notionalAmount" : 100000000,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2020-10-30",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a53152"
+                                  }
+                                } ]
+                              }
+                            } ],
+                            "meta" : {
+                              "globalKey" : "6211e509"
+                            }
+                          } ]
+                        },
+                        "meta" : {
+                          "globalKey" : "d5b49744"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "c4bfe14f"
+                        "globalKey" : "f177a183"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "17dbd5b8"
+                    "globalKey" : "449395ec"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "17dbd5b8"
+                  "globalKey" : "449395ec"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "368d7cd4"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.02226,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.02226,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 100000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "9b221dac"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "2d5dbd2c"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "35d60749"
+                      }
                     },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
+                    }
+                  } ],
+                  "observable" : {
                     "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-Federal Funds-H.15-OIS-COMPOUND"
+                        }
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
                           "value" : "rateOption-1"
                         } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-Federal Funds-H.15-OIS-COMPOUND"
-                        }
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 100000000
+                    "meta" : {
+                      "globalKey" : "84eae1d7"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f129f"
-              },
-              "value" : "2018-10-31"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "9369935"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "43400962-2"
+                    "globalKey" : "36f327a2"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "ba4f",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "43400962"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "010",
                   "meta" : {
-                    "scheme" : "platform_side_id"
-                  },
-                  "value" : "43402071"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ba4f"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "ba4f",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "43400962"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "d52fed1c"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS9369935"
+                  "value" : "MARKIT_WIRE"
+                },
+                "meta" : {
+                  "globalKey" : "66b48bac"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "66b48bac",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "66b48bac",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2018-10-31",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "010S3",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "1770aef6"
+                "globalKey" : "a30716bd",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "9cf3f37"
+            }
+          },
+          "meta" : {
+            "globalKey" : "9cf3f37"
           }
         }
       }
     } ],
-    "intent" : "CONTRACT_FORMATION",
+    "eventQualifier" : "ContractFormation",
     "after" : [ {
-      "meta" : {
-        "globalKey" : "5b504342"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
       "trade" : {
-        "account" : [ {
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "clearing_firm_accounts"
-            },
-            "value" : "010S3"
-          },
-          "meta" : {
-            "externalKey" : "account1",
-            "globalKey" : "34a0c93d"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
-          },
-          "servicingParty" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
-          }
-        } ],
-        "clearedDate" : "2018-10-31",
-        "meta" : {
-          "globalKey" : "62d3f1c5"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "clearing_firm",
-            "globalKey" : "ba4f"
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "1051b",
+            "externalReference" : "clearing_service"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "9369935",
               "meta" : {
-                "scheme" : "clearing_member_firms"
-              },
-              "value" : "010"
-            },
-            "meta" : {
-              "globalKey" : "ba4f"
+                "scheme" : "cme_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing_service",
-            "globalKey" : "1051b"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "CME"
-            },
-            "meta" : {
-              "globalKey" : "1051b"
+              "value" : "43400962-2",
+              "meta" : {
+                "scheme" : "client_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "trade_source",
-            "globalKey" : "66b48bac"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "MARKIT_WIRE"
-            },
+              "value" : "43400962",
+              "meta" : {
+                "scheme" : "platform_trade_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "43402071",
+              "meta" : {
+                "scheme" : "platform_side_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "43400962",
+              "meta" : {
+                "scheme" : "block_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "fb3533d0"
+          }
+        }, {
+          "issuer" : {
+            "value" : "1010000023",
             "meta" : {
-              "globalKey" : "66b48bac"
+              "scheme" : "cftc_Namespace"
             }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
-          },
-          "partyReference" : {
-            "externalReference" : "trade_source",
-            "globalReference" : "66b48bac"
           },
-          "role" : "DATA_SUBMITTER"
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "CCCIRS9369935",
+              "meta" : {
+                "scheme" : "reg_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "4ac79bd8"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2018-10-31",
+          "meta" : {
+            "globalKey" : "3f129f"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "ba4f"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -832,46 +785,42 @@
                 "payout" : {
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "fixedPrimaryBusinessCenters",
-                            "globalReference" : "27e4e9"
-                          },
-                          "meta" : {
-                            "globalKey" : "c2a1c1d9"
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "a042e068"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "159eb"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 1,
-                        "rollConvention" : "2"
-                      },
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/360"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2018-11-02",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -880,42 +829,101 @@
                           },
                           "meta" : {
                             "globalKey" : "ecea117a"
-                          },
-                          "unadjustedDate" : "2018-11-02"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ecea117a"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "fixedCalcPeriodDates",
-                        "globalKey" : "6feaffc3"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2020-11-02",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "c2a1c1d9"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "a042e068"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "641c212a"
-                          },
-                          "unadjustedDate" : "2020-11-02"
+                            "globalKey" : "641c212a"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "641c212a"
+                        }
+                      },
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "27e4e9",
+                            "externalReference" : "fixedPrimaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "c2a1c1d9"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "a042e068"
+                        }
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "1a3b"
+                        },
+                        "rollConvention" : "2"
+                      },
+                      "meta" : {
+                        "globalKey" : "880f1e13",
+                        "externalKey" : "fixedCalcPeriodDates"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "78"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDaysOffset" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "ea4abf7e"
+                        },
+                        "dayType" : "Business"
+                      },
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "USNY"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "27e4e9",
+                            "externalKey" : "fixedPrimaryBusinessCenters"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "641c212a"
+                          "globalKey" : "3662e8ba"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "5ddd0f5e",
+                        "externalKey" : "fixedLegPaymentDates"
                       }
                     },
                     "cashflowRepresentation" : {
@@ -923,133 +931,72 @@
                       "paymentCalculationPeriod" : [ {
                         "adjustedPaymentDate" : "2019-11-06",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-11-04",
                           "adjustedStartDate" : "2018-11-02",
+                          "adjustedEndDate" : "2019-11-04",
                           "meta" : {
-                            "globalKey" : "7c94179"
+                            "globalKey" : "1e1bd427"
                           },
-                          "fixedRate" : 0.02226,
-                          "notionalAmount" : 100000000
+                          "notionalAmount" : 100000000,
+                          "fixedRate" : 0.02226
                         } ],
                         "meta" : {
-                          "globalKey" : "6c9f273"
+                          "globalKey" : "1d1c8521"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-11-04",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-11-02",
                           "adjustedStartDate" : "2019-11-04",
+                          "adjustedEndDate" : "2020-11-02",
                           "meta" : {
-                            "globalKey" : "b89603d"
+                            "globalKey" : "21ddb563"
                           },
-                          "fixedRate" : 0.02226,
-                          "notionalAmount" : 100000000
+                          "notionalAmount" : 100000000,
+                          "fixedRate" : 0.02226
                         } ],
                         "meta" : {
-                          "globalKey" : "ade557f9"
+                          "globalKey" : "c439ad1f"
                         }
                       } ]
                     },
-                    "dayCountFraction" : {
-                      "value" : "ACT/360"
-                    },
                     "meta" : {
-                      "globalKey" : "79ea61b"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "fixedLegPaymentDates",
-                        "globalKey" : "eb988f26"
-                      },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "USNY"
-                          } ],
-                          "meta" : {
-                            "externalKey" : "fixedPrimaryBusinessCenters",
-                            "globalKey" : "27e4e9"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "3662e8ba"
-                        }
-                      },
-                      "paymentDaysOffset" : {
-                        "meta" : {
-                          "globalKey" : "ea4baf42"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "BUSINESS"
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "ac8"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 1
-                      }
-                    },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
-                          }
-                        }
-                      }
+                      "globalKey" : "27d0667f"
                     }
                   }, {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-2"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "27e4e9"
-                          },
-                          "meta" : {
-                            "globalKey" : "ff891bf1"
+                    "rateSpecification" : {
+                      "floatingRate" : {
+                        "rateOption" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "rateOption-1"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "dd2a3a80"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "159eb"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 1,
-                        "rollConvention" : "2"
-                      },
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/360"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2018-11-02",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -1058,159 +1005,116 @@
                           },
                           "meta" : {
                             "globalKey" : "ecea117a"
-                          },
-                          "unadjustedDate" : "2018-11-02"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ecea117a"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "floatingCalcPeriodDates",
-                        "globalKey" : "64dfb7f3"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2020-11-02",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "ff891bf1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "dd2a3a80"
                             }
                           },
                           "meta" : {
                             "globalKey" : "a1037b42"
-                          },
-                          "unadjustedDate" : "2020-11-02"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "a1037b42"
                         }
-                      }
-                    },
-                    "cashflowRepresentation" : {
-                      "cashflowsMatchParameters" : true,
-                      "paymentCalculationPeriod" : [ {
-                        "adjustedPaymentDate" : "2019-11-06",
-                        "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-11-04",
-                          "adjustedStartDate" : "2018-11-02",
-                          "meta" : {
-                            "globalKey" : "2824e282"
-                          },
-                          "floatingRateDefinition" : {
-                            "rateObservation" : [ {
-                              "adjustedFixingDate" : "2019-11-01",
-                              "meta" : {
-                                "globalKey" : "7a43d8f"
-                              },
-                              "observedRate" : 0
-                            } ]
+                      },
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "27e4e9",
+                            "externalReference" : "floatPrimaryBusinessCenters"
                           },
-                          "notionalAmount" : 100000000
-                        } ],
-                        "meta" : {
-                          "globalKey" : "1997d748"
-                        }
-                      }, {
-                        "adjustedPaymentDate" : "2020-11-04",
-                        "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-11-02",
-                          "adjustedStartDate" : "2019-11-04",
                           "meta" : {
-                            "globalKey" : "9a621101"
-                          },
-                          "floatingRateDefinition" : {
-                            "rateObservation" : [ {
-                              "adjustedFixingDate" : "2020-10-30",
-                              "meta" : {
-                                "globalKey" : "7a53152"
-                              },
-                              "observedRate" : 0
-                            } ]
-                          },
-                          "notionalAmount" : 100000000
-                        } ],
+                            "globalKey" : "ff891bf1"
+                          }
+                        },
                         "meta" : {
-                          "globalKey" : "86c42fc5"
+                          "globalKey" : "dd2a3a80"
                         }
-                      } ]
-                    },
-                    "dayCountFraction" : {
-                      "value" : "ACT/360"
-                    },
-                    "meta" : {
-                      "globalKey" : "bfb12074"
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "1a3b"
+                        },
+                        "rollConvention" : "2"
+                      },
+                      "meta" : {
+                        "globalKey" : "7604a243",
+                        "externalKey" : "floatingCalcPeriodDates"
+                      }
                     },
                     "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "floatingLegPaymentDates",
-                        "globalKey" : "eb988f26"
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "78"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDaysOffset" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "ea4abf7e"
+                        },
+                        "dayType" : "Business"
                       },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                       "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "floatPrimaryBusinessCenters",
-                            "globalKey" : "27e4e9"
+                            "globalKey" : "27e4e9",
+                            "externalKey" : "floatPrimaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "3662e8ba"
                         }
                       },
-                      "paymentDaysOffset" : {
-                        "meta" : {
-                          "globalKey" : "ea4baf42"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "BUSINESS"
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "ac8"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 1
-                      }
-                    },
-                    "rateSpecification" : {
-                      "floatingRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateOption" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "rateOption-1"
-                          }
-                        }
+                      "meta" : {
+                        "globalKey" : "5ddd0f5e",
+                        "externalKey" : "floatingLegPaymentDates"
                       }
                     },
                     "resetDates" : {
                       "calculationPeriodDatesReference" : {
-                        "externalReference" : "floatingCalcPeriodDates",
-                        "globalReference" : "64dfb7f3"
+                        "globalReference" : "7604a243",
+                        "externalReference" : "floatingCalcPeriodDates"
                       },
+                      "resetRelativeTo" : "CalculationPeriodEndDate",
                       "fixingDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "69232be0"
+                          "globalKey" : "de7afde8"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
+                        "businessDayConvention" : "PRECEDING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -1219,263 +1123,342 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "PRECEDING",
                         "dateRelativeTo" : {
-                          "externalReference" : "floatingLegResetDates",
-                          "globalReference" : "78c2cb18"
+                          "globalReference" : "daa0910",
+                          "externalReference" : "floatingLegResetDates"
+                        }
+                      },
+                      "resetFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "78"
+                        }
+                      },
+                      "resetDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "27e4e9",
+                            "externalReference" : "floatPrimaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "ff891bf1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "dd2a3a80"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "daa0910",
+                        "externalKey" : "floatingLegResetDates"
+                      }
+                    },
+                    "cashflowRepresentation" : {
+                      "cashflowsMatchParameters" : true,
+                      "paymentCalculationPeriod" : [ {
+                        "adjustedPaymentDate" : "2019-11-06",
+                        "calculationPeriod" : [ {
+                          "adjustedStartDate" : "2018-11-02",
+                          "adjustedEndDate" : "2019-11-04",
+                          "meta" : {
+                            "globalKey" : "36ad0d3e"
+                          },
+                          "notionalAmount" : 100000000,
+                          "floatingRateDefinition" : {
+                            "rateObservation" : [ {
+                              "adjustedFixingDate" : "2019-11-01",
+                              "observedRate" : 0,
+                              "meta" : {
+                                "globalKey" : "7a43d8f"
+                              }
+                            } ]
+                          }
+                        } ],
+                        "meta" : {
+                          "globalKey" : "28200204"
                         }
-                      },
-                      "meta" : {
-                        "externalKey" : "floatingLegResetDates",
-                        "globalKey" : "78c2cb18"
-                      },
-                      "resetDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "27e4e9"
-                          },
+                      }, {
+                        "adjustedPaymentDate" : "2020-11-04",
+                        "calculationPeriod" : [ {
+                          "adjustedStartDate" : "2019-11-04",
+                          "adjustedEndDate" : "2020-11-02",
                           "meta" : {
-                            "globalKey" : "ff891bf1"
+                            "globalKey" : "75afc645"
+                          },
+                          "notionalAmount" : 100000000,
+                          "floatingRateDefinition" : {
+                            "rateObservation" : [ {
+                              "adjustedFixingDate" : "2020-10-30",
+                              "observedRate" : 0,
+                              "meta" : {
+                                "globalKey" : "7a53152"
+                              }
+                            } ]
                           }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
+                        } ],
                         "meta" : {
-                          "globalKey" : "dd2a3a80"
+                          "globalKey" : "6211e509"
                         }
-                      },
-                      "resetFrequency" : {
-                        "meta" : {
-                          "globalKey" : "ac8"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 1
-                      },
-                      "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                      } ]
+                    },
+                    "meta" : {
+                      "globalKey" : "d5b49744"
                     }
                   } ],
                   "meta" : {
-                    "globalKey" : "c4bfe14f"
+                    "globalKey" : "f177a183"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "17dbd5b8"
+                "globalKey" : "449395ec"
               }
             },
             "meta" : {
-              "globalKey" : "17dbd5b8"
+              "globalKey" : "449395ec"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "368d7cd4"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.02226,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.02226,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
                 }
               } ],
               "quantity" : [ {
+                "value" : {
+                  "value" : 100000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "9b221dac"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 100000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 100000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
                 }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "2d5dbd2c"
-              },
+              } ],
               "observable" : {
-                "meta" : {
-                  "globalKey" : "35d60749"
-                },
                 "rateOption" : {
+                  "value" : {
+                    "floatingRateIndex" : {
+                      "value" : "USD-Federal Funds-H.15-OIS-COMPOUND"
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "rateOption-1"
                     } ]
-                  },
-                  "value" : {
-                    "floatingRateIndex" : {
-                      "value" : "USD-Federal Funds-H.15-OIS-COMPOUND"
-                    }
                   }
-                }
-              },
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
                 },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 100000000
+                "meta" : {
+                  "globalKey" : "84eae1d7"
                 }
-              } ]
-            } ]
-          } ]
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f129f"
-          },
-          "value" : "2018-10-31"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "cme_trade_id"
               },
-              "value" : "9369935"
-            }
-          }, {
-            "identifier" : {
               "meta" : {
-                "scheme" : "client_trade_id"
-              },
-              "value" : "43400962-2"
+                "globalKey" : "36f327a2"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "ba4f",
+              "externalReference" : "clearing_firm"
             }
           }, {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "platform_trade_id"
-              },
-              "value" : "43400962"
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
             }
-          }, {
+          } ]
+        },
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "010",
               "meta" : {
-                "scheme" : "platform_side_id"
-              },
-              "value" : "43402071"
+                "scheme" : "clearing_member_firms"
+              }
+            },
+            "meta" : {
+              "globalKey" : "ba4f"
             }
-          }, {
+          } ],
+          "meta" : {
+            "globalKey" : "ba4f",
+            "externalKey" : "clearing_firm"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "block_trade_id"
-              },
-              "value" : "43400962"
+              "value" : "CME"
+            },
+            "meta" : {
+              "globalKey" : "1051b"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "clearing_service",
-            "globalReference" : "1051b"
-          },
           "meta" : {
-            "globalKey" : "d52fed1c"
+            "globalKey" : "1051b",
+            "externalKey" : "clearing_service"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "reg_trade_id"
-              },
-              "value" : "CCCIRS9369935"
+              "value" : "MARKIT_WIRE"
+            },
+            "meta" : {
+              "globalKey" : "66b48bac"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "66b48bac",
+            "externalKey" : "trade_source"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "66b48bac",
+            "externalReference" : "trade_source"
+          },
+          "role" : "DataSubmitter",
+          "ownershipPartyReference" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
+          }
+        } ],
+        "clearedDate" : "2018-10-31",
+        "account" : [ {
+          "partyReference" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
+          },
+          "accountNumber" : {
+            "value" : "010S3",
             "meta" : {
-              "scheme" : "cftc_Namespace"
-            },
-            "value" : "1010000023"
+              "scheme" : "clearing_firm_accounts"
+            }
+          },
+          "servicingParty" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
           },
           "meta" : {
-            "globalKey" : "1770aef6"
+            "globalKey" : "a30716bd",
+            "externalKey" : "account1"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "9cf3f37"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
+      },
+      "meta" : {
+        "globalKey" : "4eef39da"
       }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "df4835ab"
+      "globalKey" : "7b5817b5"
     }
   },
+  "previousWorkflowStep" : {
+    "globalReference" : "7caabcef"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "0109369935",
       "meta" : {
         "scheme" : "cme_message_id"
-      },
-      "value" : "0109369935"
+      }
     },
     "sentBy" : {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
+      }
     },
     "sentTo" : [ {
+      "value" : "010",
       "meta" : {
         "scheme" : "cme_firm_id"
-      },
-      "value" : "010"
+      }
     }, {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
+      }
     } ]
   },
-  "meta" : {
-    "globalKey" : "e17ca3e1"
-  },
+  "timestamp" : [ {
+    "dateTime" : "2018-10-31T14:36:28Z",
+    "qualification" : "eventCreationDateTime"
+  }, {
+    "dateTime" : "2018-10-31T14:15:55.608Z",
+    "qualification" : "clearingReceiptDateTime"
+  } ],
   "party" : [ {
-    "meta" : {
-      "externalKey" : "clearing_firm",
-      "globalKey" : "ba4f"
-    },
     "partyId" : [ {
       "identifier" : {
+        "value" : "010",
         "meta" : {
           "scheme" : "clearing_member_firms"
-        },
-        "value" : "010"
+        }
       },
       "meta" : {
         "globalKey" : "ba4f"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "clearing_service",
-      "globalKey" : "1051b"
-    },
+      "globalKey" : "ba4f",
+      "externalKey" : "clearing_firm"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "CME"
@@ -1483,12 +1466,12 @@
       "meta" : {
         "globalKey" : "1051b"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "trade_source",
-      "globalKey" : "66b48bac"
-    },
+      "globalKey" : "1051b",
+      "externalKey" : "clearing_service"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "MARKIT_WIRE"
@@ -1496,16 +1479,33 @@
       "meta" : {
         "globalKey" : "66b48bac"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "66b48bac",
+      "externalKey" : "trade_source"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "c7ddb8e7"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2018-10-31T14:36:28Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  }, {
-    "dateTime" : "2018-10-31T14:15:55.608Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
-  } ]
+  "account" : [ {
+    "partyReference" : {
+      "globalReference" : "ba4f",
+      "externalReference" : "clearing_firm"
+    },
+    "accountNumber" : {
+      "value" : "010S3",
+      "meta" : {
+        "scheme" : "clearing_firm_accounts"
+      }
+    },
+    "servicingParty" : {
+      "globalReference" : "ba4f",
+      "externalReference" : "clearing_firm"
+    },
+    "meta" : {
+      "globalKey" : "a30716bd",
+      "externalKey" : "account1"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "b7603463"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex10-OIS-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex10-OIS-func-output.json
index f322e5db29..2e7e9b9a9d 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex10-OIS-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex10-OIS-func-output.json
@@ -1,124 +1,80 @@
 {
-  "account" : [ {
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "clearing_firm_accounts"
-      },
-      "value" : "010S3"
-    },
-    "meta" : {
-      "externalKey" : "account1",
-      "globalKey" : "34a0c93d"
-    },
-    "partyReference" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "ba4f"
-    },
-    "servicingParty" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "ba4f"
-    }
-  } ],
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "d5656d53"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "010S3"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "34a0c93d"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              }
-            } ],
-            "clearedDate" : "2018-10-31",
-            "meta" : {
-              "globalKey" : "d5656d53"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "ba4f"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "9369933",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "010"
-                },
-                "meta" : {
-                  "globalKey" : "ba4f"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "43401034-2",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "66b48bac"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "MARKIT_WIRE"
-                },
+                  "value" : "43401034",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43402020",
+                  "meta" : {
+                    "scheme" : "platform_side_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43401034",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "70c50263"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "66b48bac"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
               },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "66b48bac"
-              },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS9369933",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "4ac79bd6"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-31",
+              "meta" : {
+                "globalKey" : "3f129f"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "ba4f"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -129,46 +85,42 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "c2a1c1d9"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "a042e068"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "159eb"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "2"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -177,42 +129,101 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "6feaffc3"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2020-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "fixedPrimaryBusinessCenters",
-                                    "globalReference" : "27e4e9"
+                                    "globalReference" : "27e4e9",
+                                    "externalReference" : "fixedPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "c2a1c1d9"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "a042e068"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "641c212a"
-                              },
-                              "unadjustedDate" : "2020-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "641c212a"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "c2a1c1d9"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "a042e068"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "1a3b"
+                            },
+                            "rollConvention" : "2"
+                          },
+                          "meta" : {
+                            "globalKey" : "880f1e13",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4abf7e"
+                            },
+                            "dayType" : "Business"
+                          },
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "27e4e9",
+                                "externalKey" : "fixedPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3662e8ba"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "5ddd0f5e",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -220,133 +231,72 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2019-11-06",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-11-04",
                               "adjustedStartDate" : "2018-11-02",
+                              "adjustedEndDate" : "2019-11-04",
                               "meta" : {
-                                "globalKey" : "7c9bd3b"
+                                "globalKey" : "1e1bd825"
                               },
-                              "fixedRate" : 0.02345,
-                              "notionalAmount" : 100000000
+                              "notionalAmount" : 100000000,
+                              "fixedRate" : 0.02345
                             } ],
                             "meta" : {
-                              "globalKey" : "6ca6e35"
+                              "globalKey" : "1d1c891f"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-11-04",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-11-02",
                               "adjustedStartDate" : "2019-11-04",
+                              "adjustedEndDate" : "2020-11-02",
                               "meta" : {
-                                "globalKey" : "b89dbff"
+                                "globalKey" : "21ddb961"
                               },
-                              "fixedRate" : 0.02345,
-                              "notionalAmount" : 100000000
+                              "notionalAmount" : 100000000,
+                              "fixedRate" : 0.02345
                             } ],
                             "meta" : {
-                              "globalKey" : "ade5d3bb"
+                              "globalKey" : "c439b11d"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
                         "meta" : {
-                          "globalKey" : "23e3a197"
+                          "globalKey" : "56f0f7fb"
+                        }
+                      }, {
+                        "payerReceiver" : {
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "eb988f26"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "fixedPrimaryBusinessCenters",
-                                "globalKey" : "27e4e9"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "3662e8ba"
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-2"
                             }
                           },
-                          "paymentDaysOffset" : {
-                            "meta" : {
-                              "globalKey" : "ea4baf42"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 2,
-                            "dayType" : "BUSINESS"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           }
-                        }
-                      }, {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
                         },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-2"
-                            }
-                          }
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
                         },
                         "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "ff891bf1"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "dd2a3a80"
-                            }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "159eb"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "2"
-                          },
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -355,159 +305,116 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "64dfb7f3"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2020-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "27e4e9"
+                                    "globalReference" : "27e4e9",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "ff891bf1"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "dd2a3a80"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "a1037b42"
-                              },
-                              "unadjustedDate" : "2020-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "a1037b42"
                             }
-                          }
-                        },
-                        "cashflowRepresentation" : {
-                          "cashflowsMatchParameters" : true,
-                          "paymentCalculationPeriod" : [ {
-                            "adjustedPaymentDate" : "2019-11-06",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-11-04",
-                              "adjustedStartDate" : "2018-11-02",
-                              "meta" : {
-                                "globalKey" : "2824e282"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2019-11-01",
-                                  "meta" : {
-                                    "globalKey" : "7a43d8f"
-                                  },
-                                  "observedRate" : 0
-                                } ]
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
-                              "notionalAmount" : 100000000
-                            } ],
-                            "meta" : {
-                              "globalKey" : "1997d748"
-                            }
-                          }, {
-                            "adjustedPaymentDate" : "2020-11-04",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-11-02",
-                              "adjustedStartDate" : "2019-11-04",
                               "meta" : {
-                                "globalKey" : "9a621101"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2020-10-30",
-                                  "meta" : {
-                                    "globalKey" : "7a53152"
-                                  },
-                                  "observedRate" : 0
-                                } ]
-                              },
-                              "notionalAmount" : 100000000
-                            } ],
+                                "globalKey" : "ff891bf1"
+                              }
+                            },
                             "meta" : {
-                              "globalKey" : "86c42fc5"
+                              "globalKey" : "dd2a3a80"
                             }
-                          } ]
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "ff7e7ef3"
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "1a3b"
+                            },
+                            "rollConvention" : "2"
+                          },
+                          "meta" : {
+                            "globalKey" : "7604a243",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
                         },
                         "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "eb988f26"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4abf7e"
+                            },
+                            "dayType" : "Business"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USNY"
                               } ],
                               "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "27e4e9"
+                                "globalKey" : "27e4e9",
+                                "externalKey" : "floatPrimaryBusinessCenters"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "3662e8ba"
                             }
                           },
-                          "paymentDaysOffset" : {
-                            "meta" : {
-                              "globalKey" : "ea4baf42"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 2,
-                            "dayType" : "BUSINESS"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "5ddd0f5e",
+                            "externalKey" : "floatingLegPaymentDates"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "64dfb7f3"
+                            "globalReference" : "7604a243",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodEndDate",
                           "fixingDates" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "691fe6c1"
+                              "globalKey" : "de77b8c9"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
+                            "businessDayConvention" : "PRECEDING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USGS"
@@ -516,312 +423,358 @@
                                 "globalKey" : "27e40a"
                               }
                             },
-                            "businessDayConvention" : "PRECEDING",
                             "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "b8902997"
+                              "globalReference" : "4d77678f",
+                              "externalReference" : "floatingLegResetDates"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "b8902997"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "ff891bf1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "dd2a3a80"
                             }
                           },
-                          "resetFrequency" : {
+                          "meta" : {
+                            "globalKey" : "4d77678f",
+                            "externalKey" : "floatingLegResetDates"
+                          }
+                        },
+                        "cashflowRepresentation" : {
+                          "cashflowsMatchParameters" : true,
+                          "paymentCalculationPeriod" : [ {
+                            "adjustedPaymentDate" : "2019-11-06",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2018-11-02",
+                              "adjustedEndDate" : "2019-11-04",
+                              "meta" : {
+                                "globalKey" : "36ad0d3e"
+                              },
+                              "notionalAmount" : 100000000,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2019-11-01",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a43d8f"
+                                  }
+                                } ]
+                              }
+                            } ],
                             "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                              "globalKey" : "28200204"
+                            }
+                          }, {
+                            "adjustedPaymentDate" : "2020-11-04",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2019-11-04",
+                              "adjustedEndDate" : "2020-11-02",
+                              "meta" : {
+                                "globalKey" : "75afc645"
+                              },
+                              "notionalAmount" : 100000000,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2020-10-30",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a53152"
+                                  }
+                                } ]
+                              }
+                            } ],
+                            "meta" : {
+                              "globalKey" : "6211e509"
+                            }
+                          } ]
+                        },
+                        "meta" : {
+                          "globalKey" : "92a27c83"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "976f2a4a"
+                        "globalKey" : "3ab0873e"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "f301bc39"
+                    "globalKey" : "9643192d"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "f301bc39"
+                  "globalKey" : "9643192d"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "f07fac52"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.02345,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.02345,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 100000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "1f75ddee"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "e84ab7ac"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "54f5dcc9"
-                    },
                     "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-SOFR-COMPOUND"
+                        }
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
                           "value" : "rateOption-1"
                         } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-SOFR-COMPOUND"
-                        }
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 100000000
+                    "meta" : {
+                      "globalKey" : "49c5bc57"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f129f"
-              },
-              "value" : "2018-10-31"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "9369933"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "43401034-2"
+                    "globalKey" : "fbce0222"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "ba4f",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "43401034"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "010",
                   "meta" : {
-                    "scheme" : "platform_side_id"
-                  },
-                  "value" : "43402020"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ba4f"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "ba4f",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "43401034"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "4761416f"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS9369933"
+                  "value" : "MARKIT_WIRE"
+                },
+                "meta" : {
+                  "globalKey" : "66b48bac"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "66b48bac",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "66b48bac",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2018-10-31",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "010S3",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "1770a774"
+                "globalKey" : "a30716bd",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "9b442bed"
+            }
+          },
+          "meta" : {
+            "globalKey" : "9b442bed"
           }
         }
       }
     } ],
-    "intent" : "CONTRACT_FORMATION",
+    "eventQualifier" : "ContractFormation",
     "after" : [ {
-      "meta" : {
-        "globalKey" : "cde1bed0"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
       "trade" : {
-        "account" : [ {
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "clearing_firm_accounts"
-            },
-            "value" : "010S3"
-          },
-          "meta" : {
-            "externalKey" : "account1",
-            "globalKey" : "34a0c93d"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
-          },
-          "servicingParty" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
-          }
-        } ],
-        "clearedDate" : "2018-10-31",
-        "meta" : {
-          "globalKey" : "d5656d53"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "clearing_firm",
-            "globalKey" : "ba4f"
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "1051b",
+            "externalReference" : "clearing_service"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "9369933",
               "meta" : {
-                "scheme" : "clearing_member_firms"
-              },
-              "value" : "010"
-            },
-            "meta" : {
-              "globalKey" : "ba4f"
+                "scheme" : "cme_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing_service",
-            "globalKey" : "1051b"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "CME"
-            },
-            "meta" : {
-              "globalKey" : "1051b"
+              "value" : "43401034-2",
+              "meta" : {
+                "scheme" : "client_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "trade_source",
-            "globalKey" : "66b48bac"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "MARKIT_WIRE"
-            },
+              "value" : "43401034",
+              "meta" : {
+                "scheme" : "platform_trade_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "43402020",
+              "meta" : {
+                "scheme" : "platform_side_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "43401034",
+              "meta" : {
+                "scheme" : "block_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "70c50263"
+          }
+        }, {
+          "issuer" : {
+            "value" : "1010000023",
             "meta" : {
-              "globalKey" : "66b48bac"
+              "scheme" : "cftc_Namespace"
             }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
-          },
-          "partyReference" : {
-            "externalReference" : "trade_source",
-            "globalReference" : "66b48bac"
           },
-          "role" : "DATA_SUBMITTER"
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "CCCIRS9369933",
+              "meta" : {
+                "scheme" : "reg_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "4ac79bd6"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2018-10-31",
+          "meta" : {
+            "globalKey" : "3f129f"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "ba4f"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -832,46 +785,42 @@
                 "payout" : {
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "fixedPrimaryBusinessCenters",
-                            "globalReference" : "27e4e9"
-                          },
-                          "meta" : {
-                            "globalKey" : "c2a1c1d9"
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "a042e068"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "159eb"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 1,
-                        "rollConvention" : "2"
-                      },
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/360"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2018-11-02",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -880,42 +829,101 @@
                           },
                           "meta" : {
                             "globalKey" : "ecea117a"
-                          },
-                          "unadjustedDate" : "2018-11-02"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ecea117a"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "fixedCalcPeriodDates",
-                        "globalKey" : "6feaffc3"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2020-11-02",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "c2a1c1d9"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "a042e068"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "641c212a"
-                          },
-                          "unadjustedDate" : "2020-11-02"
+                            "globalKey" : "641c212a"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "641c212a"
+                        }
+                      },
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "27e4e9",
+                            "externalReference" : "fixedPrimaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "c2a1c1d9"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "a042e068"
+                        }
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "1a3b"
+                        },
+                        "rollConvention" : "2"
+                      },
+                      "meta" : {
+                        "globalKey" : "880f1e13",
+                        "externalKey" : "fixedCalcPeriodDates"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "78"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDaysOffset" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "ea4abf7e"
+                        },
+                        "dayType" : "Business"
+                      },
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "USNY"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "27e4e9",
+                            "externalKey" : "fixedPrimaryBusinessCenters"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "641c212a"
+                          "globalKey" : "3662e8ba"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "5ddd0f5e",
+                        "externalKey" : "fixedLegPaymentDates"
                       }
                     },
                     "cashflowRepresentation" : {
@@ -923,133 +931,72 @@
                       "paymentCalculationPeriod" : [ {
                         "adjustedPaymentDate" : "2019-11-06",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-11-04",
                           "adjustedStartDate" : "2018-11-02",
+                          "adjustedEndDate" : "2019-11-04",
                           "meta" : {
-                            "globalKey" : "7c9bd3b"
+                            "globalKey" : "1e1bd825"
                           },
-                          "fixedRate" : 0.02345,
-                          "notionalAmount" : 100000000
+                          "notionalAmount" : 100000000,
+                          "fixedRate" : 0.02345
                         } ],
                         "meta" : {
-                          "globalKey" : "6ca6e35"
+                          "globalKey" : "1d1c891f"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-11-04",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-11-02",
                           "adjustedStartDate" : "2019-11-04",
+                          "adjustedEndDate" : "2020-11-02",
                           "meta" : {
-                            "globalKey" : "b89dbff"
+                            "globalKey" : "21ddb961"
                           },
-                          "fixedRate" : 0.02345,
-                          "notionalAmount" : 100000000
+                          "notionalAmount" : 100000000,
+                          "fixedRate" : 0.02345
                         } ],
                         "meta" : {
-                          "globalKey" : "ade5d3bb"
+                          "globalKey" : "c439b11d"
                         }
                       } ]
                     },
-                    "dayCountFraction" : {
-                      "value" : "ACT/360"
-                    },
                     "meta" : {
-                      "globalKey" : "23e3a197"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "fixedLegPaymentDates",
-                        "globalKey" : "eb988f26"
-                      },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "USNY"
-                          } ],
-                          "meta" : {
-                            "externalKey" : "fixedPrimaryBusinessCenters",
-                            "globalKey" : "27e4e9"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "3662e8ba"
-                        }
-                      },
-                      "paymentDaysOffset" : {
-                        "meta" : {
-                          "globalKey" : "ea4baf42"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "BUSINESS"
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "ac8"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 1
-                      }
-                    },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
-                          }
-                        }
-                      }
+                      "globalKey" : "56f0f7fb"
                     }
                   }, {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-2"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "27e4e9"
-                          },
-                          "meta" : {
-                            "globalKey" : "ff891bf1"
+                    "rateSpecification" : {
+                      "floatingRate" : {
+                        "rateOption" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "rateOption-1"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "dd2a3a80"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "159eb"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 1,
-                        "rollConvention" : "2"
-                      },
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/360"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2018-11-02",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -1058,159 +1005,116 @@
                           },
                           "meta" : {
                             "globalKey" : "ecea117a"
-                          },
-                          "unadjustedDate" : "2018-11-02"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ecea117a"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "floatingCalcPeriodDates",
-                        "globalKey" : "64dfb7f3"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2020-11-02",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "ff891bf1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "dd2a3a80"
                             }
                           },
                           "meta" : {
                             "globalKey" : "a1037b42"
-                          },
-                          "unadjustedDate" : "2020-11-02"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "a1037b42"
                         }
-                      }
-                    },
-                    "cashflowRepresentation" : {
-                      "cashflowsMatchParameters" : true,
-                      "paymentCalculationPeriod" : [ {
-                        "adjustedPaymentDate" : "2019-11-06",
-                        "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-11-04",
-                          "adjustedStartDate" : "2018-11-02",
-                          "meta" : {
-                            "globalKey" : "2824e282"
-                          },
-                          "floatingRateDefinition" : {
-                            "rateObservation" : [ {
-                              "adjustedFixingDate" : "2019-11-01",
-                              "meta" : {
-                                "globalKey" : "7a43d8f"
-                              },
-                              "observedRate" : 0
-                            } ]
+                      },
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "27e4e9",
+                            "externalReference" : "floatPrimaryBusinessCenters"
                           },
-                          "notionalAmount" : 100000000
-                        } ],
-                        "meta" : {
-                          "globalKey" : "1997d748"
-                        }
-                      }, {
-                        "adjustedPaymentDate" : "2020-11-04",
-                        "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-11-02",
-                          "adjustedStartDate" : "2019-11-04",
                           "meta" : {
-                            "globalKey" : "9a621101"
-                          },
-                          "floatingRateDefinition" : {
-                            "rateObservation" : [ {
-                              "adjustedFixingDate" : "2020-10-30",
-                              "meta" : {
-                                "globalKey" : "7a53152"
-                              },
-                              "observedRate" : 0
-                            } ]
-                          },
-                          "notionalAmount" : 100000000
-                        } ],
+                            "globalKey" : "ff891bf1"
+                          }
+                        },
                         "meta" : {
-                          "globalKey" : "86c42fc5"
+                          "globalKey" : "dd2a3a80"
                         }
-                      } ]
-                    },
-                    "dayCountFraction" : {
-                      "value" : "ACT/360"
-                    },
-                    "meta" : {
-                      "globalKey" : "ff7e7ef3"
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "1a3b"
+                        },
+                        "rollConvention" : "2"
+                      },
+                      "meta" : {
+                        "globalKey" : "7604a243",
+                        "externalKey" : "floatingCalcPeriodDates"
+                      }
                     },
                     "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "floatingLegPaymentDates",
-                        "globalKey" : "eb988f26"
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "78"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDaysOffset" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "ea4abf7e"
+                        },
+                        "dayType" : "Business"
                       },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                       "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "floatPrimaryBusinessCenters",
-                            "globalKey" : "27e4e9"
+                            "globalKey" : "27e4e9",
+                            "externalKey" : "floatPrimaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "3662e8ba"
                         }
                       },
-                      "paymentDaysOffset" : {
-                        "meta" : {
-                          "globalKey" : "ea4baf42"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "BUSINESS"
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "ac8"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 1
-                      }
-                    },
-                    "rateSpecification" : {
-                      "floatingRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateOption" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "rateOption-1"
-                          }
-                        }
+                      "meta" : {
+                        "globalKey" : "5ddd0f5e",
+                        "externalKey" : "floatingLegPaymentDates"
                       }
                     },
                     "resetDates" : {
                       "calculationPeriodDatesReference" : {
-                        "externalReference" : "floatingCalcPeriodDates",
-                        "globalReference" : "64dfb7f3"
+                        "globalReference" : "7604a243",
+                        "externalReference" : "floatingCalcPeriodDates"
                       },
+                      "resetRelativeTo" : "CalculationPeriodEndDate",
                       "fixingDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "691fe6c1"
+                          "globalKey" : "de77b8c9"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
+                        "businessDayConvention" : "PRECEDING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USGS"
@@ -1219,263 +1123,342 @@
                             "globalKey" : "27e40a"
                           }
                         },
-                        "businessDayConvention" : "PRECEDING",
                         "dateRelativeTo" : {
-                          "externalReference" : "floatingLegResetDates",
-                          "globalReference" : "b8902997"
+                          "globalReference" : "4d77678f",
+                          "externalReference" : "floatingLegResetDates"
+                        }
+                      },
+                      "resetFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "78"
+                        }
+                      },
+                      "resetDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "27e4e9",
+                            "externalReference" : "floatPrimaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "ff891bf1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "dd2a3a80"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "4d77678f",
+                        "externalKey" : "floatingLegResetDates"
+                      }
+                    },
+                    "cashflowRepresentation" : {
+                      "cashflowsMatchParameters" : true,
+                      "paymentCalculationPeriod" : [ {
+                        "adjustedPaymentDate" : "2019-11-06",
+                        "calculationPeriod" : [ {
+                          "adjustedStartDate" : "2018-11-02",
+                          "adjustedEndDate" : "2019-11-04",
+                          "meta" : {
+                            "globalKey" : "36ad0d3e"
+                          },
+                          "notionalAmount" : 100000000,
+                          "floatingRateDefinition" : {
+                            "rateObservation" : [ {
+                              "adjustedFixingDate" : "2019-11-01",
+                              "observedRate" : 0,
+                              "meta" : {
+                                "globalKey" : "7a43d8f"
+                              }
+                            } ]
+                          }
+                        } ],
+                        "meta" : {
+                          "globalKey" : "28200204"
                         }
-                      },
-                      "meta" : {
-                        "externalKey" : "floatingLegResetDates",
-                        "globalKey" : "b8902997"
-                      },
-                      "resetDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "27e4e9"
-                          },
+                      }, {
+                        "adjustedPaymentDate" : "2020-11-04",
+                        "calculationPeriod" : [ {
+                          "adjustedStartDate" : "2019-11-04",
+                          "adjustedEndDate" : "2020-11-02",
                           "meta" : {
-                            "globalKey" : "ff891bf1"
+                            "globalKey" : "75afc645"
+                          },
+                          "notionalAmount" : 100000000,
+                          "floatingRateDefinition" : {
+                            "rateObservation" : [ {
+                              "adjustedFixingDate" : "2020-10-30",
+                              "observedRate" : 0,
+                              "meta" : {
+                                "globalKey" : "7a53152"
+                              }
+                            } ]
                           }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
+                        } ],
                         "meta" : {
-                          "globalKey" : "dd2a3a80"
+                          "globalKey" : "6211e509"
                         }
-                      },
-                      "resetFrequency" : {
-                        "meta" : {
-                          "globalKey" : "ac8"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 1
-                      },
-                      "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                      } ]
+                    },
+                    "meta" : {
+                      "globalKey" : "92a27c83"
                     }
                   } ],
                   "meta" : {
-                    "globalKey" : "976f2a4a"
+                    "globalKey" : "3ab0873e"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "f301bc39"
+                "globalKey" : "9643192d"
               }
             },
             "meta" : {
-              "globalKey" : "f301bc39"
+              "globalKey" : "9643192d"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "f07fac52"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.02345,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.02345,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
                 }
               } ],
               "quantity" : [ {
+                "value" : {
+                  "value" : 100000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "1f75ddee"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 100000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 100000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
                 }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "e84ab7ac"
-              },
+              } ],
               "observable" : {
-                "meta" : {
-                  "globalKey" : "54f5dcc9"
-                },
                 "rateOption" : {
+                  "value" : {
+                    "floatingRateIndex" : {
+                      "value" : "USD-SOFR-COMPOUND"
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "rateOption-1"
                     } ]
-                  },
-                  "value" : {
-                    "floatingRateIndex" : {
-                      "value" : "USD-SOFR-COMPOUND"
-                    }
                   }
-                }
-              },
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
                 },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 100000000
+                "meta" : {
+                  "globalKey" : "49c5bc57"
                 }
-              } ]
-            } ]
-          } ]
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f129f"
-          },
-          "value" : "2018-10-31"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "cme_trade_id"
               },
-              "value" : "9369933"
-            }
-          }, {
-            "identifier" : {
               "meta" : {
-                "scheme" : "client_trade_id"
-              },
-              "value" : "43401034-2"
+                "globalKey" : "fbce0222"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "ba4f",
+              "externalReference" : "clearing_firm"
             }
           }, {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "platform_trade_id"
-              },
-              "value" : "43401034"
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
             }
-          }, {
+          } ]
+        },
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "010",
               "meta" : {
-                "scheme" : "platform_side_id"
-              },
-              "value" : "43402020"
+                "scheme" : "clearing_member_firms"
+              }
+            },
+            "meta" : {
+              "globalKey" : "ba4f"
             }
-          }, {
+          } ],
+          "meta" : {
+            "globalKey" : "ba4f",
+            "externalKey" : "clearing_firm"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "block_trade_id"
-              },
-              "value" : "43401034"
+              "value" : "CME"
+            },
+            "meta" : {
+              "globalKey" : "1051b"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "clearing_service",
-            "globalReference" : "1051b"
-          },
           "meta" : {
-            "globalKey" : "4761416f"
+            "globalKey" : "1051b",
+            "externalKey" : "clearing_service"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "reg_trade_id"
-              },
-              "value" : "CCCIRS9369933"
+              "value" : "MARKIT_WIRE"
+            },
+            "meta" : {
+              "globalKey" : "66b48bac"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "66b48bac",
+            "externalKey" : "trade_source"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "66b48bac",
+            "externalReference" : "trade_source"
+          },
+          "role" : "DataSubmitter",
+          "ownershipPartyReference" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
+          }
+        } ],
+        "clearedDate" : "2018-10-31",
+        "account" : [ {
+          "partyReference" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
+          },
+          "accountNumber" : {
+            "value" : "010S3",
             "meta" : {
-              "scheme" : "cftc_Namespace"
-            },
-            "value" : "1010000023"
+              "scheme" : "clearing_firm_accounts"
+            }
+          },
+          "servicingParty" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
           },
           "meta" : {
-            "globalKey" : "1770a774"
+            "globalKey" : "a30716bd",
+            "externalKey" : "account1"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "9b442bed"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
+      },
+      "meta" : {
+        "globalKey" : "56dbd110"
       }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "e4348ec7"
+      "globalKey" : "54e115a1"
     }
   },
+  "previousWorkflowStep" : {
+    "globalReference" : "2174cb64"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "0109369933",
       "meta" : {
         "scheme" : "cme_message_id"
-      },
-      "value" : "0109369933"
+      }
     },
     "sentBy" : {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
+      }
     },
     "sentTo" : [ {
+      "value" : "010",
       "meta" : {
         "scheme" : "cme_firm_id"
-      },
-      "value" : "010"
+      }
     }, {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
+      }
     } ]
   },
-  "meta" : {
-    "globalKey" : "55c13d7c"
-  },
+  "timestamp" : [ {
+    "dateTime" : "2018-10-31T14:34:54Z",
+    "qualification" : "eventCreationDateTime"
+  }, {
+    "dateTime" : "2018-10-31T14:15:19.417Z",
+    "qualification" : "clearingReceiptDateTime"
+  } ],
   "party" : [ {
-    "meta" : {
-      "externalKey" : "clearing_firm",
-      "globalKey" : "ba4f"
-    },
     "partyId" : [ {
       "identifier" : {
+        "value" : "010",
         "meta" : {
           "scheme" : "clearing_member_firms"
-        },
-        "value" : "010"
+        }
       },
       "meta" : {
         "globalKey" : "ba4f"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "clearing_service",
-      "globalKey" : "1051b"
-    },
+      "globalKey" : "ba4f",
+      "externalKey" : "clearing_firm"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "CME"
@@ -1483,12 +1466,12 @@
       "meta" : {
         "globalKey" : "1051b"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "trade_source",
-      "globalKey" : "66b48bac"
-    },
+      "globalKey" : "1051b",
+      "externalKey" : "clearing_service"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "MARKIT_WIRE"
@@ -1496,16 +1479,33 @@
       "meta" : {
         "globalKey" : "66b48bac"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "66b48bac",
+      "externalKey" : "trade_source"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "d606f318"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2018-10-31T14:34:54Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  }, {
-    "dateTime" : "2018-10-31T14:15:19.417Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
-  } ]
+  "account" : [ {
+    "partyReference" : {
+      "globalReference" : "ba4f",
+      "externalReference" : "clearing_firm"
+    },
+    "accountNumber" : {
+      "value" : "010S3",
+      "meta" : {
+        "scheme" : "clearing_firm_accounts"
+      }
+    },
+    "servicingParty" : {
+      "globalReference" : "ba4f",
+      "externalReference" : "clearing_firm"
+    },
+    "meta" : {
+      "globalKey" : "a30716bd",
+      "externalKey" : "account1"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "d204625c"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex11-OIS-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex11-OIS-func-output.json
index 5067e7443e..96f387814c 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex11-OIS-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/IRS-ex11-OIS-func-output.json
@@ -1,137 +1,66 @@
 {
-  "account" : [ {
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "clearing_firm_accounts"
-      },
-      "value" : "999-123"
-    },
-    "meta" : {
-      "externalKey" : "account1",
-      "globalKey" : "a18b2f80"
-    },
-    "partyReference" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "dd19"
-    },
-    "servicingParty" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "dd19"
-    }
-  } ],
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "7d120f51"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "999-123"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "a18b2f80"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              }
-            } ],
-            "clearedDate" : "2018-04-24",
-            "meta" : {
-              "globalKey" : "f6bbfe03"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "dd19"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "2894761",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "999"
-                },
-                "meta" : {
-                  "globalKey" : "dd19"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "QAC-11111",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "9e635873"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "PLATFORM"
-                },
-                "meta" : {
-                  "globalKey" : "9e635873"
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "SEF",
-                "globalKey" : "75895dac"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "value" : "PARTY123"
-                },
+                "globalKey" : "c3b59534"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "75895dac"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "9e635873"
               },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS2894761",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e12c31ab"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-04-24",
+              "meta" : {
+                "globalKey" : "3f1118"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "dd19"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -142,46 +71,40 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "ff891bf1"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "dd2a3a80"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "2b91b"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "26"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2013-07-26",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -190,42 +113,154 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec508292"
-                              },
-                              "unadjustedDate" : "2013-07-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec508292"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "66f0b623"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2025-07-26",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "27e4e9"
+                                    "globalReference" : "27e4e9",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "ff891bf1"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "dd2a3a80"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "f4570a5a"
-                              },
-                              "unadjustedDate" : "2025-07-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "f4570a5a"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "ff891bf1"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "dd2a3a80"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "1796b"
+                            },
+                            "rollConvention" : "26"
+                          },
+                          "meta" : {
+                            "globalKey" : "4fd38073",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4abf7e"
+                            },
+                            "dayType" : "Business"
+                          },
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "27e4e9",
+                                "externalKey" : "floatPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3662e8ba"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "5ddd0f5e",
+                            "externalKey" : "floatingLegPaymentDates"
+                          }
+                        },
+                        "resetDates" : {
+                          "calculationPeriodDatesReference" : {
+                            "globalReference" : "4fd38073",
+                            "externalReference" : "floatingCalcPeriodDates"
+                          },
+                          "resetRelativeTo" : "CalculationPeriodEndDate",
+                          "fixingDates" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "de7afde8"
+                            },
+                            "businessDayConvention" : "PRECEDING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "27e4e9"
+                              }
+                            },
+                            "dateRelativeTo" : {
+                              "globalReference" : "f60bef40",
+                              "externalReference" : "floatingLegResetDates"
+                            }
+                          },
+                          "resetFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
+                          },
+                          "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "ff891bf1"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "dd2a3a80"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "f60bef40",
+                            "externalKey" : "floatingLegResetDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -233,420 +268,310 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2014-07-30",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2014-07-28",
                               "adjustedStartDate" : "2013-07-26",
+                              "adjustedEndDate" : "2014-07-28",
                               "meta" : {
-                                "globalKey" : "f7ac65ae"
+                                "globalKey" : "634906a"
                               },
+                              "notionalAmount" : 5000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2014-07-25",
+                                  "observedRate" : 0.0008347,
                                   "meta" : {
                                     "globalKey" : "bebc8677"
-                                  },
-                                  "observedRate" : 0.0008347
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 5000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "d9c2998c"
+                              "globalKey" : "e84ac448"
                             }
                           }, {
                             "adjustedPaymentDate" : "2015-07-29",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-07-27",
                               "adjustedStartDate" : "2014-07-28",
+                              "adjustedEndDate" : "2015-07-27",
                               "meta" : {
-                                "globalKey" : "9edab0b7"
+                                "globalKey" : "46f70359"
                               },
+                              "notionalAmount" : 5000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2015-07-24",
+                                  "observedRate" : 0.0011009,
                                   "meta" : {
                                     "globalKey" : "bec85b83"
-                                  },
-                                  "observedRate" : 0.0011009
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 5000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "10247d94"
+                              "globalKey" : "b840d036"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-07-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-07-26",
                               "adjustedStartDate" : "2015-07-27",
+                              "adjustedEndDate" : "2016-07-26",
                               "meta" : {
-                                "globalKey" : "40f076c6"
+                                "globalKey" : "e90cc968"
                               },
+                              "notionalAmount" : 5000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2016-07-25",
+                                  "observedRate" : 0.0027493,
                                   "meta" : {
                                     "globalKey" : "beda3572"
-                                  },
-                                  "observedRate" : 0.0027493
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 5000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "416ddca2"
+                              "globalKey" : "e98a2f44"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-07-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-07-26",
                               "adjustedStartDate" : "2016-07-26",
+                              "adjustedEndDate" : "2017-07-26",
                               "meta" : {
-                                "globalKey" : "1813f3d4"
+                                "globalKey" : "8cfee3d4"
                               },
+                              "notionalAmount" : 5000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2017-07-25",
+                                  "observedRate" : 0.0067469,
                                   "meta" : {
                                     "globalKey" : "bf138b1f"
-                                  },
-                                  "observedRate" : 0.0067469
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 5000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "3c0961b0"
+                              "globalKey" : "b0f451b0"
                             }
                           }, {
                             "adjustedPaymentDate" : "2018-07-30",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-07-26",
                               "adjustedStartDate" : "2017-07-26",
+                              "adjustedEndDate" : "2018-07-26",
                               "meta" : {
-                                "globalKey" : "3942922c"
+                                "globalKey" : "ae2d822c"
                               },
+                              "notionalAmount" : 5000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2018-07-25",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a32977"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 5000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "a938e60a"
+                              "globalKey" : "1e23d60a"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-07-30",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-07-26",
                               "adjustedStartDate" : "2018-07-26",
+                              "adjustedEndDate" : "2019-07-26",
                               "meta" : {
-                                "globalKey" : "11e28a2c"
+                                "globalKey" : "86cd7a2c"
                               },
+                              "notionalAmount" : 5000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-07-25",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a42177"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 5000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "a550e60a"
+                              "globalKey" : "1a3bd60a"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-07-29",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-07-27",
                               "adjustedStartDate" : "2019-07-26",
+                              "adjustedEndDate" : "2020-07-27",
                               "meta" : {
-                                "globalKey" : "1f68bd4e"
+                                "globalKey" : "61224aac"
                               },
+                              "notionalAmount" : 5000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-07-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a51958"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 5000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "420ab22b"
+                              "globalKey" : "83c43f89"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-07-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-07-26",
                               "adjustedStartDate" : "2020-07-27",
+                              "adjustedEndDate" : "2021-07-26",
                               "meta" : {
-                                "globalKey" : "c4d7528d"
+                                "globalKey" : "6cf3a52f"
                               },
+                              "notionalAmount" : 5000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-07-23",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a61139"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 5000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "76ace069"
+                              "globalKey" : "1ec9330b"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-07-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-07-26",
                               "adjustedStartDate" : "2021-07-26",
+                              "adjustedEndDate" : "2022-07-26",
                               "meta" : {
-                                "globalKey" : "9bc2722c"
+                                "globalKey" : "10ad622c"
                               },
+                              "notionalAmount" : 5000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-07-25",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a70977"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 5000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "71100808"
+                              "globalKey" : "e5faf808"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-07-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-07-26",
                               "adjustedStartDate" : "2022-07-26",
+                              "adjustedEndDate" : "2023-07-26",
                               "meta" : {
-                                "globalKey" : "74626a2c"
+                                "globalKey" : "e94d5a2c"
                               },
+                              "notionalAmount" : 5000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2023-07-25",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a80177"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 5000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "6d280808"
+                              "globalKey" : "e212f808"
                             }
                           }, {
                             "adjustedPaymentDate" : "2024-07-30",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2024-07-26",
                               "adjustedStartDate" : "2023-07-26",
+                              "adjustedEndDate" : "2024-07-26",
                               "meta" : {
-                                "globalKey" : "4d02622c"
+                                "globalKey" : "c1ed522c"
                               },
+                              "notionalAmount" : 5000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2024-07-25",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a8f977"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 5000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "91c8e60a"
+                              "globalKey" : "6b3d60a"
                             }
                           }, {
                             "adjustedPaymentDate" : "2025-07-30",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2025-07-28",
                               "adjustedStartDate" : "2024-07-26",
+                              "adjustedEndDate" : "2025-07-28",
                               "meta" : {
-                                "globalKey" : "8f6ed0ae"
+                                "globalKey" : "9df6fb6a"
                               },
+                              "notionalAmount" : 5000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2025-07-25",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a9f177"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 5000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "f7ad5c8c"
+                              "globalKey" : "6358748"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
                         "meta" : {
-                          "globalKey" : "fdea4bb9"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "eb988f26"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "27e4e9"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "3662e8ba"
-                            }
-                          },
-                          "paymentDaysOffset" : {
-                            "meta" : {
-                              "globalKey" : "ea4baf42"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 2,
-                            "dayType" : "BUSINESS"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
-                          }
-                        },
-                        "resetDates" : {
-                          "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "66f0b623"
-                          },
-                          "fixingDates" : {
-                            "meta" : {
-                              "globalKey" : "69232be0"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "27e4e9"
-                              }
-                            },
-                            "businessDayConvention" : "PRECEDING",
-                            "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "f316d148"
-                            }
-                          },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "f316d148"
-                          },
-                          "resetDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "ff891bf1"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "dd2a3a80"
-                            }
-                          },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                          "globalKey" : "182ee9d7"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "c2a1c1d9"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "a042e068"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "2b91b"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "26"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2013-07-26",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -655,42 +580,101 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec508292"
-                              },
-                              "unadjustedDate" : "2013-07-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec508292"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "71fbfdf3"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2025-07-26",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "fixedPrimaryBusinessCenters",
-                                    "globalReference" : "27e4e9"
+                                    "globalReference" : "27e4e9",
+                                    "externalReference" : "fixedPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "c2a1c1d9"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "a042e068"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "b76fb042"
-                              },
-                              "unadjustedDate" : "2025-07-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "b76fb042"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "c2a1c1d9"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "a042e068"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "1796b"
+                            },
+                            "rollConvention" : "26"
+                          },
+                          "meta" : {
+                            "globalKey" : "61ddfc43",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4abf7e"
+                            },
+                            "dayType" : "Business"
+                          },
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "27e4e9",
+                                "externalKey" : "fixedPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3662e8ba"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "5ddd0f5e",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -698,410 +682,403 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2014-07-30",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2014-07-28",
                               "adjustedStartDate" : "2013-07-26",
+                              "adjustedEndDate" : "2014-07-28",
                               "meta" : {
-                                "globalKey" : "dd4fbd3"
+                                "globalKey" : "9b8ded8d"
                               },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000
+                              "notionalAmount" : 5000000,
+                              "fixedRate" : 0.0695
                             } ],
                             "meta" : {
-                              "globalKey" : "3f1884b5"
+                              "globalKey" : "ccd1766f"
                             }
                           }, {
                             "adjustedPaymentDate" : "2015-07-29",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-07-27",
                               "adjustedStartDate" : "2014-07-28",
+                              "adjustedEndDate" : "2015-07-27",
                               "meta" : {
-                                "globalKey" : "11958ef6"
+                                "globalKey" : "9f4fd28a"
                               },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000
+                              "notionalAmount" : 5000000,
+                              "fixedRate" : 0.0695
                             } ],
                             "meta" : {
-                              "globalKey" : "e7e93739"
+                              "globalKey" : "75a37acd"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-07-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-07-26",
                               "adjustedStartDate" : "2015-07-27",
+                              "adjustedEndDate" : "2016-07-26",
                               "meta" : {
-                                "globalKey" : "155616d6"
+                                "globalKey" : "a3105a6a"
                               },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000
+                              "notionalAmount" : 5000000,
+                              "fixedRate" : 0.0695
                             } ],
                             "meta" : {
-                              "globalKey" : "90b9de7a"
+                              "globalKey" : "1e74220e"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-07-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-07-26",
                               "adjustedStartDate" : "2016-07-26",
+                              "adjustedEndDate" : "2017-07-26",
                               "meta" : {
-                                "globalKey" : "19171315"
+                                "globalKey" : "a6d0e60b"
                               },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000
+                              "notionalAmount" : 5000000,
+                              "fixedRate" : 0.0695
                             } ],
                             "meta" : {
-                              "globalKey" : "3b3fd2b9"
+                              "globalKey" : "c8f9a5af"
                             }
                           }, {
                             "adjustedPaymentDate" : "2018-07-30",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-07-26",
                               "adjustedStartDate" : "2017-07-26",
+                              "adjustedEndDate" : "2018-07-26",
                               "meta" : {
-                                "globalKey" : "1cd81315"
+                                "globalKey" : "aa91e60b"
                               },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000
+                              "notionalAmount" : 5000000,
+                              "fixedRate" : 0.0695
                             } ],
                             "meta" : {
-                              "globalKey" : "e92f7bf7"
+                              "globalKey" : "76e94eed"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-07-30",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-07-26",
                               "adjustedStartDate" : "2018-07-26",
+                              "adjustedEndDate" : "2019-07-26",
                               "meta" : {
-                                "globalKey" : "20991315"
+                                "globalKey" : "ae52e60b"
                               },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000
+                              "notionalAmount" : 5000000,
+                              "fixedRate" : 0.0695
                             } ],
                             "meta" : {
-                              "globalKey" : "93b573f7"
+                              "globalKey" : "216f46ed"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-07-29",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-07-27",
                               "adjustedStartDate" : "2019-07-26",
+                              "adjustedEndDate" : "2020-07-27",
                               "meta" : {
-                                "globalKey" : "245a8774"
+                                "globalKey" : "b213e9cc"
                               },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000
+                              "notionalAmount" : 5000000,
+                              "fixedRate" : 0.0695
                             } ],
                             "meta" : {
-                              "globalKey" : "3c8707b7"
+                              "globalKey" : "ca406a0f"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-07-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-07-26",
                               "adjustedStartDate" : "2020-07-27",
+                              "adjustedEndDate" : "2021-07-26",
                               "meta" : {
-                                "globalKey" : "281b16d6"
+                                "globalKey" : "b5d55a6a"
                               },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000
+                              "notionalAmount" : 5000000,
+                              "fixedRate" : 0.0695
                             } ],
                             "meta" : {
-                              "globalKey" : "e557b67a"
+                              "globalKey" : "7311fa0e"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-07-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-07-26",
                               "adjustedStartDate" : "2021-07-26",
+                              "adjustedEndDate" : "2022-07-26",
                               "meta" : {
-                                "globalKey" : "2bdc1315"
+                                "globalKey" : "b995e60b"
                               },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000
+                              "notionalAmount" : 5000000,
+                              "fixedRate" : 0.0695
                             } ],
                             "meta" : {
-                              "globalKey" : "8fddaab9"
+                              "globalKey" : "1d977daf"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-07-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-07-26",
                               "adjustedStartDate" : "2022-07-26",
+                              "adjustedEndDate" : "2023-07-26",
                               "meta" : {
-                                "globalKey" : "2f9d1315"
+                                "globalKey" : "bd56e60b"
                               },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000
+                              "notionalAmount" : 5000000,
+                              "fixedRate" : 0.0695
                             } ],
                             "meta" : {
-                              "globalKey" : "3a63a2b9"
+                              "globalKey" : "c81d75af"
                             }
                           }, {
                             "adjustedPaymentDate" : "2024-07-30",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2024-07-26",
                               "adjustedStartDate" : "2023-07-26",
+                              "adjustedEndDate" : "2024-07-26",
                               "meta" : {
-                                "globalKey" : "335e1315"
+                                "globalKey" : "c117e60b"
                               },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000
+                              "notionalAmount" : 5000000,
+                              "fixedRate" : 0.0695
                             } ],
                             "meta" : {
-                              "globalKey" : "e8534bf7"
+                              "globalKey" : "760d1eed"
                             }
                           }, {
                             "adjustedPaymentDate" : "2025-07-30",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2025-07-28",
                               "adjustedStartDate" : "2024-07-26",
+                              "adjustedEndDate" : "2025-07-28",
                               "meta" : {
-                                "globalKey" : "371ffbd3"
+                                "globalKey" : "c4d8ed8d"
                               },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000
+                              "notionalAmount" : 5000000,
+                              "fixedRate" : 0.0695
                             } ],
                             "meta" : {
-                              "globalKey" : "92da2cb5"
+                              "globalKey" : "20931e6f"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
                         "meta" : {
-                          "globalKey" : "496d9b"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "eb988f26"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "fixedPrimaryBusinessCenters",
-                                "globalKey" : "27e4e9"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "3662e8ba"
-                            }
-                          },
-                          "paymentDaysOffset" : {
-                            "meta" : {
-                              "globalKey" : "ea4baf42"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 2,
-                            "dayType" : "BUSINESS"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                          "globalKey" : "ba952cfb"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "cd169614"
+                        "globalKey" : "749e8612"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "365c673d"
+                    "globalKey" : "dde4573b"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "365c673d"
+                  "globalKey" : "dde4573b"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "8eeac768"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "35d60749"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-Federal Funds-H.15-OIS-COMPOUND"
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 5000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
                         }
                       }
-                    }
-                  },
-                  "quantity" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-Federal Funds-H.15-OIS-COMPOUND"
                         }
                       },
-                      "value" : 5000000
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "84eae1d7"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "fa00c2ba"
                   },
+                  "meta" : {
+                    "globalKey" : "914d61e6"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0695,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.0695,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 5000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 5000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "46179486"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "dd19",
+                  "externalReference" : "clearing_firm"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1118"
-              },
-              "value" : "2018-04-24"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "999",
                   "meta" : {
-                    "scheme" : "cme_trade_id"
-                  },
-                  "value" : "2894761"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "dd19"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "dd19",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "QAC-11111"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "22222"
+                  "value" : "PLATFORM"
+                },
+                "meta" : {
+                  "globalKey" : "9e635873"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "af19c000"
+                "globalKey" : "9e635873",
+                "externalKey" : "trade_source"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS2894761"
+                  "value" : "PARTY123"
+                },
+                "meta" : {
+                  "globalKey" : "75895dac"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "75895dac",
+                "externalKey" : "SEF"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "9e635873",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2018-04-24",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "999-123",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "a7071c09"
+                "globalKey" : "24a161c0",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "2e4f3a6b"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "19f4a74"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "dd19"
-                }
-              },
               "quantity" : {
+                "value" : 1500,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 },
-                "value" : 1500
+                "receiverPartyReference" : {
+                  "globalReference" : "dd19",
+                  "externalReference" : "clearing_firm"
+                }
               },
               "settlementDate" : {
+                "unadjustedDate" : "2018-04-25",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "USNY"
@@ -1110,135 +1087,84 @@
                       "globalKey" : "27e4e9"
                     }
                   },
-                  "businessDayConvention" : "MODFOLLOWING",
                   "meta" : {
                     "globalKey" : "3662e8ba"
                   }
-                },
-                "unadjustedDate" : "2018-04-25"
+                }
               },
               "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
+                "priceTransfer" : "Upfront"
               }
+            },
+            "meta" : {
+              "globalKey" : "a474548a"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "939315ff"
+          }
         }
       }
     } ],
-    "intent" : "CONTRACT_FORMATION",
+    "eventQualifier" : "ContractFormation",
     "after" : [ {
-      "meta" : {
-        "globalKey" : "450a5bf4"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
       "trade" : {
-        "account" : [ {
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "clearing_firm_accounts"
-            },
-            "value" : "999-123"
-          },
-          "meta" : {
-            "externalKey" : "account1",
-            "globalKey" : "a18b2f80"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
-          },
-          "servicingParty" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
-          }
-        } ],
-        "clearedDate" : "2018-04-24",
-        "meta" : {
-          "globalKey" : "f6bbfe03"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "clearing_firm",
-            "globalKey" : "dd19"
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "1051b",
+            "externalReference" : "clearing_service"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "2894761",
               "meta" : {
-                "scheme" : "clearing_member_firms"
-              },
-              "value" : "999"
-            },
-            "meta" : {
-              "globalKey" : "dd19"
+                "scheme" : "cme_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing_service",
-            "globalKey" : "1051b"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "CME"
-            },
-            "meta" : {
-              "globalKey" : "1051b"
+              "value" : "QAC-11111",
+              "meta" : {
+                "scheme" : "client_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "trade_source",
-            "globalKey" : "9e635873"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "PLATFORM"
-            },
-            "meta" : {
-              "globalKey" : "9e635873"
+              "value" : "22222",
+              "meta" : {
+                "scheme" : "platform_trade_id"
+              }
             }
-          } ]
-        }, {
+          } ],
           "meta" : {
-            "externalKey" : "SEF",
-            "globalKey" : "75895dac"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "value" : "PARTY123"
-            },
+            "globalKey" : "c3b59534"
+          }
+        }, {
+          "issuer" : {
+            "value" : "1010000023",
             "meta" : {
-              "globalKey" : "75895dac"
+              "scheme" : "cftc_Namespace"
             }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "dd19"
-          },
-          "partyReference" : {
-            "externalReference" : "trade_source",
-            "globalReference" : "9e635873"
           },
-          "role" : "DATA_SUBMITTER"
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "CCCIRS2894761",
+              "meta" : {
+                "scheme" : "reg_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e12c31ab"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2018-04-24",
+          "meta" : {
+            "globalKey" : "3f1118"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "dd19"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -1249,90 +1175,196 @@
                 "payout" : {
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
-                      }
-                    },
-                    "calculationPeriodDates" : {
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    },
+                    "rateSpecification" : {
+                      "floatingRate" : {
+                        "rateOption" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "rateOption-1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/360"
+                    },
+                    "calculationPeriodDates" : {
+                      "effectiveDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2013-07-26",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ec508292"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "ec508292"
+                        }
+                      },
+                      "terminationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2025-07-26",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "ff891bf1"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "dd2a3a80"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "f4570a5a"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "f4570a5a"
+                        }
+                      },
                       "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "27e4e9"
+                            "globalReference" : "27e4e9",
+                            "externalReference" : "floatPrimaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "ff891bf1"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "dd2a3a80"
                         }
                       },
                       "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
                         "meta" : {
-                          "globalKey" : "2b91b"
+                          "globalKey" : "1796b"
                         },
-                        "period" : "Y",
-                        "periodMultiplier" : 1,
                         "rollConvention" : "26"
                       },
-                      "effectiveDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
+                      "meta" : {
+                        "globalKey" : "4fd38073",
+                        "externalKey" : "floatingCalcPeriodDates"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "78"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDaysOffset" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "ea4abf7e"
+                        },
+                        "dayType" : "Business"
+                      },
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "USNY"
+                          } ],
                           "meta" : {
-                            "globalKey" : "ec508292"
-                          },
-                          "unadjustedDate" : "2013-07-26"
+                            "globalKey" : "27e4e9",
+                            "externalKey" : "floatPrimaryBusinessCenters"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "ec508292"
+                          "globalKey" : "3662e8ba"
                         }
                       },
                       "meta" : {
-                        "externalKey" : "floatingCalcPeriodDates",
-                        "globalKey" : "66f0b623"
+                        "globalKey" : "5ddd0f5e",
+                        "externalKey" : "floatingLegPaymentDates"
+                      }
+                    },
+                    "resetDates" : {
+                      "calculationPeriodDatesReference" : {
+                        "globalReference" : "4fd38073",
+                        "externalReference" : "floatingCalcPeriodDates"
                       },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "ff891bf1"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "dd2a3a80"
-                            }
-                          },
+                      "resetRelativeTo" : "CalculationPeriodEndDate",
+                      "fixingDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "de7afde8"
+                        },
+                        "businessDayConvention" : "PRECEDING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "USNY"
+                          } ],
                           "meta" : {
-                            "globalKey" : "f4570a5a"
+                            "globalKey" : "27e4e9"
+                          }
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "f60bef40",
+                          "externalReference" : "floatingLegResetDates"
+                        }
+                      },
+                      "resetFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "78"
+                        }
+                      },
+                      "resetDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "27e4e9",
+                            "externalReference" : "floatPrimaryBusinessCenters"
                           },
-                          "unadjustedDate" : "2025-07-26"
+                          "meta" : {
+                            "globalKey" : "ff891bf1"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "f4570a5a"
+                          "globalKey" : "dd2a3a80"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "f60bef40",
+                        "externalKey" : "floatingLegResetDates"
                       }
                     },
                     "cashflowRepresentation" : {
@@ -1340,420 +1372,310 @@
                       "paymentCalculationPeriod" : [ {
                         "adjustedPaymentDate" : "2014-07-30",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2014-07-28",
                           "adjustedStartDate" : "2013-07-26",
+                          "adjustedEndDate" : "2014-07-28",
                           "meta" : {
-                            "globalKey" : "f7ac65ae"
+                            "globalKey" : "634906a"
                           },
+                          "notionalAmount" : 5000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2014-07-25",
+                              "observedRate" : 0.0008347,
                               "meta" : {
                                 "globalKey" : "bebc8677"
-                              },
-                              "observedRate" : 0.0008347
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 5000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "d9c2998c"
+                          "globalKey" : "e84ac448"
                         }
                       }, {
                         "adjustedPaymentDate" : "2015-07-29",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2015-07-27",
                           "adjustedStartDate" : "2014-07-28",
+                          "adjustedEndDate" : "2015-07-27",
                           "meta" : {
-                            "globalKey" : "9edab0b7"
+                            "globalKey" : "46f70359"
                           },
+                          "notionalAmount" : 5000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2015-07-24",
+                              "observedRate" : 0.0011009,
                               "meta" : {
                                 "globalKey" : "bec85b83"
-                              },
-                              "observedRate" : 0.0011009
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 5000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "10247d94"
+                          "globalKey" : "b840d036"
                         }
                       }, {
                         "adjustedPaymentDate" : "2016-07-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2016-07-26",
                           "adjustedStartDate" : "2015-07-27",
+                          "adjustedEndDate" : "2016-07-26",
                           "meta" : {
-                            "globalKey" : "40f076c6"
+                            "globalKey" : "e90cc968"
                           },
+                          "notionalAmount" : 5000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2016-07-25",
+                              "observedRate" : 0.0027493,
                               "meta" : {
                                 "globalKey" : "beda3572"
-                              },
-                              "observedRate" : 0.0027493
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 5000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "416ddca2"
+                          "globalKey" : "e98a2f44"
                         }
                       }, {
                         "adjustedPaymentDate" : "2017-07-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2017-07-26",
                           "adjustedStartDate" : "2016-07-26",
+                          "adjustedEndDate" : "2017-07-26",
                           "meta" : {
-                            "globalKey" : "1813f3d4"
+                            "globalKey" : "8cfee3d4"
                           },
+                          "notionalAmount" : 5000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2017-07-25",
+                              "observedRate" : 0.0067469,
                               "meta" : {
                                 "globalKey" : "bf138b1f"
-                              },
-                              "observedRate" : 0.0067469
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 5000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "3c0961b0"
+                          "globalKey" : "b0f451b0"
                         }
                       }, {
                         "adjustedPaymentDate" : "2018-07-30",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2018-07-26",
                           "adjustedStartDate" : "2017-07-26",
+                          "adjustedEndDate" : "2018-07-26",
                           "meta" : {
-                            "globalKey" : "3942922c"
+                            "globalKey" : "ae2d822c"
                           },
+                          "notionalAmount" : 5000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2018-07-25",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a32977"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 5000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "a938e60a"
+                          "globalKey" : "1e23d60a"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-07-30",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-07-26",
                           "adjustedStartDate" : "2018-07-26",
+                          "adjustedEndDate" : "2019-07-26",
                           "meta" : {
-                            "globalKey" : "11e28a2c"
+                            "globalKey" : "86cd7a2c"
                           },
+                          "notionalAmount" : 5000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2019-07-25",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a42177"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 5000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "a550e60a"
+                          "globalKey" : "1a3bd60a"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-07-29",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-07-27",
                           "adjustedStartDate" : "2019-07-26",
+                          "adjustedEndDate" : "2020-07-27",
                           "meta" : {
-                            "globalKey" : "1f68bd4e"
+                            "globalKey" : "61224aac"
                           },
+                          "notionalAmount" : 5000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2020-07-24",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a51958"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 5000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "420ab22b"
+                          "globalKey" : "83c43f89"
                         }
                       }, {
                         "adjustedPaymentDate" : "2021-07-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2021-07-26",
                           "adjustedStartDate" : "2020-07-27",
+                          "adjustedEndDate" : "2021-07-26",
                           "meta" : {
-                            "globalKey" : "c4d7528d"
+                            "globalKey" : "6cf3a52f"
                           },
+                          "notionalAmount" : 5000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2021-07-23",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a61139"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 5000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "76ace069"
+                          "globalKey" : "1ec9330b"
                         }
                       }, {
                         "adjustedPaymentDate" : "2022-07-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2022-07-26",
                           "adjustedStartDate" : "2021-07-26",
+                          "adjustedEndDate" : "2022-07-26",
                           "meta" : {
-                            "globalKey" : "9bc2722c"
+                            "globalKey" : "10ad622c"
                           },
+                          "notionalAmount" : 5000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2022-07-25",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a70977"
-                              },
-                              "observedRate" : 0
-                            } ]
-                          },
-                          "notionalAmount" : 5000000
-                        } ],
-                        "meta" : {
-                          "globalKey" : "71100808"
-                        }
-                      }, {
-                        "adjustedPaymentDate" : "2023-07-28",
-                        "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2023-07-26",
-                          "adjustedStartDate" : "2022-07-26",
-                          "meta" : {
-                            "globalKey" : "74626a2c"
-                          },
-                          "floatingRateDefinition" : {
-                            "rateObservation" : [ {
-                              "adjustedFixingDate" : "2023-07-25",
-                              "meta" : {
-                                "globalKey" : "7a80177"
-                              },
-                              "observedRate" : 0
-                            } ]
-                          },
-                          "notionalAmount" : 5000000
-                        } ],
-                        "meta" : {
-                          "globalKey" : "6d280808"
-                        }
-                      }, {
-                        "adjustedPaymentDate" : "2024-07-30",
-                        "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2024-07-26",
-                          "adjustedStartDate" : "2023-07-26",
-                          "meta" : {
-                            "globalKey" : "4d02622c"
-                          },
-                          "floatingRateDefinition" : {
-                            "rateObservation" : [ {
-                              "adjustedFixingDate" : "2024-07-25",
-                              "meta" : {
-                                "globalKey" : "7a8f977"
-                              },
-                              "observedRate" : 0
-                            } ]
-                          },
-                          "notionalAmount" : 5000000
-                        } ],
-                        "meta" : {
-                          "globalKey" : "91c8e60a"
-                        }
-                      }, {
-                        "adjustedPaymentDate" : "2025-07-30",
-                        "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2025-07-28",
-                          "adjustedStartDate" : "2024-07-26",
-                          "meta" : {
-                            "globalKey" : "8f6ed0ae"
-                          },
-                          "floatingRateDefinition" : {
-                            "rateObservation" : [ {
-                              "adjustedFixingDate" : "2025-07-25",
-                              "meta" : {
-                                "globalKey" : "7a9f177"
-                              },
-                              "observedRate" : 0
-                            } ]
-                          },
-                          "notionalAmount" : 5000000
-                        } ],
-                        "meta" : {
-                          "globalKey" : "f7ad5c8c"
-                        }
-                      } ]
-                    },
-                    "dayCountFraction" : {
-                      "value" : "ACT/360"
-                    },
-                    "meta" : {
-                      "globalKey" : "fdea4bb9"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "floatingLegPaymentDates",
-                        "globalKey" : "eb988f26"
-                      },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "USNY"
-                          } ],
-                          "meta" : {
-                            "externalKey" : "floatPrimaryBusinessCenters",
-                            "globalKey" : "27e4e9"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "3662e8ba"
-                        }
-                      },
-                      "paymentDaysOffset" : {
-                        "meta" : {
-                          "globalKey" : "ea4baf42"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "BUSINESS"
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "ac8"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 1
-                      }
-                    },
-                    "rateSpecification" : {
-                      "floatingRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateOption" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "rateOption-1"
+                              }
+                            } ]
                           }
-                        }
-                      }
-                    },
-                    "resetDates" : {
-                      "calculationPeriodDatesReference" : {
-                        "externalReference" : "floatingCalcPeriodDates",
-                        "globalReference" : "66f0b623"
-                      },
-                      "fixingDates" : {
+                        } ],
                         "meta" : {
-                          "globalKey" : "69232be0"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "USNY"
-                          } ],
+                          "globalKey" : "e5faf808"
+                        }
+                      }, {
+                        "adjustedPaymentDate" : "2023-07-28",
+                        "calculationPeriod" : [ {
+                          "adjustedStartDate" : "2022-07-26",
+                          "adjustedEndDate" : "2023-07-26",
                           "meta" : {
-                            "globalKey" : "27e4e9"
+                            "globalKey" : "e94d5a2c"
+                          },
+                          "notionalAmount" : 5000000,
+                          "floatingRateDefinition" : {
+                            "rateObservation" : [ {
+                              "adjustedFixingDate" : "2023-07-25",
+                              "observedRate" : 0,
+                              "meta" : {
+                                "globalKey" : "7a80177"
+                              }
+                            } ]
                           }
-                        },
-                        "businessDayConvention" : "PRECEDING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "floatingLegResetDates",
-                          "globalReference" : "f316d148"
+                        } ],
+                        "meta" : {
+                          "globalKey" : "e212f808"
                         }
-                      },
-                      "meta" : {
-                        "externalKey" : "floatingLegResetDates",
-                        "globalKey" : "f316d148"
-                      },
-                      "resetDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "27e4e9"
-                          },
+                      }, {
+                        "adjustedPaymentDate" : "2024-07-30",
+                        "calculationPeriod" : [ {
+                          "adjustedStartDate" : "2023-07-26",
+                          "adjustedEndDate" : "2024-07-26",
                           "meta" : {
-                            "globalKey" : "ff891bf1"
+                            "globalKey" : "c1ed522c"
+                          },
+                          "notionalAmount" : 5000000,
+                          "floatingRateDefinition" : {
+                            "rateObservation" : [ {
+                              "adjustedFixingDate" : "2024-07-25",
+                              "observedRate" : 0,
+                              "meta" : {
+                                "globalKey" : "7a8f977"
+                              }
+                            } ]
                           }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
+                        } ],
                         "meta" : {
-                          "globalKey" : "dd2a3a80"
+                          "globalKey" : "6b3d60a"
                         }
-                      },
-                      "resetFrequency" : {
+                      }, {
+                        "adjustedPaymentDate" : "2025-07-30",
+                        "calculationPeriod" : [ {
+                          "adjustedStartDate" : "2024-07-26",
+                          "adjustedEndDate" : "2025-07-28",
+                          "meta" : {
+                            "globalKey" : "9df6fb6a"
+                          },
+                          "notionalAmount" : 5000000,
+                          "floatingRateDefinition" : {
+                            "rateObservation" : [ {
+                              "adjustedFixingDate" : "2025-07-25",
+                              "observedRate" : 0,
+                              "meta" : {
+                                "globalKey" : "7a9f177"
+                              }
+                            } ]
+                          }
+                        } ],
                         "meta" : {
-                          "globalKey" : "ac8"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 1
-                      },
-                      "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                          "globalKey" : "6358748"
+                        }
+                      } ]
+                    },
+                    "meta" : {
+                      "globalKey" : "182ee9d7"
                     }
                   }, {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-2"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "fixedPrimaryBusinessCenters",
-                            "globalReference" : "27e4e9"
-                          },
-                          "meta" : {
-                            "globalKey" : "c2a1c1d9"
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "a042e068"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "2b91b"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 1,
-                        "rollConvention" : "26"
-                      },
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/360"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2013-07-26",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -1762,42 +1684,101 @@
                           },
                           "meta" : {
                             "globalKey" : "ec508292"
-                          },
-                          "unadjustedDate" : "2013-07-26"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ec508292"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "fixedCalcPeriodDates",
-                        "globalKey" : "71fbfdf3"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2025-07-26",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "c2a1c1d9"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "a042e068"
                             }
                           },
                           "meta" : {
                             "globalKey" : "b76fb042"
-                          },
-                          "unadjustedDate" : "2025-07-26"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "b76fb042"
                         }
+                      },
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "27e4e9",
+                            "externalReference" : "fixedPrimaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "c2a1c1d9"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "a042e068"
+                        }
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "1796b"
+                        },
+                        "rollConvention" : "26"
+                      },
+                      "meta" : {
+                        "globalKey" : "61ddfc43",
+                        "externalKey" : "fixedCalcPeriodDates"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "78"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDaysOffset" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "ea4abf7e"
+                        },
+                        "dayType" : "Business"
+                      },
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "USNY"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "27e4e9",
+                            "externalKey" : "fixedPrimaryBusinessCenters"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "3662e8ba"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "5ddd0f5e",
+                        "externalKey" : "fixedLegPaymentDates"
                       }
                     },
                     "cashflowRepresentation" : {
@@ -1805,410 +1786,406 @@
                       "paymentCalculationPeriod" : [ {
                         "adjustedPaymentDate" : "2014-07-30",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2014-07-28",
                           "adjustedStartDate" : "2013-07-26",
+                          "adjustedEndDate" : "2014-07-28",
                           "meta" : {
-                            "globalKey" : "dd4fbd3"
+                            "globalKey" : "9b8ded8d"
                           },
-                          "fixedRate" : 0.0695,
-                          "notionalAmount" : 5000000
+                          "notionalAmount" : 5000000,
+                          "fixedRate" : 0.0695
                         } ],
                         "meta" : {
-                          "globalKey" : "3f1884b5"
+                          "globalKey" : "ccd1766f"
                         }
                       }, {
                         "adjustedPaymentDate" : "2015-07-29",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2015-07-27",
                           "adjustedStartDate" : "2014-07-28",
+                          "adjustedEndDate" : "2015-07-27",
                           "meta" : {
-                            "globalKey" : "11958ef6"
+                            "globalKey" : "9f4fd28a"
                           },
-                          "fixedRate" : 0.0695,
-                          "notionalAmount" : 5000000
+                          "notionalAmount" : 5000000,
+                          "fixedRate" : 0.0695
                         } ],
                         "meta" : {
-                          "globalKey" : "e7e93739"
+                          "globalKey" : "75a37acd"
                         }
                       }, {
                         "adjustedPaymentDate" : "2016-07-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2016-07-26",
                           "adjustedStartDate" : "2015-07-27",
+                          "adjustedEndDate" : "2016-07-26",
                           "meta" : {
-                            "globalKey" : "155616d6"
+                            "globalKey" : "a3105a6a"
                           },
-                          "fixedRate" : 0.0695,
-                          "notionalAmount" : 5000000
+                          "notionalAmount" : 5000000,
+                          "fixedRate" : 0.0695
                         } ],
                         "meta" : {
-                          "globalKey" : "90b9de7a"
+                          "globalKey" : "1e74220e"
                         }
                       }, {
                         "adjustedPaymentDate" : "2017-07-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2017-07-26",
                           "adjustedStartDate" : "2016-07-26",
+                          "adjustedEndDate" : "2017-07-26",
                           "meta" : {
-                            "globalKey" : "19171315"
+                            "globalKey" : "a6d0e60b"
                           },
-                          "fixedRate" : 0.0695,
-                          "notionalAmount" : 5000000
+                          "notionalAmount" : 5000000,
+                          "fixedRate" : 0.0695
                         } ],
                         "meta" : {
-                          "globalKey" : "3b3fd2b9"
+                          "globalKey" : "c8f9a5af"
                         }
                       }, {
                         "adjustedPaymentDate" : "2018-07-30",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2018-07-26",
                           "adjustedStartDate" : "2017-07-26",
+                          "adjustedEndDate" : "2018-07-26",
                           "meta" : {
-                            "globalKey" : "1cd81315"
+                            "globalKey" : "aa91e60b"
                           },
-                          "fixedRate" : 0.0695,
-                          "notionalAmount" : 5000000
+                          "notionalAmount" : 5000000,
+                          "fixedRate" : 0.0695
                         } ],
                         "meta" : {
-                          "globalKey" : "e92f7bf7"
+                          "globalKey" : "76e94eed"
                         }
                       }, {
                         "adjustedPaymentDate" : "2019-07-30",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2019-07-26",
                           "adjustedStartDate" : "2018-07-26",
+                          "adjustedEndDate" : "2019-07-26",
                           "meta" : {
-                            "globalKey" : "20991315"
+                            "globalKey" : "ae52e60b"
                           },
-                          "fixedRate" : 0.0695,
-                          "notionalAmount" : 5000000
+                          "notionalAmount" : 5000000,
+                          "fixedRate" : 0.0695
                         } ],
                         "meta" : {
-                          "globalKey" : "93b573f7"
+                          "globalKey" : "216f46ed"
                         }
                       }, {
                         "adjustedPaymentDate" : "2020-07-29",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2020-07-27",
                           "adjustedStartDate" : "2019-07-26",
+                          "adjustedEndDate" : "2020-07-27",
                           "meta" : {
-                            "globalKey" : "245a8774"
+                            "globalKey" : "b213e9cc"
                           },
-                          "fixedRate" : 0.0695,
-                          "notionalAmount" : 5000000
+                          "notionalAmount" : 5000000,
+                          "fixedRate" : 0.0695
                         } ],
                         "meta" : {
-                          "globalKey" : "3c8707b7"
+                          "globalKey" : "ca406a0f"
                         }
                       }, {
                         "adjustedPaymentDate" : "2021-07-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2021-07-26",
                           "adjustedStartDate" : "2020-07-27",
+                          "adjustedEndDate" : "2021-07-26",
                           "meta" : {
-                            "globalKey" : "281b16d6"
+                            "globalKey" : "b5d55a6a"
                           },
-                          "fixedRate" : 0.0695,
-                          "notionalAmount" : 5000000
+                          "notionalAmount" : 5000000,
+                          "fixedRate" : 0.0695
                         } ],
                         "meta" : {
-                          "globalKey" : "e557b67a"
+                          "globalKey" : "7311fa0e"
                         }
                       }, {
                         "adjustedPaymentDate" : "2022-07-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2022-07-26",
                           "adjustedStartDate" : "2021-07-26",
+                          "adjustedEndDate" : "2022-07-26",
                           "meta" : {
-                            "globalKey" : "2bdc1315"
+                            "globalKey" : "b995e60b"
                           },
-                          "fixedRate" : 0.0695,
-                          "notionalAmount" : 5000000
+                          "notionalAmount" : 5000000,
+                          "fixedRate" : 0.0695
                         } ],
                         "meta" : {
-                          "globalKey" : "8fddaab9"
+                          "globalKey" : "1d977daf"
                         }
                       }, {
                         "adjustedPaymentDate" : "2023-07-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2023-07-26",
                           "adjustedStartDate" : "2022-07-26",
+                          "adjustedEndDate" : "2023-07-26",
                           "meta" : {
-                            "globalKey" : "2f9d1315"
+                            "globalKey" : "bd56e60b"
                           },
-                          "fixedRate" : 0.0695,
-                          "notionalAmount" : 5000000
+                          "notionalAmount" : 5000000,
+                          "fixedRate" : 0.0695
                         } ],
                         "meta" : {
-                          "globalKey" : "3a63a2b9"
+                          "globalKey" : "c81d75af"
                         }
                       }, {
                         "adjustedPaymentDate" : "2024-07-30",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2024-07-26",
                           "adjustedStartDate" : "2023-07-26",
+                          "adjustedEndDate" : "2024-07-26",
                           "meta" : {
-                            "globalKey" : "335e1315"
+                            "globalKey" : "c117e60b"
                           },
-                          "fixedRate" : 0.0695,
-                          "notionalAmount" : 5000000
+                          "notionalAmount" : 5000000,
+                          "fixedRate" : 0.0695
                         } ],
                         "meta" : {
-                          "globalKey" : "e8534bf7"
+                          "globalKey" : "760d1eed"
                         }
                       }, {
                         "adjustedPaymentDate" : "2025-07-30",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2025-07-28",
                           "adjustedStartDate" : "2024-07-26",
+                          "adjustedEndDate" : "2025-07-28",
                           "meta" : {
-                            "globalKey" : "371ffbd3"
+                            "globalKey" : "c4d8ed8d"
                           },
-                          "fixedRate" : 0.0695,
-                          "notionalAmount" : 5000000
+                          "notionalAmount" : 5000000,
+                          "fixedRate" : 0.0695
                         } ],
                         "meta" : {
-                          "globalKey" : "92da2cb5"
-                        }
-                      } ]
-                    },
-                    "dayCountFraction" : {
-                      "value" : "ACT/360"
-                    },
-                    "meta" : {
-                      "globalKey" : "496d9b"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "externalKey" : "fixedLegPaymentDates",
-                        "globalKey" : "eb988f26"
-                      },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "USNY"
-                          } ],
-                          "meta" : {
-                            "externalKey" : "fixedPrimaryBusinessCenters",
-                            "globalKey" : "27e4e9"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "3662e8ba"
-                        }
-                      },
-                      "paymentDaysOffset" : {
-                        "meta" : {
-                          "globalKey" : "ea4baf42"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "BUSINESS"
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "ac8"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 1
-                      }
-                    },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
-                          }
+                          "globalKey" : "20931e6f"
                         }
-                      }
+                      } ]
+                    },
+                    "meta" : {
+                      "globalKey" : "ba952cfb"
                     }
                   } ],
                   "meta" : {
-                    "globalKey" : "cd169614"
+                    "globalKey" : "749e8612"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "365c673d"
+                "globalKey" : "dde4573b"
               }
             },
             "meta" : {
-              "globalKey" : "365c673d"
+              "globalKey" : "dde4573b"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "8eeac768"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "35d60749"
-                },
-                "rateOption" : {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "rateOption-1"
-                    } ]
-                  },
-                  "value" : {
-                    "floatingRateIndex" : {
-                      "value" : "USD-Federal Funds-H.15-OIS-COMPOUND"
+              "quantity" : [ {
+                "value" : {
+                  "value" : 5000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
                     }
                   }
-                }
-              },
-              "quantity" : [ {
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-1"
                   } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
+                }
+              } ],
+              "observable" : {
+                "rateOption" : {
+                  "value" : {
+                    "floatingRateIndex" : {
+                      "value" : "USD-Federal Funds-H.15-OIS-COMPOUND"
                     }
                   },
-                  "value" : 5000000
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "rateOption-1"
+                    } ]
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "84eae1d7"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "fa00c2ba"
               },
+              "meta" : {
+                "globalKey" : "914d61e6"
+              }
+            }, {
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.0695,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.0695,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ],
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "quantity" : [ {
                 "value" : {
+                  "value" : 5000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 5000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "46179486"
+              }
             } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "dd19",
+              "externalReference" : "clearing_firm"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
+            }
           } ]
         },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f1118"
-          },
-          "value" : "2018-04-24"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "999",
               "meta" : {
-                "scheme" : "cme_trade_id"
-              },
-              "value" : "2894761"
+                "scheme" : "clearing_member_firms"
+              }
+            },
+            "meta" : {
+              "globalKey" : "dd19"
             }
-          }, {
+          } ],
+          "meta" : {
+            "globalKey" : "dd19",
+            "externalKey" : "clearing_firm"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "client_trade_id"
-              },
-              "value" : "QAC-11111"
+              "value" : "CME"
+            },
+            "meta" : {
+              "globalKey" : "1051b"
             }
-          }, {
+          } ],
+          "meta" : {
+            "globalKey" : "1051b",
+            "externalKey" : "clearing_service"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "platform_trade_id"
-              },
-              "value" : "22222"
+              "value" : "PLATFORM"
+            },
+            "meta" : {
+              "globalKey" : "9e635873"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "clearing_service",
-            "globalReference" : "1051b"
-          },
           "meta" : {
-            "globalKey" : "af19c000"
+            "globalKey" : "9e635873",
+            "externalKey" : "trade_source"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "reg_trade_id"
-              },
-              "value" : "CCCIRS2894761"
+              "value" : "PARTY123"
+            },
+            "meta" : {
+              "globalKey" : "75895dac"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "75895dac",
+            "externalKey" : "SEF"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "9e635873",
+            "externalReference" : "trade_source"
+          },
+          "role" : "DataSubmitter",
+          "ownershipPartyReference" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
+          }
+        } ],
+        "clearedDate" : "2018-04-24",
+        "account" : [ {
+          "partyReference" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
+          },
+          "accountNumber" : {
+            "value" : "999-123",
             "meta" : {
-              "scheme" : "cftc_Namespace"
-            },
-            "value" : "1010000023"
+              "scheme" : "clearing_firm_accounts"
+            }
+          },
+          "servicingParty" : {
+            "globalReference" : "dd19",
+            "externalReference" : "clearing_firm"
           },
           "meta" : {
-            "globalKey" : "a7071c09"
+            "globalKey" : "24a161c0",
+            "externalKey" : "account1"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "2e4f3a6b"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
       },
       "transferHistory" : [ {
-        "meta" : {
-          "globalKey" : "19f4a74"
-        },
         "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            },
-            "receiverPartyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "dd19"
-            }
-          },
           "quantity" : {
+            "value" : 1500,
             "unit" : {
               "currency" : {
                 "value" : "USD"
               }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
             },
-            "value" : 1500
+            "receiverPartyReference" : {
+              "globalReference" : "dd19",
+              "externalReference" : "clearing_firm"
+            }
           },
           "settlementDate" : {
+            "unadjustedDate" : "2018-04-25",
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "USNY"
@@ -2217,73 +2194,79 @@
                   "globalKey" : "27e4e9"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "3662e8ba"
               }
-            },
-            "unadjustedDate" : "2018-04-25"
+            }
           },
           "transferExpression" : {
-            "priceTransfer" : "UPFRONT"
+            "priceTransfer" : "Upfront"
           }
+        },
+        "meta" : {
+          "globalKey" : "a474548a"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "59337f3c"
+      }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "15418e7"
+      "globalKey" : "8c88041"
     }
   },
+  "previousWorkflowStep" : {
+    "globalReference" : "53b7d08"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "1K08850892",
       "meta" : {
         "scheme" : "cme_message_id"
-      },
-      "value" : "1K08850892"
+      }
     },
     "sentBy" : {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
+      }
     },
     "sentTo" : [ {
+      "value" : "999",
       "meta" : {
         "scheme" : "cme_firm_id"
-      },
-      "value" : "999"
+      }
     }, {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
+      }
     } ]
   },
-  "meta" : {
-    "globalKey" : "7e446534"
-  },
+  "timestamp" : [ {
+    "dateTime" : "2018-04-24T21:30:07Z",
+    "qualification" : "eventCreationDateTime"
+  }, {
+    "dateTime" : "2018-04-24T21:30:03Z",
+    "qualification" : "clearingReceiptDateTime"
+  } ],
   "party" : [ {
-    "meta" : {
-      "externalKey" : "clearing_firm",
-      "globalKey" : "dd19"
-    },
     "partyId" : [ {
       "identifier" : {
+        "value" : "999",
         "meta" : {
           "scheme" : "clearing_member_firms"
-        },
-        "value" : "999"
+        }
       },
       "meta" : {
         "globalKey" : "dd19"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "clearing_service",
-      "globalKey" : "1051b"
-    },
+      "globalKey" : "dd19",
+      "externalKey" : "clearing_firm"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "CME"
@@ -2291,12 +2274,12 @@
       "meta" : {
         "globalKey" : "1051b"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "trade_source",
-      "globalKey" : "9e635873"
-    },
+      "globalKey" : "1051b",
+      "externalKey" : "clearing_service"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "PLATFORM"
@@ -2304,12 +2287,12 @@
       "meta" : {
         "globalKey" : "9e635873"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "SEF",
-      "globalKey" : "75895dac"
-    },
+      "globalKey" : "9e635873",
+      "externalKey" : "trade_source"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "PARTY123"
@@ -2317,16 +2300,33 @@
       "meta" : {
         "globalKey" : "75895dac"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "75895dac",
+      "externalKey" : "SEF"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "b141c638"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2018-04-24T21:30:07Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  }, {
-    "dateTime" : "2018-04-24T21:30:03Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
-  } ]
+  "account" : [ {
+    "partyReference" : {
+      "globalReference" : "dd19",
+      "externalReference" : "clearing_firm"
+    },
+    "accountNumber" : {
+      "value" : "999-123",
+      "meta" : {
+        "scheme" : "clearing_firm_accounts"
+      }
+    },
+    "servicingParty" : {
+      "globalReference" : "dd19",
+      "externalReference" : "clearing_firm"
+    },
+    "meta" : {
+      "globalKey" : "24a161c0",
+      "externalKey" : "account1"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "f3d92002"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/SWAPTION_TERMINATED_DUE_TO_EXERCISE-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/SWAPTION_TERMINATED_DUE_TO_EXERCISE-func-output.json
index d93194ffac..08487162dd 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/SWAPTION_TERMINATED_DUE_TO_EXERCISE-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/SWAPTION_TERMINATED_DUE_TO_EXERCISE-func-output.json
@@ -1,124 +1,66 @@
 {
-  "account" : [ {
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "clearing_firm_accounts"
-      },
-      "value" : "pacct1"
-    },
-    "meta" : {
-      "externalKey" : "account1",
-      "globalKey" : "71bc0c06"
-    },
-    "partyReference" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "9d362d34"
-    },
-    "servicingParty" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "9d362d34"
-    }
-  } ],
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "2f6e9d0f"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "pacct1"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "71bc0c06"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "9d362d34"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "9d362d34"
-              }
-            } ],
-            "clearedDate" : "2013-08-21",
-            "meta" : {
-              "globalKey" : "24dfdfe4"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "9d362d34"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "844409",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "TESTBOOKLE"
-                },
-                "meta" : {
-                  "globalKey" : "9d362d34"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "scenario1",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "44f1e133"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME_TRADE_REPORT"
-                },
+                  "value" : "scenario1",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "2bf1b841"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "44f1e133"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "9d362d34"
               },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "44f1e133"
-              },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS844409",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "ee46e52d"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2013-08-21",
+              "meta" : {
+                "globalKey" : "3eea15"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "9d362d34"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -127,30 +69,23 @@
                   } ],
                   "economicTerms" : {
                     "payout" : {
-                      "meta" : {
-                        "globalKey" : "ad4f896f"
-                      },
                       "optionPayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "buyerSeller" : {
-                          "buyer" : "PARTY_1",
-                          "seller" : "PARTY_2"
+                          "buyer" : "Party1",
+                          "seller" : "Party2"
                         },
                         "exerciseTerms" : {
                           "optionStyle" : {
                             "europeanExercise" : {
-                              "earliestExerciseTime" : {
-                                "businessCenter" : {
-                                  "value" : "USNY"
-                                },
-                                "hourMinuteTime" : "09:00:00"
-                              },
                               "expirationDate" : [ {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2014-09-24",
                                   "dateAdjustments" : {
+                                    "businessDayConvention" : "FOLLOWING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "USNY"
@@ -159,35 +94,36 @@
                                         "globalKey" : "27e4e9"
                                       }
                                     },
-                                    "businessDayConvention" : "FOLLOWING",
                                     "meta" : {
                                       "globalKey" : "212500d8"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "2297c580"
-                                  },
-                                  "unadjustedDate" : "2014-09-24"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "2297c580"
                                 }
                               } ],
+                              "earliestExerciseTime" : {
+                                "hourMinuteTime" : "09:00:00",
+                                "businessCenter" : {
+                                  "value" : "USNY"
+                                }
+                              },
                               "expirationTime" : {
+                                "hourMinuteTime" : "11:00:00",
                                 "businessCenter" : {
                                   "value" : "USNY"
-                                },
-                                "hourMinuteTime" : "11:00:00"
+                                }
                               },
                               "meta" : {
-                                "globalKey" : "548eee0d"
+                                "globalKey" : "229ace0d"
                               }
                             }
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "ad4f896f"
-                        },
                         "underlier" : {
                           "contractualProduct" : {
                             "productTaxonomy" : [ {
@@ -198,46 +134,42 @@
                               "payout" : {
                                 "interestRatePayout" : [ {
                                   "payerReceiver" : {
-                                    "payer" : "PARTY_1",
-                                    "receiver" : "PARTY_2"
+                                    "payer" : "Party1",
+                                    "receiver" : "Party2"
                                   },
                                   "priceQuantity" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
                                     "quantitySchedule" : {
                                       "address" : {
                                         "scope" : "DOCUMENT",
                                         "value" : "quantity-1"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "0"
                                     }
                                   },
-                                  "calculationPeriodDates" : {
-                                    "calculationPeriodDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "fixedPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "fa5f1fb"
+                                  "rateSpecification" : {
+                                    "fixedRate" : {
+                                      "rateSchedule" : {
+                                        "price" : {
+                                          "address" : {
+                                            "scope" : "DOCUMENT",
+                                            "value" : "price-1"
+                                          }
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
-                                        "globalKey" : "979a8ca"
+                                        "globalKey" : "0"
                                       }
-                                    },
-                                    "calculationPeriodFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "28caa"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6,
-                                      "rollConvention" : "26"
-                                    },
+                                    }
+                                  },
+                                  "dayCountFraction" : {
+                                    "value" : "ACT/360"
+                                  },
+                                  "calculationPeriodDates" : {
                                     "effectiveDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2014-09-26",
                                         "dateAdjustments" : {
                                           "businessDayConvention" : "NONE",
                                           "meta" : {
@@ -246,42 +178,94 @@
                                         },
                                         "meta" : {
                                           "globalKey" : "ec706b12"
-                                        },
-                                        "unadjustedDate" : "2014-09-26"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "ec706b12"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "fixedCalcPeriodDates",
-                                      "globalKey" : "dbbdb046"
-                                    },
                                     "terminationDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2016-09-26",
                                         "dateAdjustments" : {
+                                          "businessDayConvention" : "MODFOLLOWING",
                                           "businessCenters" : {
                                             "businessCentersReference" : {
-                                              "externalReference" : "fixedPrimaryBusinessCenters",
-                                              "globalReference" : "42f910b"
+                                              "globalReference" : "42f910b",
+                                              "externalReference" : "fixedPrimaryBusinessCenters"
                                             },
                                             "meta" : {
                                               "globalKey" : "fa5f1fb"
                                             }
                                           },
-                                          "businessDayConvention" : "MODFOLLOWING",
                                           "meta" : {
                                             "globalKey" : "979a8ca"
                                           }
                                         },
                                         "meta" : {
                                           "globalKey" : "28c502a4"
-                                        },
-                                        "unadjustedDate" : "2016-09-26"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "28c502a4"
                                       }
+                                    },
+                                    "calculationPeriodDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "fixedPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "fa5f1fb"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "979a8ca"
+                                      }
+                                    },
+                                    "calculationPeriodFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "18abc"
+                                      },
+                                      "rollConvention" : "26"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "3d468bd8",
+                                      "externalKey" : "fixedCalcPeriodDates"
+                                    }
+                                  },
+                                  "paymentDates" : {
+                                    "paymentFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "107"
+                                      }
+                                    },
+                                    "payRelativeTo" : "CalculationPeriodEndDate",
+                                    "paymentDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        }, {
+                                          "value" : "USNY"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "42f910b",
+                                          "externalKey" : "fixedPrimaryBusinessCenters"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "97b8e49c"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "9e5a4d0f"
                                     }
                                   },
                                   "cashflowRepresentation" : {
@@ -289,154 +273,100 @@
                                     "paymentCalculationPeriod" : [ {
                                       "adjustedPaymentDate" : "2015-03-26",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2015-03-26",
                                         "adjustedStartDate" : "2014-09-26",
+                                        "adjustedEndDate" : "2015-03-26",
                                         "meta" : {
-                                          "globalKey" : "eabb173c"
+                                          "globalKey" : "f938a384"
                                         },
-                                        "fixedRate" : 0.0225,
-                                        "notionalAmount" : 10000000
+                                        "notionalAmount" : 10000000,
+                                        "fixedRate" : 0.0225
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "71796a2"
+                                        "globalKey" : "159522ea"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2015-09-28",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2015-09-28",
                                         "adjustedStartDate" : "2015-03-26",
+                                        "adjustedEndDate" : "2015-09-28",
                                         "meta" : {
-                                          "globalKey" : "eb82f4fa"
+                                          "globalKey" : "fc32b606"
                                         },
-                                        "fixedRate" : 0.0225,
-                                        "notionalAmount" : 10000000
+                                        "notionalAmount" : 10000000,
+                                        "fixedRate" : 0.0225
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "9a8e141e"
+                                        "globalKey" : "ab3dd52a"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-03-29",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-03-29",
                                         "adjustedStartDate" : "2015-09-28",
+                                        "adjustedEndDate" : "2016-03-29",
                                         "meta" : {
-                                          "globalKey" : "ee7d7bdb"
+                                          "globalKey" : "fcfa9785"
                                         },
-                                        "fixedRate" : 0.0225,
-                                        "notionalAmount" : 10000000
+                                        "notionalAmount" : 10000000,
+                                        "fixedRate" : 0.0225
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "b6bd7d1e"
+                                        "globalKey" : "c53a98c8"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-09-26",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-09-26",
                                         "adjustedStartDate" : "2016-03-29",
+                                        "adjustedEndDate" : "2016-09-26",
                                         "meta" : {
-                                          "globalKey" : "ef43177f"
+                                          "globalKey" : "fff50ba1"
                                         },
-                                        "fixedRate" : 0.0225,
-                                        "notionalAmount" : 10000000
+                                        "notionalAmount" : 10000000,
+                                        "fixedRate" : 0.0225
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "41a97d65"
+                                        "globalKey" : "525b7187"
                                       }
                                     } ]
                                   },
-                                  "dayCountFraction" : {
-                                    "value" : "ACT/360"
-                                  },
                                   "meta" : {
-                                    "globalKey" : "c74ad7f0"
+                                    "globalKey" : "cea2fc18"
+                                  }
+                                }, {
+                                  "payerReceiver" : {
+                                    "payer" : "Party2",
+                                    "receiver" : "Party1"
                                   },
-                                  "paymentDates" : {
-                                    "meta" : {
-                                      "globalKey" : "637fde97"
+                                  "priceQuantity" : {
+                                    "quantitySchedule" : {
+                                      "address" : {
+                                        "scope" : "DOCUMENT",
+                                        "value" : "quantity-2"
+                                      }
                                     },
-                                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                    "paymentDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        }, {
-                                          "value" : "USNY"
-                                        } ],
-                                        "meta" : {
-                                          "externalKey" : "fixedPrimaryBusinessCenters",
-                                          "globalKey" : "42f910b"
+                                    "meta" : {
+                                      "globalKey" : "0"
+                                    }
+                                  },
+                                  "rateSpecification" : {
+                                    "floatingRate" : {
+                                      "rateOption" : {
+                                        "address" : {
+                                          "scope" : "DOCUMENT",
+                                          "value" : "rateOption-1"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "97b8e49c"
-                                      }
-                                    },
-                                    "paymentFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "959"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6
-                                    }
-                                  },
-                                  "rateSpecification" : {
-                                    "fixedRate" : {
                                       "meta" : {
                                         "globalKey" : "0"
-                                      },
-                                      "rateSchedule" : {
-                                        "price" : {
-                                          "address" : {
-                                            "scope" : "DOCUMENT",
-                                            "value" : "price-1"
-                                          }
-                                        }
                                       }
                                     }
-                                  }
-                                }, {
-                                  "payerReceiver" : {
-                                    "payer" : "PARTY_2",
-                                    "receiver" : "PARTY_1"
                                   },
-                                  "priceQuantity" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
-                                    "quantitySchedule" : {
-                                      "address" : {
-                                        "scope" : "DOCUMENT",
-                                        "value" : "quantity-2"
-                                      }
-                                    }
+                                  "dayCountFraction" : {
+                                    "value" : "ACT/360"
                                   },
                                   "calculationPeriodDates" : {
-                                    "calculationPeriodDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "floatPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "b01f2613"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "a9f2dce2"
-                                      }
-                                    },
-                                    "calculationPeriodFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "28c4d"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3,
-                                      "rollConvention" : "26"
-                                    },
                                     "effectiveDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2014-09-26",
                                         "dateAdjustments" : {
                                           "businessDayConvention" : "NONE",
                                           "meta" : {
@@ -445,501 +375,548 @@
                                         },
                                         "meta" : {
                                           "globalKey" : "ec706b12"
-                                        },
-                                        "unadjustedDate" : "2014-09-26"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "ec706b12"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "floatingCalcPeriodDates",
-                                      "globalKey" : "dcd1f359"
-                                    },
                                     "terminationDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2016-09-26",
                                         "dateAdjustments" : {
+                                          "businessDayConvention" : "MODFOLLOWING",
                                           "businessCenters" : {
                                             "businessCentersReference" : {
-                                              "externalReference" : "floatPrimaryBusinessCenters",
-                                              "globalReference" : "42f910b"
+                                              "globalReference" : "42f910b",
+                                              "externalReference" : "floatPrimaryBusinessCenters"
                                             },
                                             "meta" : {
                                               "globalKey" : "b01f2613"
                                             }
                                           },
-                                          "businessDayConvention" : "MODFOLLOWING",
                                           "meta" : {
                                             "globalKey" : "a9f2dce2"
                                           }
                                         },
                                         "meta" : {
                                           "globalKey" : "c93e36bc"
-                                        },
-                                        "unadjustedDate" : "2016-09-26"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "c93e36bc"
                                       }
+                                    },
+                                    "calculationPeriodDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "floatPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "b01f2613"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "a9f2dce2"
+                                      }
+                                    },
+                                    "calculationPeriodFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "17f79"
+                                      },
+                                      "rollConvention" : "26"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "ae3812c5",
+                                      "externalKey" : "floatingCalcPeriodDates"
+                                    }
+                                  },
+                                  "paymentDates" : {
+                                    "paymentFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "107"
+                                      }
+                                    },
+                                    "payRelativeTo" : "CalculationPeriodEndDate",
+                                    "paymentDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        }, {
+                                          "value" : "USNY"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "42f910b",
+                                          "externalKey" : "floatPrimaryBusinessCenters"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "97b8e49c"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "9e5a4d0f"
+                                    }
+                                  },
+                                  "resetDates" : {
+                                    "calculationPeriodDatesReference" : {
+                                      "globalReference" : "ae3812c5",
+                                      "externalReference" : "floatingCalcPeriodDates"
+                                    },
+                                    "resetRelativeTo" : "CalculationPeriodStartDate",
+                                    "fixingDates" : {
+                                      "periodMultiplier" : -2,
+                                      "period" : "D",
+                                      "meta" : {
+                                        "globalKey" : "1a78799e"
+                                      },
+                                      "dayType" : "Business",
+                                      "businessDayConvention" : "NONE",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "21479e"
+                                        }
+                                      },
+                                      "dateRelativeTo" : {
+                                        "globalReference" : "9093d885",
+                                        "externalReference" : "floatingLegResetDates"
+                                      }
+                                    },
+                                    "resetFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "aa"
+                                      }
+                                    },
+                                    "resetDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "floatPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "b01f2613"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "a9f2dce2"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "9093d885",
+                                      "externalKey" : "floatingLegResetDates"
                                     }
                                   },
+                                  "compoundingMethod" : "Flat",
                                   "cashflowRepresentation" : {
                                     "cashflowsMatchParameters" : true,
                                     "paymentCalculationPeriod" : [ {
                                       "adjustedPaymentDate" : "2015-03-26",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2014-12-29",
                                         "adjustedStartDate" : "2014-09-26",
+                                        "adjustedEndDate" : "2014-12-29",
                                         "meta" : {
-                                          "globalKey" : "a6f9f57a"
+                                          "globalKey" : "a85bd414"
                                         },
+                                        "notionalAmount" : 10000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2014-09-24",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "79f58d8"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 10000000
+                                        }
                                       }, {
-                                        "adjustedEndDate" : "2015-03-26",
                                         "adjustedStartDate" : "2014-12-29",
+                                        "adjustedEndDate" : "2015-03-26",
                                         "meta" : {
-                                          "globalKey" : "80dd11b5"
+                                          "globalKey" : "be7a161b"
                                         },
+                                        "notionalAmount" : 10000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2014-12-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "79f6ff9"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 10000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "c4fae3d5"
+                                        "globalKey" : "a4754861"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2015-09-28",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2015-06-26",
                                         "adjustedStartDate" : "2015-03-26",
+                                        "adjustedEndDate" : "2015-06-26",
                                         "meta" : {
-                                          "globalKey" : "f8493d37"
+                                          "globalKey" : "933f43b7"
                                         },
+                                        "notionalAmount" : 10000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2015-03-24",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a02258"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 10000000
+                                        }
                                       }, {
-                                        "adjustedEndDate" : "2015-09-28",
                                         "adjustedStartDate" : "2015-06-26",
+                                        "adjustedEndDate" : "2015-09-28",
                                         "meta" : {
-                                          "globalKey" : "5664b2f9"
+                                          "globalKey" : "8af7f435"
                                         },
+                                        "notionalAmount" : 10000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2015-06-24",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a03998"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 10000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "c7243c3e"
+                                        "globalKey" : "77a526fa"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-03-29",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2015-12-29",
                                         "adjustedStartDate" : "2015-09-28",
+                                        "adjustedEndDate" : "2015-12-29",
                                         "meta" : {
-                                          "globalKey" : "83039eb8"
+                                          "globalKey" : "eac84296"
                                         },
+                                        "notionalAmount" : 10000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2015-09-24",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a050d8"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 10000000
+                                        }
                                       }, {
-                                        "adjustedEndDate" : "2016-03-29",
                                         "adjustedStartDate" : "2015-12-29",
+                                        "adjustedEndDate" : "2016-03-29",
                                         "meta" : {
-                                          "globalKey" : "f82fbb78"
+                                          "globalKey" : "9c3897f8"
                                         },
+                                        "notionalAmount" : 10000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2015-12-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a067f9"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 10000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "843a449d"
+                                        "globalKey" : "b0d6077f"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-09-26",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-06-27",
                                         "adjustedStartDate" : "2016-03-29",
+                                        "adjustedEndDate" : "2016-06-27",
                                         "meta" : {
-                                          "globalKey" : "aedfa36"
+                                          "globalKey" : "c46c5fa"
                                         },
+                                        "notionalAmount" : 10000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2016-03-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a11a39"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 10000000
+                                        }
                                       }, {
-                                        "adjustedEndDate" : "2016-09-26",
                                         "adjustedStartDate" : "2016-06-27",
+                                        "adjustedEndDate" : "2016-09-26",
                                         "meta" : {
-                                          "globalKey" : "c6ed0cf7"
+                                          "globalKey" : "95147619"
                                         },
+                                        "notionalAmount" : 10000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2016-06-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a13179"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 10000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "2864585b"
+                                        "globalKey" : "592ef139"
                                       }
                                     } ]
                                   },
-                                  "compoundingMethod" : "FLAT",
-                                  "dayCountFraction" : {
-                                    "value" : "ACT/360"
-                                  },
                                   "meta" : {
-                                    "globalKey" : "1c4646bb"
-                                  },
-                                  "paymentDates" : {
-                                    "meta" : {
-                                      "globalKey" : "637fde97"
-                                    },
-                                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                    "paymentDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        }, {
-                                          "value" : "USNY"
-                                        } ],
-                                        "meta" : {
-                                          "externalKey" : "floatPrimaryBusinessCenters",
-                                          "globalKey" : "42f910b"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "97b8e49c"
-                                      }
-                                    },
-                                    "paymentFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "959"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6
-                                    }
-                                  },
-                                  "rateSpecification" : {
-                                    "floatingRate" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
-                                      "rateOption" : {
-                                        "address" : {
-                                          "scope" : "DOCUMENT",
-                                          "value" : "rateOption-1"
-                                        }
-                                      }
-                                    }
-                                  },
-                                  "resetDates" : {
-                                    "calculationPeriodDatesReference" : {
-                                      "externalReference" : "floatingCalcPeriodDates",
-                                      "globalReference" : "dcd1f359"
-                                    },
-                                    "fixingDates" : {
-                                      "meta" : {
-                                        "globalKey" : "3d9c8eea"
-                                      },
-                                      "period" : "D",
-                                      "periodMultiplier" : -2,
-                                      "dayType" : "BUSINESS",
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        } ],
-                                        "meta" : {
-                                          "globalKey" : "21479e"
-                                        }
-                                      },
-                                      "businessDayConvention" : "NONE",
-                                      "dateRelativeTo" : {
-                                        "externalReference" : "floatingLegResetDates",
-                                        "globalReference" : "fde74fcd"
-                                      }
-                                    },
-                                    "meta" : {
-                                      "externalKey" : "floatingLegResetDates",
-                                      "globalKey" : "fde74fcd"
-                                    },
-                                    "resetDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "floatPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "b01f2613"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "a9f2dce2"
-                                      }
-                                    },
-                                    "resetFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "956"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3
-                                    },
-                                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                                    "globalKey" : "add810c3"
                                   }
                                 } ],
                                 "meta" : {
-                                  "globalKey" : "87b416ab"
+                                  "globalKey" : "23e698db"
                                 }
                               }
                             },
                             "meta" : {
-                              "globalKey" : "8318225a"
+                              "globalKey" : "1f4aa48a"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "8318225a"
+                            "globalKey" : "1f4aa48a"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "b2922b9f"
                         }
-                      } ]
+                      } ],
+                      "meta" : {
+                        "globalKey" : "b2922b9f"
+                      }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "4f9f5e1a"
+                    "globalKey" : "54e2004a"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "4f9f5e1a"
+                  "globalKey" : "54e2004a"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "46b33af3"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0225,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.0225,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 10000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "8fb4236d"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 10000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 10000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "975cb782"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3eea15"
-              },
-              "value" : "2013-08-21"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "844409"
+                  "meta" : {
+                    "globalKey" : "a032462e"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "9d362d34",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
+                }
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "TESTBOOKLE",
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "scenario1"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "9d362d34"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "9d362d34",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "scenario1"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "2420a54d"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS844409"
+                  "value" : "CME_TRADE_REPORT"
+                },
+                "meta" : {
+                  "globalKey" : "44f1e133"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "44f1e133",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "44f1e133",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "9d362d34",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2013-08-21",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "9d362d34",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "pacct1",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "9d362d34",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "d842f70b"
+                "globalKey" : "aca5f86",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "11ef9004"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "50a54273"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "9d362d34"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                }
-              },
               "quantity" : {
+                "value" : 100000,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "9d362d34",
+                  "externalReference" : "clearing_firm"
                 },
-                "value" : 100000
+                "receiverPartyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
+                }
               },
               "settlementDate" : {
+                "unadjustedDate" : "2014-09-25",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "USNY"
@@ -948,122 +925,84 @@
                       "globalKey" : "27e4e9"
                     }
                   },
-                  "businessDayConvention" : "MODFOLLOWING",
                   "meta" : {
                     "globalKey" : "3662e8ba"
                   }
-                },
-                "unadjustedDate" : "2014-09-25"
+                }
               },
-              "transferExpression" : {
-                "priceTransfer" : "PREMIUM"
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "intent" : "CONTRACT_FORMATION",
-    "after" : [ {
-      "meta" : {
-        "globalKey" : "2e847832"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
-      "trade" : {
-        "account" : [ {
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "clearing_firm_accounts"
+              "transferExpression" : {
+                "priceTransfer" : "Premium"
+              }
             },
-            "value" : "pacct1"
-          },
+            "meta" : {
+              "globalKey" : "e3c0d8dd"
+            }
+          } ],
           "meta" : {
-            "externalKey" : "account1",
-            "globalKey" : "71bc0c06"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "9d362d34"
-          },
-          "servicingParty" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "9d362d34"
+            "globalKey" : "cf6df759"
           }
-        } ],
-        "clearedDate" : "2013-08-21",
-        "meta" : {
-          "globalKey" : "24dfdfe4"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "clearing_firm",
-            "globalKey" : "9d362d34"
+        }
+      }
+    } ],
+    "eventQualifier" : "ContractFormation",
+    "after" : [ {
+      "trade" : {
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "1051b",
+            "externalReference" : "clearing_service"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "844409",
               "meta" : {
-                "scheme" : "clearing_member_firms"
-              },
-              "value" : "TESTBOOKLE"
-            },
-            "meta" : {
-              "globalKey" : "9d362d34"
+                "scheme" : "cme_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing_service",
-            "globalKey" : "1051b"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "CME"
-            },
-            "meta" : {
-              "globalKey" : "1051b"
+              "value" : "scenario1",
+              "meta" : {
+                "scheme" : "client_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "trade_source",
-            "globalKey" : "44f1e133"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "CME_TRADE_REPORT"
-            },
+              "value" : "scenario1",
+              "meta" : {
+                "scheme" : "platform_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "2bf1b841"
+          }
+        }, {
+          "issuer" : {
+            "value" : "1010000023",
             "meta" : {
-              "globalKey" : "44f1e133"
+              "scheme" : "cftc_Namespace"
             }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "9d362d34"
-          },
-          "partyReference" : {
-            "externalReference" : "trade_source",
-            "globalReference" : "44f1e133"
           },
-          "role" : "DATA_SUBMITTER"
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "CCCIRS844409",
+              "meta" : {
+                "scheme" : "reg_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "ee46e52d"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2013-08-21",
+          "meta" : {
+            "globalKey" : "3eea15"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "9d362d34"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -1072,30 +1011,23 @@
               } ],
               "economicTerms" : {
                 "payout" : {
-                  "meta" : {
-                    "globalKey" : "ad4f896f"
-                  },
                   "optionPayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "buyerSeller" : {
-                      "buyer" : "PARTY_1",
-                      "seller" : "PARTY_2"
+                      "buyer" : "Party1",
+                      "seller" : "Party2"
                     },
                     "exerciseTerms" : {
                       "optionStyle" : {
                         "europeanExercise" : {
-                          "earliestExerciseTime" : {
-                            "businessCenter" : {
-                              "value" : "USNY"
-                            },
-                            "hourMinuteTime" : "09:00:00"
-                          },
                           "expirationDate" : [ {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2014-09-24",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "FOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
@@ -1104,35 +1036,36 @@
                                     "globalKey" : "27e4e9"
                                   }
                                 },
-                                "businessDayConvention" : "FOLLOWING",
                                 "meta" : {
                                   "globalKey" : "212500d8"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "2297c580"
-                              },
-                              "unadjustedDate" : "2014-09-24"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "2297c580"
                             }
                           } ],
+                          "earliestExerciseTime" : {
+                            "hourMinuteTime" : "09:00:00",
+                            "businessCenter" : {
+                              "value" : "USNY"
+                            }
+                          },
                           "expirationTime" : {
+                            "hourMinuteTime" : "11:00:00",
                             "businessCenter" : {
                               "value" : "USNY"
-                            },
-                            "hourMinuteTime" : "11:00:00"
+                            }
                           },
                           "meta" : {
-                            "globalKey" : "548eee0d"
+                            "globalKey" : "229ace0d"
                           }
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "ad4f896f"
-                    },
                     "underlier" : {
                       "contractualProduct" : {
                         "productTaxonomy" : [ {
@@ -1143,46 +1076,42 @@
                           "payout" : {
                             "interestRatePayout" : [ {
                               "payerReceiver" : {
-                                "payer" : "PARTY_1",
-                                "receiver" : "PARTY_2"
+                                "payer" : "Party1",
+                                "receiver" : "Party2"
                               },
                               "priceQuantity" : {
-                                "meta" : {
-                                  "globalKey" : "0"
-                                },
                                 "quantitySchedule" : {
                                   "address" : {
                                     "scope" : "DOCUMENT",
                                     "value" : "quantity-1"
                                   }
+                                },
+                                "meta" : {
+                                  "globalKey" : "0"
                                 }
                               },
-                              "calculationPeriodDates" : {
-                                "calculationPeriodDatesAdjustments" : {
-                                  "businessCenters" : {
-                                    "businessCentersReference" : {
-                                      "externalReference" : "fixedPrimaryBusinessCenters",
-                                      "globalReference" : "42f910b"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "fa5f1fb"
+                              "rateSpecification" : {
+                                "fixedRate" : {
+                                  "rateSchedule" : {
+                                    "price" : {
+                                      "address" : {
+                                        "scope" : "DOCUMENT",
+                                        "value" : "price-1"
+                                      }
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
-                                    "globalKey" : "979a8ca"
+                                    "globalKey" : "0"
                                   }
-                                },
-                                "calculationPeriodFrequency" : {
-                                  "meta" : {
-                                    "globalKey" : "28caa"
-                                  },
-                                  "period" : "M",
-                                  "periodMultiplier" : 6,
-                                  "rollConvention" : "26"
-                                },
+                                }
+                              },
+                              "dayCountFraction" : {
+                                "value" : "ACT/360"
+                              },
+                              "calculationPeriodDates" : {
                                 "effectiveDate" : {
                                   "adjustableDate" : {
+                                    "unadjustedDate" : "2014-09-26",
                                     "dateAdjustments" : {
                                       "businessDayConvention" : "NONE",
                                       "meta" : {
@@ -1191,42 +1120,94 @@
                                     },
                                     "meta" : {
                                       "globalKey" : "ec706b12"
-                                    },
-                                    "unadjustedDate" : "2014-09-26"
+                                    }
                                   },
                                   "meta" : {
                                     "globalKey" : "ec706b12"
                                   }
                                 },
-                                "meta" : {
-                                  "externalKey" : "fixedCalcPeriodDates",
-                                  "globalKey" : "dbbdb046"
-                                },
                                 "terminationDate" : {
                                   "adjustableDate" : {
+                                    "unadjustedDate" : "2016-09-26",
                                     "dateAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
                                       "businessCenters" : {
                                         "businessCentersReference" : {
-                                          "externalReference" : "fixedPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "fixedPrimaryBusinessCenters"
                                         },
                                         "meta" : {
                                           "globalKey" : "fa5f1fb"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
                                         "globalKey" : "979a8ca"
                                       }
                                     },
                                     "meta" : {
                                       "globalKey" : "28c502a4"
-                                    },
-                                    "unadjustedDate" : "2016-09-26"
+                                    }
                                   },
                                   "meta" : {
                                     "globalKey" : "28c502a4"
                                   }
+                                },
+                                "calculationPeriodDatesAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
+                                  "businessCenters" : {
+                                    "businessCentersReference" : {
+                                      "globalReference" : "42f910b",
+                                      "externalReference" : "fixedPrimaryBusinessCenters"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "fa5f1fb"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "979a8ca"
+                                  }
+                                },
+                                "calculationPeriodFrequency" : {
+                                  "periodMultiplier" : 6,
+                                  "period" : "M",
+                                  "meta" : {
+                                    "globalKey" : "18abc"
+                                  },
+                                  "rollConvention" : "26"
+                                },
+                                "meta" : {
+                                  "globalKey" : "3d468bd8",
+                                  "externalKey" : "fixedCalcPeriodDates"
+                                }
+                              },
+                              "paymentDates" : {
+                                "paymentFrequency" : {
+                                  "periodMultiplier" : 6,
+                                  "period" : "M",
+                                  "meta" : {
+                                    "globalKey" : "107"
+                                  }
+                                },
+                                "payRelativeTo" : "CalculationPeriodEndDate",
+                                "paymentDatesAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
+                                  "businessCenters" : {
+                                    "businessCenter" : [ {
+                                      "value" : "GBLO"
+                                    }, {
+                                      "value" : "USNY"
+                                    } ],
+                                    "meta" : {
+                                      "globalKey" : "42f910b",
+                                      "externalKey" : "fixedPrimaryBusinessCenters"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "97b8e49c"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "9e5a4d0f"
                                 }
                               },
                               "cashflowRepresentation" : {
@@ -1234,154 +1215,100 @@
                                 "paymentCalculationPeriod" : [ {
                                   "adjustedPaymentDate" : "2015-03-26",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2015-03-26",
                                     "adjustedStartDate" : "2014-09-26",
+                                    "adjustedEndDate" : "2015-03-26",
                                     "meta" : {
-                                      "globalKey" : "eabb173c"
+                                      "globalKey" : "f938a384"
                                     },
-                                    "fixedRate" : 0.0225,
-                                    "notionalAmount" : 10000000
+                                    "notionalAmount" : 10000000,
+                                    "fixedRate" : 0.0225
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "71796a2"
+                                    "globalKey" : "159522ea"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2015-09-28",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2015-09-28",
                                     "adjustedStartDate" : "2015-03-26",
+                                    "adjustedEndDate" : "2015-09-28",
                                     "meta" : {
-                                      "globalKey" : "eb82f4fa"
+                                      "globalKey" : "fc32b606"
                                     },
-                                    "fixedRate" : 0.0225,
-                                    "notionalAmount" : 10000000
+                                    "notionalAmount" : 10000000,
+                                    "fixedRate" : 0.0225
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "9a8e141e"
+                                    "globalKey" : "ab3dd52a"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2016-03-29",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2016-03-29",
                                     "adjustedStartDate" : "2015-09-28",
+                                    "adjustedEndDate" : "2016-03-29",
                                     "meta" : {
-                                      "globalKey" : "ee7d7bdb"
+                                      "globalKey" : "fcfa9785"
                                     },
-                                    "fixedRate" : 0.0225,
-                                    "notionalAmount" : 10000000
+                                    "notionalAmount" : 10000000,
+                                    "fixedRate" : 0.0225
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "b6bd7d1e"
+                                    "globalKey" : "c53a98c8"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2016-09-26",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2016-09-26",
                                     "adjustedStartDate" : "2016-03-29",
+                                    "adjustedEndDate" : "2016-09-26",
                                     "meta" : {
-                                      "globalKey" : "ef43177f"
+                                      "globalKey" : "fff50ba1"
                                     },
-                                    "fixedRate" : 0.0225,
-                                    "notionalAmount" : 10000000
+                                    "notionalAmount" : 10000000,
+                                    "fixedRate" : 0.0225
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "41a97d65"
+                                    "globalKey" : "525b7187"
                                   }
                                 } ]
                               },
-                              "dayCountFraction" : {
-                                "value" : "ACT/360"
-                              },
-                              "meta" : {
-                                "globalKey" : "c74ad7f0"
-                              },
-                              "paymentDates" : {
-                                "meta" : {
-                                  "globalKey" : "637fde97"
-                                },
-                                "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                "paymentDatesAdjustments" : {
-                                  "businessCenters" : {
-                                    "businessCenter" : [ {
-                                      "value" : "GBLO"
-                                    }, {
-                                      "value" : "USNY"
-                                    } ],
-                                    "meta" : {
-                                      "externalKey" : "fixedPrimaryBusinessCenters",
-                                      "globalKey" : "42f910b"
-                                    }
-                                  },
-                                  "businessDayConvention" : "MODFOLLOWING",
-                                  "meta" : {
-                                    "globalKey" : "97b8e49c"
-                                  }
-                                },
-                                "paymentFrequency" : {
-                                  "meta" : {
-                                    "globalKey" : "959"
-                                  },
-                                  "period" : "M",
-                                  "periodMultiplier" : 6
-                                }
-                              },
-                              "rateSpecification" : {
-                                "fixedRate" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
-                                  "rateSchedule" : {
-                                    "price" : {
-                                      "address" : {
-                                        "scope" : "DOCUMENT",
-                                        "value" : "price-1"
-                                      }
-                                    }
-                                  }
-                                }
+                              "meta" : {
+                                "globalKey" : "cea2fc18"
                               }
                             }, {
                               "payerReceiver" : {
-                                "payer" : "PARTY_2",
-                                "receiver" : "PARTY_1"
+                                "payer" : "Party2",
+                                "receiver" : "Party1"
                               },
                               "priceQuantity" : {
-                                "meta" : {
-                                  "globalKey" : "0"
-                                },
                                 "quantitySchedule" : {
                                   "address" : {
                                     "scope" : "DOCUMENT",
                                     "value" : "quantity-2"
                                   }
+                                },
+                                "meta" : {
+                                  "globalKey" : "0"
                                 }
                               },
-                              "calculationPeriodDates" : {
-                                "calculationPeriodDatesAdjustments" : {
-                                  "businessCenters" : {
-                                    "businessCentersReference" : {
-                                      "externalReference" : "floatPrimaryBusinessCenters",
-                                      "globalReference" : "42f910b"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "b01f2613"
+                              "rateSpecification" : {
+                                "floatingRate" : {
+                                  "rateOption" : {
+                                    "address" : {
+                                      "scope" : "DOCUMENT",
+                                      "value" : "rateOption-1"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
-                                    "globalKey" : "a9f2dce2"
+                                    "globalKey" : "0"
                                   }
-                                },
-                                "calculationPeriodFrequency" : {
-                                  "meta" : {
-                                    "globalKey" : "28c4d"
-                                  },
-                                  "period" : "M",
-                                  "periodMultiplier" : 3,
-                                  "rollConvention" : "26"
-                                },
+                                }
+                              },
+                              "dayCountFraction" : {
+                                "value" : "ACT/360"
+                              },
+                              "calculationPeriodDates" : {
                                 "effectiveDate" : {
                                   "adjustableDate" : {
+                                    "unadjustedDate" : "2014-09-26",
                                     "dateAdjustments" : {
                                       "businessDayConvention" : "NONE",
                                       "meta" : {
@@ -1390,501 +1317,551 @@
                                     },
                                     "meta" : {
                                       "globalKey" : "ec706b12"
-                                    },
-                                    "unadjustedDate" : "2014-09-26"
+                                    }
                                   },
                                   "meta" : {
                                     "globalKey" : "ec706b12"
                                   }
                                 },
-                                "meta" : {
-                                  "externalKey" : "floatingCalcPeriodDates",
-                                  "globalKey" : "dcd1f359"
-                                },
                                 "terminationDate" : {
                                   "adjustableDate" : {
+                                    "unadjustedDate" : "2016-09-26",
                                     "dateAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
                                       "businessCenters" : {
                                         "businessCentersReference" : {
-                                          "externalReference" : "floatPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "floatPrimaryBusinessCenters"
                                         },
                                         "meta" : {
                                           "globalKey" : "b01f2613"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
                                         "globalKey" : "a9f2dce2"
                                       }
                                     },
                                     "meta" : {
                                       "globalKey" : "c93e36bc"
-                                    },
-                                    "unadjustedDate" : "2016-09-26"
+                                    }
                                   },
                                   "meta" : {
                                     "globalKey" : "c93e36bc"
                                   }
+                                },
+                                "calculationPeriodDatesAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
+                                  "businessCenters" : {
+                                    "businessCentersReference" : {
+                                      "globalReference" : "42f910b",
+                                      "externalReference" : "floatPrimaryBusinessCenters"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "b01f2613"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "a9f2dce2"
+                                  }
+                                },
+                                "calculationPeriodFrequency" : {
+                                  "periodMultiplier" : 3,
+                                  "period" : "M",
+                                  "meta" : {
+                                    "globalKey" : "17f79"
+                                  },
+                                  "rollConvention" : "26"
+                                },
+                                "meta" : {
+                                  "globalKey" : "ae3812c5",
+                                  "externalKey" : "floatingCalcPeriodDates"
+                                }
+                              },
+                              "paymentDates" : {
+                                "paymentFrequency" : {
+                                  "periodMultiplier" : 6,
+                                  "period" : "M",
+                                  "meta" : {
+                                    "globalKey" : "107"
+                                  }
+                                },
+                                "payRelativeTo" : "CalculationPeriodEndDate",
+                                "paymentDatesAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
+                                  "businessCenters" : {
+                                    "businessCenter" : [ {
+                                      "value" : "GBLO"
+                                    }, {
+                                      "value" : "USNY"
+                                    } ],
+                                    "meta" : {
+                                      "globalKey" : "42f910b",
+                                      "externalKey" : "floatPrimaryBusinessCenters"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "97b8e49c"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "9e5a4d0f"
+                                }
+                              },
+                              "resetDates" : {
+                                "calculationPeriodDatesReference" : {
+                                  "globalReference" : "ae3812c5",
+                                  "externalReference" : "floatingCalcPeriodDates"
+                                },
+                                "resetRelativeTo" : "CalculationPeriodStartDate",
+                                "fixingDates" : {
+                                  "periodMultiplier" : -2,
+                                  "period" : "D",
+                                  "meta" : {
+                                    "globalKey" : "1a78799e"
+                                  },
+                                  "dayType" : "Business",
+                                  "businessDayConvention" : "NONE",
+                                  "businessCenters" : {
+                                    "businessCenter" : [ {
+                                      "value" : "GBLO"
+                                    } ],
+                                    "meta" : {
+                                      "globalKey" : "21479e"
+                                    }
+                                  },
+                                  "dateRelativeTo" : {
+                                    "globalReference" : "9093d885",
+                                    "externalReference" : "floatingLegResetDates"
+                                  }
+                                },
+                                "resetFrequency" : {
+                                  "periodMultiplier" : 3,
+                                  "period" : "M",
+                                  "meta" : {
+                                    "globalKey" : "aa"
+                                  }
+                                },
+                                "resetDatesAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
+                                  "businessCenters" : {
+                                    "businessCentersReference" : {
+                                      "globalReference" : "42f910b",
+                                      "externalReference" : "floatPrimaryBusinessCenters"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "b01f2613"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "a9f2dce2"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "9093d885",
+                                  "externalKey" : "floatingLegResetDates"
                                 }
                               },
+                              "compoundingMethod" : "Flat",
                               "cashflowRepresentation" : {
                                 "cashflowsMatchParameters" : true,
                                 "paymentCalculationPeriod" : [ {
                                   "adjustedPaymentDate" : "2015-03-26",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2014-12-29",
                                     "adjustedStartDate" : "2014-09-26",
+                                    "adjustedEndDate" : "2014-12-29",
                                     "meta" : {
-                                      "globalKey" : "a6f9f57a"
+                                      "globalKey" : "a85bd414"
                                     },
+                                    "notionalAmount" : 10000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2014-09-24",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "79f58d8"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 10000000
+                                    }
                                   }, {
-                                    "adjustedEndDate" : "2015-03-26",
                                     "adjustedStartDate" : "2014-12-29",
+                                    "adjustedEndDate" : "2015-03-26",
                                     "meta" : {
-                                      "globalKey" : "80dd11b5"
+                                      "globalKey" : "be7a161b"
                                     },
+                                    "notionalAmount" : 10000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2014-12-23",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "79f6ff9"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 10000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "c4fae3d5"
+                                    "globalKey" : "a4754861"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2015-09-28",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2015-06-26",
                                     "adjustedStartDate" : "2015-03-26",
+                                    "adjustedEndDate" : "2015-06-26",
                                     "meta" : {
-                                      "globalKey" : "f8493d37"
+                                      "globalKey" : "933f43b7"
                                     },
+                                    "notionalAmount" : 10000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2015-03-24",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a02258"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 10000000
+                                    }
                                   }, {
-                                    "adjustedEndDate" : "2015-09-28",
                                     "adjustedStartDate" : "2015-06-26",
+                                    "adjustedEndDate" : "2015-09-28",
                                     "meta" : {
-                                      "globalKey" : "5664b2f9"
+                                      "globalKey" : "8af7f435"
                                     },
+                                    "notionalAmount" : 10000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2015-06-24",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a03998"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 10000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "c7243c3e"
+                                    "globalKey" : "77a526fa"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2016-03-29",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2015-12-29",
                                     "adjustedStartDate" : "2015-09-28",
+                                    "adjustedEndDate" : "2015-12-29",
                                     "meta" : {
-                                      "globalKey" : "83039eb8"
+                                      "globalKey" : "eac84296"
                                     },
+                                    "notionalAmount" : 10000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2015-09-24",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a050d8"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 10000000
+                                    }
                                   }, {
-                                    "adjustedEndDate" : "2016-03-29",
                                     "adjustedStartDate" : "2015-12-29",
+                                    "adjustedEndDate" : "2016-03-29",
                                     "meta" : {
-                                      "globalKey" : "f82fbb78"
+                                      "globalKey" : "9c3897f8"
                                     },
+                                    "notionalAmount" : 10000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2015-12-23",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a067f9"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 10000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "843a449d"
+                                    "globalKey" : "b0d6077f"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2016-09-26",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2016-06-27",
                                     "adjustedStartDate" : "2016-03-29",
+                                    "adjustedEndDate" : "2016-06-27",
                                     "meta" : {
-                                      "globalKey" : "aedfa36"
+                                      "globalKey" : "c46c5fa"
                                     },
+                                    "notionalAmount" : 10000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2016-03-23",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a11a39"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 10000000
+                                    }
                                   }, {
-                                    "adjustedEndDate" : "2016-09-26",
                                     "adjustedStartDate" : "2016-06-27",
+                                    "adjustedEndDate" : "2016-09-26",
                                     "meta" : {
-                                      "globalKey" : "c6ed0cf7"
+                                      "globalKey" : "95147619"
                                     },
+                                    "notionalAmount" : 10000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2016-06-23",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a13179"
-                                        },
-                                        "observedRate" : 0
-                                      } ]
-                                    },
-                                    "notionalAmount" : 10000000
-                                  } ],
-                                  "meta" : {
-                                    "globalKey" : "2864585b"
-                                  }
-                                } ]
-                              },
-                              "compoundingMethod" : "FLAT",
-                              "dayCountFraction" : {
-                                "value" : "ACT/360"
-                              },
-                              "meta" : {
-                                "globalKey" : "1c4646bb"
-                              },
-                              "paymentDates" : {
-                                "meta" : {
-                                  "globalKey" : "637fde97"
-                                },
-                                "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                "paymentDatesAdjustments" : {
-                                  "businessCenters" : {
-                                    "businessCenter" : [ {
-                                      "value" : "GBLO"
-                                    }, {
-                                      "value" : "USNY"
-                                    } ],
-                                    "meta" : {
-                                      "externalKey" : "floatPrimaryBusinessCenters",
-                                      "globalKey" : "42f910b"
-                                    }
-                                  },
-                                  "businessDayConvention" : "MODFOLLOWING",
-                                  "meta" : {
-                                    "globalKey" : "97b8e49c"
-                                  }
-                                },
-                                "paymentFrequency" : {
-                                  "meta" : {
-                                    "globalKey" : "959"
-                                  },
-                                  "period" : "M",
-                                  "periodMultiplier" : 6
-                                }
-                              },
-                              "rateSpecification" : {
-                                "floatingRate" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
-                                  "rateOption" : {
-                                    "address" : {
-                                      "scope" : "DOCUMENT",
-                                      "value" : "rateOption-1"
-                                    }
-                                  }
-                                }
-                              },
-                              "resetDates" : {
-                                "calculationPeriodDatesReference" : {
-                                  "externalReference" : "floatingCalcPeriodDates",
-                                  "globalReference" : "dcd1f359"
-                                },
-                                "fixingDates" : {
-                                  "meta" : {
-                                    "globalKey" : "3d9c8eea"
-                                  },
-                                  "period" : "D",
-                                  "periodMultiplier" : -2,
-                                  "dayType" : "BUSINESS",
-                                  "businessCenters" : {
-                                    "businessCenter" : [ {
-                                      "value" : "GBLO"
-                                    } ],
-                                    "meta" : {
-                                      "globalKey" : "21479e"
-                                    }
-                                  },
-                                  "businessDayConvention" : "NONE",
-                                  "dateRelativeTo" : {
-                                    "externalReference" : "floatingLegResetDates",
-                                    "globalReference" : "fde74fcd"
-                                  }
-                                },
-                                "meta" : {
-                                  "externalKey" : "floatingLegResetDates",
-                                  "globalKey" : "fde74fcd"
-                                },
-                                "resetDatesAdjustments" : {
-                                  "businessCenters" : {
-                                    "businessCentersReference" : {
-                                      "externalReference" : "floatPrimaryBusinessCenters",
-                                      "globalReference" : "42f910b"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "b01f2613"
+                                        }
+                                      } ]
                                     }
-                                  },
-                                  "businessDayConvention" : "MODFOLLOWING",
+                                  } ],
                                   "meta" : {
-                                    "globalKey" : "a9f2dce2"
+                                    "globalKey" : "592ef139"
                                   }
-                                },
-                                "resetFrequency" : {
-                                  "meta" : {
-                                    "globalKey" : "956"
-                                  },
-                                  "period" : "M",
-                                  "periodMultiplier" : 3
-                                },
-                                "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                                } ]
+                              },
+                              "meta" : {
+                                "globalKey" : "add810c3"
                               }
                             } ],
                             "meta" : {
-                              "globalKey" : "87b416ab"
+                              "globalKey" : "23e698db"
                             }
                           }
                         },
                         "meta" : {
-                          "globalKey" : "8318225a"
+                          "globalKey" : "1f4aa48a"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "8318225a"
+                        "globalKey" : "1f4aa48a"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "b2922b9f"
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "b2922b9f"
+                  }
                 }
               },
               "meta" : {
-                "globalKey" : "4f9f5e1a"
+                "globalKey" : "54e2004a"
               }
             },
             "meta" : {
-              "globalKey" : "4f9f5e1a"
+              "globalKey" : "54e2004a"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "46b33af3"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.0225,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.0225,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
                 }
               } ],
               "quantity" : [ {
+                "value" : {
+                  "value" : 10000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "8fb4236d"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 10000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 10000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
                 }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "975cb782"
-              },
+              } ],
               "observable" : {
-                "meta" : {
-                  "globalKey" : "5f0c6d05"
-                },
                 "rateOption" : {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "rateOption-1"
-                    } ]
-                  },
                   "value" : {
                     "floatingRateIndex" : {
                       "value" : "USD-LIBOR-BBA"
                     },
                     "indexTenor" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
+                      "periodMultiplier" : 3,
                       "period" : "M",
-                      "periodMultiplier" : 3
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "rateOption-1"
+                    } ]
                   }
-                }
-              },
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
                 },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 10000000
+                "meta" : {
+                  "globalKey" : "828026c7"
                 }
-              } ]
-            } ]
-          } ]
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3eea15"
-          },
-          "value" : "2013-08-21"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "cme_trade_id"
               },
-              "value" : "844409"
+              "meta" : {
+                "globalKey" : "a032462e"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "9d362d34",
+              "externalReference" : "clearing_firm"
             }
           }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
+            }
+          } ]
+        },
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "TESTBOOKLE",
               "meta" : {
-                "scheme" : "client_trade_id"
-              },
-              "value" : "scenario1"
+                "scheme" : "clearing_member_firms"
+              }
+            },
+            "meta" : {
+              "globalKey" : "9d362d34"
             }
-          }, {
+          } ],
+          "meta" : {
+            "globalKey" : "9d362d34",
+            "externalKey" : "clearing_firm"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "platform_trade_id"
-              },
-              "value" : "scenario1"
+              "value" : "CME"
+            },
+            "meta" : {
+              "globalKey" : "1051b"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "clearing_service",
-            "globalReference" : "1051b"
-          },
           "meta" : {
-            "globalKey" : "2420a54d"
+            "globalKey" : "1051b",
+            "externalKey" : "clearing_service"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "reg_trade_id"
-              },
-              "value" : "CCCIRS844409"
+              "value" : "CME_TRADE_REPORT"
+            },
+            "meta" : {
+              "globalKey" : "44f1e133"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "44f1e133",
+            "externalKey" : "trade_source"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "44f1e133",
+            "externalReference" : "trade_source"
+          },
+          "role" : "DataSubmitter",
+          "ownershipPartyReference" : {
+            "globalReference" : "9d362d34",
+            "externalReference" : "clearing_firm"
+          }
+        } ],
+        "clearedDate" : "2013-08-21",
+        "account" : [ {
+          "partyReference" : {
+            "globalReference" : "9d362d34",
+            "externalReference" : "clearing_firm"
+          },
+          "accountNumber" : {
+            "value" : "pacct1",
             "meta" : {
-              "scheme" : "cftc_Namespace"
-            },
-            "value" : "1010000023"
+              "scheme" : "clearing_firm_accounts"
+            }
+          },
+          "servicingParty" : {
+            "globalReference" : "9d362d34",
+            "externalReference" : "clearing_firm"
           },
           "meta" : {
-            "globalKey" : "d842f70b"
+            "globalKey" : "aca5f86",
+            "externalKey" : "account1"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "11ef9004"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
       },
       "transferHistory" : [ {
-        "meta" : {
-          "globalKey" : "50a54273"
-        },
         "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "9d362d34"
-            },
-            "receiverPartyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            }
-          },
           "quantity" : {
+            "value" : 100000,
             "unit" : {
               "currency" : {
                 "value" : "USD"
               }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "9d362d34",
+              "externalReference" : "clearing_firm"
             },
-            "value" : 100000
+            "receiverPartyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
+            }
           },
           "settlementDate" : {
+            "unadjustedDate" : "2014-09-25",
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "USNY"
@@ -1893,73 +1870,76 @@
                   "globalKey" : "27e4e9"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "3662e8ba"
               }
-            },
-            "unadjustedDate" : "2014-09-25"
+            }
           },
           "transferExpression" : {
-            "priceTransfer" : "PREMIUM"
+            "priceTransfer" : "Premium"
           }
+        },
+        "meta" : {
+          "globalKey" : "e3c0d8dd"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "aaeb3ad6"
+      }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "66a3fa7"
+      "globalKey" : "34597541"
     }
   },
+  "previousWorkflowStep" : {
+    "globalReference" : "103e4f9a"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "TESTBOOKLE844409",
       "meta" : {
         "scheme" : "cme_message_id"
-      },
-      "value" : "TESTBOOKLE844409"
+      }
     },
     "sentBy" : {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
+      }
     },
     "sentTo" : [ {
+      "value" : "TESTBOOKLE",
       "meta" : {
         "scheme" : "cme_firm_id"
-      },
-      "value" : "TESTBOOKLE"
+      }
     }, {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
+      }
     } ]
   },
-  "meta" : {
-    "globalKey" : "1045e901"
-  },
+  "timestamp" : [ {
+    "dateTime" : "2014-09-24T09:30:15Z",
+    "qualification" : "eventCreationDateTime"
+  } ],
   "party" : [ {
-    "meta" : {
-      "externalKey" : "clearing_firm",
-      "globalKey" : "9d362d34"
-    },
     "partyId" : [ {
       "identifier" : {
+        "value" : "TESTBOOKLE",
         "meta" : {
           "scheme" : "clearing_member_firms"
-        },
-        "value" : "TESTBOOKLE"
+        }
       },
       "meta" : {
         "globalKey" : "9d362d34"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "clearing_service",
-      "globalKey" : "1051b"
-    },
+      "globalKey" : "9d362d34",
+      "externalKey" : "clearing_firm"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "CME"
@@ -1967,12 +1947,12 @@
       "meta" : {
         "globalKey" : "1051b"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "trade_source",
-      "globalKey" : "44f1e133"
-    },
+      "globalKey" : "1051b",
+      "externalKey" : "clearing_service"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "CME_TRADE_REPORT"
@@ -1980,13 +1960,33 @@
       "meta" : {
         "globalKey" : "44f1e133"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "44f1e133",
+      "externalKey" : "trade_source"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "d421fd90"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2014-09-24T09:30:15Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+  "account" : [ {
+    "partyReference" : {
+      "globalReference" : "9d362d34",
+      "externalReference" : "clearing_firm"
+    },
+    "accountNumber" : {
+      "value" : "pacct1",
+      "meta" : {
+        "scheme" : "clearing_firm_accounts"
+      }
+    },
+    "servicingParty" : {
+      "globalReference" : "9d362d34",
+      "externalReference" : "clearing_firm"
+    },
+    "meta" : {
+      "globalKey" : "aca5f86",
+      "externalKey" : "account1"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "5b7f4d8f"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/SWAP_CREATED_DUE_TO_EXERCISE-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/SWAP_CREATED_DUE_TO_EXERCISE-func-output.json
index 2ebc76d409..384f74e91b 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/SWAP_CREATED_DUE_TO_EXERCISE-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/SWAP_CREATED_DUE_TO_EXERCISE-func-output.json
@@ -1,124 +1,73 @@
 {
-  "account" : [ {
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "clearing_firm_accounts"
-      },
-      "value" : "pacct1"
-    },
-    "meta" : {
-      "externalKey" : "account1",
-      "globalKey" : "71bc0c06"
-    },
-    "partyReference" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "9d362d34"
-    },
-    "servicingParty" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "9d362d34"
-    }
-  } ],
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "888d726"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "pacct1"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "71bc0c06"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "9d362d34"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "9d362d34"
-              }
-            } ],
-            "clearedDate" : "2014-09-24",
-            "meta" : {
-              "globalKey" : "888d726"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "9d362d34"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "844510",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "TESTBOOKLE"
-                },
-                "meta" : {
-                  "globalKey" : "9d362d34"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "scenario1",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "44f1e133"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME_TRADE_REPORT"
-                },
+                  "value" : "scenario1",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "844409",
+                  "meta" : {
+                    "scheme" : "swaption_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "d46ba3e9"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "44f1e133"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "9d362d34"
-              },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "44f1e133"
               },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS844510",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "ee46e904"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2014-09-24",
+              "meta" : {
+                "globalKey" : "3ef258"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "9d362d34"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -129,46 +78,42 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "fa5f1fb"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "979a8ca"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28caa"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "26"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2014-09-26",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -177,42 +122,94 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec706b12"
-                              },
-                              "unadjustedDate" : "2014-09-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec706b12"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "dbbdb046"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2016-09-26",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "fixedPrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "fixedPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "fa5f1fb"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "979a8ca"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "28c502a4"
-                              },
-                              "unadjustedDate" : "2016-09-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "28c502a4"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "fa5f1fb"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "979a8ca"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "18abc"
+                            },
+                            "rollConvention" : "26"
+                          },
+                          "meta" : {
+                            "globalKey" : "3d468bd8",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b",
+                                "externalKey" : "fixedPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "9e5a4d0f"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -220,154 +217,100 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2015-03-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-03-26",
                               "adjustedStartDate" : "2014-09-26",
+                              "adjustedEndDate" : "2015-03-26",
                               "meta" : {
-                                "globalKey" : "eabb173c"
+                                "globalKey" : "f938a384"
                               },
-                              "fixedRate" : 0.0225,
-                              "notionalAmount" : 10000000
+                              "notionalAmount" : 10000000,
+                              "fixedRate" : 0.0225
                             } ],
                             "meta" : {
-                              "globalKey" : "71796a2"
+                              "globalKey" : "159522ea"
                             }
                           }, {
                             "adjustedPaymentDate" : "2015-09-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-09-28",
                               "adjustedStartDate" : "2015-03-26",
+                              "adjustedEndDate" : "2015-09-28",
                               "meta" : {
-                                "globalKey" : "eb82f4fa"
+                                "globalKey" : "fc32b606"
                               },
-                              "fixedRate" : 0.0225,
-                              "notionalAmount" : 10000000
+                              "notionalAmount" : 10000000,
+                              "fixedRate" : 0.0225
                             } ],
                             "meta" : {
-                              "globalKey" : "9a8e141e"
+                              "globalKey" : "ab3dd52a"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-03-29",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-03-29",
                               "adjustedStartDate" : "2015-09-28",
+                              "adjustedEndDate" : "2016-03-29",
                               "meta" : {
-                                "globalKey" : "ee7d7bdb"
+                                "globalKey" : "fcfa9785"
                               },
-                              "fixedRate" : 0.0225,
-                              "notionalAmount" : 10000000
+                              "notionalAmount" : 10000000,
+                              "fixedRate" : 0.0225
                             } ],
                             "meta" : {
-                              "globalKey" : "b6bd7d1e"
+                              "globalKey" : "c53a98c8"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-09-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-09-26",
                               "adjustedStartDate" : "2016-03-29",
+                              "adjustedEndDate" : "2016-09-26",
                               "meta" : {
-                                "globalKey" : "ef43177f"
+                                "globalKey" : "fff50ba1"
                               },
-                              "fixedRate" : 0.0225,
-                              "notionalAmount" : 10000000
+                              "notionalAmount" : 10000000,
+                              "fixedRate" : 0.0225
                             } ],
                             "meta" : {
-                              "globalKey" : "41a97d65"
+                              "globalKey" : "525b7187"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
                         "meta" : {
-                          "globalKey" : "c74ad7f0"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "637fde97"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "fixedPrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "97b8e49c"
-                            }
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "959"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                          "globalKey" : "cea2fc18"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
-                          }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "b01f2613"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "a9f2dce2"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c4d"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "26"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2014-09-26",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -376,576 +319,579 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec706b12"
-                              },
-                              "unadjustedDate" : "2014-09-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec706b12"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "dcd1f359"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2016-09-26",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "b01f2613"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "a9f2dce2"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "c93e36bc"
-                              },
-                              "unadjustedDate" : "2016-09-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "c93e36bc"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "b01f2613"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "a9f2dce2"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f79"
+                            },
+                            "rollConvention" : "26"
+                          },
+                          "meta" : {
+                            "globalKey" : "ae3812c5",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b",
+                                "externalKey" : "floatPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "9e5a4d0f"
+                          }
+                        },
+                        "resetDates" : {
+                          "calculationPeriodDatesReference" : {
+                            "globalReference" : "ae3812c5",
+                            "externalReference" : "floatingCalcPeriodDates"
+                          },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
+                          "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "1a78799e"
+                            },
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "21479e"
+                              }
+                            },
+                            "dateRelativeTo" : {
+                              "globalReference" : "9093d885",
+                              "externalReference" : "floatingLegResetDates"
+                            }
+                          },
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "b01f2613"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "a9f2dce2"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "9093d885",
+                            "externalKey" : "floatingLegResetDates"
                           }
                         },
+                        "compoundingMethod" : "Flat",
                         "cashflowRepresentation" : {
                           "cashflowsMatchParameters" : true,
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2015-03-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2014-12-29",
                               "adjustedStartDate" : "2014-09-26",
+                              "adjustedEndDate" : "2014-12-29",
                               "meta" : {
-                                "globalKey" : "a6f9f57a"
+                                "globalKey" : "a85bd414"
                               },
+                              "notionalAmount" : 10000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2014-09-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "79f58d8"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 10000000
+                              }
                             }, {
-                              "adjustedEndDate" : "2015-03-26",
                               "adjustedStartDate" : "2014-12-29",
+                              "adjustedEndDate" : "2015-03-26",
                               "meta" : {
-                                "globalKey" : "80dd11b5"
+                                "globalKey" : "be7a161b"
                               },
+                              "notionalAmount" : 10000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2014-12-23",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "79f6ff9"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 10000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "c4fae3d5"
+                              "globalKey" : "a4754861"
                             }
                           }, {
                             "adjustedPaymentDate" : "2015-09-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-06-26",
                               "adjustedStartDate" : "2015-03-26",
+                              "adjustedEndDate" : "2015-06-26",
                               "meta" : {
-                                "globalKey" : "f8493d37"
+                                "globalKey" : "933f43b7"
                               },
+                              "notionalAmount" : 10000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2015-03-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a02258"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 10000000
+                              }
                             }, {
-                              "adjustedEndDate" : "2015-09-28",
                               "adjustedStartDate" : "2015-06-26",
+                              "adjustedEndDate" : "2015-09-28",
                               "meta" : {
-                                "globalKey" : "5664b2f9"
+                                "globalKey" : "8af7f435"
                               },
+                              "notionalAmount" : 10000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2015-06-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a03998"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 10000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "c7243c3e"
+                              "globalKey" : "77a526fa"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-03-29",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-12-29",
                               "adjustedStartDate" : "2015-09-28",
+                              "adjustedEndDate" : "2015-12-29",
                               "meta" : {
-                                "globalKey" : "83039eb8"
+                                "globalKey" : "eac84296"
                               },
+                              "notionalAmount" : 10000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2015-09-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a050d8"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 10000000
+                              }
                             }, {
-                              "adjustedEndDate" : "2016-03-29",
                               "adjustedStartDate" : "2015-12-29",
+                              "adjustedEndDate" : "2016-03-29",
                               "meta" : {
-                                "globalKey" : "f82fbb78"
+                                "globalKey" : "9c3897f8"
                               },
+                              "notionalAmount" : 10000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2015-12-23",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a067f9"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 10000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "843a449d"
+                              "globalKey" : "b0d6077f"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-09-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-06-27",
                               "adjustedStartDate" : "2016-03-29",
+                              "adjustedEndDate" : "2016-06-27",
                               "meta" : {
-                                "globalKey" : "aedfa36"
+                                "globalKey" : "c46c5fa"
                               },
+                              "notionalAmount" : 10000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2016-03-23",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a11a39"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 10000000
+                              }
                             }, {
-                              "adjustedEndDate" : "2016-09-26",
                               "adjustedStartDate" : "2016-06-27",
+                              "adjustedEndDate" : "2016-09-26",
                               "meta" : {
-                                "globalKey" : "c6ed0cf7"
+                                "globalKey" : "95147619"
                               },
+                              "notionalAmount" : 10000000,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2016-06-23",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a13179"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 10000000
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "2864585b"
+                              "globalKey" : "592ef139"
                             }
                           } ]
                         },
-                        "compoundingMethod" : "FLAT",
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
                         "meta" : {
-                          "globalKey" : "1c4646bb"
+                          "globalKey" : "add810c3"
+                        }
+                      } ],
+                      "meta" : {
+                        "globalKey" : "23e698db"
+                      }
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "1f4aa48a"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "1f4aa48a"
+                }
+              },
+              "tradeLot" : [ {
+                "priceQuantity" : [ {
+                  "price" : [ {
+                    "value" : {
+                      "value" : 0.0225,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "perUnitOf" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
+                    }
+                  } ],
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 10000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "8fb4236d"
+                  }
+                }, {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 10000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-LIBOR-BBA"
                         },
-                        "paymentDates" : {
+                        "indexTenor" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "637fde97"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "97b8e49c"
-                            }
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "959"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6
+                            "globalKey" : "aa"
                           }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
-                          }
-                        },
-                        "resetDates" : {
-                          "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "dcd1f359"
-                          },
-                          "fixingDates" : {
-                            "meta" : {
-                              "globalKey" : "3d9c8eea"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "21479e"
-                              }
-                            },
-                            "businessDayConvention" : "NONE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "fde74fcd"
-                            }
-                          },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "fde74fcd"
-                          },
-                          "resetDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "b01f2613"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "a9f2dce2"
-                            }
-                          },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
-                        }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "87b416ab"
-                      }
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "8318225a"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "8318225a"
-                }
-              },
-              "tradeLot" : [ {
-                "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "46b33af3"
-                  },
-                  "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
                         }
                       },
-                      "value" : 0.0225,
-                      "perUnitOf" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "975cb782"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
-                    "rateOption" : {
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
                           "value" : "rateOption-1"
                         } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-LIBOR-BBA"
-                        },
-                        "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
-                        }
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ef258"
-              },
-              "value" : "2014-09-24"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "844510"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "scenario1"
+                    "globalKey" : "a032462e"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "9d362d34",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
+                }
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "TESTBOOKLE",
                   "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "scenario1"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "9d362d34"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "9d362d34",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "swaption_trade_id"
-                  },
-                  "value" : "844409"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "7376a6a9"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS844510"
+                  "value" : "CME_TRADE_REPORT"
+                },
+                "meta" : {
+                  "globalKey" : "44f1e133"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "44f1e133",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "44f1e133",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "9d362d34",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2014-09-24",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "9d362d34",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "pacct1",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "9d362d34",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "d8516122"
+                "globalKey" : "aca5f86",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "104bc168"
+            }
+          },
+          "meta" : {
+            "globalKey" : "104bc168"
           }
         }
       }
     } ],
-    "intent" : "CONTRACT_FORMATION",
+    "eventQualifier" : "ContractFormation",
     "after" : [ {
-      "meta" : {
-        "globalKey" : "691e1e3"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
       "trade" : {
-        "account" : [ {
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "clearing_firm_accounts"
-            },
-            "value" : "pacct1"
-          },
-          "meta" : {
-            "externalKey" : "account1",
-            "globalKey" : "71bc0c06"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "9d362d34"
-          },
-          "servicingParty" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "9d362d34"
-          }
-        } ],
-        "clearedDate" : "2014-09-24",
-        "meta" : {
-          "globalKey" : "888d726"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "clearing_firm",
-            "globalKey" : "9d362d34"
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "1051b",
+            "externalReference" : "clearing_service"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "844510",
               "meta" : {
-                "scheme" : "clearing_member_firms"
-              },
-              "value" : "TESTBOOKLE"
-            },
-            "meta" : {
-              "globalKey" : "9d362d34"
+                "scheme" : "cme_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing_service",
-            "globalKey" : "1051b"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "CME"
-            },
-            "meta" : {
-              "globalKey" : "1051b"
+              "value" : "scenario1",
+              "meta" : {
+                "scheme" : "client_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "trade_source",
-            "globalKey" : "44f1e133"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "CME_TRADE_REPORT"
-            },
+              "value" : "scenario1",
+              "meta" : {
+                "scheme" : "platform_trade_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "844409",
+              "meta" : {
+                "scheme" : "swaption_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "d46ba3e9"
+          }
+        }, {
+          "issuer" : {
+            "value" : "1010000023",
             "meta" : {
-              "globalKey" : "44f1e133"
+              "scheme" : "cftc_Namespace"
             }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "9d362d34"
-          },
-          "partyReference" : {
-            "externalReference" : "trade_source",
-            "globalReference" : "44f1e133"
           },
-          "role" : "DATA_SUBMITTER"
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "CCCIRS844510",
+              "meta" : {
+                "scheme" : "reg_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "ee46e904"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2014-09-24",
+          "meta" : {
+            "globalKey" : "3ef258"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "9d362d34"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -956,46 +902,42 @@
                 "payout" : {
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "fixedPrimaryBusinessCenters",
-                            "globalReference" : "42f910b"
-                          },
-                          "meta" : {
-                            "globalKey" : "fa5f1fb"
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "979a8ca"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "28caa"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6,
-                        "rollConvention" : "26"
-                      },
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/360"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2014-09-26",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -1004,42 +946,94 @@
                           },
                           "meta" : {
                             "globalKey" : "ec706b12"
-                          },
-                          "unadjustedDate" : "2014-09-26"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ec706b12"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "fixedCalcPeriodDates",
-                        "globalKey" : "dbbdb046"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2016-09-26",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
+                                "globalReference" : "42f910b",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "fa5f1fb"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "979a8ca"
                             }
                           },
                           "meta" : {
                             "globalKey" : "28c502a4"
-                          },
-                          "unadjustedDate" : "2016-09-26"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "28c502a4"
                         }
+                      },
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "42f910b",
+                            "externalReference" : "fixedPrimaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "fa5f1fb"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "979a8ca"
+                        }
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "18abc"
+                        },
+                        "rollConvention" : "26"
+                      },
+                      "meta" : {
+                        "globalKey" : "3d468bd8",
+                        "externalKey" : "fixedCalcPeriodDates"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "107"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "GBLO"
+                          }, {
+                            "value" : "USNY"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "42f910b",
+                            "externalKey" : "fixedPrimaryBusinessCenters"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "97b8e49c"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "9e5a4d0f"
                       }
                     },
                     "cashflowRepresentation" : {
@@ -1047,154 +1041,100 @@
                       "paymentCalculationPeriod" : [ {
                         "adjustedPaymentDate" : "2015-03-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2015-03-26",
                           "adjustedStartDate" : "2014-09-26",
+                          "adjustedEndDate" : "2015-03-26",
                           "meta" : {
-                            "globalKey" : "eabb173c"
+                            "globalKey" : "f938a384"
                           },
-                          "fixedRate" : 0.0225,
-                          "notionalAmount" : 10000000
+                          "notionalAmount" : 10000000,
+                          "fixedRate" : 0.0225
                         } ],
                         "meta" : {
-                          "globalKey" : "71796a2"
+                          "globalKey" : "159522ea"
                         }
                       }, {
                         "adjustedPaymentDate" : "2015-09-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2015-09-28",
                           "adjustedStartDate" : "2015-03-26",
+                          "adjustedEndDate" : "2015-09-28",
                           "meta" : {
-                            "globalKey" : "eb82f4fa"
+                            "globalKey" : "fc32b606"
                           },
-                          "fixedRate" : 0.0225,
-                          "notionalAmount" : 10000000
+                          "notionalAmount" : 10000000,
+                          "fixedRate" : 0.0225
                         } ],
                         "meta" : {
-                          "globalKey" : "9a8e141e"
+                          "globalKey" : "ab3dd52a"
                         }
                       }, {
                         "adjustedPaymentDate" : "2016-03-29",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2016-03-29",
                           "adjustedStartDate" : "2015-09-28",
+                          "adjustedEndDate" : "2016-03-29",
                           "meta" : {
-                            "globalKey" : "ee7d7bdb"
+                            "globalKey" : "fcfa9785"
                           },
-                          "fixedRate" : 0.0225,
-                          "notionalAmount" : 10000000
+                          "notionalAmount" : 10000000,
+                          "fixedRate" : 0.0225
                         } ],
                         "meta" : {
-                          "globalKey" : "b6bd7d1e"
+                          "globalKey" : "c53a98c8"
                         }
                       }, {
                         "adjustedPaymentDate" : "2016-09-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2016-09-26",
                           "adjustedStartDate" : "2016-03-29",
+                          "adjustedEndDate" : "2016-09-26",
                           "meta" : {
-                            "globalKey" : "ef43177f"
+                            "globalKey" : "fff50ba1"
                           },
-                          "fixedRate" : 0.0225,
-                          "notionalAmount" : 10000000
+                          "notionalAmount" : 10000000,
+                          "fixedRate" : 0.0225
                         } ],
                         "meta" : {
-                          "globalKey" : "41a97d65"
+                          "globalKey" : "525b7187"
                         }
                       } ]
                     },
-                    "dayCountFraction" : {
-                      "value" : "ACT/360"
-                    },
                     "meta" : {
-                      "globalKey" : "c74ad7f0"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "globalKey" : "637fde97"
-                      },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "GBLO"
-                          }, {
-                            "value" : "USNY"
-                          } ],
-                          "meta" : {
-                            "externalKey" : "fixedPrimaryBusinessCenters",
-                            "globalKey" : "42f910b"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "97b8e49c"
-                        }
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "959"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6
-                      }
-                    },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
-                          }
-                        }
-                      }
+                      "globalKey" : "cea2fc18"
                     }
                   }, {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-2"
                         }
-                      }
-                    },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "42f910b"
-                          },
-                          "meta" : {
-                            "globalKey" : "b01f2613"
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    },
+                    "rateSpecification" : {
+                      "floatingRate" : {
+                        "rateOption" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "rateOption-1"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "a9f2dce2"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "28c4d"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
-                        "rollConvention" : "26"
-                      },
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/360"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2014-09-26",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -1203,527 +1143,567 @@
                           },
                           "meta" : {
                             "globalKey" : "ec706b12"
-                          },
-                          "unadjustedDate" : "2014-09-26"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ec706b12"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "floatingCalcPeriodDates",
-                        "globalKey" : "dcd1f359"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2016-09-26",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "b01f2613"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "a9f2dce2"
                             }
                           },
                           "meta" : {
                             "globalKey" : "c93e36bc"
-                          },
-                          "unadjustedDate" : "2016-09-26"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "c93e36bc"
                         }
+                      },
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "42f910b",
+                            "externalReference" : "floatPrimaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "b01f2613"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "a9f2dce2"
+                        }
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "17f79"
+                        },
+                        "rollConvention" : "26"
+                      },
+                      "meta" : {
+                        "globalKey" : "ae3812c5",
+                        "externalKey" : "floatingCalcPeriodDates"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "107"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "GBLO"
+                          }, {
+                            "value" : "USNY"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "42f910b",
+                            "externalKey" : "floatPrimaryBusinessCenters"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "97b8e49c"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "9e5a4d0f"
+                      }
+                    },
+                    "resetDates" : {
+                      "calculationPeriodDatesReference" : {
+                        "globalReference" : "ae3812c5",
+                        "externalReference" : "floatingCalcPeriodDates"
+                      },
+                      "resetRelativeTo" : "CalculationPeriodStartDate",
+                      "fixingDates" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "1a78799e"
+                        },
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "GBLO"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "21479e"
+                          }
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "9093d885",
+                          "externalReference" : "floatingLegResetDates"
+                        }
+                      },
+                      "resetFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
+                      },
+                      "resetDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "42f910b",
+                            "externalReference" : "floatPrimaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "b01f2613"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "a9f2dce2"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "9093d885",
+                        "externalKey" : "floatingLegResetDates"
                       }
                     },
+                    "compoundingMethod" : "Flat",
                     "cashflowRepresentation" : {
                       "cashflowsMatchParameters" : true,
                       "paymentCalculationPeriod" : [ {
                         "adjustedPaymentDate" : "2015-03-26",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2014-12-29",
                           "adjustedStartDate" : "2014-09-26",
+                          "adjustedEndDate" : "2014-12-29",
                           "meta" : {
-                            "globalKey" : "a6f9f57a"
+                            "globalKey" : "a85bd414"
                           },
+                          "notionalAmount" : 10000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2014-09-24",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "79f58d8"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 10000000
+                          }
                         }, {
-                          "adjustedEndDate" : "2015-03-26",
                           "adjustedStartDate" : "2014-12-29",
+                          "adjustedEndDate" : "2015-03-26",
                           "meta" : {
-                            "globalKey" : "80dd11b5"
+                            "globalKey" : "be7a161b"
                           },
+                          "notionalAmount" : 10000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2014-12-23",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "79f6ff9"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 10000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "c4fae3d5"
+                          "globalKey" : "a4754861"
                         }
                       }, {
                         "adjustedPaymentDate" : "2015-09-28",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2015-06-26",
                           "adjustedStartDate" : "2015-03-26",
+                          "adjustedEndDate" : "2015-06-26",
                           "meta" : {
-                            "globalKey" : "f8493d37"
+                            "globalKey" : "933f43b7"
                           },
+                          "notionalAmount" : 10000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2015-03-24",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a02258"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 10000000
+                          }
                         }, {
-                          "adjustedEndDate" : "2015-09-28",
                           "adjustedStartDate" : "2015-06-26",
+                          "adjustedEndDate" : "2015-09-28",
                           "meta" : {
-                            "globalKey" : "5664b2f9"
+                            "globalKey" : "8af7f435"
                           },
+                          "notionalAmount" : 10000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2015-06-24",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a03998"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 10000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "c7243c3e"
+                          "globalKey" : "77a526fa"
                         }
                       }, {
                         "adjustedPaymentDate" : "2016-03-29",
                         "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2015-12-29",
                           "adjustedStartDate" : "2015-09-28",
+                          "adjustedEndDate" : "2015-12-29",
                           "meta" : {
-                            "globalKey" : "83039eb8"
+                            "globalKey" : "eac84296"
                           },
+                          "notionalAmount" : 10000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2015-09-24",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a050d8"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 10000000
+                          }
                         }, {
-                          "adjustedEndDate" : "2016-03-29",
                           "adjustedStartDate" : "2015-12-29",
+                          "adjustedEndDate" : "2016-03-29",
                           "meta" : {
-                            "globalKey" : "f82fbb78"
+                            "globalKey" : "9c3897f8"
                           },
+                          "notionalAmount" : 10000000,
                           "floatingRateDefinition" : {
                             "rateObservation" : [ {
                               "adjustedFixingDate" : "2015-12-23",
+                              "observedRate" : 0,
                               "meta" : {
                                 "globalKey" : "7a067f9"
-                              },
-                              "observedRate" : 0
+                              }
                             } ]
-                          },
-                          "notionalAmount" : 10000000
+                          }
                         } ],
                         "meta" : {
-                          "globalKey" : "843a449d"
+                          "globalKey" : "b0d6077f"
                         }
                       }, {
                         "adjustedPaymentDate" : "2016-09-26",
-                        "calculationPeriod" : [ {
-                          "adjustedEndDate" : "2016-06-27",
-                          "adjustedStartDate" : "2016-03-29",
-                          "meta" : {
-                            "globalKey" : "aedfa36"
-                          },
-                          "floatingRateDefinition" : {
-                            "rateObservation" : [ {
-                              "adjustedFixingDate" : "2016-03-23",
-                              "meta" : {
-                                "globalKey" : "7a11a39"
-                              },
-                              "observedRate" : 0
-                            } ]
-                          },
-                          "notionalAmount" : 10000000
-                        }, {
-                          "adjustedEndDate" : "2016-09-26",
-                          "adjustedStartDate" : "2016-06-27",
-                          "meta" : {
-                            "globalKey" : "c6ed0cf7"
-                          },
-                          "floatingRateDefinition" : {
-                            "rateObservation" : [ {
-                              "adjustedFixingDate" : "2016-06-23",
-                              "meta" : {
-                                "globalKey" : "7a13179"
-                              },
-                              "observedRate" : 0
-                            } ]
-                          },
-                          "notionalAmount" : 10000000
-                        } ],
-                        "meta" : {
-                          "globalKey" : "2864585b"
-                        }
-                      } ]
-                    },
-                    "compoundingMethod" : "FLAT",
-                    "dayCountFraction" : {
-                      "value" : "ACT/360"
-                    },
-                    "meta" : {
-                      "globalKey" : "1c4646bb"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "globalKey" : "637fde97"
-                      },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "GBLO"
-                          }, {
-                            "value" : "USNY"
-                          } ],
-                          "meta" : {
-                            "externalKey" : "floatPrimaryBusinessCenters",
-                            "globalKey" : "42f910b"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "97b8e49c"
-                        }
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "959"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6
-                      }
-                    },
-                    "rateSpecification" : {
-                      "floatingRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateOption" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "rateOption-1"
-                          }
-                        }
-                      }
-                    },
-                    "resetDates" : {
-                      "calculationPeriodDatesReference" : {
-                        "externalReference" : "floatingCalcPeriodDates",
-                        "globalReference" : "dcd1f359"
-                      },
-                      "fixingDates" : {
-                        "meta" : {
-                          "globalKey" : "3d9c8eea"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "GBLO"
-                          } ],
-                          "meta" : {
-                            "globalKey" : "21479e"
-                          }
-                        },
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "floatingLegResetDates",
-                          "globalReference" : "fde74fcd"
-                        }
-                      },
-                      "meta" : {
-                        "externalKey" : "floatingLegResetDates",
-                        "globalKey" : "fde74fcd"
-                      },
-                      "resetDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "floatPrimaryBusinessCenters",
-                            "globalReference" : "42f910b"
+                        "calculationPeriod" : [ {
+                          "adjustedStartDate" : "2016-03-29",
+                          "adjustedEndDate" : "2016-06-27",
+                          "meta" : {
+                            "globalKey" : "c46c5fa"
                           },
+                          "notionalAmount" : 10000000,
+                          "floatingRateDefinition" : {
+                            "rateObservation" : [ {
+                              "adjustedFixingDate" : "2016-03-23",
+                              "observedRate" : 0,
+                              "meta" : {
+                                "globalKey" : "7a11a39"
+                              }
+                            } ]
+                          }
+                        }, {
+                          "adjustedStartDate" : "2016-06-27",
+                          "adjustedEndDate" : "2016-09-26",
                           "meta" : {
-                            "globalKey" : "b01f2613"
+                            "globalKey" : "95147619"
+                          },
+                          "notionalAmount" : 10000000,
+                          "floatingRateDefinition" : {
+                            "rateObservation" : [ {
+                              "adjustedFixingDate" : "2016-06-23",
+                              "observedRate" : 0,
+                              "meta" : {
+                                "globalKey" : "7a13179"
+                              }
+                            } ]
                           }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
+                        } ],
                         "meta" : {
-                          "globalKey" : "a9f2dce2"
+                          "globalKey" : "592ef139"
                         }
-                      },
-                      "resetFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
-                      },
-                      "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                      } ]
+                    },
+                    "meta" : {
+                      "globalKey" : "add810c3"
                     }
                   } ],
                   "meta" : {
-                    "globalKey" : "87b416ab"
+                    "globalKey" : "23e698db"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "8318225a"
+                "globalKey" : "1f4aa48a"
               }
             },
             "meta" : {
-              "globalKey" : "8318225a"
+              "globalKey" : "1f4aa48a"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "46b33af3"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.0225,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.0225,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
                 }
               } ],
               "quantity" : [ {
+                "value" : {
+                  "value" : 10000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "8fb4236d"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 10000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 10000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
                 }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "975cb782"
-              },
+              } ],
               "observable" : {
-                "meta" : {
-                  "globalKey" : "5f0c6d05"
-                },
                 "rateOption" : {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "rateOption-1"
-                    } ]
-                  },
                   "value" : {
                     "floatingRateIndex" : {
                       "value" : "USD-LIBOR-BBA"
                     },
                     "indexTenor" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
+                      "periodMultiplier" : 3,
                       "period" : "M",
-                      "periodMultiplier" : 3
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "rateOption-1"
+                    } ]
                   }
-                }
-              },
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
                 },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 10000000
+                "meta" : {
+                  "globalKey" : "828026c7"
                 }
-              } ]
-            } ]
-          } ]
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3ef258"
-          },
-          "value" : "2014-09-24"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "cme_trade_id"
               },
-              "value" : "844510"
-            }
-          }, {
-            "identifier" : {
               "meta" : {
-                "scheme" : "client_trade_id"
-              },
-              "value" : "scenario1"
+                "globalKey" : "a032462e"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "9d362d34",
+              "externalReference" : "clearing_firm"
             }
           }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
+            }
+          } ]
+        },
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "TESTBOOKLE",
               "meta" : {
-                "scheme" : "platform_trade_id"
-              },
-              "value" : "scenario1"
+                "scheme" : "clearing_member_firms"
+              }
+            },
+            "meta" : {
+              "globalKey" : "9d362d34"
             }
-          }, {
+          } ],
+          "meta" : {
+            "globalKey" : "9d362d34",
+            "externalKey" : "clearing_firm"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "swaption_trade_id"
-              },
-              "value" : "844409"
+              "value" : "CME"
+            },
+            "meta" : {
+              "globalKey" : "1051b"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "clearing_service",
-            "globalReference" : "1051b"
-          },
           "meta" : {
-            "globalKey" : "7376a6a9"
+            "globalKey" : "1051b",
+            "externalKey" : "clearing_service"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "reg_trade_id"
-              },
-              "value" : "CCCIRS844510"
+              "value" : "CME_TRADE_REPORT"
+            },
+            "meta" : {
+              "globalKey" : "44f1e133"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "44f1e133",
+            "externalKey" : "trade_source"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "44f1e133",
+            "externalReference" : "trade_source"
+          },
+          "role" : "DataSubmitter",
+          "ownershipPartyReference" : {
+            "globalReference" : "9d362d34",
+            "externalReference" : "clearing_firm"
+          }
+        } ],
+        "clearedDate" : "2014-09-24",
+        "account" : [ {
+          "partyReference" : {
+            "globalReference" : "9d362d34",
+            "externalReference" : "clearing_firm"
+          },
+          "accountNumber" : {
+            "value" : "pacct1",
             "meta" : {
-              "scheme" : "cftc_Namespace"
-            },
-            "value" : "1010000023"
+              "scheme" : "clearing_firm_accounts"
+            }
+          },
+          "servicingParty" : {
+            "globalReference" : "9d362d34",
+            "externalReference" : "clearing_firm"
           },
           "meta" : {
-            "globalKey" : "d8516122"
+            "globalKey" : "aca5f86",
+            "externalKey" : "account1"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "104bc168"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
+      },
+      "meta" : {
+        "globalKey" : "a853f3cb"
       }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "474982d"
+      "globalKey" : "e12d36d7"
     }
   },
+  "previousWorkflowStep" : {
+    "globalReference" : "9359a39"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "MSG4529898",
       "meta" : {
         "scheme" : "cme_message_id"
-      },
-      "value" : "MSG4529898"
+      }
     },
     "sentBy" : {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
+      }
     },
     "sentTo" : [ {
+      "value" : "TESTBOOKLE",
       "meta" : {
         "scheme" : "cme_firm_id"
-      },
-      "value" : "TESTBOOKLE"
+      }
     }, {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
+      }
     } ]
   },
-  "meta" : {
-    "globalKey" : "102b5e90"
-  },
+  "timestamp" : [ {
+    "dateTime" : "2014-09-24T09:30:17Z",
+    "qualification" : "eventCreationDateTime"
+  } ],
   "party" : [ {
-    "meta" : {
-      "externalKey" : "clearing_firm",
-      "globalKey" : "9d362d34"
-    },
     "partyId" : [ {
       "identifier" : {
+        "value" : "TESTBOOKLE",
         "meta" : {
           "scheme" : "clearing_member_firms"
-        },
-        "value" : "TESTBOOKLE"
+        }
       },
       "meta" : {
         "globalKey" : "9d362d34"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "clearing_service",
-      "globalKey" : "1051b"
-    },
+      "globalKey" : "9d362d34",
+      "externalKey" : "clearing_firm"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "CME"
@@ -1731,12 +1711,12 @@
       "meta" : {
         "globalKey" : "1051b"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "trade_source",
-      "globalKey" : "44f1e133"
-    },
+      "globalKey" : "1051b",
+      "externalKey" : "clearing_service"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "CME_TRADE_REPORT"
@@ -1744,13 +1724,33 @@
       "meta" : {
         "globalKey" : "44f1e133"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "44f1e133",
+      "externalKey" : "trade_source"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "7fc4108d"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2014-09-24T09:30:17Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+  "account" : [ {
+    "partyReference" : {
+      "globalReference" : "9d362d34",
+      "externalReference" : "clearing_firm"
+    },
+    "accountNumber" : {
+      "value" : "pacct1",
+      "meta" : {
+        "scheme" : "clearing_firm_accounts"
+      }
+    },
+    "servicingParty" : {
+      "globalReference" : "9d362d34",
+      "externalReference" : "clearing_firm"
+    },
+    "meta" : {
+      "globalKey" : "aca5f86",
+      "externalKey" : "account1"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "15b90c3a"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/Swaption-ex01-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/Swaption-ex01-func-output.json
index 5d0a11fce4..7508590837 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/Swaption-ex01-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/Swaption-ex01-func-output.json
@@ -1,124 +1,73 @@
 {
-  "account" : [ {
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "clearing_firm_accounts"
-      },
-      "value" : "0220HOUSE2"
-    },
-    "meta" : {
-      "externalKey" : "account1",
-      "globalKey" : "d5df2f02"
-    },
-    "partyReference" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "1693c0"
-    },
-    "servicingParty" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "1693c0"
-    }
-  } ],
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "6d1864c5"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "0220HOUSE2"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "d5df2f02"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "1693c0"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "1693c0"
-              }
-            } ],
-            "clearedDate" : "2015-01-13",
-            "meta" : {
-              "globalKey" : "fc295f1a"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "1693c0"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "2896735",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "0220"
-                },
-                "meta" : {
-                  "globalKey" : "1693c0"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "2098916",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "902a6db3"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CHI2WIRE"
-                },
+                  "value" : "19427806",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "19427806",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "285a4917"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "902a6db3"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "1693c0"
-              },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "902a6db3"
               },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS2896735",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e12d1a10"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2015-01-13",
+              "meta" : {
+                "globalKey" : "3ef84d"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "1693c0"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -127,30 +76,23 @@
                   } ],
                   "economicTerms" : {
                     "payout" : {
-                      "meta" : {
-                        "globalKey" : "762ef921"
-                      },
                       "optionPayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "buyerSeller" : {
-                          "buyer" : "PARTY_1",
-                          "seller" : "PARTY_2"
+                          "buyer" : "Party1",
+                          "seller" : "Party2"
                         },
                         "exerciseTerms" : {
                           "optionStyle" : {
                             "europeanExercise" : {
-                              "earliestExerciseTime" : {
-                                "businessCenter" : {
-                                  "value" : "USNY"
-                                },
-                                "hourMinuteTime" : "09:00:00"
-                              },
                               "expirationDate" : [ {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2015-07-13",
                                   "dateAdjustments" : {
+                                    "businessDayConvention" : "PRECEDING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "USNY"
@@ -159,35 +101,36 @@
                                         "globalKey" : "27e4e9"
                                       }
                                     },
-                                    "businessDayConvention" : "PRECEDING",
                                     "meta" : {
                                       "globalKey" : "4c776966"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "77d87b9"
-                                  },
-                                  "unadjustedDate" : "2015-07-13"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "77d87b9"
                                 }
                               } ],
+                              "earliestExerciseTime" : {
+                                "hourMinuteTime" : "09:00:00",
+                                "businessCenter" : {
+                                  "value" : "USNY"
+                                }
+                              },
                               "expirationTime" : {
+                                "hourMinuteTime" : "11:00:00",
                                 "businessCenter" : {
                                   "value" : "USNY"
-                                },
-                                "hourMinuteTime" : "11:00:00"
+                                }
                               },
                               "meta" : {
-                                "globalKey" : "efe6ebc6"
+                                "globalKey" : "31db4746"
                               }
                             }
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "762ef921"
-                        },
                         "underlier" : {
                           "contractualProduct" : {
                             "productTaxonomy" : [ {
@@ -198,46 +141,42 @@
                               "payout" : {
                                 "interestRatePayout" : [ {
                                   "payerReceiver" : {
-                                    "payer" : "PARTY_1",
-                                    "receiver" : "PARTY_2"
+                                    "payer" : "Party1",
+                                    "receiver" : "Party2"
                                   },
                                   "priceQuantity" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
                                     "quantitySchedule" : {
                                       "address" : {
                                         "scope" : "DOCUMENT",
                                         "value" : "quantity-1"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "0"
                                     }
                                   },
-                                  "calculationPeriodDates" : {
-                                    "calculationPeriodDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "fixedPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "fa5f1fb"
+                                  "rateSpecification" : {
+                                    "fixedRate" : {
+                                      "rateSchedule" : {
+                                        "price" : {
+                                          "address" : {
+                                            "scope" : "DOCUMENT",
+                                            "value" : "price-1"
+                                          }
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
-                                        "globalKey" : "979a8ca"
+                                        "globalKey" : "0"
                                       }
-                                    },
-                                    "calculationPeriodFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "28c8a"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6,
-                                      "rollConvention" : "15"
-                                    },
+                                    }
+                                  },
+                                  "dayCountFraction" : {
+                                    "value" : "30/360"
+                                  },
+                                  "calculationPeriodDates" : {
                                     "effectiveDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2015-07-15",
                                         "dateAdjustments" : {
                                           "businessDayConvention" : "NONE",
                                           "meta" : {
@@ -246,42 +185,94 @@
                                         },
                                         "meta" : {
                                           "globalKey" : "ec8c6947"
-                                        },
-                                        "unadjustedDate" : "2015-07-15"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "ec8c6947"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "fixedCalcPeriodDates",
-                                      "globalKey" : "44841946"
-                                    },
                                     "terminationDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2022-07-15",
                                         "dateAdjustments" : {
+                                          "businessDayConvention" : "MODFOLLOWING",
                                           "businessCenters" : {
                                             "businessCentersReference" : {
-                                              "externalReference" : "fixedPrimaryBusinessCenters",
-                                              "globalReference" : "42f910b"
+                                              "globalReference" : "42f910b",
+                                              "externalReference" : "fixedPrimaryBusinessCenters"
                                             },
                                             "meta" : {
                                               "globalKey" : "fa5f1fb"
                                             }
                                           },
-                                          "businessDayConvention" : "MODFOLLOWING",
                                           "meta" : {
                                             "globalKey" : "979a8ca"
                                           }
                                         },
                                         "meta" : {
                                           "globalKey" : "321c23d9"
-                                        },
-                                        "unadjustedDate" : "2022-07-15"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "321c23d9"
                                       }
+                                    },
+                                    "calculationPeriodDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "fixedPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "fa5f1fb"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "979a8ca"
+                                      }
+                                    },
+                                    "calculationPeriodFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "18a9c"
+                                      },
+                                      "rollConvention" : "15"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "8d18b4d8",
+                                      "externalKey" : "fixedCalcPeriodDates"
+                                    }
+                                  },
+                                  "paymentDates" : {
+                                    "paymentFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "107"
+                                      }
+                                    },
+                                    "payRelativeTo" : "CalculationPeriodEndDate",
+                                    "paymentDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        }, {
+                                          "value" : "USNY"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "42f910b",
+                                          "externalKey" : "fixedPrimaryBusinessCenters"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "97b8e49c"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "9e5a4d0f"
                                     }
                                   },
                                   "cashflowRepresentation" : {
@@ -289,294 +280,240 @@
                                     "paymentCalculationPeriod" : [ {
                                       "adjustedPaymentDate" : "2016-01-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-01-15",
                                         "adjustedStartDate" : "2015-07-15",
+                                        "adjustedEndDate" : "2016-01-15",
                                         "meta" : {
-                                          "globalKey" : "daf48d55"
+                                          "globalKey" : "4e94250b"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000
+                                        "notionalAmount" : 5000000,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "b0e46666"
+                                        "globalKey" : "2483fe1c"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-07-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-07-15",
                                         "adjustedStartDate" : "2016-01-15",
+                                        "adjustedEndDate" : "2016-07-15",
                                         "meta" : {
-                                          "globalKey" : "dbbb8255"
+                                          "globalKey" : "518e300b"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000
+                                        "notionalAmount" : 5000000,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "40f049e6"
+                                        "globalKey" : "b6c2f79c"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-01-17",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-01-17",
                                         "adjustedStartDate" : "2016-07-15",
+                                        "adjustedEndDate" : "2017-01-17",
                                         "meta" : {
-                                          "globalKey" : "deb67613"
+                                          "globalKey" : "52552c8d"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000
+                                        "notionalAmount" : 5000000,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "5ed4f862"
+                                        "globalKey" : "d273aedc"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-07-17",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-07-17",
                                         "adjustedStartDate" : "2017-01-17",
+                                        "adjustedEndDate" : "2017-07-17",
                                         "meta" : {
-                                          "globalKey" : "df7d7295"
+                                          "globalKey" : "5550204b"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000
+                                        "notionalAmount" : 5000000,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "eee0e364"
+                                        "globalKey" : "64b3911a"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-01-16",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-01-16",
                                         "adjustedStartDate" : "2017-07-17",
+                                        "adjustedEndDate" : "2018-01-16",
                                         "meta" : {
-                                          "globalKey" : "e2770936"
+                                          "globalKey" : "5617118a"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000
+                                        "notionalAmount" : 5000000,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "7a5aae6"
+                                        "globalKey" : "7b45b33a"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-07-16",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-07-16",
                                         "adjustedStartDate" : "2018-01-16",
+                                        "adjustedEndDate" : "2018-07-16",
                                         "meta" : {
-                                          "globalKey" : "e33dfa75"
+                                          "globalKey" : "5910a82b"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000
+                                        "notionalAmount" : 5000000,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "97b18aa5"
+                                        "globalKey" : "d84385b"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-01-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-01-15",
                                         "adjustedStartDate" : "2018-07-16",
+                                        "adjustedEndDate" : "2019-01-15",
                                         "meta" : {
-                                          "globalKey" : "e6379116"
+                                          "globalKey" : "59d7996a"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000
+                                        "notionalAmount" : 5000000,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "b0765227"
+                                        "globalKey" : "24165a7b"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-07-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-07-15",
                                         "adjustedStartDate" : "2019-01-15",
+                                        "adjustedEndDate" : "2019-07-15",
                                         "meta" : {
-                                          "globalKey" : "e6fe8255"
+                                          "globalKey" : "5cd1300b"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000
+                                        "notionalAmount" : 5000000,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "408231e6"
+                                        "globalKey" : "b654df9c"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-01-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-01-15",
                                         "adjustedStartDate" : "2019-07-15",
+                                        "adjustedEndDate" : "2020-01-15",
                                         "meta" : {
-                                          "globalKey" : "e9f88d55"
+                                          "globalKey" : "5d98250b"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000
+                                        "notionalAmount" : 5000000,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "5afc4666"
+                                        "globalKey" : "ce9bde1c"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-07-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-07-15",
                                         "adjustedStartDate" : "2020-01-15",
+                                        "adjustedEndDate" : "2020-07-15",
                                         "meta" : {
-                                          "globalKey" : "eabf8255"
+                                          "globalKey" : "6092300b"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000
+                                        "notionalAmount" : 5000000,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "eb0829e6"
+                                        "globalKey" : "60dad79c"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-01-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-01-15",
                                         "adjustedStartDate" : "2020-07-15",
+                                        "adjustedEndDate" : "2021-01-15",
                                         "meta" : {
-                                          "globalKey" : "edb98d55"
+                                          "globalKey" : "6159250b"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000
+                                        "notionalAmount" : 5000000,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "5823e66"
+                                        "globalKey" : "7921d61c"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-07-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-07-15",
                                         "adjustedStartDate" : "2021-01-15",
+                                        "adjustedEndDate" : "2021-07-15",
                                         "meta" : {
-                                          "globalKey" : "ee808255"
+                                          "globalKey" : "6453300b"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000
+                                        "notionalAmount" : 5000000,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "958e21e6"
+                                        "globalKey" : "b60cf9c"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2022-01-18",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2022-01-18",
                                         "adjustedStartDate" : "2021-07-15",
+                                        "adjustedEndDate" : "2022-01-18",
                                         "meta" : {
-                                          "globalKey" : "f17bea72"
+                                          "globalKey" : "651a304e"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000
+                                        "notionalAmount" : 5000000,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "b5281d60"
+                                        "globalKey" : "28c6633c"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2022-07-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2022-07-15",
                                         "adjustedStartDate" : "2022-01-18",
+                                        "adjustedEndDate" : "2022-07-15",
                                         "meta" : {
-                                          "globalKey" : "f2418d98"
+                                          "globalKey" : "68158d28"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000
+                                        "notionalAmount" : 5000000,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "40142529"
+                                        "globalKey" : "b5e824b9"
                                       }
                                     } ]
                                   },
-                                  "dayCountFraction" : {
-                                    "value" : "30/360"
-                                  },
                                   "meta" : {
-                                    "globalKey" : "844a965e"
-                                  },
-                                  "paymentDates" : {
-                                    "meta" : {
-                                      "globalKey" : "637fde97"
-                                    },
-                                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                    "paymentDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        }, {
-                                          "value" : "USNY"
-                                        } ],
-                                        "meta" : {
-                                          "externalKey" : "fixedPrimaryBusinessCenters",
-                                          "globalKey" : "42f910b"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "97b8e49c"
-                                      }
-                                    },
-                                    "paymentFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "959"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6
-                                    }
-                                  },
-                                  "rateSpecification" : {
-                                    "fixedRate" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
-                                      "rateSchedule" : {
-                                        "price" : {
-                                          "address" : {
-                                            "scope" : "DOCUMENT",
-                                            "value" : "price-1"
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }, {
-                                  "payerReceiver" : {
-                                    "payer" : "PARTY_2",
-                                    "receiver" : "PARTY_1"
+                                    "globalKey" : "9f0dc1aa"
+                                  }
+                                }, {
+                                  "payerReceiver" : {
+                                    "payer" : "Party2",
+                                    "receiver" : "Party1"
                                   },
                                   "priceQuantity" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
                                     "quantitySchedule" : {
                                       "address" : {
                                         "scope" : "DOCUMENT",
                                         "value" : "quantity-2"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "0"
                                     }
                                   },
-                                  "calculationPeriodDates" : {
-                                    "calculationPeriodDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "floatPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "b01f2613"
+                                  "rateSpecification" : {
+                                    "floatingRate" : {
+                                      "rateOption" : {
+                                        "address" : {
+                                          "scope" : "DOCUMENT",
+                                          "value" : "rateOption-1"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
-                                        "globalKey" : "a9f2dce2"
+                                        "globalKey" : "0"
                                       }
-                                    },
-                                    "calculationPeriodFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "28c2d"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3,
-                                      "rollConvention" : "15"
-                                    },
+                                    }
+                                  },
+                                  "dayCountFraction" : {
+                                    "value" : "ACT/360"
+                                  },
+                                  "calculationPeriodDates" : {
                                     "effectiveDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2015-07-15",
                                         "dateAdjustments" : {
                                           "businessDayConvention" : "NONE",
                                           "meta" : {
@@ -585,42 +522,148 @@
                                         },
                                         "meta" : {
                                           "globalKey" : "ec8c6947"
-                                        },
-                                        "unadjustedDate" : "2015-07-15"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "ec8c6947"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "floatingCalcPeriodDates",
-                                      "globalKey" : "45985c59"
-                                    },
                                     "terminationDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2022-07-15",
                                         "dateAdjustments" : {
+                                          "businessDayConvention" : "MODFOLLOWING",
                                           "businessCenters" : {
                                             "businessCentersReference" : {
-                                              "externalReference" : "floatPrimaryBusinessCenters",
-                                              "globalReference" : "42f910b"
+                                              "globalReference" : "42f910b",
+                                              "externalReference" : "floatPrimaryBusinessCenters"
                                             },
                                             "meta" : {
                                               "globalKey" : "b01f2613"
                                             }
                                           },
-                                          "businessDayConvention" : "MODFOLLOWING",
                                           "meta" : {
                                             "globalKey" : "a9f2dce2"
                                           }
                                         },
                                         "meta" : {
                                           "globalKey" : "d29557f1"
-                                        },
-                                        "unadjustedDate" : "2022-07-15"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "d29557f1"
                                       }
+                                    },
+                                    "calculationPeriodDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "floatPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "b01f2613"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "a9f2dce2"
+                                      }
+                                    },
+                                    "calculationPeriodFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "17f59"
+                                      },
+                                      "rollConvention" : "15"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "fe0a3bc5",
+                                      "externalKey" : "floatingCalcPeriodDates"
+                                    }
+                                  },
+                                  "paymentDates" : {
+                                    "paymentFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "aa"
+                                      }
+                                    },
+                                    "payRelativeTo" : "CalculationPeriodEndDate",
+                                    "paymentDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        }, {
+                                          "value" : "USNY"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "42f910b",
+                                          "externalKey" : "floatPrimaryBusinessCenters"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "97b8e49c"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "e18d000c"
+                                    }
+                                  },
+                                  "resetDates" : {
+                                    "calculationPeriodDatesReference" : {
+                                      "globalReference" : "fe0a3bc5",
+                                      "externalReference" : "floatingCalcPeriodDates"
+                                    },
+                                    "resetRelativeTo" : "CalculationPeriodStartDate",
+                                    "fixingDates" : {
+                                      "periodMultiplier" : -2,
+                                      "period" : "D",
+                                      "meta" : {
+                                        "globalKey" : "1a78799e"
+                                      },
+                                      "dayType" : "Business",
+                                      "businessDayConvention" : "NONE",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "21479e"
+                                        }
+                                      },
+                                      "dateRelativeTo" : {
+                                        "globalReference" : "d4638f85",
+                                        "externalReference" : "floatingLegResetDates"
+                                      }
+                                    },
+                                    "resetFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "aa"
+                                      }
+                                    },
+                                    "resetDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "floatPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "b01f2613"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "a9f2dce2"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "d4638f85",
+                                      "externalKey" : "floatingLegResetDates"
                                     }
                                   },
                                   "cashflowRepresentation" : {
@@ -628,928 +671,862 @@
                                     "paymentCalculationPeriod" : [ {
                                       "adjustedPaymentDate" : "2015-10-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2015-10-15",
                                         "adjustedStartDate" : "2015-07-15",
+                                        "adjustedEndDate" : "2015-10-15",
                                         "meta" : {
-                                          "globalKey" : "aa2a36d8"
+                                          "globalKey" : "45203d58"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2015-07-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a04003"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "33093267"
+                                        "globalKey" : "cdff38e7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-01-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-01-15",
                                         "adjustedStartDate" : "2015-10-15",
+                                        "adjustedEndDate" : "2016-01-15",
                                         "meta" : {
-                                          "globalKey" : "1da17b18"
+                                          "globalKey" : "c1aa5798"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2015-10-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a05743"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "2ffebc67"
+                                        "globalKey" : "d40798e7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-04-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-04-15",
                                         "adjustedStartDate" : "2016-01-15",
+                                        "adjustedEndDate" : "2016-04-15",
                                         "meta" : {
-                                          "globalKey" : "9a2c3058"
+                                          "globalKey" : "352236d8"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2016-01-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a10983"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "dfdcb267"
+                                        "globalKey" : "7ad2b8e7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-07-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-07-15",
                                         "adjustedStartDate" : "2016-04-15",
+                                        "adjustedEndDate" : "2016-07-15",
                                         "meta" : {
-                                          "globalKey" : "8e7b2f98"
+                                          "globalKey" : "29713618"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2016-04-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a120c3"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "77ef267"
+                                        "globalKey" : "a274f8e7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-10-17",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-10-17",
                                         "adjustedStartDate" : "2016-07-15",
+                                        "adjustedEndDate" : "2016-10-17",
                                         "meta" : {
-                                          "globalKey" : "ec96a55a"
+                                          "globalKey" : "2129e696"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2016-07-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a13803"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "c17686eb"
+                                        "globalKey" : "f609c827"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-01-17",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-01-17",
                                         "adjustedStartDate" : "2016-10-17",
+                                        "adjustedEndDate" : "2017-01-17",
                                         "meta" : {
-                                          "globalKey" : "63779ad8"
+                                          "globalKey" : "7807758"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2016-10-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a14f43"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "c1d5c229"
+                                        "globalKey" : "65de9ea9"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-04-18",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-04-18",
                                         "adjustedStartDate" : "2017-01-17",
+                                        "adjustedEndDate" : "2017-04-18",
                                         "meta" : {
-                                          "globalKey" : "14e88b59"
+                                          "globalKey" : "7cad2f37"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2017-01-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a20183"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "3ade626b"
+                                        "globalKey" : "a2a30649"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-07-17",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-07-17",
                                         "adjustedStartDate" : "2017-04-18",
+                                        "adjustedEndDate" : "2017-07-17",
                                         "meta" : {
-                                          "globalKey" : "d60627d8"
+                                          "globalKey" : "a42d90fa"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2017-04-12",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a218a4"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "9b0ad0a9"
+                                        "globalKey" : "693239cb"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-10-16",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-10-16",
                                         "adjustedStartDate" : "2017-07-17",
+                                        "adjustedEndDate" : "2017-10-16",
                                         "meta" : {
-                                          "globalKey" : "93ba1357"
+                                          "globalKey" : "61e17c79"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2017-07-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a23003"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "f7cd8de7"
+                                        "globalKey" : "c5f4f709"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-01-16",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-01-16",
                                         "adjustedStartDate" : "2017-10-16",
+                                        "adjustedEndDate" : "2018-01-16",
                                         "meta" : {
-                                          "globalKey" : "57c7ed9"
+                                          "globalKey" : "a9855b59"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2017-10-12",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a24724"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "f30e3f29"
+                                        "globalKey" : "97171ba9"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-04-16",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-04-16",
                                         "adjustedStartDate" : "2018-01-16",
+                                        "adjustedEndDate" : "2018-04-16",
                                         "meta" : {
-                                          "globalKey" : "82073419"
+                                          "globalKey" : "1cfd3a99"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2018-01-12",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a2f964"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "a2ec3529"
+                                        "globalKey" : "3de23ba9"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-07-16",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-07-16",
                                         "adjustedStartDate" : "2018-04-16",
+                                        "adjustedEndDate" : "2018-07-16",
                                         "meta" : {
-                                          "globalKey" : "76563359"
+                                          "globalKey" : "114c39d9"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2018-04-12",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a310a4"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "ca8e7529"
+                                        "globalKey" : "65847ba9"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-10-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-10-15",
                                         "adjustedStartDate" : "2018-07-16",
+                                        "adjustedEndDate" : "2018-10-15",
                                         "meta" : {
-                                          "globalKey" : "35bef758"
+                                          "globalKey" : "3e6607a"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2018-07-12",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a327e4"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "29060ae7"
+                                        "globalKey" : "f72d7409"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-01-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-01-15",
                                         "adjustedStartDate" : "2018-10-15",
+                                        "adjustedEndDate" : "2019-01-15",
                                         "meta" : {
-                                          "globalKey" : "a78162da"
+                                          "globalKey" : "4b8a3f5a"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2018-10-11",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a33f05"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "2446bc29"
+                                        "globalKey" : "c84f98a9"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-04-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-04-15",
                                         "adjustedStartDate" : "2019-01-15",
+                                        "adjustedEndDate" : "2019-04-15",
                                         "meta" : {
-                                          "globalKey" : "240c181a"
+                                          "globalKey" : "bf021e9a"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-01-11",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a3f145"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "d424b229"
+                                        "globalKey" : "6f1ab8a9"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-07-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-07-15",
                                         "adjustedStartDate" : "2019-04-15",
+                                        "adjustedEndDate" : "2019-07-15",
                                         "meta" : {
-                                          "globalKey" : "185b175a"
+                                          "globalKey" : "b3511dda"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-04-11",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a40885"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "fbc6f229"
+                                        "globalKey" : "96bcf8a9"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-10-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-10-15",
                                         "adjustedStartDate" : "2019-07-15",
+                                        "adjustedEndDate" : "2019-10-15",
                                         "meta" : {
-                                          "globalKey" : "caa169a"
+                                          "globalKey" : "a7a01d1a"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-07-11",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a41fc5"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "23693229"
+                                        "globalKey" : "be5f38a9"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-01-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-01-15",
                                         "adjustedStartDate" : "2019-10-15",
+                                        "adjustedEndDate" : "2020-01-15",
                                         "meta" : {
-                                          "globalKey" : "80215ada"
+                                          "globalKey" : "242a375a"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-10-11",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a43705"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "205ebc29"
+                                        "globalKey" : "c46798a9"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-04-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-04-15",
                                         "adjustedStartDate" : "2020-01-15",
+                                        "adjustedEndDate" : "2020-04-15",
                                         "meta" : {
-                                          "globalKey" : "fcac1058"
+                                          "globalKey" : "97a216d8"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-01-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a4e983"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "d03cb267"
+                                        "globalKey" : "6b32b8e7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-07-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-07-15",
                                         "adjustedStartDate" : "2020-04-15",
+                                        "adjustedEndDate" : "2020-07-15",
                                         "meta" : {
-                                          "globalKey" : "f0fb0f1c"
+                                          "globalKey" : "8bf1159c"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-04-09",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a50047"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "f7def1eb"
+                                        "globalKey" : "92d4f86b"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-10-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-10-15",
                                         "adjustedStartDate" : "2020-07-15",
+                                        "adjustedEndDate" : "2020-10-15",
                                         "meta" : {
-                                          "globalKey" : "e54a0ed8"
+                                          "globalKey" : "80401558"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-07-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a51803"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "1f813267"
+                                        "globalKey" : "ba7738e7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-01-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-01-15",
                                         "adjustedStartDate" : "2020-10-15",
+                                        "adjustedEndDate" : "2021-01-15",
                                         "meta" : {
-                                          "globalKey" : "58c15318"
+                                          "globalKey" : "fcca2f98"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-10-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a52f43"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "1c76bc67"
+                                        "globalKey" : "c07f98e7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-04-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-04-15",
                                         "adjustedStartDate" : "2021-01-15",
+                                        "adjustedEndDate" : "2021-04-15",
                                         "meta" : {
-                                          "globalKey" : "d54c0858"
+                                          "globalKey" : "70420ed8"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2021-01-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a5e183"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "cc54b267"
+                                        "globalKey" : "674ab8e7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-07-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-07-15",
                                         "adjustedStartDate" : "2021-04-15",
+                                        "adjustedEndDate" : "2021-07-15",
                                         "meta" : {
-                                          "globalKey" : "c99b0798"
+                                          "globalKey" : "64910e18"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2021-04-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a5f8c3"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "f3f6f267"
+                                        "globalKey" : "8eecf8e7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-10-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-10-15",
                                         "adjustedStartDate" : "2021-07-15",
+                                        "adjustedEndDate" : "2021-10-15",
                                         "meta" : {
-                                          "globalKey" : "bdea06d8"
+                                          "globalKey" : "58e00d58"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2021-07-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a61003"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "1b993267"
+                                        "globalKey" : "b68f38e7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2022-01-18",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2022-01-18",
                                         "adjustedStartDate" : "2021-10-15",
+                                        "adjustedEndDate" : "2022-01-18",
                                         "meta" : {
-                                          "globalKey" : "d013fcdb"
+                                          "globalKey" : "da88b175"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2021-10-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a62743"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "740ebb2d"
+                                        "globalKey" : "7e836fc7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2022-04-19",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2022-04-19",
                                         "adjustedStartDate" : "2022-01-18",
+                                        "adjustedEndDate" : "2022-04-19",
                                         "meta" : {
-                                          "globalKey" : "86a37758"
+                                          "globalKey" : "ee681b36"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2022-01-14",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a6d9a2"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "f235e56b"
+                                        "globalKey" : "59fa8949"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2022-07-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2022-07-15",
                                         "adjustedStartDate" : "2022-04-19",
+                                        "adjustedEndDate" : "2022-07-15",
                                         "meta" : {
-                                          "globalKey" : "a90e6214"
+                                          "globalKey" : "10c9f31c"
                                         },
+                                        "notionalAmount" : 5000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2022-04-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a6f0c3"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "f6e254e3"
+                                        "globalKey" : "5e9de5eb"
                                       }
                                     } ]
                                   },
-                                  "dayCountFraction" : {
-                                    "value" : "ACT/360"
-                                  },
                                   "meta" : {
-                                    "globalKey" : "972d248a"
-                                  },
-                                  "paymentDates" : {
-                                    "meta" : {
-                                      "globalKey" : "637fde94"
-                                    },
-                                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                    "paymentDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        }, {
-                                          "value" : "USNY"
-                                        } ],
-                                        "meta" : {
-                                          "externalKey" : "floatPrimaryBusinessCenters",
-                                          "globalKey" : "42f910b"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "97b8e49c"
-                                      }
-                                    },
-                                    "paymentFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "956"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3
-                                    }
-                                  },
-                                  "rateSpecification" : {
-                                    "floatingRate" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
-                                      "rateOption" : {
-                                        "address" : {
-                                          "scope" : "DOCUMENT",
-                                          "value" : "rateOption-1"
-                                        }
-                                      }
-                                    }
-                                  },
-                                  "resetDates" : {
-                                    "calculationPeriodDatesReference" : {
-                                      "externalReference" : "floatingCalcPeriodDates",
-                                      "globalReference" : "45985c59"
-                                    },
-                                    "fixingDates" : {
-                                      "meta" : {
-                                        "globalKey" : "3d9c8eea"
-                                      },
-                                      "period" : "D",
-                                      "periodMultiplier" : -2,
-                                      "dayType" : "BUSINESS",
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        } ],
-                                        "meta" : {
-                                          "globalKey" : "21479e"
-                                        }
-                                      },
-                                      "businessDayConvention" : "NONE",
-                                      "dateRelativeTo" : {
-                                        "externalReference" : "floatingLegResetDates",
-                                        "globalReference" : "b9fac6cd"
-                                      }
-                                    },
-                                    "meta" : {
-                                      "externalKey" : "floatingLegResetDates",
-                                      "globalKey" : "b9fac6cd"
-                                    },
-                                    "resetDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "floatPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "b01f2613"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "a9f2dce2"
-                                      }
-                                    },
-                                    "resetFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "956"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3
-                                    },
-                                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                                    "globalKey" : "b0aff9ae"
                                   }
                                 } ],
                                 "meta" : {
-                                  "globalKey" : "413276c"
+                                  "globalKey" : "a56149c4"
                                 }
                               }
                             },
                             "meta" : {
-                              "globalKey" : "87c66f1d"
+                              "globalKey" : "29149175"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "87c66f1d"
+                            "globalKey" : "29149175"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "ba3d56f9"
                         }
-                      } ]
+                      } ],
+                      "meta" : {
+                        "globalKey" : "ba3d56f9"
+                      }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "b4aead56"
+                    "globalKey" : "f8bd0b2e"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "b4aead56"
+                  "globalKey" : "f8bd0b2e"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "1609049a"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.02,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.02,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 5000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "ab178ea6"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 5000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 5000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "dd05b62c"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 5000000
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
+                  },
+                  "meta" : {
+                    "globalKey" : "bd147858"
+                  }
                 } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ef84d"
-              },
-              "value" : "2015-01-13"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
-                  },
-                  "value" : "2896735"
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "1693c0",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "2098916"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "0220",
                   "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "19427806"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "1693c0"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "1693c0",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "19427806"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "82743157"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS2896735"
+                  "value" : "CHI2WIRE"
+                },
+                "meta" : {
+                  "globalKey" : "902a6db3"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "902a6db3",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "902a6db3",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "1693c0",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2015-01-13",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "1693c0",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "0220HOUSE2",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "1693c0",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "aa6f7f2e"
+                "globalKey" : "ceb64a82",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "f0a775c2"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "4767f59f"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "1693c0"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                }
-              },
               "quantity" : {
+                "value" : 500,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "1693c0",
+                  "externalReference" : "clearing_firm"
                 },
-                "value" : 500
+                "receiverPartyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
+                }
               },
               "settlementDate" : {
+                "unadjustedDate" : "2015-01-15",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "USNY"
@@ -1558,122 +1535,91 @@
                       "globalKey" : "27e4e9"
                     }
                   },
-                  "businessDayConvention" : "MODFOLLOWING",
                   "meta" : {
                     "globalKey" : "3662e8ba"
                   }
-                },
-                "unadjustedDate" : "2015-01-15"
+                }
               },
               "transferExpression" : {
-                "priceTransfer" : "PREMIUM"
+                "priceTransfer" : "Premium"
               }
+            },
+            "meta" : {
+              "globalKey" : "eb7a4c85"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "5d7d0603"
+          }
         }
       }
     } ],
-    "intent" : "CONTRACT_FORMATION",
+    "eventQualifier" : "ContractFormation",
     "after" : [ {
-      "meta" : {
-        "globalKey" : "3a9d66e8"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
       "trade" : {
-        "account" : [ {
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "clearing_firm_accounts"
-            },
-            "value" : "0220HOUSE2"
-          },
-          "meta" : {
-            "externalKey" : "account1",
-            "globalKey" : "d5df2f02"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "1693c0"
-          },
-          "servicingParty" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "1693c0"
-          }
-        } ],
-        "clearedDate" : "2015-01-13",
-        "meta" : {
-          "globalKey" : "fc295f1a"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "clearing_firm",
-            "globalKey" : "1693c0"
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "1051b",
+            "externalReference" : "clearing_service"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "2896735",
               "meta" : {
-                "scheme" : "clearing_member_firms"
-              },
-              "value" : "0220"
-            },
-            "meta" : {
-              "globalKey" : "1693c0"
+                "scheme" : "cme_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing_service",
-            "globalKey" : "1051b"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "CME"
-            },
-            "meta" : {
-              "globalKey" : "1051b"
+              "value" : "2098916",
+              "meta" : {
+                "scheme" : "client_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "trade_source",
-            "globalKey" : "902a6db3"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "CHI2WIRE"
-            },
+              "value" : "19427806",
+              "meta" : {
+                "scheme" : "platform_trade_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "19427806",
+              "meta" : {
+                "scheme" : "block_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "285a4917"
+          }
+        }, {
+          "issuer" : {
+            "value" : "1010000023",
             "meta" : {
-              "globalKey" : "902a6db3"
+              "scheme" : "cftc_Namespace"
             }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "1693c0"
-          },
-          "partyReference" : {
-            "externalReference" : "trade_source",
-            "globalReference" : "902a6db3"
           },
-          "role" : "DATA_SUBMITTER"
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "CCCIRS2896735",
+              "meta" : {
+                "scheme" : "reg_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e12d1a10"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2015-01-13",
+          "meta" : {
+            "globalKey" : "3ef84d"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "1693c0"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -1682,30 +1628,23 @@
               } ],
               "economicTerms" : {
                 "payout" : {
-                  "meta" : {
-                    "globalKey" : "762ef921"
-                  },
                   "optionPayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "buyerSeller" : {
-                      "buyer" : "PARTY_1",
-                      "seller" : "PARTY_2"
+                      "buyer" : "Party1",
+                      "seller" : "Party2"
                     },
                     "exerciseTerms" : {
                       "optionStyle" : {
                         "europeanExercise" : {
-                          "earliestExerciseTime" : {
-                            "businessCenter" : {
-                              "value" : "USNY"
-                            },
-                            "hourMinuteTime" : "09:00:00"
-                          },
                           "expirationDate" : [ {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2015-07-13",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "PRECEDING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
@@ -1714,35 +1653,36 @@
                                     "globalKey" : "27e4e9"
                                   }
                                 },
-                                "businessDayConvention" : "PRECEDING",
                                 "meta" : {
                                   "globalKey" : "4c776966"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "77d87b9"
-                              },
-                              "unadjustedDate" : "2015-07-13"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "77d87b9"
                             }
                           } ],
+                          "earliestExerciseTime" : {
+                            "hourMinuteTime" : "09:00:00",
+                            "businessCenter" : {
+                              "value" : "USNY"
+                            }
+                          },
                           "expirationTime" : {
+                            "hourMinuteTime" : "11:00:00",
                             "businessCenter" : {
                               "value" : "USNY"
-                            },
-                            "hourMinuteTime" : "11:00:00"
+                            }
                           },
                           "meta" : {
-                            "globalKey" : "efe6ebc6"
+                            "globalKey" : "31db4746"
                           }
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "762ef921"
-                    },
                     "underlier" : {
                       "contractualProduct" : {
                         "productTaxonomy" : [ {
@@ -1753,46 +1693,42 @@
                           "payout" : {
                             "interestRatePayout" : [ {
                               "payerReceiver" : {
-                                "payer" : "PARTY_1",
-                                "receiver" : "PARTY_2"
+                                "payer" : "Party1",
+                                "receiver" : "Party2"
                               },
                               "priceQuantity" : {
-                                "meta" : {
-                                  "globalKey" : "0"
-                                },
                                 "quantitySchedule" : {
                                   "address" : {
                                     "scope" : "DOCUMENT",
                                     "value" : "quantity-1"
                                   }
+                                },
+                                "meta" : {
+                                  "globalKey" : "0"
                                 }
                               },
-                              "calculationPeriodDates" : {
-                                "calculationPeriodDatesAdjustments" : {
-                                  "businessCenters" : {
-                                    "businessCentersReference" : {
-                                      "externalReference" : "fixedPrimaryBusinessCenters",
-                                      "globalReference" : "42f910b"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "fa5f1fb"
+                              "rateSpecification" : {
+                                "fixedRate" : {
+                                  "rateSchedule" : {
+                                    "price" : {
+                                      "address" : {
+                                        "scope" : "DOCUMENT",
+                                        "value" : "price-1"
+                                      }
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
-                                    "globalKey" : "979a8ca"
+                                    "globalKey" : "0"
                                   }
-                                },
-                                "calculationPeriodFrequency" : {
-                                  "meta" : {
-                                    "globalKey" : "28c8a"
-                                  },
-                                  "period" : "M",
-                                  "periodMultiplier" : 6,
-                                  "rollConvention" : "15"
-                                },
+                                }
+                              },
+                              "dayCountFraction" : {
+                                "value" : "30/360"
+                              },
+                              "calculationPeriodDates" : {
                                 "effectiveDate" : {
                                   "adjustableDate" : {
+                                    "unadjustedDate" : "2015-07-15",
                                     "dateAdjustments" : {
                                       "businessDayConvention" : "NONE",
                                       "meta" : {
@@ -1801,42 +1737,94 @@
                                     },
                                     "meta" : {
                                       "globalKey" : "ec8c6947"
-                                    },
-                                    "unadjustedDate" : "2015-07-15"
+                                    }
                                   },
                                   "meta" : {
                                     "globalKey" : "ec8c6947"
                                   }
                                 },
-                                "meta" : {
-                                  "externalKey" : "fixedCalcPeriodDates",
-                                  "globalKey" : "44841946"
-                                },
                                 "terminationDate" : {
                                   "adjustableDate" : {
+                                    "unadjustedDate" : "2022-07-15",
                                     "dateAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
                                       "businessCenters" : {
                                         "businessCentersReference" : {
-                                          "externalReference" : "fixedPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "fixedPrimaryBusinessCenters"
                                         },
                                         "meta" : {
                                           "globalKey" : "fa5f1fb"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
                                         "globalKey" : "979a8ca"
                                       }
                                     },
                                     "meta" : {
                                       "globalKey" : "321c23d9"
-                                    },
-                                    "unadjustedDate" : "2022-07-15"
+                                    }
                                   },
                                   "meta" : {
                                     "globalKey" : "321c23d9"
                                   }
+                                },
+                                "calculationPeriodDatesAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
+                                  "businessCenters" : {
+                                    "businessCentersReference" : {
+                                      "globalReference" : "42f910b",
+                                      "externalReference" : "fixedPrimaryBusinessCenters"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "fa5f1fb"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "979a8ca"
+                                  }
+                                },
+                                "calculationPeriodFrequency" : {
+                                  "periodMultiplier" : 6,
+                                  "period" : "M",
+                                  "meta" : {
+                                    "globalKey" : "18a9c"
+                                  },
+                                  "rollConvention" : "15"
+                                },
+                                "meta" : {
+                                  "globalKey" : "8d18b4d8",
+                                  "externalKey" : "fixedCalcPeriodDates"
+                                }
+                              },
+                              "paymentDates" : {
+                                "paymentFrequency" : {
+                                  "periodMultiplier" : 6,
+                                  "period" : "M",
+                                  "meta" : {
+                                    "globalKey" : "107"
+                                  }
+                                },
+                                "payRelativeTo" : "CalculationPeriodEndDate",
+                                "paymentDatesAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
+                                  "businessCenters" : {
+                                    "businessCenter" : [ {
+                                      "value" : "GBLO"
+                                    }, {
+                                      "value" : "USNY"
+                                    } ],
+                                    "meta" : {
+                                      "globalKey" : "42f910b",
+                                      "externalKey" : "fixedPrimaryBusinessCenters"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "97b8e49c"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "9e5a4d0f"
                                 }
                               },
                               "cashflowRepresentation" : {
@@ -1844,294 +1832,240 @@
                                 "paymentCalculationPeriod" : [ {
                                   "adjustedPaymentDate" : "2016-01-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2016-01-15",
                                     "adjustedStartDate" : "2015-07-15",
+                                    "adjustedEndDate" : "2016-01-15",
                                     "meta" : {
-                                      "globalKey" : "daf48d55"
+                                      "globalKey" : "4e94250b"
                                     },
-                                    "fixedRate" : 0.02,
-                                    "notionalAmount" : 5000000
+                                    "notionalAmount" : 5000000,
+                                    "fixedRate" : 0.02
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "b0e46666"
+                                    "globalKey" : "2483fe1c"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2016-07-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2016-07-15",
                                     "adjustedStartDate" : "2016-01-15",
+                                    "adjustedEndDate" : "2016-07-15",
                                     "meta" : {
-                                      "globalKey" : "dbbb8255"
+                                      "globalKey" : "518e300b"
                                     },
-                                    "fixedRate" : 0.02,
-                                    "notionalAmount" : 5000000
+                                    "notionalAmount" : 5000000,
+                                    "fixedRate" : 0.02
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "40f049e6"
+                                    "globalKey" : "b6c2f79c"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2017-01-17",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2017-01-17",
                                     "adjustedStartDate" : "2016-07-15",
+                                    "adjustedEndDate" : "2017-01-17",
                                     "meta" : {
-                                      "globalKey" : "deb67613"
+                                      "globalKey" : "52552c8d"
                                     },
-                                    "fixedRate" : 0.02,
-                                    "notionalAmount" : 5000000
+                                    "notionalAmount" : 5000000,
+                                    "fixedRate" : 0.02
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "5ed4f862"
+                                    "globalKey" : "d273aedc"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2017-07-17",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2017-07-17",
                                     "adjustedStartDate" : "2017-01-17",
+                                    "adjustedEndDate" : "2017-07-17",
                                     "meta" : {
-                                      "globalKey" : "df7d7295"
+                                      "globalKey" : "5550204b"
                                     },
-                                    "fixedRate" : 0.02,
-                                    "notionalAmount" : 5000000
+                                    "notionalAmount" : 5000000,
+                                    "fixedRate" : 0.02
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "eee0e364"
+                                    "globalKey" : "64b3911a"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2018-01-16",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2018-01-16",
                                     "adjustedStartDate" : "2017-07-17",
+                                    "adjustedEndDate" : "2018-01-16",
                                     "meta" : {
-                                      "globalKey" : "e2770936"
+                                      "globalKey" : "5617118a"
                                     },
-                                    "fixedRate" : 0.02,
-                                    "notionalAmount" : 5000000
+                                    "notionalAmount" : 5000000,
+                                    "fixedRate" : 0.02
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "7a5aae6"
+                                    "globalKey" : "7b45b33a"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2018-07-16",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2018-07-16",
                                     "adjustedStartDate" : "2018-01-16",
+                                    "adjustedEndDate" : "2018-07-16",
                                     "meta" : {
-                                      "globalKey" : "e33dfa75"
+                                      "globalKey" : "5910a82b"
                                     },
-                                    "fixedRate" : 0.02,
-                                    "notionalAmount" : 5000000
+                                    "notionalAmount" : 5000000,
+                                    "fixedRate" : 0.02
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "97b18aa5"
+                                    "globalKey" : "d84385b"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2019-01-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2019-01-15",
                                     "adjustedStartDate" : "2018-07-16",
+                                    "adjustedEndDate" : "2019-01-15",
                                     "meta" : {
-                                      "globalKey" : "e6379116"
+                                      "globalKey" : "59d7996a"
                                     },
-                                    "fixedRate" : 0.02,
-                                    "notionalAmount" : 5000000
+                                    "notionalAmount" : 5000000,
+                                    "fixedRate" : 0.02
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "b0765227"
+                                    "globalKey" : "24165a7b"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2019-07-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2019-07-15",
                                     "adjustedStartDate" : "2019-01-15",
+                                    "adjustedEndDate" : "2019-07-15",
                                     "meta" : {
-                                      "globalKey" : "e6fe8255"
+                                      "globalKey" : "5cd1300b"
                                     },
-                                    "fixedRate" : 0.02,
-                                    "notionalAmount" : 5000000
+                                    "notionalAmount" : 5000000,
+                                    "fixedRate" : 0.02
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "408231e6"
+                                    "globalKey" : "b654df9c"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2020-01-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2020-01-15",
                                     "adjustedStartDate" : "2019-07-15",
+                                    "adjustedEndDate" : "2020-01-15",
                                     "meta" : {
-                                      "globalKey" : "e9f88d55"
+                                      "globalKey" : "5d98250b"
                                     },
-                                    "fixedRate" : 0.02,
-                                    "notionalAmount" : 5000000
+                                    "notionalAmount" : 5000000,
+                                    "fixedRate" : 0.02
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "5afc4666"
+                                    "globalKey" : "ce9bde1c"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2020-07-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2020-07-15",
                                     "adjustedStartDate" : "2020-01-15",
+                                    "adjustedEndDate" : "2020-07-15",
                                     "meta" : {
-                                      "globalKey" : "eabf8255"
+                                      "globalKey" : "6092300b"
                                     },
-                                    "fixedRate" : 0.02,
-                                    "notionalAmount" : 5000000
+                                    "notionalAmount" : 5000000,
+                                    "fixedRate" : 0.02
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "eb0829e6"
+                                    "globalKey" : "60dad79c"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2021-01-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2021-01-15",
                                     "adjustedStartDate" : "2020-07-15",
+                                    "adjustedEndDate" : "2021-01-15",
                                     "meta" : {
-                                      "globalKey" : "edb98d55"
+                                      "globalKey" : "6159250b"
                                     },
-                                    "fixedRate" : 0.02,
-                                    "notionalAmount" : 5000000
+                                    "notionalAmount" : 5000000,
+                                    "fixedRate" : 0.02
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "5823e66"
+                                    "globalKey" : "7921d61c"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2021-07-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2021-07-15",
                                     "adjustedStartDate" : "2021-01-15",
+                                    "adjustedEndDate" : "2021-07-15",
                                     "meta" : {
-                                      "globalKey" : "ee808255"
+                                      "globalKey" : "6453300b"
                                     },
-                                    "fixedRate" : 0.02,
-                                    "notionalAmount" : 5000000
+                                    "notionalAmount" : 5000000,
+                                    "fixedRate" : 0.02
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "958e21e6"
+                                    "globalKey" : "b60cf9c"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2022-01-18",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2022-01-18",
                                     "adjustedStartDate" : "2021-07-15",
+                                    "adjustedEndDate" : "2022-01-18",
                                     "meta" : {
-                                      "globalKey" : "f17bea72"
+                                      "globalKey" : "651a304e"
                                     },
-                                    "fixedRate" : 0.02,
-                                    "notionalAmount" : 5000000
+                                    "notionalAmount" : 5000000,
+                                    "fixedRate" : 0.02
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "b5281d60"
+                                    "globalKey" : "28c6633c"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2022-07-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2022-07-15",
                                     "adjustedStartDate" : "2022-01-18",
+                                    "adjustedEndDate" : "2022-07-15",
                                     "meta" : {
-                                      "globalKey" : "f2418d98"
+                                      "globalKey" : "68158d28"
                                     },
-                                    "fixedRate" : 0.02,
-                                    "notionalAmount" : 5000000
+                                    "notionalAmount" : 5000000,
+                                    "fixedRate" : 0.02
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "40142529"
+                                    "globalKey" : "b5e824b9"
                                   }
                                 } ]
                               },
-                              "dayCountFraction" : {
-                                "value" : "30/360"
-                              },
                               "meta" : {
-                                "globalKey" : "844a965e"
-                              },
-                              "paymentDates" : {
-                                "meta" : {
-                                  "globalKey" : "637fde97"
-                                },
-                                "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                "paymentDatesAdjustments" : {
-                                  "businessCenters" : {
-                                    "businessCenter" : [ {
-                                      "value" : "GBLO"
-                                    }, {
-                                      "value" : "USNY"
-                                    } ],
-                                    "meta" : {
-                                      "externalKey" : "fixedPrimaryBusinessCenters",
-                                      "globalKey" : "42f910b"
-                                    }
-                                  },
-                                  "businessDayConvention" : "MODFOLLOWING",
-                                  "meta" : {
-                                    "globalKey" : "97b8e49c"
-                                  }
-                                },
-                                "paymentFrequency" : {
-                                  "meta" : {
-                                    "globalKey" : "959"
-                                  },
-                                  "period" : "M",
-                                  "periodMultiplier" : 6
-                                }
-                              },
-                              "rateSpecification" : {
-                                "fixedRate" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
-                                  "rateSchedule" : {
-                                    "price" : {
-                                      "address" : {
-                                        "scope" : "DOCUMENT",
-                                        "value" : "price-1"
-                                      }
-                                    }
-                                  }
-                                }
+                                "globalKey" : "9f0dc1aa"
                               }
                             }, {
                               "payerReceiver" : {
-                                "payer" : "PARTY_2",
-                                "receiver" : "PARTY_1"
+                                "payer" : "Party2",
+                                "receiver" : "Party1"
                               },
                               "priceQuantity" : {
-                                "meta" : {
-                                  "globalKey" : "0"
-                                },
                                 "quantitySchedule" : {
                                   "address" : {
                                     "scope" : "DOCUMENT",
                                     "value" : "quantity-2"
                                   }
+                                },
+                                "meta" : {
+                                  "globalKey" : "0"
                                 }
                               },
-                              "calculationPeriodDates" : {
-                                "calculationPeriodDatesAdjustments" : {
-                                  "businessCenters" : {
-                                    "businessCentersReference" : {
-                                      "externalReference" : "floatPrimaryBusinessCenters",
-                                      "globalReference" : "42f910b"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "b01f2613"
+                              "rateSpecification" : {
+                                "floatingRate" : {
+                                  "rateOption" : {
+                                    "address" : {
+                                      "scope" : "DOCUMENT",
+                                      "value" : "rateOption-1"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
-                                    "globalKey" : "a9f2dce2"
+                                    "globalKey" : "0"
                                   }
-                                },
-                                "calculationPeriodFrequency" : {
-                                  "meta" : {
-                                    "globalKey" : "28c2d"
-                                  },
-                                  "period" : "M",
-                                  "periodMultiplier" : 3,
-                                  "rollConvention" : "15"
-                                },
+                                }
+                              },
+                              "dayCountFraction" : {
+                                "value" : "ACT/360"
+                              },
+                              "calculationPeriodDates" : {
                                 "effectiveDate" : {
                                   "adjustableDate" : {
+                                    "unadjustedDate" : "2015-07-15",
                                     "dateAdjustments" : {
                                       "businessDayConvention" : "NONE",
                                       "meta" : {
@@ -2140,42 +2074,148 @@
                                     },
                                     "meta" : {
                                       "globalKey" : "ec8c6947"
-                                    },
-                                    "unadjustedDate" : "2015-07-15"
+                                    }
                                   },
                                   "meta" : {
                                     "globalKey" : "ec8c6947"
                                   }
                                 },
-                                "meta" : {
-                                  "externalKey" : "floatingCalcPeriodDates",
-                                  "globalKey" : "45985c59"
-                                },
                                 "terminationDate" : {
                                   "adjustableDate" : {
+                                    "unadjustedDate" : "2022-07-15",
                                     "dateAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
                                       "businessCenters" : {
                                         "businessCentersReference" : {
-                                          "externalReference" : "floatPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "floatPrimaryBusinessCenters"
                                         },
                                         "meta" : {
                                           "globalKey" : "b01f2613"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
                                         "globalKey" : "a9f2dce2"
                                       }
                                     },
                                     "meta" : {
-                                      "globalKey" : "d29557f1"
-                                    },
-                                    "unadjustedDate" : "2022-07-15"
+                                      "globalKey" : "d29557f1"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "d29557f1"
+                                  }
+                                },
+                                "calculationPeriodDatesAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
+                                  "businessCenters" : {
+                                    "businessCentersReference" : {
+                                      "globalReference" : "42f910b",
+                                      "externalReference" : "floatPrimaryBusinessCenters"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "b01f2613"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "a9f2dce2"
+                                  }
+                                },
+                                "calculationPeriodFrequency" : {
+                                  "periodMultiplier" : 3,
+                                  "period" : "M",
+                                  "meta" : {
+                                    "globalKey" : "17f59"
+                                  },
+                                  "rollConvention" : "15"
+                                },
+                                "meta" : {
+                                  "globalKey" : "fe0a3bc5",
+                                  "externalKey" : "floatingCalcPeriodDates"
+                                }
+                              },
+                              "paymentDates" : {
+                                "paymentFrequency" : {
+                                  "periodMultiplier" : 3,
+                                  "period" : "M",
+                                  "meta" : {
+                                    "globalKey" : "aa"
+                                  }
+                                },
+                                "payRelativeTo" : "CalculationPeriodEndDate",
+                                "paymentDatesAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
+                                  "businessCenters" : {
+                                    "businessCenter" : [ {
+                                      "value" : "GBLO"
+                                    }, {
+                                      "value" : "USNY"
+                                    } ],
+                                    "meta" : {
+                                      "globalKey" : "42f910b",
+                                      "externalKey" : "floatPrimaryBusinessCenters"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "97b8e49c"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "e18d000c"
+                                }
+                              },
+                              "resetDates" : {
+                                "calculationPeriodDatesReference" : {
+                                  "globalReference" : "fe0a3bc5",
+                                  "externalReference" : "floatingCalcPeriodDates"
+                                },
+                                "resetRelativeTo" : "CalculationPeriodStartDate",
+                                "fixingDates" : {
+                                  "periodMultiplier" : -2,
+                                  "period" : "D",
+                                  "meta" : {
+                                    "globalKey" : "1a78799e"
+                                  },
+                                  "dayType" : "Business",
+                                  "businessDayConvention" : "NONE",
+                                  "businessCenters" : {
+                                    "businessCenter" : [ {
+                                      "value" : "GBLO"
+                                    } ],
+                                    "meta" : {
+                                      "globalKey" : "21479e"
+                                    }
+                                  },
+                                  "dateRelativeTo" : {
+                                    "globalReference" : "d4638f85",
+                                    "externalReference" : "floatingLegResetDates"
+                                  }
+                                },
+                                "resetFrequency" : {
+                                  "periodMultiplier" : 3,
+                                  "period" : "M",
+                                  "meta" : {
+                                    "globalKey" : "aa"
+                                  }
+                                },
+                                "resetDatesAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
+                                  "businessCenters" : {
+                                    "businessCentersReference" : {
+                                      "globalReference" : "42f910b",
+                                      "externalReference" : "floatPrimaryBusinessCenters"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "b01f2613"
+                                    }
                                   },
                                   "meta" : {
-                                    "globalKey" : "d29557f1"
+                                    "globalKey" : "a9f2dce2"
                                   }
+                                },
+                                "meta" : {
+                                  "globalKey" : "d4638f85",
+                                  "externalKey" : "floatingLegResetDates"
                                 }
                               },
                               "cashflowRepresentation" : {
@@ -2183,928 +2223,865 @@
                                 "paymentCalculationPeriod" : [ {
                                   "adjustedPaymentDate" : "2015-10-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2015-10-15",
                                     "adjustedStartDate" : "2015-07-15",
+                                    "adjustedEndDate" : "2015-10-15",
                                     "meta" : {
-                                      "globalKey" : "aa2a36d8"
+                                      "globalKey" : "45203d58"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2015-07-13",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a04003"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "33093267"
+                                    "globalKey" : "cdff38e7"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2016-01-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2016-01-15",
                                     "adjustedStartDate" : "2015-10-15",
+                                    "adjustedEndDate" : "2016-01-15",
                                     "meta" : {
-                                      "globalKey" : "1da17b18"
+                                      "globalKey" : "c1aa5798"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2015-10-13",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a05743"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "2ffebc67"
+                                    "globalKey" : "d40798e7"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2016-04-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2016-04-15",
                                     "adjustedStartDate" : "2016-01-15",
+                                    "adjustedEndDate" : "2016-04-15",
                                     "meta" : {
-                                      "globalKey" : "9a2c3058"
+                                      "globalKey" : "352236d8"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2016-01-13",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a10983"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "dfdcb267"
+                                    "globalKey" : "7ad2b8e7"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2016-07-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2016-07-15",
                                     "adjustedStartDate" : "2016-04-15",
+                                    "adjustedEndDate" : "2016-07-15",
                                     "meta" : {
-                                      "globalKey" : "8e7b2f98"
+                                      "globalKey" : "29713618"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2016-04-13",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a120c3"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "77ef267"
+                                    "globalKey" : "a274f8e7"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2016-10-17",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2016-10-17",
                                     "adjustedStartDate" : "2016-07-15",
+                                    "adjustedEndDate" : "2016-10-17",
                                     "meta" : {
-                                      "globalKey" : "ec96a55a"
+                                      "globalKey" : "2129e696"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2016-07-13",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a13803"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "c17686eb"
+                                    "globalKey" : "f609c827"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2017-01-17",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2017-01-17",
                                     "adjustedStartDate" : "2016-10-17",
+                                    "adjustedEndDate" : "2017-01-17",
                                     "meta" : {
-                                      "globalKey" : "63779ad8"
+                                      "globalKey" : "7807758"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2016-10-13",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a14f43"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "c1d5c229"
+                                    "globalKey" : "65de9ea9"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2017-04-18",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2017-04-18",
                                     "adjustedStartDate" : "2017-01-17",
+                                    "adjustedEndDate" : "2017-04-18",
                                     "meta" : {
-                                      "globalKey" : "14e88b59"
+                                      "globalKey" : "7cad2f37"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2017-01-13",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a20183"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "3ade626b"
+                                    "globalKey" : "a2a30649"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2017-07-17",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2017-07-17",
                                     "adjustedStartDate" : "2017-04-18",
+                                    "adjustedEndDate" : "2017-07-17",
                                     "meta" : {
-                                      "globalKey" : "d60627d8"
+                                      "globalKey" : "a42d90fa"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2017-04-12",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a218a4"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "9b0ad0a9"
+                                    "globalKey" : "693239cb"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2017-10-16",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2017-10-16",
                                     "adjustedStartDate" : "2017-07-17",
+                                    "adjustedEndDate" : "2017-10-16",
                                     "meta" : {
-                                      "globalKey" : "93ba1357"
+                                      "globalKey" : "61e17c79"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2017-07-13",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a23003"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "f7cd8de7"
+                                    "globalKey" : "c5f4f709"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2018-01-16",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2018-01-16",
                                     "adjustedStartDate" : "2017-10-16",
+                                    "adjustedEndDate" : "2018-01-16",
                                     "meta" : {
-                                      "globalKey" : "57c7ed9"
+                                      "globalKey" : "a9855b59"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2017-10-12",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a24724"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "f30e3f29"
+                                    "globalKey" : "97171ba9"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2018-04-16",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2018-04-16",
                                     "adjustedStartDate" : "2018-01-16",
+                                    "adjustedEndDate" : "2018-04-16",
                                     "meta" : {
-                                      "globalKey" : "82073419"
+                                      "globalKey" : "1cfd3a99"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2018-01-12",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a2f964"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "a2ec3529"
+                                    "globalKey" : "3de23ba9"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2018-07-16",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2018-07-16",
                                     "adjustedStartDate" : "2018-04-16",
+                                    "adjustedEndDate" : "2018-07-16",
                                     "meta" : {
-                                      "globalKey" : "76563359"
+                                      "globalKey" : "114c39d9"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2018-04-12",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a310a4"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "ca8e7529"
+                                    "globalKey" : "65847ba9"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2018-10-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2018-10-15",
                                     "adjustedStartDate" : "2018-07-16",
+                                    "adjustedEndDate" : "2018-10-15",
                                     "meta" : {
-                                      "globalKey" : "35bef758"
+                                      "globalKey" : "3e6607a"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2018-07-12",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a327e4"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "29060ae7"
+                                    "globalKey" : "f72d7409"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2019-01-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2019-01-15",
                                     "adjustedStartDate" : "2018-10-15",
+                                    "adjustedEndDate" : "2019-01-15",
                                     "meta" : {
-                                      "globalKey" : "a78162da"
+                                      "globalKey" : "4b8a3f5a"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2018-10-11",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a33f05"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "2446bc29"
+                                    "globalKey" : "c84f98a9"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2019-04-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2019-04-15",
                                     "adjustedStartDate" : "2019-01-15",
+                                    "adjustedEndDate" : "2019-04-15",
                                     "meta" : {
-                                      "globalKey" : "240c181a"
+                                      "globalKey" : "bf021e9a"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2019-01-11",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a3f145"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "d424b229"
+                                    "globalKey" : "6f1ab8a9"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2019-07-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2019-07-15",
                                     "adjustedStartDate" : "2019-04-15",
+                                    "adjustedEndDate" : "2019-07-15",
                                     "meta" : {
-                                      "globalKey" : "185b175a"
+                                      "globalKey" : "b3511dda"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2019-04-11",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a40885"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "fbc6f229"
+                                    "globalKey" : "96bcf8a9"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2019-10-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2019-10-15",
                                     "adjustedStartDate" : "2019-07-15",
+                                    "adjustedEndDate" : "2019-10-15",
                                     "meta" : {
-                                      "globalKey" : "caa169a"
+                                      "globalKey" : "a7a01d1a"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2019-07-11",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a41fc5"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "23693229"
+                                    "globalKey" : "be5f38a9"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2020-01-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2020-01-15",
                                     "adjustedStartDate" : "2019-10-15",
+                                    "adjustedEndDate" : "2020-01-15",
                                     "meta" : {
-                                      "globalKey" : "80215ada"
+                                      "globalKey" : "242a375a"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2019-10-11",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a43705"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "205ebc29"
+                                    "globalKey" : "c46798a9"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2020-04-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2020-04-15",
                                     "adjustedStartDate" : "2020-01-15",
+                                    "adjustedEndDate" : "2020-04-15",
                                     "meta" : {
-                                      "globalKey" : "fcac1058"
+                                      "globalKey" : "97a216d8"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2020-01-13",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a4e983"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "d03cb267"
+                                    "globalKey" : "6b32b8e7"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2020-07-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2020-07-15",
                                     "adjustedStartDate" : "2020-04-15",
+                                    "adjustedEndDate" : "2020-07-15",
                                     "meta" : {
-                                      "globalKey" : "f0fb0f1c"
+                                      "globalKey" : "8bf1159c"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2020-04-09",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a50047"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "f7def1eb"
+                                    "globalKey" : "92d4f86b"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2020-10-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2020-10-15",
                                     "adjustedStartDate" : "2020-07-15",
+                                    "adjustedEndDate" : "2020-10-15",
                                     "meta" : {
-                                      "globalKey" : "e54a0ed8"
+                                      "globalKey" : "80401558"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2020-07-13",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a51803"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "1f813267"
+                                    "globalKey" : "ba7738e7"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2021-01-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2021-01-15",
                                     "adjustedStartDate" : "2020-10-15",
+                                    "adjustedEndDate" : "2021-01-15",
                                     "meta" : {
-                                      "globalKey" : "58c15318"
+                                      "globalKey" : "fcca2f98"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2020-10-13",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a52f43"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "1c76bc67"
+                                    "globalKey" : "c07f98e7"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2021-04-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2021-04-15",
                                     "adjustedStartDate" : "2021-01-15",
+                                    "adjustedEndDate" : "2021-04-15",
                                     "meta" : {
-                                      "globalKey" : "d54c0858"
+                                      "globalKey" : "70420ed8"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2021-01-13",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a5e183"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "cc54b267"
+                                    "globalKey" : "674ab8e7"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2021-07-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2021-07-15",
                                     "adjustedStartDate" : "2021-04-15",
+                                    "adjustedEndDate" : "2021-07-15",
                                     "meta" : {
-                                      "globalKey" : "c99b0798"
+                                      "globalKey" : "64910e18"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2021-04-13",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a5f8c3"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "f3f6f267"
+                                    "globalKey" : "8eecf8e7"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2021-10-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2021-10-15",
                                     "adjustedStartDate" : "2021-07-15",
+                                    "adjustedEndDate" : "2021-10-15",
                                     "meta" : {
-                                      "globalKey" : "bdea06d8"
+                                      "globalKey" : "58e00d58"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2021-07-13",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a61003"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "1b993267"
+                                    "globalKey" : "b68f38e7"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2022-01-18",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2022-01-18",
                                     "adjustedStartDate" : "2021-10-15",
+                                    "adjustedEndDate" : "2022-01-18",
                                     "meta" : {
-                                      "globalKey" : "d013fcdb"
+                                      "globalKey" : "da88b175"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2021-10-13",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a62743"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "740ebb2d"
+                                    "globalKey" : "7e836fc7"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2022-04-19",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2022-04-19",
                                     "adjustedStartDate" : "2022-01-18",
+                                    "adjustedEndDate" : "2022-04-19",
                                     "meta" : {
-                                      "globalKey" : "86a37758"
+                                      "globalKey" : "ee681b36"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2022-01-14",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a6d9a2"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "f235e56b"
+                                    "globalKey" : "59fa8949"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2022-07-15",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2022-07-15",
                                     "adjustedStartDate" : "2022-04-19",
+                                    "adjustedEndDate" : "2022-07-15",
                                     "meta" : {
-                                      "globalKey" : "a90e6214"
+                                      "globalKey" : "10c9f31c"
                                     },
+                                    "notionalAmount" : 5000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2022-04-13",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a6f0c3"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 5000000
-                                  } ],
-                                  "meta" : {
-                                    "globalKey" : "f6e254e3"
-                                  }
-                                } ]
-                              },
-                              "dayCountFraction" : {
-                                "value" : "ACT/360"
-                              },
-                              "meta" : {
-                                "globalKey" : "972d248a"
-                              },
-                              "paymentDates" : {
-                                "meta" : {
-                                  "globalKey" : "637fde94"
-                                },
-                                "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                "paymentDatesAdjustments" : {
-                                  "businessCenters" : {
-                                    "businessCenter" : [ {
-                                      "value" : "GBLO"
-                                    }, {
-                                      "value" : "USNY"
-                                    } ],
-                                    "meta" : {
-                                      "externalKey" : "floatPrimaryBusinessCenters",
-                                      "globalKey" : "42f910b"
-                                    }
-                                  },
-                                  "businessDayConvention" : "MODFOLLOWING",
-                                  "meta" : {
-                                    "globalKey" : "97b8e49c"
-                                  }
-                                },
-                                "paymentFrequency" : {
-                                  "meta" : {
-                                    "globalKey" : "956"
-                                  },
-                                  "period" : "M",
-                                  "periodMultiplier" : 3
-                                }
-                              },
-                              "rateSpecification" : {
-                                "floatingRate" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
-                                  "rateOption" : {
-                                    "address" : {
-                                      "scope" : "DOCUMENT",
-                                      "value" : "rateOption-1"
-                                    }
-                                  }
-                                }
-                              },
-                              "resetDates" : {
-                                "calculationPeriodDatesReference" : {
-                                  "externalReference" : "floatingCalcPeriodDates",
-                                  "globalReference" : "45985c59"
-                                },
-                                "fixingDates" : {
-                                  "meta" : {
-                                    "globalKey" : "3d9c8eea"
-                                  },
-                                  "period" : "D",
-                                  "periodMultiplier" : -2,
-                                  "dayType" : "BUSINESS",
-                                  "businessCenters" : {
-                                    "businessCenter" : [ {
-                                      "value" : "GBLO"
-                                    } ],
-                                    "meta" : {
-                                      "globalKey" : "21479e"
                                     }
-                                  },
-                                  "businessDayConvention" : "NONE",
-                                  "dateRelativeTo" : {
-                                    "externalReference" : "floatingLegResetDates",
-                                    "globalReference" : "b9fac6cd"
-                                  }
-                                },
-                                "meta" : {
-                                  "externalKey" : "floatingLegResetDates",
-                                  "globalKey" : "b9fac6cd"
-                                },
-                                "resetDatesAdjustments" : {
-                                  "businessCenters" : {
-                                    "businessCentersReference" : {
-                                      "externalReference" : "floatPrimaryBusinessCenters",
-                                      "globalReference" : "42f910b"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "b01f2613"
-                                    }
-                                  },
-                                  "businessDayConvention" : "MODFOLLOWING",
+                                  } ],
                                   "meta" : {
-                                    "globalKey" : "a9f2dce2"
+                                    "globalKey" : "5e9de5eb"
                                   }
-                                },
-                                "resetFrequency" : {
-                                  "meta" : {
-                                    "globalKey" : "956"
-                                  },
-                                  "period" : "M",
-                                  "periodMultiplier" : 3
-                                },
-                                "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                                } ]
+                              },
+                              "meta" : {
+                                "globalKey" : "b0aff9ae"
                               }
                             } ],
                             "meta" : {
-                              "globalKey" : "413276c"
+                              "globalKey" : "a56149c4"
                             }
                           }
                         },
                         "meta" : {
-                          "globalKey" : "87c66f1d"
+                          "globalKey" : "29149175"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "87c66f1d"
+                        "globalKey" : "29149175"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "ba3d56f9"
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "ba3d56f9"
+                  }
                 }
               },
               "meta" : {
-                "globalKey" : "b4aead56"
+                "globalKey" : "f8bd0b2e"
               }
             },
             "meta" : {
-              "globalKey" : "b4aead56"
+              "globalKey" : "f8bd0b2e"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "1609049a"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.02,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.02,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
                 }
               } ],
               "quantity" : [ {
+                "value" : {
+                  "value" : 5000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "ab178ea6"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 5000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 5000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
                 }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "dd05b62c"
-              },
+              } ],
               "observable" : {
-                "meta" : {
-                  "globalKey" : "5f0c6d05"
-                },
                 "rateOption" : {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "rateOption-1"
-                    } ]
-                  },
                   "value" : {
                     "floatingRateIndex" : {
                       "value" : "USD-LIBOR-BBA"
                     },
                     "indexTenor" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
+                      "periodMultiplier" : 3,
                       "period" : "M",
-                      "periodMultiplier" : 3
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "rateOption-1"
+                    } ]
                   }
-                }
-              },
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
                 },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 5000000
+                "meta" : {
+                  "globalKey" : "828026c7"
                 }
-              } ]
-            } ]
-          } ]
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3ef84d"
-          },
-          "value" : "2015-01-13"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "cme_trade_id"
               },
-              "value" : "2896735"
-            }
-          }, {
-            "identifier" : {
               "meta" : {
-                "scheme" : "client_trade_id"
-              },
-              "value" : "2098916"
+                "globalKey" : "bd147858"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "1693c0",
+              "externalReference" : "clearing_firm"
             }
           }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
+            }
+          } ]
+        },
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "0220",
               "meta" : {
-                "scheme" : "platform_trade_id"
-              },
-              "value" : "19427806"
+                "scheme" : "clearing_member_firms"
+              }
+            },
+            "meta" : {
+              "globalKey" : "1693c0"
             }
-          }, {
+          } ],
+          "meta" : {
+            "globalKey" : "1693c0",
+            "externalKey" : "clearing_firm"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "block_trade_id"
-              },
-              "value" : "19427806"
+              "value" : "CME"
+            },
+            "meta" : {
+              "globalKey" : "1051b"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "clearing_service",
-            "globalReference" : "1051b"
-          },
           "meta" : {
-            "globalKey" : "82743157"
+            "globalKey" : "1051b",
+            "externalKey" : "clearing_service"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "reg_trade_id"
-              },
-              "value" : "CCCIRS2896735"
+              "value" : "CHI2WIRE"
+            },
+            "meta" : {
+              "globalKey" : "902a6db3"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "902a6db3",
+            "externalKey" : "trade_source"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "902a6db3",
+            "externalReference" : "trade_source"
+          },
+          "role" : "DataSubmitter",
+          "ownershipPartyReference" : {
+            "globalReference" : "1693c0",
+            "externalReference" : "clearing_firm"
+          }
+        } ],
+        "clearedDate" : "2015-01-13",
+        "account" : [ {
+          "partyReference" : {
+            "globalReference" : "1693c0",
+            "externalReference" : "clearing_firm"
+          },
+          "accountNumber" : {
+            "value" : "0220HOUSE2",
             "meta" : {
-              "scheme" : "cftc_Namespace"
-            },
-            "value" : "1010000023"
+              "scheme" : "clearing_firm_accounts"
+            }
+          },
+          "servicingParty" : {
+            "globalReference" : "1693c0",
+            "externalReference" : "clearing_firm"
           },
           "meta" : {
-            "globalKey" : "aa6f7f2e"
+            "globalKey" : "ceb64a82",
+            "externalKey" : "account1"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "f0a775c2"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
       },
       "transferHistory" : [ {
-        "meta" : {
-          "globalKey" : "4767f59f"
-        },
         "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "1693c0"
-            },
-            "receiverPartyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            }
-          },
           "quantity" : {
+            "value" : 500,
             "unit" : {
               "currency" : {
                 "value" : "USD"
               }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "1693c0",
+              "externalReference" : "clearing_firm"
             },
-            "value" : 500
+            "receiverPartyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
+            }
           },
           "settlementDate" : {
+            "unadjustedDate" : "2015-01-15",
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "USNY"
@@ -3113,73 +3090,76 @@
                   "globalKey" : "27e4e9"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "3662e8ba"
               }
-            },
-            "unadjustedDate" : "2015-01-15"
+            }
           },
           "transferExpression" : {
-            "priceTransfer" : "PREMIUM"
+            "priceTransfer" : "Premium"
           }
+        },
+        "meta" : {
+          "globalKey" : "eb7a4c85"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "f9ff9100"
+      }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "27610067"
+      "globalKey" : "5d32d701"
     }
   },
+  "previousWorkflowStep" : {
+    "globalReference" : "436011f2"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "3702896735",
       "meta" : {
         "scheme" : "cme_message_id"
-      },
-      "value" : "3702896735"
+      }
     },
     "sentBy" : {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
+      }
     },
     "sentTo" : [ {
+      "value" : "0220",
       "meta" : {
         "scheme" : "cme_firm_id"
-      },
-      "value" : "0220"
+      }
     }, {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
+      }
     } ]
   },
-  "meta" : {
-    "globalKey" : "5648b0f2"
-  },
+  "timestamp" : [ {
+    "dateTime" : "2015-01-13T15:59:10Z",
+    "qualification" : "eventCreationDateTime"
+  } ],
   "party" : [ {
-    "meta" : {
-      "externalKey" : "clearing_firm",
-      "globalKey" : "1693c0"
-    },
     "partyId" : [ {
       "identifier" : {
+        "value" : "0220",
         "meta" : {
           "scheme" : "clearing_member_firms"
-        },
-        "value" : "0220"
+        }
       },
       "meta" : {
         "globalKey" : "1693c0"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "clearing_service",
-      "globalKey" : "1051b"
-    },
+      "globalKey" : "1693c0",
+      "externalKey" : "clearing_firm"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "CME"
@@ -3187,12 +3167,12 @@
       "meta" : {
         "globalKey" : "1051b"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "trade_source",
-      "globalKey" : "902a6db3"
-    },
+      "globalKey" : "1051b",
+      "externalKey" : "clearing_service"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "CHI2WIRE"
@@ -3200,13 +3180,33 @@
       "meta" : {
         "globalKey" : "902a6db3"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "902a6db3",
+      "externalKey" : "trade_source"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "abfdcd26"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2015-01-13T15:59:10Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+  "account" : [ {
+    "partyReference" : {
+      "globalReference" : "1693c0",
+      "externalReference" : "clearing_firm"
+    },
+    "accountNumber" : {
+      "value" : "0220HOUSE2",
+      "meta" : {
+        "scheme" : "clearing_firm_accounts"
+      }
+    },
+    "servicingParty" : {
+      "globalReference" : "1693c0",
+      "externalReference" : "clearing_firm"
+    },
+    "meta" : {
+      "globalKey" : "ceb64a82",
+      "externalKey" : "account1"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "691bc3e8"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/Swaption-ex02-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/Swaption-ex02-func-output.json
index 792ea2b829..7792a5c894 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/Swaption-ex02-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/Swaption-ex02-func-output.json
@@ -1,124 +1,80 @@
 {
-  "account" : [ {
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "clearing_firm_accounts"
-      },
-      "value" : "010S3"
-    },
-    "meta" : {
-      "externalKey" : "account1",
-      "globalKey" : "34a0c93d"
-    },
-    "partyReference" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "ba4f"
-    },
-    "servicingParty" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "ba4f"
-    }
-  } ],
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "ee083de2"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "010S3"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "34a0c93d"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              }
-            } ],
-            "clearedDate" : "2018-10-31",
-            "meta" : {
-              "globalKey" : "65bbb1f1"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "ba4f"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "9369939",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "010"
-                },
-                "meta" : {
-                  "globalKey" : "ba4f"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "43400915-2",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "66b48bac"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "MARKIT_WIRE"
-                },
+                  "value" : "43400915",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43402096",
+                  "meta" : {
+                    "scheme" : "platform_side_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43400915",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "3b480d8f"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "66b48bac"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
               },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "66b48bac"
-              },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS9369939",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "4ac79bdc"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-31",
+              "meta" : {
+                "globalKey" : "3f129f"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "ba4f"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -127,30 +83,23 @@
                   } ],
                   "economicTerms" : {
                     "payout" : {
-                      "meta" : {
-                        "globalKey" : "18852e0"
-                      },
                       "optionPayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "buyerSeller" : {
-                          "buyer" : "PARTY_1",
-                          "seller" : "PARTY_2"
+                          "buyer" : "Party1",
+                          "seller" : "Party2"
                         },
                         "exerciseTerms" : {
                           "optionStyle" : {
                             "europeanExercise" : {
-                              "earliestExerciseTime" : {
-                                "businessCenter" : {
-                                  "value" : "USNY"
-                                },
-                                "hourMinuteTime" : "09:00:00"
-                              },
                               "expirationDate" : [ {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2018-11-30",
                                   "dateAdjustments" : {
+                                    "businessDayConvention" : "PRECEDING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "USNY"
@@ -159,35 +108,36 @@
                                         "globalKey" : "27e4e9"
                                       }
                                     },
-                                    "businessDayConvention" : "PRECEDING",
                                     "meta" : {
                                       "globalKey" : "4c776966"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "cda77148"
-                                  },
-                                  "unadjustedDate" : "2018-11-30"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "cda77148"
                                 }
                               } ],
+                              "earliestExerciseTime" : {
+                                "hourMinuteTime" : "09:00:00",
+                                "businessCenter" : {
+                                  "value" : "USNY"
+                                }
+                              },
                               "expirationTime" : {
+                                "hourMinuteTime" : "11:00:00",
                                 "businessCenter" : {
                                   "value" : "USNY"
-                                },
-                                "hourMinuteTime" : "11:00:00"
+                                }
                               },
                               "meta" : {
-                                "globalKey" : "54d375d5"
+                                "globalKey" : "da4631d5"
                               }
                             }
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "18852e0"
-                        },
                         "underlier" : {
                           "contractualProduct" : {
                             "productTaxonomy" : [ {
@@ -198,46 +148,42 @@
                               "payout" : {
                                 "interestRatePayout" : [ {
                                   "payerReceiver" : {
-                                    "payer" : "PARTY_1",
-                                    "receiver" : "PARTY_2"
+                                    "payer" : "Party1",
+                                    "receiver" : "Party2"
                                   },
                                   "priceQuantity" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
                                     "quantitySchedule" : {
                                       "address" : {
                                         "scope" : "DOCUMENT",
                                         "value" : "quantity-1"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "0"
                                     }
                                   },
-                                  "calculationPeriodDates" : {
-                                    "calculationPeriodDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "fixedPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "fa5f1fb"
+                                  "rateSpecification" : {
+                                    "fixedRate" : {
+                                      "rateSchedule" : {
+                                        "price" : {
+                                          "address" : {
+                                            "scope" : "DOCUMENT",
+                                            "value" : "price-1"
+                                          }
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
-                                        "globalKey" : "979a8ca"
+                                        "globalKey" : "0"
                                       }
-                                    },
-                                    "calculationPeriodFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "12d7c"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6,
-                                      "rollConvention" : "4"
-                                    },
+                                    }
+                                  },
+                                  "dayCountFraction" : {
+                                    "value" : "30/360"
+                                  },
+                                  "calculationPeriodDates" : {
                                     "effectiveDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2018-12-04",
                                         "dateAdjustments" : {
                                           "businessDayConvention" : "NONE",
                                           "meta" : {
@@ -246,42 +192,95 @@
                                         },
                                         "meta" : {
                                           "globalKey" : "eceb093c"
-                                        },
-                                        "unadjustedDate" : "2018-12-04"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "eceb093c"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "fixedCalcPeriodDates",
-                                      "globalKey" : "ed7e92d8"
-                                    },
                                     "terminationDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2021-12-04",
                                         "dateAdjustments" : {
+                                          "businessDayConvention" : "MODFOLLOWING",
                                           "businessCenters" : {
                                             "businessCentersReference" : {
-                                              "externalReference" : "fixedPrimaryBusinessCenters",
-                                              "globalReference" : "42f910b"
+                                              "globalReference" : "42f910b",
+                                              "externalReference" : "fixedPrimaryBusinessCenters"
                                             },
                                             "meta" : {
                                               "globalKey" : "fa5f1fb"
                                             }
                                           },
-                                          "businessDayConvention" : "MODFOLLOWING",
                                           "meta" : {
                                             "globalKey" : "979a8ca"
                                           }
                                         },
                                         "meta" : {
                                           "globalKey" : "c491dece"
-                                        },
-                                        "unadjustedDate" : "2021-12-04"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "c491dece"
                                       }
+                                    },
+                                    "calculationPeriodDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "fixedPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "fa5f1fb"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "979a8ca"
+                                      }
+                                    },
+                                    "calculationPeriodFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "2b8e"
+                                      },
+                                      "rollConvention" : "4"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "997e4eea",
+                                      "externalKey" : "fixedCalcPeriodDates"
+                                    }
+                                  },
+                                  "paymentDates" : {
+                                    "paymentFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "107"
+                                      }
+                                    },
+                                    "payRelativeTo" : "CalculationPeriodEndDate",
+                                    "paymentDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        }, {
+                                          "value" : "USNY"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "42f910b",
+                                          "externalKey" : "fixedPrimaryBusinessCenters"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "97b8e49c"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "9e5a4d0f",
+                                      "externalKey" : "fixedLegPaymentDates"
                                     }
                                   },
                                   "cashflowRepresentation" : {
@@ -289,183 +288,128 @@
                                     "paymentCalculationPeriod" : [ {
                                       "adjustedPaymentDate" : "2019-06-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-06-04",
                                         "adjustedStartDate" : "2018-12-04",
+                                        "adjustedEndDate" : "2019-06-04",
                                         "meta" : {
-                                          "globalKey" : "739421d"
+                                          "globalKey" : "1e352783"
                                         },
-                                        "fixedRate" : 0.02356,
-                                        "notionalAmount" : 100000000
+                                        "notionalAmount" : 100000000,
+                                        "fixedRate" : 0.02356
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "e0c17b19"
+                                        "globalKey" : "f7bd607f"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-12-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-12-04",
                                         "adjustedStartDate" : "2019-06-04",
+                                        "adjustedEndDate" : "2019-12-04",
                                         "meta" : {
-                                          "globalKey" : "800371d"
+                                          "globalKey" : "212f3283"
                                         },
-                                        "fixedRate" : 0.02356,
-                                        "notionalAmount" : 100000000
+                                        "notionalAmount" : 100000000,
+                                        "fixedRate" : 0.02356
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "70cd5e99"
+                                        "globalKey" : "89fc59ff"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-06-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-06-04",
                                         "adjustedStartDate" : "2019-12-04",
+                                        "adjustedEndDate" : "2020-06-04",
                                         "meta" : {
-                                          "globalKey" : "afa421d"
+                                          "globalKey" : "21f62783"
                                         },
-                                        "fixedRate" : 0.02356,
-                                        "notionalAmount" : 100000000
+                                        "notionalAmount" : 100000000,
+                                        "fixedRate" : 0.02356
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "8b477319"
+                                        "globalKey" : "a243587f"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-12-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-12-04",
                                         "adjustedStartDate" : "2020-06-04",
+                                        "adjustedEndDate" : "2020-12-04",
                                         "meta" : {
-                                          "globalKey" : "bc1371d"
+                                          "globalKey" : "24f03283"
                                         },
-                                        "fixedRate" : 0.02356,
-                                        "notionalAmount" : 100000000
+                                        "notionalAmount" : 100000000,
+                                        "fixedRate" : 0.02356
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "1b535699"
+                                        "globalKey" : "348251ff"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-06-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-06-04",
                                         "adjustedStartDate" : "2020-12-04",
+                                        "adjustedEndDate" : "2021-06-04",
                                         "meta" : {
-                                          "globalKey" : "ebb421d"
+                                          "globalKey" : "25b72783"
                                         },
-                                        "fixedRate" : 0.02356,
-                                        "notionalAmount" : 100000000
+                                        "notionalAmount" : 100000000,
+                                        "fixedRate" : 0.02356
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "35cd6b19"
+                                        "globalKey" : "4cc9507f"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-12-06",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-12-06",
                                         "adjustedStartDate" : "2021-06-04",
+                                        "adjustedEndDate" : "2021-12-06",
                                         "meta" : {
-                                          "globalKey" : "f831fdb"
+                                          "globalKey" : "28b13a05"
                                         },
-                                        "fixedRate" : 0.02356,
-                                        "notionalAmount" : 100000000
+                                        "notionalAmount" : 100000000,
+                                        "fixedRate" : 0.02356
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "c943e895"
+                                        "globalKey" : "e27202bf"
                                       }
                                     } ]
                                   },
-                                  "dayCountFraction" : {
-                                    "value" : "30/360"
-                                  },
                                   "meta" : {
-                                    "globalKey" : "d88751a5"
+                                    "globalKey" : "adc0aeb7"
+                                  }
+                                }, {
+                                  "payerReceiver" : {
+                                    "payer" : "Party2",
+                                    "receiver" : "Party1"
                                   },
-                                  "paymentDates" : {
-                                    "meta" : {
-                                      "externalKey" : "fixedLegPaymentDates",
-                                      "globalKey" : "637fde97"
+                                  "priceQuantity" : {
+                                    "quantitySchedule" : {
+                                      "address" : {
+                                        "scope" : "DOCUMENT",
+                                        "value" : "quantity-2"
+                                      }
                                     },
-                                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                    "paymentDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        }, {
-                                          "value" : "USNY"
-                                        } ],
-                                        "meta" : {
-                                          "externalKey" : "fixedPrimaryBusinessCenters",
-                                          "globalKey" : "42f910b"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "97b8e49c"
-                                      }
-                                    },
-                                    "paymentFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "959"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6
+                                    "meta" : {
+                                      "globalKey" : "0"
                                     }
                                   },
                                   "rateSpecification" : {
-                                    "fixedRate" : {
+                                    "floatingRate" : {
+                                      "rateOption" : {
+                                        "address" : {
+                                          "scope" : "DOCUMENT",
+                                          "value" : "rateOption-1"
+                                        }
+                                      },
                                       "meta" : {
                                         "globalKey" : "0"
-                                      },
-                                      "rateSchedule" : {
-                                        "price" : {
-                                          "address" : {
-                                            "scope" : "DOCUMENT",
-                                            "value" : "price-1"
-                                          }
-                                        }
                                       }
                                     }
-                                  }
-                                }, {
-                                  "payerReceiver" : {
-                                    "payer" : "PARTY_2",
-                                    "receiver" : "PARTY_1"
                                   },
-                                  "priceQuantity" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
-                                    "quantitySchedule" : {
-                                      "address" : {
-                                        "scope" : "DOCUMENT",
-                                        "value" : "quantity-2"
-                                      }
-                                    }
+                                  "dayCountFraction" : {
+                                    "value" : "ACT/360"
                                   },
                                   "calculationPeriodDates" : {
-                                    "calculationPeriodDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "floatPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "b01f2613"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "a9f2dce2"
-                                      }
-                                    },
-                                    "calculationPeriodFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "12d1f"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3,
-                                      "rollConvention" : "4"
-                                    },
                                     "effectiveDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2018-12-04",
                                         "dateAdjustments" : {
                                           "businessDayConvention" : "NONE",
                                           "meta" : {
@@ -474,42 +418,149 @@
                                         },
                                         "meta" : {
                                           "globalKey" : "eceb093c"
-                                        },
-                                        "unadjustedDate" : "2018-12-04"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "eceb093c"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "floatingCalcPeriodDates",
-                                      "globalKey" : "ee92d5eb"
-                                    },
                                     "terminationDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2021-12-04",
                                         "dateAdjustments" : {
+                                          "businessDayConvention" : "MODFOLLOWING",
                                           "businessCenters" : {
                                             "businessCentersReference" : {
-                                              "externalReference" : "floatPrimaryBusinessCenters",
-                                              "globalReference" : "42f910b"
+                                              "globalReference" : "42f910b",
+                                              "externalReference" : "floatPrimaryBusinessCenters"
                                             },
                                             "meta" : {
                                               "globalKey" : "b01f2613"
                                             }
                                           },
-                                          "businessDayConvention" : "MODFOLLOWING",
                                           "meta" : {
                                             "globalKey" : "a9f2dce2"
                                           }
                                         },
                                         "meta" : {
                                           "globalKey" : "650b12e6"
-                                        },
-                                        "unadjustedDate" : "2021-12-04"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "650b12e6"
                                       }
+                                    },
+                                    "calculationPeriodDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "floatPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "b01f2613"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "a9f2dce2"
+                                      }
+                                    },
+                                    "calculationPeriodFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "204b"
+                                      },
+                                      "rollConvention" : "4"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "a6fd5d7",
+                                      "externalKey" : "floatingCalcPeriodDates"
+                                    }
+                                  },
+                                  "paymentDates" : {
+                                    "paymentFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "aa"
+                                      }
+                                    },
+                                    "payRelativeTo" : "CalculationPeriodEndDate",
+                                    "paymentDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        }, {
+                                          "value" : "USNY"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "42f910b",
+                                          "externalKey" : "floatPrimaryBusinessCenters"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "97b8e49c"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "e18d000c",
+                                      "externalKey" : "floatingLegPaymentDates"
+                                    }
+                                  },
+                                  "resetDates" : {
+                                    "calculationPeriodDatesReference" : {
+                                      "globalReference" : "a6fd5d7",
+                                      "externalReference" : "floatingCalcPeriodDates"
+                                    },
+                                    "resetRelativeTo" : "CalculationPeriodStartDate",
+                                    "fixingDates" : {
+                                      "periodMultiplier" : -2,
+                                      "period" : "D",
+                                      "meta" : {
+                                        "globalKey" : "1a78799e"
+                                      },
+                                      "dayType" : "Business",
+                                      "businessDayConvention" : "NONE",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "21479e"
+                                        }
+                                      },
+                                      "dateRelativeTo" : {
+                                        "globalReference" : "4e6cc133",
+                                        "externalReference" : "floatingLegResetDates"
+                                      }
+                                    },
+                                    "resetFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "aa"
+                                      }
+                                    },
+                                    "resetDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "floatPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "b01f2613"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "a9f2dce2"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "4e6cc133",
+                                      "externalKey" : "floatingLegResetDates"
                                     }
                                   },
                                   "cashflowRepresentation" : {
@@ -517,584 +568,510 @@
                                     "paymentCalculationPeriod" : [ {
                                       "adjustedPaymentDate" : "2019-03-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-03-04",
                                         "adjustedStartDate" : "2018-12-04",
+                                        "adjustedEndDate" : "2019-03-04",
                                         "meta" : {
-                                          "globalKey" : "cc4d4503"
+                                          "globalKey" : "70562183"
                                         },
+                                        "notionalAmount" : 100000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2018-11-30",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a34912"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "c5959c7"
+                                        "globalKey" : "b0623647"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-06-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-06-04",
                                         "adjustedStartDate" : "2019-03-04",
+                                        "adjustedEndDate" : "2019-06-04",
                                         "meta" : {
-                                          "globalKey" : "48d7fa05"
+                                          "globalKey" : "e3ce0085"
                                         },
+                                        "notionalAmount" : 100000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-02-28",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a3fb14"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "bc374f89"
+                                        "globalKey" : "572d5609"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-09-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-09-04",
                                         "adjustedStartDate" : "2019-06-04",
+                                        "adjustedEndDate" : "2019-09-04",
                                         "meta" : {
-                                          "globalKey" : "3d26f9a2"
+                                          "globalKey" : "d81d0022"
                                         },
+                                        "notionalAmount" : 100000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-05-31",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a412b1"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "e3d98fe6"
+                                        "globalKey" : "7ecf9666"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-12-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-12-04",
                                         "adjustedStartDate" : "2019-09-04",
+                                        "adjustedEndDate" : "2019-12-04",
                                         "meta" : {
-                                          "globalKey" : "3175fd1f"
+                                          "globalKey" : "cc6c039f"
                                         },
+                                        "notionalAmount" : 100000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-09-02",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a42e2e"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "b7bd423"
+                                        "globalKey" : "a671daa3"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-03-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-03-04",
                                         "adjustedStartDate" : "2019-12-04",
+                                        "adjustedEndDate" : "2020-03-04",
                                         "meta" : {
-                                          "globalKey" : "a4ed415f"
+                                          "globalKey" : "48f61ddf"
                                         },
+                                        "notionalAmount" : 100000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-12-02",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a4456e"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "8715e23"
+                                        "globalKey" : "ac7a3aa3"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-06-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-06-04",
                                         "adjustedStartDate" : "2020-03-04",
+                                        "adjustedEndDate" : "2020-06-04",
                                         "meta" : {
-                                          "globalKey" : "2177f69f"
+                                          "globalKey" : "bc6dfd1f"
                                         },
+                                        "notionalAmount" : 100000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-03-02",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a4f7ae"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "b84f5423"
+                                        "globalKey" : "53455aa3"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-09-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-09-04",
                                         "adjustedStartDate" : "2020-06-04",
+                                        "adjustedEndDate" : "2020-09-04",
                                         "meta" : {
-                                          "globalKey" : "15c6f5df"
+                                          "globalKey" : "b0bcfc5f"
                                         },
+                                        "notionalAmount" : 100000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-06-02",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a50eee"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "dff19423"
+                                        "globalKey" : "7ae79aa3"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-12-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-12-04",
                                         "adjustedStartDate" : "2020-09-04",
+                                        "adjustedEndDate" : "2020-12-04",
                                         "meta" : {
-                                          "globalKey" : "a15f51f"
+                                          "globalKey" : "a50bfb9f"
                                         },
+                                        "notionalAmount" : 100000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-09-02",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a5262e"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "793d423"
+                                        "globalKey" : "a289daa3"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-03-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-03-04",
                                         "adjustedStartDate" : "2020-12-04",
+                                        "adjustedEndDate" : "2021-03-04",
                                         "meta" : {
-                                          "globalKey" : "7d8d395f"
+                                          "globalKey" : "219615df"
                                         },
+                                        "notionalAmount" : 100000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-12-02",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a53d6e"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "4895e23"
+                                        "globalKey" : "a8923aa3"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-06-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-06-04",
                                         "adjustedStartDate" : "2021-03-04",
+                                        "adjustedEndDate" : "2021-06-04",
                                         "meta" : {
-                                          "globalKey" : "fa17ee9f"
+                                          "globalKey" : "950df51f"
                                         },
+                                        "notionalAmount" : 100000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2021-03-02",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a5efae"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "b4675423"
+                                        "globalKey" : "4f5d5aa3"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-09-07",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-09-07",
                                         "adjustedStartDate" : "2021-06-04",
+                                        "adjustedEndDate" : "2021-09-07",
                                         "meta" : {
-                                          "globalKey" : "8d199fa2"
+                                          "globalKey" : "8e7b7e3c"
                                         },
+                                        "notionalAmount" : 100000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2021-06-02",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a606ee"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "378992e9"
+                                        "globalKey" : "38eb7183"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-12-06",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-12-06",
                                         "adjustedStartDate" : "2021-09-07",
+                                        "adjustedEndDate" : "2021-12-06",
                                         "meta" : {
-                                          "globalKey" : "51a0ed9d"
+                                          "globalKey" : "1fc856bf"
                                         },
+                                        "notionalAmount" : 100000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2021-09-03",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a61e4d"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "9b1fb2a3"
+                                        "globalKey" : "69471bc5"
                                       }
                                     } ]
                                   },
-                                  "dayCountFraction" : {
-                                    "value" : "ACT/360"
-                                  },
                                   "meta" : {
-                                    "globalKey" : "490d5c21"
-                                  },
-                                  "paymentDates" : {
-                                    "meta" : {
-                                      "externalKey" : "floatingLegPaymentDates",
-                                      "globalKey" : "637fde94"
-                                    },
-                                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                    "paymentDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        }, {
-                                          "value" : "USNY"
-                                        } ],
-                                        "meta" : {
-                                          "externalKey" : "floatPrimaryBusinessCenters",
-                                          "globalKey" : "42f910b"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "97b8e49c"
-                                      }
-                                    },
-                                    "paymentFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "956"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3
-                                    }
-                                  },
-                                  "rateSpecification" : {
-                                    "floatingRate" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
-                                      "rateOption" : {
-                                        "address" : {
-                                          "scope" : "DOCUMENT",
-                                          "value" : "rateOption-1"
-                                        }
-                                      }
-                                    }
-                                  },
-                                  "resetDates" : {
-                                    "calculationPeriodDatesReference" : {
-                                      "externalReference" : "floatingCalcPeriodDates",
-                                      "globalReference" : "ee92d5eb"
-                                    },
-                                    "fixingDates" : {
-                                      "meta" : {
-                                        "globalKey" : "3d9c8eea"
-                                      },
-                                      "period" : "D",
-                                      "periodMultiplier" : -2,
-                                      "dayType" : "BUSINESS",
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        } ],
-                                        "meta" : {
-                                          "globalKey" : "21479e"
-                                        }
-                                      },
-                                      "businessDayConvention" : "NONE",
-                                      "dateRelativeTo" : {
-                                        "externalReference" : "floatingLegResetDates",
-                                        "globalReference" : "d2ba8fb"
-                                      }
-                                    },
-                                    "meta" : {
-                                      "externalKey" : "floatingLegResetDates",
-                                      "globalKey" : "d2ba8fb"
-                                    },
-                                    "resetDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "floatPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "b01f2613"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "a9f2dce2"
-                                      }
-                                    },
-                                    "resetFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "956"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3
-                                    },
-                                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                                    "globalKey" : "f2c41085"
                                   }
                                 } ],
                                 "meta" : {
-                                  "globalKey" : "b2a74d5c"
+                                  "globalKey" : "20ce9d6e"
                                 }
                               }
                             },
                             "meta" : {
-                              "globalKey" : "373d700d"
+                              "globalKey" : "a564c01f"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "373d700d"
+                            "globalKey" : "a564c01f"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "e4cd5ef2"
                         }
-                      } ]
+                      } ],
+                      "meta" : {
+                        "globalKey" : "e4cd5ef2"
+                      }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "cbbd8e15"
+                    "globalKey" : "af029a27"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "cbbd8e15"
+                  "globalKey" : "af029a27"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "2becf472"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.02356,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.02356,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 100000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "51b199ce"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "7b78abf0"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 100000000
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f129f"
-              },
-              "value" : "2018-10-31"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "9369939"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "43400915-2"
+                    "globalKey" : "5332091c"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "ba4f",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "43400915"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "010",
                   "meta" : {
-                    "scheme" : "platform_side_id"
-                  },
-                  "value" : "43402096"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ba4f"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "ba4f",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "43400915"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "dfc23b9b"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS9369939"
+                  "value" : "MARKIT_WIRE"
+                },
+                "meta" : {
+                  "globalKey" : "66b48bac"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "66b48bac",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "66b48bac",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2018-10-31",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "010S3",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "1770bdfa"
+                "globalKey" : "a30716bd",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "27cf4469"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "d0acbe33"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "ba4f"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                }
-              },
               "quantity" : {
+                "value" : 250,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "ba4f",
+                  "externalReference" : "clearing_firm"
                 },
-                "value" : 250
+                "receiverPartyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
+                }
               },
               "settlementDate" : {
+                "unadjustedDate" : "2018-11-02",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "USNY"
@@ -1103,122 +1080,98 @@
                       "globalKey" : "27e4e9"
                     }
                   },
-                  "businessDayConvention" : "MODFOLLOWING",
                   "meta" : {
                     "globalKey" : "3662e8ba"
                   }
-                },
-                "unadjustedDate" : "2018-11-02"
+                }
               },
               "transferExpression" : {
-                "priceTransfer" : "PREMIUM"
+                "priceTransfer" : "Premium"
               }
+            },
+            "meta" : {
+              "globalKey" : "569261eb"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "798c0222"
+          }
         }
       }
     } ],
-    "intent" : "CONTRACT_FORMATION",
+    "eventQualifier" : "ContractFormation",
     "after" : [ {
-      "meta" : {
-        "globalKey" : "bcc203df"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
       "trade" : {
-        "account" : [ {
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "clearing_firm_accounts"
-            },
-            "value" : "010S3"
-          },
-          "meta" : {
-            "externalKey" : "account1",
-            "globalKey" : "34a0c93d"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
-          },
-          "servicingParty" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
-          }
-        } ],
-        "clearedDate" : "2018-10-31",
-        "meta" : {
-          "globalKey" : "65bbb1f1"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "clearing_firm",
-            "globalKey" : "ba4f"
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "1051b",
+            "externalReference" : "clearing_service"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "9369939",
+              "meta" : {
+                "scheme" : "cme_trade_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "43400915-2",
+              "meta" : {
+                "scheme" : "client_trade_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "43400915",
+              "meta" : {
+                "scheme" : "platform_trade_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "43402096",
+              "meta" : {
+                "scheme" : "platform_side_id"
+              }
+            }
+          }, {
             "identifier" : {
+              "value" : "43400915",
               "meta" : {
-                "scheme" : "clearing_member_firms"
-              },
-              "value" : "010"
-            },
-            "meta" : {
-              "globalKey" : "ba4f"
+                "scheme" : "block_trade_id"
+              }
             }
-          } ]
-        }, {
+          } ],
           "meta" : {
-            "externalKey" : "clearing_service",
-            "globalKey" : "1051b"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "value" : "CME"
-            },
+            "globalKey" : "3b480d8f"
+          }
+        }, {
+          "issuer" : {
+            "value" : "1010000023",
             "meta" : {
-              "globalKey" : "1051b"
+              "scheme" : "cftc_Namespace"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "trade_source",
-            "globalKey" : "66b48bac"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
-              "value" : "MARKIT_WIRE"
-            },
-            "meta" : {
-              "globalKey" : "66b48bac"
+              "value" : "CCCIRS9369939",
+              "meta" : {
+                "scheme" : "reg_trade_id"
+              }
             }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
-          },
-          "partyReference" : {
-            "externalReference" : "trade_source",
-            "globalReference" : "66b48bac"
-          },
-          "role" : "DATA_SUBMITTER"
+          } ],
+          "meta" : {
+            "globalKey" : "4ac79bdc"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2018-10-31",
+          "meta" : {
+            "globalKey" : "3f129f"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "ba4f"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -1227,30 +1180,23 @@
               } ],
               "economicTerms" : {
                 "payout" : {
-                  "meta" : {
-                    "globalKey" : "18852e0"
-                  },
                   "optionPayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "buyerSeller" : {
-                      "buyer" : "PARTY_1",
-                      "seller" : "PARTY_2"
+                      "buyer" : "Party1",
+                      "seller" : "Party2"
                     },
                     "exerciseTerms" : {
                       "optionStyle" : {
                         "europeanExercise" : {
-                          "earliestExerciseTime" : {
-                            "businessCenter" : {
-                              "value" : "USNY"
-                            },
-                            "hourMinuteTime" : "09:00:00"
-                          },
                           "expirationDate" : [ {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-30",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "PRECEDING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
@@ -1259,35 +1205,36 @@
                                     "globalKey" : "27e4e9"
                                   }
                                 },
-                                "businessDayConvention" : "PRECEDING",
                                 "meta" : {
                                   "globalKey" : "4c776966"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "cda77148"
-                              },
-                              "unadjustedDate" : "2018-11-30"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "cda77148"
                             }
                           } ],
+                          "earliestExerciseTime" : {
+                            "hourMinuteTime" : "09:00:00",
+                            "businessCenter" : {
+                              "value" : "USNY"
+                            }
+                          },
                           "expirationTime" : {
+                            "hourMinuteTime" : "11:00:00",
                             "businessCenter" : {
                               "value" : "USNY"
-                            },
-                            "hourMinuteTime" : "11:00:00"
+                            }
                           },
                           "meta" : {
-                            "globalKey" : "54d375d5"
+                            "globalKey" : "da4631d5"
                           }
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "18852e0"
-                    },
                     "underlier" : {
                       "contractualProduct" : {
                         "productTaxonomy" : [ {
@@ -1298,46 +1245,42 @@
                           "payout" : {
                             "interestRatePayout" : [ {
                               "payerReceiver" : {
-                                "payer" : "PARTY_1",
-                                "receiver" : "PARTY_2"
+                                "payer" : "Party1",
+                                "receiver" : "Party2"
                               },
                               "priceQuantity" : {
-                                "meta" : {
-                                  "globalKey" : "0"
-                                },
                                 "quantitySchedule" : {
                                   "address" : {
                                     "scope" : "DOCUMENT",
                                     "value" : "quantity-1"
                                   }
+                                },
+                                "meta" : {
+                                  "globalKey" : "0"
                                 }
                               },
-                              "calculationPeriodDates" : {
-                                "calculationPeriodDatesAdjustments" : {
-                                  "businessCenters" : {
-                                    "businessCentersReference" : {
-                                      "externalReference" : "fixedPrimaryBusinessCenters",
-                                      "globalReference" : "42f910b"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "fa5f1fb"
+                              "rateSpecification" : {
+                                "fixedRate" : {
+                                  "rateSchedule" : {
+                                    "price" : {
+                                      "address" : {
+                                        "scope" : "DOCUMENT",
+                                        "value" : "price-1"
+                                      }
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
-                                    "globalKey" : "979a8ca"
+                                    "globalKey" : "0"
                                   }
-                                },
-                                "calculationPeriodFrequency" : {
-                                  "meta" : {
-                                    "globalKey" : "12d7c"
-                                  },
-                                  "period" : "M",
-                                  "periodMultiplier" : 6,
-                                  "rollConvention" : "4"
-                                },
+                                }
+                              },
+                              "dayCountFraction" : {
+                                "value" : "30/360"
+                              },
+                              "calculationPeriodDates" : {
                                 "effectiveDate" : {
                                   "adjustableDate" : {
+                                    "unadjustedDate" : "2018-12-04",
                                     "dateAdjustments" : {
                                       "businessDayConvention" : "NONE",
                                       "meta" : {
@@ -1346,42 +1289,95 @@
                                     },
                                     "meta" : {
                                       "globalKey" : "eceb093c"
-                                    },
-                                    "unadjustedDate" : "2018-12-04"
+                                    }
                                   },
                                   "meta" : {
                                     "globalKey" : "eceb093c"
                                   }
                                 },
-                                "meta" : {
-                                  "externalKey" : "fixedCalcPeriodDates",
-                                  "globalKey" : "ed7e92d8"
-                                },
                                 "terminationDate" : {
                                   "adjustableDate" : {
+                                    "unadjustedDate" : "2021-12-04",
                                     "dateAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
                                       "businessCenters" : {
                                         "businessCentersReference" : {
-                                          "externalReference" : "fixedPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "fixedPrimaryBusinessCenters"
                                         },
                                         "meta" : {
                                           "globalKey" : "fa5f1fb"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
                                         "globalKey" : "979a8ca"
                                       }
                                     },
                                     "meta" : {
                                       "globalKey" : "c491dece"
-                                    },
-                                    "unadjustedDate" : "2021-12-04"
+                                    }
                                   },
                                   "meta" : {
                                     "globalKey" : "c491dece"
                                   }
+                                },
+                                "calculationPeriodDatesAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
+                                  "businessCenters" : {
+                                    "businessCentersReference" : {
+                                      "globalReference" : "42f910b",
+                                      "externalReference" : "fixedPrimaryBusinessCenters"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "fa5f1fb"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "979a8ca"
+                                  }
+                                },
+                                "calculationPeriodFrequency" : {
+                                  "periodMultiplier" : 6,
+                                  "period" : "M",
+                                  "meta" : {
+                                    "globalKey" : "2b8e"
+                                  },
+                                  "rollConvention" : "4"
+                                },
+                                "meta" : {
+                                  "globalKey" : "997e4eea",
+                                  "externalKey" : "fixedCalcPeriodDates"
+                                }
+                              },
+                              "paymentDates" : {
+                                "paymentFrequency" : {
+                                  "periodMultiplier" : 6,
+                                  "period" : "M",
+                                  "meta" : {
+                                    "globalKey" : "107"
+                                  }
+                                },
+                                "payRelativeTo" : "CalculationPeriodEndDate",
+                                "paymentDatesAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
+                                  "businessCenters" : {
+                                    "businessCenter" : [ {
+                                      "value" : "GBLO"
+                                    }, {
+                                      "value" : "USNY"
+                                    } ],
+                                    "meta" : {
+                                      "globalKey" : "42f910b",
+                                      "externalKey" : "fixedPrimaryBusinessCenters"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "97b8e49c"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "9e5a4d0f",
+                                  "externalKey" : "fixedLegPaymentDates"
                                 }
                               },
                               "cashflowRepresentation" : {
@@ -1389,183 +1385,128 @@
                                 "paymentCalculationPeriod" : [ {
                                   "adjustedPaymentDate" : "2019-06-04",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2019-06-04",
                                     "adjustedStartDate" : "2018-12-04",
+                                    "adjustedEndDate" : "2019-06-04",
                                     "meta" : {
-                                      "globalKey" : "739421d"
+                                      "globalKey" : "1e352783"
                                     },
-                                    "fixedRate" : 0.02356,
-                                    "notionalAmount" : 100000000
+                                    "notionalAmount" : 100000000,
+                                    "fixedRate" : 0.02356
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "e0c17b19"
+                                    "globalKey" : "f7bd607f"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2019-12-04",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2019-12-04",
                                     "adjustedStartDate" : "2019-06-04",
+                                    "adjustedEndDate" : "2019-12-04",
                                     "meta" : {
-                                      "globalKey" : "800371d"
+                                      "globalKey" : "212f3283"
                                     },
-                                    "fixedRate" : 0.02356,
-                                    "notionalAmount" : 100000000
+                                    "notionalAmount" : 100000000,
+                                    "fixedRate" : 0.02356
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "70cd5e99"
+                                    "globalKey" : "89fc59ff"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2020-06-04",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2020-06-04",
                                     "adjustedStartDate" : "2019-12-04",
+                                    "adjustedEndDate" : "2020-06-04",
                                     "meta" : {
-                                      "globalKey" : "afa421d"
+                                      "globalKey" : "21f62783"
                                     },
-                                    "fixedRate" : 0.02356,
-                                    "notionalAmount" : 100000000
+                                    "notionalAmount" : 100000000,
+                                    "fixedRate" : 0.02356
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "8b477319"
+                                    "globalKey" : "a243587f"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2020-12-04",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2020-12-04",
                                     "adjustedStartDate" : "2020-06-04",
+                                    "adjustedEndDate" : "2020-12-04",
                                     "meta" : {
-                                      "globalKey" : "bc1371d"
+                                      "globalKey" : "24f03283"
                                     },
-                                    "fixedRate" : 0.02356,
-                                    "notionalAmount" : 100000000
+                                    "notionalAmount" : 100000000,
+                                    "fixedRate" : 0.02356
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "1b535699"
+                                    "globalKey" : "348251ff"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2021-06-04",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2021-06-04",
                                     "adjustedStartDate" : "2020-12-04",
+                                    "adjustedEndDate" : "2021-06-04",
                                     "meta" : {
-                                      "globalKey" : "ebb421d"
+                                      "globalKey" : "25b72783"
                                     },
-                                    "fixedRate" : 0.02356,
-                                    "notionalAmount" : 100000000
+                                    "notionalAmount" : 100000000,
+                                    "fixedRate" : 0.02356
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "35cd6b19"
+                                    "globalKey" : "4cc9507f"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2021-12-06",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2021-12-06",
                                     "adjustedStartDate" : "2021-06-04",
+                                    "adjustedEndDate" : "2021-12-06",
                                     "meta" : {
-                                      "globalKey" : "f831fdb"
+                                      "globalKey" : "28b13a05"
                                     },
-                                    "fixedRate" : 0.02356,
-                                    "notionalAmount" : 100000000
+                                    "notionalAmount" : 100000000,
+                                    "fixedRate" : 0.02356
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "c943e895"
+                                    "globalKey" : "e27202bf"
                                   }
                                 } ]
                               },
-                              "dayCountFraction" : {
-                                "value" : "30/360"
-                              },
                               "meta" : {
-                                "globalKey" : "d88751a5"
-                              },
-                              "paymentDates" : {
-                                "meta" : {
-                                  "externalKey" : "fixedLegPaymentDates",
-                                  "globalKey" : "637fde97"
-                                },
-                                "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                "paymentDatesAdjustments" : {
-                                  "businessCenters" : {
-                                    "businessCenter" : [ {
-                                      "value" : "GBLO"
-                                    }, {
-                                      "value" : "USNY"
-                                    } ],
-                                    "meta" : {
-                                      "externalKey" : "fixedPrimaryBusinessCenters",
-                                      "globalKey" : "42f910b"
-                                    }
-                                  },
-                                  "businessDayConvention" : "MODFOLLOWING",
-                                  "meta" : {
-                                    "globalKey" : "97b8e49c"
-                                  }
-                                },
-                                "paymentFrequency" : {
-                                  "meta" : {
-                                    "globalKey" : "959"
-                                  },
-                                  "period" : "M",
-                                  "periodMultiplier" : 6
-                                }
-                              },
-                              "rateSpecification" : {
-                                "fixedRate" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
-                                  "rateSchedule" : {
-                                    "price" : {
-                                      "address" : {
-                                        "scope" : "DOCUMENT",
-                                        "value" : "price-1"
-                                      }
-                                    }
-                                  }
-                                }
+                                "globalKey" : "adc0aeb7"
                               }
                             }, {
                               "payerReceiver" : {
-                                "payer" : "PARTY_2",
-                                "receiver" : "PARTY_1"
+                                "payer" : "Party2",
+                                "receiver" : "Party1"
                               },
                               "priceQuantity" : {
-                                "meta" : {
-                                  "globalKey" : "0"
-                                },
                                 "quantitySchedule" : {
                                   "address" : {
                                     "scope" : "DOCUMENT",
                                     "value" : "quantity-2"
                                   }
+                                },
+                                "meta" : {
+                                  "globalKey" : "0"
                                 }
                               },
-                              "calculationPeriodDates" : {
-                                "calculationPeriodDatesAdjustments" : {
-                                  "businessCenters" : {
-                                    "businessCentersReference" : {
-                                      "externalReference" : "floatPrimaryBusinessCenters",
-                                      "globalReference" : "42f910b"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "b01f2613"
+                              "rateSpecification" : {
+                                "floatingRate" : {
+                                  "rateOption" : {
+                                    "address" : {
+                                      "scope" : "DOCUMENT",
+                                      "value" : "rateOption-1"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
-                                    "globalKey" : "a9f2dce2"
+                                    "globalKey" : "0"
                                   }
-                                },
-                                "calculationPeriodFrequency" : {
-                                  "meta" : {
-                                    "globalKey" : "12d1f"
-                                  },
-                                  "period" : "M",
-                                  "periodMultiplier" : 3,
-                                  "rollConvention" : "4"
-                                },
+                                }
+                              },
+                              "dayCountFraction" : {
+                                "value" : "ACT/360"
+                              },
+                              "calculationPeriodDates" : {
                                 "effectiveDate" : {
                                   "adjustableDate" : {
+                                    "unadjustedDate" : "2018-12-04",
                                     "dateAdjustments" : {
                                       "businessDayConvention" : "NONE",
                                       "meta" : {
@@ -1574,42 +1515,149 @@
                                     },
                                     "meta" : {
                                       "globalKey" : "eceb093c"
-                                    },
-                                    "unadjustedDate" : "2018-12-04"
+                                    }
                                   },
                                   "meta" : {
                                     "globalKey" : "eceb093c"
                                   }
                                 },
-                                "meta" : {
-                                  "externalKey" : "floatingCalcPeriodDates",
-                                  "globalKey" : "ee92d5eb"
-                                },
                                 "terminationDate" : {
                                   "adjustableDate" : {
+                                    "unadjustedDate" : "2021-12-04",
                                     "dateAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
                                       "businessCenters" : {
                                         "businessCentersReference" : {
-                                          "externalReference" : "floatPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "floatPrimaryBusinessCenters"
                                         },
                                         "meta" : {
                                           "globalKey" : "b01f2613"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
                                         "globalKey" : "a9f2dce2"
                                       }
                                     },
                                     "meta" : {
                                       "globalKey" : "650b12e6"
-                                    },
-                                    "unadjustedDate" : "2021-12-04"
+                                    }
                                   },
                                   "meta" : {
                                     "globalKey" : "650b12e6"
                                   }
+                                },
+                                "calculationPeriodDatesAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
+                                  "businessCenters" : {
+                                    "businessCentersReference" : {
+                                      "globalReference" : "42f910b",
+                                      "externalReference" : "floatPrimaryBusinessCenters"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "b01f2613"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "a9f2dce2"
+                                  }
+                                },
+                                "calculationPeriodFrequency" : {
+                                  "periodMultiplier" : 3,
+                                  "period" : "M",
+                                  "meta" : {
+                                    "globalKey" : "204b"
+                                  },
+                                  "rollConvention" : "4"
+                                },
+                                "meta" : {
+                                  "globalKey" : "a6fd5d7",
+                                  "externalKey" : "floatingCalcPeriodDates"
+                                }
+                              },
+                              "paymentDates" : {
+                                "paymentFrequency" : {
+                                  "periodMultiplier" : 3,
+                                  "period" : "M",
+                                  "meta" : {
+                                    "globalKey" : "aa"
+                                  }
+                                },
+                                "payRelativeTo" : "CalculationPeriodEndDate",
+                                "paymentDatesAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
+                                  "businessCenters" : {
+                                    "businessCenter" : [ {
+                                      "value" : "GBLO"
+                                    }, {
+                                      "value" : "USNY"
+                                    } ],
+                                    "meta" : {
+                                      "globalKey" : "42f910b",
+                                      "externalKey" : "floatPrimaryBusinessCenters"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "97b8e49c"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "e18d000c",
+                                  "externalKey" : "floatingLegPaymentDates"
+                                }
+                              },
+                              "resetDates" : {
+                                "calculationPeriodDatesReference" : {
+                                  "globalReference" : "a6fd5d7",
+                                  "externalReference" : "floatingCalcPeriodDates"
+                                },
+                                "resetRelativeTo" : "CalculationPeriodStartDate",
+                                "fixingDates" : {
+                                  "periodMultiplier" : -2,
+                                  "period" : "D",
+                                  "meta" : {
+                                    "globalKey" : "1a78799e"
+                                  },
+                                  "dayType" : "Business",
+                                  "businessDayConvention" : "NONE",
+                                  "businessCenters" : {
+                                    "businessCenter" : [ {
+                                      "value" : "GBLO"
+                                    } ],
+                                    "meta" : {
+                                      "globalKey" : "21479e"
+                                    }
+                                  },
+                                  "dateRelativeTo" : {
+                                    "globalReference" : "4e6cc133",
+                                    "externalReference" : "floatingLegResetDates"
+                                  }
+                                },
+                                "resetFrequency" : {
+                                  "periodMultiplier" : 3,
+                                  "period" : "M",
+                                  "meta" : {
+                                    "globalKey" : "aa"
+                                  }
+                                },
+                                "resetDatesAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
+                                  "businessCenters" : {
+                                    "businessCentersReference" : {
+                                      "globalReference" : "42f910b",
+                                      "externalReference" : "floatPrimaryBusinessCenters"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "b01f2613"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "a9f2dce2"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "4e6cc133",
+                                  "externalKey" : "floatingLegResetDates"
                                 }
                               },
                               "cashflowRepresentation" : {
@@ -1617,584 +1665,513 @@
                                 "paymentCalculationPeriod" : [ {
                                   "adjustedPaymentDate" : "2019-03-04",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2019-03-04",
                                     "adjustedStartDate" : "2018-12-04",
+                                    "adjustedEndDate" : "2019-03-04",
                                     "meta" : {
-                                      "globalKey" : "cc4d4503"
+                                      "globalKey" : "70562183"
                                     },
+                                    "notionalAmount" : 100000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2018-11-30",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a34912"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 100000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "c5959c7"
+                                    "globalKey" : "b0623647"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2019-06-04",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2019-06-04",
                                     "adjustedStartDate" : "2019-03-04",
+                                    "adjustedEndDate" : "2019-06-04",
                                     "meta" : {
-                                      "globalKey" : "48d7fa05"
+                                      "globalKey" : "e3ce0085"
                                     },
+                                    "notionalAmount" : 100000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2019-02-28",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a3fb14"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 100000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "bc374f89"
+                                    "globalKey" : "572d5609"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2019-09-04",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2019-09-04",
                                     "adjustedStartDate" : "2019-06-04",
+                                    "adjustedEndDate" : "2019-09-04",
                                     "meta" : {
-                                      "globalKey" : "3d26f9a2"
+                                      "globalKey" : "d81d0022"
                                     },
+                                    "notionalAmount" : 100000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2019-05-31",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a412b1"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 100000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "e3d98fe6"
+                                    "globalKey" : "7ecf9666"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2019-12-04",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2019-12-04",
                                     "adjustedStartDate" : "2019-09-04",
+                                    "adjustedEndDate" : "2019-12-04",
                                     "meta" : {
-                                      "globalKey" : "3175fd1f"
+                                      "globalKey" : "cc6c039f"
                                     },
+                                    "notionalAmount" : 100000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2019-09-02",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a42e2e"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 100000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "b7bd423"
+                                    "globalKey" : "a671daa3"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2020-03-04",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2020-03-04",
                                     "adjustedStartDate" : "2019-12-04",
+                                    "adjustedEndDate" : "2020-03-04",
                                     "meta" : {
-                                      "globalKey" : "a4ed415f"
+                                      "globalKey" : "48f61ddf"
                                     },
+                                    "notionalAmount" : 100000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2019-12-02",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a4456e"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 100000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "8715e23"
+                                    "globalKey" : "ac7a3aa3"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2020-06-04",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2020-06-04",
                                     "adjustedStartDate" : "2020-03-04",
+                                    "adjustedEndDate" : "2020-06-04",
                                     "meta" : {
-                                      "globalKey" : "2177f69f"
+                                      "globalKey" : "bc6dfd1f"
                                     },
+                                    "notionalAmount" : 100000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2020-03-02",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a4f7ae"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 100000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "b84f5423"
+                                    "globalKey" : "53455aa3"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2020-09-04",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2020-09-04",
                                     "adjustedStartDate" : "2020-06-04",
+                                    "adjustedEndDate" : "2020-09-04",
                                     "meta" : {
-                                      "globalKey" : "15c6f5df"
+                                      "globalKey" : "b0bcfc5f"
                                     },
+                                    "notionalAmount" : 100000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2020-06-02",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a50eee"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 100000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "dff19423"
+                                    "globalKey" : "7ae79aa3"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2020-12-04",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2020-12-04",
                                     "adjustedStartDate" : "2020-09-04",
+                                    "adjustedEndDate" : "2020-12-04",
                                     "meta" : {
-                                      "globalKey" : "a15f51f"
+                                      "globalKey" : "a50bfb9f"
                                     },
+                                    "notionalAmount" : 100000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2020-09-02",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a5262e"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 100000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "793d423"
+                                    "globalKey" : "a289daa3"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2021-03-04",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2021-03-04",
                                     "adjustedStartDate" : "2020-12-04",
+                                    "adjustedEndDate" : "2021-03-04",
                                     "meta" : {
-                                      "globalKey" : "7d8d395f"
+                                      "globalKey" : "219615df"
                                     },
+                                    "notionalAmount" : 100000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2020-12-02",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a53d6e"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 100000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "4895e23"
+                                    "globalKey" : "a8923aa3"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2021-06-04",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2021-06-04",
                                     "adjustedStartDate" : "2021-03-04",
+                                    "adjustedEndDate" : "2021-06-04",
                                     "meta" : {
-                                      "globalKey" : "fa17ee9f"
+                                      "globalKey" : "950df51f"
                                     },
+                                    "notionalAmount" : 100000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2021-03-02",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a5efae"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 100000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "b4675423"
+                                    "globalKey" : "4f5d5aa3"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2021-09-07",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2021-09-07",
                                     "adjustedStartDate" : "2021-06-04",
+                                    "adjustedEndDate" : "2021-09-07",
                                     "meta" : {
-                                      "globalKey" : "8d199fa2"
+                                      "globalKey" : "8e7b7e3c"
                                     },
+                                    "notionalAmount" : 100000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2021-06-02",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a606ee"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 100000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "378992e9"
+                                    "globalKey" : "38eb7183"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2021-12-06",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2021-12-06",
                                     "adjustedStartDate" : "2021-09-07",
+                                    "adjustedEndDate" : "2021-12-06",
                                     "meta" : {
-                                      "globalKey" : "51a0ed9d"
+                                      "globalKey" : "1fc856bf"
                                     },
+                                    "notionalAmount" : 100000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2021-09-03",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a61e4d"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 100000000
-                                  } ],
-                                  "meta" : {
-                                    "globalKey" : "9b1fb2a3"
-                                  }
-                                } ]
-                              },
-                              "dayCountFraction" : {
-                                "value" : "ACT/360"
-                              },
-                              "meta" : {
-                                "globalKey" : "490d5c21"
-                              },
-                              "paymentDates" : {
-                                "meta" : {
-                                  "externalKey" : "floatingLegPaymentDates",
-                                  "globalKey" : "637fde94"
-                                },
-                                "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                "paymentDatesAdjustments" : {
-                                  "businessCenters" : {
-                                    "businessCenter" : [ {
-                                      "value" : "GBLO"
-                                    }, {
-                                      "value" : "USNY"
-                                    } ],
-                                    "meta" : {
-                                      "externalKey" : "floatPrimaryBusinessCenters",
-                                      "globalKey" : "42f910b"
                                     }
-                                  },
-                                  "businessDayConvention" : "MODFOLLOWING",
-                                  "meta" : {
-                                    "globalKey" : "97b8e49c"
-                                  }
-                                },
-                                "paymentFrequency" : {
-                                  "meta" : {
-                                    "globalKey" : "956"
-                                  },
-                                  "period" : "M",
-                                  "periodMultiplier" : 3
-                                }
-                              },
-                              "rateSpecification" : {
-                                "floatingRate" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
-                                  "rateOption" : {
-                                    "address" : {
-                                      "scope" : "DOCUMENT",
-                                      "value" : "rateOption-1"
-                                    }
-                                  }
-                                }
-                              },
-                              "resetDates" : {
-                                "calculationPeriodDatesReference" : {
-                                  "externalReference" : "floatingCalcPeriodDates",
-                                  "globalReference" : "ee92d5eb"
-                                },
-                                "fixingDates" : {
-                                  "meta" : {
-                                    "globalKey" : "3d9c8eea"
-                                  },
-                                  "period" : "D",
-                                  "periodMultiplier" : -2,
-                                  "dayType" : "BUSINESS",
-                                  "businessCenters" : {
-                                    "businessCenter" : [ {
-                                      "value" : "GBLO"
-                                    } ],
-                                    "meta" : {
-                                      "globalKey" : "21479e"
-                                    }
-                                  },
-                                  "businessDayConvention" : "NONE",
-                                  "dateRelativeTo" : {
-                                    "externalReference" : "floatingLegResetDates",
-                                    "globalReference" : "d2ba8fb"
-                                  }
-                                },
-                                "meta" : {
-                                  "externalKey" : "floatingLegResetDates",
-                                  "globalKey" : "d2ba8fb"
-                                },
-                                "resetDatesAdjustments" : {
-                                  "businessCenters" : {
-                                    "businessCentersReference" : {
-                                      "externalReference" : "floatPrimaryBusinessCenters",
-                                      "globalReference" : "42f910b"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "b01f2613"
-                                    }
-                                  },
-                                  "businessDayConvention" : "MODFOLLOWING",
+                                  } ],
                                   "meta" : {
-                                    "globalKey" : "a9f2dce2"
+                                    "globalKey" : "69471bc5"
                                   }
-                                },
-                                "resetFrequency" : {
-                                  "meta" : {
-                                    "globalKey" : "956"
-                                  },
-                                  "period" : "M",
-                                  "periodMultiplier" : 3
-                                },
-                                "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                                } ]
+                              },
+                              "meta" : {
+                                "globalKey" : "f2c41085"
                               }
                             } ],
                             "meta" : {
-                              "globalKey" : "b2a74d5c"
+                              "globalKey" : "20ce9d6e"
                             }
                           }
                         },
                         "meta" : {
-                          "globalKey" : "373d700d"
+                          "globalKey" : "a564c01f"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "373d700d"
+                        "globalKey" : "a564c01f"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "e4cd5ef2"
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "e4cd5ef2"
+                  }
                 }
               },
               "meta" : {
-                "globalKey" : "cbbd8e15"
+                "globalKey" : "af029a27"
               }
             },
             "meta" : {
-              "globalKey" : "cbbd8e15"
+              "globalKey" : "af029a27"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "2becf472"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.02356,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.02356,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
                 }
               } ],
               "quantity" : [ {
+                "value" : {
+                  "value" : 100000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "51b199ce"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 100000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 100000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
                 }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "7b78abf0"
-              },
+              } ],
               "observable" : {
-                "meta" : {
-                  "globalKey" : "5f0c6d05"
-                },
                 "rateOption" : {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "rateOption-1"
-                    } ]
-                  },
                   "value" : {
                     "floatingRateIndex" : {
                       "value" : "USD-LIBOR-BBA"
                     },
                     "indexTenor" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
+                      "periodMultiplier" : 3,
                       "period" : "M",
-                      "periodMultiplier" : 3
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "rateOption-1"
+                    } ]
                   }
-                }
-              },
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
                 },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 100000000
+                "meta" : {
+                  "globalKey" : "828026c7"
                 }
-              } ]
-            } ]
-          } ]
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f129f"
-          },
-          "value" : "2018-10-31"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "cme_trade_id"
               },
-              "value" : "9369939"
-            }
-          }, {
-            "identifier" : {
               "meta" : {
-                "scheme" : "client_trade_id"
-              },
-              "value" : "43400915-2"
+                "globalKey" : "5332091c"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "ba4f",
+              "externalReference" : "clearing_firm"
             }
           }, {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "platform_trade_id"
-              },
-              "value" : "43400915"
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
             }
-          }, {
+          } ]
+        },
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "010",
               "meta" : {
-                "scheme" : "platform_side_id"
-              },
-              "value" : "43402096"
+                "scheme" : "clearing_member_firms"
+              }
+            },
+            "meta" : {
+              "globalKey" : "ba4f"
             }
-          }, {
+          } ],
+          "meta" : {
+            "globalKey" : "ba4f",
+            "externalKey" : "clearing_firm"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "block_trade_id"
-              },
-              "value" : "43400915"
+              "value" : "CME"
+            },
+            "meta" : {
+              "globalKey" : "1051b"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "clearing_service",
-            "globalReference" : "1051b"
-          },
           "meta" : {
-            "globalKey" : "dfc23b9b"
+            "globalKey" : "1051b",
+            "externalKey" : "clearing_service"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "reg_trade_id"
-              },
-              "value" : "CCCIRS9369939"
+              "value" : "MARKIT_WIRE"
+            },
+            "meta" : {
+              "globalKey" : "66b48bac"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "66b48bac",
+            "externalKey" : "trade_source"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "66b48bac",
+            "externalReference" : "trade_source"
+          },
+          "role" : "DataSubmitter",
+          "ownershipPartyReference" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
+          }
+        } ],
+        "clearedDate" : "2018-10-31",
+        "account" : [ {
+          "partyReference" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
+          },
+          "accountNumber" : {
+            "value" : "010S3",
             "meta" : {
-              "scheme" : "cftc_Namespace"
-            },
-            "value" : "1010000023"
+              "scheme" : "clearing_firm_accounts"
+            }
+          },
+          "servicingParty" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
           },
           "meta" : {
-            "globalKey" : "1770bdfa"
+            "globalKey" : "a30716bd",
+            "externalKey" : "account1"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "27cf4469"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
       },
       "transferHistory" : [ {
-        "meta" : {
-          "globalKey" : "d0acbe33"
-        },
         "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "ba4f"
-            },
-            "receiverPartyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            }
-          },
           "quantity" : {
+            "value" : 250,
             "unit" : {
               "currency" : {
                 "value" : "USD"
               }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "ba4f",
+              "externalReference" : "clearing_firm"
             },
-            "value" : 250
+            "receiverPartyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
+            }
           },
           "settlementDate" : {
+            "unadjustedDate" : "2018-11-02",
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "USNY"
@@ -2203,73 +2180,79 @@
                   "globalKey" : "27e4e9"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "3662e8ba"
               }
-            },
-            "unadjustedDate" : "2018-11-02"
+            }
           },
           "transferExpression" : {
-            "priceTransfer" : "PREMIUM"
+            "priceTransfer" : "Premium"
           }
+        },
+        "meta" : {
+          "globalKey" : "569261eb"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "b3efc2df"
+      }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "a3e86e65"
+      "globalKey" : "6f3d51a5"
     }
   },
+  "previousWorkflowStep" : {
+    "globalReference" : "9f551ccf"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "0109369939",
       "meta" : {
         "scheme" : "cme_message_id"
-      },
-      "value" : "0109369939"
+      }
     },
     "sentBy" : {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
+      }
     },
     "sentTo" : [ {
+      "value" : "010",
       "meta" : {
         "scheme" : "cme_firm_id"
-      },
-      "value" : "010"
+      }
     }, {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
+      }
     } ]
   },
-  "meta" : {
-    "globalKey" : "237e0ddc"
-  },
+  "timestamp" : [ {
+    "dateTime" : "2018-10-31T14:37:48Z",
+    "qualification" : "eventCreationDateTime"
+  }, {
+    "dateTime" : "2018-10-31T14:16:26.588Z",
+    "qualification" : "clearingReceiptDateTime"
+  } ],
   "party" : [ {
-    "meta" : {
-      "externalKey" : "clearing_firm",
-      "globalKey" : "ba4f"
-    },
     "partyId" : [ {
       "identifier" : {
+        "value" : "010",
         "meta" : {
           "scheme" : "clearing_member_firms"
-        },
-        "value" : "010"
+        }
       },
       "meta" : {
         "globalKey" : "ba4f"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "clearing_service",
-      "globalKey" : "1051b"
-    },
+      "globalKey" : "ba4f",
+      "externalKey" : "clearing_firm"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "CME"
@@ -2277,12 +2260,12 @@
       "meta" : {
         "globalKey" : "1051b"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "trade_source",
-      "globalKey" : "66b48bac"
-    },
+      "globalKey" : "1051b",
+      "externalKey" : "clearing_service"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "MARKIT_WIRE"
@@ -2290,16 +2273,33 @@
       "meta" : {
         "globalKey" : "66b48bac"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "66b48bac",
+      "externalKey" : "trade_source"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "e3133c43"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2018-10-31T14:37:48Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  }, {
-    "dateTime" : "2018-10-31T14:16:26.588Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
-  } ]
+  "account" : [ {
+    "partyReference" : {
+      "globalReference" : "ba4f",
+      "externalReference" : "clearing_firm"
+    },
+    "accountNumber" : {
+      "value" : "010S3",
+      "meta" : {
+        "scheme" : "clearing_firm_accounts"
+      }
+    },
+    "servicingParty" : {
+      "globalReference" : "ba4f",
+      "externalReference" : "clearing_firm"
+    },
+    "meta" : {
+      "globalKey" : "a30716bd",
+      "externalKey" : "account1"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "31661e0a"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/Swaption-ex03-Straddle-Physical-Exercise-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/Swaption-ex03-Straddle-Physical-Exercise-func-output.json
index ea6e2028c4..b9db0decae 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/Swaption-ex03-Straddle-Physical-Exercise-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/cme-cleared-confirm-1-17/Swaption-ex03-Straddle-Physical-Exercise-func-output.json
@@ -1,124 +1,73 @@
 {
-  "account" : [ {
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "clearing_firm_accounts"
-      },
-      "value" : "HOUSE2"
-    },
-    "meta" : {
-      "externalKey" : "account1",
-      "globalKey" : "fb18f120"
-    },
-    "partyReference" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "ba4f"
-    },
-    "servicingParty" : {
-      "externalReference" : "clearing_firm",
-      "globalReference" : "ba4f"
-    }
-  } ],
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "f78f3236"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "HOUSE2"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "fb18f120"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              }
-            } ],
-            "clearedDate" : "2015-01-12",
-            "meta" : {
-              "globalKey" : "30b5606a"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "ba4f"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "2894761",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "010"
-                },
-                "meta" : {
-                  "globalKey" : "ba4f"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "2052340",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "902a6db3"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CHI2WIRE"
-                },
+                  "value" : "19300360",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "19300360",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "cb2626af"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "902a6db3"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "902a6db3"
               },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS2894761",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e12c31ab"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2014-10-23",
+              "meta" : {
+                "globalKey" : "3ef297"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "ba4f"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -127,30 +76,24 @@
                   } ],
                   "economicTerms" : {
                     "payout" : {
-                      "meta" : {
-                        "globalKey" : "cb966dcd"
-                      },
                       "optionPayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "buyerSeller" : {
-                          "buyer" : "PARTY_1",
-                          "seller" : "PARTY_2"
+                          "buyer" : "Party1",
+                          "seller" : "Party2"
                         },
+                        "optionType" : "Straddle",
                         "exerciseTerms" : {
                           "optionStyle" : {
                             "europeanExercise" : {
-                              "earliestExerciseTime" : {
-                                "businessCenter" : {
-                                  "value" : "USNY"
-                                },
-                                "hourMinuteTime" : "09:00:00"
-                              },
                               "expirationDate" : [ {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2015-04-23",
                                   "dateAdjustments" : {
+                                    "businessDayConvention" : "PRECEDING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "USNY"
@@ -159,36 +102,36 @@
                                         "globalKey" : "27e4e9"
                                       }
                                     },
-                                    "businessDayConvention" : "PRECEDING",
                                     "meta" : {
                                       "globalKey" : "4c776966"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "d0eb86af"
-                                  },
-                                  "unadjustedDate" : "2015-04-23"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "d0eb86af"
                                 }
                               } ],
+                              "earliestExerciseTime" : {
+                                "hourMinuteTime" : "09:00:00",
+                                "businessCenter" : {
+                                  "value" : "USNY"
+                                }
+                              },
                               "expirationTime" : {
+                                "hourMinuteTime" : "11:00:00",
                                 "businessCenter" : {
                                   "value" : "USNY"
-                                },
-                                "hourMinuteTime" : "11:00:00"
+                                }
                               },
                               "meta" : {
-                                "globalKey" : "43b07fbc"
+                                "globalKey" : "9e2df03c"
                               }
                             }
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "cb966dcd"
-                        },
-                        "optionType" : "STRADDLE",
                         "underlier" : {
                           "contractualProduct" : {
                             "productTaxonomy" : [ {
@@ -199,46 +142,42 @@
                               "payout" : {
                                 "interestRatePayout" : [ {
                                   "payerReceiver" : {
-                                    "payer" : "PARTY_1",
-                                    "receiver" : "PARTY_2"
+                                    "payer" : "Party1",
+                                    "receiver" : "Party2"
                                   },
                                   "priceQuantity" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
                                     "quantitySchedule" : {
                                       "address" : {
                                         "scope" : "DOCUMENT",
                                         "value" : "quantity-1"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "0"
                                     }
                                   },
-                                  "calculationPeriodDates" : {
-                                    "calculationPeriodDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "fixedPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "fa5f1fb"
+                                  "rateSpecification" : {
+                                    "fixedRate" : {
+                                      "rateSchedule" : {
+                                        "price" : {
+                                          "address" : {
+                                            "scope" : "DOCUMENT",
+                                            "value" : "price-1"
+                                          }
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
-                                        "globalKey" : "979a8ca"
+                                        "globalKey" : "0"
                                       }
-                                    },
-                                    "calculationPeriodFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "28cab"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6,
-                                      "rollConvention" : "27"
-                                    },
+                                    }
+                                  },
+                                  "dayCountFraction" : {
+                                    "value" : "30/360"
+                                  },
+                                  "calculationPeriodDates" : {
                                     "effectiveDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2015-04-27",
                                         "dateAdjustments" : {
                                           "businessDayConvention" : "NONE",
                                           "meta" : {
@@ -247,42 +186,94 @@
                                         },
                                         "meta" : {
                                           "globalKey" : "ec89c593"
-                                        },
-                                        "unadjustedDate" : "2015-04-27"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "ec89c593"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "fixedCalcPeriodDates",
-                                      "globalKey" : "7c1d02a7"
-                                    },
                                     "terminationDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2022-04-27",
                                         "dateAdjustments" : {
+                                          "businessDayConvention" : "MODFOLLOWING",
                                           "businessCenters" : {
                                             "businessCentersReference" : {
-                                              "externalReference" : "fixedPrimaryBusinessCenters",
-                                              "globalReference" : "42f910b"
+                                              "globalReference" : "42f910b",
+                                              "externalReference" : "fixedPrimaryBusinessCenters"
                                             },
                                             "meta" : {
                                               "globalKey" : "fa5f1fb"
                                             }
                                           },
-                                          "businessDayConvention" : "MODFOLLOWING",
                                           "meta" : {
                                             "globalKey" : "979a8ca"
                                           }
                                         },
                                         "meta" : {
                                           "globalKey" : "814e7425"
-                                        },
-                                        "unadjustedDate" : "2022-04-27"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "814e7425"
                                       }
+                                    },
+                                    "calculationPeriodDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "fixedPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "fa5f1fb"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "979a8ca"
+                                      }
+                                    },
+                                    "calculationPeriodFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "18abd"
+                                      },
+                                      "rollConvention" : "27"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "21b9e479",
+                                      "externalKey" : "fixedCalcPeriodDates"
+                                    }
+                                  },
+                                  "paymentDates" : {
+                                    "paymentFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "107"
+                                      }
+                                    },
+                                    "payRelativeTo" : "CalculationPeriodEndDate",
+                                    "paymentDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        }, {
+                                          "value" : "USNY"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "42f910b",
+                                          "externalKey" : "fixedPrimaryBusinessCenters"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "97b8e49c"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "9e5a4d0f"
                                     }
                                   },
                                   "cashflowRepresentation" : {
@@ -290,294 +281,240 @@
                                     "paymentCalculationPeriod" : [ {
                                       "adjustedPaymentDate" : "2015-10-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2015-10-27",
                                         "adjustedStartDate" : "2015-04-27",
+                                        "adjustedEndDate" : "2015-10-27",
                                         "meta" : {
-                                          "globalKey" : "6e8dc534"
+                                          "globalKey" : "7e6a8fcc"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000
+                                        "notionalAmount" : 3000000,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "891a3379"
+                                        "globalKey" : "98f6fe11"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-04-27",
                                         "adjustedStartDate" : "2015-10-27",
+                                        "adjustedEndDate" : "2016-04-27",
                                         "meta" : {
-                                          "globalKey" : "7187d034"
+                                          "globalKey" : "7f3184cc"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000
+                                        "notionalAmount" : 3000000,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "a39447f9"
+                                        "globalKey" : "b13dfc91"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-10-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-10-27",
                                         "adjustedStartDate" : "2016-04-27",
+                                        "adjustedEndDate" : "2016-10-27",
                                         "meta" : {
-                                          "globalKey" : "724ec534"
+                                          "globalKey" : "822b8fcc"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000
+                                        "notionalAmount" : 3000000,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "33a02b79"
+                                        "globalKey" : "437cf611"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-04-27",
                                         "adjustedStartDate" : "2016-10-27",
+                                        "adjustedEndDate" : "2017-04-27",
                                         "meta" : {
-                                          "globalKey" : "7548d034"
+                                          "globalKey" : "82f284cc"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000
+                                        "notionalAmount" : 3000000,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "4e1a3ff9"
+                                        "globalKey" : "5bc3f491"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-10-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-10-27",
                                         "adjustedStartDate" : "2017-04-27",
+                                        "adjustedEndDate" : "2017-10-27",
                                         "meta" : {
-                                          "globalKey" : "760fc534"
+                                          "globalKey" : "85ec8fcc"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000
+                                        "notionalAmount" : 3000000,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "de262379"
+                                        "globalKey" : "ee02ee11"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-04-27",
                                         "adjustedStartDate" : "2017-10-27",
+                                        "adjustedEndDate" : "2018-04-27",
                                         "meta" : {
-                                          "globalKey" : "7909d034"
+                                          "globalKey" : "86b384cc"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000
+                                        "notionalAmount" : 3000000,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "f8a037f9"
+                                        "globalKey" : "649ec91"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-10-29",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-10-29",
                                         "adjustedStartDate" : "2018-04-27",
+                                        "adjustedEndDate" : "2018-10-29",
                                         "meta" : {
-                                          "globalKey" : "79d1adf2"
+                                          "globalKey" : "89ad974e"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000
+                                        "notionalAmount" : 3000000,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "8c16b575"
+                                        "globalKey" : "9bf29ed1"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-04-29",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-04-29",
                                         "adjustedStartDate" : "2018-10-29",
+                                        "adjustedEndDate" : "2019-04-29",
                                         "meta" : {
-                                          "globalKey" : "7ccbc074"
+                                          "globalKey" : "8a75750c"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000
+                                        "notionalAmount" : 3000000,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "a690d177"
+                                        "globalKey" : "b43a860f"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-10-28",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-10-28",
                                         "adjustedStartDate" : "2019-04-29",
+                                        "adjustedEndDate" : "2019-10-28",
                                         "meta" : {
-                                          "globalKey" : "7d924115"
+                                          "globalKey" : "8d6f7c4b"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000
+                                        "notionalAmount" : 3000000,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "34e767f9"
+                                        "globalKey" : "44c4a32f"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-04-27",
                                         "adjustedStartDate" : "2019-10-28",
+                                        "adjustedEndDate" : "2020-04-27",
                                         "meta" : {
-                                          "globalKey" : "808bd3f5"
+                                          "globalKey" : "8e35f92b"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000
+                                        "notionalAmount" : 3000000,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "4dac2bba"
+                                        "globalKey" : "5b5650f0"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-10-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-10-27",
                                         "adjustedStartDate" : "2020-04-27",
+                                        "adjustedEndDate" : "2020-10-27",
                                         "meta" : {
-                                          "globalKey" : "8152c534"
+                                          "globalKey" : "912f8fcc"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000
+                                        "notionalAmount" : 3000000,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "ddb80b79"
+                                        "globalKey" : "ed94d611"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-04-27",
                                         "adjustedStartDate" : "2020-10-27",
+                                        "adjustedEndDate" : "2021-04-27",
                                         "meta" : {
-                                          "globalKey" : "844cd034"
+                                          "globalKey" : "91f684cc"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000
+                                        "notionalAmount" : 3000000,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "f8321ff9"
+                                        "globalKey" : "5dbd491"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-10-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-10-27",
                                         "adjustedStartDate" : "2021-04-27",
+                                        "adjustedEndDate" : "2021-10-27",
                                         "meta" : {
-                                          "globalKey" : "8513c534"
+                                          "globalKey" : "94f08fcc"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000
+                                        "notionalAmount" : 3000000,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "883e0379"
+                                        "globalKey" : "981ace11"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2022-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2022-04-27",
                                         "adjustedStartDate" : "2021-10-27",
+                                        "adjustedEndDate" : "2022-04-27",
                                         "meta" : {
-                                          "globalKey" : "880dd034"
+                                          "globalKey" : "95b784cc"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000
+                                        "notionalAmount" : 3000000,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "a2b817f9"
+                                        "globalKey" : "b061cc91"
                                       }
                                     } ]
                                   },
-                                  "dayCountFraction" : {
-                                    "value" : "30/360"
-                                  },
                                   "meta" : {
-                                    "globalKey" : "840d5d4f"
-                                  },
-                                  "paymentDates" : {
-                                    "meta" : {
-                                      "globalKey" : "637fde97"
-                                    },
-                                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                    "paymentDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        }, {
-                                          "value" : "USNY"
-                                        } ],
-                                        "meta" : {
-                                          "externalKey" : "fixedPrimaryBusinessCenters",
-                                          "globalKey" : "42f910b"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "97b8e49c"
-                                      }
-                                    },
-                                    "paymentFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "959"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6
-                                    }
-                                  },
-                                  "rateSpecification" : {
-                                    "fixedRate" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
-                                      "rateSchedule" : {
-                                        "price" : {
-                                          "address" : {
-                                            "scope" : "DOCUMENT",
-                                            "value" : "price-1"
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }, {
-                                  "payerReceiver" : {
-                                    "payer" : "PARTY_2",
-                                    "receiver" : "PARTY_1"
+                                    "globalKey" : "e1717535"
+                                  }
+                                }, {
+                                  "payerReceiver" : {
+                                    "payer" : "Party2",
+                                    "receiver" : "Party1"
                                   },
                                   "priceQuantity" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
                                     "quantitySchedule" : {
                                       "address" : {
                                         "scope" : "DOCUMENT",
                                         "value" : "quantity-2"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "0"
                                     }
                                   },
-                                  "calculationPeriodDates" : {
-                                    "calculationPeriodDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "floatPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "b01f2613"
+                                  "rateSpecification" : {
+                                    "floatingRate" : {
+                                      "rateOption" : {
+                                        "address" : {
+                                          "scope" : "DOCUMENT",
+                                          "value" : "rateOption-1"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
-                                        "globalKey" : "a9f2dce2"
+                                        "globalKey" : "0"
                                       }
-                                    },
-                                    "calculationPeriodFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "28c4e"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3,
-                                      "rollConvention" : "27"
-                                    },
+                                    }
+                                  },
+                                  "dayCountFraction" : {
+                                    "value" : "ACT/360"
+                                  },
+                                  "calculationPeriodDates" : {
                                     "effectiveDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2015-04-27",
                                         "dateAdjustments" : {
                                           "businessDayConvention" : "NONE",
                                           "meta" : {
@@ -586,42 +523,148 @@
                                         },
                                         "meta" : {
                                           "globalKey" : "ec89c593"
-                                        },
-                                        "unadjustedDate" : "2015-04-27"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "ec89c593"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "floatingCalcPeriodDates",
-                                      "globalKey" : "7d3145ba"
-                                    },
                                     "terminationDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2022-04-27",
                                         "dateAdjustments" : {
+                                          "businessDayConvention" : "MODFOLLOWING",
                                           "businessCenters" : {
                                             "businessCentersReference" : {
-                                              "externalReference" : "floatPrimaryBusinessCenters",
-                                              "globalReference" : "42f910b"
+                                              "globalReference" : "42f910b",
+                                              "externalReference" : "floatPrimaryBusinessCenters"
                                             },
                                             "meta" : {
                                               "globalKey" : "b01f2613"
                                             }
                                           },
-                                          "businessDayConvention" : "MODFOLLOWING",
                                           "meta" : {
                                             "globalKey" : "a9f2dce2"
                                           }
                                         },
                                         "meta" : {
                                           "globalKey" : "21c7a83d"
-                                        },
-                                        "unadjustedDate" : "2022-04-27"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "21c7a83d"
                                       }
+                                    },
+                                    "calculationPeriodDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "floatPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "b01f2613"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "a9f2dce2"
+                                      }
+                                    },
+                                    "calculationPeriodFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "17f7a"
+                                      },
+                                      "rollConvention" : "27"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "92ab6b66",
+                                      "externalKey" : "floatingCalcPeriodDates"
+                                    }
+                                  },
+                                  "paymentDates" : {
+                                    "paymentFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "aa"
+                                      }
+                                    },
+                                    "payRelativeTo" : "CalculationPeriodEndDate",
+                                    "paymentDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        }, {
+                                          "value" : "USNY"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "42f910b",
+                                          "externalKey" : "floatPrimaryBusinessCenters"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "97b8e49c"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "e18d000c"
+                                    }
+                                  },
+                                  "resetDates" : {
+                                    "calculationPeriodDatesReference" : {
+                                      "globalReference" : "92ab6b66",
+                                      "externalReference" : "floatingCalcPeriodDates"
+                                    },
+                                    "resetRelativeTo" : "CalculationPeriodStartDate",
+                                    "fixingDates" : {
+                                      "periodMultiplier" : -2,
+                                      "period" : "D",
+                                      "meta" : {
+                                        "globalKey" : "1a78799e"
+                                      },
+                                      "dayType" : "Business",
+                                      "businessDayConvention" : "NONE",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "21479e"
+                                        }
+                                      },
+                                      "dateRelativeTo" : {
+                                        "globalReference" : "60d85ac4",
+                                        "externalReference" : "floatingLegResetDates"
+                                      }
+                                    },
+                                    "resetFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "aa"
+                                      }
+                                    },
+                                    "resetDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "floatPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "b01f2613"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "a9f2dce2"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "60d85ac4",
+                                      "externalKey" : "floatingLegResetDates"
                                     }
                                   },
                                   "cashflowRepresentation" : {
@@ -629,928 +672,862 @@
                                     "paymentCalculationPeriod" : [ {
                                       "adjustedPaymentDate" : "2015-07-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2015-07-27",
                                         "adjustedStartDate" : "2015-04-27",
+                                        "adjustedEndDate" : "2015-07-27",
                                         "meta" : {
-                                          "globalKey" : "1b56c1cc"
+                                          "globalKey" : "b64cc84c"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2015-04-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a029f9"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "6417b0a7"
+                                        "globalKey" : "ff0db727"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2015-10-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2015-10-27",
                                         "adjustedStartDate" : "2015-07-27",
+                                        "adjustedEndDate" : "2015-10-27",
                                         "meta" : {
-                                          "globalKey" : "fa5c10c"
+                                          "globalKey" : "aa9bc78c"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2015-07-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a04139"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "8bb9f0a7"
+                                        "globalKey" : "26aff727"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-01-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-01-27",
                                         "adjustedStartDate" : "2015-10-27",
+                                        "adjustedEndDate" : "2016-01-27",
                                         "meta" : {
-                                          "globalKey" : "831d054c"
+                                          "globalKey" : "2725e1cc"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2015-10-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a05879"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "88af7aa7"
+                                        "globalKey" : "2cb85727"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-04-27",
                                         "adjustedStartDate" : "2016-01-27",
+                                        "adjustedEndDate" : "2016-04-27",
                                         "meta" : {
-                                          "globalKey" : "ffa7baca"
+                                          "globalKey" : "9a9dc14a"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2016-01-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a10af7"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "388d70e5"
+                                        "globalKey" : "d3837765"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-07-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-07-27",
                                         "adjustedStartDate" : "2016-04-27",
+                                        "adjustedEndDate" : "2016-07-27",
                                         "meta" : {
-                                          "globalKey" : "f3f6ba0a"
+                                          "globalKey" : "8eecc08a"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2016-04-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a12237"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "602fb0e5"
+                                        "globalKey" : "fb25b765"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-10-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-10-27",
                                         "adjustedStartDate" : "2016-07-27",
+                                        "adjustedEndDate" : "2016-10-27",
                                         "meta" : {
-                                          "globalKey" : "e845b94a"
+                                          "globalKey" : "833bbfca"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2016-07-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a13977"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "87d1f0e5"
+                                        "globalKey" : "22c7f765"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-01-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-01-27",
                                         "adjustedStartDate" : "2016-10-27",
+                                        "adjustedEndDate" : "2017-01-27",
                                         "meta" : {
-                                          "globalKey" : "5bbcfd8a"
+                                          "globalKey" : "ffc5da0a"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2016-10-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a150b7"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "84c77ae5"
+                                        "globalKey" : "28d05765"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-04-27",
                                         "adjustedStartDate" : "2017-01-27",
+                                        "adjustedEndDate" : "2017-04-27",
                                         "meta" : {
-                                          "globalKey" : "d847b2ca"
+                                          "globalKey" : "733db94a"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2017-01-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a202f7"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "34a570e5"
+                                        "globalKey" : "cf9b7765"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-07-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-07-27",
                                         "adjustedStartDate" : "2017-04-27",
+                                        "adjustedEndDate" : "2017-07-27",
                                         "meta" : {
-                                          "globalKey" : "cc96b20a"
+                                          "globalKey" : "678cb88a"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2017-04-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a21a37"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "5c47b0e5"
+                                        "globalKey" : "f73db765"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-10-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-10-27",
                                         "adjustedStartDate" : "2017-07-27",
+                                        "adjustedEndDate" : "2017-10-27",
                                         "meta" : {
-                                          "globalKey" : "c0e5b14a"
+                                          "globalKey" : "5bdbb7ca"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2017-07-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a23177"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "83e9f0e5"
+                                        "globalKey" : "1edff765"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-01-29",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-01-29",
                                         "adjustedStartDate" : "2017-10-27",
+                                        "adjustedEndDate" : "2018-01-29",
                                         "meta" : {
-                                          "globalKey" : "9e296c0c"
+                                          "globalKey" : "dbcf8348"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2017-10-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a248b7"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "1334cf69"
+                                        "globalKey" : "50dae6a5"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-04-27",
                                         "adjustedStartDate" : "2018-01-29",
+                                        "adjustedEndDate" : "2018-04-27",
                                         "meta" : {
-                                          "globalKey" : "b4515c08"
+                                          "globalKey" : "b5aa27cc"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2018-01-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a2faf7"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "34272223"
+                                        "globalKey" : "357fede7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-07-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-07-27",
                                         "adjustedStartDate" : "2018-04-27",
+                                        "adjustedEndDate" : "2018-07-27",
                                         "meta" : {
-                                          "globalKey" : "a536aa0a"
+                                          "globalKey" : "402cb08a"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2018-04-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a31237"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "585fb0e5"
+                                        "globalKey" : "f355b765"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-10-29",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-10-29",
                                         "adjustedStartDate" : "2018-07-27",
+                                        "adjustedEndDate" : "2018-10-29",
                                         "meta" : {
-                                          "globalKey" : "3521fcc"
+                                          "globalKey" : "37e56108"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2018-07-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a32977"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "12574569"
+                                        "globalKey" : "46ea86a5"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-01-28",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-01-28",
                                         "adjustedStartDate" : "2018-10-29",
+                                        "adjustedEndDate" : "2019-01-28",
                                         "meta" : {
-                                          "globalKey" : "454cda09"
+                                          "globalKey" : "1c87192b"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2018-10-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a340b7"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "498bd665"
+                                        "globalKey" : "20c61587"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-04-29",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-04-29",
                                         "adjustedStartDate" : "2019-01-28",
+                                        "adjustedEndDate" : "2019-04-29",
                                         "meta" : {
-                                          "globalKey" : "f508f1cc"
+                                          "globalKey" : "5ccd95aa"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-01-24",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a3f2d8"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "c0df9de9"
+                                        "globalKey" : "28a441c7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-07-29",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-07-29",
                                         "adjustedStartDate" : "2019-04-29",
+                                        "adjustedEndDate" : "2019-07-29",
                                         "meta" : {
-                                          "globalKey" : "eb0cc9ca"
+                                          "globalKey" : "8602d04a"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-04-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a40a37"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "ea36b6a7"
+                                        "globalKey" : "852cbd27"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-10-28",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-10-28",
                                         "adjustedStartDate" : "2019-07-29",
+                                        "adjustedEndDate" : "2019-10-28",
                                         "meta" : {
-                                          "globalKey" : "aa758dc9"
+                                          "globalKey" : "789cf6eb"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-07-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a42177"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "48ae4c65"
+                                        "globalKey" : "16d5b587"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-01-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-01-27",
                                         "adjustedStartDate" : "2019-10-28",
+                                        "adjustedEndDate" : "2020-01-27",
                                         "meta" : {
-                                          "globalKey" : "e751be0a"
+                                          "globalKey" : "be8bfd2c"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-10-24",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a43898"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "7ac45365"
+                                        "globalKey" : "51fe9287"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-04-27",
                                         "adjustedStartDate" : "2020-01-27",
+                                        "adjustedEndDate" : "2020-04-27",
                                         "meta" : {
-                                          "globalKey" : "62279a8c"
+                                          "globalKey" : "fd1da10c"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-01-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a4eab9"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "28ed70a7"
+                                        "globalKey" : "c3e37727"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-07-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-07-27",
                                         "adjustedStartDate" : "2020-04-27",
+                                        "adjustedEndDate" : "2020-07-27",
                                         "meta" : {
-                                          "globalKey" : "567699cc"
+                                          "globalKey" : "f16ca04c"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-04-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a501f9"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "508fb0a7"
+                                        "globalKey" : "eb85b727"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-10-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-10-27",
                                         "adjustedStartDate" : "2020-07-27",
+                                        "adjustedEndDate" : "2020-10-27",
                                         "meta" : {
-                                          "globalKey" : "4ac5990c"
+                                          "globalKey" : "e5bb9f8c"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-07-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a51939"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "7831f0a7"
+                                        "globalKey" : "1327f727"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-01-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-01-27",
                                         "adjustedStartDate" : "2020-10-27",
+                                        "adjustedEndDate" : "2021-01-27",
                                         "meta" : {
-                                          "globalKey" : "be3cdd4c"
+                                          "globalKey" : "6245b9cc"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-10-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a53079"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "75277aa7"
+                                        "globalKey" : "19305727"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-04-27",
                                         "adjustedStartDate" : "2021-01-27",
+                                        "adjustedEndDate" : "2021-04-27",
                                         "meta" : {
-                                          "globalKey" : "3ac792ca"
+                                          "globalKey" : "d5bd994a"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2021-01-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a5e2f7"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "250570e5"
+                                        "globalKey" : "bffb7765"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-07-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-07-27",
                                         "adjustedStartDate" : "2021-04-27",
+                                        "adjustedEndDate" : "2021-07-27",
                                         "meta" : {
-                                          "globalKey" : "2f1691cc"
+                                          "globalKey" : "ca0c984c"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2021-04-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a5f9f9"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "4ca7b0a7"
+                                        "globalKey" : "e79db727"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-10-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-10-27",
                                         "adjustedStartDate" : "2021-07-27",
+                                        "adjustedEndDate" : "2021-10-27",
                                         "meta" : {
-                                          "globalKey" : "2365910c"
+                                          "globalKey" : "be5b978c"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2021-07-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a61139"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "7449f0a7"
+                                        "globalKey" : "f3ff727"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2022-01-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2022-01-27",
                                         "adjustedStartDate" : "2021-10-27",
+                                        "adjustedEndDate" : "2022-01-27",
                                         "meta" : {
-                                          "globalKey" : "96dcd58a"
+                                          "globalKey" : "3ae5b20a"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2021-10-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a628b7"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "713f7ae5"
+                                        "globalKey" : "15485765"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2022-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2022-04-27",
                                         "adjustedStartDate" : "2022-01-27",
+                                        "adjustedEndDate" : "2022-04-27",
                                         "meta" : {
-                                          "globalKey" : "13678aca"
+                                          "globalKey" : "ae5d914a"
                                         },
+                                        "notionalAmount" : 3000000,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2022-01-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a6daf7"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "211d70e5"
+                                        "globalKey" : "bc137765"
                                       }
                                     } ]
                                   },
-                                  "dayCountFraction" : {
-                                    "value" : "ACT/360"
-                                  },
                                   "meta" : {
-                                    "globalKey" : "e97b40e6"
-                                  },
-                                  "paymentDates" : {
-                                    "meta" : {
-                                      "globalKey" : "637fde94"
-                                    },
-                                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                    "paymentDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        }, {
-                                          "value" : "USNY"
-                                        } ],
-                                        "meta" : {
-                                          "externalKey" : "floatPrimaryBusinessCenters",
-                                          "globalKey" : "42f910b"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "97b8e49c"
-                                      }
-                                    },
-                                    "paymentFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "956"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3
-                                    }
-                                  },
-                                  "rateSpecification" : {
-                                    "floatingRate" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
-                                      "rateOption" : {
-                                        "address" : {
-                                          "scope" : "DOCUMENT",
-                                          "value" : "rateOption-1"
-                                        }
-                                      }
-                                    }
-                                  },
-                                  "resetDates" : {
-                                    "calculationPeriodDatesReference" : {
-                                      "externalReference" : "floatingCalcPeriodDates",
-                                      "globalReference" : "7d3145ba"
-                                    },
-                                    "fixingDates" : {
-                                      "meta" : {
-                                        "globalKey" : "3d9c8eea"
-                                      },
-                                      "period" : "D",
-                                      "periodMultiplier" : -2,
-                                      "dayType" : "BUSINESS",
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        } ],
-                                        "meta" : {
-                                          "globalKey" : "21479e"
-                                        }
-                                      },
-                                      "businessDayConvention" : "NONE",
-                                      "dateRelativeTo" : {
-                                        "externalReference" : "floatingLegResetDates",
-                                        "globalReference" : "5f02e04c"
-                                      }
-                                    },
-                                    "meta" : {
-                                      "externalKey" : "floatingLegResetDates",
-                                      "globalKey" : "5f02e04c"
-                                    },
-                                    "resetDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "floatPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "b01f2613"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "a9f2dce2"
-                                      }
-                                    },
-                                    "resetFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "956"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3
-                                    },
-                                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                                    "globalKey" : "b37c45c2"
                                   }
                                 } ],
                                 "meta" : {
-                                  "globalKey" : "3a619c37"
+                                  "globalKey" : "4815dd6d"
                                 }
                               }
                             },
                             "meta" : {
-                              "globalKey" : "be14e3e8"
+                              "globalKey" : "cbc9251e"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "be14e3e8"
+                            "globalKey" : "cbc9251e"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "a8b73f83"
                         }
-                      } ]
+                      } ],
+                      "meta" : {
+                        "globalKey" : "a8b73f83"
+                      }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "5d0d4038"
+                    "globalKey" : "3a2e11ee"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "5d0d4038"
+                  "globalKey" : "3a2e11ee"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "d39ab81b"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.01,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.01,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 3000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "9fbc4b45"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 3000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 3000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "f472d3ee"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 3000000
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
+                  },
+                  "meta" : {
+                    "globalKey" : "edd0cb9a"
+                  }
                 } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ef297"
-              },
-              "value" : "2014-10-23"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
-                  },
-                  "value" : "2894761"
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "ba4f",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "2052340"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "010",
                   "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "19300360"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ba4f"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "ba4f",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "19300360"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "cad97cef"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS2894761"
+                  "value" : "CHI2WIRE"
+                },
+                "meta" : {
+                  "globalKey" : "902a6db3"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "902a6db3",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "902a6db3",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2015-01-12",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "HOUSE2",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "a7071c09"
+                "globalKey" : "9127a4e0",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "d4710b14"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "c8498260"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "ba4f"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                }
-              },
               "quantity" : {
+                "value" : 300,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "ba4f",
+                  "externalReference" : "clearing_firm"
                 },
-                "value" : 300
+                "receiverPartyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
+                }
               },
               "settlementDate" : {
+                "unadjustedDate" : "2014-10-27",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "USNY"
@@ -1559,122 +1536,91 @@
                       "globalKey" : "27e4e9"
                     }
                   },
-                  "businessDayConvention" : "MODFOLLOWING",
                   "meta" : {
                     "globalKey" : "3662e8ba"
                   }
-                },
-                "unadjustedDate" : "2014-10-27"
+                }
               },
               "transferExpression" : {
-                "priceTransfer" : "PREMIUM"
+                "priceTransfer" : "Premium"
               }
+            },
+            "meta" : {
+              "globalKey" : "2fe45f8c"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "15f09cf8"
+          }
         }
       }
     } ],
-    "intent" : "CONTRACT_FORMATION",
+    "eventQualifier" : "ContractFormation",
     "after" : [ {
-      "meta" : {
-        "globalKey" : "daaa7473"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
       "trade" : {
-        "account" : [ {
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "clearing_firm_accounts"
-            },
-            "value" : "HOUSE2"
-          },
-          "meta" : {
-            "externalKey" : "account1",
-            "globalKey" : "fb18f120"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
-          },
-          "servicingParty" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
-          }
-        } ],
-        "clearedDate" : "2015-01-12",
-        "meta" : {
-          "globalKey" : "30b5606a"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "clearing_firm",
-            "globalKey" : "ba4f"
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "1051b",
+            "externalReference" : "clearing_service"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "2894761",
               "meta" : {
-                "scheme" : "clearing_member_firms"
-              },
-              "value" : "010"
-            },
-            "meta" : {
-              "globalKey" : "ba4f"
+                "scheme" : "cme_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing_service",
-            "globalKey" : "1051b"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "CME"
-            },
-            "meta" : {
-              "globalKey" : "1051b"
+              "value" : "2052340",
+              "meta" : {
+                "scheme" : "client_trade_id"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "trade_source",
-            "globalKey" : "902a6db3"
-          },
-          "partyId" : [ {
+          }, {
             "identifier" : {
-              "value" : "CHI2WIRE"
-            },
+              "value" : "19300360",
+              "meta" : {
+                "scheme" : "platform_trade_id"
+              }
+            }
+          }, {
+            "identifier" : {
+              "value" : "19300360",
+              "meta" : {
+                "scheme" : "block_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "cb2626af"
+          }
+        }, {
+          "issuer" : {
+            "value" : "1010000023",
             "meta" : {
-              "globalKey" : "902a6db3"
+              "scheme" : "cftc_Namespace"
             }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "clearing_firm",
-            "globalReference" : "ba4f"
-          },
-          "partyReference" : {
-            "externalReference" : "trade_source",
-            "globalReference" : "902a6db3"
           },
-          "role" : "DATA_SUBMITTER"
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "CCCIRS2894761",
+              "meta" : {
+                "scheme" : "reg_trade_id"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e12c31ab"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2014-10-23",
+          "meta" : {
+            "globalKey" : "3ef297"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "ba4f"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -1683,30 +1629,24 @@
               } ],
               "economicTerms" : {
                 "payout" : {
-                  "meta" : {
-                    "globalKey" : "cb966dcd"
-                  },
                   "optionPayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "buyerSeller" : {
-                      "buyer" : "PARTY_1",
-                      "seller" : "PARTY_2"
+                      "buyer" : "Party1",
+                      "seller" : "Party2"
                     },
+                    "optionType" : "Straddle",
                     "exerciseTerms" : {
                       "optionStyle" : {
                         "europeanExercise" : {
-                          "earliestExerciseTime" : {
-                            "businessCenter" : {
-                              "value" : "USNY"
-                            },
-                            "hourMinuteTime" : "09:00:00"
-                          },
                           "expirationDate" : [ {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2015-04-23",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "PRECEDING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
@@ -1715,36 +1655,36 @@
                                     "globalKey" : "27e4e9"
                                   }
                                 },
-                                "businessDayConvention" : "PRECEDING",
                                 "meta" : {
                                   "globalKey" : "4c776966"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "d0eb86af"
-                              },
-                              "unadjustedDate" : "2015-04-23"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "d0eb86af"
                             }
                           } ],
+                          "earliestExerciseTime" : {
+                            "hourMinuteTime" : "09:00:00",
+                            "businessCenter" : {
+                              "value" : "USNY"
+                            }
+                          },
                           "expirationTime" : {
+                            "hourMinuteTime" : "11:00:00",
                             "businessCenter" : {
                               "value" : "USNY"
-                            },
-                            "hourMinuteTime" : "11:00:00"
+                            }
                           },
                           "meta" : {
-                            "globalKey" : "43b07fbc"
+                            "globalKey" : "9e2df03c"
                           }
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "cb966dcd"
-                    },
-                    "optionType" : "STRADDLE",
                     "underlier" : {
                       "contractualProduct" : {
                         "productTaxonomy" : [ {
@@ -1755,46 +1695,42 @@
                           "payout" : {
                             "interestRatePayout" : [ {
                               "payerReceiver" : {
-                                "payer" : "PARTY_1",
-                                "receiver" : "PARTY_2"
+                                "payer" : "Party1",
+                                "receiver" : "Party2"
                               },
                               "priceQuantity" : {
-                                "meta" : {
-                                  "globalKey" : "0"
-                                },
                                 "quantitySchedule" : {
                                   "address" : {
                                     "scope" : "DOCUMENT",
                                     "value" : "quantity-1"
                                   }
+                                },
+                                "meta" : {
+                                  "globalKey" : "0"
                                 }
                               },
-                              "calculationPeriodDates" : {
-                                "calculationPeriodDatesAdjustments" : {
-                                  "businessCenters" : {
-                                    "businessCentersReference" : {
-                                      "externalReference" : "fixedPrimaryBusinessCenters",
-                                      "globalReference" : "42f910b"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "fa5f1fb"
+                              "rateSpecification" : {
+                                "fixedRate" : {
+                                  "rateSchedule" : {
+                                    "price" : {
+                                      "address" : {
+                                        "scope" : "DOCUMENT",
+                                        "value" : "price-1"
+                                      }
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
-                                    "globalKey" : "979a8ca"
+                                    "globalKey" : "0"
                                   }
-                                },
-                                "calculationPeriodFrequency" : {
-                                  "meta" : {
-                                    "globalKey" : "28cab"
-                                  },
-                                  "period" : "M",
-                                  "periodMultiplier" : 6,
-                                  "rollConvention" : "27"
-                                },
+                                }
+                              },
+                              "dayCountFraction" : {
+                                "value" : "30/360"
+                              },
+                              "calculationPeriodDates" : {
                                 "effectiveDate" : {
                                   "adjustableDate" : {
+                                    "unadjustedDate" : "2015-04-27",
                                     "dateAdjustments" : {
                                       "businessDayConvention" : "NONE",
                                       "meta" : {
@@ -1803,42 +1739,94 @@
                                     },
                                     "meta" : {
                                       "globalKey" : "ec89c593"
-                                    },
-                                    "unadjustedDate" : "2015-04-27"
+                                    }
                                   },
                                   "meta" : {
                                     "globalKey" : "ec89c593"
                                   }
                                 },
-                                "meta" : {
-                                  "externalKey" : "fixedCalcPeriodDates",
-                                  "globalKey" : "7c1d02a7"
-                                },
                                 "terminationDate" : {
                                   "adjustableDate" : {
+                                    "unadjustedDate" : "2022-04-27",
                                     "dateAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
                                       "businessCenters" : {
                                         "businessCentersReference" : {
-                                          "externalReference" : "fixedPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "fixedPrimaryBusinessCenters"
                                         },
                                         "meta" : {
                                           "globalKey" : "fa5f1fb"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
                                         "globalKey" : "979a8ca"
                                       }
                                     },
                                     "meta" : {
                                       "globalKey" : "814e7425"
-                                    },
-                                    "unadjustedDate" : "2022-04-27"
+                                    }
                                   },
                                   "meta" : {
                                     "globalKey" : "814e7425"
                                   }
+                                },
+                                "calculationPeriodDatesAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
+                                  "businessCenters" : {
+                                    "businessCentersReference" : {
+                                      "globalReference" : "42f910b",
+                                      "externalReference" : "fixedPrimaryBusinessCenters"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "fa5f1fb"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "979a8ca"
+                                  }
+                                },
+                                "calculationPeriodFrequency" : {
+                                  "periodMultiplier" : 6,
+                                  "period" : "M",
+                                  "meta" : {
+                                    "globalKey" : "18abd"
+                                  },
+                                  "rollConvention" : "27"
+                                },
+                                "meta" : {
+                                  "globalKey" : "21b9e479",
+                                  "externalKey" : "fixedCalcPeriodDates"
+                                }
+                              },
+                              "paymentDates" : {
+                                "paymentFrequency" : {
+                                  "periodMultiplier" : 6,
+                                  "period" : "M",
+                                  "meta" : {
+                                    "globalKey" : "107"
+                                  }
+                                },
+                                "payRelativeTo" : "CalculationPeriodEndDate",
+                                "paymentDatesAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
+                                  "businessCenters" : {
+                                    "businessCenter" : [ {
+                                      "value" : "GBLO"
+                                    }, {
+                                      "value" : "USNY"
+                                    } ],
+                                    "meta" : {
+                                      "globalKey" : "42f910b",
+                                      "externalKey" : "fixedPrimaryBusinessCenters"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "97b8e49c"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "9e5a4d0f"
                                 }
                               },
                               "cashflowRepresentation" : {
@@ -1846,294 +1834,240 @@
                                 "paymentCalculationPeriod" : [ {
                                   "adjustedPaymentDate" : "2015-10-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2015-10-27",
                                     "adjustedStartDate" : "2015-04-27",
+                                    "adjustedEndDate" : "2015-10-27",
                                     "meta" : {
-                                      "globalKey" : "6e8dc534"
+                                      "globalKey" : "7e6a8fcc"
                                     },
-                                    "fixedRate" : 0.01,
-                                    "notionalAmount" : 3000000
+                                    "notionalAmount" : 3000000,
+                                    "fixedRate" : 0.01
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "891a3379"
+                                    "globalKey" : "98f6fe11"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2016-04-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2016-04-27",
                                     "adjustedStartDate" : "2015-10-27",
+                                    "adjustedEndDate" : "2016-04-27",
                                     "meta" : {
-                                      "globalKey" : "7187d034"
+                                      "globalKey" : "7f3184cc"
                                     },
-                                    "fixedRate" : 0.01,
-                                    "notionalAmount" : 3000000
+                                    "notionalAmount" : 3000000,
+                                    "fixedRate" : 0.01
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "a39447f9"
+                                    "globalKey" : "b13dfc91"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2016-10-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2016-10-27",
                                     "adjustedStartDate" : "2016-04-27",
+                                    "adjustedEndDate" : "2016-10-27",
                                     "meta" : {
-                                      "globalKey" : "724ec534"
+                                      "globalKey" : "822b8fcc"
                                     },
-                                    "fixedRate" : 0.01,
-                                    "notionalAmount" : 3000000
+                                    "notionalAmount" : 3000000,
+                                    "fixedRate" : 0.01
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "33a02b79"
+                                    "globalKey" : "437cf611"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2017-04-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2017-04-27",
                                     "adjustedStartDate" : "2016-10-27",
+                                    "adjustedEndDate" : "2017-04-27",
                                     "meta" : {
-                                      "globalKey" : "7548d034"
+                                      "globalKey" : "82f284cc"
                                     },
-                                    "fixedRate" : 0.01,
-                                    "notionalAmount" : 3000000
+                                    "notionalAmount" : 3000000,
+                                    "fixedRate" : 0.01
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "4e1a3ff9"
+                                    "globalKey" : "5bc3f491"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2017-10-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2017-10-27",
                                     "adjustedStartDate" : "2017-04-27",
+                                    "adjustedEndDate" : "2017-10-27",
                                     "meta" : {
-                                      "globalKey" : "760fc534"
+                                      "globalKey" : "85ec8fcc"
                                     },
-                                    "fixedRate" : 0.01,
-                                    "notionalAmount" : 3000000
+                                    "notionalAmount" : 3000000,
+                                    "fixedRate" : 0.01
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "de262379"
+                                    "globalKey" : "ee02ee11"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2018-04-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2018-04-27",
                                     "adjustedStartDate" : "2017-10-27",
+                                    "adjustedEndDate" : "2018-04-27",
                                     "meta" : {
-                                      "globalKey" : "7909d034"
+                                      "globalKey" : "86b384cc"
                                     },
-                                    "fixedRate" : 0.01,
-                                    "notionalAmount" : 3000000
+                                    "notionalAmount" : 3000000,
+                                    "fixedRate" : 0.01
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "f8a037f9"
+                                    "globalKey" : "649ec91"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2018-10-29",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2018-10-29",
                                     "adjustedStartDate" : "2018-04-27",
+                                    "adjustedEndDate" : "2018-10-29",
                                     "meta" : {
-                                      "globalKey" : "79d1adf2"
+                                      "globalKey" : "89ad974e"
                                     },
-                                    "fixedRate" : 0.01,
-                                    "notionalAmount" : 3000000
+                                    "notionalAmount" : 3000000,
+                                    "fixedRate" : 0.01
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "8c16b575"
+                                    "globalKey" : "9bf29ed1"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2019-04-29",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2019-04-29",
                                     "adjustedStartDate" : "2018-10-29",
+                                    "adjustedEndDate" : "2019-04-29",
                                     "meta" : {
-                                      "globalKey" : "7ccbc074"
+                                      "globalKey" : "8a75750c"
                                     },
-                                    "fixedRate" : 0.01,
-                                    "notionalAmount" : 3000000
+                                    "notionalAmount" : 3000000,
+                                    "fixedRate" : 0.01
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "a690d177"
+                                    "globalKey" : "b43a860f"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2019-10-28",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2019-10-28",
                                     "adjustedStartDate" : "2019-04-29",
+                                    "adjustedEndDate" : "2019-10-28",
                                     "meta" : {
-                                      "globalKey" : "7d924115"
+                                      "globalKey" : "8d6f7c4b"
                                     },
-                                    "fixedRate" : 0.01,
-                                    "notionalAmount" : 3000000
+                                    "notionalAmount" : 3000000,
+                                    "fixedRate" : 0.01
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "34e767f9"
+                                    "globalKey" : "44c4a32f"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2020-04-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2020-04-27",
                                     "adjustedStartDate" : "2019-10-28",
+                                    "adjustedEndDate" : "2020-04-27",
                                     "meta" : {
-                                      "globalKey" : "808bd3f5"
+                                      "globalKey" : "8e35f92b"
                                     },
-                                    "fixedRate" : 0.01,
-                                    "notionalAmount" : 3000000
+                                    "notionalAmount" : 3000000,
+                                    "fixedRate" : 0.01
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "4dac2bba"
+                                    "globalKey" : "5b5650f0"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2020-10-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2020-10-27",
                                     "adjustedStartDate" : "2020-04-27",
+                                    "adjustedEndDate" : "2020-10-27",
                                     "meta" : {
-                                      "globalKey" : "8152c534"
+                                      "globalKey" : "912f8fcc"
                                     },
-                                    "fixedRate" : 0.01,
-                                    "notionalAmount" : 3000000
+                                    "notionalAmount" : 3000000,
+                                    "fixedRate" : 0.01
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "ddb80b79"
+                                    "globalKey" : "ed94d611"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2021-04-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2021-04-27",
                                     "adjustedStartDate" : "2020-10-27",
+                                    "adjustedEndDate" : "2021-04-27",
                                     "meta" : {
-                                      "globalKey" : "844cd034"
+                                      "globalKey" : "91f684cc"
                                     },
-                                    "fixedRate" : 0.01,
-                                    "notionalAmount" : 3000000
+                                    "notionalAmount" : 3000000,
+                                    "fixedRate" : 0.01
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "f8321ff9"
+                                    "globalKey" : "5dbd491"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2021-10-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2021-10-27",
                                     "adjustedStartDate" : "2021-04-27",
+                                    "adjustedEndDate" : "2021-10-27",
                                     "meta" : {
-                                      "globalKey" : "8513c534"
+                                      "globalKey" : "94f08fcc"
                                     },
-                                    "fixedRate" : 0.01,
-                                    "notionalAmount" : 3000000
+                                    "notionalAmount" : 3000000,
+                                    "fixedRate" : 0.01
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "883e0379"
+                                    "globalKey" : "981ace11"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2022-04-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2022-04-27",
                                     "adjustedStartDate" : "2021-10-27",
+                                    "adjustedEndDate" : "2022-04-27",
                                     "meta" : {
-                                      "globalKey" : "880dd034"
+                                      "globalKey" : "95b784cc"
                                     },
-                                    "fixedRate" : 0.01,
-                                    "notionalAmount" : 3000000
+                                    "notionalAmount" : 3000000,
+                                    "fixedRate" : 0.01
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "a2b817f9"
+                                    "globalKey" : "b061cc91"
                                   }
                                 } ]
                               },
-                              "dayCountFraction" : {
-                                "value" : "30/360"
-                              },
                               "meta" : {
-                                "globalKey" : "840d5d4f"
-                              },
-                              "paymentDates" : {
-                                "meta" : {
-                                  "globalKey" : "637fde97"
-                                },
-                                "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                "paymentDatesAdjustments" : {
-                                  "businessCenters" : {
-                                    "businessCenter" : [ {
-                                      "value" : "GBLO"
-                                    }, {
-                                      "value" : "USNY"
-                                    } ],
-                                    "meta" : {
-                                      "externalKey" : "fixedPrimaryBusinessCenters",
-                                      "globalKey" : "42f910b"
-                                    }
-                                  },
-                                  "businessDayConvention" : "MODFOLLOWING",
-                                  "meta" : {
-                                    "globalKey" : "97b8e49c"
-                                  }
-                                },
-                                "paymentFrequency" : {
-                                  "meta" : {
-                                    "globalKey" : "959"
-                                  },
-                                  "period" : "M",
-                                  "periodMultiplier" : 6
-                                }
-                              },
-                              "rateSpecification" : {
-                                "fixedRate" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
-                                  "rateSchedule" : {
-                                    "price" : {
-                                      "address" : {
-                                        "scope" : "DOCUMENT",
-                                        "value" : "price-1"
-                                      }
-                                    }
-                                  }
-                                }
+                                "globalKey" : "e1717535"
                               }
                             }, {
                               "payerReceiver" : {
-                                "payer" : "PARTY_2",
-                                "receiver" : "PARTY_1"
+                                "payer" : "Party2",
+                                "receiver" : "Party1"
                               },
                               "priceQuantity" : {
-                                "meta" : {
-                                  "globalKey" : "0"
-                                },
                                 "quantitySchedule" : {
                                   "address" : {
                                     "scope" : "DOCUMENT",
                                     "value" : "quantity-2"
                                   }
+                                },
+                                "meta" : {
+                                  "globalKey" : "0"
                                 }
                               },
-                              "calculationPeriodDates" : {
-                                "calculationPeriodDatesAdjustments" : {
-                                  "businessCenters" : {
-                                    "businessCentersReference" : {
-                                      "externalReference" : "floatPrimaryBusinessCenters",
-                                      "globalReference" : "42f910b"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "b01f2613"
+                              "rateSpecification" : {
+                                "floatingRate" : {
+                                  "rateOption" : {
+                                    "address" : {
+                                      "scope" : "DOCUMENT",
+                                      "value" : "rateOption-1"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
-                                    "globalKey" : "a9f2dce2"
+                                    "globalKey" : "0"
                                   }
-                                },
-                                "calculationPeriodFrequency" : {
-                                  "meta" : {
-                                    "globalKey" : "28c4e"
-                                  },
-                                  "period" : "M",
-                                  "periodMultiplier" : 3,
-                                  "rollConvention" : "27"
-                                },
+                                }
+                              },
+                              "dayCountFraction" : {
+                                "value" : "ACT/360"
+                              },
+                              "calculationPeriodDates" : {
                                 "effectiveDate" : {
                                   "adjustableDate" : {
+                                    "unadjustedDate" : "2015-04-27",
                                     "dateAdjustments" : {
                                       "businessDayConvention" : "NONE",
                                       "meta" : {
@@ -2142,42 +2076,148 @@
                                     },
                                     "meta" : {
                                       "globalKey" : "ec89c593"
-                                    },
-                                    "unadjustedDate" : "2015-04-27"
+                                    }
                                   },
                                   "meta" : {
                                     "globalKey" : "ec89c593"
                                   }
                                 },
-                                "meta" : {
-                                  "externalKey" : "floatingCalcPeriodDates",
-                                  "globalKey" : "7d3145ba"
-                                },
                                 "terminationDate" : {
                                   "adjustableDate" : {
+                                    "unadjustedDate" : "2022-04-27",
                                     "dateAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
                                       "businessCenters" : {
                                         "businessCentersReference" : {
-                                          "externalReference" : "floatPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "floatPrimaryBusinessCenters"
                                         },
                                         "meta" : {
                                           "globalKey" : "b01f2613"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
                                         "globalKey" : "a9f2dce2"
                                       }
                                     },
                                     "meta" : {
-                                      "globalKey" : "21c7a83d"
-                                    },
-                                    "unadjustedDate" : "2022-04-27"
+                                      "globalKey" : "21c7a83d"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "21c7a83d"
+                                  }
+                                },
+                                "calculationPeriodDatesAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
+                                  "businessCenters" : {
+                                    "businessCentersReference" : {
+                                      "globalReference" : "42f910b",
+                                      "externalReference" : "floatPrimaryBusinessCenters"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "b01f2613"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "a9f2dce2"
+                                  }
+                                },
+                                "calculationPeriodFrequency" : {
+                                  "periodMultiplier" : 3,
+                                  "period" : "M",
+                                  "meta" : {
+                                    "globalKey" : "17f7a"
+                                  },
+                                  "rollConvention" : "27"
+                                },
+                                "meta" : {
+                                  "globalKey" : "92ab6b66",
+                                  "externalKey" : "floatingCalcPeriodDates"
+                                }
+                              },
+                              "paymentDates" : {
+                                "paymentFrequency" : {
+                                  "periodMultiplier" : 3,
+                                  "period" : "M",
+                                  "meta" : {
+                                    "globalKey" : "aa"
+                                  }
+                                },
+                                "payRelativeTo" : "CalculationPeriodEndDate",
+                                "paymentDatesAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
+                                  "businessCenters" : {
+                                    "businessCenter" : [ {
+                                      "value" : "GBLO"
+                                    }, {
+                                      "value" : "USNY"
+                                    } ],
+                                    "meta" : {
+                                      "globalKey" : "42f910b",
+                                      "externalKey" : "floatPrimaryBusinessCenters"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "97b8e49c"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "e18d000c"
+                                }
+                              },
+                              "resetDates" : {
+                                "calculationPeriodDatesReference" : {
+                                  "globalReference" : "92ab6b66",
+                                  "externalReference" : "floatingCalcPeriodDates"
+                                },
+                                "resetRelativeTo" : "CalculationPeriodStartDate",
+                                "fixingDates" : {
+                                  "periodMultiplier" : -2,
+                                  "period" : "D",
+                                  "meta" : {
+                                    "globalKey" : "1a78799e"
+                                  },
+                                  "dayType" : "Business",
+                                  "businessDayConvention" : "NONE",
+                                  "businessCenters" : {
+                                    "businessCenter" : [ {
+                                      "value" : "GBLO"
+                                    } ],
+                                    "meta" : {
+                                      "globalKey" : "21479e"
+                                    }
+                                  },
+                                  "dateRelativeTo" : {
+                                    "globalReference" : "60d85ac4",
+                                    "externalReference" : "floatingLegResetDates"
+                                  }
+                                },
+                                "resetFrequency" : {
+                                  "periodMultiplier" : 3,
+                                  "period" : "M",
+                                  "meta" : {
+                                    "globalKey" : "aa"
+                                  }
+                                },
+                                "resetDatesAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
+                                  "businessCenters" : {
+                                    "businessCentersReference" : {
+                                      "globalReference" : "42f910b",
+                                      "externalReference" : "floatPrimaryBusinessCenters"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "b01f2613"
+                                    }
                                   },
                                   "meta" : {
-                                    "globalKey" : "21c7a83d"
+                                    "globalKey" : "a9f2dce2"
                                   }
+                                },
+                                "meta" : {
+                                  "globalKey" : "60d85ac4",
+                                  "externalKey" : "floatingLegResetDates"
                                 }
                               },
                               "cashflowRepresentation" : {
@@ -2185,928 +2225,865 @@
                                 "paymentCalculationPeriod" : [ {
                                   "adjustedPaymentDate" : "2015-07-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2015-07-27",
                                     "adjustedStartDate" : "2015-04-27",
+                                    "adjustedEndDate" : "2015-07-27",
                                     "meta" : {
-                                      "globalKey" : "1b56c1cc"
+                                      "globalKey" : "b64cc84c"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2015-04-23",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a029f9"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "6417b0a7"
+                                    "globalKey" : "ff0db727"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2015-10-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2015-10-27",
                                     "adjustedStartDate" : "2015-07-27",
+                                    "adjustedEndDate" : "2015-10-27",
                                     "meta" : {
-                                      "globalKey" : "fa5c10c"
+                                      "globalKey" : "aa9bc78c"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2015-07-23",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a04139"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "8bb9f0a7"
+                                    "globalKey" : "26aff727"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2016-01-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2016-01-27",
                                     "adjustedStartDate" : "2015-10-27",
+                                    "adjustedEndDate" : "2016-01-27",
                                     "meta" : {
-                                      "globalKey" : "831d054c"
+                                      "globalKey" : "2725e1cc"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2015-10-23",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a05879"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "88af7aa7"
+                                    "globalKey" : "2cb85727"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2016-04-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2016-04-27",
                                     "adjustedStartDate" : "2016-01-27",
+                                    "adjustedEndDate" : "2016-04-27",
                                     "meta" : {
-                                      "globalKey" : "ffa7baca"
+                                      "globalKey" : "9a9dc14a"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2016-01-25",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a10af7"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "388d70e5"
+                                    "globalKey" : "d3837765"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2016-07-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2016-07-27",
                                     "adjustedStartDate" : "2016-04-27",
+                                    "adjustedEndDate" : "2016-07-27",
                                     "meta" : {
-                                      "globalKey" : "f3f6ba0a"
+                                      "globalKey" : "8eecc08a"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2016-04-25",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a12237"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "602fb0e5"
+                                    "globalKey" : "fb25b765"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2016-10-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2016-10-27",
                                     "adjustedStartDate" : "2016-07-27",
+                                    "adjustedEndDate" : "2016-10-27",
                                     "meta" : {
-                                      "globalKey" : "e845b94a"
+                                      "globalKey" : "833bbfca"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2016-07-25",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a13977"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "87d1f0e5"
+                                    "globalKey" : "22c7f765"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2017-01-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2017-01-27",
                                     "adjustedStartDate" : "2016-10-27",
+                                    "adjustedEndDate" : "2017-01-27",
                                     "meta" : {
-                                      "globalKey" : "5bbcfd8a"
+                                      "globalKey" : "ffc5da0a"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2016-10-25",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a150b7"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "84c77ae5"
+                                    "globalKey" : "28d05765"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2017-04-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2017-04-27",
                                     "adjustedStartDate" : "2017-01-27",
+                                    "adjustedEndDate" : "2017-04-27",
                                     "meta" : {
-                                      "globalKey" : "d847b2ca"
+                                      "globalKey" : "733db94a"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2017-01-25",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a202f7"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "34a570e5"
+                                    "globalKey" : "cf9b7765"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2017-07-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2017-07-27",
                                     "adjustedStartDate" : "2017-04-27",
+                                    "adjustedEndDate" : "2017-07-27",
                                     "meta" : {
-                                      "globalKey" : "cc96b20a"
+                                      "globalKey" : "678cb88a"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2017-04-25",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a21a37"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "5c47b0e5"
+                                    "globalKey" : "f73db765"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2017-10-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2017-10-27",
                                     "adjustedStartDate" : "2017-07-27",
+                                    "adjustedEndDate" : "2017-10-27",
                                     "meta" : {
-                                      "globalKey" : "c0e5b14a"
+                                      "globalKey" : "5bdbb7ca"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2017-07-25",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a23177"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "83e9f0e5"
+                                    "globalKey" : "1edff765"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2018-01-29",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2018-01-29",
                                     "adjustedStartDate" : "2017-10-27",
+                                    "adjustedEndDate" : "2018-01-29",
                                     "meta" : {
-                                      "globalKey" : "9e296c0c"
+                                      "globalKey" : "dbcf8348"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2017-10-25",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a248b7"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "1334cf69"
+                                    "globalKey" : "50dae6a5"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2018-04-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2018-04-27",
                                     "adjustedStartDate" : "2018-01-29",
+                                    "adjustedEndDate" : "2018-04-27",
                                     "meta" : {
-                                      "globalKey" : "b4515c08"
+                                      "globalKey" : "b5aa27cc"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2018-01-25",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a2faf7"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "34272223"
+                                    "globalKey" : "357fede7"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2018-07-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2018-07-27",
                                     "adjustedStartDate" : "2018-04-27",
+                                    "adjustedEndDate" : "2018-07-27",
                                     "meta" : {
-                                      "globalKey" : "a536aa0a"
+                                      "globalKey" : "402cb08a"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2018-04-25",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a31237"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "585fb0e5"
+                                    "globalKey" : "f355b765"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2018-10-29",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2018-10-29",
                                     "adjustedStartDate" : "2018-07-27",
+                                    "adjustedEndDate" : "2018-10-29",
                                     "meta" : {
-                                      "globalKey" : "3521fcc"
+                                      "globalKey" : "37e56108"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2018-07-25",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a32977"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "12574569"
+                                    "globalKey" : "46ea86a5"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2019-01-28",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2019-01-28",
                                     "adjustedStartDate" : "2018-10-29",
+                                    "adjustedEndDate" : "2019-01-28",
                                     "meta" : {
-                                      "globalKey" : "454cda09"
+                                      "globalKey" : "1c87192b"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2018-10-25",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a340b7"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "498bd665"
+                                    "globalKey" : "20c61587"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2019-04-29",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2019-04-29",
                                     "adjustedStartDate" : "2019-01-28",
+                                    "adjustedEndDate" : "2019-04-29",
                                     "meta" : {
-                                      "globalKey" : "f508f1cc"
+                                      "globalKey" : "5ccd95aa"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2019-01-24",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a3f2d8"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "c0df9de9"
+                                    "globalKey" : "28a441c7"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2019-07-29",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2019-07-29",
                                     "adjustedStartDate" : "2019-04-29",
+                                    "adjustedEndDate" : "2019-07-29",
                                     "meta" : {
-                                      "globalKey" : "eb0cc9ca"
+                                      "globalKey" : "8602d04a"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2019-04-25",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a40a37"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "ea36b6a7"
+                                    "globalKey" : "852cbd27"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2019-10-28",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2019-10-28",
                                     "adjustedStartDate" : "2019-07-29",
+                                    "adjustedEndDate" : "2019-10-28",
                                     "meta" : {
-                                      "globalKey" : "aa758dc9"
+                                      "globalKey" : "789cf6eb"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2019-07-25",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a42177"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "48ae4c65"
+                                    "globalKey" : "16d5b587"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2020-01-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2020-01-27",
                                     "adjustedStartDate" : "2019-10-28",
+                                    "adjustedEndDate" : "2020-01-27",
                                     "meta" : {
-                                      "globalKey" : "e751be0a"
+                                      "globalKey" : "be8bfd2c"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2019-10-24",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a43898"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "7ac45365"
+                                    "globalKey" : "51fe9287"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2020-04-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2020-04-27",
                                     "adjustedStartDate" : "2020-01-27",
+                                    "adjustedEndDate" : "2020-04-27",
                                     "meta" : {
-                                      "globalKey" : "62279a8c"
+                                      "globalKey" : "fd1da10c"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2020-01-23",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a4eab9"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "28ed70a7"
+                                    "globalKey" : "c3e37727"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2020-07-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2020-07-27",
                                     "adjustedStartDate" : "2020-04-27",
+                                    "adjustedEndDate" : "2020-07-27",
                                     "meta" : {
-                                      "globalKey" : "567699cc"
+                                      "globalKey" : "f16ca04c"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2020-04-23",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a501f9"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "508fb0a7"
+                                    "globalKey" : "eb85b727"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2020-10-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2020-10-27",
                                     "adjustedStartDate" : "2020-07-27",
+                                    "adjustedEndDate" : "2020-10-27",
                                     "meta" : {
-                                      "globalKey" : "4ac5990c"
+                                      "globalKey" : "e5bb9f8c"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2020-07-23",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a51939"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "7831f0a7"
+                                    "globalKey" : "1327f727"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2021-01-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2021-01-27",
                                     "adjustedStartDate" : "2020-10-27",
+                                    "adjustedEndDate" : "2021-01-27",
                                     "meta" : {
-                                      "globalKey" : "be3cdd4c"
+                                      "globalKey" : "6245b9cc"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2020-10-23",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a53079"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "75277aa7"
+                                    "globalKey" : "19305727"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2021-04-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2021-04-27",
                                     "adjustedStartDate" : "2021-01-27",
+                                    "adjustedEndDate" : "2021-04-27",
                                     "meta" : {
-                                      "globalKey" : "3ac792ca"
+                                      "globalKey" : "d5bd994a"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2021-01-25",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a5e2f7"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "250570e5"
+                                    "globalKey" : "bffb7765"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2021-07-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2021-07-27",
                                     "adjustedStartDate" : "2021-04-27",
+                                    "adjustedEndDate" : "2021-07-27",
                                     "meta" : {
-                                      "globalKey" : "2f1691cc"
+                                      "globalKey" : "ca0c984c"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2021-04-23",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a5f9f9"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "4ca7b0a7"
+                                    "globalKey" : "e79db727"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2021-10-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2021-10-27",
                                     "adjustedStartDate" : "2021-07-27",
+                                    "adjustedEndDate" : "2021-10-27",
                                     "meta" : {
-                                      "globalKey" : "2365910c"
+                                      "globalKey" : "be5b978c"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2021-07-23",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a61139"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "7449f0a7"
+                                    "globalKey" : "f3ff727"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2022-01-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2022-01-27",
                                     "adjustedStartDate" : "2021-10-27",
+                                    "adjustedEndDate" : "2022-01-27",
                                     "meta" : {
-                                      "globalKey" : "96dcd58a"
+                                      "globalKey" : "3ae5b20a"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2021-10-25",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a628b7"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
+                                    }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "713f7ae5"
+                                    "globalKey" : "15485765"
                                   }
                                 }, {
                                   "adjustedPaymentDate" : "2022-04-27",
                                   "calculationPeriod" : [ {
-                                    "adjustedEndDate" : "2022-04-27",
                                     "adjustedStartDate" : "2022-01-27",
+                                    "adjustedEndDate" : "2022-04-27",
                                     "meta" : {
-                                      "globalKey" : "13678aca"
+                                      "globalKey" : "ae5d914a"
                                     },
+                                    "notionalAmount" : 3000000,
                                     "floatingRateDefinition" : {
                                       "rateObservation" : [ {
                                         "adjustedFixingDate" : "2022-01-25",
+                                        "observedRate" : 0,
                                         "meta" : {
                                           "globalKey" : "7a6daf7"
-                                        },
-                                        "observedRate" : 0
+                                        }
                                       } ]
-                                    },
-                                    "notionalAmount" : 3000000
-                                  } ],
-                                  "meta" : {
-                                    "globalKey" : "211d70e5"
-                                  }
-                                } ]
-                              },
-                              "dayCountFraction" : {
-                                "value" : "ACT/360"
-                              },
-                              "meta" : {
-                                "globalKey" : "e97b40e6"
-                              },
-                              "paymentDates" : {
-                                "meta" : {
-                                  "globalKey" : "637fde94"
-                                },
-                                "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                "paymentDatesAdjustments" : {
-                                  "businessCenters" : {
-                                    "businessCenter" : [ {
-                                      "value" : "GBLO"
-                                    }, {
-                                      "value" : "USNY"
-                                    } ],
-                                    "meta" : {
-                                      "externalKey" : "floatPrimaryBusinessCenters",
-                                      "globalKey" : "42f910b"
-                                    }
-                                  },
-                                  "businessDayConvention" : "MODFOLLOWING",
-                                  "meta" : {
-                                    "globalKey" : "97b8e49c"
-                                  }
-                                },
-                                "paymentFrequency" : {
-                                  "meta" : {
-                                    "globalKey" : "956"
-                                  },
-                                  "period" : "M",
-                                  "periodMultiplier" : 3
-                                }
-                              },
-                              "rateSpecification" : {
-                                "floatingRate" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
-                                  "rateOption" : {
-                                    "address" : {
-                                      "scope" : "DOCUMENT",
-                                      "value" : "rateOption-1"
-                                    }
-                                  }
-                                }
-                              },
-                              "resetDates" : {
-                                "calculationPeriodDatesReference" : {
-                                  "externalReference" : "floatingCalcPeriodDates",
-                                  "globalReference" : "7d3145ba"
-                                },
-                                "fixingDates" : {
-                                  "meta" : {
-                                    "globalKey" : "3d9c8eea"
-                                  },
-                                  "period" : "D",
-                                  "periodMultiplier" : -2,
-                                  "dayType" : "BUSINESS",
-                                  "businessCenters" : {
-                                    "businessCenter" : [ {
-                                      "value" : "GBLO"
-                                    } ],
-                                    "meta" : {
-                                      "globalKey" : "21479e"
                                     }
-                                  },
-                                  "businessDayConvention" : "NONE",
-                                  "dateRelativeTo" : {
-                                    "externalReference" : "floatingLegResetDates",
-                                    "globalReference" : "5f02e04c"
-                                  }
-                                },
-                                "meta" : {
-                                  "externalKey" : "floatingLegResetDates",
-                                  "globalKey" : "5f02e04c"
-                                },
-                                "resetDatesAdjustments" : {
-                                  "businessCenters" : {
-                                    "businessCentersReference" : {
-                                      "externalReference" : "floatPrimaryBusinessCenters",
-                                      "globalReference" : "42f910b"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "b01f2613"
-                                    }
-                                  },
-                                  "businessDayConvention" : "MODFOLLOWING",
+                                  } ],
                                   "meta" : {
-                                    "globalKey" : "a9f2dce2"
+                                    "globalKey" : "bc137765"
                                   }
-                                },
-                                "resetFrequency" : {
-                                  "meta" : {
-                                    "globalKey" : "956"
-                                  },
-                                  "period" : "M",
-                                  "periodMultiplier" : 3
-                                },
-                                "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                                } ]
+                              },
+                              "meta" : {
+                                "globalKey" : "b37c45c2"
                               }
                             } ],
                             "meta" : {
-                              "globalKey" : "3a619c37"
+                              "globalKey" : "4815dd6d"
                             }
                           }
                         },
                         "meta" : {
-                          "globalKey" : "be14e3e8"
+                          "globalKey" : "cbc9251e"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "be14e3e8"
+                        "globalKey" : "cbc9251e"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "a8b73f83"
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a8b73f83"
+                  }
                 }
               },
               "meta" : {
-                "globalKey" : "5d0d4038"
+                "globalKey" : "3a2e11ee"
               }
             },
             "meta" : {
-              "globalKey" : "5d0d4038"
+              "globalKey" : "3a2e11ee"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "d39ab81b"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.01,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.01,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
                 }
               } ],
               "quantity" : [ {
+                "value" : {
+                  "value" : 3000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "9fbc4b45"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 3000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 3000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
                 }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "f472d3ee"
-              },
+              } ],
               "observable" : {
-                "meta" : {
-                  "globalKey" : "5f0c6d05"
-                },
                 "rateOption" : {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "rateOption-1"
-                    } ]
-                  },
                   "value" : {
                     "floatingRateIndex" : {
                       "value" : "USD-LIBOR-BBA"
                     },
                     "indexTenor" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
+                      "periodMultiplier" : 3,
                       "period" : "M",
-                      "periodMultiplier" : 3
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "rateOption-1"
+                    } ]
                   }
-                }
-              },
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
                 },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 3000000
+                "meta" : {
+                  "globalKey" : "828026c7"
                 }
-              } ]
-            } ]
-          } ]
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3ef297"
-          },
-          "value" : "2014-10-23"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "cme_trade_id"
               },
-              "value" : "2894761"
-            }
-          }, {
-            "identifier" : {
               "meta" : {
-                "scheme" : "client_trade_id"
-              },
-              "value" : "2052340"
+                "globalKey" : "edd0cb9a"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "ba4f",
+              "externalReference" : "clearing_firm"
             }
           }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
+            }
+          } ]
+        },
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "010",
               "meta" : {
-                "scheme" : "platform_trade_id"
-              },
-              "value" : "19300360"
+                "scheme" : "clearing_member_firms"
+              }
+            },
+            "meta" : {
+              "globalKey" : "ba4f"
             }
-          }, {
+          } ],
+          "meta" : {
+            "globalKey" : "ba4f",
+            "externalKey" : "clearing_firm"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "block_trade_id"
-              },
-              "value" : "19300360"
+              "value" : "CME"
+            },
+            "meta" : {
+              "globalKey" : "1051b"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "clearing_service",
-            "globalReference" : "1051b"
-          },
           "meta" : {
-            "globalKey" : "cad97cef"
+            "globalKey" : "1051b",
+            "externalKey" : "clearing_service"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
-              "meta" : {
-                "scheme" : "reg_trade_id"
-              },
-              "value" : "CCCIRS2894761"
+              "value" : "CHI2WIRE"
+            },
+            "meta" : {
+              "globalKey" : "902a6db3"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "902a6db3",
+            "externalKey" : "trade_source"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "902a6db3",
+            "externalReference" : "trade_source"
+          },
+          "role" : "DataSubmitter",
+          "ownershipPartyReference" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
+          }
+        } ],
+        "clearedDate" : "2015-01-12",
+        "account" : [ {
+          "partyReference" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
+          },
+          "accountNumber" : {
+            "value" : "HOUSE2",
             "meta" : {
-              "scheme" : "cftc_Namespace"
-            },
-            "value" : "1010000023"
+              "scheme" : "clearing_firm_accounts"
+            }
+          },
+          "servicingParty" : {
+            "globalReference" : "ba4f",
+            "externalReference" : "clearing_firm"
           },
           "meta" : {
-            "globalKey" : "a7071c09"
+            "globalKey" : "9127a4e0",
+            "externalKey" : "account1"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "d4710b14"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
       },
       "transferHistory" : [ {
-        "meta" : {
-          "globalKey" : "c8498260"
-        },
         "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "clearing_firm",
-              "globalReference" : "ba4f"
-            },
-            "receiverPartyReference" : {
-              "externalReference" : "clearing_service",
-              "globalReference" : "1051b"
-            }
-          },
           "quantity" : {
+            "value" : 300,
             "unit" : {
               "currency" : {
                 "value" : "USD"
               }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "ba4f",
+              "externalReference" : "clearing_firm"
             },
-            "value" : 300
+            "receiverPartyReference" : {
+              "globalReference" : "1051b",
+              "externalReference" : "clearing_service"
+            }
           },
           "settlementDate" : {
+            "unadjustedDate" : "2014-10-27",
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "USNY"
@@ -3115,73 +3092,76 @@
                   "globalKey" : "27e4e9"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "3662e8ba"
               }
-            },
-            "unadjustedDate" : "2014-10-27"
+            }
           },
           "transferExpression" : {
-            "priceTransfer" : "PREMIUM"
+            "priceTransfer" : "Premium"
           }
+        },
+        "meta" : {
+          "globalKey" : "2fe45f8c"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "d621e475"
+      }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "ce03becd"
+      "globalKey" : "c4c5711"
     }
   },
+  "previousWorkflowStep" : {
+    "globalReference" : "b6dd56ac"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "3702894761",
       "meta" : {
         "scheme" : "cme_message_id"
-      },
-      "value" : "3702894761"
+      }
     },
     "sentBy" : {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
+      }
     },
     "sentTo" : [ {
+      "value" : "010",
       "meta" : {
         "scheme" : "cme_firm_id"
-      },
-      "value" : "010"
+      }
     }, {
+      "value" : "CME",
       "meta" : {
         "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
+      }
     } ]
   },
-  "meta" : {
-    "globalKey" : "728dde0b"
-  },
+  "timestamp" : [ {
+    "dateTime" : "2015-01-12T11:41:31Z",
+    "qualification" : "eventCreationDateTime"
+  } ],
   "party" : [ {
-    "meta" : {
-      "externalKey" : "clearing_firm",
-      "globalKey" : "ba4f"
-    },
     "partyId" : [ {
       "identifier" : {
+        "value" : "010",
         "meta" : {
           "scheme" : "clearing_member_firms"
-        },
-        "value" : "010"
+        }
       },
       "meta" : {
         "globalKey" : "ba4f"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "clearing_service",
-      "globalKey" : "1051b"
-    },
+      "globalKey" : "ba4f",
+      "externalKey" : "clearing_firm"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "CME"
@@ -3189,12 +3169,12 @@
       "meta" : {
         "globalKey" : "1051b"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "trade_source",
-      "globalKey" : "902a6db3"
-    },
+      "globalKey" : "1051b",
+      "externalKey" : "clearing_service"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
         "value" : "CHI2WIRE"
@@ -3202,13 +3182,33 @@
       "meta" : {
         "globalKey" : "902a6db3"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "902a6db3",
+      "externalKey" : "trade_source"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "c4726cd0"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2015-01-12T11:41:31Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+  "account" : [ {
+    "partyReference" : {
+      "globalReference" : "ba4f",
+      "externalReference" : "clearing_firm"
+    },
+    "accountNumber" : {
+      "value" : "HOUSE2",
+      "meta" : {
+        "scheme" : "clearing_firm_accounts"
+      }
+    },
+    "servicingParty" : {
+      "globalReference" : "ba4f",
+      "externalReference" : "clearing_firm"
+    },
+    "meta" : {
+      "globalKey" : "9127a4e0",
+      "externalKey" : "account1"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "6950cbf1"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade1-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade1-func-output.json
index cd08ad0099..e8f739e6c1 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade1-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade1-func-output.json
@@ -1,96 +1,119 @@
 {
-  "action" : "NEW",
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "bdd1e3e5"
-          },
-          "trade" : {
-            "collateral" : {
-              "independentAmount" : {
-                "payerPartyReference" : {
-                  "externalReference" : "DTCCDEMO0321",
-                  "globalReference" : "50f20d5"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "DTCCDEMO0456",
-                  "globalReference" : "50f24f8"
-                },
-                "paymentDetail" : [ {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "2003-10-01",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster",
                   "meta" : {
-                    "globalKey" : "a7568501"
+                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
+                  }
+                }
+              },
+              "vintage" : 2016
+            },
+            "meta" : {
+              "globalKey" : "b4b93928"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualDefinitionsType" : [ {
+                  "value" : "ISDA2014Credit",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+                  }
+                } ],
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/matrix-type"
+                    }
                   },
-                  "paymentRule" : {
-                    "percentageRule" : {
-                      "notionalAmountReference" : {
-                        "externalReference" : "calculationAmount",
-                        "globalReference" : "0"
-                      },
-                      "paymentPercent" : 0.02
+                  "matrixTerm" : {
+                    "value" : "StandardAsiaCorporate",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/credit-matrix-transaction-type"
                     }
                   }
                 } ]
               }
             },
             "meta" : {
-              "globalKey" : "fde38d94"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "DTCCDEMO0321",
-                "globalKey" : "50f20d5"
+              "globalKey" : "b2984c06"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "50f20d5",
+                "externalReference" : "DTCCDEMO0321"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "D_0423_R1_S6_3Assgn",
                   "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCCDEMO0321"
-                },
-                "meta" : {
-                  "globalKey" : "50f20d5"
+                    "scheme" : "TradeRefNbr"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "DTCCDEMO0456",
-                "globalKey" : "50f24f8"
+                "globalKey" : "74ec8e26"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "50f24f8",
+                "externalReference" : "DTCCDEMO0456"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "D_0423_R1_S6_3Assgn",
                   "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCCDEMO0456"
-                },
+                    "scheme" : "TradeRefNbr"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "2f4a91a0"
+              }
+            }, {
+              "issuer" : {
+                "value" : "UAL001",
                 "meta" : {
-                  "globalKey" : "50f24f8"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
+              },
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "USIA010555",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/Unique-transaction-identifier"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "34d1440b"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2017-05-30",
+              "meta" : {
+                "globalKey" : "3f095e"
+              }
+            },
             "tradableProduct" : {
-              "ancillaryParty" : [ {
-                "partyReference" : [ {
-                  "externalReference" : "DTCCDEMO0321",
-                  "globalReference" : "50f20d5"
-                } ],
-                "role" : "CALCULATION_AGENT_INDEPENDENT"
-              } ],
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "DTCCDEMO0321",
-                  "globalReference" : "50f20d5"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "DTCCDEMO0456",
-                  "globalReference" : "50f24f8"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -98,67 +121,148 @@
                     "productQualifier" : "CreditDefaultSwap_SingleName"
                   } ],
                   "economicTerms" : {
-                    "calculationAgent" : {
-                      "calculationAgentBusinessCenter" : {
-                        "meta" : {
-                          "scheme" : "http://www.fpml.org/spec/2000/business-center"
-                        },
-                        "value" : "GBLO"
-                      },
-                      "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-                    },
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2017-05-31",
                         "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
                             "globalKey" : "3a4b88ab"
                           }
                         },
                         "meta" : {
                           "globalKey" : "26edb64a"
-                        },
-                        "unadjustedDate" : "2017-05-31"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "26edb64a"
                       }
                     },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2022-03-20",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "2781d47f"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "2781d47f"
+                      }
+                    },
                     "payout" : {
-                      "creditDefaultPayout" : {
+                      "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
+                          }
+                        },
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "calculationPeriodDates" : {
+                          "firstPeriodStartDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2017-03-20",
+                              "meta" : {
+                                "globalKey" : "3f08d4"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3f08d4"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
                           "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
+                            "globalKey" : "4527fe47"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
+                          "firstPaymentDate" : "2017-06-20",
+                          "meta" : {
+                            "globalKey" : "a7bb9e96"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "69541770"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
                         "generalTerms" : {
                           "referenceInformation" : {
                             "referenceEntity" : {
                               "entityId" : [ {
+                                "value" : "21657K",
                                 "meta" : {
                                   "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED"
-                                },
-                                "value" : "21657K"
+                                }
                               } ],
-                              "meta" : {
-                                "globalKey" : "a16dcbbc"
-                              },
                               "name" : {
+                                "value" : "PFIZED INC.",
                                 "meta" : {
                                   "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
-                                },
-                                "value" : "PFIZED INC."
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "a16dcbbc"
                               }
                             },
                             "referenceObligation" : [ {
@@ -166,18 +270,18 @@
                                 "productIdentifier" : [ {
                                   "value" : {
                                     "identifier" : {
+                                      "value" : "US635405AQ55",
                                       "meta" : {
                                         "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
-                                      },
-                                      "value" : "US635405AQ55"
+                                      }
                                     },
+                                    "source" : "ISIN",
                                     "meta" : {
                                       "globalKey" : "fbdc209e"
-                                    },
-                                    "source" : "ISIN"
+                                    }
                                   }
                                 } ],
-                                "securityType" : "DEBT"
+                                "securityType" : "Debt"
                               }
                             } ]
                           }
@@ -186,445 +290,258 @@
                           "globalKey" : "691ab472"
                         }
                       },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
+                      "meta" : {
+                        "globalKey" : "2168b3e2"
+                      }
+                    },
+                    "calculationAgent" : {
+                      "calculationAgentParty" : "CalculationAgentIndependent",
+                      "calculationAgentBusinessCenter" : {
+                        "value" : "GBLO",
+                        "meta" : {
+                          "scheme" : "http://www.fpml.org/spec/2000/business-center"
+                        }
+                      }
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "4db649af"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "4db649af"
+                }
+              },
+              "tradeLot" : [ {
+                "priceQuantity" : [ {
+                  "price" : [ {
+                    "value" : {
+                      "value" : 0.01,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD",
                           "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
-                          "firstPeriodStartDate" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3f08d4"
-                              },
-                              "unadjustedDate" : "2017-03-20"
-                            },
-                            "meta" : {
-                              "globalKey" : "3f08d4"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "28c1432d"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "158c626c"
-                        },
-                        "paymentDates" : {
-                          "firstPaymentDate" : "2017-06-20",
-                          "meta" : {
-                            "globalKey" : "a7bba742"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
+                            "scheme" : "http://www.fpml.org/ext/iso4217"
                           }
                         }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "2f77493a"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                      },
+                      "perUnitOf" : {
+                        "currency" : {
+                          "value" : "USD",
                           "meta" : {
-                            "globalKey" : "3a4b88ab"
+                            "scheme" : "http://www.fpml.org/ext/iso4217"
                           }
-                        },
-                        "meta" : {
-                          "globalKey" : "2781d47f"
-                        },
-                        "unadjustedDate" : "2022-03-20"
+                        }
                       },
-                      "meta" : {
-                        "globalKey" : "2781d47f"
-                      }
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "76bd7f13"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "76bd7f13"
-                }
-              },
-              "tradeLot" : [ {
-                "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "1f273178"
-                  },
-                  "price" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "c5befd88"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 1000000,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 0.01,
-                      "perUnitOf" : {
-                        "currency" : {
-                          "meta" : {
-                            "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
-                      },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "48eb1e55"
-                  },
-                  "quantity" : [ {
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "meta" : {
-                            "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 1000000
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "d478ac4b"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "50f20d5",
+                  "externalReference" : "DTCCDEMO0321"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "50f24f8",
+                  "externalReference" : "DTCCDEMO0456"
+                }
+              } ],
+              "ancillaryParty" : [ {
+                "role" : "CalculationAgentIndependent",
+                "partyReference" : [ {
+                  "globalReference" : "50f20d5",
+                  "externalReference" : "DTCCDEMO0321"
                 } ]
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f095e"
-              },
-              "value" : "2017-05-30"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCCDEMO0321",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "D_0423_R1_S6_3Assgn"
+                    "scheme" : "DTCC"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "50f20d5"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "DTCCDEMO0321",
-                "globalReference" : "50f20d5"
-              },
               "meta" : {
-                "globalKey" : "1f2108ba"
+                "globalKey" : "50f20d5",
+                "externalKey" : "DTCCDEMO0321"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCCDEMO0456",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "D_0423_R1_S6_3Assgn"
+                    "scheme" : "DTCC"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "50f24f8"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "DTCCDEMO0456",
-                "globalReference" : "50f24f8"
-              },
               "meta" : {
-                "globalKey" : "596c4780"
+                "globalKey" : "50f24f8",
+                "externalKey" : "DTCCDEMO0456"
               }
-            }, {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/Unique-transaction-identifier"
-                  },
-                  "value" : "USIA010555"
-                }
-              } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+            } ],
+            "collateral" : {
+              "independentAmount" : {
+                "payerPartyReference" : {
+                  "globalReference" : "50f20d5",
+                  "externalReference" : "DTCCDEMO0321"
                 },
-                "value" : "UAL001"
-              },
-              "meta" : {
-                "globalKey" : "a66c948d"
-              }
-            } ]
-          },
-          "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "1e916af9"
-            },
-            "transfer" : {
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/ext/iso4217"
-                    },
-                    "value" : "USD"
-                  }
+                "receiverPartyReference" : {
+                  "globalReference" : "50f24f8",
+                  "externalReference" : "DTCCDEMO0456"
                 },
-                "value" : 67000
-              },
-              "settlementDate" : {
-                "unadjustedDate" : "2017-06-02"
-              }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "2003-10-01",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "meta" : {
-                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
+                "paymentDetail" : [ {
+                  "paymentRule" : {
+                    "percentageRule" : {
+                      "paymentPercent" : 0.02,
+                      "notionalAmountReference" : {
+                        "globalReference" : "0",
+                        "externalReference" : "calculationAmount"
+                      }
+                    }
                   },
-                  "value" : "ISDA_MASTER"
-                }
-              },
-              "vintage" : 2016
-            },
-            "meta" : {
-              "globalKey" : "b4b93928"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualDefinitionsType" : [ {
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-                  },
-                  "value" : "ISDA_2014_CREDIT"
-                } ],
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/credit-matrix-transaction-type"
-                    },
-                    "value" : "STANDARD_ASIA_CORPORATE"
-                  },
-                  "matrixType" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/matrix-type"
-                    },
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
+                    "globalKey" : "a7568501"
                   }
                 } ]
               }
             },
             "meta" : {
-              "globalKey" : "31db6986"
+              "globalKey" : "e05720fe"
             }
-          } ]
-        }
-      }
-    } ],
-    "intent" : "CONTRACT_FORMATION",
-    "after" : [ {
-      "meta" : {
-        "globalKey" : "f863f5a"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
-      "trade" : {
-        "collateral" : {
-          "independentAmount" : {
-            "payerPartyReference" : {
-              "externalReference" : "DTCCDEMO0321",
-              "globalReference" : "50f20d5"
-            },
-            "receiverPartyReference" : {
-              "externalReference" : "DTCCDEMO0456",
-              "globalReference" : "50f24f8"
-            },
-            "paymentDetail" : [ {
-              "meta" : {
-                "globalKey" : "a7568501"
-              },
-              "paymentRule" : {
-                "percentageRule" : {
-                  "notionalAmountReference" : {
-                    "externalReference" : "calculationAmount",
-                    "globalReference" : "0"
-                  },
-                  "paymentPercent" : 0.02
-                }
-              }
-            } ]
-          }
-        },
-        "contractDetails" : {
-          "documentation" : [ {
-            "agreementDate" : "2003-10-01",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "meta" : {
-                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
-                  },
-                  "value" : "ISDA_MASTER"
-                }
-              },
-              "vintage" : 2016
-            },
-            "meta" : {
-              "globalKey" : "b4b93928"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualDefinitionsType" : [ {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-                  },
-                  "value" : "ISDA_2014_CREDIT"
-                } ],
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/credit-matrix-transaction-type"
-                    },
-                    "value" : "STANDARD_ASIA_CORPORATE"
-                  },
-                  "matrixType" : {
+          },
+          "transferHistory" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 67000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD",
                     "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/matrix-type"
-                    },
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
+                      "scheme" : "http://www.fpml.org/ext/iso4217"
+                    }
                   }
-                } ]
+                }
+              },
+              "settlementDate" : {
+                "unadjustedDate" : "2017-06-02"
               }
             },
             "meta" : {
-              "globalKey" : "31db6986"
+              "globalKey" : "1e916af9"
             }
           } ],
           "meta" : {
-            "globalKey" : "42dd50ae"
+            "globalKey" : "3f1c87bb"
           }
-        },
-        "meta" : {
-          "globalKey" : "8b60ba42"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "DTCCDEMO0321",
-            "globalKey" : "50f20d5"
+        }
+      }
+    } ],
+    "eventQualifier" : "ContractFormation",
+    "after" : [ {
+      "trade" : {
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "50f20d5",
+            "externalReference" : "DTCCDEMO0321"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "D_0423_R1_S6_3Assgn",
               "meta" : {
-                "scheme" : "DTCC"
-              },
-              "value" : "DTCCDEMO0321"
-            },
-            "meta" : {
-              "globalKey" : "50f20d5"
+                "scheme" : "TradeRefNbr"
+              }
             }
-          } ]
-        }, {
+          } ],
           "meta" : {
-            "externalKey" : "DTCCDEMO0456",
-            "globalKey" : "50f24f8"
+            "globalKey" : "74ec8e26"
+          }
+        }, {
+          "issuerReference" : {
+            "globalReference" : "50f24f8",
+            "externalReference" : "DTCCDEMO0456"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "D_0423_R1_S6_3Assgn",
               "meta" : {
-                "scheme" : "DTCC"
-              },
-              "value" : "DTCCDEMO0456"
-            },
+                "scheme" : "TradeRefNbr"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "2f4a91a0"
+          }
+        }, {
+          "issuer" : {
+            "value" : "UAL001",
             "meta" : {
-              "globalKey" : "50f24f8"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
             }
-          } ]
+          },
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "USIA010555",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/Unique-transaction-identifier"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "34d1440b"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2017-05-30",
+          "meta" : {
+            "globalKey" : "3f095e"
+          }
+        },
         "tradableProduct" : {
-          "ancillaryParty" : [ {
-            "partyReference" : [ {
-              "externalReference" : "DTCCDEMO0321",
-              "globalReference" : "50f20d5"
-            } ],
-            "role" : "CALCULATION_AGENT_INDEPENDENT"
-          } ],
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "DTCCDEMO0321",
-              "globalReference" : "50f20d5"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "DTCCDEMO0456",
-              "globalReference" : "50f24f8"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -632,432 +549,515 @@
                 "productQualifier" : "CreditDefaultSwap_SingleName"
               } ],
               "economicTerms" : {
-                "calculationAgent" : {
-                  "calculationAgentBusinessCenter" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/spec/2000/business-center"
-                    },
-                    "value" : "GBLO"
-                  },
-                  "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-                },
                 "effectiveDate" : {
                   "adjustableDate" : {
+                    "unadjustedDate" : "2017-05-31",
                     "dateAdjustments" : {
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "meta" : {
                         "globalKey" : "3a4b88ab"
                       }
                     },
                     "meta" : {
                       "globalKey" : "26edb64a"
-                    },
-                    "unadjustedDate" : "2017-05-31"
+                    }
                   },
                   "meta" : {
                     "globalKey" : "26edb64a"
                   }
                 },
-                "payout" : {
-                  "creditDefaultPayout" : {
-                    "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
-                    },
-                    "priceQuantity" : {
+                "terminationDate" : {
+                  "adjustableDate" : {
+                    "unadjustedDate" : "2022-03-20",
+                    "dateAdjustments" : {
+                      "businessDayConvention" : "NotApplicable",
                       "meta" : {
-                        "externalKey" : "calculationAmount",
-                        "globalKey" : "0"
-                      },
-                      "quantitySchedule" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "quantity-1"
-                        }
-                      }
-                    },
-                    "generalTerms" : {
-                      "referenceInformation" : {
-                        "referenceEntity" : {
-                          "entityId" : [ {
-                            "meta" : {
-                              "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED"
-                            },
-                            "value" : "21657K"
-                          } ],
-                          "meta" : {
-                            "globalKey" : "a16dcbbc"
-                          },
-                          "name" : {
-                            "meta" : {
-                              "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
-                            },
-                            "value" : "PFIZED INC."
-                          }
-                        },
-                        "referenceObligation" : [ {
-                          "security" : {
-                            "productIdentifier" : [ {
-                              "value" : {
-                                "identifier" : {
-                                  "meta" : {
-                                    "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
-                                  },
-                                  "value" : "US635405AQ55"
-                                },
-                                "meta" : {
-                                  "globalKey" : "fbdc209e"
-                                },
-                                "source" : "ISIN"
-                              }
-                            } ],
-                            "securityType" : "DEBT"
-                          }
-                        } ]
+                        "globalKey" : "3a4b88ab"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "691ab472"
+                      "globalKey" : "2781d47f"
                     }
                   },
+                  "meta" : {
+                    "globalKey" : "2781d47f"
+                  }
+                },
+                "payout" : {
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "externalKey" : "calculationAmount",
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0",
+                        "externalKey" : "calculationAmount"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "28c47"
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
+                          }
                         },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
-                        "rollConvention" : "20"
-                      },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
+                    "calculationPeriodDates" : {
                       "firstPeriodStartDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2017-03-20",
                           "meta" : {
                             "globalKey" : "3f08d4"
-                          },
-                          "unadjustedDate" : "2017-03-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "3f08d4"
                         }
                       },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "17f73"
+                        },
+                        "rollConvention" : "20"
+                      },
                       "meta" : {
-                        "globalKey" : "28c1432d"
+                        "globalKey" : "4527fe47"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "158c626c"
-                    },
                     "paymentDates" : {
-                      "firstPaymentDate" : "2017-06-20",
-                      "meta" : {
-                        "globalKey" : "a7bba742"
-                      },
                       "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
+                        "periodMultiplier" : 3,
                         "period" : "M",
-                        "periodMultiplier" : 3
-                      }
-                    },
-                    "rateSpecification" : {
-                      "fixedRate" : {
                         "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
-                          }
+                          "globalKey" : "aa"
                         }
+                      },
+                      "firstPaymentDate" : "2017-06-20",
+                      "meta" : {
+                        "globalKey" : "a7bb9e96"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "69541770"
                     }
                   } ],
-                  "meta" : {
-                    "globalKey" : "2f77493a"
-                  }
-                },
-                "terminationDate" : {
-                  "adjustableDate" : {
-                    "dateAdjustments" : {
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                  "creditDefaultPayout" : {
+                    "payerReceiver" : {
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
+                    },
+                    "priceQuantity" : {
+                      "quantitySchedule" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "quantity-1"
+                        }
+                      },
                       "meta" : {
-                        "globalKey" : "3a4b88ab"
+                        "globalKey" : "0",
+                        "externalKey" : "calculationAmount"
+                      }
+                    },
+                    "generalTerms" : {
+                      "referenceInformation" : {
+                        "referenceEntity" : {
+                          "entityId" : [ {
+                            "value" : "21657K",
+                            "meta" : {
+                              "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED"
+                            }
+                          } ],
+                          "name" : {
+                            "value" : "PFIZED INC.",
+                            "meta" : {
+                              "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "a16dcbbc"
+                          }
+                        },
+                        "referenceObligation" : [ {
+                          "security" : {
+                            "productIdentifier" : [ {
+                              "value" : {
+                                "identifier" : {
+                                  "value" : "US635405AQ55",
+                                  "meta" : {
+                                    "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
+                                  }
+                                },
+                                "source" : "ISIN",
+                                "meta" : {
+                                  "globalKey" : "fbdc209e"
+                                }
+                              }
+                            } ],
+                            "securityType" : "Debt"
+                          }
+                        } ]
                       }
                     },
                     "meta" : {
-                      "globalKey" : "2781d47f"
-                    },
-                    "unadjustedDate" : "2022-03-20"
+                      "globalKey" : "691ab472"
+                    }
                   },
                   "meta" : {
-                    "globalKey" : "2781d47f"
+                    "globalKey" : "2168b3e2"
+                  }
+                },
+                "calculationAgent" : {
+                  "calculationAgentParty" : "CalculationAgentIndependent",
+                  "calculationAgentBusinessCenter" : {
+                    "value" : "GBLO",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/spec/2000/business-center"
+                    }
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "76bd7f13"
+                "globalKey" : "4db649af"
               }
             },
             "meta" : {
-              "globalKey" : "76bd7f13"
+              "globalKey" : "4db649af"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "1f273178"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.01,
                   "unit" : {
                     "currency" : {
+                      "value" : "USD",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/ext/iso4217"
-                      },
-                      "value" : "USD"
+                      }
                     }
                   },
-                  "value" : 0.01,
                   "perUnitOf" : {
                     "currency" : {
+                      "value" : "USD",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/ext/iso4217"
-                      },
-                      "value" : "USD"
+                      }
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "48eb1e55"
-              },
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "c5befd88"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 1000000,
                   "unit" : {
                     "currency" : {
+                      "value" : "USD",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/ext/iso4217"
-                      },
-                      "value" : "USD"
+                      }
                     }
-                  },
-                  "value" : 1000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "d478ac4b"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "50f20d5",
+              "externalReference" : "DTCCDEMO0321"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "50f24f8",
+              "externalReference" : "DTCCDEMO0456"
+            }
+          } ],
+          "ancillaryParty" : [ {
+            "role" : "CalculationAgentIndependent",
+            "partyReference" : [ {
+              "globalReference" : "50f20d5",
+              "externalReference" : "DTCCDEMO0321"
             } ]
           } ]
         },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f095e"
-          },
-          "value" : "2017-05-30"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "DTCCDEMO0321",
               "meta" : {
-                "scheme" : "TradeRefNbr"
-              },
-              "value" : "D_0423_R1_S6_3Assgn"
+                "scheme" : "DTCC"
+              }
+            },
+            "meta" : {
+              "globalKey" : "50f20d5"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "DTCCDEMO0321",
-            "globalReference" : "50f20d5"
-          },
           "meta" : {
-            "globalKey" : "1f2108ba"
+            "globalKey" : "50f20d5",
+            "externalKey" : "DTCCDEMO0321"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "DTCCDEMO0456",
               "meta" : {
-                "scheme" : "TradeRefNbr"
-              },
-              "value" : "D_0423_R1_S6_3Assgn"
+                "scheme" : "DTCC"
+              }
+            },
+            "meta" : {
+              "globalKey" : "50f24f8"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "DTCCDEMO0456",
-            "globalReference" : "50f24f8"
-          },
           "meta" : {
-            "globalKey" : "596c4780"
+            "globalKey" : "50f24f8",
+            "externalKey" : "DTCCDEMO0456"
           }
-        }, {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/Unique-transaction-identifier"
+        } ],
+        "contractDetails" : {
+          "documentation" : [ {
+            "agreementDate" : "2003-10-01",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster",
+                  "meta" : {
+                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
+                  }
+                }
               },
-              "value" : "USIA010555"
-            }
-          } ],
-          "issuer" : {
+              "vintage" : 2016
+            },
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+              "globalKey" : "b4b93928"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualDefinitionsType" : [ {
+                  "value" : "ISDA2014Credit",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+                  }
+                } ],
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/matrix-type"
+                    }
+                  },
+                  "matrixTerm" : {
+                    "value" : "StandardAsiaCorporate",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/credit-matrix-transaction-type"
+                    }
+                  }
+                } ]
+              }
             },
-            "value" : "UAL001"
-          },
+            "meta" : {
+              "globalKey" : "b2984c06"
+            }
+          } ],
           "meta" : {
-            "globalKey" : "a66c948d"
+            "globalKey" : "c39a332e"
+          }
+        },
+        "collateral" : {
+          "independentAmount" : {
+            "payerPartyReference" : {
+              "globalReference" : "50f20d5",
+              "externalReference" : "DTCCDEMO0321"
+            },
+            "receiverPartyReference" : {
+              "globalReference" : "50f24f8",
+              "externalReference" : "DTCCDEMO0456"
+            },
+            "paymentDetail" : [ {
+              "paymentRule" : {
+                "percentageRule" : {
+                  "paymentPercent" : 0.02,
+                  "notionalAmountReference" : {
+                    "globalReference" : "0",
+                    "externalReference" : "calculationAmount"
+                  }
+                }
+              },
+              "meta" : {
+                "globalKey" : "a7568501"
+              }
+            } ]
           }
-        } ]
+        },
+        "meta" : {
+          "globalKey" : "9c7d21ac"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
       },
       "transferHistory" : [ {
-        "meta" : {
-          "globalKey" : "1e916af9"
-        },
         "transfer" : {
           "quantity" : {
+            "value" : 67000,
             "unit" : {
               "currency" : {
+                "value" : "USD",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/ext/iso4217"
-                },
-                "value" : "USD"
+                }
               }
-            },
-            "value" : 67000
+            }
           },
           "settlementDate" : {
             "unadjustedDate" : "2017-06-02"
           }
+        },
+        "meta" : {
+          "globalKey" : "1e916af9"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "d49e18ca"
+      }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "78301ead"
+      "globalKey" : "580c6b9d"
     }
   },
+  "previousWorkflowStep" : {
+    "globalReference" : "a602e72e"
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "MKREQ1f",
+      "meta" : {
+        "scheme" : "perFpMLReqmt"
+      }
+    },
+    "sentBy" : {
+      "value" : "DTCCDEMOSUB1"
+    },
+    "sentTo" : [ {
+      "value" : "DTCC"
+    } ]
+  },
+  "timestamp" : [ {
+    "dateTime" : "2007-10-31T23:08:40.335Z",
+    "qualification" : "eventSubmittedDateTime"
+  }, {
+    "dateTime" : "2007-10-31T23:08:40.335Z",
+    "qualification" : "eventCreationDateTime"
+  } ],
   "eventIdentifier" : [ {
+    "issuerReference" : {
+      "globalReference" : "50f20d5",
+      "externalReference" : "DTCCDEMO0321"
+    },
     "assignedIdentifier" : [ {
       "identifier" : {
+        "value" : "581067",
         "meta" : {
           "scheme" : "EventProcessingId"
-        },
-        "value" : "581067"
+        }
       }
     } ],
-    "issuerReference" : {
-      "externalReference" : "DTCCDEMO0321",
-      "globalReference" : "50f20d5"
-    },
     "meta" : {
-      "globalKey" : "b8efcf2d"
+      "globalKey" : "a921e6d9"
     }
   }, {
+    "issuerReference" : {
+      "globalReference" : "50f24f8",
+      "externalReference" : "DTCCDEMO0456"
+    },
     "assignedIdentifier" : [ {
       "identifier" : {
+        "value" : "581067",
         "meta" : {
           "scheme" : "EventProcessingId"
-        },
-        "value" : "581067"
+        }
       }
     } ],
-    "issuerReference" : {
-      "externalReference" : "DTCCDEMO0456",
-      "globalReference" : "50f24f8"
-    },
     "meta" : {
-      "globalKey" : "f33b0df3"
+      "globalKey" : "637fea53"
     }
   } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "perFpMLReqmt"
-      },
-      "value" : "MKREQ1f"
-    },
-    "sentBy" : {
-      "value" : "DTCCDEMOSUB1"
-    },
-    "sentTo" : [ {
-      "value" : "DTCC"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "77273c9b"
-  },
+  "action" : "New",
   "party" : [ {
-    "meta" : {
-      "externalKey" : "DTCCDEMO0321",
-      "globalKey" : "50f20d5"
-    },
     "partyId" : [ {
       "identifier" : {
+        "value" : "DTCCDEMO0321",
         "meta" : {
           "scheme" : "DTCC"
-        },
-        "value" : "DTCCDEMO0321"
+        }
       },
       "meta" : {
         "globalKey" : "50f20d5"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "DTCCDEMO0456",
-      "globalKey" : "50f24f8"
-    },
+      "globalKey" : "50f20d5",
+      "externalKey" : "DTCCDEMO0321"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "DTCCDEMO0456",
         "meta" : {
           "scheme" : "DTCC"
-        },
-        "value" : "DTCCDEMO0456"
+        }
       },
       "meta" : {
         "globalKey" : "50f24f8"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "50f24f8",
+      "externalKey" : "DTCCDEMO0456"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "80f2617a"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2007-10-31T23:08:40.335Z",
-    "qualification" : "EVENT_SUBMITTED_DATE_TIME"
-  }, {
-    "dateTime" : "2007-10-31T23:08:40.335Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+  "meta" : {
+    "globalKey" : "9e712917"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade2-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade2-func-output.json
index d62942ceeb..8462dd513c 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade2-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade2-func-output.json
@@ -1,92 +1,122 @@
 {
-  "action" : "NEW",
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "2006-05-01",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster",
+                  "meta" : {
+                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
+                  }
+                }
+              },
+              "vintage" : 2002
+            },
+            "meta" : {
+              "globalKey" : "29b7f6da"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualDefinitionsType" : [ {
+                  "value" : "ISDA2014Credit",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+                  }
+                } ],
+                "contractualTermsSupplement" : [ {
+                  "contractualTermsSupplementType" : {
+                    "value" : "iTraxxEurope",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/contractual-supplement"
+                    }
+                  },
+                  "publicationDate" : "2014-09-20"
+                }, {
+                  "contractualTermsSupplementType" : {
+                    "value" : "iTraxxEuropeSwaption",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/ext/swaption-supplement"
+                    }
+                  },
+                  "publicationDate" : "2017-03-20"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "c08a3ed2"
+            }
+          } ]
+        }
+      },
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "43c9fc39"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "c8678b4"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "DTCC00001234",
-                "globalKey" : "c01a15e4"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "c01a15e4",
+                "externalReference" : "DTCC00001234"
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCC00001234"
-                },
-                "meta" : {
-                  "globalKey" : "5d63d132"
-                }
-              }, {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "810RI27100804CP",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "DTCCZBUT11V806EZRVTWT807"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "dd44cc56"
+                    "scheme" : "TradeRefNbr"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "DTCC00005678",
-                "globalKey" : "bfffbd41"
+                "globalKey" : "56924e15"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "bfffbd41",
+                "externalReference" : "DTCC00005678"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "810RI27100803",
                   "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCC00005678"
-                },
+                    "scheme" : "TradeRefNbr"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "fe318baa"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1030229152",
                 "meta" : {
-                  "globalKey" : "5d65b232"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              }, {
+              },
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "IL196459337",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "DTCC7H6GLXDRUGQFU57RNE97"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "283f4b3"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "ee859c79"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-07-17",
+              "meta" : {
+                "globalKey" : "3f11d1"
+              }
+            },
             "tradableProduct" : {
-              "ancillaryParty" : [ {
-                "partyReference" : [ {
-                  "externalReference" : "DTCC00005678",
-                  "globalReference" : "bfffbd41"
-                } ],
-                "role" : "CALCULATION_AGENT_INDEPENDENT"
-              } ],
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "DTCC00001234",
-                  "globalReference" : "c01a15e4"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "DTCC00005678",
-                  "globalReference" : "bfffbd41"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -94,90 +124,81 @@
                     "productQualifier" : "CreditDefaultSwaption"
                   } ],
                   "economicTerms" : {
-                    "calculationAgent" : {
-                      "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-                    },
                     "payout" : {
-                      "meta" : {
-                        "globalKey" : "f50411ea"
-                      },
                       "optionPayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "settlementTerms" : {
+                          "settlementType" : "Physical",
                           "meta" : {
                             "globalKey" : "f3b1d0d7"
-                          },
-                          "settlementType" : "PHYSICAL"
+                          }
                         },
                         "buyerSeller" : {
-                          "buyer" : "PARTY_1",
-                          "seller" : "PARTY_2"
+                          "buyer" : "Party1",
+                          "seller" : "Party2"
                         },
+                        "optionType" : "Put",
                         "exerciseTerms" : {
-                          "exerciseProcedure" : {
-                            "followUpConfirmation" : true
-                          },
                           "optionStyle" : {
                             "europeanExercise" : {
-                              "earliestExerciseTime" : {
-                                "hourMinuteTime" : "00:00:00"
-                              },
                               "expirationDate" : [ {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2018-09-19",
                                   "dateAdjustments" : {
-                                    "businessDayConvention" : "NOT_APPLICABLE",
+                                    "businessDayConvention" : "NotApplicable",
                                     "meta" : {
                                       "globalKey" : "3a4b88ab"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "270f523e"
-                                  },
-                                  "unadjustedDate" : "2018-09-19"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "270f523e"
                                 }
                               } ],
+                              "earliestExerciseTime" : {
+                                "hourMinuteTime" : "00:00:00"
+                              },
                               "expirationTime" : {
                                 "hourMinuteTime" : "23:00:00"
                               },
                               "meta" : {
-                                "globalKey" : "119e60c"
+                                "globalKey" : "ef162e8c"
                               }
                             }
                           },
                           "strike" : {
                             "strikePrice" : {
+                              "value" : 0.0003,
                               "unit" : {
                                 "currency" : {
+                                  "value" : "EUR",
                                   "meta" : {
                                     "scheme" : "http://www.fpml.org/ext/iso4217"
-                                  },
-                                  "value" : "EUR"
+                                  }
                                 }
                               },
-                              "value" : 0.0003,
-                              "arithmeticOperator" : "ADD",
                               "perUnitOf" : {
                                 "currency" : {
+                                  "value" : "EUR",
                                   "meta" : {
                                     "scheme" : "http://www.fpml.org/ext/iso4217"
-                                  },
-                                  "value" : "EUR"
+                                  }
                                 }
                               },
-                              "priceType" : "INTEREST_RATE"
+                              "priceType" : "InterestRate",
+                              "arithmeticOperator" : "Add"
                             }
+                          },
+                          "exerciseProcedure" : {
+                            "followUpConfirmation" : true
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "f50411ea"
-                        },
-                        "optionType" : "PUT",
                         "underlier" : {
                           "contractualProduct" : {
                             "productTaxonomy" : [ {
@@ -187,87 +208,58 @@
                             "economicTerms" : {
                               "effectiveDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2018-03-20",
                                   "dateAdjustments" : {
-                                    "businessDayConvention" : "NOT_APPLICABLE",
+                                    "businessDayConvention" : "NotApplicable",
                                     "meta" : {
                                       "globalKey" : "3a4b88ab"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "2709b47f"
-                                  },
-                                  "unadjustedDate" : "2018-03-20"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "2709b47f"
                                 }
                               },
-                              "payout" : {
-                                "creditDefaultPayout" : {
-                                  "payerReceiver" : {
-                                    "payer" : "PARTY_2",
-                                    "receiver" : "PARTY_1"
-                                  },
-                                  "priceQuantity" : {
+                              "terminationDate" : {
+                                "adjustableDate" : {
+                                  "unadjustedDate" : "2023-06-20",
+                                  "dateAdjustments" : {
+                                    "businessDayConvention" : "NotApplicable",
                                     "meta" : {
-                                      "externalKey" : "calculationAmount",
-                                      "globalKey" : "0"
-                                    },
-                                    "quantitySchedule" : {
-                                      "address" : {
-                                        "scope" : "DOCUMENT",
-                                        "value" : "quantity-1"
-                                      }
-                                    }
-                                  },
-                                  "generalTerms" : {
-                                    "indexReferenceInformation" : {
-                                      "indexId" : [ {
-                                        "meta" : {
-                                          "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair"
-                                        },
-                                        "value" : "2I667KFN3"
-                                      } ],
-                                      "indexName" : {
-                                        "meta" : {
-                                          "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
-                                        },
-                                        "value" : "ITRAXX EUROPE CROSSOVER SERIES 29 VERSION 1"
-                                      },
-                                      "meta" : {
-                                        "globalKey" : "950d2f55"
-                                      }
+                                      "globalKey" : "3a4b88ab"
                                     }
                                   },
                                   "meta" : {
-                                    "globalKey" : "9ade1f56"
+                                    "globalKey" : "27a2ad3f"
                                   }
                                 },
+                                "meta" : {
+                                  "globalKey" : "27a2ad3f"
+                                }
+                              },
+                              "payout" : {
                                 "interestRatePayout" : [ {
                                   "payerReceiver" : {
-                                    "payer" : "PARTY_1",
-                                    "receiver" : "PARTY_2"
+                                    "payer" : "Party1",
+                                    "receiver" : "Party2"
                                   },
                                   "priceQuantity" : {
-                                    "meta" : {
-                                      "externalKey" : "calculationAmount",
-                                      "globalKey" : "0"
-                                    },
                                     "quantitySchedule" : {
                                       "address" : {
                                         "scope" : "DOCUMENT",
                                         "value" : "quantity-1"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "0",
+                                      "externalKey" : "calculationAmount"
                                     }
                                   },
-                                  "meta" : {
-                                    "globalKey" : "58b93681"
-                                  },
                                   "rateSpecification" : {
                                     "fixedRate" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
                                       "rateSchedule" : {
                                         "price" : {
                                           "address" : {
@@ -275,408 +267,334 @@
                                             "value" : "price-1"
                                           }
                                         }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "0"
                                       }
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "58b93681"
                                   }
                                 } ],
-                                "meta" : {
-                                  "globalKey" : "4e059fd7"
-                                }
-                              },
-                              "terminationDate" : {
-                                "adjustableDate" : {
-                                  "dateAdjustments" : {
-                                    "businessDayConvention" : "NOT_APPLICABLE",
+                                "creditDefaultPayout" : {
+                                  "payerReceiver" : {
+                                    "payer" : "Party2",
+                                    "receiver" : "Party1"
+                                  },
+                                  "priceQuantity" : {
+                                    "quantitySchedule" : {
+                                      "address" : {
+                                        "scope" : "DOCUMENT",
+                                        "value" : "quantity-1"
+                                      }
+                                    },
                                     "meta" : {
-                                      "globalKey" : "3a4b88ab"
+                                      "globalKey" : "0",
+                                      "externalKey" : "calculationAmount"
                                     }
                                   },
-                                  "meta" : {
-                                    "globalKey" : "27a2ad3f"
+                                  "generalTerms" : {
+                                    "indexReferenceInformation" : {
+                                      "indexName" : {
+                                        "value" : "ITRAXX EUROPE CROSSOVER SERIES 29 VERSION 1",
+                                        "meta" : {
+                                          "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
+                                        }
+                                      },
+                                      "indexId" : [ {
+                                        "value" : "2I667KFN3",
+                                        "meta" : {
+                                          "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair"
+                                        }
+                                      } ],
+                                      "meta" : {
+                                        "globalKey" : "a36eae15"
+                                      }
+                                    }
                                   },
-                                  "unadjustedDate" : "2023-06-20"
+                                  "meta" : {
+                                    "globalKey" : "a93f9e16"
+                                  }
                                 },
                                 "meta" : {
-                                  "globalKey" : "27a2ad3f"
+                                  "globalKey" : "2c4cfcf5"
                                 }
                               }
                             },
                             "meta" : {
-                              "globalKey" : "e91b0f82"
+                              "globalKey" : "f96c486e"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e91b0f82"
+                            "globalKey" : "f96c486e"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "4ed8c7e"
                         }
-                      } ]
+                      } ],
+                      "meta" : {
+                        "globalKey" : "4ed8c7e"
+                      }
+                    },
+                    "calculationAgent" : {
+                      "calculationAgentParty" : "CalculationAgentIndependent"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "4066f1ec"
+                    "globalKey" : "63e61f00"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "4066f1ec"
+                  "globalKey" : "63e61f00"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "7476ef6c"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.05,
                       "unit" : {
                         "currency" : {
+                          "value" : "EUR",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "EUR"
+                          }
                         }
                       },
-                      "value" : 0.05,
                       "perUnitOf" : {
                         "currency" : {
+                          "value" : "EUR",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "EUR"
+                          }
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "99d6ddfe"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "1a66fe14"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 15000000,
                       "unit" : {
                         "currency" : {
+                          "value" : "EUR",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "EUR"
+                          }
                         }
-                      },
-                      "value" : 15000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a104e1c2"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "c01a15e4",
+                  "externalReference" : "DTCC00001234"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "bfffbd41",
+                  "externalReference" : "DTCC00005678"
+                }
+              } ],
+              "ancillaryParty" : [ {
+                "role" : "CalculationAgentIndependent",
+                "partyReference" : [ {
+                  "globalReference" : "bfffbd41",
+                  "externalReference" : "DTCC00005678"
                 } ]
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f11d1"
-              },
-              "value" : "2018-07-17"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCC00001234",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "810RI27100804CP"
+                    "scheme" : "DTCC"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "5d63d132"
                 }
-              } ],
-              "issuerReference" : {
-                "externalReference" : "DTCC00001234",
-                "globalReference" : "c01a15e4"
-              },
-              "meta" : {
-                "globalKey" : "14972e41"
-              }
-            }, {
-              "assignedIdentifier" : [ {
+              }, {
                 "identifier" : {
+                  "value" : "DTCCZBUT11V806EZRVTWT807",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "810RI27100803"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "dd44cc56"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "DTCC00005678",
-                "globalReference" : "bfffbd41"
-              },
               "meta" : {
-                "globalKey" : "1a80730"
+                "globalKey" : "c01a15e4",
+                "externalKey" : "DTCC00001234"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCC00005678",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "IL196459337"
-                }
-              } ],
-              "issuer" : {
+                    "scheme" : "DTCC"
+                  }
+                },
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "5d65b232"
+                }
+              }, {
+                "identifier" : {
+                  "value" : "DTCC7H6GLXDRUGQFU57RNE97",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "1030229152"
-              },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "283f4b3"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "6c541efb"
+                "globalKey" : "bfffbd41",
+                "externalKey" : "DTCC00005678"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "64d9902a"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "ee7ab085"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "DTCC00001234",
-                  "globalReference" : "c01a15e4"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "DTCC00005678",
-                  "globalReference" : "bfffbd41"
-                }
-              },
               "quantity" : {
+                "value" : 137437.5,
                 "unit" : {
                   "currency" : {
+                    "value" : "EUR",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/ext/iso4217"
-                    },
-                    "value" : "EUR"
+                    }
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "c01a15e4",
+                  "externalReference" : "DTCC00001234"
                 },
-                "value" : 137437.5
+                "receiverPartyReference" : {
+                  "globalReference" : "bfffbd41",
+                  "externalReference" : "DTCC00005678"
+                }
               },
               "settlementDate" : {
+                "unadjustedDate" : "2018-07-20",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
-                },
-                "unadjustedDate" : "2018-07-20"
-              },
-              "transferExpression" : {
-                "priceTransfer" : "PREMIUM"
-              }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "2006-05-01",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "meta" : {
-                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
-                  },
-                  "value" : "ISDA_MASTER"
                 }
               },
-              "vintage" : 2002
-            },
-            "meta" : {
-              "globalKey" : "29b7f6da"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualDefinitionsType" : [ {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-                  },
-                  "value" : "ISDA_2014_CREDIT"
-                } ],
-                "contractualTermsSupplement" : [ {
-                  "contractualTermsSupplementType" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/contractual-supplement"
-                    },
-                    "value" : "I_TRAXX_EUROPE"
-                  },
-                  "publicationDate" : "2014-09-20"
-                }, {
-                  "contractualTermsSupplementType" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/ext/swaption-supplement"
-                    },
-                    "value" : "I_TRAXX_EUROPE_SWAPTION"
-                  },
-                  "publicationDate" : "2017-03-20"
-                } ]
+              "transferExpression" : {
+                "priceTransfer" : "Premium"
               }
             },
             "meta" : {
-              "globalKey" : "c08a3ed2"
+              "globalKey" : "305f2007"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "ea6425b1"
+          }
         }
       }
     } ],
-    "intent" : "CONTRACT_FORMATION",
+    "eventQualifier" : "ContractFormation",
     "after" : [ {
-      "meta" : {
-        "globalKey" : "3cb9e094"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
       "trade" : {
-        "contractDetails" : {
-          "documentation" : [ {
-            "agreementDate" : "2006-05-01",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "meta" : {
-                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
-                  },
-                  "value" : "ISDA_MASTER"
-                }
-              },
-              "vintage" : 2002
-            },
-            "meta" : {
-              "globalKey" : "29b7f6da"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualDefinitionsType" : [ {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-                  },
-                  "value" : "ISDA_2014_CREDIT"
-                } ],
-                "contractualTermsSupplement" : [ {
-                  "contractualTermsSupplementType" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/contractual-supplement"
-                    },
-                    "value" : "I_TRAXX_EUROPE"
-                  },
-                  "publicationDate" : "2014-09-20"
-                }, {
-                  "contractualTermsSupplementType" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/ext/swaption-supplement"
-                    },
-                    "value" : "I_TRAXX_EUROPE_SWAPTION"
-                  },
-                  "publicationDate" : "2017-03-20"
-                } ]
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "c01a15e4",
+            "externalReference" : "DTCC00001234"
+          },
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "810RI27100804CP",
+              "meta" : {
+                "scheme" : "TradeRefNbr"
               }
-            },
-            "meta" : {
-              "globalKey" : "c08a3ed2"
             }
           } ],
           "meta" : {
-            "globalKey" : "cecfba38"
+            "globalKey" : "56924e15"
           }
-        },
-        "meta" : {
-          "globalKey" : "e192ceec"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "DTCC00001234",
-            "globalKey" : "c01a15e4"
+        }, {
+          "issuerReference" : {
+            "globalReference" : "bfffbd41",
+            "externalReference" : "DTCC00005678"
           },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "DTCC"
-              },
-              "value" : "DTCC00001234"
-            },
-            "meta" : {
-              "globalKey" : "5d63d132"
-            }
-          }, {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "810RI27100803",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "DTCCZBUT11V806EZRVTWT807"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "dd44cc56"
+                "scheme" : "TradeRefNbr"
+              }
             }
-          } ]
-        }, {
+          } ],
           "meta" : {
-            "externalKey" : "DTCC00005678",
-            "globalKey" : "bfffbd41"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "DTCC"
-              },
-              "value" : "DTCC00005678"
-            },
+            "globalKey" : "fe318baa"
+          }
+        }, {
+          "issuer" : {
+            "value" : "1030229152",
             "meta" : {
-              "globalKey" : "5d65b232"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
             }
-          }, {
+          },
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "IL196459337",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "DTCC7H6GLXDRUGQFU57RNE97"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "283f4b3"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+              }
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "ee859c79"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2018-07-17",
+          "meta" : {
+            "globalKey" : "3f11d1"
+          }
+        },
         "tradableProduct" : {
-          "ancillaryParty" : [ {
-            "partyReference" : [ {
-              "externalReference" : "DTCC00005678",
-              "globalReference" : "bfffbd41"
-            } ],
-            "role" : "CALCULATION_AGENT_INDEPENDENT"
-          } ],
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "DTCC00001234",
-              "globalReference" : "c01a15e4"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "DTCC00005678",
-              "globalReference" : "bfffbd41"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -684,90 +602,81 @@
                 "productQualifier" : "CreditDefaultSwaption"
               } ],
               "economicTerms" : {
-                "calculationAgent" : {
-                  "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-                },
                 "payout" : {
-                  "meta" : {
-                    "globalKey" : "f50411ea"
-                  },
                   "optionPayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "settlementTerms" : {
+                      "settlementType" : "Physical",
                       "meta" : {
                         "globalKey" : "f3b1d0d7"
-                      },
-                      "settlementType" : "PHYSICAL"
+                      }
                     },
                     "buyerSeller" : {
-                      "buyer" : "PARTY_1",
-                      "seller" : "PARTY_2"
+                      "buyer" : "Party1",
+                      "seller" : "Party2"
                     },
+                    "optionType" : "Put",
                     "exerciseTerms" : {
-                      "exerciseProcedure" : {
-                        "followUpConfirmation" : true
-                      },
                       "optionStyle" : {
                         "europeanExercise" : {
-                          "earliestExerciseTime" : {
-                            "hourMinuteTime" : "00:00:00"
-                          },
                           "expirationDate" : [ {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-09-19",
                               "dateAdjustments" : {
-                                "businessDayConvention" : "NOT_APPLICABLE",
+                                "businessDayConvention" : "NotApplicable",
                                 "meta" : {
                                   "globalKey" : "3a4b88ab"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "270f523e"
-                              },
-                              "unadjustedDate" : "2018-09-19"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "270f523e"
                             }
                           } ],
+                          "earliestExerciseTime" : {
+                            "hourMinuteTime" : "00:00:00"
+                          },
                           "expirationTime" : {
                             "hourMinuteTime" : "23:00:00"
                           },
                           "meta" : {
-                            "globalKey" : "119e60c"
+                            "globalKey" : "ef162e8c"
                           }
                         }
                       },
                       "strike" : {
                         "strikePrice" : {
+                          "value" : 0.0003,
                           "unit" : {
                             "currency" : {
+                              "value" : "EUR",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/ext/iso4217"
-                              },
-                              "value" : "EUR"
+                              }
                             }
                           },
-                          "value" : 0.0003,
-                          "arithmeticOperator" : "ADD",
                           "perUnitOf" : {
                             "currency" : {
+                              "value" : "EUR",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/ext/iso4217"
-                              },
-                              "value" : "EUR"
+                              }
                             }
                           },
-                          "priceType" : "INTEREST_RATE"
+                          "priceType" : "InterestRate",
+                          "arithmeticOperator" : "Add"
                         }
+                      },
+                      "exerciseProcedure" : {
+                        "followUpConfirmation" : true
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "f50411ea"
-                    },
-                    "optionType" : "PUT",
                     "underlier" : {
                       "contractualProduct" : {
                         "productTaxonomy" : [ {
@@ -777,87 +686,58 @@
                         "economicTerms" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-03-20",
                               "dateAdjustments" : {
-                                "businessDayConvention" : "NOT_APPLICABLE",
+                                "businessDayConvention" : "NotApplicable",
                                 "meta" : {
                                   "globalKey" : "3a4b88ab"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "2709b47f"
-                              },
-                              "unadjustedDate" : "2018-03-20"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "2709b47f"
                             }
                           },
-                          "payout" : {
-                            "creditDefaultPayout" : {
-                              "payerReceiver" : {
-                                "payer" : "PARTY_2",
-                                "receiver" : "PARTY_1"
-                              },
-                              "priceQuantity" : {
+                          "terminationDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2023-06-20",
+                              "dateAdjustments" : {
+                                "businessDayConvention" : "NotApplicable",
                                 "meta" : {
-                                  "externalKey" : "calculationAmount",
-                                  "globalKey" : "0"
-                                },
-                                "quantitySchedule" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "quantity-1"
-                                  }
-                                }
-                              },
-                              "generalTerms" : {
-                                "indexReferenceInformation" : {
-                                  "indexId" : [ {
-                                    "meta" : {
-                                      "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair"
-                                    },
-                                    "value" : "2I667KFN3"
-                                  } ],
-                                  "indexName" : {
-                                    "meta" : {
-                                      "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
-                                    },
-                                    "value" : "ITRAXX EUROPE CROSSOVER SERIES 29 VERSION 1"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "950d2f55"
-                                  }
+                                  "globalKey" : "3a4b88ab"
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "9ade1f56"
+                                "globalKey" : "27a2ad3f"
                               }
                             },
+                            "meta" : {
+                              "globalKey" : "27a2ad3f"
+                            }
+                          },
+                          "payout" : {
                             "interestRatePayout" : [ {
                               "payerReceiver" : {
-                                "payer" : "PARTY_1",
-                                "receiver" : "PARTY_2"
+                                "payer" : "Party1",
+                                "receiver" : "Party2"
                               },
                               "priceQuantity" : {
-                                "meta" : {
-                                  "externalKey" : "calculationAmount",
-                                  "globalKey" : "0"
-                                },
                                 "quantitySchedule" : {
                                   "address" : {
                                     "scope" : "DOCUMENT",
                                     "value" : "quantity-1"
                                   }
+                                },
+                                "meta" : {
+                                  "globalKey" : "0",
+                                  "externalKey" : "calculationAmount"
                                 }
                               },
-                              "meta" : {
-                                "globalKey" : "58b93681"
-                              },
                               "rateSpecification" : {
                                 "fixedRate" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "rateSchedule" : {
                                     "price" : {
                                       "address" : {
@@ -865,237 +745,342 @@
                                         "value" : "price-1"
                                       }
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 }
+                              },
+                              "meta" : {
+                                "globalKey" : "58b93681"
                               }
                             } ],
-                            "meta" : {
-                              "globalKey" : "4e059fd7"
-                            }
-                          },
-                          "terminationDate" : {
-                            "adjustableDate" : {
-                              "dateAdjustments" : {
-                                "businessDayConvention" : "NOT_APPLICABLE",
+                            "creditDefaultPayout" : {
+                              "payerReceiver" : {
+                                "payer" : "Party2",
+                                "receiver" : "Party1"
+                              },
+                              "priceQuantity" : {
+                                "quantitySchedule" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "quantity-1"
+                                  }
+                                },
                                 "meta" : {
-                                  "globalKey" : "3a4b88ab"
+                                  "globalKey" : "0",
+                                  "externalKey" : "calculationAmount"
                                 }
                               },
-                              "meta" : {
-                                "globalKey" : "27a2ad3f"
+                              "generalTerms" : {
+                                "indexReferenceInformation" : {
+                                  "indexName" : {
+                                    "value" : "ITRAXX EUROPE CROSSOVER SERIES 29 VERSION 1",
+                                    "meta" : {
+                                      "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
+                                    }
+                                  },
+                                  "indexId" : [ {
+                                    "value" : "2I667KFN3",
+                                    "meta" : {
+                                      "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair"
+                                    }
+                                  } ],
+                                  "meta" : {
+                                    "globalKey" : "a36eae15"
+                                  }
+                                }
                               },
-                              "unadjustedDate" : "2023-06-20"
+                              "meta" : {
+                                "globalKey" : "a93f9e16"
+                              }
                             },
                             "meta" : {
-                              "globalKey" : "27a2ad3f"
+                              "globalKey" : "2c4cfcf5"
                             }
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e91b0f82"
+                          "globalKey" : "f96c486e"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "e91b0f82"
+                        "globalKey" : "f96c486e"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "4ed8c7e"
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "4ed8c7e"
+                  }
+                },
+                "calculationAgent" : {
+                  "calculationAgentParty" : "CalculationAgentIndependent"
                 }
               },
               "meta" : {
-                "globalKey" : "4066f1ec"
+                "globalKey" : "63e61f00"
               }
             },
             "meta" : {
-              "globalKey" : "4066f1ec"
+              "globalKey" : "63e61f00"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "7476ef6c"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.05,
                   "unit" : {
                     "currency" : {
+                      "value" : "EUR",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/ext/iso4217"
-                      },
-                      "value" : "EUR"
+                      }
                     }
                   },
-                  "value" : 0.05,
                   "perUnitOf" : {
                     "currency" : {
+                      "value" : "EUR",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/ext/iso4217"
-                      },
-                      "value" : "EUR"
+                      }
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "99d6ddfe"
-              },
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "1a66fe14"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 15000000,
                   "unit" : {
                     "currency" : {
+                      "value" : "EUR",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/ext/iso4217"
-                      },
-                      "value" : "EUR"
+                      }
                     }
-                  },
-                  "value" : 15000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "a104e1c2"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "c01a15e4",
+              "externalReference" : "DTCC00001234"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "bfffbd41",
+              "externalReference" : "DTCC00005678"
+            }
+          } ],
+          "ancillaryParty" : [ {
+            "role" : "CalculationAgentIndependent",
+            "partyReference" : [ {
+              "globalReference" : "bfffbd41",
+              "externalReference" : "DTCC00005678"
             } ]
           } ]
         },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f11d1"
-          },
-          "value" : "2018-07-17"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "DTCC00001234",
               "meta" : {
-                "scheme" : "TradeRefNbr"
-              },
-              "value" : "810RI27100804CP"
+                "scheme" : "DTCC"
+              }
+            },
+            "meta" : {
+              "globalKey" : "5d63d132"
             }
-          } ],
-          "issuerReference" : {
-            "externalReference" : "DTCC00001234",
-            "globalReference" : "c01a15e4"
-          },
-          "meta" : {
-            "globalKey" : "14972e41"
-          }
-        }, {
-          "assignedIdentifier" : [ {
+          }, {
             "identifier" : {
+              "value" : "DTCCZBUT11V806EZRVTWT807",
               "meta" : {
-                "scheme" : "TradeRefNbr"
-              },
-              "value" : "810RI27100803"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "dd44cc56"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "DTCC00005678",
-            "globalReference" : "bfffbd41"
-          },
           "meta" : {
-            "globalKey" : "1a80730"
+            "globalKey" : "c01a15e4",
+            "externalKey" : "DTCC00001234"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "DTCC00005678",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-              },
-              "value" : "IL196459337"
+                "scheme" : "DTCC"
+              }
+            },
+            "meta" : {
+              "globalKey" : "5d65b232"
+            }
+          }, {
+            "identifier" : {
+              "value" : "DTCC7H6GLXDRUGQFU57RNE97",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "283f4b3"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "bfffbd41",
+            "externalKey" : "DTCC00005678"
+          }
+        } ],
+        "contractDetails" : {
+          "documentation" : [ {
+            "agreementDate" : "2006-05-01",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster",
+                  "meta" : {
+                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
+                  }
+                }
+              },
+              "vintage" : 2002
+            },
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+              "globalKey" : "29b7f6da"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualDefinitionsType" : [ {
+                  "value" : "ISDA2014Credit",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+                  }
+                } ],
+                "contractualTermsSupplement" : [ {
+                  "contractualTermsSupplementType" : {
+                    "value" : "iTraxxEurope",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/contractual-supplement"
+                    }
+                  },
+                  "publicationDate" : "2014-09-20"
+                }, {
+                  "contractualTermsSupplementType" : {
+                    "value" : "iTraxxEuropeSwaption",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/ext/swaption-supplement"
+                    }
+                  },
+                  "publicationDate" : "2017-03-20"
+                } ]
+              }
             },
-            "value" : "1030229152"
-          },
+            "meta" : {
+              "globalKey" : "c08a3ed2"
+            }
+          } ],
           "meta" : {
-            "globalKey" : "6c541efb"
+            "globalKey" : "cecfba38"
           }
-        } ]
+        },
+        "meta" : {
+          "globalKey" : "3e759ace"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
       },
       "transferHistory" : [ {
-        "meta" : {
-          "globalKey" : "ee7ab085"
-        },
         "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "DTCC00001234",
-              "globalReference" : "c01a15e4"
-            },
-            "receiverPartyReference" : {
-              "externalReference" : "DTCC00005678",
-              "globalReference" : "bfffbd41"
-            }
-          },
           "quantity" : {
+            "value" : 137437.5,
             "unit" : {
               "currency" : {
+                "value" : "EUR",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/ext/iso4217"
-                },
-                "value" : "EUR"
+                }
               }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "c01a15e4",
+              "externalReference" : "DTCC00001234"
             },
-            "value" : 137437.5
+            "receiverPartyReference" : {
+              "globalReference" : "bfffbd41",
+              "externalReference" : "DTCC00005678"
+            }
           },
           "settlementDate" : {
+            "unadjustedDate" : "2018-07-20",
             "dateAdjustments" : {
-              "businessDayConvention" : "NOT_APPLICABLE",
+              "businessDayConvention" : "NotApplicable",
               "meta" : {
                 "globalKey" : "3a4b88ab"
               }
-            },
-            "unadjustedDate" : "2018-07-20"
+            }
           },
           "transferExpression" : {
-            "priceTransfer" : "PREMIUM"
+            "priceTransfer" : "Premium"
           }
+        },
+        "meta" : {
+          "globalKey" : "305f2007"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "74a5ff78"
+      }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "9de721f"
+      "globalKey" : "e6fef2fb"
     }
   },
-  "eventIdentifier" : [ {
-    "issuerReference" : {
-      "externalReference" : "DTCC00001234",
-      "globalReference" : "c01a15e4"
-    },
-    "meta" : {
-      "globalKey" : "de7a9516"
-    }
-  }, {
-    "issuerReference" : {
-      "externalReference" : "DTCC00005678",
-      "globalReference" : "bfffbd41"
-    },
-    "meta" : {
-      "globalKey" : "72f11d73"
-    }
-  } ],
+  "previousWorkflowStep" : {
+    "globalReference" : "ee2f660c"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "MSERV20181008.0004086555",
       "meta" : {
         "scheme" : "perFpMLReqmt"
-      },
-      "value" : "MSERV20181008.0004086555"
+      }
     },
     "sentBy" : {
       "value" : "MarkitSERV"
@@ -1104,72 +1089,87 @@
       "value" : "DTCC"
     } ]
   },
-  "meta" : {
-    "globalKey" : "7199d1ed"
-  },
-  "party" : [ {
+  "timestamp" : [ {
+    "dateTime" : "2018-10-08T10:57:52.137Z",
+    "qualification" : "eventSubmittedDateTime"
+  }, {
+    "dateTime" : "2018-10-08T10:58:02.462Z",
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "issuerReference" : {
+      "globalReference" : "c01a15e4",
+      "externalReference" : "DTCC00001234"
+    },
     "meta" : {
-      "externalKey" : "DTCC00001234",
-      "globalKey" : "c01a15e4"
+      "globalKey" : "de7a9516"
+    }
+  }, {
+    "issuerReference" : {
+      "globalReference" : "bfffbd41",
+      "externalReference" : "DTCC00005678"
     },
+    "meta" : {
+      "globalKey" : "72f11d73"
+    }
+  } ],
+  "action" : "New",
+  "party" : [ {
     "partyId" : [ {
       "identifier" : {
+        "value" : "DTCC00001234",
         "meta" : {
           "scheme" : "DTCC"
-        },
-        "value" : "DTCC00001234"
+        }
       },
       "meta" : {
         "globalKey" : "5d63d132"
       }
     }, {
       "identifier" : {
+        "value" : "DTCCZBUT11V806EZRVTWT807",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "DTCCZBUT11V806EZRVTWT807"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "dd44cc56"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "DTCC00005678",
-      "globalKey" : "bfffbd41"
-    },
+      "globalKey" : "c01a15e4",
+      "externalKey" : "DTCC00001234"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "DTCC00005678",
         "meta" : {
           "scheme" : "DTCC"
-        },
-        "value" : "DTCC00005678"
+        }
       },
       "meta" : {
         "globalKey" : "5d65b232"
       }
     }, {
       "identifier" : {
+        "value" : "DTCC7H6GLXDRUGQFU57RNE97",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "DTCC7H6GLXDRUGQFU57RNE97"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "283f4b3"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "bfffbd41",
+      "externalKey" : "DTCC00005678"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "255a429e"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2018-10-08T10:57:52.137Z",
-    "qualification" : "EVENT_SUBMITTED_DATE_TIME"
-  }, {
-    "dateTime" : "2018-10-08T10:58:02.462Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+  "meta" : {
+    "globalKey" : "ec08f1b3"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade3-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade3-func-output.json
index 554ec95a28..9c11e1b8e0 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade3-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade3-func-output.json
@@ -1,92 +1,132 @@
 {
-  "action" : "NEW",
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "1992-09-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster",
+                  "meta" : {
+                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
+                  }
+                }
+              },
+              "vintage" : 1992
+            },
+            "meta" : {
+              "globalKey" : "f42c8e93"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualDefinitionsType" : [ {
+                  "value" : "ISDA2014Credit",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+                  }
+                } ],
+                "contractualTermsSupplement" : [ {
+                  "contractualTermsSupplementType" : {
+                    "value" : "CDX",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/contractual-supplement"
+                    }
+                  },
+                  "publicationDate" : "2014-09-22"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "945b3ce1"
+            }
+          } ]
+        }
+      },
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "86d6fe42"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "771b974f"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "DTCC00005678",
-                "globalKey" : "aa32cc29"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "aa32cc29",
+                "externalReference" : "DTCC00005678"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "204069260",
                   "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCC00005678"
-                },
-                "meta" : {
-                  "globalKey" : "5d65b232"
+                    "scheme" : "TradeRefNbr"
+                  }
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "77dc1194"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "b38cc8f1",
+                "externalReference" : "DTCC00001234"
+              },
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "4876781",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "DTCCRR3QWICWWIPCS8A4S074"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "ecb7039b"
+                    "scheme" : "TradeRefNbr"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "DTCC00001234",
-                "globalKey" : "b38cc8f1"
+                "globalKey" : "8d317b2a"
+              }
+            }, {
+              "issuer" : {
+                "value" : "M710DSN29N",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                }
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "1TTRVD82HTWGNT13LB8QG2G6L0DDN5SA",
                   "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCC00001234"
-                },
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "9cbaf17e"
+              }
+            }, {
+              "issuer" : {
+                "value" : "M710DSN29N",
                 "meta" : {
-                  "globalKey" : "5d63d132"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
                 }
-              }, {
+              },
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "1TTRVD82HTWGNT13LB8QG2G6L0DDN5SA",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "DTCCDGQCSV2PHVF7I2743539"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "d0b77f63"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "9cbaf17e"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-08",
+              "meta" : {
+                "globalKey" : "3f1288"
+              }
+            },
             "tradableProduct" : {
-              "ancillaryParty" : [ {
-                "partyReference" : [ {
-                  "externalReference" : "DTCC00001234",
-                  "globalReference" : "b38cc8f1"
-                } ],
-                "role" : "CALCULATION_AGENT_INDEPENDENT"
-              } ],
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "DTCC00001234",
-                  "globalReference" : "b38cc8f1"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "DTCC00005678",
-                  "globalReference" : "aa32cc29"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -94,93 +134,60 @@
                     "productQualifier" : "CreditDefaultSwap_Index"
                   } ],
                   "economicTerms" : {
-                    "calculationAgent" : {
-                      "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-                    },
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-03-20",
                         "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
                             "globalKey" : "3a4b88ab"
                           }
                         },
                         "meta" : {
                           "globalKey" : "2709b47f"
-                        },
-                        "unadjustedDate" : "2018-03-20"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "2709b47f"
                       }
                     },
-                    "payout" : {
-                      "creditDefaultPayout" : {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
-                        },
-                        "priceQuantity" : {
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2023-06-20",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "generalTerms" : {
-                          "indexReferenceInformation" : {
-                            "indexId" : [ {
-                              "meta" : {
-                                "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair"
-                              },
-                              "value" : "2I65BYDP7"
-                            } ],
-                            "indexName" : {
-                              "meta" : {
-                                "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
-                              },
-                              "value" : "CDX.NA.IG.30"
-                            },
-                            "indexAnnexDate" : "2018-03-20",
-                            "meta" : {
-                              "globalKey" : "eeb2782d"
-                            }
+                            "globalKey" : "3a4b88ab"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "42fa862e"
+                          "globalKey" : "27a2ad3f"
                         }
                       },
+                      "meta" : {
+                        "globalKey" : "27a2ad3f"
+                      }
+                    },
+                    "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "5a5ff79f"
-                        },
                         "rateSpecification" : {
                           "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "rateSchedule" : {
                               "price" : {
                                 "address" : {
@@ -188,390 +195,327 @@
                                   "value" : "price-1"
                                 }
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "5a5ff79f"
                         }
                       } ],
-                      "meta" : {
-                        "globalKey" : "79c06fcd"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
                           "meta" : {
-                            "globalKey" : "3a4b88ab"
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "27a2ad3f"
+                        "generalTerms" : {
+                          "indexReferenceInformation" : {
+                            "indexName" : {
+                              "value" : "CDX.NA.IG.30",
+                              "meta" : {
+                                "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
+                              }
+                            },
+                            "indexId" : [ {
+                              "value" : "2I65BYDP7",
+                              "meta" : {
+                                "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair"
+                              }
+                            } ],
+                            "indexAnnexDate" : "2018-03-20",
+                            "meta" : {
+                              "globalKey" : "d84ac6ed"
+                            }
+                          }
                         },
-                        "unadjustedDate" : "2023-06-20"
+                        "meta" : {
+                          "globalKey" : "2c92d4ee"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "27a2ad3f"
+                        "globalKey" : "7f19560d"
                       }
+                    },
+                    "calculationAgent" : {
+                      "calculationAgentParty" : "CalculationAgentIndependent"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "98a77d2e"
+                    "globalKey" : "b737c59e"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "98a77d2e"
+                  "globalKey" : "b737c59e"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "1f273178"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.01,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "value" : 0.01,
                       "perUnitOf" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "1a10e2d1"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "c5befd88"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 5000000,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
-                      },
-                      "value" : 5000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "280b774f"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "b38cc8f1",
+                  "externalReference" : "DTCC00001234"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "aa32cc29",
+                  "externalReference" : "DTCC00005678"
+                }
+              } ],
+              "ancillaryParty" : [ {
+                "role" : "CalculationAgentIndependent",
+                "partyReference" : [ {
+                  "globalReference" : "b38cc8f1",
+                  "externalReference" : "DTCC00001234"
                 } ]
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1288"
-              },
-              "value" : "2018-10-08"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCC00005678",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "204069260"
+                    "scheme" : "DTCC"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "5d65b232"
                 }
-              } ],
-              "issuerReference" : {
-                "externalReference" : "DTCC00005678",
-                "globalReference" : "aa32cc29"
-              },
-              "meta" : {
-                "globalKey" : "703c556a"
-              }
-            }, {
-              "assignedIdentifier" : [ {
+              }, {
                 "identifier" : {
+                  "value" : "DTCCRR3QWICWWIPCS8A4S074",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "4876781"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "ecb7039b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "DTCC00001234",
-                "globalReference" : "b38cc8f1"
-              },
               "meta" : {
-                "globalKey" : "ec0c0e10"
+                "globalKey" : "aa32cc29",
+                "externalKey" : "DTCC00005678"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCC00001234",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "1TTRVD82HTWGNT13LB8QG2G6L0DDN5SA"
-                }
-              } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                    "scheme" : "DTCC"
+                  }
                 },
-                "value" : "M710DSN29N"
-              },
-              "meta" : {
-                "globalKey" : "caca0600"
-              }
-            }, {
-              "assignedIdentifier" : [ {
+                "meta" : {
+                  "globalKey" : "5d63d132"
+                }
+              }, {
                 "identifier" : {
+                  "value" : "DTCCDGQCSV2PHVF7I2743539",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "1TTRVD82HTWGNT13LB8QG2G6L0DDN5SA"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "d0b77f63"
                 }
               } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
-                },
-                "value" : "M710DSN29N"
-              },
               "meta" : {
-                "globalKey" : "caca0600"
+                "globalKey" : "b38cc8f1",
+                "externalKey" : "DTCC00001234"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "2f7b30a1"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "6f07db33"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "DTCC00005678",
-                  "globalReference" : "aa32cc29"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "DTCC00001234",
-                  "globalReference" : "b38cc8f1"
-                }
-              },
               "quantity" : {
+                "value" : 123456,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/ext/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
-                },
-                "value" : 123456
+                }
               },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
-              }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "1992-09-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "meta" : {
-                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
-                  },
-                  "value" : "ISDA_MASTER"
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "aa32cc29",
+                  "externalReference" : "DTCC00005678"
+                },
+                "receiverPartyReference" : {
+                  "globalReference" : "b38cc8f1",
+                  "externalReference" : "DTCC00001234"
                 }
               },
-              "vintage" : 1992
-            },
-            "meta" : {
-              "globalKey" : "f42c8e93"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualDefinitionsType" : [ {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-                  },
-                  "value" : "ISDA_2014_CREDIT"
-                } ],
-                "contractualTermsSupplement" : [ {
-                  "contractualTermsSupplementType" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/contractual-supplement"
-                    },
-                    "value" : "CDX"
-                  },
-                  "publicationDate" : "2014-09-22"
-                } ]
+              "transferExpression" : {
+                "priceTransfer" : "Upfront"
               }
             },
             "meta" : {
-              "globalKey" : "945b3ce1"
+              "globalKey" : "46771009"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "38a430ea"
+          }
         }
       }
     } ],
-    "intent" : "CONTRACT_FORMATION",
+    "eventQualifier" : "ContractFormation",
     "after" : [ {
-      "meta" : {
-        "globalKey" : "c479be91"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
       "trade" : {
-        "contractDetails" : {
-          "documentation" : [ {
-            "agreementDate" : "1992-09-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "meta" : {
-                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
-                  },
-                  "value" : "ISDA_MASTER"
-                }
-              },
-              "vintage" : 1992
-            },
-            "meta" : {
-              "globalKey" : "f42c8e93"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualDefinitionsType" : [ {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-                  },
-                  "value" : "ISDA_2014_CREDIT"
-                } ],
-                "contractualTermsSupplement" : [ {
-                  "contractualTermsSupplementType" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/contractual-supplement"
-                    },
-                    "value" : "CDX"
-                  },
-                  "publicationDate" : "2014-09-22"
-                } ]
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "aa32cc29",
+            "externalReference" : "DTCC00005678"
+          },
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "204069260",
+              "meta" : {
+                "scheme" : "TradeRefNbr"
               }
-            },
-            "meta" : {
-              "globalKey" : "945b3ce1"
             }
           } ],
           "meta" : {
-            "globalKey" : "949a63ae"
+            "globalKey" : "77dc1194"
           }
-        },
-        "meta" : {
-          "globalKey" : "2049f361"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "DTCC00005678",
-            "globalKey" : "aa32cc29"
+        }, {
+          "issuerReference" : {
+            "globalReference" : "b38cc8f1",
+            "externalReference" : "DTCC00001234"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "4876781",
               "meta" : {
-                "scheme" : "DTCC"
-              },
-              "value" : "DTCC00005678"
-            },
-            "meta" : {
-              "globalKey" : "5d65b232"
+                "scheme" : "TradeRefNbr"
+              }
             }
-          }, {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "DTCCRR3QWICWWIPCS8A4S074"
-            },
-            "identifierType" : "LEI",
+          } ],
+          "meta" : {
+            "globalKey" : "8d317b2a"
+          }
+        }, {
+          "issuer" : {
+            "value" : "M710DSN29N",
             "meta" : {
-              "globalKey" : "ecb7039b"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "DTCC00001234",
-            "globalKey" : "b38cc8f1"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "1TTRVD82HTWGNT13LB8QG2G6L0DDN5SA",
               "meta" : {
-                "scheme" : "DTCC"
-              },
-              "value" : "DTCC00001234"
-            },
+                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "9cbaf17e"
+          }
+        }, {
+          "issuer" : {
+            "value" : "M710DSN29N",
             "meta" : {
-              "globalKey" : "5d63d132"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
             }
-          }, {
+          },
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "1TTRVD82HTWGNT13LB8QG2G6L0DDN5SA",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "DTCCDGQCSV2PHVF7I2743539"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "d0b77f63"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+              }
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "9cbaf17e"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2018-10-08",
+          "meta" : {
+            "globalKey" : "3f1288"
+          }
+        },
         "tradableProduct" : {
-          "ancillaryParty" : [ {
-            "partyReference" : [ {
-              "externalReference" : "DTCC00001234",
-              "globalReference" : "b38cc8f1"
-            } ],
-            "role" : "CALCULATION_AGENT_INDEPENDENT"
-          } ],
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "DTCC00001234",
-              "globalReference" : "b38cc8f1"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "DTCC00005678",
-              "globalReference" : "aa32cc29"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -579,93 +523,60 @@
                 "productQualifier" : "CreditDefaultSwap_Index"
               } ],
               "economicTerms" : {
-                "calculationAgent" : {
-                  "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-                },
                 "effectiveDate" : {
                   "adjustableDate" : {
+                    "unadjustedDate" : "2018-03-20",
                     "dateAdjustments" : {
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "meta" : {
                         "globalKey" : "3a4b88ab"
                       }
                     },
                     "meta" : {
                       "globalKey" : "2709b47f"
-                    },
-                    "unadjustedDate" : "2018-03-20"
+                    }
                   },
                   "meta" : {
                     "globalKey" : "2709b47f"
                   }
                 },
-                "payout" : {
-                  "creditDefaultPayout" : {
-                    "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
-                    },
-                    "priceQuantity" : {
+                "terminationDate" : {
+                  "adjustableDate" : {
+                    "unadjustedDate" : "2023-06-20",
+                    "dateAdjustments" : {
+                      "businessDayConvention" : "NotApplicable",
                       "meta" : {
-                        "externalKey" : "calculationAmount",
-                        "globalKey" : "0"
-                      },
-                      "quantitySchedule" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "quantity-1"
-                        }
-                      }
-                    },
-                    "generalTerms" : {
-                      "indexReferenceInformation" : {
-                        "indexId" : [ {
-                          "meta" : {
-                            "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair"
-                          },
-                          "value" : "2I65BYDP7"
-                        } ],
-                        "indexName" : {
-                          "meta" : {
-                            "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
-                          },
-                          "value" : "CDX.NA.IG.30"
-                        },
-                        "indexAnnexDate" : "2018-03-20",
-                        "meta" : {
-                          "globalKey" : "eeb2782d"
-                        }
+                        "globalKey" : "3a4b88ab"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "42fa862e"
+                      "globalKey" : "27a2ad3f"
                     }
                   },
+                  "meta" : {
+                    "globalKey" : "27a2ad3f"
+                  }
+                },
+                "payout" : {
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "externalKey" : "calculationAmount",
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0",
+                        "externalKey" : "calculationAmount"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "5a5ff79f"
-                    },
                     "rateSpecification" : {
                       "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "rateSchedule" : {
                           "price" : {
                             "address" : {
@@ -673,235 +584,309 @@
                               "value" : "price-1"
                             }
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "5a5ff79f"
                     }
                   } ],
-                  "meta" : {
-                    "globalKey" : "79c06fcd"
-                  }
-                },
-                "terminationDate" : {
-                  "adjustableDate" : {
-                    "dateAdjustments" : {
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                  "creditDefaultPayout" : {
+                    "payerReceiver" : {
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
+                    },
+                    "priceQuantity" : {
+                      "quantitySchedule" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "quantity-1"
+                        }
+                      },
                       "meta" : {
-                        "globalKey" : "3a4b88ab"
+                        "globalKey" : "0",
+                        "externalKey" : "calculationAmount"
+                      }
+                    },
+                    "generalTerms" : {
+                      "indexReferenceInformation" : {
+                        "indexName" : {
+                          "value" : "CDX.NA.IG.30",
+                          "meta" : {
+                            "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
+                          }
+                        },
+                        "indexId" : [ {
+                          "value" : "2I65BYDP7",
+                          "meta" : {
+                            "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair"
+                          }
+                        } ],
+                        "indexAnnexDate" : "2018-03-20",
+                        "meta" : {
+                          "globalKey" : "d84ac6ed"
+                        }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "27a2ad3f"
-                    },
-                    "unadjustedDate" : "2023-06-20"
+                      "globalKey" : "2c92d4ee"
+                    }
                   },
                   "meta" : {
-                    "globalKey" : "27a2ad3f"
+                    "globalKey" : "7f19560d"
                   }
+                },
+                "calculationAgent" : {
+                  "calculationAgentParty" : "CalculationAgentIndependent"
                 }
               },
               "meta" : {
-                "globalKey" : "98a77d2e"
+                "globalKey" : "b737c59e"
               }
             },
             "meta" : {
-              "globalKey" : "98a77d2e"
+              "globalKey" : "b737c59e"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "1f273178"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.01,
                   "unit" : {
                     "currency" : {
+                      "value" : "USD",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/ext/iso4217"
-                      },
-                      "value" : "USD"
+                      }
                     }
                   },
-                  "value" : 0.01,
                   "perUnitOf" : {
                     "currency" : {
+                      "value" : "USD",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/ext/iso4217"
-                      },
-                      "value" : "USD"
+                      }
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "1a10e2d1"
-              },
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "c5befd88"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 5000000,
                   "unit" : {
                     "currency" : {
+                      "value" : "USD",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/ext/iso4217"
-                      },
-                      "value" : "USD"
+                      }
                     }
-                  },
-                  "value" : 5000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "280b774f"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "b38cc8f1",
+              "externalReference" : "DTCC00001234"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "aa32cc29",
+              "externalReference" : "DTCC00005678"
+            }
+          } ],
+          "ancillaryParty" : [ {
+            "role" : "CalculationAgentIndependent",
+            "partyReference" : [ {
+              "globalReference" : "b38cc8f1",
+              "externalReference" : "DTCC00001234"
             } ]
           } ]
         },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f1288"
-          },
-          "value" : "2018-10-08"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "DTCC00005678",
               "meta" : {
-                "scheme" : "TradeRefNbr"
-              },
-              "value" : "204069260"
+                "scheme" : "DTCC"
+              }
+            },
+            "meta" : {
+              "globalKey" : "5d65b232"
             }
-          } ],
-          "issuerReference" : {
-            "externalReference" : "DTCC00005678",
-            "globalReference" : "aa32cc29"
-          },
-          "meta" : {
-            "globalKey" : "703c556a"
-          }
-        }, {
-          "assignedIdentifier" : [ {
+          }, {
             "identifier" : {
+              "value" : "DTCCRR3QWICWWIPCS8A4S074",
               "meta" : {
-                "scheme" : "TradeRefNbr"
-              },
-              "value" : "4876781"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "ecb7039b"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "DTCC00001234",
-            "globalReference" : "b38cc8f1"
-          },
           "meta" : {
-            "globalKey" : "ec0c0e10"
+            "globalKey" : "aa32cc29",
+            "externalKey" : "DTCC00005678"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "DTCC00001234",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-              },
-              "value" : "1TTRVD82HTWGNT13LB8QG2G6L0DDN5SA"
-            }
-          } ],
-          "issuer" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                "scheme" : "DTCC"
+              }
             },
-            "value" : "M710DSN29N"
-          },
-          "meta" : {
-            "globalKey" : "caca0600"
-          }
-        }, {
-          "assignedIdentifier" : [ {
+            "meta" : {
+              "globalKey" : "5d63d132"
+            }
+          }, {
             "identifier" : {
+              "value" : "DTCCDGQCSV2PHVF7I2743539",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-              },
-              "value" : "1TTRVD82HTWGNT13LB8QG2G6L0DDN5SA"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "d0b77f63"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "b38cc8f1",
+            "externalKey" : "DTCC00001234"
+          }
+        } ],
+        "contractDetails" : {
+          "documentation" : [ {
+            "agreementDate" : "1992-09-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster",
+                  "meta" : {
+                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
+                  }
+                }
+              },
+              "vintage" : 1992
+            },
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
+              "globalKey" : "f42c8e93"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualDefinitionsType" : [ {
+                  "value" : "ISDA2014Credit",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+                  }
+                } ],
+                "contractualTermsSupplement" : [ {
+                  "contractualTermsSupplementType" : {
+                    "value" : "CDX",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/contractual-supplement"
+                    }
+                  },
+                  "publicationDate" : "2014-09-22"
+                } ]
+              }
             },
-            "value" : "M710DSN29N"
-          },
+            "meta" : {
+              "globalKey" : "945b3ce1"
+            }
+          } ],
           "meta" : {
-            "globalKey" : "caca0600"
+            "globalKey" : "949a63ae"
           }
-        } ]
+        },
+        "meta" : {
+          "globalKey" : "a39056d"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
       },
       "transferHistory" : [ {
-        "meta" : {
-          "globalKey" : "6f07db33"
-        },
         "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "DTCC00005678",
-              "globalReference" : "aa32cc29"
-            },
-            "receiverPartyReference" : {
-              "externalReference" : "DTCC00001234",
-              "globalReference" : "b38cc8f1"
-            }
-          },
           "quantity" : {
+            "value" : 123456,
             "unit" : {
               "currency" : {
+                "value" : "USD",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/ext/iso4217"
-                },
-                "value" : "USD"
+                }
               }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "aa32cc29",
+              "externalReference" : "DTCC00005678"
             },
-            "value" : 123456
+            "receiverPartyReference" : {
+              "globalReference" : "b38cc8f1",
+              "externalReference" : "DTCC00001234"
+            }
           },
           "transferExpression" : {
-            "priceTransfer" : "UPFRONT"
+            "priceTransfer" : "Upfront"
           }
+        },
+        "meta" : {
+          "globalKey" : "46771009"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "2f4a7e99"
+      }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "ef18745d"
+      "globalKey" : "ba5a008d"
     }
   },
-  "eventIdentifier" : [ {
-    "issuerReference" : {
-      "externalReference" : "DTCC00005678",
-      "globalReference" : "aa32cc29"
-    },
-    "meta" : {
-      "globalKey" : "5d242c5b"
-    }
-  }, {
-    "issuerReference" : {
-      "externalReference" : "DTCC00001234",
-      "globalReference" : "b38cc8f1"
-    },
-    "meta" : {
-      "globalKey" : "d1ed4823"
-    }
-  } ],
+  "previousWorkflowStep" : {
+    "globalReference" : "2c204bb5"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "MSERV20181022.0005217595",
       "meta" : {
         "scheme" : "perFpMLReqmt"
-      },
-      "value" : "MSERV20181022.0005217595"
+      }
     },
     "sentBy" : {
       "value" : "MarkitSERV"
@@ -910,72 +895,87 @@
       "value" : "DTCC"
     } ]
   },
-  "meta" : {
-    "globalKey" : "db369bf2"
-  },
-  "party" : [ {
+  "timestamp" : [ {
+    "dateTime" : "2018-10-22T09:45:24.382Z",
+    "qualification" : "eventSubmittedDateTime"
+  }, {
+    "dateTime" : "2018-10-22T09:45:36.701Z",
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "issuerReference" : {
+      "globalReference" : "aa32cc29",
+      "externalReference" : "DTCC00005678"
+    },
     "meta" : {
-      "externalKey" : "DTCC00005678",
-      "globalKey" : "aa32cc29"
+      "globalKey" : "5d242c5b"
+    }
+  }, {
+    "issuerReference" : {
+      "globalReference" : "b38cc8f1",
+      "externalReference" : "DTCC00001234"
     },
+    "meta" : {
+      "globalKey" : "d1ed4823"
+    }
+  } ],
+  "action" : "New",
+  "party" : [ {
     "partyId" : [ {
       "identifier" : {
+        "value" : "DTCC00005678",
         "meta" : {
           "scheme" : "DTCC"
-        },
-        "value" : "DTCC00005678"
+        }
       },
       "meta" : {
         "globalKey" : "5d65b232"
       }
     }, {
       "identifier" : {
+        "value" : "DTCCRR3QWICWWIPCS8A4S074",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "DTCCRR3QWICWWIPCS8A4S074"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "ecb7039b"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "DTCC00001234",
-      "globalKey" : "b38cc8f1"
-    },
+      "globalKey" : "aa32cc29",
+      "externalKey" : "DTCC00005678"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "DTCC00001234",
         "meta" : {
           "scheme" : "DTCC"
-        },
-        "value" : "DTCC00001234"
+        }
       },
       "meta" : {
         "globalKey" : "5d63d132"
       }
     }, {
       "identifier" : {
+        "value" : "DTCCDGQCSV2PHVF7I2743539",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "DTCCDGQCSV2PHVF7I2743539"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "d0b77f63"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "b38cc8f1",
+      "externalKey" : "DTCC00001234"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "a77889c1"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2018-10-22T09:45:24.382Z",
-    "qualification" : "EVENT_SUBMITTED_DATE_TIME"
-  }, {
-    "dateTime" : "2018-10-22T09:45:36.701Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+  "meta" : {
+    "globalKey" : "45babd8"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade4-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade4-func-output.json
index 8827428752..02cd616651 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade4-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade4-func-output.json
@@ -1,92 +1,137 @@
 {
-  "action" : "NEW",
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "1999-04-07",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster",
+                  "meta" : {
+                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
+                  }
+                }
+              },
+              "vintage" : 1992
+            },
+            "meta" : {
+              "globalKey" : "d00b6716"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualDefinitionsType" : [ {
+                  "value" : "ISDA2014Credit",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+                  }
+                } ],
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/matrix-type"
+                    }
+                  },
+                  "matrixTerm" : {
+                    "value" : "StandardNorthAmericanCorporate",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/credit-matrix-transaction-type"
+                    }
+                  }
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "b5190ef6"
+            }
+          } ]
+        }
+      },
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "668aa429"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "bc10ac37"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "DTCC00001234",
-                "globalKey" : "8c5248c"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "8c5248c",
+                "externalReference" : "DTCC00001234"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "15367807",
                   "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCC00001234"
-                },
-                "meta" : {
-                  "globalKey" : "5d63d132"
+                    "scheme" : "TradeRefNbr"
+                  }
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "c507ac31"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "acf57a09",
+                "externalReference" : "DTCC00005678"
+              },
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "CDV-3651370",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "DTCCG5GSEF7VJP5I7OUK5573"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "25efdafe"
+                    "scheme" : "TradeRefNbr"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "DTCC00005678",
-                "globalKey" : "acf57a09"
+                "globalKey" : "78223da"
+              }
+            }, {
+              "issuer" : {
+                "value" : "9J6AQFWC2C",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                }
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "TRADESERV20181022206086611CVKAN4",
                   "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCC00005678"
-                },
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "5d8455c3"
+              }
+            }, {
+              "issuer" : {
+                "value" : "9J6AQFWC2C",
                 "meta" : {
-                  "globalKey" : "5d65b232"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
                 }
-              }, {
+              },
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "TRADESERV2018102221714656009C39J",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "DTCCO2RNE8IBXP4R0TD8PU41"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "ef79b17b"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "fe369ef2"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-22",
+              "meta" : {
+                "globalKey" : "3f1296"
+              }
+            },
             "tradableProduct" : {
-              "ancillaryParty" : [ {
-                "partyReference" : [ {
-                  "externalReference" : "DTCC00001234",
-                  "globalReference" : "8c5248c"
-                } ],
-                "role" : "CALCULATION_AGENT_INDEPENDENT"
-              } ],
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "DTCC00001234",
-                  "globalReference" : "8c5248c"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "DTCC00005678",
-                  "globalReference" : "acf57a09"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -94,67 +139,148 @@
                     "productQualifier" : "CreditDefaultSwap_SingleName"
                   } ],
                   "economicTerms" : {
-                    "calculationAgent" : {
-                      "calculationAgentBusinessCenter" : {
-                        "meta" : {
-                          "scheme" : "http://www.fpml.org/spec/2000/business-center"
-                        },
-                        "value" : "USNY"
-                      },
-                      "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-                    },
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-10-23",
                         "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
                             "globalKey" : "3a4b88ab"
                           }
                         },
                         "meta" : {
                           "globalKey" : "27105182"
-                        },
-                        "unadjustedDate" : "2018-10-23"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "27105182"
                       }
                     },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2020-03-20",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "2745c47f"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "2745c47f"
+                      }
+                    },
                     "payout" : {
-                      "creditDefaultPayout" : {
+                      "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
+                          }
+                        },
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "calculationPeriodDates" : {
+                          "firstPeriodStartDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2018-09-20",
+                              "meta" : {
+                                "globalKey" : "3f1254"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3f1254"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
                           "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
+                            "globalKey" : "cb0747c7"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
+                          "firstPaymentDate" : "2018-12-20",
+                          "meta" : {
+                            "globalKey" : "ac0d2516"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "27584470"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
                         "generalTerms" : {
                           "referenceInformation" : {
                             "referenceEntity" : {
                               "entityId" : [ {
+                                "value" : "57BGE9AD0",
                                 "meta" : {
                                   "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED"
-                                },
-                                "value" : "57BGE9AD0"
+                                }
                               } ],
-                              "meta" : {
-                                "globalKey" : "36296790"
-                              },
                               "name" : {
+                                "value" : "LEXMARK INTERNATIONAL, INC.",
                                 "meta" : {
                                   "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
-                                },
-                                "value" : "LEXMARK INTERNATIONAL, INC."
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "36296790"
                               }
                             },
                             "referenceObligation" : [ {
@@ -162,18 +288,18 @@
                                 "productIdentifier" : [ {
                                   "value" : {
                                     "identifier" : {
+                                      "value" : "US529772AF23",
                                       "meta" : {
                                         "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
-                                      },
-                                      "value" : "US529772AF23"
+                                      }
                                     },
+                                    "source" : "ISIN",
                                     "meta" : {
                                       "globalKey" : "bd4d21e9"
-                                    },
-                                    "source" : "ISIN"
+                                    }
                                   }
                                 } ],
-                                "securityType" : "DEBT"
+                                "securityType" : "Debt"
                               }
                             } ]
                           }
@@ -182,472 +308,285 @@
                           "globalKey" : "b766645b"
                         }
                       },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
-                          "firstPeriodStartDate" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3f1254"
-                              },
-                              "unadjustedDate" : "2018-09-20"
-                            },
-                            "meta" : {
-                              "globalKey" : "3f1254"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "28c14cad"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "2addd56c"
-                        },
-                        "paymentDates" : {
-                          "firstPaymentDate" : "2018-12-20",
-                          "meta" : {
-                            "globalKey" : "ac0d2dc2"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      } ],
                       "meta" : {
-                        "globalKey" : "3da747f1"
+                        "globalKey" : "e6e010cb"
                       }
                     },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
+                    "calculationAgent" : {
+                      "calculationAgentParty" : "CalculationAgentIndependent",
+                      "calculationAgentBusinessCenter" : {
+                        "value" : "USNY",
                         "meta" : {
-                          "globalKey" : "2745c47f"
-                        },
-                        "unadjustedDate" : "2020-03-20"
-                      },
-                      "meta" : {
-                        "globalKey" : "2745c47f"
+                          "scheme" : "http://www.fpml.org/spec/2000/business-center"
+                        }
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "f0ee964f"
+                    "globalKey" : "b0d0e12b"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "f0ee964f"
+                  "globalKey" : "b0d0e12b"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "1f273178"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.01,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "value" : 0.01,
                       "perUnitOf" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "b883d895"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "c5befd88"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
-                      },
-                      "value" : 100000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "57f73a0b"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "8c5248c",
+                  "externalReference" : "DTCC00001234"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "acf57a09",
+                  "externalReference" : "DTCC00005678"
+                }
+              } ],
+              "ancillaryParty" : [ {
+                "role" : "CalculationAgentIndependent",
+                "partyReference" : [ {
+                  "globalReference" : "8c5248c",
+                  "externalReference" : "DTCC00001234"
                 } ]
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1296"
-              },
-              "value" : "2018-10-22"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCC00001234",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "15367807"
+                    "scheme" : "DTCC"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "5d63d132"
                 }
-              } ],
-              "issuerReference" : {
-                "externalReference" : "DTCC00001234",
-                "globalReference" : "8c5248c"
-              },
-              "meta" : {
-                "globalKey" : "8055a5ad"
-              }
-            }, {
-              "assignedIdentifier" : [ {
+              }, {
                 "identifier" : {
+                  "value" : "DTCCG5GSEF7VJP5I7OUK5573",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "CDV-3651370"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "25efdafe"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "DTCC00005678",
-                "globalReference" : "acf57a09"
-              },
               "meta" : {
-                "globalKey" : "6a7097f0"
+                "globalKey" : "8c5248c",
+                "externalKey" : "DTCC00001234"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCC00005678",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "TRADESERV20181022206086611CVKAN4"
-                }
-              } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                    "scheme" : "DTCC"
+                  }
                 },
-                "value" : "9J6AQFWC2C"
-              },
-              "meta" : {
-                "globalKey" : "6174b91f"
-              }
-            }, {
-              "assignedIdentifier" : [ {
+                "meta" : {
+                  "globalKey" : "5d65b232"
+                }
+              }, {
                 "identifier" : {
+                  "value" : "DTCCO2RNE8IBXP4R0TD8PU41",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "TRADESERV2018102221714656009C39J"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "ef79b17b"
                 }
               } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
-                },
-                "value" : "9J6AQFWC2C"
-              },
               "meta" : {
-                "globalKey" : "9eb9728e"
+                "globalKey" : "acf57a09",
+                "externalKey" : "DTCC00005678"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "a66f2cf3"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "eed093f2"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "DTCC00001234",
-                  "globalReference" : "8c5248c"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "DTCC00005678",
-                  "globalReference" : "acf57a09"
-                }
-              },
               "quantity" : {
+                "value" : 2345,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/ext/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "8c5248c",
+                  "externalReference" : "DTCC00001234"
                 },
-                "value" : 2345
+                "receiverPartyReference" : {
+                  "globalReference" : "acf57a09",
+                  "externalReference" : "DTCC00005678"
+                }
               },
               "settlementDate" : {
                 "unadjustedDate" : "2018-10-25"
               },
               "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
-              }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "1999-04-07",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "meta" : {
-                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
-                  },
-                  "value" : "ISDA_MASTER"
-                }
-              },
-              "vintage" : 1992
-            },
-            "meta" : {
-              "globalKey" : "d00b6716"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualDefinitionsType" : [ {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-                  },
-                  "value" : "ISDA_2014_CREDIT"
-                } ],
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/credit-matrix-transaction-type"
-                    },
-                    "value" : "STANDARD_NORTH_AMERICAN_CORPORATE"
-                  },
-                  "matrixType" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/matrix-type"
-                    },
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-                  }
-                } ]
+                "priceTransfer" : "Upfront"
               }
             },
             "meta" : {
-              "globalKey" : "97373076"
+              "globalKey" : "2e9d177c"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "e123b86f"
+          }
         }
       }
     } ],
-    "intent" : "CONTRACT_FORMATION",
+    "eventQualifier" : "ContractFormation",
     "after" : [ {
-      "meta" : {
-        "globalKey" : "16df0db2"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
       "trade" : {
-        "contractDetails" : {
-          "documentation" : [ {
-            "agreementDate" : "1999-04-07",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "meta" : {
-                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
-                  },
-                  "value" : "ISDA_MASTER"
-                }
-              },
-              "vintage" : 1992
-            },
-            "meta" : {
-              "globalKey" : "d00b6716"
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "8c5248c",
+            "externalReference" : "DTCC00001234"
+          },
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "15367807",
+              "meta" : {
+                "scheme" : "TradeRefNbr"
+              }
             }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualDefinitionsType" : [ {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-                  },
-                  "value" : "ISDA_2014_CREDIT"
-                } ],
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/credit-matrix-transaction-type"
-                    },
-                    "value" : "STANDARD_NORTH_AMERICAN_CORPORATE"
-                  },
-                  "matrixType" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/matrix-type"
-                    },
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-                  }
-                } ]
+          } ],
+          "meta" : {
+            "globalKey" : "c507ac31"
+          }
+        }, {
+          "issuerReference" : {
+            "globalReference" : "acf57a09",
+            "externalReference" : "DTCC00005678"
+          },
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "CDV-3651370",
+              "meta" : {
+                "scheme" : "TradeRefNbr"
               }
-            },
-            "meta" : {
-              "globalKey" : "97373076"
             }
           } ],
           "meta" : {
-            "globalKey" : "e515340c"
+            "globalKey" : "78223da"
           }
-        },
-        "meta" : {
-          "globalKey" : "6b145843"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "DTCC00001234",
-            "globalKey" : "8c5248c"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "DTCC"
-              },
-              "value" : "DTCC00001234"
-            },
+        }, {
+          "issuer" : {
+            "value" : "9J6AQFWC2C",
             "meta" : {
-              "globalKey" : "5d63d132"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
             }
-          }, {
+          },
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "TRADESERV20181022206086611CVKAN4",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "DTCCG5GSEF7VJP5I7OUK5573"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "25efdafe"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+              }
             }
-          } ]
-        }, {
+          } ],
           "meta" : {
-            "externalKey" : "DTCC00005678",
-            "globalKey" : "acf57a09"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "DTCC"
-              },
-              "value" : "DTCC00005678"
-            },
+            "globalKey" : "5d8455c3"
+          }
+        }, {
+          "issuer" : {
+            "value" : "9J6AQFWC2C",
             "meta" : {
-              "globalKey" : "5d65b232"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
             }
-          }, {
+          },
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "TRADESERV2018102221714656009C39J",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "DTCCO2RNE8IBXP4R0TD8PU41"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "ef79b17b"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+              }
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "fe369ef2"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2018-10-22",
+          "meta" : {
+            "globalKey" : "3f1296"
+          }
+        },
         "tradableProduct" : {
-          "ancillaryParty" : [ {
-            "partyReference" : [ {
-              "externalReference" : "DTCC00001234",
-              "globalReference" : "8c5248c"
-            } ],
-            "role" : "CALCULATION_AGENT_INDEPENDENT"
-          } ],
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "DTCC00001234",
-              "globalReference" : "8c5248c"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "DTCC00005678",
-              "globalReference" : "acf57a09"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -655,67 +594,148 @@
                 "productQualifier" : "CreditDefaultSwap_SingleName"
               } ],
               "economicTerms" : {
-                "calculationAgent" : {
-                  "calculationAgentBusinessCenter" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/spec/2000/business-center"
-                    },
-                    "value" : "USNY"
-                  },
-                  "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-                },
                 "effectiveDate" : {
                   "adjustableDate" : {
+                    "unadjustedDate" : "2018-10-23",
                     "dateAdjustments" : {
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "meta" : {
                         "globalKey" : "3a4b88ab"
                       }
                     },
                     "meta" : {
                       "globalKey" : "27105182"
-                    },
-                    "unadjustedDate" : "2018-10-23"
+                    }
                   },
                   "meta" : {
                     "globalKey" : "27105182"
                   }
                 },
+                "terminationDate" : {
+                  "adjustableDate" : {
+                    "unadjustedDate" : "2020-03-20",
+                    "dateAdjustments" : {
+                      "businessDayConvention" : "NotApplicable",
+                      "meta" : {
+                        "globalKey" : "3a4b88ab"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "2745c47f"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "2745c47f"
+                  }
+                },
                 "payout" : {
-                  "creditDefaultPayout" : {
+                  "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
+                      "quantitySchedule" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "quantity-1"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0",
+                        "externalKey" : "calculationAmount"
+                      }
+                    },
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
+                    "calculationPeriodDates" : {
+                      "firstPeriodStartDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2018-09-20",
+                          "meta" : {
+                            "globalKey" : "3f1254"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "3f1254"
+                        }
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "17f73"
+                        },
+                        "rollConvention" : "20"
+                      },
                       "meta" : {
-                        "externalKey" : "calculationAmount",
-                        "globalKey" : "0"
+                        "globalKey" : "cb0747c7"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
                       },
+                      "firstPaymentDate" : "2018-12-20",
+                      "meta" : {
+                        "globalKey" : "ac0d2516"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "27584470"
+                    }
+                  } ],
+                  "creditDefaultPayout" : {
+                    "payerReceiver" : {
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
+                    },
+                    "priceQuantity" : {
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0",
+                        "externalKey" : "calculationAmount"
                       }
                     },
                     "generalTerms" : {
                       "referenceInformation" : {
                         "referenceEntity" : {
                           "entityId" : [ {
+                            "value" : "57BGE9AD0",
                             "meta" : {
                               "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED"
-                            },
-                            "value" : "57BGE9AD0"
+                            }
                           } ],
-                          "meta" : {
-                            "globalKey" : "36296790"
-                          },
                           "name" : {
+                            "value" : "LEXMARK INTERNATIONAL, INC.",
                             "meta" : {
                               "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
-                            },
-                            "value" : "LEXMARK INTERNATIONAL, INC."
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "36296790"
                           }
                         },
                         "referenceObligation" : [ {
@@ -723,18 +743,18 @@
                             "productIdentifier" : [ {
                               "value" : {
                                 "identifier" : {
+                                  "value" : "US529772AF23",
                                   "meta" : {
                                     "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
-                                  },
-                                  "value" : "US529772AF23"
+                                  }
                                 },
+                                "source" : "ISIN",
                                 "meta" : {
                                   "globalKey" : "bd4d21e9"
-                                },
-                                "source" : "ISIN"
+                                }
                               }
                             } ],
-                            "securityType" : "DEBT"
+                            "securityType" : "Debt"
                           }
                         } ]
                       }
@@ -743,307 +763,272 @@
                       "globalKey" : "b766645b"
                     }
                   },
-                  "interestRatePayout" : [ {
-                    "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
-                    },
-                    "priceQuantity" : {
-                      "meta" : {
-                        "externalKey" : "calculationAmount",
-                        "globalKey" : "0"
-                      },
-                      "quantitySchedule" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "quantity-1"
-                        }
-                      }
-                    },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "28c47"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
-                        "rollConvention" : "20"
-                      },
-                      "firstPeriodStartDate" : {
-                        "adjustableDate" : {
-                          "meta" : {
-                            "globalKey" : "3f1254"
-                          },
-                          "unadjustedDate" : "2018-09-20"
-                        },
-                        "meta" : {
-                          "globalKey" : "3f1254"
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "28c14cad"
-                      }
-                    },
-                    "meta" : {
-                      "globalKey" : "2addd56c"
-                    },
-                    "paymentDates" : {
-                      "firstPaymentDate" : "2018-12-20",
-                      "meta" : {
-                        "globalKey" : "ac0d2dc2"
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
-                      }
-                    },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  } ],
                   "meta" : {
-                    "globalKey" : "3da747f1"
+                    "globalKey" : "e6e010cb"
                   }
-                },
-                "terminationDate" : {
-                  "adjustableDate" : {
-                    "dateAdjustments" : {
-                      "businessDayConvention" : "NOT_APPLICABLE",
-                      "meta" : {
-                        "globalKey" : "3a4b88ab"
-                      }
-                    },
-                    "meta" : {
-                      "globalKey" : "2745c47f"
-                    },
-                    "unadjustedDate" : "2020-03-20"
-                  },
-                  "meta" : {
-                    "globalKey" : "2745c47f"
+                },
+                "calculationAgent" : {
+                  "calculationAgentParty" : "CalculationAgentIndependent",
+                  "calculationAgentBusinessCenter" : {
+                    "value" : "USNY",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/spec/2000/business-center"
+                    }
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "f0ee964f"
+                "globalKey" : "b0d0e12b"
               }
             },
             "meta" : {
-              "globalKey" : "f0ee964f"
+              "globalKey" : "b0d0e12b"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "1f273178"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.01,
                   "unit" : {
                     "currency" : {
+                      "value" : "USD",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/ext/iso4217"
-                      },
-                      "value" : "USD"
+                      }
                     }
                   },
-                  "value" : 0.01,
                   "perUnitOf" : {
                     "currency" : {
+                      "value" : "USD",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/ext/iso4217"
-                      },
-                      "value" : "USD"
+                      }
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "b883d895"
-              },
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "c5befd88"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 100000000,
                   "unit" : {
                     "currency" : {
+                      "value" : "USD",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/ext/iso4217"
-                      },
-                      "value" : "USD"
+                      }
                     }
-                  },
-                  "value" : 100000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "57f73a0b"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "8c5248c",
+              "externalReference" : "DTCC00001234"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "acf57a09",
+              "externalReference" : "DTCC00005678"
+            }
+          } ],
+          "ancillaryParty" : [ {
+            "role" : "CalculationAgentIndependent",
+            "partyReference" : [ {
+              "globalReference" : "8c5248c",
+              "externalReference" : "DTCC00001234"
             } ]
           } ]
         },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f1296"
-          },
-          "value" : "2018-10-22"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "DTCC00001234",
               "meta" : {
-                "scheme" : "TradeRefNbr"
-              },
-              "value" : "15367807"
+                "scheme" : "DTCC"
+              }
+            },
+            "meta" : {
+              "globalKey" : "5d63d132"
             }
-          } ],
-          "issuerReference" : {
-            "externalReference" : "DTCC00001234",
-            "globalReference" : "8c5248c"
-          },
-          "meta" : {
-            "globalKey" : "8055a5ad"
-          }
-        }, {
-          "assignedIdentifier" : [ {
+          }, {
             "identifier" : {
+              "value" : "DTCCG5GSEF7VJP5I7OUK5573",
               "meta" : {
-                "scheme" : "TradeRefNbr"
-              },
-              "value" : "CDV-3651370"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "25efdafe"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "DTCC00005678",
-            "globalReference" : "acf57a09"
-          },
           "meta" : {
-            "globalKey" : "6a7097f0"
+            "globalKey" : "8c5248c",
+            "externalKey" : "DTCC00001234"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "DTCC00005678",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-              },
-              "value" : "TRADESERV20181022206086611CVKAN4"
-            }
-          } ],
-          "issuer" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                "scheme" : "DTCC"
+              }
             },
-            "value" : "9J6AQFWC2C"
-          },
-          "meta" : {
-            "globalKey" : "6174b91f"
-          }
-        }, {
-          "assignedIdentifier" : [ {
+            "meta" : {
+              "globalKey" : "5d65b232"
+            }
+          }, {
             "identifier" : {
+              "value" : "DTCCO2RNE8IBXP4R0TD8PU41",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-              },
-              "value" : "TRADESERV2018102221714656009C39J"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "ef79b17b"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "acf57a09",
+            "externalKey" : "DTCC00005678"
+          }
+        } ],
+        "contractDetails" : {
+          "documentation" : [ {
+            "agreementDate" : "1999-04-07",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster",
+                  "meta" : {
+                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
+                  }
+                }
+              },
+              "vintage" : 1992
+            },
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
+              "globalKey" : "d00b6716"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualDefinitionsType" : [ {
+                  "value" : "ISDA2014Credit",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+                  }
+                } ],
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/matrix-type"
+                    }
+                  },
+                  "matrixTerm" : {
+                    "value" : "StandardNorthAmericanCorporate",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/credit-matrix-transaction-type"
+                    }
+                  }
+                } ]
+              }
             },
-            "value" : "9J6AQFWC2C"
-          },
+            "meta" : {
+              "globalKey" : "b5190ef6"
+            }
+          } ],
           "meta" : {
-            "globalKey" : "9eb9728e"
+            "globalKey" : "2f7128c"
           }
-        } ]
+        },
+        "meta" : {
+          "globalKey" : "5b4947ff"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
       },
       "transferHistory" : [ {
-        "meta" : {
-          "globalKey" : "eed093f2"
-        },
         "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "DTCC00001234",
-              "globalReference" : "8c5248c"
-            },
-            "receiverPartyReference" : {
-              "externalReference" : "DTCC00005678",
-              "globalReference" : "acf57a09"
-            }
-          },
           "quantity" : {
+            "value" : 2345,
             "unit" : {
               "currency" : {
+                "value" : "USD",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/ext/iso4217"
-                },
-                "value" : "USD"
+                }
               }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "8c5248c",
+              "externalReference" : "DTCC00001234"
             },
-            "value" : 2345
+            "receiverPartyReference" : {
+              "globalReference" : "acf57a09",
+              "externalReference" : "DTCC00005678"
+            }
           },
           "settlementDate" : {
             "unadjustedDate" : "2018-10-25"
           },
           "transferExpression" : {
-            "priceTransfer" : "UPFRONT"
+            "priceTransfer" : "Upfront"
           }
+        },
+        "meta" : {
+          "globalKey" : "2e9d177c"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "c66c401e"
+      }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "57dcb111"
+      "globalKey" : "f834525d"
     }
   },
-  "eventIdentifier" : [ {
-    "issuerReference" : {
-      "externalReference" : "DTCC00001234",
-      "globalReference" : "8c5248c"
-    },
-    "meta" : {
-      "globalKey" : "2725a3be"
-    }
-  }, {
-    "issuerReference" : {
-      "externalReference" : "DTCC00005678",
-      "globalReference" : "acf57a09"
-    },
-    "meta" : {
-      "globalKey" : "5fe6da3b"
-    }
-  } ],
+  "previousWorkflowStep" : {
+    "globalReference" : "1c43f10e"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "MSERV20181022.0006142001",
       "meta" : {
         "scheme" : "perFpMLReqmt"
-      },
-      "value" : "MSERV20181022.0006142001"
+      }
     },
     "sentBy" : {
       "value" : "MarkitSERV"
@@ -1052,72 +1037,87 @@
       "value" : "DTCC"
     } ]
   },
-  "meta" : {
-    "globalKey" : "12a002a8"
-  },
-  "party" : [ {
+  "timestamp" : [ {
+    "dateTime" : "2018-10-22T14:05:42.26Z",
+    "qualification" : "eventSubmittedDateTime"
+  }, {
+    "dateTime" : "2018-10-22T14:05:57.974Z",
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "issuerReference" : {
+      "globalReference" : "8c5248c",
+      "externalReference" : "DTCC00001234"
+    },
     "meta" : {
-      "externalKey" : "DTCC00001234",
-      "globalKey" : "8c5248c"
+      "globalKey" : "2725a3be"
+    }
+  }, {
+    "issuerReference" : {
+      "globalReference" : "acf57a09",
+      "externalReference" : "DTCC00005678"
     },
+    "meta" : {
+      "globalKey" : "5fe6da3b"
+    }
+  } ],
+  "action" : "New",
+  "party" : [ {
     "partyId" : [ {
       "identifier" : {
+        "value" : "DTCC00001234",
         "meta" : {
           "scheme" : "DTCC"
-        },
-        "value" : "DTCC00001234"
+        }
       },
       "meta" : {
         "globalKey" : "5d63d132"
       }
     }, {
       "identifier" : {
+        "value" : "DTCCG5GSEF7VJP5I7OUK5573",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "DTCCG5GSEF7VJP5I7OUK5573"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "25efdafe"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "DTCC00005678",
-      "globalKey" : "acf57a09"
-    },
+      "globalKey" : "8c5248c",
+      "externalKey" : "DTCC00001234"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "DTCC00005678",
         "meta" : {
           "scheme" : "DTCC"
-        },
-        "value" : "DTCC00005678"
+        }
       },
       "meta" : {
         "globalKey" : "5d65b232"
       }
     }, {
       "identifier" : {
+        "value" : "DTCCO2RNE8IBXP4R0TD8PU41",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "DTCCO2RNE8IBXP4R0TD8PU41"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "ef79b17b"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "acf57a09",
+      "externalKey" : "DTCC00005678"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "35747966"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2018-10-22T14:05:42.26Z",
-    "qualification" : "EVENT_SUBMITTED_DATE_TIME"
-  }, {
-    "dateTime" : "2018-10-22T14:05:57.974Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+  "meta" : {
+    "globalKey" : "d1af7dc8"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade5-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade5-func-output.json
index e6858f75e6..b59bac227d 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade5-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade5-func-output.json
@@ -1,92 +1,108 @@
 {
-  "action" : "NEW",
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "1995-07-28",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster",
+                  "meta" : {
+                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
+                  }
+                }
+              },
+              "vintage" : 2002
+            },
+            "meta" : {
+              "globalKey" : "cbf7f35"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualDefinitionsType" : [ {
+                  "value" : "ISDA2003Credit",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+                  }
+                } ],
+                "contractualTermsSupplement" : [ {
+                  "publicationDate" : "2018-10-09"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "8517df9d"
+            }
+          } ]
+        }
+      },
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "23fa4393"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "23fa4393"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "DTCC00001234",
-                "globalKey" : "2c7d7a2c"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "2c7d7a2c",
+                "externalReference" : "DTCC00001234"
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCC00001234"
-                },
-                "meta" : {
-                  "globalKey" : "5d63d132"
-                }
-              }, {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "SJDBTEST2210OS",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "DTCC549300FSLUWD8ETI2P24"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "49a8309e"
+                    "scheme" : "TradeRefNbr"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "DTCC00005678",
-                "globalKey" : "723f92c"
+                "globalKey" : "788e564c"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "723f92c",
+                "externalReference" : "DTCC00005678"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "SJDBTEST2210",
                   "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCC00005678"
-                },
+                    "scheme" : "TradeRefNbr"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "4a8fd5e8"
+              }
+            }, {
+              "issuer" : {
+                "value" : "9J6AQFWC2C",
                 "meta" : {
-                  "globalKey" : "5d65b232"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              }, {
+              },
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "TRADESERV20181022211981783OAVSFL",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "DTCC549300FSLUWD8ETI2P24"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "49a8309e"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "ff3335db"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-09-25",
+              "meta" : {
+                "globalKey" : "3f1259"
+              }
+            },
             "tradableProduct" : {
-              "ancillaryParty" : [ {
-                "partyReference" : [ {
-                  "externalReference" : "DTCC00005678",
-                  "globalReference" : "723f92c"
-                } ],
-                "role" : "CALCULATION_AGENT_INDEPENDENT"
-              } ],
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "DTCC00005678",
-                  "globalReference" : "723f92c"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "DTCC00001234",
-                  "globalReference" : "2c7d7a2c"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -94,83 +110,91 @@
                     "productQualifier" : "CreditDefaultSwap_SingleName"
                   } ],
                   "economicTerms" : {
-                    "calculationAgent" : {
-                      "calculationAgentBusinessCenter" : {
+                    "effectiveDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2018-09-25",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
                         "meta" : {
-                          "scheme" : "http://www.fpml.org/spec/2000/business-center"
+                          "globalKey" : "270f68c4"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "270f68c4"
+                      }
+                    },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2046-09-25",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
                         },
-                        "value" : "USNY"
+                        "meta" : {
+                          "globalKey" : "2a5848c4"
+                        }
                       },
-                      "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+                      "meta" : {
+                        "globalKey" : "2a5848c4"
+                      }
                     },
                     "dateAdjustments" : {
+                      "businessDayConvention" : "NotApplicable",
                       "businessCenters" : {
                         "businessCenter" : [ {
+                          "value" : "GBLO",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/business-center"
-                          },
-                          "value" : "GBLO"
+                          }
                         }, {
+                          "value" : "USNY",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/business-center"
-                          },
-                          "value" : "USNY"
+                          }
                         } ],
                         "meta" : {
                           "globalKey" : "42f910b"
                         }
                       },
-                      "businessDayConvention" : "NOT_APPLICABLE",
                       "meta" : {
                         "globalKey" : "b7a5bb40"
                       }
                     },
-                    "effectiveDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "270f68c4"
-                        },
-                        "unadjustedDate" : "2018-09-25"
-                      },
-                      "meta" : {
-                        "globalKey" : "270f68c4"
-                      }
-                    },
                     "payout" : {
                       "creditDefaultPayout" : {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
                         "generalTerms" : {
                           "referenceInformation" : {
                             "referenceEntity" : {
-                              "meta" : {
-                                "globalKey" : "260265d9"
-                              },
                               "name" : {
+                                "value" : "THEISSUEROFTHEREFERENCEOBLIGATION",
                                 "meta" : {
                                   "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
-                                },
-                                "value" : "THEISSUEROFTHEREFERENCEOBLIGATION"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "260265d9"
                               }
                             },
                             "referenceObligation" : [ {
@@ -178,330 +202,238 @@
                                 "productIdentifier" : [ {
                                   "value" : {
                                     "identifier" : {
+                                      "value" : "US02147DAK72",
                                       "meta" : {
                                         "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
-                                      },
-                                      "value" : "US02147DAK72"
+                                      }
                                     },
+                                    "source" : "ISIN",
                                     "meta" : {
                                       "globalKey" : "1b1f8e04"
-                                    },
-                                    "source" : "ISIN"
+                                    }
                                   }
                                 } ],
-                                "securityType" : "DEBT"
+                                "securityType" : "Debt"
                               }
                             } ]
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "b289aec7"
-                        },
                         "protectionTerms" : [ {
                           "floatingAmountEvents" : {
                             "interestShortfall" : {
+                              "interestShortfallCap" : "Fixed",
                               "compounding" : false,
-                              "interestShortfallCap" : "FIXED",
                               "rateSource" : {
+                                "value" : "USD-LIBOR-BBA",
                                 "meta" : {
                                   "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
-                                },
-                                "value" : "USD-LIBOR-BBA"
+                                }
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "b12b8c10"
+                            "globalKey" : "cddbd672"
                           }
-                        } ]
+                        } ],
+                        "meta" : {
+                          "globalKey" : "cf39f929"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "b289aec7"
+                        "globalKey" : "cf39f929"
                       }
                     },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
+                    "calculationAgent" : {
+                      "calculationAgentParty" : "CalculationAgentIndependent",
+                      "calculationAgentBusinessCenter" : {
+                        "value" : "USNY",
                         "meta" : {
-                          "globalKey" : "2a5848c4"
-                        },
-                        "unadjustedDate" : "2046-09-25"
-                      },
-                      "meta" : {
-                        "globalKey" : "2a5848c4"
+                          "scheme" : "http://www.fpml.org/spec/2000/business-center"
+                        }
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "8a3e3416"
+                    "globalKey" : "936ca5ac"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "8a3e3416"
+                  "globalKey" : "936ca5ac"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "4628ea45"
-                  },
                   "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 23000000,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
-                      },
-                      "value" : 23000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "7ef45e5b"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "723f92c",
+                  "externalReference" : "DTCC00005678"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "2c7d7a2c",
+                  "externalReference" : "DTCC00001234"
+                }
+              } ],
+              "ancillaryParty" : [ {
+                "role" : "CalculationAgentIndependent",
+                "partyReference" : [ {
+                  "globalReference" : "723f92c",
+                  "externalReference" : "DTCC00005678"
                 } ]
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1259"
-              },
-              "value" : "2018-09-25"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCC00001234",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "SJDBTEST2210OS"
+                    "scheme" : "DTCC"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "5d63d132"
                 }
-              } ],
-              "issuerReference" : {
-                "externalReference" : "DTCC00001234",
-                "globalReference" : "2c7d7a2c"
-              },
-              "meta" : {
-                "globalKey" : "450f3148"
-              }
-            }, {
-              "assignedIdentifier" : [ {
+              }, {
                 "identifier" : {
+                  "value" : "DTCC549300FSLUWD8ETI2P24",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "SJDBTEST2210"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "49a8309e"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "DTCC00005678",
-                "globalReference" : "723f92c"
-              },
               "meta" : {
-                "globalKey" : "7b4d9de4"
+                "globalKey" : "2c7d7a2c",
+                "externalKey" : "DTCC00001234"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCC00005678",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "TRADESERV20181022211981783OAVSFL"
-                }
-              } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                    "scheme" : "DTCC"
+                  }
                 },
-                "value" : "9J6AQFWC2C"
-              },
-              "meta" : {
-                "globalKey" : "52ebf337"
-              }
-            } ]
-          }
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "1995-07-28",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "meta" : {
-                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
-                  },
-                  "value" : "ISDA_MASTER"
+                "meta" : {
+                  "globalKey" : "5d65b232"
                 }
-              },
-              "vintage" : 2002
-            },
-            "meta" : {
-              "globalKey" : "cbf7f35"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualDefinitionsType" : [ {
+              }, {
+                "identifier" : {
+                  "value" : "DTCC549300FSLUWD8ETI2P24",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-                  },
-                  "value" : "ISDA_2003_CREDIT"
-                } ],
-                "contractualTermsSupplement" : [ {
-                  "publicationDate" : "2018-10-09"
-                } ]
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "49a8309e"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "723f92c",
+                "externalKey" : "DTCC00005678"
               }
-            },
+            } ],
             "meta" : {
-              "globalKey" : "8517df9d"
+              "globalKey" : "cbf68ad9"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "cbf68ad9"
+          }
         }
       }
     } ],
-    "intent" : "CONTRACT_FORMATION",
+    "eventQualifier" : "ContractFormation",
     "after" : [ {
-      "meta" : {
-        "globalKey" : "55eff008"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
       "trade" : {
-        "contractDetails" : {
-          "documentation" : [ {
-            "agreementDate" : "1995-07-28",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "meta" : {
-                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
-                  },
-                  "value" : "ISDA_MASTER"
-                }
-              },
-              "vintage" : 2002
-            },
-            "meta" : {
-              "globalKey" : "cbf7f35"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualDefinitionsType" : [ {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-                  },
-                  "value" : "ISDA_2003_CREDIT"
-                } ],
-                "contractualTermsSupplement" : [ {
-                  "publicationDate" : "2018-10-09"
-                } ]
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "2c7d7a2c",
+            "externalReference" : "DTCC00001234"
+          },
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "SJDBTEST2210OS",
+              "meta" : {
+                "scheme" : "TradeRefNbr"
               }
-            },
-            "meta" : {
-              "globalKey" : "8517df9d"
             }
           } ],
           "meta" : {
-            "globalKey" : "aa59cac8"
+            "globalKey" : "788e564c"
           }
-        },
-        "meta" : {
-          "globalKey" : "24a105cb"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "DTCC00001234",
-            "globalKey" : "2c7d7a2c"
+        }, {
+          "issuerReference" : {
+            "globalReference" : "723f92c",
+            "externalReference" : "DTCC00005678"
           },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "DTCC"
-              },
-              "value" : "DTCC00001234"
-            },
-            "meta" : {
-              "globalKey" : "5d63d132"
-            }
-          }, {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "SJDBTEST2210",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "DTCC549300FSLUWD8ETI2P24"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "49a8309e"
+                "scheme" : "TradeRefNbr"
+              }
             }
-          } ]
-        }, {
+          } ],
           "meta" : {
-            "externalKey" : "DTCC00005678",
-            "globalKey" : "723f92c"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "DTCC"
-              },
-              "value" : "DTCC00005678"
-            },
+            "globalKey" : "4a8fd5e8"
+          }
+        }, {
+          "issuer" : {
+            "value" : "9J6AQFWC2C",
             "meta" : {
-              "globalKey" : "5d65b232"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
             }
-          }, {
+          },
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "TRADESERV20181022211981783OAVSFL",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "DTCC549300FSLUWD8ETI2P24"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "49a8309e"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+              }
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "ff3335db"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2018-09-25",
+          "meta" : {
+            "globalKey" : "3f1259"
+          }
+        },
         "tradableProduct" : {
-          "ancillaryParty" : [ {
-            "partyReference" : [ {
-              "externalReference" : "DTCC00005678",
-              "globalReference" : "723f92c"
-            } ],
-            "role" : "CALCULATION_AGENT_INDEPENDENT"
-          } ],
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "DTCC00005678",
-              "globalReference" : "723f92c"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "DTCC00001234",
-              "globalReference" : "2c7d7a2c"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -509,83 +441,91 @@
                 "productQualifier" : "CreditDefaultSwap_SingleName"
               } ],
               "economicTerms" : {
-                "calculationAgent" : {
-                  "calculationAgentBusinessCenter" : {
+                "effectiveDate" : {
+                  "adjustableDate" : {
+                    "unadjustedDate" : "2018-09-25",
+                    "dateAdjustments" : {
+                      "businessDayConvention" : "NotApplicable",
+                      "meta" : {
+                        "globalKey" : "3a4b88ab"
+                      }
+                    },
                     "meta" : {
-                      "scheme" : "http://www.fpml.org/spec/2000/business-center"
+                      "globalKey" : "270f68c4"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "270f68c4"
+                  }
+                },
+                "terminationDate" : {
+                  "adjustableDate" : {
+                    "unadjustedDate" : "2046-09-25",
+                    "dateAdjustments" : {
+                      "businessDayConvention" : "NotApplicable",
+                      "meta" : {
+                        "globalKey" : "3a4b88ab"
+                      }
                     },
-                    "value" : "USNY"
+                    "meta" : {
+                      "globalKey" : "2a5848c4"
+                    }
                   },
-                  "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+                  "meta" : {
+                    "globalKey" : "2a5848c4"
+                  }
                 },
                 "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
                   "businessCenters" : {
                     "businessCenter" : [ {
+                      "value" : "GBLO",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/business-center"
-                      },
-                      "value" : "GBLO"
+                      }
                     }, {
+                      "value" : "USNY",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/business-center"
-                      },
-                      "value" : "USNY"
+                      }
                     } ],
                     "meta" : {
                       "globalKey" : "42f910b"
                     }
                   },
-                  "businessDayConvention" : "NOT_APPLICABLE",
                   "meta" : {
                     "globalKey" : "b7a5bb40"
                   }
                 },
-                "effectiveDate" : {
-                  "adjustableDate" : {
-                    "dateAdjustments" : {
-                      "businessDayConvention" : "NOT_APPLICABLE",
-                      "meta" : {
-                        "globalKey" : "3a4b88ab"
-                      }
-                    },
-                    "meta" : {
-                      "globalKey" : "270f68c4"
-                    },
-                    "unadjustedDate" : "2018-09-25"
-                  },
-                  "meta" : {
-                    "globalKey" : "270f68c4"
-                  }
-                },
                 "payout" : {
                   "creditDefaultPayout" : {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "externalKey" : "calculationAmount",
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0",
+                        "externalKey" : "calculationAmount"
                       }
                     },
                     "generalTerms" : {
                       "referenceInformation" : {
                         "referenceEntity" : {
-                          "meta" : {
-                            "globalKey" : "260265d9"
-                          },
                           "name" : {
+                            "value" : "THEISSUEROFTHEREFERENCEOBLIGATION",
                             "meta" : {
                               "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
-                            },
-                            "value" : "THEISSUEROFTHEREFERENCEOBLIGATION"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "260265d9"
                           }
                         },
                         "referenceObligation" : [ {
@@ -593,187 +533,232 @@
                             "productIdentifier" : [ {
                               "value" : {
                                 "identifier" : {
+                                  "value" : "US02147DAK72",
                                   "meta" : {
                                     "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
-                                  },
-                                  "value" : "US02147DAK72"
+                                  }
                                 },
+                                "source" : "ISIN",
                                 "meta" : {
                                   "globalKey" : "1b1f8e04"
-                                },
-                                "source" : "ISIN"
+                                }
                               }
                             } ],
-                            "securityType" : "DEBT"
+                            "securityType" : "Debt"
                           }
                         } ]
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "b289aec7"
-                    },
                     "protectionTerms" : [ {
                       "floatingAmountEvents" : {
                         "interestShortfall" : {
+                          "interestShortfallCap" : "Fixed",
                           "compounding" : false,
-                          "interestShortfallCap" : "FIXED",
                           "rateSource" : {
+                            "value" : "USD-LIBOR-BBA",
                             "meta" : {
                               "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
-                            },
-                            "value" : "USD-LIBOR-BBA"
+                            }
                           }
                         }
                       },
                       "meta" : {
-                        "globalKey" : "b12b8c10"
+                        "globalKey" : "cddbd672"
                       }
-                    } ]
+                    } ],
+                    "meta" : {
+                      "globalKey" : "cf39f929"
+                    }
                   },
                   "meta" : {
-                    "globalKey" : "b289aec7"
+                    "globalKey" : "cf39f929"
                   }
                 },
-                "terminationDate" : {
-                  "adjustableDate" : {
-                    "dateAdjustments" : {
-                      "businessDayConvention" : "NOT_APPLICABLE",
-                      "meta" : {
-                        "globalKey" : "3a4b88ab"
-                      }
-                    },
+                "calculationAgent" : {
+                  "calculationAgentParty" : "CalculationAgentIndependent",
+                  "calculationAgentBusinessCenter" : {
+                    "value" : "USNY",
                     "meta" : {
-                      "globalKey" : "2a5848c4"
-                    },
-                    "unadjustedDate" : "2046-09-25"
-                  },
-                  "meta" : {
-                    "globalKey" : "2a5848c4"
+                      "scheme" : "http://www.fpml.org/spec/2000/business-center"
+                    }
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "8a3e3416"
+                "globalKey" : "936ca5ac"
               }
             },
             "meta" : {
-              "globalKey" : "8a3e3416"
+              "globalKey" : "936ca5ac"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "4628ea45"
-              },
               "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 23000000,
                   "unit" : {
                     "currency" : {
+                      "value" : "USD",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/ext/iso4217"
-                      },
-                      "value" : "USD"
+                      }
                     }
-                  },
-                  "value" : 23000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "7ef45e5b"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "723f92c",
+              "externalReference" : "DTCC00005678"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "2c7d7a2c",
+              "externalReference" : "DTCC00001234"
+            }
+          } ],
+          "ancillaryParty" : [ {
+            "role" : "CalculationAgentIndependent",
+            "partyReference" : [ {
+              "globalReference" : "723f92c",
+              "externalReference" : "DTCC00005678"
             } ]
           } ]
         },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f1259"
-          },
-          "value" : "2018-09-25"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "DTCC00001234",
               "meta" : {
-                "scheme" : "TradeRefNbr"
-              },
-              "value" : "SJDBTEST2210OS"
+                "scheme" : "DTCC"
+              }
+            },
+            "meta" : {
+              "globalKey" : "5d63d132"
             }
-          } ],
-          "issuerReference" : {
-            "externalReference" : "DTCC00001234",
-            "globalReference" : "2c7d7a2c"
-          },
-          "meta" : {
-            "globalKey" : "450f3148"
-          }
-        }, {
-          "assignedIdentifier" : [ {
+          }, {
             "identifier" : {
+              "value" : "DTCC549300FSLUWD8ETI2P24",
               "meta" : {
-                "scheme" : "TradeRefNbr"
-              },
-              "value" : "SJDBTEST2210"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "49a8309e"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "DTCC00005678",
-            "globalReference" : "723f92c"
-          },
           "meta" : {
-            "globalKey" : "7b4d9de4"
+            "globalKey" : "2c7d7a2c",
+            "externalKey" : "DTCC00001234"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "DTCC00005678",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-              },
-              "value" : "TRADESERV20181022211981783OAVSFL"
+                "scheme" : "DTCC"
+              }
+            },
+            "meta" : {
+              "globalKey" : "5d65b232"
+            }
+          }, {
+            "identifier" : {
+              "value" : "DTCC549300FSLUWD8ETI2P24",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "49a8309e"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "723f92c",
+            "externalKey" : "DTCC00005678"
+          }
+        } ],
+        "contractDetails" : {
+          "documentation" : [ {
+            "agreementDate" : "1995-07-28",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster",
+                  "meta" : {
+                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
+                  }
+                }
+              },
+              "vintage" : 2002
+            },
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+              "globalKey" : "cbf7f35"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualDefinitionsType" : [ {
+                  "value" : "ISDA2003Credit",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+                  }
+                } ],
+                "contractualTermsSupplement" : [ {
+                  "publicationDate" : "2018-10-09"
+                } ]
+              }
             },
-            "value" : "9J6AQFWC2C"
-          },
+            "meta" : {
+              "globalKey" : "8517df9d"
+            }
+          } ],
           "meta" : {
-            "globalKey" : "52ebf337"
+            "globalKey" : "aa59cac8"
           }
-        } ]
+        },
+        "meta" : {
+          "globalKey" : "ccb12d0f"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
+      },
+      "meta" : {
+        "globalKey" : "e10d11b2"
       }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "1d9866bf"
+      "globalKey" : "e58ceef"
     }
   },
-  "eventIdentifier" : [ {
-    "issuerReference" : {
-      "externalReference" : "DTCC00001234",
-      "globalReference" : "2c7d7a2c"
-    },
-    "meta" : {
-      "globalKey" : "4addf95e"
-    }
-  }, {
-    "issuerReference" : {
-      "externalReference" : "DTCC00005678",
-      "globalReference" : "723f92c"
-    },
-    "meta" : {
-      "globalKey" : "ba15595e"
-    }
-  } ],
+  "previousWorkflowStep" : {
+    "globalReference" : "95071f90"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "MSERV20181022.0006130535",
       "meta" : {
         "scheme" : "perFpMLReqmt"
-      },
-      "value" : "MSERV20181022.0006130535"
+      }
     },
     "sentBy" : {
       "value" : "MarkitSERV"
@@ -782,72 +767,87 @@
       "value" : "DTCC"
     } ]
   },
-  "meta" : {
-    "globalKey" : "1cabd26c"
-  },
-  "party" : [ {
+  "timestamp" : [ {
+    "dateTime" : "2018-10-22T12:39:37.457Z",
+    "qualification" : "eventSubmittedDateTime"
+  }, {
+    "dateTime" : "2018-10-22T12:39:55.914Z",
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "issuerReference" : {
+      "globalReference" : "2c7d7a2c",
+      "externalReference" : "DTCC00001234"
+    },
     "meta" : {
-      "externalKey" : "DTCC00001234",
-      "globalKey" : "2c7d7a2c"
+      "globalKey" : "4addf95e"
+    }
+  }, {
+    "issuerReference" : {
+      "globalReference" : "723f92c",
+      "externalReference" : "DTCC00005678"
     },
+    "meta" : {
+      "globalKey" : "ba15595e"
+    }
+  } ],
+  "action" : "New",
+  "party" : [ {
     "partyId" : [ {
       "identifier" : {
+        "value" : "DTCC00001234",
         "meta" : {
           "scheme" : "DTCC"
-        },
-        "value" : "DTCC00001234"
+        }
       },
       "meta" : {
         "globalKey" : "5d63d132"
       }
     }, {
       "identifier" : {
+        "value" : "DTCC549300FSLUWD8ETI2P24",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "DTCC549300FSLUWD8ETI2P24"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "49a8309e"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "DTCC00005678",
-      "globalKey" : "723f92c"
-    },
+      "globalKey" : "2c7d7a2c",
+      "externalKey" : "DTCC00001234"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "DTCC00005678",
         "meta" : {
           "scheme" : "DTCC"
-        },
-        "value" : "DTCC00005678"
+        }
       },
       "meta" : {
         "globalKey" : "5d65b232"
       }
     }, {
       "identifier" : {
+        "value" : "DTCC549300FSLUWD8ETI2P24",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "DTCC549300FSLUWD8ETI2P24"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "49a8309e"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "723f92c",
+      "externalKey" : "DTCC00005678"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "5e343776"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2018-10-22T12:39:37.457Z",
-    "qualification" : "EVENT_SUBMITTED_DATE_TIME"
-  }, {
-    "dateTime" : "2018-10-22T12:39:55.914Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+  "meta" : {
+    "globalKey" : "acaa0e84"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade6-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade6-func-output.json
index 0f6402cf05..82052181db 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade6-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade6-func-output.json
@@ -1,85 +1,119 @@
 {
-  "action" : "NEW",
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "2016-01-15",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster",
+                  "meta" : {
+                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
+                  }
+                }
+              },
+              "vintage" : 2002
+            },
+            "meta" : {
+              "globalKey" : "1a984368"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualDefinitionsType" : [ {
+                  "value" : "ISDA2014Credit",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+                  }
+                } ],
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/matrix-type"
+                    }
+                  },
+                  "matrixTerm" : {
+                    "value" : "StandardNorthAmericanCorporate",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/credit-matrix-transaction-type"
+                    }
+                  }
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "b5190ef6"
+            }
+          } ]
+        }
+      },
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "23f55ec4"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "1221f6f4"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "DTCC00005678",
-                "globalKey" : "723f92c"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "723f92c",
+                "externalReference" : "DTCC00005678"
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCC00005678"
-                },
-                "meta" : {
-                  "globalKey" : "5d65b232"
-                }
-              }, {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "105424OCT1KP_CP",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "DTCC549300FSLUWD8ETI2P24"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "49a8309e"
+                    "scheme" : "TradeRefNbr"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "DTCC00001234",
-                "globalKey" : "d32eca83"
+                "globalKey" : "90484f18"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "d32eca83",
+                "externalReference" : "DTCC00001234"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "1054_26OCT1",
                   "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCC00001234"
-                },
+                    "scheme" : "TradeRefNbr"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "a4e61401"
+              }
+            }, {
+              "issuer" : {
+                "value" : "9J6AQFWC2C",
                 "meta" : {
-                  "globalKey" : "5d63d132"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              }, {
+              },
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "TRADESERV20181026560757688K9W667",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "DTCC549300J6MD8PFY96XF36"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "f05980f5"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "667cb9aa"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2017-11-15",
+              "meta" : {
+                "globalKey" : "3f0acf"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "DTCC00005678",
-                  "globalReference" : "723f92c"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "DTCC00001234",
-                  "globalReference" : "d32eca83"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -87,67 +121,148 @@
                     "productQualifier" : "CreditDefaultSwap_SingleName"
                   } ],
                   "economicTerms" : {
-                    "calculationAgent" : {
-                      "calculationAgentBusinessCenter" : {
-                        "meta" : {
-                          "scheme" : "http://www.fpml.org/spec/2000/business-center"
-                        },
-                        "value" : "USNY"
-                      },
-                      "calculationAgentPartyEnum" : "AS_SPECIFIED_IN_MASTER_AGREEMENT"
-                    },
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2017-11-16",
                         "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
                             "globalKey" : "3a4b88ab"
                           }
                         },
                         "meta" : {
                           "globalKey" : "26f31f7b"
-                        },
-                        "unadjustedDate" : "2017-11-16"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "26f31f7b"
                       }
                     },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2020-03-20",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "2745c47f"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "2745c47f"
+                      }
+                    },
                     "payout" : {
-                      "creditDefaultPayout" : {
+                      "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
+                          }
+                        },
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "calculationPeriodDates" : {
+                          "firstPeriodStartDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2017-09-20",
+                              "meta" : {
+                                "globalKey" : "3f0a54"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3f0a54"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
                           "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
+                            "globalKey" : "5a4b3fc7"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
+                          "firstPaymentDate" : "2017-12-20",
+                          "meta" : {
+                            "globalKey" : "a86a2d16"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "d82c5470"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
                         "generalTerms" : {
                           "referenceInformation" : {
                             "referenceEntity" : {
                               "entityId" : [ {
+                                "value" : "57BGE9AD0",
                                 "meta" : {
                                   "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED"
-                                },
-                                "value" : "57BGE9AD0"
+                                }
                               } ],
-                              "meta" : {
-                                "globalKey" : "36296790"
-                              },
                               "name" : {
+                                "value" : "LEXMARK INTERNATIONAL, INC.",
                                 "meta" : {
                                   "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
-                                },
-                                "value" : "LEXMARK INTERNATIONAL, INC."
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "36296790"
                               }
                             },
                             "referenceObligation" : [ {
@@ -155,18 +270,18 @@
                                 "productIdentifier" : [ {
                                   "value" : {
                                     "identifier" : {
+                                      "value" : "US529772AF23",
                                       "meta" : {
                                         "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
-                                      },
-                                      "value" : "US529772AF23"
+                                      }
                                     },
+                                    "source" : "ISIN",
                                     "meta" : {
                                       "globalKey" : "bd4d21e9"
-                                    },
-                                    "source" : "ISIN"
+                                    }
                                   }
                                 } ],
-                                "securityType" : "DEBT"
+                                "securityType" : "Debt"
                               }
                             } ]
                           }
@@ -175,434 +290,247 @@
                           "globalKey" : "b766645b"
                         }
                       },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
+                      "meta" : {
+                        "globalKey" : "750c20cb"
+                      }
+                    },
+                    "calculationAgent" : {
+                      "calculationAgentPartyEnum" : "AsSpecifiedInMasterAgreement",
+                      "calculationAgentBusinessCenter" : {
+                        "value" : "USNY",
+                        "meta" : {
+                          "scheme" : "http://www.fpml.org/spec/2000/business-center"
+                        }
+                      }
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "7e596d13"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "7e596d13"
+                }
+              },
+              "tradeLot" : [ {
+                "priceQuantity" : [ {
+                  "price" : [ {
+                    "value" : {
+                      "value" : 0.01,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD",
                           "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
-                          "firstPeriodStartDate" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3f0a54"
-                              },
-                              "unadjustedDate" : "2017-09-20"
-                            },
-                            "meta" : {
-                              "globalKey" : "3f0a54"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "28c144ad"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "d58bc56c"
-                        },
-                        "paymentDates" : {
-                          "firstPaymentDate" : "2017-12-20",
-                          "meta" : {
-                            "globalKey" : "a86a35c2"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
+                            "scheme" : "http://www.fpml.org/ext/iso4217"
                           }
                         }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "e85537f1"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                      },
+                      "perUnitOf" : {
+                        "currency" : {
+                          "value" : "USD",
                           "meta" : {
-                            "globalKey" : "3a4b88ab"
+                            "scheme" : "http://www.fpml.org/ext/iso4217"
                           }
-                        },
-                        "meta" : {
-                          "globalKey" : "2745c47f"
-                        },
-                        "unadjustedDate" : "2020-03-20"
+                        }
                       },
-                      "meta" : {
-                        "globalKey" : "2745c47f"
-                      }
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "1a1c5f37"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "1a1c5f37"
-                }
-              },
-              "tradeLot" : [ {
-                "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "1f273178"
-                  },
-                  "price" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "c5befd88"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 1000000,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 0.01,
-                      "perUnitOf" : {
-                        "currency" : {
-                          "meta" : {
-                            "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
-                      },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "48eb1e55"
-                  },
-                  "quantity" : [ {
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "meta" : {
-                            "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 1000000
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "d478ac4b"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "723f92c",
+                  "externalReference" : "DTCC00005678"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "d32eca83",
+                  "externalReference" : "DTCC00001234"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f0acf"
-              },
-              "value" : "2017-11-15"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCC00005678",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "105424OCT1KP_CP"
+                    "scheme" : "DTCC"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "5d65b232"
                 }
-              } ],
-              "issuerReference" : {
-                "externalReference" : "DTCC00005678",
-                "globalReference" : "723f92c"
-              },
-              "meta" : {
-                "globalKey" : "fe645b14"
-              }
-            }, {
-              "assignedIdentifier" : [ {
+              }, {
                 "identifier" : {
+                  "value" : "DTCC549300FSLUWD8ETI2P24",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "1054_26OCT1"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "49a8309e"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "DTCC00001234",
-                "globalReference" : "d32eca83"
-              },
               "meta" : {
-                "globalKey" : "62b22c0b"
+                "globalKey" : "723f92c",
+                "externalKey" : "DTCC00005678"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCC00001234",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "TRADESERV20181026560757688K9W667"
-                }
-              } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-                },
-                "value" : "9J6AQFWC2C"
-              },
-              "meta" : {
-                "globalKey" : "de3bf46"
-              }
-            } ]
-          },
-          "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "f842c338"
-            },
-            "transfer" : {
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/ext/iso4217"
-                    },
-                    "value" : "USD"
+                    "scheme" : "DTCC"
                   }
                 },
-                "value" : 3456
-              },
-              "settlementDate" : {
-                "unadjustedDate" : "2017-11-20"
-              }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "2016-01-15",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "meta" : {
-                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
-                  },
-                  "value" : "ISDA_MASTER"
+                "meta" : {
+                  "globalKey" : "5d63d132"
                 }
-              },
-              "vintage" : 2002
-            },
-            "meta" : {
-              "globalKey" : "1a984368"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualDefinitionsType" : [ {
+              }, {
+                "identifier" : {
+                  "value" : "DTCC549300J6MD8PFY96XF36",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-                  },
-                  "value" : "ISDA_2014_CREDIT"
-                } ],
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/credit-matrix-transaction-type"
-                    },
-                    "value" : "STANDARD_NORTH_AMERICAN_CORPORATE"
-                  },
-                  "matrixType" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/matrix-type"
-                    },
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
-                } ]
-              }
-            },
-            "meta" : {
-              "globalKey" : "97373076"
-            }
-          } ]
-        }
-      }
-    } ],
-    "intent" : "CONTRACT_FORMATION",
-    "after" : [ {
-      "meta" : {
-        "globalKey" : "b9f7d09"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
-      "trade" : {
-        "contractDetails" : {
-          "documentation" : [ {
-            "agreementDate" : "2016-01-15",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "meta" : {
-                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
-                  },
-                  "value" : "ISDA_MASTER"
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "f05980f5"
                 }
-              },
-              "vintage" : 2002
-            },
+              } ],
+              "meta" : {
+                "globalKey" : "d32eca83",
+                "externalKey" : "DTCC00001234"
+              }
+            } ],
             "meta" : {
-              "globalKey" : "1a984368"
+              "globalKey" : "62d00ba0"
             }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualDefinitionsType" : [ {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-                  },
-                  "value" : "ISDA_2014_CREDIT"
-                } ],
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/credit-matrix-transaction-type"
-                    },
-                    "value" : "STANDARD_NORTH_AMERICAN_CORPORATE"
-                  },
-                  "matrixType" : {
+          },
+          "transferHistory" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 3456,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD",
                     "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/matrix-type"
-                    },
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
+                      "scheme" : "http://www.fpml.org/ext/iso4217"
+                    }
                   }
-                } ]
+                }
+              },
+              "settlementDate" : {
+                "unadjustedDate" : "2017-11-20"
               }
             },
             "meta" : {
-              "globalKey" : "97373076"
+              "globalKey" : "f842c338"
             }
           } ],
           "meta" : {
-            "globalKey" : "ab8051de"
+            "globalKey" : "9535cb98"
           }
-        },
-        "meta" : {
-          "globalKey" : "ea685052"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "DTCC00005678",
-            "globalKey" : "723f92c"
+        }
+      }
+    } ],
+    "eventQualifier" : "ContractFormation",
+    "after" : [ {
+      "trade" : {
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "723f92c",
+            "externalReference" : "DTCC00005678"
           },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "DTCC"
-              },
-              "value" : "DTCC00005678"
-            },
-            "meta" : {
-              "globalKey" : "5d65b232"
-            }
-          }, {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "105424OCT1KP_CP",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "DTCC549300FSLUWD8ETI2P24"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "49a8309e"
+                "scheme" : "TradeRefNbr"
+              }
             }
-          } ]
-        }, {
+          } ],
           "meta" : {
-            "externalKey" : "DTCC00001234",
-            "globalKey" : "d32eca83"
+            "globalKey" : "90484f18"
+          }
+        }, {
+          "issuerReference" : {
+            "globalReference" : "d32eca83",
+            "externalReference" : "DTCC00001234"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "1054_26OCT1",
               "meta" : {
-                "scheme" : "DTCC"
-              },
-              "value" : "DTCC00001234"
-            },
+                "scheme" : "TradeRefNbr"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "a4e61401"
+          }
+        }, {
+          "issuer" : {
+            "value" : "9J6AQFWC2C",
             "meta" : {
-              "globalKey" : "5d63d132"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
             }
-          }, {
+          },
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "TRADESERV20181026560757688K9W667",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "DTCC549300J6MD8PFY96XF36"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "f05980f5"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+              }
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "667cb9aa"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2017-11-15",
+          "meta" : {
+            "globalKey" : "3f0acf"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "DTCC00005678",
-              "globalReference" : "723f92c"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "DTCC00001234",
-              "globalReference" : "d32eca83"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -610,364 +538,421 @@
                 "productQualifier" : "CreditDefaultSwap_SingleName"
               } ],
               "economicTerms" : {
-                "calculationAgent" : {
-                  "calculationAgentBusinessCenter" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/spec/2000/business-center"
-                    },
-                    "value" : "USNY"
-                  },
-                  "calculationAgentPartyEnum" : "AS_SPECIFIED_IN_MASTER_AGREEMENT"
-                },
                 "effectiveDate" : {
                   "adjustableDate" : {
+                    "unadjustedDate" : "2017-11-16",
                     "dateAdjustments" : {
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "meta" : {
                         "globalKey" : "3a4b88ab"
                       }
                     },
                     "meta" : {
                       "globalKey" : "26f31f7b"
-                    },
-                    "unadjustedDate" : "2017-11-16"
+                    }
                   },
                   "meta" : {
                     "globalKey" : "26f31f7b"
                   }
                 },
-                "payout" : {
-                  "creditDefaultPayout" : {
-                    "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
-                    },
-                    "priceQuantity" : {
+                "terminationDate" : {
+                  "adjustableDate" : {
+                    "unadjustedDate" : "2020-03-20",
+                    "dateAdjustments" : {
+                      "businessDayConvention" : "NotApplicable",
                       "meta" : {
-                        "externalKey" : "calculationAmount",
-                        "globalKey" : "0"
-                      },
-                      "quantitySchedule" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "quantity-1"
-                        }
-                      }
-                    },
-                    "generalTerms" : {
-                      "referenceInformation" : {
-                        "referenceEntity" : {
-                          "entityId" : [ {
-                            "meta" : {
-                              "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED"
-                            },
-                            "value" : "57BGE9AD0"
-                          } ],
-                          "meta" : {
-                            "globalKey" : "36296790"
-                          },
-                          "name" : {
-                            "meta" : {
-                              "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
-                            },
-                            "value" : "LEXMARK INTERNATIONAL, INC."
-                          }
-                        },
-                        "referenceObligation" : [ {
-                          "security" : {
-                            "productIdentifier" : [ {
-                              "value" : {
-                                "identifier" : {
-                                  "meta" : {
-                                    "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
-                                  },
-                                  "value" : "US529772AF23"
-                                },
-                                "meta" : {
-                                  "globalKey" : "bd4d21e9"
-                                },
-                                "source" : "ISIN"
-                              }
-                            } ],
-                            "securityType" : "DEBT"
-                          }
-                        } ]
+                        "globalKey" : "3a4b88ab"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "b766645b"
+                      "globalKey" : "2745c47f"
                     }
                   },
+                  "meta" : {
+                    "globalKey" : "2745c47f"
+                  }
+                },
+                "payout" : {
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "externalKey" : "calculationAmount",
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0",
+                        "externalKey" : "calculationAmount"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "28c47"
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
+                          }
                         },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
-                        "rollConvention" : "20"
-                      },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
+                    "calculationPeriodDates" : {
                       "firstPeriodStartDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2017-09-20",
                           "meta" : {
                             "globalKey" : "3f0a54"
-                          },
-                          "unadjustedDate" : "2017-09-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "3f0a54"
                         }
                       },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "17f73"
+                        },
+                        "rollConvention" : "20"
+                      },
                       "meta" : {
-                        "globalKey" : "28c144ad"
+                        "globalKey" : "5a4b3fc7"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "d58bc56c"
-                    },
                     "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
+                      },
                       "firstPaymentDate" : "2017-12-20",
                       "meta" : {
-                        "globalKey" : "a86a35c2"
+                        "globalKey" : "a86a2d16"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "d82c5470"
+                    }
+                  } ],
+                  "creditDefaultPayout" : {
+                    "payerReceiver" : {
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
+                    },
+                    "priceQuantity" : {
+                      "quantitySchedule" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "quantity-1"
+                        }
                       },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
+                      "meta" : {
+                        "globalKey" : "0",
+                        "externalKey" : "calculationAmount"
                       }
                     },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
+                    "generalTerms" : {
+                      "referenceInformation" : {
+                        "referenceEntity" : {
+                          "entityId" : [ {
+                            "value" : "57BGE9AD0",
+                            "meta" : {
+                              "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED"
+                            }
+                          } ],
+                          "name" : {
+                            "value" : "LEXMARK INTERNATIONAL, INC.",
+                            "meta" : {
+                              "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "36296790"
+                          }
+                        },
+                        "referenceObligation" : [ {
+                          "security" : {
+                            "productIdentifier" : [ {
+                              "value" : {
+                                "identifier" : {
+                                  "value" : "US529772AF23",
+                                  "meta" : {
+                                    "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
+                                  }
+                                },
+                                "source" : "ISIN",
+                                "meta" : {
+                                  "globalKey" : "bd4d21e9"
+                                }
+                              }
+                            } ],
+                            "securityType" : "Debt"
                           }
-                        }
+                        } ]
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "b766645b"
                     }
-                  } ],
+                  },
                   "meta" : {
-                    "globalKey" : "e85537f1"
+                    "globalKey" : "750c20cb"
                   }
                 },
-                "terminationDate" : {
-                  "adjustableDate" : {
-                    "dateAdjustments" : {
-                      "businessDayConvention" : "NOT_APPLICABLE",
-                      "meta" : {
-                        "globalKey" : "3a4b88ab"
-                      }
-                    },
+                "calculationAgent" : {
+                  "calculationAgentPartyEnum" : "AsSpecifiedInMasterAgreement",
+                  "calculationAgentBusinessCenter" : {
+                    "value" : "USNY",
                     "meta" : {
-                      "globalKey" : "2745c47f"
-                    },
-                    "unadjustedDate" : "2020-03-20"
-                  },
-                  "meta" : {
-                    "globalKey" : "2745c47f"
+                      "scheme" : "http://www.fpml.org/spec/2000/business-center"
+                    }
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "1a1c5f37"
+                "globalKey" : "7e596d13"
               }
             },
             "meta" : {
-              "globalKey" : "1a1c5f37"
+              "globalKey" : "7e596d13"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "1f273178"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.01,
                   "unit" : {
                     "currency" : {
+                      "value" : "USD",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/ext/iso4217"
-                      },
-                      "value" : "USD"
+                      }
                     }
                   },
-                  "value" : 0.01,
                   "perUnitOf" : {
                     "currency" : {
+                      "value" : "USD",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/ext/iso4217"
-                      },
-                      "value" : "USD"
+                      }
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "48eb1e55"
-              },
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "c5befd88"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 1000000,
                   "unit" : {
                     "currency" : {
+                      "value" : "USD",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/ext/iso4217"
-                      },
-                      "value" : "USD"
+                      }
                     }
-                  },
-                  "value" : 1000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "d478ac4b"
+              }
             } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "723f92c",
+              "externalReference" : "DTCC00005678"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "d32eca83",
+              "externalReference" : "DTCC00001234"
+            }
           } ]
         },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f0acf"
-          },
-          "value" : "2017-11-15"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "DTCC00005678",
               "meta" : {
-                "scheme" : "TradeRefNbr"
-              },
-              "value" : "105424OCT1KP_CP"
+                "scheme" : "DTCC"
+              }
+            },
+            "meta" : {
+              "globalKey" : "5d65b232"
             }
-          } ],
-          "issuerReference" : {
-            "externalReference" : "DTCC00005678",
-            "globalReference" : "723f92c"
-          },
-          "meta" : {
-            "globalKey" : "fe645b14"
-          }
-        }, {
-          "assignedIdentifier" : [ {
+          }, {
             "identifier" : {
+              "value" : "DTCC549300FSLUWD8ETI2P24",
               "meta" : {
-                "scheme" : "TradeRefNbr"
-              },
-              "value" : "1054_26OCT1"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "49a8309e"
             }
           } ],
-          "issuerReference" : {
-            "externalReference" : "DTCC00001234",
-            "globalReference" : "d32eca83"
-          },
           "meta" : {
-            "globalKey" : "62b22c0b"
+            "globalKey" : "723f92c",
+            "externalKey" : "DTCC00005678"
           }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "DTCC00001234",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-              },
-              "value" : "TRADESERV20181026560757688K9W667"
+                "scheme" : "DTCC"
+              }
+            },
+            "meta" : {
+              "globalKey" : "5d63d132"
+            }
+          }, {
+            "identifier" : {
+              "value" : "DTCC549300J6MD8PFY96XF36",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "f05980f5"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "d32eca83",
+            "externalKey" : "DTCC00001234"
+          }
+        } ],
+        "contractDetails" : {
+          "documentation" : [ {
+            "agreementDate" : "2016-01-15",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster",
+                  "meta" : {
+                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
+                  }
+                }
+              },
+              "vintage" : 2002
+            },
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+              "globalKey" : "1a984368"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualDefinitionsType" : [ {
+                  "value" : "ISDA2014Credit",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+                  }
+                } ],
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/matrix-type"
+                    }
+                  },
+                  "matrixTerm" : {
+                    "value" : "StandardNorthAmericanCorporate",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/credit-matrix-transaction-type"
+                    }
+                  }
+                } ]
+              }
             },
-            "value" : "9J6AQFWC2C"
-          },
+            "meta" : {
+              "globalKey" : "b5190ef6"
+            }
+          } ],
           "meta" : {
-            "globalKey" : "de3bf46"
+            "globalKey" : "c962305e"
           }
-        } ]
+        },
+        "meta" : {
+          "globalKey" : "16582bfe"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
       },
       "transferHistory" : [ {
-        "meta" : {
-          "globalKey" : "f842c338"
-        },
         "transfer" : {
           "quantity" : {
+            "value" : 3456,
             "unit" : {
               "currency" : {
+                "value" : "USD",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/ext/iso4217"
-                },
-                "value" : "USD"
+                }
               }
-            },
-            "value" : 3456
+            }
           },
           "settlementDate" : {
             "unadjustedDate" : "2017-11-20"
           }
+        },
+        "meta" : {
+          "globalKey" : "f842c338"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "74f11f77"
+      }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "9d47d20b"
+      "globalKey" : "d052581d"
     }
   },
-  "eventIdentifier" : [ {
-    "issuerReference" : {
-      "externalReference" : "DTCC00005678",
-      "globalReference" : "723f92c"
-    },
-    "meta" : {
-      "globalKey" : "ba15595e"
-    }
-  }, {
-    "issuerReference" : {
-      "externalReference" : "DTCC00001234",
-      "globalReference" : "d32eca83"
-    },
-    "meta" : {
-      "globalKey" : "f18f49b5"
-    }
-  } ],
+  "previousWorkflowStep" : {
+    "globalReference" : "3c6dbef4"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "MSERV20181026.0007196855",
       "meta" : {
         "scheme" : "perFpMLReqmt"
-      },
-      "value" : "MSERV20181026.0007196855"
+      }
     },
     "sentBy" : {
       "value" : "MarkitSERV"
@@ -976,72 +961,87 @@
       "value" : "DTCC"
     } ]
   },
-  "meta" : {
-    "globalKey" : "c4f6905a"
-  },
-  "party" : [ {
+  "timestamp" : [ {
+    "dateTime" : "2018-10-26T13:32:15.288Z",
+    "qualification" : "eventSubmittedDateTime"
+  }, {
+    "dateTime" : "2018-10-26T13:33:14.616Z",
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "issuerReference" : {
+      "globalReference" : "723f92c",
+      "externalReference" : "DTCC00005678"
+    },
     "meta" : {
-      "externalKey" : "DTCC00005678",
-      "globalKey" : "723f92c"
+      "globalKey" : "ba15595e"
+    }
+  }, {
+    "issuerReference" : {
+      "globalReference" : "d32eca83",
+      "externalReference" : "DTCC00001234"
     },
+    "meta" : {
+      "globalKey" : "f18f49b5"
+    }
+  } ],
+  "action" : "New",
+  "party" : [ {
     "partyId" : [ {
       "identifier" : {
+        "value" : "DTCC00005678",
         "meta" : {
           "scheme" : "DTCC"
-        },
-        "value" : "DTCC00005678"
+        }
       },
       "meta" : {
         "globalKey" : "5d65b232"
       }
     }, {
       "identifier" : {
+        "value" : "DTCC549300FSLUWD8ETI2P24",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "DTCC549300FSLUWD8ETI2P24"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "49a8309e"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "DTCC00001234",
-      "globalKey" : "d32eca83"
-    },
+      "globalKey" : "723f92c",
+      "externalKey" : "DTCC00005678"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "DTCC00001234",
         "meta" : {
           "scheme" : "DTCC"
-        },
-        "value" : "DTCC00001234"
+        }
       },
       "meta" : {
         "globalKey" : "5d63d132"
       }
     }, {
       "identifier" : {
+        "value" : "DTCC549300J6MD8PFY96XF36",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "DTCC549300J6MD8PFY96XF36"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "f05980f5"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "d32eca83",
+      "externalKey" : "DTCC00001234"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "be557646"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2018-10-26T13:32:15.288Z",
-    "qualification" : "EVENT_SUBMITTED_DATE_TIME"
-  }, {
-    "dateTime" : "2018-10-26T13:33:14.616Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+  "meta" : {
+    "globalKey" : "f5ed77de"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/eligible-collateral/merge-criteria-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/eligible-collateral/merge-criteria-func-output.json
index 4481183fb7..2d73708044 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/eligible-collateral/merge-criteria-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/eligible-collateral/merge-criteria-func-output.json
@@ -1,231 +1,231 @@
 {
   "criteria" : [ {
+    "issuer" : [ {
+      "issuerType" : [ {
+        "issuerType" : "SovereignCentralBank"
+      } ],
+      "issuerCountryOfOrigin" : [ {
+        "value" : "GB",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso3166"
+        }
+      } ]
+    } ],
     "asset" : [ {
       "collateralAssetType" : [ {
-        "assetType" : "SECURITY",
-        "securityType" : "DEBT"
+        "assetType" : "Security",
+        "securityType" : "Debt"
       } ],
+      "maturityType" : "RemainingMaturity",
       "maturityRange" : {
         "lowerBound" : {
-          "inclusive" : true,
           "period" : {
-            "meta" : {
-              "globalKey" : "ac7"
-            },
+            "periodMultiplier" : 0,
             "period" : "Y",
-            "periodMultiplier" : 0
-          }
+            "meta" : {
+              "globalKey" : "59"
+            }
+          },
+          "inclusive" : true
         },
         "upperBound" : {
-          "inclusive" : false,
           "period" : {
-            "meta" : {
-              "globalKey" : "ac8"
-            },
+            "periodMultiplier" : 1,
             "period" : "Y",
-            "periodMultiplier" : 1
-          }
+            "meta" : {
+              "globalKey" : "78"
+            }
+          },
+          "inclusive" : false
         }
-      },
-      "maturityType" : "REMAINING_MATURITY"
+      }
     } ],
+    "treatment" : {
+      "valuationTreatment" : {
+        "haircutPercentage" : 0.97
+      },
+      "isIncluded" : true
+    }
+  }, {
     "issuer" : [ {
+      "issuerType" : [ {
+        "issuerType" : "SovereignCentralBank"
+      } ],
       "issuerCountryOfOrigin" : [ {
+        "value" : "GB",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso3166"
-        },
-        "value" : "GB"
-      } ],
-      "issuerType" : [ {
-        "issuerType" : "SOVEREIGN_CENTRAL_BANK"
+        }
       } ]
     } ],
-    "treatment" : {
-      "isIncluded" : true,
-      "valuationTreatment" : {
-        "haircutPercentage" : 0.97
-      }
-    }
-  }, {
     "asset" : [ {
       "collateralAssetType" : [ {
-        "assetType" : "SECURITY",
-        "securityType" : "DEBT"
+        "assetType" : "Security",
+        "securityType" : "Debt"
       } ],
+      "maturityType" : "RemainingMaturity",
       "maturityRange" : {
         "lowerBound" : {
-          "inclusive" : true,
           "period" : {
-            "meta" : {
-              "globalKey" : "ac8"
-            },
+            "periodMultiplier" : 1,
             "period" : "Y",
-            "periodMultiplier" : 1
-          }
+            "meta" : {
+              "globalKey" : "78"
+            }
+          },
+          "inclusive" : true
         },
         "upperBound" : {
-          "inclusive" : false,
           "period" : {
-            "meta" : {
-              "globalKey" : "acc"
-            },
+            "periodMultiplier" : 5,
             "period" : "Y",
-            "periodMultiplier" : 5
-          }
+            "meta" : {
+              "globalKey" : "f4"
+            }
+          },
+          "inclusive" : false
         }
-      },
-      "maturityType" : "REMAINING_MATURITY"
+      }
     } ],
+    "treatment" : {
+      "valuationTreatment" : {
+        "haircutPercentage" : 0.96
+      },
+      "isIncluded" : true
+    }
+  }, {
     "issuer" : [ {
+      "issuerType" : [ {
+        "issuerType" : "SovereignCentralBank"
+      } ],
       "issuerCountryOfOrigin" : [ {
+        "value" : "GB",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso3166"
-        },
-        "value" : "GB"
-      } ],
-      "issuerType" : [ {
-        "issuerType" : "SOVEREIGN_CENTRAL_BANK"
+        }
       } ]
     } ],
-    "treatment" : {
-      "isIncluded" : true,
-      "valuationTreatment" : {
-        "haircutPercentage" : 0.96
-      }
-    }
-  }, {
     "asset" : [ {
       "collateralAssetType" : [ {
-        "assetType" : "SECURITY",
-        "securityType" : "DEBT"
+        "assetType" : "Security",
+        "securityType" : "Debt"
       } ],
+      "maturityType" : "RemainingMaturity",
       "maturityRange" : {
         "lowerBound" : {
-          "inclusive" : true,
           "period" : {
-            "meta" : {
-              "globalKey" : "acc"
-            },
+            "periodMultiplier" : 5,
             "period" : "Y",
-            "periodMultiplier" : 5
-          }
+            "meta" : {
+              "globalKey" : "f4"
+            }
+          },
+          "inclusive" : true
         },
         "upperBound" : {
-          "inclusive" : false,
           "period" : {
-            "meta" : {
-              "globalKey" : "ad1"
-            },
+            "periodMultiplier" : 10,
             "period" : "Y",
-            "periodMultiplier" : 10
-          }
+            "meta" : {
+              "globalKey" : "18f"
+            }
+          },
+          "inclusive" : false
         }
-      },
-      "maturityType" : "REMAINING_MATURITY"
+      }
     } ],
+    "treatment" : {
+      "valuationTreatment" : {
+        "haircutPercentage" : 0.95
+      },
+      "isIncluded" : true
+    }
+  }, {
     "issuer" : [ {
+      "issuerType" : [ {
+        "issuerType" : "SovereignCentralBank"
+      } ],
       "issuerCountryOfOrigin" : [ {
+        "value" : "GB",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso3166"
-        },
-        "value" : "GB"
-      } ],
-      "issuerType" : [ {
-        "issuerType" : "SOVEREIGN_CENTRAL_BANK"
+        }
       } ]
     } ],
-    "treatment" : {
-      "isIncluded" : true,
-      "valuationTreatment" : {
-        "haircutPercentage" : 0.95
-      }
-    }
-  }, {
     "asset" : [ {
       "collateralAssetType" : [ {
-        "assetType" : "SECURITY",
-        "securityType" : "DEBT"
+        "assetType" : "Security",
+        "securityType" : "Debt"
       } ],
+      "maturityType" : "RemainingMaturity",
       "maturityRange" : {
         "lowerBound" : {
-          "inclusive" : true,
           "period" : {
-            "meta" : {
-              "globalKey" : "ad1"
-            },
+            "periodMultiplier" : 10,
             "period" : "Y",
-            "periodMultiplier" : 10
-          }
+            "meta" : {
+              "globalKey" : "18f"
+            }
+          },
+          "inclusive" : true
         },
         "upperBound" : {
-          "inclusive" : false,
           "period" : {
-            "meta" : {
-              "globalKey" : "ae5"
-            },
+            "periodMultiplier" : 30,
             "period" : "Y",
-            "periodMultiplier" : 30
-          }
+            "meta" : {
+              "globalKey" : "3fb"
+            }
+          },
+          "inclusive" : false
         }
-      },
-      "maturityType" : "REMAINING_MATURITY"
+      }
     } ],
+    "treatment" : {
+      "valuationTreatment" : {
+        "haircutPercentage" : 0.93
+      },
+      "isIncluded" : true
+    }
+  }, {
     "issuer" : [ {
+      "issuerType" : [ {
+        "issuerType" : "SovereignCentralBank"
+      } ],
       "issuerCountryOfOrigin" : [ {
+        "value" : "GB",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso3166"
-        },
-        "value" : "GB"
-      } ],
-      "issuerType" : [ {
-        "issuerType" : "SOVEREIGN_CENTRAL_BANK"
+        }
       } ]
     } ],
-    "treatment" : {
-      "isIncluded" : true,
-      "valuationTreatment" : {
-        "haircutPercentage" : 0.93
-      }
-    }
-  }, {
     "asset" : [ {
       "collateralAssetType" : [ {
-        "assetType" : "SECURITY",
-        "securityType" : "DEBT"
+        "assetType" : "Security",
+        "securityType" : "Debt"
       } ],
+      "maturityType" : "RemainingMaturity",
       "maturityRange" : {
         "lowerBound" : {
-          "inclusive" : true,
           "period" : {
-            "meta" : {
-              "globalKey" : "ae5"
-            },
+            "periodMultiplier" : 30,
             "period" : "Y",
-            "periodMultiplier" : 30
-          }
+            "meta" : {
+              "globalKey" : "3fb"
+            }
+          },
+          "inclusive" : true
         }
-      },
-      "maturityType" : "REMAINING_MATURITY"
-    } ],
-    "issuer" : [ {
-      "issuerCountryOfOrigin" : [ {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso3166"
-        },
-        "value" : "GB"
-      } ],
-      "issuerType" : [ {
-        "issuerType" : "SOVEREIGN_CENTRAL_BANK"
-      } ]
+      }
     } ],
     "treatment" : {
-      "isIncluded" : true,
       "valuationTreatment" : {
         "haircutPercentage" : 0.9
-      }
+      },
+      "isIncluded" : true
     }
   } ],
   "meta" : {
-    "globalKey" : "fe69f314"
+    "globalKey" : "76a4a50c"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-cleared-alpha-trade-CFTC-SEC-and-canada-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-cleared-alpha-trade-CFTC-SEC-and-canada-func-output.json
index f7b39418aa..8416aedfe1 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-cleared-alpha-trade-CFTC-SEC-and-canada-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-cleared-alpha-trade-CFTC-SEC-and-canada-func-output.json
@@ -1,372 +1,154 @@
 {
-  "action" : "NEW",
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "70b2d093"
-          },
-          "trade" : {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "2002-01-05",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster"
+                }
+              },
+              "vintage" : 1992
+            },
             "meta" : {
-              "globalKey" : "11754517"
+              "globalKey" : "4f2097d4"
+            }
+          }, {
+            "agreementDate" : "2002-01-07",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "ISDA2003CreditNorthAmerican"
+                }
+              }
             },
-            "party" : [ {
-              "businessUnit" : [ {
-                "contactInformation" : {
-                  "address" : [ {
-                    "city" : "New York",
-                    "country" : {
-                      "value" : "US"
-                    },
-                    "postalCode" : "10017",
-                    "state" : "NY",
-                    "street" : [ "123 Park Avenue" ]
-                  } ]
-                },
-                "meta" : {
-                  "externalKey" : "branch1",
-                  "globalKey" : "69aea9de"
-                },
-                "name" : "New York Office"
-              }, {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "contactInformation" : {
-                "email" : [ "swap_trading@bankx.com" ]
-              },
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "e450a87"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            "meta" : {
+              "globalKey" : "5d7949e5"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "CreditSupportAgreement"
+              }
+            },
+            "meta" : {
+              "globalKey" : "984ae6d0"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix"
                   },
-                  "value" : "5493001RKR55V4X61F71"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "d0f863bc"
-                }
-              } ],
-              "person" : [ {
-                "firstName" : "person",
-                "meta" : {
-                  "externalKey" : "broker",
-                  "globalKey" : "5b25cf92"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "person123"
-                    },
-                    "meta" : {
-                      "globalKey" : "32d9e6bd"
-                    }
-                  }
-                } ]
-              }, {
-                "firstName" : "person",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "5b25db35"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "person456"
-                    },
-                    "meta" : {
-                      "globalKey" : "32d9f260"
-                    }
+                  "matrixTerm" : {
+                    "value" : "StandardNorthAmericanCorporate"
                   }
                 } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_parent",
-                "globalKey" : "956c45f9"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B47"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f9"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_affiliate1",
-                "globalKey" : "956c45fa"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B48"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45fa"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_affiliate2",
-                "globalKey" : "956c45fb"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B49"
-                },
-                "identifierType" : "LEI",
+              }
+            },
+            "meta" : {
+              "globalKey" : "9ed2f955"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Other",
+                "otherAgreement" : "Custom Legal Agreement"
+              }
+            },
+            "meta" : {
+              "globalKey" : "98e1dbe8"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "FCHUXIINML",
                 "meta" : {
-                  "globalKey" : "956c45fb"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
                 }
-              } ]
-            }, {
-              "contactInformation" : {
-                "email" : [ "investments@banky.com" ]
-              },
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "573ad49d"
-              },
-              "name" : {
-                "value" : "Bank Y"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "12345678901234567890123456789012",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B46"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f8"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "party2_parent",
-                "globalKey" : "956c45f9"
+                "globalKey" : "ce80645"
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B47"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f9"
-                }
-              } ]
+              "identifierType" : "UniqueTransactionIdentifier"
             }, {
-              "meta" : {
-                "externalKey" : "party2_affiliate1",
-                "globalKey" : "956c45fa"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B48"
-                },
-                "identifierType" : "LEI",
+              "issuer" : {
+                "value" : "1031234567",
                 "meta" : {
-                  "globalKey" : "956c45fa"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
-              },
-              "name" : {
-                "value" : "Up&Atem"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "12345678901234567890123456789011",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "executing_agent",
-                "globalKey" : "49e97697"
-              },
-              "name" : {
-                "value" : "XYZ Bank"
+                "globalKey" : "671d1c67"
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND22"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e774"
-                }
-              } ]
-            }, {
+              "identifierType" : "UniqueTransactionIdentifier"
+            } ],
+            "tradeDate" : {
+              "value" : "2011-02-12",
               "meta" : {
-                "externalKey" : "venue",
-                "globalKey" : "6ebddc37"
-              },
-              "name" : {
-                "value" : "SEFCo LLC"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND11"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e754"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "original_sdr",
-                "globalKey" : "9b321c78"
-              },
-              "name" : {
-                "value" : "WorldWide Trade Repository"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
-                }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "e450a87"
-              },
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "573ad49d"
-              },
-              "role" : "REPORTING_PARTY"
-            } ],
+                "globalKey" : "3ed88c"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "573ad49d"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "e450a87"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "meta" : {
-                          "scheme" : "http://www.theice.com/coding-scheme/product-id"
-                        },
-                        "value" : "X123"
-                      },
-                      "meta" : {
-                        "globalKey" : "e6a349ca"
-                      },
-                      "source" : "OTHER"
-                    }
-                  } ],
                   "productTaxonomy" : [ {
                     "primaryAssetClass" : {
-                      "value" : "CREDIT"
+                      "value" : "Credit"
                     }
                   }, {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
+                        "value" : "SecurityBasedSwap",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/sec-product-category"
-                        },
-                        "value" : "SecurityBasedSwap"
+                        }
                       }
                     }
                   }, {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
+                        "value" : "Credi Default Swap",
                         "meta" : {
                           "scheme" : "http://www.theice.com/coding-scheme/product-name"
-                        },
-                        "value" : "Credi Default Swap"
+                        }
                       }
                     }
                   }, {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
                         "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
@@ -376,50 +158,147 @@
                     "source" : "ISDA",
                     "productQualifier" : "CreditDefaultSwap_SingleName"
                   } ],
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "X123",
+                        "meta" : {
+                          "scheme" : "http://www.theice.com/coding-scheme/product-id"
+                        }
+                      },
+                      "source" : "Other",
+                      "meta" : {
+                        "globalKey" : "e6a349ca"
+                      }
+                    }
+                  } ],
                   "economicTerms" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2009-03-26",
                         "meta" : {
                           "globalKey" : "3ec8da"
-                        },
-                        "unadjustedDate" : "2009-03-26"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "3ec8da"
                       }
                     },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2014-06-20",
+                        "meta" : {
+                          "globalKey" : "3ef194"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ef194"
+                      }
+                    },
                     "payout" : {
-                      "creditDefaultPayout" : {
+                      "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
                           "meta" : {
                             "globalKey" : "0"
+                          }
+                        },
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "calculationPeriodDates" : {
+                          "firstPeriodStartDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2009-03-20",
+                              "meta" : {
+                                "globalKey" : "3ec8d4"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3ec8d4"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
+                          "meta" : {
+                            "globalKey" : "bf47be47"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
+                          "firstPaymentDate" : "2009-06-20",
+                          "meta" : {
+                            "globalKey" : "8aa3de96"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "eff49770"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "generalTerms" : {
                           "referenceInformation" : {
                             "referenceEntity" : {
                               "entityId" : [ {
+                                "value" : "8G836J",
                                 "meta" : {
                                   "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                                },
-                                "value" : "8G836J"
+                                }
                               } ],
-                              "meta" : {
-                                "externalKey" : "referenceEntity",
-                                "globalKey" : "54140007"
-                              },
                               "name" : {
                                 "value" : "TENET HEALTHCARE CORPORATION"
+                              },
+                              "meta" : {
+                                "globalKey" : "54140007",
+                                "externalKey" : "referenceEntity"
                               }
                             },
                             "referenceObligation" : [ {
@@ -427,770 +306,529 @@
                                 "productIdentifier" : [ {
                                   "value" : {
                                     "identifier" : {
+                                      "value" : "8G836JAF2",
                                       "meta" : {
                                         "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair-1-0"
-                                      },
-                                      "value" : "8G836JAF2"
+                                      }
                                     },
+                                    "source" : "Other",
                                     "meta" : {
                                       "globalKey" : "1165f83f"
-                                    },
-                                    "source" : "OTHER"
+                                    }
                                   }
                                 } ],
-                                "securityType" : "DEBT"
+                                "securityType" : "Debt"
                               }
                             } ]
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "2fa76fbc"
-                        },
                         "transactedPrice" : {
                           "marketFixedRate" : 0.02
-                        }
-                      },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
-                          "firstPeriodStartDate" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3ec8d4"
-                              },
-                              "unadjustedDate" : "2009-03-20"
-                            },
-                            "meta" : {
-                              "globalKey" : "3ec8d4"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "28c1032d"
-                          }
                         },
                         "meta" : {
-                          "globalKey" : "6afbe26c"
-                        },
-                        "paymentDates" : {
-                          "firstPaymentDate" : "2009-06-20",
-                          "meta" : {
-                            "globalKey" : "8aa3e742"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                          "globalKey" : "2fa76fbc"
                         }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "1fd4e030"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3ef194"
-                        },
-                        "unadjustedDate" : "2014-06-20"
                       },
                       "meta" : {
-                        "globalKey" : "3ef194"
+                        "globalKey" : "a7b3d32c"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "7d137866"
+                    "globalKey" : "819b3a8a"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "7d137866"
+                  "globalKey" : "819b3a8a"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "1f273178"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.01,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.01,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "1a10e2d1"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "c5befd88"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 5000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 5000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "280b774f"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "d0b9c5dd",
+                  "externalReference" : "party2"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1bec43b5",
+                  "externalReference" : "party1"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ed88c"
-              },
-              "value" : "2011-02-12"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "5493001RKR55V4X61F71",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "12345678901234567890123456789012"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "d0f863bc"
                 }
               } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
+              "name" : {
+                "value" : "Bank X"
+              },
+              "businessUnit" : [ {
+                "name" : "New York Office",
+                "contactInformation" : {
+                  "address" : [ {
+                    "street" : [ "123 Park Avenue" ],
+                    "city" : "New York",
+                    "state" : "NY",
+                    "country" : {
+                      "value" : "US"
+                    },
+                    "postalCode" : "10017"
+                  } ]
                 },
-                "value" : "FCHUXIINML"
+                "meta" : {
+                  "globalKey" : "e15b99b0",
+                  "externalKey" : "branch1"
+                }
+              }, {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "person123"
+                    },
+                    "meta" : {
+                      "globalKey" : "32d9e6bd"
+                    }
+                  }
+                } ],
+                "firstName" : "person",
+                "meta" : {
+                  "globalKey" : "5b25cf92",
+                  "externalKey" : "broker"
+                }
+              }, {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "person456"
+                    },
+                    "meta" : {
+                      "globalKey" : "32d9f260"
+                    }
+                  }
+                } ],
+                "firstName" : "person",
+                "meta" : {
+                  "globalKey" : "5b25db35",
+                  "externalKey" : "trader"
+                }
+              } ],
+              "contactInformation" : {
+                "email" : [ "swap_trading@bankx.com" ]
               },
               "meta" : {
-                "globalKey" : "1551a427"
-              },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
+                "globalKey" : "1bec43b5",
+                "externalKey" : "party1"
+              }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B47",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "12345678901234567890123456789011"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45f9"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "956c45f9",
+                "externalKey" : "party1_parent"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B48",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "956c45fa"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "956c45fa",
+                "externalKey" : "party1_affiliate1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B49",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "1031234567"
-              },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45fb"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "f6e8a927"
-              },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
-          },
-          "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "8af8663c"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "e450a87"
+                "globalKey" : "956c45fb",
+                "externalKey" : "party1_affiliate2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B46",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "receiverPartyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "573ad49d"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45f8"
                 }
+              } ],
+              "name" : {
+                "value" : "Bank Y"
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
+              "contactInformation" : {
+                "email" : [ "investments@banky.com" ]
+              },
+              "meta" : {
+                "globalKey" : "d0b9c5dd",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B47",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
-                "value" : 1000
-              },
-              "settlementDate" : {
-                "adjustedDate" : {
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45f9"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "956c45f9",
+                "externalKey" : "party2_parent"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B48",
                   "meta" : {
-                    "globalKey" : "3ec8de"
-                  },
-                  "value" : "2009-03-30"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "unadjustedDate" : "2009-03-28"
-              },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45fa"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "956c45fa",
+                "externalKey" : "party2_affiliate1"
               }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "2002-01-05",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "value" : "ISDA_MASTER"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "8ffabe4b"
                 }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
               },
-              "vintage" : 1992
-            },
-            "meta" : {
-              "globalKey" : "4f2097d4"
-            }
-          }, {
-            "agreementDate" : "2002-01-07",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "ISDA_2003_CREDIT_NORTH_AMERICAN"
+              "meta" : {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND22",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e774"
                 }
+              } ],
+              "name" : {
+                "value" : "XYZ Bank"
+              },
+              "meta" : {
+                "globalKey" : "61a07317",
+                "externalKey" : "executing_agent"
               }
-            },
-            "meta" : {
-              "globalKey" : "5d7949e5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CREDIT_SUPPORT_AGREEMENT"
-              }
-            },
-            "meta" : {
-              "globalKey" : "984ae6d0"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "value" : "STANDARD_NORTH_AMERICAN_CORPORATE"
-                  },
-                  "matrixType" : {
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND11",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
-                } ]
-              }
-            },
-            "meta" : {
-              "globalKey" : "80f11ad5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "OTHER",
-                "otherAgreement" : "Custom Legal Agreement"
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e754"
+                }
+              } ],
+              "name" : {
+                "value" : "SEFCo LLC"
+              },
+              "meta" : {
+                "globalKey" : "ae0d40b7",
+                "externalKey" : "venue"
               }
-            },
-            "meta" : {
-              "globalKey" : "98e1dbe8"
-            }
-          } ]
-        }
-      }
-    } ],
-    "intent" : "CONTRACT_FORMATION",
-    "after" : [ {
-      "meta" : {
-        "globalKey" : "49d5a1ac"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
-      "trade" : {
-        "contractDetails" : {
-          "documentation" : [ {
-            "agreementDate" : "2002-01-05",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "value" : "ISDA_MASTER"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
                 }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
               },
-              "vintage" : 1992
-            },
-            "meta" : {
-              "globalKey" : "4f2097d4"
-            }
-          }, {
-            "agreementDate" : "2002-01-07",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "ISDA_2003_CREDIT_NORTH_AMERICAN"
+              "meta" : {
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
                 }
+              } ],
+              "name" : {
+                "value" : "WorldWide Trade Repository"
+              },
+              "meta" : {
+                "globalKey" : "4ba4fb38",
+                "externalKey" : "original_sdr"
               }
-            },
-            "meta" : {
-              "globalKey" : "5d7949e5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CREDIT_SUPPORT_AGREEMENT"
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "d0b9c5dd",
+                "externalReference" : "party2"
+              },
+              "role" : "ReportingParty",
+              "ownershipPartyReference" : {
+                "globalReference" : "1bec43b5",
+                "externalReference" : "party1"
               }
-            },
+            } ],
             "meta" : {
-              "globalKey" : "984ae6d0"
+              "globalKey" : "dbe3f1f3"
             }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "value" : "STANDARD_NORTH_AMERICAN_CORPORATE"
-                  },
-                  "matrixType" : {
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
+          },
+          "transferHistory" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 1000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
                   }
-                } ]
-              }
-            },
-            "meta" : {
-              "globalKey" : "80f11ad5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "OTHER",
-                "otherAgreement" : "Custom Legal Agreement"
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "1bec43b5",
+                  "externalReference" : "party1"
+                },
+                "receiverPartyReference" : {
+                  "globalReference" : "d0b9c5dd",
+                  "externalReference" : "party2"
+                }
+              },
+              "settlementDate" : {
+                "unadjustedDate" : "2009-03-28",
+                "adjustedDate" : {
+                  "value" : "2009-03-30",
+                  "meta" : {
+                    "globalKey" : "3ec8de"
+                  }
+                }
+              },
+              "transferExpression" : {
+                "priceTransfer" : "Upfront"
               }
             },
             "meta" : {
-              "globalKey" : "98e1dbe8"
+              "globalKey" : "57999eaa"
             }
           } ],
           "meta" : {
-            "globalKey" : "2468dfca"
+            "globalKey" : "40faadd"
           }
-        },
-        "meta" : {
-          "globalKey" : "c908bf0d"
-        },
-        "party" : [ {
-          "businessUnit" : [ {
-            "contactInformation" : {
-              "address" : [ {
-                "city" : "New York",
-                "country" : {
-                  "value" : "US"
-                },
-                "postalCode" : "10017",
-                "state" : "NY",
-                "street" : [ "123 Park Avenue" ]
-              } ]
-            },
-            "meta" : {
-              "externalKey" : "branch1",
-              "globalKey" : "69aea9de"
-            },
-            "name" : "New York Office"
-          }, {
+        }
+      }
+    } ],
+    "eventQualifier" : "ContractFormation",
+    "after" : [ {
+      "trade" : {
+        "tradeIdentifier" : [ {
+          "issuer" : {
+            "value" : "FCHUXIINML",
             "meta" : {
-              "externalKey" : "desk1",
-              "globalKey" : "5c10b72e"
-            },
-            "name" : "NY Swaps Desk"
-          } ],
-          "contactInformation" : {
-            "email" : [ "swap_trading@bankx.com" ]
-          },
-          "meta" : {
-            "externalKey" : "party1",
-            "globalKey" : "e450a87"
-          },
-          "name" : {
-            "value" : "Bank X"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
+            }
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "12345678901234567890123456789012",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "5493001RKR55V4X61F71"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "d0f863bc"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+              }
             }
           } ],
-          "person" : [ {
-            "firstName" : "person",
-            "meta" : {
-              "externalKey" : "broker",
-              "globalKey" : "5b25cf92"
-            },
-            "personId" : [ {
-              "value" : {
-                "identifier" : {
-                  "value" : "person123"
-                },
-                "meta" : {
-                  "globalKey" : "32d9e6bd"
-                }
-              }
-            } ]
-          }, {
-            "firstName" : "person",
-            "meta" : {
-              "externalKey" : "trader",
-              "globalKey" : "5b25db35"
-            },
-            "personId" : [ {
-              "value" : {
-                "identifier" : {
-                  "value" : "person456"
-                },
-                "meta" : {
-                  "globalKey" : "32d9f260"
-                }
-              }
-            } ]
-          } ]
-        }, {
           "meta" : {
-            "externalKey" : "party1_parent",
-            "globalKey" : "956c45f9"
+            "globalKey" : "ce80645"
           },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300O5MFEP1XJ40B47"
-            },
-            "identifierType" : "LEI",
+          "identifierType" : "UniqueTransactionIdentifier"
+        }, {
+          "issuer" : {
+            "value" : "1031234567",
             "meta" : {
-              "globalKey" : "956c45f9"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party1_affiliate1",
-            "globalKey" : "956c45fa"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "12345678901234567890123456789011",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300O5MFEP1XJ40B48"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "956c45fa"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party1_affiliate2",
-            "globalKey" : "956c45fb"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300O5MFEP1XJ40B49"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "956c45fb"
-            }
-          } ]
-        }, {
-          "contactInformation" : {
-            "email" : [ "investments@banky.com" ]
-          },
-          "meta" : {
-            "externalKey" : "party2",
-            "globalKey" : "573ad49d"
-          },
-          "name" : {
-            "value" : "Bank Y"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300O5MFEP1XJ40B46"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "956c45f8"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party2_parent",
-            "globalKey" : "956c45f9"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300O5MFEP1XJ40B47"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "956c45f9"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party2_affiliate1",
-            "globalKey" : "956c45fa"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300O5MFEP1XJ40B48"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "956c45fa"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "broker1",
-            "globalKey" : "ed0cc6d1"
-          },
-          "name" : {
-            "value" : "Up&Atem"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300OL8KL0WCQ34V31"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "8ffabe4b"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "executing_agent",
-            "globalKey" : "49e97697"
-          },
-          "name" : {
-            "value" : "XYZ Bank"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND22"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e213e774"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "venue",
-            "globalKey" : "6ebddc37"
-          },
-          "name" : {
-            "value" : "SEFCo LLC"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND11"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e213e754"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing-svc",
-            "globalKey" : "611719a0"
-          },
-          "name" : {
-            "value" : "ClearItAll"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND58"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e213e7d7"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+              }
             }
-          } ]
-        }, {
+          } ],
           "meta" : {
-            "externalKey" : "original_sdr",
-            "globalKey" : "9b321c78"
-          },
-          "name" : {
-            "value" : "WorldWide Trade Repository"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND58"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e213e7d7"
-            }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "e450a87"
-          },
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "573ad49d"
+            "globalKey" : "671d1c67"
           },
-          "role" : "REPORTING_PARTY"
+          "identifierType" : "UniqueTransactionIdentifier"
         } ],
+        "tradeDate" : {
+          "value" : "2011-02-12",
+          "meta" : {
+            "globalKey" : "3ed88c"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "573ad49d"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "e450a87"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "meta" : {
-                      "scheme" : "http://www.theice.com/coding-scheme/product-id"
-                    },
-                    "value" : "X123"
-                  },
-                  "meta" : {
-                    "globalKey" : "e6a349ca"
-                  },
-                  "source" : "OTHER"
-                }
-              } ],
               "productTaxonomy" : [ {
                 "primaryAssetClass" : {
-                  "value" : "CREDIT"
+                  "value" : "Credit"
                 }
               }, {
-                "source" : "OTHER",
+                "source" : "Other",
                 "value" : {
                   "name" : {
+                    "value" : "SecurityBasedSwap",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/sec-product-category"
-                    },
-                    "value" : "SecurityBasedSwap"
+                    }
                   }
                 }
               }, {
-                "source" : "OTHER",
+                "source" : "Other",
                 "value" : {
                   "name" : {
+                    "value" : "Credi Default Swap",
                     "meta" : {
                       "scheme" : "http://www.theice.com/coding-scheme/product-name"
-                    },
-                    "value" : "Credi Default Swap"
+                    }
                   }
                 }
               }, {
-                "source" : "OTHER",
+                "source" : "Other",
                 "value" : {
                   "name" : {
                     "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
@@ -1200,331 +838,685 @@
                 "source" : "ISDA",
                 "productQualifier" : "CreditDefaultSwap_SingleName"
               } ],
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "X123",
+                    "meta" : {
+                      "scheme" : "http://www.theice.com/coding-scheme/product-id"
+                    }
+                  },
+                  "source" : "Other",
+                  "meta" : {
+                    "globalKey" : "e6a349ca"
+                  }
+                }
+              } ],
               "economicTerms" : {
                 "effectiveDate" : {
                   "adjustableDate" : {
+                    "unadjustedDate" : "2009-03-26",
                     "meta" : {
                       "globalKey" : "3ec8da"
-                    },
-                    "unadjustedDate" : "2009-03-26"
+                    }
                   },
                   "meta" : {
                     "globalKey" : "3ec8da"
                   }
                 },
+                "terminationDate" : {
+                  "adjustableDate" : {
+                    "unadjustedDate" : "2014-06-20",
+                    "meta" : {
+                      "globalKey" : "3ef194"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3ef194"
+                  }
+                },
                 "payout" : {
-                  "creditDefaultPayout" : {
+                  "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "generalTerms" : {
-                      "referenceInformation" : {
-                        "referenceEntity" : {
-                          "entityId" : [ {
-                            "meta" : {
-                              "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                            },
-                            "value" : "8G836J"
-                          } ],
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
+                    "calculationPeriodDates" : {
+                      "firstPeriodStartDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2009-03-20",
                           "meta" : {
-                            "externalKey" : "referenceEntity",
-                            "globalKey" : "54140007"
-                          },
-                          "name" : {
-                            "value" : "TENET HEALTHCARE CORPORATION"
+                            "globalKey" : "3ec8d4"
                           }
                         },
-                        "referenceObligation" : [ {
-                          "security" : {
-                            "productIdentifier" : [ {
-                              "value" : {
-                                "identifier" : {
-                                  "meta" : {
-                                    "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair-1-0"
-                                  },
-                                  "value" : "8G836JAF2"
-                                },
-                                "meta" : {
-                                  "globalKey" : "1165f83f"
-                                },
-                                "source" : "OTHER"
-                              }
-                            } ],
-                            "securityType" : "DEBT"
-                          }
-                        } ]
-                      }
-                    },
-                    "meta" : {
-                      "globalKey" : "2fa76fbc"
-                    },
-                    "transactedPrice" : {
-                      "marketFixedRate" : 0.02
-                    }
-                  },
-                  "interestRatePayout" : [ {
-                    "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
-                    },
-                    "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "quantitySchedule" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "quantity-1"
+                        "meta" : {
+                          "globalKey" : "3ec8d4"
                         }
-                      }
-                    },
-                    "calculationPeriodDates" : {
+                      },
                       "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
                         "meta" : {
-                          "globalKey" : "28c47"
+                          "globalKey" : "17f73"
                         },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
                         "rollConvention" : "20"
                       },
-                      "firstPeriodStartDate" : {
-                        "adjustableDate" : {
-                          "meta" : {
-                            "globalKey" : "3ec8d4"
-                          },
-                          "unadjustedDate" : "2009-03-20"
-                        },
+                      "meta" : {
+                        "globalKey" : "bf47be47"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
                         "meta" : {
-                          "globalKey" : "3ec8d4"
+                          "globalKey" : "aa"
                         }
                       },
+                      "firstPaymentDate" : "2009-06-20",
                       "meta" : {
-                        "globalKey" : "28c1032d"
+                        "globalKey" : "8aa3de96"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "6afbe26c"
+                      "globalKey" : "eff49770"
+                    }
+                  } ],
+                  "creditDefaultPayout" : {
+                    "payerReceiver" : {
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
-                    "paymentDates" : {
-                      "firstPaymentDate" : "2009-06-20",
-                      "meta" : {
-                        "globalKey" : "8aa3e742"
+                    "priceQuantity" : {
+                      "quantitySchedule" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "quantity-1"
+                        }
                       },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
+                    "generalTerms" : {
+                      "referenceInformation" : {
+                        "referenceEntity" : {
+                          "entityId" : [ {
+                            "value" : "8G836J",
+                            "meta" : {
+                              "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
                             }
+                          } ],
+                          "name" : {
+                            "value" : "TENET HEALTHCARE CORPORATION"
+                          },
+                          "meta" : {
+                            "globalKey" : "54140007",
+                            "externalKey" : "referenceEntity"
                           }
-                        }
+                        },
+                        "referenceObligation" : [ {
+                          "security" : {
+                            "productIdentifier" : [ {
+                              "value" : {
+                                "identifier" : {
+                                  "value" : "8G836JAF2",
+                                  "meta" : {
+                                    "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair-1-0"
+                                  }
+                                },
+                                "source" : "Other",
+                                "meta" : {
+                                  "globalKey" : "1165f83f"
+                                }
+                              }
+                            } ],
+                            "securityType" : "Debt"
+                          }
+                        } ]
                       }
-                    }
-                  } ],
-                  "meta" : {
-                    "globalKey" : "1fd4e030"
-                  }
-                },
-                "terminationDate" : {
-                  "adjustableDate" : {
-                    "meta" : {
-                      "globalKey" : "3ef194"
                     },
-                    "unadjustedDate" : "2014-06-20"
+                    "transactedPrice" : {
+                      "marketFixedRate" : 0.02
+                    },
+                    "meta" : {
+                      "globalKey" : "2fa76fbc"
+                    }
                   },
                   "meta" : {
-                    "globalKey" : "3ef194"
+                    "globalKey" : "a7b3d32c"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "7d137866"
+                "globalKey" : "819b3a8a"
               }
             },
             "meta" : {
-              "globalKey" : "7d137866"
+              "globalKey" : "819b3a8a"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "1f273178"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.01,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.01,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "1a10e2d1"
-              },
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "c5befd88"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 5000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 5000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "280b774f"
+              }
             } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "d0b9c5dd",
+              "externalReference" : "party2"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "1bec43b5",
+              "externalReference" : "party1"
+            }
           } ]
         },
-        "tradeDate" : {
+        "party" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "5493001RKR55V4X61F71",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "d0f863bc"
+            }
+          } ],
+          "name" : {
+            "value" : "Bank X"
+          },
+          "businessUnit" : [ {
+            "name" : "New York Office",
+            "contactInformation" : {
+              "address" : [ {
+                "street" : [ "123 Park Avenue" ],
+                "city" : "New York",
+                "state" : "NY",
+                "country" : {
+                  "value" : "US"
+                },
+                "postalCode" : "10017"
+              } ]
+            },
+            "meta" : {
+              "globalKey" : "e15b99b0",
+              "externalKey" : "branch1"
+            }
+          }, {
+            "name" : "NY Swaps Desk",
+            "meta" : {
+              "globalKey" : "5c10b72e",
+              "externalKey" : "desk1"
+            }
+          } ],
+          "person" : [ {
+            "personId" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "person123"
+                },
+                "meta" : {
+                  "globalKey" : "32d9e6bd"
+                }
+              }
+            } ],
+            "firstName" : "person",
+            "meta" : {
+              "globalKey" : "5b25cf92",
+              "externalKey" : "broker"
+            }
+          }, {
+            "personId" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "person456"
+                },
+                "meta" : {
+                  "globalKey" : "32d9f260"
+                }
+              }
+            } ],
+            "firstName" : "person",
+            "meta" : {
+              "globalKey" : "5b25db35",
+              "externalKey" : "trader"
+            }
+          } ],
+          "contactInformation" : {
+            "email" : [ "swap_trading@bankx.com" ]
+          },
           "meta" : {
-            "globalKey" : "3ed88c"
+            "globalKey" : "1bec43b5",
+            "externalKey" : "party1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300O5MFEP1XJ40B47",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "956c45f9"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "956c45f9",
+            "externalKey" : "party1_parent"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300O5MFEP1XJ40B48",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "956c45fa"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "956c45fa",
+            "externalKey" : "party1_affiliate1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300O5MFEP1XJ40B49",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "956c45fb"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "956c45fb",
+            "externalKey" : "party1_affiliate2"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300O5MFEP1XJ40B46",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "956c45f8"
+            }
+          } ],
+          "name" : {
+            "value" : "Bank Y"
           },
-          "value" : "2011-02-12"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
+          "contactInformation" : {
+            "email" : [ "investments@banky.com" ]
+          },
+          "meta" : {
+            "globalKey" : "d0b9c5dd",
+            "externalKey" : "party2"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "549300O5MFEP1XJ40B47",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-              },
-              "value" : "12345678901234567890123456789012"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "956c45f9"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "956c45f9",
+            "externalKey" : "party2_parent"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300O5MFEP1XJ40B48",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
+              "globalKey" : "956c45fa"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "956c45fa",
+            "externalKey" : "party2_affiliate1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300OL8KL0WCQ34V31",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "8ffabe4b"
+            }
+          } ],
+          "name" : {
+            "value" : "Up&Atem"
+          },
+          "meta" : {
+            "globalKey" : "ce0b9311",
+            "externalKey" : "broker1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300IB5Q45JGNPND22",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
             },
-            "value" : "FCHUXIINML"
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e774"
+            }
+          } ],
+          "name" : {
+            "value" : "XYZ Bank"
           },
           "meta" : {
-            "globalKey" : "1551a427"
+            "globalKey" : "61a07317",
+            "externalKey" : "executing_agent"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300IB5Q45JGNPND11",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e754"
+            }
+          } ],
+          "name" : {
+            "value" : "SEFCo LLC"
           },
-          "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
+          "meta" : {
+            "globalKey" : "ae0d40b7",
+            "externalKey" : "venue"
+          }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "549300IB5Q45JGNPND58",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e7d7"
+            }
+          } ],
+          "name" : {
+            "value" : "ClearItAll"
+          },
+          "meta" : {
+            "globalKey" : "f6a6cc60",
+            "externalKey" : "clearing-svc"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300IB5Q45JGNPND58",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e7d7"
+            }
+          } ],
+          "name" : {
+            "value" : "WorldWide Trade Repository"
+          },
+          "meta" : {
+            "globalKey" : "4ba4fb38",
+            "externalKey" : "original_sdr"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "d0b9c5dd",
+            "externalReference" : "party2"
+          },
+          "role" : "ReportingParty",
+          "ownershipPartyReference" : {
+            "globalReference" : "1bec43b5",
+            "externalReference" : "party1"
+          }
+        } ],
+        "contractDetails" : {
+          "documentation" : [ {
+            "agreementDate" : "2002-01-05",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster"
+                }
               },
-              "value" : "12345678901234567890123456789011"
+              "vintage" : 1992
+            },
+            "meta" : {
+              "globalKey" : "4f2097d4"
+            }
+          }, {
+            "agreementDate" : "2002-01-07",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "ISDA2003CreditNorthAmerican"
+                }
+              }
+            },
+            "meta" : {
+              "globalKey" : "5d7949e5"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "CreditSupportAgreement"
+              }
+            },
+            "meta" : {
+              "globalKey" : "984ae6d0"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix"
+                  },
+                  "matrixTerm" : {
+                    "value" : "StandardNorthAmericanCorporate"
+                  }
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "9ed2f955"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Other",
+                "otherAgreement" : "Custom Legal Agreement"
+              }
+            },
+            "meta" : {
+              "globalKey" : "98e1dbe8"
             }
           } ],
-          "issuer" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-            },
-            "value" : "1031234567"
-          },
           "meta" : {
-            "globalKey" : "f6e8a927"
-          },
-          "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-        } ]
+            "globalKey" : "396e114a"
+          }
+        },
+        "meta" : {
+          "globalKey" : "c63b45bd"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
       },
       "transferHistory" : [ {
-        "meta" : {
-          "globalKey" : "8af8663c"
-        },
         "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "e450a87"
-            },
-            "receiverPartyReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "573ad49d"
-            }
-          },
           "quantity" : {
+            "value" : 1000,
             "unit" : {
               "currency" : {
                 "value" : "USD"
               }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "1bec43b5",
+              "externalReference" : "party1"
             },
-            "value" : 1000
+            "receiverPartyReference" : {
+              "globalReference" : "d0b9c5dd",
+              "externalReference" : "party2"
+            }
           },
           "settlementDate" : {
+            "unadjustedDate" : "2009-03-28",
             "adjustedDate" : {
+              "value" : "2009-03-30",
               "meta" : {
                 "globalKey" : "3ec8de"
-              },
-              "value" : "2009-03-30"
-            },
-            "unadjustedDate" : "2009-03-28"
+              }
+            }
           },
           "transferExpression" : {
-            "priceTransfer" : "UPFRONT"
+            "priceTransfer" : "Upfront"
           }
+        },
+        "meta" : {
+          "globalKey" : "57999eaa"
         }
-      } ]
-    } ],
-    "eventQualifier" : "ContractFormation",
-    "meta" : {
-      "globalKey" : "bc8781d1"
-    }
-  },
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "BANKX0001"
+      } ],
+      "meta" : {
+        "globalKey" : "d0f0fd8a"
       }
     } ],
     "meta" : {
-      "globalKey" : "3ce1279d"
+      "globalKey" : "7b3d309f"
     }
-  } ],
+  },
+  "previousWorkflowStep" : {
+    "globalReference" : "f6ef25ff"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "BANKX0001",
       "meta" : {
         "scheme" : "http://www.bankx.com/msg_id"
-      },
-      "value" : "BANKX0001"
+      }
     },
     "sentBy" : {
       "value" : "BANKX"
@@ -1533,62 +1525,65 @@
       "value" : "SDR01"
     } ]
   },
-  "meta" : {
-    "globalKey" : "d9a607a9"
-  },
+  "timestamp" : [ {
+    "dateTime" : "2011-02-12T12:42:16Z",
+    "qualification" : "eventCreationDateTime"
+  }, {
+    "dateTime" : "2011-02-12T12:20:47Z",
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "BANKX0001"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "3ce1279d"
+    }
+  } ],
+  "action" : "New",
   "party" : [ {
+    "partyId" : [ {
+      "identifier" : {
+        "value" : "5493001RKR55V4X61F71",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+        }
+      },
+      "identifierType" : "LEI",
+      "meta" : {
+        "globalKey" : "d0f863bc"
+      }
+    } ],
+    "name" : {
+      "value" : "Bank X"
+    },
     "businessUnit" : [ {
+      "name" : "New York Office",
       "contactInformation" : {
         "address" : [ {
+          "street" : [ "123 Park Avenue" ],
           "city" : "New York",
+          "state" : "NY",
           "country" : {
             "value" : "US"
           },
-          "postalCode" : "10017",
-          "state" : "NY",
-          "street" : [ "123 Park Avenue" ]
+          "postalCode" : "10017"
         } ]
       },
       "meta" : {
-        "externalKey" : "branch1",
-        "globalKey" : "69aea9de"
-      },
-      "name" : "New York Office"
+        "globalKey" : "e15b99b0",
+        "externalKey" : "branch1"
+      }
     }, {
+      "name" : "NY Swaps Desk",
       "meta" : {
-        "externalKey" : "desk1",
-        "globalKey" : "5c10b72e"
-      },
-      "name" : "NY Swaps Desk"
-    } ],
-    "contactInformation" : {
-      "email" : [ "swap_trading@bankx.com" ]
-    },
-    "meta" : {
-      "externalKey" : "party1",
-      "globalKey" : "e450a87"
-    },
-    "name" : {
-      "value" : "Bank X"
-    },
-    "partyId" : [ {
-      "identifier" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "5493001RKR55V4X61F71"
-      },
-      "identifierType" : "LEI",
-      "meta" : {
-        "globalKey" : "d0f863bc"
+        "globalKey" : "5c10b72e",
+        "externalKey" : "desk1"
       }
     } ],
     "person" : [ {
-      "firstName" : "person",
-      "meta" : {
-        "externalKey" : "broker",
-        "globalKey" : "5b25cf92"
-      },
       "personId" : [ {
         "value" : {
           "identifier" : {
@@ -1598,13 +1593,13 @@
             "globalKey" : "32d9e6bd"
           }
         }
-      } ]
-    }, {
+      } ],
       "firstName" : "person",
       "meta" : {
-        "externalKey" : "trader",
-        "globalKey" : "5b25db35"
-      },
+        "globalKey" : "5b25cf92",
+        "externalKey" : "broker"
+      }
+    }, {
       "personId" : [ {
         "value" : {
           "identifier" : {
@@ -1614,225 +1609,230 @@
             "globalKey" : "32d9f260"
           }
         }
-      } ]
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "party1_parent",
-      "globalKey" : "956c45f9"
+      } ],
+      "firstName" : "person",
+      "meta" : {
+        "globalKey" : "5b25db35",
+        "externalKey" : "trader"
+      }
+    } ],
+    "contactInformation" : {
+      "email" : [ "swap_trading@bankx.com" ]
     },
+    "meta" : {
+      "globalKey" : "1bec43b5",
+      "externalKey" : "party1"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B47",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B47"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45f9"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "party1_affiliate1",
-      "globalKey" : "956c45fa"
-    },
+      "globalKey" : "956c45f9",
+      "externalKey" : "party1_parent"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B48",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B48"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45fa"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "party1_affiliate2",
-      "globalKey" : "956c45fb"
-    },
+      "globalKey" : "956c45fa",
+      "externalKey" : "party1_affiliate1"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B49",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B49"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45fb"
       }
-    } ]
-  }, {
-    "contactInformation" : {
-      "email" : [ "investments@banky.com" ]
-    },
+    } ],
     "meta" : {
-      "externalKey" : "party2",
-      "globalKey" : "573ad49d"
-    },
-    "name" : {
-      "value" : "Bank Y"
-    },
+      "globalKey" : "956c45fb",
+      "externalKey" : "party1_affiliate2"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B46",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B46"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45f8"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "party2_parent",
-      "globalKey" : "956c45f9"
+    } ],
+    "name" : {
+      "value" : "Bank Y"
+    },
+    "contactInformation" : {
+      "email" : [ "investments@banky.com" ]
     },
+    "meta" : {
+      "globalKey" : "d0b9c5dd",
+      "externalKey" : "party2"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B47",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B47"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45f9"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "party2_affiliate1",
-      "globalKey" : "956c45fa"
-    },
+      "globalKey" : "956c45f9",
+      "externalKey" : "party2_parent"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B48",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B48"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45fa"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "broker1",
-      "globalKey" : "ed0cc6d1"
-    },
-    "name" : {
-      "value" : "Up&Atem"
-    },
+      "globalKey" : "956c45fa",
+      "externalKey" : "party2_affiliate1"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300OL8KL0WCQ34V31",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300OL8KL0WCQ34V31"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "8ffabe4b"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "executing_agent",
-      "globalKey" : "49e97697"
-    },
+    } ],
     "name" : {
-      "value" : "XYZ Bank"
+      "value" : "Up&Atem"
     },
+    "meta" : {
+      "globalKey" : "ce0b9311",
+      "externalKey" : "broker1"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300IB5Q45JGNPND22",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND22"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "e213e774"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "venue",
-      "globalKey" : "6ebddc37"
-    },
+    } ],
     "name" : {
-      "value" : "SEFCo LLC"
+      "value" : "XYZ Bank"
     },
+    "meta" : {
+      "globalKey" : "61a07317",
+      "externalKey" : "executing_agent"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300IB5Q45JGNPND11",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND11"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "e213e754"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "clearing-svc",
-      "globalKey" : "611719a0"
-    },
+    } ],
     "name" : {
-      "value" : "ClearItAll"
+      "value" : "SEFCo LLC"
     },
+    "meta" : {
+      "globalKey" : "ae0d40b7",
+      "externalKey" : "venue"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300IB5Q45JGNPND58",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND58"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "e213e7d7"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "original_sdr",
-      "globalKey" : "9b321c78"
-    },
+    } ],
     "name" : {
-      "value" : "WorldWide Trade Repository"
+      "value" : "ClearItAll"
     },
+    "meta" : {
+      "globalKey" : "f6a6cc60",
+      "externalKey" : "clearing-svc"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300IB5Q45JGNPND58",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND58"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "e213e7d7"
       }
-    } ]
+    } ],
+    "name" : {
+      "value" : "WorldWide Trade Repository"
+    },
+    "meta" : {
+      "globalKey" : "4ba4fb38",
+      "externalKey" : "original_sdr"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "75570423"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2011-02-12T12:42:16Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  }, {
-    "dateTime" : "2011-02-12T12:20:47Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+  "meta" : {
+    "globalKey" : "7413feb3"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex51-execution-advice-trade-initiation-C01-00-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex51-execution-advice-trade-initiation-C01-00-func-output.json
index 3df06ee109..16285a62c5 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex51-execution-advice-trade-initiation-C01-00-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex51-execution-advice-trade-initiation-C01-00-func-output.json
@@ -1,157 +1,57 @@
 {
-  "account" : [ {
-    "accountBeneficiary" : {
-      "externalReference" : "_fund",
-      "globalReference" : "7233a0bd"
-    },
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "http://www.imgr.com/schemes/account-id"
-      },
-      "value" : "FUND100"
-    },
-    "meta" : {
-      "externalKey" : "_FUNDACCT",
-      "globalKey" : "84e15365"
-    }
-  }, {
-    "accountBeneficiary" : {
-      "externalReference" : "_cust",
-      "globalReference" : "6f1f29ef"
-    },
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "http://www.custodian.com/account-id"
-      },
-      "value" : "98765"
-    },
-    "meta" : {
-      "externalKey" : "_CUSTACCT",
-      "globalKey" : "4d6768f4"
-    }
-  } ],
-  "action" : "NEW",
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "2009-05-22",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "ISDA2003StandardCreditNorthAmerican"
+                }
+              }
+            },
+            "meta" : {
+              "globalKey" : "e0202540"
+            }
+          } ]
+        }
+      },
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "d0f44484"
-          },
           "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "_fund",
-                "globalReference" : "7233a0bd"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "29bfd33d",
+                "externalReference" : "_fund"
               },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.imgr.com/schemes/account-id"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CONTR2345",
+                  "meta" : {
+                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+                  }
                 },
-                "value" : "FUND100"
-              },
+                "version" : 1
+              } ],
               "meta" : {
-                "externalKey" : "_FUNDACCT",
-                "globalKey" : "84e15365"
+                "globalKey" : "9c14363c"
               }
-            }, {
-              "accountBeneficiary" : {
-                "externalReference" : "_cust",
-                "globalReference" : "6f1f29ef"
-              },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.custodian.com/account-id"
-                },
-                "value" : "98765"
-              },
+            } ],
+            "tradeDate" : {
+              "value" : "2009-06-08",
               "meta" : {
-                "externalKey" : "_CUSTACCT",
-                "globalKey" : "4d6768f4"
+                "globalKey" : "3ec988"
               }
-            } ],
-            "meta" : {
-              "globalKey" : "e51cd0ec"
             },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "_fund",
-                "globalKey" : "7233a0bd"
-              },
-              "name" : {
-                "value" : "INVEST MGR"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "959800NKRMZ8NEKQ0A23"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "696247f0"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_broker",
-                "globalKey" : "9627fd8c"
-              },
-              "name" : {
-                "value" : "BROKER 33"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300E4CDNNLJRBKF36"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "ea328105"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_cust",
-                "globalKey" : "6f1f29ef"
-              },
-              "name" : {
-                "value" : "Custodian"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300FNRNXH6KYKUK07"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "aefc2f21"
-                }
-              } ]
-            } ],
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "7233a0bd"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "9627fd8c"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
                         "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
@@ -164,463 +64,423 @@
                   "economicTerms" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2009-06-09",
                         "meta" : {
                           "globalKey" : "3ec989"
-                        },
-                        "unadjustedDate" : "2009-06-09"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "3ec989"
                       }
                     },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2012-06-20",
+                        "meta" : {
+                          "globalKey" : "3ee194"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ee194"
+                      }
+                    },
                     "payout" : {
-                      "creditDefaultPayout" : {
+                      "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
+                          }
+                        },
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "calculationPeriodDates" : {
+                          "firstPeriodStartDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2009-03-20",
+                              "meta" : {
+                                "globalKey" : "3ec8d4"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3ec8d4"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
                           "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
+                            "globalKey" : "bf47be47"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
+                          "firstPaymentDate" : "2009-06-20",
+                          "meta" : {
+                            "globalKey" : "8aa3de96"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "eff49770"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
                         "generalTerms" : {
                           "referenceInformation" : {
                             "referenceEntity" : {
                               "entityId" : [ {
+                                "value" : "0E69A8",
                                 "meta" : {
                                   "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                                },
-                                "value" : "0E69A8"
+                                }
                               } ],
-                              "meta" : {
-                                "globalKey" : "717c0b9e"
-                              },
                               "name" : {
                                 "value" : "0E69A8"
+                              },
+                              "meta" : {
+                                "globalKey" : "717c0b9e"
                               }
                             },
                             "referenceObligation" : [ {
-                              "primaryObligor" : {
-                                "entityId" : [ {
-                                  "meta" : {
-                                    "scheme" : "http://www.imgr.com/schemes/entity-id"
-                                  },
-                                  "value" : "ARW"
-                                } ],
-                                "meta" : {
-                                  "globalKey" : "3bb830c"
-                                },
-                                "name" : {
-                                  "value" : "ARW"
-                                }
-                              },
                               "security" : {
                                 "productIdentifier" : [ {
                                   "value" : {
                                     "identifier" : {
+                                      "value" : "US042735AL41",
                                       "meta" : {
                                         "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                                      },
-                                      "value" : "US042735AL41"
+                                      }
                                     },
+                                    "source" : "ISIN",
                                     "meta" : {
                                       "globalKey" : "42958b00"
-                                    },
-                                    "source" : "ISIN"
+                                    }
+                                  }
+                                } ],
+                                "securityType" : "Debt"
+                              },
+                              "primaryObligor" : {
+                                "entityId" : [ {
+                                  "value" : "ARW",
+                                  "meta" : {
+                                    "scheme" : "http://www.imgr.com/schemes/entity-id"
                                   }
                                 } ],
-                                "securityType" : "DEBT"
+                                "name" : {
+                                  "value" : "ARW"
+                                },
+                                "meta" : {
+                                  "globalKey" : "3bb830c"
+                                }
                               }
                             } ]
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "110ba297"
-                        },
                         "protectionTerms" : [ {
                           "creditEvents" : {
-                            "meta" : {
-                              "globalKey" : "4cf"
-                            },
                             "restructuring" : {
                               "applicable" : true
+                            },
+                            "meta" : {
+                              "globalKey" : "4cf"
                             }
                           },
                           "meta" : {
                             "globalKey" : "4cf"
                           }
-                        } ]
+                        } ],
+                        "meta" : {
+                          "globalKey" : "2779e5e9"
+                        }
                       },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
-                          "firstPeriodStartDate" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3ec8d4"
-                              },
-                              "unadjustedDate" : "2009-03-20"
-                            },
-                            "meta" : {
-                              "globalKey" : "3ec8d4"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "28c1032d"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "6afbe26c"
-                        },
-                        "paymentDates" : {
-                          "firstPaymentDate" : "2009-06-20",
-                          "meta" : {
-                            "globalKey" : "8aa3e742"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      } ],
                       "meta" : {
-                        "globalKey" : "f7ca9435"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3ee194"
-                        },
-                        "unadjustedDate" : "2012-06-20"
-                      },
-                      "meta" : {
-                        "globalKey" : "3ee194"
+                        "globalKey" : "50cbc479"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "bdb3d360"
+                    "globalKey" : "92d47086"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "bdb3d360"
+                  "globalKey" : "92d47086"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "478ae7c4"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.023,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.023,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "51c414ad"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a9d210bc"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 70000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 70000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "e6be80f3"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "29bfd33d",
+                  "externalReference" : "_fund"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "7e552bcc",
+                  "externalReference" : "_broker"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ec988"
-              },
-              "value" : "2009-06-08"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "959800NKRMZ8NEKQ0A23",
                   "meta" : {
-                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-                  },
-                  "value" : "CONTR2345"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "version" : 1
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "696247f0"
+                }
               } ],
-              "issuerReference" : {
-                "externalReference" : "_fund",
-                "globalReference" : "7233a0bd"
+              "name" : {
+                "value" : "INVEST MGR"
               },
               "meta" : {
-                "globalKey" : "6c977856"
+                "globalKey" : "29bfd33d",
+                "externalKey" : "_fund"
               }
-            } ]
-          },
-          "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "6e88cd98"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "7233a0bd"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300E4CDNNLJRBKF36",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "receiverPartyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "9627fd8c"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "ea328105"
                 }
+              } ],
+              "name" : {
+                "value" : "BROKER 33"
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
+              "meta" : {
+                "globalKey" : "7e552bcc",
+                "externalKey" : "_broker"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300FNRNXH6KYKUK07",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
-                "value" : 387300
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "aefc2f21"
+                }
+              } ],
+              "name" : {
+                "value" : "Custodian"
               },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
+              "meta" : {
+                "globalKey" : "b8297caf",
+                "externalKey" : "_cust"
               }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "2009-05-22",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "ISDA_2003_STANDARD_CREDIT_NORTH_AMERICAN"
+            } ],
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "FUND100",
+                "meta" : {
+                  "scheme" : "http://www.imgr.com/schemes/account-id"
                 }
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "29bfd33d",
+                "externalReference" : "_fund"
+              },
+              "meta" : {
+                "globalKey" : "287ed38d",
+                "externalKey" : "_FUNDACCT"
               }
-            },
-            "meta" : {
-              "globalKey" : "e0202540"
-            }
-          } ]
-        }
-      }
-    } ],
-    "intent" : "CONTRACT_FORMATION",
-    "after" : [ {
-      "meta" : {
-        "globalKey" : "f209b4a7"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
-      "trade" : {
-        "account" : [ {
-          "accountBeneficiary" : {
-            "externalReference" : "_fund",
-            "globalReference" : "7233a0bd"
-          },
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "http://www.imgr.com/schemes/account-id"
-            },
-            "value" : "FUND100"
-          },
-          "meta" : {
-            "externalKey" : "_FUNDACCT",
-            "globalKey" : "84e15365"
-          }
-        }, {
-          "accountBeneficiary" : {
-            "externalReference" : "_cust",
-            "globalReference" : "6f1f29ef"
-          },
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "http://www.custodian.com/account-id"
-            },
-            "value" : "98765"
-          },
-          "meta" : {
-            "externalKey" : "_CUSTACCT",
-            "globalKey" : "4d6768f4"
-          }
-        } ],
-        "contractDetails" : {
-          "documentation" : [ {
-            "agreementDate" : "2009-05-22",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "ISDA_2003_STANDARD_CREDIT_NORTH_AMERICAN"
+            }, {
+              "accountNumber" : {
+                "value" : "98765",
+                "meta" : {
+                  "scheme" : "http://www.custodian.com/account-id"
                 }
-              }
-            },
-            "meta" : {
-              "globalKey" : "e0202540"
-            }
-          } ],
-          "meta" : {
-            "globalKey" : "e0202540"
-          }
-        },
-        "meta" : {
-          "globalKey" : "3a3c62ac"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "_fund",
-            "globalKey" : "7233a0bd"
-          },
-          "name" : {
-            "value" : "INVEST MGR"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
               },
-              "value" : "959800NKRMZ8NEKQ0A23"
-            },
-            "identifierType" : "LEI",
+              "accountBeneficiary" : {
+                "globalReference" : "b8297caf",
+                "externalReference" : "_cust"
+              },
+              "meta" : {
+                "globalKey" : "9385d966",
+                "externalKey" : "_CUSTACCT"
+              }
+            } ],
             "meta" : {
-              "globalKey" : "696247f0"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "_broker",
-            "globalKey" : "9627fd8c"
-          },
-          "name" : {
-            "value" : "BROKER 33"
+              "globalKey" : "1d865748"
+            }
           },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "transferHistory" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 387300,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "29bfd33d",
+                  "externalReference" : "_fund"
+                },
+                "receiverPartyReference" : {
+                  "globalReference" : "7e552bcc",
+                  "externalReference" : "_broker"
+                }
               },
-              "value" : "549300E4CDNNLJRBKF36"
+              "transferExpression" : {
+                "priceTransfer" : "Upfront"
+              }
             },
-            "identifierType" : "LEI",
             "meta" : {
-              "globalKey" : "ea328105"
+              "globalKey" : "baa18f84"
             }
-          } ]
-        }, {
+          } ],
           "meta" : {
-            "externalKey" : "_cust",
-            "globalKey" : "6f1f29ef"
-          },
-          "name" : {
-            "value" : "Custodian"
+            "globalKey" : "b847aacc"
+          }
+        }
+      }
+    } ],
+    "eventQualifier" : "ContractFormation",
+    "after" : [ {
+      "trade" : {
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "29bfd33d",
+            "externalReference" : "_fund"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "CONTR2345",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300FNRNXH6KYKUK07"
+                "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+              }
             },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "aefc2f21"
-            }
-          } ]
+            "version" : 1
+          } ],
+          "meta" : {
+            "globalKey" : "9c14363c"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2009-06-08",
+          "meta" : {
+            "globalKey" : "3ec988"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "_fund",
-              "globalReference" : "7233a0bd"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "_broker",
-              "globalReference" : "9627fd8c"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
-                "source" : "OTHER",
+                "source" : "Other",
                 "value" : {
                   "name" : {
                     "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
@@ -633,323 +493,424 @@
               "economicTerms" : {
                 "effectiveDate" : {
                   "adjustableDate" : {
+                    "unadjustedDate" : "2009-06-09",
                     "meta" : {
                       "globalKey" : "3ec989"
-                    },
-                    "unadjustedDate" : "2009-06-09"
+                    }
                   },
                   "meta" : {
                     "globalKey" : "3ec989"
                   }
                 },
+                "terminationDate" : {
+                  "adjustableDate" : {
+                    "unadjustedDate" : "2012-06-20",
+                    "meta" : {
+                      "globalKey" : "3ee194"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3ee194"
+                  }
+                },
                 "payout" : {
-                  "creditDefaultPayout" : {
+                  "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
+                      "quantitySchedule" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "quantity-1"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0",
+                        "externalKey" : "calculationAmount"
+                      }
+                    },
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
+                    "calculationPeriodDates" : {
+                      "firstPeriodStartDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2009-03-20",
+                          "meta" : {
+                            "globalKey" : "3ec8d4"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "3ec8d4"
+                        }
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "17f73"
+                        },
+                        "rollConvention" : "20"
+                      },
                       "meta" : {
-                        "externalKey" : "calculationAmount",
-                        "globalKey" : "0"
+                        "globalKey" : "bf47be47"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
                       },
+                      "firstPaymentDate" : "2009-06-20",
+                      "meta" : {
+                        "globalKey" : "8aa3de96"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "eff49770"
+                    }
+                  } ],
+                  "creditDefaultPayout" : {
+                    "payerReceiver" : {
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
+                    },
+                    "priceQuantity" : {
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0",
+                        "externalKey" : "calculationAmount"
                       }
                     },
                     "generalTerms" : {
                       "referenceInformation" : {
                         "referenceEntity" : {
                           "entityId" : [ {
+                            "value" : "0E69A8",
                             "meta" : {
                               "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                            },
-                            "value" : "0E69A8"
+                            }
                           } ],
-                          "meta" : {
-                            "globalKey" : "717c0b9e"
-                          },
                           "name" : {
                             "value" : "0E69A8"
+                          },
+                          "meta" : {
+                            "globalKey" : "717c0b9e"
                           }
                         },
                         "referenceObligation" : [ {
-                          "primaryObligor" : {
-                            "entityId" : [ {
-                              "meta" : {
-                                "scheme" : "http://www.imgr.com/schemes/entity-id"
-                              },
-                              "value" : "ARW"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "3bb830c"
-                            },
-                            "name" : {
-                              "value" : "ARW"
-                            }
-                          },
                           "security" : {
                             "productIdentifier" : [ {
                               "value" : {
                                 "identifier" : {
+                                  "value" : "US042735AL41",
                                   "meta" : {
                                     "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                                  },
-                                  "value" : "US042735AL41"
+                                  }
                                 },
+                                "source" : "ISIN",
                                 "meta" : {
                                   "globalKey" : "42958b00"
-                                },
-                                "source" : "ISIN"
+                                }
                               }
                             } ],
-                            "securityType" : "DEBT"
+                            "securityType" : "Debt"
+                          },
+                          "primaryObligor" : {
+                            "entityId" : [ {
+                              "value" : "ARW",
+                              "meta" : {
+                                "scheme" : "http://www.imgr.com/schemes/entity-id"
+                              }
+                            } ],
+                            "name" : {
+                              "value" : "ARW"
+                            },
+                            "meta" : {
+                              "globalKey" : "3bb830c"
+                            }
                           }
                         } ]
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "110ba297"
-                    },
                     "protectionTerms" : [ {
                       "creditEvents" : {
-                        "meta" : {
-                          "globalKey" : "4cf"
-                        },
                         "restructuring" : {
                           "applicable" : true
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "4cf"
-                      }
-                    } ]
-                  },
-                  "interestRatePayout" : [ {
-                    "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
-                    },
-                    "priceQuantity" : {
-                      "meta" : {
-                        "externalKey" : "calculationAmount",
-                        "globalKey" : "0"
-                      },
-                      "quantitySchedule" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "quantity-1"
-                        }
-                      }
-                    },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "28c47"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
-                        "rollConvention" : "20"
-                      },
-                      "firstPeriodStartDate" : {
-                        "adjustableDate" : {
-                          "meta" : {
-                            "globalKey" : "3ec8d4"
-                          },
-                          "unadjustedDate" : "2009-03-20"
                         },
                         "meta" : {
-                          "globalKey" : "3ec8d4"
+                          "globalKey" : "4cf"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "28c1032d"
-                      }
-                    },
-                    "meta" : {
-                      "globalKey" : "6afbe26c"
-                    },
-                    "paymentDates" : {
-                      "firstPaymentDate" : "2009-06-20",
-                      "meta" : {
-                        "globalKey" : "8aa3e742"
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
-                      }
-                    },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  } ],
-                  "meta" : {
-                    "globalKey" : "f7ca9435"
-                  }
-                },
-                "terminationDate" : {
-                  "adjustableDate" : {
+                        "globalKey" : "4cf"
+                      }
+                    } ],
                     "meta" : {
-                      "globalKey" : "3ee194"
-                    },
-                    "unadjustedDate" : "2012-06-20"
+                      "globalKey" : "2779e5e9"
+                    }
                   },
                   "meta" : {
-                    "globalKey" : "3ee194"
+                    "globalKey" : "50cbc479"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "bdb3d360"
+                "globalKey" : "92d47086"
               }
             },
             "meta" : {
-              "globalKey" : "bdb3d360"
+              "globalKey" : "92d47086"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "478ae7c4"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.023,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.023,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "51c414ad"
-              },
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "a9d210bc"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 70000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 70000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "e6be80f3"
+              }
             } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "29bfd33d",
+              "externalReference" : "_fund"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "7e552bcc",
+              "externalReference" : "_broker"
+            }
           } ]
         },
-        "tradeDate" : {
+        "party" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "959800NKRMZ8NEKQ0A23",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "696247f0"
+            }
+          } ],
+          "name" : {
+            "value" : "INVEST MGR"
+          },
           "meta" : {
-            "globalKey" : "3ec988"
+            "globalKey" : "29bfd33d",
+            "externalKey" : "_fund"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300E4CDNNLJRBKF36",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "ea328105"
+            }
+          } ],
+          "name" : {
+            "value" : "BROKER 33"
           },
-          "value" : "2009-06-08"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
+          "meta" : {
+            "globalKey" : "7e552bcc",
+            "externalKey" : "_broker"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "549300FNRNXH6KYKUK07",
               "meta" : {
-                "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-              },
-              "value" : "CONTR2345"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
             },
-            "version" : 1
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "aefc2f21"
+            }
           } ],
-          "issuerReference" : {
-            "externalReference" : "_fund",
-            "globalReference" : "7233a0bd"
+          "name" : {
+            "value" : "Custodian"
           },
           "meta" : {
-            "globalKey" : "6c977856"
+            "globalKey" : "b8297caf",
+            "externalKey" : "_cust"
           }
-        } ]
-      },
-      "transferHistory" : [ {
-        "meta" : {
-          "globalKey" : "6e88cd98"
-        },
-        "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "_fund",
-              "globalReference" : "7233a0bd"
+        } ],
+        "contractDetails" : {
+          "documentation" : [ {
+            "agreementDate" : "2009-05-22",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "ISDA2003StandardCreditNorthAmerican"
+                }
+              }
             },
-            "receiverPartyReference" : {
-              "externalReference" : "_broker",
-              "globalReference" : "9627fd8c"
+            "meta" : {
+              "globalKey" : "e0202540"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e0202540"
+          }
+        },
+        "account" : [ {
+          "accountNumber" : {
+            "value" : "FUND100",
+            "meta" : {
+              "scheme" : "http://www.imgr.com/schemes/account-id"
+            }
+          },
+          "accountBeneficiary" : {
+            "globalReference" : "29bfd33d",
+            "externalReference" : "_fund"
+          },
+          "meta" : {
+            "globalKey" : "287ed38d",
+            "externalKey" : "_FUNDACCT"
+          }
+        }, {
+          "accountNumber" : {
+            "value" : "98765",
+            "meta" : {
+              "scheme" : "http://www.custodian.com/account-id"
             }
           },
+          "accountBeneficiary" : {
+            "globalReference" : "b8297caf",
+            "externalReference" : "_cust"
+          },
+          "meta" : {
+            "globalKey" : "9385d966",
+            "externalKey" : "_CUSTACCT"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "85c9bd88"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
+      },
+      "transferHistory" : [ {
+        "transfer" : {
           "quantity" : {
+            "value" : 387300,
             "unit" : {
               "currency" : {
                 "value" : "USD"
               }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "29bfd33d",
+              "externalReference" : "_fund"
             },
-            "value" : 387300
+            "receiverPartyReference" : {
+              "globalReference" : "7e552bcc",
+              "externalReference" : "_broker"
+            }
           },
           "transferExpression" : {
-            "priceTransfer" : "UPFRONT"
+            "priceTransfer" : "Upfront"
           }
+        },
+        "meta" : {
+          "globalKey" : "baa18f84"
         }
-      } ]
-    } ],
-    "eventQualifier" : "ContractFormation",
-    "meta" : {
-      "globalKey" : "97d247c7"
-    }
-  },
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "IM/5"
+      } ],
+      "meta" : {
+        "globalKey" : "4fab38ef"
       }
     } ],
     "meta" : {
-      "globalKey" : "22560a"
+      "globalKey" : "7257af3f"
     }
-  } ],
+  },
+  "previousWorkflowStep" : {
+    "globalReference" : "cb259a8e"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "IM/5",
       "meta" : {
         "scheme" : "http://www.imgr.com/schemes/message-id"
-      },
-      "value" : "IM/5"
+      }
     },
     "sentBy" : {
       "value" : "IMGRUS6S"
@@ -958,75 +919,114 @@
       "value" : "CUSTUS3T"
     } ]
   },
-  "meta" : {
-    "globalKey" : "539a284e"
-  },
-  "party" : [ {
+  "timestamp" : [ {
+    "dateTime" : "2009-06-08T18:03:09Z",
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "IM/5"
+      }
+    } ],
     "meta" : {
-      "externalKey" : "_fund",
-      "globalKey" : "7233a0bd"
-    },
-    "name" : {
-      "value" : "INVEST MGR"
-    },
+      "globalKey" : "22560a"
+    }
+  } ],
+  "action" : "New",
+  "party" : [ {
     "partyId" : [ {
       "identifier" : {
+        "value" : "959800NKRMZ8NEKQ0A23",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "959800NKRMZ8NEKQ0A23"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "696247f0"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "_broker",
-      "globalKey" : "9627fd8c"
-    },
+    } ],
     "name" : {
-      "value" : "BROKER 33"
+      "value" : "INVEST MGR"
     },
+    "meta" : {
+      "globalKey" : "29bfd33d",
+      "externalKey" : "_fund"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300E4CDNNLJRBKF36",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300E4CDNNLJRBKF36"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "ea328105"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "_cust",
-      "globalKey" : "6f1f29ef"
-    },
+    } ],
     "name" : {
-      "value" : "Custodian"
+      "value" : "BROKER 33"
     },
+    "meta" : {
+      "globalKey" : "7e552bcc",
+      "externalKey" : "_broker"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300FNRNXH6KYKUK07",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300FNRNXH6KYKUK07"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "aefc2f21"
       }
-    } ]
+    } ],
+    "name" : {
+      "value" : "Custodian"
+    },
+    "meta" : {
+      "globalKey" : "b8297caf",
+      "externalKey" : "_cust"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "a1fa544e"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2009-06-08T18:03:09Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+  "account" : [ {
+    "accountNumber" : {
+      "value" : "FUND100",
+      "meta" : {
+        "scheme" : "http://www.imgr.com/schemes/account-id"
+      }
+    },
+    "accountBeneficiary" : {
+      "globalReference" : "29bfd33d",
+      "externalReference" : "_fund"
+    },
+    "meta" : {
+      "globalKey" : "287ed38d",
+      "externalKey" : "_FUNDACCT"
+    }
+  }, {
+    "accountNumber" : {
+      "value" : "98765",
+      "meta" : {
+        "scheme" : "http://www.custodian.com/account-id"
+      }
+    },
+    "accountBeneficiary" : {
+      "globalReference" : "b8297caf",
+      "externalReference" : "_cust"
+    },
+    "meta" : {
+      "globalKey" : "9385d966",
+      "externalKey" : "_CUSTACCT"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "1d5d4992"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex52-execution-advice-trade-partial-novation-C02-00-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex52-execution-advice-trade-partial-novation-C02-00-func-output.json
index 78cd723848..4c09514351 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex52-execution-advice-trade-partial-novation-C02-00-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex52-execution-advice-trade-partial-novation-C02-00-func-output.json
@@ -1,197 +1,145 @@
 {
-  "account" : [ {
-    "accountBeneficiary" : {
-      "externalReference" : "_fund",
-      "globalReference" : "7233a0bd"
-    },
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "http://www.imgr.com/schemes/account-id"
-      },
-      "value" : "FUND100"
-    },
-    "meta" : {
-      "externalKey" : "_FUNDACCT",
-      "globalKey" : "84e15365"
-    }
-  }, {
-    "accountBeneficiary" : {
-      "externalReference" : "_cust",
-      "globalReference" : "6f1f29ef"
-    },
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "http://www.custodian.com/account-id"
-      },
-      "value" : "98765"
-    },
-    "meta" : {
-      "externalKey" : "_CUSTACCT",
-      "globalKey" : "4d6768f4"
-    }
-  } ],
-  "action" : "NEW",
   "businessEvent" : {
+    "intent" : "Novation",
     "eventDate" : "2009-06-16",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "6b7005c1"
-          },
-          "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "_fund",
-                "globalReference" : "7233a0bd"
-              },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.imgr.com/schemes/account-id"
-                },
-                "value" : "FUND100"
-              },
-              "meta" : {
-                "externalKey" : "_FUNDACCT",
-                "globalKey" : "84e15365"
-              }
-            }, {
-              "accountBeneficiary" : {
-                "externalReference" : "_cust",
-                "globalReference" : "6f1f29ef"
+      "primitiveInstruction" : {
+        "split" : {
+          "breakdown" : [ {
+            "partyChange" : {
+              "counterparty" : {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "a69bc63f",
+                  "externalReference" : "_broker2"
+                }
               },
-              "accountNumber" : {
+              "tradeId" : [ {
+                "assignedIdentifier" : [ {
+                  "identifier" : {
+                    "value" : "CONTR2345",
+                    "meta" : {
+                      "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+                    }
+                  },
+                  "version" : 2
+                } ],
                 "meta" : {
-                  "scheme" : "http://www.custodian.com/account-id"
-                },
-                "value" : "98765"
-              },
-              "meta" : {
-                "externalKey" : "_CUSTACCT",
-                "globalKey" : "4d6768f4"
-              }
-            } ],
-            "contractDetails" : {
-              "documentation" : [ {
-                "agreementDate" : "2009-05-22",
-                "legalAgreementIdentification" : {
-                  "agreementName" : {
-                    "agreementType" : "MASTER_CONFIRMATION",
-                    "masterConfirmationType" : {
-                      "value" : "ISDA_2003_STANDARD_CREDIT_NORTH_AMERICAN"
+                  "globalKey" : "8e7e1764"
+                }
+              } ]
+            },
+            "quantityChange" : {
+              "change" : [ {
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 20000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
                     }
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "e0202540"
+                  "globalKey" : "694c96e8"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "e0202540"
-              }
-            },
-            "meta" : {
-              "globalKey" : "fc9ddfa9"
+              "direction" : "Replace"
             },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "_fund",
-                "globalKey" : "7233a0bd"
-              },
-              "name" : {
-                "value" : "INVEST MGR"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            "transfer" : {
+              "transferState" : [ {
+                "transfer" : {
+                  "quantity" : {
+                    "value" : 38555,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
+                    }
                   },
-                  "value" : "959800NKRMZ8NEKQ0A23"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "696247f0"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_broker",
-                "globalKey" : "9627fd8c"
-              },
-              "name" : {
-                "value" : "BROKER 33"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  "payerReceiver" : {
+                    "payerPartyReference" : {
+                      "globalReference" : "a69bc63f",
+                      "externalReference" : "_broker2"
+                    },
+                    "receiverPartyReference" : {
+                      "globalReference" : "29bfd33d",
+                      "externalReference" : "_fund"
+                    }
                   },
-                  "value" : "549300E4CDNNLJRBKF36"
+                  "settlementDate" : {
+                    "adjustedDate" : {
+                      "value" : "2009-08-16",
+                      "meta" : {
+                        "globalKey" : "3eca10"
+                      }
+                    }
+                  },
+                  "transferExpression" : {
+                    "priceTransfer" : "Novation"
+                  }
                 },
-                "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "ea328105"
+                  "globalKey" : "a1624a2",
+                  "externalKey" : "NOVATION_FEE"
                 }
               } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_broker2",
-                "globalKey" : "c3b3523f"
-              },
-              "name" : {
-                "value" : "BROKER 53"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300L7VWW3G1702646"
-                },
-                "identifierType" : "LEI",
+            }
+          }, {
+            "quantityChange" : {
+              "change" : [ {
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 20000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
+                    }
+                  }
+                } ],
                 "meta" : {
-                  "globalKey" : "1454247a"
+                  "globalKey" : "694c96e8"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_cust",
-                "globalKey" : "6f1f29ef"
-              },
-              "name" : {
-                "value" : "Custodian"
+              } ],
+              "direction" : "Decrease"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "29bfd33d",
+                "externalReference" : "_fund"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "CONTR2345",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300FNRNXH6KYKUK07"
+                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+                  }
                 },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "aefc2f21"
-                }
-              } ]
+                "version" : 1
+              } ],
+              "meta" : {
+                "globalKey" : "9c14363c"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2009-06-08",
+              "meta" : {
+                "globalKey" : "3ec988"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "7233a0bd"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "9627fd8c"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
                         "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
@@ -204,547 +152,458 @@
                   "economicTerms" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2009-06-09",
                         "meta" : {
                           "globalKey" : "3ec989"
-                        },
-                        "unadjustedDate" : "2009-06-09"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "3ec989"
                       }
                     },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2012-06-20",
+                        "meta" : {
+                          "globalKey" : "3ee194"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ee194"
+                      }
+                    },
                     "payout" : {
-                      "creditDefaultPayout" : {
+                      "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
-                        "generalTerms" : {
-                          "referenceInformation" : {
-                            "referenceEntity" : {
-                              "entityId" : [ {
-                                "meta" : {
-                                  "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                                },
-                                "value" : "0E69A8"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "717c0b9e"
-                              },
-                              "name" : {
-                                "value" : "0E69A8"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "referenceObligation" : [ {
-                              "primaryObligor" : {
-                                "entityId" : [ {
-                                  "meta" : {
-                                    "scheme" : "http://www.imgr.com/schemes/entity-id"
-                                  },
-                                  "value" : "ARW"
-                                } ],
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "calculationPeriodDates" : {
+                          "firstPeriodStartDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2009-03-20",
+                              "meta" : {
+                                "globalKey" : "3ec8d4"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3ec8d4"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
+                          "meta" : {
+                            "globalKey" : "bf47be47"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "firstPaymentDate" : "2009-06-20",
+                          "meta" : {
+                            "globalKey" : "8aa3de96"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "eff49770"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
+                          }
+                        },
+                        "generalTerms" : {
+                          "referenceInformation" : {
+                            "referenceEntity" : {
+                              "entityId" : [ {
+                                "value" : "0E69A8",
                                 "meta" : {
-                                  "globalKey" : "3bb830c"
-                                },
-                                "name" : {
-                                  "value" : "ARW"
+                                  "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
                                 }
+                              } ],
+                              "name" : {
+                                "value" : "0E69A8"
                               },
+                              "meta" : {
+                                "globalKey" : "717c0b9e"
+                              }
+                            },
+                            "referenceObligation" : [ {
                               "security" : {
                                 "productIdentifier" : [ {
                                   "value" : {
                                     "identifier" : {
+                                      "value" : "US042735AL41",
                                       "meta" : {
                                         "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                                      },
-                                      "value" : "US042735AL41"
+                                      }
                                     },
+                                    "source" : "ISIN",
                                     "meta" : {
                                       "globalKey" : "42958b00"
-                                    },
-                                    "source" : "ISIN"
+                                    }
                                   }
                                 } ],
-                                "securityType" : "DEBT"
+                                "securityType" : "Debt"
+                              },
+                              "primaryObligor" : {
+                                "entityId" : [ {
+                                  "value" : "ARW",
+                                  "meta" : {
+                                    "scheme" : "http://www.imgr.com/schemes/entity-id"
+                                  }
+                                } ],
+                                "name" : {
+                                  "value" : "ARW"
+                                },
+                                "meta" : {
+                                  "globalKey" : "3bb830c"
+                                }
                               }
                             } ]
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "110ba297"
-                        },
                         "protectionTerms" : [ {
                           "creditEvents" : {
-                            "meta" : {
-                              "globalKey" : "4cf"
-                            },
                             "restructuring" : {
                               "applicable" : true
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "4cf"
-                          }
-                        } ]
-                      },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
-                          "firstPeriodStartDate" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3ec8d4"
-                              },
-                              "unadjustedDate" : "2009-03-20"
                             },
                             "meta" : {
-                              "globalKey" : "3ec8d4"
+                              "globalKey" : "4cf"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "28c1032d"
+                            "globalKey" : "4cf"
                           }
-                        },
+                        } ],
                         "meta" : {
-                          "globalKey" : "6afbe26c"
-                        },
-                        "paymentDates" : {
-                          "firstPaymentDate" : "2009-06-20",
-                          "meta" : {
-                            "globalKey" : "8aa3e742"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                          "globalKey" : "2779e5e9"
                         }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "f7ca9435"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3ee194"
-                        },
-                        "unadjustedDate" : "2012-06-20"
                       },
                       "meta" : {
-                        "globalKey" : "3ee194"
+                        "globalKey" : "50cbc479"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "bdb3d360"
+                    "globalKey" : "92d47086"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "bdb3d360"
+                  "globalKey" : "92d47086"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "478ae7c4"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.023,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.023,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "51c414ad"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a9d210bc"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 70000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 70000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "e6be80f3"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "29bfd33d",
+                  "externalReference" : "_fund"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "7e552bcc",
+                  "externalReference" : "_broker"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ec988"
-              },
-              "value" : "2009-06-08"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "959800NKRMZ8NEKQ0A23",
                   "meta" : {
-                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-                  },
-                  "value" : "CONTR2345"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "version" : 1
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "696247f0"
+                }
               } ],
-              "issuerReference" : {
-                "externalReference" : "_fund",
-                "globalReference" : "7233a0bd"
+              "name" : {
+                "value" : "INVEST MGR"
               },
               "meta" : {
-                "globalKey" : "6c977856"
+                "globalKey" : "29bfd33d",
+                "externalKey" : "_fund"
               }
-            } ]
-          },
-          "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "6e88cd98"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "7233a0bd"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300E4CDNNLJRBKF36",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "receiverPartyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "9627fd8c"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "ea328105"
                 }
+              } ],
+              "name" : {
+                "value" : "BROKER 33"
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
+              "meta" : {
+                "globalKey" : "7e552bcc",
+                "externalKey" : "_broker"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300L7VWW3G1702646",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
-                "value" : 387300
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "1454247a"
+                }
+              } ],
+              "name" : {
+                "value" : "BROKER 53"
               },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
+              "meta" : {
+                "globalKey" : "a69bc63f",
+                "externalKey" : "_broker2"
               }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "split" : {
-          "breakdown" : [ {
-            "partyChange" : {
-              "counterparty" : {
-                "partyReference" : {
-                  "externalReference" : "_broker2",
-                  "globalReference" : "c3b3523f"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300FNRNXH6KYKUK07",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "role" : "PARTY_1"
-              },
-              "tradeId" : [ {
-                "assignedIdentifier" : [ {
-                  "identifier" : {
-                    "meta" : {
-                      "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-                    },
-                    "value" : "CONTR2345"
-                  },
-                  "version" : 2
-                } ],
+                "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "8e7e1764"
+                  "globalKey" : "aefc2f21"
                 }
-              } ]
-            },
-            "quantityChange" : {
-              "change" : [ {
-                "meta" : {
-                  "globalKey" : "694c96e8"
-                },
-                "quantity" : [ {
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 20000000
-                  }
-                } ]
               } ],
-              "direction" : "REPLACE"
-            },
-            "transfer" : {
-              "transferState" : [ {
-                "meta" : {
-                  "externalKey" : "NOVATION_FEE",
-                  "globalKey" : "32c2029e"
-                },
-                "transfer" : {
-                  "payerReceiver" : {
-                    "payerPartyReference" : {
-                      "externalReference" : "_broker2",
-                      "globalReference" : "c3b3523f"
-                    },
-                    "receiverPartyReference" : {
-                      "externalReference" : "_fund",
-                      "globalReference" : "7233a0bd"
-                    }
-                  },
-                  "quantity" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 38555
-                  },
-                  "settlementDate" : {
-                    "adjustedDate" : {
-                      "meta" : {
-                        "globalKey" : "3eca10"
-                      },
-                      "value" : "2009-08-16"
+              "name" : {
+                "value" : "Custodian"
+              },
+              "meta" : {
+                "globalKey" : "b8297caf",
+                "externalKey" : "_cust"
+              }
+            } ],
+            "contractDetails" : {
+              "documentation" : [ {
+                "agreementDate" : "2009-05-22",
+                "legalAgreementIdentification" : {
+                  "agreementName" : {
+                    "agreementType" : "MasterConfirmation",
+                    "masterConfirmationType" : {
+                      "value" : "ISDA2003StandardCreditNorthAmerican"
                     }
-                  },
-                  "transferExpression" : {
-                    "priceTransfer" : "NOVATION"
                   }
-                }
-              } ]
-            }
-          }, {
-            "quantityChange" : {
-              "change" : [ {
-                "meta" : {
-                  "globalKey" : "694c96e8"
                 },
-                "quantity" : [ {
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 20000000
-                  }
-                } ]
-              } ],
-              "direction" : "DECREASE"
-            }
-          } ]
-        }
-      }
-    } ],
-    "intent" : "NOVATION",
-    "after" : [ {
-      "meta" : {
-        "globalKey" : "e457c4a6"
-      },
-      "trade" : {
-        "account" : [ {
-          "accountBeneficiary" : {
-            "externalReference" : "_fund",
-            "globalReference" : "7233a0bd"
-          },
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "http://www.imgr.com/schemes/account-id"
-            },
-            "value" : "FUND100"
-          },
-          "meta" : {
-            "externalKey" : "_FUNDACCT",
-            "globalKey" : "84e15365"
-          }
-        }, {
-          "accountBeneficiary" : {
-            "externalReference" : "_cust",
-            "globalReference" : "6f1f29ef"
-          },
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "http://www.custodian.com/account-id"
-            },
-            "value" : "98765"
-          },
-          "meta" : {
-            "externalKey" : "_CUSTACCT",
-            "globalKey" : "4d6768f4"
-          }
-        } ],
-        "contractDetails" : {
-          "documentation" : [ {
-            "agreementDate" : "2009-05-22",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "ISDA_2003_STANDARD_CREDIT_NORTH_AMERICAN"
+                "meta" : {
+                  "globalKey" : "e0202540"
                 }
-              }
-            },
-            "meta" : {
-              "globalKey" : "e0202540"
-            }
-          } ],
-          "meta" : {
-            "globalKey" : "e0202540"
-          }
-        },
-        "meta" : {
-          "globalKey" : "fb8080f8"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "_broker2",
-            "globalKey" : "c3b3523f"
-          },
-          "name" : {
-            "value" : "BROKER 53"
-          },
-          "partyId" : [ {
-            "identifier" : {
+              } ],
+              "meta" : {
+                "globalKey" : "e0202540"
+              }
+            },
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "FUND100",
+                "meta" : {
+                  "scheme" : "http://www.imgr.com/schemes/account-id"
+                }
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "29bfd33d",
+                "externalReference" : "_fund"
+              },
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                "globalKey" : "287ed38d",
+                "externalKey" : "_FUNDACCT"
+              }
+            }, {
+              "accountNumber" : {
+                "value" : "98765",
+                "meta" : {
+                  "scheme" : "http://www.custodian.com/account-id"
+                }
               },
-              "value" : "549300L7VWW3G1702646"
-            },
-            "identifierType" : "LEI",
+              "accountBeneficiary" : {
+                "globalReference" : "b8297caf",
+                "externalReference" : "_cust"
+              },
+              "meta" : {
+                "globalKey" : "9385d966",
+                "externalKey" : "_CUSTACCT"
+              }
+            } ],
             "meta" : {
-              "globalKey" : "1454247a"
+              "globalKey" : "72c9b739"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "_broker",
-            "globalKey" : "9627fd8c"
-          },
-          "name" : {
-            "value" : "BROKER 33"
           },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "transferHistory" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 387300,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "29bfd33d",
+                  "externalReference" : "_fund"
+                },
+                "receiverPartyReference" : {
+                  "globalReference" : "7e552bcc",
+                  "externalReference" : "_broker"
+                }
               },
-              "value" : "549300E4CDNNLJRBKF36"
+              "transferExpression" : {
+                "priceTransfer" : "Upfront"
+              }
             },
-            "identifierType" : "LEI",
             "meta" : {
-              "globalKey" : "ea328105"
+              "globalKey" : "baa18f84"
             }
-          } ]
-        }, {
+          } ],
           "meta" : {
-            "externalKey" : "_cust",
-            "globalKey" : "6f1f29ef"
-          },
-          "name" : {
-            "value" : "Custodian"
-          },
-          "partyId" : [ {
+            "globalKey" : "e50ca73d"
+          }
+        }
+      }
+    } ],
+    "eventQualifier" : "PartialNovation",
+    "after" : [ {
+      "trade" : {
+        "tradeIdentifier" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "CONTR2345",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300FNRNXH6KYKUK07"
+                "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+              }
             },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "aefc2f21"
-            }
-          } ]
+            "version" : 2
+          } ],
+          "meta" : {
+            "globalKey" : "8e7e1764"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2009-06-08",
+          "meta" : {
+            "globalKey" : "3ec988"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "_broker2",
-              "globalReference" : "c3b3523f"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "_broker",
-              "globalReference" : "9627fd8c"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
-                "source" : "OTHER",
+                "source" : "Other",
                 "value" : {
                   "name" : {
                     "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
@@ -757,340 +616,320 @@
               "economicTerms" : {
                 "effectiveDate" : {
                   "adjustableDate" : {
+                    "unadjustedDate" : "2009-06-09",
                     "meta" : {
                       "globalKey" : "3ec989"
-                    },
-                    "unadjustedDate" : "2009-06-09"
+                    }
                   },
                   "meta" : {
                     "globalKey" : "3ec989"
                   }
                 },
+                "terminationDate" : {
+                  "adjustableDate" : {
+                    "unadjustedDate" : "2012-06-20",
+                    "meta" : {
+                      "globalKey" : "3ee194"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3ee194"
+                  }
+                },
                 "payout" : {
-                  "creditDefaultPayout" : {
+                  "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
+                      "quantitySchedule" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "quantity-1"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0",
+                        "externalKey" : "calculationAmount"
+                      }
+                    },
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
+                    "calculationPeriodDates" : {
+                      "firstPeriodStartDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2009-03-20",
+                          "meta" : {
+                            "globalKey" : "3ec8d4"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "3ec8d4"
+                        }
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "17f73"
+                        },
+                        "rollConvention" : "20"
+                      },
                       "meta" : {
-                        "externalKey" : "calculationAmount",
-                        "globalKey" : "0"
+                        "globalKey" : "bf47be47"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
                       },
+                      "firstPaymentDate" : "2009-06-20",
+                      "meta" : {
+                        "globalKey" : "8aa3de96"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "eff49770"
+                    }
+                  } ],
+                  "creditDefaultPayout" : {
+                    "payerReceiver" : {
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
+                    },
+                    "priceQuantity" : {
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0",
+                        "externalKey" : "calculationAmount"
                       }
                     },
                     "generalTerms" : {
                       "referenceInformation" : {
                         "referenceEntity" : {
                           "entityId" : [ {
+                            "value" : "0E69A8",
                             "meta" : {
                               "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                            },
-                            "value" : "0E69A8"
+                            }
                           } ],
-                          "meta" : {
-                            "globalKey" : "717c0b9e"
-                          },
                           "name" : {
                             "value" : "0E69A8"
+                          },
+                          "meta" : {
+                            "globalKey" : "717c0b9e"
                           }
                         },
                         "referenceObligation" : [ {
-                          "primaryObligor" : {
-                            "entityId" : [ {
-                              "meta" : {
-                                "scheme" : "http://www.imgr.com/schemes/entity-id"
-                              },
-                              "value" : "ARW"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "3bb830c"
-                            },
-                            "name" : {
-                              "value" : "ARW"
-                            }
-                          },
                           "security" : {
                             "productIdentifier" : [ {
                               "value" : {
                                 "identifier" : {
+                                  "value" : "US042735AL41",
                                   "meta" : {
                                     "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                                  },
-                                  "value" : "US042735AL41"
+                                  }
                                 },
+                                "source" : "ISIN",
                                 "meta" : {
                                   "globalKey" : "42958b00"
-                                },
-                                "source" : "ISIN"
+                                }
                               }
                             } ],
-                            "securityType" : "DEBT"
-                          }
-                        } ]
-                      }
-                    },
-                    "meta" : {
-                      "globalKey" : "110ba297"
-                    },
-                    "protectionTerms" : [ {
-                      "creditEvents" : {
-                        "meta" : {
-                          "globalKey" : "4cf"
-                        },
-                        "restructuring" : {
-                          "applicable" : true
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "4cf"
-                      }
-                    } ]
-                  },
-                  "interestRatePayout" : [ {
-                    "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
-                    },
-                    "priceQuantity" : {
-                      "meta" : {
-                        "externalKey" : "calculationAmount",
-                        "globalKey" : "0"
-                      },
-                      "quantitySchedule" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "quantity-1"
-                        }
-                      }
-                    },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "28c47"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
-                        "rollConvention" : "20"
-                      },
-                      "firstPeriodStartDate" : {
-                        "adjustableDate" : {
-                          "meta" : {
-                            "globalKey" : "3ec8d4"
+                            "securityType" : "Debt"
                           },
-                          "unadjustedDate" : "2009-03-20"
+                          "primaryObligor" : {
+                            "entityId" : [ {
+                              "value" : "ARW",
+                              "meta" : {
+                                "scheme" : "http://www.imgr.com/schemes/entity-id"
+                              }
+                            } ],
+                            "name" : {
+                              "value" : "ARW"
+                            },
+                            "meta" : {
+                              "globalKey" : "3bb830c"
+                            }
+                          }
+                        } ]
+                      }
+                    },
+                    "protectionTerms" : [ {
+                      "creditEvents" : {
+                        "restructuring" : {
+                          "applicable" : true
                         },
                         "meta" : {
-                          "globalKey" : "3ec8d4"
+                          "globalKey" : "4cf"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "28c1032d"
+                        "globalKey" : "4cf"
                       }
-                    },
+                    } ],
                     "meta" : {
-                      "globalKey" : "6afbe26c"
-                    },
-                    "paymentDates" : {
-                      "firstPaymentDate" : "2009-06-20",
-                      "meta" : {
-                        "globalKey" : "8aa3e742"
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
-                      }
-                    },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
-                          }
-                        }
-                      }
+                      "globalKey" : "2779e5e9"
                     }
-                  } ],
-                  "meta" : {
-                    "globalKey" : "f7ca9435"
-                  }
-                },
-                "terminationDate" : {
-                  "adjustableDate" : {
-                    "meta" : {
-                      "globalKey" : "3ee194"
-                    },
-                    "unadjustedDate" : "2012-06-20"
                   },
                   "meta" : {
-                    "globalKey" : "3ee194"
+                    "globalKey" : "50cbc479"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "bdb3d360"
+                "globalKey" : "92d47086"
               }
             },
             "meta" : {
-              "globalKey" : "bdb3d360"
+              "globalKey" : "92d47086"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "478ae7c4"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.023,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.023,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "694c96e8"
-              },
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "a9d210bc"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 20000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 20000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "c0464618"
+              }
             } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "a69bc63f",
+              "externalReference" : "_broker2"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "7e552bcc",
+              "externalReference" : "_broker"
+            }
           } ]
         },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3ec988"
-          },
-          "value" : "2009-06-08"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "549300L7VWW3G1702646",
               "meta" : {
-                "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-              },
-              "value" : "CONTR2345"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
             },
-            "version" : 2
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "1454247a"
+            }
           } ],
+          "name" : {
+            "value" : "BROKER 53"
+          },
           "meta" : {
-            "globalKey" : "8e7e1764"
+            "globalKey" : "a69bc63f",
+            "externalKey" : "_broker2"
           }
-        } ]
-      },
-      "transferHistory" : [ {
-        "meta" : {
-          "externalKey" : "NOVATION_FEE",
-          "globalKey" : "32c2029e"
-        },
-        "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "_broker2",
-              "globalReference" : "c3b3523f"
-            },
-            "receiverPartyReference" : {
-              "externalReference" : "_fund",
-              "globalReference" : "7233a0bd"
-            }
-          },
-          "quantity" : {
-            "unit" : {
-              "currency" : {
-                "value" : "USD"
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300E4CDNNLJRBKF36",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
               }
             },
-            "value" : 38555
-          },
-          "settlementDate" : {
-            "adjustedDate" : {
-              "meta" : {
-                "globalKey" : "3eca10"
-              },
-              "value" : "2009-08-16"
-            }
-          },
-          "transferExpression" : {
-            "priceTransfer" : "NOVATION"
-          }
-        }
-      } ]
-    }, {
-      "meta" : {
-        "globalKey" : "50faa2bf"
-      },
-      "trade" : {
-        "account" : [ {
-          "accountBeneficiary" : {
-            "externalReference" : "_fund",
-            "globalReference" : "7233a0bd"
-          },
-          "accountNumber" : {
+            "identifierType" : "LEI",
             "meta" : {
-              "scheme" : "http://www.imgr.com/schemes/account-id"
-            },
-            "value" : "FUND100"
+              "globalKey" : "ea328105"
+            }
+          } ],
+          "name" : {
+            "value" : "BROKER 33"
           },
           "meta" : {
-            "externalKey" : "_FUNDACCT",
-            "globalKey" : "84e15365"
+            "globalKey" : "7e552bcc",
+            "externalKey" : "_broker"
           }
         }, {
-          "accountBeneficiary" : {
-            "externalReference" : "_cust",
-            "globalReference" : "6f1f29ef"
-          },
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "http://www.custodian.com/account-id"
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300FNRNXH6KYKUK07",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
             },
-            "value" : "98765"
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "aefc2f21"
+            }
+          } ],
+          "name" : {
+            "value" : "Custodian"
           },
           "meta" : {
-            "externalKey" : "_CUSTACCT",
-            "globalKey" : "4d6768f4"
+            "globalKey" : "b8297caf",
+            "externalKey" : "_cust"
           }
         } ],
         "contractDetails" : {
@@ -1098,9 +937,9 @@
             "agreementDate" : "2009-05-22",
             "legalAgreementIdentification" : {
               "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
+                "agreementType" : "MasterConfirmation",
                 "masterConfirmationType" : {
-                  "value" : "ISDA_2003_STANDARD_CREDIT_NORTH_AMERICAN"
+                  "value" : "ISDA2003StandardCreditNorthAmerican"
                 }
               }
             },
@@ -1112,108 +951,112 @@
             "globalKey" : "e0202540"
           }
         },
-        "meta" : {
-          "globalKey" : "f43d45a7"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "_fund",
-            "globalKey" : "7233a0bd"
-          },
-          "name" : {
-            "value" : "INVEST MGR"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "959800NKRMZ8NEKQ0A23"
-            },
-            "identifierType" : "LEI",
+        "account" : [ {
+          "accountNumber" : {
+            "value" : "FUND100",
             "meta" : {
-              "globalKey" : "696247f0"
+              "scheme" : "http://www.imgr.com/schemes/account-id"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "_broker",
-            "globalKey" : "9627fd8c"
           },
-          "name" : {
-            "value" : "BROKER 33"
+          "accountBeneficiary" : {
+            "globalReference" : "29bfd33d",
+            "externalReference" : "_fund"
           },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300E4CDNNLJRBKF36"
-            },
-            "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "287ed38d",
+            "externalKey" : "_FUNDACCT"
+          }
+        }, {
+          "accountNumber" : {
+            "value" : "98765",
             "meta" : {
-              "globalKey" : "ea328105"
+              "scheme" : "http://www.custodian.com/account-id"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "_broker2",
-            "globalKey" : "c3b3523f"
           },
-          "name" : {
-            "value" : "BROKER 53"
+          "accountBeneficiary" : {
+            "globalReference" : "b8297caf",
+            "externalReference" : "_cust"
           },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300L7VWW3G1702646"
+          "meta" : {
+            "globalKey" : "9385d966",
+            "externalKey" : "_CUSTACCT"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "2b8a4b20"
+        }
+      },
+      "transferHistory" : [ {
+        "transfer" : {
+          "quantity" : {
+            "value" : 38555,
+            "unit" : {
+              "currency" : {
+                "value" : "USD"
+              }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "a69bc63f",
+              "externalReference" : "_broker2"
             },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "1454247a"
+            "receiverPartyReference" : {
+              "globalReference" : "29bfd33d",
+              "externalReference" : "_fund"
+            }
+          },
+          "settlementDate" : {
+            "adjustedDate" : {
+              "value" : "2009-08-16",
+              "meta" : {
+                "globalKey" : "3eca10"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "_cust",
-            "globalKey" : "6f1f29ef"
           },
-          "name" : {
-            "value" : "Custodian"
+          "transferExpression" : {
+            "priceTransfer" : "Novation"
+          }
+        },
+        "meta" : {
+          "globalKey" : "a1624a2",
+          "externalKey" : "NOVATION_FEE"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "eea92d82"
+      }
+    }, {
+      "trade" : {
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "29bfd33d",
+            "externalReference" : "_fund"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "CONTR2345",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300FNRNXH6KYKUK07"
+                "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+              }
             },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "aefc2f21"
-            }
-          } ]
+            "version" : 1
+          } ],
+          "meta" : {
+            "globalKey" : "9c14363c"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2009-06-08",
+          "meta" : {
+            "globalKey" : "3ec988"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "_fund",
-              "globalReference" : "7233a0bd"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "_broker",
-              "globalReference" : "9627fd8c"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
-                "source" : "OTHER",
+                "source" : "Other",
                 "value" : {
                   "name" : {
                     "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
@@ -1226,323 +1069,441 @@
               "economicTerms" : {
                 "effectiveDate" : {
                   "adjustableDate" : {
+                    "unadjustedDate" : "2009-06-09",
                     "meta" : {
                       "globalKey" : "3ec989"
-                    },
-                    "unadjustedDate" : "2009-06-09"
+                    }
                   },
                   "meta" : {
                     "globalKey" : "3ec989"
                   }
                 },
+                "terminationDate" : {
+                  "adjustableDate" : {
+                    "unadjustedDate" : "2012-06-20",
+                    "meta" : {
+                      "globalKey" : "3ee194"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3ee194"
+                  }
+                },
                 "payout" : {
-                  "creditDefaultPayout" : {
+                  "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
+                      "quantitySchedule" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "quantity-1"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0",
+                        "externalKey" : "calculationAmount"
+                      }
+                    },
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
+                    "calculationPeriodDates" : {
+                      "firstPeriodStartDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2009-03-20",
+                          "meta" : {
+                            "globalKey" : "3ec8d4"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "3ec8d4"
+                        }
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "17f73"
+                        },
+                        "rollConvention" : "20"
+                      },
                       "meta" : {
-                        "externalKey" : "calculationAmount",
-                        "globalKey" : "0"
+                        "globalKey" : "bf47be47"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
                       },
+                      "firstPaymentDate" : "2009-06-20",
+                      "meta" : {
+                        "globalKey" : "8aa3de96"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "eff49770"
+                    }
+                  } ],
+                  "creditDefaultPayout" : {
+                    "payerReceiver" : {
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
+                    },
+                    "priceQuantity" : {
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0",
+                        "externalKey" : "calculationAmount"
                       }
                     },
                     "generalTerms" : {
                       "referenceInformation" : {
                         "referenceEntity" : {
                           "entityId" : [ {
+                            "value" : "0E69A8",
                             "meta" : {
                               "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                            },
-                            "value" : "0E69A8"
+                            }
                           } ],
-                          "meta" : {
-                            "globalKey" : "717c0b9e"
-                          },
                           "name" : {
                             "value" : "0E69A8"
+                          },
+                          "meta" : {
+                            "globalKey" : "717c0b9e"
                           }
                         },
                         "referenceObligation" : [ {
-                          "primaryObligor" : {
-                            "entityId" : [ {
-                              "meta" : {
-                                "scheme" : "http://www.imgr.com/schemes/entity-id"
-                              },
-                              "value" : "ARW"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "3bb830c"
-                            },
-                            "name" : {
-                              "value" : "ARW"
-                            }
-                          },
                           "security" : {
                             "productIdentifier" : [ {
                               "value" : {
                                 "identifier" : {
+                                  "value" : "US042735AL41",
                                   "meta" : {
                                     "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                                  },
-                                  "value" : "US042735AL41"
+                                  }
                                 },
+                                "source" : "ISIN",
                                 "meta" : {
                                   "globalKey" : "42958b00"
-                                },
-                                "source" : "ISIN"
+                                }
+                              }
+                            } ],
+                            "securityType" : "Debt"
+                          },
+                          "primaryObligor" : {
+                            "entityId" : [ {
+                              "value" : "ARW",
+                              "meta" : {
+                                "scheme" : "http://www.imgr.com/schemes/entity-id"
                               }
                             } ],
-                            "securityType" : "DEBT"
+                            "name" : {
+                              "value" : "ARW"
+                            },
+                            "meta" : {
+                              "globalKey" : "3bb830c"
+                            }
                           }
                         } ]
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "110ba297"
-                    },
                     "protectionTerms" : [ {
                       "creditEvents" : {
-                        "meta" : {
-                          "globalKey" : "4cf"
-                        },
                         "restructuring" : {
                           "applicable" : true
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "4cf"
-                      }
-                    } ]
-                  },
-                  "interestRatePayout" : [ {
-                    "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
-                    },
-                    "priceQuantity" : {
-                      "meta" : {
-                        "externalKey" : "calculationAmount",
-                        "globalKey" : "0"
-                      },
-                      "quantitySchedule" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "quantity-1"
-                        }
-                      }
-                    },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "28c47"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
-                        "rollConvention" : "20"
-                      },
-                      "firstPeriodStartDate" : {
-                        "adjustableDate" : {
-                          "meta" : {
-                            "globalKey" : "3ec8d4"
-                          },
-                          "unadjustedDate" : "2009-03-20"
                         },
                         "meta" : {
-                          "globalKey" : "3ec8d4"
+                          "globalKey" : "4cf"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "28c1032d"
+                        "globalKey" : "4cf"
                       }
-                    },
+                    } ],
                     "meta" : {
-                      "globalKey" : "6afbe26c"
-                    },
-                    "paymentDates" : {
-                      "firstPaymentDate" : "2009-06-20",
-                      "meta" : {
-                        "globalKey" : "8aa3e742"
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
-                      }
-                    },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
-                          }
-                        }
-                      }
+                      "globalKey" : "2779e5e9"
                     }
-                  } ],
-                  "meta" : {
-                    "globalKey" : "f7ca9435"
-                  }
-                },
-                "terminationDate" : {
-                  "adjustableDate" : {
-                    "meta" : {
-                      "globalKey" : "3ee194"
-                    },
-                    "unadjustedDate" : "2012-06-20"
                   },
                   "meta" : {
-                    "globalKey" : "3ee194"
+                    "globalKey" : "50cbc479"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "bdb3d360"
+                "globalKey" : "92d47086"
               }
             },
             "meta" : {
-              "globalKey" : "bdb3d360"
+              "globalKey" : "92d47086"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "478ae7c4"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.023,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.023,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "27faaf2b"
-              },
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "a9d210bc"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 50000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 50000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "d75b3635"
+              }
             } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "29bfd33d",
+              "externalReference" : "_fund"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "7e552bcc",
+              "externalReference" : "_broker"
+            }
           } ]
         },
-        "tradeDate" : {
+        "party" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "959800NKRMZ8NEKQ0A23",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "696247f0"
+            }
+          } ],
+          "name" : {
+            "value" : "INVEST MGR"
+          },
           "meta" : {
-            "globalKey" : "3ec988"
+            "globalKey" : "29bfd33d",
+            "externalKey" : "_fund"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300E4CDNNLJRBKF36",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "ea328105"
+            }
+          } ],
+          "name" : {
+            "value" : "BROKER 33"
           },
-          "value" : "2009-06-08"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
+          "meta" : {
+            "globalKey" : "7e552bcc",
+            "externalKey" : "_broker"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "549300L7VWW3G1702646",
               "meta" : {
-                "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-              },
-              "value" : "CONTR2345"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
             },
-            "version" : 1
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "1454247a"
+            }
           } ],
-          "issuerReference" : {
-            "externalReference" : "_fund",
-            "globalReference" : "7233a0bd"
+          "name" : {
+            "value" : "BROKER 53"
           },
           "meta" : {
-            "globalKey" : "6c977856"
+            "globalKey" : "a69bc63f",
+            "externalKey" : "_broker2"
           }
-        } ]
-      },
-      "transferHistory" : [ {
-        "meta" : {
-          "globalKey" : "6e88cd98"
-        },
-        "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "_fund",
-              "globalReference" : "7233a0bd"
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300FNRNXH6KYKUK07",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
             },
-            "receiverPartyReference" : {
-              "externalReference" : "_broker",
-              "globalReference" : "9627fd8c"
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "aefc2f21"
+            }
+          } ],
+          "name" : {
+            "value" : "Custodian"
+          },
+          "meta" : {
+            "globalKey" : "b8297caf",
+            "externalKey" : "_cust"
+          }
+        } ],
+        "contractDetails" : {
+          "documentation" : [ {
+            "agreementDate" : "2009-05-22",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "ISDA2003StandardCreditNorthAmerican"
+                }
+              }
+            },
+            "meta" : {
+              "globalKey" : "e0202540"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e0202540"
+          }
+        },
+        "account" : [ {
+          "accountNumber" : {
+            "value" : "FUND100",
+            "meta" : {
+              "scheme" : "http://www.imgr.com/schemes/account-id"
+            }
+          },
+          "accountBeneficiary" : {
+            "globalReference" : "29bfd33d",
+            "externalReference" : "_fund"
+          },
+          "meta" : {
+            "globalKey" : "287ed38d",
+            "externalKey" : "_FUNDACCT"
+          }
+        }, {
+          "accountNumber" : {
+            "value" : "98765",
+            "meta" : {
+              "scheme" : "http://www.custodian.com/account-id"
             }
           },
+          "accountBeneficiary" : {
+            "globalReference" : "b8297caf",
+            "externalReference" : "_cust"
+          },
+          "meta" : {
+            "globalKey" : "9385d966",
+            "externalKey" : "_CUSTACCT"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "d3494ffb"
+        }
+      },
+      "transferHistory" : [ {
+        "transfer" : {
           "quantity" : {
+            "value" : 387300,
             "unit" : {
               "currency" : {
                 "value" : "USD"
               }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "29bfd33d",
+              "externalReference" : "_fund"
             },
-            "value" : 387300
+            "receiverPartyReference" : {
+              "globalReference" : "7e552bcc",
+              "externalReference" : "_broker"
+            }
           },
           "transferExpression" : {
-            "priceTransfer" : "UPFRONT"
+            "priceTransfer" : "Upfront"
           }
+        },
+        "meta" : {
+          "globalKey" : "baa18f84"
         }
-      } ]
-    } ],
-    "eventQualifier" : "PartialNovation",
-    "meta" : {
-      "globalKey" : "280a5917"
-    }
-  },
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "IM/6"
+      } ],
+      "meta" : {
+        "globalKey" : "5f4368ff"
       }
     } ],
     "meta" : {
-      "globalKey" : "22560b"
+      "globalKey" : "c49e8f7f"
     }
-  } ],
+  },
+  "previousWorkflowStep" : {
+    "globalReference" : "bfb99595"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "IM/6",
       "meta" : {
         "scheme" : "http://www.imgr.com/schemes/message-id"
-      },
-      "value" : "IM/6"
+      }
     },
     "sentBy" : {
       "value" : "IMGRUS6S"
@@ -1551,95 +1512,134 @@
       "value" : "CUSTUS3T"
     } ]
   },
-  "meta" : {
-    "globalKey" : "8278eeb5"
-  },
-  "party" : [ {
+  "timestamp" : [ {
+    "dateTime" : "2009-06-15T21:03:09Z",
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "IM/6"
+      }
+    } ],
     "meta" : {
-      "externalKey" : "_broker2",
-      "globalKey" : "c3b3523f"
-    },
-    "name" : {
-      "value" : "BROKER 53"
-    },
+      "globalKey" : "22560b"
+    }
+  } ],
+  "action" : "New",
+  "party" : [ {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300L7VWW3G1702646",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300L7VWW3G1702646"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "1454247a"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "_broker",
-      "globalKey" : "9627fd8c"
-    },
+    } ],
     "name" : {
-      "value" : "BROKER 33"
+      "value" : "BROKER 53"
     },
+    "meta" : {
+      "globalKey" : "a69bc63f",
+      "externalKey" : "_broker2"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300E4CDNNLJRBKF36",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300E4CDNNLJRBKF36"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "ea328105"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "_cust",
-      "globalKey" : "6f1f29ef"
-    },
+    } ],
     "name" : {
-      "value" : "Custodian"
+      "value" : "BROKER 33"
     },
+    "meta" : {
+      "globalKey" : "7e552bcc",
+      "externalKey" : "_broker"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300FNRNXH6KYKUK07",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300FNRNXH6KYKUK07"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "aefc2f21"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "_fund",
-      "globalKey" : "7233a0bd"
-    },
+    } ],
     "name" : {
-      "value" : "INVEST MGR"
+      "value" : "Custodian"
     },
+    "meta" : {
+      "globalKey" : "b8297caf",
+      "externalKey" : "_cust"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "959800NKRMZ8NEKQ0A23",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "959800NKRMZ8NEKQ0A23"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "696247f0"
       }
-    } ]
+    } ],
+    "name" : {
+      "value" : "INVEST MGR"
+    },
+    "meta" : {
+      "globalKey" : "29bfd33d",
+      "externalKey" : "_fund"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "2673ffb9"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2009-06-15T21:03:09Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+  "account" : [ {
+    "accountNumber" : {
+      "value" : "FUND100",
+      "meta" : {
+        "scheme" : "http://www.imgr.com/schemes/account-id"
+      }
+    },
+    "accountBeneficiary" : {
+      "globalReference" : "29bfd33d",
+      "externalReference" : "_fund"
+    },
+    "meta" : {
+      "globalKey" : "287ed38d",
+      "externalKey" : "_FUNDACCT"
+    }
+  }, {
+    "accountNumber" : {
+      "value" : "98765",
+      "meta" : {
+        "scheme" : "http://www.custodian.com/account-id"
+      }
+    },
+    "accountBeneficiary" : {
+      "globalReference" : "b8297caf",
+      "externalReference" : "_cust"
+    },
+    "meta" : {
+      "globalKey" : "9385d966",
+      "externalKey" : "_CUSTACCT"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "a79037dd"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex53-execution-advice-trade-partial-novation-correction-C02-10-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex53-execution-advice-trade-partial-novation-correction-C02-10-func-output.json
index 3be30f976c..351a10a736 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex53-execution-advice-trade-partial-novation-correction-C02-10-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex53-execution-advice-trade-partial-novation-correction-C02-10-func-output.json
@@ -1,197 +1,145 @@
 {
-  "account" : [ {
-    "accountBeneficiary" : {
-      "externalReference" : "_fund",
-      "globalReference" : "7233a0bd"
-    },
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "http://www.imgr.com/schemes/account-id"
-      },
-      "value" : "FUND100"
-    },
-    "meta" : {
-      "externalKey" : "_FUNDACCT",
-      "globalKey" : "84e15365"
-    }
-  }, {
-    "accountBeneficiary" : {
-      "externalReference" : "_cust",
-      "globalReference" : "6f1f29ef"
-    },
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "http://www.custodian.com/account-id"
-      },
-      "value" : "98765"
-    },
-    "meta" : {
-      "externalKey" : "_CUSTACCT",
-      "globalKey" : "4d6768f4"
-    }
-  } ],
-  "action" : "CORRECT",
   "businessEvent" : {
+    "intent" : "Novation",
     "eventDate" : "2009-06-16",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "6b7005c1"
-          },
-          "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "_fund",
-                "globalReference" : "7233a0bd"
-              },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.imgr.com/schemes/account-id"
-                },
-                "value" : "FUND100"
-              },
-              "meta" : {
-                "externalKey" : "_FUNDACCT",
-                "globalKey" : "84e15365"
-              }
-            }, {
-              "accountBeneficiary" : {
-                "externalReference" : "_cust",
-                "globalReference" : "6f1f29ef"
+      "primitiveInstruction" : {
+        "split" : {
+          "breakdown" : [ {
+            "partyChange" : {
+              "counterparty" : {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "a69bc63f",
+                  "externalReference" : "_broker2"
+                }
               },
-              "accountNumber" : {
+              "tradeId" : [ {
+                "assignedIdentifier" : [ {
+                  "identifier" : {
+                    "value" : "CONTR2345",
+                    "meta" : {
+                      "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+                    }
+                  },
+                  "version" : 3
+                } ],
                 "meta" : {
-                  "scheme" : "http://www.custodian.com/account-id"
-                },
-                "value" : "98765"
-              },
-              "meta" : {
-                "externalKey" : "_CUSTACCT",
-                "globalKey" : "4d6768f4"
-              }
-            } ],
-            "contractDetails" : {
-              "documentation" : [ {
-                "agreementDate" : "2009-05-22",
-                "legalAgreementIdentification" : {
-                  "agreementName" : {
-                    "agreementType" : "MASTER_CONFIRMATION",
-                    "masterConfirmationType" : {
-                      "value" : "ISDA_2003_STANDARD_CREDIT_NORTH_AMERICAN"
+                  "globalKey" : "8e7e1b25"
+                }
+              } ]
+            },
+            "quantityChange" : {
+              "change" : [ {
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 25000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
                     }
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "e0202540"
+                  "globalKey" : "2ebbcc83"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "e0202540"
-              }
-            },
-            "meta" : {
-              "globalKey" : "fc9ddfa9"
+              "direction" : "Replace"
             },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "_fund",
-                "globalKey" : "7233a0bd"
-              },
-              "name" : {
-                "value" : "INVEST MGR"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            "transfer" : {
+              "transferState" : [ {
+                "transfer" : {
+                  "quantity" : {
+                    "value" : 53555,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
+                    }
                   },
-                  "value" : "959800NKRMZ8NEKQ0A23"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "696247f0"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_broker",
-                "globalKey" : "9627fd8c"
-              },
-              "name" : {
-                "value" : "BROKER 33"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  "payerReceiver" : {
+                    "payerPartyReference" : {
+                      "globalReference" : "a69bc63f",
+                      "externalReference" : "_broker2"
+                    },
+                    "receiverPartyReference" : {
+                      "globalReference" : "29bfd33d",
+                      "externalReference" : "_fund"
+                    }
                   },
-                  "value" : "549300E4CDNNLJRBKF36"
+                  "settlementDate" : {
+                    "adjustedDate" : {
+                      "value" : "2009-08-16",
+                      "meta" : {
+                        "globalKey" : "3eca10"
+                      }
+                    }
+                  },
+                  "transferExpression" : {
+                    "priceTransfer" : "Novation"
+                  }
                 },
-                "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "ea328105"
+                  "globalKey" : "3ce0055b",
+                  "externalKey" : "NOVATION_FEE"
                 }
               } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_broker2",
-                "globalKey" : "c3b3523f"
-              },
-              "name" : {
-                "value" : "BROKER 53"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300L7VWW3G1702646"
-                },
-                "identifierType" : "LEI",
+            }
+          }, {
+            "quantityChange" : {
+              "change" : [ {
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 25000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
+                    }
+                  }
+                } ],
                 "meta" : {
-                  "globalKey" : "1454247a"
+                  "globalKey" : "2ebbcc83"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_cust",
-                "globalKey" : "6f1f29ef"
-              },
-              "name" : {
-                "value" : "Custodian"
+              } ],
+              "direction" : "Decrease"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "29bfd33d",
+                "externalReference" : "_fund"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "CONTR2345",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300FNRNXH6KYKUK07"
+                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+                  }
                 },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "aefc2f21"
-                }
-              } ]
+                "version" : 1
+              } ],
+              "meta" : {
+                "globalKey" : "9c14363c"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2009-06-08",
+              "meta" : {
+                "globalKey" : "3ec988"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "7233a0bd"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "9627fd8c"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
                         "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
@@ -204,547 +152,458 @@
                   "economicTerms" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2009-06-09",
                         "meta" : {
                           "globalKey" : "3ec989"
-                        },
-                        "unadjustedDate" : "2009-06-09"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "3ec989"
                       }
                     },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2012-06-20",
+                        "meta" : {
+                          "globalKey" : "3ee194"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ee194"
+                      }
+                    },
                     "payout" : {
-                      "creditDefaultPayout" : {
+                      "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
-                        "generalTerms" : {
-                          "referenceInformation" : {
-                            "referenceEntity" : {
-                              "entityId" : [ {
-                                "meta" : {
-                                  "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                                },
-                                "value" : "0E69A8"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "717c0b9e"
-                              },
-                              "name" : {
-                                "value" : "0E69A8"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "referenceObligation" : [ {
-                              "primaryObligor" : {
-                                "entityId" : [ {
-                                  "meta" : {
-                                    "scheme" : "http://www.imgr.com/schemes/entity-id"
-                                  },
-                                  "value" : "ARW"
-                                } ],
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "calculationPeriodDates" : {
+                          "firstPeriodStartDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2009-03-20",
+                              "meta" : {
+                                "globalKey" : "3ec8d4"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3ec8d4"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
+                          "meta" : {
+                            "globalKey" : "bf47be47"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "firstPaymentDate" : "2009-06-20",
+                          "meta" : {
+                            "globalKey" : "8aa3de96"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "eff49770"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
+                          }
+                        },
+                        "generalTerms" : {
+                          "referenceInformation" : {
+                            "referenceEntity" : {
+                              "entityId" : [ {
+                                "value" : "0E69A8",
                                 "meta" : {
-                                  "globalKey" : "3bb830c"
-                                },
-                                "name" : {
-                                  "value" : "ARW"
+                                  "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
                                 }
+                              } ],
+                              "name" : {
+                                "value" : "0E69A8"
                               },
+                              "meta" : {
+                                "globalKey" : "717c0b9e"
+                              }
+                            },
+                            "referenceObligation" : [ {
                               "security" : {
                                 "productIdentifier" : [ {
                                   "value" : {
                                     "identifier" : {
+                                      "value" : "US042735AL41",
                                       "meta" : {
                                         "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                                      },
-                                      "value" : "US042735AL41"
+                                      }
                                     },
+                                    "source" : "ISIN",
                                     "meta" : {
                                       "globalKey" : "42958b00"
-                                    },
-                                    "source" : "ISIN"
+                                    }
                                   }
                                 } ],
-                                "securityType" : "DEBT"
+                                "securityType" : "Debt"
+                              },
+                              "primaryObligor" : {
+                                "entityId" : [ {
+                                  "value" : "ARW",
+                                  "meta" : {
+                                    "scheme" : "http://www.imgr.com/schemes/entity-id"
+                                  }
+                                } ],
+                                "name" : {
+                                  "value" : "ARW"
+                                },
+                                "meta" : {
+                                  "globalKey" : "3bb830c"
+                                }
                               }
                             } ]
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "110ba297"
-                        },
                         "protectionTerms" : [ {
                           "creditEvents" : {
-                            "meta" : {
-                              "globalKey" : "4cf"
-                            },
                             "restructuring" : {
                               "applicable" : true
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "4cf"
-                          }
-                        } ]
-                      },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
-                          "firstPeriodStartDate" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3ec8d4"
-                              },
-                              "unadjustedDate" : "2009-03-20"
                             },
                             "meta" : {
-                              "globalKey" : "3ec8d4"
+                              "globalKey" : "4cf"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "28c1032d"
+                            "globalKey" : "4cf"
                           }
-                        },
+                        } ],
                         "meta" : {
-                          "globalKey" : "6afbe26c"
-                        },
-                        "paymentDates" : {
-                          "firstPaymentDate" : "2009-06-20",
-                          "meta" : {
-                            "globalKey" : "8aa3e742"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                          "globalKey" : "2779e5e9"
                         }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "f7ca9435"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3ee194"
-                        },
-                        "unadjustedDate" : "2012-06-20"
                       },
                       "meta" : {
-                        "globalKey" : "3ee194"
+                        "globalKey" : "50cbc479"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "bdb3d360"
+                    "globalKey" : "92d47086"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "bdb3d360"
+                  "globalKey" : "92d47086"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "478ae7c4"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.023,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.023,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "51c414ad"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a9d210bc"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 70000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 70000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "e6be80f3"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "29bfd33d",
+                  "externalReference" : "_fund"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "7e552bcc",
+                  "externalReference" : "_broker"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ec988"
-              },
-              "value" : "2009-06-08"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "959800NKRMZ8NEKQ0A23",
                   "meta" : {
-                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-                  },
-                  "value" : "CONTR2345"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "version" : 1
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "696247f0"
+                }
               } ],
-              "issuerReference" : {
-                "externalReference" : "_fund",
-                "globalReference" : "7233a0bd"
+              "name" : {
+                "value" : "INVEST MGR"
               },
               "meta" : {
-                "globalKey" : "6c977856"
+                "globalKey" : "29bfd33d",
+                "externalKey" : "_fund"
               }
-            } ]
-          },
-          "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "6e88cd98"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "7233a0bd"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300E4CDNNLJRBKF36",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "receiverPartyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "9627fd8c"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "ea328105"
                 }
+              } ],
+              "name" : {
+                "value" : "BROKER 33"
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
+              "meta" : {
+                "globalKey" : "7e552bcc",
+                "externalKey" : "_broker"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300L7VWW3G1702646",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
-                "value" : 387300
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "1454247a"
+                }
+              } ],
+              "name" : {
+                "value" : "BROKER 53"
               },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
+              "meta" : {
+                "globalKey" : "a69bc63f",
+                "externalKey" : "_broker2"
               }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "split" : {
-          "breakdown" : [ {
-            "partyChange" : {
-              "counterparty" : {
-                "partyReference" : {
-                  "externalReference" : "_broker2",
-                  "globalReference" : "c3b3523f"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300FNRNXH6KYKUK07",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "role" : "PARTY_1"
-              },
-              "tradeId" : [ {
-                "assignedIdentifier" : [ {
-                  "identifier" : {
-                    "meta" : {
-                      "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-                    },
-                    "value" : "CONTR2345"
-                  },
-                  "version" : 3
-                } ],
+                "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "8e7e1b25"
+                  "globalKey" : "aefc2f21"
                 }
-              } ]
-            },
-            "quantityChange" : {
-              "change" : [ {
-                "meta" : {
-                  "globalKey" : "2ebbcc83"
-                },
-                "quantity" : [ {
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 25000000
-                  }
-                } ]
               } ],
-              "direction" : "REPLACE"
-            },
-            "transfer" : {
-              "transferState" : [ {
-                "meta" : {
-                  "externalKey" : "NOVATION_FEE",
-                  "globalKey" : "971c3285"
-                },
-                "transfer" : {
-                  "payerReceiver" : {
-                    "payerPartyReference" : {
-                      "externalReference" : "_broker2",
-                      "globalReference" : "c3b3523f"
-                    },
-                    "receiverPartyReference" : {
-                      "externalReference" : "_fund",
-                      "globalReference" : "7233a0bd"
-                    }
-                  },
-                  "quantity" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 53555
-                  },
-                  "settlementDate" : {
-                    "adjustedDate" : {
-                      "meta" : {
-                        "globalKey" : "3eca10"
-                      },
-                      "value" : "2009-08-16"
+              "name" : {
+                "value" : "Custodian"
+              },
+              "meta" : {
+                "globalKey" : "b8297caf",
+                "externalKey" : "_cust"
+              }
+            } ],
+            "contractDetails" : {
+              "documentation" : [ {
+                "agreementDate" : "2009-05-22",
+                "legalAgreementIdentification" : {
+                  "agreementName" : {
+                    "agreementType" : "MasterConfirmation",
+                    "masterConfirmationType" : {
+                      "value" : "ISDA2003StandardCreditNorthAmerican"
                     }
-                  },
-                  "transferExpression" : {
-                    "priceTransfer" : "NOVATION"
                   }
-                }
-              } ]
-            }
-          }, {
-            "quantityChange" : {
-              "change" : [ {
-                "meta" : {
-                  "globalKey" : "2ebbcc83"
                 },
-                "quantity" : [ {
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 25000000
-                  }
-                } ]
-              } ],
-              "direction" : "DECREASE"
-            }
-          } ]
-        }
-      }
-    } ],
-    "intent" : "NOVATION",
-    "after" : [ {
-      "meta" : {
-        "globalKey" : "9f804347"
-      },
-      "trade" : {
-        "account" : [ {
-          "accountBeneficiary" : {
-            "externalReference" : "_fund",
-            "globalReference" : "7233a0bd"
-          },
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "http://www.imgr.com/schemes/account-id"
-            },
-            "value" : "FUND100"
-          },
-          "meta" : {
-            "externalKey" : "_FUNDACCT",
-            "globalKey" : "84e15365"
-          }
-        }, {
-          "accountBeneficiary" : {
-            "externalReference" : "_cust",
-            "globalReference" : "6f1f29ef"
-          },
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "http://www.custodian.com/account-id"
-            },
-            "value" : "98765"
-          },
-          "meta" : {
-            "externalKey" : "_CUSTACCT",
-            "globalKey" : "4d6768f4"
-          }
-        } ],
-        "contractDetails" : {
-          "documentation" : [ {
-            "agreementDate" : "2009-05-22",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "ISDA_2003_STANDARD_CREDIT_NORTH_AMERICAN"
+                "meta" : {
+                  "globalKey" : "e0202540"
                 }
-              }
-            },
-            "meta" : {
-              "globalKey" : "e0202540"
-            }
-          } ],
-          "meta" : {
-            "globalKey" : "e0202540"
-          }
-        },
-        "meta" : {
-          "globalKey" : "bcc997fe"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "_broker2",
-            "globalKey" : "c3b3523f"
-          },
-          "name" : {
-            "value" : "BROKER 53"
-          },
-          "partyId" : [ {
-            "identifier" : {
+              } ],
+              "meta" : {
+                "globalKey" : "e0202540"
+              }
+            },
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "FUND100",
+                "meta" : {
+                  "scheme" : "http://www.imgr.com/schemes/account-id"
+                }
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "29bfd33d",
+                "externalReference" : "_fund"
+              },
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                "globalKey" : "287ed38d",
+                "externalKey" : "_FUNDACCT"
+              }
+            }, {
+              "accountNumber" : {
+                "value" : "98765",
+                "meta" : {
+                  "scheme" : "http://www.custodian.com/account-id"
+                }
               },
-              "value" : "549300L7VWW3G1702646"
-            },
-            "identifierType" : "LEI",
+              "accountBeneficiary" : {
+                "globalReference" : "b8297caf",
+                "externalReference" : "_cust"
+              },
+              "meta" : {
+                "globalKey" : "9385d966",
+                "externalKey" : "_CUSTACCT"
+              }
+            } ],
             "meta" : {
-              "globalKey" : "1454247a"
+              "globalKey" : "72c9b739"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "_broker",
-            "globalKey" : "9627fd8c"
-          },
-          "name" : {
-            "value" : "BROKER 33"
           },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "transferHistory" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 387300,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "29bfd33d",
+                  "externalReference" : "_fund"
+                },
+                "receiverPartyReference" : {
+                  "globalReference" : "7e552bcc",
+                  "externalReference" : "_broker"
+                }
               },
-              "value" : "549300E4CDNNLJRBKF36"
+              "transferExpression" : {
+                "priceTransfer" : "Upfront"
+              }
             },
-            "identifierType" : "LEI",
             "meta" : {
-              "globalKey" : "ea328105"
+              "globalKey" : "baa18f84"
             }
-          } ]
-        }, {
+          } ],
           "meta" : {
-            "externalKey" : "_cust",
-            "globalKey" : "6f1f29ef"
-          },
-          "name" : {
-            "value" : "Custodian"
-          },
-          "partyId" : [ {
+            "globalKey" : "e50ca73d"
+          }
+        }
+      }
+    } ],
+    "eventQualifier" : "PartialNovation",
+    "after" : [ {
+      "trade" : {
+        "tradeIdentifier" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "CONTR2345",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300FNRNXH6KYKUK07"
+                "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+              }
             },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "aefc2f21"
-            }
-          } ]
+            "version" : 3
+          } ],
+          "meta" : {
+            "globalKey" : "8e7e1b25"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2009-06-08",
+          "meta" : {
+            "globalKey" : "3ec988"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "_broker2",
-              "globalReference" : "c3b3523f"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "_broker",
-              "globalReference" : "9627fd8c"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
-                "source" : "OTHER",
+                "source" : "Other",
                 "value" : {
                   "name" : {
                     "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
@@ -757,340 +616,320 @@
               "economicTerms" : {
                 "effectiveDate" : {
                   "adjustableDate" : {
+                    "unadjustedDate" : "2009-06-09",
                     "meta" : {
                       "globalKey" : "3ec989"
-                    },
-                    "unadjustedDate" : "2009-06-09"
+                    }
                   },
                   "meta" : {
                     "globalKey" : "3ec989"
                   }
                 },
+                "terminationDate" : {
+                  "adjustableDate" : {
+                    "unadjustedDate" : "2012-06-20",
+                    "meta" : {
+                      "globalKey" : "3ee194"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3ee194"
+                  }
+                },
                 "payout" : {
-                  "creditDefaultPayout" : {
+                  "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
+                      "quantitySchedule" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "quantity-1"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0",
+                        "externalKey" : "calculationAmount"
+                      }
+                    },
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
+                    "calculationPeriodDates" : {
+                      "firstPeriodStartDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2009-03-20",
+                          "meta" : {
+                            "globalKey" : "3ec8d4"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "3ec8d4"
+                        }
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "17f73"
+                        },
+                        "rollConvention" : "20"
+                      },
                       "meta" : {
-                        "externalKey" : "calculationAmount",
-                        "globalKey" : "0"
+                        "globalKey" : "bf47be47"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
                       },
+                      "firstPaymentDate" : "2009-06-20",
+                      "meta" : {
+                        "globalKey" : "8aa3de96"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "eff49770"
+                    }
+                  } ],
+                  "creditDefaultPayout" : {
+                    "payerReceiver" : {
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
+                    },
+                    "priceQuantity" : {
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0",
+                        "externalKey" : "calculationAmount"
                       }
                     },
                     "generalTerms" : {
                       "referenceInformation" : {
                         "referenceEntity" : {
                           "entityId" : [ {
+                            "value" : "0E69A8",
                             "meta" : {
                               "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                            },
-                            "value" : "0E69A8"
+                            }
                           } ],
-                          "meta" : {
-                            "globalKey" : "717c0b9e"
-                          },
                           "name" : {
                             "value" : "0E69A8"
+                          },
+                          "meta" : {
+                            "globalKey" : "717c0b9e"
                           }
                         },
                         "referenceObligation" : [ {
-                          "primaryObligor" : {
-                            "entityId" : [ {
-                              "meta" : {
-                                "scheme" : "http://www.imgr.com/schemes/entity-id"
-                              },
-                              "value" : "ARW"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "3bb830c"
-                            },
-                            "name" : {
-                              "value" : "ARW"
-                            }
-                          },
                           "security" : {
                             "productIdentifier" : [ {
                               "value" : {
                                 "identifier" : {
+                                  "value" : "US042735AL41",
                                   "meta" : {
                                     "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                                  },
-                                  "value" : "US042735AL41"
+                                  }
                                 },
+                                "source" : "ISIN",
                                 "meta" : {
                                   "globalKey" : "42958b00"
-                                },
-                                "source" : "ISIN"
+                                }
                               }
                             } ],
-                            "securityType" : "DEBT"
-                          }
-                        } ]
-                      }
-                    },
-                    "meta" : {
-                      "globalKey" : "110ba297"
-                    },
-                    "protectionTerms" : [ {
-                      "creditEvents" : {
-                        "meta" : {
-                          "globalKey" : "4cf"
-                        },
-                        "restructuring" : {
-                          "applicable" : true
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "4cf"
-                      }
-                    } ]
-                  },
-                  "interestRatePayout" : [ {
-                    "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
-                    },
-                    "priceQuantity" : {
-                      "meta" : {
-                        "externalKey" : "calculationAmount",
-                        "globalKey" : "0"
-                      },
-                      "quantitySchedule" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "quantity-1"
-                        }
-                      }
-                    },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "28c47"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
-                        "rollConvention" : "20"
-                      },
-                      "firstPeriodStartDate" : {
-                        "adjustableDate" : {
-                          "meta" : {
-                            "globalKey" : "3ec8d4"
+                            "securityType" : "Debt"
                           },
-                          "unadjustedDate" : "2009-03-20"
+                          "primaryObligor" : {
+                            "entityId" : [ {
+                              "value" : "ARW",
+                              "meta" : {
+                                "scheme" : "http://www.imgr.com/schemes/entity-id"
+                              }
+                            } ],
+                            "name" : {
+                              "value" : "ARW"
+                            },
+                            "meta" : {
+                              "globalKey" : "3bb830c"
+                            }
+                          }
+                        } ]
+                      }
+                    },
+                    "protectionTerms" : [ {
+                      "creditEvents" : {
+                        "restructuring" : {
+                          "applicable" : true
                         },
                         "meta" : {
-                          "globalKey" : "3ec8d4"
+                          "globalKey" : "4cf"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "28c1032d"
+                        "globalKey" : "4cf"
                       }
-                    },
+                    } ],
                     "meta" : {
-                      "globalKey" : "6afbe26c"
-                    },
-                    "paymentDates" : {
-                      "firstPaymentDate" : "2009-06-20",
-                      "meta" : {
-                        "globalKey" : "8aa3e742"
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
-                      }
-                    },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
-                          }
-                        }
-                      }
+                      "globalKey" : "2779e5e9"
                     }
-                  } ],
-                  "meta" : {
-                    "globalKey" : "f7ca9435"
-                  }
-                },
-                "terminationDate" : {
-                  "adjustableDate" : {
-                    "meta" : {
-                      "globalKey" : "3ee194"
-                    },
-                    "unadjustedDate" : "2012-06-20"
                   },
                   "meta" : {
-                    "globalKey" : "3ee194"
+                    "globalKey" : "50cbc479"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "bdb3d360"
+                "globalKey" : "92d47086"
               }
             },
             "meta" : {
-              "globalKey" : "bdb3d360"
+              "globalKey" : "92d47086"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "478ae7c4"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.023,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.023,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "2ebbcc83"
-              },
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "a9d210bc"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 25000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 25000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "a8bdc3dd"
+              }
             } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "a69bc63f",
+              "externalReference" : "_broker2"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "7e552bcc",
+              "externalReference" : "_broker"
+            }
           } ]
         },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3ec988"
-          },
-          "value" : "2009-06-08"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
+        "party" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "549300L7VWW3G1702646",
               "meta" : {
-                "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-              },
-              "value" : "CONTR2345"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
             },
-            "version" : 3
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "1454247a"
+            }
           } ],
+          "name" : {
+            "value" : "BROKER 53"
+          },
           "meta" : {
-            "globalKey" : "8e7e1b25"
+            "globalKey" : "a69bc63f",
+            "externalKey" : "_broker2"
           }
-        } ]
-      },
-      "transferHistory" : [ {
-        "meta" : {
-          "externalKey" : "NOVATION_FEE",
-          "globalKey" : "971c3285"
-        },
-        "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "_broker2",
-              "globalReference" : "c3b3523f"
-            },
-            "receiverPartyReference" : {
-              "externalReference" : "_fund",
-              "globalReference" : "7233a0bd"
-            }
-          },
-          "quantity" : {
-            "unit" : {
-              "currency" : {
-                "value" : "USD"
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300E4CDNNLJRBKF36",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
               }
             },
-            "value" : 53555
-          },
-          "settlementDate" : {
-            "adjustedDate" : {
-              "meta" : {
-                "globalKey" : "3eca10"
-              },
-              "value" : "2009-08-16"
-            }
-          },
-          "transferExpression" : {
-            "priceTransfer" : "NOVATION"
-          }
-        }
-      } ]
-    }, {
-      "meta" : {
-        "globalKey" : "a8faf519"
-      },
-      "trade" : {
-        "account" : [ {
-          "accountBeneficiary" : {
-            "externalReference" : "_fund",
-            "globalReference" : "7233a0bd"
-          },
-          "accountNumber" : {
+            "identifierType" : "LEI",
             "meta" : {
-              "scheme" : "http://www.imgr.com/schemes/account-id"
-            },
-            "value" : "FUND100"
+              "globalKey" : "ea328105"
+            }
+          } ],
+          "name" : {
+            "value" : "BROKER 33"
           },
           "meta" : {
-            "externalKey" : "_FUNDACCT",
-            "globalKey" : "84e15365"
+            "globalKey" : "7e552bcc",
+            "externalKey" : "_broker"
           }
         }, {
-          "accountBeneficiary" : {
-            "externalReference" : "_cust",
-            "globalReference" : "6f1f29ef"
-          },
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "http://www.custodian.com/account-id"
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300FNRNXH6KYKUK07",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
             },
-            "value" : "98765"
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "aefc2f21"
+            }
+          } ],
+          "name" : {
+            "value" : "Custodian"
           },
           "meta" : {
-            "externalKey" : "_CUSTACCT",
-            "globalKey" : "4d6768f4"
+            "globalKey" : "b8297caf",
+            "externalKey" : "_cust"
           }
         } ],
         "contractDetails" : {
@@ -1098,9 +937,9 @@
             "agreementDate" : "2009-05-22",
             "legalAgreementIdentification" : {
               "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
+                "agreementType" : "MasterConfirmation",
                 "masterConfirmationType" : {
-                  "value" : "ISDA_2003_STANDARD_CREDIT_NORTH_AMERICAN"
+                  "value" : "ISDA2003StandardCreditNorthAmerican"
                 }
               }
             },
@@ -1112,108 +951,112 @@
             "globalKey" : "e0202540"
           }
         },
-        "meta" : {
-          "globalKey" : "5c14c301"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "_fund",
-            "globalKey" : "7233a0bd"
-          },
-          "name" : {
-            "value" : "INVEST MGR"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "959800NKRMZ8NEKQ0A23"
-            },
-            "identifierType" : "LEI",
+        "account" : [ {
+          "accountNumber" : {
+            "value" : "FUND100",
             "meta" : {
-              "globalKey" : "696247f0"
+              "scheme" : "http://www.imgr.com/schemes/account-id"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "_broker",
-            "globalKey" : "9627fd8c"
           },
-          "name" : {
-            "value" : "BROKER 33"
+          "accountBeneficiary" : {
+            "globalReference" : "29bfd33d",
+            "externalReference" : "_fund"
           },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300E4CDNNLJRBKF36"
-            },
-            "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "287ed38d",
+            "externalKey" : "_FUNDACCT"
+          }
+        }, {
+          "accountNumber" : {
+            "value" : "98765",
             "meta" : {
-              "globalKey" : "ea328105"
+              "scheme" : "http://www.custodian.com/account-id"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "_broker2",
-            "globalKey" : "c3b3523f"
           },
-          "name" : {
-            "value" : "BROKER 53"
+          "accountBeneficiary" : {
+            "globalReference" : "b8297caf",
+            "externalReference" : "_cust"
           },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300L7VWW3G1702646"
+          "meta" : {
+            "globalKey" : "9385d966",
+            "externalKey" : "_CUSTACCT"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "792d6266"
+        }
+      },
+      "transferHistory" : [ {
+        "transfer" : {
+          "quantity" : {
+            "value" : 53555,
+            "unit" : {
+              "currency" : {
+                "value" : "USD"
+              }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "a69bc63f",
+              "externalReference" : "_broker2"
             },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "1454247a"
+            "receiverPartyReference" : {
+              "globalReference" : "29bfd33d",
+              "externalReference" : "_fund"
+            }
+          },
+          "settlementDate" : {
+            "adjustedDate" : {
+              "value" : "2009-08-16",
+              "meta" : {
+                "globalKey" : "3eca10"
+              }
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "_cust",
-            "globalKey" : "6f1f29ef"
           },
-          "name" : {
-            "value" : "Custodian"
+          "transferExpression" : {
+            "priceTransfer" : "Novation"
+          }
+        },
+        "meta" : {
+          "globalKey" : "3ce0055b",
+          "externalKey" : "NOVATION_FEE"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "ed5244b5"
+      }
+    }, {
+      "trade" : {
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "29bfd33d",
+            "externalReference" : "_fund"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "CONTR2345",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300FNRNXH6KYKUK07"
+                "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+              }
             },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "aefc2f21"
-            }
-          } ]
+            "version" : 1
+          } ],
+          "meta" : {
+            "globalKey" : "9c14363c"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2009-06-08",
+          "meta" : {
+            "globalKey" : "3ec988"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "_fund",
-              "globalReference" : "7233a0bd"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "_broker",
-              "globalReference" : "9627fd8c"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
-                "source" : "OTHER",
+                "source" : "Other",
                 "value" : {
                   "name" : {
                     "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
@@ -1226,323 +1069,441 @@
               "economicTerms" : {
                 "effectiveDate" : {
                   "adjustableDate" : {
+                    "unadjustedDate" : "2009-06-09",
                     "meta" : {
                       "globalKey" : "3ec989"
-                    },
-                    "unadjustedDate" : "2009-06-09"
+                    }
                   },
                   "meta" : {
                     "globalKey" : "3ec989"
                   }
                 },
+                "terminationDate" : {
+                  "adjustableDate" : {
+                    "unadjustedDate" : "2012-06-20",
+                    "meta" : {
+                      "globalKey" : "3ee194"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3ee194"
+                  }
+                },
                 "payout" : {
-                  "creditDefaultPayout" : {
+                  "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
+                      "quantitySchedule" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "quantity-1"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0",
+                        "externalKey" : "calculationAmount"
+                      }
+                    },
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
+                    "calculationPeriodDates" : {
+                      "firstPeriodStartDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2009-03-20",
+                          "meta" : {
+                            "globalKey" : "3ec8d4"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "3ec8d4"
+                        }
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "17f73"
+                        },
+                        "rollConvention" : "20"
+                      },
                       "meta" : {
-                        "externalKey" : "calculationAmount",
-                        "globalKey" : "0"
+                        "globalKey" : "bf47be47"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
                       },
+                      "firstPaymentDate" : "2009-06-20",
+                      "meta" : {
+                        "globalKey" : "8aa3de96"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "eff49770"
+                    }
+                  } ],
+                  "creditDefaultPayout" : {
+                    "payerReceiver" : {
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
+                    },
+                    "priceQuantity" : {
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0",
+                        "externalKey" : "calculationAmount"
                       }
                     },
                     "generalTerms" : {
                       "referenceInformation" : {
                         "referenceEntity" : {
                           "entityId" : [ {
+                            "value" : "0E69A8",
                             "meta" : {
                               "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                            },
-                            "value" : "0E69A8"
+                            }
                           } ],
-                          "meta" : {
-                            "globalKey" : "717c0b9e"
-                          },
                           "name" : {
                             "value" : "0E69A8"
+                          },
+                          "meta" : {
+                            "globalKey" : "717c0b9e"
                           }
                         },
                         "referenceObligation" : [ {
-                          "primaryObligor" : {
-                            "entityId" : [ {
-                              "meta" : {
-                                "scheme" : "http://www.imgr.com/schemes/entity-id"
-                              },
-                              "value" : "ARW"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "3bb830c"
-                            },
-                            "name" : {
-                              "value" : "ARW"
-                            }
-                          },
                           "security" : {
                             "productIdentifier" : [ {
                               "value" : {
                                 "identifier" : {
+                                  "value" : "US042735AL41",
                                   "meta" : {
                                     "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                                  },
-                                  "value" : "US042735AL41"
+                                  }
                                 },
+                                "source" : "ISIN",
                                 "meta" : {
                                   "globalKey" : "42958b00"
-                                },
-                                "source" : "ISIN"
+                                }
+                              }
+                            } ],
+                            "securityType" : "Debt"
+                          },
+                          "primaryObligor" : {
+                            "entityId" : [ {
+                              "value" : "ARW",
+                              "meta" : {
+                                "scheme" : "http://www.imgr.com/schemes/entity-id"
                               }
                             } ],
-                            "securityType" : "DEBT"
+                            "name" : {
+                              "value" : "ARW"
+                            },
+                            "meta" : {
+                              "globalKey" : "3bb830c"
+                            }
                           }
                         } ]
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "110ba297"
-                    },
                     "protectionTerms" : [ {
                       "creditEvents" : {
-                        "meta" : {
-                          "globalKey" : "4cf"
-                        },
                         "restructuring" : {
                           "applicable" : true
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "4cf"
-                      }
-                    } ]
-                  },
-                  "interestRatePayout" : [ {
-                    "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
-                    },
-                    "priceQuantity" : {
-                      "meta" : {
-                        "externalKey" : "calculationAmount",
-                        "globalKey" : "0"
-                      },
-                      "quantitySchedule" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "quantity-1"
-                        }
-                      }
-                    },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "28c47"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
-                        "rollConvention" : "20"
-                      },
-                      "firstPeriodStartDate" : {
-                        "adjustableDate" : {
-                          "meta" : {
-                            "globalKey" : "3ec8d4"
-                          },
-                          "unadjustedDate" : "2009-03-20"
                         },
                         "meta" : {
-                          "globalKey" : "3ec8d4"
+                          "globalKey" : "4cf"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "28c1032d"
+                        "globalKey" : "4cf"
                       }
-                    },
+                    } ],
                     "meta" : {
-                      "globalKey" : "6afbe26c"
-                    },
-                    "paymentDates" : {
-                      "firstPaymentDate" : "2009-06-20",
-                      "meta" : {
-                        "globalKey" : "8aa3e742"
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
-                      }
-                    },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
-                          }
-                        }
-                      }
+                      "globalKey" : "2779e5e9"
                     }
-                  } ],
-                  "meta" : {
-                    "globalKey" : "f7ca9435"
-                  }
-                },
-                "terminationDate" : {
-                  "adjustableDate" : {
-                    "meta" : {
-                      "globalKey" : "3ee194"
-                    },
-                    "unadjustedDate" : "2012-06-20"
                   },
                   "meta" : {
-                    "globalKey" : "3ee194"
+                    "globalKey" : "50cbc479"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "bdb3d360"
+                "globalKey" : "92d47086"
               }
             },
             "meta" : {
-              "globalKey" : "bdb3d360"
+              "globalKey" : "92d47086"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "478ae7c4"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.023,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.023,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "58853205"
-              },
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "a9d210bc"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 45000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 45000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "b8210e9b"
+              }
             } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "29bfd33d",
+              "externalReference" : "_fund"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "7e552bcc",
+              "externalReference" : "_broker"
+            }
           } ]
         },
-        "tradeDate" : {
+        "party" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "959800NKRMZ8NEKQ0A23",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "696247f0"
+            }
+          } ],
+          "name" : {
+            "value" : "INVEST MGR"
+          },
           "meta" : {
-            "globalKey" : "3ec988"
+            "globalKey" : "29bfd33d",
+            "externalKey" : "_fund"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300E4CDNNLJRBKF36",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "ea328105"
+            }
+          } ],
+          "name" : {
+            "value" : "BROKER 33"
           },
-          "value" : "2009-06-08"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
+          "meta" : {
+            "globalKey" : "7e552bcc",
+            "externalKey" : "_broker"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "549300L7VWW3G1702646",
               "meta" : {
-                "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-              },
-              "value" : "CONTR2345"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
             },
-            "version" : 1
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "1454247a"
+            }
           } ],
-          "issuerReference" : {
-            "externalReference" : "_fund",
-            "globalReference" : "7233a0bd"
+          "name" : {
+            "value" : "BROKER 53"
           },
           "meta" : {
-            "globalKey" : "6c977856"
+            "globalKey" : "a69bc63f",
+            "externalKey" : "_broker2"
           }
-        } ]
-      },
-      "transferHistory" : [ {
-        "meta" : {
-          "globalKey" : "6e88cd98"
-        },
-        "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "_fund",
-              "globalReference" : "7233a0bd"
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300FNRNXH6KYKUK07",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
             },
-            "receiverPartyReference" : {
-              "externalReference" : "_broker",
-              "globalReference" : "9627fd8c"
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "aefc2f21"
+            }
+          } ],
+          "name" : {
+            "value" : "Custodian"
+          },
+          "meta" : {
+            "globalKey" : "b8297caf",
+            "externalKey" : "_cust"
+          }
+        } ],
+        "contractDetails" : {
+          "documentation" : [ {
+            "agreementDate" : "2009-05-22",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "ISDA2003StandardCreditNorthAmerican"
+                }
+              }
+            },
+            "meta" : {
+              "globalKey" : "e0202540"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e0202540"
+          }
+        },
+        "account" : [ {
+          "accountNumber" : {
+            "value" : "FUND100",
+            "meta" : {
+              "scheme" : "http://www.imgr.com/schemes/account-id"
+            }
+          },
+          "accountBeneficiary" : {
+            "globalReference" : "29bfd33d",
+            "externalReference" : "_fund"
+          },
+          "meta" : {
+            "globalKey" : "287ed38d",
+            "externalKey" : "_FUNDACCT"
+          }
+        }, {
+          "accountNumber" : {
+            "value" : "98765",
+            "meta" : {
+              "scheme" : "http://www.custodian.com/account-id"
             }
           },
+          "accountBeneficiary" : {
+            "globalReference" : "b8297caf",
+            "externalReference" : "_cust"
+          },
+          "meta" : {
+            "globalKey" : "9385d966",
+            "externalKey" : "_CUSTACCT"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "7fe1eae1"
+        }
+      },
+      "transferHistory" : [ {
+        "transfer" : {
           "quantity" : {
+            "value" : 387300,
             "unit" : {
               "currency" : {
                 "value" : "USD"
               }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "29bfd33d",
+              "externalReference" : "_fund"
             },
-            "value" : 387300
+            "receiverPartyReference" : {
+              "globalReference" : "7e552bcc",
+              "externalReference" : "_broker"
+            }
           },
           "transferExpression" : {
-            "priceTransfer" : "UPFRONT"
+            "priceTransfer" : "Upfront"
           }
+        },
+        "meta" : {
+          "globalKey" : "baa18f84"
         }
-      } ]
-    } ],
-    "eventQualifier" : "PartialNovation",
-    "meta" : {
-      "globalKey" : "9cf0bc8a"
-    }
-  },
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "IM/7"
+      } ],
+      "meta" : {
+        "globalKey" : "e5184ee5"
       }
     } ],
     "meta" : {
-      "globalKey" : "22560c"
+      "globalKey" : "6c23630a"
     }
-  } ],
+  },
+  "previousWorkflowStep" : {
+    "globalReference" : "d55571ab"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "IM/7",
       "meta" : {
         "scheme" : "http://www.imgr.com/schemes/message-id"
-      },
-      "value" : "IM/7"
+      }
     },
     "sentBy" : {
       "value" : "IMGRUS6S"
@@ -1551,95 +1512,134 @@
       "value" : "CUSTUS3T"
     } ]
   },
-  "meta" : {
-    "globalKey" : "ec2d3f53"
-  },
-  "party" : [ {
+  "timestamp" : [ {
+    "dateTime" : "2009-06-15T21:15:09Z",
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "IM/7"
+      }
+    } ],
     "meta" : {
-      "externalKey" : "_broker2",
-      "globalKey" : "c3b3523f"
-    },
-    "name" : {
-      "value" : "BROKER 53"
-    },
+      "globalKey" : "22560c"
+    }
+  } ],
+  "action" : "Correct",
+  "party" : [ {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300L7VWW3G1702646",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300L7VWW3G1702646"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "1454247a"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "_broker",
-      "globalKey" : "9627fd8c"
-    },
+    } ],
     "name" : {
-      "value" : "BROKER 33"
+      "value" : "BROKER 53"
     },
+    "meta" : {
+      "globalKey" : "a69bc63f",
+      "externalKey" : "_broker2"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300E4CDNNLJRBKF36",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300E4CDNNLJRBKF36"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "ea328105"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "_cust",
-      "globalKey" : "6f1f29ef"
-    },
+    } ],
     "name" : {
-      "value" : "Custodian"
+      "value" : "BROKER 33"
     },
+    "meta" : {
+      "globalKey" : "7e552bcc",
+      "externalKey" : "_broker"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300FNRNXH6KYKUK07",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300FNRNXH6KYKUK07"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "aefc2f21"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "_fund",
-      "globalKey" : "7233a0bd"
-    },
+    } ],
     "name" : {
-      "value" : "INVEST MGR"
+      "value" : "Custodian"
     },
+    "meta" : {
+      "globalKey" : "b8297caf",
+      "externalKey" : "_cust"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "959800NKRMZ8NEKQ0A23",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "959800NKRMZ8NEKQ0A23"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "696247f0"
       }
-    } ]
+    } ],
+    "name" : {
+      "value" : "INVEST MGR"
+    },
+    "meta" : {
+      "globalKey" : "29bfd33d",
+      "externalKey" : "_fund"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "28e3313d"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2009-06-15T21:15:09Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+  "account" : [ {
+    "accountNumber" : {
+      "value" : "FUND100",
+      "meta" : {
+        "scheme" : "http://www.imgr.com/schemes/account-id"
+      }
+    },
+    "accountBeneficiary" : {
+      "globalReference" : "29bfd33d",
+      "externalReference" : "_fund"
+    },
+    "meta" : {
+      "globalKey" : "287ed38d",
+      "externalKey" : "_FUNDACCT"
+    }
+  }, {
+    "accountNumber" : {
+      "value" : "98765",
+      "meta" : {
+        "scheme" : "http://www.custodian.com/account-id"
+      }
+    },
+    "accountBeneficiary" : {
+      "globalReference" : "b8297caf",
+      "externalReference" : "_cust"
+    },
+    "meta" : {
+      "globalKey" : "9385d966",
+      "externalKey" : "_CUSTACCT"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "3cee2e63"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex58-execution-advice-trade-initiation-F01-00-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex58-execution-advice-trade-initiation-F01-00-func-output.json
index a0db86c684..4eb9af6a0a 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex58-execution-advice-trade-initiation-F01-00-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex58-execution-advice-trade-initiation-F01-00-func-output.json
@@ -1,157 +1,57 @@
 {
-  "account" : [ {
-    "accountBeneficiary" : {
-      "externalReference" : "_fund",
-      "globalReference" : "7233a0bd"
-    },
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "http://www.imgr.com/schemes/account-id"
-      },
-      "value" : "FUND100"
-    },
-    "meta" : {
-      "externalKey" : "_FUNDACCT",
-      "globalKey" : "84e15365"
-    }
-  }, {
-    "accountBeneficiary" : {
-      "externalReference" : "_cust",
-      "globalReference" : "6f1f29ef"
-    },
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "http://www.custodian.com/account-id"
-      },
-      "value" : "98765"
-    },
-    "meta" : {
-      "externalKey" : "_CUSTACCT",
-      "globalKey" : "4d6768f4"
-    }
-  } ],
-  "action" : "NEW",
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "2009-05-22",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "DJ.CDX.NA"
+                }
+              }
+            },
+            "meta" : {
+              "globalKey" : "d51d2790"
+            }
+          } ]
+        }
+      },
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "d4ba5efe"
-          },
           "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "_fund",
-                "globalReference" : "7233a0bd"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "29bfd33d",
+                "externalReference" : "_fund"
               },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.imgr.com/schemes/account-id"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CONTR3456",
+                  "meta" : {
+                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+                  }
                 },
-                "value" : "FUND100"
-              },
+                "version" : 1
+              } ],
               "meta" : {
-                "externalKey" : "_FUNDACCT",
-                "globalKey" : "84e15365"
+                "globalKey" : "9c14ae7c"
               }
-            }, {
-              "accountBeneficiary" : {
-                "externalReference" : "_cust",
-                "globalReference" : "6f1f29ef"
-              },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.custodian.com/account-id"
-                },
-                "value" : "98765"
-              },
+            } ],
+            "tradeDate" : {
+              "value" : "2009-09-01",
               "meta" : {
-                "externalKey" : "_CUSTACCT",
-                "globalKey" : "4d6768f4"
+                "globalKey" : "3eca41"
               }
-            } ],
-            "meta" : {
-              "globalKey" : "1a418666"
             },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "_fund",
-                "globalKey" : "7233a0bd"
-              },
-              "name" : {
-                "value" : "INVEST MGR"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "959800NKRMZ8NEKQ0A23"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "696247f0"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_broker",
-                "globalKey" : "9627fd8c"
-              },
-              "name" : {
-                "value" : "BROKER 33"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300E4CDNNLJRBKF36"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "ea328105"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_cust",
-                "globalKey" : "6f1f29ef"
-              },
-              "name" : {
-                "value" : "Custodian"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300FNRNXH6KYKUK07"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "aefc2f21"
-                }
-              } ]
-            } ],
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "7233a0bd"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "9627fd8c"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
                         "value" : "Credit:Index:CDX:CDXIG"
@@ -164,431 +64,391 @@
                   "economicTerms" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2009-09-01",
                         "meta" : {
                           "globalKey" : "3eca41"
-                        },
-                        "unadjustedDate" : "2009-09-01"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "3eca41"
                       }
                     },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2012-06-20",
+                        "meta" : {
+                          "globalKey" : "3ee194"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ee194"
+                      }
+                    },
                     "payout" : {
-                      "creditDefaultPayout" : {
+                      "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
-                        "generalTerms" : {
-                          "indexReferenceInformation" : {
-                            "indexId" : [ {
-                              "meta" : {
-                                "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-1-0"
-                              },
-                              "value" : "2I65B3BA0"
-                            } ],
-                            "indexName" : {
-                              "value" : "CDX-NAIGHVOLS10.5Y"
-                            },
-                            "excludedReferenceEntity" : [ {
-                              "referenceEntity" : {
-                                "entityId" : [ {
-                                  "meta" : {
-                                    "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-1-0"
-                                  },
-                                  "value" : "ABC1234567"
-                                } ],
-                                "meta" : {
-                                  "globalKey" : "e883dbb2"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
                                 }
                               }
-                            } ],
-                            "indexAnnexDate" : "2007-03-06",
-                            "indexAnnexVersion" : 2,
-                            "indexSeries" : 10,
+                            },
                             "meta" : {
-                              "globalKey" : "c29f01e4"
-                            }
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "8d0acb25"
-                        }
-                      },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
+                              "globalKey" : "0"
                             }
                           }
                         },
                         "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
                           "firstPeriodStartDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2009-06-20",
                               "meta" : {
                                 "globalKey" : "3ec994"
-                              },
-                              "unadjustedDate" : "2009-06-20"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "3ec994"
                             }
                           },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
                           "meta" : {
-                            "globalKey" : "28c103ed"
+                            "globalKey" : "c9d95f07"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "4afb93ec"
-                        },
                         "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
                           "firstPaymentDate" : "2009-09-20",
                           "meta" : {
-                            "globalKey" : "8afb2e82"
+                            "globalKey" : "8afb25d6"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "2760b5f0"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
+                        "generalTerms" : {
+                          "indexReferenceInformation" : {
+                            "indexName" : {
+                              "value" : "CDX-NAIGHVOLS10.5Y"
                             },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
+                            "indexId" : [ {
+                              "value" : "2I65B3BA0",
+                              "meta" : {
+                                "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-1-0"
+                              }
+                            } ],
+                            "indexSeries" : 10,
+                            "indexAnnexVersion" : 2,
+                            "indexAnnexDate" : "2007-03-06",
+                            "excludedReferenceEntity" : [ {
+                              "referenceEntity" : {
+                                "entityId" : [ {
+                                  "value" : "ABC1234567",
+                                  "meta" : {
+                                    "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-1-0"
+                                  }
+                                } ],
+                                "meta" : {
+                                  "globalKey" : "e883dbb2"
                                 }
                               }
+                            } ],
+                            "meta" : {
+                              "globalKey" : "16d002e4"
                             }
                           }
-                        }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "a481a1e7"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3ee194"
                         },
-                        "unadjustedDate" : "2012-06-20"
+                        "meta" : {
+                          "globalKey" : "e13bcc25"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "3ee194"
+                        "globalKey" : "3774e615"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "6940a1ac"
+                    "globalKey" : "53a1a308"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "6940a1ac"
+                  "globalKey" : "53a1a308"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "478ae7c4"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.023,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.023,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "51c414ad"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a9d210bc"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 70000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 70000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "e6be80f3"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "29bfd33d",
+                  "externalReference" : "_fund"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "7e552bcc",
+                  "externalReference" : "_broker"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3eca41"
-              },
-              "value" : "2009-09-01"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "959800NKRMZ8NEKQ0A23",
                   "meta" : {
-                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-                  },
-                  "value" : "CONTR3456"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "version" : 1
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "696247f0"
+                }
               } ],
-              "issuerReference" : {
-                "externalReference" : "_fund",
-                "globalReference" : "7233a0bd"
+              "name" : {
+                "value" : "INVEST MGR"
               },
               "meta" : {
-                "globalKey" : "ebfa4816"
+                "globalKey" : "29bfd33d",
+                "externalKey" : "_fund"
               }
-            } ]
-          },
-          "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "6e88cd98"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "7233a0bd"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300E4CDNNLJRBKF36",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "receiverPartyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "9627fd8c"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "ea328105"
                 }
+              } ],
+              "name" : {
+                "value" : "BROKER 33"
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
+              "meta" : {
+                "globalKey" : "7e552bcc",
+                "externalKey" : "_broker"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300FNRNXH6KYKUK07",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
-                "value" : 387300
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "aefc2f21"
+                }
+              } ],
+              "name" : {
+                "value" : "Custodian"
               },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
+              "meta" : {
+                "globalKey" : "b8297caf",
+                "externalKey" : "_cust"
               }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "2009-05-22",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "DJ.CDX.NA"
+            } ],
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "FUND100",
+                "meta" : {
+                  "scheme" : "http://www.imgr.com/schemes/account-id"
                 }
-              }
-            },
-            "meta" : {
-              "globalKey" : "d51d2790"
-            }
-          } ]
-        }
-      }
-    } ],
-    "intent" : "CONTRACT_FORMATION",
-    "after" : [ {
-      "meta" : {
-        "globalKey" : "65eac10b"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
-      "trade" : {
-        "account" : [ {
-          "accountBeneficiary" : {
-            "externalReference" : "_fund",
-            "globalReference" : "7233a0bd"
-          },
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "http://www.imgr.com/schemes/account-id"
-            },
-            "value" : "FUND100"
-          },
-          "meta" : {
-            "externalKey" : "_FUNDACCT",
-            "globalKey" : "84e15365"
-          }
-        }, {
-          "accountBeneficiary" : {
-            "externalReference" : "_cust",
-            "globalReference" : "6f1f29ef"
-          },
-          "accountNumber" : {
-            "meta" : {
-              "scheme" : "http://www.custodian.com/account-id"
-            },
-            "value" : "98765"
-          },
-          "meta" : {
-            "externalKey" : "_CUSTACCT",
-            "globalKey" : "4d6768f4"
-          }
-        } ],
-        "contractDetails" : {
-          "documentation" : [ {
-            "agreementDate" : "2009-05-22",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "DJ.CDX.NA"
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "29bfd33d",
+                "externalReference" : "_fund"
+              },
+              "meta" : {
+                "globalKey" : "287ed38d",
+                "externalKey" : "_FUNDACCT"
+              }
+            }, {
+              "accountNumber" : {
+                "value" : "98765",
+                "meta" : {
+                  "scheme" : "http://www.custodian.com/account-id"
                 }
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "b8297caf",
+                "externalReference" : "_cust"
+              },
+              "meta" : {
+                "globalKey" : "9385d966",
+                "externalKey" : "_CUSTACCT"
               }
-            },
+            } ],
             "meta" : {
-              "globalKey" : "d51d2790"
+              "globalKey" : "638d802"
             }
-          } ],
-          "meta" : {
-            "globalKey" : "d51d2790"
-          }
-        },
-        "meta" : {
-          "globalKey" : "69f43ef6"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "_fund",
-            "globalKey" : "7233a0bd"
           },
-          "name" : {
-            "value" : "INVEST MGR"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "transferHistory" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 387300,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
-              "value" : "959800NKRMZ8NEKQ0A23"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "696247f0"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "_broker",
-            "globalKey" : "9627fd8c"
-          },
-          "name" : {
-            "value" : "BROKER 33"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "29bfd33d",
+                  "externalReference" : "_fund"
+                },
+                "receiverPartyReference" : {
+                  "globalReference" : "7e552bcc",
+                  "externalReference" : "_broker"
+                }
               },
-              "value" : "549300E4CDNNLJRBKF36"
+              "transferExpression" : {
+                "priceTransfer" : "Upfront"
+              }
             },
-            "identifierType" : "LEI",
             "meta" : {
-              "globalKey" : "ea328105"
+              "globalKey" : "baa18f84"
             }
-          } ]
-        }, {
+          } ],
           "meta" : {
-            "externalKey" : "_cust",
-            "globalKey" : "6f1f29ef"
-          },
-          "name" : {
-            "value" : "Custodian"
+            "globalKey" : "78463086"
+          }
+        }
+      }
+    } ],
+    "eventQualifier" : "ContractFormation",
+    "after" : [ {
+      "trade" : {
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "29bfd33d",
+            "externalReference" : "_fund"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "CONTR3456",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300FNRNXH6KYKUK07"
+                "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+              }
             },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "aefc2f21"
-            }
-          } ]
+            "version" : 1
+          } ],
+          "meta" : {
+            "globalKey" : "9c14ae7c"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2009-09-01",
+          "meta" : {
+            "globalKey" : "3eca41"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "_fund",
-              "globalReference" : "7233a0bd"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "_broker",
-              "globalReference" : "9627fd8c"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
-                "source" : "OTHER",
+                "source" : "Other",
                 "value" : {
                   "name" : {
                     "value" : "Credit:Index:CDX:CDXIG"
@@ -601,291 +461,392 @@
               "economicTerms" : {
                 "effectiveDate" : {
                   "adjustableDate" : {
+                    "unadjustedDate" : "2009-09-01",
                     "meta" : {
                       "globalKey" : "3eca41"
-                    },
-                    "unadjustedDate" : "2009-09-01"
+                    }
                   },
                   "meta" : {
                     "globalKey" : "3eca41"
                   }
                 },
+                "terminationDate" : {
+                  "adjustableDate" : {
+                    "unadjustedDate" : "2012-06-20",
+                    "meta" : {
+                      "globalKey" : "3ee194"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3ee194"
+                  }
+                },
                 "payout" : {
-                  "creditDefaultPayout" : {
+                  "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "externalKey" : "calculationAmount",
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0",
+                        "externalKey" : "calculationAmount"
                       }
                     },
-                    "generalTerms" : {
-                      "indexReferenceInformation" : {
-                        "indexId" : [ {
-                          "meta" : {
-                            "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-1-0"
-                          },
-                          "value" : "2I65B3BA0"
-                        } ],
-                        "indexName" : {
-                          "value" : "CDX-NAIGHVOLS10.5Y"
-                        },
-                        "excludedReferenceEntity" : [ {
-                          "referenceEntity" : {
-                            "entityId" : [ {
-                              "meta" : {
-                                "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-1-0"
-                              },
-                              "value" : "ABC1234567"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "e883dbb2"
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
                             }
                           }
-                        } ],
-                        "indexAnnexDate" : "2007-03-06",
-                        "indexAnnexVersion" : 2,
-                        "indexSeries" : 10,
+                        },
                         "meta" : {
-                          "globalKey" : "c29f01e4"
-                        }
-                      }
-                    },
-                    "meta" : {
-                      "globalKey" : "8d0acb25"
-                    }
-                  },
-                  "interestRatePayout" : [ {
-                    "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
-                    },
-                    "priceQuantity" : {
-                      "meta" : {
-                        "externalKey" : "calculationAmount",
-                        "globalKey" : "0"
-                      },
-                      "quantitySchedule" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "quantity-1"
+                          "globalKey" : "0"
                         }
                       }
                     },
                     "calculationPeriodDates" : {
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "28c47"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
-                        "rollConvention" : "20"
-                      },
                       "firstPeriodStartDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2009-06-20",
                           "meta" : {
                             "globalKey" : "3ec994"
-                          },
-                          "unadjustedDate" : "2009-06-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "3ec994"
                         }
                       },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "17f73"
+                        },
+                        "rollConvention" : "20"
+                      },
                       "meta" : {
-                        "globalKey" : "28c103ed"
+                        "globalKey" : "c9d95f07"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "4afb93ec"
-                    },
                     "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
+                      },
                       "firstPaymentDate" : "2009-09-20",
                       "meta" : {
-                        "globalKey" : "8afb2e82"
+                        "globalKey" : "8afb25d6"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "2760b5f0"
+                    }
+                  } ],
+                  "creditDefaultPayout" : {
+                    "payerReceiver" : {
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
+                    },
+                    "priceQuantity" : {
+                      "quantitySchedule" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "quantity-1"
+                        }
                       },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
+                      "meta" : {
+                        "globalKey" : "0",
+                        "externalKey" : "calculationAmount"
                       }
                     },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
+                    "generalTerms" : {
+                      "indexReferenceInformation" : {
+                        "indexName" : {
+                          "value" : "CDX-NAIGHVOLS10.5Y"
                         },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
+                        "indexId" : [ {
+                          "value" : "2I65B3BA0",
+                          "meta" : {
+                            "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-1-0"
+                          }
+                        } ],
+                        "indexSeries" : 10,
+                        "indexAnnexVersion" : 2,
+                        "indexAnnexDate" : "2007-03-06",
+                        "excludedReferenceEntity" : [ {
+                          "referenceEntity" : {
+                            "entityId" : [ {
+                              "value" : "ABC1234567",
+                              "meta" : {
+                                "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-1-0"
+                              }
+                            } ],
+                            "meta" : {
+                              "globalKey" : "e883dbb2"
                             }
                           }
+                        } ],
+                        "meta" : {
+                          "globalKey" : "16d002e4"
                         }
-                      }
-                    }
-                  } ],
-                  "meta" : {
-                    "globalKey" : "a481a1e7"
-                  }
-                },
-                "terminationDate" : {
-                  "adjustableDate" : {
-                    "meta" : {
-                      "globalKey" : "3ee194"
+                      }
                     },
-                    "unadjustedDate" : "2012-06-20"
+                    "meta" : {
+                      "globalKey" : "e13bcc25"
+                    }
                   },
                   "meta" : {
-                    "globalKey" : "3ee194"
+                    "globalKey" : "3774e615"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "6940a1ac"
+                "globalKey" : "53a1a308"
               }
             },
             "meta" : {
-              "globalKey" : "6940a1ac"
+              "globalKey" : "53a1a308"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "478ae7c4"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.023,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.023,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "51c414ad"
-              },
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "a9d210bc"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 70000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 70000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "e6be80f3"
+              }
             } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "29bfd33d",
+              "externalReference" : "_fund"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "7e552bcc",
+              "externalReference" : "_broker"
+            }
           } ]
         },
-        "tradeDate" : {
+        "party" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "959800NKRMZ8NEKQ0A23",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "696247f0"
+            }
+          } ],
+          "name" : {
+            "value" : "INVEST MGR"
+          },
           "meta" : {
-            "globalKey" : "3eca41"
+            "globalKey" : "29bfd33d",
+            "externalKey" : "_fund"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300E4CDNNLJRBKF36",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "ea328105"
+            }
+          } ],
+          "name" : {
+            "value" : "BROKER 33"
           },
-          "value" : "2009-09-01"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
+          "meta" : {
+            "globalKey" : "7e552bcc",
+            "externalKey" : "_broker"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "549300FNRNXH6KYKUK07",
               "meta" : {
-                "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-              },
-              "value" : "CONTR3456"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
             },
-            "version" : 1
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "aefc2f21"
+            }
           } ],
-          "issuerReference" : {
-            "externalReference" : "_fund",
-            "globalReference" : "7233a0bd"
+          "name" : {
+            "value" : "Custodian"
           },
           "meta" : {
-            "globalKey" : "ebfa4816"
+            "globalKey" : "b8297caf",
+            "externalKey" : "_cust"
           }
-        } ]
-      },
-      "transferHistory" : [ {
-        "meta" : {
-          "globalKey" : "6e88cd98"
-        },
-        "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "_fund",
-              "globalReference" : "7233a0bd"
+        } ],
+        "contractDetails" : {
+          "documentation" : [ {
+            "agreementDate" : "2009-05-22",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "DJ.CDX.NA"
+                }
+              }
             },
-            "receiverPartyReference" : {
-              "externalReference" : "_broker",
-              "globalReference" : "9627fd8c"
+            "meta" : {
+              "globalKey" : "d51d2790"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "d51d2790"
+          }
+        },
+        "account" : [ {
+          "accountNumber" : {
+            "value" : "FUND100",
+            "meta" : {
+              "scheme" : "http://www.imgr.com/schemes/account-id"
+            }
+          },
+          "accountBeneficiary" : {
+            "globalReference" : "29bfd33d",
+            "externalReference" : "_fund"
+          },
+          "meta" : {
+            "globalKey" : "287ed38d",
+            "externalKey" : "_FUNDACCT"
+          }
+        }, {
+          "accountNumber" : {
+            "value" : "98765",
+            "meta" : {
+              "scheme" : "http://www.custodian.com/account-id"
             }
           },
+          "accountBeneficiary" : {
+            "globalReference" : "b8297caf",
+            "externalReference" : "_cust"
+          },
+          "meta" : {
+            "globalKey" : "9385d966",
+            "externalKey" : "_CUSTACCT"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "4b63f692"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
+      },
+      "transferHistory" : [ {
+        "transfer" : {
           "quantity" : {
+            "value" : 387300,
             "unit" : {
               "currency" : {
                 "value" : "USD"
               }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "29bfd33d",
+              "externalReference" : "_fund"
             },
-            "value" : 387300
+            "receiverPartyReference" : {
+              "globalReference" : "7e552bcc",
+              "externalReference" : "_broker"
+            }
           },
           "transferExpression" : {
-            "priceTransfer" : "UPFRONT"
+            "priceTransfer" : "Upfront"
           }
+        },
+        "meta" : {
+          "globalKey" : "baa18f84"
         }
-      } ]
-    } ],
-    "eventQualifier" : "ContractFormation",
-    "meta" : {
-      "globalKey" : "da0bc39"
-    }
-  },
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "IM/60"
+      } ],
+      "meta" : {
+        "globalKey" : "71738479"
       }
     } ],
     "meta" : {
-      "globalKey" : "4286b85"
+      "globalKey" : "d31bcc4b"
     }
-  } ],
+  },
+  "previousWorkflowStep" : {
+    "globalReference" : "a7ce4158"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "IM/60",
       "meta" : {
         "scheme" : "http://www.imgr.com/schemes/message-id"
-      },
-      "value" : "IM/60"
+      }
     },
     "sentBy" : {
       "value" : "IMGRUS6S"
@@ -894,75 +855,114 @@
       "value" : "CUSTUS3T"
     } ]
   },
-  "meta" : {
-    "globalKey" : "42fa6509"
-  },
-  "party" : [ {
+  "timestamp" : [ {
+    "dateTime" : "2009-09-01T18:03:09Z",
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "IM/60"
+      }
+    } ],
     "meta" : {
-      "externalKey" : "_fund",
-      "globalKey" : "7233a0bd"
-    },
-    "name" : {
-      "value" : "INVEST MGR"
-    },
+      "globalKey" : "4286b85"
+    }
+  } ],
+  "action" : "New",
+  "party" : [ {
     "partyId" : [ {
       "identifier" : {
+        "value" : "959800NKRMZ8NEKQ0A23",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "959800NKRMZ8NEKQ0A23"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "696247f0"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "_broker",
-      "globalKey" : "9627fd8c"
-    },
+    } ],
     "name" : {
-      "value" : "BROKER 33"
+      "value" : "INVEST MGR"
     },
+    "meta" : {
+      "globalKey" : "29bfd33d",
+      "externalKey" : "_fund"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300E4CDNNLJRBKF36",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300E4CDNNLJRBKF36"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "ea328105"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "_cust",
-      "globalKey" : "6f1f29ef"
-    },
+    } ],
     "name" : {
-      "value" : "Custodian"
+      "value" : "BROKER 33"
     },
+    "meta" : {
+      "globalKey" : "7e552bcc",
+      "externalKey" : "_broker"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300FNRNXH6KYKUK07",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300FNRNXH6KYKUK07"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "aefc2f21"
       }
-    } ]
+    } ],
+    "name" : {
+      "value" : "Custodian"
+    },
+    "meta" : {
+      "globalKey" : "b8297caf",
+      "externalKey" : "_cust"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "f4642c84"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2009-09-01T18:03:09Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+  "account" : [ {
+    "accountNumber" : {
+      "value" : "FUND100",
+      "meta" : {
+        "scheme" : "http://www.imgr.com/schemes/account-id"
+      }
+    },
+    "accountBeneficiary" : {
+      "globalReference" : "29bfd33d",
+      "externalReference" : "_fund"
+    },
+    "meta" : {
+      "globalKey" : "287ed38d",
+      "externalKey" : "_FUNDACCT"
+    }
+  }, {
+    "accountNumber" : {
+      "value" : "98765",
+      "meta" : {
+        "scheme" : "http://www.custodian.com/account-id"
+      }
+    },
+    "accountBeneficiary" : {
+      "globalReference" : "b8297caf",
+      "externalReference" : "_cust"
+    },
+    "meta" : {
+      "globalKey" : "9385d966",
+      "externalKey" : "_CUSTACCT"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "2df7b1f5"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex63-execution-advice-trade-initiation-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex63-execution-advice-trade-initiation-func-output.json
index eee02580be..4b2c1f5544 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex63-execution-advice-trade-initiation-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex63-execution-advice-trade-initiation-func-output.json
@@ -1,173 +1,35 @@
 {
-  "account" : [ {
-    "accountBeneficiary" : {
-      "externalReference" : "SKY",
-      "globalReference" : "836533e"
-    },
-    "accountName" : {
-      "value" : "SkyAccount"
-    },
-    "accountNumber" : {
-      "value" : "1234"
-    },
-    "meta" : {
-      "externalKey" : "AMAGINTAC1",
-      "globalKey" : "95d4efcb"
-    }
-  }, {
-    "accountBeneficiary" : {
-      "externalReference" : "SKY",
-      "globalReference" : "836533e"
-    },
-    "accountName" : {
-      "value" : "Sky General Account"
-    },
-    "accountNumber" : {
-      "value" : "47896325"
-    },
-    "meta" : {
-      "externalKey" : "CSTGEN478",
-      "globalKey" : "7d9bf937"
-    }
-  } ],
-  "action" : "NEW",
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "73c0946a"
-          },
           "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "SKY",
-                "globalReference" : "836533e"
-              },
-              "accountName" : {
-                "value" : "SkyAccount"
-              },
-              "accountNumber" : {
-                "value" : "1234"
-              },
-              "meta" : {
-                "externalKey" : "AMAGINTAC1",
-                "globalKey" : "95d4efcb"
-              }
-            }, {
-              "accountBeneficiary" : {
-                "externalReference" : "SKY",
-                "globalReference" : "836533e"
-              },
-              "accountName" : {
-                "value" : "Sky General Account"
-              },
-              "accountNumber" : {
-                "value" : "47896325"
-              },
-              "meta" : {
-                "externalKey" : "CSTGEN478",
-                "globalKey" : "7d9bf937"
-              }
-            } ],
-            "meta" : {
-              "globalKey" : "73c0946a"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "AMAG",
-                "globalKey" : "949fb7a6"
-              },
-              "name" : {
-                "value" : "International Bank Asset Management"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "969500T86SHG919ON888"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "3f13bd61"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "SKY",
-                "globalKey" : "836533e"
-              },
-              "name" : {
-                "value" : "Sky Limited"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300HTD3SZJWA5TS80"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "ff8c3b63"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "CST",
-                "globalKey" : "7e692bf1"
-              },
-              "name" : {
-                "value" : "Standards Slav. Int'l"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "2c792bfe",
+                "externalReference" : "SKY"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "IRS2",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300FL0LHI0TEZ8V48"
+                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+                  }
                 },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "3db89a47"
-                }
-              } ]
-            }, {
+                "version" : 1
+              } ],
               "meta" : {
-                "externalKey" : "FIRST",
-                "globalKey" : "43aba2b3"
-              },
-              "name" : {
-                "value" : "First International Bank, MozartStrasse, Frankfurt"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300E0S1LZYZ9QNX81"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "13e8a01c"
-                }
-              } ]
+                "globalKey" : "7c173246"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2007-07-27",
+              "meta" : {
+                "globalKey" : "3eb9db"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "SKY",
-                  "globalReference" : "836533e"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "FIRST",
-                  "globalReference" : "43aba2b3"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -178,77 +40,70 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "BCT1",
-                                "globalReference" : "99ecd50c"
-                              },
-                              "meta" : {
-                                "globalKey" : "74a988ee"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "486ac7fd"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28cc3"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "30"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2007-07-30",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "BCT1",
-                                    "globalReference" : "99ecd50c"
+                                    "globalReference" : "99ecd50c",
+                                    "externalReference" : "BCT1"
                                   },
                                   "meta" : {
                                     "globalKey" : "74a988ee"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "486ac7fd"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "60fba4db"
-                              },
-                              "unadjustedDate" : "2007-07-30"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "60fba4db"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "CALC1",
-                            "globalKey" : "66d4565a"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2037-07-30",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
@@ -258,535 +113,539 @@
                                     "value" : "JPTO"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "BCT1",
-                                    "globalKey" : "99ecd50c"
+                                    "globalKey" : "99ecd50c",
+                                    "externalKey" : "BCT1"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "706f885d"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "9a6e183f"
-                              },
-                              "unadjustedDate" : "2037-07-30"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "9a6e183f"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
-                        "meta" : {
-                          "globalKey" : "24a62651"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "6be01d22"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "BCT1",
-                                "globalReference" : "99ecd50c"
+                                "globalReference" : "99ecd50c",
+                                "externalReference" : "BCT1"
                               },
                               "meta" : {
                                 "globalKey" : "74a988ee"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "486ac7fd"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "959"
+                              "globalKey" : "18ad5"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 6
+                            "rollConvention" : "30"
+                          },
+                          "meta" : {
+                            "globalKey" : "badfe4ec",
+                            "externalKey" : "CALC1"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "99ecd50c",
+                                "externalReference" : "BCT1"
+                              },
+                              "meta" : {
+                                "globalKey" : "74a988ee"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "486ac7fd"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "7aa7af6a"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "6b9b1423"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "BCT1",
-                                "globalReference" : "99ecd50c"
-                              },
-                              "meta" : {
-                                "globalKey" : "74a988ee"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "486ac7fd"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c66"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "30"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2007-07-30",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "FOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "BCT1",
-                                    "globalReference" : "99ecd50c"
+                                    "globalReference" : "99ecd50c",
+                                    "externalReference" : "BCT1"
                                   },
                                   "meta" : {
                                     "globalKey" : "74a988ee"
                                   }
                                 },
-                                "businessDayConvention" : "FOLLOWING",
                                 "meta" : {
                                   "globalKey" : "6800f21f"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "8091cefd"
-                              },
-                              "unadjustedDate" : "2007-07-30"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "8091cefd"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "CALC2",
-                            "globalKey" : "b2092ae1"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2037-07-30",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "BCT1",
-                                    "globalReference" : "99ecd50c"
+                                    "globalReference" : "99ecd50c",
+                                    "externalReference" : "BCT1"
                                   },
                                   "meta" : {
                                     "globalKey" : "74a988ee"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "486ac7fd"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "371494db"
-                              },
-                              "unadjustedDate" : "2037-07-30"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "371494db"
                             }
-                          }
-                        },
-                        "compoundingMethod" : "FLAT",
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
-                        "meta" : {
-                          "globalKey" : "f54aea47"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "6be01e91"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "BCT1",
-                                "globalReference" : "99ecd50c"
+                                "globalReference" : "99ecd50c",
+                                "externalReference" : "BCT1"
                               },
                               "meta" : {
                                 "globalKey" : "74a988ee"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "486ac7fd"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "ac8"
+                              "globalKey" : "17f92"
                             },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
+                            "rollConvention" : "30"
+                          },
+                          "meta" : {
+                            "globalKey" : "e2bf114d",
+                            "externalKey" : "CALC2"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "99ecd50c",
+                                "externalReference" : "BCT1"
+                              },
+                              "meta" : {
+                                "globalKey" : "74a988ee"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "486ac7fd"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "3f770d5b"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "CALC2",
-                            "globalReference" : "b2092ae1"
+                            "globalReference" : "e2bf114d",
+                            "externalReference" : "CALC2"
                           },
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "c705a064"
+                              "globalKey" : "536cd230"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
                             "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "RES2",
-                              "globalReference" : "da4ca119"
+                              "globalReference" : "8f7a60a7",
+                              "externalReference" : "RES2"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "RES2",
-                            "globalKey" : "da4ca119"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "BCT1",
-                                "globalReference" : "99ecd50c"
+                                "globalReference" : "99ecd50c",
+                                "externalReference" : "BCT1"
                               },
                               "meta" : {
                                 "globalKey" : "74a988ee"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "486ac7fd"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "8f7a60a7",
+                            "externalKey" : "RES2"
                           }
+                        },
+                        "compoundingMethod" : "Flat",
+                        "meta" : {
+                          "globalKey" : "6acccaa7"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "5b322016"
+                        "globalKey" : "e74d50e4"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "a46d6987"
+                    "globalKey" : "30889a55"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "a46d6987"
+                  "globalKey" : "30889a55"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "a8099f56"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0987,
                       "unit" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "value" : 0.0987,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 12300000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "JPY"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "592a4b6a"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 12300000000,
                       "unit" : {
                         "currency" : {
                           "value" : "JPY"
                         }
-                      },
-                      "value" : 12300000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "e376a5a2"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "94cf67df"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "JPY-BBSF-Bloomberg-15:00"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "JPY"
-                        }
-                      },
-                      "value" : 12300000000
+                    "meta" : {
+                      "globalKey" : "51c872d"
                     }
-                  } ]
+                  },
+                  "meta" : {
+                    "globalKey" : "7ce2984e"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "2c792bfe",
+                  "externalReference" : "SKY"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1a22ef33",
+                  "externalReference" : "FIRST"
+                }
               } ]
             },
-            "tradeDate" : {
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "969500T86SHG919ON888",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "3f13bd61"
+                }
+              } ],
+              "name" : {
+                "value" : "International Bank Asset Management"
+              },
               "meta" : {
-                "globalKey" : "3eb9db"
+                "globalKey" : "315fcde6",
+                "externalKey" : "AMAG"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300HTD3SZJWA5TS80",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "ff8c3b63"
+                }
+              } ],
+              "name" : {
+                "value" : "Sky Limited"
               },
-              "value" : "2007-07-27"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+              "meta" : {
+                "globalKey" : "2c792bfe",
+                "externalKey" : "SKY"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300FL0LHI0TEZ8V48",
                   "meta" : {
-                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-                  },
-                  "value" : "IRS2"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "version" : 1
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "3db89a47"
+                }
               } ],
-              "issuerReference" : {
-                "externalReference" : "SKY",
-                "globalReference" : "836533e"
+              "name" : {
+                "value" : "Standards Slav. Int'l"
               },
               "meta" : {
-                "globalKey" : "47cea454"
+                "globalKey" : "963b1b31",
+                "externalKey" : "CST"
               }
-            } ]
-          }
-        }
-      }
-    } ],
-    "intent" : "CONTRACT_FORMATION",
-    "after" : [ {
-      "meta" : {
-        "globalKey" : "4842ed27"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
-      "trade" : {
-        "account" : [ {
-          "accountBeneficiary" : {
-            "externalReference" : "SKY",
-            "globalReference" : "836533e"
-          },
-          "accountName" : {
-            "value" : "SkyAccount"
-          },
-          "accountNumber" : {
-            "value" : "1234"
-          },
-          "meta" : {
-            "externalKey" : "AMAGINTAC1",
-            "globalKey" : "95d4efcb"
-          }
-        }, {
-          "accountBeneficiary" : {
-            "externalReference" : "SKY",
-            "globalReference" : "836533e"
-          },
-          "accountName" : {
-            "value" : "Sky General Account"
-          },
-          "accountNumber" : {
-            "value" : "47896325"
-          },
-          "meta" : {
-            "externalKey" : "CSTGEN478",
-            "globalKey" : "7d9bf937"
-          }
-        } ],
-        "meta" : {
-          "globalKey" : "73c0946a"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "AMAG",
-            "globalKey" : "949fb7a6"
-          },
-          "name" : {
-            "value" : "International Bank Asset Management"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300E0S1LZYZ9QNX81",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "13e8a01c"
+                }
+              } ],
+              "name" : {
+                "value" : "First International Bank, MozartStrasse, Frankfurt"
               },
-              "value" : "969500T86SHG919ON888"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "3f13bd61"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "SKY",
-            "globalKey" : "836533e"
-          },
-          "name" : {
-            "value" : "Sky Limited"
-          },
-          "partyId" : [ {
-            "identifier" : {
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                "globalKey" : "1a22ef33",
+                "externalKey" : "FIRST"
+              }
+            } ],
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "1234"
+              },
+              "accountName" : {
+                "value" : "SkyAccount"
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "2c792bfe",
+                "externalReference" : "SKY"
               },
-              "value" : "549300HTD3SZJWA5TS80"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "ff8c3b63"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "CST",
-            "globalKey" : "7e692bf1"
-          },
-          "name" : {
-            "value" : "Standards Slav. Int'l"
-          },
-          "partyId" : [ {
-            "identifier" : {
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                "globalKey" : "42d491ef",
+                "externalKey" : "AMAGINTAC1"
+              }
+            }, {
+              "accountNumber" : {
+                "value" : "47896325"
               },
-              "value" : "549300FL0LHI0TEZ8V48"
-            },
-            "identifierType" : "LEI",
+              "accountName" : {
+                "value" : "Sky General Account"
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "2c792bfe",
+                "externalReference" : "SKY"
+              },
+              "meta" : {
+                "globalKey" : "5cdf6803",
+                "externalKey" : "CSTGEN478"
+              }
+            } ],
             "meta" : {
-              "globalKey" : "3db89a47"
+              "globalKey" : "4c292474"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "FIRST",
-            "globalKey" : "43aba2b3"
           },
-          "name" : {
-            "value" : "First International Bank, MozartStrasse, Frankfurt"
+          "meta" : {
+            "globalKey" : "4c292474"
+          }
+        }
+      }
+    } ],
+    "eventQualifier" : "ContractFormation",
+    "after" : [ {
+      "trade" : {
+        "tradeIdentifier" : [ {
+          "issuerReference" : {
+            "globalReference" : "2c792bfe",
+            "externalReference" : "SKY"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "IRS2",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300E0S1LZYZ9QNX81"
+                "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+              }
             },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "13e8a01c"
-            }
-          } ]
+            "version" : 1
+          } ],
+          "meta" : {
+            "globalKey" : "7c173246"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2007-07-27",
+          "meta" : {
+            "globalKey" : "3eb9db"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "SKY",
-              "globalReference" : "836533e"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "FIRST",
-              "globalReference" : "43aba2b3"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -797,77 +656,70 @@
                 "payout" : {
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "BCT1",
-                            "globalReference" : "99ecd50c"
-                          },
-                          "meta" : {
-                            "globalKey" : "74a988ee"
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "486ac7fd"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "28cc3"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6,
-                        "rollConvention" : "30"
-                      },
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/365.FIXED"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2007-07-30",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "BCT1",
-                                "globalReference" : "99ecd50c"
+                                "globalReference" : "99ecd50c",
+                                "externalReference" : "BCT1"
                               },
                               "meta" : {
                                 "globalKey" : "74a988ee"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "486ac7fd"
                             }
                           },
                           "meta" : {
                             "globalKey" : "60fba4db"
-                          },
-                          "unadjustedDate" : "2007-07-30"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "60fba4db"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "CALC1",
-                        "globalKey" : "66d4565a"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2037-07-30",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USNY"
@@ -877,416 +729,525 @@
                                 "value" : "JPTO"
                               } ],
                               "meta" : {
-                                "externalKey" : "BCT1",
-                                "globalKey" : "99ecd50c"
+                                "globalKey" : "99ecd50c",
+                                "externalKey" : "BCT1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "706f885d"
                             }
                           },
                           "meta" : {
                             "globalKey" : "9a6e183f"
-                          },
-                          "unadjustedDate" : "2037-07-30"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "9a6e183f"
                         }
-                      }
-                    },
-                    "dayCountFraction" : {
-                      "value" : "ACT/365.FIXED"
-                    },
-                    "meta" : {
-                      "globalKey" : "24a62651"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "globalKey" : "6be01d22"
                       },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "BCT1",
-                            "globalReference" : "99ecd50c"
+                            "globalReference" : "99ecd50c",
+                            "externalReference" : "BCT1"
                           },
                           "meta" : {
                             "globalKey" : "74a988ee"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "486ac7fd"
                         }
                       },
-                      "paymentFrequency" : {
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
                         "meta" : {
-                          "globalKey" : "959"
+                          "globalKey" : "18ad5"
                         },
-                        "period" : "M",
-                        "periodMultiplier" : 6
+                        "rollConvention" : "30"
+                      },
+                      "meta" : {
+                        "globalKey" : "badfe4ec",
+                        "externalKey" : "CALC1"
                       }
                     },
-                    "rateSpecification" : {
-                      "fixedRate" : {
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
                         "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
+                          "globalKey" : "107"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "99ecd50c",
+                            "externalReference" : "BCT1"
+                          },
+                          "meta" : {
+                            "globalKey" : "74a988ee"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "486ac7fd"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "7aa7af6a"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "6b9b1423"
                     }
                   }, {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-2"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "BCT1",
-                            "globalReference" : "99ecd50c"
-                          },
-                          "meta" : {
-                            "globalKey" : "74a988ee"
+                    "rateSpecification" : {
+                      "floatingRate" : {
+                        "rateOption" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "rateOption-1"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "486ac7fd"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "28c66"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
-                        "rollConvention" : "30"
-                      },
-                      "effectiveDate" : {
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/365.FIXED"
+                    },
+                    "calculationPeriodDates" : {
+                      "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2007-07-30",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "BCT1",
-                                "globalReference" : "99ecd50c"
+                                "globalReference" : "99ecd50c",
+                                "externalReference" : "BCT1"
                               },
                               "meta" : {
                                 "globalKey" : "74a988ee"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "6800f21f"
                             }
                           },
                           "meta" : {
                             "globalKey" : "8091cefd"
-                          },
-                          "unadjustedDate" : "2007-07-30"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "8091cefd"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "CALC2",
-                        "globalKey" : "b2092ae1"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2037-07-30",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "BCT1",
-                                "globalReference" : "99ecd50c"
+                                "globalReference" : "99ecd50c",
+                                "externalReference" : "BCT1"
                               },
                               "meta" : {
                                 "globalKey" : "74a988ee"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "486ac7fd"
                             }
                           },
                           "meta" : {
                             "globalKey" : "371494db"
-                          },
-                          "unadjustedDate" : "2037-07-30"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "371494db"
                         }
-                      }
-                    },
-                    "compoundingMethod" : "FLAT",
-                    "dayCountFraction" : {
-                      "value" : "ACT/365.FIXED"
-                    },
-                    "meta" : {
-                      "globalKey" : "f54aea47"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "globalKey" : "6be01e91"
                       },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "BCT1",
-                            "globalReference" : "99ecd50c"
+                            "globalReference" : "99ecd50c",
+                            "externalReference" : "BCT1"
                           },
                           "meta" : {
                             "globalKey" : "74a988ee"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "486ac7fd"
                         }
                       },
-                      "paymentFrequency" : {
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
                         "meta" : {
-                          "globalKey" : "ac8"
+                          "globalKey" : "17f92"
                         },
-                        "period" : "Y",
-                        "periodMultiplier" : 1
+                        "rollConvention" : "30"
+                      },
+                      "meta" : {
+                        "globalKey" : "e2bf114d",
+                        "externalKey" : "CALC2"
                       }
                     },
-                    "rateSpecification" : {
-                      "floatingRate" : {
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
                         "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateOption" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "rateOption-1"
+                          "globalKey" : "78"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "99ecd50c",
+                            "externalReference" : "BCT1"
+                          },
+                          "meta" : {
+                            "globalKey" : "74a988ee"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "486ac7fd"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3f770d5b"
                       }
                     },
                     "resetDates" : {
                       "calculationPeriodDatesReference" : {
-                        "externalReference" : "CALC2",
-                        "globalReference" : "b2092ae1"
+                        "globalReference" : "e2bf114d",
+                        "externalReference" : "CALC2"
                       },
                       "fixingDates" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "c705a064"
+                          "globalKey" : "536cd230"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
                         "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "RES2",
-                          "globalReference" : "da4ca119"
+                          "globalReference" : "8f7a60a7",
+                          "externalReference" : "RES2"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "RES2",
-                        "globalKey" : "da4ca119"
+                      "resetFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
                       },
                       "resetDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "BCT1",
-                            "globalReference" : "99ecd50c"
+                            "globalReference" : "99ecd50c",
+                            "externalReference" : "BCT1"
                           },
                           "meta" : {
                             "globalKey" : "74a988ee"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "486ac7fd"
                         }
                       },
-                      "resetFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
+                      "meta" : {
+                        "globalKey" : "8f7a60a7",
+                        "externalKey" : "RES2"
                       }
+                    },
+                    "compoundingMethod" : "Flat",
+                    "meta" : {
+                      "globalKey" : "6acccaa7"
                     }
                   } ],
                   "meta" : {
-                    "globalKey" : "5b322016"
+                    "globalKey" : "e74d50e4"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "a46d6987"
+                "globalKey" : "30889a55"
               }
             },
             "meta" : {
-              "globalKey" : "a46d6987"
+              "globalKey" : "30889a55"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "a8099f56"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.0987,
                   "unit" : {
                     "currency" : {
                       "value" : "JPY"
                     }
                   },
-                  "value" : 0.0987,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "JPY"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
                 }
               } ],
               "quantity" : [ {
+                "value" : {
+                  "value" : 12300000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "JPY"
+                    }
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "592a4b6a"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 12300000000,
                   "unit" : {
                     "currency" : {
                       "value" : "JPY"
                     }
-                  },
-                  "value" : 12300000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
                 }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "e376a5a2"
-              },
+              } ],
               "observable" : {
-                "meta" : {
-                  "globalKey" : "94cf67df"
-                },
                 "rateOption" : {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "rateOption-1"
-                    } ]
-                  },
                   "value" : {
                     "floatingRateIndex" : {
                       "value" : "JPY-BBSF-Bloomberg-15:00"
                     },
                     "indexTenor" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
+                      "periodMultiplier" : 3,
                       "period" : "M",
-                      "periodMultiplier" : 3
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
                     }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "rateOption-1"
+                    } ]
                   }
-                }
-              },
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
                 },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "JPY"
-                    }
-                  },
-                  "value" : 12300000000
+                "meta" : {
+                  "globalKey" : "51c872d"
                 }
-              } ]
+              },
+              "meta" : {
+                "globalKey" : "7ce2984e"
+              }
             } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "2c792bfe",
+              "externalReference" : "SKY"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "1a22ef33",
+              "externalReference" : "FIRST"
+            }
           } ]
         },
-        "tradeDate" : {
+        "party" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "969500T86SHG919ON888",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "3f13bd61"
+            }
+          } ],
+          "name" : {
+            "value" : "International Bank Asset Management"
+          },
           "meta" : {
-            "globalKey" : "3eb9db"
+            "globalKey" : "315fcde6",
+            "externalKey" : "AMAG"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300HTD3SZJWA5TS80",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "ff8c3b63"
+            }
+          } ],
+          "name" : {
+            "value" : "Sky Limited"
           },
-          "value" : "2007-07-27"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
+          "meta" : {
+            "globalKey" : "2c792bfe",
+            "externalKey" : "SKY"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "549300FL0LHI0TEZ8V48",
               "meta" : {
-                "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-              },
-              "value" : "IRS2"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
             },
-            "version" : 1
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "3db89a47"
+            }
           } ],
-          "issuerReference" : {
-            "externalReference" : "SKY",
-            "globalReference" : "836533e"
+          "name" : {
+            "value" : "Standards Slav. Int'l"
+          },
+          "meta" : {
+            "globalKey" : "963b1b31",
+            "externalKey" : "CST"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300E0S1LZYZ9QNX81",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "13e8a01c"
+            }
+          } ],
+          "name" : {
+            "value" : "First International Bank, MozartStrasse, Frankfurt"
+          },
+          "meta" : {
+            "globalKey" : "1a22ef33",
+            "externalKey" : "FIRST"
+          }
+        } ],
+        "account" : [ {
+          "accountNumber" : {
+            "value" : "1234"
+          },
+          "accountName" : {
+            "value" : "SkyAccount"
+          },
+          "accountBeneficiary" : {
+            "globalReference" : "2c792bfe",
+            "externalReference" : "SKY"
           },
           "meta" : {
-            "globalKey" : "47cea454"
+            "globalKey" : "42d491ef",
+            "externalKey" : "AMAGINTAC1"
           }
-        } ]
+        }, {
+          "accountNumber" : {
+            "value" : "47896325"
+          },
+          "accountName" : {
+            "value" : "Sky General Account"
+          },
+          "accountBeneficiary" : {
+            "globalReference" : "2c792bfe",
+            "externalReference" : "SKY"
+          },
+          "meta" : {
+            "globalKey" : "5cdf6803",
+            "externalKey" : "CSTGEN478"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "4c292474"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
+      },
+      "meta" : {
+        "globalKey" : "6264c3d7"
       }
     } ],
-    "eventQualifier" : "ContractFormation",
     "meta" : {
-      "globalKey" : "765d81b5"
+      "globalKey" : "c25700ef"
     }
   },
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "0482588"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "4713c937"
-    }
-  } ],
+  "previousWorkflowStep" : {
+    "globalReference" : "d21953b9"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "0482588",
       "meta" : {
         "scheme" : "http://www.amag.com/coding-scheme/message-id"
-      },
-      "value" : "0482588"
+      }
     },
     "sentBy" : {
       "value" : "AMAGGB22XXX"
@@ -1295,95 +1256,134 @@
       "value" : "CCSTUS6S"
     } ]
   },
-  "meta" : {
-    "globalKey" : "5920b0b9"
-  },
-  "party" : [ {
+  "timestamp" : [ {
+    "dateTime" : "2007-07-27T10:02:00Z",
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "0482588"
+      }
+    } ],
     "meta" : {
-      "externalKey" : "AMAG",
-      "globalKey" : "949fb7a6"
-    },
-    "name" : {
-      "value" : "International Bank Asset Management"
-    },
+      "globalKey" : "4713c937"
+    }
+  } ],
+  "action" : "New",
+  "party" : [ {
     "partyId" : [ {
       "identifier" : {
+        "value" : "969500T86SHG919ON888",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "969500T86SHG919ON888"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "3f13bd61"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "SKY",
-      "globalKey" : "836533e"
-    },
+    } ],
     "name" : {
-      "value" : "Sky Limited"
+      "value" : "International Bank Asset Management"
     },
+    "meta" : {
+      "globalKey" : "315fcde6",
+      "externalKey" : "AMAG"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300HTD3SZJWA5TS80",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300HTD3SZJWA5TS80"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "ff8c3b63"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "CST",
-      "globalKey" : "7e692bf1"
-    },
+    } ],
     "name" : {
-      "value" : "Standards Slav. Int'l"
+      "value" : "Sky Limited"
     },
+    "meta" : {
+      "globalKey" : "2c792bfe",
+      "externalKey" : "SKY"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300FL0LHI0TEZ8V48",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300FL0LHI0TEZ8V48"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "3db89a47"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "FIRST",
-      "globalKey" : "43aba2b3"
-    },
+    } ],
     "name" : {
-      "value" : "First International Bank, MozartStrasse, Frankfurt"
+      "value" : "Standards Slav. Int'l"
     },
+    "meta" : {
+      "globalKey" : "963b1b31",
+      "externalKey" : "CST"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300E0S1LZYZ9QNX81",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300E0S1LZYZ9QNX81"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "13e8a01c"
       }
-    } ]
+    } ],
+    "name" : {
+      "value" : "First International Bank, MozartStrasse, Frankfurt"
+    },
+    "meta" : {
+      "globalKey" : "1a22ef33",
+      "externalKey" : "FIRST"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "f289e2ff"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2007-07-27T10:02:00Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+  "account" : [ {
+    "accountNumber" : {
+      "value" : "1234"
+    },
+    "accountName" : {
+      "value" : "SkyAccount"
+    },
+    "accountBeneficiary" : {
+      "globalReference" : "2c792bfe",
+      "externalReference" : "SKY"
+    },
+    "meta" : {
+      "globalKey" : "42d491ef",
+      "externalKey" : "AMAGINTAC1"
+    }
+  }, {
+    "accountNumber" : {
+      "value" : "47896325"
+    },
+    "accountName" : {
+      "value" : "Sky General Account"
+    },
+    "accountBeneficiary" : {
+      "globalReference" : "2c792bfe",
+      "externalReference" : "SKY"
+    },
+    "meta" : {
+      "globalKey" : "5cdf6803",
+      "externalKey" : "CSTGEN478"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "da011651"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-alpha-trade-CFTC-SEC-and-canada-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-alpha-trade-CFTC-SEC-and-canada-func-output.json
index e1e3878eeb..ec685070b1 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-alpha-trade-CFTC-SEC-and-canada-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-alpha-trade-CFTC-SEC-and-canada-func-output.json
@@ -1,372 +1,154 @@
 {
-  "action" : "NEW",
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "4f14032"
-          },
-          "trade" : {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "2002-01-05",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster"
+                }
+              },
+              "vintage" : 1992
+            },
             "meta" : {
-              "globalKey" : "1175b976"
+              "globalKey" : "4f2097d4"
+            }
+          }, {
+            "agreementDate" : "2002-01-07",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "ISDA2003CreditNorthAmerican"
+                }
+              }
             },
-            "party" : [ {
-              "businessUnit" : [ {
-                "contactInformation" : {
-                  "address" : [ {
-                    "city" : "New York",
-                    "country" : {
-                      "value" : "US"
-                    },
-                    "postalCode" : "10017",
-                    "state" : "NY",
-                    "street" : [ "123 Park Avenue" ]
-                  } ]
-                },
-                "meta" : {
-                  "externalKey" : "branch1",
-                  "globalKey" : "69aea9de"
-                },
-                "name" : "New York Office"
-              }, {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "contactInformation" : {
-                "email" : [ "swap_trading@bankx.com" ]
-              },
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "e450a87"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            "meta" : {
+              "globalKey" : "5d7949e5"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "CreditSupportAgreement"
+              }
+            },
+            "meta" : {
+              "globalKey" : "984ae6d0"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix"
                   },
-                  "value" : "5493001RKR55V4X61F71"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "d0f863bc"
-                }
-              } ],
-              "person" : [ {
-                "firstName" : "person",
-                "meta" : {
-                  "externalKey" : "broker",
-                  "globalKey" : "5b25cf92"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "person123"
-                    },
-                    "meta" : {
-                      "globalKey" : "32d9e6bd"
-                    }
-                  }
-                } ]
-              }, {
-                "firstName" : "person",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "5b25db35"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "person456"
-                    },
-                    "meta" : {
-                      "globalKey" : "32d9f260"
-                    }
+                  "matrixTerm" : {
+                    "value" : "StandardNorthAmericanCorporate"
                   }
                 } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_parent",
-                "globalKey" : "956c45f9"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B47"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f9"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_affiliate1",
-                "globalKey" : "956c45fa"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B48"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45fa"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_affiliate2",
-                "globalKey" : "956c45fb"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B49"
-                },
-                "identifierType" : "LEI",
+              }
+            },
+            "meta" : {
+              "globalKey" : "9ed2f955"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Other",
+                "otherAgreement" : "Custom Legal Agreement"
+              }
+            },
+            "meta" : {
+              "globalKey" : "98e1dbe8"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "FCHUXIINML",
                 "meta" : {
-                  "globalKey" : "956c45fb"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
                 }
-              } ]
-            }, {
-              "contactInformation" : {
-                "email" : [ "investments@banky.com" ]
-              },
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "573ad49d"
-              },
-              "name" : {
-                "value" : "Bank Y"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "12345678901234567890123456789012",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B46"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f8"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "party2_parent",
-                "globalKey" : "956c45f9"
+                "globalKey" : "ce80645"
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B47"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f9"
-                }
-              } ]
+              "identifierType" : "UniqueTransactionIdentifier"
             }, {
-              "meta" : {
-                "externalKey" : "party2_affiliate1",
-                "globalKey" : "956c45fa"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B48"
-                },
-                "identifierType" : "LEI",
+              "issuer" : {
+                "value" : "1031234567",
                 "meta" : {
-                  "globalKey" : "956c45fa"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
-              },
-              "name" : {
-                "value" : "Up&Atem"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "12345678901234567890123456789012",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "executing_agent",
-                "globalKey" : "49e97697"
-              },
-              "name" : {
-                "value" : "XYZ Bank"
+                "globalKey" : "671d1c86"
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND22"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e774"
-                }
-              } ]
-            }, {
+              "identifierType" : "UniqueTransactionIdentifier"
+            } ],
+            "tradeDate" : {
+              "value" : "2011-02-12",
               "meta" : {
-                "externalKey" : "venue",
-                "globalKey" : "6ebddc37"
-              },
-              "name" : {
-                "value" : "SEFCo LLC"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND11"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e754"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "original_sdr",
-                "globalKey" : "9b321c78"
-              },
-              "name" : {
-                "value" : "WorldWide Trade Repository"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
-                }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "e450a87"
-              },
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "573ad49d"
-              },
-              "role" : "REPORTING_PARTY"
-            } ],
+                "globalKey" : "3ed88c"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "573ad49d"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "e450a87"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "meta" : {
-                          "scheme" : "http://www.theice.com/coding-scheme/product-id"
-                        },
-                        "value" : "X123"
-                      },
-                      "meta" : {
-                        "globalKey" : "e6a349ca"
-                      },
-                      "source" : "OTHER"
-                    }
-                  } ],
                   "productTaxonomy" : [ {
                     "primaryAssetClass" : {
-                      "value" : "CREDIT"
+                      "value" : "Credit"
                     }
                   }, {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
+                        "value" : "SecurityBasedSwap",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/sec-product-category"
-                        },
-                        "value" : "SecurityBasedSwap"
+                        }
                       }
                     }
                   }, {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
+                        "value" : "Credi Default Swap",
                         "meta" : {
                           "scheme" : "http://www.theice.com/coding-scheme/product-name"
-                        },
-                        "value" : "Credi Default Swap"
+                        }
                       }
                     }
                   }, {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
                         "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
@@ -376,50 +158,147 @@
                     "source" : "ISDA",
                     "productQualifier" : "CreditDefaultSwap_SingleName"
                   } ],
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "X123",
+                        "meta" : {
+                          "scheme" : "http://www.theice.com/coding-scheme/product-id"
+                        }
+                      },
+                      "source" : "Other",
+                      "meta" : {
+                        "globalKey" : "e6a349ca"
+                      }
+                    }
+                  } ],
                   "economicTerms" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2009-03-26",
                         "meta" : {
                           "globalKey" : "3ec8da"
-                        },
-                        "unadjustedDate" : "2009-03-26"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "3ec8da"
                       }
                     },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2014-06-20",
+                        "meta" : {
+                          "globalKey" : "3ef194"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ef194"
+                      }
+                    },
                     "payout" : {
-                      "creditDefaultPayout" : {
+                      "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
                           "meta" : {
                             "globalKey" : "0"
+                          }
+                        },
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "calculationPeriodDates" : {
+                          "firstPeriodStartDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2009-03-20",
+                              "meta" : {
+                                "globalKey" : "3ec8d4"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3ec8d4"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
+                          "meta" : {
+                            "globalKey" : "bf47be47"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
+                          "firstPaymentDate" : "2009-06-20",
+                          "meta" : {
+                            "globalKey" : "8aa3de96"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "eff49770"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "generalTerms" : {
                           "referenceInformation" : {
                             "referenceEntity" : {
                               "entityId" : [ {
+                                "value" : "8G836J",
                                 "meta" : {
                                   "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                                },
-                                "value" : "8G836J"
+                                }
                               } ],
-                              "meta" : {
-                                "externalKey" : "referenceEntity",
-                                "globalKey" : "54140007"
-                              },
                               "name" : {
                                 "value" : "TENET HEALTHCARE CORPORATION"
+                              },
+                              "meta" : {
+                                "globalKey" : "54140007",
+                                "externalKey" : "referenceEntity"
                               }
                             },
                             "referenceObligation" : [ {
@@ -427,770 +306,529 @@
                                 "productIdentifier" : [ {
                                   "value" : {
                                     "identifier" : {
+                                      "value" : "8G836JAF2",
                                       "meta" : {
                                         "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair-1-0"
-                                      },
-                                      "value" : "8G836JAF2"
+                                      }
                                     },
+                                    "source" : "Other",
                                     "meta" : {
                                       "globalKey" : "1165f83f"
-                                    },
-                                    "source" : "OTHER"
+                                    }
                                   }
                                 } ],
-                                "securityType" : "DEBT"
+                                "securityType" : "Debt"
                               }
                             } ]
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "2fa76fbc"
-                        },
                         "transactedPrice" : {
                           "marketFixedRate" : 0.02
-                        }
-                      },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
-                          "firstPeriodStartDate" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3ec8d4"
-                              },
-                              "unadjustedDate" : "2009-03-20"
-                            },
-                            "meta" : {
-                              "globalKey" : "3ec8d4"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "28c1032d"
-                          }
                         },
                         "meta" : {
-                          "globalKey" : "6afbe26c"
-                        },
-                        "paymentDates" : {
-                          "firstPaymentDate" : "2009-06-20",
-                          "meta" : {
-                            "globalKey" : "8aa3e742"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                          "globalKey" : "2fa76fbc"
                         }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "1fd4e030"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3ef194"
-                        },
-                        "unadjustedDate" : "2014-06-20"
                       },
                       "meta" : {
-                        "globalKey" : "3ef194"
+                        "globalKey" : "a7b3d32c"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "7d137866"
+                    "globalKey" : "819b3a8a"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "7d137866"
+                  "globalKey" : "819b3a8a"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "1f273178"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.01,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.01,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "1a10e2d1"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "c5befd88"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 5000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 5000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "280b774f"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "d0b9c5dd",
+                  "externalReference" : "party2"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1bec43b5",
+                  "externalReference" : "party1"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ed88c"
-              },
-              "value" : "2011-02-12"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "5493001RKR55V4X61F71",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "12345678901234567890123456789012"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "d0f863bc"
                 }
               } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
+              "name" : {
+                "value" : "Bank X"
+              },
+              "businessUnit" : [ {
+                "name" : "New York Office",
+                "contactInformation" : {
+                  "address" : [ {
+                    "street" : [ "123 Park Avenue" ],
+                    "city" : "New York",
+                    "state" : "NY",
+                    "country" : {
+                      "value" : "US"
+                    },
+                    "postalCode" : "10017"
+                  } ]
                 },
-                "value" : "FCHUXIINML"
+                "meta" : {
+                  "globalKey" : "e15b99b0",
+                  "externalKey" : "branch1"
+                }
+              }, {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "person123"
+                    },
+                    "meta" : {
+                      "globalKey" : "32d9e6bd"
+                    }
+                  }
+                } ],
+                "firstName" : "person",
+                "meta" : {
+                  "globalKey" : "5b25cf92",
+                  "externalKey" : "broker"
+                }
+              }, {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "person456"
+                    },
+                    "meta" : {
+                      "globalKey" : "32d9f260"
+                    }
+                  }
+                } ],
+                "firstName" : "person",
+                "meta" : {
+                  "globalKey" : "5b25db35",
+                  "externalKey" : "trader"
+                }
+              } ],
+              "contactInformation" : {
+                "email" : [ "swap_trading@bankx.com" ]
               },
               "meta" : {
-                "globalKey" : "1551a427"
-              },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
+                "globalKey" : "1bec43b5",
+                "externalKey" : "party1"
+              }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B47",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "12345678901234567890123456789012"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45f9"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "956c45f9",
+                "externalKey" : "party1_parent"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B48",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "956c45fa"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "956c45fa",
+                "externalKey" : "party1_affiliate1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B49",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "1031234567"
-              },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45fb"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "f6e91d86"
-              },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
-          },
-          "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "8af8663c"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "e450a87"
+                "globalKey" : "956c45fb",
+                "externalKey" : "party1_affiliate2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B46",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "receiverPartyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "573ad49d"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45f8"
                 }
+              } ],
+              "name" : {
+                "value" : "Bank Y"
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
+              "contactInformation" : {
+                "email" : [ "investments@banky.com" ]
+              },
+              "meta" : {
+                "globalKey" : "d0b9c5dd",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B47",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
-                "value" : 1000
-              },
-              "settlementDate" : {
-                "adjustedDate" : {
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45f9"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "956c45f9",
+                "externalKey" : "party2_parent"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B48",
                   "meta" : {
-                    "globalKey" : "3ec8de"
-                  },
-                  "value" : "2009-03-30"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "unadjustedDate" : "2009-03-28"
-              },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45fa"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "956c45fa",
+                "externalKey" : "party2_affiliate1"
               }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "2002-01-05",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "value" : "ISDA_MASTER"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "8ffabe4b"
                 }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
               },
-              "vintage" : 1992
-            },
-            "meta" : {
-              "globalKey" : "4f2097d4"
-            }
-          }, {
-            "agreementDate" : "2002-01-07",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "ISDA_2003_CREDIT_NORTH_AMERICAN"
+              "meta" : {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND22",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e774"
                 }
+              } ],
+              "name" : {
+                "value" : "XYZ Bank"
+              },
+              "meta" : {
+                "globalKey" : "61a07317",
+                "externalKey" : "executing_agent"
               }
-            },
-            "meta" : {
-              "globalKey" : "5d7949e5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CREDIT_SUPPORT_AGREEMENT"
-              }
-            },
-            "meta" : {
-              "globalKey" : "984ae6d0"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "value" : "STANDARD_NORTH_AMERICAN_CORPORATE"
-                  },
-                  "matrixType" : {
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND11",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
-                } ]
-              }
-            },
-            "meta" : {
-              "globalKey" : "80f11ad5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "OTHER",
-                "otherAgreement" : "Custom Legal Agreement"
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e754"
+                }
+              } ],
+              "name" : {
+                "value" : "SEFCo LLC"
+              },
+              "meta" : {
+                "globalKey" : "ae0d40b7",
+                "externalKey" : "venue"
               }
-            },
-            "meta" : {
-              "globalKey" : "98e1dbe8"
-            }
-          } ]
-        }
-      }
-    } ],
-    "intent" : "CONTRACT_FORMATION",
-    "after" : [ {
-      "meta" : {
-        "globalKey" : "de14114b"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
-      "trade" : {
-        "contractDetails" : {
-          "documentation" : [ {
-            "agreementDate" : "2002-01-05",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "value" : "ISDA_MASTER"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
                 }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
               },
-              "vintage" : 1992
-            },
-            "meta" : {
-              "globalKey" : "4f2097d4"
-            }
-          }, {
-            "agreementDate" : "2002-01-07",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "ISDA_2003_CREDIT_NORTH_AMERICAN"
+              "meta" : {
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
                 }
+              } ],
+              "name" : {
+                "value" : "WorldWide Trade Repository"
+              },
+              "meta" : {
+                "globalKey" : "4ba4fb38",
+                "externalKey" : "original_sdr"
               }
-            },
-            "meta" : {
-              "globalKey" : "5d7949e5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CREDIT_SUPPORT_AGREEMENT"
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "d0b9c5dd",
+                "externalReference" : "party2"
+              },
+              "role" : "ReportingParty",
+              "ownershipPartyReference" : {
+                "globalReference" : "1bec43b5",
+                "externalReference" : "party1"
               }
-            },
+            } ],
             "meta" : {
-              "globalKey" : "984ae6d0"
+              "globalKey" : "c893f834"
             }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "value" : "STANDARD_NORTH_AMERICAN_CORPORATE"
-                  },
-                  "matrixType" : {
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
+          },
+          "transferHistory" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 1000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
                   }
-                } ]
-              }
-            },
-            "meta" : {
-              "globalKey" : "80f11ad5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "OTHER",
-                "otherAgreement" : "Custom Legal Agreement"
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "1bec43b5",
+                  "externalReference" : "party1"
+                },
+                "receiverPartyReference" : {
+                  "globalReference" : "d0b9c5dd",
+                  "externalReference" : "party2"
+                }
+              },
+              "settlementDate" : {
+                "unadjustedDate" : "2009-03-28",
+                "adjustedDate" : {
+                  "value" : "2009-03-30",
+                  "meta" : {
+                    "globalKey" : "3ec8de"
+                  }
+                }
+              },
+              "transferExpression" : {
+                "priceTransfer" : "Upfront"
               }
             },
             "meta" : {
-              "globalKey" : "98e1dbe8"
+              "globalKey" : "57999eaa"
             }
           } ],
           "meta" : {
-            "globalKey" : "2468dfca"
+            "globalKey" : "35b52dde"
           }
-        },
-        "meta" : {
-          "globalKey" : "c909336c"
-        },
-        "party" : [ {
-          "businessUnit" : [ {
-            "contactInformation" : {
-              "address" : [ {
-                "city" : "New York",
-                "country" : {
-                  "value" : "US"
-                },
-                "postalCode" : "10017",
-                "state" : "NY",
-                "street" : [ "123 Park Avenue" ]
-              } ]
-            },
-            "meta" : {
-              "externalKey" : "branch1",
-              "globalKey" : "69aea9de"
-            },
-            "name" : "New York Office"
-          }, {
+        }
+      }
+    } ],
+    "eventQualifier" : "ContractFormation",
+    "after" : [ {
+      "trade" : {
+        "tradeIdentifier" : [ {
+          "issuer" : {
+            "value" : "FCHUXIINML",
             "meta" : {
-              "externalKey" : "desk1",
-              "globalKey" : "5c10b72e"
-            },
-            "name" : "NY Swaps Desk"
-          } ],
-          "contactInformation" : {
-            "email" : [ "swap_trading@bankx.com" ]
-          },
-          "meta" : {
-            "externalKey" : "party1",
-            "globalKey" : "e450a87"
-          },
-          "name" : {
-            "value" : "Bank X"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
+            }
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "12345678901234567890123456789012",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "5493001RKR55V4X61F71"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "d0f863bc"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+              }
             }
           } ],
-          "person" : [ {
-            "firstName" : "person",
-            "meta" : {
-              "externalKey" : "broker",
-              "globalKey" : "5b25cf92"
-            },
-            "personId" : [ {
-              "value" : {
-                "identifier" : {
-                  "value" : "person123"
-                },
-                "meta" : {
-                  "globalKey" : "32d9e6bd"
-                }
-              }
-            } ]
-          }, {
-            "firstName" : "person",
-            "meta" : {
-              "externalKey" : "trader",
-              "globalKey" : "5b25db35"
-            },
-            "personId" : [ {
-              "value" : {
-                "identifier" : {
-                  "value" : "person456"
-                },
-                "meta" : {
-                  "globalKey" : "32d9f260"
-                }
-              }
-            } ]
-          } ]
-        }, {
           "meta" : {
-            "externalKey" : "party1_parent",
-            "globalKey" : "956c45f9"
+            "globalKey" : "ce80645"
           },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300O5MFEP1XJ40B47"
-            },
-            "identifierType" : "LEI",
+          "identifierType" : "UniqueTransactionIdentifier"
+        }, {
+          "issuer" : {
+            "value" : "1031234567",
             "meta" : {
-              "globalKey" : "956c45f9"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party1_affiliate1",
-            "globalKey" : "956c45fa"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "12345678901234567890123456789012",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300O5MFEP1XJ40B48"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "956c45fa"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party1_affiliate2",
-            "globalKey" : "956c45fb"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300O5MFEP1XJ40B49"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "956c45fb"
-            }
-          } ]
-        }, {
-          "contactInformation" : {
-            "email" : [ "investments@banky.com" ]
-          },
-          "meta" : {
-            "externalKey" : "party2",
-            "globalKey" : "573ad49d"
-          },
-          "name" : {
-            "value" : "Bank Y"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300O5MFEP1XJ40B46"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "956c45f8"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party2_parent",
-            "globalKey" : "956c45f9"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300O5MFEP1XJ40B47"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "956c45f9"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party2_affiliate1",
-            "globalKey" : "956c45fa"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300O5MFEP1XJ40B48"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "956c45fa"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "broker1",
-            "globalKey" : "ed0cc6d1"
-          },
-          "name" : {
-            "value" : "Up&Atem"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300OL8KL0WCQ34V31"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "8ffabe4b"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "executing_agent",
-            "globalKey" : "49e97697"
-          },
-          "name" : {
-            "value" : "XYZ Bank"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND22"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e213e774"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "venue",
-            "globalKey" : "6ebddc37"
-          },
-          "name" : {
-            "value" : "SEFCo LLC"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND11"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e213e754"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing-svc",
-            "globalKey" : "611719a0"
-          },
-          "name" : {
-            "value" : "ClearItAll"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND58"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e213e7d7"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+              }
             }
-          } ]
-        }, {
+          } ],
           "meta" : {
-            "externalKey" : "original_sdr",
-            "globalKey" : "9b321c78"
-          },
-          "name" : {
-            "value" : "WorldWide Trade Repository"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND58"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e213e7d7"
-            }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "e450a87"
-          },
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "573ad49d"
+            "globalKey" : "671d1c86"
           },
-          "role" : "REPORTING_PARTY"
+          "identifierType" : "UniqueTransactionIdentifier"
         } ],
+        "tradeDate" : {
+          "value" : "2011-02-12",
+          "meta" : {
+            "globalKey" : "3ed88c"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "573ad49d"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "e450a87"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "meta" : {
-                      "scheme" : "http://www.theice.com/coding-scheme/product-id"
-                    },
-                    "value" : "X123"
-                  },
-                  "meta" : {
-                    "globalKey" : "e6a349ca"
-                  },
-                  "source" : "OTHER"
-                }
-              } ],
               "productTaxonomy" : [ {
                 "primaryAssetClass" : {
-                  "value" : "CREDIT"
+                  "value" : "Credit"
                 }
               }, {
-                "source" : "OTHER",
+                "source" : "Other",
                 "value" : {
                   "name" : {
+                    "value" : "SecurityBasedSwap",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/sec-product-category"
-                    },
-                    "value" : "SecurityBasedSwap"
+                    }
                   }
                 }
               }, {
-                "source" : "OTHER",
+                "source" : "Other",
                 "value" : {
                   "name" : {
+                    "value" : "Credi Default Swap",
                     "meta" : {
                       "scheme" : "http://www.theice.com/coding-scheme/product-name"
-                    },
-                    "value" : "Credi Default Swap"
+                    }
                   }
                 }
               }, {
-                "source" : "OTHER",
+                "source" : "Other",
                 "value" : {
                   "name" : {
                     "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
@@ -1200,331 +838,685 @@
                 "source" : "ISDA",
                 "productQualifier" : "CreditDefaultSwap_SingleName"
               } ],
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "X123",
+                    "meta" : {
+                      "scheme" : "http://www.theice.com/coding-scheme/product-id"
+                    }
+                  },
+                  "source" : "Other",
+                  "meta" : {
+                    "globalKey" : "e6a349ca"
+                  }
+                }
+              } ],
               "economicTerms" : {
                 "effectiveDate" : {
                   "adjustableDate" : {
+                    "unadjustedDate" : "2009-03-26",
                     "meta" : {
                       "globalKey" : "3ec8da"
-                    },
-                    "unadjustedDate" : "2009-03-26"
+                    }
                   },
                   "meta" : {
                     "globalKey" : "3ec8da"
                   }
                 },
+                "terminationDate" : {
+                  "adjustableDate" : {
+                    "unadjustedDate" : "2014-06-20",
+                    "meta" : {
+                      "globalKey" : "3ef194"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3ef194"
+                  }
+                },
                 "payout" : {
-                  "creditDefaultPayout" : {
+                  "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "generalTerms" : {
-                      "referenceInformation" : {
-                        "referenceEntity" : {
-                          "entityId" : [ {
-                            "meta" : {
-                              "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                            },
-                            "value" : "8G836J"
-                          } ],
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
+                    "calculationPeriodDates" : {
+                      "firstPeriodStartDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2009-03-20",
                           "meta" : {
-                            "externalKey" : "referenceEntity",
-                            "globalKey" : "54140007"
-                          },
-                          "name" : {
-                            "value" : "TENET HEALTHCARE CORPORATION"
+                            "globalKey" : "3ec8d4"
                           }
                         },
-                        "referenceObligation" : [ {
-                          "security" : {
-                            "productIdentifier" : [ {
-                              "value" : {
-                                "identifier" : {
-                                  "meta" : {
-                                    "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair-1-0"
-                                  },
-                                  "value" : "8G836JAF2"
-                                },
-                                "meta" : {
-                                  "globalKey" : "1165f83f"
-                                },
-                                "source" : "OTHER"
-                              }
-                            } ],
-                            "securityType" : "DEBT"
-                          }
-                        } ]
-                      }
-                    },
-                    "meta" : {
-                      "globalKey" : "2fa76fbc"
-                    },
-                    "transactedPrice" : {
-                      "marketFixedRate" : 0.02
-                    }
-                  },
-                  "interestRatePayout" : [ {
-                    "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
-                    },
-                    "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "quantitySchedule" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "quantity-1"
+                        "meta" : {
+                          "globalKey" : "3ec8d4"
                         }
-                      }
-                    },
-                    "calculationPeriodDates" : {
+                      },
                       "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
                         "meta" : {
-                          "globalKey" : "28c47"
+                          "globalKey" : "17f73"
                         },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
                         "rollConvention" : "20"
                       },
-                      "firstPeriodStartDate" : {
-                        "adjustableDate" : {
-                          "meta" : {
-                            "globalKey" : "3ec8d4"
-                          },
-                          "unadjustedDate" : "2009-03-20"
-                        },
+                      "meta" : {
+                        "globalKey" : "bf47be47"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
                         "meta" : {
-                          "globalKey" : "3ec8d4"
+                          "globalKey" : "aa"
                         }
                       },
+                      "firstPaymentDate" : "2009-06-20",
                       "meta" : {
-                        "globalKey" : "28c1032d"
+                        "globalKey" : "8aa3de96"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "6afbe26c"
+                      "globalKey" : "eff49770"
+                    }
+                  } ],
+                  "creditDefaultPayout" : {
+                    "payerReceiver" : {
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
-                    "paymentDates" : {
-                      "firstPaymentDate" : "2009-06-20",
-                      "meta" : {
-                        "globalKey" : "8aa3e742"
+                    "priceQuantity" : {
+                      "quantitySchedule" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "quantity-1"
+                        }
                       },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
+                    "generalTerms" : {
+                      "referenceInformation" : {
+                        "referenceEntity" : {
+                          "entityId" : [ {
+                            "value" : "8G836J",
+                            "meta" : {
+                              "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
                             }
+                          } ],
+                          "name" : {
+                            "value" : "TENET HEALTHCARE CORPORATION"
+                          },
+                          "meta" : {
+                            "globalKey" : "54140007",
+                            "externalKey" : "referenceEntity"
                           }
-                        }
+                        },
+                        "referenceObligation" : [ {
+                          "security" : {
+                            "productIdentifier" : [ {
+                              "value" : {
+                                "identifier" : {
+                                  "value" : "8G836JAF2",
+                                  "meta" : {
+                                    "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair-1-0"
+                                  }
+                                },
+                                "source" : "Other",
+                                "meta" : {
+                                  "globalKey" : "1165f83f"
+                                }
+                              }
+                            } ],
+                            "securityType" : "Debt"
+                          }
+                        } ]
                       }
-                    }
-                  } ],
-                  "meta" : {
-                    "globalKey" : "1fd4e030"
-                  }
-                },
-                "terminationDate" : {
-                  "adjustableDate" : {
-                    "meta" : {
-                      "globalKey" : "3ef194"
                     },
-                    "unadjustedDate" : "2014-06-20"
+                    "transactedPrice" : {
+                      "marketFixedRate" : 0.02
+                    },
+                    "meta" : {
+                      "globalKey" : "2fa76fbc"
+                    }
                   },
                   "meta" : {
-                    "globalKey" : "3ef194"
+                    "globalKey" : "a7b3d32c"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "7d137866"
+                "globalKey" : "819b3a8a"
               }
             },
             "meta" : {
-              "globalKey" : "7d137866"
+              "globalKey" : "819b3a8a"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "1f273178"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.01,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.01,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "1a10e2d1"
-              },
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "c5befd88"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 5000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 5000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "280b774f"
+              }
             } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "d0b9c5dd",
+              "externalReference" : "party2"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "1bec43b5",
+              "externalReference" : "party1"
+            }
           } ]
         },
-        "tradeDate" : {
+        "party" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "5493001RKR55V4X61F71",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "d0f863bc"
+            }
+          } ],
+          "name" : {
+            "value" : "Bank X"
+          },
+          "businessUnit" : [ {
+            "name" : "New York Office",
+            "contactInformation" : {
+              "address" : [ {
+                "street" : [ "123 Park Avenue" ],
+                "city" : "New York",
+                "state" : "NY",
+                "country" : {
+                  "value" : "US"
+                },
+                "postalCode" : "10017"
+              } ]
+            },
+            "meta" : {
+              "globalKey" : "e15b99b0",
+              "externalKey" : "branch1"
+            }
+          }, {
+            "name" : "NY Swaps Desk",
+            "meta" : {
+              "globalKey" : "5c10b72e",
+              "externalKey" : "desk1"
+            }
+          } ],
+          "person" : [ {
+            "personId" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "person123"
+                },
+                "meta" : {
+                  "globalKey" : "32d9e6bd"
+                }
+              }
+            } ],
+            "firstName" : "person",
+            "meta" : {
+              "globalKey" : "5b25cf92",
+              "externalKey" : "broker"
+            }
+          }, {
+            "personId" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "person456"
+                },
+                "meta" : {
+                  "globalKey" : "32d9f260"
+                }
+              }
+            } ],
+            "firstName" : "person",
+            "meta" : {
+              "globalKey" : "5b25db35",
+              "externalKey" : "trader"
+            }
+          } ],
+          "contactInformation" : {
+            "email" : [ "swap_trading@bankx.com" ]
+          },
           "meta" : {
-            "globalKey" : "3ed88c"
+            "globalKey" : "1bec43b5",
+            "externalKey" : "party1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300O5MFEP1XJ40B47",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "956c45f9"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "956c45f9",
+            "externalKey" : "party1_parent"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300O5MFEP1XJ40B48",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "956c45fa"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "956c45fa",
+            "externalKey" : "party1_affiliate1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300O5MFEP1XJ40B49",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "956c45fb"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "956c45fb",
+            "externalKey" : "party1_affiliate2"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300O5MFEP1XJ40B46",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "956c45f8"
+            }
+          } ],
+          "name" : {
+            "value" : "Bank Y"
           },
-          "value" : "2011-02-12"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
+          "contactInformation" : {
+            "email" : [ "investments@banky.com" ]
+          },
+          "meta" : {
+            "globalKey" : "d0b9c5dd",
+            "externalKey" : "party2"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "549300O5MFEP1XJ40B47",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-              },
-              "value" : "12345678901234567890123456789012"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "956c45f9"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "956c45f9",
+            "externalKey" : "party2_parent"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300O5MFEP1XJ40B48",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
+              "globalKey" : "956c45fa"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "956c45fa",
+            "externalKey" : "party2_affiliate1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300OL8KL0WCQ34V31",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "8ffabe4b"
+            }
+          } ],
+          "name" : {
+            "value" : "Up&Atem"
+          },
+          "meta" : {
+            "globalKey" : "ce0b9311",
+            "externalKey" : "broker1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300IB5Q45JGNPND22",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
             },
-            "value" : "FCHUXIINML"
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e774"
+            }
+          } ],
+          "name" : {
+            "value" : "XYZ Bank"
           },
           "meta" : {
-            "globalKey" : "1551a427"
+            "globalKey" : "61a07317",
+            "externalKey" : "executing_agent"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300IB5Q45JGNPND11",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e754"
+            }
+          } ],
+          "name" : {
+            "value" : "SEFCo LLC"
           },
-          "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
+          "meta" : {
+            "globalKey" : "ae0d40b7",
+            "externalKey" : "venue"
+          }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "549300IB5Q45JGNPND58",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e7d7"
+            }
+          } ],
+          "name" : {
+            "value" : "ClearItAll"
+          },
+          "meta" : {
+            "globalKey" : "f6a6cc60",
+            "externalKey" : "clearing-svc"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300IB5Q45JGNPND58",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e7d7"
+            }
+          } ],
+          "name" : {
+            "value" : "WorldWide Trade Repository"
+          },
+          "meta" : {
+            "globalKey" : "4ba4fb38",
+            "externalKey" : "original_sdr"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "d0b9c5dd",
+            "externalReference" : "party2"
+          },
+          "role" : "ReportingParty",
+          "ownershipPartyReference" : {
+            "globalReference" : "1bec43b5",
+            "externalReference" : "party1"
+          }
+        } ],
+        "contractDetails" : {
+          "documentation" : [ {
+            "agreementDate" : "2002-01-05",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster"
+                }
               },
-              "value" : "12345678901234567890123456789012"
+              "vintage" : 1992
+            },
+            "meta" : {
+              "globalKey" : "4f2097d4"
+            }
+          }, {
+            "agreementDate" : "2002-01-07",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "ISDA2003CreditNorthAmerican"
+                }
+              }
+            },
+            "meta" : {
+              "globalKey" : "5d7949e5"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "CreditSupportAgreement"
+              }
+            },
+            "meta" : {
+              "globalKey" : "984ae6d0"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix"
+                  },
+                  "matrixTerm" : {
+                    "value" : "StandardNorthAmericanCorporate"
+                  }
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "9ed2f955"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Other",
+                "otherAgreement" : "Custom Legal Agreement"
+              }
+            },
+            "meta" : {
+              "globalKey" : "98e1dbe8"
             }
           } ],
-          "issuer" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-            },
-            "value" : "1031234567"
-          },
           "meta" : {
-            "globalKey" : "f6e91d86"
-          },
-          "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-        } ]
+            "globalKey" : "396e114a"
+          }
+        },
+        "meta" : {
+          "globalKey" : "77cff7e"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
       },
       "transferHistory" : [ {
-        "meta" : {
-          "globalKey" : "8af8663c"
-        },
         "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "e450a87"
-            },
-            "receiverPartyReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "573ad49d"
-            }
-          },
           "quantity" : {
+            "value" : 1000,
             "unit" : {
               "currency" : {
                 "value" : "USD"
               }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "1bec43b5",
+              "externalReference" : "party1"
             },
-            "value" : 1000
+            "receiverPartyReference" : {
+              "globalReference" : "d0b9c5dd",
+              "externalReference" : "party2"
+            }
           },
           "settlementDate" : {
+            "unadjustedDate" : "2009-03-28",
             "adjustedDate" : {
+              "value" : "2009-03-30",
               "meta" : {
                 "globalKey" : "3ec8de"
-              },
-              "value" : "2009-03-30"
-            },
-            "unadjustedDate" : "2009-03-28"
+              }
+            }
           },
           "transferExpression" : {
-            "priceTransfer" : "UPFRONT"
+            "priceTransfer" : "Upfront"
           }
+        },
+        "meta" : {
+          "globalKey" : "57999eaa"
         }
-      } ]
-    } ],
-    "eventQualifier" : "ContractFormation",
-    "meta" : {
-      "globalKey" : "4b41ad4f"
-    }
-  },
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "BANKX0001"
+      } ],
+      "meta" : {
+        "globalKey" : "e65d37cb"
       }
     } ],
     "meta" : {
-      "globalKey" : "3ce1279d"
+      "globalKey" : "d7e8a37f"
     }
-  } ],
+  },
+  "previousWorkflowStep" : {
+    "globalReference" : "c12f7389"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "BANKX0001",
       "meta" : {
         "scheme" : "http://www.bankx.com/msg_id"
-      },
-      "value" : "BANKX0001"
+      }
     },
     "sentBy" : {
       "value" : "BANKX"
@@ -1533,62 +1525,65 @@
       "value" : "SDR01"
     } ]
   },
-  "meta" : {
-    "globalKey" : "b2089670"
-  },
+  "timestamp" : [ {
+    "dateTime" : "2011-02-12T12:21:16Z",
+    "qualification" : "eventCreationDateTime"
+  }, {
+    "dateTime" : "2011-02-12T12:20:47Z",
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "BANKX0001"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "3ce1279d"
+    }
+  } ],
+  "action" : "New",
   "party" : [ {
+    "partyId" : [ {
+      "identifier" : {
+        "value" : "5493001RKR55V4X61F71",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+        }
+      },
+      "identifierType" : "LEI",
+      "meta" : {
+        "globalKey" : "d0f863bc"
+      }
+    } ],
+    "name" : {
+      "value" : "Bank X"
+    },
     "businessUnit" : [ {
+      "name" : "New York Office",
       "contactInformation" : {
         "address" : [ {
+          "street" : [ "123 Park Avenue" ],
           "city" : "New York",
+          "state" : "NY",
           "country" : {
             "value" : "US"
           },
-          "postalCode" : "10017",
-          "state" : "NY",
-          "street" : [ "123 Park Avenue" ]
+          "postalCode" : "10017"
         } ]
       },
       "meta" : {
-        "externalKey" : "branch1",
-        "globalKey" : "69aea9de"
-      },
-      "name" : "New York Office"
+        "globalKey" : "e15b99b0",
+        "externalKey" : "branch1"
+      }
     }, {
+      "name" : "NY Swaps Desk",
       "meta" : {
-        "externalKey" : "desk1",
-        "globalKey" : "5c10b72e"
-      },
-      "name" : "NY Swaps Desk"
-    } ],
-    "contactInformation" : {
-      "email" : [ "swap_trading@bankx.com" ]
-    },
-    "meta" : {
-      "externalKey" : "party1",
-      "globalKey" : "e450a87"
-    },
-    "name" : {
-      "value" : "Bank X"
-    },
-    "partyId" : [ {
-      "identifier" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "5493001RKR55V4X61F71"
-      },
-      "identifierType" : "LEI",
-      "meta" : {
-        "globalKey" : "d0f863bc"
+        "globalKey" : "5c10b72e",
+        "externalKey" : "desk1"
       }
     } ],
     "person" : [ {
-      "firstName" : "person",
-      "meta" : {
-        "externalKey" : "broker",
-        "globalKey" : "5b25cf92"
-      },
       "personId" : [ {
         "value" : {
           "identifier" : {
@@ -1598,13 +1593,13 @@
             "globalKey" : "32d9e6bd"
           }
         }
-      } ]
-    }, {
+      } ],
       "firstName" : "person",
       "meta" : {
-        "externalKey" : "trader",
-        "globalKey" : "5b25db35"
-      },
+        "globalKey" : "5b25cf92",
+        "externalKey" : "broker"
+      }
+    }, {
       "personId" : [ {
         "value" : {
           "identifier" : {
@@ -1614,225 +1609,230 @@
             "globalKey" : "32d9f260"
           }
         }
-      } ]
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "party1_parent",
-      "globalKey" : "956c45f9"
+      } ],
+      "firstName" : "person",
+      "meta" : {
+        "globalKey" : "5b25db35",
+        "externalKey" : "trader"
+      }
+    } ],
+    "contactInformation" : {
+      "email" : [ "swap_trading@bankx.com" ]
     },
+    "meta" : {
+      "globalKey" : "1bec43b5",
+      "externalKey" : "party1"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B47",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B47"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45f9"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "party1_affiliate1",
-      "globalKey" : "956c45fa"
-    },
+      "globalKey" : "956c45f9",
+      "externalKey" : "party1_parent"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B48",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B48"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45fa"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "party1_affiliate2",
-      "globalKey" : "956c45fb"
-    },
+      "globalKey" : "956c45fa",
+      "externalKey" : "party1_affiliate1"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B49",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B49"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45fb"
       }
-    } ]
-  }, {
-    "contactInformation" : {
-      "email" : [ "investments@banky.com" ]
-    },
+    } ],
     "meta" : {
-      "externalKey" : "party2",
-      "globalKey" : "573ad49d"
-    },
-    "name" : {
-      "value" : "Bank Y"
-    },
+      "globalKey" : "956c45fb",
+      "externalKey" : "party1_affiliate2"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B46",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B46"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45f8"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "party2_parent",
-      "globalKey" : "956c45f9"
+    } ],
+    "name" : {
+      "value" : "Bank Y"
+    },
+    "contactInformation" : {
+      "email" : [ "investments@banky.com" ]
     },
+    "meta" : {
+      "globalKey" : "d0b9c5dd",
+      "externalKey" : "party2"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B47",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B47"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45f9"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "party2_affiliate1",
-      "globalKey" : "956c45fa"
-    },
+      "globalKey" : "956c45f9",
+      "externalKey" : "party2_parent"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B48",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B48"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45fa"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "broker1",
-      "globalKey" : "ed0cc6d1"
-    },
-    "name" : {
-      "value" : "Up&Atem"
-    },
+      "globalKey" : "956c45fa",
+      "externalKey" : "party2_affiliate1"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300OL8KL0WCQ34V31",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300OL8KL0WCQ34V31"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "8ffabe4b"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "executing_agent",
-      "globalKey" : "49e97697"
-    },
+    } ],
     "name" : {
-      "value" : "XYZ Bank"
+      "value" : "Up&Atem"
     },
+    "meta" : {
+      "globalKey" : "ce0b9311",
+      "externalKey" : "broker1"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300IB5Q45JGNPND22",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND22"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "e213e774"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "venue",
-      "globalKey" : "6ebddc37"
-    },
+    } ],
     "name" : {
-      "value" : "SEFCo LLC"
+      "value" : "XYZ Bank"
     },
+    "meta" : {
+      "globalKey" : "61a07317",
+      "externalKey" : "executing_agent"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300IB5Q45JGNPND11",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND11"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "e213e754"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "clearing-svc",
-      "globalKey" : "611719a0"
-    },
+    } ],
     "name" : {
-      "value" : "ClearItAll"
+      "value" : "SEFCo LLC"
     },
+    "meta" : {
+      "globalKey" : "ae0d40b7",
+      "externalKey" : "venue"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300IB5Q45JGNPND58",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND58"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "e213e7d7"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "original_sdr",
-      "globalKey" : "9b321c78"
-    },
+    } ],
     "name" : {
-      "value" : "WorldWide Trade Repository"
+      "value" : "ClearItAll"
     },
+    "meta" : {
+      "globalKey" : "f6a6cc60",
+      "externalKey" : "clearing-svc"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300IB5Q45JGNPND58",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND58"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "e213e7d7"
       }
-    } ]
+    } ],
+    "name" : {
+      "value" : "WorldWide Trade Repository"
+    },
+    "meta" : {
+      "globalKey" : "4ba4fb38",
+      "externalKey" : "original_sdr"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "613a6dad"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2011-02-12T12:21:16Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  }, {
-    "dateTime" : "2011-02-12T12:20:47Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+  "meta" : {
+    "globalKey" : "4a7bc39c"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-beta-trade-CFTC-SEC-and-canada-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-beta-trade-CFTC-SEC-and-canada-func-output.json
index a05a05e4cb..35fb12082f 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-beta-trade-CFTC-SEC-and-canada-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-beta-trade-CFTC-SEC-and-canada-func-output.json
@@ -1,315 +1,154 @@
 {
-  "action" : "NEW",
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "52e93253"
-          },
-          "trade" : {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "2002-01-05",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster"
+                }
+              },
+              "vintage" : 1992
+            },
             "meta" : {
-              "globalKey" : "ae977cbe"
+              "globalKey" : "4f2097d4"
+            }
+          }, {
+            "agreementDate" : "2002-01-07",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "ISDA2003CreditNorthAmerican"
+                }
+              }
             },
-            "party" : [ {
-              "businessUnit" : [ {
-                "contactInformation" : {
-                  "address" : [ {
-                    "city" : "New York",
-                    "country" : {
-                      "value" : "US"
-                    },
-                    "postalCode" : "10017",
-                    "state" : "NY",
-                    "street" : [ "123 Park Avenue" ]
-                  } ]
-                },
-                "meta" : {
-                  "externalKey" : "branch1",
-                  "globalKey" : "69aea9de"
-                },
-                "name" : "New York Office"
-              }, {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "contactInformation" : {
-                "email" : [ "swap_trading@bankx.com" ]
-              },
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "e450a87"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            "meta" : {
+              "globalKey" : "5d7949e5"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "CreditSupportAgreement"
+              }
+            },
+            "meta" : {
+              "globalKey" : "984ae6d0"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix"
                   },
-                  "value" : "5493001RKR55V4X61F71"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "d0f863bc"
-                }
-              } ],
-              "person" : [ {
-                "firstName" : "person",
-                "meta" : {
-                  "externalKey" : "broker",
-                  "globalKey" : "5b25cf92"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "person123"
-                    },
-                    "meta" : {
-                      "globalKey" : "32d9e6bd"
-                    }
-                  }
-                } ]
-              }, {
-                "firstName" : "person",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "5b25db35"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "person456"
-                    },
-                    "meta" : {
-                      "globalKey" : "32d9f260"
-                    }
+                  "matrixTerm" : {
+                    "value" : "StandardNorthAmericanCorporate"
                   }
                 } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_parent",
-                "globalKey" : "956c45f9"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B47"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f9"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_affiliate1",
-                "globalKey" : "956c45fa"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B48"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45fa"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_affiliate2",
-                "globalKey" : "956c45fb"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B49"
-                },
-                "identifierType" : "LEI",
+              }
+            },
+            "meta" : {
+              "globalKey" : "9ed2f955"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Other",
+                "otherAgreement" : "Custom Legal Agreement"
+              }
+            },
+            "meta" : {
+              "globalKey" : "98e1dbe8"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "FCHUXIINML",
                 "meta" : {
-                  "globalKey" : "956c45fb"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
-              },
-              "name" : {
-                "value" : "Up&Atem"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "12345678901234567890123456789012",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "executing_agent",
-                "globalKey" : "49e97697"
-              },
-              "name" : {
-                "value" : "XYZ Bank"
+                "globalKey" : "ce80645"
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND22"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e774"
-                }
-              } ]
+              "identifierType" : "UniqueTransactionIdentifier"
             }, {
-              "meta" : {
-                "externalKey" : "venue",
-                "globalKey" : "6ebddc37"
-              },
-              "name" : {
-                "value" : "SEFCo LLC"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND11"
-                },
-                "identifierType" : "LEI",
+              "issuer" : {
+                "value" : "1031234567",
                 "meta" : {
-                  "globalKey" : "e213e754"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "12345678901234567890123456789012",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "original_sdr",
-                "globalKey" : "9b321c78"
-              },
-              "name" : {
-                "value" : "WorldWide Trade Repository"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
-                }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "e450a87"
+                "globalKey" : "671d1c86"
               },
-              "partyReference" : {
-                "externalReference" : "clearing-svc",
-                "globalReference" : "611719a0"
-              },
-              "role" : "CLEARING_ORGANIZATION"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
-            "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing-svc",
-                  "globalReference" : "611719a0"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "e450a87"
-                },
-                "role" : "PARTY_2"
-              } ],
+            "tradeDate" : {
+              "value" : "2011-02-12",
+              "meta" : {
+                "globalKey" : "3ed88c"
+              }
+            },
+            "tradableProduct" : {
               "product" : {
                 "contractualProduct" : {
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "meta" : {
-                          "scheme" : "http://www.theice.com/coding-scheme/product-id"
-                        },
-                        "value" : "X123"
-                      },
-                      "meta" : {
-                        "globalKey" : "e6a349ca"
-                      },
-                      "source" : "OTHER"
-                    }
-                  } ],
                   "productTaxonomy" : [ {
                     "primaryAssetClass" : {
-                      "value" : "CREDIT"
+                      "value" : "Credit"
                     }
                   }, {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
+                        "value" : "SecurityBasedSwap",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/sec-product-category"
-                        },
-                        "value" : "SecurityBasedSwap"
+                        }
                       }
                     }
                   }, {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
+                        "value" : "Credi Default Swap",
                         "meta" : {
                           "scheme" : "http://www.theice.com/coding-scheme/product-name"
-                        },
-                        "value" : "Credi Default Swap"
+                        }
                       }
                     }
                   }, {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
                         "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
@@ -319,50 +158,147 @@
                     "source" : "ISDA",
                     "productQualifier" : "CreditDefaultSwap_SingleName"
                   } ],
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "X123",
+                        "meta" : {
+                          "scheme" : "http://www.theice.com/coding-scheme/product-id"
+                        }
+                      },
+                      "source" : "Other",
+                      "meta" : {
+                        "globalKey" : "e6a349ca"
+                      }
+                    }
+                  } ],
                   "economicTerms" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2009-03-26",
                         "meta" : {
                           "globalKey" : "3ec8da"
-                        },
-                        "unadjustedDate" : "2009-03-26"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "3ec8da"
                       }
                     },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2014-06-20",
+                        "meta" : {
+                          "globalKey" : "3ef194"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ef194"
+                      }
+                    },
                     "payout" : {
-                      "creditDefaultPayout" : {
+                      "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
                           "meta" : {
                             "globalKey" : "0"
+                          }
+                        },
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "calculationPeriodDates" : {
+                          "firstPeriodStartDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2009-03-20",
+                              "meta" : {
+                                "globalKey" : "3ec8d4"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3ec8d4"
+                            }
                           },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
+                          "meta" : {
+                            "globalKey" : "bf47be47"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "firstPaymentDate" : "2009-06-20",
+                          "meta" : {
+                            "globalKey" : "8aa3de96"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "eff49770"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "generalTerms" : {
                           "referenceInformation" : {
                             "referenceEntity" : {
                               "entityId" : [ {
+                                "value" : "8G836J",
                                 "meta" : {
                                   "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                                },
-                                "value" : "8G836J"
+                                }
                               } ],
-                              "meta" : {
-                                "externalKey" : "referenceEntity",
-                                "globalKey" : "54140007"
-                              },
                               "name" : {
                                 "value" : "TENET HEALTHCARE CORPORATION"
+                              },
+                              "meta" : {
+                                "globalKey" : "54140007",
+                                "externalKey" : "referenceEntity"
                               }
                             },
                             "referenceObligation" : [ {
@@ -370,713 +306,472 @@
                                 "productIdentifier" : [ {
                                   "value" : {
                                     "identifier" : {
+                                      "value" : "8G836JAF2",
                                       "meta" : {
                                         "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair-1-0"
-                                      },
-                                      "value" : "8G836JAF2"
+                                      }
                                     },
+                                    "source" : "Other",
                                     "meta" : {
                                       "globalKey" : "1165f83f"
-                                    },
-                                    "source" : "OTHER"
+                                    }
                                   }
                                 } ],
-                                "securityType" : "DEBT"
+                                "securityType" : "Debt"
                               }
                             } ]
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "2fa76fbc"
-                        },
                         "transactedPrice" : {
                           "marketFixedRate" : 0.02
-                        }
-                      },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
-                          "firstPeriodStartDate" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3ec8d4"
-                              },
-                              "unadjustedDate" : "2009-03-20"
-                            },
-                            "meta" : {
-                              "globalKey" : "3ec8d4"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "28c1032d"
-                          }
                         },
                         "meta" : {
-                          "globalKey" : "6afbe26c"
-                        },
-                        "paymentDates" : {
-                          "firstPaymentDate" : "2009-06-20",
-                          "meta" : {
-                            "globalKey" : "8aa3e742"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                          "globalKey" : "2fa76fbc"
                         }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "1fd4e030"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3ef194"
-                        },
-                        "unadjustedDate" : "2014-06-20"
                       },
                       "meta" : {
-                        "globalKey" : "3ef194"
+                        "globalKey" : "a7b3d32c"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "7d137866"
+                    "globalKey" : "819b3a8a"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "7d137866"
+                  "globalKey" : "819b3a8a"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "1f273178"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.01,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.01,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "1a10e2d1"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "c5befd88"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 5000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 5000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "280b774f"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "f6a6cc60",
+                  "externalReference" : "clearing-svc"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1bec43b5",
+                  "externalReference" : "party1"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ed88c"
-              },
-              "value" : "2011-02-12"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "5493001RKR55V4X61F71",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "12345678901234567890123456789012"
-                }
-              } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "FCHUXIINML"
-              },
-              "meta" : {
-                "globalKey" : "1551a427"
-              },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            }, {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "12345678901234567890123456789012"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "d0f863bc"
                 }
               } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-                },
-                "value" : "1031234567"
-              },
-              "meta" : {
-                "globalKey" : "f6e91d86"
+              "name" : {
+                "value" : "Bank X"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
-          },
-          "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "bd170795"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "e450a87"
+              "businessUnit" : [ {
+                "name" : "New York Office",
+                "contactInformation" : {
+                  "address" : [ {
+                    "street" : [ "123 Park Avenue" ],
+                    "city" : "New York",
+                    "state" : "NY",
+                    "country" : {
+                      "value" : "US"
+                    },
+                    "postalCode" : "10017"
+                  } ]
                 },
-                "receiverPartyReference" : {
-                  "externalReference" : "clearing-svc",
-                  "globalReference" : "611719a0"
+                "meta" : {
+                  "globalKey" : "e15b99b0",
+                  "externalKey" : "branch1"
                 }
-              },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 1000
-              },
-              "settlementDate" : {
-                "adjustedDate" : {
-                  "meta" : {
-                    "globalKey" : "3ec8de"
-                  },
-                  "value" : "2009-03-30"
-                },
-                "unadjustedDate" : "2009-03-28"
-              },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
-              }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "2002-01-05",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "value" : "ISDA_MASTER"
+              }, {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
                 }
-              },
-              "vintage" : 1992
-            },
-            "meta" : {
-              "globalKey" : "4f2097d4"
-            }
-          }, {
-            "agreementDate" : "2002-01-07",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "ISDA_2003_CREDIT_NORTH_AMERICAN"
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "person123"
+                    },
+                    "meta" : {
+                      "globalKey" : "32d9e6bd"
+                    }
+                  }
+                } ],
+                "firstName" : "person",
+                "meta" : {
+                  "globalKey" : "5b25cf92",
+                  "externalKey" : "broker"
                 }
-              }
-            },
-            "meta" : {
-              "globalKey" : "5d7949e5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CREDIT_SUPPORT_AGREEMENT"
-              }
-            },
-            "meta" : {
-              "globalKey" : "984ae6d0"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "value" : "STANDARD_NORTH_AMERICAN_CORPORATE"
-                  },
-                  "matrixType" : {
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
+              }, {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "person456"
+                    },
+                    "meta" : {
+                      "globalKey" : "32d9f260"
+                    }
                   }
-                } ]
-              }
-            },
-            "meta" : {
-              "globalKey" : "80f11ad5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "OTHER",
-                "otherAgreement" : "Custom Legal Agreement"
-              }
-            },
-            "meta" : {
-              "globalKey" : "98e1dbe8"
-            }
-          } ]
-        }
-      }
-    } ],
-    "intent" : "CONTRACT_FORMATION",
-    "after" : [ {
-      "meta" : {
-        "globalKey" : "d3a37f1a"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
-      "trade" : {
-        "contractDetails" : {
-          "documentation" : [ {
-            "agreementDate" : "2002-01-05",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "value" : "ISDA_MASTER"
+                } ],
+                "firstName" : "person",
+                "meta" : {
+                  "globalKey" : "5b25db35",
+                  "externalKey" : "trader"
                 }
+              } ],
+              "contactInformation" : {
+                "email" : [ "swap_trading@bankx.com" ]
               },
-              "vintage" : 1992
-            },
-            "meta" : {
-              "globalKey" : "4f2097d4"
-            }
-          }, {
-            "agreementDate" : "2002-01-07",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "ISDA_2003_CREDIT_NORTH_AMERICAN"
-                }
-              }
-            },
-            "meta" : {
-              "globalKey" : "5d7949e5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CREDIT_SUPPORT_AGREEMENT"
+              "meta" : {
+                "globalKey" : "1bec43b5",
+                "externalKey" : "party1"
               }
-            },
-            "meta" : {
-              "globalKey" : "984ae6d0"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "value" : "STANDARD_NORTH_AMERICAN_CORPORATE"
-                  },
-                  "matrixType" : {
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B47",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45f9"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "956c45f9",
+                "externalKey" : "party1_parent"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B48",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
-                } ]
-              }
-            },
-            "meta" : {
-              "globalKey" : "80f11ad5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "OTHER",
-                "otherAgreement" : "Custom Legal Agreement"
-              }
-            },
-            "meta" : {
-              "globalKey" : "98e1dbe8"
-            }
-          } ],
-          "meta" : {
-            "globalKey" : "2468dfca"
-          }
-        },
-        "meta" : {
-          "globalKey" : "19bc7f88"
-        },
-        "party" : [ {
-          "businessUnit" : [ {
-            "contactInformation" : {
-              "address" : [ {
-                "city" : "New York",
-                "country" : {
-                  "value" : "US"
                 },
-                "postalCode" : "10017",
-                "state" : "NY",
-                "street" : [ "123 Park Avenue" ]
-              } ]
-            },
-            "meta" : {
-              "externalKey" : "branch1",
-              "globalKey" : "69aea9de"
-            },
-            "name" : "New York Office"
-          }, {
-            "meta" : {
-              "externalKey" : "desk1",
-              "globalKey" : "5c10b72e"
-            },
-            "name" : "NY Swaps Desk"
-          } ],
-          "contactInformation" : {
-            "email" : [ "swap_trading@bankx.com" ]
-          },
-          "meta" : {
-            "externalKey" : "party1",
-            "globalKey" : "e450a87"
-          },
-          "name" : {
-            "value" : "Bank X"
-          },
-          "partyId" : [ {
-            "identifier" : {
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45fa"
+                }
+              } ],
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "5493001RKR55V4X61F71"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "d0f863bc"
-            }
-          } ],
-          "person" : [ {
-            "firstName" : "person",
-            "meta" : {
-              "externalKey" : "broker",
-              "globalKey" : "5b25cf92"
-            },
-            "personId" : [ {
-              "value" : {
+                "globalKey" : "956c45fa",
+                "externalKey" : "party1_affiliate1"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "value" : "person123"
+                  "value" : "549300O5MFEP1XJ40B49",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "32d9e6bd"
+                  "globalKey" : "956c45fb"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "956c45fb",
+                "externalKey" : "party1_affiliate2"
               }
-            } ]
-          }, {
-            "firstName" : "person",
-            "meta" : {
-              "externalKey" : "trader",
-              "globalKey" : "5b25db35"
-            },
-            "personId" : [ {
-              "value" : {
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "value" : "person456"
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "32d9f260"
+                  "globalKey" : "8ffabe4b"
                 }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
+              },
+              "meta" : {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
               }
-            } ]
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party1_parent",
-            "globalKey" : "956c45f9"
-          },
-          "partyId" : [ {
-            "identifier" : {
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND22",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e774"
+                }
+              } ],
+              "name" : {
+                "value" : "XYZ Bank"
+              },
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                "globalKey" : "61a07317",
+                "externalKey" : "executing_agent"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND11",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e754"
+                }
+              } ],
+              "name" : {
+                "value" : "SEFCo LLC"
               },
-              "value" : "549300O5MFEP1XJ40B47"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "956c45f9"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party1_affiliate1",
-            "globalKey" : "956c45fa"
-          },
-          "partyId" : [ {
-            "identifier" : {
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                "globalKey" : "ae0d40b7",
+                "externalKey" : "venue"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
               },
-              "value" : "549300O5MFEP1XJ40B48"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "956c45fa"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party1_affiliate2",
-            "globalKey" : "956c45fb"
-          },
-          "partyId" : [ {
-            "identifier" : {
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "WorldWide Trade Repository"
               },
-              "value" : "549300O5MFEP1XJ40B49"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "956c45fb"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "broker1",
-            "globalKey" : "ed0cc6d1"
-          },
-          "name" : {
-            "value" : "Up&Atem"
-          },
-          "partyId" : [ {
-            "identifier" : {
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                "globalKey" : "4ba4fb38",
+                "externalKey" : "original_sdr"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "f6a6cc60",
+                "externalReference" : "clearing-svc"
               },
-              "value" : "549300OL8KL0WCQ34V31"
-            },
-            "identifierType" : "LEI",
+              "role" : "ClearingOrganization",
+              "ownershipPartyReference" : {
+                "globalReference" : "1bec43b5",
+                "externalReference" : "party1"
+              }
+            } ],
             "meta" : {
-              "globalKey" : "8ffabe4b"
+              "globalKey" : "3eda5dc6"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "executing_agent",
-            "globalKey" : "49e97697"
           },
-          "name" : {
-            "value" : "XYZ Bank"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "transferHistory" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 1000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "1bec43b5",
+                  "externalReference" : "party1"
+                },
+                "receiverPartyReference" : {
+                  "globalReference" : "f6a6cc60",
+                  "externalReference" : "clearing-svc"
+                }
+              },
+              "settlementDate" : {
+                "unadjustedDate" : "2009-03-28",
+                "adjustedDate" : {
+                  "value" : "2009-03-30",
+                  "meta" : {
+                    "globalKey" : "3ec8de"
+                  }
+                }
               },
-              "value" : "549300IB5Q45JGNPND22"
+              "transferExpression" : {
+                "priceTransfer" : "Upfront"
+              }
             },
-            "identifierType" : "LEI",
             "meta" : {
-              "globalKey" : "e213e774"
+              "globalKey" : "5f6691f1"
             }
-          } ]
-        }, {
+          } ],
           "meta" : {
-            "externalKey" : "venue",
-            "globalKey" : "6ebddc37"
-          },
-          "name" : {
-            "value" : "SEFCo LLC"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND11"
-            },
-            "identifierType" : "LEI",
+            "globalKey" : "2004e5b7"
+          }
+        }
+      }
+    } ],
+    "eventQualifier" : "ContractFormation",
+    "after" : [ {
+      "trade" : {
+        "tradeIdentifier" : [ {
+          "issuer" : {
+            "value" : "FCHUXIINML",
             "meta" : {
-              "globalKey" : "e213e754"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing-svc",
-            "globalKey" : "611719a0"
           },
-          "name" : {
-            "value" : "ClearItAll"
-          },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "12345678901234567890123456789012",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND58"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e213e7d7"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+              }
             }
-          } ]
-        }, {
+          } ],
           "meta" : {
-            "externalKey" : "original_sdr",
-            "globalKey" : "9b321c78"
+            "globalKey" : "ce80645"
           },
-          "name" : {
-            "value" : "WorldWide Trade Repository"
+          "identifierType" : "UniqueTransactionIdentifier"
+        }, {
+          "issuer" : {
+            "value" : "1031234567",
+            "meta" : {
+              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+            }
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "12345678901234567890123456789012",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND58"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e213e7d7"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+              }
             }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "e450a87"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing-svc",
-            "globalReference" : "611719a0"
+          } ],
+          "meta" : {
+            "globalKey" : "671d1c86"
           },
-          "role" : "CLEARING_ORGANIZATION"
+          "identifierType" : "UniqueTransactionIdentifier"
         } ],
+        "tradeDate" : {
+          "value" : "2011-02-12",
+          "meta" : {
+            "globalKey" : "3ed88c"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "clearing-svc",
-              "globalReference" : "611719a0"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "e450a87"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "meta" : {
-                      "scheme" : "http://www.theice.com/coding-scheme/product-id"
-                    },
-                    "value" : "X123"
-                  },
-                  "meta" : {
-                    "globalKey" : "e6a349ca"
-                  },
-                  "source" : "OTHER"
-                }
-              } ],
               "productTaxonomy" : [ {
                 "primaryAssetClass" : {
-                  "value" : "CREDIT"
+                  "value" : "Credit"
                 }
               }, {
-                "source" : "OTHER",
+                "source" : "Other",
                 "value" : {
                   "name" : {
+                    "value" : "SecurityBasedSwap",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/sec-product-category"
-                    },
-                    "value" : "SecurityBasedSwap"
+                    }
                   }
                 }
               }, {
-                "source" : "OTHER",
+                "source" : "Other",
                 "value" : {
                   "name" : {
+                    "value" : "Credi Default Swap",
                     "meta" : {
                       "scheme" : "http://www.theice.com/coding-scheme/product-name"
-                    },
-                    "value" : "Credi Default Swap"
+                    }
                   }
                 }
               }, {
-                "source" : "OTHER",
+                "source" : "Other",
                 "value" : {
                   "name" : {
                     "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
@@ -1086,50 +781,147 @@
                 "source" : "ISDA",
                 "productQualifier" : "CreditDefaultSwap_SingleName"
               } ],
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "X123",
+                    "meta" : {
+                      "scheme" : "http://www.theice.com/coding-scheme/product-id"
+                    }
+                  },
+                  "source" : "Other",
+                  "meta" : {
+                    "globalKey" : "e6a349ca"
+                  }
+                }
+              } ],
               "economicTerms" : {
                 "effectiveDate" : {
                   "adjustableDate" : {
+                    "unadjustedDate" : "2009-03-26",
                     "meta" : {
                       "globalKey" : "3ec8da"
-                    },
-                    "unadjustedDate" : "2009-03-26"
+                    }
                   },
                   "meta" : {
                     "globalKey" : "3ec8da"
                   }
                 },
+                "terminationDate" : {
+                  "adjustableDate" : {
+                    "unadjustedDate" : "2014-06-20",
+                    "meta" : {
+                      "globalKey" : "3ef194"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3ef194"
+                  }
+                },
                 "payout" : {
-                  "creditDefaultPayout" : {
+                  "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
+                      "quantitySchedule" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "quantity-1"
+                        }
+                      },
                       "meta" : {
                         "globalKey" : "0"
+                      }
+                    },
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
+                    "calculationPeriodDates" : {
+                      "firstPeriodStartDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2009-03-20",
+                          "meta" : {
+                            "globalKey" : "3ec8d4"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "3ec8d4"
+                        }
+                      },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "17f73"
+                        },
+                        "rollConvention" : "20"
+                      },
+                      "meta" : {
+                        "globalKey" : "bf47be47"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
                       },
+                      "firstPaymentDate" : "2009-06-20",
+                      "meta" : {
+                        "globalKey" : "8aa3de96"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "eff49770"
+                    }
+                  } ],
+                  "creditDefaultPayout" : {
+                    "payerReceiver" : {
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
+                    },
+                    "priceQuantity" : {
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
                     "generalTerms" : {
                       "referenceInformation" : {
                         "referenceEntity" : {
                           "entityId" : [ {
+                            "value" : "8G836J",
                             "meta" : {
                               "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                            },
-                            "value" : "8G836J"
+                            }
                           } ],
-                          "meta" : {
-                            "externalKey" : "referenceEntity",
-                            "globalKey" : "54140007"
-                          },
                           "name" : {
                             "value" : "TENET HEALTHCARE CORPORATION"
+                          },
+                          "meta" : {
+                            "globalKey" : "54140007",
+                            "externalKey" : "referenceEntity"
                           }
                         },
                         "referenceObligation" : [ {
@@ -1137,280 +929,480 @@
                             "productIdentifier" : [ {
                               "value" : {
                                 "identifier" : {
+                                  "value" : "8G836JAF2",
                                   "meta" : {
                                     "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair-1-0"
-                                  },
-                                  "value" : "8G836JAF2"
+                                  }
                                 },
+                                "source" : "Other",
                                 "meta" : {
                                   "globalKey" : "1165f83f"
-                                },
-                                "source" : "OTHER"
+                                }
                               }
                             } ],
-                            "securityType" : "DEBT"
+                            "securityType" : "Debt"
                           }
                         } ]
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "2fa76fbc"
-                    },
                     "transactedPrice" : {
                       "marketFixedRate" : 0.02
-                    }
-                  },
-                  "interestRatePayout" : [ {
-                    "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
-                    },
-                    "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "quantitySchedule" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "quantity-1"
-                        }
-                      }
-                    },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "28c47"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
-                        "rollConvention" : "20"
-                      },
-                      "firstPeriodStartDate" : {
-                        "adjustableDate" : {
-                          "meta" : {
-                            "globalKey" : "3ec8d4"
-                          },
-                          "unadjustedDate" : "2009-03-20"
-                        },
-                        "meta" : {
-                          "globalKey" : "3ec8d4"
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "28c1032d"
-                      }
                     },
                     "meta" : {
-                      "globalKey" : "6afbe26c"
-                    },
-                    "paymentDates" : {
-                      "firstPaymentDate" : "2009-06-20",
-                      "meta" : {
-                        "globalKey" : "8aa3e742"
-                      },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
-                      }
-                    },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
-                          }
-                        }
-                      }
+                      "globalKey" : "2fa76fbc"
                     }
-                  } ],
-                  "meta" : {
-                    "globalKey" : "1fd4e030"
-                  }
-                },
-                "terminationDate" : {
-                  "adjustableDate" : {
-                    "meta" : {
-                      "globalKey" : "3ef194"
-                    },
-                    "unadjustedDate" : "2014-06-20"
                   },
                   "meta" : {
-                    "globalKey" : "3ef194"
+                    "globalKey" : "a7b3d32c"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "7d137866"
+                "globalKey" : "819b3a8a"
               }
             },
             "meta" : {
-              "globalKey" : "7d137866"
+              "globalKey" : "819b3a8a"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "1f273178"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.01,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.01,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "1a10e2d1"
-              },
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "c5befd88"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 5000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 5000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "280b774f"
+              }
             } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "f6a6cc60",
+              "externalReference" : "clearing-svc"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "1bec43b5",
+              "externalReference" : "party1"
+            }
           } ]
         },
-        "tradeDate" : {
+        "party" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "5493001RKR55V4X61F71",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "d0f863bc"
+            }
+          } ],
+          "name" : {
+            "value" : "Bank X"
+          },
+          "businessUnit" : [ {
+            "name" : "New York Office",
+            "contactInformation" : {
+              "address" : [ {
+                "street" : [ "123 Park Avenue" ],
+                "city" : "New York",
+                "state" : "NY",
+                "country" : {
+                  "value" : "US"
+                },
+                "postalCode" : "10017"
+              } ]
+            },
+            "meta" : {
+              "globalKey" : "e15b99b0",
+              "externalKey" : "branch1"
+            }
+          }, {
+            "name" : "NY Swaps Desk",
+            "meta" : {
+              "globalKey" : "5c10b72e",
+              "externalKey" : "desk1"
+            }
+          } ],
+          "person" : [ {
+            "personId" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "person123"
+                },
+                "meta" : {
+                  "globalKey" : "32d9e6bd"
+                }
+              }
+            } ],
+            "firstName" : "person",
+            "meta" : {
+              "globalKey" : "5b25cf92",
+              "externalKey" : "broker"
+            }
+          }, {
+            "personId" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "person456"
+                },
+                "meta" : {
+                  "globalKey" : "32d9f260"
+                }
+              }
+            } ],
+            "firstName" : "person",
+            "meta" : {
+              "globalKey" : "5b25db35",
+              "externalKey" : "trader"
+            }
+          } ],
+          "contactInformation" : {
+            "email" : [ "swap_trading@bankx.com" ]
+          },
           "meta" : {
-            "globalKey" : "3ed88c"
+            "globalKey" : "1bec43b5",
+            "externalKey" : "party1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300O5MFEP1XJ40B47",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "956c45f9"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "956c45f9",
+            "externalKey" : "party1_parent"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300O5MFEP1XJ40B48",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "956c45fa"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "956c45fa",
+            "externalKey" : "party1_affiliate1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300O5MFEP1XJ40B49",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "956c45fb"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "956c45fb",
+            "externalKey" : "party1_affiliate2"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300OL8KL0WCQ34V31",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "8ffabe4b"
+            }
+          } ],
+          "name" : {
+            "value" : "Up&Atem"
           },
-          "value" : "2011-02-12"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
+          "meta" : {
+            "globalKey" : "ce0b9311",
+            "externalKey" : "broker1"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "549300IB5Q45JGNPND22",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-              },
-              "value" : "12345678901234567890123456789012"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e774"
             }
           } ],
-          "issuer" : {
+          "name" : {
+            "value" : "XYZ Bank"
+          },
+          "meta" : {
+            "globalKey" : "61a07317",
+            "externalKey" : "executing_agent"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300IB5Q45JGNPND11",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e754"
+            }
+          } ],
+          "name" : {
+            "value" : "SEFCo LLC"
+          },
+          "meta" : {
+            "globalKey" : "ae0d40b7",
+            "externalKey" : "venue"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300IB5Q45JGNPND58",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e7d7"
+            }
+          } ],
+          "name" : {
+            "value" : "ClearItAll"
+          },
+          "meta" : {
+            "globalKey" : "f6a6cc60",
+            "externalKey" : "clearing-svc"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300IB5Q45JGNPND58",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e7d7"
+            }
+          } ],
+          "name" : {
+            "value" : "WorldWide Trade Repository"
+          },
+          "meta" : {
+            "globalKey" : "4ba4fb38",
+            "externalKey" : "original_sdr"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "f6a6cc60",
+            "externalReference" : "clearing-svc"
+          },
+          "role" : "ClearingOrganization",
+          "ownershipPartyReference" : {
+            "globalReference" : "1bec43b5",
+            "externalReference" : "party1"
+          }
+        } ],
+        "contractDetails" : {
+          "documentation" : [ {
+            "agreementDate" : "2002-01-05",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster"
+                }
+              },
+              "vintage" : 1992
+            },
+            "meta" : {
+              "globalKey" : "4f2097d4"
+            }
+          }, {
+            "agreementDate" : "2002-01-07",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "ISDA2003CreditNorthAmerican"
+                }
+              }
+            },
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
+              "globalKey" : "5d7949e5"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "CreditSupportAgreement"
+              }
             },
-            "value" : "FCHUXIINML"
-          },
-          "meta" : {
-            "globalKey" : "1551a427"
-          },
-          "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-        }, {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-              },
-              "value" : "12345678901234567890123456789012"
+            "meta" : {
+              "globalKey" : "984ae6d0"
             }
-          } ],
-          "issuer" : {
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix"
+                  },
+                  "matrixTerm" : {
+                    "value" : "StandardNorthAmericanCorporate"
+                  }
+                } ]
+              }
+            },
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+              "globalKey" : "9ed2f955"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Other",
+                "otherAgreement" : "Custom Legal Agreement"
+              }
             },
-            "value" : "1031234567"
-          },
+            "meta" : {
+              "globalKey" : "98e1dbe8"
+            }
+          } ],
           "meta" : {
-            "globalKey" : "f6e91d86"
-          },
-          "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-        } ]
+            "globalKey" : "396e114a"
+          }
+        },
+        "meta" : {
+          "globalKey" : "beeb8410"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
       },
       "transferHistory" : [ {
-        "meta" : {
-          "globalKey" : "bd170795"
-        },
         "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "e450a87"
-            },
-            "receiverPartyReference" : {
-              "externalReference" : "clearing-svc",
-              "globalReference" : "611719a0"
-            }
-          },
           "quantity" : {
+            "value" : 1000,
             "unit" : {
               "currency" : {
                 "value" : "USD"
               }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "1bec43b5",
+              "externalReference" : "party1"
             },
-            "value" : 1000
+            "receiverPartyReference" : {
+              "globalReference" : "f6a6cc60",
+              "externalReference" : "clearing-svc"
+            }
           },
           "settlementDate" : {
+            "unadjustedDate" : "2009-03-28",
             "adjustedDate" : {
+              "value" : "2009-03-30",
               "meta" : {
                 "globalKey" : "3ec8de"
-              },
-              "value" : "2009-03-30"
-            },
-            "unadjustedDate" : "2009-03-28"
+              }
+            }
           },
           "transferExpression" : {
-            "priceTransfer" : "UPFRONT"
+            "priceTransfer" : "Upfront"
           }
+        },
+        "meta" : {
+          "globalKey" : "5f6691f1"
         }
-      } ]
-    } ],
-    "eventQualifier" : "ContractFormation",
-    "meta" : {
-      "globalKey" : "355b13cd"
-    }
-  },
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "BANKX0001"
+      } ],
+      "meta" : {
+        "globalKey" : "5a004964"
       }
     } ],
     "meta" : {
-      "globalKey" : "3ce1279d"
+      "globalKey" : "9670e8ed"
     }
-  } ],
+  },
+  "previousWorkflowStep" : {
+    "globalReference" : "f9c229ce"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "BANKX0001",
       "meta" : {
         "scheme" : "http://www.bankx.com/msg_id"
-      },
-      "value" : "BANKX0001"
+      }
     },
     "sentBy" : {
       "value" : "BANKX"
@@ -1419,62 +1411,65 @@
       "value" : "SDR01"
     } ]
   },
-  "meta" : {
-    "globalKey" : "4a87277d"
-  },
+  "timestamp" : [ {
+    "dateTime" : "2011-02-12T16:42:16Z",
+    "qualification" : "eventCreationDateTime"
+  }, {
+    "dateTime" : "2011-02-04T16:20:47Z",
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "BANKX0001"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "3ce1279d"
+    }
+  } ],
+  "action" : "New",
   "party" : [ {
+    "partyId" : [ {
+      "identifier" : {
+        "value" : "5493001RKR55V4X61F71",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+        }
+      },
+      "identifierType" : "LEI",
+      "meta" : {
+        "globalKey" : "d0f863bc"
+      }
+    } ],
+    "name" : {
+      "value" : "Bank X"
+    },
     "businessUnit" : [ {
+      "name" : "New York Office",
       "contactInformation" : {
         "address" : [ {
+          "street" : [ "123 Park Avenue" ],
           "city" : "New York",
+          "state" : "NY",
           "country" : {
             "value" : "US"
           },
-          "postalCode" : "10017",
-          "state" : "NY",
-          "street" : [ "123 Park Avenue" ]
+          "postalCode" : "10017"
         } ]
       },
       "meta" : {
-        "externalKey" : "branch1",
-        "globalKey" : "69aea9de"
-      },
-      "name" : "New York Office"
+        "globalKey" : "e15b99b0",
+        "externalKey" : "branch1"
+      }
     }, {
+      "name" : "NY Swaps Desk",
       "meta" : {
-        "externalKey" : "desk1",
-        "globalKey" : "5c10b72e"
-      },
-      "name" : "NY Swaps Desk"
-    } ],
-    "contactInformation" : {
-      "email" : [ "swap_trading@bankx.com" ]
-    },
-    "meta" : {
-      "externalKey" : "party1",
-      "globalKey" : "e450a87"
-    },
-    "name" : {
-      "value" : "Bank X"
-    },
-    "partyId" : [ {
-      "identifier" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "5493001RKR55V4X61F71"
-      },
-      "identifierType" : "LEI",
-      "meta" : {
-        "globalKey" : "d0f863bc"
+        "globalKey" : "5c10b72e",
+        "externalKey" : "desk1"
       }
     } ],
     "person" : [ {
-      "firstName" : "person",
-      "meta" : {
-        "externalKey" : "broker",
-        "globalKey" : "5b25cf92"
-      },
       "personId" : [ {
         "value" : {
           "identifier" : {
@@ -1484,13 +1479,13 @@
             "globalKey" : "32d9e6bd"
           }
         }
-      } ]
-    }, {
+      } ],
       "firstName" : "person",
       "meta" : {
-        "externalKey" : "trader",
-        "globalKey" : "5b25db35"
-      },
+        "globalKey" : "5b25cf92",
+        "externalKey" : "broker"
+      }
+    }, {
       "personId" : [ {
         "value" : {
           "identifier" : {
@@ -1500,168 +1495,173 @@
             "globalKey" : "32d9f260"
           }
         }
-      } ]
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "party1_parent",
-      "globalKey" : "956c45f9"
+      } ],
+      "firstName" : "person",
+      "meta" : {
+        "globalKey" : "5b25db35",
+        "externalKey" : "trader"
+      }
+    } ],
+    "contactInformation" : {
+      "email" : [ "swap_trading@bankx.com" ]
     },
+    "meta" : {
+      "globalKey" : "1bec43b5",
+      "externalKey" : "party1"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B47",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B47"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45f9"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "party1_affiliate1",
-      "globalKey" : "956c45fa"
-    },
+      "globalKey" : "956c45f9",
+      "externalKey" : "party1_parent"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B48",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B48"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45fa"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "party1_affiliate2",
-      "globalKey" : "956c45fb"
-    },
+      "globalKey" : "956c45fa",
+      "externalKey" : "party1_affiliate1"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B49",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B49"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45fb"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "broker1",
-      "globalKey" : "ed0cc6d1"
-    },
-    "name" : {
-      "value" : "Up&Atem"
-    },
+      "globalKey" : "956c45fb",
+      "externalKey" : "party1_affiliate2"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300OL8KL0WCQ34V31",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300OL8KL0WCQ34V31"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "8ffabe4b"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "executing_agent",
-      "globalKey" : "49e97697"
-    },
+    } ],
     "name" : {
-      "value" : "XYZ Bank"
+      "value" : "Up&Atem"
     },
+    "meta" : {
+      "globalKey" : "ce0b9311",
+      "externalKey" : "broker1"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300IB5Q45JGNPND22",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND22"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "e213e774"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "venue",
-      "globalKey" : "6ebddc37"
-    },
+    } ],
     "name" : {
-      "value" : "SEFCo LLC"
+      "value" : "XYZ Bank"
     },
+    "meta" : {
+      "globalKey" : "61a07317",
+      "externalKey" : "executing_agent"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300IB5Q45JGNPND11",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND11"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "e213e754"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "clearing-svc",
-      "globalKey" : "611719a0"
-    },
+    } ],
     "name" : {
-      "value" : "ClearItAll"
+      "value" : "SEFCo LLC"
     },
+    "meta" : {
+      "globalKey" : "ae0d40b7",
+      "externalKey" : "venue"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300IB5Q45JGNPND58",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND58"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "e213e7d7"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "original_sdr",
-      "globalKey" : "9b321c78"
-    },
+    } ],
     "name" : {
-      "value" : "WorldWide Trade Repository"
+      "value" : "ClearItAll"
     },
+    "meta" : {
+      "globalKey" : "f6a6cc60",
+      "externalKey" : "clearing-svc"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300IB5Q45JGNPND58",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND58"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "e213e7d7"
       }
-    } ]
+    } ],
+    "name" : {
+      "value" : "WorldWide Trade Repository"
+    },
+    "meta" : {
+      "globalKey" : "4ba4fb38",
+      "externalKey" : "original_sdr"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "7e3fbc1a"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2011-02-12T16:42:16Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  }, {
-    "dateTime" : "2011-02-04T16:20:47Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+  "meta" : {
+    "globalKey" : "4245605d"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-trade-CFTC-SEC-and-canada-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-trade-CFTC-SEC-and-canada-func-output.json
index f0bc1917d9..af2e211c51 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-trade-CFTC-SEC-and-canada-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-trade-CFTC-SEC-and-canada-func-output.json
@@ -1,372 +1,154 @@
 {
-  "action" : "NEW",
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "4f14032"
-          },
-          "trade" : {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "2002-01-05",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster"
+                }
+              },
+              "vintage" : 1992
+            },
             "meta" : {
-              "globalKey" : "1175b976"
+              "globalKey" : "4f2097d4"
+            }
+          }, {
+            "agreementDate" : "2002-01-07",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "ISDA2003CreditNorthAmerican"
+                }
+              }
             },
-            "party" : [ {
-              "businessUnit" : [ {
-                "contactInformation" : {
-                  "address" : [ {
-                    "city" : "New York",
-                    "country" : {
-                      "value" : "US"
-                    },
-                    "postalCode" : "10017",
-                    "state" : "NY",
-                    "street" : [ "123 Park Avenue" ]
-                  } ]
-                },
-                "meta" : {
-                  "externalKey" : "branch1",
-                  "globalKey" : "69aea9de"
-                },
-                "name" : "New York Office"
-              }, {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "contactInformation" : {
-                "email" : [ "swap_trading@bankx.com" ]
-              },
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "e450a87"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            "meta" : {
+              "globalKey" : "5d7949e5"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "CreditSupportAgreement"
+              }
+            },
+            "meta" : {
+              "globalKey" : "984ae6d0"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix"
                   },
-                  "value" : "5493001RKR55V4X61F71"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "d0f863bc"
-                }
-              } ],
-              "person" : [ {
-                "firstName" : "person",
-                "meta" : {
-                  "externalKey" : "broker",
-                  "globalKey" : "5b25cf92"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "person123"
-                    },
-                    "meta" : {
-                      "globalKey" : "32d9e6bd"
-                    }
-                  }
-                } ]
-              }, {
-                "firstName" : "person",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "5b25db35"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "person456"
-                    },
-                    "meta" : {
-                      "globalKey" : "32d9f260"
-                    }
+                  "matrixTerm" : {
+                    "value" : "StandardNorthAmericanCorporate"
                   }
                 } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_parent",
-                "globalKey" : "956c45f9"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B47"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f9"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_affiliate1",
-                "globalKey" : "956c45fa"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B48"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45fa"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_affiliate2",
-                "globalKey" : "956c45fb"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B49"
-                },
-                "identifierType" : "LEI",
+              }
+            },
+            "meta" : {
+              "globalKey" : "9ed2f955"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Other",
+                "otherAgreement" : "Custom Legal Agreement"
+              }
+            },
+            "meta" : {
+              "globalKey" : "98e1dbe8"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "FCHUXIINML",
                 "meta" : {
-                  "globalKey" : "956c45fb"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
                 }
-              } ]
-            }, {
-              "contactInformation" : {
-                "email" : [ "investments@banky.com" ]
-              },
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "573ad49d"
-              },
-              "name" : {
-                "value" : "Bank Y"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "12345678901234567890123456789012",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B46"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f8"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "party2_parent",
-                "globalKey" : "956c45f9"
+                "globalKey" : "ce80645"
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B47"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f9"
-                }
-              } ]
+              "identifierType" : "UniqueTransactionIdentifier"
             }, {
-              "meta" : {
-                "externalKey" : "party2_affiliate1",
-                "globalKey" : "956c45fa"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B48"
-                },
-                "identifierType" : "LEI",
+              "issuer" : {
+                "value" : "1031234567",
                 "meta" : {
-                  "globalKey" : "956c45fa"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
-              },
-              "name" : {
-                "value" : "Up&Atem"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "12345678901234567890123456789012",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "executing_agent",
-                "globalKey" : "49e97697"
-              },
-              "name" : {
-                "value" : "XYZ Bank"
+                "globalKey" : "671d1c86"
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND22"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e774"
-                }
-              } ]
-            }, {
+              "identifierType" : "UniqueTransactionIdentifier"
+            } ],
+            "tradeDate" : {
+              "value" : "2011-02-12",
               "meta" : {
-                "externalKey" : "venue",
-                "globalKey" : "6ebddc37"
-              },
-              "name" : {
-                "value" : "SEFCo LLC"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND11"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e754"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "original_sdr",
-                "globalKey" : "9b321c78"
-              },
-              "name" : {
-                "value" : "WorldWide Trade Repository"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
-                }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "e450a87"
-              },
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "573ad49d"
-              },
-              "role" : "REPORTING_PARTY"
-            } ],
+                "globalKey" : "3ed88c"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "573ad49d"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "e450a87"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "meta" : {
-                          "scheme" : "http://www.theice.com/coding-scheme/product-id"
-                        },
-                        "value" : "X123"
-                      },
-                      "meta" : {
-                        "globalKey" : "e6a349ca"
-                      },
-                      "source" : "OTHER"
-                    }
-                  } ],
                   "productTaxonomy" : [ {
                     "primaryAssetClass" : {
-                      "value" : "CREDIT"
+                      "value" : "Credit"
                     }
                   }, {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
+                        "value" : "SecurityBasedSwap",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/sec-product-category"
-                        },
-                        "value" : "SecurityBasedSwap"
+                        }
                       }
                     }
                   }, {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
+                        "value" : "Credi Default Swap",
                         "meta" : {
                           "scheme" : "http://www.theice.com/coding-scheme/product-name"
-                        },
-                        "value" : "Credi Default Swap"
+                        }
                       }
                     }
                   }, {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
                         "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
@@ -376,50 +158,147 @@
                     "source" : "ISDA",
                     "productQualifier" : "CreditDefaultSwap_SingleName"
                   } ],
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "X123",
+                        "meta" : {
+                          "scheme" : "http://www.theice.com/coding-scheme/product-id"
+                        }
+                      },
+                      "source" : "Other",
+                      "meta" : {
+                        "globalKey" : "e6a349ca"
+                      }
+                    }
+                  } ],
                   "economicTerms" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2009-03-26",
                         "meta" : {
                           "globalKey" : "3ec8da"
-                        },
-                        "unadjustedDate" : "2009-03-26"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "3ec8da"
                       }
                     },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2014-06-20",
+                        "meta" : {
+                          "globalKey" : "3ef194"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ef194"
+                      }
+                    },
                     "payout" : {
-                      "creditDefaultPayout" : {
+                      "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
                           "meta" : {
                             "globalKey" : "0"
+                          }
+                        },
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "calculationPeriodDates" : {
+                          "firstPeriodStartDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2009-03-20",
+                              "meta" : {
+                                "globalKey" : "3ec8d4"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3ec8d4"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
+                          "meta" : {
+                            "globalKey" : "bf47be47"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
+                          "firstPaymentDate" : "2009-06-20",
+                          "meta" : {
+                            "globalKey" : "8aa3de96"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "eff49770"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "generalTerms" : {
                           "referenceInformation" : {
                             "referenceEntity" : {
                               "entityId" : [ {
+                                "value" : "8G836J",
                                 "meta" : {
                                   "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                                },
-                                "value" : "8G836J"
+                                }
                               } ],
-                              "meta" : {
-                                "externalKey" : "referenceEntity",
-                                "globalKey" : "54140007"
-                              },
                               "name" : {
                                 "value" : "TENET HEALTHCARE CORPORATION"
+                              },
+                              "meta" : {
+                                "globalKey" : "54140007",
+                                "externalKey" : "referenceEntity"
                               }
                             },
                             "referenceObligation" : [ {
@@ -427,770 +306,529 @@
                                 "productIdentifier" : [ {
                                   "value" : {
                                     "identifier" : {
+                                      "value" : "8G836JAF2",
                                       "meta" : {
                                         "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair-1-0"
-                                      },
-                                      "value" : "8G836JAF2"
+                                      }
                                     },
+                                    "source" : "Other",
                                     "meta" : {
                                       "globalKey" : "1165f83f"
-                                    },
-                                    "source" : "OTHER"
+                                    }
                                   }
                                 } ],
-                                "securityType" : "DEBT"
+                                "securityType" : "Debt"
                               }
                             } ]
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "2fa76fbc"
-                        },
                         "transactedPrice" : {
                           "marketFixedRate" : 0.02
-                        }
-                      },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
-                          "firstPeriodStartDate" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3ec8d4"
-                              },
-                              "unadjustedDate" : "2009-03-20"
-                            },
-                            "meta" : {
-                              "globalKey" : "3ec8d4"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "28c1032d"
-                          }
                         },
                         "meta" : {
-                          "globalKey" : "6afbe26c"
-                        },
-                        "paymentDates" : {
-                          "firstPaymentDate" : "2009-06-20",
-                          "meta" : {
-                            "globalKey" : "8aa3e742"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                          "globalKey" : "2fa76fbc"
                         }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "1fd4e030"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3ef194"
-                        },
-                        "unadjustedDate" : "2014-06-20"
                       },
                       "meta" : {
-                        "globalKey" : "3ef194"
+                        "globalKey" : "a7b3d32c"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "7d137866"
+                    "globalKey" : "819b3a8a"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "7d137866"
+                  "globalKey" : "819b3a8a"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "1f273178"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.01,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.01,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "1a10e2d1"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "c5befd88"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 5000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 5000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "280b774f"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "d0b9c5dd",
+                  "externalReference" : "party2"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1bec43b5",
+                  "externalReference" : "party1"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ed88c"
-              },
-              "value" : "2011-02-12"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "5493001RKR55V4X61F71",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "12345678901234567890123456789012"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "d0f863bc"
                 }
               } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
+              "name" : {
+                "value" : "Bank X"
+              },
+              "businessUnit" : [ {
+                "name" : "New York Office",
+                "contactInformation" : {
+                  "address" : [ {
+                    "street" : [ "123 Park Avenue" ],
+                    "city" : "New York",
+                    "state" : "NY",
+                    "country" : {
+                      "value" : "US"
+                    },
+                    "postalCode" : "10017"
+                  } ]
                 },
-                "value" : "FCHUXIINML"
+                "meta" : {
+                  "globalKey" : "e15b99b0",
+                  "externalKey" : "branch1"
+                }
+              }, {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "person123"
+                    },
+                    "meta" : {
+                      "globalKey" : "32d9e6bd"
+                    }
+                  }
+                } ],
+                "firstName" : "person",
+                "meta" : {
+                  "globalKey" : "5b25cf92",
+                  "externalKey" : "broker"
+                }
+              }, {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "person456"
+                    },
+                    "meta" : {
+                      "globalKey" : "32d9f260"
+                    }
+                  }
+                } ],
+                "firstName" : "person",
+                "meta" : {
+                  "globalKey" : "5b25db35",
+                  "externalKey" : "trader"
+                }
+              } ],
+              "contactInformation" : {
+                "email" : [ "swap_trading@bankx.com" ]
               },
               "meta" : {
-                "globalKey" : "1551a427"
-              },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
+                "globalKey" : "1bec43b5",
+                "externalKey" : "party1"
+              }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B47",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "12345678901234567890123456789012"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45f9"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "956c45f9",
+                "externalKey" : "party1_parent"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B48",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "956c45fa"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "956c45fa",
+                "externalKey" : "party1_affiliate1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B49",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "1031234567"
-              },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45fb"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "f6e91d86"
-              },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
-          },
-          "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "8af8663c"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "e450a87"
+                "globalKey" : "956c45fb",
+                "externalKey" : "party1_affiliate2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B46",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "receiverPartyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "573ad49d"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45f8"
                 }
+              } ],
+              "name" : {
+                "value" : "Bank Y"
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
+              "contactInformation" : {
+                "email" : [ "investments@banky.com" ]
+              },
+              "meta" : {
+                "globalKey" : "d0b9c5dd",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B47",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
-                "value" : 1000
-              },
-              "settlementDate" : {
-                "adjustedDate" : {
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45f9"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "956c45f9",
+                "externalKey" : "party2_parent"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B48",
                   "meta" : {
-                    "globalKey" : "3ec8de"
-                  },
-                  "value" : "2009-03-30"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "unadjustedDate" : "2009-03-28"
-              },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45fa"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "956c45fa",
+                "externalKey" : "party2_affiliate1"
               }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "2002-01-05",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "value" : "ISDA_MASTER"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "8ffabe4b"
                 }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
               },
-              "vintage" : 1992
-            },
-            "meta" : {
-              "globalKey" : "4f2097d4"
-            }
-          }, {
-            "agreementDate" : "2002-01-07",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "ISDA_2003_CREDIT_NORTH_AMERICAN"
+              "meta" : {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND22",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e774"
                 }
+              } ],
+              "name" : {
+                "value" : "XYZ Bank"
+              },
+              "meta" : {
+                "globalKey" : "61a07317",
+                "externalKey" : "executing_agent"
               }
-            },
-            "meta" : {
-              "globalKey" : "5d7949e5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CREDIT_SUPPORT_AGREEMENT"
-              }
-            },
-            "meta" : {
-              "globalKey" : "984ae6d0"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "value" : "STANDARD_NORTH_AMERICAN_CORPORATE"
-                  },
-                  "matrixType" : {
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND11",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
-                } ]
-              }
-            },
-            "meta" : {
-              "globalKey" : "80f11ad5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "OTHER",
-                "otherAgreement" : "Custom Legal Agreement"
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e754"
+                }
+              } ],
+              "name" : {
+                "value" : "SEFCo LLC"
+              },
+              "meta" : {
+                "globalKey" : "ae0d40b7",
+                "externalKey" : "venue"
               }
-            },
-            "meta" : {
-              "globalKey" : "98e1dbe8"
-            }
-          } ]
-        }
-      }
-    } ],
-    "intent" : "CONTRACT_FORMATION",
-    "after" : [ {
-      "meta" : {
-        "globalKey" : "de14114b"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
-      "trade" : {
-        "contractDetails" : {
-          "documentation" : [ {
-            "agreementDate" : "2002-01-05",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "value" : "ISDA_MASTER"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
                 }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
               },
-              "vintage" : 1992
-            },
-            "meta" : {
-              "globalKey" : "4f2097d4"
-            }
-          }, {
-            "agreementDate" : "2002-01-07",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "ISDA_2003_CREDIT_NORTH_AMERICAN"
+              "meta" : {
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
                 }
+              } ],
+              "name" : {
+                "value" : "WorldWide Trade Repository"
+              },
+              "meta" : {
+                "globalKey" : "4ba4fb38",
+                "externalKey" : "original_sdr"
               }
-            },
-            "meta" : {
-              "globalKey" : "5d7949e5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CREDIT_SUPPORT_AGREEMENT"
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "d0b9c5dd",
+                "externalReference" : "party2"
+              },
+              "role" : "ReportingParty",
+              "ownershipPartyReference" : {
+                "globalReference" : "1bec43b5",
+                "externalReference" : "party1"
               }
-            },
+            } ],
             "meta" : {
-              "globalKey" : "984ae6d0"
+              "globalKey" : "c893f834"
             }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "value" : "STANDARD_NORTH_AMERICAN_CORPORATE"
-                  },
-                  "matrixType" : {
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
+          },
+          "transferHistory" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 1000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
                   }
-                } ]
-              }
-            },
-            "meta" : {
-              "globalKey" : "80f11ad5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "OTHER",
-                "otherAgreement" : "Custom Legal Agreement"
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "1bec43b5",
+                  "externalReference" : "party1"
+                },
+                "receiverPartyReference" : {
+                  "globalReference" : "d0b9c5dd",
+                  "externalReference" : "party2"
+                }
+              },
+              "settlementDate" : {
+                "unadjustedDate" : "2009-03-28",
+                "adjustedDate" : {
+                  "value" : "2009-03-30",
+                  "meta" : {
+                    "globalKey" : "3ec8de"
+                  }
+                }
+              },
+              "transferExpression" : {
+                "priceTransfer" : "Upfront"
               }
             },
             "meta" : {
-              "globalKey" : "98e1dbe8"
+              "globalKey" : "57999eaa"
             }
           } ],
           "meta" : {
-            "globalKey" : "2468dfca"
+            "globalKey" : "35b52dde"
           }
-        },
-        "meta" : {
-          "globalKey" : "c909336c"
-        },
-        "party" : [ {
-          "businessUnit" : [ {
-            "contactInformation" : {
-              "address" : [ {
-                "city" : "New York",
-                "country" : {
-                  "value" : "US"
-                },
-                "postalCode" : "10017",
-                "state" : "NY",
-                "street" : [ "123 Park Avenue" ]
-              } ]
-            },
-            "meta" : {
-              "externalKey" : "branch1",
-              "globalKey" : "69aea9de"
-            },
-            "name" : "New York Office"
-          }, {
+        }
+      }
+    } ],
+    "eventQualifier" : "ContractFormation",
+    "after" : [ {
+      "trade" : {
+        "tradeIdentifier" : [ {
+          "issuer" : {
+            "value" : "FCHUXIINML",
             "meta" : {
-              "externalKey" : "desk1",
-              "globalKey" : "5c10b72e"
-            },
-            "name" : "NY Swaps Desk"
-          } ],
-          "contactInformation" : {
-            "email" : [ "swap_trading@bankx.com" ]
-          },
-          "meta" : {
-            "externalKey" : "party1",
-            "globalKey" : "e450a87"
-          },
-          "name" : {
-            "value" : "Bank X"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
+            }
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "12345678901234567890123456789012",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "5493001RKR55V4X61F71"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "d0f863bc"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+              }
             }
           } ],
-          "person" : [ {
-            "firstName" : "person",
-            "meta" : {
-              "externalKey" : "broker",
-              "globalKey" : "5b25cf92"
-            },
-            "personId" : [ {
-              "value" : {
-                "identifier" : {
-                  "value" : "person123"
-                },
-                "meta" : {
-                  "globalKey" : "32d9e6bd"
-                }
-              }
-            } ]
-          }, {
-            "firstName" : "person",
-            "meta" : {
-              "externalKey" : "trader",
-              "globalKey" : "5b25db35"
-            },
-            "personId" : [ {
-              "value" : {
-                "identifier" : {
-                  "value" : "person456"
-                },
-                "meta" : {
-                  "globalKey" : "32d9f260"
-                }
-              }
-            } ]
-          } ]
-        }, {
           "meta" : {
-            "externalKey" : "party1_parent",
-            "globalKey" : "956c45f9"
+            "globalKey" : "ce80645"
           },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300O5MFEP1XJ40B47"
-            },
-            "identifierType" : "LEI",
+          "identifierType" : "UniqueTransactionIdentifier"
+        }, {
+          "issuer" : {
+            "value" : "1031234567",
             "meta" : {
-              "globalKey" : "956c45f9"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party1_affiliate1",
-            "globalKey" : "956c45fa"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "12345678901234567890123456789012",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300O5MFEP1XJ40B48"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "956c45fa"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party1_affiliate2",
-            "globalKey" : "956c45fb"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300O5MFEP1XJ40B49"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "956c45fb"
-            }
-          } ]
-        }, {
-          "contactInformation" : {
-            "email" : [ "investments@banky.com" ]
-          },
-          "meta" : {
-            "externalKey" : "party2",
-            "globalKey" : "573ad49d"
-          },
-          "name" : {
-            "value" : "Bank Y"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300O5MFEP1XJ40B46"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "956c45f8"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party2_parent",
-            "globalKey" : "956c45f9"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300O5MFEP1XJ40B47"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "956c45f9"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party2_affiliate1",
-            "globalKey" : "956c45fa"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300O5MFEP1XJ40B48"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "956c45fa"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "broker1",
-            "globalKey" : "ed0cc6d1"
-          },
-          "name" : {
-            "value" : "Up&Atem"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300OL8KL0WCQ34V31"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "8ffabe4b"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "executing_agent",
-            "globalKey" : "49e97697"
-          },
-          "name" : {
-            "value" : "XYZ Bank"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND22"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e213e774"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "venue",
-            "globalKey" : "6ebddc37"
-          },
-          "name" : {
-            "value" : "SEFCo LLC"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND11"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e213e754"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing-svc",
-            "globalKey" : "611719a0"
-          },
-          "name" : {
-            "value" : "ClearItAll"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND58"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e213e7d7"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+              }
             }
-          } ]
-        }, {
+          } ],
           "meta" : {
-            "externalKey" : "original_sdr",
-            "globalKey" : "9b321c78"
-          },
-          "name" : {
-            "value" : "WorldWide Trade Repository"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND58"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e213e7d7"
-            }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "e450a87"
-          },
-          "partyReference" : {
-            "externalReference" : "party2",
-            "globalReference" : "573ad49d"
+            "globalKey" : "671d1c86"
           },
-          "role" : "REPORTING_PARTY"
+          "identifierType" : "UniqueTransactionIdentifier"
         } ],
+        "tradeDate" : {
+          "value" : "2011-02-12",
+          "meta" : {
+            "globalKey" : "3ed88c"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "573ad49d"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "e450a87"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "meta" : {
-                      "scheme" : "http://www.theice.com/coding-scheme/product-id"
-                    },
-                    "value" : "X123"
-                  },
-                  "meta" : {
-                    "globalKey" : "e6a349ca"
-                  },
-                  "source" : "OTHER"
-                }
-              } ],
               "productTaxonomy" : [ {
                 "primaryAssetClass" : {
-                  "value" : "CREDIT"
+                  "value" : "Credit"
                 }
               }, {
-                "source" : "OTHER",
+                "source" : "Other",
                 "value" : {
                   "name" : {
+                    "value" : "SecurityBasedSwap",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/sec-product-category"
-                    },
-                    "value" : "SecurityBasedSwap"
+                    }
                   }
                 }
               }, {
-                "source" : "OTHER",
+                "source" : "Other",
                 "value" : {
                   "name" : {
+                    "value" : "Credi Default Swap",
                     "meta" : {
                       "scheme" : "http://www.theice.com/coding-scheme/product-name"
-                    },
-                    "value" : "Credi Default Swap"
+                    }
                   }
                 }
               }, {
-                "source" : "OTHER",
+                "source" : "Other",
                 "value" : {
                   "name" : {
                     "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
@@ -1200,331 +838,685 @@
                 "source" : "ISDA",
                 "productQualifier" : "CreditDefaultSwap_SingleName"
               } ],
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "X123",
+                    "meta" : {
+                      "scheme" : "http://www.theice.com/coding-scheme/product-id"
+                    }
+                  },
+                  "source" : "Other",
+                  "meta" : {
+                    "globalKey" : "e6a349ca"
+                  }
+                }
+              } ],
               "economicTerms" : {
                 "effectiveDate" : {
                   "adjustableDate" : {
+                    "unadjustedDate" : "2009-03-26",
                     "meta" : {
                       "globalKey" : "3ec8da"
-                    },
-                    "unadjustedDate" : "2009-03-26"
+                    }
                   },
                   "meta" : {
                     "globalKey" : "3ec8da"
                   }
                 },
+                "terminationDate" : {
+                  "adjustableDate" : {
+                    "unadjustedDate" : "2014-06-20",
+                    "meta" : {
+                      "globalKey" : "3ef194"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3ef194"
+                  }
+                },
                 "payout" : {
-                  "creditDefaultPayout" : {
+                  "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "generalTerms" : {
-                      "referenceInformation" : {
-                        "referenceEntity" : {
-                          "entityId" : [ {
-                            "meta" : {
-                              "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                            },
-                            "value" : "8G836J"
-                          } ],
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
+                    "calculationPeriodDates" : {
+                      "firstPeriodStartDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2009-03-20",
                           "meta" : {
-                            "externalKey" : "referenceEntity",
-                            "globalKey" : "54140007"
-                          },
-                          "name" : {
-                            "value" : "TENET HEALTHCARE CORPORATION"
+                            "globalKey" : "3ec8d4"
                           }
                         },
-                        "referenceObligation" : [ {
-                          "security" : {
-                            "productIdentifier" : [ {
-                              "value" : {
-                                "identifier" : {
-                                  "meta" : {
-                                    "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair-1-0"
-                                  },
-                                  "value" : "8G836JAF2"
-                                },
-                                "meta" : {
-                                  "globalKey" : "1165f83f"
-                                },
-                                "source" : "OTHER"
-                              }
-                            } ],
-                            "securityType" : "DEBT"
-                          }
-                        } ]
-                      }
-                    },
-                    "meta" : {
-                      "globalKey" : "2fa76fbc"
-                    },
-                    "transactedPrice" : {
-                      "marketFixedRate" : 0.02
-                    }
-                  },
-                  "interestRatePayout" : [ {
-                    "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
-                    },
-                    "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "quantitySchedule" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "quantity-1"
+                        "meta" : {
+                          "globalKey" : "3ec8d4"
                         }
-                      }
-                    },
-                    "calculationPeriodDates" : {
+                      },
                       "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
                         "meta" : {
-                          "globalKey" : "28c47"
+                          "globalKey" : "17f73"
                         },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
                         "rollConvention" : "20"
                       },
-                      "firstPeriodStartDate" : {
-                        "adjustableDate" : {
-                          "meta" : {
-                            "globalKey" : "3ec8d4"
-                          },
-                          "unadjustedDate" : "2009-03-20"
-                        },
+                      "meta" : {
+                        "globalKey" : "bf47be47"
+                      }
+                    },
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
                         "meta" : {
-                          "globalKey" : "3ec8d4"
+                          "globalKey" : "aa"
                         }
                       },
+                      "firstPaymentDate" : "2009-06-20",
                       "meta" : {
-                        "globalKey" : "28c1032d"
+                        "globalKey" : "8aa3de96"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "6afbe26c"
+                      "globalKey" : "eff49770"
+                    }
+                  } ],
+                  "creditDefaultPayout" : {
+                    "payerReceiver" : {
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
-                    "paymentDates" : {
-                      "firstPaymentDate" : "2009-06-20",
-                      "meta" : {
-                        "globalKey" : "8aa3e742"
+                    "priceQuantity" : {
+                      "quantitySchedule" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "quantity-1"
+                        }
                       },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
+                    "generalTerms" : {
+                      "referenceInformation" : {
+                        "referenceEntity" : {
+                          "entityId" : [ {
+                            "value" : "8G836J",
+                            "meta" : {
+                              "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
                             }
+                          } ],
+                          "name" : {
+                            "value" : "TENET HEALTHCARE CORPORATION"
+                          },
+                          "meta" : {
+                            "globalKey" : "54140007",
+                            "externalKey" : "referenceEntity"
                           }
-                        }
+                        },
+                        "referenceObligation" : [ {
+                          "security" : {
+                            "productIdentifier" : [ {
+                              "value" : {
+                                "identifier" : {
+                                  "value" : "8G836JAF2",
+                                  "meta" : {
+                                    "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair-1-0"
+                                  }
+                                },
+                                "source" : "Other",
+                                "meta" : {
+                                  "globalKey" : "1165f83f"
+                                }
+                              }
+                            } ],
+                            "securityType" : "Debt"
+                          }
+                        } ]
                       }
-                    }
-                  } ],
-                  "meta" : {
-                    "globalKey" : "1fd4e030"
-                  }
-                },
-                "terminationDate" : {
-                  "adjustableDate" : {
-                    "meta" : {
-                      "globalKey" : "3ef194"
                     },
-                    "unadjustedDate" : "2014-06-20"
+                    "transactedPrice" : {
+                      "marketFixedRate" : 0.02
+                    },
+                    "meta" : {
+                      "globalKey" : "2fa76fbc"
+                    }
                   },
                   "meta" : {
-                    "globalKey" : "3ef194"
+                    "globalKey" : "a7b3d32c"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "7d137866"
+                "globalKey" : "819b3a8a"
               }
             },
             "meta" : {
-              "globalKey" : "7d137866"
+              "globalKey" : "819b3a8a"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "1f273178"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.01,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.01,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "1a10e2d1"
-              },
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "c5befd88"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 5000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 5000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "280b774f"
+              }
             } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "d0b9c5dd",
+              "externalReference" : "party2"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "1bec43b5",
+              "externalReference" : "party1"
+            }
           } ]
         },
-        "tradeDate" : {
+        "party" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "5493001RKR55V4X61F71",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "d0f863bc"
+            }
+          } ],
+          "name" : {
+            "value" : "Bank X"
+          },
+          "businessUnit" : [ {
+            "name" : "New York Office",
+            "contactInformation" : {
+              "address" : [ {
+                "street" : [ "123 Park Avenue" ],
+                "city" : "New York",
+                "state" : "NY",
+                "country" : {
+                  "value" : "US"
+                },
+                "postalCode" : "10017"
+              } ]
+            },
+            "meta" : {
+              "globalKey" : "e15b99b0",
+              "externalKey" : "branch1"
+            }
+          }, {
+            "name" : "NY Swaps Desk",
+            "meta" : {
+              "globalKey" : "5c10b72e",
+              "externalKey" : "desk1"
+            }
+          } ],
+          "person" : [ {
+            "personId" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "person123"
+                },
+                "meta" : {
+                  "globalKey" : "32d9e6bd"
+                }
+              }
+            } ],
+            "firstName" : "person",
+            "meta" : {
+              "globalKey" : "5b25cf92",
+              "externalKey" : "broker"
+            }
+          }, {
+            "personId" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "person456"
+                },
+                "meta" : {
+                  "globalKey" : "32d9f260"
+                }
+              }
+            } ],
+            "firstName" : "person",
+            "meta" : {
+              "globalKey" : "5b25db35",
+              "externalKey" : "trader"
+            }
+          } ],
+          "contactInformation" : {
+            "email" : [ "swap_trading@bankx.com" ]
+          },
           "meta" : {
-            "globalKey" : "3ed88c"
+            "globalKey" : "1bec43b5",
+            "externalKey" : "party1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300O5MFEP1XJ40B47",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "956c45f9"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "956c45f9",
+            "externalKey" : "party1_parent"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300O5MFEP1XJ40B48",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "956c45fa"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "956c45fa",
+            "externalKey" : "party1_affiliate1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300O5MFEP1XJ40B49",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "956c45fb"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "956c45fb",
+            "externalKey" : "party1_affiliate2"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300O5MFEP1XJ40B46",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "956c45f8"
+            }
+          } ],
+          "name" : {
+            "value" : "Bank Y"
           },
-          "value" : "2011-02-12"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
+          "contactInformation" : {
+            "email" : [ "investments@banky.com" ]
+          },
+          "meta" : {
+            "globalKey" : "d0b9c5dd",
+            "externalKey" : "party2"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "549300O5MFEP1XJ40B47",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-              },
-              "value" : "12345678901234567890123456789012"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "956c45f9"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "956c45f9",
+            "externalKey" : "party2_parent"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300O5MFEP1XJ40B48",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
+              "globalKey" : "956c45fa"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "956c45fa",
+            "externalKey" : "party2_affiliate1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300OL8KL0WCQ34V31",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "8ffabe4b"
+            }
+          } ],
+          "name" : {
+            "value" : "Up&Atem"
+          },
+          "meta" : {
+            "globalKey" : "ce0b9311",
+            "externalKey" : "broker1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300IB5Q45JGNPND22",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
             },
-            "value" : "FCHUXIINML"
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e774"
+            }
+          } ],
+          "name" : {
+            "value" : "XYZ Bank"
           },
           "meta" : {
-            "globalKey" : "1551a427"
+            "globalKey" : "61a07317",
+            "externalKey" : "executing_agent"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300IB5Q45JGNPND11",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e754"
+            }
+          } ],
+          "name" : {
+            "value" : "SEFCo LLC"
           },
-          "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
+          "meta" : {
+            "globalKey" : "ae0d40b7",
+            "externalKey" : "venue"
+          }
         }, {
-          "assignedIdentifier" : [ {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "549300IB5Q45JGNPND58",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e7d7"
+            }
+          } ],
+          "name" : {
+            "value" : "ClearItAll"
+          },
+          "meta" : {
+            "globalKey" : "f6a6cc60",
+            "externalKey" : "clearing-svc"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300IB5Q45JGNPND58",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e7d7"
+            }
+          } ],
+          "name" : {
+            "value" : "WorldWide Trade Repository"
+          },
+          "meta" : {
+            "globalKey" : "4ba4fb38",
+            "externalKey" : "original_sdr"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "d0b9c5dd",
+            "externalReference" : "party2"
+          },
+          "role" : "ReportingParty",
+          "ownershipPartyReference" : {
+            "globalReference" : "1bec43b5",
+            "externalReference" : "party1"
+          }
+        } ],
+        "contractDetails" : {
+          "documentation" : [ {
+            "agreementDate" : "2002-01-05",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster"
+                }
               },
-              "value" : "12345678901234567890123456789012"
+              "vintage" : 1992
+            },
+            "meta" : {
+              "globalKey" : "4f2097d4"
+            }
+          }, {
+            "agreementDate" : "2002-01-07",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "ISDA2003CreditNorthAmerican"
+                }
+              }
+            },
+            "meta" : {
+              "globalKey" : "5d7949e5"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "CreditSupportAgreement"
+              }
+            },
+            "meta" : {
+              "globalKey" : "984ae6d0"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix"
+                  },
+                  "matrixTerm" : {
+                    "value" : "StandardNorthAmericanCorporate"
+                  }
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "9ed2f955"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Other",
+                "otherAgreement" : "Custom Legal Agreement"
+              }
+            },
+            "meta" : {
+              "globalKey" : "98e1dbe8"
             }
           } ],
-          "issuer" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-            },
-            "value" : "1031234567"
-          },
           "meta" : {
-            "globalKey" : "f6e91d86"
-          },
-          "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-        } ]
+            "globalKey" : "396e114a"
+          }
+        },
+        "meta" : {
+          "globalKey" : "77cff7e"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
       },
       "transferHistory" : [ {
-        "meta" : {
-          "globalKey" : "8af8663c"
-        },
         "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "e450a87"
-            },
-            "receiverPartyReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "573ad49d"
-            }
-          },
           "quantity" : {
+            "value" : 1000,
             "unit" : {
               "currency" : {
                 "value" : "USD"
               }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "1bec43b5",
+              "externalReference" : "party1"
             },
-            "value" : 1000
+            "receiverPartyReference" : {
+              "globalReference" : "d0b9c5dd",
+              "externalReference" : "party2"
+            }
           },
           "settlementDate" : {
+            "unadjustedDate" : "2009-03-28",
             "adjustedDate" : {
+              "value" : "2009-03-30",
               "meta" : {
                 "globalKey" : "3ec8de"
-              },
-              "value" : "2009-03-30"
-            },
-            "unadjustedDate" : "2009-03-28"
+              }
+            }
           },
           "transferExpression" : {
-            "priceTransfer" : "UPFRONT"
+            "priceTransfer" : "Upfront"
           }
+        },
+        "meta" : {
+          "globalKey" : "57999eaa"
         }
-      } ]
-    } ],
-    "eventQualifier" : "ContractFormation",
-    "meta" : {
-      "globalKey" : "4b41ad4f"
-    }
-  },
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "BANKX0001"
+      } ],
+      "meta" : {
+        "globalKey" : "e65d37cb"
       }
     } ],
     "meta" : {
-      "globalKey" : "3ce1279d"
+      "globalKey" : "d7e8a37f"
     }
-  } ],
+  },
+  "previousWorkflowStep" : {
+    "globalReference" : "330dd6be"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "BANKX0001",
       "meta" : {
         "scheme" : "http://www.bankx.com/msg_id"
-      },
-      "value" : "BANKX0001"
+      }
     },
     "sentBy" : {
       "value" : "BANKX"
@@ -1533,62 +1525,65 @@
       "value" : "SDR01"
     } ]
   },
-  "meta" : {
-    "globalKey" : "e69adc25"
-  },
+  "timestamp" : [ {
+    "dateTime" : "2011-03-04T16:42:16Z",
+    "qualification" : "eventCreationDateTime"
+  }, {
+    "dateTime" : "2011-02-04T16:20:47Z",
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "BANKX0001"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "3ce1279d"
+    }
+  } ],
+  "action" : "New",
   "party" : [ {
+    "partyId" : [ {
+      "identifier" : {
+        "value" : "5493001RKR55V4X61F71",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+        }
+      },
+      "identifierType" : "LEI",
+      "meta" : {
+        "globalKey" : "d0f863bc"
+      }
+    } ],
+    "name" : {
+      "value" : "Bank X"
+    },
     "businessUnit" : [ {
+      "name" : "New York Office",
       "contactInformation" : {
         "address" : [ {
+          "street" : [ "123 Park Avenue" ],
           "city" : "New York",
+          "state" : "NY",
           "country" : {
             "value" : "US"
           },
-          "postalCode" : "10017",
-          "state" : "NY",
-          "street" : [ "123 Park Avenue" ]
+          "postalCode" : "10017"
         } ]
       },
       "meta" : {
-        "externalKey" : "branch1",
-        "globalKey" : "69aea9de"
-      },
-      "name" : "New York Office"
+        "globalKey" : "e15b99b0",
+        "externalKey" : "branch1"
+      }
     }, {
+      "name" : "NY Swaps Desk",
       "meta" : {
-        "externalKey" : "desk1",
-        "globalKey" : "5c10b72e"
-      },
-      "name" : "NY Swaps Desk"
-    } ],
-    "contactInformation" : {
-      "email" : [ "swap_trading@bankx.com" ]
-    },
-    "meta" : {
-      "externalKey" : "party1",
-      "globalKey" : "e450a87"
-    },
-    "name" : {
-      "value" : "Bank X"
-    },
-    "partyId" : [ {
-      "identifier" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "5493001RKR55V4X61F71"
-      },
-      "identifierType" : "LEI",
-      "meta" : {
-        "globalKey" : "d0f863bc"
+        "globalKey" : "5c10b72e",
+        "externalKey" : "desk1"
       }
     } ],
     "person" : [ {
-      "firstName" : "person",
-      "meta" : {
-        "externalKey" : "broker",
-        "globalKey" : "5b25cf92"
-      },
       "personId" : [ {
         "value" : {
           "identifier" : {
@@ -1598,13 +1593,13 @@
             "globalKey" : "32d9e6bd"
           }
         }
-      } ]
-    }, {
+      } ],
       "firstName" : "person",
       "meta" : {
-        "externalKey" : "trader",
-        "globalKey" : "5b25db35"
-      },
+        "globalKey" : "5b25cf92",
+        "externalKey" : "broker"
+      }
+    }, {
       "personId" : [ {
         "value" : {
           "identifier" : {
@@ -1614,225 +1609,230 @@
             "globalKey" : "32d9f260"
           }
         }
-      } ]
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "party1_parent",
-      "globalKey" : "956c45f9"
+      } ],
+      "firstName" : "person",
+      "meta" : {
+        "globalKey" : "5b25db35",
+        "externalKey" : "trader"
+      }
+    } ],
+    "contactInformation" : {
+      "email" : [ "swap_trading@bankx.com" ]
     },
+    "meta" : {
+      "globalKey" : "1bec43b5",
+      "externalKey" : "party1"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B47",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B47"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45f9"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "party1_affiliate1",
-      "globalKey" : "956c45fa"
-    },
+      "globalKey" : "956c45f9",
+      "externalKey" : "party1_parent"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B48",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B48"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45fa"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "party1_affiliate2",
-      "globalKey" : "956c45fb"
-    },
+      "globalKey" : "956c45fa",
+      "externalKey" : "party1_affiliate1"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B49",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B49"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45fb"
       }
-    } ]
-  }, {
-    "contactInformation" : {
-      "email" : [ "investments@banky.com" ]
-    },
+    } ],
     "meta" : {
-      "externalKey" : "party2",
-      "globalKey" : "573ad49d"
-    },
-    "name" : {
-      "value" : "Bank Y"
-    },
+      "globalKey" : "956c45fb",
+      "externalKey" : "party1_affiliate2"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B46",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B46"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45f8"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "party2_parent",
-      "globalKey" : "956c45f9"
+    } ],
+    "name" : {
+      "value" : "Bank Y"
+    },
+    "contactInformation" : {
+      "email" : [ "investments@banky.com" ]
     },
+    "meta" : {
+      "globalKey" : "d0b9c5dd",
+      "externalKey" : "party2"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B47",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B47"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45f9"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "party2_affiliate1",
-      "globalKey" : "956c45fa"
-    },
+      "globalKey" : "956c45f9",
+      "externalKey" : "party2_parent"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B48",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B48"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45fa"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "broker1",
-      "globalKey" : "ed0cc6d1"
-    },
-    "name" : {
-      "value" : "Up&Atem"
-    },
+      "globalKey" : "956c45fa",
+      "externalKey" : "party2_affiliate1"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300OL8KL0WCQ34V31",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300OL8KL0WCQ34V31"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "8ffabe4b"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "executing_agent",
-      "globalKey" : "49e97697"
-    },
+    } ],
     "name" : {
-      "value" : "XYZ Bank"
+      "value" : "Up&Atem"
     },
+    "meta" : {
+      "globalKey" : "ce0b9311",
+      "externalKey" : "broker1"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300IB5Q45JGNPND22",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND22"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "e213e774"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "venue",
-      "globalKey" : "6ebddc37"
-    },
+    } ],
     "name" : {
-      "value" : "SEFCo LLC"
+      "value" : "XYZ Bank"
     },
+    "meta" : {
+      "globalKey" : "61a07317",
+      "externalKey" : "executing_agent"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300IB5Q45JGNPND11",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND11"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "e213e754"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "clearing-svc",
-      "globalKey" : "611719a0"
-    },
+    } ],
     "name" : {
-      "value" : "ClearItAll"
+      "value" : "SEFCo LLC"
     },
+    "meta" : {
+      "globalKey" : "ae0d40b7",
+      "externalKey" : "venue"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300IB5Q45JGNPND58",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND58"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "e213e7d7"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "original_sdr",
-      "globalKey" : "9b321c78"
-    },
+    } ],
     "name" : {
-      "value" : "WorldWide Trade Repository"
+      "value" : "ClearItAll"
     },
+    "meta" : {
+      "globalKey" : "f6a6cc60",
+      "externalKey" : "clearing-svc"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300IB5Q45JGNPND58",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND58"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "e213e7d7"
       }
-    } ]
+    } ],
+    "name" : {
+      "value" : "WorldWide Trade Repository"
+    },
+    "meta" : {
+      "globalKey" : "4ba4fb38",
+      "externalKey" : "original_sdr"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "95ccb362"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2011-03-04T16:42:16Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  }, {
-    "dateTime" : "2011-02-04T16:20:47Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+  "meta" : {
+    "globalKey" : "714ef11"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-trade-CFTC-clearing-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-trade-CFTC-clearing-func-output.json
index e900064f64..1754b27105 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-trade-CFTC-clearing-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-trade-CFTC-clearing-func-output.json
@@ -1,286 +1,123 @@
 {
-  "account" : [ {
-    "accountNumber" : {
-      "meta" : {
-        "scheme" : "http://bankx.com/accountId"
-      },
-      "value" : "123"
-    },
-    "meta" : {
-      "externalKey" : "client-account",
-      "globalKey" : "28dad0e0"
-    },
-    "servicingParty" : {
-      "externalReference" : "party2",
-      "globalReference" : "b386155e"
-    }
-  } ],
-  "action" : "NEW",
   "businessEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "6415e4fd"
-          },
-          "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://bankx.com/accountId"
-                },
-                "value" : "123"
-              },
-              "meta" : {
-                "externalKey" : "client-account",
-                "globalKey" : "28dad0e0"
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "2002-01-05",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster"
+                }
               },
-              "servicingParty" : {
-                "externalReference" : "party2",
-                "globalReference" : "b386155e"
+              "vintage" : 1992
+            },
+            "meta" : {
+              "globalKey" : "4f2097d4"
+            }
+          }, {
+            "agreementDate" : "2002-01-07",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "ISDA2003CreditNorthAmerican"
+                }
               }
-            } ],
+            },
             "meta" : {
-              "globalKey" : "a0e6fa09"
+              "globalKey" : "5d7949e5"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "CreditSupportAgreement"
+              }
             },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            "meta" : {
+              "globalKey" : "984ae6d0"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix"
                   },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
-                }
-              } ]
-            }, {
-              "businessUnit" : [ {
-                "contactInformation" : {
-                  "address" : [ {
-                    "city" : "New York",
-                    "country" : {
-                      "value" : "US"
-                    },
-                    "postalCode" : "10017",
-                    "state" : "NY",
-                    "street" : [ "123 Park Avenue" ]
-                  } ]
-                },
-                "meta" : {
-                  "externalKey" : "branch1",
-                  "globalKey" : "69aea9de"
-                },
-                "name" : "New York Office"
-              }, {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "contactInformation" : {
-                "address" : [ {
-                  "country" : {
-                    "value" : "GB"
+                  "matrixTerm" : {
+                    "value" : "StandardNorthAmericanCorporate"
                   }
                 } ]
-              },
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "b386155e"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "5493001RKR55V4X61F71"
-                },
-                "identifierType" : "LEI",
+              }
+            },
+            "meta" : {
+              "globalKey" : "9ed2f955"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "FCHUXIINML",
                 "meta" : {
-                  "globalKey" : "d0f863bc"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
                 }
-              } ],
-              "person" : [ {
-                "firstName" : "person",
-                "meta" : {
-                  "externalKey" : "broker",
-                  "globalKey" : "5b25cf92"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "person123"
-                    },
-                    "meta" : {
-                      "globalKey" : "32d9e6bd"
-                    }
-                  }
-                } ]
-              }, {
-                "firstName" : "person",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "5b25db35"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "person456"
-                    },
-                    "meta" : {
-                      "globalKey" : "32d9f260"
-                    }
-                  }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
-              },
-              "name" : {
-                "value" : "Up&Atem"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "12345678901234567890123456789012",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "executing_agent",
-                "globalKey" : "49e97697"
-              },
-              "name" : {
-                "value" : "XYZ Bank"
+                "globalKey" : "ce80645"
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND22"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e774"
-                }
-              } ]
+              "identifierType" : "UniqueTransactionIdentifier"
             }, {
-              "meta" : {
-                "externalKey" : "venue",
-                "globalKey" : "6ebddc37"
-              },
-              "name" : {
-                "value" : "SEFCo LLC"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND11"
-                },
-                "identifierType" : "LEI",
+              "issuer" : {
+                "value" : "1031234567",
                 "meta" : {
-                  "globalKey" : "e213e754"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "12345678901234567890123456789012",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "original_sdr",
-                "globalKey" : "9b321c78"
-              },
-              "name" : {
-                "value" : "WorldWide Trade Repository"
+                "globalKey" : "671d1c86"
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
-                }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "611719a0"
-              },
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "611719a0"
-              },
-              "role" : "CLEARING_ORGANIZATION"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2011-02-12",
+              "meta" : {
+                "globalKey" : "3ed88c"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "b386155e"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "611719a0"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
                     "primaryAssetClass" : {
-                      "value" : "CREDIT"
+                      "value" : "Credit"
                     }
                   }, {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
                         "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
@@ -293,47 +130,130 @@
                   "economicTerms" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2009-03-26",
                         "meta" : {
                           "globalKey" : "3ec8da"
-                        },
-                        "unadjustedDate" : "2009-03-26"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "3ec8da"
                       }
                     },
-                    "payout" : {
-                      "creditDefaultPayout" : {
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2014-06-20",
+                        "meta" : {
+                          "globalKey" : "3ef194"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ef194"
+                      }
+                    },
+                    "payout" : {
+                      "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
                           "meta" : {
                             "globalKey" : "0"
+                          }
+                        },
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "calculationPeriodDates" : {
+                          "firstPeriodStartDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2009-03-20",
+                              "meta" : {
+                                "globalKey" : "3ec8d4"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3ec8d4"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
+                          "meta" : {
+                            "globalKey" : "bf47be47"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
+                          "firstPaymentDate" : "2009-06-20",
+                          "meta" : {
+                            "globalKey" : "8aa3de96"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "eff49770"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "generalTerms" : {
                           "referenceInformation" : {
                             "referenceEntity" : {
                               "entityId" : [ {
+                                "value" : "8G836J",
                                 "meta" : {
                                   "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                                },
-                                "value" : "8G836J"
+                                }
                               } ],
-                              "meta" : {
-                                "externalKey" : "referenceEntity",
-                                "globalKey" : "54140007"
-                              },
                               "name" : {
                                 "value" : "TENET HEALTHCARE CORPORATION"
+                              },
+                              "meta" : {
+                                "globalKey" : "54140007",
+                                "externalKey" : "referenceEntity"
                               }
                             },
                             "referenceObligation" : [ {
@@ -341,646 +261,441 @@
                                 "productIdentifier" : [ {
                                   "value" : {
                                     "identifier" : {
+                                      "value" : "8G836JAF2",
                                       "meta" : {
                                         "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair-1-0"
-                                      },
-                                      "value" : "8G836JAF2"
+                                      }
                                     },
+                                    "source" : "Other",
                                     "meta" : {
                                       "globalKey" : "1165f83f"
-                                    },
-                                    "source" : "OTHER"
+                                    }
                                   }
                                 } ],
-                                "securityType" : "DEBT"
+                                "securityType" : "Debt"
                               }
                             } ]
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "2fa76fbc"
-                        },
                         "transactedPrice" : {
                           "marketFixedRate" : 0.02
-                        }
-                      },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
-                          "firstPeriodStartDate" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3ec8d4"
-                              },
-                              "unadjustedDate" : "2009-03-20"
-                            },
-                            "meta" : {
-                              "globalKey" : "3ec8d4"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "28c1032d"
-                          }
                         },
                         "meta" : {
-                          "globalKey" : "6afbe26c"
-                        },
-                        "paymentDates" : {
-                          "firstPaymentDate" : "2009-06-20",
-                          "meta" : {
-                            "globalKey" : "8aa3e742"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                          "globalKey" : "2fa76fbc"
                         }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "1fd4e030"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3ef194"
-                        },
-                        "unadjustedDate" : "2014-06-20"
                       },
                       "meta" : {
-                        "globalKey" : "3ef194"
+                        "globalKey" : "a7b3d32c"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "ea6f2019"
+                    "globalKey" : "2398f375"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "ea6f2019"
+                  "globalKey" : "2398f375"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "1f273178"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.01,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.01,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "1a10e2d1"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "c5befd88"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 5000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 5000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "280b774f"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "ac9c920c",
+                  "externalReference" : "party2"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "f6a6cc60",
+                  "externalReference" : "party1"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ed88c"
-              },
-              "value" : "2011-02-12"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "12345678901234567890123456789012"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
                 }
               } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
-                },
-                "value" : "FCHUXIINML"
+              "name" : {
+                "value" : "ClearItAll"
               },
               "meta" : {
-                "globalKey" : "1551a427"
-              },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "party1"
+              }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "5493001RKR55V4X61F71",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "12345678901234567890123456789012"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "d0f863bc"
                 }
               } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-                },
-                "value" : "1031234567"
-              },
-              "meta" : {
-                "globalKey" : "f6e91d86"
+              "name" : {
+                "value" : "Bank X"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
-          },
-          "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "ae573834"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "611719a0"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "b386155e"
+              "businessUnit" : [ {
+                "name" : "New York Office",
+                "contactInformation" : {
+                  "address" : [ {
+                    "street" : [ "123 Park Avenue" ],
+                    "city" : "New York",
+                    "state" : "NY",
+                    "country" : {
+                      "value" : "US"
+                    },
+                    "postalCode" : "10017"
+                  } ]
+                },
+                "meta" : {
+                  "globalKey" : "e15b99b0",
+                  "externalKey" : "branch1"
+                }
+              }, {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "person123"
+                    },
+                    "meta" : {
+                      "globalKey" : "32d9e6bd"
+                    }
+                  }
+                } ],
+                "firstName" : "person",
+                "meta" : {
+                  "globalKey" : "5b25cf92",
+                  "externalKey" : "broker"
+                }
+              }, {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "person456"
+                    },
+                    "meta" : {
+                      "globalKey" : "32d9f260"
+                    }
+                  }
+                } ],
+                "firstName" : "person",
+                "meta" : {
+                  "globalKey" : "5b25db35",
+                  "externalKey" : "trader"
                 }
+              } ],
+              "contactInformation" : {
+                "address" : [ {
+                  "country" : {
+                    "value" : "GB"
+                  }
+                } ]
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
+              "meta" : {
+                "globalKey" : "ac9c920c",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
-                "value" : 1000
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "8ffabe4b"
+                }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
               },
-              "settlementDate" : {
-                "adjustedDate" : {
+              "meta" : {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND22",
                   "meta" : {
-                    "globalKey" : "3ec8de"
-                  },
-                  "value" : "2009-03-30"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "unadjustedDate" : "2009-03-28"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e774"
+                }
+              } ],
+              "name" : {
+                "value" : "XYZ Bank"
               },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
+              "meta" : {
+                "globalKey" : "61a07317",
+                "externalKey" : "executing_agent"
               }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "2002-01-05",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "value" : "ISDA_MASTER"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND11",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e754"
                 }
+              } ],
+              "name" : {
+                "value" : "SEFCo LLC"
               },
-              "vintage" : 1992
-            },
-            "meta" : {
-              "globalKey" : "4f2097d4"
-            }
-          }, {
-            "agreementDate" : "2002-01-07",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "ISDA_2003_CREDIT_NORTH_AMERICAN"
+              "meta" : {
+                "globalKey" : "ae0d40b7",
+                "externalKey" : "venue"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
                 }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
+              },
+              "meta" : {
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
               }
-            },
-            "meta" : {
-              "globalKey" : "5d7949e5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CREDIT_SUPPORT_AGREEMENT"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "WorldWide Trade Repository"
+              },
+              "meta" : {
+                "globalKey" : "4ba4fb38",
+                "externalKey" : "original_sdr"
               }
-            },
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "f6a6cc60",
+                "externalReference" : "party1"
+              },
+              "role" : "ClearingOrganization",
+              "ownershipPartyReference" : {
+                "globalReference" : "f6a6cc60",
+                "externalReference" : "party1"
+              }
+            } ],
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "123",
+                "meta" : {
+                  "scheme" : "http://bankx.com/accountId"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "ac9c920c",
+                "externalReference" : "party2"
+              },
+              "meta" : {
+                "globalKey" : "21f14d8e",
+                "externalKey" : "client-account"
+              }
+            } ],
             "meta" : {
-              "globalKey" : "984ae6d0"
+              "globalKey" : "485cd34d"
             }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "value" : "STANDARD_NORTH_AMERICAN_CORPORATE"
-                  },
-                  "matrixType" : {
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
+          },
+          "transferHistory" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 1000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
                   }
-                } ]
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "f6a6cc60",
+                  "externalReference" : "party1"
+                },
+                "receiverPartyReference" : {
+                  "globalReference" : "ac9c920c",
+                  "externalReference" : "party2"
+                }
+              },
+              "settlementDate" : {
+                "unadjustedDate" : "2009-03-28",
+                "adjustedDate" : {
+                  "value" : "2009-03-30",
+                  "meta" : {
+                    "globalKey" : "3ec8de"
+                  }
+                }
+              },
+              "transferExpression" : {
+                "priceTransfer" : "Upfront"
               }
             },
             "meta" : {
-              "globalKey" : "80f11ad5"
+              "globalKey" : "e148764e"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "9d161f5b"
+          }
         }
       }
     } ],
-    "intent" : "CONTRACT_FORMATION",
+    "eventQualifier" : "ContractFormation",
     "after" : [ {
-      "meta" : {
-        "globalKey" : "93e31542"
-      },
-      "state" : {
-        "positionState" : "FORMED"
-      },
       "trade" : {
-        "account" : [ {
-          "accountNumber" : {
+        "tradeIdentifier" : [ {
+          "issuer" : {
+            "value" : "FCHUXIINML",
             "meta" : {
-              "scheme" : "http://bankx.com/accountId"
-            },
-            "value" : "123"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
+            }
           },
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "12345678901234567890123456789012",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+              }
+            }
+          } ],
           "meta" : {
-            "externalKey" : "client-account",
-            "globalKey" : "28dad0e0"
+            "globalKey" : "ce80645"
           },
-          "servicingParty" : {
-            "externalReference" : "party2",
-            "globalReference" : "b386155e"
-          }
-        } ],
-        "contractDetails" : {
-          "documentation" : [ {
-            "agreementDate" : "2002-01-05",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "value" : "ISDA_MASTER"
-                }
-              },
-              "vintage" : 1992
-            },
+          "identifierType" : "UniqueTransactionIdentifier"
+        }, {
+          "issuer" : {
+            "value" : "1031234567",
             "meta" : {
-              "globalKey" : "4f2097d4"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
             }
-          }, {
-            "agreementDate" : "2002-01-07",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "ISDA_2003_CREDIT_NORTH_AMERICAN"
-                }
-              }
-            },
-            "meta" : {
-              "globalKey" : "5d7949e5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CREDIT_SUPPORT_AGREEMENT"
-              }
-            },
-            "meta" : {
-              "globalKey" : "984ae6d0"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "value" : "STANDARD_NORTH_AMERICAN_CORPORATE"
-                  },
-                  "matrixType" : {
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-                  }
-                } ]
-              }
-            },
-            "meta" : {
-              "globalKey" : "80f11ad5"
-            }
-          } ],
-          "meta" : {
-            "globalKey" : "627a96de"
-          }
-        },
-        "meta" : {
-          "globalKey" : "be31196b"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "party1",
-            "globalKey" : "611719a0"
-          },
-          "name" : {
-            "value" : "ClearItAll"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "12345678901234567890123456789012",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND58"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e213e7d7"
-            }
-          } ]
-        }, {
-          "businessUnit" : [ {
-            "contactInformation" : {
-              "address" : [ {
-                "city" : "New York",
-                "country" : {
-                  "value" : "US"
-                },
-                "postalCode" : "10017",
-                "state" : "NY",
-                "street" : [ "123 Park Avenue" ]
-              } ]
-            },
-            "meta" : {
-              "externalKey" : "branch1",
-              "globalKey" : "69aea9de"
-            },
-            "name" : "New York Office"
-          }, {
-            "meta" : {
-              "externalKey" : "desk1",
-              "globalKey" : "5c10b72e"
-            },
-            "name" : "NY Swaps Desk"
-          } ],
-          "contactInformation" : {
-            "address" : [ {
-              "country" : {
-                "value" : "GB"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
               }
-            } ]
-          },
-          "meta" : {
-            "externalKey" : "party2",
-            "globalKey" : "b386155e"
-          },
-          "name" : {
-            "value" : "Bank X"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "5493001RKR55V4X61F71"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "d0f863bc"
             }
           } ],
-          "person" : [ {
-            "firstName" : "person",
-            "meta" : {
-              "externalKey" : "broker",
-              "globalKey" : "5b25cf92"
-            },
-            "personId" : [ {
-              "value" : {
-                "identifier" : {
-                  "value" : "person123"
-                },
-                "meta" : {
-                  "globalKey" : "32d9e6bd"
-                }
-              }
-            } ]
-          }, {
-            "firstName" : "person",
-            "meta" : {
-              "externalKey" : "trader",
-              "globalKey" : "5b25db35"
-            },
-            "personId" : [ {
-              "value" : {
-                "identifier" : {
-                  "value" : "person456"
-                },
-                "meta" : {
-                  "globalKey" : "32d9f260"
-                }
-              }
-            } ]
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "broker1",
-            "globalKey" : "ed0cc6d1"
-          },
-          "name" : {
-            "value" : "Up&Atem"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300OL8KL0WCQ34V31"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "8ffabe4b"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "executing_agent",
-            "globalKey" : "49e97697"
-          },
-          "name" : {
-            "value" : "XYZ Bank"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND22"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e213e774"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "venue",
-            "globalKey" : "6ebddc37"
-          },
-          "name" : {
-            "value" : "SEFCo LLC"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND11"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e213e754"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing-svc",
-            "globalKey" : "611719a0"
-          },
-          "name" : {
-            "value" : "ClearItAll"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND58"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e213e7d7"
-            }
-          } ]
-        }, {
           "meta" : {
-            "externalKey" : "original_sdr",
-            "globalKey" : "9b321c78"
-          },
-          "name" : {
-            "value" : "WorldWide Trade Repository"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND58"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e213e7d7"
-            }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "611719a0"
-          },
-          "partyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "611719a0"
+            "globalKey" : "671d1c86"
           },
-          "role" : "CLEARING_ORGANIZATION"
+          "identifierType" : "UniqueTransactionIdentifier"
         } ],
+        "tradeDate" : {
+          "value" : "2011-02-12",
+          "meta" : {
+            "globalKey" : "3ed88c"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "b386155e"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "611719a0"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
                 "primaryAssetClass" : {
-                  "value" : "CREDIT"
+                  "value" : "Credit"
                 }
               }, {
-                "source" : "OTHER",
+                "source" : "Other",
                 "value" : {
                   "name" : {
                     "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
@@ -993,328 +708,589 @@
               "economicTerms" : {
                 "effectiveDate" : {
                   "adjustableDate" : {
+                    "unadjustedDate" : "2009-03-26",
                     "meta" : {
                       "globalKey" : "3ec8da"
-                    },
-                    "unadjustedDate" : "2009-03-26"
+                    }
                   },
                   "meta" : {
                     "globalKey" : "3ec8da"
                   }
                 },
+                "terminationDate" : {
+                  "adjustableDate" : {
+                    "unadjustedDate" : "2014-06-20",
+                    "meta" : {
+                      "globalKey" : "3ef194"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3ef194"
+                  }
+                },
                 "payout" : {
-                  "creditDefaultPayout" : {
+                  "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "generalTerms" : {
-                      "referenceInformation" : {
-                        "referenceEntity" : {
-                          "entityId" : [ {
-                            "meta" : {
-                              "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                            },
-                            "value" : "8G836J"
-                          } ],
-                          "meta" : {
-                            "externalKey" : "referenceEntity",
-                            "globalKey" : "54140007"
-                          },
-                          "name" : {
-                            "value" : "TENET HEALTHCARE CORPORATION"
-                          }
-                        },
-                        "referenceObligation" : [ {
-                          "security" : {
-                            "productIdentifier" : [ {
-                              "value" : {
-                                "identifier" : {
-                                  "meta" : {
-                                    "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair-1-0"
-                                  },
-                                  "value" : "8G836JAF2"
-                                },
-                                "meta" : {
-                                  "globalKey" : "1165f83f"
-                                },
-                                "source" : "OTHER"
-                              }
-                            } ],
-                            "securityType" : "DEBT"
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
                           }
-                        } ]
-                      }
-                    },
-                    "meta" : {
-                      "globalKey" : "2fa76fbc"
-                    },
-                    "transactedPrice" : {
-                      "marketFixedRate" : 0.02
-                    }
-                  },
-                  "interestRatePayout" : [ {
-                    "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
-                    },
-                    "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "quantitySchedule" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "quantity-1"
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       }
                     },
                     "calculationPeriodDates" : {
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "28c47"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
-                        "rollConvention" : "20"
-                      },
                       "firstPeriodStartDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2009-03-20",
                           "meta" : {
                             "globalKey" : "3ec8d4"
-                          },
-                          "unadjustedDate" : "2009-03-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "3ec8d4"
                         }
                       },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "17f73"
+                        },
+                        "rollConvention" : "20"
+                      },
                       "meta" : {
-                        "globalKey" : "28c1032d"
+                        "globalKey" : "bf47be47"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "6afbe26c"
-                    },
                     "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
+                      },
                       "firstPaymentDate" : "2009-06-20",
                       "meta" : {
-                        "globalKey" : "8aa3e742"
+                        "globalKey" : "8aa3de96"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "eff49770"
+                    }
+                  } ],
+                  "creditDefaultPayout" : {
+                    "payerReceiver" : {
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
+                    },
+                    "priceQuantity" : {
+                      "quantitySchedule" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "quantity-1"
+                        }
                       },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
+                    "generalTerms" : {
+                      "referenceInformation" : {
+                        "referenceEntity" : {
+                          "entityId" : [ {
+                            "value" : "8G836J",
+                            "meta" : {
+                              "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
                             }
+                          } ],
+                          "name" : {
+                            "value" : "TENET HEALTHCARE CORPORATION"
+                          },
+                          "meta" : {
+                            "globalKey" : "54140007",
+                            "externalKey" : "referenceEntity"
                           }
-                        }
+                        },
+                        "referenceObligation" : [ {
+                          "security" : {
+                            "productIdentifier" : [ {
+                              "value" : {
+                                "identifier" : {
+                                  "value" : "8G836JAF2",
+                                  "meta" : {
+                                    "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair-1-0"
+                                  }
+                                },
+                                "source" : "Other",
+                                "meta" : {
+                                  "globalKey" : "1165f83f"
+                                }
+                              }
+                            } ],
+                            "securityType" : "Debt"
+                          }
+                        } ]
                       }
-                    }
-                  } ],
-                  "meta" : {
-                    "globalKey" : "1fd4e030"
-                  }
-                },
-                "terminationDate" : {
-                  "adjustableDate" : {
-                    "meta" : {
-                      "globalKey" : "3ef194"
                     },
-                    "unadjustedDate" : "2014-06-20"
+                    "transactedPrice" : {
+                      "marketFixedRate" : 0.02
+                    },
+                    "meta" : {
+                      "globalKey" : "2fa76fbc"
+                    }
                   },
                   "meta" : {
-                    "globalKey" : "3ef194"
+                    "globalKey" : "a7b3d32c"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "ea6f2019"
+                "globalKey" : "2398f375"
               }
             },
             "meta" : {
-              "globalKey" : "ea6f2019"
+              "globalKey" : "2398f375"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "1f273178"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.01,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.01,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "1a10e2d1"
-              },
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "c5befd88"
+              }
+            }, {
+              "quantity" : [ {
                 "value" : {
+                  "value" : 5000000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 5000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "280b774f"
+              }
             } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "ac9c920c",
+              "externalReference" : "party2"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "f6a6cc60",
+              "externalReference" : "party1"
+            }
           } ]
         },
-        "tradeDate" : {
+        "party" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300IB5Q45JGNPND58",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e7d7"
+            }
+          } ],
+          "name" : {
+            "value" : "ClearItAll"
+          },
           "meta" : {
-            "globalKey" : "3ed88c"
+            "globalKey" : "f6a6cc60",
+            "externalKey" : "party1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "5493001RKR55V4X61F71",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "d0f863bc"
+            }
+          } ],
+          "name" : {
+            "value" : "Bank X"
           },
-          "value" : "2011-02-12"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
+          "businessUnit" : [ {
+            "name" : "New York Office",
+            "contactInformation" : {
+              "address" : [ {
+                "street" : [ "123 Park Avenue" ],
+                "city" : "New York",
+                "state" : "NY",
+                "country" : {
+                  "value" : "US"
+                },
+                "postalCode" : "10017"
+              } ]
+            },
+            "meta" : {
+              "globalKey" : "e15b99b0",
+              "externalKey" : "branch1"
+            }
+          }, {
+            "name" : "NY Swaps Desk",
+            "meta" : {
+              "globalKey" : "5c10b72e",
+              "externalKey" : "desk1"
+            }
+          } ],
+          "person" : [ {
+            "personId" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "person123"
+                },
+                "meta" : {
+                  "globalKey" : "32d9e6bd"
+                }
+              }
+            } ],
+            "firstName" : "person",
+            "meta" : {
+              "globalKey" : "5b25cf92",
+              "externalKey" : "broker"
+            }
+          }, {
+            "personId" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "person456"
+                },
+                "meta" : {
+                  "globalKey" : "32d9f260"
+                }
+              }
+            } ],
+            "firstName" : "person",
+            "meta" : {
+              "globalKey" : "5b25db35",
+              "externalKey" : "trader"
+            }
+          } ],
+          "contactInformation" : {
+            "address" : [ {
+              "country" : {
+                "value" : "GB"
+              }
+            } ]
+          },
+          "meta" : {
+            "globalKey" : "ac9c920c",
+            "externalKey" : "party2"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "549300OL8KL0WCQ34V31",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-              },
-              "value" : "12345678901234567890123456789012"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "8ffabe4b"
             }
           } ],
-          "issuer" : {
+          "name" : {
+            "value" : "Up&Atem"
+          },
+          "meta" : {
+            "globalKey" : "ce0b9311",
+            "externalKey" : "broker1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300IB5Q45JGNPND22",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
+              "globalKey" : "e213e774"
+            }
+          } ],
+          "name" : {
+            "value" : "XYZ Bank"
+          },
+          "meta" : {
+            "globalKey" : "61a07317",
+            "externalKey" : "executing_agent"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300IB5Q45JGNPND11",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e754"
+            }
+          } ],
+          "name" : {
+            "value" : "SEFCo LLC"
+          },
+          "meta" : {
+            "globalKey" : "ae0d40b7",
+            "externalKey" : "venue"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300IB5Q45JGNPND58",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e7d7"
+            }
+          } ],
+          "name" : {
+            "value" : "ClearItAll"
+          },
+          "meta" : {
+            "globalKey" : "f6a6cc60",
+            "externalKey" : "clearing-svc"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300IB5Q45JGNPND58",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e7d7"
+            }
+          } ],
+          "name" : {
+            "value" : "WorldWide Trade Repository"
+          },
+          "meta" : {
+            "globalKey" : "4ba4fb38",
+            "externalKey" : "original_sdr"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "f6a6cc60",
+            "externalReference" : "party1"
+          },
+          "role" : "ClearingOrganization",
+          "ownershipPartyReference" : {
+            "globalReference" : "f6a6cc60",
+            "externalReference" : "party1"
+          }
+        } ],
+        "contractDetails" : {
+          "documentation" : [ {
+            "agreementDate" : "2002-01-05",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster"
+                }
+              },
+              "vintage" : 1992
+            },
+            "meta" : {
+              "globalKey" : "4f2097d4"
+            }
+          }, {
+            "agreementDate" : "2002-01-07",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "ISDA2003CreditNorthAmerican"
+                }
+              }
+            },
+            "meta" : {
+              "globalKey" : "5d7949e5"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "CreditSupportAgreement"
+              }
+            },
+            "meta" : {
+              "globalKey" : "984ae6d0"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix"
+                  },
+                  "matrixTerm" : {
+                    "value" : "StandardNorthAmericanCorporate"
+                  }
+                } ]
+              }
             },
-            "value" : "FCHUXIINML"
-          },
-          "meta" : {
-            "globalKey" : "1551a427"
-          },
-          "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-        }, {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-              },
-              "value" : "12345678901234567890123456789012"
+            "meta" : {
+              "globalKey" : "9ed2f955"
             }
           } ],
-          "issuer" : {
+          "meta" : {
+            "globalKey" : "805c755e"
+          }
+        },
+        "account" : [ {
+          "accountNumber" : {
+            "value" : "123",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-            },
-            "value" : "1031234567"
+              "scheme" : "http://bankx.com/accountId"
+            }
           },
-          "meta" : {
-            "globalKey" : "f6e91d86"
+          "servicingParty" : {
+            "globalReference" : "ac9c920c",
+            "externalReference" : "party2"
           },
-          "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-        } ]
+          "meta" : {
+            "globalKey" : "21f14d8e",
+            "externalKey" : "client-account"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "cfa6ba6b"
+        }
+      },
+      "state" : {
+        "positionState" : "Formed"
       },
       "transferHistory" : [ {
-        "meta" : {
-          "globalKey" : "ae573834"
-        },
         "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "611719a0"
-            },
-            "receiverPartyReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "b386155e"
-            }
-          },
           "quantity" : {
+            "value" : 1000,
             "unit" : {
               "currency" : {
                 "value" : "USD"
               }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "f6a6cc60",
+              "externalReference" : "party1"
             },
-            "value" : 1000
+            "receiverPartyReference" : {
+              "globalReference" : "ac9c920c",
+              "externalReference" : "party2"
+            }
           },
           "settlementDate" : {
+            "unadjustedDate" : "2009-03-28",
             "adjustedDate" : {
+              "value" : "2009-03-30",
               "meta" : {
                 "globalKey" : "3ec8de"
-              },
-              "value" : "2009-03-30"
-            },
-            "unadjustedDate" : "2009-03-28"
+              }
+            }
           },
           "transferExpression" : {
-            "priceTransfer" : "UPFRONT"
+            "priceTransfer" : "Upfront"
           }
+        },
+        "meta" : {
+          "globalKey" : "e148764e"
         }
-      } ]
-    } ],
-    "eventQualifier" : "ContractFormation",
-    "meta" : {
-      "globalKey" : "48c03d"
-    }
-  },
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "BANKX0001"
+      } ],
+      "meta" : {
+        "globalKey" : "23860dc"
       }
     } ],
     "meta" : {
-      "globalKey" : "3ce1279d"
+      "globalKey" : "cbee875f"
     }
-  } ],
+  },
+  "previousWorkflowStep" : {
+    "globalReference" : "a8c65d56"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "BANKX0001",
       "meta" : {
         "scheme" : "http://www.bankx.com/msg_id"
-      },
-      "value" : "BANKX0001"
+      }
     },
     "sentBy" : {
       "value" : "BANKX"
@@ -1323,86 +1299,91 @@
       "value" : "SDR01"
     } ]
   },
-  "meta" : {
-    "globalKey" : "64444e15"
-  },
-  "party" : [ {
+  "timestamp" : [ {
+    "dateTime" : "2011-03-04T16:42:16Z",
+    "qualification" : "eventCreationDateTime"
+  }, {
+    "dateTime" : "2011-02-04T16:20:47Z",
+    "qualification" : "executionDateTime"
+  }, {
+    "dateTime" : "2011-02-04T16:20:52Z",
+    "qualification" : "clearingReceiptDateTime"
+  }, {
+    "dateTime" : "2011-02-04T16:21:27Z",
+    "qualification" : "clearingDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "BANKX0001"
+      }
+    } ],
     "meta" : {
-      "externalKey" : "party1",
-      "globalKey" : "611719a0"
-    },
+      "globalKey" : "3ce1279d"
+    }
+  } ],
+  "action" : "New",
+  "party" : [ {
+    "partyId" : [ {
+      "identifier" : {
+        "value" : "549300IB5Q45JGNPND58",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+        }
+      },
+      "identifierType" : "LEI",
+      "meta" : {
+        "globalKey" : "e213e7d7"
+      }
+    } ],
     "name" : {
       "value" : "ClearItAll"
     },
+    "meta" : {
+      "globalKey" : "f6a6cc60",
+      "externalKey" : "party1"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "5493001RKR55V4X61F71",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND58"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
-        "globalKey" : "e213e7d7"
+        "globalKey" : "d0f863bc"
       }
-    } ]
-  }, {
+    } ],
+    "name" : {
+      "value" : "Bank X"
+    },
     "businessUnit" : [ {
+      "name" : "New York Office",
       "contactInformation" : {
         "address" : [ {
+          "street" : [ "123 Park Avenue" ],
           "city" : "New York",
+          "state" : "NY",
           "country" : {
             "value" : "US"
           },
-          "postalCode" : "10017",
-          "state" : "NY",
-          "street" : [ "123 Park Avenue" ]
+          "postalCode" : "10017"
         } ]
       },
       "meta" : {
-        "externalKey" : "branch1",
-        "globalKey" : "69aea9de"
-      },
-      "name" : "New York Office"
+        "globalKey" : "e15b99b0",
+        "externalKey" : "branch1"
+      }
     }, {
+      "name" : "NY Swaps Desk",
       "meta" : {
-        "externalKey" : "desk1",
-        "globalKey" : "5c10b72e"
-      },
-      "name" : "NY Swaps Desk"
-    } ],
-    "contactInformation" : {
-      "address" : [ {
-        "country" : {
-          "value" : "GB"
-        }
-      } ]
-    },
-    "meta" : {
-      "externalKey" : "party2",
-      "globalKey" : "b386155e"
-    },
-    "name" : {
-      "value" : "Bank X"
-    },
-    "partyId" : [ {
-      "identifier" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "5493001RKR55V4X61F71"
-      },
-      "identifierType" : "LEI",
-      "meta" : {
-        "globalKey" : "d0f863bc"
+        "globalKey" : "5c10b72e",
+        "externalKey" : "desk1"
       }
     } ],
     "person" : [ {
-      "firstName" : "person",
-      "meta" : {
-        "externalKey" : "broker",
-        "globalKey" : "5b25cf92"
-      },
       "personId" : [ {
         "value" : {
           "identifier" : {
@@ -1412,13 +1393,13 @@
             "globalKey" : "32d9e6bd"
           }
         }
-      } ]
-    }, {
+      } ],
       "firstName" : "person",
       "meta" : {
-        "externalKey" : "trader",
-        "globalKey" : "5b25db35"
-      },
+        "globalKey" : "5b25cf92",
+        "externalKey" : "broker"
+      }
+    }, {
       "personId" : [ {
         "value" : {
           "identifier" : {
@@ -1428,123 +1409,142 @@
             "globalKey" : "32d9f260"
           }
         }
+      } ],
+      "firstName" : "person",
+      "meta" : {
+        "globalKey" : "5b25db35",
+        "externalKey" : "trader"
+      }
+    } ],
+    "contactInformation" : {
+      "address" : [ {
+        "country" : {
+          "value" : "GB"
+        }
       } ]
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "broker1",
-      "globalKey" : "ed0cc6d1"
-    },
-    "name" : {
-      "value" : "Up&Atem"
     },
+    "meta" : {
+      "globalKey" : "ac9c920c",
+      "externalKey" : "party2"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300OL8KL0WCQ34V31",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300OL8KL0WCQ34V31"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "8ffabe4b"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "executing_agent",
-      "globalKey" : "49e97697"
-    },
+    } ],
     "name" : {
-      "value" : "XYZ Bank"
+      "value" : "Up&Atem"
     },
+    "meta" : {
+      "globalKey" : "ce0b9311",
+      "externalKey" : "broker1"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300IB5Q45JGNPND22",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND22"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "e213e774"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "venue",
-      "globalKey" : "6ebddc37"
-    },
+    } ],
     "name" : {
-      "value" : "SEFCo LLC"
+      "value" : "XYZ Bank"
     },
+    "meta" : {
+      "globalKey" : "61a07317",
+      "externalKey" : "executing_agent"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300IB5Q45JGNPND11",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND11"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "e213e754"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "clearing-svc",
-      "globalKey" : "611719a0"
-    },
+    } ],
     "name" : {
-      "value" : "ClearItAll"
+      "value" : "SEFCo LLC"
     },
+    "meta" : {
+      "globalKey" : "ae0d40b7",
+      "externalKey" : "venue"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300IB5Q45JGNPND58",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND58"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "e213e7d7"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "original_sdr",
-      "globalKey" : "9b321c78"
-    },
+    } ],
     "name" : {
-      "value" : "WorldWide Trade Repository"
+      "value" : "ClearItAll"
     },
+    "meta" : {
+      "globalKey" : "f6a6cc60",
+      "externalKey" : "clearing-svc"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300IB5Q45JGNPND58",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND58"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "e213e7d7"
       }
-    } ]
+    } ],
+    "name" : {
+      "value" : "WorldWide Trade Repository"
+    },
+    "meta" : {
+      "globalKey" : "4ba4fb38",
+      "externalKey" : "original_sdr"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "cf216aec"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2011-03-04T16:42:16Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  }, {
-    "dateTime" : "2011-02-04T16:20:47Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  }, {
-    "dateTime" : "2011-02-04T16:20:52Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
-  }, {
-    "dateTime" : "2011-02-04T16:21:27Z",
-    "qualification" : "CLEARING_DATE_TIME"
-  } ]
+  "account" : [ {
+    "accountNumber" : {
+      "value" : "123",
+      "meta" : {
+        "scheme" : "http://bankx.com/accountId"
+      }
+    },
+    "servicingParty" : {
+      "globalReference" : "ac9c920c",
+      "externalReference" : "party2"
+    },
+    "meta" : {
+      "globalKey" : "21f14d8e",
+      "externalKey" : "client-account"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "7f9f4ed1"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-partial-termination-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-partial-termination-func-output.json
index 263241ac0e..f893bb45ea 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-partial-termination-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-partial-termination-func-output.json
@@ -1,223 +1,171 @@
 {
-  "action" : "NEW",
   "businessEvent" : {
-    "effectiveDate" : "2011-06-03",
     "eventDate" : "2011-06-01",
+    "effectiveDate" : "2011-06-03",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "89f8e664"
-          },
-          "trade" : {
-            "meta" : {
-              "globalKey" : "89f8e664"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "4c6e19b1"
+      "primitiveInstruction" : {
+        "quantityChange" : {
+          "change" : [ {
+            "quantity" : [ {
+              "value" : {
+                "value" : 5000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
-              "name" : {
-                "value" : "Bank X"
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "280b774f"
+            }
+          } ],
+          "direction" : "Replace"
+        },
+        "transfer" : {
+          "transferState" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 12345,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "5493001RKR55V4X61F71"
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "62dfab31",
+                  "externalReference" : "party1"
                 },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "d0f863bc"
+                "receiverPartyReference" : {
+                  "globalReference" : "619cff8d",
+                  "externalReference" : "party2"
                 }
-              } ],
-              "person" : [ {
-                "firstName" : "jjone",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "d3962233"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "jjones"
-                    },
-                    "meta" : {
-                      "globalKey" : "baeb8c0d"
-                    }
-                  }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "b8c6cb0d"
               },
-              "name" : {
-                "value" : "Bank Y"
-              },
-              "partyId" : [ {
-                "identifier" : {
+              "settlementDate" : {
+                "adjustedDate" : {
+                  "value" : "2011-06-03",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B46"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f8"
+                    "globalKey" : "3ed983"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
-              },
-              "name" : {
-                "value" : "Up&Atem"
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
+              "transferExpression" : {
+                "priceTransfer" : "Termination"
+              }
+            },
+            "meta" : {
+              "globalKey" : "4ec7d51c"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "1031234567",
                 "meta" : {
-                  "globalKey" : "8ffabe4b"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "712345678901234567890123456789012",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "4c6e19b1"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing-svc",
-                "globalReference" : "611719a0"
+              } ],
+              "meta" : {
+                "globalKey" : "88f03f2f"
               },
-              "role" : "CLEARING_ORGANIZATION"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2011-02-12",
+              "meta" : {
+                "globalKey" : "3ed88c"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "4c6e19b1"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "b8c6cb0d"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "value" : "SWI-ST-USD-IRS"
-                      },
-                      "meta" : {
-                        "globalKey" : "cc86674f"
-                      },
-                      "source" : "OTHER"
-                    }
-                  } ],
                   "productTaxonomy" : [ {
                     "primaryAssetClass" : {
-                      "value" : "INTEREST_RATE"
+                      "value" : "InterestRate"
                     }
                   }, {
                     "source" : "ISDA",
                     "value" : {
                       "name" : {
+                        "value" : "InterestRate:IRSwap:FixedFloat",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                        },
-                        "value" : "InterestRate:IRSwap:FixedFloat"
+                        }
                       }
                     }
                   }, {
                     "source" : "ISDA",
                     "productQualifier" : "InterestRate_IRSwap_FixedFloat"
                   } ],
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "SWI-ST-USD-IRS"
+                      },
+                      "source" : "Other",
+                      "meta" : {
+                        "globalKey" : "cc86674f"
+                      }
+                    }
+                  } ],
                   "economicTerms" : {
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "4fc9cca"
-                              },
-                              "meta" : {
-                                "globalKey" : "b4c505ce"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "ae98bc9d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d23"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "8"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2011-02-08",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -226,20 +174,17 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec0f7dc0"
-                              },
-                              "unadjustedDate" : "2011-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec0f7dc0"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "aa0ad953"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2016-02-08",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
@@ -247,84 +192,92 @@
                                     "value" : "USLA"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "primaryBusinessCenters",
-                                    "globalKey" : "4fc9cca"
+                                    "globalKey" : "4fc9cca",
+                                    "externalKey" : "primaryBusinessCenters"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "9885f05b"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "d306c6d3"
-                              },
-                              "unadjustedDate" : "2016-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "d306c6d3"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "5d1a6afb"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "a26b65ff"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "4fc9cca"
+                                "globalReference" : "4fc9cca",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "b4c505ce"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "ae98bc9d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "956"
+                              "globalKey" : "204f"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                            "rollConvention" : "8"
+                          },
+                          "meta" : {
+                            "globalKey" : "1ee5dbf",
+                            "externalKey" : "floatingCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
+                              "globalKey" : "aa"
                             }
-                          }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "4fc9cca",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "b4c505ce"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "ae98bc9d"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "30bdab2d"
+                          }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "aa0ad953"
+                            "globalReference" : "1ee5dbf",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "131ae8a2"
+                              "globalKey" : "eff6d356"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -333,82 +286,79 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "resetDates",
-                              "globalReference" : "a7463c48"
+                              "globalReference" : "75eadd56",
+                              "externalReference" : "resetDates"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "resetDates",
-                            "globalKey" : "a7463c48"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "4fc9cca"
+                                "globalReference" : "4fc9cca",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "b4c505ce"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "ae98bc9d"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "meta" : {
+                            "globalKey" : "75eadd56",
+                            "externalKey" : "resetDates"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "431a0cc7"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "4fc9cca"
-                              },
-                              "meta" : {
-                                "globalKey" : "b4c505ce"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "ae98bc9d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d80"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "8"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30E/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2011-02-08",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -417,517 +367,452 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec0f7dc0"
-                              },
-                              "unadjustedDate" : "2011-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec0f7dc0"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "1f6113c2"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2016-02-08",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "primaryBusinessCenters",
-                                    "globalReference" : "4fc9cca"
+                                    "globalReference" : "4fc9cca",
+                                    "externalReference" : "primaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "b4c505ce"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "ae98bc9d"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "c596b325"
-                              },
-                              "unadjustedDate" : "2016-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "c596b325"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "30E/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "abf01156"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "a26b6602"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "4fc9cca"
+                                "globalReference" : "4fc9cca",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "b4c505ce"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "ae98bc9d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "959"
+                              "globalKey" : "2b92"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 6
+                            "rollConvention" : "8"
+                          },
+                          "meta" : {
+                            "globalKey" : "63870a54",
+                            "externalKey" : "fixedCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "4fc9cca",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "b4c505ce"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "ae98bc9d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "47d29b4a"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "4e4c440c"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "a01e92bb"
+                        "globalKey" : "6dd4b125"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "4be7a1d7"
+                    "globalKey" : "295f7589"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "4be7a1d7"
+                  "globalKey" : "295f7589"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "aaeec36f"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-LIBOR-BBA"
-                        },
-                        "indexTenor" : {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 7500000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD",
                           "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                          }
                         }
                       }
-                    }
-                  },
-                  "quantity" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-LIBOR-BBA"
+                        },
+                        "indexTenor" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                            "globalKey" : "aa"
+                          }
                         }
                       },
-                      "value" : 7500000
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "4b440bfb"
                   },
+                  "meta" : {
+                    "globalKey" : "90ac0ddb"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0253,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "value" : 0.0253,
                       "perUnitOf" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 7500000,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
-                      },
-                      "value" : 7500000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "1d3d7365"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "62dfab31",
+                  "externalReference" : "party1"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "619cff8d",
+                  "externalReference" : "party2"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ed88c"
-              },
-              "value" : "2011-02-12"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "5493001RKR55V4X61F71",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "712345678901234567890123456789012"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "d0f863bc"
                 }
               } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-                },
-                "value" : "1031234567"
-              },
-              "meta" : {
-                "globalKey" : "f07e39ef"
-              },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
-          }
-        }
-      },
-      "primitiveInstruction" : {
-        "quantityChange" : {
-          "change" : [ {
-            "meta" : {
-              "globalKey" : "1a10e2d1"
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
-                } ]
+              "name" : {
+                "value" : "Bank X"
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
+              "businessUnit" : [ {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "jjones"
+                    },
+                    "meta" : {
+                      "globalKey" : "baeb8c0d"
+                    }
                   }
-                },
-                "value" : 5000000
+                } ],
+                "firstName" : "jjone",
+                "meta" : {
+                  "globalKey" : "d3962233",
+                  "externalKey" : "trader"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "62dfab31",
+                "externalKey" : "party1"
               }
-            } ]
-          } ],
-          "direction" : "REPLACE"
-        },
-        "transfer" : {
-          "transferState" : [ {
-            "meta" : {
-              "globalKey" : "d1cda4ac"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "4c6e19b1"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B46",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "receiverPartyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "b8c6cb0d"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45f8"
                 }
+              } ],
+              "name" : {
+                "value" : "Bank Y"
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
+              "meta" : {
+                "globalKey" : "619cff8d",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
-                "value" : 12345
-              },
-              "settlementDate" : {
-                "adjustedDate" : {
-                  "meta" : {
-                    "globalKey" : "3ed983"
-                  },
-                  "value" : "2011-06-03"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "8ffabe4b"
                 }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
               },
-              "transferExpression" : {
-                "priceTransfer" : "TERMINATION"
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "after" : [ {
-      "meta" : {
-        "globalKey" : "75054e02"
-      },
-      "trade" : {
-        "meta" : {
-          "globalKey" : "817b80ea"
-        },
-        "party" : [ {
-          "businessUnit" : [ {
-            "meta" : {
-              "externalKey" : "desk1",
-              "globalKey" : "5c10b72e"
-            },
-            "name" : "NY Swaps Desk"
-          } ],
-          "meta" : {
-            "externalKey" : "party1",
-            "globalKey" : "4c6e19b1"
-          },
-          "name" : {
-            "value" : "Bank X"
-          },
-          "partyId" : [ {
-            "identifier" : {
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "5493001RKR55V4X61F71"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "d0f863bc"
-            }
-          } ],
-          "person" : [ {
-            "firstName" : "jjone",
-            "meta" : {
-              "externalKey" : "trader",
-              "globalKey" : "d3962233"
-            },
-            "personId" : [ {
-              "value" : {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "value" : "jjones"
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "baeb8c0d"
+                  "globalKey" : "e213e7d7"
                 }
-              }
-            } ]
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party2",
-            "globalKey" : "b8c6cb0d"
-          },
-          "name" : {
-            "value" : "Bank Y"
-          },
-          "partyId" : [ {
-            "identifier" : {
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
+              },
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "f6a6cc60",
+                "externalReference" : "clearing-svc"
               },
-              "value" : "549300O5MFEP1XJ40B46"
-            },
-            "identifierType" : "LEI",
+              "role" : "ClearingOrganization",
+              "ownershipPartyReference" : {
+                "globalReference" : "62dfab31",
+                "externalReference" : "party1"
+              }
+            } ],
             "meta" : {
-              "globalKey" : "956c45f8"
+              "globalKey" : "216cf298"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "broker1",
-            "globalKey" : "ed0cc6d1"
-          },
-          "name" : {
-            "value" : "Up&Atem"
           },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300OL8KL0WCQ34V31"
-            },
-            "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "216cf298"
+          }
+        }
+      }
+    } ],
+    "eventQualifier" : "PartialTermination",
+    "after" : [ {
+      "trade" : {
+        "tradeIdentifier" : [ {
+          "issuer" : {
+            "value" : "1031234567",
             "meta" : {
-              "globalKey" : "8ffabe4b"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing-svc",
-            "globalKey" : "611719a0"
           },
-          "name" : {
-            "value" : "ClearItAll"
-          },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "712345678901234567890123456789012",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND58"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e213e7d7"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+              }
             }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "4c6e19b1"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing-svc",
-            "globalReference" : "611719a0"
+          } ],
+          "meta" : {
+            "globalKey" : "88f03f2f"
           },
-          "role" : "CLEARING_ORGANIZATION"
+          "identifierType" : "UniqueTransactionIdentifier"
         } ],
+        "tradeDate" : {
+          "value" : "2011-02-12",
+          "meta" : {
+            "globalKey" : "3ed88c"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "4c6e19b1"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "b8c6cb0d"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "SWI-ST-USD-IRS"
-                  },
-                  "meta" : {
-                    "globalKey" : "cc86674f"
-                  },
-                  "source" : "OTHER"
-                }
-              } ],
               "productTaxonomy" : [ {
                 "primaryAssetClass" : {
-                  "value" : "INTEREST_RATE"
+                  "value" : "InterestRate"
                 }
               }, {
                 "source" : "ISDA",
                 "value" : {
                   "name" : {
+                    "value" : "InterestRate:IRSwap:FixedFloat",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                    },
-                    "value" : "InterestRate:IRSwap:FixedFloat"
+                    }
                   }
                 }
               }, {
                 "source" : "ISDA",
                 "productQualifier" : "InterestRate_IRSwap_FixedFloat"
               } ],
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "SWI-ST-USD-IRS"
+                  },
+                  "source" : "Other",
+                  "meta" : {
+                    "globalKey" : "cc86674f"
+                  }
+                }
+              } ],
               "economicTerms" : {
                 "payout" : {
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "4fc9cca"
-                          },
-                          "meta" : {
-                            "globalKey" : "b4c505ce"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "ae98bc9d"
-                        }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "12d23"
+                    "rateSpecification" : {
+                      "floatingRate" : {
+                        "rateOption" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "rateOption-1"
+                          }
                         },
-                        "period" : "M",
-                        "periodMultiplier" : 3,
-                        "rollConvention" : "8"
-                      },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/360"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2011-02-08",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -936,20 +821,17 @@
                           },
                           "meta" : {
                             "globalKey" : "ec0f7dc0"
-                          },
-                          "unadjustedDate" : "2011-02-08"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ec0f7dc0"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "floatingCalcPeriodDates",
-                        "globalKey" : "aa0ad953"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2016-02-08",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USNY"
@@ -957,84 +839,92 @@
                                 "value" : "USLA"
                               } ],
                               "meta" : {
-                                "externalKey" : "primaryBusinessCenters",
-                                "globalKey" : "4fc9cca"
+                                "globalKey" : "4fc9cca",
+                                "externalKey" : "primaryBusinessCenters"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "9885f05b"
                             }
                           },
                           "meta" : {
                             "globalKey" : "d306c6d3"
-                          },
-                          "unadjustedDate" : "2016-02-08"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "d306c6d3"
                         }
-                      }
-                    },
-                    "dayCountFraction" : {
-                      "value" : "ACT/360"
-                    },
-                    "meta" : {
-                      "globalKey" : "5d1a6afb"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "globalKey" : "a26b65ff"
                       },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "4fc9cca"
+                            "globalReference" : "4fc9cca",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "b4c505ce"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "ae98bc9d"
                         }
                       },
-                      "paymentFrequency" : {
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
                         "meta" : {
-                          "globalKey" : "956"
+                          "globalKey" : "204f"
                         },
-                        "period" : "M",
-                        "periodMultiplier" : 3
+                        "rollConvention" : "8"
+                      },
+                      "meta" : {
+                        "globalKey" : "1ee5dbf",
+                        "externalKey" : "floatingCalcPeriodDates"
                       }
                     },
-                    "rateSpecification" : {
-                      "floatingRate" : {
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
                         "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateOption" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "rateOption-1"
+                          "globalKey" : "aa"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "4fc9cca",
+                            "externalReference" : "primaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "b4c505ce"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "ae98bc9d"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "30bdab2d"
                       }
                     },
                     "resetDates" : {
                       "calculationPeriodDatesReference" : {
-                        "externalReference" : "floatingCalcPeriodDates",
-                        "globalReference" : "aa0ad953"
+                        "globalReference" : "1ee5dbf",
+                        "externalReference" : "floatingCalcPeriodDates"
                       },
+                      "resetRelativeTo" : "CalculationPeriodStartDate",
                       "fixingDates" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "131ae8a2"
+                          "globalKey" : "eff6d356"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -1043,82 +933,79 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "resetDates",
-                          "globalReference" : "a7463c48"
+                          "globalReference" : "75eadd56",
+                          "externalReference" : "resetDates"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "resetDates",
-                        "globalKey" : "a7463c48"
+                      "resetFrequency" : {
+                        "periodMultiplier" : 3,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
                       },
                       "resetDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "4fc9cca"
+                            "globalReference" : "4fc9cca",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "b4c505ce"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "ae98bc9d"
                         }
                       },
-                      "resetFrequency" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 3
-                      },
-                      "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                      "meta" : {
+                        "globalKey" : "75eadd56",
+                        "externalKey" : "resetDates"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "431a0cc7"
                     }
                   }, {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-2"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "4fc9cca"
-                          },
-                          "meta" : {
-                            "globalKey" : "b4c505ce"
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "ae98bc9d"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "12d80"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6,
-                        "rollConvention" : "8"
-                      },
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "30E/360"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2011-02-08",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -1127,295 +1014,400 @@
                           },
                           "meta" : {
                             "globalKey" : "ec0f7dc0"
-                          },
-                          "unadjustedDate" : "2011-02-08"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ec0f7dc0"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "fixedCalcPeriodDates",
-                        "globalKey" : "1f6113c2"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2016-02-08",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "4fc9cca"
+                                "globalReference" : "4fc9cca",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "b4c505ce"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "ae98bc9d"
                             }
                           },
                           "meta" : {
                             "globalKey" : "c596b325"
-                          },
-                          "unadjustedDate" : "2016-02-08"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "c596b325"
                         }
-                      }
-                    },
-                    "dayCountFraction" : {
-                      "value" : "30E/360"
-                    },
-                    "meta" : {
-                      "globalKey" : "abf01156"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "globalKey" : "a26b6602"
                       },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "4fc9cca"
+                            "globalReference" : "4fc9cca",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "b4c505ce"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "ae98bc9d"
                         }
                       },
-                      "paymentFrequency" : {
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
                         "meta" : {
-                          "globalKey" : "959"
+                          "globalKey" : "2b92"
                         },
-                        "period" : "M",
-                        "periodMultiplier" : 6
+                        "rollConvention" : "8"
+                      },
+                      "meta" : {
+                        "globalKey" : "63870a54",
+                        "externalKey" : "fixedCalcPeriodDates"
                       }
                     },
-                    "rateSpecification" : {
-                      "fixedRate" : {
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
                         "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
+                          "globalKey" : "107"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "4fc9cca",
+                            "externalReference" : "primaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "b4c505ce"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "ae98bc9d"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "47d29b4a"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "4e4c440c"
                     }
                   } ],
                   "meta" : {
-                    "globalKey" : "a01e92bb"
+                    "globalKey" : "6dd4b125"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "4be7a1d7"
+                "globalKey" : "295f7589"
               }
             },
             "meta" : {
-              "globalKey" : "4be7a1d7"
+              "globalKey" : "295f7589"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "dd05b62c"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "5f0c6d05"
-                },
-                "rateOption" : {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "rateOption-1"
-                    } ]
-                  },
-                  "value" : {
-                    "floatingRateIndex" : {
-                      "value" : "USD-LIBOR-BBA"
-                    },
-                    "indexTenor" : {
+              "quantity" : [ {
+                "value" : {
+                  "value" : 5000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD",
                       "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                      }
                     }
                   }
-                }
-              },
-              "quantity" : [ {
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-1"
                   } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
+                }
+              } ],
+              "observable" : {
+                "rateOption" : {
+                  "value" : {
+                    "floatingRateIndex" : {
+                      "value" : "USD-LIBOR-BBA"
+                    },
+                    "indexTenor" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
                       "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "USD"
+                        "globalKey" : "aa"
+                      }
                     }
                   },
-                  "value" : 5000000
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "rateOption-1"
+                    } ]
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "828026c7"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "7d5afeb8"
               },
+              "meta" : {
+                "globalKey" : "bd147858"
+              }
+            }, {
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.0253,
                   "unit" : {
                     "currency" : {
+                      "value" : "USD",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "USD"
+                      }
                     }
                   },
-                  "value" : 0.0253,
                   "perUnitOf" : {
                     "currency" : {
+                      "value" : "USD",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "USD"
+                      }
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ],
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "quantity" : [ {
                 "value" : {
+                  "value" : 5000000,
                   "unit" : {
                     "currency" : {
+                      "value" : "USD",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "USD"
+                      }
                     }
-                  },
-                  "value" : 5000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "2e04d848"
+              }
             } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "62dfab31",
+              "externalReference" : "party1"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "619cff8d",
+              "externalReference" : "party2"
+            }
           } ]
         },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3ed88c"
+        "party" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "5493001RKR55V4X61F71",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "d0f863bc"
+            }
+          } ],
+          "name" : {
+            "value" : "Bank X"
           },
-          "value" : "2011-02-12"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
+          "businessUnit" : [ {
+            "name" : "NY Swaps Desk",
+            "meta" : {
+              "globalKey" : "5c10b72e",
+              "externalKey" : "desk1"
+            }
+          } ],
+          "person" : [ {
+            "personId" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "jjones"
+                },
+                "meta" : {
+                  "globalKey" : "baeb8c0d"
+                }
+              }
+            } ],
+            "firstName" : "jjone",
+            "meta" : {
+              "globalKey" : "d3962233",
+              "externalKey" : "trader"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "62dfab31",
+            "externalKey" : "party1"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "549300O5MFEP1XJ40B46",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-              },
-              "value" : "712345678901234567890123456789012"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "956c45f8"
             }
           } ],
-          "issuer" : {
+          "name" : {
+            "value" : "Bank Y"
+          },
+          "meta" : {
+            "globalKey" : "619cff8d",
+            "externalKey" : "party2"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300OL8KL0WCQ34V31",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+              "globalKey" : "8ffabe4b"
+            }
+          } ],
+          "name" : {
+            "value" : "Up&Atem"
+          },
+          "meta" : {
+            "globalKey" : "ce0b9311",
+            "externalKey" : "broker1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300IB5Q45JGNPND58",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
             },
-            "value" : "1031234567"
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e7d7"
+            }
+          } ],
+          "name" : {
+            "value" : "ClearItAll"
           },
           "meta" : {
-            "globalKey" : "f07e39ef"
+            "globalKey" : "f6a6cc60",
+            "externalKey" : "clearing-svc"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "f6a6cc60",
+            "externalReference" : "clearing-svc"
           },
-          "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-        } ]
+          "role" : "ClearingOrganization",
+          "ownershipPartyReference" : {
+            "globalReference" : "62dfab31",
+            "externalReference" : "party1"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "8b5284b8"
+        }
       },
       "transferHistory" : [ {
-        "meta" : {
-          "globalKey" : "d1cda4ac"
-        },
         "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "4c6e19b1"
-            },
-            "receiverPartyReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "b8c6cb0d"
-            }
-          },
           "quantity" : {
+            "value" : 12345,
             "unit" : {
               "currency" : {
                 "value" : "USD"
               }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "62dfab31",
+              "externalReference" : "party1"
             },
-            "value" : 12345
+            "receiverPartyReference" : {
+              "globalReference" : "619cff8d",
+              "externalReference" : "party2"
+            }
           },
           "settlementDate" : {
             "adjustedDate" : {
+              "value" : "2011-06-03",
               "meta" : {
                 "globalKey" : "3ed983"
-              },
-              "value" : "2011-06-03"
+              }
             }
           },
           "transferExpression" : {
-            "priceTransfer" : "TERMINATION"
+            "priceTransfer" : "Termination"
           }
+        },
+        "meta" : {
+          "globalKey" : "4ec7d51c"
         }
-      } ]
-    } ],
-    "eventQualifier" : "PartialTermination",
-    "meta" : {
-      "globalKey" : "78ff1153"
-    }
-  },
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "SEF005"
+      } ],
+      "meta" : {
+        "globalKey" : "5ad86364"
       }
     } ],
     "meta" : {
-      "globalKey" : "918f1d81"
+      "globalKey" : "9d83aaed"
     }
-  } ],
+  },
+  "previousWorkflowStep" : {
+    "globalReference" : "decdcde0"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "SEF005",
       "meta" : {
         "scheme" : "http://www.bankx.com/msg_id"
-      },
-      "value" : "SEF005"
+      }
     },
     "sentBy" : {
       "value" : "BANKX"
@@ -1424,42 +1416,48 @@
       "value" : "SDR01"
     } ]
   },
-  "meta" : {
-    "globalKey" : "b1215bbc"
-  },
-  "party" : [ {
-    "businessUnit" : [ {
-      "meta" : {
-        "externalKey" : "desk1",
-        "globalKey" : "5c10b72e"
-      },
-      "name" : "NY Swaps Desk"
+  "timestamp" : [ {
+    "dateTime" : "2011-06-01T10:13:07Z",
+    "qualification" : "eventCreationDateTime"
+  }, {
+    "dateTime" : "2011-06-01T10:12:34Z",
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "SEF005"
+      }
     } ],
     "meta" : {
-      "externalKey" : "party1",
-      "globalKey" : "4c6e19b1"
-    },
-    "name" : {
-      "value" : "Bank X"
-    },
+      "globalKey" : "918f1d81"
+    }
+  } ],
+  "action" : "New",
+  "party" : [ {
     "partyId" : [ {
       "identifier" : {
+        "value" : "5493001RKR55V4X61F71",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "5493001RKR55V4X61F71"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "d0f863bc"
       }
     } ],
-    "person" : [ {
-      "firstName" : "jjone",
+    "name" : {
+      "value" : "Bank X"
+    },
+    "businessUnit" : [ {
+      "name" : "NY Swaps Desk",
       "meta" : {
-        "externalKey" : "trader",
-        "globalKey" : "d3962233"
-      },
+        "globalKey" : "5c10b72e",
+        "externalKey" : "desk1"
+      }
+    } ],
+    "person" : [ {
       "personId" : [ {
         "value" : {
           "identifier" : {
@@ -1469,77 +1467,79 @@
             "globalKey" : "baeb8c0d"
           }
         }
-      } ]
-    } ]
-  }, {
+      } ],
+      "firstName" : "jjone",
+      "meta" : {
+        "globalKey" : "d3962233",
+        "externalKey" : "trader"
+      }
+    } ],
     "meta" : {
-      "externalKey" : "party2",
-      "globalKey" : "b8c6cb0d"
-    },
-    "name" : {
-      "value" : "Bank Y"
-    },
+      "globalKey" : "62dfab31",
+      "externalKey" : "party1"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B46",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B46"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45f8"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "broker1",
-      "globalKey" : "ed0cc6d1"
-    },
+    } ],
     "name" : {
-      "value" : "Up&Atem"
+      "value" : "Bank Y"
     },
+    "meta" : {
+      "globalKey" : "619cff8d",
+      "externalKey" : "party2"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300OL8KL0WCQ34V31",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300OL8KL0WCQ34V31"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "8ffabe4b"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "clearing-svc",
-      "globalKey" : "611719a0"
-    },
+    } ],
     "name" : {
-      "value" : "ClearItAll"
+      "value" : "Up&Atem"
     },
+    "meta" : {
+      "globalKey" : "ce0b9311",
+      "externalKey" : "broker1"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300IB5Q45JGNPND58",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND58"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "e213e7d7"
       }
-    } ]
+    } ],
+    "name" : {
+      "value" : "ClearItAll"
+    },
+    "meta" : {
+      "globalKey" : "f6a6cc60",
+      "externalKey" : "clearing-svc"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "f156724c"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2011-06-01T10:13:07Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  }, {
-    "dateTime" : "2011-06-01T10:12:34Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+  "meta" : {
+    "globalKey" : "927290f2"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-partial-termination-xccy-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-partial-termination-xccy-func-output.json
index c43557be73..d3c743372b 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-partial-termination-xccy-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-partial-termination-xccy-func-output.json
@@ -1,168 +1,122 @@
 {
-  "action" : "NEW",
   "businessEvent" : {
-    "effectiveDate" : "2011-06-03",
     "eventDate" : "2011-06-01",
+    "effectiveDate" : "2011-06-03",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "bc13beea"
-          },
-          "trade" : {
-            "meta" : {
-              "globalKey" : "bc13beea"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "4c6e19b1"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "5493001RKR55V4X61F71"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "d0f863bc"
-                }
-              } ],
-              "person" : [ {
-                "firstName" : "jjone",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "d3962233"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "jjones"
-                    },
-                    "meta" : {
-                      "globalKey" : "baeb8c0d"
-                    }
+      "primitiveInstruction" : {
+        "quantityChange" : {
+          "change" : [ {
+            "quantity" : [ {
+              "value" : {
+                "value" : 15000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "EUR"
                   }
-                } ]
-              } ]
-            }, {
+                }
+              },
               "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "b8c6cb0d"
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "a104e1c2"
+            }
+          }, {
+            "quantity" : [ {
+              "value" : {
+                "value" : 13500000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
-              "name" : {
-                "value" : "Bank Y"
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "3cb1ee97"
+            }
+          } ],
+          "direction" : "Replace"
+        },
+        "transfer" : {
+          "transferState" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 12345,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B46"
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "62dfab31",
+                  "externalReference" : "party1"
                 },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f8"
+                "receiverPartyReference" : {
+                  "globalReference" : "619cff8d",
+                  "externalReference" : "party2"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party3",
-                "globalKey" : "79745f87"
-              },
-              "name" : {
-                "value" : "Bank Z"
               },
-              "partyId" : [ {
-                "identifier" : {
+              "settlementDate" : {
+                "adjustedDate" : {
+                  "value" : "2011-06-03",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300ZFFF6TMXQVF884"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "560bc2f1"
+                    "globalKey" : "3ed983"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
-              },
-              "name" : {
-                "value" : "Up&Atem"
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
+              "transferExpression" : {
+                "priceTransfer" : "Termination"
+              }
+            },
+            "meta" : {
+              "globalKey" : "4ec7d51c"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "1031234567",
                 "meta" : {
-                  "globalKey" : "8ffabe4b"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "712345678901234567890123456789012",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "4c6e19b1"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing-svc",
-                "globalReference" : "611719a0"
+              } ],
+              "meta" : {
+                "globalKey" : "88f03f2f"
               },
-              "role" : "CLEARING_ORGANIZATION"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2011-02-12",
+              "meta" : {
+                "globalKey" : "3ed88c"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "b8c6cb0d"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "4c6e19b1"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -173,35 +127,32 @@
                     "payout" : {
                       "forwardPayout" : [ {
                         "settlementTerms" : {
-                          "meta" : {
-                            "globalKey" : "3e8b15"
-                          },
                           "settlementDate" : {
+                            "valueDate" : "2001-12-21",
                             "meta" : {
                               "globalKey" : "3e8b15"
-                            },
-                            "valueDate" : "2001-12-21"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "3e8b15"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "90c7297"
-                        },
                         "underlier" : {
                           "foreignExchange" : {
                             "exchangedCurrency1" : {
                               "payerReceiver" : {
-                                "payer" : "PARTY_1",
-                                "receiver" : "PARTY_2"
+                                "payer" : "Party1",
+                                "receiver" : "Party2"
                               },
                               "priceQuantity" : {
-                                "meta" : {
-                                  "globalKey" : "0"
-                                },
                                 "quantitySchedule" : {
                                   "address" : {
                                     "scope" : "DOCUMENT",
                                     "value" : "quantity-1"
                                   }
+                                },
+                                "meta" : {
+                                  "globalKey" : "0"
                                 }
                               },
                               "meta" : {
@@ -210,18 +161,18 @@
                             },
                             "exchangedCurrency2" : {
                               "payerReceiver" : {
-                                "payer" : "PARTY_2",
-                                "receiver" : "PARTY_1"
+                                "payer" : "Party2",
+                                "receiver" : "Party1"
                               },
                               "priceQuantity" : {
-                                "meta" : {
-                                  "globalKey" : "0"
-                                },
                                 "quantitySchedule" : {
                                   "address" : {
                                     "scope" : "DOCUMENT",
                                     "value" : "quantity-2"
                                   }
+                                },
+                                "meta" : {
+                                  "globalKey" : "0"
                                 }
                               },
                               "meta" : {
@@ -232,6 +183,9 @@
                           "meta" : {
                             "globalKey" : "c086df02"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "90c7297"
                         }
                       } ],
                       "meta" : {
@@ -249,337 +203,254 @@
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "42938e34"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.9,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.9,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "priceType" : "EXCHANGE_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "ExchangeRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 20000000,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
-                      },
-                      "value" : 20000000
-                    }
-                  }, {
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  }, {
                     "value" : {
+                      "value" : 18000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 18000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "fde384c"
+                  }
                 } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ed88c"
-              },
-              "value" : "2011-02-12"
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "619cff8d",
+                  "externalReference" : "party2"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "62dfab31",
+                  "externalReference" : "party1"
+                }
+              } ]
             },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "5493001RKR55V4X61F71",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "712345678901234567890123456789012"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "d0f863bc"
                 }
               } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-                },
-                "value" : "1031234567"
-              },
-              "meta" : {
-                "globalKey" : "f07e39ef"
-              },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
-          }
-        }
-      },
-      "primitiveInstruction" : {
-        "quantityChange" : {
-          "change" : [ {
-            "meta" : {
-              "globalKey" : "99d6ddfe"
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
-                } ]
+              "name" : {
+                "value" : "Bank X"
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "EUR"
+              "businessUnit" : [ {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "jjones"
+                    },
+                    "meta" : {
+                      "globalKey" : "baeb8c0d"
+                    }
                   }
-                },
-                "value" : 15000000
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "969a6289"
-            },
-            "quantity" : [ {
+                } ],
+                "firstName" : "jjone",
+                "meta" : {
+                  "globalKey" : "d3962233",
+                  "externalKey" : "trader"
+                }
+              } ],
               "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
-                } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 13500000
+                "globalKey" : "62dfab31",
+                "externalKey" : "party1"
               }
-            } ]
-          } ],
-          "direction" : "REPLACE"
-        },
-        "transfer" : {
-          "transferState" : [ {
-            "meta" : {
-              "globalKey" : "d1cda4ac"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "4c6e19b1"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B46",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "receiverPartyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "b8c6cb0d"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45f8"
                 }
+              } ],
+              "name" : {
+                "value" : "Bank Y"
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
+              "meta" : {
+                "globalKey" : "619cff8d",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300ZFFF6TMXQVF884",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
-                "value" : 12345
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "560bc2f1"
+                }
+              } ],
+              "name" : {
+                "value" : "Bank Z"
               },
-              "settlementDate" : {
-                "adjustedDate" : {
+              "meta" : {
+                "globalKey" : "78512247",
+                "externalKey" : "party3"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
                   "meta" : {
-                    "globalKey" : "3ed983"
-                  },
-                  "value" : "2011-06-03"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "8ffabe4b"
                 }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
               },
-              "transferExpression" : {
-                "priceTransfer" : "TERMINATION"
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "after" : [ {
-      "meta" : {
-        "globalKey" : "1e9526c6"
-      },
-      "trade" : {
-        "meta" : {
-          "globalKey" : "7922da6"
-        },
-        "party" : [ {
-          "businessUnit" : [ {
-            "meta" : {
-              "externalKey" : "desk1",
-              "globalKey" : "5c10b72e"
-            },
-            "name" : "NY Swaps Desk"
-          } ],
-          "meta" : {
-            "externalKey" : "party1",
-            "globalKey" : "4c6e19b1"
-          },
-          "name" : {
-            "value" : "Bank X"
-          },
-          "partyId" : [ {
-            "identifier" : {
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "5493001RKR55V4X61F71"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "d0f863bc"
-            }
-          } ],
-          "person" : [ {
-            "firstName" : "jjone",
-            "meta" : {
-              "externalKey" : "trader",
-              "globalKey" : "d3962233"
-            },
-            "personId" : [ {
-              "value" : {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "value" : "jjones"
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "baeb8c0d"
+                  "globalKey" : "e213e7d7"
                 }
-              }
-            } ]
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party2",
-            "globalKey" : "b8c6cb0d"
-          },
-          "name" : {
-            "value" : "Bank Y"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
               },
-              "value" : "549300O5MFEP1XJ40B46"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "956c45f8"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party3",
-            "globalKey" : "79745f87"
-          },
-          "name" : {
-            "value" : "Bank Z"
-          },
-          "partyId" : [ {
-            "identifier" : {
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "f6a6cc60",
+                "externalReference" : "clearing-svc"
               },
-              "value" : "549300ZFFF6TMXQVF884"
-            },
-            "identifierType" : "LEI",
+              "role" : "ClearingOrganization",
+              "ownershipPartyReference" : {
+                "globalReference" : "62dfab31",
+                "externalReference" : "party1"
+              }
+            } ],
             "meta" : {
-              "globalKey" : "560bc2f1"
+              "globalKey" : "d9c5b6ae"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "broker1",
-            "globalKey" : "ed0cc6d1"
-          },
-          "name" : {
-            "value" : "Up&Atem"
           },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300OL8KL0WCQ34V31"
-            },
-            "identifierType" : "LEI",
+          "meta" : {
+            "globalKey" : "d9c5b6ae"
+          }
+        }
+      }
+    } ],
+    "eventQualifier" : "PartialTermination",
+    "after" : [ {
+      "trade" : {
+        "tradeIdentifier" : [ {
+          "issuer" : {
+            "value" : "1031234567",
             "meta" : {
-              "globalKey" : "8ffabe4b"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "clearing-svc",
-            "globalKey" : "611719a0"
-          },
-          "name" : {
-            "value" : "ClearItAll"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "712345678901234567890123456789012",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND58"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e213e7d7"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+              }
             }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "4c6e19b1"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing-svc",
-            "globalReference" : "611719a0"
+          } ],
+          "meta" : {
+            "globalKey" : "88f03f2f"
           },
-          "role" : "CLEARING_ORGANIZATION"
+          "identifierType" : "UniqueTransactionIdentifier"
         } ],
+        "tradeDate" : {
+          "value" : "2011-02-12",
+          "meta" : {
+            "globalKey" : "3ed88c"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "b8c6cb0d"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "4c6e19b1"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -590,35 +461,32 @@
                 "payout" : {
                   "forwardPayout" : [ {
                     "settlementTerms" : {
-                      "meta" : {
-                        "globalKey" : "3e8b15"
-                      },
                       "settlementDate" : {
+                        "valueDate" : "2001-12-21",
                         "meta" : {
                           "globalKey" : "3e8b15"
-                        },
-                        "valueDate" : "2001-12-21"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3e8b15"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "90c7297"
-                    },
                     "underlier" : {
                       "foreignExchange" : {
                         "exchangedCurrency1" : {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
                           "meta" : {
@@ -627,18 +495,18 @@
                         },
                         "exchangedCurrency2" : {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
                           "meta" : {
@@ -649,6 +517,9 @@
                       "meta" : {
                         "globalKey" : "c086df02"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "90c7297"
                     }
                   } ],
                   "meta" : {
@@ -657,159 +528,280 @@
                 }
               },
               "meta" : {
-                "globalKey" : "9cce50e0"
+                "globalKey" : "9cce50e0"
+              }
+            },
+            "meta" : {
+              "globalKey" : "9cce50e0"
+            }
+          },
+          "tradeLot" : [ {
+            "priceQuantity" : [ {
+              "price" : [ {
+                "value" : {
+                  "value" : 0.9,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  },
+                  "perUnitOf" : {
+                    "currency" : {
+                      "value" : "EUR"
+                    }
+                  },
+                  "priceType" : "ExchangeRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
+                }
+              } ],
+              "quantity" : [ {
+                "value" : {
+                  "value" : 15000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "EUR"
+                    }
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
+                }
+              }, {
+                "value" : {
+                  "value" : 13500000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "bb956408"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "619cff8d",
+              "externalReference" : "party2"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "62dfab31",
+              "externalReference" : "party1"
+            }
+          } ]
+        },
+        "party" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "5493001RKR55V4X61F71",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "d0f863bc"
+            }
+          } ],
+          "name" : {
+            "value" : "Bank X"
+          },
+          "businessUnit" : [ {
+            "name" : "NY Swaps Desk",
+            "meta" : {
+              "globalKey" : "5c10b72e",
+              "externalKey" : "desk1"
+            }
+          } ],
+          "person" : [ {
+            "personId" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "jjones"
+                },
+                "meta" : {
+                  "globalKey" : "baeb8c0d"
+                }
+              }
+            } ],
+            "firstName" : "jjone",
+            "meta" : {
+              "globalKey" : "d3962233",
+              "externalKey" : "trader"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "62dfab31",
+            "externalKey" : "party1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300O5MFEP1XJ40B46",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "956c45f8"
+            }
+          } ],
+          "name" : {
+            "value" : "Bank Y"
+          },
+          "meta" : {
+            "globalKey" : "619cff8d",
+            "externalKey" : "party2"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300ZFFF6TMXQVF884",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
               }
             },
+            "identifierType" : "LEI",
             "meta" : {
-              "globalKey" : "9cce50e0"
+              "globalKey" : "560bc2f1"
             }
+          } ],
+          "name" : {
+            "value" : "Bank Z"
           },
-          "tradeLot" : [ {
-            "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "79a9faf8"
-              },
-              "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 0.9,
-                  "perUnitOf" : {
-                    "currency" : {
-                      "value" : "EUR"
-                    }
-                  },
-                  "priceType" : "EXCHANGE_RATE"
-                }
-              } ],
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "EUR"
-                    }
-                  },
-                  "value" : 15000000
-                }
-              }, {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 13500000
-                }
-              } ]
-            } ]
-          } ]
-        },
-        "tradeDate" : {
           "meta" : {
-            "globalKey" : "3ed88c"
-          },
-          "value" : "2011-02-12"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
+            "globalKey" : "78512247",
+            "externalKey" : "party3"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "549300OL8KL0WCQ34V31",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-              },
-              "value" : "712345678901234567890123456789012"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "8ffabe4b"
             }
           } ],
-          "issuer" : {
-            "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+          "name" : {
+            "value" : "Up&Atem"
+          },
+          "meta" : {
+            "globalKey" : "ce0b9311",
+            "externalKey" : "broker1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300IB5Q45JGNPND58",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
             },
-            "value" : "1031234567"
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e7d7"
+            }
+          } ],
+          "name" : {
+            "value" : "ClearItAll"
           },
           "meta" : {
-            "globalKey" : "f07e39ef"
+            "globalKey" : "f6a6cc60",
+            "externalKey" : "clearing-svc"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "f6a6cc60",
+            "externalReference" : "clearing-svc"
           },
-          "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-        } ]
+          "role" : "ClearingOrganization",
+          "ownershipPartyReference" : {
+            "globalReference" : "62dfab31",
+            "externalReference" : "party1"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "31b85072"
+        }
       },
       "transferHistory" : [ {
-        "meta" : {
-          "globalKey" : "d1cda4ac"
-        },
         "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "4c6e19b1"
-            },
-            "receiverPartyReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "b8c6cb0d"
-            }
-          },
           "quantity" : {
+            "value" : 12345,
             "unit" : {
               "currency" : {
                 "value" : "USD"
               }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "62dfab31",
+              "externalReference" : "party1"
             },
-            "value" : 12345
+            "receiverPartyReference" : {
+              "globalReference" : "619cff8d",
+              "externalReference" : "party2"
+            }
           },
           "settlementDate" : {
             "adjustedDate" : {
+              "value" : "2011-06-03",
               "meta" : {
                 "globalKey" : "3ed983"
-              },
-              "value" : "2011-06-03"
+              }
             }
           },
           "transferExpression" : {
-            "priceTransfer" : "TERMINATION"
+            "priceTransfer" : "Termination"
           }
+        },
+        "meta" : {
+          "globalKey" : "4ec7d51c"
         }
-      } ]
-    } ],
-    "eventQualifier" : "PartialTermination",
-    "meta" : {
-      "globalKey" : "d2efb605"
-    }
-  },
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "SEF005"
+      } ],
+      "meta" : {
+        "globalKey" : "77cb43ea"
       }
     } ],
     "meta" : {
-      "globalKey" : "918f1d81"
+      "globalKey" : "7dc3fa3f"
     }
-  } ],
+  },
+  "previousWorkflowStep" : {
+    "globalReference" : "5f71a0a9"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "SEF005",
       "meta" : {
         "scheme" : "http://www.bankx.com/msg_id"
-      },
-      "value" : "SEF005"
+      }
     },
     "sentBy" : {
       "value" : "BANKX"
@@ -818,42 +810,48 @@
       "value" : "SDR01"
     } ]
   },
-  "meta" : {
-    "globalKey" : "b56eba59"
-  },
-  "party" : [ {
-    "businessUnit" : [ {
-      "meta" : {
-        "externalKey" : "desk1",
-        "globalKey" : "5c10b72e"
-      },
-      "name" : "NY Swaps Desk"
+  "timestamp" : [ {
+    "dateTime" : "2011-06-01T10:13:07Z",
+    "qualification" : "eventCreationDateTime"
+  }, {
+    "dateTime" : "2011-06-01T10:12:34Z",
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "SEF005"
+      }
     } ],
     "meta" : {
-      "externalKey" : "party1",
-      "globalKey" : "4c6e19b1"
-    },
-    "name" : {
-      "value" : "Bank X"
-    },
+      "globalKey" : "918f1d81"
+    }
+  } ],
+  "action" : "New",
+  "party" : [ {
     "partyId" : [ {
       "identifier" : {
+        "value" : "5493001RKR55V4X61F71",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "5493001RKR55V4X61F71"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "d0f863bc"
       }
     } ],
-    "person" : [ {
-      "firstName" : "jjone",
+    "name" : {
+      "value" : "Bank X"
+    },
+    "businessUnit" : [ {
+      "name" : "NY Swaps Desk",
       "meta" : {
-        "externalKey" : "trader",
-        "globalKey" : "d3962233"
-      },
+        "globalKey" : "5c10b72e",
+        "externalKey" : "desk1"
+      }
+    } ],
+    "person" : [ {
       "personId" : [ {
         "value" : {
           "identifier" : {
@@ -863,97 +861,99 @@
             "globalKey" : "baeb8c0d"
           }
         }
-      } ]
-    } ]
-  }, {
+      } ],
+      "firstName" : "jjone",
+      "meta" : {
+        "globalKey" : "d3962233",
+        "externalKey" : "trader"
+      }
+    } ],
     "meta" : {
-      "externalKey" : "party2",
-      "globalKey" : "b8c6cb0d"
-    },
-    "name" : {
-      "value" : "Bank Y"
-    },
+      "globalKey" : "62dfab31",
+      "externalKey" : "party1"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B46",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B46"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45f8"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "party3",
-      "globalKey" : "79745f87"
-    },
+    } ],
     "name" : {
-      "value" : "Bank Z"
+      "value" : "Bank Y"
     },
+    "meta" : {
+      "globalKey" : "619cff8d",
+      "externalKey" : "party2"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300ZFFF6TMXQVF884",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300ZFFF6TMXQVF884"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "560bc2f1"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "broker1",
-      "globalKey" : "ed0cc6d1"
-    },
+    } ],
     "name" : {
-      "value" : "Up&Atem"
+      "value" : "Bank Z"
     },
+    "meta" : {
+      "globalKey" : "78512247",
+      "externalKey" : "party3"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300OL8KL0WCQ34V31",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300OL8KL0WCQ34V31"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "8ffabe4b"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "clearing-svc",
-      "globalKey" : "611719a0"
-    },
+    } ],
     "name" : {
-      "value" : "ClearItAll"
+      "value" : "Up&Atem"
     },
+    "meta" : {
+      "globalKey" : "ce0b9311",
+      "externalKey" : "broker1"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300IB5Q45JGNPND58",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND58"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "e213e7d7"
       }
-    } ]
+    } ],
+    "name" : {
+      "value" : "ClearItAll"
+    },
+    "meta" : {
+      "globalKey" : "f6a6cc60",
+      "externalKey" : "clearing-svc"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "8fc05529"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2011-06-01T10:13:07Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  }, {
-    "dateTime" : "2011-06-01T10:12:34Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+  "meta" : {
+    "globalKey" : "b58e8041"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-partial-termination-xccy-swap-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-partial-termination-xccy-swap-func-output.json
index 611f526aa8..3ec7f62ef8 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-partial-termination-xccy-swap-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-partial-termination-xccy-swap-func-output.json
@@ -1,148 +1,192 @@
 {
-  "action" : "NEW",
   "businessEvent" : {
-    "effectiveDate" : "2011-06-03",
     "eventDate" : "2011-06-01",
+    "effectiveDate" : "2011-06-03",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "ac5aa42c"
-          },
-          "trade" : {
+      "primitiveInstruction" : {
+        "quantityChange" : {
+          "change" : [ {
+            "quantity" : [ {
+              "value" : {
+                "value" : 4000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
+              }
+            } ],
             "meta" : {
-              "globalKey" : "ac5aa42c"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
+              "globalKey" : "9326c48e"
+            }
+          }, {
+            "quantity" : [ {
+              "value" : {
+                "value" : 400000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "JPY"
+                  }
+                }
+              },
               "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "4c6e19b1"
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "237b44c1"
+            }
+          } ],
+          "direction" : "Replace"
+        },
+        "transfer" : {
+          "transferState" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 6000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
-              "name" : {
-                "value" : "Bank X"
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "619cff8d",
+                  "externalReference" : "party2"
+                },
+                "receiverPartyReference" : {
+                  "globalReference" : "62dfab31",
+                  "externalReference" : "party1"
+                }
               },
-              "partyId" : [ {
-                "identifier" : {
+              "settlementDate" : {
+                "adjustedDate" : {
+                  "value" : "2011-06-03",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "5493001RKR55V4X61F71"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "d0f863bc"
+                    "globalKey" : "3ed983"
+                  }
                 }
-              } ],
-              "person" : [ {
-                "firstName" : "jjone",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "d3962233"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "jjones"
-                    },
-                    "meta" : {
-                      "globalKey" : "baeb8c0d"
-                    }
+              },
+              "transferExpression" : {
+                "priceTransfer" : "Upfront"
+              }
+            },
+            "meta" : {
+              "globalKey" : "a18b5239"
+            }
+          }, {
+            "transfer" : {
+              "quantity" : {
+                "value" : 600000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "JPY"
                   }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "b8c6cb0d"
+                }
               },
-              "name" : {
-                "value" : "Bank Y"
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "62dfab31",
+                  "externalReference" : "party1"
+                },
+                "receiverPartyReference" : {
+                  "globalReference" : "619cff8d",
+                  "externalReference" : "party2"
+                }
               },
-              "partyId" : [ {
-                "identifier" : {
+              "settlementDate" : {
+                "adjustedDate" : {
+                  "value" : "2011-06-03",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B46"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f8"
+                    "globalKey" : "3ed983"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
               },
-              "name" : {
-                "value" : "Up&Atem"
+              "transferExpression" : {
+                "priceTransfer" : "Upfront"
+              }
+            },
+            "meta" : {
+              "globalKey" : "54d36290"
+            }
+          }, {
+            "transfer" : {
+              "quantity" : {
+                "value" : 12345,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "619cff8d",
+                  "externalReference" : "party2"
                 },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
+                "receiverPartyReference" : {
+                  "globalReference" : "62dfab31",
+                  "externalReference" : "party1"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
               },
-              "name" : {
-                "value" : "ClearItAll"
-              },
-              "partyId" : [ {
-                "identifier" : {
+              "settlementDate" : {
+                "adjustedDate" : {
+                  "value" : "2011-06-03",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
+                    "globalKey" : "3ed983"
+                  }
+                }
+              },
+              "transferExpression" : {
+                "priceTransfer" : "Termination"
+              }
+            },
+            "meta" : {
+              "globalKey" : "346ffdf2"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "1031234567",
                 "meta" : {
-                  "globalKey" : "e213e7d7"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "4c6e19b1"
               },
-              "partyReference" : {
-                "externalReference" : "clearing-svc",
-                "globalReference" : "611719a0"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "712345678901234567890123456789013",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "88f03f4e"
               },
-              "role" : "CLEARING_ORGANIZATION"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2011-02-12",
+              "meta" : {
+                "globalKey" : "3ed88c"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "4c6e19b1"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "b8c6cb0d"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -153,55 +197,49 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "notl1",
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "notl1"
                           }
                         },
                         "principalPayment" : {
-                          "finalPayment" : true,
                           "initialPayment" : true,
+                          "finalPayment" : true,
                           "intermediatePayment" : false,
                           "meta" : {
                             "globalKey" : "12a6f5"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "814e2ae6"
-                              },
-                              "meta" : {
-                                "globalKey" : "60a062ea"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "3461a1f9"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c89"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "14"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2011-02-06",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -210,20 +248,17 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec0f763e"
-                              },
-                              "unadjustedDate" : "2011-02-06"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec0f763e"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "ea4c9fed"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2015-02-06",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "GBLO"
@@ -233,84 +268,92 @@
                                     "value" : "USNY"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "primaryBusinessCenters",
-                                    "globalKey" : "814e2ae6"
+                                    "globalKey" : "814e2ae6",
+                                    "externalKey" : "primaryBusinessCenters"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "57d0de37"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "c15a1c71"
-                              },
-                              "unadjustedDate" : "2015-02-06"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "c15a1c71"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "9db79f50"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "d74131a6"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "814e2ae6"
+                                "globalReference" : "814e2ae6",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "60a062ea"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "3461a1f9"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "959"
+                              "globalKey" : "18a9b"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 6
+                            "rollConvention" : "14"
+                          },
+                          "meta" : {
+                            "globalKey" : "27386fc3",
+                            "externalKey" : "floatingCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "814e2ae6",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "60a062ea"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "3461a1f9"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "669e8966"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "ea4c9fed"
+                            "globalReference" : "27386fc3",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "131ae8a2"
+                              "globalKey" : "eff6d356"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -319,91 +362,88 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "resetDates",
-                              "globalReference" : "d231255"
+                              "globalReference" : "d4f9cdcb",
+                              "externalReference" : "resetDates"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "resetDates",
-                            "globalKey" : "d231255"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "107"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "814e2ae6"
+                                "globalReference" : "814e2ae6",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "60a062ea"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "3461a1f9"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "959"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "meta" : {
+                            "globalKey" : "d4f9cdcb",
+                            "externalKey" : "resetDates"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "daedfbdc"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "notl2",
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "notl2"
                           }
                         },
                         "principalPayment" : {
-                          "finalPayment" : true,
                           "initialPayment" : true,
+                          "finalPayment" : true,
                           "intermediatePayment" : false,
                           "meta" : {
                             "globalKey" : "12a6f5"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "814e2ae6"
-                              },
-                              "meta" : {
-                                "globalKey" : "60a062ea"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "3461a1f9"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "2b8fa"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "14"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30E/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2011-02-06",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -412,520 +452,371 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec0f763e"
-                              },
-                              "unadjustedDate" : "2011-02-06"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec0f763e"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "1cfb6674"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2011-02-06",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "primaryBusinessCenters",
-                                    "globalReference" : "814e2ae6"
+                                    "globalReference" : "814e2ae6",
+                                    "externalReference" : "primaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "60a062ea"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "3461a1f9"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "2db1e17f"
-                              },
-                              "unadjustedDate" : "2011-02-06"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "2db1e17f"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "30E/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "b36a8f80"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "d7413315"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "814e2ae6"
+                                "globalReference" : "814e2ae6",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "60a062ea"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "3461a1f9"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
                             "meta" : {
-                              "globalKey" : "ac8"
+                              "globalKey" : "1794a"
                             },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
+                            "rollConvention" : "14"
+                          },
+                          "meta" : {
+                            "globalKey" : "8da5bc44",
+                            "externalKey" : "fixedCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "814e2ae6",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "60a062ea"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "3461a1f9"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "2b6de757"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "a440ad14"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "90716e30"
+                        "globalKey" : "7329b3b8"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "ad4b8f8c"
+                    "globalKey" : "9003d514"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "ad4b8f8c"
+                  "globalKey" : "9003d514"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "cf003e1f"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d08"
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 10000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
                     },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
+                    }
+                  } ],
+                  "observable" : {
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
+                          "periodMultiplier" : 6,
                           "period" : "M",
-                          "periodMultiplier" : 6
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000
+                    "meta" : {
+                      "globalKey" : "8280320a"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "26516b87"
                   },
+                  "meta" : {
+                    "globalKey" : "a0325171"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.06,
                       "unit" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "value" : 0.06,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 1000000000,
                       "unit" : {
                         "currency" : {
                           "value" : "JPY"
                         }
-                      },
-                      "value" : 1000000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a3dc0559"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "62dfab31",
+                  "externalReference" : "party1"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "619cff8d",
+                  "externalReference" : "party2"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ed88c"
-              },
-              "value" : "2011-02-12"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "5493001RKR55V4X61F71",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "712345678901234567890123456789013"
-                }
-              } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-                },
-                "value" : "1031234567"
-              },
-              "meta" : {
-                "globalKey" : "f07eae4e"
-              },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
-          }
-        }
-      },
-      "primitiveInstruction" : {
-        "quantityChange" : {
-          "change" : [ {
-            "meta" : {
-              "globalKey" : "25c771b2"
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
-                } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 4000000
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "cf989f1f"
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
-                } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "JPY"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
-                "value" : 400000000
-              }
-            } ]
-          } ],
-          "direction" : "REPLACE"
-        },
-        "transfer" : {
-          "transferState" : [ {
-            "meta" : {
-              "globalKey" : "d1228443"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "b8c6cb0d"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "4c6e19b1"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "d0f863bc"
                 }
+              } ],
+              "name" : {
+                "value" : "Bank X"
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 6000000
-              },
-              "settlementDate" : {
-                "adjustedDate" : {
-                  "meta" : {
-                    "globalKey" : "3ed983"
-                  },
-                  "value" : "2011-06-03"
+              "businessUnit" : [ {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
                 }
-              },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
-              }
-            }
-          }, {
-            "meta" : {
-              "globalKey" : "635b384c"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "4c6e19b1"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "b8c6cb0d"
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "jjones"
+                    },
+                    "meta" : {
+                      "globalKey" : "baeb8c0d"
+                    }
+                  }
+                } ],
+                "firstName" : "jjone",
+                "meta" : {
+                  "globalKey" : "d3962233",
+                  "externalKey" : "trader"
                 }
-              },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "JPY"
+              } ],
+              "meta" : {
+                "globalKey" : "62dfab31",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B46",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
-                "value" : 600000000
-              },
-              "settlementDate" : {
-                "adjustedDate" : {
-                  "meta" : {
-                    "globalKey" : "3ed983"
-                  },
-                  "value" : "2011-06-03"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45f8"
                 }
+              } ],
+              "name" : {
+                "value" : "Bank Y"
               },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
+              "meta" : {
+                "globalKey" : "619cff8d",
+                "externalKey" : "party2"
               }
-            }
-          }, {
-            "meta" : {
-              "globalKey" : "e37af796"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "b8c6cb0d"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "receiverPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "4c6e19b1"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "8ffabe4b"
                 }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
+              "meta" : {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
-                "value" : 12345
-              },
-              "settlementDate" : {
-                "adjustedDate" : {
-                  "meta" : {
-                    "globalKey" : "3ed983"
-                  },
-                  "value" : "2011-06-03"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
                 }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
               },
-              "transferExpression" : {
-                "priceTransfer" : "TERMINATION"
+              "meta" : {
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "f6a6cc60",
+                "externalReference" : "clearing-svc"
+              },
+              "role" : "ClearingOrganization",
+              "ownershipPartyReference" : {
+                "globalReference" : "62dfab31",
+                "externalReference" : "party1"
               }
+            } ],
+            "meta" : {
+              "globalKey" : "8389a1d4"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "8389a1d4"
+          }
         }
       }
     } ],
+    "eventQualifier" : "PartialTermination",
     "after" : [ {
-      "meta" : {
-        "globalKey" : "c77bbc8f"
-      },
       "trade" : {
-        "meta" : {
-          "globalKey" : "e85357d6"
-        },
-        "party" : [ {
-          "businessUnit" : [ {
-            "meta" : {
-              "externalKey" : "desk1",
-              "globalKey" : "5c10b72e"
-            },
-            "name" : "NY Swaps Desk"
-          } ],
-          "meta" : {
-            "externalKey" : "party1",
-            "globalKey" : "4c6e19b1"
-          },
-          "name" : {
-            "value" : "Bank X"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "5493001RKR55V4X61F71"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "d0f863bc"
-            }
-          } ],
-          "person" : [ {
-            "firstName" : "jjone",
-            "meta" : {
-              "externalKey" : "trader",
-              "globalKey" : "d3962233"
-            },
-            "personId" : [ {
-              "value" : {
-                "identifier" : {
-                  "value" : "jjones"
-                },
-                "meta" : {
-                  "globalKey" : "baeb8c0d"
-                }
-              }
-            } ]
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "party2",
-            "globalKey" : "b8c6cb0d"
-          },
-          "name" : {
-            "value" : "Bank Y"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300O5MFEP1XJ40B46"
-            },
-            "identifierType" : "LEI",
+        "tradeIdentifier" : [ {
+          "issuer" : {
+            "value" : "1031234567",
             "meta" : {
-              "globalKey" : "956c45f8"
+              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "broker1",
-            "globalKey" : "ed0cc6d1"
-          },
-          "name" : {
-            "value" : "Up&Atem"
           },
-          "partyId" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "712345678901234567890123456789013",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300OL8KL0WCQ34V31"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "8ffabe4b"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+              }
             }
-          } ]
-        }, {
+          } ],
           "meta" : {
-            "externalKey" : "clearing-svc",
-            "globalKey" : "611719a0"
-          },
-          "name" : {
-            "value" : "ClearItAll"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-              },
-              "value" : "549300IB5Q45JGNPND58"
-            },
-            "identifierType" : "LEI",
-            "meta" : {
-              "globalKey" : "e213e7d7"
-            }
-          } ]
-        } ],
-        "partyRole" : [ {
-          "ownershipPartyReference" : {
-            "externalReference" : "party1",
-            "globalReference" : "4c6e19b1"
-          },
-          "partyReference" : {
-            "externalReference" : "clearing-svc",
-            "globalReference" : "611719a0"
+            "globalKey" : "88f03f4e"
           },
-          "role" : "CLEARING_ORGANIZATION"
+          "identifierType" : "UniqueTransactionIdentifier"
         } ],
+        "tradeDate" : {
+          "value" : "2011-02-12",
+          "meta" : {
+            "globalKey" : "3ed88c"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "4c6e19b1"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "b8c6cb0d"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -936,55 +827,49 @@
                 "payout" : {
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "externalKey" : "notl1",
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0",
+                        "externalKey" : "notl1"
                       }
                     },
                     "principalPayment" : {
-                      "finalPayment" : true,
                       "initialPayment" : true,
+                      "finalPayment" : true,
                       "intermediatePayment" : false,
                       "meta" : {
                         "globalKey" : "12a6f5"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "814e2ae6"
-                          },
-                          "meta" : {
-                            "globalKey" : "60a062ea"
+                    "rateSpecification" : {
+                      "floatingRate" : {
+                        "rateOption" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "rateOption-1"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "3461a1f9"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "28c89"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6,
-                        "rollConvention" : "14"
-                      },
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "ACT/360"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2011-02-06",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -993,20 +878,17 @@
                           },
                           "meta" : {
                             "globalKey" : "ec0f763e"
-                          },
-                          "unadjustedDate" : "2011-02-06"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ec0f763e"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "floatingCalcPeriodDates",
-                        "globalKey" : "ea4c9fed"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2015-02-06",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -1016,84 +898,92 @@
                                 "value" : "USNY"
                               } ],
                               "meta" : {
-                                "externalKey" : "primaryBusinessCenters",
-                                "globalKey" : "814e2ae6"
+                                "globalKey" : "814e2ae6",
+                                "externalKey" : "primaryBusinessCenters"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "57d0de37"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "c15a1c71"
-                          },
-                          "unadjustedDate" : "2015-02-06"
-                        },
-                        "meta" : {
-                          "globalKey" : "c15a1c71"
-                        }
-                      }
-                    },
-                    "dayCountFraction" : {
-                      "value" : "ACT/360"
-                    },
-                    "meta" : {
-                      "globalKey" : "9db79f50"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "globalKey" : "d74131a6"
+                            "globalKey" : "c15a1c71"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "c15a1c71"
+                        }
                       },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "814e2ae6"
+                            "globalReference" : "814e2ae6",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "60a062ea"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "3461a1f9"
                         }
                       },
-                      "paymentFrequency" : {
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
                         "meta" : {
-                          "globalKey" : "959"
+                          "globalKey" : "18a9b"
                         },
-                        "period" : "M",
-                        "periodMultiplier" : 6
+                        "rollConvention" : "14"
+                      },
+                      "meta" : {
+                        "globalKey" : "27386fc3",
+                        "externalKey" : "floatingCalcPeriodDates"
                       }
                     },
-                    "rateSpecification" : {
-                      "floatingRate" : {
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
                         "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateOption" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "rateOption-1"
+                          "globalKey" : "107"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "814e2ae6",
+                            "externalReference" : "primaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "60a062ea"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "3461a1f9"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "669e8966"
                       }
                     },
                     "resetDates" : {
                       "calculationPeriodDatesReference" : {
-                        "externalReference" : "floatingCalcPeriodDates",
-                        "globalReference" : "ea4c9fed"
+                        "globalReference" : "27386fc3",
+                        "externalReference" : "floatingCalcPeriodDates"
                       },
+                      "resetRelativeTo" : "CalculationPeriodStartDate",
                       "fixingDates" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "131ae8a2"
+                          "globalKey" : "eff6d356"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -1102,91 +992,88 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "resetDates",
-                          "globalReference" : "d231255"
+                          "globalReference" : "d4f9cdcb",
+                          "externalReference" : "resetDates"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "resetDates",
-                        "globalKey" : "d231255"
+                      "resetFrequency" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
+                        "meta" : {
+                          "globalKey" : "107"
+                        }
                       },
                       "resetDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "814e2ae6"
+                            "globalReference" : "814e2ae6",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "60a062ea"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "3461a1f9"
                         }
                       },
-                      "resetFrequency" : {
-                        "meta" : {
-                          "globalKey" : "959"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6
-                      },
-                      "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                      "meta" : {
+                        "globalKey" : "d4f9cdcb",
+                        "externalKey" : "resetDates"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "daedfbdc"
                     }
                   }, {
                     "payerReceiver" : {
-                      "payer" : "PARTY_2",
-                      "receiver" : "PARTY_1"
+                      "payer" : "Party2",
+                      "receiver" : "Party1"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "externalKey" : "notl2",
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-2"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0",
+                        "externalKey" : "notl2"
                       }
                     },
                     "principalPayment" : {
-                      "finalPayment" : true,
                       "initialPayment" : true,
+                      "finalPayment" : true,
                       "intermediatePayment" : false,
                       "meta" : {
                         "globalKey" : "12a6f5"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodDatesAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "814e2ae6"
-                          },
-                          "meta" : {
-                            "globalKey" : "60a062ea"
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "3461a1f9"
+                          "globalKey" : "0"
                         }
-                      },
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "2b8fa"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 1,
-                        "rollConvention" : "14"
-                      },
+                      }
+                    },
+                    "dayCountFraction" : {
+                      "value" : "30E/360"
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2011-02-06",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -1195,353 +1082,458 @@
                           },
                           "meta" : {
                             "globalKey" : "ec0f763e"
-                          },
-                          "unadjustedDate" : "2011-02-06"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ec0f763e"
                         }
                       },
-                      "meta" : {
-                        "externalKey" : "fixedCalcPeriodDates",
-                        "globalKey" : "1cfb6674"
-                      },
                       "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2011-02-06",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "814e2ae6"
+                                "globalReference" : "814e2ae6",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "60a062ea"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "3461a1f9"
                             }
                           },
                           "meta" : {
                             "globalKey" : "2db1e17f"
-                          },
-                          "unadjustedDate" : "2011-02-06"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "2db1e17f"
                         }
-                      }
-                    },
-                    "dayCountFraction" : {
-                      "value" : "30E/360"
-                    },
-                    "meta" : {
-                      "globalKey" : "b36a8f80"
-                    },
-                    "paymentDates" : {
-                      "meta" : {
-                        "globalKey" : "d7413315"
                       },
-                      "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                      "paymentDatesAdjustments" : {
+                      "calculationPeriodDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "814e2ae6"
+                            "globalReference" : "814e2ae6",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "60a062ea"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "3461a1f9"
                         }
                       },
-                      "paymentFrequency" : {
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
                         "meta" : {
-                          "globalKey" : "ac8"
+                          "globalKey" : "1794a"
                         },
-                        "period" : "Y",
-                        "periodMultiplier" : 1
+                        "rollConvention" : "14"
+                      },
+                      "meta" : {
+                        "globalKey" : "8da5bc44",
+                        "externalKey" : "fixedCalcPeriodDates"
                       }
                     },
-                    "rateSpecification" : {
-                      "fixedRate" : {
+                    "paymentDates" : {
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "Y",
                         "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
-                            }
+                          "globalKey" : "78"
+                        }
+                      },
+                      "payRelativeTo" : "CalculationPeriodEndDate",
+                      "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "814e2ae6",
+                            "externalReference" : "primaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "60a062ea"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "3461a1f9"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "2b6de757"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "a440ad14"
                     }
                   } ],
                   "meta" : {
-                    "globalKey" : "90716e30"
+                    "globalKey" : "7329b3b8"
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "ad4b8f8c"
+                "globalKey" : "9003d514"
               }
             },
             "meta" : {
-              "globalKey" : "ad4b8f8c"
+              "globalKey" : "9003d514"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "205fcbaa"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "5f0c6d08"
+              "quantity" : [ {
+                "value" : {
+                  "value" : 4000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
                 },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
+                }
+              } ],
+              "observable" : {
                 "rateOption" : {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "rateOption-1"
-                    } ]
-                  },
                   "value" : {
                     "floatingRateIndex" : {
                       "value" : "USD-LIBOR-BBA"
                     },
                     "indexTenor" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
+                      "periodMultiplier" : 6,
                       "period" : "M",
-                      "periodMultiplier" : 6
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
                     }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "rateOption-1"
+                    } ]
                   }
-                }
-              },
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
-                  } ]
                 },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 4000000
+                "meta" : {
+                  "globalKey" : "8280320a"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "9e03c252"
               },
+              "meta" : {
+                "globalKey" : "d572ad3c"
+              }
+            }, {
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.06,
                   "unit" : {
                     "currency" : {
                       "value" : "JPY"
                     }
                   },
-                  "value" : 0.06,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "JPY"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ],
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "quantity" : [ {
                 "value" : {
+                  "value" : 400000000,
                   "unit" : {
                     "currency" : {
                       "value" : "JPY"
                     }
-                  },
-                  "value" : 400000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "227487ee"
+              }
             } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "62dfab31",
+              "externalReference" : "party1"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "619cff8d",
+              "externalReference" : "party2"
+            }
           } ]
         },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3ed88c"
+        "party" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "5493001RKR55V4X61F71",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "d0f863bc"
+            }
+          } ],
+          "name" : {
+            "value" : "Bank X"
           },
-          "value" : "2011-02-12"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
+          "businessUnit" : [ {
+            "name" : "NY Swaps Desk",
+            "meta" : {
+              "globalKey" : "5c10b72e",
+              "externalKey" : "desk1"
+            }
+          } ],
+          "person" : [ {
+            "personId" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "jjones"
+                },
+                "meta" : {
+                  "globalKey" : "baeb8c0d"
+                }
+              }
+            } ],
+            "firstName" : "jjone",
+            "meta" : {
+              "globalKey" : "d3962233",
+              "externalKey" : "trader"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "62dfab31",
+            "externalKey" : "party1"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
+              "value" : "549300O5MFEP1XJ40B46",
               "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-              },
-              "value" : "712345678901234567890123456789013"
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "956c45f8"
             }
           } ],
-          "issuer" : {
+          "name" : {
+            "value" : "Bank Y"
+          },
+          "meta" : {
+            "globalKey" : "619cff8d",
+            "externalKey" : "party2"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300OL8KL0WCQ34V31",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
+            },
+            "identifierType" : "LEI",
             "meta" : {
-              "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+              "globalKey" : "8ffabe4b"
+            }
+          } ],
+          "name" : {
+            "value" : "Up&Atem"
+          },
+          "meta" : {
+            "globalKey" : "ce0b9311",
+            "externalKey" : "broker1"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "549300IB5Q45JGNPND58",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+              }
             },
-            "value" : "1031234567"
+            "identifierType" : "LEI",
+            "meta" : {
+              "globalKey" : "e213e7d7"
+            }
+          } ],
+          "name" : {
+            "value" : "ClearItAll"
           },
           "meta" : {
-            "globalKey" : "f07eae4e"
+            "globalKey" : "f6a6cc60",
+            "externalKey" : "clearing-svc"
+          }
+        } ],
+        "partyRole" : [ {
+          "partyReference" : {
+            "globalReference" : "f6a6cc60",
+            "externalReference" : "clearing-svc"
           },
-          "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-        } ]
+          "role" : "ClearingOrganization",
+          "ownershipPartyReference" : {
+            "globalReference" : "62dfab31",
+            "externalReference" : "party1"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "d54dab74"
+        }
       },
       "transferHistory" : [ {
-        "meta" : {
-          "globalKey" : "d1228443"
-        },
         "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "b8c6cb0d"
-            },
-            "receiverPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "4c6e19b1"
-            }
-          },
           "quantity" : {
+            "value" : 6000000,
             "unit" : {
               "currency" : {
                 "value" : "USD"
               }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "619cff8d",
+              "externalReference" : "party2"
             },
-            "value" : 6000000
+            "receiverPartyReference" : {
+              "globalReference" : "62dfab31",
+              "externalReference" : "party1"
+            }
           },
           "settlementDate" : {
             "adjustedDate" : {
+              "value" : "2011-06-03",
               "meta" : {
                 "globalKey" : "3ed983"
-              },
-              "value" : "2011-06-03"
+              }
             }
           },
           "transferExpression" : {
-            "priceTransfer" : "UPFRONT"
+            "priceTransfer" : "Upfront"
           }
+        },
+        "meta" : {
+          "globalKey" : "a18b5239"
         }
       }, {
-        "meta" : {
-          "globalKey" : "635b384c"
-        },
         "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "4c6e19b1"
-            },
-            "receiverPartyReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "b8c6cb0d"
-            }
-          },
           "quantity" : {
+            "value" : 600000000,
             "unit" : {
               "currency" : {
                 "value" : "JPY"
               }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "62dfab31",
+              "externalReference" : "party1"
             },
-            "value" : 600000000
+            "receiverPartyReference" : {
+              "globalReference" : "619cff8d",
+              "externalReference" : "party2"
+            }
           },
           "settlementDate" : {
             "adjustedDate" : {
+              "value" : "2011-06-03",
               "meta" : {
                 "globalKey" : "3ed983"
-              },
-              "value" : "2011-06-03"
+              }
             }
           },
           "transferExpression" : {
-            "priceTransfer" : "UPFRONT"
+            "priceTransfer" : "Upfront"
           }
+        },
+        "meta" : {
+          "globalKey" : "54d36290"
         }
       }, {
-        "meta" : {
-          "globalKey" : "e37af796"
-        },
         "transfer" : {
-          "payerReceiver" : {
-            "payerPartyReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "b8c6cb0d"
-            },
-            "receiverPartyReference" : {
-              "externalReference" : "party1",
-              "globalReference" : "4c6e19b1"
-            }
-          },
           "quantity" : {
+            "value" : 12345,
             "unit" : {
               "currency" : {
                 "value" : "USD"
               }
+            }
+          },
+          "payerReceiver" : {
+            "payerPartyReference" : {
+              "globalReference" : "619cff8d",
+              "externalReference" : "party2"
             },
-            "value" : 12345
+            "receiverPartyReference" : {
+              "globalReference" : "62dfab31",
+              "externalReference" : "party1"
+            }
           },
           "settlementDate" : {
             "adjustedDate" : {
+              "value" : "2011-06-03",
               "meta" : {
                 "globalKey" : "3ed983"
-              },
-              "value" : "2011-06-03"
+              }
             }
           },
           "transferExpression" : {
-            "priceTransfer" : "TERMINATION"
+            "priceTransfer" : "Termination"
           }
+        },
+        "meta" : {
+          "globalKey" : "346ffdf2"
         }
-      } ]
-    } ],
-    "eventQualifier" : "PartialTermination",
-    "meta" : {
-      "globalKey" : "b29a2b27"
-    }
-  },
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "SEF005"
+      } ],
+      "meta" : {
+        "globalKey" : "f9df07c7"
       }
     } ],
     "meta" : {
-      "globalKey" : "918f1d81"
+      "globalKey" : "5379f57f"
     }
-  } ],
+  },
+  "previousWorkflowStep" : {
+    "globalReference" : "736582fc"
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "SEF005",
       "meta" : {
         "scheme" : "http://www.bankx.com/msg_id"
-      },
-      "value" : "SEF005"
+      }
     },
     "sentBy" : {
       "value" : "BANKX"
@@ -1550,42 +1542,48 @@
       "value" : "SDR01"
     } ]
   },
-  "meta" : {
-    "globalKey" : "8636e90"
-  },
-  "party" : [ {
-    "businessUnit" : [ {
-      "meta" : {
-        "externalKey" : "desk1",
-        "globalKey" : "5c10b72e"
-      },
-      "name" : "NY Swaps Desk"
+  "timestamp" : [ {
+    "dateTime" : "2011-06-01T10:13:07Z",
+    "qualification" : "eventCreationDateTime"
+  }, {
+    "dateTime" : "2011-06-01T10:12:34Z",
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "SEF005"
+      }
     } ],
     "meta" : {
-      "externalKey" : "party1",
-      "globalKey" : "4c6e19b1"
-    },
-    "name" : {
-      "value" : "Bank X"
-    },
+      "globalKey" : "918f1d81"
+    }
+  } ],
+  "action" : "New",
+  "party" : [ {
     "partyId" : [ {
       "identifier" : {
+        "value" : "5493001RKR55V4X61F71",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "5493001RKR55V4X61F71"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "d0f863bc"
       }
     } ],
-    "person" : [ {
-      "firstName" : "jjone",
+    "name" : {
+      "value" : "Bank X"
+    },
+    "businessUnit" : [ {
+      "name" : "NY Swaps Desk",
       "meta" : {
-        "externalKey" : "trader",
-        "globalKey" : "d3962233"
-      },
+        "globalKey" : "5c10b72e",
+        "externalKey" : "desk1"
+      }
+    } ],
+    "person" : [ {
       "personId" : [ {
         "value" : {
           "identifier" : {
@@ -1595,77 +1593,79 @@
             "globalKey" : "baeb8c0d"
           }
         }
-      } ]
-    } ]
-  }, {
+      } ],
+      "firstName" : "jjone",
+      "meta" : {
+        "globalKey" : "d3962233",
+        "externalKey" : "trader"
+      }
+    } ],
     "meta" : {
-      "externalKey" : "party2",
-      "globalKey" : "b8c6cb0d"
-    },
-    "name" : {
-      "value" : "Bank Y"
-    },
+      "globalKey" : "62dfab31",
+      "externalKey" : "party1"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300O5MFEP1XJ40B46",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300O5MFEP1XJ40B46"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "956c45f8"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "broker1",
-      "globalKey" : "ed0cc6d1"
-    },
+    } ],
     "name" : {
-      "value" : "Up&Atem"
+      "value" : "Bank Y"
     },
+    "meta" : {
+      "globalKey" : "619cff8d",
+      "externalKey" : "party2"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300OL8KL0WCQ34V31",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300OL8KL0WCQ34V31"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "8ffabe4b"
       }
-    } ]
-  }, {
-    "meta" : {
-      "externalKey" : "clearing-svc",
-      "globalKey" : "611719a0"
-    },
+    } ],
     "name" : {
-      "value" : "ClearItAll"
+      "value" : "Up&Atem"
     },
+    "meta" : {
+      "globalKey" : "ce0b9311",
+      "externalKey" : "broker1"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "549300IB5Q45JGNPND58",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "549300IB5Q45JGNPND58"
+        }
       },
       "identifierType" : "LEI",
       "meta" : {
         "globalKey" : "e213e7d7"
       }
-    } ]
+    } ],
+    "name" : {
+      "value" : "ClearItAll"
+    },
+    "meta" : {
+      "globalKey" : "f6a6cc60",
+      "externalKey" : "clearing-svc"
+    }
   } ],
-  "previousWorkflowStep" : {
-    "globalReference" : "675071de"
-  },
-  "timestamp" : [ {
-    "dateTime" : "2011-06-01T10:13:07Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  }, {
-    "dateTime" : "2011-06-01T10:12:34Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+  "meta" : {
+    "globalKey" : "30631a04"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/bond-execution-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/bond-execution-func-output.json
index 6056e19b97..120f5bf954 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/bond-execution-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/bond-execution-func-output.json
@@ -3,48 +3,44 @@
   "instruction" : [ {
     "primitiveInstruction" : {
       "execution" : {
-        "parties" : [ {
-          "meta" : {
-            "externalKey" : "MegaBank",
-            "globalKey" : "84766d2a"
+        "product" : {
+          "security" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "GB00B24FF097"
+                },
+                "source" : "ISIN",
+                "meta" : {
+                  "globalKey" : "1ad6d034"
+                }
+              }
+            }, {
+              "value" : {
+                "identifier" : {
+                  "value" : "TR30 4 3/4% TREASURY GILT 30"
+                },
+                "source" : "Name",
+                "meta" : {
+                  "globalKey" : "e0c3bb03"
+                }
+              }
+            } ],
+            "securityType" : "Debt"
           },
-          "name" : {
-            "value" : "Mega Bank"
-          }
-        }, {
           "meta" : {
-            "externalKey" : "GlobalBank",
-            "globalKey" : "2db2dc99"
-          },
-          "name" : {
-            "value" : "Global Bank"
+            "globalKey" : "bb7aca3c"
           }
-        } ],
-        "partyRoles" : [ {
-          "partyReference" : {
-            "externalReference" : "MegaBank",
-            "globalReference" : "84766d2a"
-          },
-          "role" : "BUYER"
-        }, {
-          "partyReference" : {
-            "externalReference" : "GlobalBank",
-            "globalReference" : "2db2dc99"
-          },
-          "role" : "SELLER"
-        } ],
+        },
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "6a8470ba"
-          },
           "price" : [ {
             "value" : {
+              "value" : 1.022,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "value" : 1.022,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
@@ -53,12 +49,12 @@
             }
           }, {
             "value" : {
+              "value" : 1.02,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "value" : 1.02,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
@@ -67,12 +63,12 @@
             }
           }, {
             "value" : {
+              "value" : 40000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "value" : 40000,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "CONTRACT"
@@ -82,150 +78,132 @@
           } ],
           "quantity" : [ {
             "value" : {
+              "value" : 20000000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 20000000
+              }
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "6a8470ba"
+          }
         } ],
-        "product" : {
+        "parties" : [ {
+          "name" : {
+            "value" : "Mega Bank"
+          },
           "meta" : {
-            "globalKey" : "bb7aca3c"
+            "globalKey" : "84766d2a",
+            "externalKey" : "MegaBank"
+          }
+        }, {
+          "name" : {
+            "value" : "Global Bank"
           },
-          "security" : {
-            "productIdentifier" : [ {
-              "value" : {
-                "identifier" : {
-                  "value" : "GB00B24FF097"
-                },
-                "meta" : {
-                  "globalKey" : "1ad6d034"
-                },
-                "source" : "ISIN"
-              }
-            }, {
-              "value" : {
-                "identifier" : {
-                  "value" : "TR30 4 3/4% TREASURY GILT 30"
-                },
-                "meta" : {
-                  "globalKey" : "e0c3bb03"
-                },
-                "source" : "NAME"
-              }
-            } ],
-            "securityType" : "DEBT"
+          "meta" : {
+            "globalKey" : "2db2dc99",
+            "externalKey" : "GlobalBank"
           }
-        },
+        } ],
+        "partyRoles" : [ {
+          "partyReference" : {
+            "globalReference" : "84766d2a",
+            "externalReference" : "MegaBank"
+          },
+          "role" : "Buyer"
+        }, {
+          "partyReference" : {
+            "globalReference" : "2db2dc99",
+            "externalReference" : "GlobalBank"
+          },
+          "role" : "Seller"
+        } ],
         "tradeDate" : {
+          "value" : "2020-09-22",
           "meta" : {
             "globalKey" : "3f2256"
-          },
-          "value" : "2020-09-22"
+          }
         },
         "tradeIdentifier" : [ {
+          "issuer" : {
+            "value" : "GlobalBank"
+          },
           "assignedIdentifier" : [ {
             "identifier" : {
               "value" : "0266001"
             }
           } ],
-          "issuer" : {
-            "value" : "GlobalBank"
-          },
           "meta" : {
-            "globalKey" : "e1da878e"
+            "globalKey" : "c2c1db0"
           }
         } ]
       }
     }
   } ],
+  "eventQualifier" : "Execution",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "30eca81b"
-    },
-    "state" : {
-      "positionState" : "EXECUTED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "4898dfcc"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "MegaBank",
-          "globalKey" : "84766d2a"
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "GlobalBank"
         },
-        "name" : {
-          "value" : "Mega Bank"
-        }
-      }, {
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "0266001"
+          }
+        } ],
         "meta" : {
-          "externalKey" : "GlobalBank",
-          "globalKey" : "2db2dc99"
-        },
-        "name" : {
-          "value" : "Global Bank"
+          "globalKey" : "c2c1db0"
         }
       } ],
-      "partyRole" : [ {
-        "partyReference" : {
-          "externalReference" : "MegaBank",
-          "globalReference" : "84766d2a"
-        },
-        "role" : "BUYER"
-      }, {
-        "partyReference" : {
-          "externalReference" : "GlobalBank",
-          "globalReference" : "2db2dc99"
-        },
-        "role" : "SELLER"
-      } ],
+      "tradeDate" : {
+        "value" : "2020-09-22",
+        "meta" : {
+          "globalKey" : "3f2256"
+        }
+      },
       "tradableProduct" : {
         "product" : {
-          "meta" : {
-            "globalKey" : "bb7aca3c"
-          },
           "security" : {
             "productIdentifier" : [ {
               "value" : {
                 "identifier" : {
                   "value" : "GB00B24FF097"
                 },
+                "source" : "ISIN",
                 "meta" : {
                   "globalKey" : "1ad6d034"
-                },
-                "source" : "ISIN"
+                }
               }
             }, {
               "value" : {
                 "identifier" : {
                   "value" : "TR30 4 3/4% TREASURY GILT 30"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "e0c3bb03"
-                },
-                "source" : "NAME"
+                }
               }
             } ],
-            "securityType" : "DEBT"
+            "securityType" : "Debt"
+          },
+          "meta" : {
+            "globalKey" : "bb7aca3c"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "6a8470ba"
-            },
             "price" : [ {
               "value" : {
+                "value" : 1.022,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 1.022,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
@@ -234,12 +212,12 @@
               }
             }, {
               "value" : {
+                "value" : 1.02,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 1.02,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
@@ -248,12 +226,12 @@
               }
             }, {
               "value" : {
+                "value" : 40000,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 40000,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "CONTRACT"
@@ -263,40 +241,62 @@
             } ],
             "quantity" : [ {
               "value" : {
+                "value" : 20000000,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 20000000
+                }
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "6a8470ba"
+            }
           } ]
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f2256"
+      "party" : [ {
+        "name" : {
+          "value" : "Mega Bank"
         },
-        "value" : "2020-09-22"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
-            "value" : "0266001"
-          }
-        } ],
-        "issuer" : {
-          "value" : "GlobalBank"
+        "meta" : {
+          "globalKey" : "84766d2a",
+          "externalKey" : "MegaBank"
+        }
+      }, {
+        "name" : {
+          "value" : "Global Bank"
         },
         "meta" : {
-          "globalKey" : "e1da878e"
+          "globalKey" : "2db2dc99",
+          "externalKey" : "GlobalBank"
         }
-      } ]
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "84766d2a",
+          "externalReference" : "MegaBank"
+        },
+        "role" : "Buyer"
+      }, {
+        "partyReference" : {
+          "globalReference" : "2db2dc99",
+          "externalReference" : "GlobalBank"
+        },
+        "role" : "Seller"
+      } ],
+      "meta" : {
+        "globalKey" : "2067fb0e"
+      }
+    },
+    "state" : {
+      "positionState" : "Executed"
+    },
+    "meta" : {
+      "globalKey" : "4ec1571d"
     }
   } ],
-  "eventQualifier" : "Execution",
   "meta" : {
-    "globalKey" : "c01ec975"
+    "globalKey" : "e70227e1"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/cancellation-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/cancellation-output.json
index a565cb2883..d07e4baca8 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/cancellation-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/cancellation-output.json
@@ -1,77 +1,135 @@
 {
-  "effectiveDate" : "2021-03-21",
   "eventDate" : "2021-03-21",
+  "effectiveDate" : "2021-03-21",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "eaf9dc6e"
-        },
-        "state" : {
-          "positionState" : "FORMED"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "b9aaf231"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "GlobalBank",
-              "globalKey" : "296093b7"
-            },
-            "name" : {
-              "value" : "Global Bank Inc"
-            }
-          }, {
-            "meta" : {
-              "externalKey" : "UkBank",
-              "globalKey" : "1ef4886d"
-            },
-            "name" : {
-              "value" : "UK Bank plc"
-            }
-          } ],
-          "partyRole" : [ {
-            "partyReference" : {
-              "externalReference" : "GlobalBank",
-              "globalReference" : "296093b7"
-            },
-            "role" : "SELLER"
-          }, {
-            "partyReference" : {
-              "externalReference" : "UkBank",
-              "globalReference" : "1ef4886d"
-            },
-            "role" : "BUYER"
-          } ],
-          "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
+    "primitiveInstruction" : {
+      "split" : {
+        "breakdown" : [ {
+          "quantityChange" : {
+            "change" : [ {
+              "quantity" : [ {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "GlobalBank",
-                    "globalKey" : "296093b7"
+                  "value" : 0,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "16e4a5"
+              }
+            } ],
+            "direction" : "Replace"
+          }
+        }, {
+          "quantityChange" : {
+            "change" : [ {
+              "price" : [ {
+                "value" : {
+                  "value" : 0.004,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
                   },
-                  "name" : {
-                    "value" : "Global Bank Inc"
+                  "perUnitOf" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
+                  },
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
+                }
+              } ],
+              "quantity" : [ {
+                "value" : {
+                  "value" : 9974250,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
                   }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
                 }
-              },
-              "role" : "PARTY_1"
+              } ],
+              "meta" : {
+                "globalKey" : "ae7919fa"
+              }
             }, {
-              "partyReference" : {
+              "price" : [ {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "UkBank",
-                    "globalKey" : "1ef4886d"
+                  "value" : 1.0075,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
                   },
-                  "name" : {
-                    "value" : "UK Bank plc"
+                  "perUnitOf" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
+                  },
+                  "priceType" : "AssetPrice",
+                  "priceExpression" : "PercentageOfNotional"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-2"
+                  } ]
+                }
+              } ],
+              "quantity" : [ {
+                "value" : {
+                  "value" : 10000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
+                }
+              } ],
+              "observable" : {
+                "productIdentifier" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "GB00B24FF097"
+                    },
+                    "source" : "ISIN",
+                    "meta" : {
+                      "globalKey" : "1ad6d034"
+                    }
                   }
+                } ],
+                "meta" : {
+                  "globalKey" : "1ad6d034"
                 }
               },
-              "role" : "PARTY_2"
+              "meta" : {
+                "globalKey" : "a8870d90"
+              }
             } ],
+            "direction" : "Replace"
+          },
+          "termsChange" : {
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -86,6 +144,80 @@
                   "productQualifier" : "RepurchaseAgreement"
                 } ],
                 "economicTerms" : {
+                  "effectiveDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-19",
+                      "meta" : {
+                        "globalKey" : "3f28d3"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d3",
+                      "externalKey" : "PurchaseDate"
+                    }
+                  },
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-21",
+                      "meta" : {
+                        "globalKey" : "3f28d5"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d5"
+                    }
+                  },
+                  "payout" : {
+                    "interestRatePayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "priceQuantity" : {
+                        "quantitySchedule" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "quantity-1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      },
+                      "principalPayment" : {
+                        "initialPayment" : true,
+                        "finalPayment" : true,
+                        "intermediatePayment" : false,
+                        "meta" : {
+                          "globalKey" : "12a6f5"
+                        }
+                      },
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "meta" : {
+                        "globalKey" : "69ca64cc"
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "69ca64cc"
+                    }
+                  },
                   "collateral" : {
                     "collateralPortfolio" : [ {
                       "value" : {
@@ -96,114 +228,114 @@
                                 "payout" : {
                                   "assetPayout" : [ {
                                     "payerReceiver" : {
-                                      "payer" : "PARTY_1",
-                                      "receiver" : "PARTY_2"
+                                      "payer" : "Party1",
+                                      "receiver" : "Party2"
                                     },
                                     "priceQuantity" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
                                       "quantitySchedule" : {
                                         "address" : {
                                           "scope" : "DOCUMENT",
                                           "value" : "quantity-2"
                                         }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "0"
                                       }
                                     },
                                     "principalPayment" : {
-                                      "finalPayment" : true,
                                       "initialPayment" : true,
+                                      "finalPayment" : true,
                                       "intermediatePayment" : false,
                                       "meta" : {
                                         "globalKey" : "12a6f5"
                                       }
                                     },
                                     "assetLeg" : [ {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                       "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "75229c9e"
-                                        },
                                         "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
                                           "meta" : {
-                                            "globalKey" : "75229c9e"
+                                            "globalKey" : "71834796"
                                           },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
+                                          "businessDayConvention" : "NotApplicable",
                                           "dateRelativeTo" : {
-                                            "externalReference" : "PurchaseDate",
-                                            "globalReference" : "3f28d3"
+                                            "globalReference" : "3f28d3",
+                                            "externalReference" : "PurchaseDate"
                                           }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "71834796"
                                         }
-                                      }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
                                     }, {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                       "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "de136e51"
-                                        },
                                         "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
                                           "meta" : {
-                                            "globalKey" : "de136e51"
+                                            "globalKey" : "da741949"
                                           },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
+                                          "businessDayConvention" : "NotApplicable",
                                           "dateRelativeTo" : {
-                                            "externalReference" : "RepurchaseDate",
-                                            "globalReference" : "3f28d6"
+                                            "globalReference" : "3f28d6",
+                                            "externalReference" : "RepurchaseDate"
                                           }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "da741949"
                                         }
-                                      }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
                                     } ],
-                                    "durationType" : {
-                                      "durationType" : "TERM"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "e7ac7fce"
-                                    },
                                     "securityInformation" : {
-                                      "meta" : {
-                                        "globalKey" : "40232adf"
-                                      },
                                       "security" : {
                                         "productIdentifier" : [ {
                                           "value" : {
                                             "identifier" : {
                                               "value" : "GB00B24FF097"
                                             },
+                                            "source" : "ISIN",
                                             "meta" : {
                                               "globalKey" : "1ad6d034"
-                                            },
-                                            "source" : "ISIN"
+                                            }
                                           }
                                         } ],
-                                        "securityType" : "DEBT"
+                                        "securityType" : "Debt"
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "40232adf"
                                       }
-                                    }
-                                  } ],
-                                  "meta" : {
-                                    "globalKey" : "e7ac7fce"
+                                    },
+                                    "durationType" : {
+                                      "durationType" : "Term"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "12a4a1fe"
+                                    }
+                                  } ],
+                                  "meta" : {
+                                    "globalKey" : "12a4a1fe"
                                   }
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             },
                             "meta" : {
-                              "globalKey" : "e7ac7fce"
+                              "globalKey" : "12a4a1fe"
                             }
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "collateralProvisions" : {
-                      "collateralType" : "CASH",
+                      "collateralType" : "Cash",
                       "eligibleCollateral" : [ {
                         "criteria" : [ {
                           "treatment" : {
@@ -217,55 +349,111 @@
                         }
                       } ]
                     }
-                  },
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "2a71e044"
+                }
+              },
+              "meta" : {
+                "globalKey" : "2a71e044"
+              }
+            }
+          }
+        } ]
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "KTKLLEILLLLLLLLLLLLL"
+            },
+            "assignedIdentifier" : [ {
+              "identifier" : {
+                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+                "meta" : {
+                  "scheme" : "UnqTradIdr"
+                }
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "32cd87f2"
+            }
+          } ],
+          "tradeDate" : {
+            "value" : "2021-03-18",
+            "meta" : {
+              "globalKey" : "3f28d2"
+            }
+          },
+          "tradableProduct" : {
+            "product" : {
+              "contractualProduct" : {
+                "productTaxonomy" : [ {
+                  "source" : "CFI",
+                  "value" : {
+                    "name" : {
+                      "value" : "LRSTXD"
+                    }
+                  }
+                }, {
+                  "source" : "ISDA",
+                  "productQualifier" : "RepurchaseAgreement"
+                } ],
+                "economicTerms" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-19",
                       "meta" : {
                         "globalKey" : "3f28d3"
-                      },
-                      "unadjustedDate" : "2021-03-19"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d3",
+                      "externalKey" : "PurchaseDate"
+                    }
+                  },
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-22",
+                      "meta" : {
+                        "globalKey" : "3f28d6"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "PurchaseDate",
-                      "globalKey" : "3f28d3"
+                      "globalKey" : "3f28d6",
+                      "externalKey" : "RepurchaseDate"
                     }
                   },
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "principalPayment" : {
-                        "finalPayment" : true,
                         "initialPayment" : true,
+                        "finalPayment" : true,
                         "intermediatePayment" : false,
                         "meta" : {
                           "globalKey" : "12a6f5"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "6a2c670c"
-                      },
                       "rateSpecification" : {
                         "fixedRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "rateSchedule" : {
                             "price" : {
                               "address" : {
@@ -273,599 +461,365 @@
                                 "value" : "price-1"
                               }
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "meta" : {
+                        "globalKey" : "69ca64cc"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "6a2c670c"
+                      "globalKey" : "69ca64cc"
                     }
                   },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d6"
-                      },
-                      "unadjustedDate" : "2021-03-22"
-                    },
-                    "meta" : {
-                      "externalKey" : "RepurchaseDate",
-                      "globalKey" : "3f28d6"
+                  "collateral" : {
+                    "collateralPortfolio" : [ {
+                      "value" : {
+                        "collateralPosition" : [ {
+                          "product" : {
+                            "contractualProduct" : {
+                              "economicTerms" : {
+                                "payout" : {
+                                  "assetPayout" : [ {
+                                    "payerReceiver" : {
+                                      "payer" : "Party1",
+                                      "receiver" : "Party2"
+                                    },
+                                    "priceQuantity" : {
+                                      "quantitySchedule" : {
+                                        "address" : {
+                                          "scope" : "DOCUMENT",
+                                          "value" : "quantity-2"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "0"
+                                      }
+                                    },
+                                    "principalPayment" : {
+                                      "initialPayment" : true,
+                                      "finalPayment" : true,
+                                      "intermediatePayment" : false,
+                                      "meta" : {
+                                        "globalKey" : "12a6f5"
+                                      }
+                                    },
+                                    "assetLeg" : [ {
+                                      "settlementDate" : {
+                                        "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
+                                          "meta" : {
+                                            "globalKey" : "71834796"
+                                          },
+                                          "businessDayConvention" : "NotApplicable",
+                                          "dateRelativeTo" : {
+                                            "globalReference" : "3f28d3",
+                                            "externalReference" : "PurchaseDate"
+                                          }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "71834796"
+                                        }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
+                                    }, {
+                                      "settlementDate" : {
+                                        "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
+                                          "meta" : {
+                                            "globalKey" : "da741949"
+                                          },
+                                          "businessDayConvention" : "NotApplicable",
+                                          "dateRelativeTo" : {
+                                            "globalReference" : "3f28d6",
+                                            "externalReference" : "RepurchaseDate"
+                                          }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "da741949"
+                                        }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
+                                    } ],
+                                    "securityInformation" : {
+                                      "security" : {
+                                        "productIdentifier" : [ {
+                                          "value" : {
+                                            "identifier" : {
+                                              "value" : "GB00B24FF097"
+                                            },
+                                            "source" : "ISIN",
+                                            "meta" : {
+                                              "globalKey" : "1ad6d034"
+                                            }
+                                          }
+                                        } ],
+                                        "securityType" : "Debt"
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "40232adf"
+                                      }
+                                    },
+                                    "durationType" : {
+                                      "durationType" : "Term"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "12a4a1fe"
+                                    }
+                                  } ],
+                                  "meta" : {
+                                    "globalKey" : "12a4a1fe"
+                                  }
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "12a4a1fe"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "12a4a1fe"
+                            }
+                          }
+                        } ],
+                        "meta" : {
+                          "globalKey" : "12a4a1fe"
+                        }
+                      }
+                    } ],
+                    "collateralProvisions" : {
+                      "collateralType" : "Cash",
+                      "eligibleCollateral" : [ {
+                        "criteria" : [ {
+                          "treatment" : {
+                            "valuationTreatment" : {
+                              "marginPercentage" : 0.99
+                            }
+                          }
+                        } ],
+                        "meta" : {
+                          "globalKey" : "16859e"
+                        }
+                      } ]
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "1a2ab30d"
+                  "globalKey" : "c6dfdca3"
                 }
               },
               "meta" : {
-                "globalKey" : "1a2ab30d"
+                "globalKey" : "c6dfdca3"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "fd5ebec6"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.004,
                     "unit" : {
                       "currency" : {
                         "value" : "GBP"
                       }
                     },
-                    "value" : 0.004,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "GBP"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 9974250,
                     "unit" : {
                       "currency" : {
                         "value" : "GBP"
                       }
-                    },
-                    "value" : 9974250
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "c886a5fe"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "value" : "GB00B24FF097"
-                      },
-                      "meta" : {
-                        "globalKey" : "1ad6d034"
-                      },
-                      "source" : "ISIN"
                     }
-                  } ]
-                },
-                "price" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "price-2"
+                      "value" : "quantity-1"
                     } ]
-                  },
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "ae7919fa"
+                }
+              }, {
+                "price" : [ {
                   "value" : {
+                    "value" : 1.0075,
                     "unit" : {
                       "currency" : {
                         "value" : "GBP"
                       }
                     },
-                    "value" : 1.0075,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "GBP"
                       }
                     },
-                    "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                    "priceType" : "ASSET_PRICE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "AssetPrice",
+                    "priceExpression" : "PercentageOfNotional"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "price-2"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 10000000,
                     "unit" : {
                       "currency" : {
                         "value" : "GBP"
                       }
-                    },
-                    "value" : 10000000
-                  }
-                } ]
-              } ]
-            } ]
-          },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f28d2"
-            },
-            "value" : "2021-03-18"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "UnqTradIdr"
-                },
-                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-              }
-            } ],
-            "issuer" : {
-              "value" : "KTKLLEILLLLLLLLLLLLL"
-            },
-            "meta" : {
-              "globalKey" : "4a82737e"
-            }
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "split" : {
-        "breakdown" : [ {
-          "quantityChange" : {
-            "change" : [ {
-              "meta" : {
-                "globalKey" : "16e4a5"
-              },
-              "quantity" : [ {
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "GBP"
                     }
                   },
-                  "value" : 0
-                }
-              } ]
-            } ],
-            "direction" : "REPLACE"
-          }
-        }, {
-          "quantityChange" : {
-            "change" : [ {
-              "meta" : {
-                "globalKey" : "fd5ebec6"
-              },
-              "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "GBP"
-                    }
-                  },
-                  "value" : 0.004,
-                  "perUnitOf" : {
-                    "currency" : {
-                      "value" : "GBP"
-                    }
-                  },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ],
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "GBP"
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
+                  }
+                } ],
+                "observable" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "GB00B24FF097"
+                      },
+                      "source" : "ISIN",
+                      "meta" : {
+                        "globalKey" : "1ad6d034"
+                      }
                     }
-                  },
-                  "value" : 9974250
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "c886a5fe"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "1ad6d034"
-                },
-                "productIdentifier" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "GB00B24FF097"
-                    },
-                    "meta" : {
-                      "globalKey" : "1ad6d034"
-                    },
-                    "source" : "ISIN"
+                  } ],
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
                   }
-                } ]
-              },
-              "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-2"
-                  } ]
                 },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "GBP"
-                    }
-                  },
-                  "value" : 1.0075,
-                  "perUnitOf" : {
-                    "currency" : {
-                      "value" : "GBP"
-                    }
-                  },
-                  "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                  "priceType" : "ASSET_PRICE"
-                }
-              } ],
-              "quantity" : [ {
                 "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "GBP"
-                    }
-                  },
-                  "value" : 10000000
+                  "globalKey" : "a8870d90"
                 }
               } ]
             } ],
-            "direction" : "REPLACE"
-          },
-          "termsChange" : {
-            "product" : {
-              "contractualProduct" : {
-                "productTaxonomy" : [ {
-                  "source" : "CFI",
-                  "value" : {
-                    "name" : {
-                      "value" : "LRSTXD"
-                    }
-                  }
-                }, {
-                  "source" : "ISDA",
-                  "productQualifier" : "RepurchaseAgreement"
-                } ],
-                "economicTerms" : {
-                  "collateral" : {
-                    "collateralPortfolio" : [ {
-                      "value" : {
-                        "collateralPosition" : [ {
-                          "product" : {
-                            "contractualProduct" : {
-                              "economicTerms" : {
-                                "payout" : {
-                                  "assetPayout" : [ {
-                                    "payerReceiver" : {
-                                      "payer" : "PARTY_1",
-                                      "receiver" : "PARTY_2"
-                                    },
-                                    "priceQuantity" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
-                                      "quantitySchedule" : {
-                                        "address" : {
-                                          "scope" : "DOCUMENT",
-                                          "value" : "quantity-2"
-                                        }
-                                      }
-                                    },
-                                    "principalPayment" : {
-                                      "finalPayment" : true,
-                                      "initialPayment" : true,
-                                      "intermediatePayment" : false,
-                                      "meta" : {
-                                        "globalKey" : "12a6f5"
-                                      }
-                                    },
-                                    "assetLeg" : [ {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                                      "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "75229c9e"
-                                        },
-                                        "relativeDate" : {
-                                          "meta" : {
-                                            "globalKey" : "75229c9e"
-                                          },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
-                                          "dateRelativeTo" : {
-                                            "externalReference" : "PurchaseDate",
-                                            "globalReference" : "3f28d3"
-                                          }
-                                        }
-                                      }
-                                    }, {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                                      "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "de136e51"
-                                        },
-                                        "relativeDate" : {
-                                          "meta" : {
-                                            "globalKey" : "de136e51"
-                                          },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
-                                          "dateRelativeTo" : {
-                                            "externalReference" : "RepurchaseDate",
-                                            "globalReference" : "3f28d6"
-                                          }
-                                        }
-                                      }
-                                    } ],
-                                    "durationType" : {
-                                      "durationType" : "TERM"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "e7ac7fce"
-                                    },
-                                    "securityInformation" : {
-                                      "meta" : {
-                                        "globalKey" : "40232adf"
-                                      },
-                                      "security" : {
-                                        "productIdentifier" : [ {
-                                          "value" : {
-                                            "identifier" : {
-                                              "value" : "GB00B24FF097"
-                                            },
-                                            "meta" : {
-                                              "globalKey" : "1ad6d034"
-                                            },
-                                            "source" : "ISIN"
-                                          }
-                                        } ],
-                                        "securityType" : "DEBT"
-                                      }
-                                    }
-                                  } ],
-                                  "meta" : {
-                                    "globalKey" : "e7ac7fce"
-                                  }
-                                }
-                              },
-                              "meta" : {
-                                "globalKey" : "e7ac7fce"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "e7ac7fce"
-                            }
-                          }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "e7ac7fce"
-                        }
-                      }
-                    } ],
-                    "collateralProvisions" : {
-                      "collateralType" : "CASH",
-                      "eligibleCollateral" : [ {
-                        "criteria" : [ {
-                          "treatment" : {
-                            "valuationTreatment" : {
-                              "marginPercentage" : 0.99
-                            }
-                          }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "16859e"
-                        }
-                      } ]
-                    }
-                  },
-                  "effectiveDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d3"
-                      },
-                      "unadjustedDate" : "2021-03-19"
-                    },
-                    "meta" : {
-                      "externalKey" : "PurchaseDate",
-                      "globalKey" : "3f28d3"
-                    }
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "value" : {
+                  "name" : {
+                    "value" : "Global Bank Inc"
                   },
-                  "payout" : {
-                    "interestRatePayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
-                      },
-                      "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "quantitySchedule" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "quantity-1"
-                          }
-                        }
-                      },
-                      "principalPayment" : {
-                        "finalPayment" : true,
-                        "initialPayment" : true,
-                        "intermediatePayment" : false,
-                        "meta" : {
-                          "globalKey" : "12a6f5"
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "6a2c670c"
-                      },
-                      "rateSpecification" : {
-                        "fixedRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
-                          }
-                        }
-                      }
-                    } ],
-                    "meta" : {
-                      "globalKey" : "6a2c670c"
-                    }
+                  "meta" : {
+                    "globalKey" : "296093b7",
+                    "externalKey" : "GlobalBank"
+                  }
+                }
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "value" : {
+                  "name" : {
+                    "value" : "UK Bank plc"
                   },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d5"
-                      },
-                      "unadjustedDate" : "2021-03-21"
-                    },
-                    "meta" : {
-                      "globalKey" : "3f28d5"
-                    }
+                  "meta" : {
+                    "globalKey" : "1ef4886d",
+                    "externalKey" : "UkBank"
                   }
-                },
-                "meta" : {
-                  "globalKey" : "1a2ab30c"
                 }
-              },
-              "meta" : {
-                "globalKey" : "1a2ab30c"
               }
+            } ]
+          },
+          "party" : [ {
+            "name" : {
+              "value" : "Global Bank Inc"
+            },
+            "meta" : {
+              "globalKey" : "296093b7",
+              "externalKey" : "GlobalBank"
+            }
+          }, {
+            "name" : {
+              "value" : "UK Bank plc"
+            },
+            "meta" : {
+              "globalKey" : "1ef4886d",
+              "externalKey" : "UkBank"
             }
+          } ],
+          "partyRole" : [ {
+            "partyReference" : {
+              "globalReference" : "296093b7",
+              "externalReference" : "GlobalBank"
+            },
+            "role" : "Seller"
+          }, {
+            "partyReference" : {
+              "globalReference" : "1ef4886d",
+              "externalReference" : "UkBank"
+            },
+            "role" : "Buyer"
+          } ],
+          "meta" : {
+            "globalKey" : "b62aaee7"
           }
-        } ]
+        },
+        "state" : {
+          "positionState" : "Formed"
+        },
+        "meta" : {
+          "globalKey" : "522d7d8a"
+        }
       }
     }
   } ],
+  "eventQualifier" : "Cancellation",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "28b21b91"
-    },
-    "state" : {
-      "closedState" : {
-        "state" : "TERMINATED"
-      },
-      "positionState" : "CLOSED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "25234300"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "GlobalBank",
-          "globalKey" : "296093b7"
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "KTKLLEILLLLLLLLLLLLL"
         },
-        "name" : {
-          "value" : "Global Bank Inc"
-        }
-      }, {
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+            "meta" : {
+              "scheme" : "UnqTradIdr"
+            }
+          }
+        } ],
         "meta" : {
-          "externalKey" : "UkBank",
-          "globalKey" : "1ef4886d"
-        },
-        "name" : {
-          "value" : "UK Bank plc"
+          "globalKey" : "32cd87f2"
         }
       } ],
-      "partyRole" : [ {
-        "partyReference" : {
-          "externalReference" : "GlobalBank",
-          "globalReference" : "296093b7"
-        },
-        "role" : "SELLER"
-      }, {
-        "partyReference" : {
-          "externalReference" : "UkBank",
-          "globalReference" : "1ef4886d"
-        },
-        "role" : "BUYER"
-      } ],
+      "tradeDate" : {
+        "value" : "2021-03-18",
+        "meta" : {
+          "globalKey" : "3f28d2"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
-              },
-              "name" : {
-                "value" : "Global Bank Inc"
-              }
-            }
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
-              "name" : {
-                "value" : "UK Bank plc"
-              }
-            }
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -880,6 +834,81 @@
               "productQualifier" : "RepurchaseAgreement"
             } ],
             "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-19",
+                  "meta" : {
+                    "globalKey" : "3f28d3"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d3",
+                  "externalKey" : "PurchaseDate"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
+                  "meta" : {
+                    "globalKey" : "3f28d6"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
+                }
+              },
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "69ca64cc"
+                }
+              },
               "collateral" : {
                 "collateralPortfolio" : [ {
                   "value" : {
@@ -890,114 +919,114 @@
                             "payout" : {
                               "assetPayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
                                 "principalPayment" : {
-                                  "finalPayment" : true,
                                   "initialPayment" : true,
+                                  "finalPayment" : true,
                                   "intermediatePayment" : false,
                                   "meta" : {
                                     "globalKey" : "12a6f5"
                                   }
                                 },
                                 "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "75229c9e"
+                                        "globalKey" : "71834796"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "71834796"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "de136e51"
+                                        "globalKey" : "da741949"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "da741949"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
                                 "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
                                   "security" : {
                                     "productIdentifier" : [ {
                                       "value" : {
                                         "identifier" : {
                                           "value" : "GB00B24FF097"
                                         },
+                                        "source" : "ISIN",
                                         "meta" : {
                                           "globalKey" : "1ad6d034"
-                                        },
-                                        "source" : "ISIN"
+                                        }
                                       }
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityType" : "Debt"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e7ac7fce"
+                            "globalKey" : "12a4a1fe"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e7ac7fce"
+                      "globalKey" : "12a4a1fe"
                     }
                   }
                 } ],
                 "collateralProvisions" : {
-                  "collateralType" : "CASH",
+                  "collateralType" : "Cash",
                   "eligibleCollateral" : [ {
                     "criteria" : [ {
                       "treatment" : {
@@ -1011,285 +1040,216 @@
                     }
                   } ]
                 }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d3"
-                  },
-                  "unadjustedDate" : "2021-03-19"
-                },
-                "meta" : {
-                  "externalKey" : "PurchaseDate",
-                  "globalKey" : "3f28d3"
-                }
-              },
-              "payout" : {
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "6a2c670c"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d6"
-                  },
-                  "unadjustedDate" : "2021-03-22"
-                },
-                "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
-                }
               }
             },
             "meta" : {
-              "globalKey" : "1a2ab30d"
+              "globalKey" : "c6dfdca3"
             }
           },
           "meta" : {
-            "globalKey" : "1a2ab30d"
-          }
-        },
-        "tradeLot" : [ {
-          "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "2d65fdc6"
-            },
-            "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
+            "globalKey" : "c6dfdca3"
+          }
+        },
+        "tradeLot" : [ {
+          "priceQuantity" : [ {
+            "price" : [ {
               "value" : {
+                "value" : 0.004,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 0.004,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 0,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 0
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "f435dd0d"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "1ad6d034"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "GB00B24FF097"
-                  },
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "source" : "ISIN"
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-2"
+                  "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "7f59bafa"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 1.0075,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 1.0075,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                "priceType" : "ASSET_PRICE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "AssetPrice",
+                "priceExpression" : "PercentageOfNotional"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 0,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 0
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
+              }
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "GB00B24FF097"
+                  },
+                  "source" : "ISIN",
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "1ad6d034"
               }
-            } ]
-          } ]
-        } ]
-      },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f28d2"
-        },
-        "value" : "2021-03-18"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "UnqTradIdr"
             },
-            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-          }
+            "meta" : {
+              "globalKey" : "40cd97a1"
+            }
+          } ]
         } ],
-        "issuer" : {
-          "value" : "KTKLLEILLLLLLLLLLLLL"
-        },
-        "meta" : {
-          "globalKey" : "4a82737e"
-        }
-      } ]
-    }
-  }, {
-    "meta" : {
-      "globalKey" : "24437a9f"
-    },
-    "trade" : {
-      "meta" : {
-        "globalKey" : "24437a9f"
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "Global Bank Inc"
+              },
+              "meta" : {
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
+              }
+            }
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
+              }
+            }
+          }
+        } ]
       },
       "party" : [ {
-        "meta" : {
-          "externalKey" : "GlobalBank",
-          "globalKey" : "296093b7"
-        },
         "name" : {
           "value" : "Global Bank Inc"
+        },
+        "meta" : {
+          "globalKey" : "296093b7",
+          "externalKey" : "GlobalBank"
         }
       }, {
-        "meta" : {
-          "externalKey" : "UkBank",
-          "globalKey" : "1ef4886d"
-        },
         "name" : {
           "value" : "UK Bank plc"
+        },
+        "meta" : {
+          "globalKey" : "1ef4886d",
+          "externalKey" : "UkBank"
         }
       } ],
       "partyRole" : [ {
         "partyReference" : {
-          "externalReference" : "GlobalBank",
-          "globalReference" : "296093b7"
+          "globalReference" : "296093b7",
+          "externalReference" : "GlobalBank"
         },
-        "role" : "SELLER"
+        "role" : "Seller"
       }, {
         "partyReference" : {
-          "externalReference" : "UkBank",
-          "globalReference" : "1ef4886d"
+          "globalReference" : "1ef4886d",
+          "externalReference" : "UkBank"
         },
-        "role" : "BUYER"
+        "role" : "Buyer"
       } ],
-      "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
-              },
-              "name" : {
-                "value" : "Global Bank Inc"
-              }
-            }
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
-              "name" : {
-                "value" : "UK Bank plc"
-              }
+      "meta" : {
+        "globalKey" : "e3c733f8"
+      }
+    },
+    "state" : {
+      "closedState" : {
+        "state" : "Terminated"
+      },
+      "positionState" : "Closed"
+    },
+    "meta" : {
+      "globalKey" : "c34c9c87"
+    }
+  }, {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "KTKLLEILLLLLLLLLLLLL"
+        },
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+            "meta" : {
+              "scheme" : "UnqTradIdr"
             }
-          },
-          "role" : "PARTY_2"
+          }
         } ],
+        "meta" : {
+          "globalKey" : "32cd87f2"
+        }
+      } ],
+      "tradeDate" : {
+        "value" : "2021-03-18",
+        "meta" : {
+          "globalKey" : "3f28d2"
+        }
+      },
+      "tradableProduct" : {
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -1304,6 +1264,80 @@
               "productQualifier" : "RepurchaseAgreement"
             } ],
             "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-19",
+                  "meta" : {
+                    "globalKey" : "3f28d3"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d3",
+                  "externalKey" : "PurchaseDate"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-21",
+                  "meta" : {
+                    "globalKey" : "3f28d5"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d5"
+                }
+              },
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "69ca64cc"
+                }
+              },
               "collateral" : {
                 "collateralPortfolio" : [ {
                   "value" : {
@@ -1314,114 +1348,114 @@
                             "payout" : {
                               "assetPayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
                                 "principalPayment" : {
-                                  "finalPayment" : true,
                                   "initialPayment" : true,
+                                  "finalPayment" : true,
                                   "intermediatePayment" : false,
                                   "meta" : {
                                     "globalKey" : "12a6f5"
                                   }
                                 },
                                 "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "75229c9e"
+                                        "globalKey" : "71834796"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "71834796"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "de136e51"
+                                        "globalKey" : "da741949"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "da741949"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
                                 "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
                                   "security" : {
                                     "productIdentifier" : [ {
                                       "value" : {
                                         "identifier" : {
                                           "value" : "GB00B24FF097"
                                         },
+                                        "source" : "ISIN",
                                         "meta" : {
                                           "globalKey" : "1ad6d034"
-                                        },
-                                        "source" : "ISIN"
+                                        }
                                       }
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityType" : "Debt"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e7ac7fce"
+                            "globalKey" : "12a4a1fe"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e7ac7fce"
+                      "globalKey" : "12a4a1fe"
                     }
                   }
                 } ],
                 "collateralProvisions" : {
-                  "collateralType" : "CASH",
+                  "collateralType" : "Cash",
                   "eligibleCollateral" : [ {
                     "criteria" : [ {
                       "treatment" : {
@@ -1435,221 +1469,187 @@
                     }
                   } ]
                 }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d3"
-                  },
-                  "unadjustedDate" : "2021-03-19"
-                },
-                "meta" : {
-                  "externalKey" : "PurchaseDate",
-                  "globalKey" : "3f28d3"
-                }
-              },
-              "payout" : {
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "6a2c670c"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d5"
-                  },
-                  "unadjustedDate" : "2021-03-21"
-                },
-                "meta" : {
-                  "globalKey" : "3f28d5"
-                }
               }
             },
             "meta" : {
-              "globalKey" : "1a2ab30c"
+              "globalKey" : "2a71e044"
             }
           },
           "meta" : {
-            "globalKey" : "1a2ab30c"
+            "globalKey" : "2a71e044"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "1b6c6b7"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.004,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 0.004,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 9974250,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 10000000
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "c886a5fe"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "1ad6d034"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "GB00B24FF097"
-                  },
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "source" : "ISIN"
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-2"
+                  "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "ae7919fa"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 1.0075,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 1.0075,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                "priceType" : "ASSET_PRICE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "AssetPrice",
+                "priceExpression" : "PercentageOfNotional"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 9974250,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 10000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "GB00B24FF097"
+                  },
+                  "source" : "ISIN",
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "1ad6d034"
+              }
+            },
+            "meta" : {
+              "globalKey" : "cca9b6a1"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "Global Bank Inc"
+              },
+              "meta" : {
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
+              }
+            }
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
+              }
+            }
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f28d2"
+      "party" : [ {
+        "name" : {
+          "value" : "Global Bank Inc"
         },
-        "value" : "2021-03-18"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "UnqTradIdr"
-            },
-            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-          }
-        } ],
-        "issuer" : {
-          "value" : "KTKLLEILLLLLLLLLLLLL"
+        "meta" : {
+          "globalKey" : "296093b7",
+          "externalKey" : "GlobalBank"
+        }
+      }, {
+        "name" : {
+          "value" : "UK Bank plc"
         },
         "meta" : {
-          "globalKey" : "4a82737e"
+          "globalKey" : "1ef4886d",
+          "externalKey" : "UkBank"
         }
-      } ]
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "296093b7",
+          "externalReference" : "GlobalBank"
+        },
+        "role" : "Seller"
+      }, {
+        "partyReference" : {
+          "globalReference" : "1ef4886d",
+          "externalReference" : "UkBank"
+        },
+        "role" : "Buyer"
+      } ],
+      "meta" : {
+        "globalKey" : "c02be1d9"
+      }
+    },
+    "meta" : {
+      "globalKey" : "c02be1d9"
     }
   } ],
-  "eventQualifier" : "Cancellation",
   "meta" : {
-    "globalKey" : "a923847b"
+    "globalKey" : "6c641ae7"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/clearing-via-novation-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/clearing-via-novation-output.json
index a9161b21e7..712bc58704 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/clearing-via-novation-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/clearing-via-novation-output.json
@@ -1,90 +1,123 @@
 {
+  "intent" : "Clearing",
   "eventDate" : "2018-04-01",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "44c363b9"
-        },
-        "state" : {
-          "positionState" : "FORMED"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "571261bc"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "GlobalBank",
-              "globalKey" : "296093b7"
-            },
-            "name" : {
-              "value" : "Global Bank Inc"
-            }
-          }, {
-            "meta" : {
-              "externalKey" : "UkBank",
-              "globalKey" : "1ef4886d"
-            },
-            "name" : {
-              "value" : "UK Bank plc"
-            }
-          }, {
-            "meta" : {
-              "externalKey" : "ccp",
-              "globalKey" : "103f0"
-            },
-            "name" : {
-              "value" : "CCP"
-            }
-          } ],
-          "partyRole" : [ {
-            "partyReference" : {
-              "externalReference" : "GlobalBank",
-              "globalReference" : "296093b7"
-            },
-            "role" : "SELLER"
-          }, {
-            "partyReference" : {
-              "externalReference" : "UkBank",
-              "globalReference" : "1ef4886d"
-            },
-            "role" : "BUYER"
-          }, {
-            "partyReference" : {
-              "externalReference" : "ccp",
-              "globalReference" : "103f0"
-            },
-            "role" : "CLEARING_ORGANIZATION"
-          } ],
-          "tradableProduct" : {
-            "counterparty" : [ {
+    "primitiveInstruction" : {
+      "split" : {
+        "breakdown" : [ {
+          "partyChange" : {
+            "counterparty" : {
+              "role" : "Party2",
               "partyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "GlobalBank",
-                    "globalKey" : "296093b7"
-                  },
                   "name" : {
-                    "value" : "Global Bank Inc"
+                    "value" : "CCP"
+                  },
+                  "meta" : {
+                    "globalKey" : "103f0",
+                    "externalKey" : "ccp"
                   }
                 }
+              }
+            },
+            "tradeId" : [ {
+              "issuer" : {
+                "value" : "CCP123"
               },
-              "role" : "PARTY_1"
-            }, {
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCP123-FISG1G1LENDFP002830BETA",
+                  "meta" : {
+                    "scheme" : "UnqTradIdr"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "2be3ab43"
+              }
+            } ]
+          }
+        }, {
+          "partyChange" : {
+            "counterparty" : {
+              "role" : "Party1",
               "partyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "UkBank",
-                    "globalKey" : "1ef4886d"
-                  },
                   "name" : {
-                    "value" : "UK Bank plc"
+                    "value" : "CCP"
+                  },
+                  "meta" : {
+                    "globalKey" : "103f0",
+                    "externalKey" : "ccp"
                   }
                 }
+              }
+            },
+            "tradeId" : [ {
+              "issuer" : {
+                "value" : "CCP123"
               },
-              "role" : "PARTY_2"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCP123-FISG1G1LENDFP00283GAMMA",
+                  "meta" : {
+                    "scheme" : "UnqTradIdr"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "2d2770aa"
+              }
+            } ]
+          }
+        }, {
+          "quantityChange" : {
+            "change" : [ {
+              "quantity" : [ {
+                "value" : {
+                  "value" : 0,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "16e4a5"
+              }
+            } ],
+            "direction" : "Replace"
+          }
+        } ]
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "KTKLLEILLLLLLLLLLLLL"
+            },
+            "assignedIdentifier" : [ {
+              "identifier" : {
+                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+                "meta" : {
+                  "scheme" : "UnqTradIdr"
+                }
+              }
             } ],
+            "meta" : {
+              "globalKey" : "32cd87f2"
+            }
+          } ],
+          "tradeDate" : {
+            "value" : "2021-03-18",
+            "meta" : {
+              "globalKey" : "3f28d2"
+            }
+          },
+          "tradableProduct" : {
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -99,6 +132,81 @@
                   "productQualifier" : "RepurchaseAgreement"
                 } ],
                 "economicTerms" : {
+                  "effectiveDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-19",
+                      "meta" : {
+                        "globalKey" : "3f28d3"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d3",
+                      "externalKey" : "PurchaseDate"
+                    }
+                  },
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-22",
+                      "meta" : {
+                        "globalKey" : "3f28d6"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d6",
+                      "externalKey" : "RepurchaseDate"
+                    }
+                  },
+                  "payout" : {
+                    "interestRatePayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "priceQuantity" : {
+                        "quantitySchedule" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "quantity-1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      },
+                      "principalPayment" : {
+                        "initialPayment" : true,
+                        "finalPayment" : true,
+                        "intermediatePayment" : false,
+                        "meta" : {
+                          "globalKey" : "12a6f5"
+                        }
+                      },
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "meta" : {
+                        "globalKey" : "69ca64cc"
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "69ca64cc"
+                    }
+                  },
                   "collateral" : {
                     "collateralPortfolio" : [ {
                       "value" : {
@@ -109,114 +217,114 @@
                                 "payout" : {
                                   "assetPayout" : [ {
                                     "payerReceiver" : {
-                                      "payer" : "PARTY_1",
-                                      "receiver" : "PARTY_2"
+                                      "payer" : "Party1",
+                                      "receiver" : "Party2"
                                     },
                                     "priceQuantity" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
                                       "quantitySchedule" : {
                                         "address" : {
                                           "scope" : "DOCUMENT",
                                           "value" : "quantity-2"
                                         }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "0"
                                       }
                                     },
                                     "principalPayment" : {
-                                      "finalPayment" : true,
                                       "initialPayment" : true,
+                                      "finalPayment" : true,
                                       "intermediatePayment" : false,
                                       "meta" : {
                                         "globalKey" : "12a6f5"
                                       }
                                     },
                                     "assetLeg" : [ {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                       "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "75229c9e"
-                                        },
                                         "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
                                           "meta" : {
-                                            "globalKey" : "75229c9e"
+                                            "globalKey" : "71834796"
                                           },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
+                                          "businessDayConvention" : "NotApplicable",
                                           "dateRelativeTo" : {
-                                            "externalReference" : "PurchaseDate",
-                                            "globalReference" : "3f28d3"
+                                            "globalReference" : "3f28d3",
+                                            "externalReference" : "PurchaseDate"
                                           }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "71834796"
                                         }
-                                      }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
                                     }, {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                       "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "de136e51"
-                                        },
                                         "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
                                           "meta" : {
-                                            "globalKey" : "de136e51"
+                                            "globalKey" : "da741949"
                                           },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
+                                          "businessDayConvention" : "NotApplicable",
                                           "dateRelativeTo" : {
-                                            "externalReference" : "RepurchaseDate",
-                                            "globalReference" : "3f28d6"
+                                            "globalReference" : "3f28d6",
+                                            "externalReference" : "RepurchaseDate"
                                           }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "da741949"
                                         }
-                                      }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
                                     } ],
-                                    "durationType" : {
-                                      "durationType" : "TERM"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "e7ac7fce"
-                                    },
                                     "securityInformation" : {
-                                      "meta" : {
-                                        "globalKey" : "40232adf"
-                                      },
                                       "security" : {
                                         "productIdentifier" : [ {
                                           "value" : {
                                             "identifier" : {
                                               "value" : "GB00B24FF097"
                                             },
+                                            "source" : "ISIN",
                                             "meta" : {
                                               "globalKey" : "1ad6d034"
-                                            },
-                                            "source" : "ISIN"
+                                            }
                                           }
                                         } ],
-                                        "securityType" : "DEBT"
+                                        "securityType" : "Debt"
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "40232adf"
                                       }
+                                    },
+                                    "durationType" : {
+                                      "durationType" : "Term"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "12a4a1fe"
                                     }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "e7ac7fce"
+                                    "globalKey" : "12a4a1fe"
                                   }
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             },
                             "meta" : {
-                              "globalKey" : "e7ac7fce"
+                              "globalKey" : "12a4a1fe"
                             }
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "collateralProvisions" : {
-                      "collateralType" : "CASH",
+                      "collateralType" : "Cash",
                       "eligibleCollateral" : [ {
                         "criteria" : [ {
                           "treatment" : {
@@ -230,381 +338,231 @@
                         }
                       } ]
                     }
-                  },
-                  "effectiveDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d3"
-                      },
-                      "unadjustedDate" : "2021-03-19"
-                    },
-                    "meta" : {
-                      "externalKey" : "PurchaseDate",
-                      "globalKey" : "3f28d3"
-                    }
-                  },
-                  "payout" : {
-                    "interestRatePayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
-                      },
-                      "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "quantitySchedule" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "quantity-1"
-                          }
-                        }
-                      },
-                      "principalPayment" : {
-                        "finalPayment" : true,
-                        "initialPayment" : true,
-                        "intermediatePayment" : false,
-                        "meta" : {
-                          "globalKey" : "12a6f5"
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "6a2c670c"
-                      },
-                      "rateSpecification" : {
-                        "fixedRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
-                          }
-                        }
-                      }
-                    } ],
-                    "meta" : {
-                      "globalKey" : "6a2c670c"
-                    }
-                  },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d6"
-                      },
-                      "unadjustedDate" : "2021-03-22"
-                    },
-                    "meta" : {
-                      "externalKey" : "RepurchaseDate",
-                      "globalKey" : "3f28d6"
-                    }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "1a2ab30d"
+                  "globalKey" : "c6dfdca3"
                 }
               },
               "meta" : {
-                "globalKey" : "1a2ab30d"
+                "globalKey" : "c6dfdca3"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "fd5ebec6"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.004,
                     "unit" : {
                       "currency" : {
                         "value" : "GBP"
                       }
                     },
-                    "value" : 0.004,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "GBP"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 9974250,
                     "unit" : {
                       "currency" : {
                         "value" : "GBP"
                       }
-                    },
-                    "value" : 9974250
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "c886a5fe"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "value" : "GB00B24FF097"
-                      },
-                      "meta" : {
-                        "globalKey" : "1ad6d034"
-                      },
-                      "source" : "ISIN"
                     }
-                  } ]
-                },
-                "price" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "price-2"
+                      "value" : "quantity-1"
                     } ]
-                  },
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "ae7919fa"
+                }
+              }, {
+                "price" : [ {
                   "value" : {
+                    "value" : 1.0075,
                     "unit" : {
                       "currency" : {
                         "value" : "GBP"
                       }
                     },
-                    "value" : 1.0075,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "GBP"
                       }
                     },
-                    "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                    "priceType" : "ASSET_PRICE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "AssetPrice",
+                    "priceExpression" : "PercentageOfNotional"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "price-2"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 10000000,
                     "unit" : {
                       "currency" : {
                         "value" : "GBP"
                       }
-                    },
-                    "value" : 10000000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
+                  }
+                } ],
+                "observable" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "GB00B24FF097"
+                      },
+                      "source" : "ISIN",
+                      "meta" : {
+                        "globalKey" : "1ad6d034"
+                      }
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
                   }
-                } ]
-              } ]
-            } ]
-          },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f28d2"
-            },
-            "value" : "2021-03-18"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "UnqTradIdr"
                 },
-                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-              }
+                "meta" : {
+                  "globalKey" : "a8870d90"
+                }
+              } ]
             } ],
-            "issuer" : {
-              "value" : "KTKLLEILLLLLLLLLLLLL"
-            },
-            "meta" : {
-              "globalKey" : "4a82737e"
-            }
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "split" : {
-        "breakdown" : [ {
-          "partyChange" : {
-            "counterparty" : {
+            "counterparty" : [ {
+              "role" : "Party1",
               "partyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "ccp",
-                    "globalKey" : "103f0"
-                  },
                   "name" : {
-                    "value" : "CCP"
-                  }
-                }
-              },
-              "role" : "PARTY_2"
-            },
-            "tradeId" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "UnqTradIdr"
+                    "value" : "Global Bank Inc"
                   },
-                  "value" : "CCP123-FISG1G1LENDFP002830BETA"
+                  "meta" : {
+                    "globalKey" : "296093b7",
+                    "externalKey" : "GlobalBank"
+                  }
                 }
-              } ],
-              "issuer" : {
-                "value" : "CCP123"
-              },
-              "meta" : {
-                "globalKey" : "6d4175c7"
               }
-            } ]
-          }
-        }, {
-          "partyChange" : {
-            "counterparty" : {
+            }, {
+              "role" : "Party2",
               "partyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "ccp",
-                    "globalKey" : "103f0"
-                  },
                   "name" : {
-                    "value" : "CCP"
-                  }
-                }
-              },
-              "role" : "PARTY_1"
-            },
-            "tradeId" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "UnqTradIdr"
+                    "value" : "UK Bank plc"
                   },
-                  "value" : "CCP123-FISG1G1LENDFP00283GAMMA"
+                  "meta" : {
+                    "globalKey" : "1ef4886d",
+                    "externalKey" : "UkBank"
+                  }
                 }
-              } ],
-              "issuer" : {
-                "value" : "CCP123"
-              },
-              "meta" : {
-                "globalKey" : "2ca97d6e"
               }
             } ]
+          },
+          "party" : [ {
+            "name" : {
+              "value" : "Global Bank Inc"
+            },
+            "meta" : {
+              "globalKey" : "296093b7",
+              "externalKey" : "GlobalBank"
+            }
+          }, {
+            "name" : {
+              "value" : "UK Bank plc"
+            },
+            "meta" : {
+              "globalKey" : "1ef4886d",
+              "externalKey" : "UkBank"
+            }
+          }, {
+            "name" : {
+              "value" : "CCP"
+            },
+            "meta" : {
+              "globalKey" : "103f0",
+              "externalKey" : "ccp"
+            }
+          } ],
+          "partyRole" : [ {
+            "partyReference" : {
+              "globalReference" : "296093b7",
+              "externalReference" : "GlobalBank"
+            },
+            "role" : "Seller"
+          }, {
+            "partyReference" : {
+              "globalReference" : "1ef4886d",
+              "externalReference" : "UkBank"
+            },
+            "role" : "Buyer"
+          }, {
+            "partyReference" : {
+              "globalReference" : "103f0",
+              "externalReference" : "ccp"
+            },
+            "role" : "ClearingOrganization"
+          } ],
+          "meta" : {
+            "globalKey" : "dcdb40b2"
           }
-        }, {
-          "quantityChange" : {
-            "change" : [ {
-              "meta" : {
-                "globalKey" : "16e4a5"
-              },
-              "quantity" : [ {
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "GBP"
-                    }
-                  },
-                  "value" : 0
-                }
-              } ]
-            } ],
-            "direction" : "REPLACE"
-          }
-        } ]
+        },
+        "state" : {
+          "positionState" : "Formed"
+        },
+        "meta" : {
+          "globalKey" : "8f00c895"
+        }
       }
     }
   } ],
-  "intent" : "CLEARING",
+  "eventQualifier" : "ClearedTrade",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "7713c6f2"
-    },
-    "state" : {
-      "positionState" : "FORMED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "5188d30f"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "GlobalBank",
-          "globalKey" : "296093b7"
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "CCP123"
         },
-        "name" : {
-          "value" : "Global Bank Inc"
-        }
-      }, {
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "CCP123-FISG1G1LENDFP002830BETA",
+            "meta" : {
+              "scheme" : "UnqTradIdr"
+            }
+          }
+        } ],
         "meta" : {
-          "externalKey" : "ccp",
-          "globalKey" : "103f0"
-        },
-        "name" : {
-          "value" : "CCP"
+          "globalKey" : "2be3ab43"
         }
       } ],
-      "partyRole" : [ {
-        "partyReference" : {
-          "externalReference" : "GlobalBank",
-          "globalReference" : "296093b7"
-        },
-        "role" : "SELLER"
-      }, {
-        "partyReference" : {
-          "externalReference" : "UkBank",
-          "globalReference" : "1ef4886d"
-        },
-        "role" : "BUYER"
-      }, {
-        "partyReference" : {
-          "externalReference" : "ccp",
-          "globalReference" : "103f0"
-        },
-        "role" : "CLEARING_ORGANIZATION"
-      } ],
+      "tradeDate" : {
+        "value" : "2021-03-18",
+        "meta" : {
+          "globalKey" : "3f28d2"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
-              },
-              "name" : {
-                "value" : "Global Bank Inc"
-              }
-            }
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "externalReference" : "ccp",
-            "globalReference" : "103f0"
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -613,12 +571,87 @@
                 "name" : {
                   "value" : "LRSTXD"
                 }
-              }
-            }, {
-              "source" : "ISDA",
-              "productQualifier" : "RepurchaseAgreement"
-            } ],
-            "economicTerms" : {
+              }
+            }, {
+              "source" : "ISDA",
+              "productQualifier" : "RepurchaseAgreement"
+            } ],
+            "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-19",
+                  "meta" : {
+                    "globalKey" : "3f28d3"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d3",
+                  "externalKey" : "PurchaseDate"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
+                  "meta" : {
+                    "globalKey" : "3f28d6"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
+                }
+              },
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "69ca64cc"
+                }
+              },
               "collateral" : {
                 "collateralPortfolio" : [ {
                   "value" : {
@@ -629,114 +662,114 @@
                             "payout" : {
                               "assetPayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
                                 "principalPayment" : {
-                                  "finalPayment" : true,
                                   "initialPayment" : true,
+                                  "finalPayment" : true,
                                   "intermediatePayment" : false,
                                   "meta" : {
                                     "globalKey" : "12a6f5"
                                   }
                                 },
                                 "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "75229c9e"
+                                        "globalKey" : "71834796"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "71834796"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "de136e51"
+                                        "globalKey" : "da741949"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "da741949"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
                                 "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
                                   "security" : {
                                     "productIdentifier" : [ {
                                       "value" : {
                                         "identifier" : {
                                           "value" : "GB00B24FF097"
                                         },
+                                        "source" : "ISIN",
                                         "meta" : {
                                           "globalKey" : "1ad6d034"
-                                        },
-                                        "source" : "ISIN"
+                                        }
                                       }
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityType" : "Debt"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e7ac7fce"
+                            "globalKey" : "12a4a1fe"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e7ac7fce"
+                      "globalKey" : "12a4a1fe"
                     }
                   }
                 } ],
                 "collateralProvisions" : {
-                  "collateralType" : "CASH",
+                  "collateralType" : "Cash",
                   "eligibleCollateral" : [ {
                     "criteria" : [ {
                       "treatment" : {
@@ -750,287 +783,212 @@
                     }
                   } ]
                 }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d3"
-                  },
-                  "unadjustedDate" : "2021-03-19"
-                },
-                "meta" : {
-                  "externalKey" : "PurchaseDate",
-                  "globalKey" : "3f28d3"
-                }
-              },
-              "payout" : {
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "6a2c670c"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d6"
-                  },
-                  "unadjustedDate" : "2021-03-22"
-                },
-                "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
-                }
               }
             },
             "meta" : {
-              "globalKey" : "1a2ab30d"
+              "globalKey" : "c6dfdca3"
             }
           },
           "meta" : {
-            "globalKey" : "1a2ab30d"
+            "globalKey" : "c6dfdca3"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "fd5ebec6"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.004,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 0.004,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 9974250,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 9974250
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "c886a5fe"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "1ad6d034"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "GB00B24FF097"
-                  },
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "source" : "ISIN"
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-2"
+                  "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "ae7919fa"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 1.0075,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 1.0075,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                "priceType" : "ASSET_PRICE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "AssetPrice",
+                "priceExpression" : "PercentageOfNotional"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 10000000,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 10000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
+              }
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "GB00B24FF097"
+                  },
+                  "source" : "ISIN",
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "1ad6d034"
               }
-            } ]
-          } ]
-        } ]
-      },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f28d2"
-        },
-        "value" : "2021-03-18"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "UnqTradIdr"
             },
-            "value" : "CCP123-FISG1G1LENDFP002830BETA"
+            "meta" : {
+              "globalKey" : "a8870d90"
+            }
+          } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "Global Bank Inc"
+              },
+              "meta" : {
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
+              }
+            }
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "globalReference" : "103f0",
+            "externalReference" : "ccp"
           }
-        } ],
-        "issuer" : {
-          "value" : "CCP123"
-        },
-        "meta" : {
-          "globalKey" : "6d4175c7"
-        }
-      } ]
-    }
-  }, {
-    "meta" : {
-      "globalKey" : "e444e13f"
-    },
-    "state" : {
-      "positionState" : "FORMED"
-    },
-    "trade" : {
-      "meta" : {
-        "globalKey" : "beb9ed5c"
+        } ]
       },
       "party" : [ {
-        "meta" : {
-          "externalKey" : "ccp",
-          "globalKey" : "103f0"
-        },
         "name" : {
-          "value" : "CCP"
+          "value" : "Global Bank Inc"
+        },
+        "meta" : {
+          "globalKey" : "296093b7",
+          "externalKey" : "GlobalBank"
         }
       }, {
-        "meta" : {
-          "externalKey" : "UkBank",
-          "globalKey" : "1ef4886d"
-        },
         "name" : {
-          "value" : "UK Bank plc"
+          "value" : "CCP"
+        },
+        "meta" : {
+          "globalKey" : "103f0",
+          "externalKey" : "ccp"
         }
       } ],
       "partyRole" : [ {
         "partyReference" : {
-          "externalReference" : "GlobalBank",
-          "globalReference" : "296093b7"
+          "globalReference" : "296093b7",
+          "externalReference" : "GlobalBank"
         },
-        "role" : "SELLER"
+        "role" : "Seller"
       }, {
         "partyReference" : {
-          "externalReference" : "UkBank",
-          "globalReference" : "1ef4886d"
+          "globalReference" : "1ef4886d",
+          "externalReference" : "UkBank"
         },
-        "role" : "BUYER"
+        "role" : "Buyer"
       }, {
         "partyReference" : {
-          "externalReference" : "ccp",
-          "globalReference" : "103f0"
+          "globalReference" : "103f0",
+          "externalReference" : "ccp"
         },
-        "role" : "CLEARING_ORGANIZATION"
+        "role" : "ClearingOrganization"
       } ],
-      "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "ccp",
-            "globalReference" : "103f0"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
-              "name" : {
-                "value" : "UK Bank plc"
-              }
+      "meta" : {
+        "globalKey" : "c748da47"
+      }
+    },
+    "state" : {
+      "positionState" : "Formed"
+    },
+    "meta" : {
+      "globalKey" : "946e50ea"
+    }
+  }, {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "CCP123"
+        },
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "CCP123-FISG1G1LENDFP00283GAMMA",
+            "meta" : {
+              "scheme" : "UnqTradIdr"
             }
-          },
-          "role" : "PARTY_2"
+          }
         } ],
+        "meta" : {
+          "globalKey" : "2d2770aa"
+        }
+      } ],
+      "tradeDate" : {
+        "value" : "2021-03-18",
+        "meta" : {
+          "globalKey" : "3f28d2"
+        }
+      },
+      "tradableProduct" : {
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -1045,6 +1003,81 @@
               "productQualifier" : "RepurchaseAgreement"
             } ],
             "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-19",
+                  "meta" : {
+                    "globalKey" : "3f28d3"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d3",
+                  "externalKey" : "PurchaseDate"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
+                  "meta" : {
+                    "globalKey" : "3f28d6"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
+                }
+              },
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "69ca64cc"
+                }
+              },
               "collateral" : {
                 "collateralPortfolio" : [ {
                   "value" : {
@@ -1055,114 +1088,114 @@
                             "payout" : {
                               "assetPayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
                                 "principalPayment" : {
-                                  "finalPayment" : true,
                                   "initialPayment" : true,
+                                  "finalPayment" : true,
                                   "intermediatePayment" : false,
                                   "meta" : {
                                     "globalKey" : "12a6f5"
                                   }
                                 },
                                 "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "75229c9e"
+                                        "globalKey" : "71834796"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "71834796"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "de136e51"
+                                        "globalKey" : "da741949"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "da741949"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
                                 "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
                                   "security" : {
                                     "productIdentifier" : [ {
                                       "value" : {
                                         "identifier" : {
                                           "value" : "GB00B24FF097"
                                         },
+                                        "source" : "ISIN",
                                         "meta" : {
                                           "globalKey" : "1ad6d034"
-                                        },
-                                        "source" : "ISIN"
+                                        }
                                       }
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityType" : "Debt"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e7ac7fce"
+                            "globalKey" : "12a4a1fe"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e7ac7fce"
+                      "globalKey" : "12a4a1fe"
                     }
                   }
                 } ],
                 "collateralProvisions" : {
-                  "collateralType" : "CASH",
+                  "collateralType" : "Cash",
                   "eligibleCollateral" : [ {
                     "criteria" : [ {
                       "treatment" : {
@@ -1176,305 +1209,212 @@
                     }
                   } ]
                 }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d3"
-                  },
-                  "unadjustedDate" : "2021-03-19"
-                },
-                "meta" : {
-                  "externalKey" : "PurchaseDate",
-                  "globalKey" : "3f28d3"
-                }
-              },
-              "payout" : {
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "6a2c670c"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d6"
-                  },
-                  "unadjustedDate" : "2021-03-22"
-                },
-                "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
-                }
               }
             },
             "meta" : {
-              "globalKey" : "1a2ab30d"
+              "globalKey" : "c6dfdca3"
             }
           },
           "meta" : {
-            "globalKey" : "1a2ab30d"
+            "globalKey" : "c6dfdca3"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "fd5ebec6"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.004,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 0.004,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 9974250,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 9974250
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "c886a5fe"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "1ad6d034"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "GB00B24FF097"
-                  },
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "source" : "ISIN"
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-2"
+                  "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "ae7919fa"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 1.0075,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 1.0075,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                "priceType" : "ASSET_PRICE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "AssetPrice",
+                "priceExpression" : "PercentageOfNotional"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 10000000,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 10000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
+              }
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "GB00B24FF097"
+                  },
+                  "source" : "ISIN",
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "1ad6d034"
               }
-            } ]
-          } ]
-        } ]
-      },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f28d2"
-        },
-        "value" : "2021-03-18"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "UnqTradIdr"
             },
-            "value" : "CCP123-FISG1G1LENDFP00283GAMMA"
-          }
+            "meta" : {
+              "globalKey" : "a8870d90"
+            }
+          } ]
         } ],
-        "issuer" : {
-          "value" : "CCP123"
-        },
-        "meta" : {
-          "globalKey" : "2ca97d6e"
-        }
-      } ]
-    }
-  }, {
-    "meta" : {
-      "globalKey" : "78f4c9dc"
-    },
-    "state" : {
-      "closedState" : {
-        "state" : "TERMINATED"
-      },
-      "positionState" : "CLOSED"
-    },
-    "trade" : {
-      "meta" : {
-        "globalKey" : "c28ab28b"
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "103f0",
+            "externalReference" : "ccp"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
+              }
+            }
+          }
+        } ]
       },
       "party" : [ {
-        "meta" : {
-          "externalKey" : "GlobalBank",
-          "globalKey" : "296093b7"
-        },
         "name" : {
-          "value" : "Global Bank Inc"
+          "value" : "CCP"
+        },
+        "meta" : {
+          "globalKey" : "103f0",
+          "externalKey" : "ccp"
         }
       }, {
-        "meta" : {
-          "externalKey" : "UkBank",
-          "globalKey" : "1ef4886d"
-        },
         "name" : {
           "value" : "UK Bank plc"
-        }
-      }, {
-        "meta" : {
-          "externalKey" : "ccp",
-          "globalKey" : "103f0"
         },
-        "name" : {
-          "value" : "CCP"
+        "meta" : {
+          "globalKey" : "1ef4886d",
+          "externalKey" : "UkBank"
         }
       } ],
       "partyRole" : [ {
         "partyReference" : {
-          "externalReference" : "GlobalBank",
-          "globalReference" : "296093b7"
+          "globalReference" : "296093b7",
+          "externalReference" : "GlobalBank"
         },
-        "role" : "SELLER"
+        "role" : "Seller"
       }, {
         "partyReference" : {
-          "externalReference" : "UkBank",
-          "globalReference" : "1ef4886d"
+          "globalReference" : "1ef4886d",
+          "externalReference" : "UkBank"
         },
-        "role" : "BUYER"
+        "role" : "Buyer"
       }, {
         "partyReference" : {
-          "externalReference" : "ccp",
-          "globalReference" : "103f0"
+          "globalReference" : "103f0",
+          "externalReference" : "ccp"
         },
-        "role" : "CLEARING_ORGANIZATION"
+        "role" : "ClearingOrganization"
       } ],
-      "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
-              },
-              "name" : {
-                "value" : "Global Bank Inc"
-              }
-            }
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
-              "name" : {
-                "value" : "UK Bank plc"
-              }
+      "meta" : {
+        "globalKey" : "8aeec2e6"
+      }
+    },
+    "state" : {
+      "positionState" : "Formed"
+    },
+    "meta" : {
+      "globalKey" : "63c8dc9"
+    }
+  }, {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "KTKLLEILLLLLLLLLLLLL"
+        },
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+            "meta" : {
+              "scheme" : "UnqTradIdr"
             }
-          },
-          "role" : "PARTY_2"
+          }
         } ],
+        "meta" : {
+          "globalKey" : "32cd87f2"
+        }
+      } ],
+      "tradeDate" : {
+        "value" : "2021-03-18",
+        "meta" : {
+          "globalKey" : "3f28d2"
+        }
+      },
+      "tradableProduct" : {
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -1489,6 +1429,81 @@
               "productQualifier" : "RepurchaseAgreement"
             } ],
             "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-19",
+                  "meta" : {
+                    "globalKey" : "3f28d3"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d3",
+                  "externalKey" : "PurchaseDate"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
+                  "meta" : {
+                    "globalKey" : "3f28d6"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
+                }
+              },
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "69ca64cc"
+                }
+              },
               "collateral" : {
                 "collateralPortfolio" : [ {
                   "value" : {
@@ -1499,114 +1514,114 @@
                             "payout" : {
                               "assetPayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
                                 "principalPayment" : {
-                                  "finalPayment" : true,
                                   "initialPayment" : true,
+                                  "finalPayment" : true,
                                   "intermediatePayment" : false,
                                   "meta" : {
                                     "globalKey" : "12a6f5"
                                   }
                                 },
                                 "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "75229c9e"
+                                        "globalKey" : "71834796"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "71834796"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "de136e51"
+                                        "globalKey" : "da741949"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "da741949"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
                                 "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
                                   "security" : {
                                     "productIdentifier" : [ {
                                       "value" : {
                                         "identifier" : {
                                           "value" : "GB00B24FF097"
                                         },
+                                        "source" : "ISIN",
                                         "meta" : {
                                           "globalKey" : "1ad6d034"
-                                        },
-                                        "source" : "ISIN"
+                                        }
                                       }
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityType" : "Debt"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e7ac7fce"
+                            "globalKey" : "12a4a1fe"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e7ac7fce"
+                      "globalKey" : "12a4a1fe"
                     }
                   }
                 } ],
                 "collateralProvisions" : {
-                  "collateralType" : "CASH",
+                  "collateralType" : "Cash",
                   "eligibleCollateral" : [ {
                     "criteria" : [ {
                       "treatment" : {
@@ -1620,222 +1635,207 @@
                     }
                   } ]
                 }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d3"
-                  },
-                  "unadjustedDate" : "2021-03-19"
-                },
-                "meta" : {
-                  "externalKey" : "PurchaseDate",
-                  "globalKey" : "3f28d3"
-                }
-              },
-              "payout" : {
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "6a2c670c"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d6"
-                  },
-                  "unadjustedDate" : "2021-03-22"
-                },
-                "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
-                }
               }
             },
             "meta" : {
-              "globalKey" : "1a2ab30d"
+              "globalKey" : "c6dfdca3"
             }
           },
           "meta" : {
-            "globalKey" : "1a2ab30d"
+            "globalKey" : "c6dfdca3"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "2d65fdc6"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.004,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 0.004,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 0,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 0
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "f435dd0d"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "1ad6d034"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "GB00B24FF097"
-                  },
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "source" : "ISIN"
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-2"
+                  "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "7f59bafa"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 1.0075,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 1.0075,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                "priceType" : "ASSET_PRICE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "AssetPrice",
+                "priceExpression" : "PercentageOfNotional"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 0,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 0
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "GB00B24FF097"
+                  },
+                  "source" : "ISIN",
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "1ad6d034"
+              }
+            },
+            "meta" : {
+              "globalKey" : "40cd97a1"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "Global Bank Inc"
+              },
+              "meta" : {
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
+              }
+            }
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
+              }
+            }
+          }
         } ]
       },
-      "tradeDate" : {
+      "party" : [ {
+        "name" : {
+          "value" : "Global Bank Inc"
+        },
         "meta" : {
-          "globalKey" : "3f28d2"
+          "globalKey" : "296093b7",
+          "externalKey" : "GlobalBank"
+        }
+      }, {
+        "name" : {
+          "value" : "UK Bank plc"
         },
-        "value" : "2021-03-18"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "UnqTradIdr"
-            },
-            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-          }
-        } ],
-        "issuer" : {
-          "value" : "KTKLLEILLLLLLLLLLLLL"
+        "meta" : {
+          "globalKey" : "1ef4886d",
+          "externalKey" : "UkBank"
+        }
+      }, {
+        "name" : {
+          "value" : "CCP"
         },
         "meta" : {
-          "globalKey" : "4a82737e"
+          "globalKey" : "103f0",
+          "externalKey" : "ccp"
         }
-      } ]
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "296093b7",
+          "externalReference" : "GlobalBank"
+        },
+        "role" : "Seller"
+      }, {
+        "partyReference" : {
+          "globalReference" : "1ef4886d",
+          "externalReference" : "UkBank"
+        },
+        "role" : "Buyer"
+      }, {
+        "partyReference" : {
+          "globalReference" : "103f0",
+          "externalReference" : "ccp"
+        },
+        "role" : "ClearingOrganization"
+      } ],
+      "meta" : {
+        "globalKey" : "6b856483"
+      }
+    },
+    "state" : {
+      "closedState" : {
+        "state" : "Terminated"
+      },
+      "positionState" : "Closed"
+    },
+    "meta" : {
+      "globalKey" : "e8198f92"
     }
   } ],
-  "eventQualifier" : "ClearedTrade",
   "meta" : {
-    "globalKey" : "5abf3683"
+    "globalKey" : "2ef432b5"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/clearing-via-open-offer-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/clearing-via-open-offer-output.json
index 238408153a..bbf54e49ca 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/clearing-via-open-offer-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/clearing-via-open-offer-output.json
@@ -1,4 +1,5 @@
 {
+  "intent" : "Clearing",
   "eventDate" : "2021-03-18",
   "instruction" : [ {
     "primitiveInstruction" : {
@@ -6,11 +7,11 @@
         "legalAgreement" : [ {
           "agreementDate" : "2021-03-18",
           "contractualParty" : [ {
-            "externalReference" : "UkBank",
-            "globalReference" : "1ef4886d"
+            "globalReference" : "1ef4886d",
+            "externalReference" : "UkBank"
           }, {
-            "externalReference" : "ccp",
-            "globalReference" : "103f0"
+            "globalReference" : "103f0",
+            "externalReference" : "ccp"
           } ],
           "meta" : {
             "globalKey" : "f1fcbcd"
@@ -18,171 +19,6 @@
         } ]
       },
       "execution" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
-              },
-              "name" : {
-                "value" : "Global Bank Inc"
-              }
-            }
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
-              "name" : {
-                "value" : "UK Bank plc"
-              }
-            }
-          },
-          "role" : "PARTY_2"
-        } ],
-        "parties" : [ {
-          "meta" : {
-            "externalKey" : "ccp",
-            "globalKey" : "103f0"
-          },
-          "name" : {
-            "value" : "CCP"
-          }
-        }, {
-          "meta" : {
-            "externalKey" : "UkBank",
-            "globalKey" : "1ef4886d"
-          },
-          "name" : {
-            "value" : "UK Bank plc"
-          }
-        } ],
-        "partyRoles" : [ {
-          "partyReference" : {
-            "externalReference" : "ccp",
-            "globalReference" : "103f0"
-          },
-          "role" : "SELLER"
-        }, {
-          "partyReference" : {
-            "externalReference" : "ccp",
-            "globalReference" : "103f0"
-          },
-          "role" : "CLEARING_ORGANIZATION"
-        }, {
-          "partyReference" : {
-            "externalReference" : "UkBank",
-            "globalReference" : "1ef4886d"
-          },
-          "role" : "BUYER"
-        } ],
-        "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "fd5ebec6"
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 0.004,
-              "perUnitOf" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 9974250
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "c886a5fe"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "1ad6d034"
-            },
-            "productIdentifier" : [ {
-              "value" : {
-                "identifier" : {
-                  "value" : "GB00B24FF097"
-                },
-                "meta" : {
-                  "globalKey" : "1ad6d034"
-                },
-                "source" : "ISIN"
-              }
-            } ]
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 1.0075,
-              "perUnitOf" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 10000000
-            }
-          } ]
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -197,6 +33,81 @@
               "productQualifier" : "RepurchaseAgreement"
             } ],
             "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-19",
+                  "meta" : {
+                    "globalKey" : "3f28d3"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d3",
+                  "externalKey" : "PurchaseDate"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
+                  "meta" : {
+                    "globalKey" : "3f28d6"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
+                }
+              },
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "69ca64cc"
+                }
+              },
               "collateral" : {
                 "collateralPortfolio" : [ {
                   "value" : {
@@ -207,114 +118,114 @@
                             "payout" : {
                               "assetPayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
                                 "principalPayment" : {
-                                  "finalPayment" : true,
                                   "initialPayment" : true,
+                                  "finalPayment" : true,
                                   "intermediatePayment" : false,
                                   "meta" : {
                                     "globalKey" : "12a6f5"
                                   }
                                 },
                                 "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "75229c9e"
+                                        "globalKey" : "71834796"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "71834796"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "de136e51"
+                                        "globalKey" : "da741949"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "da741949"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
                                 "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
                                   "security" : {
                                     "productIdentifier" : [ {
                                       "value" : {
                                         "identifier" : {
                                           "value" : "GB00B24FF097"
                                         },
+                                        "source" : "ISIN",
                                         "meta" : {
                                           "globalKey" : "1ad6d034"
-                                        },
-                                        "source" : "ISIN"
+                                        }
                                       }
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityType" : "Debt"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e7ac7fce"
+                            "globalKey" : "12a4a1fe"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e7ac7fce"
+                      "globalKey" : "12a4a1fe"
                     }
                   }
                 } ],
                 "collateralProvisions" : {
-                  "collateralType" : "CASH",
+                  "collateralType" : "Cash",
                   "eligibleCollateral" : [ {
                     "criteria" : [ {
                       "treatment" : {
@@ -328,430 +239,430 @@
                     }
                   } ]
                 }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d3"
-                  },
-                  "unadjustedDate" : "2021-03-19"
-                },
-                "meta" : {
-                  "externalKey" : "PurchaseDate",
-                  "globalKey" : "3f28d3"
-                }
-              },
-              "payout" : {
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "6a2c670c"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d6"
-                  },
-                  "unadjustedDate" : "2021-03-22"
-                },
-                "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
-                }
               }
             },
             "meta" : {
-              "globalKey" : "1a2ab30d"
+              "globalKey" : "c6dfdca3"
             }
           },
           "meta" : {
-            "globalKey" : "1a2ab30d"
+            "globalKey" : "c6dfdca3"
           }
         },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f28d2"
-          },
-          "value" : "2021-03-18"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "UnqTradIdr"
-              },
-              "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-            }
-          } ],
-          "issuer" : {
-            "value" : "KTKLLEILLLLLLLLLLLLL"
-          },
-          "meta" : {
-            "globalKey" : "4a82737e"
-          }
-        } ]
-      }
-    }
-  }, {
-    "primitiveInstruction" : {
-      "contractFormation" : {
-        "legalAgreement" : [ {
-          "agreementDate" : "2021-03-18",
-          "contractualParty" : [ {
-            "externalReference" : "GlobalBank",
-            "globalReference" : "296093b7"
-          }, {
-            "externalReference" : "ccp",
-            "globalReference" : "103f0"
-          } ],
-          "meta" : {
-            "globalKey" : "ce2782ea"
-          }
-        } ]
-      },
-      "execution" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
-              },
-              "name" : {
-                "value" : "Global Bank Inc"
-              }
-            }
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
-              "name" : {
-                "value" : "UK Bank plc"
-              }
-            }
-          },
-          "role" : "PARTY_2"
-        } ],
-        "parties" : [ {
-          "meta" : {
-            "externalKey" : "GlobalBank",
-            "globalKey" : "296093b7"
-          },
-          "name" : {
-            "value" : "Global Bank Inc"
-          }
-        }, {
-          "meta" : {
-            "externalKey" : "ccp",
-            "globalKey" : "103f0"
-          },
-          "name" : {
-            "value" : "CCP"
-          }
-        } ],
-        "partyRoles" : [ {
-          "partyReference" : {
-            "externalReference" : "GlobalBank",
-            "globalReference" : "296093b7"
-          },
-          "role" : "SELLER"
-        }, {
-          "partyReference" : {
-            "externalReference" : "ccp",
-            "globalReference" : "103f0"
-          },
-          "role" : "BUYER"
-        }, {
-          "partyReference" : {
-            "externalReference" : "ccp",
-            "globalReference" : "103f0"
-          },
-          "role" : "CLEARING_ORGANIZATION"
-        } ],
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "fd5ebec6"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.004,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "value" : 0.004,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 9974250,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 9974250
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "c886a5fe"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "1ad6d034"
-            },
-            "productIdentifier" : [ {
-              "value" : {
-                "identifier" : {
-                  "value" : "GB00B24FF097"
-                },
-                "meta" : {
-                  "globalKey" : "1ad6d034"
-                },
-                "source" : "ISIN"
               }
-            } ]
-          },
-          "price" : [ {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "ae7919fa"
+          }
+        }, {
+          "price" : [ {
             "value" : {
+              "value" : 1.0075,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "value" : 1.0075,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "AssetPrice",
+              "priceExpression" : "PercentageOfNotional"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-2"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 10000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        } ],
-        "product" : {
-          "contractualProduct" : {
-            "productTaxonomy" : [ {
-              "source" : "CFI",
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
               "value" : {
-                "name" : {
-                  "value" : "LRSTXD"
+                "identifier" : {
+                  "value" : "GB00B24FF097"
+                },
+                "source" : "ISIN",
+                "meta" : {
+                  "globalKey" : "1ad6d034"
                 }
               }
-            }, {
-              "source" : "ISDA",
-              "productQualifier" : "RepurchaseAgreement"
             } ],
-            "economicTerms" : {
-              "collateral" : {
-                "collateralPortfolio" : [ {
-                  "value" : {
-                    "collateralPosition" : [ {
-                      "product" : {
-                        "contractualProduct" : {
-                          "economicTerms" : {
-                            "payout" : {
-                              "assetPayout" : [ {
-                                "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
-                                },
-                                "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
-                                  "quantitySchedule" : {
-                                    "address" : {
-                                      "scope" : "DOCUMENT",
-                                      "value" : "quantity-2"
-                                    }
-                                  }
-                                },
-                                "principalPayment" : {
-                                  "finalPayment" : true,
-                                  "initialPayment" : true,
-                                  "intermediatePayment" : false,
-                                  "meta" : {
-                                    "globalKey" : "12a6f5"
-                                  }
-                                },
-                                "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                                  "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
-                                    },
+            "meta" : {
+              "globalKey" : "1ad6d034"
+            }
+          },
+          "meta" : {
+            "globalKey" : "a8870d90"
+          }
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "Global Bank Inc"
+              },
+              "meta" : {
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
+              }
+            }
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
+              }
+            }
+          }
+        } ],
+        "parties" : [ {
+          "name" : {
+            "value" : "CCP"
+          },
+          "meta" : {
+            "globalKey" : "103f0",
+            "externalKey" : "ccp"
+          }
+        }, {
+          "name" : {
+            "value" : "UK Bank plc"
+          },
+          "meta" : {
+            "globalKey" : "1ef4886d",
+            "externalKey" : "UkBank"
+          }
+        } ],
+        "partyRoles" : [ {
+          "partyReference" : {
+            "globalReference" : "103f0",
+            "externalReference" : "ccp"
+          },
+          "role" : "Seller"
+        }, {
+          "partyReference" : {
+            "globalReference" : "103f0",
+            "externalReference" : "ccp"
+          },
+          "role" : "ClearingOrganization"
+        }, {
+          "partyReference" : {
+            "globalReference" : "1ef4886d",
+            "externalReference" : "UkBank"
+          },
+          "role" : "Buyer"
+        } ],
+        "tradeDate" : {
+          "value" : "2021-03-18",
+          "meta" : {
+            "globalKey" : "3f28d2"
+          }
+        },
+        "tradeIdentifier" : [ {
+          "issuer" : {
+            "value" : "KTKLLEILLLLLLLLLLLLL"
+          },
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+              "meta" : {
+                "scheme" : "UnqTradIdr"
+              }
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "32cd87f2"
+          }
+        } ]
+      }
+    }
+  }, {
+    "primitiveInstruction" : {
+      "contractFormation" : {
+        "legalAgreement" : [ {
+          "agreementDate" : "2021-03-18",
+          "contractualParty" : [ {
+            "globalReference" : "296093b7",
+            "externalReference" : "GlobalBank"
+          }, {
+            "globalReference" : "103f0",
+            "externalReference" : "ccp"
+          } ],
+          "meta" : {
+            "globalKey" : "ce2782ea"
+          }
+        } ]
+      },
+      "execution" : {
+        "product" : {
+          "contractualProduct" : {
+            "productTaxonomy" : [ {
+              "source" : "CFI",
+              "value" : {
+                "name" : {
+                  "value" : "LRSTXD"
+                }
+              }
+            }, {
+              "source" : "ISDA",
+              "productQualifier" : "RepurchaseAgreement"
+            } ],
+            "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-19",
+                  "meta" : {
+                    "globalKey" : "3f28d3"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d3",
+                  "externalKey" : "PurchaseDate"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
+                  "meta" : {
+                    "globalKey" : "3f28d6"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
+                }
+              },
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "69ca64cc"
+                }
+              },
+              "collateral" : {
+                "collateralPortfolio" : [ {
+                  "value" : {
+                    "collateralPosition" : [ {
+                      "product" : {
+                        "contractualProduct" : {
+                          "economicTerms" : {
+                            "payout" : {
+                              "assetPayout" : [ {
+                                "payerReceiver" : {
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
+                                },
+                                "priceQuantity" : {
+                                  "quantitySchedule" : {
+                                    "address" : {
+                                      "scope" : "DOCUMENT",
+                                      "value" : "quantity-2"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
+                                  }
+                                },
+                                "principalPayment" : {
+                                  "initialPayment" : true,
+                                  "finalPayment" : true,
+                                  "intermediatePayment" : false,
+                                  "meta" : {
+                                    "globalKey" : "12a6f5"
+                                  }
+                                },
+                                "assetLeg" : [ {
+                                  "settlementDate" : {
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "75229c9e"
+                                        "globalKey" : "71834796"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "71834796"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "de136e51"
+                                        "globalKey" : "da741949"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "da741949"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
                                 "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
                                   "security" : {
                                     "productIdentifier" : [ {
                                       "value" : {
                                         "identifier" : {
                                           "value" : "GB00B24FF097"
                                         },
+                                        "source" : "ISIN",
                                         "meta" : {
                                           "globalKey" : "1ad6d034"
-                                        },
-                                        "source" : "ISIN"
+                                        }
                                       }
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityType" : "Debt"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e7ac7fce"
+                            "globalKey" : "12a4a1fe"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e7ac7fce"
+                      "globalKey" : "12a4a1fe"
                     }
                   }
                 } ],
                 "collateralProvisions" : {
-                  "collateralType" : "CASH",
+                  "collateralType" : "Cash",
                   "eligibleCollateral" : [ {
                     "criteria" : [ {
                       "treatment" : {
@@ -765,210 +676,232 @@
                     }
                   } ]
                 }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d3"
-                  },
-                  "unadjustedDate" : "2021-03-19"
-                },
-                "meta" : {
-                  "externalKey" : "PurchaseDate",
-                  "globalKey" : "3f28d3"
+              }
+            },
+            "meta" : {
+              "globalKey" : "c6dfdca3"
+            }
+          },
+          "meta" : {
+            "globalKey" : "c6dfdca3"
+          }
+        },
+        "priceQuantity" : [ {
+          "price" : [ {
+            "value" : {
+              "value" : 0.004,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
                 }
               },
-              "payout" : {
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "6a2c670c"
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "GBP"
                 }
               },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d6"
-                  },
-                  "unadjustedDate" : "2021-03-22"
-                },
-                "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 9974250,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
                 }
               }
             },
             "meta" : {
-              "globalKey" : "1a2ab30d"
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          },
+          } ],
           "meta" : {
-            "globalKey" : "1a2ab30d"
+            "globalKey" : "ae7919fa"
           }
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f28d2"
-          },
-          "value" : "2021-03-18"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "UnqTradIdr"
+        }, {
+          "price" : [ {
+            "value" : {
+              "value" : 1.0075,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
               },
-              "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
+              "priceType" : "AssetPrice",
+              "priceExpression" : "PercentageOfNotional"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
             }
           } ],
-          "issuer" : {
-            "value" : "KTKLLEILLLLLLLLLLLLL"
-          },
-          "meta" : {
-            "globalKey" : "4a82737e"
-          }
-        } ]
-      }
-    }
-  } ],
-  "intent" : "CLEARING",
-  "after" : [ {
-    "meta" : {
-      "globalKey" : "b3ef3e8b"
-    },
-    "state" : {
-      "positionState" : "FORMED"
-    },
-    "trade" : {
-      "contractDetails" : {
-        "documentation" : [ {
-          "agreementDate" : "2021-03-18",
-          "contractualParty" : [ {
-            "externalReference" : "UkBank",
-            "globalReference" : "1ef4886d"
-          }, {
-            "externalReference" : "ccp",
-            "globalReference" : "103f0"
+          "quantity" : [ {
+            "value" : {
+              "value" : 10000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
           } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "GB00B24FF097"
+                },
+                "source" : "ISIN",
+                "meta" : {
+                  "globalKey" : "1ad6d034"
+                }
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "1ad6d034"
+            }
+          },
           "meta" : {
-            "globalKey" : "f1fcbcd"
+            "globalKey" : "a8870d90"
           }
         } ],
-        "meta" : {
-          "globalKey" : "f1fcbcd"
-        }
-      },
-      "meta" : {
-        "globalKey" : "64c6d4ce"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "ccp",
-          "globalKey" : "103f0"
-        },
-        "name" : {
-          "value" : "CCP"
-        }
-      }, {
-        "meta" : {
-          "externalKey" : "UkBank",
-          "globalKey" : "1ef4886d"
-        },
-        "name" : {
-          "value" : "UK Bank plc"
-        }
-      } ],
-      "partyRole" : [ {
-        "partyReference" : {
-          "externalReference" : "ccp",
-          "globalReference" : "103f0"
-        },
-        "role" : "SELLER"
-      }, {
-        "partyReference" : {
-          "externalReference" : "ccp",
-          "globalReference" : "103f0"
-        },
-        "role" : "CLEARING_ORGANIZATION"
-      }, {
-        "partyReference" : {
-          "externalReference" : "UkBank",
-          "globalReference" : "1ef4886d"
-        },
-        "role" : "BUYER"
-      } ],
-      "tradableProduct" : {
         "counterparty" : [ {
+          "role" : "Party1",
           "partyReference" : {
             "value" : {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
-              },
               "name" : {
                 "value" : "Global Bank Inc"
+              },
+              "meta" : {
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
+              }
+            }
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
               }
             }
+          }
+        } ],
+        "parties" : [ {
+          "name" : {
+            "value" : "Global Bank Inc"
+          },
+          "meta" : {
+            "globalKey" : "296093b7",
+            "externalKey" : "GlobalBank"
+          }
+        }, {
+          "name" : {
+            "value" : "CCP"
+          },
+          "meta" : {
+            "globalKey" : "103f0",
+            "externalKey" : "ccp"
+          }
+        } ],
+        "partyRoles" : [ {
+          "partyReference" : {
+            "globalReference" : "296093b7",
+            "externalReference" : "GlobalBank"
+          },
+          "role" : "Seller"
+        }, {
+          "partyReference" : {
+            "globalReference" : "103f0",
+            "externalReference" : "ccp"
+          },
+          "role" : "Buyer"
+        }, {
+          "partyReference" : {
+            "globalReference" : "103f0",
+            "externalReference" : "ccp"
+          },
+          "role" : "ClearingOrganization"
+        } ],
+        "tradeDate" : {
+          "value" : "2021-03-18",
+          "meta" : {
+            "globalKey" : "3f28d2"
+          }
+        },
+        "tradeIdentifier" : [ {
+          "issuer" : {
+            "value" : "KTKLLEILLLLLLLLLLLLL"
           },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
               "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
-              "name" : {
-                "value" : "UK Bank plc"
+                "scheme" : "UnqTradIdr"
               }
             }
-          },
-          "role" : "PARTY_2"
+          } ],
+          "meta" : {
+            "globalKey" : "32cd87f2"
+          }
+        } ]
+      }
+    }
+  } ],
+  "eventQualifier" : "OpenOfferClearedTrade",
+  "after" : [ {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "KTKLLEILLLLLLLLLLLLL"
+        },
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+            "meta" : {
+              "scheme" : "UnqTradIdr"
+            }
+          }
         } ],
+        "meta" : {
+          "globalKey" : "32cd87f2"
+        }
+      } ],
+      "tradeDate" : {
+        "value" : "2021-03-18",
+        "meta" : {
+          "globalKey" : "3f28d2"
+        }
+      },
+      "tradableProduct" : {
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -983,6 +916,81 @@
               "productQualifier" : "RepurchaseAgreement"
             } ],
             "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-19",
+                  "meta" : {
+                    "globalKey" : "3f28d3"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d3",
+                  "externalKey" : "PurchaseDate"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
+                  "meta" : {
+                    "globalKey" : "3f28d6"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
+                }
+              },
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "69ca64cc"
+                }
+              },
               "collateral" : {
                 "collateralPortfolio" : [ {
                   "value" : {
@@ -993,114 +1001,114 @@
                             "payout" : {
                               "assetPayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
                                 "principalPayment" : {
-                                  "finalPayment" : true,
                                   "initialPayment" : true,
+                                  "finalPayment" : true,
                                   "intermediatePayment" : false,
                                   "meta" : {
                                     "globalKey" : "12a6f5"
                                   }
                                 },
                                 "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "75229c9e"
+                                        "globalKey" : "71834796"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "71834796"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "de136e51"
+                                        "globalKey" : "da741949"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "da741949"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
                                 "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
                                   "security" : {
                                     "productIdentifier" : [ {
                                       "value" : {
                                         "identifier" : {
                                           "value" : "GB00B24FF097"
                                         },
+                                        "source" : "ISIN",
                                         "meta" : {
                                           "globalKey" : "1ad6d034"
-                                        },
-                                        "source" : "ISIN"
+                                        }
                                       }
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityType" : "Debt"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e7ac7fce"
+                            "globalKey" : "12a4a1fe"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e7ac7fce"
+                      "globalKey" : "12a4a1fe"
                     }
                   }
                 } ],
                 "collateralProvisions" : {
-                  "collateralType" : "CASH",
+                  "collateralType" : "Cash",
                   "eligibleCollateral" : [ {
                     "criteria" : [ {
                       "treatment" : {
@@ -1114,312 +1122,237 @@
                     }
                   } ]
                 }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d3"
-                  },
-                  "unadjustedDate" : "2021-03-19"
-                },
-                "meta" : {
-                  "externalKey" : "PurchaseDate",
-                  "globalKey" : "3f28d3"
-                }
-              },
-              "payout" : {
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "6a2c670c"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d6"
-                  },
-                  "unadjustedDate" : "2021-03-22"
-                },
-                "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
-                }
               }
             },
             "meta" : {
-              "globalKey" : "1a2ab30d"
+              "globalKey" : "c6dfdca3"
             }
           },
           "meta" : {
-            "globalKey" : "1a2ab30d"
+            "globalKey" : "c6dfdca3"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "fd5ebec6"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.004,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 0.004,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 9974250,
                 "unit" : {
                   "currency" : {
-                    "value" : "GBP"
-                  }
-                },
-                "value" : 9974250
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "c886a5fe"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "1ad6d034"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "GB00B24FF097"
-                  },
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "source" : "ISIN"
+                    "value" : "GBP"
+                  }
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-2"
+                  "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "ae7919fa"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 1.0075,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 1.0075,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                "priceType" : "ASSET_PRICE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "AssetPrice",
+                "priceExpression" : "PercentageOfNotional"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 10000000,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 10000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
+              }
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "GB00B24FF097"
+                  },
+                  "source" : "ISIN",
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "1ad6d034"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "a8870d90"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "Global Bank Inc"
+              },
+              "meta" : {
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
+              }
+            }
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
+              }
+            }
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f28d2"
+      "party" : [ {
+        "name" : {
+          "value" : "CCP"
         },
-        "value" : "2021-03-18"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "UnqTradIdr"
-            },
-            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-          }
-        } ],
-        "issuer" : {
-          "value" : "KTKLLEILLLLLLLLLLLLL"
+        "meta" : {
+          "globalKey" : "103f0",
+          "externalKey" : "ccp"
+        }
+      }, {
+        "name" : {
+          "value" : "UK Bank plc"
         },
         "meta" : {
-          "globalKey" : "4a82737e"
+          "globalKey" : "1ef4886d",
+          "externalKey" : "UkBank"
         }
-      } ]
-    }
-  }, {
-    "meta" : {
-      "globalKey" : "38fb1aa1"
-    },
-    "state" : {
-      "positionState" : "FORMED"
-    },
-    "trade" : {
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "103f0",
+          "externalReference" : "ccp"
+        },
+        "role" : "Seller"
+      }, {
+        "partyReference" : {
+          "globalReference" : "103f0",
+          "externalReference" : "ccp"
+        },
+        "role" : "ClearingOrganization"
+      }, {
+        "partyReference" : {
+          "globalReference" : "1ef4886d",
+          "externalReference" : "UkBank"
+        },
+        "role" : "Buyer"
+      } ],
       "contractDetails" : {
         "documentation" : [ {
           "agreementDate" : "2021-03-18",
           "contractualParty" : [ {
-            "externalReference" : "GlobalBank",
-            "globalReference" : "296093b7"
+            "globalReference" : "1ef4886d",
+            "externalReference" : "UkBank"
           }, {
-            "externalReference" : "ccp",
-            "globalReference" : "103f0"
+            "globalReference" : "103f0",
+            "externalReference" : "ccp"
           } ],
           "meta" : {
-            "globalKey" : "ce2782ea"
+            "globalKey" : "f1fcbcd"
           }
         } ],
         "meta" : {
-          "globalKey" : "ce2782ea"
+          "globalKey" : "f1fcbcd"
         }
       },
       "meta" : {
-        "globalKey" : "e9d2b0e4"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "GlobalBank",
-          "globalKey" : "296093b7"
+        "globalKey" : "24128900"
+      }
+    },
+    "state" : {
+      "positionState" : "Formed"
+    },
+    "meta" : {
+      "globalKey" : "e5873563"
+    }
+  }, {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "KTKLLEILLLLLLLLLLLLL"
         },
-        "name" : {
-          "value" : "Global Bank Inc"
-        }
-      }, {
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+            "meta" : {
+              "scheme" : "UnqTradIdr"
+            }
+          }
+        } ],
         "meta" : {
-          "externalKey" : "ccp",
-          "globalKey" : "103f0"
-        },
-        "name" : {
-          "value" : "CCP"
+          "globalKey" : "32cd87f2"
         }
       } ],
-      "partyRole" : [ {
-        "partyReference" : {
-          "externalReference" : "GlobalBank",
-          "globalReference" : "296093b7"
-        },
-        "role" : "SELLER"
-      }, {
-        "partyReference" : {
-          "externalReference" : "ccp",
-          "globalReference" : "103f0"
-        },
-        "role" : "BUYER"
-      }, {
-        "partyReference" : {
-          "externalReference" : "ccp",
-          "globalReference" : "103f0"
-        },
-        "role" : "CLEARING_ORGANIZATION"
-      } ],
+      "tradeDate" : {
+        "value" : "2021-03-18",
+        "meta" : {
+          "globalKey" : "3f28d2"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
-              },
-              "name" : {
-                "value" : "Global Bank Inc"
-              }
-            }
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
-              "name" : {
-                "value" : "UK Bank plc"
-              }
-            }
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -1434,6 +1367,81 @@
               "productQualifier" : "RepurchaseAgreement"
             } ],
             "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-19",
+                  "meta" : {
+                    "globalKey" : "3f28d3"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d3",
+                  "externalKey" : "PurchaseDate"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
+                  "meta" : {
+                    "globalKey" : "3f28d6"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
+                }
+              },
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "69ca64cc"
+                }
+              },
               "collateral" : {
                 "collateralPortfolio" : [ {
                   "value" : {
@@ -1444,114 +1452,114 @@
                             "payout" : {
                               "assetPayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
                                 "principalPayment" : {
-                                  "finalPayment" : true,
                                   "initialPayment" : true,
+                                  "finalPayment" : true,
                                   "intermediatePayment" : false,
                                   "meta" : {
                                     "globalKey" : "12a6f5"
                                   }
                                 },
                                 "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "75229c9e"
+                                        "globalKey" : "71834796"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "71834796"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "de136e51"
+                                        "globalKey" : "da741949"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "da741949"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
                                 "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
                                   "security" : {
                                     "productIdentifier" : [ {
                                       "value" : {
                                         "identifier" : {
                                           "value" : "GB00B24FF097"
                                         },
+                                        "source" : "ISIN",
                                         "meta" : {
                                           "globalKey" : "1ad6d034"
-                                        },
-                                        "source" : "ISIN"
+                                        }
                                       }
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityType" : "Debt"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e7ac7fce"
+                            "globalKey" : "12a4a1fe"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e7ac7fce"
+                      "globalKey" : "12a4a1fe"
                     }
                   }
                 } ],
                 "collateralProvisions" : {
-                  "collateralType" : "CASH",
+                  "collateralType" : "Cash",
                   "eligibleCollateral" : [ {
                     "criteria" : [ {
                       "treatment" : {
@@ -1565,222 +1573,214 @@
                     }
                   } ]
                 }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d3"
-                  },
-                  "unadjustedDate" : "2021-03-19"
-                },
-                "meta" : {
-                  "externalKey" : "PurchaseDate",
-                  "globalKey" : "3f28d3"
-                }
-              },
-              "payout" : {
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "6a2c670c"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d6"
-                  },
-                  "unadjustedDate" : "2021-03-22"
-                },
-                "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
-                }
               }
             },
             "meta" : {
-              "globalKey" : "1a2ab30d"
+              "globalKey" : "c6dfdca3"
             }
           },
           "meta" : {
-            "globalKey" : "1a2ab30d"
+            "globalKey" : "c6dfdca3"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "fd5ebec6"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.004,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 0.004,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 9974250,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 9974250
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "c886a5fe"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "1ad6d034"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "GB00B24FF097"
-                  },
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "source" : "ISIN"
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-2"
+                  "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "ae7919fa"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 1.0075,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 1.0075,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                "priceType" : "ASSET_PRICE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "AssetPrice",
+                "priceExpression" : "PercentageOfNotional"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 10000000,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 10000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
+              }
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "GB00B24FF097"
+                  },
+                  "source" : "ISIN",
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "1ad6d034"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "a8870d90"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "Global Bank Inc"
+              },
+              "meta" : {
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
+              }
+            }
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
+              }
+            }
+          }
         } ]
       },
-      "tradeDate" : {
+      "party" : [ {
+        "name" : {
+          "value" : "Global Bank Inc"
+        },
         "meta" : {
-          "globalKey" : "3f28d2"
+          "globalKey" : "296093b7",
+          "externalKey" : "GlobalBank"
+        }
+      }, {
+        "name" : {
+          "value" : "CCP"
         },
-        "value" : "2021-03-18"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "UnqTradIdr"
-            },
-            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
+        "meta" : {
+          "globalKey" : "103f0",
+          "externalKey" : "ccp"
+        }
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "296093b7",
+          "externalReference" : "GlobalBank"
+        },
+        "role" : "Seller"
+      }, {
+        "partyReference" : {
+          "globalReference" : "103f0",
+          "externalReference" : "ccp"
+        },
+        "role" : "Buyer"
+      }, {
+        "partyReference" : {
+          "globalReference" : "103f0",
+          "externalReference" : "ccp"
+        },
+        "role" : "ClearingOrganization"
+      } ],
+      "contractDetails" : {
+        "documentation" : [ {
+          "agreementDate" : "2021-03-18",
+          "contractualParty" : [ {
+            "globalReference" : "296093b7",
+            "externalReference" : "GlobalBank"
+          }, {
+            "globalReference" : "103f0",
+            "externalReference" : "ccp"
+          } ],
+          "meta" : {
+            "globalKey" : "ce2782ea"
           }
         } ],
-        "issuer" : {
-          "value" : "KTKLLEILLLLLLLLLLLLL"
-        },
         "meta" : {
-          "globalKey" : "4a82737e"
+          "globalKey" : "ce2782ea"
         }
-      } ]
+      },
+      "meta" : {
+        "globalKey" : "43f1b82a"
+      }
+    },
+    "state" : {
+      "positionState" : "Formed"
+    },
+    "meta" : {
+      "globalKey" : "8a57420d"
     }
   } ],
-  "eventQualifier" : "OpenOfferClearedTrade",
   "meta" : {
-    "globalKey" : "7013a939"
+    "globalKey" : "d391eb7f"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-interest-payment-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-interest-payment-output.json
index a2f3b6b79e..09441eb994 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-interest-payment-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-interest-payment-output.json
@@ -1,77 +1,304 @@
 {
-  "effectiveDate" : "2021-03-18",
   "eventDate" : "2021-03-18",
+  "effectiveDate" : "2021-03-18",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "eaf9dc6e"
-        },
-        "state" : {
-          "positionState" : "FORMED"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "b9aaf231"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "GlobalBank",
-              "globalKey" : "296093b7"
-            },
-            "name" : {
-              "value" : "Global Bank Inc"
-            }
-          }, {
-            "meta" : {
-              "externalKey" : "UkBank",
-              "globalKey" : "1ef4886d"
-            },
-            "name" : {
-              "value" : "UK Bank plc"
-            }
-          } ],
-          "partyRole" : [ {
-            "partyReference" : {
-              "externalReference" : "GlobalBank",
-              "globalReference" : "296093b7"
-            },
-            "role" : "SELLER"
-          }, {
-            "partyReference" : {
-              "externalReference" : "UkBank",
-              "globalReference" : "1ef4886d"
-            },
-            "role" : "BUYER"
-          } ],
-          "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "value" : {
+    "primitiveInstruction" : {
+      "termsChange" : {
+        "product" : {
+          "contractualProduct" : {
+            "productTaxonomy" : [ {
+              "source" : "CFI",
+              "value" : {
+                "name" : {
+                  "value" : "LRSTXD"
+                }
+              }
+            } ],
+            "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-19",
                   "meta" : {
-                    "externalKey" : "GlobalBank",
-                    "globalKey" : "296093b7"
-                  },
-                  "name" : {
-                    "value" : "Global Bank Inc"
+                    "globalKey" : "3f28d3"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d3",
+                  "externalKey" : "PurchaseDate"
                 }
               },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "value" : {
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
                   "meta" : {
-                    "externalKey" : "UkBank",
-                    "globalKey" : "1ef4886d"
+                    "globalKey" : "3f28d6"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
+                }
+              },
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
-                  "name" : {
-                    "value" : "UK Bank plc"
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
                   }
+                } ],
+                "cashflow" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "value" : {
+                        "value" : 2000,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "GBP"
+                          }
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "a99b7d57"
+                    }
+                  },
+                  "settlementTerms" : {
+                    "settlementDate" : {
+                      "adjustableOrRelativeDate" : {
+                        "unadjustedDate" : "2021-03-21"
+                      },
+                      "meta" : {
+                        "globalKey" : "3f28d5"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d5"
+                    }
+                  },
+                  "cashflowType" : {
+                    "cashflowType" : "NetInterest"
+                  },
+                  "meta" : {
+                    "globalKey" : "11ce29f7"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "d5d876ab"
                 }
               },
-              "role" : "PARTY_2"
+              "collateral" : {
+                "collateralPortfolio" : [ {
+                  "value" : {
+                    "collateralPosition" : [ {
+                      "product" : {
+                        "contractualProduct" : {
+                          "economicTerms" : {
+                            "payout" : {
+                              "assetPayout" : [ {
+                                "payerReceiver" : {
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
+                                },
+                                "priceQuantity" : {
+                                  "quantitySchedule" : {
+                                    "address" : {
+                                      "scope" : "DOCUMENT",
+                                      "value" : "quantity-2"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
+                                  }
+                                },
+                                "principalPayment" : {
+                                  "initialPayment" : true,
+                                  "finalPayment" : true,
+                                  "intermediatePayment" : false,
+                                  "meta" : {
+                                    "globalKey" : "12a6f5"
+                                  }
+                                },
+                                "assetLeg" : [ {
+                                  "settlementDate" : {
+                                    "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
+                                      "meta" : {
+                                        "globalKey" : "71834796"
+                                      },
+                                      "businessDayConvention" : "NotApplicable",
+                                      "dateRelativeTo" : {
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "71834796"
+                                    }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
+                                }, {
+                                  "settlementDate" : {
+                                    "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
+                                      "meta" : {
+                                        "globalKey" : "da741949"
+                                      },
+                                      "businessDayConvention" : "NotApplicable",
+                                      "dateRelativeTo" : {
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "da741949"
+                                    }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
+                                } ],
+                                "securityInformation" : {
+                                  "security" : {
+                                    "productIdentifier" : [ {
+                                      "value" : {
+                                        "identifier" : {
+                                          "value" : "GB00B24FF097"
+                                        },
+                                        "source" : "ISIN",
+                                        "meta" : {
+                                          "globalKey" : "1ad6d034"
+                                        }
+                                      }
+                                    } ],
+                                    "securityType" : "Debt"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "40232adf"
+                                  }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
+                                }
+                              } ],
+                              "meta" : {
+                                "globalKey" : "12a4a1fe"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "12a4a1fe"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "12a4a1fe"
+                        }
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "12a4a1fe"
+                    }
+                  }
+                } ],
+                "collateralProvisions" : {
+                  "collateralType" : "Cash",
+                  "eligibleCollateral" : [ {
+                    "criteria" : [ {
+                      "treatment" : {
+                        "valuationTreatment" : {
+                          "marginPercentage" : 0.99
+                        }
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "16859e"
+                    }
+                  } ]
+                }
+              }
+            },
+            "meta" : {
+              "globalKey" : "5d7bfbae"
+            }
+          },
+          "meta" : {
+            "globalKey" : "5d7bfbae"
+          }
+        }
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "KTKLLEILLLLLLLLLLLLL"
+            },
+            "assignedIdentifier" : [ {
+              "identifier" : {
+                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+                "meta" : {
+                  "scheme" : "UnqTradIdr"
+                }
+              }
             } ],
+            "meta" : {
+              "globalKey" : "32cd87f2"
+            }
+          } ],
+          "tradeDate" : {
+            "value" : "2021-03-18",
+            "meta" : {
+              "globalKey" : "3f28d2"
+            }
+          },
+          "tradableProduct" : {
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -86,6 +313,81 @@
                   "productQualifier" : "RepurchaseAgreement"
                 } ],
                 "economicTerms" : {
+                  "effectiveDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-19",
+                      "meta" : {
+                        "globalKey" : "3f28d3"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d3",
+                      "externalKey" : "PurchaseDate"
+                    }
+                  },
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-22",
+                      "meta" : {
+                        "globalKey" : "3f28d6"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d6",
+                      "externalKey" : "RepurchaseDate"
+                    }
+                  },
+                  "payout" : {
+                    "interestRatePayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "priceQuantity" : {
+                        "quantitySchedule" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "quantity-1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      },
+                      "principalPayment" : {
+                        "initialPayment" : true,
+                        "finalPayment" : true,
+                        "intermediatePayment" : false,
+                        "meta" : {
+                          "globalKey" : "12a6f5"
+                        }
+                      },
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "meta" : {
+                        "globalKey" : "69ca64cc"
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "69ca64cc"
+                    }
+                  },
                   "collateral" : {
                     "collateralPortfolio" : [ {
                       "value" : {
@@ -96,114 +398,114 @@
                                 "payout" : {
                                   "assetPayout" : [ {
                                     "payerReceiver" : {
-                                      "payer" : "PARTY_1",
-                                      "receiver" : "PARTY_2"
+                                      "payer" : "Party1",
+                                      "receiver" : "Party2"
                                     },
                                     "priceQuantity" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
                                       "quantitySchedule" : {
                                         "address" : {
                                           "scope" : "DOCUMENT",
                                           "value" : "quantity-2"
                                         }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "0"
                                       }
                                     },
                                     "principalPayment" : {
-                                      "finalPayment" : true,
                                       "initialPayment" : true,
+                                      "finalPayment" : true,
                                       "intermediatePayment" : false,
                                       "meta" : {
                                         "globalKey" : "12a6f5"
                                       }
                                     },
                                     "assetLeg" : [ {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                       "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "75229c9e"
-                                        },
                                         "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
                                           "meta" : {
-                                            "globalKey" : "75229c9e"
+                                            "globalKey" : "71834796"
                                           },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
+                                          "businessDayConvention" : "NotApplicable",
                                           "dateRelativeTo" : {
-                                            "externalReference" : "PurchaseDate",
-                                            "globalReference" : "3f28d3"
+                                            "globalReference" : "3f28d3",
+                                            "externalReference" : "PurchaseDate"
                                           }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "71834796"
                                         }
-                                      }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
                                     }, {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                       "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "de136e51"
-                                        },
                                         "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
                                           "meta" : {
-                                            "globalKey" : "de136e51"
+                                            "globalKey" : "da741949"
                                           },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
+                                          "businessDayConvention" : "NotApplicable",
                                           "dateRelativeTo" : {
-                                            "externalReference" : "RepurchaseDate",
-                                            "globalReference" : "3f28d6"
+                                            "globalReference" : "3f28d6",
+                                            "externalReference" : "RepurchaseDate"
                                           }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "da741949"
                                         }
-                                      }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
                                     } ],
-                                    "durationType" : {
-                                      "durationType" : "TERM"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "e7ac7fce"
-                                    },
                                     "securityInformation" : {
-                                      "meta" : {
-                                        "globalKey" : "40232adf"
-                                      },
                                       "security" : {
                                         "productIdentifier" : [ {
                                           "value" : {
                                             "identifier" : {
                                               "value" : "GB00B24FF097"
                                             },
+                                            "source" : "ISIN",
                                             "meta" : {
                                               "globalKey" : "1ad6d034"
-                                            },
-                                            "source" : "ISIN"
+                                            }
                                           }
                                         } ],
-                                        "securityType" : "DEBT"
+                                        "securityType" : "Debt"
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "40232adf"
                                       }
+                                    },
+                                    "durationType" : {
+                                      "durationType" : "Term"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "12a4a1fe"
                                     }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "e7ac7fce"
+                                    "globalKey" : "12a4a1fe"
                                   }
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             },
                             "meta" : {
-                              "globalKey" : "e7ac7fce"
+                              "globalKey" : "12a4a1fe"
                             }
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "collateralProvisions" : {
-                      "collateralType" : "CASH",
+                      "collateralType" : "Cash",
                       "eligibleCollateral" : [ {
                         "criteria" : [ {
                           "treatment" : {
@@ -217,454 +519,278 @@
                         }
                       } ]
                     }
-                  },
-                  "effectiveDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d3"
-                      },
-                      "unadjustedDate" : "2021-03-19"
-                    },
-                    "meta" : {
-                      "externalKey" : "PurchaseDate",
-                      "globalKey" : "3f28d3"
-                    }
-                  },
-                  "payout" : {
-                    "interestRatePayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
-                      },
-                      "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "quantitySchedule" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "quantity-1"
-                          }
-                        }
-                      },
-                      "principalPayment" : {
-                        "finalPayment" : true,
-                        "initialPayment" : true,
-                        "intermediatePayment" : false,
-                        "meta" : {
-                          "globalKey" : "12a6f5"
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "6a2c670c"
-                      },
-                      "rateSpecification" : {
-                        "fixedRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
-                          }
-                        }
-                      }
-                    } ],
-                    "meta" : {
-                      "globalKey" : "6a2c670c"
-                    }
-                  },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d6"
-                      },
-                      "unadjustedDate" : "2021-03-22"
-                    },
-                    "meta" : {
-                      "externalKey" : "RepurchaseDate",
-                      "globalKey" : "3f28d6"
-                    }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "1a2ab30d"
+                  "globalKey" : "c6dfdca3"
                 }
               },
               "meta" : {
-                "globalKey" : "1a2ab30d"
+                "globalKey" : "c6dfdca3"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "fd5ebec6"
-                },
                 "price" : [ {
+                  "value" : {
+                    "value" : 0.004,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
+                    },
+                    "perUnitOf" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
+                    },
+                    "priceType" : "InterestRate"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
+                  }
+                } ],
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 9974250,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "price-1"
+                      "value" : "quantity-1"
                     } ]
-                  },
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "ae7919fa"
+                }
+              }, {
+                "price" : [ {
                   "value" : {
+                    "value" : 1.0075,
                     "unit" : {
                       "currency" : {
                         "value" : "GBP"
                       }
                     },
-                    "value" : 0.004,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "GBP"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "AssetPrice",
+                    "priceExpression" : "PercentageOfNotional"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
+                      "value" : "price-2"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 10000000,
                     "unit" : {
                       "currency" : {
                         "value" : "GBP"
                       }
-                    },
-                    "value" : 9974250
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "c886a5fe"
-                },
+                } ],
                 "observable" : {
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
                   "productIdentifier" : [ {
                     "value" : {
                       "identifier" : {
                         "value" : "GB00B24FF097"
                       },
+                      "source" : "ISIN",
                       "meta" : {
                         "globalKey" : "1ad6d034"
-                      },
-                      "source" : "ISIN"
+                      }
                     }
-                  } ]
-                },
-                "price" : [ {
+                  } ],
                   "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "value" : 1.0075,
-                    "perUnitOf" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                    "priceType" : "ASSET_PRICE"
+                    "globalKey" : "1ad6d034"
                   }
-                } ],
-                "quantity" : [ {
+                },
+                "meta" : {
+                  "globalKey" : "a8870d90"
+                }
+              } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "value" : {
+                  "name" : {
+                    "value" : "Global Bank Inc"
+                  },
                   "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
-                    } ]
+                    "globalKey" : "296093b7",
+                    "externalKey" : "GlobalBank"
+                  }
+                }
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "value" : {
+                  "name" : {
+                    "value" : "UK Bank plc"
                   },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "value" : 10000000
+                  "meta" : {
+                    "globalKey" : "1ef4886d",
+                    "externalKey" : "UkBank"
                   }
-                } ]
-              } ]
+                }
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f28d2"
+          "party" : [ {
+            "name" : {
+              "value" : "Global Bank Inc"
             },
-            "value" : "2021-03-18"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "UnqTradIdr"
-                },
-                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-              }
-            } ],
-            "issuer" : {
-              "value" : "KTKLLEILLLLLLLLLLLLL"
+            "meta" : {
+              "globalKey" : "296093b7",
+              "externalKey" : "GlobalBank"
+            }
+          }, {
+            "name" : {
+              "value" : "UK Bank plc"
             },
             "meta" : {
-              "globalKey" : "4a82737e"
+              "globalKey" : "1ef4886d",
+              "externalKey" : "UkBank"
             }
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "termsChange" : {
-        "product" : {
-          "contractualProduct" : {
-            "productTaxonomy" : [ {
-              "source" : "CFI",
-              "value" : {
-                "name" : {
-                  "value" : "LRSTXD"
-                }
-              }
-            } ],
-            "economicTerms" : {
-              "collateral" : {
-                "collateralPortfolio" : [ {
-                  "value" : {
-                    "collateralPosition" : [ {
-                      "product" : {
-                        "contractualProduct" : {
-                          "economicTerms" : {
-                            "payout" : {
-                              "assetPayout" : [ {
-                                "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
-                                },
-                                "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
-                                  "quantitySchedule" : {
-                                    "address" : {
-                                      "scope" : "DOCUMENT",
-                                      "value" : "quantity-2"
-                                    }
-                                  }
-                                },
-                                "principalPayment" : {
-                                  "finalPayment" : true,
-                                  "initialPayment" : true,
-                                  "intermediatePayment" : false,
-                                  "meta" : {
-                                    "globalKey" : "12a6f5"
-                                  }
-                                },
-                                "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                                  "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
-                                    },
-                                    "relativeDate" : {
-                                      "meta" : {
-                                        "globalKey" : "75229c9e"
-                                      },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
-                                      "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
-                                      }
-                                    }
-                                  }
-                                }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                                  "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
-                                    },
-                                    "relativeDate" : {
-                                      "meta" : {
-                                        "globalKey" : "de136e51"
-                                      },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
-                                      "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
-                                      }
-                                    }
-                                  }
-                                } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
-                                "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
-                                  "security" : {
-                                    "productIdentifier" : [ {
-                                      "value" : {
-                                        "identifier" : {
-                                          "value" : "GB00B24FF097"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "1ad6d034"
-                                        },
-                                        "source" : "ISIN"
-                                      }
-                                    } ],
-                                    "securityType" : "DEBT"
-                                  }
-                                }
-                              } ],
-                              "meta" : {
-                                "globalKey" : "e7ac7fce"
-                              }
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "e7ac7fce"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "e7ac7fce"
-                        }
-                      }
-                    } ],
-                    "meta" : {
-                      "globalKey" : "e7ac7fce"
-                    }
-                  }
-                } ],
-                "collateralProvisions" : {
-                  "collateralType" : "CASH",
-                  "eligibleCollateral" : [ {
-                    "criteria" : [ {
-                      "treatment" : {
-                        "valuationTreatment" : {
-                          "marginPercentage" : 0.99
-                        }
-                      }
-                    } ],
-                    "meta" : {
-                      "globalKey" : "16859e"
-                    }
-                  } ]
+          } ],
+          "partyRole" : [ {
+            "partyReference" : {
+              "globalReference" : "296093b7",
+              "externalReference" : "GlobalBank"
+            },
+            "role" : "Seller"
+          }, {
+            "partyReference" : {
+              "globalReference" : "1ef4886d",
+              "externalReference" : "UkBank"
+            },
+            "role" : "Buyer"
+          } ],
+          "meta" : {
+            "globalKey" : "b62aaee7"
+          }
+        },
+        "state" : {
+          "positionState" : "Formed"
+        },
+        "meta" : {
+          "globalKey" : "522d7d8a"
+        }
+      }
+    }
+  } ],
+  "after" : [ {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "KTKLLEILLLLLLLLLLLLL"
+        },
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+            "meta" : {
+              "scheme" : "UnqTradIdr"
+            }
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "32cd87f2"
+        }
+      } ],
+      "tradeDate" : {
+        "value" : "2021-03-18",
+        "meta" : {
+          "globalKey" : "3f28d2"
+        }
+      },
+      "tradableProduct" : {
+        "product" : {
+          "contractualProduct" : {
+            "productTaxonomy" : [ {
+              "source" : "CFI",
+              "value" : {
+                "name" : {
+                  "value" : "LRSTXD"
                 }
-              },
+              }
+            } ],
+            "economicTerms" : {
               "effectiveDate" : {
                 "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-19",
                   "meta" : {
                     "globalKey" : "3f28d3"
-                  },
-                  "unadjustedDate" : "2021-03-19"
+                  }
                 },
                 "meta" : {
-                  "externalKey" : "PurchaseDate",
-                  "globalKey" : "3f28d3"
+                  "globalKey" : "3f28d3",
+                  "externalKey" : "PurchaseDate"
                 }
               },
-              "payout" : {
-                "cashflow" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "a99b7d57"
-                    },
-                    "quantitySchedule" : {
-                      "value" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "GBP"
-                          }
-                        },
-                        "value" : 2000
-                      }
-                    }
-                  },
-                  "settlementTerms" : {
-                    "meta" : {
-                      "globalKey" : "3f28d5"
-                    },
-                    "settlementDate" : {
-                      "adjustableOrRelativeDate" : {
-                        "unadjustedDate" : "2021-03-21"
-                      },
-                      "meta" : {
-                        "globalKey" : "3f28d5"
-                      }
-                    }
-                  },
-                  "cashflowType" : {
-                    "cashflowType" : "NET_INTEREST"
-                  },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
                   "meta" : {
-                    "globalKey" : "11ce29f7"
+                    "globalKey" : "3f28d6"
                   }
-                } ],
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
+                }
+              },
+              "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
                   "principalPayment" : {
-                    "finalPayment" : true,
                     "initialPayment" : true,
+                    "finalPayment" : true,
                     "intermediatePayment" : false,
                     "meta" : {
                       "globalKey" : "12a6f5"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
                   "rateSpecification" : {
                     "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "rateSchedule" : {
                         "price" : {
                           "address" : {
@@ -672,118 +798,63 @@
                             "value" : "price-1"
                           }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
                   }
                 } ],
-                "meta" : {
-                  "globalKey" : "123254c3"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d6"
+                "cashflow" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
-                  "unadjustedDate" : "2021-03-22"
-                },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "value" : {
+                        "value" : 2000,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "GBP"
+                          }
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "a99b7d57"
+                    }
+                  },
+                  "settlementTerms" : {
+                    "settlementDate" : {
+                      "adjustableOrRelativeDate" : {
+                        "unadjustedDate" : "2021-03-21"
+                      },
+                      "meta" : {
+                        "globalKey" : "3f28d5"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d5"
+                    }
+                  },
+                  "cashflowType" : {
+                    "cashflowType" : "NetInterest"
+                  },
+                  "meta" : {
+                    "globalKey" : "11ce29f7"
+                  }
+                } ],
                 "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
+                  "globalKey" : "d5d876ab"
                 }
-              }
-            },
-            "meta" : {
-              "globalKey" : "49e7dad0"
-            }
-          },
-          "meta" : {
-            "globalKey" : "49e7dad0"
-          }
-        }
-      }
-    }
-  } ],
-  "after" : [ {
-    "meta" : {
-      "globalKey" : "8a8e473b"
-    },
-    "state" : {
-      "positionState" : "FORMED"
-    },
-    "trade" : {
-      "meta" : {
-        "globalKey" : "86a90fd8"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "GlobalBank",
-          "globalKey" : "296093b7"
-        },
-        "name" : {
-          "value" : "Global Bank Inc"
-        }
-      }, {
-        "meta" : {
-          "externalKey" : "UkBank",
-          "globalKey" : "1ef4886d"
-        },
-        "name" : {
-          "value" : "UK Bank plc"
-        }
-      } ],
-      "partyRole" : [ {
-        "partyReference" : {
-          "externalReference" : "GlobalBank",
-          "globalReference" : "296093b7"
-        },
-        "role" : "SELLER"
-      }, {
-        "partyReference" : {
-          "externalReference" : "UkBank",
-          "globalReference" : "1ef4886d"
-        },
-        "role" : "BUYER"
-      } ],
-      "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
-              },
-              "name" : {
-                "value" : "Global Bank Inc"
-              }
-            }
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
               },
-              "name" : {
-                "value" : "UK Bank plc"
-              }
-            }
-          },
-          "role" : "PARTY_2"
-        } ],
-        "product" : {
-          "contractualProduct" : {
-            "productTaxonomy" : [ {
-              "source" : "CFI",
-              "value" : {
-                "name" : {
-                  "value" : "LRSTXD"
-                }
-              }
-            } ],
-            "economicTerms" : {
               "collateral" : {
                 "collateralPortfolio" : [ {
                   "value" : {
@@ -794,114 +865,114 @@
                             "payout" : {
                               "assetPayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
                                 "principalPayment" : {
-                                  "finalPayment" : true,
                                   "initialPayment" : true,
+                                  "finalPayment" : true,
                                   "intermediatePayment" : false,
                                   "meta" : {
                                     "globalKey" : "12a6f5"
                                   }
                                 },
                                 "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "75229c9e"
+                                        "globalKey" : "71834796"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "71834796"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "de136e51"
+                                        "globalKey" : "da741949"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "da741949"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
                                 "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
                                   "security" : {
                                     "productIdentifier" : [ {
                                       "value" : {
                                         "identifier" : {
                                           "value" : "GB00B24FF097"
                                         },
+                                        "source" : "ISIN",
                                         "meta" : {
                                           "globalKey" : "1ad6d034"
-                                        },
-                                        "source" : "ISIN"
+                                        }
                                       }
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityType" : "Debt"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e7ac7fce"
+                            "globalKey" : "12a4a1fe"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e7ac7fce"
+                      "globalKey" : "12a4a1fe"
                     }
                   }
                 } ],
                 "collateralProvisions" : {
-                  "collateralType" : "CASH",
+                  "collateralType" : "Cash",
                   "eligibleCollateral" : [ {
                     "criteria" : [ {
                       "treatment" : {
@@ -915,261 +986,190 @@
                     }
                   } ]
                 }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d3"
-                  },
-                  "unadjustedDate" : "2021-03-19"
-                },
-                "meta" : {
-                  "externalKey" : "PurchaseDate",
-                  "globalKey" : "3f28d3"
-                }
-              },
-              "payout" : {
-                "cashflow" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "a99b7d57"
-                    },
-                    "quantitySchedule" : {
-                      "value" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "GBP"
-                          }
-                        },
-                        "value" : 2000
-                      }
-                    }
-                  },
-                  "settlementTerms" : {
-                    "meta" : {
-                      "globalKey" : "3f28d5"
-                    },
-                    "settlementDate" : {
-                      "adjustableOrRelativeDate" : {
-                        "unadjustedDate" : "2021-03-21"
-                      },
-                      "meta" : {
-                        "globalKey" : "3f28d5"
-                      }
-                    }
-                  },
-                  "cashflowType" : {
-                    "cashflowType" : "NET_INTEREST"
-                  },
-                  "meta" : {
-                    "globalKey" : "11ce29f7"
-                  }
-                } ],
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "123254c3"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d6"
-                  },
-                  "unadjustedDate" : "2021-03-22"
-                },
-                "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
-                }
               }
             },
             "meta" : {
-              "globalKey" : "49e7dad0"
+              "globalKey" : "5d7bfbae"
             }
           },
           "meta" : {
-            "globalKey" : "49e7dad0"
+            "globalKey" : "5d7bfbae"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "fd5ebec6"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.004,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 0.004,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 9974250,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 9974250
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "c886a5fe"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "1ad6d034"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "GB00B24FF097"
-                  },
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "source" : "ISIN"
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-2"
+                  "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "ae7919fa"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 1.0075,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 1.0075,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                "priceType" : "ASSET_PRICE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "AssetPrice",
+                "priceExpression" : "PercentageOfNotional"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 10000000,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 10000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "GB00B24FF097"
+                  },
+                  "source" : "ISIN",
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "1ad6d034"
+              }
+            },
+            "meta" : {
+              "globalKey" : "a8870d90"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "Global Bank Inc"
+              },
+              "meta" : {
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
+              }
+            }
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
+              }
+            }
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f28d2"
+      "party" : [ {
+        "name" : {
+          "value" : "Global Bank Inc"
         },
-        "value" : "2021-03-18"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "UnqTradIdr"
-            },
-            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-          }
-        } ],
-        "issuer" : {
-          "value" : "KTKLLEILLLLLLLLLLLLL"
+        "meta" : {
+          "globalKey" : "296093b7",
+          "externalKey" : "GlobalBank"
+        }
+      }, {
+        "name" : {
+          "value" : "UK Bank plc"
         },
         "meta" : {
-          "globalKey" : "4a82737e"
+          "globalKey" : "1ef4886d",
+          "externalKey" : "UkBank"
         }
-      } ]
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "296093b7",
+          "externalReference" : "GlobalBank"
+        },
+        "role" : "Seller"
+      }, {
+        "partyReference" : {
+          "globalReference" : "1ef4886d",
+          "externalReference" : "UkBank"
+        },
+        "role" : "Buyer"
+      } ],
+      "meta" : {
+        "globalKey" : "f757a90e"
+      }
+    },
+    "state" : {
+      "positionState" : "Formed"
+    },
+    "meta" : {
+      "globalKey" : "fc0489f1"
     }
   } ],
   "meta" : {
-    "globalKey" : "23de3dfd"
+    "globalKey" : "2812c515"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-rate-change-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-rate-change-output.json
index 3e5a5ca0df..6b7f30b8d7 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-rate-change-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-rate-change-output.json
@@ -1,77 +1,54 @@
 {
-  "effectiveDate" : "2021-03-20",
   "eventDate" : "2021-03-20",
+  "effectiveDate" : "2021-03-20",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "eaf9dc6e"
-        },
-        "state" : {
-          "positionState" : "FORMED"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "b9aaf231"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "GlobalBank",
-              "globalKey" : "296093b7"
-            },
-            "name" : {
-              "value" : "Global Bank Inc"
-            }
-          }, {
-            "meta" : {
-              "externalKey" : "UkBank",
-              "globalKey" : "1ef4886d"
-            },
-            "name" : {
-              "value" : "UK Bank plc"
-            }
-          } ],
-          "partyRole" : [ {
-            "partyReference" : {
-              "externalReference" : "GlobalBank",
-              "globalReference" : "296093b7"
-            },
-            "role" : "SELLER"
-          }, {
-            "partyReference" : {
-              "externalReference" : "UkBank",
-              "globalReference" : "1ef4886d"
-            },
-            "role" : "BUYER"
-          } ],
-          "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
+    "primitiveInstruction" : {
+      "split" : {
+        "breakdown" : [ {
+          "quantityChange" : {
+            "change" : [ {
+              "quantity" : [ {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "GlobalBank",
-                    "globalKey" : "296093b7"
-                  },
-                  "name" : {
-                    "value" : "Global Bank Inc"
+                  "value" : 0,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
                   }
                 }
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
+              } ],
+              "meta" : {
+                "globalKey" : "16e4a5"
+              }
+            } ],
+            "direction" : "Replace"
+          }
+        }, {
+          "quantityChange" : {
+            "change" : [ {
+              "price" : [ {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "UkBank",
-                    "globalKey" : "1ef4886d"
+                  "value" : 0.005,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
                   },
-                  "name" : {
-                    "value" : "UK Bank plc"
-                  }
+                  "perUnitOf" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
+                  },
+                  "priceType" : "InterestRate"
                 }
-              },
-              "role" : "PARTY_2"
+              } ],
+              "meta" : {
+                "globalKey" : "edd3a6de"
+              }
             } ],
+            "direction" : "Replace"
+          },
+          "termsChange" : {
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -86,6 +63,80 @@
                   "productQualifier" : "RepurchaseAgreement"
                 } ],
                 "economicTerms" : {
+                  "effectiveDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-20",
+                      "meta" : {
+                        "globalKey" : "3f28d4"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d4"
+                    }
+                  },
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-22",
+                      "meta" : {
+                        "globalKey" : "3f28d6"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d6",
+                      "externalKey" : "RepurchaseDate"
+                    }
+                  },
+                  "payout" : {
+                    "interestRatePayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "priceQuantity" : {
+                        "quantitySchedule" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "quantity-1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      },
+                      "principalPayment" : {
+                        "initialPayment" : true,
+                        "finalPayment" : true,
+                        "intermediatePayment" : false,
+                        "meta" : {
+                          "globalKey" : "12a6f5"
+                        }
+                      },
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "meta" : {
+                        "globalKey" : "69ca64cc"
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "69ca64cc"
+                    }
+                  },
                   "collateral" : {
                     "collateralPortfolio" : [ {
                       "value" : {
@@ -96,114 +147,114 @@
                                 "payout" : {
                                   "assetPayout" : [ {
                                     "payerReceiver" : {
-                                      "payer" : "PARTY_1",
-                                      "receiver" : "PARTY_2"
+                                      "payer" : "Party1",
+                                      "receiver" : "Party2"
                                     },
                                     "priceQuantity" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
                                       "quantitySchedule" : {
                                         "address" : {
                                           "scope" : "DOCUMENT",
                                           "value" : "quantity-2"
                                         }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "0"
                                       }
                                     },
                                     "principalPayment" : {
-                                      "finalPayment" : true,
                                       "initialPayment" : true,
+                                      "finalPayment" : true,
                                       "intermediatePayment" : false,
                                       "meta" : {
                                         "globalKey" : "12a6f5"
                                       }
                                     },
                                     "assetLeg" : [ {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                       "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "75229c9e"
-                                        },
                                         "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
                                           "meta" : {
-                                            "globalKey" : "75229c9e"
+                                            "globalKey" : "71834796"
                                           },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
+                                          "businessDayConvention" : "NotApplicable",
                                           "dateRelativeTo" : {
-                                            "externalReference" : "PurchaseDate",
-                                            "globalReference" : "3f28d3"
+                                            "globalReference" : "3f28d3",
+                                            "externalReference" : "PurchaseDate"
                                           }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "71834796"
                                         }
-                                      }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
                                     }, {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                       "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "de136e51"
-                                        },
                                         "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
                                           "meta" : {
-                                            "globalKey" : "de136e51"
+                                            "globalKey" : "da741949"
                                           },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
+                                          "businessDayConvention" : "NotApplicable",
                                           "dateRelativeTo" : {
-                                            "externalReference" : "RepurchaseDate",
-                                            "globalReference" : "3f28d6"
+                                            "globalReference" : "3f28d6",
+                                            "externalReference" : "RepurchaseDate"
                                           }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "da741949"
                                         }
-                                      }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
                                     } ],
-                                    "durationType" : {
-                                      "durationType" : "TERM"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "e7ac7fce"
-                                    },
                                     "securityInformation" : {
-                                      "meta" : {
-                                        "globalKey" : "40232adf"
-                                      },
                                       "security" : {
                                         "productIdentifier" : [ {
                                           "value" : {
                                             "identifier" : {
                                               "value" : "GB00B24FF097"
                                             },
+                                            "source" : "ISIN",
                                             "meta" : {
                                               "globalKey" : "1ad6d034"
-                                            },
-                                            "source" : "ISIN"
+                                            }
                                           }
                                         } ],
-                                        "securityType" : "DEBT"
+                                        "securityType" : "Debt"
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "40232adf"
                                       }
+                                    },
+                                    "durationType" : {
+                                      "durationType" : "Term"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "12a4a1fe"
                                     }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "e7ac7fce"
+                                    "globalKey" : "12a4a1fe"
                                   }
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             },
                             "meta" : {
-                              "globalKey" : "e7ac7fce"
+                              "globalKey" : "12a4a1fe"
                             }
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "collateralProvisions" : {
-                      "collateralType" : "CASH",
+                      "collateralType" : "Cash",
                       "eligibleCollateral" : [ {
                         "criteria" : [ {
                           "treatment" : {
@@ -217,55 +268,111 @@
                         }
                       } ]
                     }
-                  },
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "aa0b8fe4"
+                }
+              },
+              "meta" : {
+                "globalKey" : "aa0b8fe4"
+              }
+            }
+          }
+        } ]
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "KTKLLEILLLLLLLLLLLLL"
+            },
+            "assignedIdentifier" : [ {
+              "identifier" : {
+                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+                "meta" : {
+                  "scheme" : "UnqTradIdr"
+                }
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "32cd87f2"
+            }
+          } ],
+          "tradeDate" : {
+            "value" : "2021-03-18",
+            "meta" : {
+              "globalKey" : "3f28d2"
+            }
+          },
+          "tradableProduct" : {
+            "product" : {
+              "contractualProduct" : {
+                "productTaxonomy" : [ {
+                  "source" : "CFI",
+                  "value" : {
+                    "name" : {
+                      "value" : "LRSTXD"
+                    }
+                  }
+                }, {
+                  "source" : "ISDA",
+                  "productQualifier" : "RepurchaseAgreement"
+                } ],
+                "economicTerms" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-19",
                       "meta" : {
                         "globalKey" : "3f28d3"
-                      },
-                      "unadjustedDate" : "2021-03-19"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d3",
+                      "externalKey" : "PurchaseDate"
+                    }
+                  },
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-22",
+                      "meta" : {
+                        "globalKey" : "3f28d6"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "PurchaseDate",
-                      "globalKey" : "3f28d3"
+                      "globalKey" : "3f28d6",
+                      "externalKey" : "RepurchaseDate"
                     }
                   },
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "principalPayment" : {
-                        "finalPayment" : true,
                         "initialPayment" : true,
+                        "finalPayment" : true,
                         "intermediatePayment" : false,
                         "meta" : {
                           "globalKey" : "12a6f5"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "6a2c670c"
-                      },
                       "rateSpecification" : {
                         "fixedRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "rateSchedule" : {
                             "price" : {
                               "address" : {
@@ -273,226 +380,23 @@
                                 "value" : "price-1"
                               }
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         }
-                      }
-                    } ],
-                    "meta" : {
-                      "globalKey" : "6a2c670c"
-                    }
-                  },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d6"
                       },
-                      "unadjustedDate" : "2021-03-22"
-                    },
-                    "meta" : {
-                      "externalKey" : "RepurchaseDate",
-                      "globalKey" : "3f28d6"
-                    }
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "1a2ab30d"
-                }
-              },
-              "meta" : {
-                "globalKey" : "1a2ab30d"
-              }
-            },
-            "tradeLot" : [ {
-              "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "fd5ebec6"
-                },
-                "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "value" : 0.004,
-                    "perUnitOf" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "value" : 9974250
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "c886a5fe"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "value" : "GB00B24FF097"
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
                       },
                       "meta" : {
-                        "globalKey" : "1ad6d034"
-                      },
-                      "source" : "ISIN"
-                    }
-                  } ]
-                },
-                "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "value" : 1.0075,
-                    "perUnitOf" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                    "priceType" : "ASSET_PRICE"
-                  }
-                } ],
-                "quantity" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
-                    } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "GBP"
+                        "globalKey" : "69ca64cc"
                       }
-                    },
-                    "value" : 10000000
-                  }
-                } ]
-              } ]
-            } ]
-          },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f28d2"
-            },
-            "value" : "2021-03-18"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "UnqTradIdr"
-                },
-                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-              }
-            } ],
-            "issuer" : {
-              "value" : "KTKLLEILLLLLLLLLLLLL"
-            },
-            "meta" : {
-              "globalKey" : "4a82737e"
-            }
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "split" : {
-        "breakdown" : [ {
-          "quantityChange" : {
-            "change" : [ {
-              "meta" : {
-                "globalKey" : "16e4a5"
-              },
-              "quantity" : [ {
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "GBP"
-                    }
-                  },
-                  "value" : 0
-                }
-              } ]
-            } ],
-            "direction" : "REPLACE"
-          }
-        }, {
-          "quantityChange" : {
-            "change" : [ {
-              "meta" : {
-                "globalKey" : "edd3a6de"
-              },
-              "price" : [ {
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "GBP"
-                    }
-                  },
-                  "value" : 0.005,
-                  "perUnitOf" : {
-                    "currency" : {
-                      "value" : "GBP"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "69ca64cc"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ]
-            } ],
-            "direction" : "REPLACE"
-          },
-          "termsChange" : {
-            "product" : {
-              "contractualProduct" : {
-                "productTaxonomy" : [ {
-                  "source" : "CFI",
-                  "value" : {
-                    "name" : {
-                      "value" : "LRSTXD"
-                    }
-                  }
-                }, {
-                  "source" : "ISDA",
-                  "productQualifier" : "RepurchaseAgreement"
-                } ],
-                "economicTerms" : {
                   "collateral" : {
                     "collateralPortfolio" : [ {
                       "value" : {
@@ -503,114 +407,114 @@
                                 "payout" : {
                                   "assetPayout" : [ {
                                     "payerReceiver" : {
-                                      "payer" : "PARTY_1",
-                                      "receiver" : "PARTY_2"
+                                      "payer" : "Party1",
+                                      "receiver" : "Party2"
                                     },
                                     "priceQuantity" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
                                       "quantitySchedule" : {
                                         "address" : {
                                           "scope" : "DOCUMENT",
                                           "value" : "quantity-2"
                                         }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "0"
                                       }
                                     },
                                     "principalPayment" : {
-                                      "finalPayment" : true,
                                       "initialPayment" : true,
+                                      "finalPayment" : true,
                                       "intermediatePayment" : false,
                                       "meta" : {
                                         "globalKey" : "12a6f5"
                                       }
                                     },
                                     "assetLeg" : [ {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                       "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "75229c9e"
-                                        },
                                         "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
                                           "meta" : {
-                                            "globalKey" : "75229c9e"
+                                            "globalKey" : "71834796"
                                           },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
+                                          "businessDayConvention" : "NotApplicable",
                                           "dateRelativeTo" : {
-                                            "externalReference" : "PurchaseDate",
-                                            "globalReference" : "3f28d3"
+                                            "globalReference" : "3f28d3",
+                                            "externalReference" : "PurchaseDate"
                                           }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "71834796"
                                         }
-                                      }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
                                     }, {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                       "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "de136e51"
-                                        },
                                         "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
                                           "meta" : {
-                                            "globalKey" : "de136e51"
+                                            "globalKey" : "da741949"
                                           },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
+                                          "businessDayConvention" : "NotApplicable",
                                           "dateRelativeTo" : {
-                                            "externalReference" : "RepurchaseDate",
-                                            "globalReference" : "3f28d6"
+                                            "globalReference" : "3f28d6",
+                                            "externalReference" : "RepurchaseDate"
                                           }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "da741949"
                                         }
-                                      }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
                                     } ],
-                                    "durationType" : {
-                                      "durationType" : "TERM"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "e7ac7fce"
-                                    },
                                     "securityInformation" : {
-                                      "meta" : {
-                                        "globalKey" : "40232adf"
-                                      },
                                       "security" : {
                                         "productIdentifier" : [ {
                                           "value" : {
                                             "identifier" : {
                                               "value" : "GB00B24FF097"
                                             },
+                                            "source" : "ISIN",
                                             "meta" : {
                                               "globalKey" : "1ad6d034"
-                                            },
-                                            "source" : "ISIN"
+                                            }
                                           }
                                         } ],
-                                        "securityType" : "DEBT"
+                                        "securityType" : "Debt"
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "40232adf"
                                       }
+                                    },
+                                    "durationType" : {
+                                      "durationType" : "Term"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "12a4a1fe"
                                     }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "e7ac7fce"
+                                    "globalKey" : "12a4a1fe"
                                   }
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             },
                             "meta" : {
-                              "globalKey" : "e7ac7fce"
+                              "globalKey" : "12a4a1fe"
                             }
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "collateralProvisions" : {
-                      "collateralType" : "CASH",
+                      "collateralType" : "Cash",
                       "eligibleCollateral" : [ {
                         "criteria" : [ {
                           "treatment" : {
@@ -624,167 +528,217 @@
                         }
                       } ]
                     }
-                  },
-                  "effectiveDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d4"
-                      },
-                      "unadjustedDate" : "2021-03-20"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c6dfdca3"
+                }
+              },
+              "meta" : {
+                "globalKey" : "c6dfdca3"
+              }
+            },
+            "tradeLot" : [ {
+              "priceQuantity" : [ {
+                "price" : [ {
+                  "value" : {
+                    "value" : 0.004,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
                     },
-                    "meta" : {
-                      "globalKey" : "3f28d4"
+                    "perUnitOf" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
+                    },
+                    "priceType" : "InterestRate"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
+                  }
+                } ],
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 9974250,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
                     }
                   },
-                  "payout" : {
-                    "interestRatePayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
-                      },
-                      "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "quantitySchedule" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "quantity-1"
-                          }
-                        }
-                      },
-                      "principalPayment" : {
-                        "finalPayment" : true,
-                        "initialPayment" : true,
-                        "intermediatePayment" : false,
-                        "meta" : {
-                          "globalKey" : "12a6f5"
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "6a2c670c"
-                      },
-                      "rateSpecification" : {
-                        "fixedRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
-                          }
-                        }
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    } ]
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "ae7919fa"
+                }
+              }, {
+                "price" : [ {
+                  "value" : {
+                    "value" : 1.0075,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
+                    },
+                    "perUnitOf" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
+                    },
+                    "priceType" : "AssetPrice",
+                    "priceExpression" : "PercentageOfNotional"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-2"
+                    } ]
+                  }
+                } ],
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 10000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "GBP"
                       }
-                    } ],
-                    "meta" : {
-                      "globalKey" : "6a2c670c"
                     }
                   },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d6"
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
+                  }
+                } ],
+                "observable" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "GB00B24FF097"
                       },
-                      "unadjustedDate" : "2021-03-22"
-                    },
-                    "meta" : {
-                      "externalKey" : "RepurchaseDate",
-                      "globalKey" : "3f28d6"
+                      "source" : "ISIN",
+                      "meta" : {
+                        "globalKey" : "1ad6d034"
+                      }
                     }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "e7d514ce"
+                  "globalKey" : "a8870d90"
+                }
+              } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "value" : {
+                  "name" : {
+                    "value" : "Global Bank Inc"
+                  },
+                  "meta" : {
+                    "globalKey" : "296093b7",
+                    "externalKey" : "GlobalBank"
+                  }
+                }
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "value" : {
+                  "name" : {
+                    "value" : "UK Bank plc"
+                  },
+                  "meta" : {
+                    "globalKey" : "1ef4886d",
+                    "externalKey" : "UkBank"
+                  }
                 }
-              },
-              "meta" : {
-                "globalKey" : "e7d514ce"
               }
+            } ]
+          },
+          "party" : [ {
+            "name" : {
+              "value" : "Global Bank Inc"
+            },
+            "meta" : {
+              "globalKey" : "296093b7",
+              "externalKey" : "GlobalBank"
             }
+          }, {
+            "name" : {
+              "value" : "UK Bank plc"
+            },
+            "meta" : {
+              "globalKey" : "1ef4886d",
+              "externalKey" : "UkBank"
+            }
+          } ],
+          "partyRole" : [ {
+            "partyReference" : {
+              "globalReference" : "296093b7",
+              "externalReference" : "GlobalBank"
+            },
+            "role" : "Seller"
+          }, {
+            "partyReference" : {
+              "globalReference" : "1ef4886d",
+              "externalReference" : "UkBank"
+            },
+            "role" : "Buyer"
+          } ],
+          "meta" : {
+            "globalKey" : "b62aaee7"
           }
-        } ]
+        },
+        "state" : {
+          "positionState" : "Formed"
+        },
+        "meta" : {
+          "globalKey" : "522d7d8a"
+        }
       }
     }
   } ],
+  "eventQualifier" : "OnDemandRateChange",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "28b21b91"
-    },
-    "state" : {
-      "closedState" : {
-        "state" : "TERMINATED"
-      },
-      "positionState" : "CLOSED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "25234300"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "GlobalBank",
-          "globalKey" : "296093b7"
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "KTKLLEILLLLLLLLLLLLL"
         },
-        "name" : {
-          "value" : "Global Bank Inc"
-        }
-      }, {
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+            "meta" : {
+              "scheme" : "UnqTradIdr"
+            }
+          }
+        } ],
         "meta" : {
-          "externalKey" : "UkBank",
-          "globalKey" : "1ef4886d"
-        },
-        "name" : {
-          "value" : "UK Bank plc"
+          "globalKey" : "32cd87f2"
         }
       } ],
-      "partyRole" : [ {
-        "partyReference" : {
-          "externalReference" : "GlobalBank",
-          "globalReference" : "296093b7"
-        },
-        "role" : "SELLER"
-      }, {
-        "partyReference" : {
-          "externalReference" : "UkBank",
-          "globalReference" : "1ef4886d"
-        },
-        "role" : "BUYER"
-      } ],
+      "tradeDate" : {
+        "value" : "2021-03-18",
+        "meta" : {
+          "globalKey" : "3f28d2"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
-              },
-              "name" : {
-                "value" : "Global Bank Inc"
-              }
-            }
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
-              "name" : {
-                "value" : "UK Bank plc"
-              }
-            }
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -799,6 +753,81 @@
               "productQualifier" : "RepurchaseAgreement"
             } ],
             "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-19",
+                  "meta" : {
+                    "globalKey" : "3f28d3"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d3",
+                  "externalKey" : "PurchaseDate"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
+                  "meta" : {
+                    "globalKey" : "3f28d6"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
+                }
+              },
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "69ca64cc"
+                }
+              },
               "collateral" : {
                 "collateralPortfolio" : [ {
                   "value" : {
@@ -809,114 +838,114 @@
                             "payout" : {
                               "assetPayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
                                 "principalPayment" : {
-                                  "finalPayment" : true,
                                   "initialPayment" : true,
+                                  "finalPayment" : true,
                                   "intermediatePayment" : false,
                                   "meta" : {
                                     "globalKey" : "12a6f5"
                                   }
                                 },
                                 "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "75229c9e"
+                                        "globalKey" : "71834796"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "71834796"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "de136e51"
+                                        "globalKey" : "da741949"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "da741949"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
                                 "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
                                   "security" : {
                                     "productIdentifier" : [ {
                                       "value" : {
                                         "identifier" : {
                                           "value" : "GB00B24FF097"
                                         },
+                                        "source" : "ISIN",
                                         "meta" : {
                                           "globalKey" : "1ad6d034"
-                                        },
-                                        "source" : "ISIN"
+                                        }
                                       }
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityType" : "Debt"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e7ac7fce"
+                            "globalKey" : "12a4a1fe"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e7ac7fce"
+                      "globalKey" : "12a4a1fe"
                     }
                   }
                 } ],
                 "collateralProvisions" : {
-                  "collateralType" : "CASH",
+                  "collateralType" : "Cash",
                   "eligibleCollateral" : [ {
                     "criteria" : [ {
                       "treatment" : {
@@ -930,285 +959,216 @@
                     }
                   } ]
                 }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d3"
-                  },
-                  "unadjustedDate" : "2021-03-19"
-                },
-                "meta" : {
-                  "externalKey" : "PurchaseDate",
-                  "globalKey" : "3f28d3"
-                }
-              },
-              "payout" : {
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "6a2c670c"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d6"
-                  },
-                  "unadjustedDate" : "2021-03-22"
-                },
-                "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
-                }
               }
             },
             "meta" : {
-              "globalKey" : "1a2ab30d"
+              "globalKey" : "c6dfdca3"
             }
           },
           "meta" : {
-            "globalKey" : "1a2ab30d"
+            "globalKey" : "c6dfdca3"
           }
         },
         "tradeLot" : [ {
-          "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "2d65fdc6"
-            },
+          "priceQuantity" : [ {
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.004,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 0.004,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 0,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 0
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "f435dd0d"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "1ad6d034"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "GB00B24FF097"
-                  },
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "source" : "ISIN"
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-2"
+                  "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "7f59bafa"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 1.0075,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 1.0075,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                "priceType" : "ASSET_PRICE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "AssetPrice",
+                "priceExpression" : "PercentageOfNotional"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 0,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 0
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
+              }
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "GB00B24FF097"
+                  },
+                  "source" : "ISIN",
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "1ad6d034"
               }
-            } ]
-          } ]
-        } ]
-      },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f28d2"
-        },
-        "value" : "2021-03-18"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "UnqTradIdr"
             },
-            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-          }
+            "meta" : {
+              "globalKey" : "40cd97a1"
+            }
+          } ]
         } ],
-        "issuer" : {
-          "value" : "KTKLLEILLLLLLLLLLLLL"
-        },
-        "meta" : {
-          "globalKey" : "4a82737e"
-        }
-      } ]
-    }
-  }, {
-    "meta" : {
-      "globalKey" : "564e3311"
-    },
-    "trade" : {
-      "meta" : {
-        "globalKey" : "564e3311"
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "Global Bank Inc"
+              },
+              "meta" : {
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
+              }
+            }
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
+              }
+            }
+          }
+        } ]
       },
       "party" : [ {
-        "meta" : {
-          "externalKey" : "GlobalBank",
-          "globalKey" : "296093b7"
-        },
         "name" : {
           "value" : "Global Bank Inc"
+        },
+        "meta" : {
+          "globalKey" : "296093b7",
+          "externalKey" : "GlobalBank"
         }
       }, {
-        "meta" : {
-          "externalKey" : "UkBank",
-          "globalKey" : "1ef4886d"
-        },
         "name" : {
           "value" : "UK Bank plc"
+        },
+        "meta" : {
+          "globalKey" : "1ef4886d",
+          "externalKey" : "UkBank"
         }
       } ],
       "partyRole" : [ {
         "partyReference" : {
-          "externalReference" : "GlobalBank",
-          "globalReference" : "296093b7"
+          "globalReference" : "296093b7",
+          "externalReference" : "GlobalBank"
         },
-        "role" : "SELLER"
+        "role" : "Seller"
       }, {
         "partyReference" : {
-          "externalReference" : "UkBank",
-          "globalReference" : "1ef4886d"
+          "globalReference" : "1ef4886d",
+          "externalReference" : "UkBank"
         },
-        "role" : "BUYER"
+        "role" : "Buyer"
       } ],
-      "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
-              },
-              "name" : {
-                "value" : "Global Bank Inc"
-              }
-            }
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
-              "name" : {
-                "value" : "UK Bank plc"
-              }
+      "meta" : {
+        "globalKey" : "e3c733f8"
+      }
+    },
+    "state" : {
+      "closedState" : {
+        "state" : "Terminated"
+      },
+      "positionState" : "Closed"
+    },
+    "meta" : {
+      "globalKey" : "c34c9c87"
+    }
+  }, {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "KTKLLEILLLLLLLLLLLLL"
+        },
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+            "meta" : {
+              "scheme" : "UnqTradIdr"
             }
-          },
-          "role" : "PARTY_2"
+          }
         } ],
+        "meta" : {
+          "globalKey" : "32cd87f2"
+        }
+      } ],
+      "tradeDate" : {
+        "value" : "2021-03-18",
+        "meta" : {
+          "globalKey" : "3f28d2"
+        }
+      },
+      "tradableProduct" : {
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -1223,6 +1183,80 @@
               "productQualifier" : "RepurchaseAgreement"
             } ],
             "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-20",
+                  "meta" : {
+                    "globalKey" : "3f28d4"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d4"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
+                  "meta" : {
+                    "globalKey" : "3f28d6"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
+                }
+              },
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "69ca64cc"
+                }
+              },
               "collateral" : {
                 "collateralPortfolio" : [ {
                   "value" : {
@@ -1233,114 +1267,114 @@
                             "payout" : {
                               "assetPayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
                                 "principalPayment" : {
-                                  "finalPayment" : true,
                                   "initialPayment" : true,
+                                  "finalPayment" : true,
                                   "intermediatePayment" : false,
                                   "meta" : {
                                     "globalKey" : "12a6f5"
                                   }
                                 },
                                 "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "75229c9e"
+                                        "globalKey" : "71834796"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "71834796"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "de136e51"
+                                        "globalKey" : "da741949"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "da741949"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
                                 "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
                                   "security" : {
                                     "productIdentifier" : [ {
                                       "value" : {
                                         "identifier" : {
                                           "value" : "GB00B24FF097"
                                         },
+                                        "source" : "ISIN",
                                         "meta" : {
                                           "globalKey" : "1ad6d034"
-                                        },
-                                        "source" : "ISIN"
+                                        }
                                       }
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityType" : "Debt"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e7ac7fce"
+                            "globalKey" : "12a4a1fe"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e7ac7fce"
+                      "globalKey" : "12a4a1fe"
                     }
                   }
                 } ],
                 "collateralProvisions" : {
-                  "collateralType" : "CASH",
+                  "collateralType" : "Cash",
                   "eligibleCollateral" : [ {
                     "criteria" : [ {
                       "treatment" : {
@@ -1354,221 +1388,187 @@
                     }
                   } ]
                 }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d4"
-                  },
-                  "unadjustedDate" : "2021-03-20"
-                },
-                "meta" : {
-                  "globalKey" : "3f28d4"
-                }
-              },
-              "payout" : {
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "6a2c670c"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d6"
-                  },
-                  "unadjustedDate" : "2021-03-22"
-                },
-                "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
-                }
               }
             },
             "meta" : {
-              "globalKey" : "e7d514ce"
+              "globalKey" : "aa0b8fe4"
             }
           },
           "meta" : {
-            "globalKey" : "e7d514ce"
+            "globalKey" : "aa0b8fe4"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "573a2907"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.005,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 0.005,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 9974250,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 9974250
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "c886a5fe"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "1ad6d034"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "GB00B24FF097"
-                  },
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "source" : "ISIN"
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-2"
+                  "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "900af7d9"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 1.0075,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 1.0075,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                "priceType" : "ASSET_PRICE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "AssetPrice",
+                "priceExpression" : "PercentageOfNotional"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 10000000,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 10000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "GB00B24FF097"
+                  },
+                  "source" : "ISIN",
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "1ad6d034"
+              }
+            },
+            "meta" : {
+              "globalKey" : "a8870d90"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "Global Bank Inc"
+              },
+              "meta" : {
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
+              }
+            }
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
+              }
+            }
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f28d2"
+      "party" : [ {
+        "name" : {
+          "value" : "Global Bank Inc"
         },
-        "value" : "2021-03-18"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "UnqTradIdr"
-            },
-            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-          }
-        } ],
-        "issuer" : {
-          "value" : "KTKLLEILLLLLLLLLLLLL"
+        "meta" : {
+          "globalKey" : "296093b7",
+          "externalKey" : "GlobalBank"
+        }
+      }, {
+        "name" : {
+          "value" : "UK Bank plc"
         },
         "meta" : {
-          "globalKey" : "4a82737e"
+          "globalKey" : "1ef4886d",
+          "externalKey" : "UkBank"
         }
-      } ]
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "296093b7",
+          "externalReference" : "GlobalBank"
+        },
+        "role" : "Seller"
+      }, {
+        "partyReference" : {
+          "globalReference" : "1ef4886d",
+          "externalReference" : "UkBank"
+        },
+        "role" : "Buyer"
+      } ],
+      "meta" : {
+        "globalKey" : "88b67b69"
+      }
+    },
+    "meta" : {
+      "globalKey" : "88b67b69"
     }
   } ],
-  "eventQualifier" : "OnDemandRateChange",
   "meta" : {
-    "globalKey" : "ed77435"
+    "globalKey" : "192eecef"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/pair-off-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/pair-off-output.json
index c3ae994d0b..97a40fbb9b 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/pair-off-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/pair-off-output.json
@@ -1,1921 +1,1827 @@
 {
-  "effectiveDate" : "2021-03-18",
   "eventDate" : "2021-03-18",
+  "effectiveDate" : "2021-03-18",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "eaf9dc6e"
-        },
-        "state" : {
-          "positionState" : "FORMED"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "b9aaf231"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "GlobalBank",
-              "globalKey" : "296093b7"
-            },
-            "name" : {
-              "value" : "Global Bank Inc"
-            }
-          }, {
-            "meta" : {
-              "externalKey" : "UkBank",
-              "globalKey" : "1ef4886d"
-            },
-            "name" : {
-              "value" : "UK Bank plc"
-            }
-          } ],
-          "partyRole" : [ {
-            "partyReference" : {
-              "externalReference" : "GlobalBank",
-              "globalReference" : "296093b7"
-            },
-            "role" : "SELLER"
-          }, {
-            "partyReference" : {
-              "externalReference" : "UkBank",
-              "globalReference" : "1ef4886d"
-            },
-            "role" : "BUYER"
-          } ],
-          "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "value" : {
+    "primitiveInstruction" : {
+      "execution" : {
+        "product" : {
+          "contractualProduct" : {
+            "productTaxonomy" : [ {
+              "source" : "CFI",
+              "value" : {
+                "name" : {
+                  "value" : "LRSTXD"
+                }
+              }
+            }, {
+              "source" : "ISDA",
+              "productQualifier" : "RepurchaseAgreement"
+            } ],
+            "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-19",
                   "meta" : {
-                    "externalKey" : "GlobalBank",
-                    "globalKey" : "296093b7"
-                  },
-                  "name" : {
-                    "value" : "Global Bank Inc"
+                    "globalKey" : "3f28d3"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d3",
+                  "externalKey" : "PurchaseDate"
                 }
               },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "value" : {
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
                   "meta" : {
-                    "externalKey" : "UkBank",
-                    "globalKey" : "1ef4886d"
-                  },
-                  "name" : {
-                    "value" : "UK Bank plc"
+                    "globalKey" : "3f28d6"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
                 }
               },
-              "role" : "PARTY_2"
-            } ],
-            "product" : {
-              "contractualProduct" : {
-                "productTaxonomy" : [ {
-                  "source" : "CFI",
-                  "value" : {
-                    "name" : {
-                      "value" : "LRSTXD"
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
                     }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
                   }
-                }, {
-                  "source" : "ISDA",
-                  "productQualifier" : "RepurchaseAgreement"
                 } ],
-                "economicTerms" : {
-                  "collateral" : {
-                    "collateralPortfolio" : [ {
-                      "value" : {
-                        "collateralPosition" : [ {
-                          "product" : {
-                            "contractualProduct" : {
-                              "economicTerms" : {
-                                "payout" : {
-                                  "assetPayout" : [ {
-                                    "payerReceiver" : {
-                                      "payer" : "PARTY_1",
-                                      "receiver" : "PARTY_2"
-                                    },
-                                    "priceQuantity" : {
+                "meta" : {
+                  "globalKey" : "69ca64cc"
+                }
+              },
+              "collateral" : {
+                "collateralPortfolio" : [ {
+                  "value" : {
+                    "collateralPosition" : [ {
+                      "product" : {
+                        "contractualProduct" : {
+                          "economicTerms" : {
+                            "payout" : {
+                              "assetPayout" : [ {
+                                "payerReceiver" : {
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
+                                },
+                                "priceQuantity" : {
+                                  "quantitySchedule" : {
+                                    "address" : {
+                                      "scope" : "DOCUMENT",
+                                      "value" : "quantity-2"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
+                                  }
+                                },
+                                "principalPayment" : {
+                                  "initialPayment" : true,
+                                  "finalPayment" : true,
+                                  "intermediatePayment" : false,
+                                  "meta" : {
+                                    "globalKey" : "12a6f5"
+                                  }
+                                },
+                                "assetLeg" : [ {
+                                  "settlementDate" : {
+                                    "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "0"
+                                        "globalKey" : "71834796"
                                       },
-                                      "quantitySchedule" : {
-                                        "address" : {
-                                          "scope" : "DOCUMENT",
-                                          "value" : "quantity-2"
-                                        }
+                                      "businessDayConvention" : "NotApplicable",
+                                      "dateRelativeTo" : {
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
                                     },
-                                    "principalPayment" : {
-                                      "finalPayment" : true,
-                                      "initialPayment" : true,
-                                      "intermediatePayment" : false,
+                                    "meta" : {
+                                      "globalKey" : "71834796"
+                                    }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
+                                }, {
+                                  "settlementDate" : {
+                                    "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "12a6f5"
+                                        "globalKey" : "da741949"
+                                      },
+                                      "businessDayConvention" : "NotApplicable",
+                                      "dateRelativeTo" : {
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
                                     },
-                                    "assetLeg" : [ {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                                      "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "75229c9e"
+                                    "meta" : {
+                                      "globalKey" : "da741949"
+                                    }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
+                                } ],
+                                "securityInformation" : {
+                                  "security" : {
+                                    "productIdentifier" : [ {
+                                      "value" : {
+                                        "identifier" : {
+                                          "value" : "GB00B24FF097"
                                         },
-                                        "relativeDate" : {
-                                          "meta" : {
-                                            "globalKey" : "75229c9e"
-                                          },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
-                                          "dateRelativeTo" : {
-                                            "externalReference" : "PurchaseDate",
-                                            "globalReference" : "3f28d3"
-                                          }
-                                        }
-                                      }
-                                    }, {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                                      "settlementDate" : {
+                                        "source" : "ISIN",
                                         "meta" : {
-                                          "globalKey" : "de136e51"
-                                        },
-                                        "relativeDate" : {
-                                          "meta" : {
-                                            "globalKey" : "de136e51"
-                                          },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
-                                          "dateRelativeTo" : {
-                                            "externalReference" : "RepurchaseDate",
-                                            "globalReference" : "3f28d6"
-                                          }
+                                          "globalKey" : "1ad6d034"
                                         }
                                       }
                                     } ],
-                                    "durationType" : {
-                                      "durationType" : "TERM"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "e7ac7fce"
-                                    },
-                                    "securityInformation" : {
-                                      "meta" : {
-                                        "globalKey" : "40232adf"
-                                      },
-                                      "security" : {
-                                        "productIdentifier" : [ {
-                                          "value" : {
-                                            "identifier" : {
-                                              "value" : "GB00B24FF097"
-                                            },
-                                            "meta" : {
-                                              "globalKey" : "1ad6d034"
-                                            },
-                                            "source" : "ISIN"
-                                          }
-                                        } ],
-                                        "securityType" : "DEBT"
-                                      }
-                                    }
-                                  } ],
+                                    "securityType" : "Debt"
+                                  },
                                   "meta" : {
-                                    "globalKey" : "e7ac7fce"
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
-                              },
+                              } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
-                            },
-                            "meta" : {
-                              "globalKey" : "e7ac7fce"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "12a4a1fe"
                           }
-                        } ],
+                        },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
-                    "collateralProvisions" : {
-                      "collateralType" : "CASH",
-                      "eligibleCollateral" : [ {
-                        "criteria" : [ {
-                          "treatment" : {
-                            "valuationTreatment" : {
-                              "marginPercentage" : 0.99
-                            }
-                          }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "16859e"
-                        }
-                      } ]
-                    }
-                  },
-                  "effectiveDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d3"
-                      },
-                      "unadjustedDate" : "2021-03-19"
-                    },
                     "meta" : {
-                      "externalKey" : "PurchaseDate",
-                      "globalKey" : "3f28d3"
+                      "globalKey" : "12a4a1fe"
                     }
-                  },
-                  "payout" : {
-                    "interestRatePayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
-                      },
-                      "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "quantitySchedule" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "quantity-1"
-                          }
-                        }
-                      },
-                      "principalPayment" : {
-                        "finalPayment" : true,
-                        "initialPayment" : true,
-                        "intermediatePayment" : false,
-                        "meta" : {
-                          "globalKey" : "12a6f5"
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "6a2c670c"
-                      },
-                      "rateSpecification" : {
-                        "fixedRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
-                          }
+                  }
+                } ],
+                "collateralProvisions" : {
+                  "collateralType" : "Cash",
+                  "eligibleCollateral" : [ {
+                    "criteria" : [ {
+                      "treatment" : {
+                        "valuationTreatment" : {
+                          "marginPercentage" : 0.99
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "6a2c670c"
-                    }
-                  },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d6"
-                      },
-                      "unadjustedDate" : "2021-03-22"
-                    },
-                    "meta" : {
-                      "externalKey" : "RepurchaseDate",
-                      "globalKey" : "3f28d6"
+                      "globalKey" : "16859e"
                     }
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "1a2ab30d"
+                  } ]
                 }
-              },
-              "meta" : {
-                "globalKey" : "1a2ab30d"
               }
             },
-            "tradeLot" : [ {
-              "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "fd5ebec6"
-                },
-                "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "value" : 0.004,
-                    "perUnitOf" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "value" : 9974250
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "c886a5fe"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "value" : "GB00B24FF097"
-                      },
-                      "meta" : {
-                        "globalKey" : "1ad6d034"
-                      },
-                      "source" : "ISIN"
-                    }
-                  } ]
-                },
-                "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "value" : 1.0075,
-                    "perUnitOf" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                    "priceType" : "ASSET_PRICE"
-                  }
-                } ],
-                "quantity" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
-                    } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "value" : 10000000
-                  }
-                } ]
-              } ]
-            } ]
-          },
-          "tradeDate" : {
             "meta" : {
-              "globalKey" : "3f28d2"
-            },
-            "value" : "2021-03-18"
+              "globalKey" : "c6dfdca3"
+            }
           },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "UnqTradIdr"
-                },
-                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-              }
-            } ],
-            "issuer" : {
-              "value" : "KTKLLEILLLLLLLLLLLLL"
+          "meta" : {
+            "globalKey" : "c6dfdca3"
+          }
+        },
+        "priceQuantity" : [ {
+          "price" : [ {
+            "value" : {
+              "value" : 0.004,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              },
+              "priceType" : "InterestRate"
             },
             "meta" : {
-              "globalKey" : "4a82737e"
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "execution" : {
-        "counterparty" : [ {
-          "partyReference" : {
+          } ],
+          "quantity" : [ {
             "value" : {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
-              },
-              "name" : {
-                "value" : "Global Bank Inc"
+              "value" : 9974250,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
               }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          },
-          "role" : "PARTY_1"
+          } ],
+          "meta" : {
+            "globalKey" : "ae7919fa"
+          }
         }, {
-          "partyReference" : {
+          "price" : [ {
             "value" : {
-              "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
+              "value" : 1.0075,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              },
+              "priceType" : "AssetPrice",
+              "priceExpression" : "PercentageOfNotional"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 10000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "GB00B24FF097"
+                },
+                "source" : "ISIN",
+                "meta" : {
+                  "globalKey" : "1ad6d034"
+                }
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "1ad6d034"
+            }
+          },
+          "meta" : {
+            "globalKey" : "a8870d90"
+          }
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "Global Bank Inc"
               },
+              "meta" : {
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
+              }
+            }
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
               "name" : {
                 "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
               }
             }
-          },
-          "role" : "PARTY_2"
+          }
         } ],
-        "executionDetails" : {
+        "parties" : [ {
+          "name" : {
+            "value" : "Global Bank Inc"
+          },
+          "meta" : {
+            "globalKey" : "296093b7",
+            "externalKey" : "GlobalBank"
+          }
+        }, {
+          "name" : {
+            "value" : "UK Bank plc"
+          },
           "meta" : {
-            "globalKey" : "69d2eae6"
+            "globalKey" : "1ef4886d",
+            "externalKey" : "UkBank"
+          }
+        } ],
+        "partyRoles" : [ {
+          "partyReference" : {
+            "globalReference" : "296093b7",
+            "externalReference" : "GlobalBank"
+          },
+          "role" : "Seller"
+        }, {
+          "partyReference" : {
+            "globalReference" : "1ef4886d",
+            "externalReference" : "UkBank"
           },
+          "role" : "Buyer"
+        } ],
+        "executionDetails" : {
           "packageReference" : {
-            "componentId" : [ {
+            "listId" : {
               "assignedIdentifier" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "UnqTradIdr"
-                  },
-                  "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
+                  "value" : "Package"
                 }
               } ],
+              "meta" : {
+                "globalKey" : "331dcc26"
+              }
+            },
+            "componentId" : [ {
               "issuer" : {
                 "value" : "KTKLLEILLLLLLLLLLLLL"
               },
-              "meta" : {
-                "globalKey" : "4a82737e"
-              }
-            }, {
               "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
                   "meta" : {
                     "scheme" : "UnqTradIdr"
-                  },
-                  "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
+                  }
                 }
               } ],
+              "meta" : {
+                "globalKey" : "32cd87f2"
+              }
+            }, {
               "issuer" : {
                 "value" : "KTKLLEILLLLLLLLLLLLL"
               },
-              "meta" : {
-                "globalKey" : "4a82737e"
-              }
-            } ],
-            "listId" : {
               "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "Package"
+                  "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+                  "meta" : {
+                    "scheme" : "UnqTradIdr"
+                  }
                 }
               } ],
               "meta" : {
-                "globalKey" : "331dcc26"
+                "globalKey" : "32cd87f2"
               }
-            },
+            } ],
             "meta" : {
-              "globalKey" : "69d2eae6"
+              "globalKey" : "f38fea66"
             }
-          }
-        },
-        "parties" : [ {
-          "meta" : {
-            "externalKey" : "GlobalBank",
-            "globalKey" : "296093b7"
           },
-          "name" : {
-            "value" : "Global Bank Inc"
-          }
-        }, {
           "meta" : {
-            "externalKey" : "UkBank",
-            "globalKey" : "1ef4886d"
-          },
-          "name" : {
-            "value" : "UK Bank plc"
+            "globalKey" : "f38fea66"
           }
-        } ],
-        "partyRoles" : [ {
-          "partyReference" : {
-            "externalReference" : "GlobalBank",
-            "globalReference" : "296093b7"
-          },
-          "role" : "SELLER"
-        }, {
-          "partyReference" : {
-            "externalReference" : "UkBank",
-            "globalReference" : "1ef4886d"
-          },
-          "role" : "BUYER"
-        } ],
-        "priceQuantity" : [ {
+        },
+        "tradeDate" : {
+          "value" : "2021-03-18",
           "meta" : {
-            "globalKey" : "fd5ebec6"
+            "globalKey" : "3f28d2"
+          }
+        },
+        "tradeIdentifier" : [ {
+          "issuer" : {
+            "value" : "KTKLLEILLLLLLLLLLLLL"
           },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 0.004,
-              "perUnitOf" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "priceType" : "INTEREST_RATE"
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+              "meta" : {
+                "scheme" : "UnqTradIdr"
+              }
             }
           } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 9974250
-            }
-          } ]
-        }, {
           "meta" : {
-            "globalKey" : "c886a5fe"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "1ad6d034"
+            "globalKey" : "32cd87f2"
+          }
+        } ]
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "KTKLLEILLLLLLLLLLLLL"
             },
-            "productIdentifier" : [ {
-              "value" : {
-                "identifier" : {
-                  "value" : "GB00B24FF097"
-                },
+            "assignedIdentifier" : [ {
+              "identifier" : {
+                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
                 "meta" : {
-                  "globalKey" : "1ad6d034"
-                },
-                "source" : "ISIN"
+                  "scheme" : "UnqTradIdr"
+                }
               }
-            } ]
-          },
-          "price" : [ {
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 1.0075,
-              "perUnitOf" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-              "priceType" : "ASSET_PRICE"
+              "globalKey" : "32cd87f2"
             }
           } ],
-          "quantity" : [ {
+          "tradeDate" : {
+            "value" : "2021-03-18",
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 10000000
+              "globalKey" : "3f28d2"
             }
-          } ]
-        } ],
-        "product" : {
-          "contractualProduct" : {
-            "productTaxonomy" : [ {
-              "source" : "CFI",
-              "value" : {
-                "name" : {
-                  "value" : "LRSTXD"
-                }
-              }
-            }, {
-              "source" : "ISDA",
-              "productQualifier" : "RepurchaseAgreement"
-            } ],
-            "economicTerms" : {
-              "collateral" : {
-                "collateralPortfolio" : [ {
+          },
+          "tradableProduct" : {
+            "product" : {
+              "contractualProduct" : {
+                "productTaxonomy" : [ {
+                  "source" : "CFI",
                   "value" : {
-                    "collateralPosition" : [ {
-                      "product" : {
-                        "contractualProduct" : {
-                          "economicTerms" : {
-                            "payout" : {
-                              "assetPayout" : [ {
-                                "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
-                                },
-                                "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
-                                  "quantitySchedule" : {
-                                    "address" : {
-                                      "scope" : "DOCUMENT",
-                                      "value" : "quantity-2"
-                                    }
-                                  }
-                                },
-                                "principalPayment" : {
-                                  "finalPayment" : true,
-                                  "initialPayment" : true,
-                                  "intermediatePayment" : false,
-                                  "meta" : {
-                                    "globalKey" : "12a6f5"
-                                  }
-                                },
-                                "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                                  "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
+                    "name" : {
+                      "value" : "LRSTXD"
+                    }
+                  }
+                }, {
+                  "source" : "ISDA",
+                  "productQualifier" : "RepurchaseAgreement"
+                } ],
+                "economicTerms" : {
+                  "effectiveDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-19",
+                      "meta" : {
+                        "globalKey" : "3f28d3"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d3",
+                      "externalKey" : "PurchaseDate"
+                    }
+                  },
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-22",
+                      "meta" : {
+                        "globalKey" : "3f28d6"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d6",
+                      "externalKey" : "RepurchaseDate"
+                    }
+                  },
+                  "payout" : {
+                    "interestRatePayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "priceQuantity" : {
+                        "quantitySchedule" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "quantity-1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      },
+                      "principalPayment" : {
+                        "initialPayment" : true,
+                        "finalPayment" : true,
+                        "intermediatePayment" : false,
+                        "meta" : {
+                          "globalKey" : "12a6f5"
+                        }
+                      },
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "meta" : {
+                        "globalKey" : "69ca64cc"
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "69ca64cc"
+                    }
+                  },
+                  "collateral" : {
+                    "collateralPortfolio" : [ {
+                      "value" : {
+                        "collateralPosition" : [ {
+                          "product" : {
+                            "contractualProduct" : {
+                              "economicTerms" : {
+                                "payout" : {
+                                  "assetPayout" : [ {
+                                    "payerReceiver" : {
+                                      "payer" : "Party1",
+                                      "receiver" : "Party2"
                                     },
-                                    "relativeDate" : {
-                                      "meta" : {
-                                        "globalKey" : "75229c9e"
+                                    "priceQuantity" : {
+                                      "quantitySchedule" : {
+                                        "address" : {
+                                          "scope" : "DOCUMENT",
+                                          "value" : "quantity-2"
+                                        }
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
-                                      "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                      "meta" : {
+                                        "globalKey" : "0"
                                       }
-                                    }
-                                  }
-                                }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                                  "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
                                     },
-                                    "relativeDate" : {
+                                    "principalPayment" : {
+                                      "initialPayment" : true,
+                                      "finalPayment" : true,
+                                      "intermediatePayment" : false,
                                       "meta" : {
-                                        "globalKey" : "de136e51"
-                                      },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
-                                      "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalKey" : "12a6f5"
                                       }
-                                    }
-                                  }
-                                } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
-                                "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
-                                  "security" : {
-                                    "productIdentifier" : [ {
-                                      "value" : {
-                                        "identifier" : {
-                                          "value" : "GB00B24FF097"
+                                    },
+                                    "assetLeg" : [ {
+                                      "settlementDate" : {
+                                        "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
+                                          "meta" : {
+                                            "globalKey" : "71834796"
+                                          },
+                                          "businessDayConvention" : "NotApplicable",
+                                          "dateRelativeTo" : {
+                                            "globalReference" : "3f28d3",
+                                            "externalReference" : "PurchaseDate"
+                                          }
                                         },
                                         "meta" : {
-                                          "globalKey" : "1ad6d034"
+                                          "globalKey" : "71834796"
+                                        }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
+                                    }, {
+                                      "settlementDate" : {
+                                        "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
+                                          "meta" : {
+                                            "globalKey" : "da741949"
+                                          },
+                                          "businessDayConvention" : "NotApplicable",
+                                          "dateRelativeTo" : {
+                                            "globalReference" : "3f28d6",
+                                            "externalReference" : "RepurchaseDate"
+                                          }
                                         },
-                                        "source" : "ISIN"
-                                      }
+                                        "meta" : {
+                                          "globalKey" : "da741949"
+                                        }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityInformation" : {
+                                      "security" : {
+                                        "productIdentifier" : [ {
+                                          "value" : {
+                                            "identifier" : {
+                                              "value" : "GB00B24FF097"
+                                            },
+                                            "source" : "ISIN",
+                                            "meta" : {
+                                              "globalKey" : "1ad6d034"
+                                            }
+                                          }
+                                        } ],
+                                        "securityType" : "Debt"
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "40232adf"
+                                      }
+                                    },
+                                    "durationType" : {
+                                      "durationType" : "Term"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "12a4a1fe"
+                                    }
+                                  } ],
+                                  "meta" : {
+                                    "globalKey" : "12a4a1fe"
                                   }
                                 }
-                              } ],
+                              },
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "12a4a1fe"
                             }
-                          },
-                          "meta" : {
-                            "globalKey" : "e7ac7fce"
                           }
-                        },
+                        } ],
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
-                    "meta" : {
-                      "globalKey" : "e7ac7fce"
-                    }
-                  }
-                } ],
-                "collateralProvisions" : {
-                  "collateralType" : "CASH",
-                  "eligibleCollateral" : [ {
-                    "criteria" : [ {
-                      "treatment" : {
-                        "valuationTreatment" : {
-                          "marginPercentage" : 0.99
+                    "collateralProvisions" : {
+                      "collateralType" : "Cash",
+                      "eligibleCollateral" : [ {
+                        "criteria" : [ {
+                          "treatment" : {
+                            "valuationTreatment" : {
+                              "marginPercentage" : 0.99
+                            }
+                          }
+                        } ],
+                        "meta" : {
+                          "globalKey" : "16859e"
                         }
-                      }
-                    } ],
-                    "meta" : {
-                      "globalKey" : "16859e"
+                      } ]
                     }
-                  } ]
-                }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d3"
-                  },
-                  "unadjustedDate" : "2021-03-19"
+                  }
                 },
                 "meta" : {
-                  "externalKey" : "PurchaseDate",
-                  "globalKey" : "3f28d3"
+                  "globalKey" : "c6dfdca3"
                 }
               },
-              "payout" : {
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
+              "meta" : {
+                "globalKey" : "c6dfdca3"
+              }
+            },
+            "tradeLot" : [ {
+              "priceQuantity" : [ {
+                "price" : [ {
+                  "value" : {
+                    "value" : 0.004,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
                     },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                    "perUnitOf" : {
+                      "currency" : {
+                        "value" : "GBP"
                       }
-                    }
+                    },
+                    "priceType" : "InterestRate"
                   },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
+                  }
+                } ],
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 9974250,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    } ]
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "ae7919fa"
+                }
+              }, {
+                "price" : [ {
+                  "value" : {
+                    "value" : 1.0075,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
+                    },
+                    "perUnitOf" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
+                    },
+                    "priceType" : "AssetPrice",
+                    "priceExpression" : "PercentageOfNotional"
                   },
                   "meta" : {
-                    "globalKey" : "6a2c670c"
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-2"
+                    } ]
+                  }
+                } ],
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 10000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
+                    }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
+                  }
+                } ],
+                "observable" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "GB00B24FF097"
                       },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
+                      "source" : "ISIN",
+                      "meta" : {
+                        "globalKey" : "1ad6d034"
                       }
                     }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
                   }
-                } ],
+                },
                 "meta" : {
-                  "globalKey" : "6a2c670c"
+                  "globalKey" : "a8870d90"
                 }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
+              } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "value" : {
+                  "name" : {
+                    "value" : "Global Bank Inc"
+                  },
                   "meta" : {
-                    "globalKey" : "3f28d6"
+                    "globalKey" : "296093b7",
+                    "externalKey" : "GlobalBank"
+                  }
+                }
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "value" : {
+                  "name" : {
+                    "value" : "UK Bank plc"
                   },
-                  "unadjustedDate" : "2021-03-22"
-                },
-                "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
+                  "meta" : {
+                    "globalKey" : "1ef4886d",
+                    "externalKey" : "UkBank"
+                  }
                 }
               }
-            },
-            "meta" : {
-              "globalKey" : "1a2ab30d"
-            }
-          },
-          "meta" : {
-            "globalKey" : "1a2ab30d"
-          }
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f28d2"
-          },
-          "value" : "2021-03-18"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "UnqTradIdr"
-              },
-              "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-            }
-          } ],
-          "issuer" : {
-            "value" : "KTKLLEILLLLLLLLLLLLL"
-          },
-          "meta" : {
-            "globalKey" : "4a82737e"
-          }
-        } ]
-      }
-    }
-  }, {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "eaf9dc6e"
-        },
-        "state" : {
-          "positionState" : "FORMED"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "b9aaf231"
+            } ]
           },
           "party" : [ {
-            "meta" : {
-              "externalKey" : "GlobalBank",
-              "globalKey" : "296093b7"
-            },
             "name" : {
               "value" : "Global Bank Inc"
+            },
+            "meta" : {
+              "globalKey" : "296093b7",
+              "externalKey" : "GlobalBank"
             }
           }, {
-            "meta" : {
-              "externalKey" : "UkBank",
-              "globalKey" : "1ef4886d"
-            },
             "name" : {
               "value" : "UK Bank plc"
+            },
+            "meta" : {
+              "globalKey" : "1ef4886d",
+              "externalKey" : "UkBank"
             }
           } ],
           "partyRole" : [ {
             "partyReference" : {
-              "externalReference" : "GlobalBank",
-              "globalReference" : "296093b7"
+              "globalReference" : "296093b7",
+              "externalReference" : "GlobalBank"
             },
-            "role" : "SELLER"
+            "role" : "Seller"
           }, {
             "partyReference" : {
-              "externalReference" : "UkBank",
-              "globalReference" : "1ef4886d"
+              "globalReference" : "1ef4886d",
+              "externalReference" : "UkBank"
             },
-            "role" : "BUYER"
+            "role" : "Buyer"
           } ],
-          "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "value" : {
+          "meta" : {
+            "globalKey" : "b62aaee7"
+          }
+        },
+        "state" : {
+          "positionState" : "Formed"
+        },
+        "meta" : {
+          "globalKey" : "522d7d8a"
+        }
+      }
+    }
+  }, {
+    "primitiveInstruction" : {
+      "execution" : {
+        "product" : {
+          "contractualProduct" : {
+            "productTaxonomy" : [ {
+              "source" : "CFI",
+              "value" : {
+                "name" : {
+                  "value" : "LRSTXD"
+                }
+              }
+            }, {
+              "source" : "ISDA",
+              "productQualifier" : "RepurchaseAgreement"
+            } ],
+            "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-19",
                   "meta" : {
-                    "externalKey" : "GlobalBank",
-                    "globalKey" : "296093b7"
-                  },
-                  "name" : {
-                    "value" : "Global Bank Inc"
+                    "globalKey" : "3f28d3"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d3",
+                  "externalKey" : "PurchaseDate"
                 }
               },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "value" : {
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
                   "meta" : {
-                    "externalKey" : "UkBank",
-                    "globalKey" : "1ef4886d"
-                  },
-                  "name" : {
-                    "value" : "UK Bank plc"
+                    "globalKey" : "3f28d6"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
                 }
               },
-              "role" : "PARTY_2"
-            } ],
-            "product" : {
-              "contractualProduct" : {
-                "productTaxonomy" : [ {
-                  "source" : "CFI",
-                  "value" : {
-                    "name" : {
-                      "value" : "LRSTXD"
-                    }
-                  }
-                }, {
-                  "source" : "ISDA",
-                  "productQualifier" : "RepurchaseAgreement"
-                } ],
-                "economicTerms" : {
-                  "collateral" : {
-                    "collateralPortfolio" : [ {
-                      "value" : {
-                        "collateralPosition" : [ {
-                          "product" : {
-                            "contractualProduct" : {
-                              "economicTerms" : {
-                                "payout" : {
-                                  "assetPayout" : [ {
-                                    "payerReceiver" : {
-                                      "payer" : "PARTY_1",
-                                      "receiver" : "PARTY_2"
-                                    },
-                                    "priceQuantity" : {
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "69ca64cc"
+                }
+              },
+              "collateral" : {
+                "collateralPortfolio" : [ {
+                  "value" : {
+                    "collateralPosition" : [ {
+                      "product" : {
+                        "contractualProduct" : {
+                          "economicTerms" : {
+                            "payout" : {
+                              "assetPayout" : [ {
+                                "payerReceiver" : {
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
+                                },
+                                "priceQuantity" : {
+                                  "quantitySchedule" : {
+                                    "address" : {
+                                      "scope" : "DOCUMENT",
+                                      "value" : "quantity-2"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
+                                  }
+                                },
+                                "principalPayment" : {
+                                  "initialPayment" : true,
+                                  "finalPayment" : true,
+                                  "intermediatePayment" : false,
+                                  "meta" : {
+                                    "globalKey" : "12a6f5"
+                                  }
+                                },
+                                "assetLeg" : [ {
+                                  "settlementDate" : {
+                                    "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "0"
+                                        "globalKey" : "71834796"
                                       },
-                                      "quantitySchedule" : {
-                                        "address" : {
-                                          "scope" : "DOCUMENT",
-                                          "value" : "quantity-2"
-                                        }
+                                      "businessDayConvention" : "NotApplicable",
+                                      "dateRelativeTo" : {
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
                                     },
-                                    "principalPayment" : {
-                                      "finalPayment" : true,
-                                      "initialPayment" : true,
-                                      "intermediatePayment" : false,
+                                    "meta" : {
+                                      "globalKey" : "71834796"
+                                    }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
+                                }, {
+                                  "settlementDate" : {
+                                    "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "12a6f5"
+                                        "globalKey" : "da741949"
+                                      },
+                                      "businessDayConvention" : "NotApplicable",
+                                      "dateRelativeTo" : {
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
                                     },
-                                    "assetLeg" : [ {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                                      "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "75229c9e"
+                                    "meta" : {
+                                      "globalKey" : "da741949"
+                                    }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
+                                } ],
+                                "securityInformation" : {
+                                  "security" : {
+                                    "productIdentifier" : [ {
+                                      "value" : {
+                                        "identifier" : {
+                                          "value" : "GB00B24FF097"
                                         },
-                                        "relativeDate" : {
-                                          "meta" : {
-                                            "globalKey" : "75229c9e"
-                                          },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
-                                          "dateRelativeTo" : {
-                                            "externalReference" : "PurchaseDate",
-                                            "globalReference" : "3f28d3"
-                                          }
-                                        }
-                                      }
-                                    }, {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                                      "settlementDate" : {
+                                        "source" : "ISIN",
                                         "meta" : {
-                                          "globalKey" : "de136e51"
-                                        },
-                                        "relativeDate" : {
-                                          "meta" : {
-                                            "globalKey" : "de136e51"
-                                          },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
-                                          "dateRelativeTo" : {
-                                            "externalReference" : "RepurchaseDate",
-                                            "globalReference" : "3f28d6"
-                                          }
+                                          "globalKey" : "1ad6d034"
                                         }
                                       }
                                     } ],
-                                    "durationType" : {
-                                      "durationType" : "TERM"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "e7ac7fce"
-                                    },
-                                    "securityInformation" : {
-                                      "meta" : {
-                                        "globalKey" : "40232adf"
-                                      },
-                                      "security" : {
-                                        "productIdentifier" : [ {
-                                          "value" : {
-                                            "identifier" : {
-                                              "value" : "GB00B24FF097"
-                                            },
-                                            "meta" : {
-                                              "globalKey" : "1ad6d034"
-                                            },
-                                            "source" : "ISIN"
-                                          }
-                                        } ],
-                                        "securityType" : "DEBT"
-                                      }
-                                    }
-                                  } ],
+                                    "securityType" : "Debt"
+                                  },
                                   "meta" : {
-                                    "globalKey" : "e7ac7fce"
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
-                              },
+                              } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
-                            },
-                            "meta" : {
-                              "globalKey" : "e7ac7fce"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "12a4a1fe"
                           }
-                        } ],
+                        },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
-                    "collateralProvisions" : {
-                      "collateralType" : "CASH",
-                      "eligibleCollateral" : [ {
-                        "criteria" : [ {
-                          "treatment" : {
-                            "valuationTreatment" : {
-                              "marginPercentage" : 0.99
-                            }
-                          }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "16859e"
-                        }
-                      } ]
-                    }
-                  },
-                  "effectiveDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d3"
-                      },
-                      "unadjustedDate" : "2021-03-19"
-                    },
                     "meta" : {
-                      "externalKey" : "PurchaseDate",
-                      "globalKey" : "3f28d3"
+                      "globalKey" : "12a4a1fe"
                     }
-                  },
-                  "payout" : {
-                    "interestRatePayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
-                      },
-                      "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "quantitySchedule" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "quantity-1"
-                          }
-                        }
-                      },
-                      "principalPayment" : {
-                        "finalPayment" : true,
-                        "initialPayment" : true,
-                        "intermediatePayment" : false,
-                        "meta" : {
-                          "globalKey" : "12a6f5"
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "6a2c670c"
-                      },
-                      "rateSpecification" : {
-                        "fixedRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
-                          }
+                  }
+                } ],
+                "collateralProvisions" : {
+                  "collateralType" : "Cash",
+                  "eligibleCollateral" : [ {
+                    "criteria" : [ {
+                      "treatment" : {
+                        "valuationTreatment" : {
+                          "marginPercentage" : 0.99
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "6a2c670c"
-                    }
-                  },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d6"
-                      },
-                      "unadjustedDate" : "2021-03-22"
-                    },
-                    "meta" : {
-                      "externalKey" : "RepurchaseDate",
-                      "globalKey" : "3f28d6"
+                      "globalKey" : "16859e"
                     }
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "1a2ab30d"
+                  } ]
+                }
+              }
+            },
+            "meta" : {
+              "globalKey" : "c6dfdca3"
+            }
+          },
+          "meta" : {
+            "globalKey" : "c6dfdca3"
+          }
+        },
+        "priceQuantity" : [ {
+          "price" : [ {
+            "value" : {
+              "value" : 0.004,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
                 }
               },
-              "meta" : {
-                "globalKey" : "1a2ab30d"
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              },
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 9974250,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
               }
             },
-            "tradeLot" : [ {
-              "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "fd5ebec6"
-                },
-                "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "value" : 0.004,
-                    "perUnitOf" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "value" : 9974250
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "c886a5fe"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "value" : "GB00B24FF097"
-                      },
-                      "meta" : {
-                        "globalKey" : "1ad6d034"
-                      },
-                      "source" : "ISIN"
-                    }
-                  } ]
-                },
-                "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "value" : 1.0075,
-                    "perUnitOf" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                    "priceType" : "ASSET_PRICE"
-                  }
-                } ],
-                "quantity" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
-                    } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "value" : 10000000
-                  }
-                } ]
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
               } ]
-            } ]
-          },
-          "tradeDate" : {
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "ae7919fa"
+          }
+        }, {
+          "price" : [ {
+            "value" : {
+              "value" : 1.0075,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              },
+              "priceType" : "AssetPrice",
+              "priceExpression" : "PercentageOfNotional"
+            },
             "meta" : {
-              "globalKey" : "3f28d2"
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 10000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              }
             },
-            "value" : "2021-03-18"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "UnqTradIdr"
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "GB00B24FF097"
                 },
-                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
+                "source" : "ISIN",
+                "meta" : {
+                  "globalKey" : "1ad6d034"
+                }
               }
             } ],
-            "issuer" : {
-              "value" : "KTKLLEILLLLLLLLLLLLL"
-            },
             "meta" : {
-              "globalKey" : "4a82737e"
-            }
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "execution" : {
+              "globalKey" : "1ad6d034"
+            }
+          },
+          "meta" : {
+            "globalKey" : "a8870d90"
+          }
+        } ],
         "counterparty" : [ {
+          "role" : "Party1",
           "partyReference" : {
             "value" : {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
-              },
               "name" : {
                 "value" : "Global Bank Inc"
+              },
+              "meta" : {
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
               }
             }
-          },
-          "role" : "PARTY_1"
+          }
         }, {
+          "role" : "Party2",
           "partyReference" : {
             "value" : {
-              "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
               "name" : {
                 "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
               }
             }
-          },
-          "role" : "PARTY_2"
+          }
         } ],
-        "executionDetails" : {
+        "parties" : [ {
+          "name" : {
+            "value" : "Global Bank Inc"
+          },
+          "meta" : {
+            "globalKey" : "296093b7",
+            "externalKey" : "GlobalBank"
+          }
+        }, {
+          "name" : {
+            "value" : "UK Bank plc"
+          },
           "meta" : {
-            "globalKey" : "69d2eae6"
+            "globalKey" : "1ef4886d",
+            "externalKey" : "UkBank"
+          }
+        } ],
+        "partyRoles" : [ {
+          "partyReference" : {
+            "globalReference" : "296093b7",
+            "externalReference" : "GlobalBank"
+          },
+          "role" : "Seller"
+        }, {
+          "partyReference" : {
+            "globalReference" : "1ef4886d",
+            "externalReference" : "UkBank"
           },
+          "role" : "Buyer"
+        } ],
+        "executionDetails" : {
           "packageReference" : {
-            "componentId" : [ {
+            "listId" : {
               "assignedIdentifier" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "UnqTradIdr"
-                  },
-                  "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
+                  "value" : "Package"
                 }
               } ],
+              "meta" : {
+                "globalKey" : "331dcc26"
+              }
+            },
+            "componentId" : [ {
               "issuer" : {
                 "value" : "KTKLLEILLLLLLLLLLLLL"
               },
-              "meta" : {
-                "globalKey" : "4a82737e"
-              }
-            }, {
               "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
                   "meta" : {
                     "scheme" : "UnqTradIdr"
-                  },
-                  "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
+                  }
                 }
               } ],
+              "meta" : {
+                "globalKey" : "32cd87f2"
+              }
+            }, {
               "issuer" : {
                 "value" : "KTKLLEILLLLLLLLLLLLL"
               },
-              "meta" : {
-                "globalKey" : "4a82737e"
-              }
-            } ],
-            "listId" : {
               "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "Package"
+                  "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+                  "meta" : {
+                    "scheme" : "UnqTradIdr"
+                  }
                 }
               } ],
               "meta" : {
-                "globalKey" : "331dcc26"
+                "globalKey" : "32cd87f2"
               }
-            },
+            } ],
             "meta" : {
-              "globalKey" : "69d2eae6"
+              "globalKey" : "f38fea66"
             }
-          }
-        },
-        "parties" : [ {
-          "meta" : {
-            "externalKey" : "GlobalBank",
-            "globalKey" : "296093b7"
           },
-          "name" : {
-            "value" : "Global Bank Inc"
-          }
-        }, {
           "meta" : {
-            "externalKey" : "UkBank",
-            "globalKey" : "1ef4886d"
-          },
-          "name" : {
-            "value" : "UK Bank plc"
+            "globalKey" : "f38fea66"
           }
-        } ],
-        "partyRoles" : [ {
-          "partyReference" : {
-            "externalReference" : "GlobalBank",
-            "globalReference" : "296093b7"
-          },
-          "role" : "SELLER"
-        }, {
-          "partyReference" : {
-            "externalReference" : "UkBank",
-            "globalReference" : "1ef4886d"
-          },
-          "role" : "BUYER"
-        } ],
-        "priceQuantity" : [ {
+        },
+        "tradeDate" : {
+          "value" : "2021-03-18",
           "meta" : {
-            "globalKey" : "fd5ebec6"
+            "globalKey" : "3f28d2"
+          }
+        },
+        "tradeIdentifier" : [ {
+          "issuer" : {
+            "value" : "KTKLLEILLLLLLLLLLLLL"
           },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 0.004,
-              "perUnitOf" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "priceType" : "INTEREST_RATE"
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+              "meta" : {
+                "scheme" : "UnqTradIdr"
+              }
             }
           } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 9974250
-            }
-          } ]
-        }, {
           "meta" : {
-            "globalKey" : "c886a5fe"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "1ad6d034"
+            "globalKey" : "32cd87f2"
+          }
+        } ]
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "KTKLLEILLLLLLLLLLLLL"
             },
-            "productIdentifier" : [ {
-              "value" : {
-                "identifier" : {
-                  "value" : "GB00B24FF097"
-                },
+            "assignedIdentifier" : [ {
+              "identifier" : {
+                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
                 "meta" : {
-                  "globalKey" : "1ad6d034"
-                },
-                "source" : "ISIN"
+                  "scheme" : "UnqTradIdr"
+                }
               }
-            } ]
-          },
-          "price" : [ {
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 1.0075,
-              "perUnitOf" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-              "priceType" : "ASSET_PRICE"
+              "globalKey" : "32cd87f2"
             }
           } ],
-          "quantity" : [ {
+          "tradeDate" : {
+            "value" : "2021-03-18",
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 10000000
+              "globalKey" : "3f28d2"
             }
-          } ]
-        } ],
-        "product" : {
-          "contractualProduct" : {
-            "productTaxonomy" : [ {
-              "source" : "CFI",
-              "value" : {
-                "name" : {
-                  "value" : "LRSTXD"
-                }
-              }
-            }, {
-              "source" : "ISDA",
-              "productQualifier" : "RepurchaseAgreement"
-            } ],
-            "economicTerms" : {
-              "collateral" : {
-                "collateralPortfolio" : [ {
+          },
+          "tradableProduct" : {
+            "product" : {
+              "contractualProduct" : {
+                "productTaxonomy" : [ {
+                  "source" : "CFI",
                   "value" : {
-                    "collateralPosition" : [ {
-                      "product" : {
-                        "contractualProduct" : {
-                          "economicTerms" : {
-                            "payout" : {
-                              "assetPayout" : [ {
-                                "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
-                                },
-                                "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
-                                  "quantitySchedule" : {
-                                    "address" : {
-                                      "scope" : "DOCUMENT",
-                                      "value" : "quantity-2"
-                                    }
-                                  }
-                                },
-                                "principalPayment" : {
-                                  "finalPayment" : true,
-                                  "initialPayment" : true,
-                                  "intermediatePayment" : false,
-                                  "meta" : {
-                                    "globalKey" : "12a6f5"
-                                  }
-                                },
-                                "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                                  "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
+                    "name" : {
+                      "value" : "LRSTXD"
+                    }
+                  }
+                }, {
+                  "source" : "ISDA",
+                  "productQualifier" : "RepurchaseAgreement"
+                } ],
+                "economicTerms" : {
+                  "effectiveDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-19",
+                      "meta" : {
+                        "globalKey" : "3f28d3"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d3",
+                      "externalKey" : "PurchaseDate"
+                    }
+                  },
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-22",
+                      "meta" : {
+                        "globalKey" : "3f28d6"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d6",
+                      "externalKey" : "RepurchaseDate"
+                    }
+                  },
+                  "payout" : {
+                    "interestRatePayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "priceQuantity" : {
+                        "quantitySchedule" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "quantity-1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      },
+                      "principalPayment" : {
+                        "initialPayment" : true,
+                        "finalPayment" : true,
+                        "intermediatePayment" : false,
+                        "meta" : {
+                          "globalKey" : "12a6f5"
+                        }
+                      },
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "meta" : {
+                        "globalKey" : "69ca64cc"
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "69ca64cc"
+                    }
+                  },
+                  "collateral" : {
+                    "collateralPortfolio" : [ {
+                      "value" : {
+                        "collateralPosition" : [ {
+                          "product" : {
+                            "contractualProduct" : {
+                              "economicTerms" : {
+                                "payout" : {
+                                  "assetPayout" : [ {
+                                    "payerReceiver" : {
+                                      "payer" : "Party1",
+                                      "receiver" : "Party2"
                                     },
-                                    "relativeDate" : {
-                                      "meta" : {
-                                        "globalKey" : "75229c9e"
+                                    "priceQuantity" : {
+                                      "quantitySchedule" : {
+                                        "address" : {
+                                          "scope" : "DOCUMENT",
+                                          "value" : "quantity-2"
+                                        }
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
-                                      "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                      "meta" : {
+                                        "globalKey" : "0"
                                       }
-                                    }
-                                  }
-                                }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                                  "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
                                     },
-                                    "relativeDate" : {
+                                    "principalPayment" : {
+                                      "initialPayment" : true,
+                                      "finalPayment" : true,
+                                      "intermediatePayment" : false,
                                       "meta" : {
-                                        "globalKey" : "de136e51"
-                                      },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
-                                      "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalKey" : "12a6f5"
                                       }
-                                    }
-                                  }
-                                } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
-                                "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
-                                  "security" : {
-                                    "productIdentifier" : [ {
-                                      "value" : {
-                                        "identifier" : {
-                                          "value" : "GB00B24FF097"
+                                    },
+                                    "assetLeg" : [ {
+                                      "settlementDate" : {
+                                        "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
+                                          "meta" : {
+                                            "globalKey" : "71834796"
+                                          },
+                                          "businessDayConvention" : "NotApplicable",
+                                          "dateRelativeTo" : {
+                                            "globalReference" : "3f28d3",
+                                            "externalReference" : "PurchaseDate"
+                                          }
                                         },
                                         "meta" : {
-                                          "globalKey" : "1ad6d034"
+                                          "globalKey" : "71834796"
+                                        }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
+                                    }, {
+                                      "settlementDate" : {
+                                        "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
+                                          "meta" : {
+                                            "globalKey" : "da741949"
+                                          },
+                                          "businessDayConvention" : "NotApplicable",
+                                          "dateRelativeTo" : {
+                                            "globalReference" : "3f28d6",
+                                            "externalReference" : "RepurchaseDate"
+                                          }
                                         },
-                                        "source" : "ISIN"
-                                      }
+                                        "meta" : {
+                                          "globalKey" : "da741949"
+                                        }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityInformation" : {
+                                      "security" : {
+                                        "productIdentifier" : [ {
+                                          "value" : {
+                                            "identifier" : {
+                                              "value" : "GB00B24FF097"
+                                            },
+                                            "source" : "ISIN",
+                                            "meta" : {
+                                              "globalKey" : "1ad6d034"
+                                            }
+                                          }
+                                        } ],
+                                        "securityType" : "Debt"
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "40232adf"
+                                      }
+                                    },
+                                    "durationType" : {
+                                      "durationType" : "Term"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "12a4a1fe"
+                                    }
+                                  } ],
+                                  "meta" : {
+                                    "globalKey" : "12a4a1fe"
                                   }
                                 }
-                              } ],
+                              },
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "12a4a1fe"
                             }
-                          },
-                          "meta" : {
-                            "globalKey" : "e7ac7fce"
                           }
-                        },
+                        } ],
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
-                    "meta" : {
-                      "globalKey" : "e7ac7fce"
-                    }
-                  }
-                } ],
-                "collateralProvisions" : {
-                  "collateralType" : "CASH",
-                  "eligibleCollateral" : [ {
-                    "criteria" : [ {
-                      "treatment" : {
-                        "valuationTreatment" : {
-                          "marginPercentage" : 0.99
+                    "collateralProvisions" : {
+                      "collateralType" : "Cash",
+                      "eligibleCollateral" : [ {
+                        "criteria" : [ {
+                          "treatment" : {
+                            "valuationTreatment" : {
+                              "marginPercentage" : 0.99
+                            }
+                          }
+                        } ],
+                        "meta" : {
+                          "globalKey" : "16859e"
                         }
-                      }
-                    } ],
-                    "meta" : {
-                      "globalKey" : "16859e"
+                      } ]
                     }
-                  } ]
-                }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d3"
-                  },
-                  "unadjustedDate" : "2021-03-19"
+                  }
                 },
                 "meta" : {
-                  "externalKey" : "PurchaseDate",
-                  "globalKey" : "3f28d3"
+                  "globalKey" : "c6dfdca3"
                 }
               },
-              "payout" : {
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+              "meta" : {
+                "globalKey" : "c6dfdca3"
+              }
+            },
+            "tradeLot" : [ {
+              "priceQuantity" : [ {
+                "price" : [ {
+                  "value" : {
+                    "value" : 0.004,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
+                    },
+                    "perUnitOf" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
+                    },
+                    "priceType" : "InterestRate"
                   },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
+                  }
+                } ],
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 9974250,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    } ]
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "ae7919fa"
+                }
+              }, {
+                "price" : [ {
+                  "value" : {
+                    "value" : 1.0075,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
                     },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                    "perUnitOf" : {
+                      "currency" : {
+                        "value" : "GBP"
                       }
-                    }
+                    },
+                    "priceType" : "AssetPrice",
+                    "priceExpression" : "PercentageOfNotional"
                   },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-2"
+                    } ]
+                  }
+                } ],
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 10000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
                   "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
+                  }
+                } ],
+                "observable" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "GB00B24FF097"
                       },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
+                      "source" : "ISIN",
+                      "meta" : {
+                        "globalKey" : "1ad6d034"
                       }
                     }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
                   }
-                } ],
+                },
                 "meta" : {
-                  "globalKey" : "6a2c670c"
+                  "globalKey" : "a8870d90"
                 }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
+              } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "value" : {
+                  "name" : {
+                    "value" : "Global Bank Inc"
+                  },
                   "meta" : {
-                    "globalKey" : "3f28d6"
+                    "globalKey" : "296093b7",
+                    "externalKey" : "GlobalBank"
+                  }
+                }
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "value" : {
+                  "name" : {
+                    "value" : "UK Bank plc"
                   },
-                  "unadjustedDate" : "2021-03-22"
-                },
-                "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
+                  "meta" : {
+                    "globalKey" : "1ef4886d",
+                    "externalKey" : "UkBank"
+                  }
                 }
               }
+            } ]
+          },
+          "party" : [ {
+            "name" : {
+              "value" : "Global Bank Inc"
             },
             "meta" : {
-              "globalKey" : "1a2ab30d"
+              "globalKey" : "296093b7",
+              "externalKey" : "GlobalBank"
             }
-          },
-          "meta" : {
-            "globalKey" : "1a2ab30d"
-          }
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f28d2"
-          },
-          "value" : "2021-03-18"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "meta" : {
-                "scheme" : "UnqTradIdr"
-              },
-              "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
+          }, {
+            "name" : {
+              "value" : "UK Bank plc"
+            },
+            "meta" : {
+              "globalKey" : "1ef4886d",
+              "externalKey" : "UkBank"
             }
           } ],
-          "issuer" : {
-            "value" : "KTKLLEILLLLLLLLLLLLL"
-          },
+          "partyRole" : [ {
+            "partyReference" : {
+              "globalReference" : "296093b7",
+              "externalReference" : "GlobalBank"
+            },
+            "role" : "Seller"
+          }, {
+            "partyReference" : {
+              "globalReference" : "1ef4886d",
+              "externalReference" : "UkBank"
+            },
+            "role" : "Buyer"
+          } ],
           "meta" : {
-            "globalKey" : "4a82737e"
+            "globalKey" : "b62aaee7"
           }
-        } ]
+        },
+        "state" : {
+          "positionState" : "Formed"
+        },
+        "meta" : {
+          "globalKey" : "522d7d8a"
+        }
       }
     }
   } ],
+  "eventQualifier" : "PairOff",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "3e8bf3e8"
-    },
-    "state" : {
-      "positionState" : "EXECUTED"
-    },
     "trade" : {
-      "executionDetails" : {
-        "meta" : {
-          "globalKey" : "69d2eae6"
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "KTKLLEILLLLLLLLLLLLL"
         },
-        "packageReference" : {
-          "componentId" : [ {
-            "assignedIdentifier" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "UnqTradIdr"
-                },
-                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-              }
-            } ],
-            "issuer" : {
-              "value" : "KTKLLEILLLLLLLLLLLLL"
-            },
-            "meta" : {
-              "globalKey" : "4a82737e"
-            }
-          }, {
-            "assignedIdentifier" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "UnqTradIdr"
-                },
-                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-              }
-            } ],
-            "issuer" : {
-              "value" : "KTKLLEILLLLLLLLLLLLL"
-            },
-            "meta" : {
-              "globalKey" : "4a82737e"
-            }
-          } ],
-          "listId" : {
-            "assignedIdentifier" : [ {
-              "identifier" : {
-                "value" : "Package"
-              }
-            } ],
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
             "meta" : {
-              "globalKey" : "331dcc26"
+              "scheme" : "UnqTradIdr"
             }
-          },
-          "meta" : {
-            "globalKey" : "69d2eae6"
           }
-        }
-      },
-      "meta" : {
-        "globalKey" : "46102097"
-      },
-      "party" : [ {
+        } ],
         "meta" : {
-          "externalKey" : "GlobalBank",
-          "globalKey" : "296093b7"
-        },
-        "name" : {
-          "value" : "Global Bank Inc"
+          "globalKey" : "32cd87f2"
         }
-      }, {
+      } ],
+      "tradeDate" : {
+        "value" : "2021-03-18",
         "meta" : {
-          "externalKey" : "UkBank",
-          "globalKey" : "1ef4886d"
-        },
-        "name" : {
-          "value" : "UK Bank plc"
+          "globalKey" : "3f28d2"
         }
-      } ],
-      "partyRole" : [ {
-        "partyReference" : {
-          "externalReference" : "GlobalBank",
-          "globalReference" : "296093b7"
-        },
-        "role" : "SELLER"
-      }, {
-        "partyReference" : {
-          "externalReference" : "UkBank",
-          "globalReference" : "1ef4886d"
-        },
-        "role" : "BUYER"
-      } ],
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
-              },
-              "name" : {
-                "value" : "Global Bank Inc"
-              }
-            }
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
-              "name" : {
-                "value" : "UK Bank plc"
-              }
-            }
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -1924,12 +1830,87 @@
                 "name" : {
                   "value" : "LRSTXD"
                 }
-              }
-            }, {
-              "source" : "ISDA",
-              "productQualifier" : "RepurchaseAgreement"
-            } ],
-            "economicTerms" : {
+              }
+            }, {
+              "source" : "ISDA",
+              "productQualifier" : "RepurchaseAgreement"
+            } ],
+            "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-19",
+                  "meta" : {
+                    "globalKey" : "3f28d3"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d3",
+                  "externalKey" : "PurchaseDate"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
+                  "meta" : {
+                    "globalKey" : "3f28d6"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
+                }
+              },
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "69ca64cc"
+                }
+              },
               "collateral" : {
                 "collateralPortfolio" : [ {
                   "value" : {
@@ -1940,114 +1921,114 @@
                             "payout" : {
                               "assetPayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
                                 "principalPayment" : {
-                                  "finalPayment" : true,
                                   "initialPayment" : true,
+                                  "finalPayment" : true,
                                   "intermediatePayment" : false,
                                   "meta" : {
                                     "globalKey" : "12a6f5"
                                   }
                                 },
                                 "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "75229c9e"
+                                        "globalKey" : "71834796"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "71834796"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "de136e51"
+                                        "globalKey" : "da741949"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "da741949"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
                                 "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
                                   "security" : {
                                     "productIdentifier" : [ {
                                       "value" : {
                                         "identifier" : {
                                           "value" : "GB00B24FF097"
                                         },
+                                        "source" : "ISIN",
                                         "meta" : {
                                           "globalKey" : "1ad6d034"
-                                        },
-                                        "source" : "ISIN"
+                                        }
                                       }
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityType" : "Debt"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e7ac7fce"
+                            "globalKey" : "12a4a1fe"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e7ac7fce"
+                      "globalKey" : "12a4a1fe"
                     }
                   }
                 } ],
                 "collateralProvisions" : {
-                  "collateralType" : "CASH",
+                  "collateralType" : "Cash",
                   "eligibleCollateral" : [ {
                     "criteria" : [ {
                       "treatment" : {
@@ -2061,339 +2042,264 @@
                     }
                   } ]
                 }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d3"
-                  },
-                  "unadjustedDate" : "2021-03-19"
-                },
-                "meta" : {
-                  "externalKey" : "PurchaseDate",
-                  "globalKey" : "3f28d3"
-                }
-              },
-              "payout" : {
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "6a2c670c"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d6"
-                  },
-                  "unadjustedDate" : "2021-03-22"
-                },
-                "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
-                }
               }
             },
             "meta" : {
-              "globalKey" : "1a2ab30d"
+              "globalKey" : "c6dfdca3"
             }
           },
           "meta" : {
-            "globalKey" : "1a2ab30d"
+            "globalKey" : "c6dfdca3"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "fd5ebec6"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.004,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 0.004,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 9974250,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 9974250
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "c886a5fe"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "1ad6d034"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "GB00B24FF097"
-                  },
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "source" : "ISIN"
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-2"
+                  "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "ae7919fa"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 1.0075,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 1.0075,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                "priceType" : "ASSET_PRICE"
+                "priceType" : "AssetPrice",
+                "priceExpression" : "PercentageOfNotional"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-2"
+                } ]
               }
             } ],
             "quantity" : [ {
+              "value" : {
+                "value" : 10000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "GBP"
+                  }
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-2"
                 } ]
+              }
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "GB00B24FF097"
+                  },
+                  "source" : "ISIN",
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "1ad6d034"
+              }
+            },
+            "meta" : {
+              "globalKey" : "a8870d90"
+            }
+          } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "Global Bank Inc"
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "GBP"
-                  }
-                },
-                "value" : 10000000
+              "meta" : {
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
               }
-            } ]
-          } ]
+            }
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
+              }
+            }
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f28d2"
-        },
-        "value" : "2021-03-18"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "UnqTradIdr"
-            },
-            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-          }
-        } ],
-        "issuer" : {
-          "value" : "KTKLLEILLLLLLLLLLLLL"
+      "party" : [ {
+        "name" : {
+          "value" : "Global Bank Inc"
         },
         "meta" : {
-          "globalKey" : "4a82737e"
+          "globalKey" : "296093b7",
+          "externalKey" : "GlobalBank"
         }
-      } ]
-    }
-  }, {
-    "meta" : {
-      "globalKey" : "3e8bf3e8"
-    },
-    "state" : {
-      "positionState" : "EXECUTED"
-    },
-    "trade" : {
-      "executionDetails" : {
+      }, {
+        "name" : {
+          "value" : "UK Bank plc"
+        },
         "meta" : {
-          "globalKey" : "69d2eae6"
+          "globalKey" : "1ef4886d",
+          "externalKey" : "UkBank"
+        }
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "296093b7",
+          "externalReference" : "GlobalBank"
+        },
+        "role" : "Seller"
+      }, {
+        "partyReference" : {
+          "globalReference" : "1ef4886d",
+          "externalReference" : "UkBank"
         },
+        "role" : "Buyer"
+      } ],
+      "executionDetails" : {
         "packageReference" : {
-          "componentId" : [ {
+          "listId" : {
             "assignedIdentifier" : [ {
               "identifier" : {
-                "meta" : {
-                  "scheme" : "UnqTradIdr"
-                },
-                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
+                "value" : "Package"
               }
             } ],
+            "meta" : {
+              "globalKey" : "331dcc26"
+            }
+          },
+          "componentId" : [ {
             "issuer" : {
               "value" : "KTKLLEILLLLLLLLLLLLL"
             },
-            "meta" : {
-              "globalKey" : "4a82737e"
-            }
-          }, {
             "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
                 "meta" : {
                   "scheme" : "UnqTradIdr"
-                },
-                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
+                }
               }
             } ],
+            "meta" : {
+              "globalKey" : "32cd87f2"
+            }
+          }, {
             "issuer" : {
               "value" : "KTKLLEILLLLLLLLLLLLL"
             },
-            "meta" : {
-              "globalKey" : "4a82737e"
-            }
-          } ],
-          "listId" : {
             "assignedIdentifier" : [ {
               "identifier" : {
-                "value" : "Package"
+                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+                "meta" : {
+                  "scheme" : "UnqTradIdr"
+                }
               }
             } ],
             "meta" : {
-              "globalKey" : "331dcc26"
+              "globalKey" : "32cd87f2"
             }
-          },
+          } ],
           "meta" : {
-            "globalKey" : "69d2eae6"
+            "globalKey" : "f38fea66"
           }
+        },
+        "meta" : {
+          "globalKey" : "f38fea66"
         }
       },
       "meta" : {
-        "globalKey" : "46102097"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "GlobalBank",
-          "globalKey" : "296093b7"
+        "globalKey" : "96694d8d"
+      }
+    },
+    "state" : {
+      "positionState" : "Executed"
+    },
+    "meta" : {
+      "globalKey" : "49b805dc"
+    }
+  }, {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "KTKLLEILLLLLLLLLLLLL"
         },
-        "name" : {
-          "value" : "Global Bank Inc"
-        }
-      }, {
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+            "meta" : {
+              "scheme" : "UnqTradIdr"
+            }
+          }
+        } ],
         "meta" : {
-          "externalKey" : "UkBank",
-          "globalKey" : "1ef4886d"
-        },
-        "name" : {
-          "value" : "UK Bank plc"
+          "globalKey" : "32cd87f2"
         }
       } ],
-      "partyRole" : [ {
-        "partyReference" : {
-          "externalReference" : "GlobalBank",
-          "globalReference" : "296093b7"
-        },
-        "role" : "SELLER"
-      }, {
-        "partyReference" : {
-          "externalReference" : "UkBank",
-          "globalReference" : "1ef4886d"
-        },
-        "role" : "BUYER"
-      } ],
+      "tradeDate" : {
+        "value" : "2021-03-18",
+        "meta" : {
+          "globalKey" : "3f28d2"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
-              },
-              "name" : {
-                "value" : "Global Bank Inc"
-              }
-            }
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
-              "name" : {
-                "value" : "UK Bank plc"
-              }
-            }
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -2408,6 +2314,81 @@
               "productQualifier" : "RepurchaseAgreement"
             } ],
             "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-19",
+                  "meta" : {
+                    "globalKey" : "3f28d3"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d3",
+                  "externalKey" : "PurchaseDate"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
+                  "meta" : {
+                    "globalKey" : "3f28d6"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
+                }
+              },
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "69ca64cc"
+                }
+              },
               "collateral" : {
                 "collateralPortfolio" : [ {
                   "value" : {
@@ -2418,114 +2399,114 @@
                             "payout" : {
                               "assetPayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
                                 "principalPayment" : {
-                                  "finalPayment" : true,
                                   "initialPayment" : true,
+                                  "finalPayment" : true,
                                   "intermediatePayment" : false,
                                   "meta" : {
                                     "globalKey" : "12a6f5"
                                   }
                                 },
                                 "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "75229c9e"
+                                        "globalKey" : "71834796"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "71834796"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "de136e51"
+                                        "globalKey" : "da741949"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "da741949"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
                                 "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
                                   "security" : {
                                     "productIdentifier" : [ {
                                       "value" : {
                                         "identifier" : {
                                           "value" : "GB00B24FF097"
                                         },
+                                        "source" : "ISIN",
                                         "meta" : {
                                           "globalKey" : "1ad6d034"
-                                        },
-                                        "source" : "ISIN"
+                                        }
                                       }
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityType" : "Debt"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e7ac7fce"
+                            "globalKey" : "12a4a1fe"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e7ac7fce"
+                      "globalKey" : "12a4a1fe"
                     }
                   }
                 } ],
                 "collateralProvisions" : {
-                  "collateralType" : "CASH",
+                  "collateralType" : "Cash",
                   "eligibleCollateral" : [ {
                     "criteria" : [ {
                       "treatment" : {
@@ -2539,222 +2520,241 @@
                     }
                   } ]
                 }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d3"
-                  },
-                  "unadjustedDate" : "2021-03-19"
-                },
-                "meta" : {
-                  "externalKey" : "PurchaseDate",
-                  "globalKey" : "3f28d3"
-                }
-              },
-              "payout" : {
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "6a2c670c"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d6"
-                  },
-                  "unadjustedDate" : "2021-03-22"
-                },
-                "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
-                }
               }
             },
             "meta" : {
-              "globalKey" : "1a2ab30d"
+              "globalKey" : "c6dfdca3"
             }
           },
           "meta" : {
-            "globalKey" : "1a2ab30d"
+            "globalKey" : "c6dfdca3"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "fd5ebec6"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.004,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 0.004,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 9974250,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 9974250
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "c886a5fe"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "1ad6d034"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "GB00B24FF097"
-                  },
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "source" : "ISIN"
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-2"
+                  "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "ae7919fa"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 1.0075,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 1.0075,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                "priceType" : "ASSET_PRICE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "AssetPrice",
+                "priceExpression" : "PercentageOfNotional"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 10000000,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 10000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "GB00B24FF097"
+                  },
+                  "source" : "ISIN",
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "1ad6d034"
+              }
+            },
+            "meta" : {
+              "globalKey" : "a8870d90"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "Global Bank Inc"
+              },
+              "meta" : {
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
+              }
+            }
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
+              }
+            }
+          }
         } ]
       },
-      "tradeDate" : {
+      "party" : [ {
+        "name" : {
+          "value" : "Global Bank Inc"
+        },
         "meta" : {
-          "globalKey" : "3f28d2"
+          "globalKey" : "296093b7",
+          "externalKey" : "GlobalBank"
+        }
+      }, {
+        "name" : {
+          "value" : "UK Bank plc"
         },
-        "value" : "2021-03-18"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
+        "meta" : {
+          "globalKey" : "1ef4886d",
+          "externalKey" : "UkBank"
+        }
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "296093b7",
+          "externalReference" : "GlobalBank"
+        },
+        "role" : "Seller"
+      }, {
+        "partyReference" : {
+          "globalReference" : "1ef4886d",
+          "externalReference" : "UkBank"
+        },
+        "role" : "Buyer"
+      } ],
+      "executionDetails" : {
+        "packageReference" : {
+          "listId" : {
+            "assignedIdentifier" : [ {
+              "identifier" : {
+                "value" : "Package"
+              }
+            } ],
             "meta" : {
-              "scheme" : "UnqTradIdr"
+              "globalKey" : "331dcc26"
+            }
+          },
+          "componentId" : [ {
+            "issuer" : {
+              "value" : "KTKLLEILLLLLLLLLLLLL"
+            },
+            "assignedIdentifier" : [ {
+              "identifier" : {
+                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+                "meta" : {
+                  "scheme" : "UnqTradIdr"
+                }
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "32cd87f2"
+            }
+          }, {
+            "issuer" : {
+              "value" : "KTKLLEILLLLLLLLLLLLL"
             },
-            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
+            "assignedIdentifier" : [ {
+              "identifier" : {
+                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+                "meta" : {
+                  "scheme" : "UnqTradIdr"
+                }
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "32cd87f2"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "f38fea66"
           }
-        } ],
-        "issuer" : {
-          "value" : "KTKLLEILLLLLLLLLLLLL"
         },
         "meta" : {
-          "globalKey" : "4a82737e"
+          "globalKey" : "f38fea66"
         }
-      } ]
+      },
+      "meta" : {
+        "globalKey" : "96694d8d"
+      }
+    },
+    "state" : {
+      "positionState" : "Executed"
+    },
+    "meta" : {
+      "globalKey" : "49b805dc"
     }
   } ],
-  "eventQualifier" : "PairOff",
   "meta" : {
-    "globalKey" : "cc80d660"
+    "globalKey" : "a5b031e0"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-execution-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-execution-func-output.json
index 15df3588f3..d375ef20e6 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-execution-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-execution-func-output.json
@@ -3,165 +3,6 @@
   "instruction" : [ {
     "primitiveInstruction" : {
       "execution" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
-              },
-              "name" : {
-                "value" : "Global Bank Inc"
-              }
-            }
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
-              "name" : {
-                "value" : "UK Bank plc"
-              }
-            }
-          },
-          "role" : "PARTY_2"
-        } ],
-        "parties" : [ {
-          "meta" : {
-            "externalKey" : "GlobalBank",
-            "globalKey" : "296093b7"
-          },
-          "name" : {
-            "value" : "Global Bank Inc"
-          }
-        }, {
-          "meta" : {
-            "externalKey" : "UkBank",
-            "globalKey" : "1ef4886d"
-          },
-          "name" : {
-            "value" : "UK Bank plc"
-          }
-        } ],
-        "partyRoles" : [ {
-          "partyReference" : {
-            "externalReference" : "GlobalBank",
-            "globalReference" : "296093b7"
-          },
-          "role" : "SELLER"
-        }, {
-          "partyReference" : {
-            "externalReference" : "UkBank",
-            "globalReference" : "1ef4886d"
-          },
-          "role" : "BUYER"
-        } ],
-        "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "fd5ebec6"
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 0.004,
-              "perUnitOf" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 9974250
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "c886a5fe"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "1ad6d034"
-            },
-            "productIdentifier" : [ {
-              "value" : {
-                "identifier" : {
-                  "value" : "GB00B24FF097"
-                },
-                "meta" : {
-                  "globalKey" : "1ad6d034"
-                },
-                "source" : "ISIN"
-              }
-            } ]
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 1.0075,
-              "perUnitOf" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 10000000
-            }
-          } ]
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -176,6 +17,81 @@
               "productQualifier" : "RepurchaseAgreement"
             } ],
             "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-19",
+                  "meta" : {
+                    "globalKey" : "3f28d3"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d3",
+                  "externalKey" : "PurchaseDate"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
+                  "meta" : {
+                    "globalKey" : "3f28d6"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
+                }
+              },
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "69ca64cc"
+                }
+              },
               "collateral" : {
                 "collateralPortfolio" : [ {
                   "value" : {
@@ -186,114 +102,114 @@
                             "payout" : {
                               "assetPayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
                                 "principalPayment" : {
-                                  "finalPayment" : true,
                                   "initialPayment" : true,
+                                  "finalPayment" : true,
                                   "intermediatePayment" : false,
                                   "meta" : {
                                     "globalKey" : "12a6f5"
                                   }
                                 },
                                 "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "75229c9e"
+                                        "globalKey" : "71834796"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "71834796"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "de136e51"
+                                        "globalKey" : "da741949"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "da741949"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
                                 "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
                                   "security" : {
                                     "productIdentifier" : [ {
                                       "value" : {
                                         "identifier" : {
                                           "value" : "GB00B24FF097"
                                         },
+                                        "source" : "ISIN",
                                         "meta" : {
                                           "globalKey" : "1ad6d034"
-                                        },
-                                        "source" : "ISIN"
+                                        }
                                       }
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityType" : "Debt"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e7ac7fce"
+                            "globalKey" : "12a4a1fe"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e7ac7fce"
+                      "globalKey" : "12a4a1fe"
                     }
                   }
                 } ],
                 "collateralProvisions" : {
-                  "collateralType" : "CASH",
+                  "collateralType" : "Cash",
                   "eligibleCollateral" : [ {
                     "criteria" : [ {
                       "treatment" : {
@@ -307,185 +223,226 @@
                     }
                   } ]
                 }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d3"
-                  },
-                  "unadjustedDate" : "2021-03-19"
-                },
-                "meta" : {
-                  "externalKey" : "PurchaseDate",
-                  "globalKey" : "3f28d3"
-                }
-              },
-              "payout" : {
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "6a2c670c"
+              }
+            },
+            "meta" : {
+              "globalKey" : "c6dfdca3"
+            }
+          },
+          "meta" : {
+            "globalKey" : "c6dfdca3"
+          }
+        },
+        "priceQuantity" : [ {
+          "price" : [ {
+            "value" : {
+              "value" : 0.004,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
                 }
               },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d6"
-                  },
-                  "unadjustedDate" : "2021-03-22"
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              },
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 9974250,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "ae7919fa"
+          }
+        }, {
+          "price" : [ {
+            "value" : {
+              "value" : 1.0075,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              },
+              "priceType" : "AssetPrice",
+              "priceExpression" : "PercentageOfNotional"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 10000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "GB00B24FF097"
                 },
+                "source" : "ISIN",
                 "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
+                  "globalKey" : "1ad6d034"
                 }
               }
-            },
+            } ],
             "meta" : {
-              "globalKey" : "1a2ab30d"
+              "globalKey" : "1ad6d034"
             }
           },
           "meta" : {
-            "globalKey" : "1a2ab30d"
+            "globalKey" : "a8870d90"
           }
-        },
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "Global Bank Inc"
+              },
+              "meta" : {
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
+              }
+            }
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
+              }
+            }
+          }
+        } ],
+        "parties" : [ {
+          "name" : {
+            "value" : "Global Bank Inc"
+          },
+          "meta" : {
+            "globalKey" : "296093b7",
+            "externalKey" : "GlobalBank"
+          }
+        }, {
+          "name" : {
+            "value" : "UK Bank plc"
+          },
+          "meta" : {
+            "globalKey" : "1ef4886d",
+            "externalKey" : "UkBank"
+          }
+        } ],
+        "partyRoles" : [ {
+          "partyReference" : {
+            "globalReference" : "296093b7",
+            "externalReference" : "GlobalBank"
+          },
+          "role" : "Seller"
+        }, {
+          "partyReference" : {
+            "globalReference" : "1ef4886d",
+            "externalReference" : "UkBank"
+          },
+          "role" : "Buyer"
+        } ],
         "tradeDate" : {
+          "value" : "2021-03-18",
           "meta" : {
             "globalKey" : "3f28d2"
-          },
-          "value" : "2021-03-18"
+          }
         },
         "tradeIdentifier" : [ {
+          "issuer" : {
+            "value" : "KTKLLEILLLLLLLLLLLLL"
+          },
           "assignedIdentifier" : [ {
             "identifier" : {
+              "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
               "meta" : {
                 "scheme" : "UnqTradIdr"
-              },
-              "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
+              }
             }
           } ],
-          "issuer" : {
-            "value" : "KTKLLEILLLLLLLLLLLLL"
-          },
           "meta" : {
-            "globalKey" : "4a82737e"
+            "globalKey" : "32cd87f2"
           }
         } ]
       }
     }
   } ],
+  "eventQualifier" : "Execution",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "eaf9dc6e"
-    },
-    "state" : {
-      "positionState" : "FORMED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "b9aaf231"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "GlobalBank",
-          "globalKey" : "296093b7"
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "KTKLLEILLLLLLLLLLLLL"
         },
-        "name" : {
-          "value" : "Global Bank Inc"
-        }
-      }, {
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+            "meta" : {
+              "scheme" : "UnqTradIdr"
+            }
+          }
+        } ],
         "meta" : {
-          "externalKey" : "UkBank",
-          "globalKey" : "1ef4886d"
-        },
-        "name" : {
-          "value" : "UK Bank plc"
+          "globalKey" : "32cd87f2"
         }
       } ],
-      "partyRole" : [ {
-        "partyReference" : {
-          "externalReference" : "GlobalBank",
-          "globalReference" : "296093b7"
-        },
-        "role" : "SELLER"
-      }, {
-        "partyReference" : {
-          "externalReference" : "UkBank",
-          "globalReference" : "1ef4886d"
-        },
-        "role" : "BUYER"
-      } ],
+      "tradeDate" : {
+        "value" : "2021-03-18",
+        "meta" : {
+          "globalKey" : "3f28d2"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
-              },
-              "name" : {
-                "value" : "Global Bank Inc"
-              }
-            }
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
-              "name" : {
-                "value" : "UK Bank plc"
-              }
-            }
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -500,6 +457,81 @@
               "productQualifier" : "RepurchaseAgreement"
             } ],
             "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-19",
+                  "meta" : {
+                    "globalKey" : "3f28d3"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d3",
+                  "externalKey" : "PurchaseDate"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
+                  "meta" : {
+                    "globalKey" : "3f28d6"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
+                }
+              },
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "69ca64cc"
+                }
+              },
               "collateral" : {
                 "collateralPortfolio" : [ {
                   "value" : {
@@ -510,114 +542,114 @@
                             "payout" : {
                               "assetPayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
                                 "principalPayment" : {
-                                  "finalPayment" : true,
                                   "initialPayment" : true,
+                                  "finalPayment" : true,
                                   "intermediatePayment" : false,
                                   "meta" : {
                                     "globalKey" : "12a6f5"
                                   }
                                 },
                                 "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "75229c9e"
+                                        "globalKey" : "71834796"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "71834796"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "de136e51"
+                                        "globalKey" : "da741949"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "da741949"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
                                 "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
                                   "security" : {
                                     "productIdentifier" : [ {
                                       "value" : {
                                         "identifier" : {
                                           "value" : "GB00B24FF097"
                                         },
+                                        "source" : "ISIN",
                                         "meta" : {
                                           "globalKey" : "1ad6d034"
-                                        },
-                                        "source" : "ISIN"
+                                        }
                                       }
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityType" : "Debt"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e7ac7fce"
+                            "globalKey" : "12a4a1fe"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e7ac7fce"
+                      "globalKey" : "12a4a1fe"
                     }
                   }
                 } ],
                 "collateralProvisions" : {
-                  "collateralType" : "CASH",
+                  "collateralType" : "Cash",
                   "eligibleCollateral" : [ {
                     "criteria" : [ {
                       "treatment" : {
@@ -631,222 +663,190 @@
                     }
                   } ]
                 }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d3"
-                  },
-                  "unadjustedDate" : "2021-03-19"
-                },
-                "meta" : {
-                  "externalKey" : "PurchaseDate",
-                  "globalKey" : "3f28d3"
-                }
-              },
-              "payout" : {
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "6a2c670c"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d6"
-                  },
-                  "unadjustedDate" : "2021-03-22"
-                },
-                "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
-                }
               }
             },
             "meta" : {
-              "globalKey" : "1a2ab30d"
+              "globalKey" : "c6dfdca3"
             }
           },
           "meta" : {
-            "globalKey" : "1a2ab30d"
+            "globalKey" : "c6dfdca3"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "fd5ebec6"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.004,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 0.004,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 9974250,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 9974250
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "c886a5fe"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "1ad6d034"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "GB00B24FF097"
-                  },
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "source" : "ISIN"
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-2"
+                  "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "ae7919fa"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 1.0075,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 1.0075,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                "priceType" : "ASSET_PRICE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "AssetPrice",
+                "priceExpression" : "PercentageOfNotional"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 10000000,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 10000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
+              }
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "GB00B24FF097"
+                  },
+                  "source" : "ISIN",
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "1ad6d034"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "a8870d90"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "Global Bank Inc"
+              },
+              "meta" : {
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
+              }
+            }
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
+              }
+            }
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f28d2"
+      "party" : [ {
+        "name" : {
+          "value" : "Global Bank Inc"
         },
-        "value" : "2021-03-18"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "UnqTradIdr"
-            },
-            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-          }
-        } ],
-        "issuer" : {
-          "value" : "KTKLLEILLLLLLLLLLLLL"
+        "meta" : {
+          "globalKey" : "296093b7",
+          "externalKey" : "GlobalBank"
+        }
+      }, {
+        "name" : {
+          "value" : "UK Bank plc"
         },
         "meta" : {
-          "globalKey" : "4a82737e"
+          "globalKey" : "1ef4886d",
+          "externalKey" : "UkBank"
         }
-      } ]
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "296093b7",
+          "externalReference" : "GlobalBank"
+        },
+        "role" : "Seller"
+      }, {
+        "partyReference" : {
+          "globalReference" : "1ef4886d",
+          "externalReference" : "UkBank"
+        },
+        "role" : "Buyer"
+      } ],
+      "meta" : {
+        "globalKey" : "b62aaee7"
+      }
+    },
+    "state" : {
+      "positionState" : "Formed"
+    },
+    "meta" : {
+      "globalKey" : "522d7d8a"
     }
   } ],
-  "eventQualifier" : "Execution",
   "meta" : {
-    "globalKey" : "d6d1abab"
+    "globalKey" : "e806d239"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/roll-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/roll-output.json
index 93dd2ffc8a..abdf7e94ac 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/roll-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/roll-output.json
@@ -1,77 +1,135 @@
 {
-  "effectiveDate" : "2021-03-22",
   "eventDate" : "2021-03-22",
+  "effectiveDate" : "2021-03-22",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "eaf9dc6e"
-        },
-        "state" : {
-          "positionState" : "FORMED"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "b9aaf231"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "GlobalBank",
-              "globalKey" : "296093b7"
-            },
-            "name" : {
-              "value" : "Global Bank Inc"
-            }
-          }, {
-            "meta" : {
-              "externalKey" : "UkBank",
-              "globalKey" : "1ef4886d"
-            },
-            "name" : {
-              "value" : "UK Bank plc"
-            }
-          } ],
-          "partyRole" : [ {
-            "partyReference" : {
-              "externalReference" : "GlobalBank",
-              "globalReference" : "296093b7"
-            },
-            "role" : "SELLER"
-          }, {
-            "partyReference" : {
-              "externalReference" : "UkBank",
-              "globalReference" : "1ef4886d"
-            },
-            "role" : "BUYER"
-          } ],
-          "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
+    "primitiveInstruction" : {
+      "split" : {
+        "breakdown" : [ {
+          "quantityChange" : {
+            "change" : [ {
+              "quantity" : [ {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "GlobalBank",
-                    "globalKey" : "296093b7"
+                  "value" : 0,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "16e4a5"
+              }
+            } ],
+            "direction" : "Replace"
+          }
+        }, {
+          "quantityChange" : {
+            "change" : [ {
+              "price" : [ {
+                "value" : {
+                  "value" : 0.004,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
                   },
-                  "name" : {
-                    "value" : "Global Bank Inc"
+                  "perUnitOf" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
+                  },
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
+                }
+              } ],
+              "quantity" : [ {
+                "value" : {
+                  "value" : 9974250,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
                   }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
                 }
-              },
-              "role" : "PARTY_1"
+              } ],
+              "meta" : {
+                "globalKey" : "ae7919fa"
+              }
             }, {
-              "partyReference" : {
+              "price" : [ {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "UkBank",
-                    "globalKey" : "1ef4886d"
+                  "value" : 1.0075,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
                   },
-                  "name" : {
-                    "value" : "UK Bank plc"
+                  "perUnitOf" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
+                  },
+                  "priceType" : "AssetPrice",
+                  "priceExpression" : "PercentageOfNotional"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-2"
+                  } ]
+                }
+              } ],
+              "quantity" : [ {
+                "value" : {
+                  "value" : 10000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
+                }
+              } ],
+              "observable" : {
+                "productIdentifier" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "GB00B24FF097"
+                    },
+                    "source" : "ISIN",
+                    "meta" : {
+                      "globalKey" : "1ad6d034"
+                    }
                   }
+                } ],
+                "meta" : {
+                  "globalKey" : "1ad6d034"
                 }
               },
-              "role" : "PARTY_2"
+              "meta" : {
+                "globalKey" : "a8870d90"
+              }
             } ],
+            "direction" : "Replace"
+          },
+          "termsChange" : {
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -86,6 +144,80 @@
                   "productQualifier" : "RepurchaseAgreement"
                 } ],
                 "economicTerms" : {
+                  "effectiveDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-22",
+                      "meta" : {
+                        "globalKey" : "3f28d6"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d6",
+                      "externalKey" : "RepurchaseDate"
+                    }
+                  },
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-25",
+                      "meta" : {
+                        "globalKey" : "3f28d9"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d9"
+                    }
+                  },
+                  "payout" : {
+                    "interestRatePayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "priceQuantity" : {
+                        "quantitySchedule" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "quantity-1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      },
+                      "principalPayment" : {
+                        "initialPayment" : true,
+                        "finalPayment" : true,
+                        "intermediatePayment" : false,
+                        "meta" : {
+                          "globalKey" : "12a6f5"
+                        }
+                      },
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "meta" : {
+                        "globalKey" : "69ca64cc"
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "69ca64cc"
+                    }
+                  },
                   "collateral" : {
                     "collateralPortfolio" : [ {
                       "value" : {
@@ -96,114 +228,114 @@
                                 "payout" : {
                                   "assetPayout" : [ {
                                     "payerReceiver" : {
-                                      "payer" : "PARTY_1",
-                                      "receiver" : "PARTY_2"
+                                      "payer" : "Party1",
+                                      "receiver" : "Party2"
                                     },
                                     "priceQuantity" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
                                       "quantitySchedule" : {
                                         "address" : {
                                           "scope" : "DOCUMENT",
                                           "value" : "quantity-2"
                                         }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "0"
                                       }
                                     },
                                     "principalPayment" : {
-                                      "finalPayment" : true,
                                       "initialPayment" : true,
+                                      "finalPayment" : true,
                                       "intermediatePayment" : false,
                                       "meta" : {
                                         "globalKey" : "12a6f5"
                                       }
                                     },
                                     "assetLeg" : [ {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                       "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "75229c9e"
-                                        },
                                         "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
                                           "meta" : {
-                                            "globalKey" : "75229c9e"
+                                            "globalKey" : "71834796"
                                           },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
+                                          "businessDayConvention" : "NotApplicable",
                                           "dateRelativeTo" : {
-                                            "externalReference" : "PurchaseDate",
-                                            "globalReference" : "3f28d3"
+                                            "globalReference" : "3f28d3",
+                                            "externalReference" : "PurchaseDate"
                                           }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "71834796"
                                         }
-                                      }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
                                     }, {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                       "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "de136e51"
-                                        },
                                         "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
                                           "meta" : {
-                                            "globalKey" : "de136e51"
+                                            "globalKey" : "da741949"
                                           },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
+                                          "businessDayConvention" : "NotApplicable",
                                           "dateRelativeTo" : {
-                                            "externalReference" : "RepurchaseDate",
-                                            "globalReference" : "3f28d6"
+                                            "globalReference" : "3f28d6",
+                                            "externalReference" : "RepurchaseDate"
                                           }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "da741949"
                                         }
-                                      }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
                                     } ],
-                                    "durationType" : {
-                                      "durationType" : "TERM"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "e7ac7fce"
-                                    },
                                     "securityInformation" : {
-                                      "meta" : {
-                                        "globalKey" : "40232adf"
-                                      },
                                       "security" : {
                                         "productIdentifier" : [ {
                                           "value" : {
                                             "identifier" : {
                                               "value" : "GB00B24FF097"
                                             },
+                                            "source" : "ISIN",
                                             "meta" : {
                                               "globalKey" : "1ad6d034"
-                                            },
-                                            "source" : "ISIN"
+                                            }
                                           }
                                         } ],
-                                        "securityType" : "DEBT"
+                                        "securityType" : "Debt"
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "40232adf"
                                       }
-                                    }
-                                  } ],
-                                  "meta" : {
-                                    "globalKey" : "e7ac7fce"
+                                    },
+                                    "durationType" : {
+                                      "durationType" : "Term"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "12a4a1fe"
+                                    }
+                                  } ],
+                                  "meta" : {
+                                    "globalKey" : "12a4a1fe"
                                   }
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             },
                             "meta" : {
-                              "globalKey" : "e7ac7fce"
+                              "globalKey" : "12a4a1fe"
                             }
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "collateralProvisions" : {
-                      "collateralType" : "CASH",
+                      "collateralType" : "Cash",
                       "eligibleCollateral" : [ {
                         "criteria" : [ {
                           "treatment" : {
@@ -217,363 +349,135 @@
                         }
                       } ]
                     }
-                  },
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "45aceb83"
+                }
+              },
+              "meta" : {
+                "globalKey" : "45aceb83"
+              }
+            }
+          }
+        } ]
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "KTKLLEILLLLLLLLLLLLL"
+            },
+            "assignedIdentifier" : [ {
+              "identifier" : {
+                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+                "meta" : {
+                  "scheme" : "UnqTradIdr"
+                }
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "32cd87f2"
+            }
+          } ],
+          "tradeDate" : {
+            "value" : "2021-03-18",
+            "meta" : {
+              "globalKey" : "3f28d2"
+            }
+          },
+          "tradableProduct" : {
+            "product" : {
+              "contractualProduct" : {
+                "productTaxonomy" : [ {
+                  "source" : "CFI",
+                  "value" : {
+                    "name" : {
+                      "value" : "LRSTXD"
+                    }
+                  }
+                }, {
+                  "source" : "ISDA",
+                  "productQualifier" : "RepurchaseAgreement"
+                } ],
+                "economicTerms" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-19",
                       "meta" : {
                         "globalKey" : "3f28d3"
-                      },
-                      "unadjustedDate" : "2021-03-19"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d3",
+                      "externalKey" : "PurchaseDate"
+                    }
+                  },
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-22",
+                      "meta" : {
+                        "globalKey" : "3f28d6"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "PurchaseDate",
-                      "globalKey" : "3f28d3"
+                      "globalKey" : "3f28d6",
+                      "externalKey" : "RepurchaseDate"
                     }
                   },
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "principalPayment" : {
-                        "finalPayment" : true,
                         "initialPayment" : true,
+                        "finalPayment" : true,
                         "intermediatePayment" : false,
                         "meta" : {
                           "globalKey" : "12a6f5"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "6a2c670c"
-                      },
                       "rateSpecification" : {
                         "fixedRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "rateSchedule" : {
                             "price" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
-                          }
-                        }
-                      }
-                    } ],
-                    "meta" : {
-                      "globalKey" : "6a2c670c"
-                    }
-                  },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d6"
-                      },
-                      "unadjustedDate" : "2021-03-22"
-                    },
-                    "meta" : {
-                      "externalKey" : "RepurchaseDate",
-                      "globalKey" : "3f28d6"
-                    }
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "1a2ab30d"
-                }
-              },
-              "meta" : {
-                "globalKey" : "1a2ab30d"
-              }
-            },
-            "tradeLot" : [ {
-              "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "fd5ebec6"
-                },
-                "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "value" : 0.004,
-                    "perUnitOf" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "value" : 9974250
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "c886a5fe"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "value" : "GB00B24FF097"
-                      },
-                      "meta" : {
-                        "globalKey" : "1ad6d034"
-                      },
-                      "source" : "ISIN"
-                    }
-                  } ]
-                },
-                "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "value" : 1.0075,
-                    "perUnitOf" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                    "priceType" : "ASSET_PRICE"
-                  }
-                } ],
-                "quantity" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
-                    } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "value" : 10000000
-                  }
-                } ]
-              } ]
-            } ]
-          },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f28d2"
-            },
-            "value" : "2021-03-18"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "UnqTradIdr"
-                },
-                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-              }
-            } ],
-            "issuer" : {
-              "value" : "KTKLLEILLLLLLLLLLLLL"
-            },
-            "meta" : {
-              "globalKey" : "4a82737e"
-            }
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "split" : {
-        "breakdown" : [ {
-          "quantityChange" : {
-            "change" : [ {
-              "meta" : {
-                "globalKey" : "16e4a5"
-              },
-              "quantity" : [ {
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "GBP"
-                    }
-                  },
-                  "value" : 0
-                }
-              } ]
-            } ],
-            "direction" : "REPLACE"
-          }
-        }, {
-          "quantityChange" : {
-            "change" : [ {
-              "meta" : {
-                "globalKey" : "fd5ebec6"
-              },
-              "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "GBP"
-                    }
-                  },
-                  "value" : 0.004,
-                  "perUnitOf" : {
-                    "currency" : {
-                      "value" : "GBP"
-                    }
-                  },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ],
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "GBP"
-                    }
-                  },
-                  "value" : 9974250
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "c886a5fe"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "1ad6d034"
-                },
-                "productIdentifier" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "GB00B24FF097"
-                    },
-                    "meta" : {
-                      "globalKey" : "1ad6d034"
-                    },
-                    "source" : "ISIN"
-                  }
-                } ]
-              },
-              "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-2"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "GBP"
-                    }
-                  },
-                  "value" : 1.0075,
-                  "perUnitOf" : {
-                    "currency" : {
-                      "value" : "GBP"
-                    }
-                  },
-                  "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                  "priceType" : "ASSET_PRICE"
-                }
-              } ],
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "GBP"
+                                "value" : "price-1"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "meta" : {
+                        "globalKey" : "69ca64cc"
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "69ca64cc"
                     }
                   },
-                  "value" : 10000000
-                }
-              } ]
-            } ],
-            "direction" : "REPLACE"
-          },
-          "termsChange" : {
-            "product" : {
-              "contractualProduct" : {
-                "productTaxonomy" : [ {
-                  "source" : "CFI",
-                  "value" : {
-                    "name" : {
-                      "value" : "LRSTXD"
-                    }
-                  }
-                }, {
-                  "source" : "ISDA",
-                  "productQualifier" : "RepurchaseAgreement"
-                } ],
-                "economicTerms" : {
                   "collateral" : {
                     "collateralPortfolio" : [ {
                       "value" : {
@@ -584,114 +488,114 @@
                                 "payout" : {
                                   "assetPayout" : [ {
                                     "payerReceiver" : {
-                                      "payer" : "PARTY_1",
-                                      "receiver" : "PARTY_2"
+                                      "payer" : "Party1",
+                                      "receiver" : "Party2"
                                     },
                                     "priceQuantity" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
                                       "quantitySchedule" : {
                                         "address" : {
                                           "scope" : "DOCUMENT",
                                           "value" : "quantity-2"
                                         }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "0"
                                       }
                                     },
                                     "principalPayment" : {
-                                      "finalPayment" : true,
                                       "initialPayment" : true,
+                                      "finalPayment" : true,
                                       "intermediatePayment" : false,
                                       "meta" : {
                                         "globalKey" : "12a6f5"
                                       }
                                     },
                                     "assetLeg" : [ {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                       "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "75229c9e"
-                                        },
                                         "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
                                           "meta" : {
-                                            "globalKey" : "75229c9e"
+                                            "globalKey" : "71834796"
                                           },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
+                                          "businessDayConvention" : "NotApplicable",
                                           "dateRelativeTo" : {
-                                            "externalReference" : "PurchaseDate",
-                                            "globalReference" : "3f28d3"
+                                            "globalReference" : "3f28d3",
+                                            "externalReference" : "PurchaseDate"
                                           }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "71834796"
                                         }
-                                      }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
                                     }, {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                       "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "de136e51"
-                                        },
                                         "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
                                           "meta" : {
-                                            "globalKey" : "de136e51"
+                                            "globalKey" : "da741949"
                                           },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
+                                          "businessDayConvention" : "NotApplicable",
                                           "dateRelativeTo" : {
-                                            "externalReference" : "RepurchaseDate",
-                                            "globalReference" : "3f28d6"
+                                            "globalReference" : "3f28d6",
+                                            "externalReference" : "RepurchaseDate"
                                           }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "da741949"
                                         }
-                                      }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
                                     } ],
-                                    "durationType" : {
-                                      "durationType" : "TERM"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "e7ac7fce"
-                                    },
                                     "securityInformation" : {
-                                      "meta" : {
-                                        "globalKey" : "40232adf"
-                                      },
                                       "security" : {
                                         "productIdentifier" : [ {
                                           "value" : {
                                             "identifier" : {
                                               "value" : "GB00B24FF097"
                                             },
+                                            "source" : "ISIN",
                                             "meta" : {
                                               "globalKey" : "1ad6d034"
-                                            },
-                                            "source" : "ISIN"
+                                            }
                                           }
                                         } ],
-                                        "securityType" : "DEBT"
+                                        "securityType" : "Debt"
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "40232adf"
                                       }
+                                    },
+                                    "durationType" : {
+                                      "durationType" : "Term"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "12a4a1fe"
                                     }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "e7ac7fce"
+                                    "globalKey" : "12a4a1fe"
                                   }
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             },
                             "meta" : {
-                              "globalKey" : "e7ac7fce"
+                              "globalKey" : "12a4a1fe"
                             }
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "collateralProvisions" : {
-                      "collateralType" : "CASH",
+                      "collateralType" : "Cash",
                       "eligibleCollateral" : [ {
                         "criteria" : [ {
                           "treatment" : {
@@ -705,167 +609,216 @@
                         }
                       } ]
                     }
-                  },
-                  "effectiveDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d6"
-                      },
-                      "unadjustedDate" : "2021-03-22"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c6dfdca3"
+                }
+              },
+              "meta" : {
+                "globalKey" : "c6dfdca3"
+              }
+            },
+            "tradeLot" : [ {
+              "priceQuantity" : [ {
+                "price" : [ {
+                  "value" : {
+                    "value" : 0.004,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
                     },
-                    "meta" : {
-                      "externalKey" : "RepurchaseDate",
-                      "globalKey" : "3f28d6"
+                    "perUnitOf" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
+                    },
+                    "priceType" : "InterestRate"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
+                  }
+                } ],
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 9974250,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
                     }
                   },
-                  "payout" : {
-                    "interestRatePayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
-                      },
-                      "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "quantitySchedule" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "quantity-1"
-                          }
-                        }
-                      },
-                      "principalPayment" : {
-                        "finalPayment" : true,
-                        "initialPayment" : true,
-                        "intermediatePayment" : false,
-                        "meta" : {
-                          "globalKey" : "12a6f5"
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "6a2c670c"
-                      },
-                      "rateSpecification" : {
-                        "fixedRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
-                          }
-                        }
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    } ]
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "ae7919fa"
+                }
+              }, {
+                "price" : [ {
+                  "value" : {
+                    "value" : 1.0075,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
+                    },
+                    "perUnitOf" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
+                    },
+                    "priceType" : "AssetPrice",
+                    "priceExpression" : "PercentageOfNotional"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-2"
+                    } ]
+                  }
+                } ],
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 10000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "GBP"
                       }
-                    } ],
-                    "meta" : {
-                      "globalKey" : "6a2c670c"
                     }
                   },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d9"
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
+                  }
+                } ],
+                "observable" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "GB00B24FF097"
                       },
-                      "unadjustedDate" : "2021-03-25"
-                    },
-                    "meta" : {
-                      "globalKey" : "3f28d9"
+                      "source" : "ISIN",
+                      "meta" : {
+                        "globalKey" : "1ad6d034"
+                      }
                     }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "8329d853"
+                  "globalKey" : "a8870d90"
+                }
+              } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "value" : {
+                  "name" : {
+                    "value" : "Global Bank Inc"
+                  },
+                  "meta" : {
+                    "globalKey" : "296093b7",
+                    "externalKey" : "GlobalBank"
+                  }
+                }
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "value" : {
+                  "name" : {
+                    "value" : "UK Bank plc"
+                  },
+                  "meta" : {
+                    "globalKey" : "1ef4886d",
+                    "externalKey" : "UkBank"
+                  }
                 }
-              },
-              "meta" : {
-                "globalKey" : "8329d853"
               }
+            } ]
+          },
+          "party" : [ {
+            "name" : {
+              "value" : "Global Bank Inc"
+            },
+            "meta" : {
+              "globalKey" : "296093b7",
+              "externalKey" : "GlobalBank"
+            }
+          }, {
+            "name" : {
+              "value" : "UK Bank plc"
+            },
+            "meta" : {
+              "globalKey" : "1ef4886d",
+              "externalKey" : "UkBank"
             }
+          } ],
+          "partyRole" : [ {
+            "partyReference" : {
+              "globalReference" : "296093b7",
+              "externalReference" : "GlobalBank"
+            },
+            "role" : "Seller"
+          }, {
+            "partyReference" : {
+              "globalReference" : "1ef4886d",
+              "externalReference" : "UkBank"
+            },
+            "role" : "Buyer"
+          } ],
+          "meta" : {
+            "globalKey" : "b62aaee7"
           }
-        } ]
+        },
+        "state" : {
+          "positionState" : "Formed"
+        },
+        "meta" : {
+          "globalKey" : "522d7d8a"
+        }
       }
     }
   } ],
   "after" : [ {
-    "meta" : {
-      "globalKey" : "28b21b91"
-    },
-    "state" : {
-      "closedState" : {
-        "state" : "TERMINATED"
-      },
-      "positionState" : "CLOSED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "25234300"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "GlobalBank",
-          "globalKey" : "296093b7"
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "KTKLLEILLLLLLLLLLLLL"
         },
-        "name" : {
-          "value" : "Global Bank Inc"
-        }
-      }, {
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+            "meta" : {
+              "scheme" : "UnqTradIdr"
+            }
+          }
+        } ],
         "meta" : {
-          "externalKey" : "UkBank",
-          "globalKey" : "1ef4886d"
-        },
-        "name" : {
-          "value" : "UK Bank plc"
+          "globalKey" : "32cd87f2"
         }
       } ],
-      "partyRole" : [ {
-        "partyReference" : {
-          "externalReference" : "GlobalBank",
-          "globalReference" : "296093b7"
-        },
-        "role" : "SELLER"
-      }, {
-        "partyReference" : {
-          "externalReference" : "UkBank",
-          "globalReference" : "1ef4886d"
-        },
-        "role" : "BUYER"
-      } ],
+      "tradeDate" : {
+        "value" : "2021-03-18",
+        "meta" : {
+          "globalKey" : "3f28d2"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
-              },
-              "name" : {
-                "value" : "Global Bank Inc"
-              }
-            }
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
-              "name" : {
-                "value" : "UK Bank plc"
-              }
-            }
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -880,6 +833,81 @@
               "productQualifier" : "RepurchaseAgreement"
             } ],
             "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-19",
+                  "meta" : {
+                    "globalKey" : "3f28d3"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d3",
+                  "externalKey" : "PurchaseDate"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
+                  "meta" : {
+                    "globalKey" : "3f28d6"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
+                }
+              },
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "69ca64cc"
+                }
+              },
               "collateral" : {
                 "collateralPortfolio" : [ {
                   "value" : {
@@ -890,114 +918,114 @@
                             "payout" : {
                               "assetPayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
                                 "principalPayment" : {
-                                  "finalPayment" : true,
                                   "initialPayment" : true,
+                                  "finalPayment" : true,
                                   "intermediatePayment" : false,
                                   "meta" : {
                                     "globalKey" : "12a6f5"
                                   }
                                 },
                                 "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "75229c9e"
+                                        "globalKey" : "71834796"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "71834796"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "de136e51"
+                                        "globalKey" : "da741949"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "da741949"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
                                 "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
                                   "security" : {
                                     "productIdentifier" : [ {
                                       "value" : {
                                         "identifier" : {
                                           "value" : "GB00B24FF097"
                                         },
+                                        "source" : "ISIN",
                                         "meta" : {
                                           "globalKey" : "1ad6d034"
-                                        },
-                                        "source" : "ISIN"
+                                        }
                                       }
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityType" : "Debt"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e7ac7fce"
+                            "globalKey" : "12a4a1fe"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e7ac7fce"
+                      "globalKey" : "12a4a1fe"
                     }
                   }
                 } ],
                 "collateralProvisions" : {
-                  "collateralType" : "CASH",
+                  "collateralType" : "Cash",
                   "eligibleCollateral" : [ {
                     "criteria" : [ {
                       "treatment" : {
@@ -1011,285 +1039,216 @@
                     }
                   } ]
                 }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d3"
-                  },
-                  "unadjustedDate" : "2021-03-19"
-                },
-                "meta" : {
-                  "externalKey" : "PurchaseDate",
-                  "globalKey" : "3f28d3"
-                }
-              },
-              "payout" : {
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "6a2c670c"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d6"
-                  },
-                  "unadjustedDate" : "2021-03-22"
-                },
-                "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
-                }
               }
             },
             "meta" : {
-              "globalKey" : "1a2ab30d"
+              "globalKey" : "c6dfdca3"
             }
           },
           "meta" : {
-            "globalKey" : "1a2ab30d"
+            "globalKey" : "c6dfdca3"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "2d65fdc6"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.004,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 0.004,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 0,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 0
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "f435dd0d"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "1ad6d034"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "GB00B24FF097"
-                  },
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "source" : "ISIN"
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-2"
+                  "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "7f59bafa"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 1.0075,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 1.0075,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                "priceType" : "ASSET_PRICE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "AssetPrice",
+                "priceExpression" : "PercentageOfNotional"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 0,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 0
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
+              }
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "GB00B24FF097"
+                  },
+                  "source" : "ISIN",
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "1ad6d034"
               }
-            } ]
-          } ]
-        } ]
-      },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f28d2"
-        },
-        "value" : "2021-03-18"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "UnqTradIdr"
             },
-            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-          }
+            "meta" : {
+              "globalKey" : "40cd97a1"
+            }
+          } ]
         } ],
-        "issuer" : {
-          "value" : "KTKLLEILLLLLLLLLLLLL"
-        },
-        "meta" : {
-          "globalKey" : "4a82737e"
-        }
-      } ]
-    }
-  }, {
-    "meta" : {
-      "globalKey" : "2b15a66"
-    },
-    "trade" : {
-      "meta" : {
-        "globalKey" : "2b15a66"
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "Global Bank Inc"
+              },
+              "meta" : {
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
+              }
+            }
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
+              }
+            }
+          }
+        } ]
       },
       "party" : [ {
-        "meta" : {
-          "externalKey" : "GlobalBank",
-          "globalKey" : "296093b7"
-        },
         "name" : {
           "value" : "Global Bank Inc"
+        },
+        "meta" : {
+          "globalKey" : "296093b7",
+          "externalKey" : "GlobalBank"
         }
       }, {
-        "meta" : {
-          "externalKey" : "UkBank",
-          "globalKey" : "1ef4886d"
-        },
         "name" : {
           "value" : "UK Bank plc"
+        },
+        "meta" : {
+          "globalKey" : "1ef4886d",
+          "externalKey" : "UkBank"
         }
       } ],
       "partyRole" : [ {
         "partyReference" : {
-          "externalReference" : "GlobalBank",
-          "globalReference" : "296093b7"
+          "globalReference" : "296093b7",
+          "externalReference" : "GlobalBank"
         },
-        "role" : "SELLER"
+        "role" : "Seller"
       }, {
         "partyReference" : {
-          "externalReference" : "UkBank",
-          "globalReference" : "1ef4886d"
+          "globalReference" : "1ef4886d",
+          "externalReference" : "UkBank"
         },
-        "role" : "BUYER"
+        "role" : "Buyer"
       } ],
-      "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
-              },
-              "name" : {
-                "value" : "Global Bank Inc"
-              }
-            }
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
-              "name" : {
-                "value" : "UK Bank plc"
-              }
+      "meta" : {
+        "globalKey" : "e3c733f8"
+      }
+    },
+    "state" : {
+      "closedState" : {
+        "state" : "Terminated"
+      },
+      "positionState" : "Closed"
+    },
+    "meta" : {
+      "globalKey" : "c34c9c87"
+    }
+  }, {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "KTKLLEILLLLLLLLLLLLL"
+        },
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+            "meta" : {
+              "scheme" : "UnqTradIdr"
             }
-          },
-          "role" : "PARTY_2"
+          }
         } ],
+        "meta" : {
+          "globalKey" : "32cd87f2"
+        }
+      } ],
+      "tradeDate" : {
+        "value" : "2021-03-18",
+        "meta" : {
+          "globalKey" : "3f28d2"
+        }
+      },
+      "tradableProduct" : {
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -1304,6 +1263,80 @@
               "productQualifier" : "RepurchaseAgreement"
             } ],
             "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
+                  "meta" : {
+                    "globalKey" : "3f28d6"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-25",
+                  "meta" : {
+                    "globalKey" : "3f28d9"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d9"
+                }
+              },
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "69ca64cc"
+                }
+              },
               "collateral" : {
                 "collateralPortfolio" : [ {
                   "value" : {
@@ -1314,114 +1347,114 @@
                             "payout" : {
                               "assetPayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
                                 "principalPayment" : {
-                                  "finalPayment" : true,
                                   "initialPayment" : true,
+                                  "finalPayment" : true,
                                   "intermediatePayment" : false,
                                   "meta" : {
                                     "globalKey" : "12a6f5"
                                   }
                                 },
                                 "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "75229c9e"
+                                        "globalKey" : "71834796"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "71834796"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "de136e51"
+                                        "globalKey" : "da741949"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "da741949"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
                                 "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
                                   "security" : {
                                     "productIdentifier" : [ {
                                       "value" : {
                                         "identifier" : {
                                           "value" : "GB00B24FF097"
                                         },
+                                        "source" : "ISIN",
                                         "meta" : {
                                           "globalKey" : "1ad6d034"
-                                        },
-                                        "source" : "ISIN"
+                                        }
                                       }
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityType" : "Debt"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e7ac7fce"
+                            "globalKey" : "12a4a1fe"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e7ac7fce"
+                      "globalKey" : "12a4a1fe"
                     }
                   }
                 } ],
                 "collateralProvisions" : {
-                  "collateralType" : "CASH",
+                  "collateralType" : "Cash",
                   "eligibleCollateral" : [ {
                     "criteria" : [ {
                       "treatment" : {
@@ -1435,220 +1468,187 @@
                     }
                   } ]
                 }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d6"
-                  },
-                  "unadjustedDate" : "2021-03-22"
-                },
-                "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
-                }
-              },
-              "payout" : {
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "6a2c670c"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d9"
-                  },
-                  "unadjustedDate" : "2021-03-25"
-                },
-                "meta" : {
-                  "globalKey" : "3f28d9"
-                }
               }
             },
             "meta" : {
-              "globalKey" : "8329d853"
+              "globalKey" : "45aceb83"
             }
           },
           "meta" : {
-            "globalKey" : "8329d853"
+            "globalKey" : "45aceb83"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "1b6c6b7"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.004,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 0.004,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 9974250,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 10000000
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "c886a5fe"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "1ad6d034"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "GB00B24FF097"
-                  },
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "source" : "ISIN"
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-2"
+                  "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "ae7919fa"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 1.0075,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 1.0075,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                "priceType" : "ASSET_PRICE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "AssetPrice",
+                "priceExpression" : "PercentageOfNotional"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 9974250,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 10000000
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "GB00B24FF097"
+                  },
+                  "source" : "ISIN",
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "1ad6d034"
+              }
+            },
+            "meta" : {
+              "globalKey" : "cca9b6a1"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "Global Bank Inc"
+              },
+              "meta" : {
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
+              }
+            }
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
+              }
+            }
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f28d2"
+      "party" : [ {
+        "name" : {
+          "value" : "Global Bank Inc"
         },
-        "value" : "2021-03-18"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "UnqTradIdr"
-            },
-            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-          }
-        } ],
-        "issuer" : {
-          "value" : "KTKLLEILLLLLLLLLLLLL"
+        "meta" : {
+          "globalKey" : "296093b7",
+          "externalKey" : "GlobalBank"
+        }
+      }, {
+        "name" : {
+          "value" : "UK Bank plc"
         },
         "meta" : {
-          "globalKey" : "4a82737e"
+          "globalKey" : "1ef4886d",
+          "externalKey" : "UkBank"
         }
-      } ]
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "296093b7",
+          "externalReference" : "GlobalBank"
+        },
+        "role" : "Seller"
+      }, {
+        "partyReference" : {
+          "globalReference" : "1ef4886d",
+          "externalReference" : "UkBank"
+        },
+        "role" : "Buyer"
+      } ],
+      "meta" : {
+        "globalKey" : "44ef5ad8"
+      }
+    },
+    "meta" : {
+      "globalKey" : "44ef5ad8"
     }
   } ],
   "meta" : {
-    "globalKey" : "932d029"
+    "globalKey" : "fc55ace7"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/shaping-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/shaping-output.json
index 080ede3eeb..83417a731c 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/shaping-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/shaping-output.json
@@ -1,77 +1,30 @@
 {
-  "effectiveDate" : "2021-03-18",
   "eventDate" : "2021-03-18",
+  "effectiveDate" : "2021-03-18",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "eaf9dc6e"
-        },
-        "state" : {
-          "positionState" : "FORMED"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "b9aaf231"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "GlobalBank",
-              "globalKey" : "296093b7"
-            },
-            "name" : {
-              "value" : "Global Bank Inc"
-            }
-          }, {
-            "meta" : {
-              "externalKey" : "UkBank",
-              "globalKey" : "1ef4886d"
-            },
-            "name" : {
-              "value" : "UK Bank plc"
-            }
-          } ],
-          "partyRole" : [ {
-            "partyReference" : {
-              "externalReference" : "GlobalBank",
-              "globalReference" : "296093b7"
-            },
-            "role" : "SELLER"
-          }, {
-            "partyReference" : {
-              "externalReference" : "UkBank",
-              "globalReference" : "1ef4886d"
-            },
-            "role" : "BUYER"
-          } ],
-          "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "GlobalBank",
-                    "globalKey" : "296093b7"
-                  },
-                  "name" : {
-                    "value" : "Global Bank Inc"
-                  }
-                }
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
+    "primitiveInstruction" : {
+      "split" : {
+        "breakdown" : [ {
+          "quantityChange" : {
+            "change" : [ {
+              "quantity" : [ {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "UkBank",
-                    "globalKey" : "1ef4886d"
-                  },
-                  "name" : {
-                    "value" : "UK Bank plc"
+                  "value" : 0,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
                   }
                 }
-              },
-              "role" : "PARTY_2"
+              } ],
+              "meta" : {
+                "globalKey" : "16e4a5"
+              }
             } ],
+            "direction" : "Replace"
+          }
+        }, {
+          "execution" : {
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -86,6 +39,81 @@
                   "productQualifier" : "RepurchaseAgreement"
                 } ],
                 "economicTerms" : {
+                  "effectiveDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-19",
+                      "meta" : {
+                        "globalKey" : "3f28d3"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d3",
+                      "externalKey" : "PurchaseDate"
+                    }
+                  },
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-22",
+                      "meta" : {
+                        "globalKey" : "3f28d6"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d6",
+                      "externalKey" : "RepurchaseDate"
+                    }
+                  },
+                  "payout" : {
+                    "interestRatePayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "priceQuantity" : {
+                        "quantitySchedule" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "quantity-1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      },
+                      "principalPayment" : {
+                        "initialPayment" : true,
+                        "finalPayment" : true,
+                        "intermediatePayment" : false,
+                        "meta" : {
+                          "globalKey" : "12a6f5"
+                        }
+                      },
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "meta" : {
+                        "globalKey" : "69ca64cc"
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "69ca64cc"
+                    }
+                  },
                   "collateral" : {
                     "collateralPortfolio" : [ {
                       "value" : {
@@ -96,114 +124,114 @@
                                 "payout" : {
                                   "assetPayout" : [ {
                                     "payerReceiver" : {
-                                      "payer" : "PARTY_1",
-                                      "receiver" : "PARTY_2"
+                                      "payer" : "Party1",
+                                      "receiver" : "Party2"
                                     },
                                     "priceQuantity" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
                                       "quantitySchedule" : {
                                         "address" : {
                                           "scope" : "DOCUMENT",
                                           "value" : "quantity-2"
                                         }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "0"
                                       }
                                     },
                                     "principalPayment" : {
-                                      "finalPayment" : true,
                                       "initialPayment" : true,
+                                      "finalPayment" : true,
                                       "intermediatePayment" : false,
                                       "meta" : {
                                         "globalKey" : "12a6f5"
                                       }
                                     },
                                     "assetLeg" : [ {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                       "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "75229c9e"
-                                        },
                                         "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
                                           "meta" : {
-                                            "globalKey" : "75229c9e"
+                                            "globalKey" : "71834796"
                                           },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
+                                          "businessDayConvention" : "NotApplicable",
                                           "dateRelativeTo" : {
-                                            "externalReference" : "PurchaseDate",
-                                            "globalReference" : "3f28d3"
+                                            "globalReference" : "3f28d3",
+                                            "externalReference" : "PurchaseDate"
                                           }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "71834796"
                                         }
-                                      }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
                                     }, {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                       "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "de136e51"
-                                        },
                                         "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
                                           "meta" : {
-                                            "globalKey" : "de136e51"
+                                            "globalKey" : "da741949"
                                           },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
+                                          "businessDayConvention" : "NotApplicable",
                                           "dateRelativeTo" : {
-                                            "externalReference" : "RepurchaseDate",
-                                            "globalReference" : "3f28d6"
+                                            "globalReference" : "3f28d6",
+                                            "externalReference" : "RepurchaseDate"
                                           }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "da741949"
                                         }
-                                      }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
                                     } ],
-                                    "durationType" : {
-                                      "durationType" : "TERM"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "e7ac7fce"
-                                    },
                                     "securityInformation" : {
-                                      "meta" : {
-                                        "globalKey" : "40232adf"
-                                      },
                                       "security" : {
                                         "productIdentifier" : [ {
                                           "value" : {
                                             "identifier" : {
                                               "value" : "GB00B24FF097"
                                             },
+                                            "source" : "ISIN",
                                             "meta" : {
                                               "globalKey" : "1ad6d034"
-                                            },
-                                            "source" : "ISIN"
+                                            }
                                           }
                                         } ],
-                                        "securityType" : "DEBT"
+                                        "securityType" : "Debt"
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "40232adf"
                                       }
+                                    },
+                                    "durationType" : {
+                                      "durationType" : "Term"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "12a4a1fe"
                                     }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "e7ac7fce"
+                                    "globalKey" : "12a4a1fe"
                                   }
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             },
                             "meta" : {
-                              "globalKey" : "e7ac7fce"
+                              "globalKey" : "12a4a1fe"
                             }
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "collateralProvisions" : {
-                      "collateralType" : "CASH",
+                      "collateralType" : "Cash",
                       "eligibleCollateral" : [ {
                         "criteria" : [ {
                           "treatment" : {
@@ -217,275 +245,176 @@
                         }
                       } ]
                     }
-                  },
-                  "effectiveDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d3"
-                      },
-                      "unadjustedDate" : "2021-03-19"
-                    },
-                    "meta" : {
-                      "externalKey" : "PurchaseDate",
-                      "globalKey" : "3f28d3"
-                    }
-                  },
-                  "payout" : {
-                    "interestRatePayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
-                      },
-                      "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "quantitySchedule" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "quantity-1"
-                          }
-                        }
-                      },
-                      "principalPayment" : {
-                        "finalPayment" : true,
-                        "initialPayment" : true,
-                        "intermediatePayment" : false,
-                        "meta" : {
-                          "globalKey" : "12a6f5"
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "6a2c670c"
-                      },
-                      "rateSpecification" : {
-                        "fixedRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
-                          }
-                        }
-                      }
-                    } ],
-                    "meta" : {
-                      "globalKey" : "6a2c670c"
-                    }
-                  },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d6"
-                      },
-                      "unadjustedDate" : "2021-03-22"
-                    },
-                    "meta" : {
-                      "externalKey" : "RepurchaseDate",
-                      "globalKey" : "3f28d6"
-                    }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "1a2ab30d"
+                  "globalKey" : "c6dfdca3"
                 }
               },
               "meta" : {
-                "globalKey" : "1a2ab30d"
+                "globalKey" : "c6dfdca3"
               }
             },
-            "tradeLot" : [ {
-              "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "fd5ebec6"
+            "priceQuantity" : [ {
+              "price" : [ {
+                "value" : {
+                  "value" : 0.004,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
+                  },
+                  "perUnitOf" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
+                  },
+                  "priceType" : "InterestRate"
                 },
-                "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "value" : 0.004,
-                    "perUnitOf" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "value" : 9974250
-                  }
-                } ]
-              }, {
                 "meta" : {
-                  "globalKey" : "c886a5fe"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "value" : "GB00B24FF097"
-                      },
-                      "meta" : {
-                        "globalKey" : "1ad6d034"
-                      },
-                      "source" : "ISIN"
-                    }
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
                   } ]
+                }
+              } ],
+              "quantity" : [ {
+                "value" : {
+                  "value" : 9974250,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
+                  }
                 },
-                "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "ae7919fa"
+              }
+            }, {
+              "price" : [ {
+                "value" : {
+                  "value" : 1.0075,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
                   },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "value" : 1.0075,
-                    "perUnitOf" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                    "priceType" : "ASSET_PRICE"
-                  }
-                } ],
-                "quantity" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
-                    } ]
+                  "perUnitOf" : {
+                    "currency" : {
+                      "value" : "GBP"
+                    }
                   },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "GBP"
-                      }
-                    },
-                    "value" : 10000000
-                  }
-                } ]
-              } ]
-            } ]
-          },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f28d2"
-            },
-            "value" : "2021-03-18"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "UnqTradIdr"
+                  "priceType" : "AssetPrice",
+                  "priceExpression" : "PercentageOfNotional"
                 },
-                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-              }
-            } ],
-            "issuer" : {
-              "value" : "KTKLLEILLLLLLLLLLLLL"
-            },
-            "meta" : {
-              "globalKey" : "4a82737e"
-            }
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "split" : {
-        "breakdown" : [ {
-          "quantityChange" : {
-            "change" : [ {
-              "meta" : {
-                "globalKey" : "16e4a5"
-              },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-2"
+                  } ]
+                }
+              } ],
               "quantity" : [ {
                 "value" : {
+                  "value" : 10000000,
                   "unit" : {
                     "currency" : {
                       "value" : "GBP"
                     }
-                  },
-                  "value" : 0
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
                 }
-              } ]
+              } ],
+              "observable" : {
+                "productIdentifier" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "GB00B24FF097"
+                    },
+                    "source" : "ISIN",
+                    "meta" : {
+                      "globalKey" : "1ad6d034"
+                    }
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "1ad6d034"
+                }
+              },
+              "meta" : {
+                "globalKey" : "a8870d90"
+              }
             } ],
-            "direction" : "REPLACE"
-          }
-        }, {
-          "execution" : {
             "counterparty" : [ {
+              "role" : "Party1",
               "partyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "GlobalBank",
-                    "globalKey" : "296093b7"
-                  },
                   "name" : {
                     "value" : "Global Bank Inc"
+                  },
+                  "meta" : {
+                    "globalKey" : "296093b7",
+                    "externalKey" : "GlobalBank"
                   }
                 }
-              },
-              "role" : "PARTY_1"
+              }
             }, {
+              "role" : "Party2",
               "partyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "UkBank",
-                    "globalKey" : "1ef4886d"
-                  },
                   "name" : {
                     "value" : "UK Bank plc"
+                  },
+                  "meta" : {
+                    "globalKey" : "1ef4886d",
+                    "externalKey" : "UkBank"
                   }
                 }
-              },
-              "role" : "PARTY_2"
+              }
             } ],
-            "executionDetails" : {
+            "parties" : [ {
+              "name" : {
+                "value" : "Global Bank Inc"
+              },
               "meta" : {
-                "globalKey" : "ecdc96e2"
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
+              }
+            }, {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
+              }
+            } ],
+            "partyRoles" : [ {
+              "partyReference" : {
+                "globalReference" : "296093b7",
+                "externalReference" : "GlobalBank"
+              },
+              "role" : "Seller"
+            }, {
+              "partyReference" : {
+                "globalReference" : "1ef4886d",
+                "externalReference" : "UkBank"
               },
+              "role" : "Buyer"
+            } ],
+            "executionDetails" : {
               "packageReference" : {
                 "listId" : {
                   "assignedIdentifier" : [ {
@@ -500,140 +429,117 @@
                 "meta" : {
                   "globalKey" : "ecdc96e2"
                 }
-              }
-            },
-            "parties" : [ {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
               },
-              "name" : {
-                "value" : "Global Bank Inc"
+              "meta" : {
+                "globalKey" : "ecdc96e2"
               }
-            }, {
+            },
+            "tradeDate" : {
+              "value" : "2021-03-18",
               "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
-              "name" : {
-                "value" : "UK Bank plc"
+                "globalKey" : "3f28d2"
               }
-            } ],
-            "partyRoles" : [ {
-              "partyReference" : {
-                "externalReference" : "GlobalBank",
-                "globalReference" : "296093b7"
-              },
-              "role" : "SELLER"
-            }, {
-              "partyReference" : {
-                "externalReference" : "UkBank",
-                "globalReference" : "1ef4886d"
+            },
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "KTKLLEILLLLLLLLLLLLL"
               },
-              "role" : "BUYER"
-            } ],
-            "priceQuantity" : [ {
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+                  "meta" : {
+                    "scheme" : "UnqTradIdr"
+                  }
+                }
+              } ],
               "meta" : {
-                "globalKey" : "fd5ebec6"
-              },
-              "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
+                "globalKey" : "32cd87f2"
+              }
+            } ]
+          },
+          "quantityChange" : {
+            "change" : [ {
+              "price" : [ {
                 "value" : {
+                  "value" : 0.004,
                   "unit" : {
                     "currency" : {
                       "value" : "GBP"
                     }
                   },
-                  "value" : 0.004,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "GBP"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
+                  "priceType" : "InterestRate"
                 }
               } ],
               "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 3989700,
                   "unit" : {
                     "currency" : {
                       "value" : "GBP"
                     }
-                  },
-                  "value" : 9974250
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "globalKey" : "c886a5fe"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "1ad6d034"
-                },
-                "productIdentifier" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "GB00B24FF097"
-                    },
-                    "meta" : {
-                      "globalKey" : "1ad6d034"
-                    },
-                    "source" : "ISIN"
-                  }
-                } ]
-              },
+                "globalKey" : "dac1d864"
+              }
+            }, {
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-2"
-                  } ]
-                },
                 "value" : {
+                  "value" : 1.0075,
                   "unit" : {
                     "currency" : {
                       "value" : "GBP"
                     }
                   },
-                  "value" : 1.0075,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "GBP"
                     }
                   },
-                  "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                  "priceType" : "ASSET_PRICE"
+                  "priceType" : "AssetPrice",
+                  "priceExpression" : "PercentageOfNotional"
                 }
               } ],
               "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
-                },
                 "value" : {
+                  "value" : 4000000,
                   "unit" : {
                     "currency" : {
                       "value" : "GBP"
                     }
-                  },
-                  "value" : 10000000
+                  }
                 }
-              } ]
+              } ],
+              "observable" : {
+                "productIdentifier" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "GB00B24FF097"
+                    },
+                    "source" : "ISIN",
+                    "meta" : {
+                      "globalKey" : "1ad6d034"
+                    }
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "1ad6d034"
+                }
+              },
+              "meta" : {
+                "globalKey" : "9a77f2c7"
+              }
             } ],
+            "direction" : "Replace"
+          }
+        }, {
+          "execution" : {
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -648,6 +554,81 @@
                   "productQualifier" : "RepurchaseAgreement"
                 } ],
                 "economicTerms" : {
+                  "effectiveDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-19",
+                      "meta" : {
+                        "globalKey" : "3f28d3"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d3",
+                      "externalKey" : "PurchaseDate"
+                    }
+                  },
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-22",
+                      "meta" : {
+                        "globalKey" : "3f28d6"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d6",
+                      "externalKey" : "RepurchaseDate"
+                    }
+                  },
+                  "payout" : {
+                    "interestRatePayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "priceQuantity" : {
+                        "quantitySchedule" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "quantity-1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      },
+                      "principalPayment" : {
+                        "initialPayment" : true,
+                        "finalPayment" : true,
+                        "intermediatePayment" : false,
+                        "meta" : {
+                          "globalKey" : "12a6f5"
+                        }
+                      },
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "meta" : {
+                        "globalKey" : "69ca64cc"
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "69ca64cc"
+                    }
+                  },
                   "collateral" : {
                     "collateralPortfolio" : [ {
                       "value" : {
@@ -658,114 +639,114 @@
                                 "payout" : {
                                   "assetPayout" : [ {
                                     "payerReceiver" : {
-                                      "payer" : "PARTY_1",
-                                      "receiver" : "PARTY_2"
+                                      "payer" : "Party1",
+                                      "receiver" : "Party2"
                                     },
                                     "priceQuantity" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
                                       "quantitySchedule" : {
                                         "address" : {
                                           "scope" : "DOCUMENT",
                                           "value" : "quantity-2"
                                         }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "0"
                                       }
                                     },
                                     "principalPayment" : {
-                                      "finalPayment" : true,
                                       "initialPayment" : true,
+                                      "finalPayment" : true,
                                       "intermediatePayment" : false,
                                       "meta" : {
                                         "globalKey" : "12a6f5"
                                       }
                                     },
                                     "assetLeg" : [ {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                       "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "75229c9e"
-                                        },
                                         "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
                                           "meta" : {
-                                            "globalKey" : "75229c9e"
+                                            "globalKey" : "71834796"
                                           },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
+                                          "businessDayConvention" : "NotApplicable",
                                           "dateRelativeTo" : {
-                                            "externalReference" : "PurchaseDate",
-                                            "globalReference" : "3f28d3"
+                                            "globalReference" : "3f28d3",
+                                            "externalReference" : "PurchaseDate"
                                           }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "71834796"
                                         }
-                                      }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
                                     }, {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                       "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "de136e51"
-                                        },
                                         "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
                                           "meta" : {
-                                            "globalKey" : "de136e51"
+                                            "globalKey" : "da741949"
                                           },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
+                                          "businessDayConvention" : "NotApplicable",
                                           "dateRelativeTo" : {
-                                            "externalReference" : "RepurchaseDate",
-                                            "globalReference" : "3f28d6"
+                                            "globalReference" : "3f28d6",
+                                            "externalReference" : "RepurchaseDate"
                                           }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "da741949"
                                         }
-                                      }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
                                     } ],
-                                    "durationType" : {
-                                      "durationType" : "TERM"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "e7ac7fce"
-                                    },
                                     "securityInformation" : {
-                                      "meta" : {
-                                        "globalKey" : "40232adf"
-                                      },
                                       "security" : {
                                         "productIdentifier" : [ {
                                           "value" : {
                                             "identifier" : {
                                               "value" : "GB00B24FF097"
                                             },
+                                            "source" : "ISIN",
                                             "meta" : {
                                               "globalKey" : "1ad6d034"
-                                            },
-                                            "source" : "ISIN"
+                                            }
                                           }
                                         } ],
-                                        "securityType" : "DEBT"
+                                        "securityType" : "Debt"
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "40232adf"
                                       }
+                                    },
+                                    "durationType" : {
+                                      "durationType" : "Term"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "12a4a1fe"
                                     }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "e7ac7fce"
+                                    "globalKey" : "12a4a1fe"
                                   }
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             },
                             "meta" : {
-                              "globalKey" : "e7ac7fce"
+                              "globalKey" : "12a4a1fe"
                             }
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "collateralProvisions" : {
-                      "collateralType" : "CASH",
+                      "collateralType" : "Cash",
                       "eligibleCollateral" : [ {
                         "criteria" : [ {
                           "treatment" : {
@@ -779,228 +760,176 @@
                         }
                       } ]
                     }
-                  },
-                  "effectiveDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d3"
-                      },
-                      "unadjustedDate" : "2021-03-19"
-                    },
-                    "meta" : {
-                      "externalKey" : "PurchaseDate",
-                      "globalKey" : "3f28d3"
-                    }
-                  },
-                  "payout" : {
-                    "interestRatePayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
-                      },
-                      "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "quantitySchedule" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "quantity-1"
-                          }
-                        }
-                      },
-                      "principalPayment" : {
-                        "finalPayment" : true,
-                        "initialPayment" : true,
-                        "intermediatePayment" : false,
-                        "meta" : {
-                          "globalKey" : "12a6f5"
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "6a2c670c"
-                      },
-                      "rateSpecification" : {
-                        "fixedRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
-                          }
-                        }
-                      }
-                    } ],
-                    "meta" : {
-                      "globalKey" : "6a2c670c"
-                    }
-                  },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d6"
-                      },
-                      "unadjustedDate" : "2021-03-22"
-                    },
-                    "meta" : {
-                      "externalKey" : "RepurchaseDate",
-                      "globalKey" : "3f28d6"
-                    }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "1a2ab30d"
+                  "globalKey" : "c6dfdca3"
                 }
               },
               "meta" : {
-                "globalKey" : "1a2ab30d"
+                "globalKey" : "c6dfdca3"
               }
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f28d2"
-              },
-              "value" : "2021-03-18"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "UnqTradIdr"
-                  },
-                  "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-                }
-              } ],
-              "issuer" : {
-                "value" : "KTKLLEILLLLLLLLLLLLL"
-              },
-              "meta" : {
-                "globalKey" : "4a82737e"
-              }
-            } ]
-          },
-          "quantityChange" : {
-            "change" : [ {
-              "meta" : {
-                "globalKey" : "dac1d864"
-              },
+            "priceQuantity" : [ {
               "price" : [ {
                 "value" : {
+                  "value" : 0.004,
                   "unit" : {
                     "currency" : {
                       "value" : "GBP"
                     }
                   },
-                  "value" : 0.004,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "GBP"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
                 }
               } ],
               "quantity" : [ {
                 "value" : {
+                  "value" : 9974250,
                   "unit" : {
                     "currency" : {
                       "value" : "GBP"
                     }
-                  },
-                  "value" : 3989700
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "globalKey" : "791a08d1"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "1ad6d034"
-                },
-                "productIdentifier" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "GB00B24FF097"
-                    },
-                    "meta" : {
-                      "globalKey" : "1ad6d034"
-                    },
-                    "source" : "ISIN"
-                  }
-                } ]
-              },
+                "globalKey" : "ae7919fa"
+              }
+            }, {
               "price" : [ {
                 "value" : {
+                  "value" : 1.0075,
                   "unit" : {
                     "currency" : {
                       "value" : "GBP"
                     }
                   },
-                  "value" : 1.0075,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "GBP"
                     }
                   },
-                  "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                  "priceType" : "ASSET_PRICE"
+                  "priceType" : "AssetPrice",
+                  "priceExpression" : "PercentageOfNotional"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-2"
+                  } ]
                 }
               } ],
               "quantity" : [ {
                 "value" : {
+                  "value" : 10000000,
                   "unit" : {
                     "currency" : {
                       "value" : "GBP"
                     }
-                  },
-                  "value" : 4000000
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
                 }
-              } ]
+              } ],
+              "observable" : {
+                "productIdentifier" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "GB00B24FF097"
+                    },
+                    "source" : "ISIN",
+                    "meta" : {
+                      "globalKey" : "1ad6d034"
+                    }
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "1ad6d034"
+                }
+              },
+              "meta" : {
+                "globalKey" : "a8870d90"
+              }
             } ],
-            "direction" : "REPLACE"
-          }
-        }, {
-          "execution" : {
             "counterparty" : [ {
+              "role" : "Party1",
               "partyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "GlobalBank",
-                    "globalKey" : "296093b7"
-                  },
                   "name" : {
                     "value" : "Global Bank Inc"
+                  },
+                  "meta" : {
+                    "globalKey" : "296093b7",
+                    "externalKey" : "GlobalBank"
                   }
                 }
-              },
-              "role" : "PARTY_1"
+              }
             }, {
+              "role" : "Party2",
               "partyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "UkBank",
-                    "globalKey" : "1ef4886d"
-                  },
                   "name" : {
                     "value" : "UK Bank plc"
+                  },
+                  "meta" : {
+                    "globalKey" : "1ef4886d",
+                    "externalKey" : "UkBank"
                   }
                 }
-              },
-              "role" : "PARTY_2"
+              }
             } ],
-            "executionDetails" : {
+            "parties" : [ {
+              "name" : {
+                "value" : "Global Bank Inc"
+              },
               "meta" : {
-                "globalKey" : "ecdc96e2"
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
+              }
+            }, {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
+              }
+            } ],
+            "partyRoles" : [ {
+              "partyReference" : {
+                "globalReference" : "296093b7",
+                "externalReference" : "GlobalBank"
               },
+              "role" : "Seller"
+            }, {
+              "partyReference" : {
+                "globalReference" : "1ef4886d",
+                "externalReference" : "UkBank"
+              },
+              "role" : "Buyer"
+            } ],
+            "executionDetails" : {
               "packageReference" : {
                 "listId" : {
                   "assignedIdentifier" : [ {
@@ -1015,140 +944,117 @@
                 "meta" : {
                   "globalKey" : "ecdc96e2"
                 }
-              }
-            },
-            "parties" : [ {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
               },
-              "name" : {
-                "value" : "Global Bank Inc"
+              "meta" : {
+                "globalKey" : "ecdc96e2"
               }
-            }, {
+            },
+            "tradeDate" : {
+              "value" : "2021-03-18",
               "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
-              "name" : {
-                "value" : "UK Bank plc"
+                "globalKey" : "3f28d2"
               }
-            } ],
-            "partyRoles" : [ {
-              "partyReference" : {
-                "externalReference" : "GlobalBank",
-                "globalReference" : "296093b7"
-              },
-              "role" : "SELLER"
-            }, {
-              "partyReference" : {
-                "externalReference" : "UkBank",
-                "globalReference" : "1ef4886d"
+            },
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "KTKLLEILLLLLLLLLLLLL"
               },
-              "role" : "BUYER"
-            } ],
-            "priceQuantity" : [ {
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+                  "meta" : {
+                    "scheme" : "UnqTradIdr"
+                  }
+                }
+              } ],
               "meta" : {
-                "globalKey" : "fd5ebec6"
-              },
+                "globalKey" : "32cd87f2"
+              }
+            } ]
+          },
+          "quantityChange" : {
+            "change" : [ {
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.004,
                   "unit" : {
                     "currency" : {
                       "value" : "GBP"
                     }
                   },
-                  "value" : 0.004,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "GBP"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
+                  "priceType" : "InterestRate"
                 }
               } ],
               "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 3989700,
                   "unit" : {
                     "currency" : {
                       "value" : "GBP"
                     }
-                  },
-                  "value" : 9974250
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "globalKey" : "c886a5fe"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "1ad6d034"
-                },
-                "productIdentifier" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "GB00B24FF097"
-                    },
-                    "meta" : {
-                      "globalKey" : "1ad6d034"
-                    },
-                    "source" : "ISIN"
-                  }
-                } ]
-              },
+                "globalKey" : "dac1d864"
+              }
+            }, {
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-2"
-                  } ]
-                },
                 "value" : {
+                  "value" : 1.0075,
                   "unit" : {
                     "currency" : {
                       "value" : "GBP"
                     }
                   },
-                  "value" : 1.0075,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "GBP"
                     }
                   },
-                  "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                  "priceType" : "ASSET_PRICE"
+                  "priceType" : "AssetPrice",
+                  "priceExpression" : "PercentageOfNotional"
                 }
               } ],
               "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
-                },
                 "value" : {
+                  "value" : 4000000,
                   "unit" : {
                     "currency" : {
                       "value" : "GBP"
                     }
-                  },
-                  "value" : 10000000
+                  }
                 }
-              } ]
+              } ],
+              "observable" : {
+                "productIdentifier" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "GB00B24FF097"
+                    },
+                    "source" : "ISIN",
+                    "meta" : {
+                      "globalKey" : "1ad6d034"
+                    }
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "1ad6d034"
+                }
+              },
+              "meta" : {
+                "globalKey" : "9a77f2c7"
+              }
             } ],
+            "direction" : "Replace"
+          }
+        }, {
+          "execution" : {
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -1163,124 +1069,199 @@
                   "productQualifier" : "RepurchaseAgreement"
                 } ],
                 "economicTerms" : {
-                  "collateral" : {
-                    "collateralPortfolio" : [ {
-                      "value" : {
-                        "collateralPosition" : [ {
-                          "product" : {
-                            "contractualProduct" : {
-                              "economicTerms" : {
+                  "effectiveDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-19",
+                      "meta" : {
+                        "globalKey" : "3f28d3"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d3",
+                      "externalKey" : "PurchaseDate"
+                    }
+                  },
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-22",
+                      "meta" : {
+                        "globalKey" : "3f28d6"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d6",
+                      "externalKey" : "RepurchaseDate"
+                    }
+                  },
+                  "payout" : {
+                    "interestRatePayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "priceQuantity" : {
+                        "quantitySchedule" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "quantity-1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      },
+                      "principalPayment" : {
+                        "initialPayment" : true,
+                        "finalPayment" : true,
+                        "intermediatePayment" : false,
+                        "meta" : {
+                          "globalKey" : "12a6f5"
+                        }
+                      },
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "meta" : {
+                        "globalKey" : "69ca64cc"
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "69ca64cc"
+                    }
+                  },
+                  "collateral" : {
+                    "collateralPortfolio" : [ {
+                      "value" : {
+                        "collateralPosition" : [ {
+                          "product" : {
+                            "contractualProduct" : {
+                              "economicTerms" : {
                                 "payout" : {
                                   "assetPayout" : [ {
                                     "payerReceiver" : {
-                                      "payer" : "PARTY_1",
-                                      "receiver" : "PARTY_2"
+                                      "payer" : "Party1",
+                                      "receiver" : "Party2"
                                     },
                                     "priceQuantity" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
                                       "quantitySchedule" : {
                                         "address" : {
                                           "scope" : "DOCUMENT",
                                           "value" : "quantity-2"
                                         }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "0"
                                       }
                                     },
                                     "principalPayment" : {
-                                      "finalPayment" : true,
                                       "initialPayment" : true,
+                                      "finalPayment" : true,
                                       "intermediatePayment" : false,
                                       "meta" : {
                                         "globalKey" : "12a6f5"
                                       }
                                     },
                                     "assetLeg" : [ {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                       "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "75229c9e"
-                                        },
                                         "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
                                           "meta" : {
-                                            "globalKey" : "75229c9e"
+                                            "globalKey" : "71834796"
                                           },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
+                                          "businessDayConvention" : "NotApplicable",
                                           "dateRelativeTo" : {
-                                            "externalReference" : "PurchaseDate",
-                                            "globalReference" : "3f28d3"
+                                            "globalReference" : "3f28d3",
+                                            "externalReference" : "PurchaseDate"
                                           }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "71834796"
                                         }
-                                      }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
                                     }, {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                       "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "de136e51"
-                                        },
                                         "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
                                           "meta" : {
-                                            "globalKey" : "de136e51"
+                                            "globalKey" : "da741949"
                                           },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
+                                          "businessDayConvention" : "NotApplicable",
                                           "dateRelativeTo" : {
-                                            "externalReference" : "RepurchaseDate",
-                                            "globalReference" : "3f28d6"
+                                            "globalReference" : "3f28d6",
+                                            "externalReference" : "RepurchaseDate"
                                           }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "da741949"
                                         }
-                                      }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
                                     } ],
-                                    "durationType" : {
-                                      "durationType" : "TERM"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "e7ac7fce"
-                                    },
                                     "securityInformation" : {
-                                      "meta" : {
-                                        "globalKey" : "40232adf"
-                                      },
                                       "security" : {
                                         "productIdentifier" : [ {
                                           "value" : {
                                             "identifier" : {
                                               "value" : "GB00B24FF097"
                                             },
+                                            "source" : "ISIN",
                                             "meta" : {
                                               "globalKey" : "1ad6d034"
-                                            },
-                                            "source" : "ISIN"
+                                            }
                                           }
                                         } ],
-                                        "securityType" : "DEBT"
+                                        "securityType" : "Debt"
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "40232adf"
                                       }
+                                    },
+                                    "durationType" : {
+                                      "durationType" : "Term"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "12a4a1fe"
                                     }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "e7ac7fce"
+                                    "globalKey" : "12a4a1fe"
                                   }
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             },
                             "meta" : {
-                              "globalKey" : "e7ac7fce"
+                              "globalKey" : "12a4a1fe"
                             }
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "collateralProvisions" : {
-                      "collateralType" : "CASH",
+                      "collateralType" : "Cash",
                       "eligibleCollateral" : [ {
                         "criteria" : [ {
                           "treatment" : {
@@ -1294,228 +1275,176 @@
                         }
                       } ]
                     }
-                  },
-                  "effectiveDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d3"
-                      },
-                      "unadjustedDate" : "2021-03-19"
-                    },
-                    "meta" : {
-                      "externalKey" : "PurchaseDate",
-                      "globalKey" : "3f28d3"
-                    }
-                  },
-                  "payout" : {
-                    "interestRatePayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
-                      },
-                      "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "quantitySchedule" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "quantity-1"
-                          }
-                        }
-                      },
-                      "principalPayment" : {
-                        "finalPayment" : true,
-                        "initialPayment" : true,
-                        "intermediatePayment" : false,
-                        "meta" : {
-                          "globalKey" : "12a6f5"
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "6a2c670c"
-                      },
-                      "rateSpecification" : {
-                        "fixedRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
-                          }
-                        }
-                      }
-                    } ],
-                    "meta" : {
-                      "globalKey" : "6a2c670c"
-                    }
-                  },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d6"
-                      },
-                      "unadjustedDate" : "2021-03-22"
-                    },
-                    "meta" : {
-                      "externalKey" : "RepurchaseDate",
-                      "globalKey" : "3f28d6"
-                    }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "1a2ab30d"
+                  "globalKey" : "c6dfdca3"
                 }
               },
               "meta" : {
-                "globalKey" : "1a2ab30d"
+                "globalKey" : "c6dfdca3"
               }
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f28d2"
-              },
-              "value" : "2021-03-18"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "UnqTradIdr"
-                  },
-                  "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-                }
-              } ],
-              "issuer" : {
-                "value" : "KTKLLEILLLLLLLLLLLLL"
-              },
-              "meta" : {
-                "globalKey" : "4a82737e"
-              }
-            } ]
-          },
-          "quantityChange" : {
-            "change" : [ {
-              "meta" : {
-                "globalKey" : "dac1d864"
-              },
+            "priceQuantity" : [ {
               "price" : [ {
                 "value" : {
+                  "value" : 0.004,
                   "unit" : {
                     "currency" : {
                       "value" : "GBP"
                     }
                   },
-                  "value" : 0.004,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "GBP"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
                 }
               } ],
               "quantity" : [ {
                 "value" : {
+                  "value" : 9974250,
                   "unit" : {
                     "currency" : {
                       "value" : "GBP"
                     }
-                  },
-                  "value" : 3989700
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "globalKey" : "791a08d1"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "1ad6d034"
-                },
-                "productIdentifier" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "GB00B24FF097"
-                    },
-                    "meta" : {
-                      "globalKey" : "1ad6d034"
-                    },
-                    "source" : "ISIN"
-                  }
-                } ]
-              },
+                "globalKey" : "ae7919fa"
+              }
+            }, {
               "price" : [ {
                 "value" : {
+                  "value" : 1.0075,
                   "unit" : {
                     "currency" : {
                       "value" : "GBP"
                     }
                   },
-                  "value" : 1.0075,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "GBP"
                     }
                   },
-                  "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                  "priceType" : "ASSET_PRICE"
+                  "priceType" : "AssetPrice",
+                  "priceExpression" : "PercentageOfNotional"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-2"
+                  } ]
                 }
               } ],
               "quantity" : [ {
                 "value" : {
+                  "value" : 10000000,
                   "unit" : {
                     "currency" : {
                       "value" : "GBP"
                     }
-                  },
-                  "value" : 4000000
-                }
-              } ]
-            } ],
-            "direction" : "REPLACE"
-          }
-        }, {
-          "execution" : {
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
+                }
+              } ],
+              "observable" : {
+                "productIdentifier" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "GB00B24FF097"
+                    },
+                    "source" : "ISIN",
+                    "meta" : {
+                      "globalKey" : "1ad6d034"
+                    }
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "1ad6d034"
+                }
+              },
+              "meta" : {
+                "globalKey" : "a8870d90"
+              }
+            } ],
             "counterparty" : [ {
+              "role" : "Party1",
               "partyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "GlobalBank",
-                    "globalKey" : "296093b7"
-                  },
                   "name" : {
                     "value" : "Global Bank Inc"
+                  },
+                  "meta" : {
+                    "globalKey" : "296093b7",
+                    "externalKey" : "GlobalBank"
                   }
                 }
-              },
-              "role" : "PARTY_1"
+              }
             }, {
+              "role" : "Party2",
               "partyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "UkBank",
-                    "globalKey" : "1ef4886d"
-                  },
                   "name" : {
                     "value" : "UK Bank plc"
+                  },
+                  "meta" : {
+                    "globalKey" : "1ef4886d",
+                    "externalKey" : "UkBank"
                   }
                 }
-              },
-              "role" : "PARTY_2"
+              }
             } ],
-            "executionDetails" : {
+            "parties" : [ {
+              "name" : {
+                "value" : "Global Bank Inc"
+              },
               "meta" : {
-                "globalKey" : "ecdc96e2"
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
+              }
+            }, {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
+              }
+            } ],
+            "partyRoles" : [ {
+              "partyReference" : {
+                "globalReference" : "296093b7",
+                "externalReference" : "GlobalBank"
+              },
+              "role" : "Seller"
+            }, {
+              "partyReference" : {
+                "globalReference" : "1ef4886d",
+                "externalReference" : "UkBank"
               },
+              "role" : "Buyer"
+            } ],
+            "executionDetails" : {
               "packageReference" : {
                 "listId" : {
                   "assignedIdentifier" : [ {
@@ -1530,140 +1459,144 @@
                 "meta" : {
                   "globalKey" : "ecdc96e2"
                 }
-              }
-            },
-            "parties" : [ {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
               },
-              "name" : {
-                "value" : "Global Bank Inc"
+              "meta" : {
+                "globalKey" : "ecdc96e2"
               }
-            }, {
+            },
+            "tradeDate" : {
+              "value" : "2021-03-18",
               "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
-              "name" : {
-                "value" : "UK Bank plc"
+                "globalKey" : "3f28d2"
               }
-            } ],
-            "partyRoles" : [ {
-              "partyReference" : {
-                "externalReference" : "GlobalBank",
-                "globalReference" : "296093b7"
-              },
-              "role" : "SELLER"
-            }, {
-              "partyReference" : {
-                "externalReference" : "UkBank",
-                "globalReference" : "1ef4886d"
+            },
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "KTKLLEILLLLLLLLLLLLL"
               },
-              "role" : "BUYER"
-            } ],
-            "priceQuantity" : [ {
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+                  "meta" : {
+                    "scheme" : "UnqTradIdr"
+                  }
+                }
+              } ],
               "meta" : {
-                "globalKey" : "fd5ebec6"
-              },
+                "globalKey" : "32cd87f2"
+              }
+            } ]
+          },
+          "quantityChange" : {
+            "change" : [ {
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.004,
                   "unit" : {
                     "currency" : {
                       "value" : "GBP"
                     }
                   },
-                  "value" : 0.004,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "GBP"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
+                  "priceType" : "InterestRate"
                 }
               } ],
               "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 1994850,
                   "unit" : {
                     "currency" : {
                       "value" : "GBP"
                     }
-                  },
-                  "value" : 9974250
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "globalKey" : "c886a5fe"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "1ad6d034"
-                },
-                "productIdentifier" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "GB00B24FF097"
-                    },
-                    "meta" : {
-                      "globalKey" : "1ad6d034"
-                    },
-                    "source" : "ISIN"
-                  }
-                } ]
-              },
+                "globalKey" : "538c48e4"
+              }
+            }, {
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-2"
-                  } ]
-                },
                 "value" : {
+                  "value" : 1.0075,
                   "unit" : {
                     "currency" : {
                       "value" : "GBP"
                     }
                   },
-                  "value" : 1.0075,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "GBP"
                     }
                   },
-                  "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                  "priceType" : "ASSET_PRICE"
+                  "priceType" : "AssetPrice",
+                  "priceExpression" : "PercentageOfNotional"
                 }
               } ],
               "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
-                },
                 "value" : {
+                  "value" : 2000000,
                   "unit" : {
                     "currency" : {
                       "value" : "GBP"
                     }
-                  },
-                  "value" : 10000000
+                  }
                 }
-              } ]
+              } ],
+              "observable" : {
+                "productIdentifier" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "GB00B24FF097"
+                    },
+                    "source" : "ISIN",
+                    "meta" : {
+                      "globalKey" : "1ad6d034"
+                    }
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "1ad6d034"
+                }
+              },
+              "meta" : {
+                "globalKey" : "d7543709"
+              }
+            } ],
+            "direction" : "Replace"
+          }
+        } ]
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "KTKLLEILLLLLLLLLLLLL"
+            },
+            "assignedIdentifier" : [ {
+              "identifier" : {
+                "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+                "meta" : {
+                  "scheme" : "UnqTradIdr"
+                }
+              }
             } ],
+            "meta" : {
+              "globalKey" : "32cd87f2"
+            }
+          } ],
+          "tradeDate" : {
+            "value" : "2021-03-18",
+            "meta" : {
+              "globalKey" : "3f28d2"
+            }
+          },
+          "tradableProduct" : {
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -1678,124 +1611,199 @@
                   "productQualifier" : "RepurchaseAgreement"
                 } ],
                 "economicTerms" : {
-                  "collateral" : {
-                    "collateralPortfolio" : [ {
-                      "value" : {
-                        "collateralPosition" : [ {
-                          "product" : {
-                            "contractualProduct" : {
-                              "economicTerms" : {
-                                "payout" : {
-                                  "assetPayout" : [ {
-                                    "payerReceiver" : {
-                                      "payer" : "PARTY_1",
-                                      "receiver" : "PARTY_2"
-                                    },
-                                    "priceQuantity" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
-                                      "quantitySchedule" : {
-                                        "address" : {
-                                          "scope" : "DOCUMENT",
-                                          "value" : "quantity-2"
-                                        }
-                                      }
-                                    },
-                                    "principalPayment" : {
-                                      "finalPayment" : true,
-                                      "initialPayment" : true,
-                                      "intermediatePayment" : false,
-                                      "meta" : {
-                                        "globalKey" : "12a6f5"
-                                      }
-                                    },
-                                    "assetLeg" : [ {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                                      "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "75229c9e"
-                                        },
-                                        "relativeDate" : {
-                                          "meta" : {
-                                            "globalKey" : "75229c9e"
-                                          },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
-                                          "dateRelativeTo" : {
-                                            "externalReference" : "PurchaseDate",
-                                            "globalReference" : "3f28d3"
-                                          }
-                                        }
-                                      }
-                                    }, {
-                                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                                      "settlementDate" : {
-                                        "meta" : {
-                                          "globalKey" : "de136e51"
-                                        },
-                                        "relativeDate" : {
-                                          "meta" : {
-                                            "globalKey" : "de136e51"
-                                          },
-                                          "period" : "D",
-                                          "periodMultiplier" : 0,
-                                          "businessDayConvention" : "NOT_APPLICABLE",
-                                          "dateRelativeTo" : {
-                                            "externalReference" : "RepurchaseDate",
-                                            "globalReference" : "3f28d6"
-                                          }
+                  "effectiveDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-19",
+                      "meta" : {
+                        "globalKey" : "3f28d3"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d3",
+                      "externalKey" : "PurchaseDate"
+                    }
+                  },
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2021-03-22",
+                      "meta" : {
+                        "globalKey" : "3f28d6"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f28d6",
+                      "externalKey" : "RepurchaseDate"
+                    }
+                  },
+                  "payout" : {
+                    "interestRatePayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "priceQuantity" : {
+                        "quantitySchedule" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "quantity-1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      },
+                      "principalPayment" : {
+                        "initialPayment" : true,
+                        "finalPayment" : true,
+                        "intermediatePayment" : false,
+                        "meta" : {
+                          "globalKey" : "12a6f5"
+                        }
+                      },
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "meta" : {
+                        "globalKey" : "69ca64cc"
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "69ca64cc"
+                    }
+                  },
+                  "collateral" : {
+                    "collateralPortfolio" : [ {
+                      "value" : {
+                        "collateralPosition" : [ {
+                          "product" : {
+                            "contractualProduct" : {
+                              "economicTerms" : {
+                                "payout" : {
+                                  "assetPayout" : [ {
+                                    "payerReceiver" : {
+                                      "payer" : "Party1",
+                                      "receiver" : "Party2"
+                                    },
+                                    "priceQuantity" : {
+                                      "quantitySchedule" : {
+                                        "address" : {
+                                          "scope" : "DOCUMENT",
+                                          "value" : "quantity-2"
                                         }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "0"
                                       }
-                                    } ],
-                                    "durationType" : {
-                                      "durationType" : "TERM"
                                     },
-                                    "meta" : {
-                                      "globalKey" : "e7ac7fce"
-                                    },
-                                    "securityInformation" : {
+                                    "principalPayment" : {
+                                      "initialPayment" : true,
+                                      "finalPayment" : true,
+                                      "intermediatePayment" : false,
                                       "meta" : {
-                                        "globalKey" : "40232adf"
+                                        "globalKey" : "12a6f5"
+                                      }
+                                    },
+                                    "assetLeg" : [ {
+                                      "settlementDate" : {
+                                        "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
+                                          "meta" : {
+                                            "globalKey" : "71834796"
+                                          },
+                                          "businessDayConvention" : "NotApplicable",
+                                          "dateRelativeTo" : {
+                                            "globalReference" : "3f28d3",
+                                            "externalReference" : "PurchaseDate"
+                                          }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "71834796"
+                                        }
                                       },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
+                                    }, {
+                                      "settlementDate" : {
+                                        "relativeDate" : {
+                                          "periodMultiplier" : 0,
+                                          "period" : "D",
+                                          "meta" : {
+                                            "globalKey" : "da741949"
+                                          },
+                                          "businessDayConvention" : "NotApplicable",
+                                          "dateRelativeTo" : {
+                                            "globalReference" : "3f28d6",
+                                            "externalReference" : "RepurchaseDate"
+                                          }
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "da741949"
+                                        }
+                                      },
+                                      "deliveryMethod" : "DeliveryVersusPayment"
+                                    } ],
+                                    "securityInformation" : {
                                       "security" : {
                                         "productIdentifier" : [ {
                                           "value" : {
                                             "identifier" : {
                                               "value" : "GB00B24FF097"
                                             },
+                                            "source" : "ISIN",
                                             "meta" : {
                                               "globalKey" : "1ad6d034"
-                                            },
-                                            "source" : "ISIN"
+                                            }
                                           }
                                         } ],
-                                        "securityType" : "DEBT"
+                                        "securityType" : "Debt"
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "40232adf"
                                       }
+                                    },
+                                    "durationType" : {
+                                      "durationType" : "Term"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "12a4a1fe"
                                     }
                                   } ],
                                   "meta" : {
-                                    "globalKey" : "e7ac7fce"
+                                    "globalKey" : "12a4a1fe"
                                   }
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             },
                             "meta" : {
-                              "globalKey" : "e7ac7fce"
+                              "globalKey" : "12a4a1fe"
                             }
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "collateralProvisions" : {
-                      "collateralType" : "CASH",
+                      "collateralType" : "Cash",
                       "eligibleCollateral" : [ {
                         "criteria" : [ {
                           "treatment" : {
@@ -1809,271 +1817,217 @@
                         }
                       } ]
                     }
-                  },
-                  "effectiveDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d3"
-                      },
-                      "unadjustedDate" : "2021-03-19"
-                    },
-                    "meta" : {
-                      "externalKey" : "PurchaseDate",
-                      "globalKey" : "3f28d3"
-                    }
-                  },
-                  "payout" : {
-                    "interestRatePayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
-                      },
-                      "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "quantitySchedule" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "quantity-1"
-                          }
-                        }
-                      },
-                      "principalPayment" : {
-                        "finalPayment" : true,
-                        "initialPayment" : true,
-                        "intermediatePayment" : false,
-                        "meta" : {
-                          "globalKey" : "12a6f5"
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "6a2c670c"
-                      },
-                      "rateSpecification" : {
-                        "fixedRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
-                            }
-                          }
-                        }
-                      }
-                    } ],
-                    "meta" : {
-                      "globalKey" : "6a2c670c"
-                    }
-                  },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f28d6"
-                      },
-                      "unadjustedDate" : "2021-03-22"
-                    },
-                    "meta" : {
-                      "externalKey" : "RepurchaseDate",
-                      "globalKey" : "3f28d6"
-                    }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "1a2ab30d"
+                  "globalKey" : "c6dfdca3"
                 }
               },
               "meta" : {
-                "globalKey" : "1a2ab30d"
+                "globalKey" : "c6dfdca3"
               }
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f28d2"
-              },
-              "value" : "2021-03-18"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "UnqTradIdr"
-                  },
-                  "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-                }
-              } ],
-              "issuer" : {
-                "value" : "KTKLLEILLLLLLLLLLLLL"
-              },
-              "meta" : {
-                "globalKey" : "4a82737e"
-              }
-            } ]
-          },
-          "quantityChange" : {
-            "change" : [ {
-              "meta" : {
-                "globalKey" : "538c48e4"
-              },
-              "price" : [ {
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "GBP"
-                    }
-                  },
-                  "value" : 0.004,
-                  "perUnitOf" : {
-                    "currency" : {
-                      "value" : "GBP"
-                    }
+            "tradeLot" : [ {
+              "priceQuantity" : [ {
+                "price" : [ {
+                  "value" : {
+                    "value" : 0.004,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
+                    },
+                    "perUnitOf" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
+                    },
+                    "priceType" : "InterestRate"
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ],
-              "quantity" : [ {
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "GBP"
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
+                  }
+                } ],
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 9974250,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
                     }
                   },
-                  "value" : 1994850
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "90872693"
-              },
-              "observable" : {
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    } ]
+                  }
+                } ],
                 "meta" : {
-                  "globalKey" : "1ad6d034"
-                },
-                "productIdentifier" : [ {
+                  "globalKey" : "ae7919fa"
+                }
+              }, {
+                "price" : [ {
                   "value" : {
-                    "identifier" : {
-                      "value" : "GB00B24FF097"
+                    "value" : 1.0075,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
                     },
-                    "meta" : {
-                      "globalKey" : "1ad6d034"
+                    "perUnitOf" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
                     },
-                    "source" : "ISIN"
+                    "priceType" : "AssetPrice",
+                    "priceExpression" : "PercentageOfNotional"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-2"
+                    } ]
                   }
-                } ]
-              },
-              "price" : [ {
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "GBP"
+                } ],
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 10000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "GBP"
+                      }
                     }
                   },
-                  "value" : 1.0075,
-                  "perUnitOf" : {
-                    "currency" : {
-                      "value" : "GBP"
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
+                  }
+                } ],
+                "observable" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "GB00B24FF097"
+                      },
+                      "source" : "ISIN",
+                      "meta" : {
+                        "globalKey" : "1ad6d034"
+                      }
                     }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "a8870d90"
+                }
+              } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "value" : {
+                  "name" : {
+                    "value" : "Global Bank Inc"
                   },
-                  "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                  "priceType" : "ASSET_PRICE"
+                  "meta" : {
+                    "globalKey" : "296093b7",
+                    "externalKey" : "GlobalBank"
+                  }
                 }
-              } ],
-              "quantity" : [ {
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
                 "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "GBP"
-                    }
+                  "name" : {
+                    "value" : "UK Bank plc"
                   },
-                  "value" : 2000000
+                  "meta" : {
+                    "globalKey" : "1ef4886d",
+                    "externalKey" : "UkBank"
+                  }
                 }
-              } ]
-            } ],
-            "direction" : "REPLACE"
+              }
+            } ]
+          },
+          "party" : [ {
+            "name" : {
+              "value" : "Global Bank Inc"
+            },
+            "meta" : {
+              "globalKey" : "296093b7",
+              "externalKey" : "GlobalBank"
+            }
+          }, {
+            "name" : {
+              "value" : "UK Bank plc"
+            },
+            "meta" : {
+              "globalKey" : "1ef4886d",
+              "externalKey" : "UkBank"
+            }
+          } ],
+          "partyRole" : [ {
+            "partyReference" : {
+              "globalReference" : "296093b7",
+              "externalReference" : "GlobalBank"
+            },
+            "role" : "Seller"
+          }, {
+            "partyReference" : {
+              "globalReference" : "1ef4886d",
+              "externalReference" : "UkBank"
+            },
+            "role" : "Buyer"
+          } ],
+          "meta" : {
+            "globalKey" : "b62aaee7"
           }
-        } ]
+        },
+        "state" : {
+          "positionState" : "Formed"
+        },
+        "meta" : {
+          "globalKey" : "522d7d8a"
+        }
       }
     }
   } ],
+  "eventQualifier" : "Shaping",
   "after" : [ {
-    "meta" : {
-      "globalKey" : "28b21b91"
-    },
-    "state" : {
-      "closedState" : {
-        "state" : "TERMINATED"
-      },
-      "positionState" : "CLOSED"
-    },
     "trade" : {
-      "meta" : {
-        "globalKey" : "25234300"
-      },
-      "party" : [ {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "KTKLLEILLLLLLLLLLLLL"
+        },
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+            "meta" : {
+              "scheme" : "UnqTradIdr"
+            }
+          }
+        } ],
         "meta" : {
-          "externalKey" : "GlobalBank",
-          "globalKey" : "296093b7"
-        },
-        "name" : {
-          "value" : "Global Bank Inc"
+          "globalKey" : "32cd87f2"
         }
-      }, {
+      } ],
+      "tradeDate" : {
+        "value" : "2021-03-18",
         "meta" : {
-          "externalKey" : "UkBank",
-          "globalKey" : "1ef4886d"
-        },
-        "name" : {
-          "value" : "UK Bank plc"
+          "globalKey" : "3f28d2"
         }
-      } ],
-      "partyRole" : [ {
-        "partyReference" : {
-          "externalReference" : "GlobalBank",
-          "globalReference" : "296093b7"
-        },
-        "role" : "SELLER"
-      }, {
-        "partyReference" : {
-          "externalReference" : "UkBank",
-          "globalReference" : "1ef4886d"
-        },
-        "role" : "BUYER"
-      } ],
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
-              },
-              "name" : {
-                "value" : "Global Bank Inc"
-              }
-            }
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
-              "name" : {
-                "value" : "UK Bank plc"
-              }
-            }
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -2088,6 +2042,81 @@
               "productQualifier" : "RepurchaseAgreement"
             } ],
             "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-19",
+                  "meta" : {
+                    "globalKey" : "3f28d3"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d3",
+                  "externalKey" : "PurchaseDate"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
+                  "meta" : {
+                    "globalKey" : "3f28d6"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
+                }
+              },
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "69ca64cc"
+                }
+              },
               "collateral" : {
                 "collateralPortfolio" : [ {
                   "value" : {
@@ -2098,114 +2127,114 @@
                             "payout" : {
                               "assetPayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
                                 "principalPayment" : {
-                                  "finalPayment" : true,
                                   "initialPayment" : true,
+                                  "finalPayment" : true,
                                   "intermediatePayment" : false,
                                   "meta" : {
                                     "globalKey" : "12a6f5"
                                   }
                                 },
                                 "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "75229c9e"
+                                        "globalKey" : "71834796"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "71834796"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "de136e51"
+                                        "globalKey" : "da741949"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "da741949"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
                                 "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
                                   "security" : {
                                     "productIdentifier" : [ {
                                       "value" : {
                                         "identifier" : {
                                           "value" : "GB00B24FF097"
                                         },
+                                        "source" : "ISIN",
                                         "meta" : {
                                           "globalKey" : "1ad6d034"
-                                        },
-                                        "source" : "ISIN"
+                                        }
                                       }
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityType" : "Debt"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e7ac7fce"
+                            "globalKey" : "12a4a1fe"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e7ac7fce"
+                      "globalKey" : "12a4a1fe"
                     }
                   }
                 } ],
                 "collateralProvisions" : {
-                  "collateralType" : "CASH",
+                  "collateralType" : "Cash",
                   "eligibleCollateral" : [ {
                     "criteria" : [ {
                       "treatment" : {
@@ -2219,305 +2248,216 @@
                     }
                   } ]
                 }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d3"
-                  },
-                  "unadjustedDate" : "2021-03-19"
-                },
-                "meta" : {
-                  "externalKey" : "PurchaseDate",
-                  "globalKey" : "3f28d3"
-                }
-              },
-              "payout" : {
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "6a2c670c"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d6"
-                  },
-                  "unadjustedDate" : "2021-03-22"
-                },
-                "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
-                }
               }
             },
             "meta" : {
-              "globalKey" : "1a2ab30d"
+              "globalKey" : "c6dfdca3"
             }
           },
           "meta" : {
-            "globalKey" : "1a2ab30d"
+            "globalKey" : "c6dfdca3"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "2d65fdc6"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.004,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 0.004,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 0,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 0
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "f435dd0d"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "1ad6d034"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "GB00B24FF097"
-                  },
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "source" : "ISIN"
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-2"
+                  "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "7f59bafa"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 1.0075,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 1.0075,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                "priceType" : "ASSET_PRICE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "AssetPrice",
+                "priceExpression" : "PercentageOfNotional"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 0,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 0
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
+              }
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "GB00B24FF097"
+                  },
+                  "source" : "ISIN",
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "1ad6d034"
               }
-            } ]
-          } ]
-        } ]
-      },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f28d2"
-        },
-        "value" : "2021-03-18"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "UnqTradIdr"
             },
-            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-          }
+            "meta" : {
+              "globalKey" : "40cd97a1"
+            }
+          } ]
         } ],
-        "issuer" : {
-          "value" : "KTKLLEILLLLLLLLLLLLL"
-        },
-        "meta" : {
-          "globalKey" : "4a82737e"
-        }
-      } ]
-    }
-  }, {
-    "meta" : {
-      "globalKey" : "d6bf2062"
-    },
-    "trade" : {
-      "executionDetails" : {
-        "meta" : {
-          "globalKey" : "ecdc96e2"
-        },
-        "packageReference" : {
-          "listId" : {
-            "assignedIdentifier" : [ {
-              "identifier" : {
-                "value" : "L302TW1XER000101"
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "Global Bank Inc"
+              },
+              "meta" : {
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
               }
-            } ],
-            "meta" : {
-              "globalKey" : "ecdc96e2"
             }
-          },
-          "meta" : {
-            "globalKey" : "ecdc96e2"
           }
-        }
-      },
-      "meta" : {
-        "globalKey" : "d6bf2062"
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
+              }
+            }
+          }
+        } ]
       },
       "party" : [ {
-        "meta" : {
-          "externalKey" : "GlobalBank",
-          "globalKey" : "296093b7"
-        },
         "name" : {
           "value" : "Global Bank Inc"
+        },
+        "meta" : {
+          "globalKey" : "296093b7",
+          "externalKey" : "GlobalBank"
         }
       }, {
-        "meta" : {
-          "externalKey" : "UkBank",
-          "globalKey" : "1ef4886d"
-        },
         "name" : {
           "value" : "UK Bank plc"
+        },
+        "meta" : {
+          "globalKey" : "1ef4886d",
+          "externalKey" : "UkBank"
         }
       } ],
       "partyRole" : [ {
         "partyReference" : {
-          "externalReference" : "GlobalBank",
-          "globalReference" : "296093b7"
+          "globalReference" : "296093b7",
+          "externalReference" : "GlobalBank"
         },
-        "role" : "SELLER"
+        "role" : "Seller"
       }, {
         "partyReference" : {
-          "externalReference" : "UkBank",
-          "globalReference" : "1ef4886d"
+          "globalReference" : "1ef4886d",
+          "externalReference" : "UkBank"
         },
-        "role" : "BUYER"
+        "role" : "Buyer"
       } ],
-      "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
-              },
-              "name" : {
-                "value" : "Global Bank Inc"
-              }
-            }
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
-              "name" : {
-                "value" : "UK Bank plc"
-              }
+      "meta" : {
+        "globalKey" : "e3c733f8"
+      }
+    },
+    "state" : {
+      "closedState" : {
+        "state" : "Terminated"
+      },
+      "positionState" : "Closed"
+    },
+    "meta" : {
+      "globalKey" : "c34c9c87"
+    }
+  }, {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "KTKLLEILLLLLLLLLLLLL"
+        },
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+            "meta" : {
+              "scheme" : "UnqTradIdr"
             }
-          },
-          "role" : "PARTY_2"
+          }
         } ],
+        "meta" : {
+          "globalKey" : "32cd87f2"
+        }
+      } ],
+      "tradeDate" : {
+        "value" : "2021-03-18",
+        "meta" : {
+          "globalKey" : "3f28d2"
+        }
+      },
+      "tradableProduct" : {
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -2532,6 +2472,81 @@
               "productQualifier" : "RepurchaseAgreement"
             } ],
             "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-19",
+                  "meta" : {
+                    "globalKey" : "3f28d3"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d3",
+                  "externalKey" : "PurchaseDate"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
+                  "meta" : {
+                    "globalKey" : "3f28d6"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
+                }
+              },
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "69ca64cc"
+                }
+              },
               "collateral" : {
                 "collateralPortfolio" : [ {
                   "value" : {
@@ -2542,114 +2557,114 @@
                             "payout" : {
                               "assetPayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
                                 "principalPayment" : {
-                                  "finalPayment" : true,
                                   "initialPayment" : true,
+                                  "finalPayment" : true,
                                   "intermediatePayment" : false,
                                   "meta" : {
                                     "globalKey" : "12a6f5"
                                   }
                                 },
                                 "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "75229c9e"
+                                        "globalKey" : "71834796"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "71834796"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
-                                    },
                                     "relativeDate" : {
-                                      "meta" : {
-                                        "globalKey" : "de136e51"
-                                      },
-                                      "period" : "D",
                                       "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "period" : "D",
+                                      "meta" : {
+                                        "globalKey" : "da741949"
+                                      },
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "da741949"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
                                 "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
                                   "security" : {
                                     "productIdentifier" : [ {
                                       "value" : {
                                         "identifier" : {
                                           "value" : "GB00B24FF097"
                                         },
+                                        "source" : "ISIN",
                                         "meta" : {
                                           "globalKey" : "1ad6d034"
-                                        },
-                                        "source" : "ISIN"
+                                        }
                                       }
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityType" : "Debt"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e7ac7fce"
+                            "globalKey" : "12a4a1fe"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e7ac7fce"
+                      "globalKey" : "12a4a1fe"
                     }
                   }
                 } ],
                 "collateralProvisions" : {
-                  "collateralType" : "CASH",
+                  "collateralType" : "Cash",
                   "eligibleCollateral" : [ {
                     "criteria" : [ {
                       "treatment" : {
@@ -2663,228 +2678,179 @@
                     }
                   } ]
                 }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d3"
-                  },
-                  "unadjustedDate" : "2021-03-19"
-                },
-                "meta" : {
-                  "externalKey" : "PurchaseDate",
-                  "globalKey" : "3f28d3"
-                }
-              },
-              "payout" : {
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "6a2c670c"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d6"
-                  },
-                  "unadjustedDate" : "2021-03-22"
-                },
-                "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
-                }
               }
             },
             "meta" : {
-              "globalKey" : "1a2ab30d"
+              "globalKey" : "c6dfdca3"
             }
           },
           "meta" : {
-            "globalKey" : "1a2ab30d"
+            "globalKey" : "c6dfdca3"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "bc4832c6"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.004,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 0.004,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 3989700,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 3989700
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "8318120d"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "1ad6d034"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "GB00B24FF097"
-                  },
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "source" : "ISIN"
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-2"
+                  "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "ccbe25fa"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 1.0075,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 1.0075,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                "priceType" : "ASSET_PRICE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "AssetPrice",
+                "priceExpression" : "PercentageOfNotional"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 3989700,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 3989700
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "GB00B24FF097"
+                  },
+                  "source" : "ISIN",
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "1ad6d034"
+              }
+            },
+            "meta" : {
+              "globalKey" : "2df5c2a1"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "Global Bank Inc"
+              },
+              "meta" : {
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
+              }
+            }
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
+              }
+            }
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f28d2"
-        },
-        "value" : "2021-03-18"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "UnqTradIdr"
-            },
-            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-          }
-        } ],
-        "issuer" : {
-          "value" : "KTKLLEILLLLLLLLLLLLL"
+      "party" : [ {
+        "name" : {
+          "value" : "Global Bank Inc"
         },
         "meta" : {
-          "globalKey" : "4a82737e"
+          "globalKey" : "296093b7",
+          "externalKey" : "GlobalBank"
         }
-      } ]
-    }
-  }, {
-    "meta" : {
-      "globalKey" : "d6bf2062"
-    },
-    "trade" : {
-      "executionDetails" : {
+      }, {
+        "name" : {
+          "value" : "UK Bank plc"
+        },
         "meta" : {
-          "globalKey" : "ecdc96e2"
+          "globalKey" : "1ef4886d",
+          "externalKey" : "UkBank"
+        }
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "296093b7",
+          "externalReference" : "GlobalBank"
+        },
+        "role" : "Seller"
+      }, {
+        "partyReference" : {
+          "globalReference" : "1ef4886d",
+          "externalReference" : "UkBank"
         },
+        "role" : "Buyer"
+      } ],
+      "executionDetails" : {
         "packageReference" : {
           "listId" : {
             "assignedIdentifier" : [ {
@@ -2899,69 +2865,43 @@
           "meta" : {
             "globalKey" : "ecdc96e2"
           }
+        },
+        "meta" : {
+          "globalKey" : "ecdc96e2"
         }
       },
       "meta" : {
-        "globalKey" : "d6bf2062"
-      },
-      "party" : [ {
+        "globalKey" : "d7a510da"
+      }
+    },
+    "meta" : {
+      "globalKey" : "d7a510da"
+    }
+  }, {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "KTKLLEILLLLLLLLLLLLL"
+        },
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+            "meta" : {
+              "scheme" : "UnqTradIdr"
+            }
+          }
+        } ],
         "meta" : {
-          "externalKey" : "GlobalBank",
-          "globalKey" : "296093b7"
-        },
-        "name" : {
-          "value" : "Global Bank Inc"
+          "globalKey" : "32cd87f2"
         }
-      }, {
+      } ],
+      "tradeDate" : {
+        "value" : "2021-03-18",
         "meta" : {
-          "externalKey" : "UkBank",
-          "globalKey" : "1ef4886d"
-        },
-        "name" : {
-          "value" : "UK Bank plc"
+          "globalKey" : "3f28d2"
         }
-      } ],
-      "partyRole" : [ {
-        "partyReference" : {
-          "externalReference" : "GlobalBank",
-          "globalReference" : "296093b7"
-        },
-        "role" : "SELLER"
-      }, {
-        "partyReference" : {
-          "externalReference" : "UkBank",
-          "globalReference" : "1ef4886d"
-        },
-        "role" : "BUYER"
-      } ],
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
-              },
-              "name" : {
-                "value" : "Global Bank Inc"
-              }
-            }
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
-              "name" : {
-                "value" : "UK Bank plc"
-              }
-            }
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -2976,6 +2916,81 @@
               "productQualifier" : "RepurchaseAgreement"
             } ],
             "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-19",
+                  "meta" : {
+                    "globalKey" : "3f28d3"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d3",
+                  "externalKey" : "PurchaseDate"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
+                  "meta" : {
+                    "globalKey" : "3f28d6"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
+                }
+              },
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "69ca64cc"
+                }
+              },
               "collateral" : {
                 "collateralPortfolio" : [ {
                   "value" : {
@@ -2986,114 +3001,114 @@
                             "payout" : {
                               "assetPayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
                                 "principalPayment" : {
-                                  "finalPayment" : true,
                                   "initialPayment" : true,
+                                  "finalPayment" : true,
                                   "intermediatePayment" : false,
                                   "meta" : {
                                     "globalKey" : "12a6f5"
                                   }
                                 },
                                 "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "75229c9e"
+                                        "globalKey" : "71834796"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "71834796"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "de136e51"
+                                        "globalKey" : "da741949"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "da741949"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
                                 "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
                                   "security" : {
                                     "productIdentifier" : [ {
                                       "value" : {
                                         "identifier" : {
                                           "value" : "GB00B24FF097"
                                         },
+                                        "source" : "ISIN",
                                         "meta" : {
                                           "globalKey" : "1ad6d034"
-                                        },
-                                        "source" : "ISIN"
+                                        }
                                       }
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityType" : "Debt"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e7ac7fce"
+                            "globalKey" : "12a4a1fe"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e7ac7fce"
+                      "globalKey" : "12a4a1fe"
                     }
                   }
                 } ],
                 "collateralProvisions" : {
-                  "collateralType" : "CASH",
+                  "collateralType" : "Cash",
                   "eligibleCollateral" : [ {
                     "criteria" : [ {
                       "treatment" : {
@@ -3107,228 +3122,179 @@
                     }
                   } ]
                 }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d3"
-                  },
-                  "unadjustedDate" : "2021-03-19"
-                },
-                "meta" : {
-                  "externalKey" : "PurchaseDate",
-                  "globalKey" : "3f28d3"
-                }
-              },
-              "payout" : {
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "6a2c670c"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d6"
-                  },
-                  "unadjustedDate" : "2021-03-22"
-                },
-                "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
-                }
               }
             },
             "meta" : {
-              "globalKey" : "1a2ab30d"
+              "globalKey" : "c6dfdca3"
             }
           },
           "meta" : {
-            "globalKey" : "1a2ab30d"
+            "globalKey" : "c6dfdca3"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "bc4832c6"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.004,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 0.004,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 3989700,
                 "unit" : {
-                  "currency" : {
-                    "value" : "GBP"
-                  }
-                },
-                "value" : 3989700
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "8318120d"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "1ad6d034"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "GB00B24FF097"
-                  },
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "source" : "ISIN"
+                  "currency" : {
+                    "value" : "GBP"
+                  }
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-2"
+                  "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "ccbe25fa"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 1.0075,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 1.0075,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                "priceType" : "ASSET_PRICE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "AssetPrice",
+                "priceExpression" : "PercentageOfNotional"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 3989700,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 3989700
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "GB00B24FF097"
+                  },
+                  "source" : "ISIN",
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "1ad6d034"
+              }
+            },
+            "meta" : {
+              "globalKey" : "2df5c2a1"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "Global Bank Inc"
+              },
+              "meta" : {
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
+              }
+            }
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
+              }
+            }
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f28d2"
-        },
-        "value" : "2021-03-18"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
-            "meta" : {
-              "scheme" : "UnqTradIdr"
-            },
-            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
-          }
-        } ],
-        "issuer" : {
-          "value" : "KTKLLEILLLLLLLLLLLLL"
+      "party" : [ {
+        "name" : {
+          "value" : "Global Bank Inc"
         },
         "meta" : {
-          "globalKey" : "4a82737e"
+          "globalKey" : "296093b7",
+          "externalKey" : "GlobalBank"
         }
-      } ]
-    }
-  }, {
-    "meta" : {
-      "globalKey" : "5f1ab062"
-    },
-    "trade" : {
-      "executionDetails" : {
+      }, {
+        "name" : {
+          "value" : "UK Bank plc"
+        },
         "meta" : {
-          "globalKey" : "ecdc96e2"
+          "globalKey" : "1ef4886d",
+          "externalKey" : "UkBank"
+        }
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "296093b7",
+          "externalReference" : "GlobalBank"
+        },
+        "role" : "Seller"
+      }, {
+        "partyReference" : {
+          "globalReference" : "1ef4886d",
+          "externalReference" : "UkBank"
         },
+        "role" : "Buyer"
+      } ],
+      "executionDetails" : {
         "packageReference" : {
           "listId" : {
             "assignedIdentifier" : [ {
@@ -3343,69 +3309,43 @@
           "meta" : {
             "globalKey" : "ecdc96e2"
           }
+        },
+        "meta" : {
+          "globalKey" : "ecdc96e2"
         }
       },
       "meta" : {
-        "globalKey" : "5f1ab062"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "GlobalBank",
-          "globalKey" : "296093b7"
+        "globalKey" : "d7a510da"
+      }
+    },
+    "meta" : {
+      "globalKey" : "d7a510da"
+    }
+  }, {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "KTKLLEILLLLLLLLLLLLL"
         },
-        "name" : {
-          "value" : "Global Bank Inc"
-        }
-      }, {
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002",
+            "meta" : {
+              "scheme" : "UnqTradIdr"
+            }
+          }
+        } ],
         "meta" : {
-          "externalKey" : "UkBank",
-          "globalKey" : "1ef4886d"
-        },
-        "name" : {
-          "value" : "UK Bank plc"
+          "globalKey" : "32cd87f2"
         }
       } ],
-      "partyRole" : [ {
-        "partyReference" : {
-          "externalReference" : "GlobalBank",
-          "globalReference" : "296093b7"
-        },
-        "role" : "SELLER"
-      }, {
-        "partyReference" : {
-          "externalReference" : "UkBank",
-          "globalReference" : "1ef4886d"
-        },
-        "role" : "BUYER"
-      } ],
+      "tradeDate" : {
+        "value" : "2021-03-18",
+        "meta" : {
+          "globalKey" : "3f28d2"
+        }
+      },
       "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "GlobalBank",
-                "globalKey" : "296093b7"
-              },
-              "name" : {
-                "value" : "Global Bank Inc"
-              }
-            }
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "UkBank",
-                "globalKey" : "1ef4886d"
-              },
-              "name" : {
-                "value" : "UK Bank plc"
-              }
-            }
-          },
-          "role" : "PARTY_2"
-        } ],
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -3420,6 +3360,81 @@
               "productQualifier" : "RepurchaseAgreement"
             } ],
             "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-19",
+                  "meta" : {
+                    "globalKey" : "3f28d3"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d3",
+                  "externalKey" : "PurchaseDate"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2021-03-22",
+                  "meta" : {
+                    "globalKey" : "3f28d6"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3f28d6",
+                  "externalKey" : "RepurchaseDate"
+                }
+              },
+              "payout" : {
+                "interestRatePayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "principalPayment" : {
+                    "initialPayment" : true,
+                    "finalPayment" : true,
+                    "intermediatePayment" : false,
+                    "meta" : {
+                      "globalKey" : "12a6f5"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-1"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "meta" : {
+                    "globalKey" : "69ca64cc"
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "69ca64cc"
+                }
+              },
               "collateral" : {
                 "collateralPortfolio" : [ {
                   "value" : {
@@ -3430,114 +3445,114 @@
                             "payout" : {
                               "assetPayout" : [ {
                                 "payerReceiver" : {
-                                  "payer" : "PARTY_1",
-                                  "receiver" : "PARTY_2"
+                                  "payer" : "Party1",
+                                  "receiver" : "Party2"
                                 },
                                 "priceQuantity" : {
-                                  "meta" : {
-                                    "globalKey" : "0"
-                                  },
                                   "quantitySchedule" : {
                                     "address" : {
                                       "scope" : "DOCUMENT",
                                       "value" : "quantity-2"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "0"
                                   }
                                 },
                                 "principalPayment" : {
-                                  "finalPayment" : true,
                                   "initialPayment" : true,
+                                  "finalPayment" : true,
                                   "intermediatePayment" : false,
                                   "meta" : {
                                     "globalKey" : "12a6f5"
                                   }
                                 },
                                 "assetLeg" : [ {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "75229c9e"
-                                    },
                                     "relativeDate" : {
-                                      "meta" : {
-                                        "globalKey" : "75229c9e"
-                                      },
-                                      "period" : "D",
                                       "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "period" : "D",
+                                      "meta" : {
+                                        "globalKey" : "71834796"
+                                      },
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "PurchaseDate",
-                                        "globalReference" : "3f28d3"
+                                        "globalReference" : "3f28d3",
+                                        "externalReference" : "PurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "71834796"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 }, {
-                                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
                                   "settlementDate" : {
-                                    "meta" : {
-                                      "globalKey" : "de136e51"
-                                    },
                                     "relativeDate" : {
+                                      "periodMultiplier" : 0,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "de136e51"
+                                        "globalKey" : "da741949"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : 0,
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "RepurchaseDate",
-                                        "globalReference" : "3f28d6"
+                                        "globalReference" : "3f28d6",
+                                        "externalReference" : "RepurchaseDate"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "da741949"
                                     }
-                                  }
+                                  },
+                                  "deliveryMethod" : "DeliveryVersusPayment"
                                 } ],
-                                "durationType" : {
-                                  "durationType" : "TERM"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e7ac7fce"
-                                },
                                 "securityInformation" : {
-                                  "meta" : {
-                                    "globalKey" : "40232adf"
-                                  },
                                   "security" : {
                                     "productIdentifier" : [ {
                                       "value" : {
                                         "identifier" : {
                                           "value" : "GB00B24FF097"
                                         },
+                                        "source" : "ISIN",
                                         "meta" : {
                                           "globalKey" : "1ad6d034"
-                                        },
-                                        "source" : "ISIN"
+                                        }
                                       }
                                     } ],
-                                    "securityType" : "DEBT"
+                                    "securityType" : "Debt"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "40232adf"
                                   }
+                                },
+                                "durationType" : {
+                                  "durationType" : "Term"
+                                },
+                                "meta" : {
+                                  "globalKey" : "12a4a1fe"
                                 }
                               } ],
                               "meta" : {
-                                "globalKey" : "e7ac7fce"
+                                "globalKey" : "12a4a1fe"
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e7ac7fce"
+                            "globalKey" : "12a4a1fe"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e7ac7fce"
+                          "globalKey" : "12a4a1fe"
                         }
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e7ac7fce"
+                      "globalKey" : "12a4a1fe"
                     }
                   }
                 } ],
                 "collateralProvisions" : {
-                  "collateralType" : "CASH",
+                  "collateralType" : "Cash",
                   "eligibleCollateral" : [ {
                     "criteria" : [ {
                       "treatment" : {
@@ -3551,222 +3566,207 @@
                     }
                   } ]
                 }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d3"
-                  },
-                  "unadjustedDate" : "2021-03-19"
-                },
-                "meta" : {
-                  "externalKey" : "PurchaseDate",
-                  "globalKey" : "3f28d3"
-                }
-              },
-              "payout" : {
-                "interestRatePayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      }
-                    }
-                  },
-                  "principalPayment" : {
-                    "finalPayment" : true,
-                    "initialPayment" : true,
-                    "intermediatePayment" : false,
-                    "meta" : {
-                      "globalKey" : "12a6f5"
-                    }
-                  },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "6a2c670c"
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-1"
-                          }
-                        }
-                      }
-                    }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "6a2c670c"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "meta" : {
-                    "globalKey" : "3f28d6"
-                  },
-                  "unadjustedDate" : "2021-03-22"
-                },
-                "meta" : {
-                  "externalKey" : "RepurchaseDate",
-                  "globalKey" : "3f28d6"
-                }
               }
             },
             "meta" : {
-              "globalKey" : "1a2ab30d"
+              "globalKey" : "c6dfdca3"
             }
           },
           "meta" : {
-            "globalKey" : "1a2ab30d"
+            "globalKey" : "c6dfdca3"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "3512a346"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-1"
-                } ]
-              },
               "value" : {
+                "value" : 0.004,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 0.004,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
+                  "value" : "price-1"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 2000000,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 1994850
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "fbe2828d"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "1ad6d034"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "GB00B24FF097"
-                  },
-                  "meta" : {
-                    "globalKey" : "1ad6d034"
-                  },
-                  "source" : "ISIN"
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-2"
+                  "value" : "quantity-1"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "e5eace7c"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 1.0075,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "value" : 1.0075,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "GBP"
                   }
                 },
-                "priceExpression" : "PERCENTAGE_OF_NOTIONAL",
-                "priceType" : "ASSET_PRICE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "AssetPrice",
+                "priceExpression" : "PercentageOfNotional"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 2000000,
                 "unit" : {
                   "currency" : {
                     "value" : "GBP"
                   }
-                },
-                "value" : 1994850
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
               }
-            } ]
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "GB00B24FF097"
+                  },
+                  "source" : "ISIN",
+                  "meta" : {
+                    "globalKey" : "1ad6d034"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "1ad6d034"
+              }
+            },
+            "meta" : {
+              "globalKey" : "a9ee81a3"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "Global Bank Inc"
+              },
+              "meta" : {
+                "globalKey" : "296093b7",
+                "externalKey" : "GlobalBank"
+              }
+            }
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "name" : {
+                "value" : "UK Bank plc"
+              },
+              "meta" : {
+                "globalKey" : "1ef4886d",
+                "externalKey" : "UkBank"
+              }
+            }
+          }
         } ]
       },
-      "tradeDate" : {
+      "party" : [ {
+        "name" : {
+          "value" : "Global Bank Inc"
+        },
         "meta" : {
-          "globalKey" : "3f28d2"
+          "globalKey" : "296093b7",
+          "externalKey" : "GlobalBank"
+        }
+      }, {
+        "name" : {
+          "value" : "UK Bank plc"
         },
-        "value" : "2021-03-18"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
+        "meta" : {
+          "globalKey" : "1ef4886d",
+          "externalKey" : "UkBank"
+        }
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "globalReference" : "296093b7",
+          "externalReference" : "GlobalBank"
+        },
+        "role" : "Seller"
+      }, {
+        "partyReference" : {
+          "globalReference" : "1ef4886d",
+          "externalReference" : "UkBank"
+        },
+        "role" : "Buyer"
+      } ],
+      "executionDetails" : {
+        "packageReference" : {
+          "listId" : {
+            "assignedIdentifier" : [ {
+              "identifier" : {
+                "value" : "L302TW1XER000101"
+              }
+            } ],
             "meta" : {
-              "scheme" : "UnqTradIdr"
-            },
-            "value" : "KTKLLEILLLLLLLLLLLLL-FISG1G1LENDFP0028303002"
+              "globalKey" : "ecdc96e2"
+            }
+          },
+          "meta" : {
+            "globalKey" : "ecdc96e2"
           }
-        } ],
-        "issuer" : {
-          "value" : "KTKLLEILLLLLLLLLLLLL"
         },
         "meta" : {
-          "globalKey" : "4a82737e"
+          "globalKey" : "ecdc96e2"
         }
-      } ]
+      },
+      "meta" : {
+        "globalKey" : "2d3acd9a"
+      }
+    },
+    "meta" : {
+      "globalKey" : "2d3acd9a"
     }
   } ],
-  "eventQualifier" : "Shaping",
   "meta" : {
-    "globalKey" : "8eef976e"
+    "globalKey" : "1696a1a6"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/allocation/allocation-sec-lending-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/allocation/allocation-sec-lending-func-output.json
index ce9f21ed77..3e15e99bde 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/allocation/allocation-sec-lending-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/allocation/allocation-sec-lending-func-output.json
@@ -1,95 +1,231 @@
 {
+  "intent" : "Allocation",
   "eventDate" : "2020-09-21",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "2c5e94ac"
-        },
-        "state" : {
-          "positionState" : "EXECUTED"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "5ec4779d"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "AGENT_LENDER",
-              "globalKey" : "2691a546"
+    "primitiveInstruction" : {
+      "split" : {
+        "breakdown" : [ {
+          "partyChange" : {
+            "counterparty" : {
+              "role" : "Party1",
+              "partyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "Fund 1"
+                    },
+                    "meta" : {
+                      "globalKey" : "7e1775b6"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "d42855ec",
+                    "externalKey" : "lender-1"
+                  }
+                }
+              }
             },
-            "name" : {
-              "value" : "KTKL (Agent Lender)"
+            "partyRole" : {
+              "partyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "KTKLLEILLLLLLLLLLLLL"
+                    },
+                    "meta" : {
+                      "globalKey" : "60098fe6"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "KTKL (Agent Lender)"
+                  },
+                  "meta" : {
+                    "globalKey" : "53741506",
+                    "externalKey" : "AGENT_LENDER"
+                  }
+                }
+              },
+              "role" : "AgentLender"
             },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "KTKLLEILLLLLLLLLLLLL"
+            "tradeId" : [ {
+              "issuer" : {
+                "value" : "KTKL"
               },
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "0266001-allocation-lender-1"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "60098fe6"
+                "globalKey" : "c76d61e5"
               }
             } ]
-          }, {
-            "meta" : {
-              "externalKey" : "Borrower",
-              "globalKey" : "20931af1"
-            },
-            "name" : {
-              "value" : "CP001 (Borrower)"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "CP001LEI111111111111"
-              },
+          },
+          "quantityChange" : {
+            "change" : [ {
+              "quantity" : [ {
+                "value" : {
+                  "value" : 3000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                }
+              }, {
+                "value" : {
+                  "value" : 120000,
+                  "unit" : {
+                    "financialUnit" : "Share"
+                  }
+                }
+              } ],
               "meta" : {
-                "globalKey" : "12818f8c"
+                "globalKey" : "dafd8c33"
               }
-            } ]
-          } ],
-          "tradableProduct" : {
-            "counterparty" : [ {
+            } ],
+            "direction" : "Replace"
+          }
+        }, {
+          "partyChange" : {
+            "counterparty" : {
+              "role" : "Party1",
               "partyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "AGENT_LENDER",
-                    "globalKey" : "2691a546"
-                  },
-                  "name" : {
-                    "value" : "KTKL (Agent Lender)"
-                  },
                   "partyId" : [ {
                     "identifier" : {
-                      "value" : "KTKLLEILLLLLLLLLLLLL"
+                      "value" : "Fund 2"
                     },
                     "meta" : {
-                      "globalKey" : "60098fe6"
+                      "globalKey" : "7e1775b7"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "Fund 2"
+                  },
+                  "meta" : {
+                    "globalKey" : "d42859ae",
+                    "externalKey" : "lender-2"
+                  }
                 }
-              },
-              "role" : "PARTY_1"
-            }, {
+              }
+            },
+            "partyRole" : {
               "partyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "20931af1"
-                  },
-                  "name" : {
-                    "value" : "CP001 (Borrower)"
-                  },
                   "partyId" : [ {
                     "identifier" : {
-                      "value" : "CP001LEI111111111111"
+                      "value" : "KTKLLEILLLLLLLLLLLLL"
                     },
                     "meta" : {
-                      "globalKey" : "12818f8c"
+                      "globalKey" : "60098fe6"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "KTKL (Agent Lender)"
+                  },
+                  "meta" : {
+                    "globalKey" : "53741506",
+                    "externalKey" : "AGENT_LENDER"
+                  }
                 }
               },
-              "role" : "PARTY_2"
+              "role" : "AgentLender"
+            },
+            "tradeId" : [ {
+              "issuer" : {
+                "value" : "KTKL"
+              },
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "0266001-allocation-lender-2"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "c76d61e6"
+              }
+            } ]
+          },
+          "quantityChange" : {
+            "change" : [ {
+              "quantity" : [ {
+                "value" : {
+                  "value" : 2000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                }
+              }, {
+                "value" : {
+                  "value" : 80000,
+                  "unit" : {
+                    "financialUnit" : "Share"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "546b8f6b"
+              }
+            } ],
+            "direction" : "Replace"
+          }
+        }, {
+          "quantityChange" : {
+            "change" : [ {
+              "quantity" : [ {
+                "value" : {
+                  "value" : 0,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                }
+              }, {
+                "value" : {
+                  "value" : 0,
+                  "unit" : {
+                    "financialUnit" : "Share"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "a0be9c25"
+              }
+            } ],
+            "direction" : "Replace"
+          }
+        } ]
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "KTKL"
+            },
+            "assignedIdentifier" : [ {
+              "identifier" : {
+                "value" : "0266001"
+              }
             } ],
+            "meta" : {
+              "globalKey" : "569d85e5"
+            }
+          } ],
+          "tradeDate" : {
+            "value" : "2020-09-21",
+            "meta" : {
+              "globalKey" : "3f2255"
+            }
+          },
+          "tradableProduct" : {
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -97,25 +233,26 @@
                   "productQualifier" : "SecurityLendingAgreement"
                 } ],
                 "economicTerms" : {
-                  "collateral" : {
-                    "collateralProvisions" : {
-                      "collateralType" : "CASH",
-                      "eligibleCollateral" : [ {
-                        "criteria" : [ {
-                          "treatment" : {
-                            "valuationTreatment" : {
-                              "marginPercentage" : 0.02
-                            }
-                          }
-                        } ],
+                  "effectiveDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2020-09-22",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "168480"
+                          "globalKey" : "fa42f5cf"
                         }
-                      } ]
+                      },
+                      "meta" : {
+                        "globalKey" : "e742daa5"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "e742daa5"
                     }
                   },
-                  "effectiveDate" : {
+                  "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2020-10-22",
                       "dateAdjustments" : {
                         "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
@@ -123,197 +260,117 @@
                         }
                       },
                       "meta" : {
-                        "globalKey" : "e742daa5"
-                      },
-                      "unadjustedDate" : "2020-09-22"
+                        "globalKey" : "e743cae5"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "e742daa5"
+                      "globalKey" : "e743cae5"
                     }
                   },
                   "payout" : {
-                    "assetPayout" : [ {
+                    "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
-                      "assetLeg" : [ {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
-                          "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
-                            },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
-                              "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "24a738"
+                      "priceQuantity" : {
+                        "quantitySchedule" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "quantity-8"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
-                      }, {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
-                          "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
-                            },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
-                              "meta" : {
-                                "globalKey" : "24a738"
+                      },
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-2"
                               }
-                            },
-                            "meta" : {
-                              "globalKey" : "24a738"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        }
-                      } ],
-                      "dividendTerms" : {
-                        "manufacturedIncomeRequirement" : {
-                          "totalRatio" : 1
-                        }
-                      },
-                      "durationType" : {
-                        "durationType" : "TERM"
-                      },
-                      "meta" : {
-                        "globalKey" : "73453ae0"
-                      },
-                      "minimumFee" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "USD"
+                            "globalKey" : "0"
                           }
-                        },
-                        "value" : 0,
-                        "meta" : {
-                          "globalKey" : "171b36"
-                        }
-                      },
-                      "securityInformation" : {
-                        "meta" : {
-                          "globalKey" : "7548eca6"
-                        },
-                        "security" : {
-                          "productIdentifier" : [ {
-                            "value" : {
-                              "identifier" : {
-                                "value" : "ST001"
-                              },
-                              "meta" : {
-                                "globalKey" : "a4ff65ff"
-                              },
-                              "source" : "SEDOL"
-                            }
-                          } ],
-                          "securityType" : "EQUITY"
                         }
-                      }
-                    } ],
-                    "interestRatePayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
                       },
-                      "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "quantitySchedule" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "quantity-8"
-                          }
-                        }
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
                       },
                       "calculationPeriodDates" : {
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "25e2ab"
-                          },
-                          "period" : "T",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "NONE"
-                        },
                         "effectiveDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
-                            },
                             "dateAdjustments" : {
                               "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "fa42f5cf"
                               }
                             },
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
+                              "meta" : {
+                                "globalKey" : "3f2256"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "Effective_Date",
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Effective_Date"
                             }
                           },
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "a4273c9"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
-                            },
                             "dateAdjustments" : {
                               "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "fa42f5cf"
                               }
                             },
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
+                              "meta" : {
+                                "globalKey" : "3f2296"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "Termination_Date",
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Termination_Date"
                             }
                           },
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
+                        },
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "24b525"
+                          },
+                          "rollConvention" : "NONE"
+                        },
+                        "meta" : {
+                          "globalKey" : "8b1de243"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "ce90278b"
-                      },
                       "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "b578507f"
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "73"
+                          }
                         },
                         "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -322,722 +379,501 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
-                        "paymentFrequency" : {
-                          "meta" : {
-                            "globalKey" : "a2d"
-                          },
-                          "period" : "T",
-                          "periodMultiplier" : 1
+                        "meta" : {
+                          "globalKey" : "fa98fa5b"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "meta" : {
+                        "globalKey" : "98fd77d9"
+                      }
+                    } ],
+                    "assetPayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "assetLeg" : [ {
+                        "settlementDate" : {
+                          "adjustableDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
+                              "meta" : {
+                                "globalKey" : "3f2256"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
                           "meta" : {
-                            "globalKey" : "0"
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      }, {
+                        "settlementDate" : {
+                          "adjustableDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
+                              "meta" : {
+                                "globalKey" : "3f2296"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
                           },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-2"
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      } ],
+                      "securityInformation" : {
+                        "security" : {
+                          "productIdentifier" : [ {
+                            "value" : {
+                              "identifier" : {
+                                "value" : "ST001"
+                              },
+                              "source" : "SEDOL",
+                              "meta" : {
+                                "globalKey" : "a4ff65ff"
                               }
                             }
+                          } ],
+                          "securityType" : "Equity"
+                        },
+                        "meta" : {
+                          "globalKey" : "7548eca6"
+                        }
+                      },
+                      "durationType" : {
+                        "durationType" : "Term"
+                      },
+                      "minimumFee" : {
+                        "value" : 0,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "USD"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "171b36"
+                        }
+                      },
+                      "dividendTerms" : {
+                        "manufacturedIncomeRequirement" : {
+                          "totalRatio" : 1
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3b19750e"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "eb31e26b"
+                      "globalKey" : "43b3b6a7"
                     }
                   },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "fa42f5cf"
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "e743cae5"
-                      },
-                      "unadjustedDate" : "2020-10-22"
-                    },
-                    "meta" : {
-                      "globalKey" : "e743cae5"
+                  "collateral" : {
+                    "collateralProvisions" : {
+                      "collateralType" : "Cash",
+                      "eligibleCollateral" : [ {
+                        "criteria" : [ {
+                          "treatment" : {
+                            "valuationTreatment" : {
+                              "marginPercentage" : 0.02
+                            }
+                          }
+                        } ],
+                        "meta" : {
+                          "globalKey" : "168480"
+                        }
+                      } ]
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "37405ce2"
+                  "globalKey" : "38d91964"
                 }
               },
               "meta" : {
-                "globalKey" : "37405ce2"
+                "globalKey" : "38d91964"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "bc2d9a59"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.01,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 0.01,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-8"
+                      "value" : "price-2"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 5000000,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
-                    },
-                    "value" : 5000000
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "a0b25412"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "value" : "ST001"
-                      },
-                      "meta" : {
-                        "globalKey" : "a4ff65ff"
-                      },
-                      "source" : "SEDOL"
                     }
-                  } ]
-                },
-                "price" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "price-1"
+                      "value" : "quantity-8"
                     } ]
-                  },
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "c985b0c7"
+                }
+              }, {
+                "price" : [ {
                   "value" : {
+                    "value" : 25,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 25,
                     "perUnitOf" : {
-                      "financialUnit" : "SHARE"
+                      "financialUnit" : "Share"
                     },
-                    "priceType" : "ASSET_PRICE"
+                    "priceType" : "AssetPrice"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
                   }
                 } ],
                 "quantity" : [ {
+                  "value" : {
+                    "value" : 200000,
+                    "unit" : {
+                      "financialUnit" : "Share"
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-9"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "financialUnit" : "SHARE"
-                    },
-                    "value" : 200000
                   }
-                } ]
+                } ],
+                "observable" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "ST001"
+                      },
+                      "source" : "SEDOL",
+                      "meta" : {
+                        "globalKey" : "a4ff65ff"
+                      }
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "998f6e8c"
+                }
               } ]
-            } ]
-          },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f2255"
-            },
-            "value" : "2020-09-21"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
-              "identifier" : {
-                "value" : "0266001"
-              }
             } ],
-            "issuer" : {
-              "value" : "KTKL"
-            },
-            "meta" : {
-              "globalKey" : "9e641379"
-            }
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "split" : {
-        "breakdown" : [ {
-          "partyChange" : {
-            "counterparty" : {
+            "counterparty" : [ {
+              "role" : "Party1",
               "partyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "lender-1",
-                    "globalKey" : "ea229c40"
-                  },
-                  "name" : {
-                    "value" : "Fund 1"
-                  },
                   "partyId" : [ {
                     "identifier" : {
-                      "value" : "Fund 1"
+                      "value" : "KTKLLEILLLLLLLLLLLLL"
                     },
                     "meta" : {
-                      "globalKey" : "7e1775b6"
+                      "globalKey" : "60098fe6"
                     }
-                  } ]
-                }
-              },
-              "role" : "PARTY_1"
-            },
-            "partyRole" : {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "AGENT_LENDER",
-                    "globalKey" : "2691a546"
-                  },
+                  } ],
                   "name" : {
                     "value" : "KTKL (Agent Lender)"
                   },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "KTKLLEILLLLLLLLLLLLL"
-                    },
-                    "meta" : {
-                      "globalKey" : "60098fe6"
-                    }
-                  } ]
-                }
-              },
-              "role" : "AGENT_LENDER"
-            },
-            "tradeId" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "value" : "0266001-allocation-lender-1"
+                  "meta" : {
+                    "globalKey" : "53741506",
+                    "externalKey" : "AGENT_LENDER"
+                  }
                 }
-              } ],
-              "issuer" : {
-                "value" : "KTKL"
-              },
-              "meta" : {
-                "globalKey" : "1aacef79"
               }
-            } ]
-          },
-          "quantityChange" : {
-            "change" : [ {
-              "meta" : {
-                "globalKey" : "dafd8c33"
-              },
-              "quantity" : [ {
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 3000000
-                }
-              }, {
-                "value" : {
-                  "unit" : {
-                    "financialUnit" : "SHARE"
-                  },
-                  "value" : 120000
-                }
-              } ]
-            } ],
-            "direction" : "REPLACE"
-          }
-        }, {
-          "partyChange" : {
-            "counterparty" : {
+            }, {
+              "role" : "Party2",
               "partyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "lender-2",
-                    "globalKey" : "ea2310a0"
-                  },
-                  "name" : {
-                    "value" : "Fund 2"
-                  },
                   "partyId" : [ {
                     "identifier" : {
-                      "value" : "Fund 2"
+                      "value" : "CP001LEI111111111111"
                     },
                     "meta" : {
-                      "globalKey" : "7e1775b7"
+                      "globalKey" : "12818f8c"
                     }
-                  } ]
-                }
-              },
-              "role" : "PARTY_1"
-            },
-            "partyRole" : {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "AGENT_LENDER",
-                    "globalKey" : "2691a546"
-                  },
+                  } ],
                   "name" : {
-                    "value" : "KTKL (Agent Lender)"
+                    "value" : "CP001 (Borrower)"
                   },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "KTKLLEILLLLLLLLLLLLL"
-                    },
-                    "meta" : {
-                      "globalKey" : "60098fe6"
-                    }
-                  } ]
-                }
-              },
-              "role" : "AGENT_LENDER"
-            },
-            "tradeId" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "value" : "0266001-allocation-lender-2"
+                  "meta" : {
+                    "globalKey" : "84fb9347",
+                    "externalKey" : "Borrower"
+                  }
                 }
-              } ],
-              "issuer" : {
-                "value" : "KTKL"
-              },
-              "meta" : {
-                "globalKey" : "1aacf33a"
               }
             } ]
           },
-          "quantityChange" : {
-            "change" : [ {
-              "meta" : {
-                "globalKey" : "546b8f6b"
+          "party" : [ {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "KTKLLEILLLLLLLLLLLLL"
               },
-              "quantity" : [ {
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 2000000
-                }
-              }, {
-                "value" : {
-                  "unit" : {
-                    "financialUnit" : "SHARE"
-                  },
-                  "value" : 80000
-                }
-              } ]
-            } ],
-            "direction" : "REPLACE"
-          }
-        }, {
-          "quantityChange" : {
-            "change" : [ {
               "meta" : {
-                "globalKey" : "a0be9c25"
-              },
-              "quantity" : [ {
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 0
-                }
-              }, {
-                "value" : {
-                  "unit" : {
-                    "financialUnit" : "SHARE"
-                  },
-                  "value" : 0
-                }
-              } ]
+                "globalKey" : "60098fe6"
+              }
             } ],
-            "direction" : "REPLACE"
-          }
-        } ]
-      }
-    }
-  } ],
-  "intent" : "ALLOCATION",
-  "after" : [ {
-    "meta" : {
-      "globalKey" : "6cca6c72"
-    },
-    "trade" : {
-      "meta" : {
-        "globalKey" : "6cca6c72"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "lender-1",
-          "globalKey" : "ea229c40"
-        },
-        "name" : {
-          "value" : "Fund 1"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "value" : "Fund 1"
-          },
-          "meta" : {
-            "globalKey" : "7e1775b6"
-          }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "Borrower",
-          "globalKey" : "20931af1"
-        },
-        "name" : {
-          "value" : "CP001 (Borrower)"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "value" : "CP001LEI111111111111"
-          },
-          "meta" : {
-            "globalKey" : "12818f8c"
-          }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "AGENT_LENDER",
-          "globalKey" : "2691a546"
-        },
-        "name" : {
-          "value" : "KTKL (Agent Lender)"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "value" : "KTKLLEILLLLLLLLLLLLL"
-          },
-          "meta" : {
-            "globalKey" : "60098fe6"
-          }
-        } ]
-      } ],
-      "partyRole" : [ {
-        "partyReference" : {
-          "value" : {
-            "meta" : {
-              "externalKey" : "AGENT_LENDER",
-              "globalKey" : "2691a546"
-            },
             "name" : {
               "value" : "KTKL (Agent Lender)"
             },
+            "meta" : {
+              "globalKey" : "53741506",
+              "externalKey" : "AGENT_LENDER"
+            }
+          }, {
             "partyId" : [ {
               "identifier" : {
-                "value" : "KTKLLEILLLLLLLLLLLLL"
+                "value" : "CP001LEI111111111111"
               },
               "meta" : {
-                "globalKey" : "60098fe6"
+                "globalKey" : "12818f8c"
               }
-            } ]
+            } ],
+            "name" : {
+              "value" : "CP001 (Borrower)"
+            },
+            "meta" : {
+              "globalKey" : "84fb9347",
+              "externalKey" : "Borrower"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "fd5ae067"
           }
         },
-        "role" : "AGENT_LENDER"
-      } ],
-      "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "lender-1",
-            "globalReference" : "ea229c40"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "Borrower",
-                "globalKey" : "20931af1"
-              },
-              "name" : {
-                "value" : "CP001 (Borrower)"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "value" : "CP001LEI111111111111"
-                },
-                "meta" : {
-                  "globalKey" : "12818f8c"
-                }
-              } ]
-            }
-          },
-          "role" : "PARTY_2"
-        } ],
-        "product" : {
-          "contractualProduct" : {
-            "productTaxonomy" : [ {
-              "source" : "ISDA",
-              "productQualifier" : "SecurityLendingAgreement"
-            } ],
-            "economicTerms" : {
-              "collateral" : {
-                "collateralProvisions" : {
-                  "collateralType" : "CASH",
-                  "eligibleCollateral" : [ {
-                    "criteria" : [ {
-                      "treatment" : {
-                        "valuationTreatment" : {
-                          "marginPercentage" : 0.02
-                        }
-                      }
-                    } ],
-                    "meta" : {
-                      "globalKey" : "168480"
-                    }
-                  } ]
-                }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "dateAdjustments" : {
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "fa42f5cf"
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "e742daa5"
-                  },
-                  "unadjustedDate" : "2020-09-22"
-                },
-                "meta" : {
-                  "globalKey" : "e742daa5"
-                }
-              },
-              "payout" : {
-                "assetPayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "assetLeg" : [ {
-                    "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                    "settlementDate" : {
-                      "adjustableDate" : {
-                        "adjustedDate" : {
-                          "meta" : {
-                            "globalKey" : "3f2256"
-                          },
-                          "value" : "2020-09-22"
-                        },
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NONE",
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "24a738"
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "24a738"
-                      }
-                    }
-                  }, {
-                    "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                    "settlementDate" : {
-                      "adjustableDate" : {
-                        "adjustedDate" : {
-                          "meta" : {
-                            "globalKey" : "3f2296"
-                          },
-                          "value" : "2020-10-22"
-                        },
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NONE",
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "24a738"
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "24a738"
-                      }
-                    }
-                  } ],
-                  "dividendTerms" : {
-                    "manufacturedIncomeRequirement" : {
-                      "totalRatio" : 1
+        "state" : {
+          "positionState" : "Executed"
+        },
+        "meta" : {
+          "globalKey" : "ba904a36"
+        }
+      }
+    }
+  } ],
+  "eventQualifier" : "Allocation",
+  "after" : [ {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "KTKL"
+        },
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "0266001-allocation-lender-1"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "c76d61e5"
+        }
+      } ],
+      "tradeDate" : {
+        "value" : "2020-09-21",
+        "meta" : {
+          "globalKey" : "3f2255"
+        }
+      },
+      "tradableProduct" : {
+        "product" : {
+          "contractualProduct" : {
+            "productTaxonomy" : [ {
+              "source" : "ISDA",
+              "productQualifier" : "SecurityLendingAgreement"
+            } ],
+            "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2020-09-22",
+                  "dateAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "meta" : {
+                      "globalKey" : "fa42f5cf"
                     }
                   },
-                  "durationType" : {
-                    "durationType" : "TERM"
-                  },
                   "meta" : {
-                    "globalKey" : "73453ae0"
-                  },
-                  "minimumFee" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 0,
+                    "globalKey" : "e742daa5"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "e742daa5"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2020-10-22",
+                  "dateAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "171b36"
+                      "globalKey" : "fa42f5cf"
                     }
                   },
-                  "securityInformation" : {
-                    "meta" : {
-                      "globalKey" : "7548eca6"
-                    },
-                    "security" : {
-                      "productIdentifier" : [ {
-                        "value" : {
-                          "identifier" : {
-                            "value" : "ST001"
-                          },
-                          "meta" : {
-                            "globalKey" : "a4ff65ff"
-                          },
-                          "source" : "SEDOL"
-                        }
-                      } ],
-                      "securityType" : "EQUITY"
-                    }
+                  "meta" : {
+                    "globalKey" : "e743cae5"
                   }
-                } ],
+                },
+                "meta" : {
+                  "globalKey" : "e743cae5"
+                }
+              },
+              "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-8"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "25e2ab"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-2"
+                          }
+                        }
                       },
-                      "period" : "T",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "NONE"
-                    },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
-                        "adjustedDate" : {
-                          "meta" : {
-                            "globalKey" : "3f2256"
-                          },
-                          "value" : "2020-09-22"
-                        },
                         "dateAdjustments" : {
                           "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
                         },
+                        "adjustedDate" : {
+                          "value" : "2020-09-22",
+                          "meta" : {
+                            "globalKey" : "3f2256"
+                          }
+                        },
                         "meta" : {
-                          "externalKey" : "Effective_Date",
-                          "globalKey" : "fa42f5cf"
+                          "globalKey" : "fa42f5cf",
+                          "externalKey" : "Effective_Date"
                         }
                       },
                       "meta" : {
                         "globalKey" : "fa42f5cf"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "a4273c9"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
-                        "adjustedDate" : {
-                          "meta" : {
-                            "globalKey" : "3f2296"
-                          },
-                          "value" : "2020-10-22"
-                        },
                         "dateAdjustments" : {
                           "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
                         },
+                        "adjustedDate" : {
+                          "value" : "2020-10-22",
+                          "meta" : {
+                            "globalKey" : "3f2296"
+                          }
+                        },
                         "meta" : {
-                          "externalKey" : "Termination_Date",
-                          "globalKey" : "fa42f5cf"
+                          "globalKey" : "fa42f5cf",
+                          "externalKey" : "Termination_Date"
                         }
                       },
                       "meta" : {
                         "globalKey" : "fa42f5cf"
                       }
+                    },
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
+                      "meta" : {
+                        "globalKey" : "24b525"
+                      },
+                      "rollConvention" : "NONE"
+                    },
+                    "meta" : {
+                      "globalKey" : "8b1de243"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "ce90278b"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "b578507f"
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
+                      "meta" : {
+                        "globalKey" : "73"
+                      }
                     },
                     "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
@@ -1046,217 +882,289 @@
                           "globalKey" : "20a71d"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365baaee"
                       }
                     },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "a2d"
-                      },
-                      "period" : "T",
-                      "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "fa98fa5b"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
+                  "meta" : {
+                    "globalKey" : "98fd77d9"
+                  }
+                } ],
+                "assetPayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "assetLeg" : [ {
+                    "settlementDate" : {
+                      "adjustableDate" : {
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NONE",
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "adjustedDate" : {
+                          "value" : "2020-09-22",
+                          "meta" : {
+                            "globalKey" : "3f2256"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "24a738"
+                        }
+                      },
                       "meta" : {
-                        "globalKey" : "0"
+                        "globalKey" : "24a738"
+                      }
+                    },
+                    "deliveryMethod" : "DeliveryVersusPayment"
+                  }, {
+                    "settlementDate" : {
+                      "adjustableDate" : {
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NONE",
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "adjustedDate" : {
+                          "value" : "2020-10-22",
+                          "meta" : {
+                            "globalKey" : "3f2296"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "24a738"
+                        }
                       },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-2"
+                      "meta" : {
+                        "globalKey" : "24a738"
+                      }
+                    },
+                    "deliveryMethod" : "DeliveryVersusPayment"
+                  } ],
+                  "securityInformation" : {
+                    "security" : {
+                      "productIdentifier" : [ {
+                        "value" : {
+                          "identifier" : {
+                            "value" : "ST001"
+                          },
+                          "source" : "SEDOL",
+                          "meta" : {
+                            "globalKey" : "a4ff65ff"
                           }
                         }
+                      } ],
+                      "securityType" : "Equity"
+                    },
+                    "meta" : {
+                      "globalKey" : "7548eca6"
+                    }
+                  },
+                  "durationType" : {
+                    "durationType" : "Term"
+                  },
+                  "minimumFee" : {
+                    "value" : 0,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "171b36"
+                    }
+                  },
+                  "dividendTerms" : {
+                    "manufacturedIncomeRequirement" : {
+                      "totalRatio" : 1
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "3b19750e"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "eb31e26b"
+                  "globalKey" : "43b3b6a7"
                 }
               },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "dateAdjustments" : {
-                    "businessDayConvention" : "MODFOLLOWING",
+              "collateral" : {
+                "collateralProvisions" : {
+                  "collateralType" : "Cash",
+                  "eligibleCollateral" : [ {
+                    "criteria" : [ {
+                      "treatment" : {
+                        "valuationTreatment" : {
+                          "marginPercentage" : 0.02
+                        }
+                      }
+                    } ],
                     "meta" : {
-                      "globalKey" : "fa42f5cf"
+                      "globalKey" : "168480"
                     }
-                  },
-                  "meta" : {
-                    "globalKey" : "e743cae5"
-                  },
-                  "unadjustedDate" : "2020-10-22"
-                },
-                "meta" : {
-                  "globalKey" : "e743cae5"
+                  } ]
                 }
               }
             },
             "meta" : {
-              "globalKey" : "37405ce2"
+              "globalKey" : "38d91964"
             }
           },
           "meta" : {
-            "globalKey" : "37405ce2"
+            "globalKey" : "38d91964"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "d39ab81b"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-2"
-                } ]
-              },
               "value" : {
+                "value" : 0.01,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 0.01,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-8"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 3000000,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 3000000
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "a29d9db5"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "a4ff65ff"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "ST001"
-                  },
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
-                  "source" : "SEDOL"
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-1"
+                  "value" : "quantity-8"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "9fbc4b45"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 25,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 25,
                 "perUnitOf" : {
-                  "financialUnit" : "SHARE"
+                  "financialUnit" : "Share"
                 },
-                "priceType" : "ASSET_PRICE"
+                "priceType" : "AssetPrice"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-1"
+                } ]
               }
             } ],
             "quantity" : [ {
+              "value" : {
+                "value" : 120000,
+                "unit" : {
+                  "financialUnit" : "Share"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-9"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "financialUnit" : "SHARE"
-                },
-                "value" : 120000
               }
-            } ]
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "ST001"
+                  },
+                  "source" : "SEDOL",
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "a4ff65ff"
+              }
+            },
+            "meta" : {
+              "globalKey" : "36f9789"
+            }
           } ]
-        } ]
-      },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f2255"
-        },
-        "value" : "2020-09-21"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
-          "identifier" : {
-            "value" : "0266001-allocation-lender-1"
-          }
         } ],
-        "issuer" : {
-          "value" : "KTKL"
-        },
-        "meta" : {
-          "globalKey" : "1aacef79"
-        }
-      } ]
-    }
-  }, {
-    "meta" : {
-      "globalKey" : "897d704c"
-    },
-    "trade" : {
-      "meta" : {
-        "globalKey" : "897d704c"
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "d42855ec",
+            "externalReference" : "lender-1"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "CP001LEI111111111111"
+                },
+                "meta" : {
+                  "globalKey" : "12818f8c"
+                }
+              } ],
+              "name" : {
+                "value" : "CP001 (Borrower)"
+              },
+              "meta" : {
+                "globalKey" : "84fb9347",
+                "externalKey" : "Borrower"
+              }
+            }
+          }
+        } ]
       },
       "party" : [ {
-        "meta" : {
-          "externalKey" : "lender-2",
-          "globalKey" : "ea2310a0"
-        },
-        "name" : {
-          "value" : "Fund 2"
-        },
         "partyId" : [ {
           "identifier" : {
-            "value" : "Fund 2"
+            "value" : "Fund 1"
           },
           "meta" : {
-            "globalKey" : "7e1775b7"
+            "globalKey" : "7e1775b6"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "Borrower",
-          "globalKey" : "20931af1"
-        },
+        } ],
         "name" : {
-          "value" : "CP001 (Borrower)"
+          "value" : "Fund 1"
         },
+        "meta" : {
+          "globalKey" : "d42855ec",
+          "externalKey" : "lender-1"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
             "value" : "CP001LEI111111111111"
@@ -1264,15 +1172,15 @@
           "meta" : {
             "globalKey" : "12818f8c"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "AGENT_LENDER",
-          "globalKey" : "2691a546"
-        },
+        } ],
         "name" : {
-          "value" : "KTKL (Agent Lender)"
+          "value" : "CP001 (Borrower)"
         },
+        "meta" : {
+          "globalKey" : "84fb9347",
+          "externalKey" : "Borrower"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
             "value" : "KTKLLEILLLLLLLLLLLLL"
@@ -1280,18 +1188,18 @@
           "meta" : {
             "globalKey" : "60098fe6"
           }
-        } ]
+        } ],
+        "name" : {
+          "value" : "KTKL (Agent Lender)"
+        },
+        "meta" : {
+          "globalKey" : "53741506",
+          "externalKey" : "AGENT_LENDER"
+        }
       } ],
       "partyRole" : [ {
         "partyReference" : {
           "value" : {
-            "meta" : {
-              "externalKey" : "AGENT_LENDER",
-              "globalKey" : "2691a546"
-            },
-            "name" : {
-              "value" : "KTKL (Agent Lender)"
-            },
             "partyId" : [ {
               "identifier" : {
                 "value" : "KTKLLEILLLLLLLLLLLLL"
@@ -1299,66 +1207,74 @@
               "meta" : {
                 "globalKey" : "60098fe6"
               }
-            } ]
+            } ],
+            "name" : {
+              "value" : "KTKL (Agent Lender)"
+            },
+            "meta" : {
+              "globalKey" : "53741506",
+              "externalKey" : "AGENT_LENDER"
+            }
           }
         },
-        "role" : "AGENT_LENDER"
+        "role" : "AgentLender"
       } ],
-      "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "lender-2",
-            "globalReference" : "ea2310a0"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "Borrower",
-                "globalKey" : "20931af1"
-              },
-              "name" : {
-                "value" : "CP001 (Borrower)"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "value" : "CP001LEI111111111111"
-                },
-                "meta" : {
-                  "globalKey" : "12818f8c"
-                }
-              } ]
-            }
-          },
-          "role" : "PARTY_2"
+      "meta" : {
+        "globalKey" : "324d1664"
+      }
+    },
+    "meta" : {
+      "globalKey" : "324d1664"
+    }
+  }, {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "KTKL"
+        },
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "0266001-allocation-lender-2"
+          }
         } ],
+        "meta" : {
+          "globalKey" : "c76d61e6"
+        }
+      } ],
+      "tradeDate" : {
+        "value" : "2020-09-21",
+        "meta" : {
+          "globalKey" : "3f2255"
+        }
+      },
+      "tradableProduct" : {
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
               "source" : "ISDA",
               "productQualifier" : "SecurityLendingAgreement"
-            } ],
-            "economicTerms" : {
-              "collateral" : {
-                "collateralProvisions" : {
-                  "collateralType" : "CASH",
-                  "eligibleCollateral" : [ {
-                    "criteria" : [ {
-                      "treatment" : {
-                        "valuationTreatment" : {
-                          "marginPercentage" : 0.02
-                        }
-                      }
-                    } ],
+            } ],
+            "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2020-09-22",
+                  "dateAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "168480"
+                      "globalKey" : "fa42f5cf"
                     }
-                  } ]
+                  },
+                  "meta" : {
+                    "globalKey" : "e742daa5"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "e742daa5"
                 }
               },
-              "effectiveDate" : {
+              "terminationDate" : {
                 "adjustableDate" : {
+                  "unadjustedDate" : "2020-10-22",
                   "dateAdjustments" : {
                     "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
@@ -1366,475 +1282,491 @@
                     }
                   },
                   "meta" : {
-                    "globalKey" : "e742daa5"
-                  },
-                  "unadjustedDate" : "2020-09-22"
+                    "globalKey" : "e743cae5"
+                  }
                 },
                 "meta" : {
-                  "globalKey" : "e742daa5"
+                  "globalKey" : "e743cae5"
                 }
               },
               "payout" : {
-                "assetPayout" : [ {
+                "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
-                  "assetLeg" : [ {
-                    "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                    "settlementDate" : {
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-8"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-2"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
+                    "effectiveDate" : {
                       "adjustableDate" : {
-                        "adjustedDate" : {
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "3f2256"
-                          },
-                          "value" : "2020-09-22"
+                            "globalKey" : "fa42f5cf"
+                          }
                         },
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NONE",
+                        "adjustedDate" : {
+                          "value" : "2020-09-22",
                           "meta" : {
-                            "globalKey" : "24a738"
+                            "globalKey" : "3f2256"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "24a738"
+                          "globalKey" : "fa42f5cf",
+                          "externalKey" : "Effective_Date"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "24a738"
+                        "globalKey" : "fa42f5cf"
                       }
-                    }
-                  }, {
-                    "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                    "settlementDate" : {
+                    },
+                    "terminationDate" : {
                       "adjustableDate" : {
-                        "adjustedDate" : {
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "3f2296"
-                          },
-                          "value" : "2020-10-22"
+                            "globalKey" : "fa42f5cf"
+                          }
                         },
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NONE",
+                        "adjustedDate" : {
+                          "value" : "2020-10-22",
                           "meta" : {
-                            "globalKey" : "24a738"
+                            "globalKey" : "3f2296"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "24a738"
+                          "globalKey" : "fa42f5cf",
+                          "externalKey" : "Termination_Date"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "24a738"
-                      }
-                    }
-                  } ],
-                  "dividendTerms" : {
-                    "manufacturedIncomeRequirement" : {
-                      "totalRatio" : 1
-                    }
-                  },
-                  "durationType" : {
-                    "durationType" : "TERM"
-                  },
-                  "meta" : {
-                    "globalKey" : "73453ae0"
-                  },
-                  "minimumFee" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
+                        "globalKey" : "fa42f5cf"
                       }
                     },
-                    "value" : 0,
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
+                      "meta" : {
+                        "globalKey" : "24b525"
+                      },
+                      "rollConvention" : "NONE"
+                    },
                     "meta" : {
-                      "globalKey" : "171b36"
+                      "globalKey" : "8b1de243"
                     }
                   },
-                  "securityInformation" : {
-                    "meta" : {
-                      "globalKey" : "7548eca6"
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
+                      "meta" : {
+                        "globalKey" : "73"
+                      }
                     },
-                    "security" : {
-                      "productIdentifier" : [ {
-                        "value" : {
-                          "identifier" : {
-                            "value" : "ST001"
-                          },
-                          "meta" : {
-                            "globalKey" : "a4ff65ff"
-                          },
-                          "source" : "SEDOL"
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCenter" : [ {
+                          "value" : "EUTA"
+                        } ],
+                        "meta" : {
+                          "globalKey" : "20a71d"
                         }
-                      } ],
-                      "securityType" : "EQUITY"
+                      },
+                      "meta" : {
+                        "globalKey" : "365baaee"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "fa98fa5b"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "98fd77d9"
                   }
                 } ],
-                "interestRatePayout" : [ {
+                "assetPayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-8"
-                      }
-                    }
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "25e2ab"
-                      },
-                      "period" : "T",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "NONE"
-                    },
-                    "effectiveDate" : {
+                  "assetLeg" : [ {
+                    "settlementDate" : {
                       "adjustableDate" : {
-                        "adjustedDate" : {
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NONE",
                           "meta" : {
-                            "globalKey" : "3f2256"
-                          },
-                          "value" : "2020-09-22"
+                            "globalKey" : "24a738"
+                          }
                         },
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "MODFOLLOWING",
+                        "adjustedDate" : {
+                          "value" : "2020-09-22",
                           "meta" : {
-                            "globalKey" : "fa42f5cf"
+                            "globalKey" : "3f2256"
                           }
                         },
                         "meta" : {
-                          "externalKey" : "Effective_Date",
-                          "globalKey" : "fa42f5cf"
+                          "globalKey" : "24a738"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "fa42f5cf"
+                        "globalKey" : "24a738"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "a4273c9"
-                    },
-                    "terminationDate" : {
+                    "deliveryMethod" : "DeliveryVersusPayment"
+                  }, {
+                    "settlementDate" : {
                       "adjustableDate" : {
-                        "adjustedDate" : {
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NONE",
                           "meta" : {
-                            "globalKey" : "3f2296"
-                          },
-                          "value" : "2020-10-22"
+                            "globalKey" : "24a738"
+                          }
                         },
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "MODFOLLOWING",
+                        "adjustedDate" : {
+                          "value" : "2020-10-22",
                           "meta" : {
-                            "globalKey" : "fa42f5cf"
+                            "globalKey" : "3f2296"
                           }
                         },
                         "meta" : {
-                          "externalKey" : "Termination_Date",
-                          "globalKey" : "fa42f5cf"
+                          "globalKey" : "24a738"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "fa42f5cf"
+                        "globalKey" : "24a738"
                       }
+                    },
+                    "deliveryMethod" : "DeliveryVersusPayment"
+                  } ],
+                  "securityInformation" : {
+                    "security" : {
+                      "productIdentifier" : [ {
+                        "value" : {
+                          "identifier" : {
+                            "value" : "ST001"
+                          },
+                          "source" : "SEDOL",
+                          "meta" : {
+                            "globalKey" : "a4ff65ff"
+                          }
+                        }
+                      } ],
+                      "securityType" : "Equity"
+                    },
+                    "meta" : {
+                      "globalKey" : "7548eca6"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "ce90278b"
+                  "durationType" : {
+                    "durationType" : "Term"
                   },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "b578507f"
-                    },
-                    "paymentDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCenter" : [ {
-                          "value" : "EUTA"
-                        } ],
-                        "meta" : {
-                          "globalKey" : "20a71d"
-                        }
-                      },
-                      "businessDayConvention" : "MODFOLLOWING",
-                      "meta" : {
-                        "globalKey" : "365baaee"
+                  "minimumFee" : {
+                    "value" : 0,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
                       }
                     },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "a2d"
-                      },
-                      "period" : "T",
-                      "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "171b36"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-2"
-                          }
-                        }
-                      }
+                  "dividendTerms" : {
+                    "manufacturedIncomeRequirement" : {
+                      "totalRatio" : 1
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "3b19750e"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "eb31e26b"
+                  "globalKey" : "43b3b6a7"
                 }
               },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "dateAdjustments" : {
-                    "businessDayConvention" : "MODFOLLOWING",
+              "collateral" : {
+                "collateralProvisions" : {
+                  "collateralType" : "Cash",
+                  "eligibleCollateral" : [ {
+                    "criteria" : [ {
+                      "treatment" : {
+                        "valuationTreatment" : {
+                          "marginPercentage" : 0.02
+                        }
+                      }
+                    } ],
                     "meta" : {
-                      "globalKey" : "fa42f5cf"
+                      "globalKey" : "168480"
                     }
-                  },
-                  "meta" : {
-                    "globalKey" : "e743cae5"
-                  },
-                  "unadjustedDate" : "2020-10-22"
-                },
-                "meta" : {
-                  "globalKey" : "e743cae5"
+                  } ]
                 }
               }
             },
             "meta" : {
-              "globalKey" : "37405ce2"
+              "globalKey" : "38d91964"
             }
           },
           "meta" : {
-            "globalKey" : "37405ce2"
+            "globalKey" : "38d91964"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "df5146fc"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-2"
-                } ]
-              },
               "value" : {
+                "value" : 0.01,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 0.01,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-8"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 2000000,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 2000000
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "fde96a8c"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "a4ff65ff"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "ST001"
-                  },
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
-                  "source" : "SEDOL"
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-1"
+                  "value" : "quantity-8"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "ad79884"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 25,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 25,
                 "perUnitOf" : {
-                  "financialUnit" : "SHARE"
+                  "financialUnit" : "Share"
                 },
-                "priceType" : "ASSET_PRICE"
+                "priceType" : "AssetPrice"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-1"
+                } ]
               }
             } ],
             "quantity" : [ {
+              "value" : {
+                "value" : 80000,
+                "unit" : {
+                  "financialUnit" : "Share"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-9"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "financialUnit" : "SHARE"
-                },
-                "value" : 80000
               }
-            } ]
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "ST001"
+                  },
+                  "source" : "SEDOL",
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "a4ff65ff"
+              }
+            },
+            "meta" : {
+              "globalKey" : "1ba2fad2"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "d42859ae",
+            "externalReference" : "lender-2"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "CP001LEI111111111111"
+                },
+                "meta" : {
+                  "globalKey" : "12818f8c"
+                }
+              } ],
+              "name" : {
+                "value" : "CP001 (Borrower)"
+              },
+              "meta" : {
+                "globalKey" : "84fb9347",
+                "externalKey" : "Borrower"
+              }
+            }
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f2255"
-        },
-        "value" : "2020-09-21"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
-            "value" : "0266001-allocation-lender-2"
+            "value" : "Fund 2"
+          },
+          "meta" : {
+            "globalKey" : "7e1775b7"
           }
         } ],
-        "issuer" : {
-          "value" : "KTKL"
+        "name" : {
+          "value" : "Fund 2"
         },
         "meta" : {
-          "globalKey" : "1aacf33a"
+          "globalKey" : "d42859ae",
+          "externalKey" : "lender-2"
         }
-      } ]
-    }
-  }, {
-    "meta" : {
-      "globalKey" : "f9da5b83"
-    },
-    "state" : {
-      "closedState" : {
-        "state" : "TERMINATED"
-      },
-      "positionState" : "CLOSED"
-    },
-    "trade" : {
-      "meta" : {
-        "globalKey" : "66738174"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "AGENT_LENDER",
-          "globalKey" : "2691a546"
-        },
-        "name" : {
-          "value" : "KTKL (Agent Lender)"
-        },
+      }, {
         "partyId" : [ {
           "identifier" : {
-            "value" : "KTKLLEILLLLLLLLLLLLL"
+            "value" : "CP001LEI111111111111"
           },
           "meta" : {
-            "globalKey" : "60098fe6"
+            "globalKey" : "12818f8c"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "Borrower",
-          "globalKey" : "20931af1"
-        },
+        } ],
         "name" : {
           "value" : "CP001 (Borrower)"
         },
+        "meta" : {
+          "globalKey" : "84fb9347",
+          "externalKey" : "Borrower"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
-            "value" : "CP001LEI111111111111"
+            "value" : "KTKLLEILLLLLLLLLLLLL"
           },
           "meta" : {
-            "globalKey" : "12818f8c"
+            "globalKey" : "60098fe6"
           }
-        } ]
+        } ],
+        "name" : {
+          "value" : "KTKL (Agent Lender)"
+        },
+        "meta" : {
+          "globalKey" : "53741506",
+          "externalKey" : "AGENT_LENDER"
+        }
       } ],
-      "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "AGENT_LENDER",
-                "globalKey" : "2691a546"
-              },
-              "name" : {
-                "value" : "KTKL (Agent Lender)"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "value" : "KTKLLEILLLLLLLLLLLLL"
-                },
-                "meta" : {
-                  "globalKey" : "60098fe6"
-                }
-              } ]
-            }
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "Borrower",
-                "globalKey" : "20931af1"
-              },
-              "name" : {
-                "value" : "CP001 (Borrower)"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "value" : "CP001LEI111111111111"
-                },
-                "meta" : {
-                  "globalKey" : "12818f8c"
-                }
-              } ]
+      "partyRole" : [ {
+        "partyReference" : {
+          "value" : {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "KTKLLEILLLLLLLLLLLLL"
+              },
+              "meta" : {
+                "globalKey" : "60098fe6"
+              }
+            } ],
+            "name" : {
+              "value" : "KTKL (Agent Lender)"
+            },
+            "meta" : {
+              "globalKey" : "53741506",
+              "externalKey" : "AGENT_LENDER"
             }
-          },
-          "role" : "PARTY_2"
+          }
+        },
+        "role" : "AgentLender"
+      } ],
+      "meta" : {
+        "globalKey" : "133650e8"
+      }
+    },
+    "meta" : {
+      "globalKey" : "133650e8"
+    }
+  }, {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "KTKL"
+        },
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "0266001"
+          }
         } ],
+        "meta" : {
+          "globalKey" : "569d85e5"
+        }
+      } ],
+      "tradeDate" : {
+        "value" : "2020-09-21",
+        "meta" : {
+          "globalKey" : "3f2255"
+        }
+      },
+      "tradableProduct" : {
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -1842,25 +1774,26 @@
               "productQualifier" : "SecurityLendingAgreement"
             } ],
             "economicTerms" : {
-              "collateral" : {
-                "collateralProvisions" : {
-                  "collateralType" : "CASH",
-                  "eligibleCollateral" : [ {
-                    "criteria" : [ {
-                      "treatment" : {
-                        "valuationTreatment" : {
-                          "marginPercentage" : 0.02
-                        }
-                      }
-                    } ],
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2020-09-22",
+                  "dateAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "168480"
+                      "globalKey" : "fa42f5cf"
                     }
-                  } ]
+                  },
+                  "meta" : {
+                    "globalKey" : "e742daa5"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "e742daa5"
                 }
               },
-              "effectiveDate" : {
+              "terminationDate" : {
                 "adjustableDate" : {
+                  "unadjustedDate" : "2020-10-22",
                   "dateAdjustments" : {
                     "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
@@ -1868,387 +1801,454 @@
                     }
                   },
                   "meta" : {
-                    "globalKey" : "e742daa5"
-                  },
-                  "unadjustedDate" : "2020-09-22"
+                    "globalKey" : "e743cae5"
+                  }
                 },
                 "meta" : {
-                  "globalKey" : "e742daa5"
+                  "globalKey" : "e743cae5"
                 }
               },
               "payout" : {
-                "assetPayout" : [ {
+                "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
-                  "assetLeg" : [ {
-                    "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                    "settlementDate" : {
+                  "priceQuantity" : {
+                    "quantitySchedule" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-8"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  },
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-2"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
+                    "effectiveDate" : {
                       "adjustableDate" : {
-                        "adjustedDate" : {
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "3f2256"
-                          },
-                          "value" : "2020-09-22"
+                            "globalKey" : "fa42f5cf"
+                          }
                         },
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NONE",
+                        "adjustedDate" : {
+                          "value" : "2020-09-22",
                           "meta" : {
-                            "globalKey" : "24a738"
+                            "globalKey" : "3f2256"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "24a738"
+                          "globalKey" : "fa42f5cf",
+                          "externalKey" : "Effective_Date"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "24a738"
+                        "globalKey" : "fa42f5cf"
                       }
-                    }
-                  }, {
-                    "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                    "settlementDate" : {
+                    },
+                    "terminationDate" : {
                       "adjustableDate" : {
-                        "adjustedDate" : {
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "3f2296"
-                          },
-                          "value" : "2020-10-22"
+                            "globalKey" : "fa42f5cf"
+                          }
                         },
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NONE",
+                        "adjustedDate" : {
+                          "value" : "2020-10-22",
                           "meta" : {
-                            "globalKey" : "24a738"
+                            "globalKey" : "3f2296"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "24a738"
+                          "globalKey" : "fa42f5cf",
+                          "externalKey" : "Termination_Date"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "24a738"
-                      }
-                    }
-                  } ],
-                  "dividendTerms" : {
-                    "manufacturedIncomeRequirement" : {
-                      "totalRatio" : 1
-                    }
-                  },
-                  "durationType" : {
-                    "durationType" : "TERM"
-                  },
-                  "meta" : {
-                    "globalKey" : "73453ae0"
-                  },
-                  "minimumFee" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
+                        "globalKey" : "fa42f5cf"
                       }
                     },
-                    "value" : 0,
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
+                      "meta" : {
+                        "globalKey" : "24b525"
+                      },
+                      "rollConvention" : "NONE"
+                    },
                     "meta" : {
-                      "globalKey" : "171b36"
+                      "globalKey" : "8b1de243"
                     }
                   },
-                  "securityInformation" : {
-                    "meta" : {
-                      "globalKey" : "7548eca6"
+                  "paymentDates" : {
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
+                      "meta" : {
+                        "globalKey" : "73"
+                      }
                     },
-                    "security" : {
-                      "productIdentifier" : [ {
-                        "value" : {
-                          "identifier" : {
-                            "value" : "ST001"
-                          },
-                          "meta" : {
-                            "globalKey" : "a4ff65ff"
-                          },
-                          "source" : "SEDOL"
+                    "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
+                      "businessCenters" : {
+                        "businessCenter" : [ {
+                          "value" : "EUTA"
+                        } ],
+                        "meta" : {
+                          "globalKey" : "20a71d"
                         }
-                      } ],
-                      "securityType" : "EQUITY"
+                      },
+                      "meta" : {
+                        "globalKey" : "365baaee"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "fa98fa5b"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "98fd77d9"
                   }
                 } ],
-                "interestRatePayout" : [ {
+                "assetPayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "quantitySchedule" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-8"
-                      }
-                    }
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "25e2ab"
-                      },
-                      "period" : "T",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "NONE"
-                    },
-                    "effectiveDate" : {
+                  "assetLeg" : [ {
+                    "settlementDate" : {
                       "adjustableDate" : {
-                        "adjustedDate" : {
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NONE",
                           "meta" : {
-                            "globalKey" : "3f2256"
-                          },
-                          "value" : "2020-09-22"
+                            "globalKey" : "24a738"
+                          }
                         },
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "MODFOLLOWING",
+                        "adjustedDate" : {
+                          "value" : "2020-09-22",
                           "meta" : {
-                            "globalKey" : "fa42f5cf"
+                            "globalKey" : "3f2256"
                           }
                         },
                         "meta" : {
-                          "externalKey" : "Effective_Date",
-                          "globalKey" : "fa42f5cf"
+                          "globalKey" : "24a738"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "fa42f5cf"
+                        "globalKey" : "24a738"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "a4273c9"
-                    },
-                    "terminationDate" : {
+                    "deliveryMethod" : "DeliveryVersusPayment"
+                  }, {
+                    "settlementDate" : {
                       "adjustableDate" : {
-                        "adjustedDate" : {
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NONE",
                           "meta" : {
-                            "globalKey" : "3f2296"
-                          },
-                          "value" : "2020-10-22"
+                            "globalKey" : "24a738"
+                          }
                         },
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "MODFOLLOWING",
+                        "adjustedDate" : {
+                          "value" : "2020-10-22",
                           "meta" : {
-                            "globalKey" : "fa42f5cf"
+                            "globalKey" : "3f2296"
                           }
                         },
                         "meta" : {
-                          "externalKey" : "Termination_Date",
-                          "globalKey" : "fa42f5cf"
+                          "globalKey" : "24a738"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "fa42f5cf"
+                        "globalKey" : "24a738"
                       }
+                    },
+                    "deliveryMethod" : "DeliveryVersusPayment"
+                  } ],
+                  "securityInformation" : {
+                    "security" : {
+                      "productIdentifier" : [ {
+                        "value" : {
+                          "identifier" : {
+                            "value" : "ST001"
+                          },
+                          "source" : "SEDOL",
+                          "meta" : {
+                            "globalKey" : "a4ff65ff"
+                          }
+                        }
+                      } ],
+                      "securityType" : "Equity"
+                    },
+                    "meta" : {
+                      "globalKey" : "7548eca6"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "ce90278b"
+                  "durationType" : {
+                    "durationType" : "Term"
                   },
-                  "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "b578507f"
-                    },
-                    "paymentDatesAdjustments" : {
-                      "businessCenters" : {
-                        "businessCenter" : [ {
-                          "value" : "EUTA"
-                        } ],
-                        "meta" : {
-                          "globalKey" : "20a71d"
-                        }
-                      },
-                      "businessDayConvention" : "MODFOLLOWING",
-                      "meta" : {
-                        "globalKey" : "365baaee"
+                  "minimumFee" : {
+                    "value" : 0,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
                       }
                     },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "a2d"
-                      },
-                      "period" : "T",
-                      "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "171b36"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-2"
-                          }
-                        }
-                      }
+                  "dividendTerms" : {
+                    "manufacturedIncomeRequirement" : {
+                      "totalRatio" : 1
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "3b19750e"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "eb31e26b"
+                  "globalKey" : "43b3b6a7"
                 }
               },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "dateAdjustments" : {
-                    "businessDayConvention" : "MODFOLLOWING",
+              "collateral" : {
+                "collateralProvisions" : {
+                  "collateralType" : "Cash",
+                  "eligibleCollateral" : [ {
+                    "criteria" : [ {
+                      "treatment" : {
+                        "valuationTreatment" : {
+                          "marginPercentage" : 0.02
+                        }
+                      }
+                    } ],
                     "meta" : {
-                      "globalKey" : "fa42f5cf"
+                      "globalKey" : "168480"
                     }
-                  },
-                  "meta" : {
-                    "globalKey" : "e743cae5"
-                  },
-                  "unadjustedDate" : "2020-10-22"
-                },
-                "meta" : {
-                  "globalKey" : "e743cae5"
+                  } ]
                 }
               }
             },
             "meta" : {
-              "globalKey" : "37405ce2"
+              "globalKey" : "38d91964"
             }
           },
           "meta" : {
-            "globalKey" : "37405ce2"
+            "globalKey" : "38d91964"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "a233d2be"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-2"
-                } ]
-              },
               "value" : {
+                "value" : 0.01,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 0.01,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-8"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 0,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 0
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "16e99c84"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "a4ff65ff"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "ST001"
-                  },
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
-                  "source" : "SEDOL"
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-1"
+                  "value" : "quantity-8"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "a4468502"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 25,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 25,
                 "perUnitOf" : {
-                  "financialUnit" : "SHARE"
+                  "financialUnit" : "Share"
                 },
-                "priceType" : "ASSET_PRICE"
+                "priceType" : "AssetPrice"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-1"
+                } ]
               }
             } ],
             "quantity" : [ {
+              "value" : {
+                "value" : 0,
+                "unit" : {
+                  "financialUnit" : "Share"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-9"
                 } ]
+              }
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "ST001"
+                  },
+                  "source" : "SEDOL",
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "a4ff65ff"
+              }
+            },
+            "meta" : {
+              "globalKey" : "9e5d21da"
+            }
+          } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "value" : {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "KTKLLEILLLLLLLLLLLLL"
+                },
+                "meta" : {
+                  "globalKey" : "60098fe6"
+                }
+              } ],
+              "name" : {
+                "value" : "KTKL (Agent Lender)"
               },
-              "value" : {
-                "unit" : {
-                  "financialUnit" : "SHARE"
+              "meta" : {
+                "globalKey" : "53741506",
+                "externalKey" : "AGENT_LENDER"
+              }
+            }
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "CP001LEI111111111111"
                 },
-                "value" : 0
+                "meta" : {
+                  "globalKey" : "12818f8c"
+                }
+              } ],
+              "name" : {
+                "value" : "CP001 (Borrower)"
+              },
+              "meta" : {
+                "globalKey" : "84fb9347",
+                "externalKey" : "Borrower"
               }
-            } ]
-          } ]
+            }
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f2255"
+      "party" : [ {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "KTKLLEILLLLLLLLLLLLL"
+          },
+          "meta" : {
+            "globalKey" : "60098fe6"
+          }
+        } ],
+        "name" : {
+          "value" : "KTKL (Agent Lender)"
         },
-        "value" : "2020-09-21"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+        "meta" : {
+          "globalKey" : "53741506",
+          "externalKey" : "AGENT_LENDER"
+        }
+      }, {
+        "partyId" : [ {
           "identifier" : {
-            "value" : "0266001"
+            "value" : "CP001LEI111111111111"
+          },
+          "meta" : {
+            "globalKey" : "12818f8c"
           }
         } ],
-        "issuer" : {
-          "value" : "KTKL"
+        "name" : {
+          "value" : "CP001 (Borrower)"
         },
         "meta" : {
-          "globalKey" : "9e641379"
+          "globalKey" : "84fb9347",
+          "externalKey" : "Borrower"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "a2a013f0"
+      }
+    },
+    "state" : {
+      "closedState" : {
+        "state" : "Terminated"
+      },
+      "positionState" : "Closed"
+    },
+    "meta" : {
+      "globalKey" : "aa44c07f"
     }
   } ],
-  "eventQualifier" : "Allocation",
   "meta" : {
-    "globalKey" : "f9292290"
+    "globalKey" : "c8342090"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/create-security-lending-invoice-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/create-security-lending-invoice-func-output.json
index 4f376b6a98..bd7c57809c 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/create-security-lending-invoice-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/create-security-lending-invoice-func-output.json
@@ -1,789 +1,209 @@
 {
-  "billingEndDate" : "2020-10-31",
-  "billingRecord" : [ {
-    "recordEndDate" : "2020-10-22",
-    "recordStartDate" : "2020-10-01",
-    "recordTransfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "value" : {
-            "meta" : {
-              "externalKey" : "Lender0",
-              "globalKey" : "a896ecd"
-            },
-            "name" : {
-              "value" : "Standard Fund 1"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "FM1LEI11111111111111"
-              },
-              "meta" : {
-                "globalKey" : "87c4d1c6"
-              }
-            } ]
-          }
-        },
-        "receiverPartyReference" : {
-          "value" : {
-            "meta" : {
-              "externalKey" : "Borrower",
-              "globalKey" : "1f061e68"
-            },
-            "name" : {
-              "value" : "CP001"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "CP001LEI111111111111"
-              },
-              "meta" : {
-                "globalKey" : "12818f8c"
-              }
-            } ]
-          }
-        }
+  "sendingParty" : {
+    "partyId" : [ {
+      "identifier" : {
+        "value" : "FM1LEI11111111111111"
       },
-      "quantity" : {
-        "unit" : {
-          "currency" : {
-            "value" : "USD"
-          }
-        },
-        "value" : 69.428333333333333333333333333333329366000000
+      "meta" : {
+        "globalKey" : "87c4d1c6"
+      }
+    } ],
+    "name" : {
+      "value" : "Standard Fund 1"
+    },
+    "meta" : {
+      "globalKey" : "40ec509f",
+      "externalKey" : "Lender0"
+    }
+  },
+  "receivingParty" : {
+    "partyId" : [ {
+      "identifier" : {
+        "value" : "CP001LEI111111111111"
       },
-      "settlementDate" : {
-        "adjustedDate" : {
-          "meta" : {
-            "globalKey" : "3f22ca"
-          },
-          "value" : "2020-11-10"
-        }
+      "meta" : {
+        "globalKey" : "12818f8c"
       }
+    } ],
+    "name" : {
+      "value" : "CP001"
     },
+    "meta" : {
+      "globalKey" : "7c311b30",
+      "externalKey" : "Borrower"
+    }
+  },
+  "billingStartDate" : "2020-10-01",
+  "billingEndDate" : "2020-10-31",
+  "billingRecord" : [ {
     "tradeState" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "73f82530"
-        },
-        "resetHistory" : [ {
-          "averagingMethodology" : {
-            "averagingMethod" : {
-              "calculationMethod" : "ARITHMETIC"
-            }
-          },
-          "meta" : {
-            "globalKey" : "545d5d1d"
-          },
-          "observations" : [ {
-            "value" : {
-              "meta" : {
-                "globalKey" : "8180ef61"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-22"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 28.18
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "7fe67448"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-21"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 28.34
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "3f1863c6"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-20"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 30.72
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "a6cce8c3"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-19"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 32.01
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "a5269c04"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-18"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 32.12
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "a371c365"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-17"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 32.12
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "a1bceac6"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-16"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 32.12
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "6b4deee5"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-15"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 31.46
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "69de2eae"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-14"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 31.93
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "681d100a"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-13"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 31.87
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "6603c168"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-12"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 31.13
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "2f5a9607"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-11"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 30.03
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "2da5bd68"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-10"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 30.03
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "2bf0e4c9"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-09"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 30.03
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "9eb96a19"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-08"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 29.53
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "683a10dc"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-07"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 28.72
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "66237c74"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-06"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 28.04
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "2fde52b7"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-05"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 27.67
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "2def4a98"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-04"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 27.23
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "2c3a71f9"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-03"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 27.23
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "2a85995a"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-02"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 27.23
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "f440e3fc"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-01"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 26.87
-              }
-            }
-          } ],
-          "resetDate" : "2020-10-22",
-          "resetValue" : {
-            "unit" : {
-              "currency" : {
-                "value" : "USD"
-              }
-            },
-            "value" : 29.755
-          }
-        } ],
-        "state" : {
-          "positionState" : "EXECUTED"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "3ae100ed"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "Lender0",
-              "globalKey" : "a896ecd"
-            },
-            "name" : {
-              "value" : "Standard Fund 1"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "FM1LEI11111111111111"
-              },
-              "meta" : {
-                "globalKey" : "87c4d1c6"
-              }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "AGENT_LENDER",
-              "globalKey" : "73176f1c"
-            },
-            "name" : {
-              "value" : "KTKL"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "KTKLLEILLLLLLLLLLLLL"
-              },
-              "meta" : {
-                "globalKey" : "60098fe6"
-              }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "Borrower",
-              "globalKey" : "1f061e68"
-            },
-            "name" : {
-              "value" : "CP001"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "CP001LEI111111111111"
-              },
-              "meta" : {
-                "globalKey" : "12818f8c"
-              }
-            } ]
-          } ],
-          "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "FM1LEI11111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "87c4d1c6"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "CP001LEI111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "12818f8c"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_2"
-            } ],
-            "product" : {
-              "contractualProduct" : {
-                "productTaxonomy" : [ {
-                  "source" : "ISDA",
-                  "productQualifier" : "SecurityLendingAgreement"
-                } ],
-                "economicTerms" : {
-                  "collateral" : {
-                    "collateralProvisions" : {
-                      "collateralType" : "CASH",
-                      "eligibleCollateral" : [ {
-                        "criteria" : [ {
-                          "treatment" : {
-                            "valuationTreatment" : {
-                              "marginPercentage" : 0.02
-                            }
-                          }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "168480"
-                        }
-                      } ]
-                    }
-                  },
-                  "effectiveDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "fa42f5cf"
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "e742daa5"
-                      },
-                      "unadjustedDate" : "2020-09-22"
-                    },
-                    "meta" : {
-                      "globalKey" : "e742daa5"
-                    }
-                  },
-                  "payout" : {
-                    "assetPayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
-                      },
-                      "assetLeg" : [ {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
-                          "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
-                            },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
-                              "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        }
-                      }, {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
-                          "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
-                            },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
-                              "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        }
-                      } ],
-                      "dividendTerms" : {
-                        "manufacturedIncomeRequirement" : {
-                          "totalRatio" : 1
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "KTKL"
+            },
+            "assignedIdentifier" : [ {
+              "identifier" : {
+                "value" : "0266001"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "569d85e5"
+            }
+          } ],
+          "tradeDate" : {
+            "value" : "2020-09-21",
+            "meta" : {
+              "globalKey" : "3f2255"
+            }
+          },
+          "tradableProduct" : {
+            "product" : {
+              "contractualProduct" : {
+                "productTaxonomy" : [ {
+                  "source" : "ISDA",
+                  "productQualifier" : "SecurityLendingAgreement"
+                } ],
+                "economicTerms" : {
+                  "effectiveDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2020-09-22",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "meta" : {
+                          "globalKey" : "fa42f5cf"
                         }
                       },
-                      "durationType" : {
-                        "durationType" : "TERM"
-                      },
                       "meta" : {
-                        "globalKey" : "73453ae0"
-                      },
-                      "minimumFee" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "USD"
-                          }
-                        },
-                        "value" : 0,
+                        "globalKey" : "e742daa5"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "e742daa5"
+                    }
+                  },
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2020-10-22",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "171b36"
+                          "globalKey" : "fa42f5cf"
                         }
                       },
-                      "securityInformation" : {
-                        "meta" : {
-                          "globalKey" : "7548eca6"
-                        },
-                        "security" : {
-                          "productIdentifier" : [ {
-                            "value" : {
-                              "identifier" : {
-                                "value" : "ST001"
-                              },
-                              "meta" : {
-                                "globalKey" : "a4ff65ff"
-                              },
-                              "source" : "SEDOL"
-                            }
-                          } ],
-                          "securityType" : "EQUITY"
-                        }
+                      "meta" : {
+                        "globalKey" : "e743cae5"
                       }
-                    } ],
+                    },
+                    "meta" : {
+                      "globalKey" : "e743cae5"
+                    }
+                  },
+                  "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-8"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "25e2ab"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-2"
+                              }
+                            }
                           },
-                          "period" : "T",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "NONE"
-                        },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
-                            },
                             "dateAdjustments" : {
                               "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "fa42f5cf"
                               }
                             },
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
+                              "meta" : {
+                                "globalKey" : "3f2256"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "Effective_Date",
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Effective_Date"
                             }
                           },
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "a4273c9"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
-                            },
                             "dateAdjustments" : {
                               "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "fa42f5cf"
                               }
                             },
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
+                              "meta" : {
+                                "globalKey" : "3f2296"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "Termination_Date",
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Termination_Date"
                             }
                           },
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
+                        },
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "24b525"
+                          },
+                          "rollConvention" : "NONE"
+                        },
+                        "meta" : {
+                          "globalKey" : "8b1de243"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "ce90278b"
-                      },
                       "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "b578507f"
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "73"
+                          }
                         },
                         "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -792,283 +212,247 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
-                        "paymentFrequency" : {
-                          "meta" : {
-                            "globalKey" : "a2d"
-                          },
-                          "period" : "T",
-                          "periodMultiplier" : 1
+                        "meta" : {
+                          "globalKey" : "fa98fa5b"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "meta" : {
+                        "globalKey" : "98fd77d9"
+                      }
+                    } ],
+                    "assetPayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "assetLeg" : [ {
+                        "settlementDate" : {
+                          "adjustableDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
+                              "meta" : {
+                                "globalKey" : "3f2256"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
                           "meta" : {
-                            "globalKey" : "0"
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      }, {
+                        "settlementDate" : {
+                          "adjustableDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
+                              "meta" : {
+                                "globalKey" : "3f2296"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
                           },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-2"
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      } ],
+                      "securityInformation" : {
+                        "security" : {
+                          "productIdentifier" : [ {
+                            "value" : {
+                              "identifier" : {
+                                "value" : "ST001"
+                              },
+                              "source" : "SEDOL",
+                              "meta" : {
+                                "globalKey" : "a4ff65ff"
                               }
                             }
+                          } ],
+                          "securityType" : "Equity"
+                        },
+                        "meta" : {
+                          "globalKey" : "7548eca6"
+                        }
+                      },
+                      "durationType" : {
+                        "durationType" : "Term"
+                      },
+                      "minimumFee" : {
+                        "value" : 0,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "USD"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "171b36"
+                        }
+                      },
+                      "dividendTerms" : {
+                        "manufacturedIncomeRequirement" : {
+                          "totalRatio" : 1
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3b19750e"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "eb31e26b"
+                      "globalKey" : "43b3b6a7"
                     }
                   },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "MODFOLLOWING",
+                  "collateral" : {
+                    "collateralProvisions" : {
+                      "collateralType" : "Cash",
+                      "eligibleCollateral" : [ {
+                        "criteria" : [ {
+                          "treatment" : {
+                            "valuationTreatment" : {
+                              "marginPercentage" : 0.02
+                            }
+                          }
+                        } ],
                         "meta" : {
-                          "globalKey" : "fa42f5cf"
+                          "globalKey" : "168480"
                         }
-                      },
-                      "meta" : {
-                        "globalKey" : "e743cae5"
-                      },
-                      "unadjustedDate" : "2020-10-22"
-                    },
-                    "meta" : {
-                      "globalKey" : "e743cae5"
+                      } ]
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "37405ce2"
+                  "globalKey" : "38d91964"
                 }
               },
               "meta" : {
-                "globalKey" : "37405ce2"
+                "globalKey" : "38d91964"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "bc2d9a59"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.01,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 0.01,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-8"
+                      "value" : "price-2"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 5000000,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
-                    },
-                    "value" : 5000000
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "a0b25412"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "value" : "ST001"
-                      },
-                      "meta" : {
-                        "globalKey" : "a4ff65ff"
-                      },
-                      "source" : "SEDOL"
                     }
-                  } ]
-                },
-                "price" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "price-1"
+                      "value" : "quantity-8"
                     } ]
-                  },
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "c985b0c7"
+                }
+              }, {
+                "price" : [ {
                   "value" : {
+                    "value" : 25,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 25,
                     "perUnitOf" : {
-                      "financialUnit" : "SHARE"
+                      "financialUnit" : "Share"
                     },
-                    "priceType" : "ASSET_PRICE"
+                    "priceType" : "AssetPrice"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
                   }
                 } ],
                 "quantity" : [ {
+                  "value" : {
+                    "value" : 200000,
+                    "unit" : {
+                      "financialUnit" : "Share"
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-9"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "financialUnit" : "SHARE"
-                    },
-                    "value" : 200000
                   }
-                } ]
-              } ]
-            } ]
-          },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f2255"
-            },
-            "value" : "2020-09-21"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
-              "identifier" : {
-                "value" : "0266001"
-              }
-            } ],
-            "issuer" : {
-              "value" : "KTKL"
-            },
-            "meta" : {
-              "globalKey" : "9e641379"
-            }
-          } ]
-        },
-        "transferHistory" : [ {
-          "meta" : {
-            "globalKey" : "637bd5fe"
-          },
-          "transfer" : {
-            "payerReceiver" : {
-              "payerPartyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "CP001LEI111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "12818f8c"
-                    }
-                  } ]
-                }
-              },
-              "receiverPartyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "FM1LEI11111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "87c4d1c6"
+                } ],
+                "observable" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "ST001"
+                      },
+                      "source" : "SEDOL",
+                      "meta" : {
+                        "globalKey" : "a4ff65ff"
+                      }
                     }
-                  } ]
-                }
-              }
-            },
-            "quantity" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 100000
-            },
-            "settlementDate" : {
-              "adjustedDate" : {
-                "meta" : {
-                  "globalKey" : "3f2256"
-                },
-                "value" : "2020-09-22"
-              }
-            },
-            "settlementOrigin" : {
-              "assetPayout" : {
-                "globalReference" : "73453ae0"
-              }
-            }
-          }
-        }, {
-          "meta" : {
-            "globalKey" : "79e525e7"
-          },
-          "transfer" : {
-            "observable" : {
-              "meta" : {
-                "globalKey" : "a4ff65ff"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "ST001"
-                  },
+                  } ],
                   "meta" : {
                     "globalKey" : "a4ff65ff"
-                  },
-                  "source" : "SEDOL"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "998f6e8c"
                 }
               } ]
-            },
-            "payerReceiver" : {
-              "payerPartyReference" : {
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "FM1LEI11111111111111"
@@ -1076,18 +460,20 @@
                     "meta" : {
                       "globalKey" : "87c4d1c6"
                     }
-                  } ]
-                }
-              },
-              "receiverPartyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
+                  } ],
                   "name" : {
-                    "value" : "CP001"
+                    "value" : "Standard Fund 1"
                   },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
+                }
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "value" : {
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "CP001LEI111111111111"
@@ -1095,66 +481,51 @@
                     "meta" : {
                       "globalKey" : "12818f8c"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
                 }
               }
-            },
-            "quantity" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
+            } ]
+          },
+          "party" : [ {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "FM1LEI11111111111111"
               },
-              "value" : 200000
-            },
-            "settlementDate" : {
-              "adjustedDate" : {
-                "meta" : {
-                  "globalKey" : "3f2256"
-                },
-                "value" : "2020-09-22"
-              }
-            },
-            "settlementOrigin" : {
-              "assetPayout" : {
-                "globalReference" : "73453ae0"
+              "meta" : {
+                "globalKey" : "87c4d1c6"
               }
-            }
-          }
-        } ]
-      }
-    }
-  }, {
-    "recordEndDate" : "2020-10-09",
-    "recordStartDate" : "2020-10-01",
-    "recordTransfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "value" : {
-            "meta" : {
-              "externalKey" : "Lender0",
-              "globalKey" : "a896ecd"
-            },
+            } ],
             "name" : {
               "value" : "Standard Fund 1"
             },
+            "meta" : {
+              "globalKey" : "40ec509f",
+              "externalKey" : "Lender0"
+            }
+          }, {
             "partyId" : [ {
               "identifier" : {
-                "value" : "FM1LEI11111111111111"
+                "value" : "KTKLLEILLLLLLLLLLLLL"
               },
               "meta" : {
-                "globalKey" : "87c4d1c6"
+                "globalKey" : "60098fe6"
               }
-            } ]
-          }
-        },
-        "receiverPartyReference" : {
-          "value" : {
-            "meta" : {
-              "externalKey" : "Borrower",
-              "globalKey" : "1f061e68"
-            },
+            } ],
             "name" : {
-              "value" : "CP001"
+              "value" : "KTKL"
             },
+            "meta" : {
+              "globalKey" : "84088af0",
+              "externalKey" : "AGENT_LENDER"
+            }
+          }, {
             "partyId" : [ {
               "identifier" : {
                 "value" : "CP001LEI111111111111"
@@ -1162,249 +533,601 @@
               "meta" : {
                 "globalKey" : "12818f8c"
               }
-            } ]
-          }
-        }
-      },
-      "quantity" : {
-        "unit" : {
-          "currency" : {
-            "value" : "USD"
+            } ],
+            "name" : {
+              "value" : "CP001"
+            },
+            "meta" : {
+              "globalKey" : "7c311b30",
+              "externalKey" : "Borrower"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "199bc407"
           }
         },
-        "value" : 18.70740740740740740740740740740740479592592592592592592592592592592600000
-      },
-      "settlementDate" : {
-        "adjustedDate" : {
-          "meta" : {
-            "globalKey" : "3f22ca"
-          },
-          "value" : "2020-11-10"
-        }
-      }
-    },
-    "tradeState" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "fb6d13e9"
+        "state" : {
+          "positionState" : "Executed"
         },
         "resetHistory" : [ {
-          "averagingMethodology" : {
-            "averagingMethod" : {
-              "calculationMethod" : "ARITHMETIC"
+          "resetValue" : {
+            "value" : 29.755,
+            "unit" : {
+              "currency" : {
+                "value" : "USD"
+              }
             }
           },
-          "meta" : {
-            "globalKey" : "27312f89"
-          },
+          "resetDate" : "2020-10-22",
           "observations" : [ {
             "value" : {
+              "observedValue" : {
+                "value" : 28.18,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-22"
+              },
               "meta" : {
-                "globalKey" : "2bf0e4c9"
+                "globalKey" : "547ad50d"
+              }
+            }
+          }, {
+            "value" : {
+              "observedValue" : {
+                "value" : 28.34,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
               "observationIdentifier" : {
-                "observationDate" : "2020-10-09"
+                "observationDate" : "2020-10-21"
               },
+              "meta" : {
+                "globalKey" : "b773e912"
+              }
+            }
+          }, {
+            "value" : {
               "observedValue" : {
+                "value" : 30.72,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 30.03
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-20"
+              },
+              "meta" : {
+                "globalKey" : "d9c91dee"
               }
             }
           }, {
             "value" : {
+              "observedValue" : {
+                "value" : 32.01,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-19"
+              },
               "meta" : {
-                "globalKey" : "9eb96a19"
+                "globalKey" : "8e518489"
+              }
+            }
+          }, {
+            "value" : {
+              "observedValue" : {
+                "value" : 32.12,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
               "observationIdentifier" : {
-                "observationDate" : "2020-10-08"
+                "observationDate" : "2020-10-18"
               },
+              "meta" : {
+                "globalKey" : "c4ec9868"
+              }
+            }
+          }, {
+            "value" : {
               "observedValue" : {
+                "value" : 32.12,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 29.53
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-17"
+              },
+              "meta" : {
+                "globalKey" : "c4ec9867"
+              }
+            }
+          }, {
+            "value" : {
+              "observedValue" : {
+                "value" : 32.12,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-16"
+              },
+              "meta" : {
+                "globalKey" : "c4ec9866"
               }
             }
           }, {
             "value" : {
+              "observedValue" : {
+                "value" : 31.46,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-15"
+              },
               "meta" : {
-                "globalKey" : "683a10dc"
+                "globalKey" : "d62e3da3"
+              }
+            }
+          }, {
+            "value" : {
+              "observedValue" : {
+                "value" : 31.93,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
               "observationIdentifier" : {
-                "observationDate" : "2020-10-07"
+                "observationDate" : "2020-10-14"
+              },
+              "meta" : {
+                "globalKey" : "d98edc0a"
+              }
+            }
+          }, {
+            "value" : {
+              "observedValue" : {
+                "value" : 31.87,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-13"
+              },
+              "meta" : {
+                "globalKey" : "ab7c0344"
+              }
+            }
+          }, {
+            "value" : {
+              "observedValue" : {
+                "value" : 31.13,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-12"
+              },
+              "meta" : {
+                "globalKey" : "325d0200"
+              }
+            }
+          }, {
+            "value" : {
+              "observedValue" : {
+                "value" : 30.03,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-11"
+              },
+              "meta" : {
+                "globalKey" : "693257bd"
+              }
+            }
+          }, {
+            "value" : {
+              "observedValue" : {
+                "value" : 30.03,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-10"
+              },
+              "meta" : {
+                "globalKey" : "693257bc"
+              }
+            }
+          }, {
+            "value" : {
+              "observedValue" : {
+                "value" : 30.03,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-09"
+              },
+              "meta" : {
+                "globalKey" : "693257bb"
+              }
+            }
+          }, {
+            "value" : {
+              "observedValue" : {
+                "value" : 29.53,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-08"
+              },
+              "meta" : {
+                "globalKey" : "b3cff5e9"
+              }
+            }
+          }, {
+            "value" : {
               "observedValue" : {
+                "value" : 28.72,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 28.72
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-07"
+              },
+              "meta" : {
+                "globalKey" : "87a324ca"
               }
             }
           }, {
             "value" : {
-              "meta" : {
-                "globalKey" : "66237c74"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-06"
-              },
               "observedValue" : {
+                "value" : 28.04,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 28.04
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-06"
+              },
+              "meta" : {
+                "globalKey" : "18c13740"
               }
             }
           }, {
             "value" : {
-              "meta" : {
-                "globalKey" : "2fde52b7"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-05"
-              },
               "observedValue" : {
+                "value" : 27.67,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 27.67
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-05"
+              },
+              "meta" : {
+                "globalKey" : "c700b5a1"
               }
             }
           }, {
             "value" : {
-              "meta" : {
-                "globalKey" : "2def4a98"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-04"
-              },
               "observedValue" : {
+                "value" : 27.23,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 27.23
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-04"
+              },
+              "meta" : {
+                "globalKey" : "ec946620"
               }
             }
           }, {
             "value" : {
-              "meta" : {
-                "globalKey" : "2c3a71f9"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-03"
-              },
               "observedValue" : {
+                "value" : 27.23,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 27.23
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-03"
+              },
+              "meta" : {
+                "globalKey" : "ec94661f"
               }
             }
           }, {
             "value" : {
-              "meta" : {
-                "globalKey" : "2a85995a"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-02"
-              },
               "observedValue" : {
+                "value" : 27.23,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 27.23
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-02"
+              },
+              "meta" : {
+                "globalKey" : "ec94661e"
               }
             }
           }, {
             "value" : {
-              "meta" : {
-                "globalKey" : "f440e3fc"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-01"
-              },
               "observedValue" : {
+                "value" : 26.87,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 26.87
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-01"
+              },
+              "meta" : {
+                "globalKey" : "9c88bd1e"
               }
             }
           } ],
-          "resetDate" : "2020-10-09",
-          "resetValue" : {
-            "unit" : {
-              "currency" : {
-                "value" : "USD"
-              }
-            },
-            "value" : 28.06111111111111111111111111111111
+          "averagingMethodology" : {
+            "averagingMethod" : {
+              "calculationMethod" : "Arithmetic"
+            }
+          },
+          "meta" : {
+            "globalKey" : "d7a61bab"
           }
         } ],
-        "trade" : {
-          "meta" : {
-            "globalKey" : "dc000f7"
+        "transferHistory" : [ {
+          "transfer" : {
+            "quantity" : {
+              "value" : 100000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "CP001LEI111111111111"
+                    },
+                    "meta" : {
+                      "globalKey" : "12818f8c"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
+                }
+              },
+              "receiverPartyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "FM1LEI11111111111111"
+                    },
+                    "meta" : {
+                      "globalKey" : "87c4d1c6"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
+                }
+              }
+            },
+            "settlementDate" : {
+              "adjustedDate" : {
+                "value" : "2020-09-22",
+                "meta" : {
+                  "globalKey" : "3f2256"
+                }
+              }
+            },
+            "settlementOrigin" : {
+              "assetPayout" : {
+                "globalReference" : "73453ae0"
+              }
+            }
           },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "Lender0",
-              "globalKey" : "a896ecd"
+          "meta" : {
+            "globalKey" : "a37ecfe6"
+          }
+        }, {
+          "transfer" : {
+            "quantity" : {
+              "value" : 200000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
             },
-            "name" : {
-              "value" : "Standard Fund 1"
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "ST001"
+                  },
+                  "source" : "SEDOL",
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "a4ff65ff"
+              }
             },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "FM1LEI11111111111111"
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "FM1LEI11111111111111"
+                    },
+                    "meta" : {
+                      "globalKey" : "87c4d1c6"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
+                }
               },
-              "meta" : {
-                "globalKey" : "87c4d1c6"
+              "receiverPartyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "CP001LEI111111111111"
+                    },
+                    "meta" : {
+                      "globalKey" : "12818f8c"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
+                }
               }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "AGENT_LENDER",
-              "globalKey" : "73176f1c"
             },
-            "name" : {
-              "value" : "KTKL"
+            "settlementDate" : {
+              "adjustedDate" : {
+                "value" : "2020-09-22",
+                "meta" : {
+                  "globalKey" : "3f2256"
+                }
+              }
             },
+            "settlementOrigin" : {
+              "assetPayout" : {
+                "globalReference" : "73453ae0"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "2d4d67b9"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "488cb0f2"
+        }
+      }
+    },
+    "recordTransfer" : {
+      "quantity" : {
+        "value" : 69.428333333333333333333333333333329366000000,
+        "unit" : {
+          "currency" : {
+            "value" : "USD"
+          }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "value" : {
             "partyId" : [ {
               "identifier" : {
-                "value" : "KTKLLEILLLLLLLLLLLLL"
+                "value" : "FM1LEI11111111111111"
               },
               "meta" : {
-                "globalKey" : "60098fe6"
+                "globalKey" : "87c4d1c6"
               }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "Borrower",
-              "globalKey" : "1f061e68"
-            },
+            } ],
             "name" : {
-              "value" : "CP001"
+              "value" : "Standard Fund 1"
             },
+            "meta" : {
+              "globalKey" : "40ec509f",
+              "externalKey" : "Lender0"
+            }
+          }
+        },
+        "receiverPartyReference" : {
+          "value" : {
             "partyId" : [ {
               "identifier" : {
                 "value" : "CP001LEI111111111111"
@@ -1412,52 +1135,52 @@
               "meta" : {
                 "globalKey" : "12818f8c"
               }
-            } ]
+            } ],
+            "name" : {
+              "value" : "CP001"
+            },
+            "meta" : {
+              "globalKey" : "7c311b30",
+              "externalKey" : "Borrower"
+            }
+          }
+        }
+      },
+      "settlementDate" : {
+        "adjustedDate" : {
+          "value" : "2020-11-10",
+          "meta" : {
+            "globalKey" : "3f22ca"
+          }
+        }
+      }
+    },
+    "recordStartDate" : "2020-10-01",
+    "recordEndDate" : "2020-10-22"
+  }, {
+    "tradeState" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "KTKL"
+            },
+            "assignedIdentifier" : [ {
+              "identifier" : {
+                "value" : "0266001"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "569d85e5"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "2020-09-21",
+            "meta" : {
+              "globalKey" : "3f2255"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "FM1LEI11111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "87c4d1c6"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "CP001LEI111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "12818f8c"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -1465,25 +1188,26 @@
                   "productQualifier" : "SecurityLendingAgreement"
                 } ],
                 "economicTerms" : {
-                  "collateral" : {
-                    "collateralProvisions" : {
-                      "collateralType" : "CASH",
-                      "eligibleCollateral" : [ {
-                        "criteria" : [ {
-                          "treatment" : {
-                            "valuationTreatment" : {
-                              "marginPercentage" : 0.02
-                            }
-                          }
-                        } ],
+                  "effectiveDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2020-09-22",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "168480"
+                          "globalKey" : "fa42f5cf"
                         }
-                      } ]
+                      },
+                      "meta" : {
+                        "globalKey" : "e742daa5"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "e742daa5"
                     }
                   },
-                  "effectiveDate" : {
+                  "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2020-10-22",
                       "dateAdjustments" : {
                         "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
@@ -1491,482 +1215,366 @@
                         }
                       },
                       "meta" : {
-                        "globalKey" : "e742daa5"
-                      },
-                      "unadjustedDate" : "2020-09-22"
+                        "globalKey" : "e743cae5"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "e742daa5"
+                      "globalKey" : "e743cae5"
                     }
                   },
                   "payout" : {
-                    "assetPayout" : [ {
+                    "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
-                      "assetLeg" : [ {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
+                      "priceQuantity" : {
+                        "quantitySchedule" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "quantity-8"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      },
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-2"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
+                        "effectiveDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
+                                "globalKey" : "fa42f5cf"
+                              }
                             },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
                               "meta" : {
-                                "globalKey" : "24a738"
+                                "globalKey" : "3f2256"
                               }
                             },
                             "meta" : {
-                              "globalKey" : "24a738"
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Effective_Date"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "24a738"
+                            "globalKey" : "fa42f5cf"
                           }
-                        }
-                      }, {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
+                        },
+                        "terminationDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
+                                "globalKey" : "fa42f5cf"
+                              }
                             },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
                               "meta" : {
-                                "globalKey" : "24a738"
+                                "globalKey" : "3f2296"
                               }
                             },
                             "meta" : {
-                              "globalKey" : "24a738"
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Termination_Date"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        }
-                      } ],
-                      "dividendTerms" : {
-                        "manufacturedIncomeRequirement" : {
-                          "totalRatio" : 1
-                        }
-                      },
-                      "durationType" : {
-                        "durationType" : "TERM"
-                      },
-                      "meta" : {
-                        "globalKey" : "73453ae0"
-                      },
-                      "minimumFee" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "USD"
+                            "globalKey" : "fa42f5cf"
                           }
                         },
-                        "value" : 0,
-                        "meta" : {
-                          "globalKey" : "171b36"
-                        }
-                      },
-                      "securityInformation" : {
-                        "meta" : {
-                          "globalKey" : "7548eca6"
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "24b525"
+                          },
+                          "rollConvention" : "NONE"
                         },
-                        "security" : {
-                          "productIdentifier" : [ {
-                            "value" : {
-                              "identifier" : {
-                                "value" : "ST001"
-                              },
-                              "meta" : {
-                                "globalKey" : "a4ff65ff"
-                              },
-                              "source" : "SEDOL"
-                            }
-                          } ],
-                          "securityType" : "EQUITY"
-                        }
-                      }
-                    } ],
-                    "interestRatePayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
-                      },
-                      "priceQuantity" : {
                         "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "quantitySchedule" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "quantity-8"
-                          }
+                          "globalKey" : "8b1de243"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodFrequency" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
                           "meta" : {
-                            "globalKey" : "25e2ab"
+                            "globalKey" : "73"
+                          }
+                        },
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "EUTA"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "20a71d"
+                            }
                           },
-                          "period" : "T",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "NONE"
+                          "meta" : {
+                            "globalKey" : "365baaee"
+                          }
                         },
-                        "effectiveDate" : {
+                        "meta" : {
+                          "globalKey" : "fa98fa5b"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "98fd77d9"
+                      }
+                    } ],
+                    "assetPayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "assetLeg" : [ {
+                        "settlementDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
                               "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
+                                "globalKey" : "24a738"
+                              }
                             },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "MODFOLLOWING",
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
                               "meta" : {
-                                "globalKey" : "fa42f5cf"
+                                "globalKey" : "3f2256"
                               }
                             },
                             "meta" : {
-                              "externalKey" : "Effective_Date",
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "24a738"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "fa42f5cf"
+                            "globalKey" : "24a738"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "a4273c9"
-                        },
-                        "terminationDate" : {
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      }, {
+                        "settlementDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
                               "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
+                                "globalKey" : "24a738"
+                              }
                             },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "MODFOLLOWING",
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
                               "meta" : {
-                                "globalKey" : "fa42f5cf"
+                                "globalKey" : "3f2296"
                               }
                             },
                             "meta" : {
-                              "externalKey" : "Termination_Date",
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "24a738"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "fa42f5cf"
+                            "globalKey" : "24a738"
                           }
+                        },
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      } ],
+                      "securityInformation" : {
+                        "security" : {
+                          "productIdentifier" : [ {
+                            "value" : {
+                              "identifier" : {
+                                "value" : "ST001"
+                              },
+                              "source" : "SEDOL",
+                              "meta" : {
+                                "globalKey" : "a4ff65ff"
+                              }
+                            }
+                          } ],
+                          "securityType" : "Equity"
+                        },
+                        "meta" : {
+                          "globalKey" : "7548eca6"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "ce90278b"
+                      "durationType" : {
+                        "durationType" : "Term"
                       },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "b578507f"
-                        },
-                        "paymentDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "EUTA"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "20a71d"
-                            }
-                          },
-                          "businessDayConvention" : "MODFOLLOWING",
-                          "meta" : {
-                            "globalKey" : "365baaee"
+                      "minimumFee" : {
+                        "value" : 0,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "USD"
                           }
                         },
-                        "paymentFrequency" : {
-                          "meta" : {
-                            "globalKey" : "a2d"
-                          },
-                          "period" : "T",
-                          "periodMultiplier" : 1
+                        "meta" : {
+                          "globalKey" : "171b36"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-2"
-                              }
-                            }
-                          }
+                      "dividendTerms" : {
+                        "manufacturedIncomeRequirement" : {
+                          "totalRatio" : 1
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3b19750e"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "eb31e26b"
+                      "globalKey" : "43b3b6a7"
                     }
                   },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "MODFOLLOWING",
+                  "collateral" : {
+                    "collateralProvisions" : {
+                      "collateralType" : "Cash",
+                      "eligibleCollateral" : [ {
+                        "criteria" : [ {
+                          "treatment" : {
+                            "valuationTreatment" : {
+                              "marginPercentage" : 0.02
+                            }
+                          }
+                        } ],
                         "meta" : {
-                          "globalKey" : "fa42f5cf"
+                          "globalKey" : "168480"
                         }
-                      },
-                      "meta" : {
-                        "globalKey" : "e743cae5"
-                      },
-                      "unadjustedDate" : "2020-10-22"
-                    },
-                    "meta" : {
-                      "globalKey" : "e743cae5"
+                      } ]
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "37405ce2"
+                  "globalKey" : "38d91964"
                 }
               },
               "meta" : {
-                "globalKey" : "37405ce2"
+                "globalKey" : "38d91964"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "e8dfa17d"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.01,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 0.01,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-8"
+                      "value" : "price-2"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 3750000,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
-                    },
-                    "value" : 3750000
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "41504f78"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "value" : "ST001"
-                      },
-                      "meta" : {
-                        "globalKey" : "a4ff65ff"
-                      },
-                      "source" : "SEDOL"
                     }
-                  } ]
-                },
-                "price" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "price-1"
+                      "value" : "quantity-8"
                     } ]
-                  },
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "33148e23"
+                }
+              }, {
+                "price" : [ {
                   "value" : {
+                    "value" : 25,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 25,
                     "perUnitOf" : {
-                      "financialUnit" : "SHARE"
+                      "financialUnit" : "Share"
                     },
-                    "priceType" : "ASSET_PRICE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "AssetPrice"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-9"
+                      "value" : "price-1"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "financialUnit" : "SHARE"
-                    },
-                    "value" : 150000
                   }
-                } ]
-              } ]
-            } ]
-          },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f2255"
-            },
-            "value" : "2020-09-21"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
-              "identifier" : {
-                "value" : "0266001"
-              }
-            } ],
-            "issuer" : {
-              "value" : "KTKL"
-            },
-            "meta" : {
-              "globalKey" : "9e641379"
-            }
-          } ]
-        },
-        "transferHistory" : [ {
-          "meta" : {
-            "globalKey" : "637bd5fe"
-          },
-          "transfer" : {
-            "payerReceiver" : {
-              "payerPartyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "CP001LEI111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "12818f8c"
-                    }
-                  } ]
-                }
-              },
-              "receiverPartyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "FM1LEI11111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "87c4d1c6"
+                } ],
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 150000,
+                    "unit" : {
+                      "financialUnit" : "Share"
                     }
-                  } ]
-                }
-              }
-            },
-            "quantity" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 100000
-            },
-            "settlementDate" : {
-              "adjustedDate" : {
-                "meta" : {
-                  "globalKey" : "3f2256"
-                },
-                "value" : "2020-09-22"
-              }
-            },
-            "settlementOrigin" : {
-              "assetPayout" : {
-                "globalReference" : "73453ae0"
-              }
-            }
-          }
-        }, {
-          "meta" : {
-            "globalKey" : "79e525e7"
-          },
-          "transfer" : {
-            "observable" : {
-              "meta" : {
-                "globalKey" : "a4ff65ff"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "ST001"
                   },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-9"
+                    } ]
+                  }
+                } ],
+                "observable" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "ST001"
+                      },
+                      "source" : "SEDOL",
+                      "meta" : {
+                        "globalKey" : "a4ff65ff"
+                      }
+                    }
+                  } ],
                   "meta" : {
                     "globalKey" : "a4ff65ff"
-                  },
-                  "source" : "SEDOL"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "a908f466"
                 }
               } ]
-            },
-            "payerReceiver" : {
-              "payerPartyReference" : {
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "FM1LEI11111111111111"
@@ -1974,18 +1582,20 @@
                     "meta" : {
                       "globalKey" : "87c4d1c6"
                     }
-                  } ]
-                }
-              },
-              "receiverPartyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
+                  } ],
                   "name" : {
-                    "value" : "CP001"
+                    "value" : "Standard Fund 1"
                   },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
+                }
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "value" : {
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "CP001LEI111111111111"
@@ -1993,66 +1603,51 @@
                     "meta" : {
                       "globalKey" : "12818f8c"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
                 }
               }
-            },
-            "quantity" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
+            } ]
+          },
+          "party" : [ {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "FM1LEI11111111111111"
               },
-              "value" : 200000
-            },
-            "settlementDate" : {
-              "adjustedDate" : {
-                "meta" : {
-                  "globalKey" : "3f2256"
-                },
-                "value" : "2020-09-22"
-              }
-            },
-            "settlementOrigin" : {
-              "assetPayout" : {
-                "globalReference" : "73453ae0"
+              "meta" : {
+                "globalKey" : "87c4d1c6"
               }
-            }
-          }
-        } ]
-      }
-    }
-  }, {
-    "recordEndDate" : "2020-10-22",
-    "recordStartDate" : "2020-10-10",
-    "recordTransfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "value" : {
-            "meta" : {
-              "externalKey" : "Lender0",
-              "globalKey" : "a896ecd"
-            },
+            } ],
             "name" : {
               "value" : "Standard Fund 1"
             },
+            "meta" : {
+              "globalKey" : "40ec509f",
+              "externalKey" : "Lender0"
+            }
+          }, {
             "partyId" : [ {
               "identifier" : {
-                "value" : "FM1LEI11111111111111"
+                "value" : "KTKLLEILLLLLLLLLLLLL"
               },
               "meta" : {
-                "globalKey" : "87c4d1c6"
+                "globalKey" : "60098fe6"
               }
-            } ]
-          }
-        },
-        "receiverPartyReference" : {
-          "value" : {
-            "meta" : {
-              "externalKey" : "Borrower",
-              "globalKey" : "1f061e68"
-            },
+            } ],
             "name" : {
-              "value" : "CP001"
+              "value" : "KTKL"
             },
+            "meta" : {
+              "globalKey" : "84088af0",
+              "externalKey" : "AGENT_LENDER"
+            }
+          }, {
             "partyId" : [ {
               "identifier" : {
                 "value" : "CP001LEI111111111111"
@@ -2060,317 +1655,377 @@
               "meta" : {
                 "globalKey" : "12818f8c"
               }
-            } ]
-          }
-        }
-      },
-      "quantity" : {
-        "unit" : {
-          "currency" : {
-            "value" : "USD"
-          }
-        },
-        "value" : 30.92769230769230769230769230769230690723076923076923076923076923076900000
-      },
-      "settlementDate" : {
-        "adjustedDate" : {
+            } ],
+            "name" : {
+              "value" : "CP001"
+            },
+            "meta" : {
+              "globalKey" : "7c311b30",
+              "externalKey" : "Borrower"
+            }
+          } ],
           "meta" : {
-            "globalKey" : "3f22ca"
-          },
-          "value" : "2020-11-10"
-        }
-      }
-    },
-    "tradeState" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "8124a4a3"
+            "globalKey" : "3d87173d"
+          }
         },
         "resetHistory" : [ {
-          "averagingMethodology" : {
-            "averagingMethod" : {
-              "calculationMethod" : "ARITHMETIC"
+          "resetValue" : {
+            "value" : 28.06111111111111111111111111111111,
+            "unit" : {
+              "currency" : {
+                "value" : "USD"
+              }
             }
           },
-          "meta" : {
-            "globalKey" : "89933051"
-          },
+          "resetDate" : "2020-10-09",
           "observations" : [ {
             "value" : {
-              "meta" : {
-                "globalKey" : "8180ef61"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-22"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 28.18
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "7fe67448"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-21"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 28.34
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "3f1863c6"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-20"
-              },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 30.72
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "a6cce8c3"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-19"
-              },
               "observedValue" : {
+                "value" : 30.03,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 32.01
-              }
-            }
-          }, {
-            "value" : {
-              "meta" : {
-                "globalKey" : "a5269c04"
+                }
               },
               "observationIdentifier" : {
-                "observationDate" : "2020-10-18"
+                "observationDate" : "2020-10-09"
               },
-              "observedValue" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 32.12
-              }
-            }
-          }, {
-            "value" : {
               "meta" : {
-                "globalKey" : "a371c365"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-17"
-              },
+                "globalKey" : "693257bb"
+              }
+            }
+          }, {
+            "value" : {
               "observedValue" : {
+                "value" : 29.53,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 32.12
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-08"
+              },
+              "meta" : {
+                "globalKey" : "b3cff5e9"
               }
             }
           }, {
             "value" : {
-              "meta" : {
-                "globalKey" : "a1bceac6"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-16"
-              },
               "observedValue" : {
+                "value" : 28.72,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 32.12
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-07"
+              },
+              "meta" : {
+                "globalKey" : "87a324ca"
               }
             }
           }, {
             "value" : {
-              "meta" : {
-                "globalKey" : "6b4deee5"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-15"
-              },
               "observedValue" : {
+                "value" : 28.04,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 31.46
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-06"
+              },
+              "meta" : {
+                "globalKey" : "18c13740"
               }
             }
           }, {
             "value" : {
-              "meta" : {
-                "globalKey" : "69de2eae"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-14"
-              },
               "observedValue" : {
+                "value" : 27.67,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 31.93
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-05"
+              },
+              "meta" : {
+                "globalKey" : "c700b5a1"
               }
             }
           }, {
             "value" : {
-              "meta" : {
-                "globalKey" : "681d100a"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-13"
-              },
               "observedValue" : {
+                "value" : 27.23,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 31.87
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-04"
+              },
+              "meta" : {
+                "globalKey" : "ec946620"
               }
             }
           }, {
             "value" : {
-              "meta" : {
-                "globalKey" : "6603c168"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-12"
-              },
               "observedValue" : {
+                "value" : 27.23,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 31.13
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-03"
+              },
+              "meta" : {
+                "globalKey" : "ec94661f"
               }
             }
           }, {
             "value" : {
-              "meta" : {
-                "globalKey" : "2f5a9607"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-11"
-              },
               "observedValue" : {
+                "value" : 27.23,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 30.03
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-02"
+              },
+              "meta" : {
+                "globalKey" : "ec94661e"
               }
             }
           }, {
             "value" : {
-              "meta" : {
-                "globalKey" : "2da5bd68"
-              },
-              "observationIdentifier" : {
-                "observationDate" : "2020-10-10"
-              },
               "observedValue" : {
+                "value" : 26.87,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 30.03
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-01"
+              },
+              "meta" : {
+                "globalKey" : "9c88bd1e"
               }
             }
           } ],
-          "resetDate" : "2020-10-22",
-          "resetValue" : {
-            "unit" : {
-              "currency" : {
-                "value" : "USD"
-              }
-            },
-            "value" : 30.92769230769230769230769230769231
+          "averagingMethodology" : {
+            "averagingMethod" : {
+              "calculationMethod" : "Arithmetic"
+            }
+          },
+          "meta" : {
+            "globalKey" : "a282cacf"
           }
         } ],
-        "trade" : {
-          "meta" : {
-            "globalKey" : "dc000f7"
+        "transferHistory" : [ {
+          "transfer" : {
+            "quantity" : {
+              "value" : 100000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "CP001LEI111111111111"
+                    },
+                    "meta" : {
+                      "globalKey" : "12818f8c"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
+                }
+              },
+              "receiverPartyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "FM1LEI11111111111111"
+                    },
+                    "meta" : {
+                      "globalKey" : "87c4d1c6"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
+                }
+              }
+            },
+            "settlementDate" : {
+              "adjustedDate" : {
+                "value" : "2020-09-22",
+                "meta" : {
+                  "globalKey" : "3f2256"
+                }
+              }
+            },
+            "settlementOrigin" : {
+              "assetPayout" : {
+                "globalReference" : "73453ae0"
+              }
+            }
           },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "Lender0",
-              "globalKey" : "a896ecd"
+          "meta" : {
+            "globalKey" : "a37ecfe6"
+          }
+        }, {
+          "transfer" : {
+            "quantity" : {
+              "value" : 200000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
             },
-            "name" : {
-              "value" : "Standard Fund 1"
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "ST001"
+                  },
+                  "source" : "SEDOL",
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "a4ff65ff"
+              }
             },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "FM1LEI11111111111111"
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "FM1LEI11111111111111"
+                    },
+                    "meta" : {
+                      "globalKey" : "87c4d1c6"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
+                }
               },
-              "meta" : {
-                "globalKey" : "87c4d1c6"
+              "receiverPartyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "CP001LEI111111111111"
+                    },
+                    "meta" : {
+                      "globalKey" : "12818f8c"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
+                }
               }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "AGENT_LENDER",
-              "globalKey" : "73176f1c"
             },
-            "name" : {
-              "value" : "KTKL"
+            "settlementDate" : {
+              "adjustedDate" : {
+                "value" : "2020-09-22",
+                "meta" : {
+                  "globalKey" : "3f2256"
+                }
+              }
             },
+            "settlementOrigin" : {
+              "assetPayout" : {
+                "globalReference" : "73453ae0"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "2d4d67b9"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "f2c9b661"
+        }
+      }
+    },
+    "recordTransfer" : {
+      "quantity" : {
+        "value" : 18.70740740740740740740740740740740479592592592592592592592592592592600000,
+        "unit" : {
+          "currency" : {
+            "value" : "USD"
+          }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "value" : {
             "partyId" : [ {
               "identifier" : {
-                "value" : "KTKLLEILLLLLLLLLLLLL"
+                "value" : "FM1LEI11111111111111"
               },
               "meta" : {
-                "globalKey" : "60098fe6"
+                "globalKey" : "87c4d1c6"
               }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "Borrower",
-              "globalKey" : "1f061e68"
-            },
+            } ],
             "name" : {
-              "value" : "CP001"
+              "value" : "Standard Fund 1"
             },
+            "meta" : {
+              "globalKey" : "40ec509f",
+              "externalKey" : "Lender0"
+            }
+          }
+        },
+        "receiverPartyReference" : {
+          "value" : {
             "partyId" : [ {
               "identifier" : {
                 "value" : "CP001LEI111111111111"
@@ -2378,52 +2033,52 @@
               "meta" : {
                 "globalKey" : "12818f8c"
               }
-            } ]
+            } ],
+            "name" : {
+              "value" : "CP001"
+            },
+            "meta" : {
+              "globalKey" : "7c311b30",
+              "externalKey" : "Borrower"
+            }
+          }
+        }
+      },
+      "settlementDate" : {
+        "adjustedDate" : {
+          "value" : "2020-11-10",
+          "meta" : {
+            "globalKey" : "3f22ca"
+          }
+        }
+      }
+    },
+    "recordStartDate" : "2020-10-01",
+    "recordEndDate" : "2020-10-09"
+  }, {
+    "tradeState" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "KTKL"
+            },
+            "assignedIdentifier" : [ {
+              "identifier" : {
+                "value" : "0266001"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "569d85e5"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "2020-09-21",
+            "meta" : {
+              "globalKey" : "3f2255"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "FM1LEI11111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "87c4d1c6"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "CP001LEI111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "12818f8c"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -2431,25 +2086,9 @@
                   "productQualifier" : "SecurityLendingAgreement"
                 } ],
                 "economicTerms" : {
-                  "collateral" : {
-                    "collateralProvisions" : {
-                      "collateralType" : "CASH",
-                      "eligibleCollateral" : [ {
-                        "criteria" : [ {
-                          "treatment" : {
-                            "valuationTreatment" : {
-                              "marginPercentage" : 0.02
-                            }
-                          }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "168480"
-                        }
-                      } ]
-                    }
-                  },
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2020-09-22",
                       "dateAdjustments" : {
                         "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
@@ -2458,196 +2097,133 @@
                       },
                       "meta" : {
                         "globalKey" : "e742daa5"
-                      },
-                      "unadjustedDate" : "2020-09-22"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e742daa5"
                     }
                   },
-                  "payout" : {
-                    "assetPayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
-                      },
-                      "assetLeg" : [ {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
-                          "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
-                            },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
-                              "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        }
-                      }, {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
-                          "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
-                            },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
-                              "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        }
-                      } ],
-                      "dividendTerms" : {
-                        "manufacturedIncomeRequirement" : {
-                          "totalRatio" : 1
-                        }
-                      },
-                      "durationType" : {
-                        "durationType" : "TERM"
-                      },
-                      "meta" : {
-                        "globalKey" : "73453ae0"
-                      },
-                      "minimumFee" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "USD"
-                          }
-                        },
-                        "value" : 0,
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2020-10-22",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "171b36"
+                          "globalKey" : "fa42f5cf"
                         }
                       },
-                      "securityInformation" : {
-                        "meta" : {
-                          "globalKey" : "7548eca6"
-                        },
-                        "security" : {
-                          "productIdentifier" : [ {
-                            "value" : {
-                              "identifier" : {
-                                "value" : "ST001"
-                              },
-                              "meta" : {
-                                "globalKey" : "a4ff65ff"
-                              },
-                              "source" : "SEDOL"
-                            }
-                          } ],
-                          "securityType" : "EQUITY"
-                        }
+                      "meta" : {
+                        "globalKey" : "e743cae5"
                       }
-                    } ],
+                    },
+                    "meta" : {
+                      "globalKey" : "e743cae5"
+                    }
+                  },
+                  "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-8"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "25e2ab"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-2"
+                              }
+                            }
                           },
-                          "period" : "T",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "NONE"
-                        },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
-                            },
                             "dateAdjustments" : {
                               "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "fa42f5cf"
                               }
                             },
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
+                              "meta" : {
+                                "globalKey" : "3f2256"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "Effective_Date",
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Effective_Date"
                             }
                           },
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "a4273c9"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
-                            },
                             "dateAdjustments" : {
                               "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "fa42f5cf"
                               }
                             },
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
+                              "meta" : {
+                                "globalKey" : "3f2296"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "Termination_Date",
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Termination_Date"
                             }
                           },
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
+                        },
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "24b525"
+                          },
+                          "rollConvention" : "NONE"
+                        },
+                        "meta" : {
+                          "globalKey" : "8b1de243"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "ce90278b"
-                      },
                       "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "b578507f"
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "73"
+                          }
                         },
                         "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -2656,200 +2232,594 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
-                        "paymentFrequency" : {
-                          "meta" : {
-                            "globalKey" : "a2d"
-                          },
-                          "period" : "T",
-                          "periodMultiplier" : 1
+                        "meta" : {
+                          "globalKey" : "fa98fa5b"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "meta" : {
+                        "globalKey" : "98fd77d9"
+                      }
+                    } ],
+                    "assetPayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "assetLeg" : [ {
+                        "settlementDate" : {
+                          "adjustableDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
+                              "meta" : {
+                                "globalKey" : "3f2256"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
                           "meta" : {
-                            "globalKey" : "0"
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      }, {
+                        "settlementDate" : {
+                          "adjustableDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
+                              "meta" : {
+                                "globalKey" : "3f2296"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
                           },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-2"
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      } ],
+                      "securityInformation" : {
+                        "security" : {
+                          "productIdentifier" : [ {
+                            "value" : {
+                              "identifier" : {
+                                "value" : "ST001"
+                              },
+                              "source" : "SEDOL",
+                              "meta" : {
+                                "globalKey" : "a4ff65ff"
                               }
                             }
+                          } ],
+                          "securityType" : "Equity"
+                        },
+                        "meta" : {
+                          "globalKey" : "7548eca6"
+                        }
+                      },
+                      "durationType" : {
+                        "durationType" : "Term"
+                      },
+                      "minimumFee" : {
+                        "value" : 0,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "USD"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "171b36"
+                        }
+                      },
+                      "dividendTerms" : {
+                        "manufacturedIncomeRequirement" : {
+                          "totalRatio" : 1
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3b19750e"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "eb31e26b"
+                      "globalKey" : "43b3b6a7"
                     }
                   },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "MODFOLLOWING",
+                  "collateral" : {
+                    "collateralProvisions" : {
+                      "collateralType" : "Cash",
+                      "eligibleCollateral" : [ {
+                        "criteria" : [ {
+                          "treatment" : {
+                            "valuationTreatment" : {
+                              "marginPercentage" : 0.02
+                            }
+                          }
+                        } ],
                         "meta" : {
-                          "globalKey" : "fa42f5cf"
+                          "globalKey" : "168480"
                         }
-                      },
-                      "meta" : {
-                        "globalKey" : "e743cae5"
-                      },
-                      "unadjustedDate" : "2020-10-22"
-                    },
-                    "meta" : {
-                      "globalKey" : "e743cae5"
+                      } ]
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "37405ce2"
+                  "globalKey" : "38d91964"
                 }
               },
               "meta" : {
-                "globalKey" : "37405ce2"
+                "globalKey" : "38d91964"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "e8dfa17d"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.01,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 0.01,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-8"
+                      "value" : "price-2"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 3750000,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
-                    },
-                    "value" : 3750000
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "41504f78"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "value" : "ST001"
-                      },
-                      "meta" : {
-                        "globalKey" : "a4ff65ff"
-                      },
-                      "source" : "SEDOL"
                     }
-                  } ]
-                },
-                "price" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "price-1"
+                      "value" : "quantity-8"
                     } ]
-                  },
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "33148e23"
+                }
+              }, {
+                "price" : [ {
                   "value" : {
+                    "value" : 25,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 25,
                     "perUnitOf" : {
-                      "financialUnit" : "SHARE"
+                      "financialUnit" : "Share"
                     },
-                    "priceType" : "ASSET_PRICE"
+                    "priceType" : "AssetPrice"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
                   }
                 } ],
                 "quantity" : [ {
+                  "value" : {
+                    "value" : 150000,
+                    "unit" : {
+                      "financialUnit" : "Share"
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-9"
                     } ]
+                  }
+                } ],
+                "observable" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "ST001"
+                      },
+                      "source" : "SEDOL",
+                      "meta" : {
+                        "globalKey" : "a4ff65ff"
+                      }
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "a908f466"
+                }
+              } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "FM1LEI11111111111111"
+                    },
+                    "meta" : {
+                      "globalKey" : "87c4d1c6"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
                   },
-                  "value" : {
-                    "unit" : {
-                      "financialUnit" : "SHARE"
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
+                }
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "CP001LEI111111111111"
                     },
-                    "value" : 150000
+                    "meta" : {
+                      "globalKey" : "12818f8c"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
                   }
-                } ]
-              } ]
+                }
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f2255"
+          "party" : [ {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "FM1LEI11111111111111"
+              },
+              "meta" : {
+                "globalKey" : "87c4d1c6"
+              }
+            } ],
+            "name" : {
+              "value" : "Standard Fund 1"
             },
-            "value" : "2020-09-21"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+            "meta" : {
+              "globalKey" : "40ec509f",
+              "externalKey" : "Lender0"
+            }
+          }, {
+            "partyId" : [ {
               "identifier" : {
-                "value" : "0266001"
+                "value" : "KTKLLEILLLLLLLLLLLLL"
+              },
+              "meta" : {
+                "globalKey" : "60098fe6"
               }
             } ],
-            "issuer" : {
+            "name" : {
               "value" : "KTKL"
             },
             "meta" : {
-              "globalKey" : "9e641379"
+              "globalKey" : "84088af0",
+              "externalKey" : "AGENT_LENDER"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "CP001LEI111111111111"
+              },
+              "meta" : {
+                "globalKey" : "12818f8c"
+              }
+            } ],
+            "name" : {
+              "value" : "CP001"
+            },
+            "meta" : {
+              "globalKey" : "7c311b30",
+              "externalKey" : "Borrower"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "3d87173d"
+          }
+        },
+        "resetHistory" : [ {
+          "resetValue" : {
+            "value" : 30.92769230769230769230769230769231,
+            "unit" : {
+              "currency" : {
+                "value" : "USD"
+              }
+            }
+          },
+          "resetDate" : "2020-10-22",
+          "observations" : [ {
+            "value" : {
+              "observedValue" : {
+                "value" : 28.18,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-22"
+              },
+              "meta" : {
+                "globalKey" : "547ad50d"
+              }
+            }
+          }, {
+            "value" : {
+              "observedValue" : {
+                "value" : 28.34,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-21"
+              },
+              "meta" : {
+                "globalKey" : "b773e912"
+              }
+            }
+          }, {
+            "value" : {
+              "observedValue" : {
+                "value" : 30.72,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-20"
+              },
+              "meta" : {
+                "globalKey" : "d9c91dee"
+              }
+            }
+          }, {
+            "value" : {
+              "observedValue" : {
+                "value" : 32.01,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-19"
+              },
+              "meta" : {
+                "globalKey" : "8e518489"
+              }
+            }
+          }, {
+            "value" : {
+              "observedValue" : {
+                "value" : 32.12,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-18"
+              },
+              "meta" : {
+                "globalKey" : "c4ec9868"
+              }
+            }
+          }, {
+            "value" : {
+              "observedValue" : {
+                "value" : 32.12,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-17"
+              },
+              "meta" : {
+                "globalKey" : "c4ec9867"
+              }
+            }
+          }, {
+            "value" : {
+              "observedValue" : {
+                "value" : 32.12,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-16"
+              },
+              "meta" : {
+                "globalKey" : "c4ec9866"
+              }
+            }
+          }, {
+            "value" : {
+              "observedValue" : {
+                "value" : 31.46,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-15"
+              },
+              "meta" : {
+                "globalKey" : "d62e3da3"
+              }
+            }
+          }, {
+            "value" : {
+              "observedValue" : {
+                "value" : 31.93,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-14"
+              },
+              "meta" : {
+                "globalKey" : "d98edc0a"
+              }
+            }
+          }, {
+            "value" : {
+              "observedValue" : {
+                "value" : 31.87,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-13"
+              },
+              "meta" : {
+                "globalKey" : "ab7c0344"
+              }
+            }
+          }, {
+            "value" : {
+              "observedValue" : {
+                "value" : 31.13,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-12"
+              },
+              "meta" : {
+                "globalKey" : "325d0200"
+              }
+            }
+          }, {
+            "value" : {
+              "observedValue" : {
+                "value" : 30.03,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-11"
+              },
+              "meta" : {
+                "globalKey" : "693257bd"
+              }
+            }
+          }, {
+            "value" : {
+              "observedValue" : {
+                "value" : 30.03,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "observationIdentifier" : {
+                "observationDate" : "2020-10-10"
+              },
+              "meta" : {
+                "globalKey" : "693257bc"
+              }
+            }
+          } ],
+          "averagingMethodology" : {
+            "averagingMethod" : {
+              "calculationMethod" : "Arithmetic"
             }
-          } ]
-        },
-        "transferHistory" : [ {
-          "meta" : {
-            "globalKey" : "637bd5fe"
           },
+          "meta" : {
+            "globalKey" : "71a30631"
+          }
+        } ],
+        "transferHistory" : [ {
           "transfer" : {
+            "quantity" : {
+              "value" : 100000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
             "payerReceiver" : {
               "payerPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "CP001LEI111111111111"
@@ -2857,18 +2827,18 @@
                     "meta" : {
                       "globalKey" : "12818f8c"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
                 }
               },
               "receiverPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "FM1LEI11111111111111"
@@ -2876,24 +2846,23 @@
                     "meta" : {
                       "globalKey" : "87c4d1c6"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
                 }
               }
             },
-            "quantity" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 100000
-            },
             "settlementDate" : {
               "adjustedDate" : {
+                "value" : "2020-09-22",
                 "meta" : {
                   "globalKey" : "3f2256"
-                },
-                "value" : "2020-09-22"
+                }
               }
             },
             "settlementOrigin" : {
@@ -2901,38 +2870,37 @@
                 "globalReference" : "73453ae0"
               }
             }
+          },
+          "meta" : {
+            "globalKey" : "a37ecfe6"
           }
         }, {
-          "meta" : {
-            "globalKey" : "79e525e7"
-          },
           "transfer" : {
+            "quantity" : {
+              "value" : 200000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "observable" : {
-              "meta" : {
-                "globalKey" : "a4ff65ff"
-              },
               "productIdentifier" : [ {
                 "value" : {
                   "identifier" : {
                     "value" : "ST001"
                   },
+                  "source" : "SEDOL",
                   "meta" : {
                     "globalKey" : "a4ff65ff"
-                  },
-                  "source" : "SEDOL"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "a4ff65ff"
+              }
             },
             "payerReceiver" : {
               "payerPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "FM1LEI11111111111111"
@@ -2940,18 +2908,18 @@
                     "meta" : {
                       "globalKey" : "87c4d1c6"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
                 }
               },
               "receiverPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "CP001LEI111111111111"
@@ -2959,22 +2927,23 @@
                     "meta" : {
                       "globalKey" : "12818f8c"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
                 }
               }
             },
-            "quantity" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 200000
-            },
             "settlementDate" : {
               "adjustedDate" : {
+                "value" : "2020-09-22",
                 "meta" : {
                   "globalKey" : "3f2256"
-                },
-                "value" : "2020-09-22"
+                }
               }
             },
             "settlementOrigin" : {
@@ -2982,22 +2951,23 @@
                 "globalReference" : "73453ae0"
               }
             }
+          },
+          "meta" : {
+            "globalKey" : "2d4d67b9"
           }
         }, {
-          "meta" : {
-            "globalKey" : "fcfe8682"
-          },
           "transfer" : {
+            "quantity" : {
+              "value" : 25000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
             "payerReceiver" : {
               "payerPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "FM1LEI11111111111111"
@@ -3005,18 +2975,18 @@
                     "meta" : {
                       "globalKey" : "87c4d1c6"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
                 }
               },
               "receiverPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "CP001LEI111111111111"
@@ -3024,24 +2994,23 @@
                     "meta" : {
                       "globalKey" : "12818f8c"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
                 }
               }
             },
-            "quantity" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 25000
-            },
             "settlementDate" : {
               "adjustedDate" : {
+                "value" : "2020-10-09",
                 "meta" : {
                   "globalKey" : "3f2289"
-                },
-                "value" : "2020-10-09"
+                }
               }
             },
             "settlementOrigin" : {
@@ -3049,38 +3018,37 @@
                 "globalReference" : "73453ae0"
               }
             }
+          },
+          "meta" : {
+            "globalKey" : "d5fe4b6"
           }
         }, {
-          "meta" : {
-            "globalKey" : "b994ca66"
-          },
           "transfer" : {
+            "quantity" : {
+              "value" : 50000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "observable" : {
-              "meta" : {
-                "globalKey" : "a4ff65ff"
-              },
               "productIdentifier" : [ {
                 "value" : {
                   "identifier" : {
                     "value" : "ST001"
                   },
+                  "source" : "SEDOL",
                   "meta" : {
                     "globalKey" : "a4ff65ff"
-                  },
-                  "source" : "SEDOL"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "a4ff65ff"
+              }
             },
             "payerReceiver" : {
               "payerPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "CP001LEI111111111111"
@@ -3088,18 +3056,18 @@
                     "meta" : {
                       "globalKey" : "12818f8c"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
                 }
               },
               "receiverPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "FM1LEI11111111111111"
@@ -3107,22 +3075,23 @@
                     "meta" : {
                       "globalKey" : "87c4d1c6"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
                 }
               }
             },
-            "quantity" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 50000
-            },
             "settlementDate" : {
               "adjustedDate" : {
+                "value" : "2020-10-09",
                 "meta" : {
                   "globalKey" : "3f2289"
-                },
-                "value" : "2020-10-09"
+                }
               }
             },
             "settlementOrigin" : {
@@ -3130,47 +3099,78 @@
                 "globalReference" : "73453ae0"
               }
             }
+          },
+          "meta" : {
+            "globalKey" : "39f1f2b2"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "a9e587dd"
+        }
       }
-    }
-  } ],
-  "billingStartDate" : "2020-10-01",
-  "meta" : {
-    "globalKey" : "f8c81190"
-  },
-  "receivingParty" : {
-    "meta" : {
-      "externalKey" : "Borrower",
-      "globalKey" : "1f061e68"
-    },
-    "name" : {
-      "value" : "CP001"
     },
-    "partyId" : [ {
-      "identifier" : {
-        "value" : "CP001LEI111111111111"
+    "recordTransfer" : {
+      "quantity" : {
+        "value" : 30.92769230769230769230769230769230690723076923076923076923076923076900000,
+        "unit" : {
+          "currency" : {
+            "value" : "USD"
+          }
+        }
       },
-      "meta" : {
-        "globalKey" : "12818f8c"
-      }
-    } ]
-  },
-  "sendingParty" : {
-    "meta" : {
-      "externalKey" : "Lender0",
-      "globalKey" : "a896ecd"
-    },
-    "name" : {
-      "value" : "Standard Fund 1"
-    },
-    "partyId" : [ {
-      "identifier" : {
-        "value" : "FM1LEI11111111111111"
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "value" : {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "FM1LEI11111111111111"
+              },
+              "meta" : {
+                "globalKey" : "87c4d1c6"
+              }
+            } ],
+            "name" : {
+              "value" : "Standard Fund 1"
+            },
+            "meta" : {
+              "globalKey" : "40ec509f",
+              "externalKey" : "Lender0"
+            }
+          }
+        },
+        "receiverPartyReference" : {
+          "value" : {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "CP001LEI111111111111"
+              },
+              "meta" : {
+                "globalKey" : "12818f8c"
+              }
+            } ],
+            "name" : {
+              "value" : "CP001"
+            },
+            "meta" : {
+              "globalKey" : "7c311b30",
+              "externalKey" : "Borrower"
+            }
+          }
+        }
       },
-      "meta" : {
-        "globalKey" : "87c4d1c6"
+      "settlementDate" : {
+        "adjustedDate" : {
+          "value" : "2020-11-10",
+          "meta" : {
+            "globalKey" : "3f22ca"
+          }
+        }
       }
-    } ]
+    },
+    "recordStartDate" : "2020-10-10",
+    "recordEndDate" : "2020-10-22"
+  } ],
+  "meta" : {
+    "globalKey" : "a408bb92"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/full-return-settlement-workflow-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/full-return-settlement-workflow-func-output.json
index dd1c7b4e11..7f004aa068 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/full-return-settlement-workflow-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/full-return-settlement-workflow-func-output.json
@@ -1,112 +1,29 @@
 {
   "steps" : [ {
-    "action" : "NEW",
     "businessEvent" : {
       "eventDate" : "2020-10-21",
       "after" : [ {
-        "meta" : {
-          "globalKey" : "524c9cf9"
-        },
-        "state" : {
-          "positionState" : "CLOSED"
-        },
         "trade" : {
-          "meta" : {
-            "globalKey" : "42900ac4"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "Lender0",
-              "globalKey" : "a896ecd"
-            },
-            "name" : {
-              "value" : "Standard Fund 1"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "FM1LEI11111111111111"
-              },
-              "meta" : {
-                "globalKey" : "87c4d1c6"
-              }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "AGENT_LENDER",
-              "globalKey" : "73176f1c"
-            },
-            "name" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
               "value" : "KTKL"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
-                "value" : "KTKLLEILLLLLLLLLLLLL"
-              },
-              "meta" : {
-                "globalKey" : "60098fe6"
+                "value" : "0266001"
               }
-            } ]
-          }, {
+            } ],
             "meta" : {
-              "externalKey" : "Borrower",
-              "globalKey" : "1f061e68"
-            },
-            "name" : {
-              "value" : "CP001"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "CP001LEI111111111111"
-              },
-              "meta" : {
-                "globalKey" : "12818f8c"
-              }
-            } ]
+              "globalKey" : "569d85e5"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "2020-09-21",
+            "meta" : {
+              "globalKey" : "3f2255"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "FM1LEI11111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "87c4d1c6"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "CP001LEI111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "12818f8c"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -114,25 +31,9 @@
                   "productQualifier" : "SecurityLendingAgreement"
                 } ],
                 "economicTerms" : {
-                  "collateral" : {
-                    "collateralProvisions" : {
-                      "collateralType" : "CASH",
-                      "eligibleCollateral" : [ {
-                        "criteria" : [ {
-                          "treatment" : {
-                            "valuationTreatment" : {
-                              "marginPercentage" : 0.02
-                            }
-                          }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "168480"
-                        }
-                      } ]
-                    }
-                  },
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2020-09-22",
                       "dateAdjustments" : {
                         "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
@@ -141,196 +42,133 @@
                       },
                       "meta" : {
                         "globalKey" : "e742daa5"
-                      },
-                      "unadjustedDate" : "2020-09-22"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e742daa5"
                     }
                   },
-                  "payout" : {
-                    "assetPayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
-                      },
-                      "assetLeg" : [ {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
-                          "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
-                            },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
-                              "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        }
-                      }, {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
-                          "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
-                            },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
-                              "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        }
-                      } ],
-                      "dividendTerms" : {
-                        "manufacturedIncomeRequirement" : {
-                          "totalRatio" : 1
-                        }
-                      },
-                      "durationType" : {
-                        "durationType" : "TERM"
-                      },
-                      "meta" : {
-                        "globalKey" : "73453ae0"
-                      },
-                      "minimumFee" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "USD"
-                          }
-                        },
-                        "value" : 0,
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2020-10-22",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "171b36"
+                          "globalKey" : "fa42f5cf"
                         }
                       },
-                      "securityInformation" : {
-                        "meta" : {
-                          "globalKey" : "7548eca6"
-                        },
-                        "security" : {
-                          "productIdentifier" : [ {
-                            "value" : {
-                              "identifier" : {
-                                "value" : "ST001"
-                              },
-                              "meta" : {
-                                "globalKey" : "a4ff65ff"
-                              },
-                              "source" : "SEDOL"
-                            }
-                          } ],
-                          "securityType" : "EQUITY"
-                        }
+                      "meta" : {
+                        "globalKey" : "e743cae5"
                       }
-                    } ],
+                    },
+                    "meta" : {
+                      "globalKey" : "e743cae5"
+                    }
+                  },
+                  "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-8"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "25e2ab"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-2"
+                              }
+                            }
                           },
-                          "period" : "T",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "NONE"
-                        },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
-                            },
                             "dateAdjustments" : {
                               "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "fa42f5cf"
                               }
                             },
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
+                              "meta" : {
+                                "globalKey" : "3f2256"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "Effective_Date",
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Effective_Date"
                             }
                           },
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "a4273c9"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
-                            },
                             "dateAdjustments" : {
                               "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "fa42f5cf"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "Termination_Date",
-                              "globalKey" : "fa42f5cf"
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
+                              "meta" : {
+                                "globalKey" : "3f2296"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Termination_Date"
                             }
                           },
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
+                        },
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "24b525"
+                          },
+                          "rollConvention" : "NONE"
+                        },
+                        "meta" : {
+                          "globalKey" : "8b1de243"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "ce90278b"
-                      },
                       "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "b578507f"
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "73"
+                          }
                         },
                         "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -339,200 +177,356 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
-                        "paymentFrequency" : {
-                          "meta" : {
-                            "globalKey" : "a2d"
-                          },
-                          "period" : "T",
-                          "periodMultiplier" : 1
+                        "meta" : {
+                          "globalKey" : "fa98fa5b"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "meta" : {
+                        "globalKey" : "98fd77d9"
+                      }
+                    } ],
+                    "assetPayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "assetLeg" : [ {
+                        "settlementDate" : {
+                          "adjustableDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
+                              "meta" : {
+                                "globalKey" : "3f2256"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
                           "meta" : {
-                            "globalKey" : "0"
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      }, {
+                        "settlementDate" : {
+                          "adjustableDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
+                              "meta" : {
+                                "globalKey" : "3f2296"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
                           },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-2"
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      } ],
+                      "securityInformation" : {
+                        "security" : {
+                          "productIdentifier" : [ {
+                            "value" : {
+                              "identifier" : {
+                                "value" : "ST001"
+                              },
+                              "source" : "SEDOL",
+                              "meta" : {
+                                "globalKey" : "a4ff65ff"
                               }
                             }
+                          } ],
+                          "securityType" : "Equity"
+                        },
+                        "meta" : {
+                          "globalKey" : "7548eca6"
+                        }
+                      },
+                      "durationType" : {
+                        "durationType" : "Term"
+                      },
+                      "minimumFee" : {
+                        "value" : 0,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "USD"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "171b36"
+                        }
+                      },
+                      "dividendTerms" : {
+                        "manufacturedIncomeRequirement" : {
+                          "totalRatio" : 1
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3b19750e"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "eb31e26b"
+                      "globalKey" : "43b3b6a7"
                     }
                   },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "MODFOLLOWING",
+                  "collateral" : {
+                    "collateralProvisions" : {
+                      "collateralType" : "Cash",
+                      "eligibleCollateral" : [ {
+                        "criteria" : [ {
+                          "treatment" : {
+                            "valuationTreatment" : {
+                              "marginPercentage" : 0.02
+                            }
+                          }
+                        } ],
                         "meta" : {
-                          "globalKey" : "fa42f5cf"
+                          "globalKey" : "168480"
                         }
-                      },
-                      "meta" : {
-                        "globalKey" : "e743cae5"
-                      },
-                      "unadjustedDate" : "2020-10-22"
-                    },
-                    "meta" : {
-                      "globalKey" : "e743cae5"
+                      } ]
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "37405ce2"
+                  "globalKey" : "38d91964"
                 }
               },
               "meta" : {
-                "globalKey" : "37405ce2"
+                "globalKey" : "38d91964"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "a233d2be"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.01,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 0.01,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-8"
+                      "value" : "price-2"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 0,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
-                    },
-                    "value" : 0
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "16e99c84"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "value" : "ST001"
-                      },
-                      "meta" : {
-                        "globalKey" : "a4ff65ff"
-                      },
-                      "source" : "SEDOL"
                     }
-                  } ]
-                },
-                "price" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "price-1"
+                      "value" : "quantity-8"
                     } ]
-                  },
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "a4468502"
+                }
+              }, {
+                "price" : [ {
                   "value" : {
+                    "value" : 25,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 25,
                     "perUnitOf" : {
-                      "financialUnit" : "SHARE"
+                      "financialUnit" : "Share"
                     },
-                    "priceType" : "ASSET_PRICE"
+                    "priceType" : "AssetPrice"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
                   }
                 } ],
                 "quantity" : [ {
+                  "value" : {
+                    "value" : 0,
+                    "unit" : {
+                      "financialUnit" : "Share"
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-9"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "financialUnit" : "SHARE"
-                    },
-                    "value" : 0
                   }
-                } ]
+                } ],
+                "observable" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "ST001"
+                      },
+                      "source" : "SEDOL",
+                      "meta" : {
+                        "globalKey" : "a4ff65ff"
+                      }
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "9e5d21da"
+                }
               } ]
-            } ]
-          },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f2255"
-            },
-            "value" : "2020-09-21"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
-              "identifier" : {
-                "value" : "0266001"
-              }
             } ],
-            "issuer" : {
-              "value" : "KTKL"
-            },
-            "meta" : {
-              "globalKey" : "9e641379"
-            }
-          } ]
-        },
-        "transferHistory" : [ {
-          "meta" : {
-            "globalKey" : "637bd5fe"
-          },
-          "transfer" : {
-            "payerReceiver" : {
-              "payerPartyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "FM1LEI11111111111111"
+                    },
+                    "meta" : {
+                      "globalKey" : "87c4d1c6"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
                   },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
+                }
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "CP001LEI111111111111"
+                    },
+                    "meta" : {
+                      "globalKey" : "12818f8c"
+                    }
+                  } ],
                   "name" : {
                     "value" : "CP001"
                   },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
+                }
+              }
+            } ]
+          },
+          "party" : [ {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "FM1LEI11111111111111"
+              },
+              "meta" : {
+                "globalKey" : "87c4d1c6"
+              }
+            } ],
+            "name" : {
+              "value" : "Standard Fund 1"
+            },
+            "meta" : {
+              "globalKey" : "40ec509f",
+              "externalKey" : "Lender0"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "KTKLLEILLLLLLLLLLLLL"
+              },
+              "meta" : {
+                "globalKey" : "60098fe6"
+              }
+            } ],
+            "name" : {
+              "value" : "KTKL"
+            },
+            "meta" : {
+              "globalKey" : "84088af0",
+              "externalKey" : "AGENT_LENDER"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "CP001LEI111111111111"
+              },
+              "meta" : {
+                "globalKey" : "12818f8c"
+              }
+            } ],
+            "name" : {
+              "value" : "CP001"
+            },
+            "meta" : {
+              "globalKey" : "7c311b30",
+              "externalKey" : "Borrower"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "24246cd0"
+          }
+        },
+        "state" : {
+          "positionState" : "Closed"
+        },
+        "transferHistory" : [ {
+          "transfer" : {
+            "quantity" : {
+              "value" : 100000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "value" : {
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "CP001LEI111111111111"
@@ -540,18 +534,18 @@
                     "meta" : {
                       "globalKey" : "12818f8c"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
                 }
               },
               "receiverPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "FM1LEI11111111111111"
@@ -559,24 +553,23 @@
                     "meta" : {
                       "globalKey" : "87c4d1c6"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
                 }
               }
             },
-            "quantity" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 100000.00
-            },
             "settlementDate" : {
               "adjustedDate" : {
+                "value" : "2020-09-22",
                 "meta" : {
                   "globalKey" : "3f2256"
-                },
-                "value" : "2020-09-22"
+                }
               }
             },
             "settlementOrigin" : {
@@ -584,38 +577,37 @@
                 "globalReference" : "73453ae0"
               }
             }
+          },
+          "meta" : {
+            "globalKey" : "4f6790d8"
           }
         }, {
-          "meta" : {
-            "globalKey" : "79e525e7"
-          },
           "transfer" : {
+            "quantity" : {
+              "value" : 200000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "observable" : {
-              "meta" : {
-                "globalKey" : "a4ff65ff"
-              },
               "productIdentifier" : [ {
                 "value" : {
                   "identifier" : {
                     "value" : "ST001"
                   },
+                  "source" : "SEDOL",
                   "meta" : {
                     "globalKey" : "a4ff65ff"
-                  },
-                  "source" : "SEDOL"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "a4ff65ff"
+              }
             },
             "payerReceiver" : {
               "payerPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "FM1LEI11111111111111"
@@ -623,18 +615,18 @@
                     "meta" : {
                       "globalKey" : "87c4d1c6"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
                 }
               },
               "receiverPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "CP001LEI111111111111"
@@ -642,22 +634,23 @@
                     "meta" : {
                       "globalKey" : "12818f8c"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
                 }
               }
             },
-            "quantity" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 200000
-            },
             "settlementDate" : {
               "adjustedDate" : {
+                "value" : "2020-09-22",
                 "meta" : {
                   "globalKey" : "3f2256"
-                },
-                "value" : "2020-09-22"
+                }
               }
             },
             "settlementOrigin" : {
@@ -665,165 +658,222 @@
                 "globalReference" : "73453ae0"
               }
             }
+          },
+          "meta" : {
+            "globalKey" : "9b9f0d6b"
           }
-        } ]
-      } ],
-      "meta" : {
-        "globalKey" : "cad9c18e"
-      }
-    },
-    "eventIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "value" : "workflow-id-0"
+        } ],
+        "meta" : {
+          "globalKey" : "70c8a9d7"
         }
       } ],
       "meta" : {
-        "globalKey" : "414b814c"
+        "globalKey" : "f2488ec"
       }
-    } ],
+    },
     "messageInformation" : {
       "messageId" : {
         "value" : "message-id-0"
       }
     },
-    "meta" : {
-      "globalKey" : "fefb0de1"
-    },
     "timestamp" : [ {
       "dateTime" : "2020-10-21T09:00:00Z",
-      "qualification" : "EVENT_CREATION_DATE_TIME"
-    } ]
-  }, {
+      "qualification" : "eventCreationDateTime"
+    } ],
     "eventIdentifier" : [ {
       "assignedIdentifier" : [ {
         "identifier" : {
-          "value" : "workflow-id-1"
+          "value" : "workflow-id-0"
         }
       } ],
       "meta" : {
-        "globalKey" : "414b814d"
+        "globalKey" : "414b814c"
       }
     } ],
-    "messageInformation" : {
-      "messageId" : {
-        "value" : "message-id-1"
-      }
-    },
+    "action" : "New",
     "meta" : {
-      "globalKey" : "fab4167e"
-    },
-    "previousWorkflowStep" : {
-      "globalReference" : "415f1f21"
-    },
+      "globalKey" : "67cf453f"
+    }
+  }, {
     "proposedEvent" : {
       "eventDate" : "2020-10-22",
       "instruction" : [ {
-        "before" : {
-          "value" : {
-            "meta" : {
-              "globalKey" : "524c9cf9"
-            },
-            "state" : {
-              "positionState" : "CLOSED"
-            },
-            "trade" : {
-              "meta" : {
-                "globalKey" : "42900ac4"
-              },
-              "party" : [ {
-                "meta" : {
-                  "externalKey" : "Lender0",
-                  "globalKey" : "a896ecd"
-                },
-                "name" : {
-                  "value" : "Standard Fund 1"
-                },
-                "partyId" : [ {
-                  "identifier" : {
-                    "value" : "FM1LEI11111111111111"
-                  },
-                  "meta" : {
-                    "globalKey" : "87c4d1c6"
+        "primitiveInstruction" : {
+          "transfer" : {
+            "transferState" : [ {
+              "transfer" : {
+                "quantity" : {
+                  "value" : 100000.00,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "externalKey" : "AGENT_LENDER",
-                  "globalKey" : "73176f1c"
-                },
-                "name" : {
-                  "value" : "KTKL"
                 },
-                "partyId" : [ {
-                  "identifier" : {
-                    "value" : "KTKLLEILLLLLLLLLLLLL"
+                "payerReceiver" : {
+                  "payerPartyReference" : {
+                    "value" : {
+                      "partyId" : [ {
+                        "identifier" : {
+                          "value" : "FM1LEI11111111111111"
+                        },
+                        "meta" : {
+                          "globalKey" : "87c4d1c6"
+                        }
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
+                      },
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
+                    }
                   },
-                  "meta" : {
-                    "globalKey" : "60098fe6"
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "externalKey" : "Borrower",
-                  "globalKey" : "1f061e68"
+                  "receiverPartyReference" : {
+                    "value" : {
+                      "partyId" : [ {
+                        "identifier" : {
+                          "value" : "CP001LEI111111111111"
+                        },
+                        "meta" : {
+                          "globalKey" : "12818f8c"
+                        }
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
+                      }
+                    }
+                  }
                 },
-                "name" : {
-                  "value" : "CP001"
+                "settlementDate" : {
+                  "adjustedDate" : {
+                    "value" : "2020-10-22",
+                    "meta" : {
+                      "globalKey" : "3f2296"
+                    }
+                  }
                 },
-                "partyId" : [ {
-                  "identifier" : {
-                    "value" : "CP001LEI111111111111"
-                  },
-                  "meta" : {
-                    "globalKey" : "12818f8c"
+                "settlementOrigin" : {
+                  "assetPayout" : {
+                    "globalReference" : "3b19750e"
                   }
-                } ]
-              } ],
-              "tradableProduct" : {
-                "counterparty" : [ {
-                  "partyReference" : {
+                }
+              },
+              "meta" : {
+                "globalKey" : "5e4f06e4"
+              }
+            }, {
+              "transfer" : {
+                "quantity" : {
+                  "value" : 200000,
+                  "unit" : {
+                    "financialUnit" : "Share"
+                  }
+                },
+                "observable" : {
+                  "productIdentifier" : [ {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
+                      "identifier" : {
+                        "value" : "ST001"
                       },
+                      "source" : "SEDOL",
+                      "meta" : {
+                        "globalKey" : "a4ff65ff"
+                      }
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
+                },
+                "payerReceiver" : {
+                  "payerPartyReference" : {
+                    "value" : {
                       "partyId" : [ {
                         "identifier" : {
-                          "value" : "FM1LEI11111111111111"
+                          "value" : "CP001LEI111111111111"
                         },
                         "meta" : {
-                          "globalKey" : "87c4d1c6"
+                          "globalKey" : "12818f8c"
                         }
-                      } ]
-                    }
-                  },
-                  "role" : "PARTY_1"
-                }, {
-                  "partyReference" : {
-                    "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
+                      } ],
                       "name" : {
                         "value" : "CP001"
                       },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
+                      }
+                    }
+                  },
+                  "receiverPartyReference" : {
+                    "value" : {
                       "partyId" : [ {
                         "identifier" : {
-                          "value" : "CP001LEI111111111111"
+                          "value" : "FM1LEI11111111111111"
                         },
                         "meta" : {
-                          "globalKey" : "12818f8c"
+                          "globalKey" : "87c4d1c6"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
+                      },
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
                     }
-                  },
-                  "role" : "PARTY_2"
+                  }
+                },
+                "settlementDate" : {
+                  "adjustedDate" : {
+                    "value" : "2020-10-22",
+                    "meta" : {
+                      "globalKey" : "3f2296"
+                    }
+                  }
+                },
+                "settlementOrigin" : {
+                  "assetPayout" : {
+                    "globalReference" : "3b19750e"
+                  }
+                }
+              },
+              "meta" : {
+                "globalKey" : "727d30bb"
+              }
+            } ]
+          }
+        },
+        "before" : {
+          "value" : {
+            "trade" : {
+              "tradeIdentifier" : [ {
+                "issuer" : {
+                  "value" : "KTKL"
+                },
+                "assignedIdentifier" : [ {
+                  "identifier" : {
+                    "value" : "0266001"
+                  }
                 } ],
+                "meta" : {
+                  "globalKey" : "569d85e5"
+                }
+              } ],
+              "tradeDate" : {
+                "value" : "2020-09-21",
+                "meta" : {
+                  "globalKey" : "3f2255"
+                }
+              },
+              "tradableProduct" : {
                 "product" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -831,25 +881,26 @@
                       "productQualifier" : "SecurityLendingAgreement"
                     } ],
                     "economicTerms" : {
-                      "collateral" : {
-                        "collateralProvisions" : {
-                          "collateralType" : "CASH",
-                          "eligibleCollateral" : [ {
-                            "criteria" : [ {
-                              "treatment" : {
-                                "valuationTreatment" : {
-                                  "marginPercentage" : 0.02
-                                }
-                              }
-                            } ],
+                      "effectiveDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2020-09-22",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "168480"
+                              "globalKey" : "fa42f5cf"
                             }
-                          } ]
+                          },
+                          "meta" : {
+                            "globalKey" : "e742daa5"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "e742daa5"
                         }
                       },
-                      "effectiveDate" : {
+                      "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2020-10-22",
                           "dateAdjustments" : {
                             "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
@@ -857,399 +908,475 @@
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e742daa5"
-                          },
-                          "unadjustedDate" : "2020-09-22"
+                            "globalKey" : "e743cae5"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "e742daa5"
+                          "globalKey" : "e743cae5"
                         }
                       },
                       "payout" : {
-                        "assetPayout" : [ {
+                        "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
-                          "assetLeg" : [ {
-                            "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                            "settlementDate" : {
+                          "priceQuantity" : {
+                            "quantitySchedule" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "quantity-8"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          },
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-2"
+                                  }
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "0"
+                              }
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
+                            "effectiveDate" : {
                               "adjustableDate" : {
-                                "adjustedDate" : {
+                                "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
-                                    "globalKey" : "3f2256"
-                                  },
-                                  "value" : "2020-09-22"
+                                    "globalKey" : "fa42f5cf"
+                                  }
                                 },
-                                "dateAdjustments" : {
-                                  "businessDayConvention" : "NONE",
+                                "adjustedDate" : {
+                                  "value" : "2020-09-22",
                                   "meta" : {
-                                    "globalKey" : "24a738"
+                                    "globalKey" : "3f2256"
                                   }
                                 },
                                 "meta" : {
-                                  "globalKey" : "24a738"
+                                  "globalKey" : "fa42f5cf",
+                                  "externalKey" : "Effective_Date"
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "24a738"
+                                "globalKey" : "fa42f5cf"
                               }
-                            }
-                          }, {
-                            "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                            "settlementDate" : {
+                            },
+                            "terminationDate" : {
                               "adjustableDate" : {
-                                "adjustedDate" : {
+                                "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
-                                    "globalKey" : "3f2296"
-                                  },
-                                  "value" : "2020-10-22"
+                                    "globalKey" : "fa42f5cf"
+                                  }
                                 },
-                                "dateAdjustments" : {
-                                  "businessDayConvention" : "NONE",
+                                "adjustedDate" : {
+                                  "value" : "2020-10-22",
                                   "meta" : {
-                                    "globalKey" : "24a738"
+                                    "globalKey" : "3f2296"
                                   }
                                 },
                                 "meta" : {
-                                  "globalKey" : "24a738"
+                                  "globalKey" : "fa42f5cf",
+                                  "externalKey" : "Termination_Date"
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "24a738"
+                                "globalKey" : "fa42f5cf"
                               }
-                            }
-                          } ],
-                          "dividendTerms" : {
-                            "manufacturedIncomeRequirement" : {
-                              "totalRatio" : 1
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "T",
+                              "meta" : {
+                                "globalKey" : "24b525"
+                              },
+                              "rollConvention" : "NONE"
+                            },
+                            "meta" : {
+                              "globalKey" : "8b1de243"
                             }
                           },
-                          "durationType" : {
-                            "durationType" : "TERM"
-                          },
-                          "meta" : {
-                            "globalKey" : "73453ae0"
-                          },
-                          "minimumFee" : {
-                            "unit" : {
-                              "currency" : {
-                                "value" : "USD"
+                          "paymentDates" : {
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "T",
+                              "meta" : {
+                                "globalKey" : "73"
+                              }
+                            },
+                            "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCenter" : [ {
+                                  "value" : "EUTA"
+                                } ],
+                                "meta" : {
+                                  "globalKey" : "20a71d"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "365baaee"
                               }
                             },
-                            "value" : 0,
                             "meta" : {
-                              "globalKey" : "171b36"
+                              "globalKey" : "fa98fa5b"
                             }
                           },
-                          "securityInformation" : {
-                            "meta" : {
-                              "globalKey" : "7548eca6"
-                            },
-                            "security" : {
-                              "productIdentifier" : [ {
-                                "value" : {
-                                  "identifier" : {
-                                    "value" : "ST001"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "a4ff65ff"
-                                  },
-                                  "source" : "SEDOL"
-                                }
-                              } ],
-                              "securityType" : "EQUITY"
-                            }
+                          "meta" : {
+                            "globalKey" : "98fd77d9"
                           }
                         } ],
-                        "interestRatePayout" : [ {
+                        "assetPayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
-                          },
-                          "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "quantitySchedule" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "quantity-8"
-                              }
-                            }
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "25e2ab"
-                              },
-                              "period" : "T",
-                              "periodMultiplier" : 1,
-                              "rollConvention" : "NONE"
-                            },
-                            "effectiveDate" : {
+                          "assetLeg" : [ {
+                            "settlementDate" : {
                               "adjustableDate" : {
-                                "adjustedDate" : {
+                                "dateAdjustments" : {
+                                  "businessDayConvention" : "NONE",
                                   "meta" : {
-                                    "globalKey" : "3f2256"
-                                  },
-                                  "value" : "2020-09-22"
+                                    "globalKey" : "24a738"
+                                  }
                                 },
-                                "dateAdjustments" : {
-                                  "businessDayConvention" : "MODFOLLOWING",
+                                "adjustedDate" : {
+                                  "value" : "2020-09-22",
                                   "meta" : {
-                                    "globalKey" : "fa42f5cf"
+                                    "globalKey" : "3f2256"
                                   }
                                 },
                                 "meta" : {
-                                  "externalKey" : "Effective_Date",
-                                  "globalKey" : "fa42f5cf"
+                                  "globalKey" : "24a738"
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "fa42f5cf"
+                                "globalKey" : "24a738"
                               }
                             },
-                            "meta" : {
-                              "globalKey" : "a4273c9"
-                            },
-                            "terminationDate" : {
+                            "deliveryMethod" : "DeliveryVersusPayment"
+                          }, {
+                            "settlementDate" : {
                               "adjustableDate" : {
-                                "adjustedDate" : {
+                                "dateAdjustments" : {
+                                  "businessDayConvention" : "NONE",
                                   "meta" : {
-                                    "globalKey" : "3f2296"
-                                  },
-                                  "value" : "2020-10-22"
+                                    "globalKey" : "24a738"
+                                  }
                                 },
-                                "dateAdjustments" : {
-                                  "businessDayConvention" : "MODFOLLOWING",
+                                "adjustedDate" : {
+                                  "value" : "2020-10-22",
                                   "meta" : {
-                                    "globalKey" : "fa42f5cf"
+                                    "globalKey" : "3f2296"
                                   }
                                 },
                                 "meta" : {
-                                  "externalKey" : "Termination_Date",
-                                  "globalKey" : "fa42f5cf"
+                                  "globalKey" : "24a738"
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "fa42f5cf"
+                                "globalKey" : "24a738"
                               }
+                            },
+                            "deliveryMethod" : "DeliveryVersusPayment"
+                          } ],
+                          "securityInformation" : {
+                            "security" : {
+                              "productIdentifier" : [ {
+                                "value" : {
+                                  "identifier" : {
+                                    "value" : "ST001"
+                                  },
+                                  "source" : "SEDOL",
+                                  "meta" : {
+                                    "globalKey" : "a4ff65ff"
+                                  }
+                                }
+                              } ],
+                              "securityType" : "Equity"
+                            },
+                            "meta" : {
+                              "globalKey" : "7548eca6"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "ce90278b"
+                          "durationType" : {
+                            "durationType" : "Term"
                           },
-                          "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "b578507f"
-                            },
-                            "paymentDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCenter" : [ {
-                                  "value" : "EUTA"
-                                } ],
-                                "meta" : {
-                                  "globalKey" : "20a71d"
-                                }
-                              },
-                              "businessDayConvention" : "MODFOLLOWING",
-                              "meta" : {
-                                "globalKey" : "365baaee"
+                          "minimumFee" : {
+                            "value" : 0,
+                            "unit" : {
+                              "currency" : {
+                                "value" : "USD"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "a2d"
-                              },
-                              "period" : "T",
-                              "periodMultiplier" : 1
+                            "meta" : {
+                              "globalKey" : "171b36"
                             }
                           },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-2"
-                                  }
-                                }
-                              }
+                          "dividendTerms" : {
+                            "manufacturedIncomeRequirement" : {
+                              "totalRatio" : 1
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "3b19750e"
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "eb31e26b"
+                          "globalKey" : "43b3b6a7"
                         }
                       },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "MODFOLLOWING",
+                      "collateral" : {
+                        "collateralProvisions" : {
+                          "collateralType" : "Cash",
+                          "eligibleCollateral" : [ {
+                            "criteria" : [ {
+                              "treatment" : {
+                                "valuationTreatment" : {
+                                  "marginPercentage" : 0.02
+                                }
+                              }
+                            } ],
                             "meta" : {
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "168480"
                             }
-                          },
-                          "meta" : {
-                            "globalKey" : "e743cae5"
-                          },
-                          "unadjustedDate" : "2020-10-22"
-                        },
-                        "meta" : {
-                          "globalKey" : "e743cae5"
+                          } ]
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "37405ce2"
+                      "globalKey" : "38d91964"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "37405ce2"
+                    "globalKey" : "38d91964"
                   }
                 },
                 "tradeLot" : [ {
                   "priceQuantity" : [ {
-                    "meta" : {
-                      "globalKey" : "a233d2be"
-                    },
                     "price" : [ {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        } ]
-                      },
                       "value" : {
+                        "value" : 0.01,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 0.01,
                         "perUnitOf" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "priceType" : "INTEREST_RATE"
-                      }
-                    } ],
-                    "quantity" : [ {
+                        "priceType" : "InterestRate"
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
-                          "value" : "quantity-8"
+                          "value" : "price-2"
                         } ]
-                      },
+                      }
+                    } ],
+                    "quantity" : [ {
                       "value" : {
+                        "value" : 0,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
-                        },
-                        "value" : 0
-                      }
-                    } ]
-                  }, {
-                    "meta" : {
-                      "globalKey" : "16e99c84"
-                    },
-                    "observable" : {
-                      "meta" : {
-                        "globalKey" : "a4ff65ff"
-                      },
-                      "productIdentifier" : [ {
-                        "value" : {
-                          "identifier" : {
-                            "value" : "ST001"
-                          },
-                          "meta" : {
-                            "globalKey" : "a4ff65ff"
-                          },
-                          "source" : "SEDOL"
                         }
-                      } ]
-                    },
-                    "price" : [ {
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
-                          "value" : "price-1"
+                          "value" : "quantity-8"
                         } ]
-                      },
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "a4468502"
+                    }
+                  }, {
+                    "price" : [ {
                       "value" : {
+                        "value" : 25,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 25,
                         "perUnitOf" : {
-                          "financialUnit" : "SHARE"
+                          "financialUnit" : "Share"
                         },
-                        "priceType" : "ASSET_PRICE"
-                      }
-                    } ],
-                    "quantity" : [ {
+                        "priceType" : "AssetPrice"
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
-                          "value" : "quantity-9"
+                          "value" : "price-1"
                         } ]
-                      },
-                      "value" : {
+                      }
+                    } ],
+                    "quantity" : [ {
+                      "value" : {
+                        "value" : 0,
                         "unit" : {
-                          "financialUnit" : "SHARE"
-                        },
-                        "value" : 0
+                          "financialUnit" : "Share"
+                        }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "quantity-9"
+                        } ]
                       }
-                    } ]
+                    } ],
+                    "observable" : {
+                      "productIdentifier" : [ {
+                        "value" : {
+                          "identifier" : {
+                            "value" : "ST001"
+                          },
+                          "source" : "SEDOL",
+                          "meta" : {
+                            "globalKey" : "a4ff65ff"
+                          }
+                        }
+                      } ],
+                      "meta" : {
+                        "globalKey" : "a4ff65ff"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "9e5d21da"
+                    }
                   } ]
+                } ],
+                "counterparty" : [ {
+                  "role" : "Party1",
+                  "partyReference" : {
+                    "value" : {
+                      "partyId" : [ {
+                        "identifier" : {
+                          "value" : "FM1LEI11111111111111"
+                        },
+                        "meta" : {
+                          "globalKey" : "87c4d1c6"
+                        }
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
+                      },
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
+                    }
+                  }
+                }, {
+                  "role" : "Party2",
+                  "partyReference" : {
+                    "value" : {
+                      "partyId" : [ {
+                        "identifier" : {
+                          "value" : "CP001LEI111111111111"
+                        },
+                        "meta" : {
+                          "globalKey" : "12818f8c"
+                        }
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
+                      }
+                    }
+                  }
                 } ]
               },
-              "tradeDate" : {
-                "meta" : {
-                  "globalKey" : "3f2255"
+              "party" : [ {
+                "partyId" : [ {
+                  "identifier" : {
+                    "value" : "FM1LEI11111111111111"
+                  },
+                  "meta" : {
+                    "globalKey" : "87c4d1c6"
+                  }
+                } ],
+                "name" : {
+                  "value" : "Standard Fund 1"
                 },
-                "value" : "2020-09-21"
-              },
-              "tradeIdentifier" : [ {
-                "assignedIdentifier" : [ {
+                "meta" : {
+                  "globalKey" : "40ec509f",
+                  "externalKey" : "Lender0"
+                }
+              }, {
+                "partyId" : [ {
                   "identifier" : {
-                    "value" : "0266001"
+                    "value" : "KTKLLEILLLLLLLLLLLLL"
+                  },
+                  "meta" : {
+                    "globalKey" : "60098fe6"
                   }
                 } ],
-                "issuer" : {
+                "name" : {
                   "value" : "KTKL"
                 },
                 "meta" : {
-                  "globalKey" : "9e641379"
+                  "globalKey" : "84088af0",
+                  "externalKey" : "AGENT_LENDER"
                 }
-              } ]
+              }, {
+                "partyId" : [ {
+                  "identifier" : {
+                    "value" : "CP001LEI111111111111"
+                  },
+                  "meta" : {
+                    "globalKey" : "12818f8c"
+                  }
+                } ],
+                "name" : {
+                  "value" : "CP001"
+                },
+                "meta" : {
+                  "globalKey" : "7c311b30",
+                  "externalKey" : "Borrower"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "24246cd0"
+              }
+            },
+            "state" : {
+              "positionState" : "Closed"
             },
             "transferHistory" : [ {
-              "meta" : {
-                "globalKey" : "637bd5fe"
-              },
               "transfer" : {
+                "quantity" : {
+                  "value" : 100000.00,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                },
                 "payerReceiver" : {
                   "payerPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "CP001LEI111111111111"
@@ -1257,18 +1384,18 @@
                         "meta" : {
                           "globalKey" : "12818f8c"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
+                      }
                     }
                   },
                   "receiverPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "FM1LEI11111111111111"
@@ -1276,24 +1403,23 @@
                         "meta" : {
                           "globalKey" : "87c4d1c6"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
+                      },
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
                     }
                   }
                 },
-                "quantity" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 100000.00
-                },
                 "settlementDate" : {
                   "adjustedDate" : {
+                    "value" : "2020-09-22",
                     "meta" : {
                       "globalKey" : "3f2256"
-                    },
-                    "value" : "2020-09-22"
+                    }
                   }
                 },
                 "settlementOrigin" : {
@@ -1301,38 +1427,37 @@
                     "globalReference" : "73453ae0"
                   }
                 }
+              },
+              "meta" : {
+                "globalKey" : "4f6790d8"
               }
             }, {
-              "meta" : {
-                "globalKey" : "79e525e7"
-              },
               "transfer" : {
+                "quantity" : {
+                  "value" : 200000,
+                  "unit" : {
+                    "financialUnit" : "Share"
+                  }
+                },
                 "observable" : {
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
                   "productIdentifier" : [ {
                     "value" : {
                       "identifier" : {
                         "value" : "ST001"
                       },
+                      "source" : "SEDOL",
                       "meta" : {
                         "globalKey" : "a4ff65ff"
-                      },
-                      "source" : "SEDOL"
+                      }
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
                 },
                 "payerReceiver" : {
                   "payerPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "FM1LEI11111111111111"
@@ -1340,18 +1465,18 @@
                         "meta" : {
                           "globalKey" : "87c4d1c6"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
+                      },
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
                     }
                   },
                   "receiverPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "CP001LEI111111111111"
@@ -1359,22 +1484,23 @@
                         "meta" : {
                           "globalKey" : "12818f8c"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
+                      }
                     }
                   }
                 },
-                "quantity" : {
-                  "unit" : {
-                    "financialUnit" : "SHARE"
-                  },
-                  "value" : 200000
-                },
                 "settlementDate" : {
                   "adjustedDate" : {
+                    "value" : "2020-09-22",
                     "meta" : {
                       "globalKey" : "3f2256"
-                    },
-                    "value" : "2020-09-22"
+                    }
                   }
                 },
                 "settlementOrigin" : {
@@ -1382,27 +1508,62 @@
                     "globalReference" : "73453ae0"
                   }
                 }
+              },
+              "meta" : {
+                "globalKey" : "9b9f0d6b"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "70c8a9d7"
+            }
           }
-        },
+        }
+      } ]
+    },
+    "previousWorkflowStep" : {
+      "globalReference" : "67cf453f"
+    },
+    "messageInformation" : {
+      "messageId" : {
+        "value" : "message-id-1"
+      }
+    },
+    "timestamp" : [ {
+      "dateTime" : "2020-10-21T15:00:00Z",
+      "qualification" : "eventCreationDateTime"
+    } ],
+    "eventIdentifier" : [ {
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "workflow-id-1"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "414b814d"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "71b2fbae"
+    }
+  }, {
+    "businessEvent" : {
+      "eventDate" : "2020-10-22",
+      "instruction" : [ {
         "primitiveInstruction" : {
           "transfer" : {
             "transferState" : [ {
-              "meta" : {
-                "globalKey" : "79010e14"
-              },
               "transfer" : {
+                "quantity" : {
+                  "value" : 100000.00,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                },
                 "payerReceiver" : {
                   "payerPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "FM1LEI11111111111111"
@@ -1410,18 +1571,18 @@
                         "meta" : {
                           "globalKey" : "87c4d1c6"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
+                      },
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
                     }
                   },
                   "receiverPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "CP001LEI111111111111"
@@ -1429,63 +1590,61 @@
                         "meta" : {
                           "globalKey" : "12818f8c"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
+                      }
                     }
                   }
                 },
-                "quantity" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 100000.00
-                },
                 "settlementDate" : {
                   "adjustedDate" : {
+                    "value" : "2020-10-22",
                     "meta" : {
                       "globalKey" : "3f2296"
-                    },
-                    "value" : "2020-10-22"
+                    }
                   }
                 },
                 "settlementOrigin" : {
                   "assetPayout" : {
-                    "globalReference" : "73453ae0"
+                    "globalReference" : "3b19750e"
                   }
                 }
+              },
+              "meta" : {
+                "globalKey" : "5e4f06e4"
               }
             }, {
-              "meta" : {
-                "globalKey" : "1e5cb8bd"
-              },
               "transfer" : {
+                "quantity" : {
+                  "value" : 200000,
+                  "unit" : {
+                    "financialUnit" : "Share"
+                  }
+                },
                 "observable" : {
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
                   "productIdentifier" : [ {
                     "value" : {
                       "identifier" : {
                         "value" : "ST001"
                       },
+                      "source" : "SEDOL",
                       "meta" : {
                         "globalKey" : "a4ff65ff"
-                      },
-                      "source" : "SEDOL"
+                      }
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
                 },
                 "payerReceiver" : {
                   "payerPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "CP001LEI111111111111"
@@ -1493,18 +1652,18 @@
                         "meta" : {
                           "globalKey" : "12818f8c"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
+                      }
                     }
                   },
                   "receiverPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "FM1LEI11111111111111"
@@ -1512,148 +1671,60 @@
                         "meta" : {
                           "globalKey" : "87c4d1c6"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
+                      },
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
                     }
                   }
                 },
-                "quantity" : {
-                  "unit" : {
-                    "financialUnit" : "SHARE"
-                  },
-                  "value" : 200000
-                },
                 "settlementDate" : {
                   "adjustedDate" : {
+                    "value" : "2020-10-22",
                     "meta" : {
                       "globalKey" : "3f2296"
-                    },
-                    "value" : "2020-10-22"
+                    }
                   }
                 },
                 "settlementOrigin" : {
                   "assetPayout" : {
-                    "globalReference" : "73453ae0"
+                    "globalReference" : "3b19750e"
                   }
                 }
+              },
+              "meta" : {
+                "globalKey" : "727d30bb"
               }
             } ]
           }
-        }
-      } ]
-    },
-    "timestamp" : [ {
-      "dateTime" : "2020-10-21T15:00:00Z",
-      "qualification" : "EVENT_CREATION_DATE_TIME"
-    } ]
-  }, {
-    "businessEvent" : {
-      "eventDate" : "2020-10-22",
-      "instruction" : [ {
+        },
         "before" : {
           "value" : {
-            "meta" : {
-              "globalKey" : "524c9cf9"
-            },
-            "state" : {
-              "positionState" : "CLOSED"
-            },
             "trade" : {
-              "meta" : {
-                "globalKey" : "42900ac4"
-              },
-              "party" : [ {
-                "meta" : {
-                  "externalKey" : "Lender0",
-                  "globalKey" : "a896ecd"
-                },
-                "name" : {
-                  "value" : "Standard Fund 1"
-                },
-                "partyId" : [ {
-                  "identifier" : {
-                    "value" : "FM1LEI11111111111111"
-                  },
-                  "meta" : {
-                    "globalKey" : "87c4d1c6"
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "externalKey" : "AGENT_LENDER",
-                  "globalKey" : "73176f1c"
-                },
-                "name" : {
+              "tradeIdentifier" : [ {
+                "issuer" : {
                   "value" : "KTKL"
                 },
-                "partyId" : [ {
+                "assignedIdentifier" : [ {
                   "identifier" : {
-                    "value" : "KTKLLEILLLLLLLLLLLLL"
-                  },
-                  "meta" : {
-                    "globalKey" : "60098fe6"
+                    "value" : "0266001"
                   }
-                } ]
-              }, {
+                } ],
                 "meta" : {
-                  "externalKey" : "Borrower",
-                  "globalKey" : "1f061e68"
-                },
-                "name" : {
-                  "value" : "CP001"
-                },
-                "partyId" : [ {
-                  "identifier" : {
-                    "value" : "CP001LEI111111111111"
-                  },
-                  "meta" : {
-                    "globalKey" : "12818f8c"
-                  }
-                } ]
+                  "globalKey" : "569d85e5"
+                }
               } ],
+              "tradeDate" : {
+                "value" : "2020-09-21",
+                "meta" : {
+                  "globalKey" : "3f2255"
+                }
+              },
               "tradableProduct" : {
-                "counterparty" : [ {
-                  "partyReference" : {
-                    "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
-                      "partyId" : [ {
-                        "identifier" : {
-                          "value" : "FM1LEI11111111111111"
-                        },
-                        "meta" : {
-                          "globalKey" : "87c4d1c6"
-                        }
-                      } ]
-                    }
-                  },
-                  "role" : "PARTY_1"
-                }, {
-                  "partyReference" : {
-                    "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
-                      "partyId" : [ {
-                        "identifier" : {
-                          "value" : "CP001LEI111111111111"
-                        },
-                        "meta" : {
-                          "globalKey" : "12818f8c"
-                        }
-                      } ]
-                    }
-                  },
-                  "role" : "PARTY_2"
-                } ],
                 "product" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -1661,25 +1732,26 @@
                       "productQualifier" : "SecurityLendingAgreement"
                     } ],
                     "economicTerms" : {
-                      "collateral" : {
-                        "collateralProvisions" : {
-                          "collateralType" : "CASH",
-                          "eligibleCollateral" : [ {
-                            "criteria" : [ {
-                              "treatment" : {
-                                "valuationTreatment" : {
-                                  "marginPercentage" : 0.02
-                                }
-                              }
-                            } ],
+                      "effectiveDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2020-09-22",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "168480"
+                              "globalKey" : "fa42f5cf"
                             }
-                          } ]
+                          },
+                          "meta" : {
+                            "globalKey" : "e742daa5"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "e742daa5"
                         }
                       },
-                      "effectiveDate" : {
+                      "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2020-10-22",
                           "dateAdjustments" : {
                             "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
@@ -1687,197 +1759,117 @@
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e742daa5"
-                          },
-                          "unadjustedDate" : "2020-09-22"
+                            "globalKey" : "e743cae5"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "e742daa5"
+                          "globalKey" : "e743cae5"
                         }
                       },
                       "payout" : {
-                        "assetPayout" : [ {
+                        "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
-                          "assetLeg" : [ {
-                            "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                            "settlementDate" : {
-                              "adjustableDate" : {
-                                "adjustedDate" : {
-                                  "meta" : {
-                                    "globalKey" : "3f2256"
-                                  },
-                                  "value" : "2020-09-22"
-                                },
-                                "dateAdjustments" : {
-                                  "businessDayConvention" : "NONE",
-                                  "meta" : {
-                                    "globalKey" : "24a738"
+                          "priceQuantity" : {
+                            "quantitySchedule" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "quantity-8"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          },
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-2"
                                   }
-                                },
-                                "meta" : {
-                                  "globalKey" : "24a738"
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "24a738"
+                                "globalKey" : "0"
                               }
                             }
-                          }, {
-                            "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                            "settlementDate" : {
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
+                            "effectiveDate" : {
                               "adjustableDate" : {
-                                "adjustedDate" : {
-                                  "meta" : {
-                                    "globalKey" : "3f2296"
-                                  },
-                                  "value" : "2020-10-22"
-                                },
                                 "dateAdjustments" : {
-                                  "businessDayConvention" : "NONE",
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
-                                    "globalKey" : "24a738"
+                                    "globalKey" : "fa42f5cf"
                                   }
                                 },
-                                "meta" : {
-                                  "globalKey" : "24a738"
-                                }
-                              },
-                              "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            }
-                          } ],
-                          "dividendTerms" : {
-                            "manufacturedIncomeRequirement" : {
-                              "totalRatio" : 1
-                            }
-                          },
-                          "durationType" : {
-                            "durationType" : "TERM"
-                          },
-                          "meta" : {
-                            "globalKey" : "73453ae0"
-                          },
-                          "minimumFee" : {
-                            "unit" : {
-                              "currency" : {
-                                "value" : "USD"
-                              }
-                            },
-                            "value" : 0,
-                            "meta" : {
-                              "globalKey" : "171b36"
-                            }
-                          },
-                          "securityInformation" : {
-                            "meta" : {
-                              "globalKey" : "7548eca6"
-                            },
-                            "security" : {
-                              "productIdentifier" : [ {
-                                "value" : {
-                                  "identifier" : {
-                                    "value" : "ST001"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "a4ff65ff"
-                                  },
-                                  "source" : "SEDOL"
-                                }
-                              } ],
-                              "securityType" : "EQUITY"
-                            }
-                          }
-                        } ],
-                        "interestRatePayout" : [ {
-                          "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
-                          },
-                          "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "quantitySchedule" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "quantity-8"
-                              }
-                            }
-                          },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "25e2ab"
-                              },
-                              "period" : "T",
-                              "periodMultiplier" : 1,
-                              "rollConvention" : "NONE"
-                            },
-                            "effectiveDate" : {
-                              "adjustableDate" : {
                                 "adjustedDate" : {
+                                  "value" : "2020-09-22",
                                   "meta" : {
                                     "globalKey" : "3f2256"
-                                  },
-                                  "value" : "2020-09-22"
-                                },
-                                "dateAdjustments" : {
-                                  "businessDayConvention" : "MODFOLLOWING",
-                                  "meta" : {
-                                    "globalKey" : "fa42f5cf"
                                   }
                                 },
                                 "meta" : {
-                                  "externalKey" : "Effective_Date",
-                                  "globalKey" : "fa42f5cf"
+                                  "globalKey" : "fa42f5cf",
+                                  "externalKey" : "Effective_Date"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "fa42f5cf"
                               }
                             },
-                            "meta" : {
-                              "globalKey" : "a4273c9"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
-                                "adjustedDate" : {
-                                  "meta" : {
-                                    "globalKey" : "3f2296"
-                                  },
-                                  "value" : "2020-10-22"
-                                },
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "fa42f5cf"
                                   }
                                 },
+                                "adjustedDate" : {
+                                  "value" : "2020-10-22",
+                                  "meta" : {
+                                    "globalKey" : "3f2296"
+                                  }
+                                },
                                 "meta" : {
-                                  "externalKey" : "Termination_Date",
-                                  "globalKey" : "fa42f5cf"
+                                  "globalKey" : "fa42f5cf",
+                                  "externalKey" : "Termination_Date"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "fa42f5cf"
                               }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "T",
+                              "meta" : {
+                                "globalKey" : "24b525"
+                              },
+                              "rollConvention" : "NONE"
+                            },
+                            "meta" : {
+                              "globalKey" : "8b1de243"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "ce90278b"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "b578507f"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "T",
+                              "meta" : {
+                                "globalKey" : "73"
+                              }
                             },
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
@@ -1886,200 +1878,356 @@
                                   "globalKey" : "20a71d"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "a2d"
-                              },
-                              "period" : "T",
-                              "periodMultiplier" : 1
+                            "meta" : {
+                              "globalKey" : "fa98fa5b"
                             }
                           },
-                          "rateSpecification" : {
-                            "fixedRate" : {
+                          "meta" : {
+                            "globalKey" : "98fd77d9"
+                          }
+                        } ],
+                        "assetPayout" : [ {
+                          "payerReceiver" : {
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
+                          },
+                          "assetLeg" : [ {
+                            "settlementDate" : {
+                              "adjustableDate" : {
+                                "dateAdjustments" : {
+                                  "businessDayConvention" : "NONE",
+                                  "meta" : {
+                                    "globalKey" : "24a738"
+                                  }
+                                },
+                                "adjustedDate" : {
+                                  "value" : "2020-09-22",
+                                  "meta" : {
+                                    "globalKey" : "3f2256"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "24a738"
+                                }
+                              },
                               "meta" : {
-                                "globalKey" : "0"
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "deliveryMethod" : "DeliveryVersusPayment"
+                          }, {
+                            "settlementDate" : {
+                              "adjustableDate" : {
+                                "dateAdjustments" : {
+                                  "businessDayConvention" : "NONE",
+                                  "meta" : {
+                                    "globalKey" : "24a738"
+                                  }
+                                },
+                                "adjustedDate" : {
+                                  "value" : "2020-10-22",
+                                  "meta" : {
+                                    "globalKey" : "3f2296"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "24a738"
+                                }
                               },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-2"
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "deliveryMethod" : "DeliveryVersusPayment"
+                          } ],
+                          "securityInformation" : {
+                            "security" : {
+                              "productIdentifier" : [ {
+                                "value" : {
+                                  "identifier" : {
+                                    "value" : "ST001"
+                                  },
+                                  "source" : "SEDOL",
+                                  "meta" : {
+                                    "globalKey" : "a4ff65ff"
                                   }
                                 }
+                              } ],
+                              "securityType" : "Equity"
+                            },
+                            "meta" : {
+                              "globalKey" : "7548eca6"
+                            }
+                          },
+                          "durationType" : {
+                            "durationType" : "Term"
+                          },
+                          "minimumFee" : {
+                            "value" : 0,
+                            "unit" : {
+                              "currency" : {
+                                "value" : "USD"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "171b36"
+                            }
+                          },
+                          "dividendTerms" : {
+                            "manufacturedIncomeRequirement" : {
+                              "totalRatio" : 1
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "3b19750e"
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "eb31e26b"
+                          "globalKey" : "43b3b6a7"
                         }
                       },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "MODFOLLOWING",
+                      "collateral" : {
+                        "collateralProvisions" : {
+                          "collateralType" : "Cash",
+                          "eligibleCollateral" : [ {
+                            "criteria" : [ {
+                              "treatment" : {
+                                "valuationTreatment" : {
+                                  "marginPercentage" : 0.02
+                                }
+                              }
+                            } ],
                             "meta" : {
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "168480"
                             }
-                          },
-                          "meta" : {
-                            "globalKey" : "e743cae5"
-                          },
-                          "unadjustedDate" : "2020-10-22"
-                        },
-                        "meta" : {
-                          "globalKey" : "e743cae5"
+                          } ]
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "37405ce2"
+                      "globalKey" : "38d91964"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "37405ce2"
+                    "globalKey" : "38d91964"
                   }
                 },
                 "tradeLot" : [ {
                   "priceQuantity" : [ {
-                    "meta" : {
-                      "globalKey" : "a233d2be"
-                    },
                     "price" : [ {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        } ]
-                      },
                       "value" : {
+                        "value" : 0.01,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 0.01,
                         "perUnitOf" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "priceType" : "INTEREST_RATE"
-                      }
-                    } ],
-                    "quantity" : [ {
+                        "priceType" : "InterestRate"
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
-                          "value" : "quantity-8"
+                          "value" : "price-2"
                         } ]
-                      },
-                      "value" : {
+                      }
+                    } ],
+                    "quantity" : [ {
+                      "value" : {
+                        "value" : 0,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
-                        },
-                        "value" : 0
-                      }
-                    } ]
-                  }, {
-                    "meta" : {
-                      "globalKey" : "16e99c84"
-                    },
-                    "observable" : {
-                      "meta" : {
-                        "globalKey" : "a4ff65ff"
-                      },
-                      "productIdentifier" : [ {
-                        "value" : {
-                          "identifier" : {
-                            "value" : "ST001"
-                          },
-                          "meta" : {
-                            "globalKey" : "a4ff65ff"
-                          },
-                          "source" : "SEDOL"
                         }
-                      } ]
-                    },
-                    "price" : [ {
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
-                          "value" : "price-1"
+                          "value" : "quantity-8"
                         } ]
-                      },
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "a4468502"
+                    }
+                  }, {
+                    "price" : [ {
                       "value" : {
+                        "value" : 25,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 25,
                         "perUnitOf" : {
-                          "financialUnit" : "SHARE"
+                          "financialUnit" : "Share"
                         },
-                        "priceType" : "ASSET_PRICE"
+                        "priceType" : "AssetPrice"
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        } ]
                       }
                     } ],
                     "quantity" : [ {
+                      "value" : {
+                        "value" : 0,
+                        "unit" : {
+                          "financialUnit" : "Share"
+                        }
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-9"
                         } ]
+                      }
+                    } ],
+                    "observable" : {
+                      "productIdentifier" : [ {
+                        "value" : {
+                          "identifier" : {
+                            "value" : "ST001"
+                          },
+                          "source" : "SEDOL",
+                          "meta" : {
+                            "globalKey" : "a4ff65ff"
+                          }
+                        }
+                      } ],
+                      "meta" : {
+                        "globalKey" : "a4ff65ff"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "9e5d21da"
+                    }
+                  } ]
+                } ],
+                "counterparty" : [ {
+                  "role" : "Party1",
+                  "partyReference" : {
+                    "value" : {
+                      "partyId" : [ {
+                        "identifier" : {
+                          "value" : "FM1LEI11111111111111"
+                        },
+                        "meta" : {
+                          "globalKey" : "87c4d1c6"
+                        }
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
                       },
-                      "value" : {
-                        "unit" : {
-                          "financialUnit" : "SHARE"
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
+                    }
+                  }
+                }, {
+                  "role" : "Party2",
+                  "partyReference" : {
+                    "value" : {
+                      "partyId" : [ {
+                        "identifier" : {
+                          "value" : "CP001LEI111111111111"
                         },
-                        "value" : 0
+                        "meta" : {
+                          "globalKey" : "12818f8c"
+                        }
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
                       }
-                    } ]
-                  } ]
+                    }
+                  }
                 } ]
               },
-              "tradeDate" : {
-                "meta" : {
-                  "globalKey" : "3f2255"
+              "party" : [ {
+                "partyId" : [ {
+                  "identifier" : {
+                    "value" : "FM1LEI11111111111111"
+                  },
+                  "meta" : {
+                    "globalKey" : "87c4d1c6"
+                  }
+                } ],
+                "name" : {
+                  "value" : "Standard Fund 1"
                 },
-                "value" : "2020-09-21"
-              },
-              "tradeIdentifier" : [ {
-                "assignedIdentifier" : [ {
+                "meta" : {
+                  "globalKey" : "40ec509f",
+                  "externalKey" : "Lender0"
+                }
+              }, {
+                "partyId" : [ {
                   "identifier" : {
-                    "value" : "0266001"
+                    "value" : "KTKLLEILLLLLLLLLLLLL"
+                  },
+                  "meta" : {
+                    "globalKey" : "60098fe6"
                   }
                 } ],
-                "issuer" : {
+                "name" : {
                   "value" : "KTKL"
                 },
                 "meta" : {
-                  "globalKey" : "9e641379"
+                  "globalKey" : "84088af0",
+                  "externalKey" : "AGENT_LENDER"
                 }
-              } ]
+              }, {
+                "partyId" : [ {
+                  "identifier" : {
+                    "value" : "CP001LEI111111111111"
+                  },
+                  "meta" : {
+                    "globalKey" : "12818f8c"
+                  }
+                } ],
+                "name" : {
+                  "value" : "CP001"
+                },
+                "meta" : {
+                  "globalKey" : "7c311b30",
+                  "externalKey" : "Borrower"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "24246cd0"
+              }
+            },
+            "state" : {
+              "positionState" : "Closed"
             },
             "transferHistory" : [ {
-              "meta" : {
-                "globalKey" : "637bd5fe"
-              },
               "transfer" : {
+                "quantity" : {
+                  "value" : 100000.00,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                },
                 "payerReceiver" : {
                   "payerPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "CP001LEI111111111111"
@@ -2087,18 +2235,18 @@
                         "meta" : {
                           "globalKey" : "12818f8c"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
+                      }
                     }
                   },
                   "receiverPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "FM1LEI11111111111111"
@@ -2106,24 +2254,23 @@
                         "meta" : {
                           "globalKey" : "87c4d1c6"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
+                      },
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
                     }
                   }
                 },
-                "quantity" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 100000.00
-                },
                 "settlementDate" : {
                   "adjustedDate" : {
+                    "value" : "2020-09-22",
                     "meta" : {
                       "globalKey" : "3f2256"
-                    },
-                    "value" : "2020-09-22"
+                    }
                   }
                 },
                 "settlementOrigin" : {
@@ -2131,38 +2278,37 @@
                     "globalReference" : "73453ae0"
                   }
                 }
+              },
+              "meta" : {
+                "globalKey" : "4f6790d8"
               }
             }, {
-              "meta" : {
-                "globalKey" : "79e525e7"
-              },
               "transfer" : {
+                "quantity" : {
+                  "value" : 200000,
+                  "unit" : {
+                    "financialUnit" : "Share"
+                  }
+                },
                 "observable" : {
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
                   "productIdentifier" : [ {
                     "value" : {
                       "identifier" : {
                         "value" : "ST001"
                       },
+                      "source" : "SEDOL",
                       "meta" : {
                         "globalKey" : "a4ff65ff"
-                      },
-                      "source" : "SEDOL"
+                      }
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
                 },
                 "payerReceiver" : {
                   "payerPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "FM1LEI11111111111111"
@@ -2170,18 +2316,18 @@
                         "meta" : {
                           "globalKey" : "87c4d1c6"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
+                      },
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
                     }
                   },
                   "receiverPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "CP001LEI111111111111"
@@ -2189,22 +2335,23 @@
                         "meta" : {
                           "globalKey" : "12818f8c"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
+                      }
                     }
                   }
                 },
-                "quantity" : {
-                  "unit" : {
-                    "financialUnit" : "SHARE"
-                  },
-                  "value" : 200000
-                },
                 "settlementDate" : {
                   "adjustedDate" : {
+                    "value" : "2020-09-22",
                     "meta" : {
                       "globalKey" : "3f2256"
-                    },
-                    "value" : "2020-09-22"
+                    }
                   }
                 },
                 "settlementOrigin" : {
@@ -2212,271 +2359,40 @@
                     "globalReference" : "73453ae0"
                   }
                 }
+              },
+              "meta" : {
+                "globalKey" : "9b9f0d6b"
               }
-            } ]
-          }
-        },
-        "primitiveInstruction" : {
-          "transfer" : {
-            "transferState" : [ {
-              "meta" : {
-                "globalKey" : "79010e14"
-              },
-              "transfer" : {
-                "payerReceiver" : {
-                  "payerPartyReference" : {
-                    "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
-                      "partyId" : [ {
-                        "identifier" : {
-                          "value" : "FM1LEI11111111111111"
-                        },
-                        "meta" : {
-                          "globalKey" : "87c4d1c6"
-                        }
-                      } ]
-                    }
-                  },
-                  "receiverPartyReference" : {
-                    "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
-                      "partyId" : [ {
-                        "identifier" : {
-                          "value" : "CP001LEI111111111111"
-                        },
-                        "meta" : {
-                          "globalKey" : "12818f8c"
-                        }
-                      } ]
-                    }
-                  }
-                },
-                "quantity" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 100000.00
-                },
-                "settlementDate" : {
-                  "adjustedDate" : {
-                    "meta" : {
-                      "globalKey" : "3f2296"
-                    },
-                    "value" : "2020-10-22"
-                  }
-                },
-                "settlementOrigin" : {
-                  "assetPayout" : {
-                    "globalReference" : "73453ae0"
-                  }
-                }
-              }
-            }, {
-              "meta" : {
-                "globalKey" : "1e5cb8bd"
-              },
-              "transfer" : {
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "value" : "ST001"
-                      },
-                      "meta" : {
-                        "globalKey" : "a4ff65ff"
-                      },
-                      "source" : "SEDOL"
-                    }
-                  } ]
-                },
-                "payerReceiver" : {
-                  "payerPartyReference" : {
-                    "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
-                      "partyId" : [ {
-                        "identifier" : {
-                          "value" : "CP001LEI111111111111"
-                        },
-                        "meta" : {
-                          "globalKey" : "12818f8c"
-                        }
-                      } ]
-                    }
-                  },
-                  "receiverPartyReference" : {
-                    "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
-                      "partyId" : [ {
-                        "identifier" : {
-                          "value" : "FM1LEI11111111111111"
-                        },
-                        "meta" : {
-                          "globalKey" : "87c4d1c6"
-                        }
-                      } ]
-                    }
-                  }
-                },
-                "quantity" : {
-                  "unit" : {
-                    "financialUnit" : "SHARE"
-                  },
-                  "value" : 200000
-                },
-                "settlementDate" : {
-                  "adjustedDate" : {
-                    "meta" : {
-                      "globalKey" : "3f2296"
-                    },
-                    "value" : "2020-10-22"
-                  }
-                },
-                "settlementOrigin" : {
-                  "assetPayout" : {
-                    "globalReference" : "73453ae0"
-                  }
-                }
-              }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "70c8a9d7"
+            }
           }
         }
       } ],
+      "eventQualifier" : "CashAndSecurityTransfer",
       "after" : [ {
-        "meta" : {
-          "globalKey" : "5df9f573"
-        },
-        "state" : {
-          "closedState" : {
-            "state" : "TERMINATED"
-          },
-          "positionState" : "CLOSED"
-        },
         "trade" : {
-          "meta" : {
-            "globalKey" : "42900ac4"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "Lender0",
-              "globalKey" : "a896ecd"
-            },
-            "name" : {
-              "value" : "Standard Fund 1"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "FM1LEI11111111111111"
-              },
-              "meta" : {
-                "globalKey" : "87c4d1c6"
-              }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "AGENT_LENDER",
-              "globalKey" : "73176f1c"
-            },
-            "name" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
               "value" : "KTKL"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
-                "value" : "KTKLLEILLLLLLLLLLLLL"
-              },
-              "meta" : {
-                "globalKey" : "60098fe6"
+                "value" : "0266001"
               }
-            } ]
-          }, {
+            } ],
             "meta" : {
-              "externalKey" : "Borrower",
-              "globalKey" : "1f061e68"
-            },
-            "name" : {
-              "value" : "CP001"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "CP001LEI111111111111"
-              },
-              "meta" : {
-                "globalKey" : "12818f8c"
-              }
-            } ]
+              "globalKey" : "569d85e5"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "2020-09-21",
+            "meta" : {
+              "globalKey" : "3f2255"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "FM1LEI11111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "87c4d1c6"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "CP001LEI111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "12818f8c"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -2484,25 +2400,9 @@
                   "productQualifier" : "SecurityLendingAgreement"
                 } ],
                 "economicTerms" : {
-                  "collateral" : {
-                    "collateralProvisions" : {
-                      "collateralType" : "CASH",
-                      "eligibleCollateral" : [ {
-                        "criteria" : [ {
-                          "treatment" : {
-                            "valuationTreatment" : {
-                              "marginPercentage" : 0.02
-                            }
-                          }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "168480"
-                        }
-                      } ]
-                    }
-                  },
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2020-09-22",
                       "dateAdjustments" : {
                         "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
@@ -2511,196 +2411,133 @@
                       },
                       "meta" : {
                         "globalKey" : "e742daa5"
-                      },
-                      "unadjustedDate" : "2020-09-22"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e742daa5"
                     }
                   },
-                  "payout" : {
-                    "assetPayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
-                      },
-                      "assetLeg" : [ {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
-                          "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
-                            },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
-                              "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        }
-                      }, {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
-                          "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
-                            },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
-                              "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        }
-                      } ],
-                      "dividendTerms" : {
-                        "manufacturedIncomeRequirement" : {
-                          "totalRatio" : 1
-                        }
-                      },
-                      "durationType" : {
-                        "durationType" : "TERM"
-                      },
-                      "meta" : {
-                        "globalKey" : "73453ae0"
-                      },
-                      "minimumFee" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "USD"
-                          }
-                        },
-                        "value" : 0,
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2020-10-22",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "171b36"
+                          "globalKey" : "fa42f5cf"
                         }
                       },
-                      "securityInformation" : {
-                        "meta" : {
-                          "globalKey" : "7548eca6"
-                        },
-                        "security" : {
-                          "productIdentifier" : [ {
-                            "value" : {
-                              "identifier" : {
-                                "value" : "ST001"
-                              },
-                              "meta" : {
-                                "globalKey" : "a4ff65ff"
-                              },
-                              "source" : "SEDOL"
-                            }
-                          } ],
-                          "securityType" : "EQUITY"
-                        }
+                      "meta" : {
+                        "globalKey" : "e743cae5"
                       }
-                    } ],
+                    },
+                    "meta" : {
+                      "globalKey" : "e743cae5"
+                    }
+                  },
+                  "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-8"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      },
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-2"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
                         }
                       },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
                       "calculationPeriodDates" : {
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "25e2ab"
-                          },
-                          "period" : "T",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "NONE"
-                        },
                         "effectiveDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
-                            },
                             "dateAdjustments" : {
                               "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "fa42f5cf"
                               }
                             },
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
+                              "meta" : {
+                                "globalKey" : "3f2256"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "Effective_Date",
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Effective_Date"
                             }
                           },
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "a4273c9"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
-                            },
                             "dateAdjustments" : {
                               "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "fa42f5cf"
+                                "globalKey" : "fa42f5cf"
+                              }
+                            },
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
+                              "meta" : {
+                                "globalKey" : "3f2296"
                               }
                             },
                             "meta" : {
-                              "externalKey" : "Termination_Date",
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Termination_Date"
                             }
                           },
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
+                        },
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "24b525"
+                          },
+                          "rollConvention" : "NONE"
+                        },
+                        "meta" : {
+                          "globalKey" : "8b1de243"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "ce90278b"
-                      },
                       "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "b578507f"
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "73"
+                          }
                         },
                         "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -2709,200 +2546,359 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
-                        "paymentFrequency" : {
-                          "meta" : {
-                            "globalKey" : "a2d"
-                          },
-                          "period" : "T",
-                          "periodMultiplier" : 1
+                        "meta" : {
+                          "globalKey" : "fa98fa5b"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "meta" : {
+                        "globalKey" : "98fd77d9"
+                      }
+                    } ],
+                    "assetPayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "assetLeg" : [ {
+                        "settlementDate" : {
+                          "adjustableDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
+                              "meta" : {
+                                "globalKey" : "3f2256"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
                           "meta" : {
-                            "globalKey" : "0"
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      }, {
+                        "settlementDate" : {
+                          "adjustableDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
+                              "meta" : {
+                                "globalKey" : "3f2296"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
                           },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-2"
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      } ],
+                      "securityInformation" : {
+                        "security" : {
+                          "productIdentifier" : [ {
+                            "value" : {
+                              "identifier" : {
+                                "value" : "ST001"
+                              },
+                              "source" : "SEDOL",
+                              "meta" : {
+                                "globalKey" : "a4ff65ff"
                               }
                             }
+                          } ],
+                          "securityType" : "Equity"
+                        },
+                        "meta" : {
+                          "globalKey" : "7548eca6"
+                        }
+                      },
+                      "durationType" : {
+                        "durationType" : "Term"
+                      },
+                      "minimumFee" : {
+                        "value" : 0,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "USD"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "171b36"
+                        }
+                      },
+                      "dividendTerms" : {
+                        "manufacturedIncomeRequirement" : {
+                          "totalRatio" : 1
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3b19750e"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "eb31e26b"
+                      "globalKey" : "43b3b6a7"
                     }
                   },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "MODFOLLOWING",
+                  "collateral" : {
+                    "collateralProvisions" : {
+                      "collateralType" : "Cash",
+                      "eligibleCollateral" : [ {
+                        "criteria" : [ {
+                          "treatment" : {
+                            "valuationTreatment" : {
+                              "marginPercentage" : 0.02
+                            }
+                          }
+                        } ],
                         "meta" : {
-                          "globalKey" : "fa42f5cf"
+                          "globalKey" : "168480"
                         }
-                      },
-                      "meta" : {
-                        "globalKey" : "e743cae5"
-                      },
-                      "unadjustedDate" : "2020-10-22"
-                    },
-                    "meta" : {
-                      "globalKey" : "e743cae5"
+                      } ]
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "37405ce2"
+                  "globalKey" : "38d91964"
                 }
               },
               "meta" : {
-                "globalKey" : "37405ce2"
+                "globalKey" : "38d91964"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "a233d2be"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.01,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 0.01,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-8"
+                      "value" : "price-2"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 0,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
-                    },
-                    "value" : 0
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "16e99c84"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "value" : "ST001"
-                      },
-                      "meta" : {
-                        "globalKey" : "a4ff65ff"
-                      },
-                      "source" : "SEDOL"
                     }
-                  } ]
-                },
-                "price" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "price-1"
+                      "value" : "quantity-8"
                     } ]
-                  },
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "a4468502"
+                }
+              }, {
+                "price" : [ {
                   "value" : {
+                    "value" : 25,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 25,
                     "perUnitOf" : {
-                      "financialUnit" : "SHARE"
+                      "financialUnit" : "Share"
                     },
-                    "priceType" : "ASSET_PRICE"
+                    "priceType" : "AssetPrice"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
                   }
                 } ],
                 "quantity" : [ {
+                  "value" : {
+                    "value" : 0,
+                    "unit" : {
+                      "financialUnit" : "Share"
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-9"
                     } ]
+                  }
+                } ],
+                "observable" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "ST001"
+                      },
+                      "source" : "SEDOL",
+                      "meta" : {
+                        "globalKey" : "a4ff65ff"
+                      }
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "9e5d21da"
+                }
+              } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "FM1LEI11111111111111"
+                    },
+                    "meta" : {
+                      "globalKey" : "87c4d1c6"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
                   },
-                  "value" : {
-                    "unit" : {
-                      "financialUnit" : "SHARE"
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
+                }
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "CP001LEI111111111111"
                     },
-                    "value" : 0
+                    "meta" : {
+                      "globalKey" : "12818f8c"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
                   }
-                } ]
-              } ]
+                }
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f2255"
+          "party" : [ {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "FM1LEI11111111111111"
+              },
+              "meta" : {
+                "globalKey" : "87c4d1c6"
+              }
+            } ],
+            "name" : {
+              "value" : "Standard Fund 1"
             },
-            "value" : "2020-09-21"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+            "meta" : {
+              "globalKey" : "40ec509f",
+              "externalKey" : "Lender0"
+            }
+          }, {
+            "partyId" : [ {
               "identifier" : {
-                "value" : "0266001"
+                "value" : "KTKLLEILLLLLLLLLLLLL"
+              },
+              "meta" : {
+                "globalKey" : "60098fe6"
               }
             } ],
-            "issuer" : {
+            "name" : {
               "value" : "KTKL"
             },
             "meta" : {
-              "globalKey" : "9e641379"
+              "globalKey" : "84088af0",
+              "externalKey" : "AGENT_LENDER"
             }
-          } ]
-        },
-        "transferHistory" : [ {
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "CP001LEI111111111111"
+              },
+              "meta" : {
+                "globalKey" : "12818f8c"
+              }
+            } ],
+            "name" : {
+              "value" : "CP001"
+            },
+            "meta" : {
+              "globalKey" : "7c311b30",
+              "externalKey" : "Borrower"
+            }
+          } ],
           "meta" : {
-            "globalKey" : "637bd5fe"
+            "globalKey" : "24246cd0"
+          }
+        },
+        "state" : {
+          "closedState" : {
+            "state" : "Terminated"
           },
+          "positionState" : "Closed"
+        },
+        "transferHistory" : [ {
           "transfer" : {
+            "quantity" : {
+              "value" : 100000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
             "payerReceiver" : {
               "payerPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "CP001LEI111111111111"
@@ -2910,18 +2906,18 @@
                     "meta" : {
                       "globalKey" : "12818f8c"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
                 }
               },
               "receiverPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "FM1LEI11111111111111"
@@ -2929,24 +2925,23 @@
                     "meta" : {
                       "globalKey" : "87c4d1c6"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
                 }
               }
             },
-            "quantity" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 100000.00
-            },
             "settlementDate" : {
               "adjustedDate" : {
+                "value" : "2020-09-22",
                 "meta" : {
                   "globalKey" : "3f2256"
-                },
-                "value" : "2020-09-22"
+                }
               }
             },
             "settlementOrigin" : {
@@ -2954,38 +2949,37 @@
                 "globalReference" : "73453ae0"
               }
             }
+          },
+          "meta" : {
+            "globalKey" : "4f6790d8"
           }
         }, {
-          "meta" : {
-            "globalKey" : "79e525e7"
-          },
           "transfer" : {
+            "quantity" : {
+              "value" : 200000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "observable" : {
-              "meta" : {
-                "globalKey" : "a4ff65ff"
-              },
               "productIdentifier" : [ {
                 "value" : {
                   "identifier" : {
                     "value" : "ST001"
                   },
+                  "source" : "SEDOL",
                   "meta" : {
                     "globalKey" : "a4ff65ff"
-                  },
-                  "source" : "SEDOL"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "a4ff65ff"
+              }
             },
             "payerReceiver" : {
               "payerPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "FM1LEI11111111111111"
@@ -2993,18 +2987,18 @@
                     "meta" : {
                       "globalKey" : "87c4d1c6"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
                 }
               },
               "receiverPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "CP001LEI111111111111"
@@ -3012,22 +3006,23 @@
                     "meta" : {
                       "globalKey" : "12818f8c"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
                 }
               }
             },
-            "quantity" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 200000
-            },
             "settlementDate" : {
               "adjustedDate" : {
+                "value" : "2020-09-22",
                 "meta" : {
                   "globalKey" : "3f2256"
-                },
-                "value" : "2020-09-22"
+                }
               }
             },
             "settlementOrigin" : {
@@ -3035,22 +3030,23 @@
                 "globalReference" : "73453ae0"
               }
             }
+          },
+          "meta" : {
+            "globalKey" : "9b9f0d6b"
           }
         }, {
-          "meta" : {
-            "globalKey" : "79010e14"
-          },
           "transfer" : {
+            "quantity" : {
+              "value" : 100000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
             "payerReceiver" : {
               "payerPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "FM1LEI11111111111111"
@@ -3058,18 +3054,18 @@
                     "meta" : {
                       "globalKey" : "87c4d1c6"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
                 }
               },
               "receiverPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "CP001LEI111111111111"
@@ -3077,63 +3073,61 @@
                     "meta" : {
                       "globalKey" : "12818f8c"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
                 }
               }
             },
-            "quantity" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 100000.00
-            },
             "settlementDate" : {
               "adjustedDate" : {
+                "value" : "2020-10-22",
                 "meta" : {
                   "globalKey" : "3f2296"
-                },
-                "value" : "2020-10-22"
+                }
               }
             },
             "settlementOrigin" : {
               "assetPayout" : {
-                "globalReference" : "73453ae0"
+                "globalReference" : "3b19750e"
               }
             }
+          },
+          "meta" : {
+            "globalKey" : "5e4f06e4"
           }
         }, {
-          "meta" : {
-            "globalKey" : "1e5cb8bd"
-          },
           "transfer" : {
+            "quantity" : {
+              "value" : 200000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "observable" : {
-              "meta" : {
-                "globalKey" : "a4ff65ff"
-              },
               "productIdentifier" : [ {
                 "value" : {
                   "identifier" : {
                     "value" : "ST001"
                   },
+                  "source" : "SEDOL",
                   "meta" : {
                     "globalKey" : "a4ff65ff"
-                  },
-                  "source" : "SEDOL"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "a4ff65ff"
+              }
             },
             "payerReceiver" : {
               "payerPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "CP001LEI111111111111"
@@ -3141,18 +3135,18 @@
                     "meta" : {
                       "globalKey" : "12818f8c"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
                 }
               },
               "receiverPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "FM1LEI11111111111111"
@@ -3160,37 +3154,55 @@
                     "meta" : {
                       "globalKey" : "87c4d1c6"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
                 }
               }
             },
-            "quantity" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 200000
-            },
             "settlementDate" : {
               "adjustedDate" : {
+                "value" : "2020-10-22",
                 "meta" : {
                   "globalKey" : "3f2296"
-                },
-                "value" : "2020-10-22"
+                }
               }
             },
             "settlementOrigin" : {
               "assetPayout" : {
-                "globalReference" : "73453ae0"
+                "globalReference" : "3b19750e"
               }
             }
+          },
+          "meta" : {
+            "globalKey" : "727d30bb"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "ebbcd4c3"
+        }
       } ],
-      "eventQualifier" : "CashAndSecurityTransfer",
       "meta" : {
-        "globalKey" : "92abe7de"
+        "globalKey" : "7402adbe"
+      }
+    },
+    "previousWorkflowStep" : {
+      "globalReference" : "d23e20ae"
+    },
+    "messageInformation" : {
+      "messageId" : {
+        "value" : "message-id-2"
       }
     },
+    "timestamp" : [ {
+      "dateTime" : "2020-10-22T18:00:00Z",
+      "qualification" : "eventCreationDateTime"
+    } ],
     "eventIdentifier" : [ {
       "assignedIdentifier" : [ {
         "identifier" : {
@@ -3201,20 +3213,8 @@
         "globalKey" : "414b814e"
       }
     } ],
-    "messageInformation" : {
-      "messageId" : {
-        "value" : "message-id-2"
-      }
-    },
     "meta" : {
-      "globalKey" : "e5faa8da"
-    },
-    "previousWorkflowStep" : {
-      "globalReference" : "7b6150be"
-    },
-    "timestamp" : [ {
-      "dateTime" : "2020-10-22T18:00:00Z",
-      "qualification" : "EVENT_CREATION_DATE_TIME"
-    } ]
+      "globalKey" : "ad4b618a"
+    }
   } ]
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/new-settlement-workflow-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/new-settlement-workflow-func-output.json
index 2e5da30093..343a63cadd 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/new-settlement-workflow-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/new-settlement-workflow-func-output.json
@@ -1,200 +1,10 @@
 {
   "steps" : [ {
-    "action" : "NEW",
     "businessEvent" : {
       "eventDate" : "2020-09-21",
       "instruction" : [ {
         "primitiveInstruction" : {
           "execution" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "FM1LEI11111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "87c4d1c6"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "CP001LEI111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "12818f8c"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_2"
-            } ],
-            "parties" : [ {
-              "meta" : {
-                "externalKey" : "Lender0",
-                "globalKey" : "a896ecd"
-              },
-              "name" : {
-                "value" : "Standard Fund 1"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "value" : "FM1LEI11111111111111"
-                },
-                "meta" : {
-                  "globalKey" : "87c4d1c6"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "AGENT_LENDER",
-                "globalKey" : "73176f1c"
-              },
-              "name" : {
-                "value" : "KTKL"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "value" : "KTKLLEILLLLLLLLLLLLL"
-                },
-                "meta" : {
-                  "globalKey" : "60098fe6"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "Borrower",
-                "globalKey" : "1f061e68"
-              },
-              "name" : {
-                "value" : "CP001"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "value" : "CP001LEI111111111111"
-                },
-                "meta" : {
-                  "globalKey" : "12818f8c"
-                }
-              } ]
-            } ],
-            "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "bc2d9a59"
-              },
-              "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-2"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 0.01,
-                  "perUnitOf" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ],
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-8"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 5000000
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "a0b25412"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "a4ff65ff"
-                },
-                "productIdentifier" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "ST001"
-                    },
-                    "meta" : {
-                      "globalKey" : "a4ff65ff"
-                    },
-                    "source" : "SEDOL"
-                  }
-                } ]
-              },
-              "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 25,
-                  "perUnitOf" : {
-                    "financialUnit" : "SHARE"
-                  },
-                  "priceType" : "ASSET_PRICE"
-                }
-              } ],
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-9"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "financialUnit" : "SHARE"
-                  },
-                  "value" : 200000
-                }
-              } ]
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -202,25 +12,26 @@
                   "productQualifier" : "SecurityLendingAgreement"
                 } ],
                 "economicTerms" : {
-                  "collateral" : {
-                    "collateralProvisions" : {
-                      "collateralType" : "CASH",
-                      "eligibleCollateral" : [ {
-                        "criteria" : [ {
-                          "treatment" : {
-                            "valuationTreatment" : {
-                              "marginPercentage" : 0.02
-                            }
-                          }
-                        } ],
+                  "effectiveDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2020-09-22",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "168480"
+                          "globalKey" : "fa42f5cf"
                         }
-                      } ]
+                      },
+                      "meta" : {
+                        "globalKey" : "e742daa5"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "e742daa5"
                     }
                   },
-                  "effectiveDate" : {
+                  "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2020-10-22",
                       "dateAdjustments" : {
                         "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
@@ -228,390 +39,497 @@
                         }
                       },
                       "meta" : {
-                        "globalKey" : "e742daa5"
-                      },
-                      "unadjustedDate" : "2020-09-22"
+                        "globalKey" : "e743cae5"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "e742daa5"
+                      "globalKey" : "e743cae5"
                     }
                   },
                   "payout" : {
-                    "assetPayout" : [ {
+                    "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
-                      "assetLeg" : [ {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
+                      "priceQuantity" : {
+                        "quantitySchedule" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "quantity-8"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      },
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-2"
+                              }
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
+                        "effectiveDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
+                                "globalKey" : "fa42f5cf"
+                              }
                             },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
                               "meta" : {
-                                "globalKey" : "24a738"
+                                "globalKey" : "3f2256"
                               }
                             },
                             "meta" : {
-                              "globalKey" : "24a738"
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Effective_Date"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "24a738"
+                            "globalKey" : "fa42f5cf"
                           }
-                        }
-                      }, {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
+                        },
+                        "terminationDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
+                                "globalKey" : "fa42f5cf"
+                              }
                             },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
                               "meta" : {
-                                "globalKey" : "24a738"
+                                "globalKey" : "3f2296"
                               }
                             },
                             "meta" : {
-                              "globalKey" : "24a738"
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Termination_Date"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        }
-                      } ],
-                      "dividendTerms" : {
-                        "manufacturedIncomeRequirement" : {
-                          "totalRatio" : 1
-                        }
-                      },
-                      "durationType" : {
-                        "durationType" : "TERM"
-                      },
-                      "meta" : {
-                        "globalKey" : "73453ae0"
-                      },
-                      "minimumFee" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "USD"
+                            "globalKey" : "fa42f5cf"
                           }
                         },
-                        "value" : 0,
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "24b525"
+                          },
+                          "rollConvention" : "NONE"
+                        },
                         "meta" : {
-                          "globalKey" : "171b36"
+                          "globalKey" : "8b1de243"
                         }
                       },
-                      "securityInformation" : {
-                        "meta" : {
-                          "globalKey" : "7548eca6"
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "73"
+                          }
                         },
-                        "security" : {
-                          "productIdentifier" : [ {
-                            "value" : {
-                              "identifier" : {
-                                "value" : "ST001"
-                              },
-                              "meta" : {
-                                "globalKey" : "a4ff65ff"
-                              },
-                              "source" : "SEDOL"
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "EUTA"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "20a71d"
                             }
-                          } ],
-                          "securityType" : "EQUITY"
+                          },
+                          "meta" : {
+                            "globalKey" : "365baaee"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "fa98fa5b"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "98fd77d9"
                       }
                     } ],
-                    "interestRatePayout" : [ {
+                    "assetPayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
-                      "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "quantitySchedule" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "quantity-8"
-                          }
-                        }
-                      },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "25e2ab"
-                          },
-                          "period" : "T",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "NONE"
-                        },
-                        "effectiveDate" : {
+                      "assetLeg" : [ {
+                        "settlementDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
                               "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
+                                "globalKey" : "24a738"
+                              }
                             },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "MODFOLLOWING",
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
                               "meta" : {
-                                "globalKey" : "fa42f5cf"
+                                "globalKey" : "3f2256"
                               }
                             },
                             "meta" : {
-                              "externalKey" : "Effective_Date",
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "24a738"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "fa42f5cf"
+                            "globalKey" : "24a738"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "a4273c9"
-                        },
-                        "terminationDate" : {
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      }, {
+                        "settlementDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
                               "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
+                                "globalKey" : "24a738"
+                              }
                             },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "MODFOLLOWING",
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
                               "meta" : {
-                                "globalKey" : "fa42f5cf"
+                                "globalKey" : "3f2296"
                               }
                             },
                             "meta" : {
-                              "externalKey" : "Termination_Date",
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "24a738"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "fa42f5cf"
+                            "globalKey" : "24a738"
                           }
+                        },
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      } ],
+                      "securityInformation" : {
+                        "security" : {
+                          "productIdentifier" : [ {
+                            "value" : {
+                              "identifier" : {
+                                "value" : "ST001"
+                              },
+                              "source" : "SEDOL",
+                              "meta" : {
+                                "globalKey" : "a4ff65ff"
+                              }
+                            }
+                          } ],
+                          "securityType" : "Equity"
+                        },
+                        "meta" : {
+                          "globalKey" : "7548eca6"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "ce90278b"
+                      "durationType" : {
+                        "durationType" : "Term"
                       },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "b578507f"
-                        },
-                        "paymentDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "EUTA"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "20a71d"
-                            }
-                          },
-                          "businessDayConvention" : "MODFOLLOWING",
-                          "meta" : {
-                            "globalKey" : "365baaee"
+                      "minimumFee" : {
+                        "value" : 0,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "USD"
                           }
                         },
-                        "paymentFrequency" : {
-                          "meta" : {
-                            "globalKey" : "a2d"
-                          },
-                          "period" : "T",
-                          "periodMultiplier" : 1
+                        "meta" : {
+                          "globalKey" : "171b36"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-2"
-                              }
-                            }
-                          }
+                      "dividendTerms" : {
+                        "manufacturedIncomeRequirement" : {
+                          "totalRatio" : 1
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3b19750e"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "eb31e26b"
+                      "globalKey" : "43b3b6a7"
                     }
                   },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "MODFOLLOWING",
+                  "collateral" : {
+                    "collateralProvisions" : {
+                      "collateralType" : "Cash",
+                      "eligibleCollateral" : [ {
+                        "criteria" : [ {
+                          "treatment" : {
+                            "valuationTreatment" : {
+                              "marginPercentage" : 0.02
+                            }
+                          }
+                        } ],
                         "meta" : {
-                          "globalKey" : "fa42f5cf"
+                          "globalKey" : "168480"
                         }
-                      },
-                      "meta" : {
-                        "globalKey" : "e743cae5"
-                      },
-                      "unadjustedDate" : "2020-10-22"
+                      } ]
+                    }
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "38d91964"
+                }
+              },
+              "meta" : {
+                "globalKey" : "38d91964"
+              }
+            },
+            "priceQuantity" : [ {
+              "price" : [ {
+                "value" : {
+                  "value" : 0.01,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  },
+                  "perUnitOf" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  },
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-2"
+                  } ]
+                }
+              } ],
+              "quantity" : [ {
+                "value" : {
+                  "value" : 5000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-8"
+                  } ]
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "c985b0c7"
+              }
+            }, {
+              "price" : [ {
+                "value" : {
+                  "value" : 25,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  },
+                  "perUnitOf" : {
+                    "financialUnit" : "Share"
+                  },
+                  "priceType" : "AssetPrice"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
+                }
+              } ],
+              "quantity" : [ {
+                "value" : {
+                  "value" : 200000,
+                  "unit" : {
+                    "financialUnit" : "Share"
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-9"
+                  } ]
+                }
+              } ],
+              "observable" : {
+                "productIdentifier" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "ST001"
                     },
+                    "source" : "SEDOL",
                     "meta" : {
-                      "globalKey" : "e743cae5"
+                      "globalKey" : "a4ff65ff"
                     }
                   }
+                } ],
+                "meta" : {
+                  "globalKey" : "a4ff65ff"
+                }
+              },
+              "meta" : {
+                "globalKey" : "998f6e8c"
+              }
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "FM1LEI11111111111111"
+                    },
+                    "meta" : {
+                      "globalKey" : "87c4d1c6"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
+                }
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "CP001LEI111111111111"
+                    },
+                    "meta" : {
+                      "globalKey" : "12818f8c"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
+                }
+              }
+            } ],
+            "parties" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "FM1LEI11111111111111"
+                },
+                "meta" : {
+                  "globalKey" : "87c4d1c6"
+                }
+              } ],
+              "name" : {
+                "value" : "Standard Fund 1"
+              },
+              "meta" : {
+                "globalKey" : "40ec509f",
+                "externalKey" : "Lender0"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "KTKLLEILLLLLLLLLLLLL"
+                },
+                "meta" : {
+                  "globalKey" : "60098fe6"
+                }
+              } ],
+              "name" : {
+                "value" : "KTKL"
+              },
+              "meta" : {
+                "globalKey" : "84088af0",
+                "externalKey" : "AGENT_LENDER"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "CP001LEI111111111111"
                 },
                 "meta" : {
-                  "globalKey" : "37405ce2"
+                  "globalKey" : "12818f8c"
                 }
+              } ],
+              "name" : {
+                "value" : "CP001"
               },
               "meta" : {
-                "globalKey" : "37405ce2"
+                "globalKey" : "7c311b30",
+                "externalKey" : "Borrower"
               }
-            },
+            } ],
             "tradeDate" : {
+              "value" : "2020-09-21",
               "meta" : {
                 "globalKey" : "3f2255"
-              },
-              "value" : "2020-09-21"
+              }
             },
             "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "KTKL"
+              },
               "assignedIdentifier" : [ {
                 "identifier" : {
                   "value" : "0266001"
                 }
               } ],
-              "issuer" : {
-                "value" : "KTKL"
-              },
               "meta" : {
-                "globalKey" : "9e641379"
+                "globalKey" : "569d85e5"
               }
             } ]
           }
         }
       } ],
+      "eventQualifier" : "Execution",
       "after" : [ {
-        "meta" : {
-          "globalKey" : "1b2ed6bc"
-        },
-        "state" : {
-          "positionState" : "EXECUTED"
-        },
         "trade" : {
-          "meta" : {
-            "globalKey" : "3ae100ed"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "Lender0",
-              "globalKey" : "a896ecd"
-            },
-            "name" : {
-              "value" : "Standard Fund 1"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "FM1LEI11111111111111"
-              },
-              "meta" : {
-                "globalKey" : "87c4d1c6"
-              }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "AGENT_LENDER",
-              "globalKey" : "73176f1c"
-            },
-            "name" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
               "value" : "KTKL"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
-                "value" : "KTKLLEILLLLLLLLLLLLL"
-              },
-              "meta" : {
-                "globalKey" : "60098fe6"
+                "value" : "0266001"
               }
-            } ]
-          }, {
+            } ],
             "meta" : {
-              "externalKey" : "Borrower",
-              "globalKey" : "1f061e68"
-            },
-            "name" : {
-              "value" : "CP001"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "CP001LEI111111111111"
-              },
-              "meta" : {
-                "globalKey" : "12818f8c"
-              }
-            } ]
+              "globalKey" : "569d85e5"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "2020-09-21",
+            "meta" : {
+              "globalKey" : "3f2255"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "FM1LEI11111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "87c4d1c6"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "CP001LEI111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "12818f8c"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -619,25 +537,9 @@
                   "productQualifier" : "SecurityLendingAgreement"
                 } ],
                 "economicTerms" : {
-                  "collateral" : {
-                    "collateralProvisions" : {
-                      "collateralType" : "CASH",
-                      "eligibleCollateral" : [ {
-                        "criteria" : [ {
-                          "treatment" : {
-                            "valuationTreatment" : {
-                              "marginPercentage" : 0.02
-                            }
-                          }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "168480"
-                        }
-                      } ]
-                    }
-                  },
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2020-09-22",
                       "dateAdjustments" : {
                         "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
@@ -646,196 +548,133 @@
                       },
                       "meta" : {
                         "globalKey" : "e742daa5"
-                      },
-                      "unadjustedDate" : "2020-09-22"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e742daa5"
                     }
                   },
-                  "payout" : {
-                    "assetPayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
-                      },
-                      "assetLeg" : [ {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
-                          "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
-                            },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
-                              "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        }
-                      }, {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
-                          "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
-                            },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
-                              "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        }
-                      } ],
-                      "dividendTerms" : {
-                        "manufacturedIncomeRequirement" : {
-                          "totalRatio" : 1
-                        }
-                      },
-                      "durationType" : {
-                        "durationType" : "TERM"
-                      },
-                      "meta" : {
-                        "globalKey" : "73453ae0"
-                      },
-                      "minimumFee" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "USD"
-                          }
-                        },
-                        "value" : 0,
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2020-10-22",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "171b36"
+                          "globalKey" : "fa42f5cf"
                         }
                       },
-                      "securityInformation" : {
-                        "meta" : {
-                          "globalKey" : "7548eca6"
-                        },
-                        "security" : {
-                          "productIdentifier" : [ {
-                            "value" : {
-                              "identifier" : {
-                                "value" : "ST001"
-                              },
-                              "meta" : {
-                                "globalKey" : "a4ff65ff"
-                              },
-                              "source" : "SEDOL"
-                            }
-                          } ],
-                          "securityType" : "EQUITY"
-                        }
+                      "meta" : {
+                        "globalKey" : "e743cae5"
                       }
-                    } ],
+                    },
+                    "meta" : {
+                      "globalKey" : "e743cae5"
+                    }
+                  },
+                  "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-8"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "25e2ab"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-2"
+                              }
+                            }
                           },
-                          "period" : "T",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "NONE"
-                        },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
-                            },
                             "dateAdjustments" : {
                               "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "fa42f5cf"
                               }
                             },
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
+                              "meta" : {
+                                "globalKey" : "3f2256"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "Effective_Date",
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Effective_Date"
                             }
                           },
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "a4273c9"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
-                            },
                             "dateAdjustments" : {
                               "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "fa42f5cf"
                               }
                             },
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
+                              "meta" : {
+                                "globalKey" : "3f2296"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "Termination_Date",
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Termination_Date"
                             }
                           },
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
+                        },
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "24b525"
+                          },
+                          "rollConvention" : "NONE"
+                        },
+                        "meta" : {
+                          "globalKey" : "8b1de243"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "ce90278b"
-                      },
                       "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "b578507f"
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "73"
+                          }
                         },
                         "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -844,310 +683,474 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
-                        "paymentFrequency" : {
-                          "meta" : {
-                            "globalKey" : "a2d"
-                          },
-                          "period" : "T",
-                          "periodMultiplier" : 1
+                        "meta" : {
+                          "globalKey" : "fa98fa5b"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "meta" : {
+                        "globalKey" : "98fd77d9"
+                      }
+                    } ],
+                    "assetPayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "assetLeg" : [ {
+                        "settlementDate" : {
+                          "adjustableDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
+                              "meta" : {
+                                "globalKey" : "3f2256"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
                           "meta" : {
-                            "globalKey" : "0"
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      }, {
+                        "settlementDate" : {
+                          "adjustableDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
+                              "meta" : {
+                                "globalKey" : "3f2296"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
                           },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-2"
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      } ],
+                      "securityInformation" : {
+                        "security" : {
+                          "productIdentifier" : [ {
+                            "value" : {
+                              "identifier" : {
+                                "value" : "ST001"
+                              },
+                              "source" : "SEDOL",
+                              "meta" : {
+                                "globalKey" : "a4ff65ff"
                               }
                             }
+                          } ],
+                          "securityType" : "Equity"
+                        },
+                        "meta" : {
+                          "globalKey" : "7548eca6"
+                        }
+                      },
+                      "durationType" : {
+                        "durationType" : "Term"
+                      },
+                      "minimumFee" : {
+                        "value" : 0,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "USD"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "171b36"
+                        }
+                      },
+                      "dividendTerms" : {
+                        "manufacturedIncomeRequirement" : {
+                          "totalRatio" : 1
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3b19750e"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "eb31e26b"
+                      "globalKey" : "43b3b6a7"
                     }
                   },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "MODFOLLOWING",
+                  "collateral" : {
+                    "collateralProvisions" : {
+                      "collateralType" : "Cash",
+                      "eligibleCollateral" : [ {
+                        "criteria" : [ {
+                          "treatment" : {
+                            "valuationTreatment" : {
+                              "marginPercentage" : 0.02
+                            }
+                          }
+                        } ],
                         "meta" : {
-                          "globalKey" : "fa42f5cf"
+                          "globalKey" : "168480"
                         }
-                      },
-                      "meta" : {
-                        "globalKey" : "e743cae5"
-                      },
-                      "unadjustedDate" : "2020-10-22"
-                    },
-                    "meta" : {
-                      "globalKey" : "e743cae5"
+                      } ]
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "37405ce2"
+                  "globalKey" : "38d91964"
                 }
               },
               "meta" : {
-                "globalKey" : "37405ce2"
+                "globalKey" : "38d91964"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "bc2d9a59"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.01,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 0.01,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
+                    "priceType" : "InterestRate"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-2"
+                    } ]
                   }
                 } ],
                 "quantity" : [ {
+                  "value" : {
+                    "value" : 5000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-8"
                     } ]
-                  },
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "c985b0c7"
+                }
+              }, {
+                "price" : [ {
                   "value" : {
+                    "value" : 25,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 5000000
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "a0b25412"
-                },
-                "observable" : {
+                    "perUnitOf" : {
+                      "financialUnit" : "Share"
+                    },
+                    "priceType" : "AssetPrice"
+                  },
                   "meta" : {
-                    "globalKey" : "a4ff65ff"
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
+                  }
+                } ],
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 200000,
+                    "unit" : {
+                      "financialUnit" : "Share"
+                    }
                   },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-9"
+                    } ]
+                  }
+                } ],
+                "observable" : {
                   "productIdentifier" : [ {
                     "value" : {
                       "identifier" : {
                         "value" : "ST001"
                       },
+                      "source" : "SEDOL",
                       "meta" : {
                         "globalKey" : "a4ff65ff"
-                      },
-                      "source" : "SEDOL"
+                      }
                     }
-                  } ]
-                },
-                "price" : [ {
+                  } ],
                   "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 25,
-                    "perUnitOf" : {
-                      "financialUnit" : "SHARE"
+                    "globalKey" : "a4ff65ff"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "998f6e8c"
+                }
+              } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "FM1LEI11111111111111"
                     },
-                    "priceType" : "ASSET_PRICE"
-                  }
-                } ],
-                "quantity" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-9"
-                    } ]
+                    "meta" : {
+                      "globalKey" : "87c4d1c6"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
                   },
-                  "value" : {
-                    "unit" : {
-                      "financialUnit" : "SHARE"
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
+                }
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "CP001LEI111111111111"
                     },
-                    "value" : 200000
+                    "meta" : {
+                      "globalKey" : "12818f8c"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
                   }
-                } ]
-              } ]
+                }
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f2255"
+          "party" : [ {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "FM1LEI11111111111111"
+              },
+              "meta" : {
+                "globalKey" : "87c4d1c6"
+              }
+            } ],
+            "name" : {
+              "value" : "Standard Fund 1"
             },
-            "value" : "2020-09-21"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+            "meta" : {
+              "globalKey" : "40ec509f",
+              "externalKey" : "Lender0"
+            }
+          }, {
+            "partyId" : [ {
               "identifier" : {
-                "value" : "0266001"
+                "value" : "KTKLLEILLLLLLLLLLLLL"
+              },
+              "meta" : {
+                "globalKey" : "60098fe6"
               }
             } ],
-            "issuer" : {
+            "name" : {
               "value" : "KTKL"
             },
             "meta" : {
-              "globalKey" : "9e641379"
+              "globalKey" : "84088af0",
+              "externalKey" : "AGENT_LENDER"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "CP001LEI111111111111"
+              },
+              "meta" : {
+                "globalKey" : "12818f8c"
+              }
+            } ],
+            "name" : {
+              "value" : "CP001"
+            },
+            "meta" : {
+              "globalKey" : "7c311b30",
+              "externalKey" : "Borrower"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "199bc407"
+          }
+        },
+        "state" : {
+          "positionState" : "Executed"
+        },
+        "meta" : {
+          "globalKey" : "ca26c5d6"
         }
       } ],
-      "eventQualifier" : "Execution",
       "meta" : {
-        "globalKey" : "b0d476cc"
+        "globalKey" : "49c48ac"
       }
     },
-    "eventIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "value" : "workflow-id-0"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "414b814c"
-      }
-    } ],
     "messageInformation" : {
       "messageId" : {
         "value" : "message-id-0"
       }
     },
-    "meta" : {
-      "globalKey" : "5b9445df"
-    },
     "timestamp" : [ {
       "dateTime" : "2020-09-21T09:00:00Z",
-      "qualification" : "EVENT_CREATION_DATE_TIME"
-    } ]
-  }, {
+      "qualification" : "eventCreationDateTime"
+    } ],
     "eventIdentifier" : [ {
       "assignedIdentifier" : [ {
         "identifier" : {
-          "value" : "workflow-id-1"
+          "value" : "workflow-id-0"
         }
       } ],
       "meta" : {
-        "globalKey" : "414b814d"
+        "globalKey" : "414b814c"
       }
     } ],
-    "messageInformation" : {
-      "messageId" : {
-        "value" : "message-id-1"
-      }
-    },
+    "action" : "New",
     "meta" : {
-      "globalKey" : "b125cb05"
-    },
-    "previousWorkflowStep" : {
-      "globalReference" : "5b9445df"
-    },
+      "globalKey" : "954eed3f"
+    }
+  }, {
     "proposedEvent" : {
       "eventDate" : "2020-09-22",
       "instruction" : [ {
-        "before" : {
-          "value" : {
-            "meta" : {
-              "globalKey" : "1b2ed6bc"
-            },
-            "state" : {
-              "positionState" : "EXECUTED"
-            },
-            "trade" : {
-              "meta" : {
-                "globalKey" : "3ae100ed"
-              },
-              "party" : [ {
-                "meta" : {
-                  "externalKey" : "Lender0",
-                  "globalKey" : "a896ecd"
-                },
-                "name" : {
-                  "value" : "Standard Fund 1"
+        "primitiveInstruction" : {
+          "transfer" : {
+            "transferState" : [ {
+              "transfer" : {
+                "quantity" : {
+                  "value" : 100000.00,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
                 },
-                "partyId" : [ {
-                  "identifier" : {
-                    "value" : "FM1LEI11111111111111"
+                "payerReceiver" : {
+                  "payerPartyReference" : {
+                    "value" : {
+                      "partyId" : [ {
+                        "identifier" : {
+                          "value" : "CP001LEI111111111111"
+                        },
+                        "meta" : {
+                          "globalKey" : "12818f8c"
+                        }
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
+                      }
+                    }
                   },
-                  "meta" : {
-                    "globalKey" : "87c4d1c6"
+                  "receiverPartyReference" : {
+                    "value" : {
+                      "partyId" : [ {
+                        "identifier" : {
+                          "value" : "FM1LEI11111111111111"
+                        },
+                        "meta" : {
+                          "globalKey" : "87c4d1c6"
+                        }
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
+                      },
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
+                    }
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "externalKey" : "AGENT_LENDER",
-                  "globalKey" : "73176f1c"
-                },
-                "name" : {
-                  "value" : "KTKL"
                 },
-                "partyId" : [ {
-                  "identifier" : {
-                    "value" : "KTKLLEILLLLLLLLLLLLL"
-                  },
-                  "meta" : {
-                    "globalKey" : "60098fe6"
+                "settlementDate" : {
+                  "adjustedDate" : {
+                    "value" : "2020-09-22",
+                    "meta" : {
+                      "globalKey" : "3f2256"
+                    }
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "externalKey" : "Borrower",
-                  "globalKey" : "1f061e68"
                 },
-                "name" : {
-                  "value" : "CP001"
+                "settlementOrigin" : {
+                  "assetPayout" : {
+                    "globalReference" : "3b19750e"
+                  }
+                }
+              },
+              "meta" : {
+                "globalKey" : "a37ecfe6"
+              }
+            }, {
+              "transfer" : {
+                "quantity" : {
+                  "value" : 200000,
+                  "unit" : {
+                    "financialUnit" : "Share"
+                  }
                 },
-                "partyId" : [ {
-                  "identifier" : {
-                    "value" : "CP001LEI111111111111"
-                  },
+                "observable" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "ST001"
+                      },
+                      "source" : "SEDOL",
+                      "meta" : {
+                        "globalKey" : "a4ff65ff"
+                      }
+                    }
+                  } ],
                   "meta" : {
-                    "globalKey" : "12818f8c"
+                    "globalKey" : "a4ff65ff"
                   }
-                } ]
-              } ],
-              "tradableProduct" : {
-                "counterparty" : [ {
-                  "partyReference" : {
+                },
+                "payerReceiver" : {
+                  "payerPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "FM1LEI11111111111111"
@@ -1155,20 +1158,18 @@
                         "meta" : {
                           "globalKey" : "87c4d1c6"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
+                      },
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
                     }
                   },
-                  "role" : "PARTY_1"
-                }, {
-                  "partyReference" : {
+                  "receiverPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "CP001LEI111111111111"
@@ -1176,11 +1177,60 @@
                         "meta" : {
                           "globalKey" : "12818f8c"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
+                      }
                     }
-                  },
-                  "role" : "PARTY_2"
+                  }
+                },
+                "settlementDate" : {
+                  "adjustedDate" : {
+                    "value" : "2020-09-22",
+                    "meta" : {
+                      "globalKey" : "3f2256"
+                    }
+                  }
+                },
+                "settlementOrigin" : {
+                  "assetPayout" : {
+                    "globalReference" : "3b19750e"
+                  }
+                }
+              },
+              "meta" : {
+                "globalKey" : "2d4d67b9"
+              }
+            } ]
+          }
+        },
+        "before" : {
+          "value" : {
+            "trade" : {
+              "tradeIdentifier" : [ {
+                "issuer" : {
+                  "value" : "KTKL"
+                },
+                "assignedIdentifier" : [ {
+                  "identifier" : {
+                    "value" : "0266001"
+                  }
                 } ],
+                "meta" : {
+                  "globalKey" : "569d85e5"
+                }
+              } ],
+              "tradeDate" : {
+                "value" : "2020-09-21",
+                "meta" : {
+                  "globalKey" : "3f2255"
+                }
+              },
+              "tradableProduct" : {
                 "product" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -1188,25 +1238,26 @@
                       "productQualifier" : "SecurityLendingAgreement"
                     } ],
                     "economicTerms" : {
-                      "collateral" : {
-                        "collateralProvisions" : {
-                          "collateralType" : "CASH",
-                          "eligibleCollateral" : [ {
-                            "criteria" : [ {
-                              "treatment" : {
-                                "valuationTreatment" : {
-                                  "marginPercentage" : 0.02
-                                }
-                              }
-                            } ],
+                      "effectiveDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2020-09-22",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "168480"
+                              "globalKey" : "fa42f5cf"
                             }
-                          } ]
+                          },
+                          "meta" : {
+                            "globalKey" : "e742daa5"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "e742daa5"
                         }
                       },
-                      "effectiveDate" : {
+                      "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2020-10-22",
                           "dateAdjustments" : {
                             "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
@@ -1214,403 +1265,513 @@
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e742daa5"
-                          },
-                          "unadjustedDate" : "2020-09-22"
+                            "globalKey" : "e743cae5"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "e742daa5"
+                          "globalKey" : "e743cae5"
                         }
                       },
                       "payout" : {
-                        "assetPayout" : [ {
+                        "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
-                          "assetLeg" : [ {
-                            "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                            "settlementDate" : {
+                          "priceQuantity" : {
+                            "quantitySchedule" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "quantity-8"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          },
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-2"
+                                  }
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "0"
+                              }
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
+                            "effectiveDate" : {
                               "adjustableDate" : {
-                                "adjustedDate" : {
+                                "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
-                                    "globalKey" : "3f2256"
-                                  },
-                                  "value" : "2020-09-22"
+                                    "globalKey" : "fa42f5cf"
+                                  }
                                 },
-                                "dateAdjustments" : {
-                                  "businessDayConvention" : "NONE",
+                                "adjustedDate" : {
+                                  "value" : "2020-09-22",
                                   "meta" : {
-                                    "globalKey" : "24a738"
+                                    "globalKey" : "3f2256"
                                   }
                                 },
                                 "meta" : {
-                                  "globalKey" : "24a738"
+                                  "globalKey" : "fa42f5cf",
+                                  "externalKey" : "Effective_Date"
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "24a738"
+                                "globalKey" : "fa42f5cf"
                               }
-                            }
-                          }, {
-                            "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                            "settlementDate" : {
+                            },
+                            "terminationDate" : {
                               "adjustableDate" : {
-                                "adjustedDate" : {
+                                "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
-                                    "globalKey" : "3f2296"
-                                  },
-                                  "value" : "2020-10-22"
+                                    "globalKey" : "fa42f5cf"
+                                  }
                                 },
-                                "dateAdjustments" : {
-                                  "businessDayConvention" : "NONE",
+                                "adjustedDate" : {
+                                  "value" : "2020-10-22",
                                   "meta" : {
-                                    "globalKey" : "24a738"
+                                    "globalKey" : "3f2296"
                                   }
                                 },
                                 "meta" : {
-                                  "globalKey" : "24a738"
+                                  "globalKey" : "fa42f5cf",
+                                  "externalKey" : "Termination_Date"
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            }
-                          } ],
-                          "dividendTerms" : {
-                            "manufacturedIncomeRequirement" : {
-                              "totalRatio" : 1
-                            }
-                          },
-                          "durationType" : {
-                            "durationType" : "TERM"
-                          },
-                          "meta" : {
-                            "globalKey" : "73453ae0"
-                          },
-                          "minimumFee" : {
-                            "unit" : {
-                              "currency" : {
-                                "value" : "USD"
+                                "globalKey" : "fa42f5cf"
                               }
                             },
-                            "value" : 0,
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "T",
+                              "meta" : {
+                                "globalKey" : "24b525"
+                              },
+                              "rollConvention" : "NONE"
+                            },
                             "meta" : {
-                              "globalKey" : "171b36"
+                              "globalKey" : "8b1de243"
                             }
                           },
-                          "securityInformation" : {
-                            "meta" : {
-                              "globalKey" : "7548eca6"
+                          "paymentDates" : {
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "T",
+                              "meta" : {
+                                "globalKey" : "73"
+                              }
                             },
-                            "security" : {
-                              "productIdentifier" : [ {
-                                "value" : {
-                                  "identifier" : {
-                                    "value" : "ST001"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "a4ff65ff"
-                                  },
-                                  "source" : "SEDOL"
+                            "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCenter" : [ {
+                                  "value" : "EUTA"
+                                } ],
+                                "meta" : {
+                                  "globalKey" : "20a71d"
                                 }
-                              } ],
-                              "securityType" : "EQUITY"
+                              },
+                              "meta" : {
+                                "globalKey" : "365baaee"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "fa98fa5b"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "98fd77d9"
                           }
                         } ],
-                        "interestRatePayout" : [ {
+                        "assetPayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
-                          },
-                          "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "quantitySchedule" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "quantity-8"
-                              }
-                            }
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "25e2ab"
-                              },
-                              "period" : "T",
-                              "periodMultiplier" : 1,
-                              "rollConvention" : "NONE"
-                            },
-                            "effectiveDate" : {
+                          "assetLeg" : [ {
+                            "settlementDate" : {
                               "adjustableDate" : {
-                                "adjustedDate" : {
+                                "dateAdjustments" : {
+                                  "businessDayConvention" : "NONE",
                                   "meta" : {
-                                    "globalKey" : "3f2256"
-                                  },
-                                  "value" : "2020-09-22"
+                                    "globalKey" : "24a738"
+                                  }
                                 },
-                                "dateAdjustments" : {
-                                  "businessDayConvention" : "MODFOLLOWING",
+                                "adjustedDate" : {
+                                  "value" : "2020-09-22",
                                   "meta" : {
-                                    "globalKey" : "fa42f5cf"
+                                    "globalKey" : "3f2256"
                                   }
                                 },
                                 "meta" : {
-                                  "externalKey" : "Effective_Date",
-                                  "globalKey" : "fa42f5cf"
+                                  "globalKey" : "24a738"
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "fa42f5cf"
+                                "globalKey" : "24a738"
                               }
                             },
-                            "meta" : {
-                              "globalKey" : "a4273c9"
-                            },
-                            "terminationDate" : {
+                            "deliveryMethod" : "DeliveryVersusPayment"
+                          }, {
+                            "settlementDate" : {
                               "adjustableDate" : {
-                                "adjustedDate" : {
+                                "dateAdjustments" : {
+                                  "businessDayConvention" : "NONE",
                                   "meta" : {
-                                    "globalKey" : "3f2296"
-                                  },
-                                  "value" : "2020-10-22"
+                                    "globalKey" : "24a738"
+                                  }
                                 },
-                                "dateAdjustments" : {
-                                  "businessDayConvention" : "MODFOLLOWING",
+                                "adjustedDate" : {
+                                  "value" : "2020-10-22",
                                   "meta" : {
-                                    "globalKey" : "fa42f5cf"
+                                    "globalKey" : "3f2296"
                                   }
                                 },
                                 "meta" : {
-                                  "externalKey" : "Termination_Date",
-                                  "globalKey" : "fa42f5cf"
+                                  "globalKey" : "24a738"
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "fa42f5cf"
+                                "globalKey" : "24a738"
                               }
+                            },
+                            "deliveryMethod" : "DeliveryVersusPayment"
+                          } ],
+                          "securityInformation" : {
+                            "security" : {
+                              "productIdentifier" : [ {
+                                "value" : {
+                                  "identifier" : {
+                                    "value" : "ST001"
+                                  },
+                                  "source" : "SEDOL",
+                                  "meta" : {
+                                    "globalKey" : "a4ff65ff"
+                                  }
+                                }
+                              } ],
+                              "securityType" : "Equity"
+                            },
+                            "meta" : {
+                              "globalKey" : "7548eca6"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "ce90278b"
+                          "durationType" : {
+                            "durationType" : "Term"
                           },
-                          "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "b578507f"
-                            },
-                            "paymentDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCenter" : [ {
-                                  "value" : "EUTA"
-                                } ],
-                                "meta" : {
-                                  "globalKey" : "20a71d"
-                                }
-                              },
-                              "businessDayConvention" : "MODFOLLOWING",
-                              "meta" : {
-                                "globalKey" : "365baaee"
+                          "minimumFee" : {
+                            "value" : 0,
+                            "unit" : {
+                              "currency" : {
+                                "value" : "USD"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "a2d"
-                              },
-                              "period" : "T",
-                              "periodMultiplier" : 1
+                            "meta" : {
+                              "globalKey" : "171b36"
                             }
                           },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-2"
-                                  }
-                                }
-                              }
+                          "dividendTerms" : {
+                            "manufacturedIncomeRequirement" : {
+                              "totalRatio" : 1
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "3b19750e"
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "eb31e26b"
+                          "globalKey" : "43b3b6a7"
                         }
                       },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "MODFOLLOWING",
+                      "collateral" : {
+                        "collateralProvisions" : {
+                          "collateralType" : "Cash",
+                          "eligibleCollateral" : [ {
+                            "criteria" : [ {
+                              "treatment" : {
+                                "valuationTreatment" : {
+                                  "marginPercentage" : 0.02
+                                }
+                              }
+                            } ],
                             "meta" : {
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "168480"
                             }
-                          },
-                          "meta" : {
-                            "globalKey" : "e743cae5"
-                          },
-                          "unadjustedDate" : "2020-10-22"
-                        },
-                        "meta" : {
-                          "globalKey" : "e743cae5"
+                          } ]
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "37405ce2"
+                      "globalKey" : "38d91964"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "37405ce2"
+                    "globalKey" : "38d91964"
                   }
                 },
                 "tradeLot" : [ {
                   "priceQuantity" : [ {
-                    "meta" : {
-                      "globalKey" : "bc2d9a59"
-                    },
                     "price" : [ {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        } ]
-                      },
                       "value" : {
+                        "value" : 0.01,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 0.01,
                         "perUnitOf" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "priceType" : "INTEREST_RATE"
-                      }
-                    } ],
-                    "quantity" : [ {
+                        "priceType" : "InterestRate"
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
-                          "value" : "quantity-8"
+                          "value" : "price-2"
                         } ]
-                      },
+                      }
+                    } ],
+                    "quantity" : [ {
                       "value" : {
+                        "value" : 5000000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
-                        },
-                        "value" : 5000000
-                      }
-                    } ]
-                  }, {
-                    "meta" : {
-                      "globalKey" : "a0b25412"
-                    },
-                    "observable" : {
-                      "meta" : {
-                        "globalKey" : "a4ff65ff"
-                      },
-                      "productIdentifier" : [ {
-                        "value" : {
-                          "identifier" : {
-                            "value" : "ST001"
-                          },
-                          "meta" : {
-                            "globalKey" : "a4ff65ff"
-                          },
-                          "source" : "SEDOL"
                         }
-                      } ]
-                    },
-                    "price" : [ {
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
-                          "value" : "price-1"
+                          "value" : "quantity-8"
                         } ]
-                      },
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "c985b0c7"
+                    }
+                  }, {
+                    "price" : [ {
                       "value" : {
+                        "value" : 25,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 25,
                         "perUnitOf" : {
-                          "financialUnit" : "SHARE"
+                          "financialUnit" : "Share"
                         },
-                        "priceType" : "ASSET_PRICE"
+                        "priceType" : "AssetPrice"
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        } ]
                       }
                     } ],
                     "quantity" : [ {
+                      "value" : {
+                        "value" : 200000,
+                        "unit" : {
+                          "financialUnit" : "Share"
+                        }
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-9"
                         } ]
+                      }
+                    } ],
+                    "observable" : {
+                      "productIdentifier" : [ {
+                        "value" : {
+                          "identifier" : {
+                            "value" : "ST001"
+                          },
+                          "source" : "SEDOL",
+                          "meta" : {
+                            "globalKey" : "a4ff65ff"
+                          }
+                        }
+                      } ],
+                      "meta" : {
+                        "globalKey" : "a4ff65ff"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "998f6e8c"
+                    }
+                  } ]
+                } ],
+                "counterparty" : [ {
+                  "role" : "Party1",
+                  "partyReference" : {
+                    "value" : {
+                      "partyId" : [ {
+                        "identifier" : {
+                          "value" : "FM1LEI11111111111111"
+                        },
+                        "meta" : {
+                          "globalKey" : "87c4d1c6"
+                        }
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
                       },
-                      "value" : {
-                        "unit" : {
-                          "financialUnit" : "SHARE"
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
+                    }
+                  }
+                }, {
+                  "role" : "Party2",
+                  "partyReference" : {
+                    "value" : {
+                      "partyId" : [ {
+                        "identifier" : {
+                          "value" : "CP001LEI111111111111"
                         },
-                        "value" : 200000
+                        "meta" : {
+                          "globalKey" : "12818f8c"
+                        }
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
                       }
-                    } ]
-                  } ]
+                    }
+                  }
                 } ]
               },
-              "tradeDate" : {
+              "party" : [ {
+                "partyId" : [ {
+                  "identifier" : {
+                    "value" : "FM1LEI11111111111111"
+                  },
+                  "meta" : {
+                    "globalKey" : "87c4d1c6"
+                  }
+                } ],
+                "name" : {
+                  "value" : "Standard Fund 1"
+                },
                 "meta" : {
-                  "globalKey" : "3f2255"
+                  "globalKey" : "40ec509f",
+                  "externalKey" : "Lender0"
+                }
+              }, {
+                "partyId" : [ {
+                  "identifier" : {
+                    "value" : "KTKLLEILLLLLLLLLLLLL"
+                  },
+                  "meta" : {
+                    "globalKey" : "60098fe6"
+                  }
+                } ],
+                "name" : {
+                  "value" : "KTKL"
                 },
-                "value" : "2020-09-21"
-              },
-              "tradeIdentifier" : [ {
-                "assignedIdentifier" : [ {
+                "meta" : {
+                  "globalKey" : "84088af0",
+                  "externalKey" : "AGENT_LENDER"
+                }
+              }, {
+                "partyId" : [ {
                   "identifier" : {
-                    "value" : "0266001"
+                    "value" : "CP001LEI111111111111"
+                  },
+                  "meta" : {
+                    "globalKey" : "12818f8c"
                   }
                 } ],
-                "issuer" : {
-                  "value" : "KTKL"
+                "name" : {
+                  "value" : "CP001"
                 },
                 "meta" : {
-                  "globalKey" : "9e641379"
+                  "globalKey" : "7c311b30",
+                  "externalKey" : "Borrower"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "199bc407"
+              }
+            },
+            "state" : {
+              "positionState" : "Executed"
+            },
+            "meta" : {
+              "globalKey" : "ca26c5d6"
             }
           }
-        },
+        }
+      } ]
+    },
+    "previousWorkflowStep" : {
+      "globalReference" : "954eed3f"
+    },
+    "messageInformation" : {
+      "messageId" : {
+        "value" : "message-id-1"
+      }
+    },
+    "timestamp" : [ {
+      "dateTime" : "2020-09-21T15:00:00Z",
+      "qualification" : "eventCreationDateTime"
+    } ],
+    "eventIdentifier" : [ {
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "workflow-id-1"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "414b814d"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "ebe3fad9"
+    }
+  }, {
+    "businessEvent" : {
+      "eventDate" : "2020-09-22",
+      "instruction" : [ {
         "primitiveInstruction" : {
           "transfer" : {
             "transferState" : [ {
-              "meta" : {
-                "globalKey" : "637bd5fe"
-              },
               "transfer" : {
+                "quantity" : {
+                  "value" : 100000.00,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                },
                 "payerReceiver" : {
                   "payerPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "CP001LEI111111111111"
@@ -1618,18 +1779,18 @@
                         "meta" : {
                           "globalKey" : "12818f8c"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
+                      }
                     }
                   },
                   "receiverPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "FM1LEI11111111111111"
@@ -1637,63 +1798,61 @@
                         "meta" : {
                           "globalKey" : "87c4d1c6"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
+                      },
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
                     }
                   }
                 },
-                "quantity" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 100000.00
-                },
                 "settlementDate" : {
                   "adjustedDate" : {
+                    "value" : "2020-09-22",
                     "meta" : {
                       "globalKey" : "3f2256"
-                    },
-                    "value" : "2020-09-22"
+                    }
                   }
                 },
                 "settlementOrigin" : {
                   "assetPayout" : {
-                    "globalReference" : "73453ae0"
+                    "globalReference" : "3b19750e"
                   }
                 }
+              },
+              "meta" : {
+                "globalKey" : "a37ecfe6"
               }
             }, {
-              "meta" : {
-                "globalKey" : "79e525e7"
-              },
               "transfer" : {
+                "quantity" : {
+                  "value" : 200000,
+                  "unit" : {
+                    "financialUnit" : "Share"
+                  }
+                },
                 "observable" : {
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
                   "productIdentifier" : [ {
                     "value" : {
                       "identifier" : {
                         "value" : "ST001"
                       },
+                      "source" : "SEDOL",
                       "meta" : {
                         "globalKey" : "a4ff65ff"
-                      },
-                      "source" : "SEDOL"
+                      }
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
                 },
                 "payerReceiver" : {
                   "payerPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "FM1LEI11111111111111"
@@ -1701,18 +1860,18 @@
                         "meta" : {
                           "globalKey" : "87c4d1c6"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
+                      },
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
                     }
                   },
                   "receiverPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "CP001LEI111111111111"
@@ -1720,174 +1879,87 @@
                         "meta" : {
                           "globalKey" : "12818f8c"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
+                      }
                     }
                   }
                 },
-                "quantity" : {
-                  "unit" : {
-                    "financialUnit" : "SHARE"
-                  },
-                  "value" : 200000
-                },
                 "settlementDate" : {
                   "adjustedDate" : {
+                    "value" : "2020-09-22",
                     "meta" : {
                       "globalKey" : "3f2256"
-                    },
-                    "value" : "2020-09-22"
+                    }
                   }
                 },
                 "settlementOrigin" : {
                   "assetPayout" : {
-                    "globalReference" : "73453ae0"
+                    "globalReference" : "3b19750e"
                   }
                 }
+              },
+              "meta" : {
+                "globalKey" : "2d4d67b9"
               }
             } ]
           }
-        }
-      } ]
-    },
-    "timestamp" : [ {
-      "dateTime" : "2020-09-21T15:00:00Z",
-      "qualification" : "EVENT_CREATION_DATE_TIME"
-    } ]
-  }, {
-    "businessEvent" : {
-      "eventDate" : "2020-09-22",
-      "instruction" : [ {
+        },
         "before" : {
           "value" : {
-            "meta" : {
-              "globalKey" : "1b2ed6bc"
-            },
-            "state" : {
-              "positionState" : "EXECUTED"
-            },
             "trade" : {
-              "meta" : {
-                "globalKey" : "3ae100ed"
-              },
-              "party" : [ {
-                "meta" : {
-                  "externalKey" : "Lender0",
-                  "globalKey" : "a896ecd"
-                },
-                "name" : {
-                  "value" : "Standard Fund 1"
-                },
-                "partyId" : [ {
-                  "identifier" : {
-                    "value" : "FM1LEI11111111111111"
-                  },
-                  "meta" : {
-                    "globalKey" : "87c4d1c6"
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "externalKey" : "AGENT_LENDER",
-                  "globalKey" : "73176f1c"
-                },
-                "name" : {
+              "tradeIdentifier" : [ {
+                "issuer" : {
                   "value" : "KTKL"
                 },
-                "partyId" : [ {
+                "assignedIdentifier" : [ {
                   "identifier" : {
-                    "value" : "KTKLLEILLLLLLLLLLLLL"
-                  },
-                  "meta" : {
-                    "globalKey" : "60098fe6"
+                    "value" : "0266001"
                   }
-                } ]
-              }, {
+                } ],
                 "meta" : {
-                  "externalKey" : "Borrower",
-                  "globalKey" : "1f061e68"
-                },
-                "name" : {
-                  "value" : "CP001"
-                },
-                "partyId" : [ {
-                  "identifier" : {
-                    "value" : "CP001LEI111111111111"
-                  },
-                  "meta" : {
-                    "globalKey" : "12818f8c"
-                  }
-                } ]
+                  "globalKey" : "569d85e5"
+                }
               } ],
-              "tradableProduct" : {
-                "counterparty" : [ {
-                  "partyReference" : {
-                    "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
-                      "partyId" : [ {
-                        "identifier" : {
-                          "value" : "FM1LEI11111111111111"
-                        },
-                        "meta" : {
-                          "globalKey" : "87c4d1c6"
-                        }
-                      } ]
-                    }
-                  },
-                  "role" : "PARTY_1"
-                }, {
-                  "partyReference" : {
-                    "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
-                      "partyId" : [ {
-                        "identifier" : {
-                          "value" : "CP001LEI111111111111"
-                        },
-                        "meta" : {
-                          "globalKey" : "12818f8c"
-                        }
-                      } ]
-                    }
-                  },
-                  "role" : "PARTY_2"
-                } ],
-                "product" : {
-                  "contractualProduct" : {
-                    "productTaxonomy" : [ {
-                      "source" : "ISDA",
-                      "productQualifier" : "SecurityLendingAgreement"
-                    } ],
-                    "economicTerms" : {
-                      "collateral" : {
-                        "collateralProvisions" : {
-                          "collateralType" : "CASH",
-                          "eligibleCollateral" : [ {
-                            "criteria" : [ {
-                              "treatment" : {
-                                "valuationTreatment" : {
-                                  "marginPercentage" : 0.02
-                                }
-                              }
-                            } ],
+              "tradeDate" : {
+                "value" : "2020-09-21",
+                "meta" : {
+                  "globalKey" : "3f2255"
+                }
+              },
+              "tradableProduct" : {
+                "product" : {
+                  "contractualProduct" : {
+                    "productTaxonomy" : [ {
+                      "source" : "ISDA",
+                      "productQualifier" : "SecurityLendingAgreement"
+                    } ],
+                    "economicTerms" : {
+                      "effectiveDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2020-09-22",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "168480"
+                              "globalKey" : "fa42f5cf"
                             }
-                          } ]
+                          },
+                          "meta" : {
+                            "globalKey" : "e742daa5"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "e742daa5"
                         }
                       },
-                      "effectiveDate" : {
+                      "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2020-10-22",
                           "dateAdjustments" : {
                             "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
@@ -1895,486 +1967,366 @@
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e742daa5"
-                          },
-                          "unadjustedDate" : "2020-09-22"
+                            "globalKey" : "e743cae5"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "e742daa5"
+                          "globalKey" : "e743cae5"
                         }
                       },
                       "payout" : {
-                        "assetPayout" : [ {
+                        "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
-                          "assetLeg" : [ {
-                            "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                            "settlementDate" : {
+                          "priceQuantity" : {
+                            "quantitySchedule" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "quantity-8"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          },
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-2"
+                                  }
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "0"
+                              }
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
+                            "effectiveDate" : {
                               "adjustableDate" : {
-                                "adjustedDate" : {
+                                "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
-                                    "globalKey" : "3f2256"
-                                  },
-                                  "value" : "2020-09-22"
+                                    "globalKey" : "fa42f5cf"
+                                  }
                                 },
-                                "dateAdjustments" : {
-                                  "businessDayConvention" : "NONE",
+                                "adjustedDate" : {
+                                  "value" : "2020-09-22",
                                   "meta" : {
-                                    "globalKey" : "24a738"
+                                    "globalKey" : "3f2256"
                                   }
                                 },
                                 "meta" : {
-                                  "globalKey" : "24a738"
+                                  "globalKey" : "fa42f5cf",
+                                  "externalKey" : "Effective_Date"
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "24a738"
+                                "globalKey" : "fa42f5cf"
                               }
-                            }
-                          }, {
-                            "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                            "settlementDate" : {
+                            },
+                            "terminationDate" : {
                               "adjustableDate" : {
-                                "adjustedDate" : {
+                                "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
-                                    "globalKey" : "3f2296"
-                                  },
-                                  "value" : "2020-10-22"
+                                    "globalKey" : "fa42f5cf"
+                                  }
                                 },
-                                "dateAdjustments" : {
-                                  "businessDayConvention" : "NONE",
+                                "adjustedDate" : {
+                                  "value" : "2020-10-22",
                                   "meta" : {
-                                    "globalKey" : "24a738"
+                                    "globalKey" : "3f2296"
                                   }
                                 },
                                 "meta" : {
-                                  "globalKey" : "24a738"
+                                  "globalKey" : "fa42f5cf",
+                                  "externalKey" : "Termination_Date"
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            }
-                          } ],
-                          "dividendTerms" : {
-                            "manufacturedIncomeRequirement" : {
-                              "totalRatio" : 1
-                            }
-                          },
-                          "durationType" : {
-                            "durationType" : "TERM"
-                          },
-                          "meta" : {
-                            "globalKey" : "73453ae0"
-                          },
-                          "minimumFee" : {
-                            "unit" : {
-                              "currency" : {
-                                "value" : "USD"
+                                "globalKey" : "fa42f5cf"
                               }
                             },
-                            "value" : 0,
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "T",
+                              "meta" : {
+                                "globalKey" : "24b525"
+                              },
+                              "rollConvention" : "NONE"
+                            },
                             "meta" : {
-                              "globalKey" : "171b36"
+                              "globalKey" : "8b1de243"
                             }
                           },
-                          "securityInformation" : {
-                            "meta" : {
-                              "globalKey" : "7548eca6"
+                          "paymentDates" : {
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "T",
+                              "meta" : {
+                                "globalKey" : "73"
+                              }
                             },
-                            "security" : {
-                              "productIdentifier" : [ {
-                                "value" : {
-                                  "identifier" : {
-                                    "value" : "ST001"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "a4ff65ff"
-                                  },
-                                  "source" : "SEDOL"
+                            "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCenter" : [ {
+                                  "value" : "EUTA"
+                                } ],
+                                "meta" : {
+                                  "globalKey" : "20a71d"
                                 }
-                              } ],
-                              "securityType" : "EQUITY"
+                              },
+                              "meta" : {
+                                "globalKey" : "365baaee"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "fa98fa5b"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "98fd77d9"
                           }
                         } ],
-                        "interestRatePayout" : [ {
+                        "assetPayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
-                          },
-                          "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "quantitySchedule" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "quantity-8"
-                              }
-                            }
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "25e2ab"
-                              },
-                              "period" : "T",
-                              "periodMultiplier" : 1,
-                              "rollConvention" : "NONE"
-                            },
-                            "effectiveDate" : {
+                          "assetLeg" : [ {
+                            "settlementDate" : {
                               "adjustableDate" : {
-                                "adjustedDate" : {
+                                "dateAdjustments" : {
+                                  "businessDayConvention" : "NONE",
                                   "meta" : {
-                                    "globalKey" : "3f2256"
-                                  },
-                                  "value" : "2020-09-22"
+                                    "globalKey" : "24a738"
+                                  }
                                 },
-                                "dateAdjustments" : {
-                                  "businessDayConvention" : "MODFOLLOWING",
+                                "adjustedDate" : {
+                                  "value" : "2020-09-22",
                                   "meta" : {
-                                    "globalKey" : "fa42f5cf"
+                                    "globalKey" : "3f2256"
                                   }
                                 },
                                 "meta" : {
-                                  "externalKey" : "Effective_Date",
-                                  "globalKey" : "fa42f5cf"
+                                  "globalKey" : "24a738"
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "fa42f5cf"
+                                "globalKey" : "24a738"
                               }
                             },
-                            "meta" : {
-                              "globalKey" : "a4273c9"
-                            },
-                            "terminationDate" : {
+                            "deliveryMethod" : "DeliveryVersusPayment"
+                          }, {
+                            "settlementDate" : {
                               "adjustableDate" : {
-                                "adjustedDate" : {
+                                "dateAdjustments" : {
+                                  "businessDayConvention" : "NONE",
                                   "meta" : {
-                                    "globalKey" : "3f2296"
-                                  },
-                                  "value" : "2020-10-22"
+                                    "globalKey" : "24a738"
+                                  }
                                 },
-                                "dateAdjustments" : {
-                                  "businessDayConvention" : "MODFOLLOWING",
+                                "adjustedDate" : {
+                                  "value" : "2020-10-22",
                                   "meta" : {
-                                    "globalKey" : "fa42f5cf"
+                                    "globalKey" : "3f2296"
                                   }
                                 },
                                 "meta" : {
-                                  "externalKey" : "Termination_Date",
-                                  "globalKey" : "fa42f5cf"
+                                  "globalKey" : "24a738"
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "fa42f5cf"
+                                "globalKey" : "24a738"
                               }
-                            }
-                          },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "ce90278b"
-                          },
-                          "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "b578507f"
                             },
-                            "paymentDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCenter" : [ {
-                                  "value" : "EUTA"
-                                } ],
-                                "meta" : {
-                                  "globalKey" : "20a71d"
+                            "deliveryMethod" : "DeliveryVersusPayment"
+                          } ],
+                          "securityInformation" : {
+                            "security" : {
+                              "productIdentifier" : [ {
+                                "value" : {
+                                  "identifier" : {
+                                    "value" : "ST001"
+                                  },
+                                  "source" : "SEDOL",
+                                  "meta" : {
+                                    "globalKey" : "a4ff65ff"
+                                  }
                                 }
-                              },
-                              "businessDayConvention" : "MODFOLLOWING",
-                              "meta" : {
-                                "globalKey" : "365baaee"
+                              } ],
+                              "securityType" : "Equity"
+                            },
+                            "meta" : {
+                              "globalKey" : "7548eca6"
+                            }
+                          },
+                          "durationType" : {
+                            "durationType" : "Term"
+                          },
+                          "minimumFee" : {
+                            "value" : 0,
+                            "unit" : {
+                              "currency" : {
+                                "value" : "USD"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "a2d"
-                              },
-                              "period" : "T",
-                              "periodMultiplier" : 1
+                            "meta" : {
+                              "globalKey" : "171b36"
                             }
                           },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-2"
-                                  }
-                                }
-                              }
+                          "dividendTerms" : {
+                            "manufacturedIncomeRequirement" : {
+                              "totalRatio" : 1
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "3b19750e"
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "eb31e26b"
+                          "globalKey" : "43b3b6a7"
                         }
                       },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "MODFOLLOWING",
+                      "collateral" : {
+                        "collateralProvisions" : {
+                          "collateralType" : "Cash",
+                          "eligibleCollateral" : [ {
+                            "criteria" : [ {
+                              "treatment" : {
+                                "valuationTreatment" : {
+                                  "marginPercentage" : 0.02
+                                }
+                              }
+                            } ],
                             "meta" : {
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "168480"
                             }
-                          },
-                          "meta" : {
-                            "globalKey" : "e743cae5"
-                          },
-                          "unadjustedDate" : "2020-10-22"
-                        },
-                        "meta" : {
-                          "globalKey" : "e743cae5"
+                          } ]
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "37405ce2"
+                      "globalKey" : "38d91964"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "37405ce2"
+                    "globalKey" : "38d91964"
                   }
                 },
                 "tradeLot" : [ {
                   "priceQuantity" : [ {
-                    "meta" : {
-                      "globalKey" : "bc2d9a59"
-                    },
                     "price" : [ {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        } ]
-                      },
                       "value" : {
+                        "value" : 0.01,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 0.01,
                         "perUnitOf" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "priceType" : "INTEREST_RATE"
-                      }
-                    } ],
-                    "quantity" : [ {
+                        "priceType" : "InterestRate"
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
-                          "value" : "quantity-8"
+                          "value" : "price-2"
                         } ]
-                      },
+                      }
+                    } ],
+                    "quantity" : [ {
                       "value" : {
+                        "value" : 5000000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
-                        },
-                        "value" : 5000000
-                      }
-                    } ]
-                  }, {
-                    "meta" : {
-                      "globalKey" : "a0b25412"
-                    },
-                    "observable" : {
-                      "meta" : {
-                        "globalKey" : "a4ff65ff"
-                      },
-                      "productIdentifier" : [ {
-                        "value" : {
-                          "identifier" : {
-                            "value" : "ST001"
-                          },
-                          "meta" : {
-                            "globalKey" : "a4ff65ff"
-                          },
-                          "source" : "SEDOL"
                         }
-                      } ]
-                    },
-                    "price" : [ {
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
-                          "value" : "price-1"
+                          "value" : "quantity-8"
                         } ]
-                      },
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "c985b0c7"
+                    }
+                  }, {
+                    "price" : [ {
                       "value" : {
+                        "value" : 25,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 25,
                         "perUnitOf" : {
-                          "financialUnit" : "SHARE"
+                          "financialUnit" : "Share"
                         },
-                        "priceType" : "ASSET_PRICE"
+                        "priceType" : "AssetPrice"
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        } ]
                       }
                     } ],
                     "quantity" : [ {
+                      "value" : {
+                        "value" : 200000,
+                        "unit" : {
+                          "financialUnit" : "Share"
+                        }
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-9"
                         } ]
-                      },
-                      "value" : {
-                        "unit" : {
-                          "financialUnit" : "SHARE"
-                        },
-                        "value" : 200000
                       }
-                    } ]
-                  } ]
-                } ]
-              },
-              "tradeDate" : {
-                "meta" : {
-                  "globalKey" : "3f2255"
-                },
-                "value" : "2020-09-21"
-              },
-              "tradeIdentifier" : [ {
-                "assignedIdentifier" : [ {
-                  "identifier" : {
-                    "value" : "0266001"
-                  }
-                } ],
-                "issuer" : {
-                  "value" : "KTKL"
-                },
-                "meta" : {
-                  "globalKey" : "9e641379"
-                }
-              } ]
-            }
-          }
-        },
-        "primitiveInstruction" : {
-          "transfer" : {
-            "transferState" : [ {
-              "meta" : {
-                "globalKey" : "637bd5fe"
-              },
-              "transfer" : {
-                "payerReceiver" : {
-                  "payerPartyReference" : {
-                    "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
-                      "partyId" : [ {
-                        "identifier" : {
-                          "value" : "CP001LEI111111111111"
-                        },
-                        "meta" : {
-                          "globalKey" : "12818f8c"
-                        }
-                      } ]
-                    }
-                  },
-                  "receiverPartyReference" : {
-                    "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
-                      "partyId" : [ {
-                        "identifier" : {
-                          "value" : "FM1LEI11111111111111"
-                        },
-                        "meta" : {
-                          "globalKey" : "87c4d1c6"
+                    } ],
+                    "observable" : {
+                      "productIdentifier" : [ {
+                        "value" : {
+                          "identifier" : {
+                            "value" : "ST001"
+                          },
+                          "source" : "SEDOL",
+                          "meta" : {
+                            "globalKey" : "a4ff65ff"
+                          }
                         }
-                      } ]
-                    }
-                  }
-                },
-                "quantity" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 100000.00
-                },
-                "settlementDate" : {
-                  "adjustedDate" : {
-                    "meta" : {
-                      "globalKey" : "3f2256"
-                    },
-                    "value" : "2020-09-22"
-                  }
-                },
-                "settlementOrigin" : {
-                  "assetPayout" : {
-                    "globalReference" : "73453ae0"
-                  }
-                }
-              }
-            }, {
-              "meta" : {
-                "globalKey" : "79e525e7"
-              },
-              "transfer" : {
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "value" : "ST001"
-                      },
+                      } ],
                       "meta" : {
                         "globalKey" : "a4ff65ff"
-                      },
-                      "source" : "SEDOL"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "998f6e8c"
                     }
                   } ]
-                },
-                "payerReceiver" : {
-                  "payerPartyReference" : {
+                } ],
+                "counterparty" : [ {
+                  "role" : "Party1",
+                  "partyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "FM1LEI11111111111111"
@@ -2382,18 +2334,20 @@
                         "meta" : {
                           "globalKey" : "87c4d1c6"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
+                      },
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
                     }
-                  },
-                  "receiverPartyReference" : {
+                  }
+                }, {
+                  "role" : "Party2",
+                  "partyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "CP001LEI111111111111"
@@ -2401,138 +2355,103 @@
                         "meta" : {
                           "globalKey" : "12818f8c"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
+                      }
                     }
                   }
-                },
-                "quantity" : {
-                  "unit" : {
-                    "financialUnit" : "SHARE"
+                } ]
+              },
+              "party" : [ {
+                "partyId" : [ {
+                  "identifier" : {
+                    "value" : "FM1LEI11111111111111"
                   },
-                  "value" : 200000
+                  "meta" : {
+                    "globalKey" : "87c4d1c6"
+                  }
+                } ],
+                "name" : {
+                  "value" : "Standard Fund 1"
                 },
-                "settlementDate" : {
-                  "adjustedDate" : {
-                    "meta" : {
-                      "globalKey" : "3f2256"
-                    },
-                    "value" : "2020-09-22"
+                "meta" : {
+                  "globalKey" : "40ec509f",
+                  "externalKey" : "Lender0"
+                }
+              }, {
+                "partyId" : [ {
+                  "identifier" : {
+                    "value" : "KTKLLEILLLLLLLLLLLLL"
+                  },
+                  "meta" : {
+                    "globalKey" : "60098fe6"
                   }
+                } ],
+                "name" : {
+                  "value" : "KTKL"
                 },
-                "settlementOrigin" : {
-                  "assetPayout" : {
-                    "globalReference" : "73453ae0"
+                "meta" : {
+                  "globalKey" : "84088af0",
+                  "externalKey" : "AGENT_LENDER"
+                }
+              }, {
+                "partyId" : [ {
+                  "identifier" : {
+                    "value" : "CP001LEI111111111111"
+                  },
+                  "meta" : {
+                    "globalKey" : "12818f8c"
                   }
+                } ],
+                "name" : {
+                  "value" : "CP001"
+                },
+                "meta" : {
+                  "globalKey" : "7c311b30",
+                  "externalKey" : "Borrower"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "199bc407"
               }
-            } ]
+            },
+            "state" : {
+              "positionState" : "Executed"
+            },
+            "meta" : {
+              "globalKey" : "ca26c5d6"
+            }
           }
         }
       } ],
+      "eventQualifier" : "CashAndSecurityTransfer",
       "after" : [ {
-        "meta" : {
-          "globalKey" : "55612bed"
-        },
-        "state" : {
-          "positionState" : "EXECUTED"
-        },
         "trade" : {
-          "meta" : {
-            "globalKey" : "3ae100ed"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "Lender0",
-              "globalKey" : "a896ecd"
-            },
-            "name" : {
-              "value" : "Standard Fund 1"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "FM1LEI11111111111111"
-              },
-              "meta" : {
-                "globalKey" : "87c4d1c6"
-              }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "AGENT_LENDER",
-              "globalKey" : "73176f1c"
-            },
-            "name" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
               "value" : "KTKL"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
-                "value" : "KTKLLEILLLLLLLLLLLLL"
-              },
-              "meta" : {
-                "globalKey" : "60098fe6"
+                "value" : "0266001"
               }
-            } ]
-          }, {
+            } ],
             "meta" : {
-              "externalKey" : "Borrower",
-              "globalKey" : "1f061e68"
-            },
-            "name" : {
-              "value" : "CP001"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "CP001LEI111111111111"
-              },
-              "meta" : {
-                "globalKey" : "12818f8c"
-              }
-            } ]
+              "globalKey" : "569d85e5"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "2020-09-21",
+            "meta" : {
+              "globalKey" : "3f2255"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "FM1LEI11111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "87c4d1c6"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "CP001LEI111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "12818f8c"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -2540,223 +2459,144 @@
                   "productQualifier" : "SecurityLendingAgreement"
                 } ],
                 "economicTerms" : {
-                  "collateral" : {
-                    "collateralProvisions" : {
-                      "collateralType" : "CASH",
-                      "eligibleCollateral" : [ {
-                        "criteria" : [ {
-                          "treatment" : {
-                            "valuationTreatment" : {
-                              "marginPercentage" : 0.02
-                            }
-                          }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "168480"
-                        }
-                      } ]
-                    }
-                  },
                   "effectiveDate" : {
                     "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "fa42f5cf"
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "e742daa5"
-                      },
-                      "unadjustedDate" : "2020-09-22"
-                    },
-                    "meta" : {
-                      "globalKey" : "e742daa5"
-                    }
-                  },
-                  "payout" : {
-                    "assetPayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
-                      },
-                      "assetLeg" : [ {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
-                          "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
-                            },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
-                              "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        }
-                      }, {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
-                          "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
-                            },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
-                              "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        }
-                      } ],
-                      "dividendTerms" : {
-                        "manufacturedIncomeRequirement" : {
-                          "totalRatio" : 1
-                        }
-                      },
-                      "durationType" : {
-                        "durationType" : "TERM"
-                      },
-                      "meta" : {
-                        "globalKey" : "73453ae0"
-                      },
-                      "minimumFee" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "USD"
-                          }
-                        },
-                        "value" : 0,
+                      "unadjustedDate" : "2020-09-22",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "171b36"
+                          "globalKey" : "fa42f5cf"
                         }
                       },
-                      "securityInformation" : {
+                      "meta" : {
+                        "globalKey" : "e742daa5"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "e742daa5"
+                    }
+                  },
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2020-10-22",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "7548eca6"
-                        },
-                        "security" : {
-                          "productIdentifier" : [ {
-                            "value" : {
-                              "identifier" : {
-                                "value" : "ST001"
-                              },
-                              "meta" : {
-                                "globalKey" : "a4ff65ff"
-                              },
-                              "source" : "SEDOL"
-                            }
-                          } ],
-                          "securityType" : "EQUITY"
+                          "globalKey" : "fa42f5cf"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "e743cae5"
                       }
-                    } ],
+                    },
+                    "meta" : {
+                      "globalKey" : "e743cae5"
+                    }
+                  },
+                  "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-8"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "25e2ab"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-2"
+                              }
+                            }
                           },
-                          "period" : "T",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "NONE"
-                        },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
-                            },
                             "dateAdjustments" : {
                               "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "fa42f5cf"
                               }
                             },
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
+                              "meta" : {
+                                "globalKey" : "3f2256"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "Effective_Date",
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Effective_Date"
                             }
                           },
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "a4273c9"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
-                            },
                             "dateAdjustments" : {
                               "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "fa42f5cf"
                               }
                             },
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
+                              "meta" : {
+                                "globalKey" : "3f2296"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "Termination_Date",
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Termination_Date"
                             }
                           },
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
+                        },
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "24b525"
+                          },
+                          "rollConvention" : "NONE"
+                        },
+                        "meta" : {
+                          "globalKey" : "8b1de243"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "ce90278b"
-                      },
                       "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "b578507f"
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "73"
+                          }
                         },
                         "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -2765,200 +2605,356 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
-                        "paymentFrequency" : {
-                          "meta" : {
-                            "globalKey" : "a2d"
-                          },
-                          "period" : "T",
-                          "periodMultiplier" : 1
+                        "meta" : {
+                          "globalKey" : "fa98fa5b"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "meta" : {
+                        "globalKey" : "98fd77d9"
+                      }
+                    } ],
+                    "assetPayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "assetLeg" : [ {
+                        "settlementDate" : {
+                          "adjustableDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
+                              "meta" : {
+                                "globalKey" : "3f2256"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
                           "meta" : {
-                            "globalKey" : "0"
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      }, {
+                        "settlementDate" : {
+                          "adjustableDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
+                              "meta" : {
+                                "globalKey" : "3f2296"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
                           },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-2"
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      } ],
+                      "securityInformation" : {
+                        "security" : {
+                          "productIdentifier" : [ {
+                            "value" : {
+                              "identifier" : {
+                                "value" : "ST001"
+                              },
+                              "source" : "SEDOL",
+                              "meta" : {
+                                "globalKey" : "a4ff65ff"
                               }
                             }
+                          } ],
+                          "securityType" : "Equity"
+                        },
+                        "meta" : {
+                          "globalKey" : "7548eca6"
+                        }
+                      },
+                      "durationType" : {
+                        "durationType" : "Term"
+                      },
+                      "minimumFee" : {
+                        "value" : 0,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "USD"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "171b36"
+                        }
+                      },
+                      "dividendTerms" : {
+                        "manufacturedIncomeRequirement" : {
+                          "totalRatio" : 1
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3b19750e"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "eb31e26b"
+                      "globalKey" : "43b3b6a7"
                     }
                   },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "MODFOLLOWING",
+                  "collateral" : {
+                    "collateralProvisions" : {
+                      "collateralType" : "Cash",
+                      "eligibleCollateral" : [ {
+                        "criteria" : [ {
+                          "treatment" : {
+                            "valuationTreatment" : {
+                              "marginPercentage" : 0.02
+                            }
+                          }
+                        } ],
                         "meta" : {
-                          "globalKey" : "fa42f5cf"
+                          "globalKey" : "168480"
                         }
-                      },
-                      "meta" : {
-                        "globalKey" : "e743cae5"
-                      },
-                      "unadjustedDate" : "2020-10-22"
-                    },
-                    "meta" : {
-                      "globalKey" : "e743cae5"
+                      } ]
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "37405ce2"
+                  "globalKey" : "38d91964"
                 }
               },
               "meta" : {
-                "globalKey" : "37405ce2"
+                "globalKey" : "38d91964"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "bc2d9a59"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.01,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 0.01,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-8"
+                      "value" : "price-2"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 5000000,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
-                    },
-                    "value" : 5000000
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "a0b25412"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "value" : "ST001"
-                      },
-                      "meta" : {
-                        "globalKey" : "a4ff65ff"
-                      },
-                      "source" : "SEDOL"
                     }
-                  } ]
-                },
-                "price" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "price-1"
+                      "value" : "quantity-8"
                     } ]
-                  },
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "c985b0c7"
+                }
+              }, {
+                "price" : [ {
                   "value" : {
+                    "value" : 25,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 25,
                     "perUnitOf" : {
-                      "financialUnit" : "SHARE"
+                      "financialUnit" : "Share"
                     },
-                    "priceType" : "ASSET_PRICE"
+                    "priceType" : "AssetPrice"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
                   }
                 } ],
                 "quantity" : [ {
+                  "value" : {
+                    "value" : 200000,
+                    "unit" : {
+                      "financialUnit" : "Share"
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-9"
                     } ]
+                  }
+                } ],
+                "observable" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "ST001"
+                      },
+                      "source" : "SEDOL",
+                      "meta" : {
+                        "globalKey" : "a4ff65ff"
+                      }
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "998f6e8c"
+                }
+              } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "FM1LEI11111111111111"
+                    },
+                    "meta" : {
+                      "globalKey" : "87c4d1c6"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
                   },
-                  "value" : {
-                    "unit" : {
-                      "financialUnit" : "SHARE"
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
+                }
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "CP001LEI111111111111"
                     },
-                    "value" : 200000
+                    "meta" : {
+                      "globalKey" : "12818f8c"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
                   }
-                } ]
-              } ]
+                }
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f2255"
+          "party" : [ {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "FM1LEI11111111111111"
+              },
+              "meta" : {
+                "globalKey" : "87c4d1c6"
+              }
+            } ],
+            "name" : {
+              "value" : "Standard Fund 1"
             },
-            "value" : "2020-09-21"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+            "meta" : {
+              "globalKey" : "40ec509f",
+              "externalKey" : "Lender0"
+            }
+          }, {
+            "partyId" : [ {
               "identifier" : {
-                "value" : "0266001"
+                "value" : "KTKLLEILLLLLLLLLLLLL"
+              },
+              "meta" : {
+                "globalKey" : "60098fe6"
               }
             } ],
-            "issuer" : {
+            "name" : {
               "value" : "KTKL"
             },
             "meta" : {
-              "globalKey" : "9e641379"
+              "globalKey" : "84088af0",
+              "externalKey" : "AGENT_LENDER"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "CP001LEI111111111111"
+              },
+              "meta" : {
+                "globalKey" : "12818f8c"
+              }
+            } ],
+            "name" : {
+              "value" : "CP001"
+            },
+            "meta" : {
+              "globalKey" : "7c311b30",
+              "externalKey" : "Borrower"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "199bc407"
+          }
+        },
+        "state" : {
+          "positionState" : "Executed"
         },
         "transferHistory" : [ {
-          "meta" : {
-            "globalKey" : "637bd5fe"
-          },
           "transfer" : {
+            "quantity" : {
+              "value" : 100000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
             "payerReceiver" : {
               "payerPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "CP001LEI111111111111"
@@ -2966,18 +2962,18 @@
                     "meta" : {
                       "globalKey" : "12818f8c"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
                 }
               },
               "receiverPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "FM1LEI11111111111111"
@@ -2985,63 +2981,61 @@
                     "meta" : {
                       "globalKey" : "87c4d1c6"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
                 }
               }
             },
-            "quantity" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 100000.00
-            },
             "settlementDate" : {
               "adjustedDate" : {
+                "value" : "2020-09-22",
                 "meta" : {
                   "globalKey" : "3f2256"
-                },
-                "value" : "2020-09-22"
+                }
               }
             },
             "settlementOrigin" : {
               "assetPayout" : {
-                "globalReference" : "73453ae0"
+                "globalReference" : "3b19750e"
               }
             }
+          },
+          "meta" : {
+            "globalKey" : "a37ecfe6"
           }
         }, {
-          "meta" : {
-            "globalKey" : "79e525e7"
-          },
           "transfer" : {
+            "quantity" : {
+              "value" : 200000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "observable" : {
-              "meta" : {
-                "globalKey" : "a4ff65ff"
-              },
               "productIdentifier" : [ {
                 "value" : {
                   "identifier" : {
                     "value" : "ST001"
                   },
+                  "source" : "SEDOL",
                   "meta" : {
                     "globalKey" : "a4ff65ff"
-                  },
-                  "source" : "SEDOL"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "a4ff65ff"
+              }
             },
             "payerReceiver" : {
               "payerPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "FM1LEI11111111111111"
@@ -3049,18 +3043,18 @@
                     "meta" : {
                       "globalKey" : "87c4d1c6"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
                 }
               },
               "receiverPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "CP001LEI111111111111"
@@ -3068,37 +3062,55 @@
                     "meta" : {
                       "globalKey" : "12818f8c"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
                 }
               }
             },
-            "quantity" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 200000
-            },
             "settlementDate" : {
               "adjustedDate" : {
+                "value" : "2020-09-22",
                 "meta" : {
                   "globalKey" : "3f2256"
-                },
-                "value" : "2020-09-22"
+                }
               }
             },
             "settlementOrigin" : {
               "assetPayout" : {
-                "globalReference" : "73453ae0"
+                "globalReference" : "3b19750e"
               }
             }
+          },
+          "meta" : {
+            "globalKey" : "2d4d67b9"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "1a87ff7d"
+        }
       } ],
-      "eventQualifier" : "CashAndSecurityTransfer",
       "meta" : {
-        "globalKey" : "6ca7daf9"
+        "globalKey" : "63a4bc4d"
+      }
+    },
+    "previousWorkflowStep" : {
+      "globalReference" : "377d4759"
+    },
+    "messageInformation" : {
+      "messageId" : {
+        "value" : "message-id-2"
       }
     },
+    "timestamp" : [ {
+      "dateTime" : "2020-09-22T18:00:00Z",
+      "qualification" : "eventCreationDateTime"
+    } ],
     "eventIdentifier" : [ {
       "assignedIdentifier" : [ {
         "identifier" : {
@@ -3109,20 +3121,8 @@
         "globalKey" : "414b814e"
       }
     } ],
-    "messageInformation" : {
-      "messageId" : {
-        "value" : "message-id-2"
-      }
-    },
     "meta" : {
-      "globalKey" : "d55e1f"
-    },
-    "previousWorkflowStep" : {
-      "globalReference" : "53c6d345"
-    },
-    "timestamp" : [ {
-      "dateTime" : "2020-09-22T18:00:00Z",
-      "qualification" : "EVENT_CREATION_DATE_TIME"
-    } ]
+      "globalKey" : "4f526adb"
+    }
   } ]
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/part-return-settlement-workflow-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/part-return-settlement-workflow-func-output.json
index 3363f6af1c..795569adf2 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/part-return-settlement-workflow-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/part-return-settlement-workflow-func-output.json
@@ -1,109 +1,29 @@
 {
   "steps" : [ {
-    "action" : "NEW",
     "businessEvent" : {
       "eventDate" : "2020-10-08",
       "after" : [ {
-        "meta" : {
-          "globalKey" : "4513f8d2"
-        },
         "trade" : {
-          "meta" : {
-            "globalKey" : "dc000f7"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "Lender0",
-              "globalKey" : "a896ecd"
-            },
-            "name" : {
-              "value" : "Standard Fund 1"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "FM1LEI11111111111111"
-              },
-              "meta" : {
-                "globalKey" : "87c4d1c6"
-              }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "AGENT_LENDER",
-              "globalKey" : "73176f1c"
-            },
-            "name" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
               "value" : "KTKL"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
-                "value" : "KTKLLEILLLLLLLLLLLLL"
-              },
-              "meta" : {
-                "globalKey" : "60098fe6"
+                "value" : "0266001"
               }
-            } ]
-          }, {
+            } ],
             "meta" : {
-              "externalKey" : "Borrower",
-              "globalKey" : "1f061e68"
-            },
-            "name" : {
-              "value" : "CP001"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "CP001LEI111111111111"
-              },
-              "meta" : {
-                "globalKey" : "12818f8c"
-              }
-            } ]
+              "globalKey" : "569d85e5"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "2020-09-21",
+            "meta" : {
+              "globalKey" : "3f2255"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "FM1LEI11111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "87c4d1c6"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "CP001LEI111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "12818f8c"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -111,25 +31,9 @@
                   "productQualifier" : "SecurityLendingAgreement"
                 } ],
                 "economicTerms" : {
-                  "collateral" : {
-                    "collateralProvisions" : {
-                      "collateralType" : "CASH",
-                      "eligibleCollateral" : [ {
-                        "criteria" : [ {
-                          "treatment" : {
-                            "valuationTreatment" : {
-                              "marginPercentage" : 0.02
-                            }
-                          }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "168480"
-                        }
-                      } ]
-                    }
-                  },
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2020-09-22",
                       "dateAdjustments" : {
                         "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
@@ -138,196 +42,133 @@
                       },
                       "meta" : {
                         "globalKey" : "e742daa5"
-                      },
-                      "unadjustedDate" : "2020-09-22"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e742daa5"
                     }
                   },
-                  "payout" : {
-                    "assetPayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
-                      },
-                      "assetLeg" : [ {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
-                          "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
-                            },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
-                              "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        }
-                      }, {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
-                          "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
-                            },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
-                              "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        }
-                      } ],
-                      "dividendTerms" : {
-                        "manufacturedIncomeRequirement" : {
-                          "totalRatio" : 1
-                        }
-                      },
-                      "durationType" : {
-                        "durationType" : "TERM"
-                      },
-                      "meta" : {
-                        "globalKey" : "73453ae0"
-                      },
-                      "minimumFee" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "USD"
-                          }
-                        },
-                        "value" : 0,
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2020-10-22",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "171b36"
+                          "globalKey" : "fa42f5cf"
                         }
                       },
-                      "securityInformation" : {
-                        "meta" : {
-                          "globalKey" : "7548eca6"
-                        },
-                        "security" : {
-                          "productIdentifier" : [ {
-                            "value" : {
-                              "identifier" : {
-                                "value" : "ST001"
-                              },
-                              "meta" : {
-                                "globalKey" : "a4ff65ff"
-                              },
-                              "source" : "SEDOL"
-                            }
-                          } ],
-                          "securityType" : "EQUITY"
-                        }
+                      "meta" : {
+                        "globalKey" : "e743cae5"
                       }
-                    } ],
+                    },
+                    "meta" : {
+                      "globalKey" : "e743cae5"
+                    }
+                  },
+                  "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-8"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "25e2ab"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-2"
+                              }
+                            }
                           },
-                          "period" : "T",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "NONE"
-                        },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
-                            },
                             "dateAdjustments" : {
                               "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "fa42f5cf"
                               }
                             },
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
+                              "meta" : {
+                                "globalKey" : "3f2256"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "Effective_Date",
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Effective_Date"
                             }
                           },
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "a4273c9"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
-                            },
                             "dateAdjustments" : {
                               "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "fa42f5cf"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "Termination_Date",
-                              "globalKey" : "fa42f5cf"
-                            }
-                          },
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
+                              "meta" : {
+                                "globalKey" : "3f2296"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Termination_Date"
+                            }
+                          },
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
+                        },
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "24b525"
+                          },
+                          "rollConvention" : "NONE"
+                        },
+                        "meta" : {
+                          "globalKey" : "8b1de243"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "ce90278b"
-                      },
                       "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "b578507f"
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "73"
+                          }
                         },
                         "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -336,200 +177,353 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
-                        "paymentFrequency" : {
-                          "meta" : {
-                            "globalKey" : "a2d"
-                          },
-                          "period" : "T",
-                          "periodMultiplier" : 1
+                        "meta" : {
+                          "globalKey" : "fa98fa5b"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "meta" : {
+                        "globalKey" : "98fd77d9"
+                      }
+                    } ],
+                    "assetPayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "assetLeg" : [ {
+                        "settlementDate" : {
+                          "adjustableDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
+                              "meta" : {
+                                "globalKey" : "3f2256"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
                           "meta" : {
-                            "globalKey" : "0"
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      }, {
+                        "settlementDate" : {
+                          "adjustableDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
+                              "meta" : {
+                                "globalKey" : "3f2296"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
                           },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-2"
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      } ],
+                      "securityInformation" : {
+                        "security" : {
+                          "productIdentifier" : [ {
+                            "value" : {
+                              "identifier" : {
+                                "value" : "ST001"
+                              },
+                              "source" : "SEDOL",
+                              "meta" : {
+                                "globalKey" : "a4ff65ff"
                               }
                             }
+                          } ],
+                          "securityType" : "Equity"
+                        },
+                        "meta" : {
+                          "globalKey" : "7548eca6"
+                        }
+                      },
+                      "durationType" : {
+                        "durationType" : "Term"
+                      },
+                      "minimumFee" : {
+                        "value" : 0,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "USD"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "171b36"
+                        }
+                      },
+                      "dividendTerms" : {
+                        "manufacturedIncomeRequirement" : {
+                          "totalRatio" : 1
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3b19750e"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "eb31e26b"
+                      "globalKey" : "43b3b6a7"
                     }
                   },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "MODFOLLOWING",
+                  "collateral" : {
+                    "collateralProvisions" : {
+                      "collateralType" : "Cash",
+                      "eligibleCollateral" : [ {
+                        "criteria" : [ {
+                          "treatment" : {
+                            "valuationTreatment" : {
+                              "marginPercentage" : 0.02
+                            }
+                          }
+                        } ],
                         "meta" : {
-                          "globalKey" : "fa42f5cf"
+                          "globalKey" : "168480"
                         }
-                      },
-                      "meta" : {
-                        "globalKey" : "e743cae5"
-                      },
-                      "unadjustedDate" : "2020-10-22"
-                    },
-                    "meta" : {
-                      "globalKey" : "e743cae5"
+                      } ]
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "37405ce2"
+                  "globalKey" : "38d91964"
                 }
               },
               "meta" : {
-                "globalKey" : "37405ce2"
+                "globalKey" : "38d91964"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "e8dfa17d"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.01,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 0.01,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-8"
+                      "value" : "price-2"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 3750000,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
-                    },
-                    "value" : 3750000
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "41504f78"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "value" : "ST001"
-                      },
-                      "meta" : {
-                        "globalKey" : "a4ff65ff"
-                      },
-                      "source" : "SEDOL"
                     }
-                  } ]
-                },
-                "price" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "price-1"
+                      "value" : "quantity-8"
                     } ]
-                  },
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "33148e23"
+                }
+              }, {
+                "price" : [ {
                   "value" : {
+                    "value" : 25,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 25,
                     "perUnitOf" : {
-                      "financialUnit" : "SHARE"
+                      "financialUnit" : "Share"
                     },
-                    "priceType" : "ASSET_PRICE"
+                    "priceType" : "AssetPrice"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
                   }
                 } ],
                 "quantity" : [ {
+                  "value" : {
+                    "value" : 150000,
+                    "unit" : {
+                      "financialUnit" : "Share"
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-9"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "financialUnit" : "SHARE"
-                    },
-                    "value" : 150000
                   }
-                } ]
+                } ],
+                "observable" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "ST001"
+                      },
+                      "source" : "SEDOL",
+                      "meta" : {
+                        "globalKey" : "a4ff65ff"
+                      }
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "a908f466"
+                }
               } ]
-            } ]
-          },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f2255"
-            },
-            "value" : "2020-09-21"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
-              "identifier" : {
-                "value" : "0266001"
-              }
             } ],
-            "issuer" : {
-              "value" : "KTKL"
-            },
-            "meta" : {
-              "globalKey" : "9e641379"
-            }
-          } ]
-        },
-        "transferHistory" : [ {
-          "meta" : {
-            "globalKey" : "637bd5fe"
-          },
-          "transfer" : {
-            "payerReceiver" : {
-              "payerPartyReference" : {
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "FM1LEI11111111111111"
+                    },
+                    "meta" : {
+                      "globalKey" : "87c4d1c6"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
                   },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
+                }
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "CP001LEI111111111111"
+                    },
+                    "meta" : {
+                      "globalKey" : "12818f8c"
+                    }
+                  } ],
                   "name" : {
                     "value" : "CP001"
                   },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
+                }
+              }
+            } ]
+          },
+          "party" : [ {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "FM1LEI11111111111111"
+              },
+              "meta" : {
+                "globalKey" : "87c4d1c6"
+              }
+            } ],
+            "name" : {
+              "value" : "Standard Fund 1"
+            },
+            "meta" : {
+              "globalKey" : "40ec509f",
+              "externalKey" : "Lender0"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "KTKLLEILLLLLLLLLLLLL"
+              },
+              "meta" : {
+                "globalKey" : "60098fe6"
+              }
+            } ],
+            "name" : {
+              "value" : "KTKL"
+            },
+            "meta" : {
+              "globalKey" : "84088af0",
+              "externalKey" : "AGENT_LENDER"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "CP001LEI111111111111"
+              },
+              "meta" : {
+                "globalKey" : "12818f8c"
+              }
+            } ],
+            "name" : {
+              "value" : "CP001"
+            },
+            "meta" : {
+              "globalKey" : "7c311b30",
+              "externalKey" : "Borrower"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "3d87173d"
+          }
+        },
+        "transferHistory" : [ {
+          "transfer" : {
+            "quantity" : {
+              "value" : 100000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
+            "payerReceiver" : {
+              "payerPartyReference" : {
+                "value" : {
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "CP001LEI111111111111"
@@ -537,18 +531,18 @@
                     "meta" : {
                       "globalKey" : "12818f8c"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
                 }
               },
               "receiverPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "FM1LEI11111111111111"
@@ -556,24 +550,23 @@
                     "meta" : {
                       "globalKey" : "87c4d1c6"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
                 }
               }
             },
-            "quantity" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 100000.00
-            },
             "settlementDate" : {
               "adjustedDate" : {
+                "value" : "2020-09-22",
                 "meta" : {
                   "globalKey" : "3f2256"
-                },
-                "value" : "2020-09-22"
+                }
               }
             },
             "settlementOrigin" : {
@@ -581,38 +574,37 @@
                 "globalReference" : "73453ae0"
               }
             }
+          },
+          "meta" : {
+            "globalKey" : "4f6790d8"
           }
         }, {
-          "meta" : {
-            "globalKey" : "79e525e7"
-          },
           "transfer" : {
+            "quantity" : {
+              "value" : 200000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "observable" : {
-              "meta" : {
-                "globalKey" : "a4ff65ff"
-              },
               "productIdentifier" : [ {
                 "value" : {
                   "identifier" : {
                     "value" : "ST001"
                   },
+                  "source" : "SEDOL",
                   "meta" : {
                     "globalKey" : "a4ff65ff"
-                  },
-                  "source" : "SEDOL"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "a4ff65ff"
+              }
             },
             "payerReceiver" : {
               "payerPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "FM1LEI11111111111111"
@@ -620,18 +612,18 @@
                     "meta" : {
                       "globalKey" : "87c4d1c6"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
                 }
               },
               "receiverPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "CP001LEI111111111111"
@@ -639,22 +631,23 @@
                     "meta" : {
                       "globalKey" : "12818f8c"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
                 }
               }
             },
-            "quantity" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 200000
-            },
             "settlementDate" : {
               "adjustedDate" : {
+                "value" : "2020-09-22",
                 "meta" : {
                   "globalKey" : "3f2256"
-                },
-                "value" : "2020-09-22"
+                }
               }
             },
             "settlementOrigin" : {
@@ -662,129 +655,61 @@
                 "globalReference" : "73453ae0"
               }
             }
+          },
+          "meta" : {
+            "globalKey" : "9b9f0d6b"
           }
-        } ]
-      } ],
-      "meta" : {
-        "globalKey" : "ed6aed5a"
-      }
-    },
-    "eventIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "value" : "workflow-id-0"
+        } ],
+        "meta" : {
+          "globalKey" : "6dcf13b6"
         }
       } ],
       "meta" : {
-        "globalKey" : "414b814c"
+        "globalKey" : "d2adcc3e"
       }
-    } ],
+    },
     "messageInformation" : {
       "messageId" : {
         "value" : "message-id-0"
       }
     },
-    "meta" : {
-      "globalKey" : "18ae4860"
-    },
     "timestamp" : [ {
       "dateTime" : "2020-10-08T09:00:00Z",
-      "qualification" : "EVENT_CREATION_DATE_TIME"
-    } ]
-  }, {
+      "qualification" : "eventCreationDateTime"
+    } ],
     "eventIdentifier" : [ {
       "assignedIdentifier" : [ {
         "identifier" : {
-          "value" : "workflow-id-1"
+          "value" : "workflow-id-0"
         }
       } ],
       "meta" : {
-        "globalKey" : "414b814d"
+        "globalKey" : "414b814c"
       }
     } ],
-    "messageInformation" : {
-      "messageId" : {
-        "value" : "message-id-1"
-      }
-    },
+    "action" : "New",
     "meta" : {
-      "globalKey" : "6e3cdd4"
-    },
-    "previousWorkflowStep" : {
-      "globalReference" : "7fe4ffa0"
-    },
+      "globalKey" : "28835644"
+    }
+  }, {
     "proposedEvent" : {
       "eventDate" : "2020-10-09",
       "instruction" : [ {
-        "before" : {
-          "value" : {
-            "meta" : {
-              "globalKey" : "4513f8d2"
-            },
-            "trade" : {
-              "meta" : {
-                "globalKey" : "dc000f7"
-              },
-              "party" : [ {
-                "meta" : {
-                  "externalKey" : "Lender0",
-                  "globalKey" : "a896ecd"
-                },
-                "name" : {
-                  "value" : "Standard Fund 1"
-                },
-                "partyId" : [ {
-                  "identifier" : {
-                    "value" : "FM1LEI11111111111111"
-                  },
-                  "meta" : {
-                    "globalKey" : "87c4d1c6"
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "externalKey" : "AGENT_LENDER",
-                  "globalKey" : "73176f1c"
-                },
-                "name" : {
-                  "value" : "KTKL"
-                },
-                "partyId" : [ {
-                  "identifier" : {
-                    "value" : "KTKLLEILLLLLLLLLLLLL"
-                  },
-                  "meta" : {
-                    "globalKey" : "60098fe6"
+        "primitiveInstruction" : {
+          "transfer" : {
+            "transferState" : [ {
+              "transfer" : {
+                "quantity" : {
+                  "value" : 25000.00,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "externalKey" : "Borrower",
-                  "globalKey" : "1f061e68"
-                },
-                "name" : {
-                  "value" : "CP001"
                 },
-                "partyId" : [ {
-                  "identifier" : {
-                    "value" : "CP001LEI111111111111"
-                  },
-                  "meta" : {
-                    "globalKey" : "12818f8c"
-                  }
-                } ]
-              } ],
-              "tradableProduct" : {
-                "counterparty" : [ {
-                  "partyReference" : {
+                "payerReceiver" : {
+                  "payerPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "FM1LEI11111111111111"
@@ -792,20 +717,80 @@
                         "meta" : {
                           "globalKey" : "87c4d1c6"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
+                      },
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
                     }
                   },
-                  "role" : "PARTY_1"
-                }, {
-                  "partyReference" : {
+                  "receiverPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
+                      "partyId" : [ {
+                        "identifier" : {
+                          "value" : "CP001LEI111111111111"
+                        },
+                        "meta" : {
+                          "globalKey" : "12818f8c"
+                        }
+                      } ],
                       "name" : {
                         "value" : "CP001"
                       },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
+                      }
+                    }
+                  }
+                },
+                "settlementDate" : {
+                  "adjustedDate" : {
+                    "value" : "2020-10-09",
+                    "meta" : {
+                      "globalKey" : "3f2289"
+                    }
+                  }
+                },
+                "settlementOrigin" : {
+                  "assetPayout" : {
+                    "globalReference" : "3b19750e"
+                  }
+                }
+              },
+              "meta" : {
+                "globalKey" : "d5fe4b6"
+              }
+            }, {
+              "transfer" : {
+                "quantity" : {
+                  "value" : 50000,
+                  "unit" : {
+                    "financialUnit" : "Share"
+                  }
+                },
+                "observable" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "ST001"
+                      },
+                      "source" : "SEDOL",
+                      "meta" : {
+                        "globalKey" : "a4ff65ff"
+                      }
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
+                },
+                "payerReceiver" : {
+                  "payerPartyReference" : {
+                    "value" : {
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "CP001LEI111111111111"
@@ -813,11 +798,79 @@
                         "meta" : {
                           "globalKey" : "12818f8c"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
+                      }
                     }
                   },
-                  "role" : "PARTY_2"
+                  "receiverPartyReference" : {
+                    "value" : {
+                      "partyId" : [ {
+                        "identifier" : {
+                          "value" : "FM1LEI11111111111111"
+                        },
+                        "meta" : {
+                          "globalKey" : "87c4d1c6"
+                        }
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
+                      },
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
+                    }
+                  }
+                },
+                "settlementDate" : {
+                  "adjustedDate" : {
+                    "value" : "2020-10-09",
+                    "meta" : {
+                      "globalKey" : "3f2289"
+                    }
+                  }
+                },
+                "settlementOrigin" : {
+                  "assetPayout" : {
+                    "globalReference" : "3b19750e"
+                  }
+                }
+              },
+              "meta" : {
+                "globalKey" : "39f1f2b2"
+              }
+            } ]
+          }
+        },
+        "before" : {
+          "value" : {
+            "trade" : {
+              "tradeIdentifier" : [ {
+                "issuer" : {
+                  "value" : "KTKL"
+                },
+                "assignedIdentifier" : [ {
+                  "identifier" : {
+                    "value" : "0266001"
+                  }
                 } ],
+                "meta" : {
+                  "globalKey" : "569d85e5"
+                }
+              } ],
+              "tradeDate" : {
+                "value" : "2020-09-21",
+                "meta" : {
+                  "globalKey" : "3f2255"
+                }
+              },
+              "tradableProduct" : {
                 "product" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -825,25 +878,26 @@
                       "productQualifier" : "SecurityLendingAgreement"
                     } ],
                     "economicTerms" : {
-                      "collateral" : {
-                        "collateralProvisions" : {
-                          "collateralType" : "CASH",
-                          "eligibleCollateral" : [ {
-                            "criteria" : [ {
-                              "treatment" : {
-                                "valuationTreatment" : {
-                                  "marginPercentage" : 0.02
-                                }
-                              }
-                            } ],
+                      "effectiveDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2020-09-22",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "168480"
+                              "globalKey" : "fa42f5cf"
                             }
-                          } ]
+                          },
+                          "meta" : {
+                            "globalKey" : "e742daa5"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "e742daa5"
                         }
                       },
-                      "effectiveDate" : {
+                      "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2020-10-22",
                           "dateAdjustments" : {
                             "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
@@ -851,399 +905,472 @@
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e742daa5"
-                          },
-                          "unadjustedDate" : "2020-09-22"
+                            "globalKey" : "e743cae5"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "e742daa5"
+                          "globalKey" : "e743cae5"
                         }
                       },
                       "payout" : {
-                        "assetPayout" : [ {
+                        "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
-                          "assetLeg" : [ {
-                            "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                            "settlementDate" : {
+                          "priceQuantity" : {
+                            "quantitySchedule" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "quantity-8"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          },
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-2"
+                                  }
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "0"
+                              }
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
+                            "effectiveDate" : {
                               "adjustableDate" : {
-                                "adjustedDate" : {
+                                "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
-                                    "globalKey" : "3f2256"
-                                  },
-                                  "value" : "2020-09-22"
+                                    "globalKey" : "fa42f5cf"
+                                  }
                                 },
-                                "dateAdjustments" : {
-                                  "businessDayConvention" : "NONE",
+                                "adjustedDate" : {
+                                  "value" : "2020-09-22",
                                   "meta" : {
-                                    "globalKey" : "24a738"
+                                    "globalKey" : "3f2256"
                                   }
                                 },
                                 "meta" : {
-                                  "globalKey" : "24a738"
+                                  "globalKey" : "fa42f5cf",
+                                  "externalKey" : "Effective_Date"
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "24a738"
+                                "globalKey" : "fa42f5cf"
                               }
-                            }
-                          }, {
-                            "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                            "settlementDate" : {
+                            },
+                            "terminationDate" : {
                               "adjustableDate" : {
-                                "adjustedDate" : {
+                                "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
-                                    "globalKey" : "3f2296"
-                                  },
-                                  "value" : "2020-10-22"
+                                    "globalKey" : "fa42f5cf"
+                                  }
                                 },
-                                "dateAdjustments" : {
-                                  "businessDayConvention" : "NONE",
+                                "adjustedDate" : {
+                                  "value" : "2020-10-22",
                                   "meta" : {
-                                    "globalKey" : "24a738"
+                                    "globalKey" : "3f2296"
                                   }
                                 },
                                 "meta" : {
-                                  "globalKey" : "24a738"
+                                  "globalKey" : "fa42f5cf",
+                                  "externalKey" : "Termination_Date"
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            }
-                          } ],
-                          "dividendTerms" : {
-                            "manufacturedIncomeRequirement" : {
-                              "totalRatio" : 1
-                            }
-                          },
-                          "durationType" : {
-                            "durationType" : "TERM"
-                          },
-                          "meta" : {
-                            "globalKey" : "73453ae0"
-                          },
-                          "minimumFee" : {
-                            "unit" : {
-                              "currency" : {
-                                "value" : "USD"
+                                "globalKey" : "fa42f5cf"
                               }
                             },
-                            "value" : 0,
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "T",
+                              "meta" : {
+                                "globalKey" : "24b525"
+                              },
+                              "rollConvention" : "NONE"
+                            },
                             "meta" : {
-                              "globalKey" : "171b36"
+                              "globalKey" : "8b1de243"
                             }
                           },
-                          "securityInformation" : {
-                            "meta" : {
-                              "globalKey" : "7548eca6"
+                          "paymentDates" : {
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "T",
+                              "meta" : {
+                                "globalKey" : "73"
+                              }
                             },
-                            "security" : {
-                              "productIdentifier" : [ {
-                                "value" : {
-                                  "identifier" : {
-                                    "value" : "ST001"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "a4ff65ff"
-                                  },
-                                  "source" : "SEDOL"
+                            "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCenter" : [ {
+                                  "value" : "EUTA"
+                                } ],
+                                "meta" : {
+                                  "globalKey" : "20a71d"
                                 }
-                              } ],
-                              "securityType" : "EQUITY"
+                              },
+                              "meta" : {
+                                "globalKey" : "365baaee"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "fa98fa5b"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "98fd77d9"
                           }
                         } ],
-                        "interestRatePayout" : [ {
+                        "assetPayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
-                          },
-                          "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "quantitySchedule" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "quantity-8"
-                              }
-                            }
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "25e2ab"
-                              },
-                              "period" : "T",
-                              "periodMultiplier" : 1,
-                              "rollConvention" : "NONE"
-                            },
-                            "effectiveDate" : {
+                          "assetLeg" : [ {
+                            "settlementDate" : {
                               "adjustableDate" : {
-                                "adjustedDate" : {
+                                "dateAdjustments" : {
+                                  "businessDayConvention" : "NONE",
                                   "meta" : {
-                                    "globalKey" : "3f2256"
-                                  },
-                                  "value" : "2020-09-22"
+                                    "globalKey" : "24a738"
+                                  }
                                 },
-                                "dateAdjustments" : {
-                                  "businessDayConvention" : "MODFOLLOWING",
+                                "adjustedDate" : {
+                                  "value" : "2020-09-22",
                                   "meta" : {
-                                    "globalKey" : "fa42f5cf"
+                                    "globalKey" : "3f2256"
                                   }
                                 },
                                 "meta" : {
-                                  "externalKey" : "Effective_Date",
-                                  "globalKey" : "fa42f5cf"
+                                  "globalKey" : "24a738"
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "fa42f5cf"
+                                "globalKey" : "24a738"
                               }
                             },
-                            "meta" : {
-                              "globalKey" : "a4273c9"
-                            },
-                            "terminationDate" : {
+                            "deliveryMethod" : "DeliveryVersusPayment"
+                          }, {
+                            "settlementDate" : {
                               "adjustableDate" : {
-                                "adjustedDate" : {
+                                "dateAdjustments" : {
+                                  "businessDayConvention" : "NONE",
                                   "meta" : {
-                                    "globalKey" : "3f2296"
-                                  },
-                                  "value" : "2020-10-22"
+                                    "globalKey" : "24a738"
+                                  }
                                 },
-                                "dateAdjustments" : {
-                                  "businessDayConvention" : "MODFOLLOWING",
+                                "adjustedDate" : {
+                                  "value" : "2020-10-22",
                                   "meta" : {
-                                    "globalKey" : "fa42f5cf"
+                                    "globalKey" : "3f2296"
                                   }
                                 },
                                 "meta" : {
-                                  "externalKey" : "Termination_Date",
-                                  "globalKey" : "fa42f5cf"
+                                  "globalKey" : "24a738"
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "fa42f5cf"
+                                "globalKey" : "24a738"
                               }
+                            },
+                            "deliveryMethod" : "DeliveryVersusPayment"
+                          } ],
+                          "securityInformation" : {
+                            "security" : {
+                              "productIdentifier" : [ {
+                                "value" : {
+                                  "identifier" : {
+                                    "value" : "ST001"
+                                  },
+                                  "source" : "SEDOL",
+                                  "meta" : {
+                                    "globalKey" : "a4ff65ff"
+                                  }
+                                }
+                              } ],
+                              "securityType" : "Equity"
+                            },
+                            "meta" : {
+                              "globalKey" : "7548eca6"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "ce90278b"
+                          "durationType" : {
+                            "durationType" : "Term"
                           },
-                          "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "b578507f"
-                            },
-                            "paymentDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCenter" : [ {
-                                  "value" : "EUTA"
-                                } ],
-                                "meta" : {
-                                  "globalKey" : "20a71d"
-                                }
-                              },
-                              "businessDayConvention" : "MODFOLLOWING",
-                              "meta" : {
-                                "globalKey" : "365baaee"
+                          "minimumFee" : {
+                            "value" : 0,
+                            "unit" : {
+                              "currency" : {
+                                "value" : "USD"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "a2d"
-                              },
-                              "period" : "T",
-                              "periodMultiplier" : 1
+                            "meta" : {
+                              "globalKey" : "171b36"
                             }
                           },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-2"
-                                  }
-                                }
-                              }
+                          "dividendTerms" : {
+                            "manufacturedIncomeRequirement" : {
+                              "totalRatio" : 1
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "3b19750e"
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "eb31e26b"
+                          "globalKey" : "43b3b6a7"
                         }
                       },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "MODFOLLOWING",
+                      "collateral" : {
+                        "collateralProvisions" : {
+                          "collateralType" : "Cash",
+                          "eligibleCollateral" : [ {
+                            "criteria" : [ {
+                              "treatment" : {
+                                "valuationTreatment" : {
+                                  "marginPercentage" : 0.02
+                                }
+                              }
+                            } ],
                             "meta" : {
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "168480"
                             }
-                          },
-                          "meta" : {
-                            "globalKey" : "e743cae5"
-                          },
-                          "unadjustedDate" : "2020-10-22"
-                        },
-                        "meta" : {
-                          "globalKey" : "e743cae5"
+                          } ]
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "37405ce2"
+                      "globalKey" : "38d91964"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "37405ce2"
+                    "globalKey" : "38d91964"
                   }
                 },
                 "tradeLot" : [ {
                   "priceQuantity" : [ {
-                    "meta" : {
-                      "globalKey" : "e8dfa17d"
-                    },
                     "price" : [ {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        } ]
-                      },
                       "value" : {
+                        "value" : 0.01,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 0.01,
                         "perUnitOf" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "priceType" : "INTEREST_RATE"
-                      }
-                    } ],
-                    "quantity" : [ {
+                        "priceType" : "InterestRate"
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
-                          "value" : "quantity-8"
+                          "value" : "price-2"
                         } ]
-                      },
+                      }
+                    } ],
+                    "quantity" : [ {
                       "value" : {
+                        "value" : 3750000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
-                        },
-                        "value" : 3750000
-                      }
-                    } ]
-                  }, {
-                    "meta" : {
-                      "globalKey" : "41504f78"
-                    },
-                    "observable" : {
-                      "meta" : {
-                        "globalKey" : "a4ff65ff"
-                      },
-                      "productIdentifier" : [ {
-                        "value" : {
-                          "identifier" : {
-                            "value" : "ST001"
-                          },
-                          "meta" : {
-                            "globalKey" : "a4ff65ff"
-                          },
-                          "source" : "SEDOL"
                         }
-                      } ]
-                    },
-                    "price" : [ {
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
-                          "value" : "price-1"
+                          "value" : "quantity-8"
                         } ]
-                      },
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "33148e23"
+                    }
+                  }, {
+                    "price" : [ {
                       "value" : {
+                        "value" : 25,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 25,
                         "perUnitOf" : {
-                          "financialUnit" : "SHARE"
+                          "financialUnit" : "Share"
                         },
-                        "priceType" : "ASSET_PRICE"
+                        "priceType" : "AssetPrice"
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        } ]
                       }
                     } ],
                     "quantity" : [ {
+                      "value" : {
+                        "value" : 150000,
+                        "unit" : {
+                          "financialUnit" : "Share"
+                        }
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-9"
                         } ]
-                      },
-                      "value" : {
-                        "unit" : {
-                          "financialUnit" : "SHARE"
-                        },
-                        "value" : 150000
                       }
-                    } ]
-                  } ]
-                } ]
-              },
-              "tradeDate" : {
-                "meta" : {
-                  "globalKey" : "3f2255"
-                },
-                "value" : "2020-09-21"
+                    } ],
+                    "observable" : {
+                      "productIdentifier" : [ {
+                        "value" : {
+                          "identifier" : {
+                            "value" : "ST001"
+                          },
+                          "source" : "SEDOL",
+                          "meta" : {
+                            "globalKey" : "a4ff65ff"
+                          }
+                        }
+                      } ],
+                      "meta" : {
+                        "globalKey" : "a4ff65ff"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "a908f466"
+                    }
+                  } ]
+                } ],
+                "counterparty" : [ {
+                  "role" : "Party1",
+                  "partyReference" : {
+                    "value" : {
+                      "partyId" : [ {
+                        "identifier" : {
+                          "value" : "FM1LEI11111111111111"
+                        },
+                        "meta" : {
+                          "globalKey" : "87c4d1c6"
+                        }
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
+                      },
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
+                    }
+                  }
+                }, {
+                  "role" : "Party2",
+                  "partyReference" : {
+                    "value" : {
+                      "partyId" : [ {
+                        "identifier" : {
+                          "value" : "CP001LEI111111111111"
+                        },
+                        "meta" : {
+                          "globalKey" : "12818f8c"
+                        }
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
+                      }
+                    }
+                  }
+                } ]
               },
-              "tradeIdentifier" : [ {
-                "assignedIdentifier" : [ {
+              "party" : [ {
+                "partyId" : [ {
                   "identifier" : {
-                    "value" : "0266001"
+                    "value" : "FM1LEI11111111111111"
+                  },
+                  "meta" : {
+                    "globalKey" : "87c4d1c6"
                   }
                 } ],
-                "issuer" : {
+                "name" : {
+                  "value" : "Standard Fund 1"
+                },
+                "meta" : {
+                  "globalKey" : "40ec509f",
+                  "externalKey" : "Lender0"
+                }
+              }, {
+                "partyId" : [ {
+                  "identifier" : {
+                    "value" : "KTKLLEILLLLLLLLLLLLL"
+                  },
+                  "meta" : {
+                    "globalKey" : "60098fe6"
+                  }
+                } ],
+                "name" : {
                   "value" : "KTKL"
                 },
                 "meta" : {
-                  "globalKey" : "9e641379"
+                  "globalKey" : "84088af0",
+                  "externalKey" : "AGENT_LENDER"
                 }
-              } ]
+              }, {
+                "partyId" : [ {
+                  "identifier" : {
+                    "value" : "CP001LEI111111111111"
+                  },
+                  "meta" : {
+                    "globalKey" : "12818f8c"
+                  }
+                } ],
+                "name" : {
+                  "value" : "CP001"
+                },
+                "meta" : {
+                  "globalKey" : "7c311b30",
+                  "externalKey" : "Borrower"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "3d87173d"
+              }
             },
             "transferHistory" : [ {
-              "meta" : {
-                "globalKey" : "637bd5fe"
-              },
               "transfer" : {
+                "quantity" : {
+                  "value" : 100000.00,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                },
                 "payerReceiver" : {
                   "payerPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "CP001LEI111111111111"
@@ -1251,18 +1378,18 @@
                         "meta" : {
                           "globalKey" : "12818f8c"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
+                      }
                     }
                   },
                   "receiverPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "FM1LEI11111111111111"
@@ -1270,24 +1397,23 @@
                         "meta" : {
                           "globalKey" : "87c4d1c6"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
+                      },
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
                     }
                   }
                 },
-                "quantity" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 100000.00
-                },
                 "settlementDate" : {
                   "adjustedDate" : {
+                    "value" : "2020-09-22",
                     "meta" : {
                       "globalKey" : "3f2256"
-                    },
-                    "value" : "2020-09-22"
+                    }
                   }
                 },
                 "settlementOrigin" : {
@@ -1295,38 +1421,37 @@
                     "globalReference" : "73453ae0"
                   }
                 }
+              },
+              "meta" : {
+                "globalKey" : "4f6790d8"
               }
             }, {
-              "meta" : {
-                "globalKey" : "79e525e7"
-              },
               "transfer" : {
+                "quantity" : {
+                  "value" : 200000,
+                  "unit" : {
+                    "financialUnit" : "Share"
+                  }
+                },
                 "observable" : {
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
                   "productIdentifier" : [ {
                     "value" : {
                       "identifier" : {
                         "value" : "ST001"
                       },
+                      "source" : "SEDOL",
                       "meta" : {
                         "globalKey" : "a4ff65ff"
-                      },
-                      "source" : "SEDOL"
+                      }
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
                 },
                 "payerReceiver" : {
                   "payerPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "FM1LEI11111111111111"
@@ -1334,18 +1459,18 @@
                         "meta" : {
                           "globalKey" : "87c4d1c6"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
+                      },
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
                     }
                   },
                   "receiverPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "CP001LEI111111111111"
@@ -1353,22 +1478,23 @@
                         "meta" : {
                           "globalKey" : "12818f8c"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
+                      }
                     }
                   }
                 },
-                "quantity" : {
-                  "unit" : {
-                    "financialUnit" : "SHARE"
-                  },
-                  "value" : 200000
-                },
                 "settlementDate" : {
                   "adjustedDate" : {
+                    "value" : "2020-09-22",
                     "meta" : {
                       "globalKey" : "3f2256"
-                    },
-                    "value" : "2020-09-22"
+                    }
                   }
                 },
                 "settlementOrigin" : {
@@ -1376,27 +1502,62 @@
                     "globalReference" : "73453ae0"
                   }
                 }
+              },
+              "meta" : {
+                "globalKey" : "9b9f0d6b"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "6dcf13b6"
+            }
           }
-        },
+        }
+      } ]
+    },
+    "previousWorkflowStep" : {
+      "globalReference" : "28835644"
+    },
+    "messageInformation" : {
+      "messageId" : {
+        "value" : "message-id-1"
+      }
+    },
+    "timestamp" : [ {
+      "dateTime" : "2020-10-08T15:00:00Z",
+      "qualification" : "eventCreationDateTime"
+    } ],
+    "eventIdentifier" : [ {
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "workflow-id-1"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "414b814d"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "a474fd2c"
+    }
+  }, {
+    "businessEvent" : {
+      "eventDate" : "2020-10-09",
+      "instruction" : [ {
         "primitiveInstruction" : {
           "transfer" : {
             "transferState" : [ {
-              "meta" : {
-                "globalKey" : "fcfe8682"
-              },
               "transfer" : {
+                "quantity" : {
+                  "value" : 25000.00,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                },
                 "payerReceiver" : {
                   "payerPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "FM1LEI11111111111111"
@@ -1404,18 +1565,18 @@
                         "meta" : {
                           "globalKey" : "87c4d1c6"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
+                      },
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
                     }
                   },
                   "receiverPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "CP001LEI111111111111"
@@ -1423,63 +1584,61 @@
                         "meta" : {
                           "globalKey" : "12818f8c"
                         }
-                      } ]
-                    }
-                  }
-                },
-                "quantity" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
+                      }
                     }
-                  },
-                  "value" : 25000.00
+                  }
                 },
                 "settlementDate" : {
                   "adjustedDate" : {
+                    "value" : "2020-10-09",
                     "meta" : {
                       "globalKey" : "3f2289"
-                    },
-                    "value" : "2020-10-09"
+                    }
                   }
                 },
                 "settlementOrigin" : {
                   "assetPayout" : {
-                    "globalReference" : "73453ae0"
+                    "globalReference" : "3b19750e"
                   }
                 }
+              },
+              "meta" : {
+                "globalKey" : "d5fe4b6"
               }
             }, {
-              "meta" : {
-                "globalKey" : "b994ca66"
-              },
               "transfer" : {
+                "quantity" : {
+                  "value" : 50000,
+                  "unit" : {
+                    "financialUnit" : "Share"
+                  }
+                },
                 "observable" : {
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
                   "productIdentifier" : [ {
                     "value" : {
                       "identifier" : {
                         "value" : "ST001"
                       },
+                      "source" : "SEDOL",
                       "meta" : {
                         "globalKey" : "a4ff65ff"
-                      },
-                      "source" : "SEDOL"
+                      }
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
                 },
                 "payerReceiver" : {
                   "payerPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "CP001LEI111111111111"
@@ -1487,18 +1646,18 @@
                         "meta" : {
                           "globalKey" : "12818f8c"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
+                      }
                     }
                   },
                   "receiverPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "FM1LEI11111111111111"
@@ -1506,145 +1665,60 @@
                         "meta" : {
                           "globalKey" : "87c4d1c6"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
+                      },
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
                     }
                   }
                 },
-                "quantity" : {
-                  "unit" : {
-                    "financialUnit" : "SHARE"
-                  },
-                  "value" : 50000
-                },
                 "settlementDate" : {
                   "adjustedDate" : {
+                    "value" : "2020-10-09",
                     "meta" : {
                       "globalKey" : "3f2289"
-                    },
-                    "value" : "2020-10-09"
+                    }
                   }
                 },
                 "settlementOrigin" : {
                   "assetPayout" : {
-                    "globalReference" : "73453ae0"
+                    "globalReference" : "3b19750e"
                   }
                 }
+              },
+              "meta" : {
+                "globalKey" : "39f1f2b2"
               }
             } ]
           }
-        }
-      } ]
-    },
-    "timestamp" : [ {
-      "dateTime" : "2020-10-08T15:00:00Z",
-      "qualification" : "EVENT_CREATION_DATE_TIME"
-    } ]
-  }, {
-    "businessEvent" : {
-      "eventDate" : "2020-10-09",
-      "instruction" : [ {
+        },
         "before" : {
           "value" : {
-            "meta" : {
-              "globalKey" : "4513f8d2"
-            },
             "trade" : {
-              "meta" : {
-                "globalKey" : "dc000f7"
-              },
-              "party" : [ {
-                "meta" : {
-                  "externalKey" : "Lender0",
-                  "globalKey" : "a896ecd"
-                },
-                "name" : {
-                  "value" : "Standard Fund 1"
-                },
-                "partyId" : [ {
-                  "identifier" : {
-                    "value" : "FM1LEI11111111111111"
-                  },
-                  "meta" : {
-                    "globalKey" : "87c4d1c6"
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "externalKey" : "AGENT_LENDER",
-                  "globalKey" : "73176f1c"
-                },
-                "name" : {
+              "tradeIdentifier" : [ {
+                "issuer" : {
                   "value" : "KTKL"
                 },
-                "partyId" : [ {
+                "assignedIdentifier" : [ {
                   "identifier" : {
-                    "value" : "KTKLLEILLLLLLLLLLLLL"
-                  },
-                  "meta" : {
-                    "globalKey" : "60098fe6"
+                    "value" : "0266001"
                   }
-                } ]
-              }, {
+                } ],
                 "meta" : {
-                  "externalKey" : "Borrower",
-                  "globalKey" : "1f061e68"
-                },
-                "name" : {
-                  "value" : "CP001"
-                },
-                "partyId" : [ {
-                  "identifier" : {
-                    "value" : "CP001LEI111111111111"
-                  },
-                  "meta" : {
-                    "globalKey" : "12818f8c"
-                  }
-                } ]
+                  "globalKey" : "569d85e5"
+                }
               } ],
+              "tradeDate" : {
+                "value" : "2020-09-21",
+                "meta" : {
+                  "globalKey" : "3f2255"
+                }
+              },
               "tradableProduct" : {
-                "counterparty" : [ {
-                  "partyReference" : {
-                    "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
-                      "partyId" : [ {
-                        "identifier" : {
-                          "value" : "FM1LEI11111111111111"
-                        },
-                        "meta" : {
-                          "globalKey" : "87c4d1c6"
-                        }
-                      } ]
-                    }
-                  },
-                  "role" : "PARTY_1"
-                }, {
-                  "partyReference" : {
-                    "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
-                      "partyId" : [ {
-                        "identifier" : {
-                          "value" : "CP001LEI111111111111"
-                        },
-                        "meta" : {
-                          "globalKey" : "12818f8c"
-                        }
-                      } ]
-                    }
-                  },
-                  "role" : "PARTY_2"
-                } ],
                 "product" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -1652,25 +1726,26 @@
                       "productQualifier" : "SecurityLendingAgreement"
                     } ],
                     "economicTerms" : {
-                      "collateral" : {
-                        "collateralProvisions" : {
-                          "collateralType" : "CASH",
-                          "eligibleCollateral" : [ {
-                            "criteria" : [ {
-                              "treatment" : {
-                                "valuationTreatment" : {
-                                  "marginPercentage" : 0.02
-                                }
-                              }
-                            } ],
+                      "effectiveDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2020-09-22",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "168480"
+                              "globalKey" : "fa42f5cf"
                             }
-                          } ]
+                          },
+                          "meta" : {
+                            "globalKey" : "e742daa5"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "e742daa5"
                         }
                       },
-                      "effectiveDate" : {
+                      "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2020-10-22",
                           "dateAdjustments" : {
                             "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
@@ -1678,197 +1753,117 @@
                             }
                           },
                           "meta" : {
-                            "globalKey" : "e742daa5"
-                          },
-                          "unadjustedDate" : "2020-09-22"
+                            "globalKey" : "e743cae5"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "e742daa5"
+                          "globalKey" : "e743cae5"
                         }
                       },
                       "payout" : {
-                        "assetPayout" : [ {
+                        "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
-                          "assetLeg" : [ {
-                            "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                            "settlementDate" : {
-                              "adjustableDate" : {
-                                "adjustedDate" : {
-                                  "meta" : {
-                                    "globalKey" : "3f2256"
-                                  },
-                                  "value" : "2020-09-22"
-                                },
-                                "dateAdjustments" : {
-                                  "businessDayConvention" : "NONE",
-                                  "meta" : {
-                                    "globalKey" : "24a738"
+                          "priceQuantity" : {
+                            "quantitySchedule" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "quantity-8"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          },
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-2"
                                   }
-                                },
-                                "meta" : {
-                                  "globalKey" : "24a738"
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "24a738"
+                                "globalKey" : "0"
                               }
                             }
-                          }, {
-                            "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                            "settlementDate" : {
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
+                            "effectiveDate" : {
                               "adjustableDate" : {
-                                "adjustedDate" : {
+                                "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
-                                    "globalKey" : "3f2296"
-                                  },
-                                  "value" : "2020-10-22"
+                                    "globalKey" : "fa42f5cf"
+                                  }
                                 },
-                                "dateAdjustments" : {
-                                  "businessDayConvention" : "NONE",
+                                "adjustedDate" : {
+                                  "value" : "2020-09-22",
                                   "meta" : {
-                                    "globalKey" : "24a738"
+                                    "globalKey" : "3f2256"
                                   }
                                 },
                                 "meta" : {
-                                  "globalKey" : "24a738"
+                                  "globalKey" : "fa42f5cf",
+                                  "externalKey" : "Effective_Date"
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            }
-                          } ],
-                          "dividendTerms" : {
-                            "manufacturedIncomeRequirement" : {
-                              "totalRatio" : 1
-                            }
-                          },
-                          "durationType" : {
-                            "durationType" : "TERM"
-                          },
-                          "meta" : {
-                            "globalKey" : "73453ae0"
-                          },
-                          "minimumFee" : {
-                            "unit" : {
-                              "currency" : {
-                                "value" : "USD"
-                              }
-                            },
-                            "value" : 0,
-                            "meta" : {
-                              "globalKey" : "171b36"
-                            }
-                          },
-                          "securityInformation" : {
-                            "meta" : {
-                              "globalKey" : "7548eca6"
-                            },
-                            "security" : {
-                              "productIdentifier" : [ {
-                                "value" : {
-                                  "identifier" : {
-                                    "value" : "ST001"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "a4ff65ff"
-                                  },
-                                  "source" : "SEDOL"
-                                }
-                              } ],
-                              "securityType" : "EQUITY"
-                            }
-                          }
-                        } ],
-                        "interestRatePayout" : [ {
-                          "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
-                          },
-                          "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "quantitySchedule" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "quantity-8"
+                                "globalKey" : "fa42f5cf"
                               }
-                            }
-                          },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "25e2ab"
-                              },
-                              "period" : "T",
-                              "periodMultiplier" : 1,
-                              "rollConvention" : "NONE"
                             },
-                            "effectiveDate" : {
+                            "terminationDate" : {
                               "adjustableDate" : {
-                                "adjustedDate" : {
-                                  "meta" : {
-                                    "globalKey" : "3f2256"
-                                  },
-                                  "value" : "2020-09-22"
-                                },
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "fa42f5cf"
                                   }
                                 },
-                                "meta" : {
-                                  "externalKey" : "Effective_Date",
-                                  "globalKey" : "fa42f5cf"
-                                }
-                              },
-                              "meta" : {
-                                "globalKey" : "fa42f5cf"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "a4273c9"
-                            },
-                            "terminationDate" : {
-                              "adjustableDate" : {
                                 "adjustedDate" : {
+                                  "value" : "2020-10-22",
                                   "meta" : {
                                     "globalKey" : "3f2296"
-                                  },
-                                  "value" : "2020-10-22"
-                                },
-                                "dateAdjustments" : {
-                                  "businessDayConvention" : "MODFOLLOWING",
-                                  "meta" : {
-                                    "globalKey" : "fa42f5cf"
                                   }
                                 },
                                 "meta" : {
-                                  "externalKey" : "Termination_Date",
-                                  "globalKey" : "fa42f5cf"
+                                  "globalKey" : "fa42f5cf",
+                                  "externalKey" : "Termination_Date"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "fa42f5cf"
                               }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "T",
+                              "meta" : {
+                                "globalKey" : "24b525"
+                              },
+                              "rollConvention" : "NONE"
+                            },
+                            "meta" : {
+                              "globalKey" : "8b1de243"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "ce90278b"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "b578507f"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "T",
+                              "meta" : {
+                                "globalKey" : "73"
+                              }
                             },
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
@@ -1877,200 +1872,353 @@
                                   "globalKey" : "20a71d"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "a2d"
-                              },
-                              "period" : "T",
-                              "periodMultiplier" : 1
+                            "meta" : {
+                              "globalKey" : "fa98fa5b"
                             }
                           },
-                          "rateSpecification" : {
-                            "fixedRate" : {
+                          "meta" : {
+                            "globalKey" : "98fd77d9"
+                          }
+                        } ],
+                        "assetPayout" : [ {
+                          "payerReceiver" : {
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
+                          },
+                          "assetLeg" : [ {
+                            "settlementDate" : {
+                              "adjustableDate" : {
+                                "dateAdjustments" : {
+                                  "businessDayConvention" : "NONE",
+                                  "meta" : {
+                                    "globalKey" : "24a738"
+                                  }
+                                },
+                                "adjustedDate" : {
+                                  "value" : "2020-09-22",
+                                  "meta" : {
+                                    "globalKey" : "3f2256"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "24a738"
+                                }
+                              },
                               "meta" : {
-                                "globalKey" : "0"
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "deliveryMethod" : "DeliveryVersusPayment"
+                          }, {
+                            "settlementDate" : {
+                              "adjustableDate" : {
+                                "dateAdjustments" : {
+                                  "businessDayConvention" : "NONE",
+                                  "meta" : {
+                                    "globalKey" : "24a738"
+                                  }
+                                },
+                                "adjustedDate" : {
+                                  "value" : "2020-10-22",
+                                  "meta" : {
+                                    "globalKey" : "3f2296"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "24a738"
+                                }
                               },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-2"
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "deliveryMethod" : "DeliveryVersusPayment"
+                          } ],
+                          "securityInformation" : {
+                            "security" : {
+                              "productIdentifier" : [ {
+                                "value" : {
+                                  "identifier" : {
+                                    "value" : "ST001"
+                                  },
+                                  "source" : "SEDOL",
+                                  "meta" : {
+                                    "globalKey" : "a4ff65ff"
                                   }
                                 }
+                              } ],
+                              "securityType" : "Equity"
+                            },
+                            "meta" : {
+                              "globalKey" : "7548eca6"
+                            }
+                          },
+                          "durationType" : {
+                            "durationType" : "Term"
+                          },
+                          "minimumFee" : {
+                            "value" : 0,
+                            "unit" : {
+                              "currency" : {
+                                "value" : "USD"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "171b36"
+                            }
+                          },
+                          "dividendTerms" : {
+                            "manufacturedIncomeRequirement" : {
+                              "totalRatio" : 1
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "3b19750e"
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "eb31e26b"
+                          "globalKey" : "43b3b6a7"
                         }
                       },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "MODFOLLOWING",
+                      "collateral" : {
+                        "collateralProvisions" : {
+                          "collateralType" : "Cash",
+                          "eligibleCollateral" : [ {
+                            "criteria" : [ {
+                              "treatment" : {
+                                "valuationTreatment" : {
+                                  "marginPercentage" : 0.02
+                                }
+                              }
+                            } ],
                             "meta" : {
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "168480"
                             }
-                          },
-                          "meta" : {
-                            "globalKey" : "e743cae5"
-                          },
-                          "unadjustedDate" : "2020-10-22"
-                        },
-                        "meta" : {
-                          "globalKey" : "e743cae5"
+                          } ]
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "37405ce2"
+                      "globalKey" : "38d91964"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "37405ce2"
+                    "globalKey" : "38d91964"
                   }
                 },
                 "tradeLot" : [ {
                   "priceQuantity" : [ {
-                    "meta" : {
-                      "globalKey" : "e8dfa17d"
-                    },
                     "price" : [ {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        } ]
-                      },
                       "value" : {
+                        "value" : 0.01,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 0.01,
                         "perUnitOf" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "priceType" : "INTEREST_RATE"
-                      }
-                    } ],
-                    "quantity" : [ {
+                        "priceType" : "InterestRate"
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
-                          "value" : "quantity-8"
+                          "value" : "price-2"
                         } ]
-                      },
+                      }
+                    } ],
+                    "quantity" : [ {
                       "value" : {
+                        "value" : 3750000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
-                        },
-                        "value" : 3750000
-                      }
-                    } ]
-                  }, {
-                    "meta" : {
-                      "globalKey" : "41504f78"
-                    },
-                    "observable" : {
-                      "meta" : {
-                        "globalKey" : "a4ff65ff"
+                        }
                       },
-                      "productIdentifier" : [ {
-                        "value" : {
-                          "identifier" : {
-                            "value" : "ST001"
-                          },
-                          "meta" : {
-                            "globalKey" : "a4ff65ff"
-                          },
-                          "source" : "SEDOL"
-                        }
-                      } ]
-                    },
-                    "price" : [ {
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
-                          "value" : "price-1"
+                          "value" : "quantity-8"
                         } ]
-                      },
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "33148e23"
+                    }
+                  }, {
+                    "price" : [ {
                       "value" : {
+                        "value" : 25,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 25,
                         "perUnitOf" : {
-                          "financialUnit" : "SHARE"
+                          "financialUnit" : "Share"
                         },
-                        "priceType" : "ASSET_PRICE"
+                        "priceType" : "AssetPrice"
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        } ]
                       }
                     } ],
                     "quantity" : [ {
+                      "value" : {
+                        "value" : 150000,
+                        "unit" : {
+                          "financialUnit" : "Share"
+                        }
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-9"
                         } ]
+                      }
+                    } ],
+                    "observable" : {
+                      "productIdentifier" : [ {
+                        "value" : {
+                          "identifier" : {
+                            "value" : "ST001"
+                          },
+                          "source" : "SEDOL",
+                          "meta" : {
+                            "globalKey" : "a4ff65ff"
+                          }
+                        }
+                      } ],
+                      "meta" : {
+                        "globalKey" : "a4ff65ff"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "a908f466"
+                    }
+                  } ]
+                } ],
+                "counterparty" : [ {
+                  "role" : "Party1",
+                  "partyReference" : {
+                    "value" : {
+                      "partyId" : [ {
+                        "identifier" : {
+                          "value" : "FM1LEI11111111111111"
+                        },
+                        "meta" : {
+                          "globalKey" : "87c4d1c6"
+                        }
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
                       },
-                      "value" : {
-                        "unit" : {
-                          "financialUnit" : "SHARE"
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
+                    }
+                  }
+                }, {
+                  "role" : "Party2",
+                  "partyReference" : {
+                    "value" : {
+                      "partyId" : [ {
+                        "identifier" : {
+                          "value" : "CP001LEI111111111111"
                         },
-                        "value" : 150000
+                        "meta" : {
+                          "globalKey" : "12818f8c"
+                        }
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
                       }
-                    } ]
-                  } ]
+                    }
+                  }
                 } ]
               },
-              "tradeDate" : {
-                "meta" : {
-                  "globalKey" : "3f2255"
+              "party" : [ {
+                "partyId" : [ {
+                  "identifier" : {
+                    "value" : "FM1LEI11111111111111"
+                  },
+                  "meta" : {
+                    "globalKey" : "87c4d1c6"
+                  }
+                } ],
+                "name" : {
+                  "value" : "Standard Fund 1"
                 },
-                "value" : "2020-09-21"
-              },
-              "tradeIdentifier" : [ {
-                "assignedIdentifier" : [ {
+                "meta" : {
+                  "globalKey" : "40ec509f",
+                  "externalKey" : "Lender0"
+                }
+              }, {
+                "partyId" : [ {
                   "identifier" : {
-                    "value" : "0266001"
+                    "value" : "KTKLLEILLLLLLLLLLLLL"
+                  },
+                  "meta" : {
+                    "globalKey" : "60098fe6"
                   }
                 } ],
-                "issuer" : {
+                "name" : {
                   "value" : "KTKL"
                 },
                 "meta" : {
-                  "globalKey" : "9e641379"
+                  "globalKey" : "84088af0",
+                  "externalKey" : "AGENT_LENDER"
                 }
-              } ]
+              }, {
+                "partyId" : [ {
+                  "identifier" : {
+                    "value" : "CP001LEI111111111111"
+                  },
+                  "meta" : {
+                    "globalKey" : "12818f8c"
+                  }
+                } ],
+                "name" : {
+                  "value" : "CP001"
+                },
+                "meta" : {
+                  "globalKey" : "7c311b30",
+                  "externalKey" : "Borrower"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "3d87173d"
+              }
             },
             "transferHistory" : [ {
-              "meta" : {
-                "globalKey" : "637bd5fe"
-              },
               "transfer" : {
+                "quantity" : {
+                  "value" : 100000.00,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                },
                 "payerReceiver" : {
                   "payerPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "CP001LEI111111111111"
@@ -2078,18 +2226,18 @@
                         "meta" : {
                           "globalKey" : "12818f8c"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
+                      }
                     }
                   },
                   "receiverPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "FM1LEI11111111111111"
@@ -2097,24 +2245,23 @@
                         "meta" : {
                           "globalKey" : "87c4d1c6"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
+                      },
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
                     }
                   }
                 },
-                "quantity" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 100000.00
-                },
                 "settlementDate" : {
                   "adjustedDate" : {
+                    "value" : "2020-09-22",
                     "meta" : {
                       "globalKey" : "3f2256"
-                    },
-                    "value" : "2020-09-22"
+                    }
                   }
                 },
                 "settlementOrigin" : {
@@ -2122,38 +2269,37 @@
                     "globalReference" : "73453ae0"
                   }
                 }
+              },
+              "meta" : {
+                "globalKey" : "4f6790d8"
               }
             }, {
-              "meta" : {
-                "globalKey" : "79e525e7"
-              },
               "transfer" : {
+                "quantity" : {
+                  "value" : 200000,
+                  "unit" : {
+                    "financialUnit" : "Share"
+                  }
+                },
                 "observable" : {
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
                   "productIdentifier" : [ {
                     "value" : {
                       "identifier" : {
                         "value" : "ST001"
                       },
+                      "source" : "SEDOL",
                       "meta" : {
                         "globalKey" : "a4ff65ff"
-                      },
-                      "source" : "SEDOL"
+                      }
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
                 },
                 "payerReceiver" : {
                   "payerPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "FM1LEI11111111111111"
@@ -2161,18 +2307,18 @@
                         "meta" : {
                           "globalKey" : "87c4d1c6"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "Standard Fund 1"
+                      },
+                      "meta" : {
+                        "globalKey" : "40ec509f",
+                        "externalKey" : "Lender0"
+                      }
                     }
                   },
                   "receiverPartyReference" : {
                     "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
                       "partyId" : [ {
                         "identifier" : {
                           "value" : "CP001LEI111111111111"
@@ -2180,22 +2326,23 @@
                         "meta" : {
                           "globalKey" : "12818f8c"
                         }
-                      } ]
+                      } ],
+                      "name" : {
+                        "value" : "CP001"
+                      },
+                      "meta" : {
+                        "globalKey" : "7c311b30",
+                        "externalKey" : "Borrower"
+                      }
                     }
                   }
                 },
-                "quantity" : {
-                  "unit" : {
-                    "financialUnit" : "SHARE"
-                  },
-                  "value" : 200000
-                },
                 "settlementDate" : {
                   "adjustedDate" : {
+                    "value" : "2020-09-22",
                     "meta" : {
                       "globalKey" : "3f2256"
-                    },
-                    "value" : "2020-09-22"
+                    }
                   }
                 },
                 "settlementOrigin" : {
@@ -2203,265 +2350,40 @@
                     "globalReference" : "73453ae0"
                   }
                 }
+              },
+              "meta" : {
+                "globalKey" : "9b9f0d6b"
               }
-            } ]
-          }
-        },
-        "primitiveInstruction" : {
-          "transfer" : {
-            "transferState" : [ {
-              "meta" : {
-                "globalKey" : "fcfe8682"
-              },
-              "transfer" : {
-                "payerReceiver" : {
-                  "payerPartyReference" : {
-                    "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
-                      "partyId" : [ {
-                        "identifier" : {
-                          "value" : "FM1LEI11111111111111"
-                        },
-                        "meta" : {
-                          "globalKey" : "87c4d1c6"
-                        }
-                      } ]
-                    }
-                  },
-                  "receiverPartyReference" : {
-                    "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
-                      "partyId" : [ {
-                        "identifier" : {
-                          "value" : "CP001LEI111111111111"
-                        },
-                        "meta" : {
-                          "globalKey" : "12818f8c"
-                        }
-                      } ]
-                    }
-                  }
-                },
-                "quantity" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 25000.00
-                },
-                "settlementDate" : {
-                  "adjustedDate" : {
-                    "meta" : {
-                      "globalKey" : "3f2289"
-                    },
-                    "value" : "2020-10-09"
-                  }
-                },
-                "settlementOrigin" : {
-                  "assetPayout" : {
-                    "globalReference" : "73453ae0"
-                  }
-                }
-              }
-            }, {
-              "meta" : {
-                "globalKey" : "b994ca66"
-              },
-              "transfer" : {
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "value" : "ST001"
-                      },
-                      "meta" : {
-                        "globalKey" : "a4ff65ff"
-                      },
-                      "source" : "SEDOL"
-                    }
-                  } ]
-                },
-                "payerReceiver" : {
-                  "payerPartyReference" : {
-                    "value" : {
-                      "meta" : {
-                        "externalKey" : "Borrower",
-                        "globalKey" : "1f061e68"
-                      },
-                      "name" : {
-                        "value" : "CP001"
-                      },
-                      "partyId" : [ {
-                        "identifier" : {
-                          "value" : "CP001LEI111111111111"
-                        },
-                        "meta" : {
-                          "globalKey" : "12818f8c"
-                        }
-                      } ]
-                    }
-                  },
-                  "receiverPartyReference" : {
-                    "value" : {
-                      "meta" : {
-                        "externalKey" : "Lender0",
-                        "globalKey" : "a896ecd"
-                      },
-                      "name" : {
-                        "value" : "Standard Fund 1"
-                      },
-                      "partyId" : [ {
-                        "identifier" : {
-                          "value" : "FM1LEI11111111111111"
-                        },
-                        "meta" : {
-                          "globalKey" : "87c4d1c6"
-                        }
-                      } ]
-                    }
-                  }
-                },
-                "quantity" : {
-                  "unit" : {
-                    "financialUnit" : "SHARE"
-                  },
-                  "value" : 50000
-                },
-                "settlementDate" : {
-                  "adjustedDate" : {
-                    "meta" : {
-                      "globalKey" : "3f2289"
-                    },
-                    "value" : "2020-10-09"
-                  }
-                },
-                "settlementOrigin" : {
-                  "assetPayout" : {
-                    "globalReference" : "73453ae0"
-                  }
-                }
-              }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "6dcf13b6"
+            }
           }
         }
       } ],
+      "eventQualifier" : "CashAndSecurityTransfer",
       "after" : [ {
-        "meta" : {
-          "globalKey" : "5a60952"
-        },
         "trade" : {
-          "meta" : {
-            "globalKey" : "dc000f7"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "Lender0",
-              "globalKey" : "a896ecd"
-            },
-            "name" : {
-              "value" : "Standard Fund 1"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "FM1LEI11111111111111"
-              },
-              "meta" : {
-                "globalKey" : "87c4d1c6"
-              }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "AGENT_LENDER",
-              "globalKey" : "73176f1c"
-            },
-            "name" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
               "value" : "KTKL"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
-                "value" : "KTKLLEILLLLLLLLLLLLL"
-              },
-              "meta" : {
-                "globalKey" : "60098fe6"
+                "value" : "0266001"
               }
-            } ]
-          }, {
+            } ],
             "meta" : {
-              "externalKey" : "Borrower",
-              "globalKey" : "1f061e68"
-            },
-            "name" : {
-              "value" : "CP001"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "CP001LEI111111111111"
-              },
-              "meta" : {
-                "globalKey" : "12818f8c"
-              }
-            } ]
+              "globalKey" : "569d85e5"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "2020-09-21",
+            "meta" : {
+              "globalKey" : "3f2255"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "FM1LEI11111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "87c4d1c6"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "CP001LEI111111111111"
-                    },
-                    "meta" : {
-                      "globalKey" : "12818f8c"
-                    }
-                  } ]
-                }
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -2469,25 +2391,9 @@
                   "productQualifier" : "SecurityLendingAgreement"
                 } ],
                 "economicTerms" : {
-                  "collateral" : {
-                    "collateralProvisions" : {
-                      "collateralType" : "CASH",
-                      "eligibleCollateral" : [ {
-                        "criteria" : [ {
-                          "treatment" : {
-                            "valuationTreatment" : {
-                              "marginPercentage" : 0.02
-                            }
-                          }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "168480"
-                        }
-                      } ]
-                    }
-                  },
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2020-09-22",
                       "dateAdjustments" : {
                         "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
@@ -2496,196 +2402,133 @@
                       },
                       "meta" : {
                         "globalKey" : "e742daa5"
-                      },
-                      "unadjustedDate" : "2020-09-22"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e742daa5"
                     }
                   },
-                  "payout" : {
-                    "assetPayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
-                      },
-                      "assetLeg" : [ {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
-                          "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
-                            },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
-                              "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        }
-                      }, {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
-                          "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
-                            },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
-                              "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        }
-                      } ],
-                      "dividendTerms" : {
-                        "manufacturedIncomeRequirement" : {
-                          "totalRatio" : 1
-                        }
-                      },
-                      "durationType" : {
-                        "durationType" : "TERM"
-                      },
-                      "meta" : {
-                        "globalKey" : "73453ae0"
-                      },
-                      "minimumFee" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "USD"
-                          }
-                        },
-                        "value" : 0,
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2020-10-22",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "171b36"
+                          "globalKey" : "fa42f5cf"
                         }
                       },
-                      "securityInformation" : {
-                        "meta" : {
-                          "globalKey" : "7548eca6"
-                        },
-                        "security" : {
-                          "productIdentifier" : [ {
-                            "value" : {
-                              "identifier" : {
-                                "value" : "ST001"
-                              },
-                              "meta" : {
-                                "globalKey" : "a4ff65ff"
-                              },
-                              "source" : "SEDOL"
-                            }
-                          } ],
-                          "securityType" : "EQUITY"
-                        }
+                      "meta" : {
+                        "globalKey" : "e743cae5"
                       }
-                    } ],
+                    },
+                    "meta" : {
+                      "globalKey" : "e743cae5"
+                    }
+                  },
+                  "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-8"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "25e2ab"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-2"
+                              }
+                            }
                           },
-                          "period" : "T",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "NONE"
-                        },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
-                            },
                             "dateAdjustments" : {
                               "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "fa42f5cf"
                               }
                             },
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
+                              "meta" : {
+                                "globalKey" : "3f2256"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "Effective_Date",
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Effective_Date"
                             }
                           },
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "a4273c9"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
-                            },
                             "dateAdjustments" : {
                               "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "fa42f5cf"
                               }
                             },
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
+                              "meta" : {
+                                "globalKey" : "3f2296"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "Termination_Date",
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Termination_Date"
                             }
                           },
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
+                        },
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "24b525"
+                          },
+                          "rollConvention" : "NONE"
+                        },
+                        "meta" : {
+                          "globalKey" : "8b1de243"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "ce90278b"
-                      },
                       "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "b578507f"
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "73"
+                          }
                         },
                         "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -2694,200 +2537,353 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
-                        "paymentFrequency" : {
-                          "meta" : {
-                            "globalKey" : "a2d"
-                          },
-                          "period" : "T",
-                          "periodMultiplier" : 1
+                        "meta" : {
+                          "globalKey" : "fa98fa5b"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "meta" : {
+                        "globalKey" : "98fd77d9"
+                      }
+                    } ],
+                    "assetPayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "assetLeg" : [ {
+                        "settlementDate" : {
+                          "adjustableDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
+                              "meta" : {
+                                "globalKey" : "3f2256"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
                           "meta" : {
-                            "globalKey" : "0"
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      }, {
+                        "settlementDate" : {
+                          "adjustableDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
+                              "meta" : {
+                                "globalKey" : "3f2296"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
                           },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-2"
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      } ],
+                      "securityInformation" : {
+                        "security" : {
+                          "productIdentifier" : [ {
+                            "value" : {
+                              "identifier" : {
+                                "value" : "ST001"
+                              },
+                              "source" : "SEDOL",
+                              "meta" : {
+                                "globalKey" : "a4ff65ff"
                               }
                             }
+                          } ],
+                          "securityType" : "Equity"
+                        },
+                        "meta" : {
+                          "globalKey" : "7548eca6"
+                        }
+                      },
+                      "durationType" : {
+                        "durationType" : "Term"
+                      },
+                      "minimumFee" : {
+                        "value" : 0,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "USD"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "171b36"
+                        }
+                      },
+                      "dividendTerms" : {
+                        "manufacturedIncomeRequirement" : {
+                          "totalRatio" : 1
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3b19750e"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "eb31e26b"
+                      "globalKey" : "43b3b6a7"
                     }
                   },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "MODFOLLOWING",
+                  "collateral" : {
+                    "collateralProvisions" : {
+                      "collateralType" : "Cash",
+                      "eligibleCollateral" : [ {
+                        "criteria" : [ {
+                          "treatment" : {
+                            "valuationTreatment" : {
+                              "marginPercentage" : 0.02
+                            }
+                          }
+                        } ],
                         "meta" : {
-                          "globalKey" : "fa42f5cf"
+                          "globalKey" : "168480"
                         }
-                      },
-                      "meta" : {
-                        "globalKey" : "e743cae5"
-                      },
-                      "unadjustedDate" : "2020-10-22"
-                    },
-                    "meta" : {
-                      "globalKey" : "e743cae5"
+                      } ]
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "37405ce2"
+                  "globalKey" : "38d91964"
                 }
               },
               "meta" : {
-                "globalKey" : "37405ce2"
+                "globalKey" : "38d91964"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "e8dfa17d"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.01,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 0.01,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-8"
+                      "value" : "price-2"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 3750000,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
-                    },
-                    "value" : 3750000
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "41504f78"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "value" : "ST001"
-                      },
-                      "meta" : {
-                        "globalKey" : "a4ff65ff"
-                      },
-                      "source" : "SEDOL"
                     }
-                  } ]
-                },
-                "price" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "price-1"
+                      "value" : "quantity-8"
                     } ]
-                  },
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "33148e23"
+                }
+              }, {
+                "price" : [ {
                   "value" : {
+                    "value" : 25,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 25,
                     "perUnitOf" : {
-                      "financialUnit" : "SHARE"
+                      "financialUnit" : "Share"
                     },
-                    "priceType" : "ASSET_PRICE"
+                    "priceType" : "AssetPrice"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
                   }
                 } ],
                 "quantity" : [ {
+                  "value" : {
+                    "value" : 150000,
+                    "unit" : {
+                      "financialUnit" : "Share"
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-9"
                     } ]
+                  }
+                } ],
+                "observable" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "ST001"
+                      },
+                      "source" : "SEDOL",
+                      "meta" : {
+                        "globalKey" : "a4ff65ff"
+                      }
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "a908f466"
+                }
+              } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "FM1LEI11111111111111"
+                    },
+                    "meta" : {
+                      "globalKey" : "87c4d1c6"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
+                }
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "CP001LEI111111111111"
+                    },
+                    "meta" : {
+                      "globalKey" : "12818f8c"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
                   },
-                  "value" : {
-                    "unit" : {
-                      "financialUnit" : "SHARE"
-                    },
-                    "value" : 150000
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
                   }
-                } ]
-              } ]
+                }
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f2255"
+          "party" : [ {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "FM1LEI11111111111111"
+              },
+              "meta" : {
+                "globalKey" : "87c4d1c6"
+              }
+            } ],
+            "name" : {
+              "value" : "Standard Fund 1"
             },
-            "value" : "2020-09-21"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+            "meta" : {
+              "globalKey" : "40ec509f",
+              "externalKey" : "Lender0"
+            }
+          }, {
+            "partyId" : [ {
               "identifier" : {
-                "value" : "0266001"
+                "value" : "KTKLLEILLLLLLLLLLLLL"
+              },
+              "meta" : {
+                "globalKey" : "60098fe6"
               }
             } ],
-            "issuer" : {
+            "name" : {
               "value" : "KTKL"
             },
             "meta" : {
-              "globalKey" : "9e641379"
+              "globalKey" : "84088af0",
+              "externalKey" : "AGENT_LENDER"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "CP001LEI111111111111"
+              },
+              "meta" : {
+                "globalKey" : "12818f8c"
+              }
+            } ],
+            "name" : {
+              "value" : "CP001"
+            },
+            "meta" : {
+              "globalKey" : "7c311b30",
+              "externalKey" : "Borrower"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "3d87173d"
+          }
         },
         "transferHistory" : [ {
-          "meta" : {
-            "globalKey" : "637bd5fe"
-          },
           "transfer" : {
+            "quantity" : {
+              "value" : 100000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
             "payerReceiver" : {
               "payerPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "CP001LEI111111111111"
@@ -2895,18 +2891,18 @@
                     "meta" : {
                       "globalKey" : "12818f8c"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
                 }
               },
               "receiverPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "FM1LEI11111111111111"
@@ -2914,24 +2910,23 @@
                     "meta" : {
                       "globalKey" : "87c4d1c6"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
                 }
               }
             },
-            "quantity" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 100000.00
-            },
             "settlementDate" : {
               "adjustedDate" : {
+                "value" : "2020-09-22",
                 "meta" : {
                   "globalKey" : "3f2256"
-                },
-                "value" : "2020-09-22"
+                }
               }
             },
             "settlementOrigin" : {
@@ -2939,38 +2934,37 @@
                 "globalReference" : "73453ae0"
               }
             }
+          },
+          "meta" : {
+            "globalKey" : "4f6790d8"
           }
         }, {
-          "meta" : {
-            "globalKey" : "79e525e7"
-          },
           "transfer" : {
+            "quantity" : {
+              "value" : 200000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "observable" : {
-              "meta" : {
-                "globalKey" : "a4ff65ff"
-              },
               "productIdentifier" : [ {
                 "value" : {
                   "identifier" : {
                     "value" : "ST001"
                   },
+                  "source" : "SEDOL",
                   "meta" : {
                     "globalKey" : "a4ff65ff"
-                  },
-                  "source" : "SEDOL"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "a4ff65ff"
+              }
             },
             "payerReceiver" : {
               "payerPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "FM1LEI11111111111111"
@@ -2978,18 +2972,18 @@
                     "meta" : {
                       "globalKey" : "87c4d1c6"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
                 }
               },
               "receiverPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "CP001LEI111111111111"
@@ -2997,22 +2991,23 @@
                     "meta" : {
                       "globalKey" : "12818f8c"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
                 }
               }
             },
-            "quantity" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 200000
-            },
             "settlementDate" : {
               "adjustedDate" : {
+                "value" : "2020-09-22",
                 "meta" : {
                   "globalKey" : "3f2256"
-                },
-                "value" : "2020-09-22"
+                }
               }
             },
             "settlementOrigin" : {
@@ -3020,22 +3015,23 @@
                 "globalReference" : "73453ae0"
               }
             }
+          },
+          "meta" : {
+            "globalKey" : "9b9f0d6b"
           }
         }, {
-          "meta" : {
-            "globalKey" : "fcfe8682"
-          },
           "transfer" : {
+            "quantity" : {
+              "value" : 25000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
             "payerReceiver" : {
               "payerPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "FM1LEI11111111111111"
@@ -3043,18 +3039,18 @@
                     "meta" : {
                       "globalKey" : "87c4d1c6"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
                 }
               },
               "receiverPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "CP001LEI111111111111"
@@ -3062,63 +3058,61 @@
                     "meta" : {
                       "globalKey" : "12818f8c"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
                 }
               }
             },
-            "quantity" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 25000.00
-            },
             "settlementDate" : {
               "adjustedDate" : {
+                "value" : "2020-10-09",
                 "meta" : {
                   "globalKey" : "3f2289"
-                },
-                "value" : "2020-10-09"
+                }
               }
             },
             "settlementOrigin" : {
               "assetPayout" : {
-                "globalReference" : "73453ae0"
+                "globalReference" : "3b19750e"
               }
             }
+          },
+          "meta" : {
+            "globalKey" : "d5fe4b6"
           }
         }, {
-          "meta" : {
-            "globalKey" : "b994ca66"
-          },
           "transfer" : {
+            "quantity" : {
+              "value" : 50000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "observable" : {
-              "meta" : {
-                "globalKey" : "a4ff65ff"
-              },
               "productIdentifier" : [ {
                 "value" : {
                   "identifier" : {
                     "value" : "ST001"
                   },
+                  "source" : "SEDOL",
                   "meta" : {
                     "globalKey" : "a4ff65ff"
-                  },
-                  "source" : "SEDOL"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "a4ff65ff"
+              }
             },
             "payerReceiver" : {
               "payerPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "1f061e68"
-                  },
-                  "name" : {
-                    "value" : "CP001"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "CP001LEI111111111111"
@@ -3126,18 +3120,18 @@
                     "meta" : {
                       "globalKey" : "12818f8c"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "CP001"
+                  },
+                  "meta" : {
+                    "globalKey" : "7c311b30",
+                    "externalKey" : "Borrower"
+                  }
                 }
               },
               "receiverPartyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Lender0",
-                    "globalKey" : "a896ecd"
-                  },
-                  "name" : {
-                    "value" : "Standard Fund 1"
-                  },
                   "partyId" : [ {
                     "identifier" : {
                       "value" : "FM1LEI11111111111111"
@@ -3145,37 +3139,55 @@
                     "meta" : {
                       "globalKey" : "87c4d1c6"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "Standard Fund 1"
+                  },
+                  "meta" : {
+                    "globalKey" : "40ec509f",
+                    "externalKey" : "Lender0"
+                  }
                 }
               }
             },
-            "quantity" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 50000
-            },
             "settlementDate" : {
               "adjustedDate" : {
+                "value" : "2020-10-09",
                 "meta" : {
                   "globalKey" : "3f2289"
-                },
-                "value" : "2020-10-09"
+                }
               }
             },
             "settlementOrigin" : {
               "assetPayout" : {
-                "globalReference" : "73453ae0"
+                "globalReference" : "3b19750e"
               }
             }
+          },
+          "meta" : {
+            "globalKey" : "39f1f2b2"
           }
-        } ]
+        } ],
+        "meta" : {
+          "globalKey" : "32ee6106"
+        }
       } ],
-      "eventQualifier" : "CashAndSecurityTransfer",
       "meta" : {
-        "globalKey" : "257ebe2c"
+        "globalKey" : "6a7b0348"
+      }
+    },
+    "previousWorkflowStep" : {
+      "globalReference" : "af1de06c"
+    },
+    "messageInformation" : {
+      "messageId" : {
+        "value" : "message-id-2"
       }
     },
+    "timestamp" : [ {
+      "dateTime" : "2020-10-09T18:00:00Z",
+      "qualification" : "eventCreationDateTime"
+    } ],
     "eventIdentifier" : [ {
       "assignedIdentifier" : [ {
         "identifier" : {
@@ -3186,20 +3198,8 @@
         "globalKey" : "414b814e"
       }
     } ],
-    "messageInformation" : {
-      "messageId" : {
-        "value" : "message-id-2"
-      }
-    },
     "meta" : {
-      "globalKey" : "944678d3"
-    },
-    "previousWorkflowStep" : {
-      "globalReference" : "1e9ea2d4"
-    },
-    "timestamp" : [ {
-      "dateTime" : "2020-10-09T18:00:00Z",
-      "qualification" : "EVENT_CREATION_DATE_TIME"
-    } ]
+      "globalKey" : "c8283947"
+    }
   } ]
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/reallocation/reallocation-pre-settled-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/reallocation/reallocation-pre-settled-func-output.json
index cce0277f8e..335eb92f63 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/reallocation/reallocation-pre-settled-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/reallocation/reallocation-pre-settled-func-output.json
@@ -1,115 +1,146 @@
 {
+  "intent" : "Reallocation",
   "eventDate" : "2020-09-21",
   "instruction" : [ {
-    "before" : {
-      "value" : {
-        "meta" : {
-          "globalKey" : "7ee521ec"
-        },
-        "trade" : {
-          "meta" : {
-            "globalKey" : "7ee521ec"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "lender-2",
-              "globalKey" : "ea2310a0"
-            },
-            "name" : {
-              "value" : "Fund 2"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "Fund 2"
-              },
-              "meta" : {
-                "globalKey" : "7e1775b7"
-              }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "Borrower",
-              "globalKey" : "20931af1"
-            },
-            "name" : {
-              "value" : "CP001 (Borrower)"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "CP001LEI111111111111"
-              },
-              "meta" : {
-                "globalKey" : "12818f8c"
-              }
-            } ]
-          }, {
-            "meta" : {
-              "externalKey" : "AGENT_LENDER",
-              "globalKey" : "2691a546"
-            },
-            "name" : {
-              "value" : "KTKL (Agent Lender)"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "KTKLLEILLLLLLLLLLLLL"
-              },
-              "meta" : {
-                "globalKey" : "60098fe6"
-              }
-            } ]
-          } ],
-          "partyRole" : [ {
-            "partyReference" : {
-              "value" : {
-                "meta" : {
-                  "externalKey" : "AGENT_LENDER",
-                  "globalKey" : "2691a546"
-                },
-                "name" : {
-                  "value" : "KTKL (Agent Lender)"
-                },
-                "partyId" : [ {
-                  "identifier" : {
-                    "value" : "KTKLLEILLLLLLLLLLLLL"
+    "primitiveInstruction" : {
+      "split" : {
+        "breakdown" : [ {
+          "partyChange" : {
+            "counterparty" : {
+              "role" : "Party1",
+              "partyReference" : {
+                "value" : {
+                  "partyId" : [ {
+                    "identifier" : {
+                      "value" : "Fund 3"
+                    },
+                    "meta" : {
+                      "globalKey" : "7e1775b8"
+                    }
+                  } ],
+                  "name" : {
+                    "value" : "Fund 3"
                   },
                   "meta" : {
-                    "globalKey" : "60098fe6"
+                    "globalKey" : "d4285d70",
+                    "externalKey" : "lender-3"
                   }
-                } ]
+                }
               }
             },
-            "role" : "AGENT_LENDER"
-          } ],
-          "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "lender-2",
-                "globalReference" : "ea2310a0"
-              },
-              "role" : "PARTY_1"
-            }, {
+            "partyRole" : {
               "partyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "Borrower",
-                    "globalKey" : "20931af1"
-                  },
-                  "name" : {
-                    "value" : "CP001 (Borrower)"
-                  },
                   "partyId" : [ {
                     "identifier" : {
-                      "value" : "CP001LEI111111111111"
+                      "value" : "Fund 2"
                     },
                     "meta" : {
-                      "globalKey" : "12818f8c"
+                      "globalKey" : "7e1775b7"
                     }
-                  } ]
+                  } ],
+                  "name" : {
+                    "value" : "Fund 2"
+                  },
+                  "meta" : {
+                    "globalKey" : "d42859ae",
+                    "externalKey" : "lender-2"
+                  }
                 }
               },
-              "role" : "PARTY_2"
+              "role" : "AgentLender"
+            },
+            "tradeId" : [ {
+              "issuer" : {
+                "value" : "KTKL"
+              },
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "0266001-allocation-lender-2-allocation-lender-3"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "3a503368"
+              }
+            } ]
+          },
+          "quantityChange" : {
+            "change" : [ {
+              "quantity" : [ {
+                "value" : {
+                  "value" : 500000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                }
+              }, {
+                "value" : {
+                  "value" : 20000,
+                  "unit" : {
+                    "financialUnit" : "Share"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "a243eb5c"
+              }
+            } ],
+            "direction" : "Replace"
+          }
+        }, {
+          "quantityChange" : {
+            "change" : [ {
+              "quantity" : [ {
+                "value" : {
+                  "value" : 1500000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "USD"
+                    }
+                  }
+                }
+              }, {
+                "value" : {
+                  "value" : 60000,
+                  "unit" : {
+                    "financialUnit" : "Share"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "b1506fcf"
+              }
+            } ],
+            "direction" : "Replace"
+          }
+        } ]
+      }
+    },
+    "before" : {
+      "value" : {
+        "trade" : {
+          "tradeIdentifier" : [ {
+            "issuer" : {
+              "value" : "KTKL"
+            },
+            "assignedIdentifier" : [ {
+              "identifier" : {
+                "value" : "0266001-allocation-lender-2"
+              }
             } ],
+            "meta" : {
+              "globalKey" : "c76d61e6"
+            }
+          } ],
+          "tradeDate" : {
+            "value" : "2020-09-21",
+            "meta" : {
+              "globalKey" : "3f2255"
+            }
+          },
+          "tradableProduct" : {
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -117,25 +148,26 @@
                   "productQualifier" : "SecurityLendingAgreement"
                 } ],
                 "economicTerms" : {
-                  "collateral" : {
-                    "collateralProvisions" : {
-                      "collateralType" : "CASH",
-                      "eligibleCollateral" : [ {
-                        "criteria" : [ {
-                          "treatment" : {
-                            "valuationTreatment" : {
-                              "marginPercentage" : 0.02
-                            }
-                          }
-                        } ],
+                  "effectiveDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2020-09-22",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
-                          "globalKey" : "168480"
+                          "globalKey" : "fa42f5cf"
                         }
-                      } ]
+                      },
+                      "meta" : {
+                        "globalKey" : "e742daa5"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "e742daa5"
                     }
                   },
-                  "effectiveDate" : {
+                  "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2020-10-22",
                       "dateAdjustments" : {
                         "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
@@ -143,197 +175,117 @@
                         }
                       },
                       "meta" : {
-                        "globalKey" : "e742daa5"
-                      },
-                      "unadjustedDate" : "2020-09-22"
+                        "globalKey" : "e743cae5"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "e742daa5"
+                      "globalKey" : "e743cae5"
                     }
                   },
                   "payout" : {
-                    "assetPayout" : [ {
+                    "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
-                      "assetLeg" : [ {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
-                          "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
-                            },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
-                              "meta" : {
-                                "globalKey" : "24a738"
+                      "priceQuantity" : {
+                        "quantitySchedule" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "quantity-8"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      },
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-2"
                               }
-                            },
-                            "meta" : {
-                              "globalKey" : "24a738"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "24a738"
+                            "globalKey" : "0"
                           }
                         }
-                      }, {
-                        "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                        "settlementDate" : {
-                          "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
-                            },
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NONE",
-                              "meta" : {
-                                "globalKey" : "24a738"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        }
-                      } ],
-                      "dividendTerms" : {
-                        "manufacturedIncomeRequirement" : {
-                          "totalRatio" : 1
-                        }
-                      },
-                      "durationType" : {
-                        "durationType" : "TERM"
-                      },
-                      "meta" : {
-                        "globalKey" : "73453ae0"
-                      },
-                      "minimumFee" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "USD"
-                          }
-                        },
-                        "value" : 0,
-                        "meta" : {
-                          "globalKey" : "171b36"
-                        }
-                      },
-                      "securityInformation" : {
-                        "meta" : {
-                          "globalKey" : "7548eca6"
-                        },
-                        "security" : {
-                          "productIdentifier" : [ {
-                            "value" : {
-                              "identifier" : {
-                                "value" : "ST001"
-                              },
-                              "meta" : {
-                                "globalKey" : "a4ff65ff"
-                              },
-                              "source" : "SEDOL"
-                            }
-                          } ],
-                          "securityType" : "EQUITY"
-                        }
-                      }
-                    } ],
-                    "interestRatePayout" : [ {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
                       },
-                      "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "quantitySchedule" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "quantity-8"
-                          }
-                        }
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
                       },
                       "calculationPeriodDates" : {
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "25e2ab"
-                          },
-                          "period" : "T",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "NONE"
-                        },
                         "effectiveDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2256"
-                              },
-                              "value" : "2020-09-22"
-                            },
                             "dateAdjustments" : {
                               "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "fa42f5cf"
                               }
                             },
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
+                              "meta" : {
+                                "globalKey" : "3f2256"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "Effective_Date",
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Effective_Date"
                             }
                           },
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "a4273c9"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
-                            "adjustedDate" : {
-                              "meta" : {
-                                "globalKey" : "3f2296"
-                              },
-                              "value" : "2020-10-22"
-                            },
                             "dateAdjustments" : {
                               "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "fa42f5cf"
                               }
                             },
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
+                              "meta" : {
+                                "globalKey" : "3f2296"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "Termination_Date",
-                              "globalKey" : "fa42f5cf"
+                              "globalKey" : "fa42f5cf",
+                              "externalKey" : "Termination_Date"
                             }
                           },
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
+                        },
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "24b525"
+                          },
+                          "rollConvention" : "NONE"
+                        },
+                        "meta" : {
+                          "globalKey" : "8b1de243"
                         }
                       },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "ce90278b"
-                      },
                       "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "b578507f"
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "T",
+                          "meta" : {
+                            "globalKey" : "73"
+                          }
                         },
                         "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -342,674 +294,521 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365baaee"
                           }
                         },
-                        "paymentFrequency" : {
-                          "meta" : {
-                            "globalKey" : "a2d"
-                          },
-                          "period" : "T",
-                          "periodMultiplier" : 1
+                        "meta" : {
+                          "globalKey" : "fa98fa5b"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "meta" : {
+                        "globalKey" : "98fd77d9"
+                      }
+                    } ],
+                    "assetPayout" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "assetLeg" : [ {
+                        "settlementDate" : {
+                          "adjustableDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "adjustedDate" : {
+                              "value" : "2020-09-22",
+                              "meta" : {
+                                "globalKey" : "3f2256"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
                           "meta" : {
-                            "globalKey" : "0"
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      }, {
+                        "settlementDate" : {
+                          "adjustableDate" : {
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NONE",
+                              "meta" : {
+                                "globalKey" : "24a738"
+                              }
+                            },
+                            "adjustedDate" : {
+                              "value" : "2020-10-22",
+                              "meta" : {
+                                "globalKey" : "3f2296"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
                           },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-2"
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "deliveryMethod" : "DeliveryVersusPayment"
+                      } ],
+                      "securityInformation" : {
+                        "security" : {
+                          "productIdentifier" : [ {
+                            "value" : {
+                              "identifier" : {
+                                "value" : "ST001"
+                              },
+                              "source" : "SEDOL",
+                              "meta" : {
+                                "globalKey" : "a4ff65ff"
                               }
                             }
+                          } ],
+                          "securityType" : "Equity"
+                        },
+                        "meta" : {
+                          "globalKey" : "7548eca6"
+                        }
+                      },
+                      "durationType" : {
+                        "durationType" : "Term"
+                      },
+                      "minimumFee" : {
+                        "value" : 0,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "USD"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "171b36"
+                        }
+                      },
+                      "dividendTerms" : {
+                        "manufacturedIncomeRequirement" : {
+                          "totalRatio" : 1
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3b19750e"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "eb31e26b"
+                      "globalKey" : "43b3b6a7"
                     }
                   },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "MODFOLLOWING",
+                  "collateral" : {
+                    "collateralProvisions" : {
+                      "collateralType" : "Cash",
+                      "eligibleCollateral" : [ {
+                        "criteria" : [ {
+                          "treatment" : {
+                            "valuationTreatment" : {
+                              "marginPercentage" : 0.02
+                            }
+                          }
+                        } ],
                         "meta" : {
-                          "globalKey" : "fa42f5cf"
+                          "globalKey" : "168480"
                         }
-                      },
-                      "meta" : {
-                        "globalKey" : "e743cae5"
-                      },
-                      "unadjustedDate" : "2020-10-22"
-                    },
-                    "meta" : {
-                      "globalKey" : "e743cae5"
+                      } ]
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "37405ce2"
+                  "globalKey" : "38d91964"
                 }
               },
               "meta" : {
-                "globalKey" : "37405ce2"
+                "globalKey" : "38d91964"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "df5146fc"
-                },
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-2"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.01,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 0.01,
                     "perUnitOf" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-8"
+                      "value" : "price-2"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 2000000,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
-                    },
-                    "value" : 2000000
-                  }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "fde96a8c"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "value" : "ST001"
-                      },
-                      "meta" : {
-                        "globalKey" : "a4ff65ff"
-                      },
-                      "source" : "SEDOL"
                     }
-                  } ]
-                },
-                "price" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "price-1"
+                      "value" : "quantity-8"
                     } ]
-                  },
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "ad79884"
+                }
+              }, {
+                "price" : [ {
                   "value" : {
+                    "value" : 25,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 25,
                     "perUnitOf" : {
-                      "financialUnit" : "SHARE"
+                      "financialUnit" : "Share"
                     },
-                    "priceType" : "ASSET_PRICE"
+                    "priceType" : "AssetPrice"
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    } ]
                   }
                 } ],
                 "quantity" : [ {
+                  "value" : {
+                    "value" : 80000,
+                    "unit" : {
+                      "financialUnit" : "Share"
+                    }
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-9"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "financialUnit" : "SHARE"
-                    },
-                    "value" : 80000
                   }
-                } ]
+                } ],
+                "observable" : {
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "ST001"
+                      },
+                      "source" : "SEDOL",
+                      "meta" : {
+                        "globalKey" : "a4ff65ff"
+                      }
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "1ba2fad2"
+                }
               } ]
-            } ]
-          },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3f2255"
-            },
-            "value" : "2020-09-21"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
-              "identifier" : {
-                "value" : "0266001-allocation-lender-2"
-              }
             } ],
-            "issuer" : {
-              "value" : "KTKL"
-            },
-            "meta" : {
-              "globalKey" : "1aacf33a"
-            }
-          } ]
-        }
-      }
-    },
-    "primitiveInstruction" : {
-      "split" : {
-        "breakdown" : [ {
-          "partyChange" : {
-            "counterparty" : {
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "d42859ae",
+                "externalReference" : "lender-2"
+              }
+            }, {
+              "role" : "Party2",
               "partyReference" : {
                 "value" : {
-                  "meta" : {
-                    "externalKey" : "lender-3",
-                    "globalKey" : "ea238500"
-                  },
-                  "name" : {
-                    "value" : "Fund 3"
-                  },
                   "partyId" : [ {
                     "identifier" : {
-                      "value" : "Fund 3"
+                      "value" : "CP001LEI111111111111"
                     },
                     "meta" : {
-                      "globalKey" : "7e1775b8"
+                      "globalKey" : "12818f8c"
                     }
-                  } ]
-                }
-              },
-              "role" : "PARTY_1"
-            },
-            "partyRole" : {
-              "partyReference" : {
-                "value" : {
-                  "meta" : {
-                    "externalKey" : "lender-2",
-                    "globalKey" : "ea2310a0"
-                  },
+                  } ],
                   "name" : {
-                    "value" : "Fund 2"
+                    "value" : "CP001 (Borrower)"
                   },
-                  "partyId" : [ {
-                    "identifier" : {
-                      "value" : "Fund 2"
-                    },
-                    "meta" : {
-                      "globalKey" : "7e1775b7"
-                    }
-                  } ]
-                }
-              },
-              "role" : "AGENT_LENDER"
-            },
-            "tradeId" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "value" : "0266001-allocation-lender-2-allocation-lender-3"
+                  "meta" : {
+                    "globalKey" : "84fb9347",
+                    "externalKey" : "Borrower"
+                  }
                 }
-              } ],
-              "issuer" : {
-                "value" : "KTKL"
-              },
-              "meta" : {
-                "globalKey" : "60216c3c"
               }
             } ]
           },
-          "quantityChange" : {
-            "change" : [ {
-              "meta" : {
-                "globalKey" : "a243eb5c"
+          "party" : [ {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "Fund 2"
               },
-              "quantity" : [ {
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 500000
-                }
-              }, {
-                "value" : {
-                  "unit" : {
-                    "financialUnit" : "SHARE"
-                  },
-                  "value" : 20000
-                }
-              } ]
-            } ],
-            "direction" : "REPLACE"
-          }
-        }, {
-          "quantityChange" : {
-            "change" : [ {
               "meta" : {
-                "globalKey" : "b1506fcf"
-              },
-              "quantity" : [ {
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "value" : "USD"
-                    }
-                  },
-                  "value" : 1500000
-                }
-              }, {
-                "value" : {
-                  "unit" : {
-                    "financialUnit" : "SHARE"
-                  },
-                  "value" : 60000
-                }
-              } ]
+                "globalKey" : "7e1775b7"
+              }
             } ],
-            "direction" : "REPLACE"
-          }
-        } ]
-      }
-    }
-  } ],
-  "intent" : "REALLOCATION",
-  "after" : [ {
-    "meta" : {
-      "globalKey" : "55454a2a"
-    },
-    "trade" : {
-      "meta" : {
-        "globalKey" : "55454a2a"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "lender-3",
-          "globalKey" : "ea238500"
-        },
-        "name" : {
-          "value" : "Fund 3"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "value" : "Fund 3"
-          },
-          "meta" : {
-            "globalKey" : "7e1775b8"
-          }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "Borrower",
-          "globalKey" : "20931af1"
-        },
-        "name" : {
-          "value" : "CP001 (Borrower)"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "value" : "CP001LEI111111111111"
-          },
-          "meta" : {
-            "globalKey" : "12818f8c"
-          }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "AGENT_LENDER",
-          "globalKey" : "2691a546"
-        },
-        "name" : {
-          "value" : "KTKL (Agent Lender)"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "value" : "KTKLLEILLLLLLLLLLLLL"
-          },
-          "meta" : {
-            "globalKey" : "60098fe6"
-          }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "lender-2",
-          "globalKey" : "ea2310a0"
-        },
-        "name" : {
-          "value" : "Fund 2"
-        },
-        "partyId" : [ {
-          "identifier" : {
-            "value" : "Fund 2"
-          },
-          "meta" : {
-            "globalKey" : "7e1775b7"
-          }
-        } ]
-      } ],
-      "partyRole" : [ {
-        "partyReference" : {
-          "value" : {
-            "meta" : {
-              "externalKey" : "AGENT_LENDER",
-              "globalKey" : "2691a546"
-            },
             "name" : {
-              "value" : "KTKL (Agent Lender)"
+              "value" : "Fund 2"
             },
+            "meta" : {
+              "globalKey" : "d42859ae",
+              "externalKey" : "lender-2"
+            }
+          }, {
             "partyId" : [ {
               "identifier" : {
-                "value" : "KTKLLEILLLLLLLLLLLLL"
+                "value" : "CP001LEI111111111111"
               },
               "meta" : {
-                "globalKey" : "60098fe6"
+                "globalKey" : "12818f8c"
               }
-            } ]
-          }
-        },
-        "role" : "AGENT_LENDER"
-      }, {
-        "partyReference" : {
-          "value" : {
-            "meta" : {
-              "externalKey" : "lender-2",
-              "globalKey" : "ea2310a0"
-            },
+            } ],
             "name" : {
-              "value" : "Fund 2"
+              "value" : "CP001 (Borrower)"
             },
+            "meta" : {
+              "globalKey" : "84fb9347",
+              "externalKey" : "Borrower"
+            }
+          }, {
             "partyId" : [ {
               "identifier" : {
-                "value" : "Fund 2"
+                "value" : "KTKLLEILLLLLLLLLLLLL"
               },
               "meta" : {
-                "globalKey" : "7e1775b7"
+                "globalKey" : "60098fe6"
               }
-            } ]
-          }
-        },
-        "role" : "AGENT_LENDER"
-      } ],
-      "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "lender-3",
-            "globalReference" : "ea238500"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "Borrower",
-                "globalKey" : "20931af1"
-              },
-              "name" : {
-                "value" : "CP001 (Borrower)"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "value" : "CP001LEI111111111111"
-                },
-                "meta" : {
-                  "globalKey" : "12818f8c"
-                }
-              } ]
-            }
-          },
-          "role" : "PARTY_2"
-        } ],
-        "product" : {
-          "contractualProduct" : {
-            "productTaxonomy" : [ {
-              "source" : "ISDA",
-              "productQualifier" : "SecurityLendingAgreement"
             } ],
-            "economicTerms" : {
-              "collateral" : {
-                "collateralProvisions" : {
-                  "collateralType" : "CASH",
-                  "eligibleCollateral" : [ {
-                    "criteria" : [ {
-                      "treatment" : {
-                        "valuationTreatment" : {
-                          "marginPercentage" : 0.02
-                        }
-                      }
-                    } ],
-                    "meta" : {
-                      "globalKey" : "168480"
-                    }
-                  } ]
-                }
-              },
-              "effectiveDate" : {
-                "adjustableDate" : {
-                  "dateAdjustments" : {
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "fa42f5cf"
-                    }
+            "name" : {
+              "value" : "KTKL (Agent Lender)"
+            },
+            "meta" : {
+              "globalKey" : "53741506",
+              "externalKey" : "AGENT_LENDER"
+            }
+          } ],
+          "partyRole" : [ {
+            "partyReference" : {
+              "value" : {
+                "partyId" : [ {
+                  "identifier" : {
+                    "value" : "KTKLLEILLLLLLLLLLLLL"
                   },
                   "meta" : {
-                    "globalKey" : "e742daa5"
-                  },
-                  "unadjustedDate" : "2020-09-22"
+                    "globalKey" : "60098fe6"
+                  }
+                } ],
+                "name" : {
+                  "value" : "KTKL (Agent Lender)"
                 },
                 "meta" : {
-                  "globalKey" : "e742daa5"
+                  "globalKey" : "53741506",
+                  "externalKey" : "AGENT_LENDER"
                 }
-              },
-              "payout" : {
-                "assetPayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "assetLeg" : [ {
-                    "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                    "settlementDate" : {
-                      "adjustableDate" : {
-                        "adjustedDate" : {
-                          "meta" : {
-                            "globalKey" : "3f2256"
-                          },
-                          "value" : "2020-09-22"
-                        },
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NONE",
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "24a738"
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "24a738"
-                      }
-                    }
-                  }, {
-                    "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                    "settlementDate" : {
-                      "adjustableDate" : {
-                        "adjustedDate" : {
-                          "meta" : {
-                            "globalKey" : "3f2296"
-                          },
-                          "value" : "2020-10-22"
-                        },
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NONE",
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "24a738"
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "24a738"
-                      }
-                    }
-                  } ],
-                  "dividendTerms" : {
-                    "manufacturedIncomeRequirement" : {
-                      "totalRatio" : 1
+              }
+            },
+            "role" : "AgentLender"
+          } ],
+          "meta" : {
+            "globalKey" : "6ec1563a"
+          }
+        },
+        "meta" : {
+          "globalKey" : "6ec1563a"
+        }
+      }
+    }
+  } ],
+  "eventQualifier" : "Reallocation",
+  "after" : [ {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "KTKL"
+        },
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "0266001-allocation-lender-2-allocation-lender-3"
+          }
+        } ],
+        "meta" : {
+          "globalKey" : "3a503368"
+        }
+      } ],
+      "tradeDate" : {
+        "value" : "2020-09-21",
+        "meta" : {
+          "globalKey" : "3f2255"
+        }
+      },
+      "tradableProduct" : {
+        "product" : {
+          "contractualProduct" : {
+            "productTaxonomy" : [ {
+              "source" : "ISDA",
+              "productQualifier" : "SecurityLendingAgreement"
+            } ],
+            "economicTerms" : {
+              "effectiveDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2020-09-22",
+                  "dateAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "meta" : {
+                      "globalKey" : "fa42f5cf"
                     }
                   },
-                  "durationType" : {
-                    "durationType" : "TERM"
-                  },
                   "meta" : {
-                    "globalKey" : "73453ae0"
-                  },
-                  "minimumFee" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 0,
+                    "globalKey" : "e742daa5"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "e742daa5"
+                }
+              },
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2020-10-22",
+                  "dateAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "171b36"
+                      "globalKey" : "fa42f5cf"
                     }
                   },
-                  "securityInformation" : {
-                    "meta" : {
-                      "globalKey" : "7548eca6"
-                    },
-                    "security" : {
-                      "productIdentifier" : [ {
-                        "value" : {
-                          "identifier" : {
-                            "value" : "ST001"
-                          },
-                          "meta" : {
-                            "globalKey" : "a4ff65ff"
-                          },
-                          "source" : "SEDOL"
-                        }
-                      } ],
-                      "securityType" : "EQUITY"
-                    }
+                  "meta" : {
+                    "globalKey" : "e743cae5"
                   }
-                } ],
+                },
+                "meta" : {
+                  "globalKey" : "e743cae5"
+                }
+              },
+              "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-8"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "25e2ab"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-2"
+                          }
+                        }
                       },
-                      "period" : "T",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "NONE"
-                    },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
-                        "adjustedDate" : {
-                          "meta" : {
-                            "globalKey" : "3f2256"
-                          },
-                          "value" : "2020-09-22"
-                        },
                         "dateAdjustments" : {
                           "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
                         },
+                        "adjustedDate" : {
+                          "value" : "2020-09-22",
+                          "meta" : {
+                            "globalKey" : "3f2256"
+                          }
+                        },
                         "meta" : {
-                          "externalKey" : "Effective_Date",
-                          "globalKey" : "fa42f5cf"
+                          "globalKey" : "fa42f5cf",
+                          "externalKey" : "Effective_Date"
                         }
                       },
                       "meta" : {
                         "globalKey" : "fa42f5cf"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "a4273c9"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
-                        "adjustedDate" : {
-                          "meta" : {
-                            "globalKey" : "3f2296"
-                          },
-                          "value" : "2020-10-22"
-                        },
                         "dateAdjustments" : {
                           "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
                         },
+                        "adjustedDate" : {
+                          "value" : "2020-10-22",
+                          "meta" : {
+                            "globalKey" : "3f2296"
+                          }
+                        },
                         "meta" : {
-                          "externalKey" : "Termination_Date",
-                          "globalKey" : "fa42f5cf"
+                          "globalKey" : "fa42f5cf",
+                          "externalKey" : "Termination_Date"
                         }
                       },
                       "meta" : {
                         "globalKey" : "fa42f5cf"
                       }
+                    },
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
+                      "meta" : {
+                        "globalKey" : "24b525"
+                      },
+                      "rollConvention" : "NONE"
+                    },
+                    "meta" : {
+                      "globalKey" : "8b1de243"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "ce90278b"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "b578507f"
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
+                      "meta" : {
+                        "globalKey" : "73"
+                      }
                     },
                     "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
@@ -1018,252 +817,340 @@
                           "globalKey" : "20a71d"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "365baaee"
                       }
                     },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "a2d"
-                      },
-                      "period" : "T",
-                      "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "fa98fa5b"
                     }
                   },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
+                  "meta" : {
+                    "globalKey" : "98fd77d9"
+                  }
+                } ],
+                "assetPayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "assetLeg" : [ {
+                    "settlementDate" : {
+                      "adjustableDate" : {
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NONE",
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "adjustedDate" : {
+                          "value" : "2020-09-22",
+                          "meta" : {
+                            "globalKey" : "3f2256"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "24a738"
+                        }
                       },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-2"
+                      "meta" : {
+                        "globalKey" : "24a738"
+                      }
+                    },
+                    "deliveryMethod" : "DeliveryVersusPayment"
+                  }, {
+                    "settlementDate" : {
+                      "adjustableDate" : {
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NONE",
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "adjustedDate" : {
+                          "value" : "2020-10-22",
+                          "meta" : {
+                            "globalKey" : "3f2296"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "24a738"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "24a738"
                       }
+                    },
+                    "deliveryMethod" : "DeliveryVersusPayment"
+                  } ],
+                  "securityInformation" : {
+                    "security" : {
+                      "productIdentifier" : [ {
+                        "value" : {
+                          "identifier" : {
+                            "value" : "ST001"
+                          },
+                          "source" : "SEDOL",
+                          "meta" : {
+                            "globalKey" : "a4ff65ff"
+                          }
+                        }
+                      } ],
+                      "securityType" : "Equity"
+                    },
+                    "meta" : {
+                      "globalKey" : "7548eca6"
                     }
-                  }
-                } ],
-                "meta" : {
-                  "globalKey" : "eb31e26b"
-                }
-              },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "dateAdjustments" : {
-                    "businessDayConvention" : "MODFOLLOWING",
+                  },
+                  "durationType" : {
+                    "durationType" : "Term"
+                  },
+                  "minimumFee" : {
+                    "value" : 0,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "fa42f5cf"
+                      "globalKey" : "171b36"
+                    }
+                  },
+                  "dividendTerms" : {
+                    "manufacturedIncomeRequirement" : {
+                      "totalRatio" : 1
                     }
                   },
                   "meta" : {
-                    "globalKey" : "e743cae5"
-                  },
-                  "unadjustedDate" : "2020-10-22"
-                },
+                    "globalKey" : "3b19750e"
+                  }
+                } ],
                 "meta" : {
-                  "globalKey" : "e743cae5"
+                  "globalKey" : "43b3b6a7"
+                }
+              },
+              "collateral" : {
+                "collateralProvisions" : {
+                  "collateralType" : "Cash",
+                  "eligibleCollateral" : [ {
+                    "criteria" : [ {
+                      "treatment" : {
+                        "valuationTreatment" : {
+                          "marginPercentage" : 0.02
+                        }
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "168480"
+                    }
+                  } ]
                 }
               }
             },
             "meta" : {
-              "globalKey" : "37405ce2"
+              "globalKey" : "38d91964"
             }
           },
           "meta" : {
-            "globalKey" : "37405ce2"
+            "globalKey" : "38d91964"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "e4f59f3"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-2"
-                } ]
-              },
               "value" : {
+                "value" : 0.01,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 0.01,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-8"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 500000,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 500000
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "c0840706"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "a4ff65ff"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "ST001"
-                  },
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
-                  "source" : "SEDOL"
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-1"
+                  "value" : "quantity-8"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "bb9be46d"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 25,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 25,
                 "perUnitOf" : {
-                  "financialUnit" : "SHARE"
+                  "financialUnit" : "Share"
                 },
-                "priceType" : "ASSET_PRICE"
+                "priceType" : "AssetPrice"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-1"
+                } ]
               }
             } ],
             "quantity" : [ {
+              "value" : {
+                "value" : 20000,
+                "unit" : {
+                  "financialUnit" : "Share"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-9"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "financialUnit" : "SHARE"
-                },
-                "value" : 20000
               }
-            } ]
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "ST001"
+                  },
+                  "source" : "SEDOL",
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "a4ff65ff"
+              }
+            },
+            "meta" : {
+              "globalKey" : "d0704118"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "d4285d70",
+            "externalReference" : "lender-3"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "CP001LEI111111111111"
+                },
+                "meta" : {
+                  "globalKey" : "12818f8c"
+                }
+              } ],
+              "name" : {
+                "value" : "CP001 (Borrower)"
+              },
+              "meta" : {
+                "globalKey" : "84fb9347",
+                "externalKey" : "Borrower"
+              }
+            }
+          }
         } ]
       },
-      "tradeDate" : {
-        "meta" : {
-          "globalKey" : "3f2255"
-        },
-        "value" : "2020-09-21"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+      "party" : [ {
+        "partyId" : [ {
           "identifier" : {
-            "value" : "0266001-allocation-lender-2-allocation-lender-3"
+            "value" : "Fund 3"
+          },
+          "meta" : {
+            "globalKey" : "7e1775b8"
           }
         } ],
-        "issuer" : {
-          "value" : "KTKL"
+        "name" : {
+          "value" : "Fund 3"
         },
         "meta" : {
-          "globalKey" : "60216c3c"
+          "globalKey" : "d4285d70",
+          "externalKey" : "lender-3"
         }
-      } ]
-    }
-  }, {
-    "meta" : {
-      "globalKey" : "a2d399d0"
-    },
-    "trade" : {
-      "meta" : {
-        "globalKey" : "a2d399d0"
-      },
-      "party" : [ {
-        "meta" : {
-          "externalKey" : "lender-2",
-          "globalKey" : "ea2310a0"
-        },
-        "name" : {
-          "value" : "Fund 2"
-        },
+      }, {
         "partyId" : [ {
           "identifier" : {
-            "value" : "Fund 2"
+            "value" : "CP001LEI111111111111"
           },
           "meta" : {
-            "globalKey" : "7e1775b7"
+            "globalKey" : "12818f8c"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "Borrower",
-          "globalKey" : "20931af1"
-        },
+        } ],
         "name" : {
           "value" : "CP001 (Borrower)"
         },
+        "meta" : {
+          "globalKey" : "84fb9347",
+          "externalKey" : "Borrower"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
-            "value" : "CP001LEI111111111111"
+            "value" : "KTKLLEILLLLLLLLLLLLL"
           },
           "meta" : {
-            "globalKey" : "12818f8c"
+            "globalKey" : "60098fe6"
           }
-        } ]
-      }, {
-        "meta" : {
-          "externalKey" : "AGENT_LENDER",
-          "globalKey" : "2691a546"
-        },
+        } ],
         "name" : {
           "value" : "KTKL (Agent Lender)"
         },
+        "meta" : {
+          "globalKey" : "53741506",
+          "externalKey" : "AGENT_LENDER"
+        }
+      }, {
         "partyId" : [ {
           "identifier" : {
-            "value" : "KTKLLEILLLLLLLLLLLLL"
+            "value" : "Fund 2"
           },
           "meta" : {
-            "globalKey" : "60098fe6"
+            "globalKey" : "7e1775b7"
           }
-        } ]
+        } ],
+        "name" : {
+          "value" : "Fund 2"
+        },
+        "meta" : {
+          "globalKey" : "d42859ae",
+          "externalKey" : "lender-2"
+        }
       } ],
       "partyRole" : [ {
         "partyReference" : {
           "value" : {
-            "meta" : {
-              "externalKey" : "AGENT_LENDER",
-              "globalKey" : "2691a546"
-            },
-            "name" : {
-              "value" : "KTKL (Agent Lender)"
-            },
             "partyId" : [ {
               "identifier" : {
                 "value" : "KTKLLEILLLLLLLLLLLLL"
@@ -1271,40 +1158,68 @@
               "meta" : {
                 "globalKey" : "60098fe6"
               }
-            } ]
+            } ],
+            "name" : {
+              "value" : "KTKL (Agent Lender)"
+            },
+            "meta" : {
+              "globalKey" : "53741506",
+              "externalKey" : "AGENT_LENDER"
+            }
           }
         },
-        "role" : "AGENT_LENDER"
-      } ],
-      "tradableProduct" : {
-        "counterparty" : [ {
-          "partyReference" : {
-            "externalReference" : "lender-2",
-            "globalReference" : "ea2310a0"
-          },
-          "role" : "PARTY_1"
-        }, {
-          "partyReference" : {
-            "value" : {
-              "meta" : {
-                "externalKey" : "Borrower",
-                "globalKey" : "20931af1"
-              },
-              "name" : {
-                "value" : "CP001 (Borrower)"
+        "role" : "AgentLender"
+      }, {
+        "partyReference" : {
+          "value" : {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "Fund 2"
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "value" : "CP001LEI111111111111"
-                },
-                "meta" : {
-                  "globalKey" : "12818f8c"
-                }
-              } ]
+              "meta" : {
+                "globalKey" : "7e1775b7"
+              }
+            } ],
+            "name" : {
+              "value" : "Fund 2"
+            },
+            "meta" : {
+              "globalKey" : "d42859ae",
+              "externalKey" : "lender-2"
             }
-          },
-          "role" : "PARTY_2"
+          }
+        },
+        "role" : "AgentLender"
+      } ],
+      "meta" : {
+        "globalKey" : "49dca816"
+      }
+    },
+    "meta" : {
+      "globalKey" : "49dca816"
+    }
+  }, {
+    "trade" : {
+      "tradeIdentifier" : [ {
+        "issuer" : {
+          "value" : "KTKL"
+        },
+        "assignedIdentifier" : [ {
+          "identifier" : {
+            "value" : "0266001-allocation-lender-2"
+          }
         } ],
+        "meta" : {
+          "globalKey" : "c76d61e6"
+        }
+      } ],
+      "tradeDate" : {
+        "value" : "2020-09-21",
+        "meta" : {
+          "globalKey" : "3f2255"
+        }
+      },
+      "tradableProduct" : {
         "product" : {
           "contractualProduct" : {
             "productTaxonomy" : [ {
@@ -1312,25 +1227,9 @@
               "productQualifier" : "SecurityLendingAgreement"
             } ],
             "economicTerms" : {
-              "collateral" : {
-                "collateralProvisions" : {
-                  "collateralType" : "CASH",
-                  "eligibleCollateral" : [ {
-                    "criteria" : [ {
-                      "treatment" : {
-                        "valuationTreatment" : {
-                          "marginPercentage" : 0.02
-                        }
-                      }
-                    } ],
-                    "meta" : {
-                      "globalKey" : "168480"
-                    }
-                  } ]
-                }
-              },
               "effectiveDate" : {
                 "adjustableDate" : {
+                  "unadjustedDate" : "2020-09-22",
                   "dateAdjustments" : {
                     "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
@@ -1339,386 +1238,487 @@
                   },
                   "meta" : {
                     "globalKey" : "e742daa5"
-                  },
-                  "unadjustedDate" : "2020-09-22"
+                  }
                 },
                 "meta" : {
                   "globalKey" : "e742daa5"
                 }
               },
-              "payout" : {
-                "assetPayout" : [ {
-                  "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
-                  },
-                  "assetLeg" : [ {
-                    "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                    "settlementDate" : {
-                      "adjustableDate" : {
-                        "adjustedDate" : {
-                          "meta" : {
-                            "globalKey" : "3f2256"
-                          },
-                          "value" : "2020-09-22"
-                        },
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NONE",
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "24a738"
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "24a738"
-                      }
-                    }
-                  }, {
-                    "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                    "settlementDate" : {
-                      "adjustableDate" : {
-                        "adjustedDate" : {
-                          "meta" : {
-                            "globalKey" : "3f2296"
-                          },
-                          "value" : "2020-10-22"
-                        },
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NONE",
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "24a738"
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "24a738"
-                      }
-                    }
-                  } ],
-                  "dividendTerms" : {
-                    "manufacturedIncomeRequirement" : {
-                      "totalRatio" : 1
-                    }
-                  },
-                  "durationType" : {
-                    "durationType" : "TERM"
-                  },
-                  "meta" : {
-                    "globalKey" : "73453ae0"
-                  },
-                  "minimumFee" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 0,
+              "terminationDate" : {
+                "adjustableDate" : {
+                  "unadjustedDate" : "2020-10-22",
+                  "dateAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "171b36"
+                      "globalKey" : "fa42f5cf"
                     }
                   },
-                  "securityInformation" : {
-                    "meta" : {
-                      "globalKey" : "7548eca6"
-                    },
-                    "security" : {
-                      "productIdentifier" : [ {
-                        "value" : {
-                          "identifier" : {
-                            "value" : "ST001"
-                          },
-                          "meta" : {
-                            "globalKey" : "a4ff65ff"
-                          },
-                          "source" : "SEDOL"
-                        }
-                      } ],
-                      "securityType" : "EQUITY"
-                    }
+                  "meta" : {
+                    "globalKey" : "e743cae5"
                   }
-                } ],
+                },
+                "meta" : {
+                  "globalKey" : "e743cae5"
+                }
+              },
+              "payout" : {
                 "interestRatePayout" : [ {
                   "payerReceiver" : {
-                    "payer" : "PARTY_1",
-                    "receiver" : "PARTY_2"
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
                   },
                   "priceQuantity" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "quantitySchedule" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-8"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   },
-                  "calculationPeriodDates" : {
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "globalKey" : "25e2ab"
+                  "rateSpecification" : {
+                    "fixedRate" : {
+                      "rateSchedule" : {
+                        "price" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "price-2"
+                          }
+                        }
                       },
-                      "period" : "T",
-                      "periodMultiplier" : 1,
-                      "rollConvention" : "NONE"
-                    },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    }
+                  },
+                  "dayCountFraction" : {
+                    "value" : "ACT/360"
+                  },
+                  "calculationPeriodDates" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
-                        "adjustedDate" : {
-                          "meta" : {
-                            "globalKey" : "3f2256"
-                          },
-                          "value" : "2020-09-22"
-                        },
                         "dateAdjustments" : {
                           "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
                         },
+                        "adjustedDate" : {
+                          "value" : "2020-09-22",
+                          "meta" : {
+                            "globalKey" : "3f2256"
+                          }
+                        },
                         "meta" : {
-                          "externalKey" : "Effective_Date",
-                          "globalKey" : "fa42f5cf"
+                          "globalKey" : "fa42f5cf",
+                          "externalKey" : "Effective_Date"
                         }
                       },
                       "meta" : {
                         "globalKey" : "fa42f5cf"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "a4273c9"
-                    },
                     "terminationDate" : {
                       "adjustableDate" : {
-                        "adjustedDate" : {
-                          "meta" : {
-                            "globalKey" : "3f2296"
-                          },
-                          "value" : "2020-10-22"
-                        },
                         "dateAdjustments" : {
                           "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "fa42f5cf"
                           }
                         },
+                        "adjustedDate" : {
+                          "value" : "2020-10-22",
+                          "meta" : {
+                            "globalKey" : "3f2296"
+                          }
+                        },
                         "meta" : {
-                          "externalKey" : "Termination_Date",
-                          "globalKey" : "fa42f5cf"
+                          "globalKey" : "fa42f5cf",
+                          "externalKey" : "Termination_Date"
                         }
                       },
                       "meta" : {
                         "globalKey" : "fa42f5cf"
                       }
+                    },
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
+                      "meta" : {
+                        "globalKey" : "24b525"
+                      },
+                      "rollConvention" : "NONE"
+                    },
+                    "meta" : {
+                      "globalKey" : "8b1de243"
                     }
                   },
-                  "dayCountFraction" : {
-                    "value" : "ACT/360"
-                  },
-                  "meta" : {
-                    "globalKey" : "ce90278b"
-                  },
                   "paymentDates" : {
-                    "meta" : {
-                      "globalKey" : "b578507f"
+                    "paymentFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
+                      "meta" : {
+                        "globalKey" : "73"
+                      }
                     },
                     "paymentDatesAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "EUTA"
                         } ],
                         "meta" : {
-                          "globalKey" : "20a71d"
+                          "globalKey" : "20a71d"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "365baaee"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "fa98fa5b"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "98fd77d9"
+                  }
+                } ],
+                "assetPayout" : [ {
+                  "payerReceiver" : {
+                    "payer" : "Party1",
+                    "receiver" : "Party2"
+                  },
+                  "assetLeg" : [ {
+                    "settlementDate" : {
+                      "adjustableDate" : {
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NONE",
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "adjustedDate" : {
+                          "value" : "2020-09-22",
+                          "meta" : {
+                            "globalKey" : "3f2256"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "24a738"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "24a738"
+                      }
+                    },
+                    "deliveryMethod" : "DeliveryVersusPayment"
+                  }, {
+                    "settlementDate" : {
+                      "adjustableDate" : {
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NONE",
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "adjustedDate" : {
+                          "value" : "2020-10-22",
+                          "meta" : {
+                            "globalKey" : "3f2296"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "24a738"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
-                        "globalKey" : "365baaee"
+                        "globalKey" : "24a738"
                       }
                     },
-                    "paymentFrequency" : {
-                      "meta" : {
-                        "globalKey" : "a2d"
-                      },
-                      "period" : "T",
-                      "periodMultiplier" : 1
-                    }
-                  },
-                  "rateSpecification" : {
-                    "fixedRate" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
-                      "rateSchedule" : {
-                        "price" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "price-2"
+                    "deliveryMethod" : "DeliveryVersusPayment"
+                  } ],
+                  "securityInformation" : {
+                    "security" : {
+                      "productIdentifier" : [ {
+                        "value" : {
+                          "identifier" : {
+                            "value" : "ST001"
+                          },
+                          "source" : "SEDOL",
+                          "meta" : {
+                            "globalKey" : "a4ff65ff"
                           }
                         }
+                      } ],
+                      "securityType" : "Equity"
+                    },
+                    "meta" : {
+                      "globalKey" : "7548eca6"
+                    }
+                  },
+                  "durationType" : {
+                    "durationType" : "Term"
+                  },
+                  "minimumFee" : {
+                    "value" : 0,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "171b36"
+                    }
+                  },
+                  "dividendTerms" : {
+                    "manufacturedIncomeRequirement" : {
+                      "totalRatio" : 1
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "3b19750e"
                   }
                 } ],
                 "meta" : {
-                  "globalKey" : "eb31e26b"
+                  "globalKey" : "43b3b6a7"
                 }
               },
-              "terminationDate" : {
-                "adjustableDate" : {
-                  "dateAdjustments" : {
-                    "businessDayConvention" : "MODFOLLOWING",
+              "collateral" : {
+                "collateralProvisions" : {
+                  "collateralType" : "Cash",
+                  "eligibleCollateral" : [ {
+                    "criteria" : [ {
+                      "treatment" : {
+                        "valuationTreatment" : {
+                          "marginPercentage" : 0.02
+                        }
+                      }
+                    } ],
                     "meta" : {
-                      "globalKey" : "fa42f5cf"
+                      "globalKey" : "168480"
                     }
-                  },
-                  "meta" : {
-                    "globalKey" : "e743cae5"
-                  },
-                  "unadjustedDate" : "2020-10-22"
-                },
-                "meta" : {
-                  "globalKey" : "e743cae5"
+                  } ]
                 }
               }
             },
             "meta" : {
-              "globalKey" : "37405ce2"
+              "globalKey" : "38d91964"
             }
           },
           "meta" : {
-            "globalKey" : "37405ce2"
+            "globalKey" : "38d91964"
           }
         },
         "tradeLot" : [ {
           "priceQuantity" : [ {
-            "meta" : {
-              "globalKey" : "d05e00e2"
-            },
             "price" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "price-2"
-                } ]
-              },
               "value" : {
+                "value" : 0.01,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 0.01,
                 "perUnitOf" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "priceType" : "INTEREST_RATE"
-              }
-            } ],
-            "quantity" : [ {
+                "priceType" : "InterestRate"
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "quantity-8"
+                  "value" : "price-2"
                 } ]
-              },
+              }
+            } ],
+            "quantity" : [ {
               "value" : {
+                "value" : 1500000,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 1500000
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "941cf40a"
-            },
-            "observable" : {
-              "meta" : {
-                "globalKey" : "a4ff65ff"
-              },
-              "productIdentifier" : [ {
-                "value" : {
-                  "identifier" : {
-                    "value" : "ST001"
-                  },
-                  "meta" : {
-                    "globalKey" : "a4ff65ff"
-                  },
-                  "source" : "SEDOL"
                 }
-              } ]
-            },
-            "price" : [ {
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "price-1"
+                  "value" : "quantity-8"
                 } ]
-              },
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "3b621b5e"
+            }
+          }, {
+            "price" : [ {
               "value" : {
+                "value" : 25,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
                 },
-                "value" : 25,
                 "perUnitOf" : {
-                  "financialUnit" : "SHARE"
+                  "financialUnit" : "Share"
                 },
-                "priceType" : "ASSET_PRICE"
+                "priceType" : "AssetPrice"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "price-1"
+                } ]
               }
             } ],
             "quantity" : [ {
+              "value" : {
+                "value" : 60000,
+                "unit" : {
+                  "financialUnit" : "Share"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "quantity-9"
                 } ]
-              },
-              "value" : {
-                "unit" : {
-                  "financialUnit" : "SHARE"
-                },
-                "value" : 60000
               }
-            } ]
+            } ],
+            "observable" : {
+              "productIdentifier" : [ {
+                "value" : {
+                  "identifier" : {
+                    "value" : "ST001"
+                  },
+                  "source" : "SEDOL",
+                  "meta" : {
+                    "globalKey" : "a4ff65ff"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "a4ff65ff"
+              }
+            },
+            "meta" : {
+              "globalKey" : "57e76794"
+            }
           } ]
+        } ],
+        "counterparty" : [ {
+          "role" : "Party1",
+          "partyReference" : {
+            "globalReference" : "d42859ae",
+            "externalReference" : "lender-2"
+          }
+        }, {
+          "role" : "Party2",
+          "partyReference" : {
+            "value" : {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "CP001LEI111111111111"
+                },
+                "meta" : {
+                  "globalKey" : "12818f8c"
+                }
+              } ],
+              "name" : {
+                "value" : "CP001 (Borrower)"
+              },
+              "meta" : {
+                "globalKey" : "84fb9347",
+                "externalKey" : "Borrower"
+              }
+            }
+          }
         } ]
       },
-      "tradeDate" : {
+      "party" : [ {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "Fund 2"
+          },
+          "meta" : {
+            "globalKey" : "7e1775b7"
+          }
+        } ],
+        "name" : {
+          "value" : "Fund 2"
+        },
         "meta" : {
-          "globalKey" : "3f2255"
+          "globalKey" : "d42859ae",
+          "externalKey" : "lender-2"
+        }
+      }, {
+        "partyId" : [ {
+          "identifier" : {
+            "value" : "CP001LEI111111111111"
+          },
+          "meta" : {
+            "globalKey" : "12818f8c"
+          }
+        } ],
+        "name" : {
+          "value" : "CP001 (Borrower)"
         },
-        "value" : "2020-09-21"
-      },
-      "tradeIdentifier" : [ {
-        "assignedIdentifier" : [ {
+        "meta" : {
+          "globalKey" : "84fb9347",
+          "externalKey" : "Borrower"
+        }
+      }, {
+        "partyId" : [ {
           "identifier" : {
-            "value" : "0266001-allocation-lender-2"
+            "value" : "KTKLLEILLLLLLLLLLLLL"
+          },
+          "meta" : {
+            "globalKey" : "60098fe6"
           }
         } ],
-        "issuer" : {
-          "value" : "KTKL"
+        "name" : {
+          "value" : "KTKL (Agent Lender)"
         },
         "meta" : {
-          "globalKey" : "1aacf33a"
+          "globalKey" : "53741506",
+          "externalKey" : "AGENT_LENDER"
         }
-      } ]
+      } ],
+      "partyRole" : [ {
+        "partyReference" : {
+          "value" : {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "KTKLLEILLLLLLLLLLLLL"
+              },
+              "meta" : {
+                "globalKey" : "60098fe6"
+              }
+            } ],
+            "name" : {
+              "value" : "KTKL (Agent Lender)"
+            },
+            "meta" : {
+              "globalKey" : "53741506",
+              "externalKey" : "AGENT_LENDER"
+            }
+          }
+        },
+        "role" : "AgentLender"
+      } ],
+      "meta" : {
+        "globalKey" : "d8977556"
+      }
+    },
+    "meta" : {
+      "globalKey" : "d8977556"
     }
   } ],
-  "eventQualifier" : "Reallocation",
   "meta" : {
-    "globalKey" : "57584777"
+    "globalKey" : "f735aaf5"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/workflow-step/cancellation/cancellation-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/workflow-step/cancellation/cancellation-func-output.json
index 9791810136..15c8a023c4 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/workflow-step/cancellation/cancellation-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/workflow-step/cancellation/cancellation-func-output.json
@@ -1,162 +1,10 @@
 {
   "steps" : [ {
-    "action" : "NEW",
     "businessEvent" : {
       "eventDate" : "1994-12-12",
       "instruction" : [ {
         "primitiveInstruction" : {
           "execution" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "a82d45fc"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ca05a501"
-              },
-              "role" : "PARTY_2"
-            } ],
-            "parties" : [ {
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "a82d45fc"
-              },
-              "name" : {
-                "value" : "Party A"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                  },
-                  "value" : "PARTYAUS33"
-                },
-                "identifierType" : "BIC",
-                "meta" : {
-                  "globalKey" : "3d5ebc15"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "ca05a501"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                  },
-                  "value" : "BARCGB2L"
-                },
-                "identifierType" : "BIC",
-                "meta" : {
-                  "globalKey" : "ca05a501"
-                }
-              } ]
-            } ],
-            "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "61d0453d"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "53c66a4c"
-                },
-                "rateOption" : {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "rateOption-1"
-                    } ]
-                  },
-                  "value" : {
-                    "floatingRateIndex" : {
-                      "value" : "EUR-LIBOR-BBA"
-                    },
-                    "indexTenor" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    }
-                  }
-                }
-              },
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "EUR"
-                    }
-                  },
-                  "value" : 99999
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "6d71265e"
-              },
-              "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "EUR"
-                    }
-                  },
-                  "value" : 0.06,
-                  "perUnitOf" : {
-                    "currency" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "EUR"
-                    }
-                  },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ],
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "EUR"
-                    }
-                  },
-                  "value" : 99999
-                }
-              } ]
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -167,46 +15,40 @@
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da36cf11"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7d7eda0"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "28c89"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6,
-                          "rollConvention" : "14"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1994-12-14",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -215,103 +57,108 @@
                             },
                             "meta" : {
                               "globalKey" : "ea1a6ec6"
-                            },
-                            "unadjustedDate" : "1994-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ea1a6ec6"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "floatingCalcPeriodDates",
-                          "globalKey" : "a54e5fcd"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1999-12-14",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "DEFR"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "primaryBusinessCenters",
-                                  "globalKey" : "1ff50d"
+                                  "globalKey" : "1ff50d",
+                                  "externalKey" : "primaryBusinessCenters"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365af8de"
                               }
                             },
                             "meta" : {
                               "globalKey" : "a8d53690"
-                            },
-                            "unadjustedDate" : "1999-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "a8d53690"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "4443c8bb"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "8c0b539f"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "959"
+                            "globalKey" : "18a9b"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 6
+                          "rollConvention" : "14"
+                        },
+                        "meta" : {
+                          "globalKey" : "3836d691",
+                          "externalKey" : "floatingCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
+                            "globalKey" : "107"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da36cf11"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7d7eda0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "8563938d"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "floatingCalcPeriodDates",
-                          "globalReference" : "a54e5fcd"
+                          "globalReference" : "3836d691",
+                          "externalReference" : "floatingCalcPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "131ae8a2"
+                            "globalKey" : "eff6d356"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -320,82 +167,79 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates",
-                            "globalReference" : "d533d3ee"
+                            "globalReference" : "25625c64",
+                            "externalReference" : "resetDates"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates",
-                          "globalKey" : "d533d3ee"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "25625c64",
+                          "externalKey" : "resetDates"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "56791807"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da36cf11"
-                            }
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
+                            }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7d7eda0"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "2b8fa"
-                          },
-                          "period" : "Y",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "14"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "30E/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1994-12-14",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -404,197 +248,317 @@
                             },
                             "meta" : {
                               "globalKey" : "ea1a6ec6"
-                            },
-                            "unadjustedDate" : "1994-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ea1a6ec6"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "fixedCalcPeriodDates",
-                          "globalKey" : "fbf296c2"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1999-12-14",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "primaryBusinessCenters",
-                                  "globalReference" : "1ff50d"
+                                  "globalReference" : "1ff50d",
+                                  "externalReference" : "primaryBusinessCenters"
                                 },
                                 "meta" : {
                                   "globalKey" : "da36cf11"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "b7d7eda0"
                               }
                             },
                             "meta" : {
                               "globalKey" : "97297aae"
-                            },
-                            "unadjustedDate" : "1999-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "97297aae"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "30E/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "8b5a674a"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "8c0b550e"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
                           "meta" : {
-                            "globalKey" : "ac8"
+                            "globalKey" : "1794a"
                           },
-                          "period" : "Y",
-                          "periodMultiplier" : 1
+                          "rollConvention" : "14"
+                        },
+                        "meta" : {
+                          "globalKey" : "a5f8cf12",
+                          "externalKey" : "fixedCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
+                            "globalKey" : "78"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da36cf11"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7d7eda0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "b32991fe"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3703de42"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e40a62af"
+                      "globalKey" : "a74ffedb"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "88a15c60"
+                  "globalKey" : "4be6f88c"
                 }
               },
               "meta" : {
-                "globalKey" : "88a15c60"
+                "globalKey" : "4be6f88c"
               }
             },
+            "priceQuantity" : [ {
+              "quantity" : [ {
+                "value" : {
+                  "value" : 99999,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "EUR",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                      }
+                    }
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
+                }
+              } ],
+              "observable" : {
+                "rateOption" : {
+                  "value" : {
+                    "floatingRateIndex" : {
+                      "value" : "EUR-LIBOR-BBA"
+                    },
+                    "indexTenor" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "rateOption-1"
+                    } ]
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "2505dd46"
+                }
+              },
+              "meta" : {
+                "globalKey" : "ed98830f"
+              }
+            }, {
+              "price" : [ {
+                "value" : {
+                  "value" : 0.06,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "EUR",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                      }
+                    }
+                  },
+                  "perUnitOf" : {
+                    "currency" : {
+                      "value" : "EUR",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                      }
+                    }
+                  },
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
+                }
+              } ],
+              "quantity" : [ {
+                "value" : {
+                  "value" : 99999,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "EUR",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                      }
+                    }
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "40b3a562"
+              }
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "9495a03c",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "ca05a501",
+                "externalReference" : "party2"
+              }
+            } ],
+            "parties" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "PARTYAUS33",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                  }
+                },
+                "identifierType" : "BIC",
+                "meta" : {
+                  "globalKey" : "3d5ebc15"
+                }
+              } ],
+              "name" : {
+                "value" : "Party A"
+              },
+              "meta" : {
+                "globalKey" : "9495a03c",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "BARCGB2L",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                  }
+                },
+                "identifierType" : "BIC",
+                "meta" : {
+                  "globalKey" : "ca05a501"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "ca05a501",
+                "externalKey" : "party2"
+              }
+            } ],
             "tradeDate" : {
+              "value" : "1994-12-12",
               "meta" : {
                 "globalKey" : "3e530c"
-              },
-              "value" : "1994-12-12"
+              }
             },
             "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "ca05a501",
+                "externalReference" : "party2"
+              },
               "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "SW2000",
                   "meta" : {
                     "scheme" : "http://www.barclays.com/swaps/trade-id"
-                  },
-                  "value" : "SW2000"
+                  }
                 },
                 "version" : 1
               } ],
-              "issuerReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ca05a501"
-              },
               "meta" : {
-                "globalKey" : "fc2ee432"
+                "globalKey" : "958d38d8"
               }
             } ]
           }
         }
       } ],
+      "eventQualifier" : "Execution",
       "after" : [ {
-        "meta" : {
-          "globalKey" : "632669e6"
-        },
-        "state" : {
-          "positionState" : "EXECUTED"
-        },
         "trade" : {
-          "meta" : {
-            "globalKey" : "3068bd95"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "a82d45fc"
-            },
-            "name" : {
-              "value" : "Party A"
+          "tradeIdentifier" : [ {
+            "issuerReference" : {
+              "globalReference" : "ca05a501",
+              "externalReference" : "party2"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "SW2000",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                },
-                "value" : "PARTYAUS33"
+                  "scheme" : "http://www.barclays.com/swaps/trade-id"
+                }
               },
-              "identifierType" : "BIC",
-              "meta" : {
-                "globalKey" : "3d5ebc15"
-              }
-            } ]
-          }, {
+              "version" : 1
+            } ],
             "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "ca05a501"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                },
-                "value" : "BARCGB2L"
-              },
-              "identifierType" : "BIC",
-              "meta" : {
-                "globalKey" : "ca05a501"
-              }
-            } ]
+              "globalKey" : "958d38d8"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "1994-12-12",
+            "meta" : {
+              "globalKey" : "3e530c"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "a82d45fc"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ca05a501"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -605,46 +569,40 @@
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da36cf11"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7d7eda0"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "28c89"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6,
-                          "rollConvention" : "14"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1994-12-14",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -653,103 +611,108 @@
                             },
                             "meta" : {
                               "globalKey" : "ea1a6ec6"
-                            },
-                            "unadjustedDate" : "1994-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ea1a6ec6"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "floatingCalcPeriodDates",
-                          "globalKey" : "a54e5fcd"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1999-12-14",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "DEFR"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "primaryBusinessCenters",
-                                  "globalKey" : "1ff50d"
+                                  "globalKey" : "1ff50d",
+                                  "externalKey" : "primaryBusinessCenters"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365af8de"
                               }
                             },
                             "meta" : {
                               "globalKey" : "a8d53690"
-                            },
-                            "unadjustedDate" : "1999-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "a8d53690"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "4443c8bb"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "8c0b539f"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "959"
+                            "globalKey" : "18a9b"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 6
+                          "rollConvention" : "14"
+                        },
+                        "meta" : {
+                          "globalKey" : "3836d691",
+                          "externalKey" : "floatingCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
+                            "globalKey" : "107"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da36cf11"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7d7eda0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "8563938d"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "floatingCalcPeriodDates",
-                          "globalReference" : "a54e5fcd"
+                          "globalReference" : "3836d691",
+                          "externalReference" : "floatingCalcPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "131ae8a2"
+                            "globalKey" : "eff6d356"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -758,82 +721,79 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates",
-                            "globalReference" : "d533d3ee"
+                            "globalReference" : "25625c64",
+                            "externalReference" : "resetDates"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates",
-                          "globalKey" : "d533d3ee"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "25625c64",
+                          "externalKey" : "resetDates"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "56791807"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da36cf11"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7d7eda0"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "2b8fa"
-                          },
-                          "period" : "Y",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "14"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "30E/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1994-12-14",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -842,241 +802,289 @@
                             },
                             "meta" : {
                               "globalKey" : "ea1a6ec6"
-                            },
-                            "unadjustedDate" : "1994-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ea1a6ec6"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "fixedCalcPeriodDates",
-                          "globalKey" : "fbf296c2"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1999-12-14",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "primaryBusinessCenters",
-                                  "globalReference" : "1ff50d"
+                                  "globalReference" : "1ff50d",
+                                  "externalReference" : "primaryBusinessCenters"
                                 },
                                 "meta" : {
                                   "globalKey" : "da36cf11"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "b7d7eda0"
                               }
                             },
                             "meta" : {
                               "globalKey" : "97297aae"
-                            },
-                            "unadjustedDate" : "1999-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "97297aae"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "30E/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "8b5a674a"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "8c0b550e"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
                           "meta" : {
-                            "globalKey" : "ac8"
+                            "globalKey" : "1794a"
                           },
-                          "period" : "Y",
-                          "periodMultiplier" : 1
+                          "rollConvention" : "14"
+                        },
+                        "meta" : {
+                          "globalKey" : "a5f8cf12",
+                          "externalKey" : "fixedCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
+                            "globalKey" : "78"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da36cf11"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7d7eda0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "b32991fe"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3703de42"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e40a62af"
+                      "globalKey" : "a74ffedb"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "88a15c60"
+                  "globalKey" : "4be6f88c"
                 }
               },
               "meta" : {
-                "globalKey" : "88a15c60"
+                "globalKey" : "4be6f88c"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "61d0453d"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "53c66a4c"
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 99999,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "EUR",
+                        "meta" : {
+                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                        }
+                      }
+                    }
                   },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    } ]
+                  }
+                } ],
+                "observable" : {
                   "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
                     "value" : {
                       "floatingRateIndex" : {
                         "value" : "EUR-LIBOR-BBA"
                       },
                       "indexTenor" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
                         "meta" : {
-                          "globalKey" : "959"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6
+                          "globalKey" : "107"
+                        }
                       }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
                     }
-                  }
-                },
-                "quantity" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    } ]
                   },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "meta" : {
-                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
-                      }
-                    },
-                    "value" : 99999
+                  "meta" : {
+                    "globalKey" : "2505dd46"
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "6d71265e"
                 },
+                "meta" : {
+                  "globalKey" : "ed98830f"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.06,
                     "unit" : {
                       "currency" : {
+                        "value" : "EUR",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
+                        }
                       }
                     },
-                    "value" : 0.06,
                     "perUnitOf" : {
                       "currency" : {
+                        "value" : "EUR",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
+                        }
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 99999,
                     "unit" : {
                       "currency" : {
+                        "value" : "EUR",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
+                        }
                       }
-                    },
-                    "value" : 99999
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "40b3a562"
+                }
               } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "9495a03c",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "ca05a501",
+                "externalReference" : "party2"
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3e530c"
-            },
-            "value" : "1994-12-12"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "PARTYAUS33",
                 "meta" : {
-                  "scheme" : "http://www.barclays.com/swaps/trade-id"
-                },
-                "value" : "SW2000"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                }
               },
-              "version" : 1
+              "identifierType" : "BIC",
+              "meta" : {
+                "globalKey" : "3d5ebc15"
+              }
             } ],
-            "issuerReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "ca05a501"
+            "name" : {
+              "value" : "Party A"
             },
             "meta" : {
-              "globalKey" : "fc2ee432"
+              "globalKey" : "9495a03c",
+              "externalKey" : "party1"
             }
-          } ]
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "BARCGB2L",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                }
+              },
+              "identifierType" : "BIC",
+              "meta" : {
+                "globalKey" : "ca05a501"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "ca05a501",
+              "externalKey" : "party2"
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "58b08a6f"
+          }
+        },
+        "state" : {
+          "positionState" : "Executed"
+        },
+        "meta" : {
+          "globalKey" : "9723923e"
         }
       } ],
-      "eventQualifier" : "Execution",
       "meta" : {
-        "globalKey" : "7274cf2b"
+        "globalKey" : "e3d2ae1b"
       }
     },
+    "messageInformation" : {
+      "messageId" : {
+        "value" : "msg-1"
+      }
+    },
+    "timestamp" : [ {
+      "dateTime" : "1994-12-12T18:12:00Z",
+      "qualification" : "eventCreationDateTime"
+    } ],
     "eventIdentifier" : [ {
       "assignedIdentifier" : [ {
         "identifier" : {
@@ -1087,58 +1095,61 @@
         "globalKey" : "3137ff"
       }
     } ],
-    "messageInformation" : {
-      "messageId" : {
-        "value" : "msg-1"
-      }
-    },
-    "meta" : {
-      "globalKey" : "773fa6a"
-    },
+    "action" : "New",
     "party" : [ {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "ca05a501"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "BARCGB2L",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "BARCGB2L"
+          }
         },
         "identifierType" : "BIC",
         "meta" : {
           "globalKey" : "ca05a501"
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "a82d45fc"
-      },
-      "name" : {
-        "value" : "Party A"
-      },
+        "globalKey" : "ca05a501",
+        "externalKey" : "party2"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "PARTYAUS33",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "PARTYAUS33"
+          }
         },
         "identifierType" : "BIC",
         "meta" : {
           "globalKey" : "3d5ebc15"
         }
-      } ]
+      } ],
+      "name" : {
+        "value" : "Party A"
+      },
+      "meta" : {
+        "globalKey" : "9495a03c",
+        "externalKey" : "party1"
+      }
     } ],
-    "timestamp" : [ {
-      "dateTime" : "1994-12-12T18:12:00Z",
-      "qualification" : "EVENT_CREATION_DATE_TIME"
-    } ]
+    "meta" : {
+      "globalKey" : "42a152f4"
+    }
   }, {
-    "action" : "CANCEL",
+    "previousWorkflowStep" : {
+      "globalReference" : "75bcdcc"
+    },
+    "messageInformation" : {
+      "messageId" : {
+        "value" : "msg-2"
+      }
+    },
+    "timestamp" : [ {
+      "dateTime" : "1994-12-12T18:55:00Z",
+      "qualification" : "eventCreationDateTime"
+    } ],
     "eventIdentifier" : [ {
       "assignedIdentifier" : [ {
         "identifier" : {
@@ -1149,179 +1160,16 @@
         "globalKey" : "313800"
       }
     } ],
-    "messageInformation" : {
-      "messageId" : {
-        "value" : "msg-2"
-      }
-    },
+    "action" : "Cancel",
     "meta" : {
-      "globalKey" : "c0b8b0d6"
-    },
-    "previousWorkflowStep" : {
-      "globalReference" : "75bcdcc"
-    },
-    "timestamp" : [ {
-      "dateTime" : "1994-12-12T18:55:00Z",
-      "qualification" : "EVENT_CREATION_DATE_TIME"
-    } ]
+      "globalKey" : "5eaece4a"
+    }
   }, {
-    "action" : "NEW",
     "businessEvent" : {
       "eventDate" : "1994-12-12",
       "instruction" : [ {
         "primitiveInstruction" : {
           "execution" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "a82d45fc"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ca05a501"
-              },
-              "role" : "PARTY_2"
-            } ],
-            "parties" : [ {
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "a82d45fc"
-              },
-              "name" : {
-                "value" : "Party A"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                  },
-                  "value" : "PARTYAUS33"
-                },
-                "identifierType" : "BIC",
-                "meta" : {
-                  "globalKey" : "3d5ebc15"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "ca05a501"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                  },
-                  "value" : "BARCGB2L"
-                },
-                "identifierType" : "BIC",
-                "meta" : {
-                  "globalKey" : "ca05a501"
-                }
-              } ]
-            } ],
-            "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "3ce21b9b"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "53c66a4c"
-                },
-                "rateOption" : {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "rateOption-1"
-                    } ]
-                  },
-                  "value" : {
-                    "floatingRateIndex" : {
-                      "value" : "EUR-LIBOR-BBA"
-                    },
-                    "indexTenor" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    }
-                  }
-                }
-              },
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "EUR"
-                    }
-                  },
-                  "value" : 50000000
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "4882fcbc"
-              },
-              "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "EUR"
-                    }
-                  },
-                  "value" : 0.06,
-                  "perUnitOf" : {
-                    "currency" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "EUR"
-                    }
-                  },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ],
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "EUR"
-                    }
-                  },
-                  "value" : 50000000
-                }
-              } ]
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -1332,46 +1180,40 @@
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da36cf11"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7d7eda0"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "28c89"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6,
-                          "rollConvention" : "14"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1994-12-14",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -1380,103 +1222,108 @@
                             },
                             "meta" : {
                               "globalKey" : "ea1a6ec6"
-                            },
-                            "unadjustedDate" : "1994-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ea1a6ec6"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "floatingCalcPeriodDates",
-                          "globalKey" : "a54e5fcd"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1999-12-14",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "DEFR"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "primaryBusinessCenters",
-                                  "globalKey" : "1ff50d"
+                                  "globalKey" : "1ff50d",
+                                  "externalKey" : "primaryBusinessCenters"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365af8de"
                               }
                             },
                             "meta" : {
                               "globalKey" : "a8d53690"
-                            },
-                            "unadjustedDate" : "1999-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "a8d53690"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "4443c8bb"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "8c0b539f"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "959"
+                            "globalKey" : "18a9b"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 6
+                          "rollConvention" : "14"
+                        },
+                        "meta" : {
+                          "globalKey" : "3836d691",
+                          "externalKey" : "floatingCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
+                            "globalKey" : "107"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da36cf11"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7d7eda0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "8563938d"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "floatingCalcPeriodDates",
-                          "globalReference" : "a54e5fcd"
+                          "globalReference" : "3836d691",
+                          "externalReference" : "floatingCalcPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "131ae8a2"
+                            "globalKey" : "eff6d356"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -1485,82 +1332,79 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates",
-                            "globalReference" : "d533d3ee"
+                            "globalReference" : "25625c64",
+                            "externalReference" : "resetDates"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates",
-                          "globalKey" : "d533d3ee"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "25625c64",
+                          "externalKey" : "resetDates"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "56791807"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da36cf11"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7d7eda0"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "2b8fa"
-                          },
-                          "period" : "Y",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "14"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "30E/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1994-12-14",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -1569,197 +1413,317 @@
                             },
                             "meta" : {
                               "globalKey" : "ea1a6ec6"
-                            },
-                            "unadjustedDate" : "1994-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ea1a6ec6"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "fixedCalcPeriodDates",
-                          "globalKey" : "fbf296c2"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1999-12-14",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "primaryBusinessCenters",
-                                  "globalReference" : "1ff50d"
+                                  "globalReference" : "1ff50d",
+                                  "externalReference" : "primaryBusinessCenters"
                                 },
                                 "meta" : {
                                   "globalKey" : "da36cf11"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "b7d7eda0"
                               }
                             },
                             "meta" : {
                               "globalKey" : "97297aae"
-                            },
-                            "unadjustedDate" : "1999-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "97297aae"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "30E/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "8b5a674a"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "8c0b550e"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
                           "meta" : {
-                            "globalKey" : "ac8"
+                            "globalKey" : "1794a"
                           },
-                          "period" : "Y",
-                          "periodMultiplier" : 1
+                          "rollConvention" : "14"
+                        },
+                        "meta" : {
+                          "globalKey" : "a5f8cf12",
+                          "externalKey" : "fixedCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
+                            "globalKey" : "78"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da36cf11"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7d7eda0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "b32991fe"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3703de42"
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "a74ffedb"
+                    }
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "4be6f88c"
+                }
+              },
+              "meta" : {
+                "globalKey" : "4be6f88c"
+              }
+            },
+            "priceQuantity" : [ {
+              "quantity" : [ {
+                "value" : {
+                  "value" : 50000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "EUR",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                      }
+                    }
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
+                }
+              } ],
+              "observable" : {
+                "rateOption" : {
+                  "value" : {
+                    "floatingRateIndex" : {
+                      "value" : "EUR-LIBOR-BBA"
+                    },
+                    "indexTenor" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "rateOption-1"
+                    } ]
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "2505dd46"
+                }
+              },
+              "meta" : {
+                "globalKey" : "c0d07bed"
+              }
+            }, {
+              "price" : [ {
+                "value" : {
+                  "value" : 0.06,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "EUR",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                      }
+                    }
+                  },
+                  "perUnitOf" : {
+                    "currency" : {
+                      "value" : "EUR",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                      }
+                    }
+                  },
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
+                }
+              } ],
+              "quantity" : [ {
+                "value" : {
+                  "value" : 50000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "EUR",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
                       }
-                    } ],
-                    "meta" : {
-                      "globalKey" : "e40a62af"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "88a15c60"
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "c7dc9ac4"
+              }
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "9495a03c",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "ca05a501",
+                "externalReference" : "party2"
+              }
+            } ],
+            "parties" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "PARTYAUS33",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                  }
+                },
+                "identifierType" : "BIC",
+                "meta" : {
+                  "globalKey" : "3d5ebc15"
                 }
+              } ],
+              "name" : {
+                "value" : "Party A"
               },
               "meta" : {
-                "globalKey" : "88a15c60"
+                "globalKey" : "9495a03c",
+                "externalKey" : "party1"
               }
-            },
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "BARCGB2L",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                  }
+                },
+                "identifierType" : "BIC",
+                "meta" : {
+                  "globalKey" : "ca05a501"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "ca05a501",
+                "externalKey" : "party2"
+              }
+            } ],
             "tradeDate" : {
+              "value" : "1994-12-12",
               "meta" : {
                 "globalKey" : "3e530c"
-              },
-              "value" : "1994-12-12"
+              }
             },
             "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "ca05a501",
+                "externalReference" : "party2"
+              },
               "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "SW2000",
                   "meta" : {
                     "scheme" : "http://www.barclays.com/swaps/trade-id"
-                  },
-                  "value" : "SW2000"
+                  }
                 },
                 "version" : 1
               } ],
-              "issuerReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ca05a501"
-              },
               "meta" : {
-                "globalKey" : "fc2ee432"
+                "globalKey" : "958d38d8"
               }
             } ]
           }
         }
       } ],
+      "eventQualifier" : "Execution",
       "after" : [ {
-        "meta" : {
-          "globalKey" : "74748122"
-        },
-        "state" : {
-          "positionState" : "EXECUTED"
-        },
         "trade" : {
-          "meta" : {
-            "globalKey" : "41b6d4d1"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "a82d45fc"
-            },
-            "name" : {
-              "value" : "Party A"
+          "tradeIdentifier" : [ {
+            "issuerReference" : {
+              "globalReference" : "ca05a501",
+              "externalReference" : "party2"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "SW2000",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                },
-                "value" : "PARTYAUS33"
+                  "scheme" : "http://www.barclays.com/swaps/trade-id"
+                }
               },
-              "identifierType" : "BIC",
-              "meta" : {
-                "globalKey" : "3d5ebc15"
-              }
-            } ]
-          }, {
+              "version" : 1
+            } ],
             "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "ca05a501"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                },
-                "value" : "BARCGB2L"
-              },
-              "identifierType" : "BIC",
-              "meta" : {
-                "globalKey" : "ca05a501"
-              }
-            } ]
+              "globalKey" : "958d38d8"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "1994-12-12",
+            "meta" : {
+              "globalKey" : "3e530c"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "a82d45fc"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ca05a501"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -1770,46 +1734,40 @@
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da36cf11"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7d7eda0"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "28c89"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6,
-                          "rollConvention" : "14"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1994-12-14",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -1818,103 +1776,108 @@
                             },
                             "meta" : {
                               "globalKey" : "ea1a6ec6"
-                            },
-                            "unadjustedDate" : "1994-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ea1a6ec6"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "floatingCalcPeriodDates",
-                          "globalKey" : "a54e5fcd"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1999-12-14",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "DEFR"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "primaryBusinessCenters",
-                                  "globalKey" : "1ff50d"
+                                  "globalKey" : "1ff50d",
+                                  "externalKey" : "primaryBusinessCenters"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365af8de"
                               }
                             },
                             "meta" : {
                               "globalKey" : "a8d53690"
-                            },
-                            "unadjustedDate" : "1999-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "a8d53690"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "4443c8bb"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "8c0b539f"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "959"
+                            "globalKey" : "18a9b"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 6
+                          "rollConvention" : "14"
+                        },
+                        "meta" : {
+                          "globalKey" : "3836d691",
+                          "externalKey" : "floatingCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
+                            "globalKey" : "107"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da36cf11"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7d7eda0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "8563938d"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "floatingCalcPeriodDates",
-                          "globalReference" : "a54e5fcd"
+                          "globalReference" : "3836d691",
+                          "externalReference" : "floatingCalcPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "131ae8a2"
+                            "globalKey" : "eff6d356"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -1923,82 +1886,79 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates",
-                            "globalReference" : "d533d3ee"
+                            "globalReference" : "25625c64",
+                            "externalReference" : "resetDates"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates",
-                          "globalKey" : "d533d3ee"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "25625c64",
+                          "externalKey" : "resetDates"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "56791807"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da36cf11"
-                            }
-                          },
-                          "businessDayConvention" : "MODFOLLOWING",
-                          "meta" : {
-                            "globalKey" : "b7d7eda0"
-                          }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "2b8fa"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
+                            }
                           },
-                          "period" : "Y",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "14"
-                        },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "30E/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1994-12-14",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -2007,241 +1967,289 @@
                             },
                             "meta" : {
                               "globalKey" : "ea1a6ec6"
-                            },
-                            "unadjustedDate" : "1994-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ea1a6ec6"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "fixedCalcPeriodDates",
-                          "globalKey" : "fbf296c2"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1999-12-14",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "primaryBusinessCenters",
-                                  "globalReference" : "1ff50d"
+                                  "globalReference" : "1ff50d",
+                                  "externalReference" : "primaryBusinessCenters"
                                 },
                                 "meta" : {
                                   "globalKey" : "da36cf11"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "b7d7eda0"
                               }
                             },
                             "meta" : {
                               "globalKey" : "97297aae"
-                            },
-                            "unadjustedDate" : "1999-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "97297aae"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "30E/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "8b5a674a"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "8c0b550e"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
                           "meta" : {
-                            "globalKey" : "ac8"
+                            "globalKey" : "1794a"
                           },
-                          "period" : "Y",
-                          "periodMultiplier" : 1
+                          "rollConvention" : "14"
+                        },
+                        "meta" : {
+                          "globalKey" : "a5f8cf12",
+                          "externalKey" : "fixedCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
+                            "globalKey" : "78"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da36cf11"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7d7eda0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "b32991fe"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3703de42"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e40a62af"
+                      "globalKey" : "a74ffedb"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "88a15c60"
+                  "globalKey" : "4be6f88c"
                 }
               },
               "meta" : {
-                "globalKey" : "88a15c60"
+                "globalKey" : "4be6f88c"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "3ce21b9b"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "53c66a4c"
-                  },
-                  "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
-                    "value" : {
-                      "floatingRateIndex" : {
-                        "value" : "EUR-LIBOR-BBA"
-                      },
-                      "indexTenor" : {
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 50000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "EUR",
                         "meta" : {
-                          "globalKey" : "959"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6
+                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                        }
                       }
                     }
-                  }
-                },
-                "quantity" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
+                  }
+                } ],
+                "observable" : {
+                  "rateOption" : {
+                    "value" : {
+                      "floatingRateIndex" : {
+                        "value" : "EUR-LIBOR-BBA"
+                      },
+                      "indexTenor" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
                         "meta" : {
-                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
+                          "globalKey" : "107"
+                        }
                       }
                     },
-                    "value" : 50000000
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "2505dd46"
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "4882fcbc"
                 },
+                "meta" : {
+                  "globalKey" : "c0d07bed"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.06,
                     "unit" : {
                       "currency" : {
+                        "value" : "EUR",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
+                        }
                       }
                     },
-                    "value" : 0.06,
                     "perUnitOf" : {
                       "currency" : {
+                        "value" : "EUR",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
+                        }
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 50000000,
                     "unit" : {
                       "currency" : {
+                        "value" : "EUR",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
+                        }
                       }
-                    },
-                    "value" : 50000000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "c7dc9ac4"
+                }
               } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "9495a03c",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "ca05a501",
+                "externalReference" : "party2"
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3e530c"
-            },
-            "value" : "1994-12-12"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "PARTYAUS33",
                 "meta" : {
-                  "scheme" : "http://www.barclays.com/swaps/trade-id"
-                },
-                "value" : "SW2000"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                }
               },
-              "version" : 1
+              "identifierType" : "BIC",
+              "meta" : {
+                "globalKey" : "3d5ebc15"
+              }
             } ],
-            "issuerReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "ca05a501"
+            "name" : {
+              "value" : "Party A"
             },
             "meta" : {
-              "globalKey" : "fc2ee432"
+              "globalKey" : "9495a03c",
+              "externalKey" : "party1"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "BARCGB2L",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                }
+              },
+              "identifierType" : "BIC",
+              "meta" : {
+                "globalKey" : "ca05a501"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "ca05a501",
+              "externalKey" : "party2"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "b2493d2f"
+          }
+        },
+        "state" : {
+          "positionState" : "Executed"
+        },
+        "meta" : {
+          "globalKey" : "ed5a94fe"
         }
       } ],
-      "eventQualifier" : "Execution",
       "meta" : {
-        "globalKey" : "a5bcedab"
+        "globalKey" : "b45f561b"
+      }
+    },
+    "messageInformation" : {
+      "messageId" : {
+        "value" : "msg-3"
       }
     },
+    "timestamp" : [ {
+      "dateTime" : "1994-12-12T19:13:00Z",
+      "qualification" : "eventCreationDateTime"
+    } ],
     "eventIdentifier" : [ {
       "assignedIdentifier" : [ {
         "identifier" : {
@@ -2252,55 +2260,47 @@
         "globalKey" : "313801"
       }
     } ],
-    "messageInformation" : {
-      "messageId" : {
-        "value" : "msg-3"
-      }
-    },
-    "meta" : {
-      "globalKey" : "52fc2aae"
-    },
+    "action" : "New",
     "party" : [ {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "ca05a501"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "BARCGB2L",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "BARCGB2L"
+          }
         },
         "identifierType" : "BIC",
         "meta" : {
           "globalKey" : "ca05a501"
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "a82d45fc"
-      },
-      "name" : {
-        "value" : "Party A"
-      },
+        "globalKey" : "ca05a501",
+        "externalKey" : "party2"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "PARTYAUS33",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "PARTYAUS33"
+          }
         },
         "identifierType" : "BIC",
         "meta" : {
           "globalKey" : "3d5ebc15"
         }
-      } ]
+      } ],
+      "name" : {
+        "value" : "Party A"
+      },
+      "meta" : {
+        "globalKey" : "9495a03c",
+        "externalKey" : "party1"
+      }
     } ],
-    "timestamp" : [ {
-      "dateTime" : "1994-12-12T19:13:00Z",
-      "qualification" : "EVENT_CREATION_DATE_TIME"
-    } ]
+    "meta" : {
+      "globalKey" : "a4819f38"
+    }
   } ]
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/workflow-step/correction/correction-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/workflow-step/correction/correction-func-output.json
index f44348dec4..ff4cff0289 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/functions/workflow-step/correction/correction-func-output.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/workflow-step/correction/correction-func-output.json
@@ -1,162 +1,10 @@
 {
   "steps" : [ {
-    "action" : "NEW",
     "businessEvent" : {
       "eventDate" : "1994-12-12",
       "instruction" : [ {
         "primitiveInstruction" : {
           "execution" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "a82d45fc"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ca05a501"
-              },
-              "role" : "PARTY_2"
-            } ],
-            "parties" : [ {
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "a82d45fc"
-              },
-              "name" : {
-                "value" : "Party A"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                  },
-                  "value" : "PARTYAUS33"
-                },
-                "identifierType" : "BIC",
-                "meta" : {
-                  "globalKey" : "3d5ebc15"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "ca05a501"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                  },
-                  "value" : "BARCGB2L"
-                },
-                "identifierType" : "BIC",
-                "meta" : {
-                  "globalKey" : "ca05a501"
-                }
-              } ]
-            } ],
-            "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "61d0453d"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "53c66a4c"
-                },
-                "rateOption" : {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "rateOption-1"
-                    } ]
-                  },
-                  "value" : {
-                    "floatingRateIndex" : {
-                      "value" : "EUR-LIBOR-BBA"
-                    },
-                    "indexTenor" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    }
-                  }
-                }
-              },
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "EUR"
-                    }
-                  },
-                  "value" : 99999
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "6d71265e"
-              },
-              "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "EUR"
-                    }
-                  },
-                  "value" : 0.06,
-                  "perUnitOf" : {
-                    "currency" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "EUR"
-                    }
-                  },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ],
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "EUR"
-                    }
-                  },
-                  "value" : 99999
-                }
-              } ]
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -167,46 +15,40 @@
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da36cf11"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7d7eda0"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "28c89"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6,
-                          "rollConvention" : "14"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1994-12-14",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -215,103 +57,108 @@
                             },
                             "meta" : {
                               "globalKey" : "ea1a6ec6"
-                            },
-                            "unadjustedDate" : "1994-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ea1a6ec6"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "floatingCalcPeriodDates",
-                          "globalKey" : "a54e5fcd"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1999-12-14",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "DEFR"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "primaryBusinessCenters",
-                                  "globalKey" : "1ff50d"
+                                  "globalKey" : "1ff50d",
+                                  "externalKey" : "primaryBusinessCenters"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365af8de"
                               }
                             },
                             "meta" : {
                               "globalKey" : "a8d53690"
-                            },
-                            "unadjustedDate" : "1999-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "a8d53690"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "4443c8bb"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "8c0b539f"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "959"
+                            "globalKey" : "18a9b"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 6
+                          "rollConvention" : "14"
+                        },
+                        "meta" : {
+                          "globalKey" : "3836d691",
+                          "externalKey" : "floatingCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
+                            "globalKey" : "107"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da36cf11"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7d7eda0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "8563938d"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "floatingCalcPeriodDates",
-                          "globalReference" : "a54e5fcd"
+                          "globalReference" : "3836d691",
+                          "externalReference" : "floatingCalcPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "131ae8a2"
+                            "globalKey" : "eff6d356"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -320,82 +167,79 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates",
-                            "globalReference" : "d533d3ee"
+                            "globalReference" : "25625c64",
+                            "externalReference" : "resetDates"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates",
-                          "globalKey" : "d533d3ee"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "25625c64",
+                          "externalKey" : "resetDates"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "56791807"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da36cf11"
-                            }
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
+                            }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7d7eda0"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "2b8fa"
-                          },
-                          "period" : "Y",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "14"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "30E/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1994-12-14",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -404,197 +248,317 @@
                             },
                             "meta" : {
                               "globalKey" : "ea1a6ec6"
-                            },
-                            "unadjustedDate" : "1994-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ea1a6ec6"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "fixedCalcPeriodDates",
-                          "globalKey" : "fbf296c2"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1999-12-14",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "primaryBusinessCenters",
-                                  "globalReference" : "1ff50d"
+                                  "globalReference" : "1ff50d",
+                                  "externalReference" : "primaryBusinessCenters"
                                 },
                                 "meta" : {
                                   "globalKey" : "da36cf11"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "b7d7eda0"
                               }
                             },
                             "meta" : {
                               "globalKey" : "97297aae"
-                            },
-                            "unadjustedDate" : "1999-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "97297aae"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "30E/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "8b5a674a"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "8c0b550e"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
                           "meta" : {
-                            "globalKey" : "ac8"
+                            "globalKey" : "1794a"
                           },
-                          "period" : "Y",
-                          "periodMultiplier" : 1
+                          "rollConvention" : "14"
+                        },
+                        "meta" : {
+                          "globalKey" : "a5f8cf12",
+                          "externalKey" : "fixedCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
+                            "globalKey" : "78"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da36cf11"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7d7eda0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "b32991fe"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3703de42"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e40a62af"
+                      "globalKey" : "a74ffedb"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "88a15c60"
+                  "globalKey" : "4be6f88c"
                 }
               },
               "meta" : {
-                "globalKey" : "88a15c60"
+                "globalKey" : "4be6f88c"
               }
             },
+            "priceQuantity" : [ {
+              "quantity" : [ {
+                "value" : {
+                  "value" : 99999,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "EUR",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                      }
+                    }
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
+                }
+              } ],
+              "observable" : {
+                "rateOption" : {
+                  "value" : {
+                    "floatingRateIndex" : {
+                      "value" : "EUR-LIBOR-BBA"
+                    },
+                    "indexTenor" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "rateOption-1"
+                    } ]
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "2505dd46"
+                }
+              },
+              "meta" : {
+                "globalKey" : "ed98830f"
+              }
+            }, {
+              "price" : [ {
+                "value" : {
+                  "value" : 0.06,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "EUR",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                      }
+                    }
+                  },
+                  "perUnitOf" : {
+                    "currency" : {
+                      "value" : "EUR",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                      }
+                    }
+                  },
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
+                }
+              } ],
+              "quantity" : [ {
+                "value" : {
+                  "value" : 99999,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "EUR",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                      }
+                    }
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "40b3a562"
+              }
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "9495a03c",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "ca05a501",
+                "externalReference" : "party2"
+              }
+            } ],
+            "parties" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "PARTYAUS33",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                  }
+                },
+                "identifierType" : "BIC",
+                "meta" : {
+                  "globalKey" : "3d5ebc15"
+                }
+              } ],
+              "name" : {
+                "value" : "Party A"
+              },
+              "meta" : {
+                "globalKey" : "9495a03c",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "BARCGB2L",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                  }
+                },
+                "identifierType" : "BIC",
+                "meta" : {
+                  "globalKey" : "ca05a501"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "ca05a501",
+                "externalKey" : "party2"
+              }
+            } ],
             "tradeDate" : {
+              "value" : "1994-12-12",
               "meta" : {
                 "globalKey" : "3e530c"
-              },
-              "value" : "1994-12-12"
+              }
             },
             "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "ca05a501",
+                "externalReference" : "party2"
+              },
               "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "SW2000",
                   "meta" : {
                     "scheme" : "http://www.barclays.com/swaps/trade-id"
-                  },
-                  "value" : "SW2000"
+                  }
                 },
                 "version" : 1
               } ],
-              "issuerReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ca05a501"
-              },
               "meta" : {
-                "globalKey" : "fc2ee432"
+                "globalKey" : "958d38d8"
               }
             } ]
           }
         }
       } ],
+      "eventQualifier" : "Execution",
       "after" : [ {
-        "meta" : {
-          "globalKey" : "632669e6"
-        },
-        "state" : {
-          "positionState" : "EXECUTED"
-        },
         "trade" : {
-          "meta" : {
-            "globalKey" : "3068bd95"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "a82d45fc"
-            },
-            "name" : {
-              "value" : "Party A"
+          "tradeIdentifier" : [ {
+            "issuerReference" : {
+              "globalReference" : "ca05a501",
+              "externalReference" : "party2"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "SW2000",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                },
-                "value" : "PARTYAUS33"
+                  "scheme" : "http://www.barclays.com/swaps/trade-id"
+                }
               },
-              "identifierType" : "BIC",
-              "meta" : {
-                "globalKey" : "3d5ebc15"
-              }
-            } ]
-          }, {
+              "version" : 1
+            } ],
             "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "ca05a501"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                },
-                "value" : "BARCGB2L"
-              },
-              "identifierType" : "BIC",
-              "meta" : {
-                "globalKey" : "ca05a501"
-              }
-            } ]
+              "globalKey" : "958d38d8"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "1994-12-12",
+            "meta" : {
+              "globalKey" : "3e530c"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "a82d45fc"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ca05a501"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -605,46 +569,40 @@
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da36cf11"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7d7eda0"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "28c89"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6,
-                          "rollConvention" : "14"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1994-12-14",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -653,103 +611,108 @@
                             },
                             "meta" : {
                               "globalKey" : "ea1a6ec6"
-                            },
-                            "unadjustedDate" : "1994-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ea1a6ec6"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "floatingCalcPeriodDates",
-                          "globalKey" : "a54e5fcd"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1999-12-14",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "DEFR"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "primaryBusinessCenters",
-                                  "globalKey" : "1ff50d"
+                                  "globalKey" : "1ff50d",
+                                  "externalKey" : "primaryBusinessCenters"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365af8de"
                               }
                             },
                             "meta" : {
                               "globalKey" : "a8d53690"
-                            },
-                            "unadjustedDate" : "1999-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "a8d53690"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "4443c8bb"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "8c0b539f"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "959"
+                            "globalKey" : "18a9b"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 6
+                          "rollConvention" : "14"
+                        },
+                        "meta" : {
+                          "globalKey" : "3836d691",
+                          "externalKey" : "floatingCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
+                            "globalKey" : "107"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da36cf11"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7d7eda0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "8563938d"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "floatingCalcPeriodDates",
-                          "globalReference" : "a54e5fcd"
+                          "globalReference" : "3836d691",
+                          "externalReference" : "floatingCalcPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "131ae8a2"
+                            "globalKey" : "eff6d356"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -758,82 +721,79 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates",
-                            "globalReference" : "d533d3ee"
+                            "globalReference" : "25625c64",
+                            "externalReference" : "resetDates"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates",
-                          "globalKey" : "d533d3ee"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "25625c64",
+                          "externalKey" : "resetDates"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "56791807"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da36cf11"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7d7eda0"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "2b8fa"
-                          },
-                          "period" : "Y",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "14"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "30E/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1994-12-14",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -842,241 +802,289 @@
                             },
                             "meta" : {
                               "globalKey" : "ea1a6ec6"
-                            },
-                            "unadjustedDate" : "1994-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ea1a6ec6"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "fixedCalcPeriodDates",
-                          "globalKey" : "fbf296c2"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1999-12-14",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "primaryBusinessCenters",
-                                  "globalReference" : "1ff50d"
+                                  "globalReference" : "1ff50d",
+                                  "externalReference" : "primaryBusinessCenters"
                                 },
                                 "meta" : {
                                   "globalKey" : "da36cf11"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "b7d7eda0"
                               }
                             },
                             "meta" : {
                               "globalKey" : "97297aae"
-                            },
-                            "unadjustedDate" : "1999-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "97297aae"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "30E/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "8b5a674a"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "8c0b550e"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
                           "meta" : {
-                            "globalKey" : "ac8"
+                            "globalKey" : "1794a"
                           },
-                          "period" : "Y",
-                          "periodMultiplier" : 1
+                          "rollConvention" : "14"
+                        },
+                        "meta" : {
+                          "globalKey" : "a5f8cf12",
+                          "externalKey" : "fixedCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
+                            "globalKey" : "78"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da36cf11"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7d7eda0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "b32991fe"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3703de42"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e40a62af"
+                      "globalKey" : "a74ffedb"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "88a15c60"
+                  "globalKey" : "4be6f88c"
                 }
               },
               "meta" : {
-                "globalKey" : "88a15c60"
+                "globalKey" : "4be6f88c"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "61d0453d"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "53c66a4c"
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 99999,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "EUR",
+                        "meta" : {
+                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                        }
+                      }
+                    }
                   },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    } ]
+                  }
+                } ],
+                "observable" : {
                   "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
                     "value" : {
                       "floatingRateIndex" : {
                         "value" : "EUR-LIBOR-BBA"
                       },
                       "indexTenor" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
                         "meta" : {
-                          "globalKey" : "959"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6
+                          "globalKey" : "107"
+                        }
                       }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
                     }
-                  }
-                },
-                "quantity" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    } ]
                   },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "meta" : {
-                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
-                      }
-                    },
-                    "value" : 99999
+                  "meta" : {
+                    "globalKey" : "2505dd46"
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "6d71265e"
                 },
+                "meta" : {
+                  "globalKey" : "ed98830f"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.06,
                     "unit" : {
                       "currency" : {
+                        "value" : "EUR",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
+                        }
                       }
                     },
-                    "value" : 0.06,
                     "perUnitOf" : {
                       "currency" : {
+                        "value" : "EUR",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
+                        }
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 99999,
                     "unit" : {
                       "currency" : {
+                        "value" : "EUR",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
+                        }
                       }
-                    },
-                    "value" : 99999
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "40b3a562"
+                }
               } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "9495a03c",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "ca05a501",
+                "externalReference" : "party2"
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3e530c"
-            },
-            "value" : "1994-12-12"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "PARTYAUS33",
                 "meta" : {
-                  "scheme" : "http://www.barclays.com/swaps/trade-id"
-                },
-                "value" : "SW2000"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                }
               },
-              "version" : 1
+              "identifierType" : "BIC",
+              "meta" : {
+                "globalKey" : "3d5ebc15"
+              }
             } ],
-            "issuerReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "ca05a501"
+            "name" : {
+              "value" : "Party A"
             },
             "meta" : {
-              "globalKey" : "fc2ee432"
+              "globalKey" : "9495a03c",
+              "externalKey" : "party1"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "BARCGB2L",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                }
+              },
+              "identifierType" : "BIC",
+              "meta" : {
+                "globalKey" : "ca05a501"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "ca05a501",
+              "externalKey" : "party2"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "58b08a6f"
+          }
+        },
+        "state" : {
+          "positionState" : "Executed"
+        },
+        "meta" : {
+          "globalKey" : "9723923e"
         }
       } ],
-      "eventQualifier" : "Execution",
       "meta" : {
-        "globalKey" : "7274cf2b"
+        "globalKey" : "e3d2ae1b"
+      }
+    },
+    "messageInformation" : {
+      "messageId" : {
+        "value" : "msg-1"
       }
     },
+    "timestamp" : [ {
+      "dateTime" : "1994-12-12T18:12:00Z",
+      "qualification" : "eventCreationDateTime"
+    } ],
     "eventIdentifier" : [ {
       "assignedIdentifier" : [ {
         "identifier" : {
@@ -1087,214 +1095,54 @@
         "globalKey" : "3137ff"
       }
     } ],
-    "messageInformation" : {
-      "messageId" : {
-        "value" : "msg-1"
-      }
-    },
-    "meta" : {
-      "globalKey" : "773fa6a"
-    },
+    "action" : "New",
     "party" : [ {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "ca05a501"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "BARCGB2L",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "BARCGB2L"
+          }
         },
         "identifierType" : "BIC",
         "meta" : {
           "globalKey" : "ca05a501"
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "a82d45fc"
-      },
-      "name" : {
-        "value" : "Party A"
-      },
+        "globalKey" : "ca05a501",
+        "externalKey" : "party2"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "PARTYAUS33",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "PARTYAUS33"
+          }
         },
         "identifierType" : "BIC",
         "meta" : {
           "globalKey" : "3d5ebc15"
         }
-      } ]
+      } ],
+      "name" : {
+        "value" : "Party A"
+      },
+      "meta" : {
+        "globalKey" : "9495a03c",
+        "externalKey" : "party1"
+      }
     } ],
-    "timestamp" : [ {
-      "dateTime" : "1994-12-12T18:12:00Z",
-      "qualification" : "EVENT_CREATION_DATE_TIME"
-    } ]
+    "meta" : {
+      "globalKey" : "42a152f4"
+    }
   }, {
-    "action" : "CORRECT",
     "businessEvent" : {
       "eventDate" : "1994-12-12",
       "instruction" : [ {
         "primitiveInstruction" : {
           "execution" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "a82d45fc"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ca05a501"
-              },
-              "role" : "PARTY_2"
-            } ],
-            "parties" : [ {
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "a82d45fc"
-              },
-              "name" : {
-                "value" : "Party A"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                  },
-                  "value" : "PARTYAUS33"
-                },
-                "identifierType" : "BIC",
-                "meta" : {
-                  "globalKey" : "3d5ebc15"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "ca05a501"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                  },
-                  "value" : "BARCGB2L"
-                },
-                "identifierType" : "BIC",
-                "meta" : {
-                  "globalKey" : "ca05a501"
-                }
-              } ]
-            } ],
-            "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "3ce21b9b"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "53c66a4c"
-                },
-                "rateOption" : {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "rateOption-1"
-                    } ]
-                  },
-                  "value" : {
-                    "floatingRateIndex" : {
-                      "value" : "EUR-LIBOR-BBA"
-                    },
-                    "indexTenor" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 6
-                    }
-                  }
-                }
-              },
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "EUR"
-                    }
-                  },
-                  "value" : 50000000
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "4882fcbc"
-              },
-              "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "EUR"
-                    }
-                  },
-                  "value" : 0.06,
-                  "perUnitOf" : {
-                    "currency" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "EUR"
-                    }
-                  },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ],
-              "quantity" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
-                  } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "currency" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                      },
-                      "value" : "EUR"
-                    }
-                  },
-                  "value" : 50000000
-                }
-              } ]
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -1305,46 +1153,40 @@
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da36cf11"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7d7eda0"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "28c89"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6,
-                          "rollConvention" : "14"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1994-12-14",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -1353,103 +1195,108 @@
                             },
                             "meta" : {
                               "globalKey" : "ea1a6ec6"
-                            },
-                            "unadjustedDate" : "1994-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ea1a6ec6"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "floatingCalcPeriodDates",
-                          "globalKey" : "a54e5fcd"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1999-12-14",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "DEFR"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "primaryBusinessCenters",
-                                  "globalKey" : "1ff50d"
+                                  "globalKey" : "1ff50d",
+                                  "externalKey" : "primaryBusinessCenters"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365af8de"
                               }
                             },
                             "meta" : {
                               "globalKey" : "a8d53690"
-                            },
-                            "unadjustedDate" : "1999-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "a8d53690"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "4443c8bb"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "8c0b539f"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "959"
+                            "globalKey" : "18a9b"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 6
+                          "rollConvention" : "14"
+                        },
+                        "meta" : {
+                          "globalKey" : "3836d691",
+                          "externalKey" : "floatingCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
+                            "globalKey" : "107"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da36cf11"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7d7eda0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "8563938d"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "floatingCalcPeriodDates",
-                          "globalReference" : "a54e5fcd"
+                          "globalReference" : "3836d691",
+                          "externalReference" : "floatingCalcPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "131ae8a2"
+                            "globalKey" : "eff6d356"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -1458,82 +1305,79 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates",
-                            "globalReference" : "d533d3ee"
+                            "globalReference" : "25625c64",
+                            "externalReference" : "resetDates"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates",
-                          "globalKey" : "d533d3ee"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "25625c64",
+                          "externalKey" : "resetDates"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "56791807"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da36cf11"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7d7eda0"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "2b8fa"
-                          },
-                          "period" : "Y",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "14"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "30E/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1994-12-14",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -1542,197 +1386,317 @@
                             },
                             "meta" : {
                               "globalKey" : "ea1a6ec6"
-                            },
-                            "unadjustedDate" : "1994-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ea1a6ec6"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "fixedCalcPeriodDates",
-                          "globalKey" : "fbf296c2"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1999-12-14",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "primaryBusinessCenters",
-                                  "globalReference" : "1ff50d"
+                                  "globalReference" : "1ff50d",
+                                  "externalReference" : "primaryBusinessCenters"
                                 },
                                 "meta" : {
                                   "globalKey" : "da36cf11"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "b7d7eda0"
                               }
                             },
                             "meta" : {
                               "globalKey" : "97297aae"
-                            },
-                            "unadjustedDate" : "1999-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "97297aae"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "30E/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "8b5a674a"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "8c0b550e"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
                           "meta" : {
-                            "globalKey" : "ac8"
+                            "globalKey" : "1794a"
                           },
-                          "period" : "Y",
-                          "periodMultiplier" : 1
+                          "rollConvention" : "14"
+                        },
+                        "meta" : {
+                          "globalKey" : "a5f8cf12",
+                          "externalKey" : "fixedCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
+                            "globalKey" : "78"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da36cf11"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7d7eda0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "b32991fe"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3703de42"
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "a74ffedb"
+                    }
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "4be6f88c"
+                }
+              },
+              "meta" : {
+                "globalKey" : "4be6f88c"
+              }
+            },
+            "priceQuantity" : [ {
+              "quantity" : [ {
+                "value" : {
+                  "value" : 50000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "EUR",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                      }
+                    }
+                  }
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-1"
+                  } ]
+                }
+              } ],
+              "observable" : {
+                "rateOption" : {
+                  "value" : {
+                    "floatingRateIndex" : {
+                      "value" : "EUR-LIBOR-BBA"
+                    },
+                    "indexTenor" : {
+                      "periodMultiplier" : 6,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "rateOption-1"
+                    } ]
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "2505dd46"
+                }
+              },
+              "meta" : {
+                "globalKey" : "c0d07bed"
+              }
+            }, {
+              "price" : [ {
+                "value" : {
+                  "value" : 0.06,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "EUR",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                      }
+                    }
+                  },
+                  "perUnitOf" : {
+                    "currency" : {
+                      "value" : "EUR",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                      }
+                    }
+                  },
+                  "priceType" : "InterestRate"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
+                }
+              } ],
+              "quantity" : [ {
+                "value" : {
+                  "value" : 50000000,
+                  "unit" : {
+                    "currency" : {
+                      "value" : "EUR",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
                       }
-                    } ],
-                    "meta" : {
-                      "globalKey" : "e40a62af"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "88a15c60"
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "quantity-2"
+                  } ]
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "c7dc9ac4"
+              }
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "9495a03c",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "ca05a501",
+                "externalReference" : "party2"
+              }
+            } ],
+            "parties" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "PARTYAUS33",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                  }
+                },
+                "identifierType" : "BIC",
+                "meta" : {
+                  "globalKey" : "3d5ebc15"
                 }
+              } ],
+              "name" : {
+                "value" : "Party A"
               },
               "meta" : {
-                "globalKey" : "88a15c60"
+                "globalKey" : "9495a03c",
+                "externalKey" : "party1"
               }
-            },
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "BARCGB2L",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                  }
+                },
+                "identifierType" : "BIC",
+                "meta" : {
+                  "globalKey" : "ca05a501"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "ca05a501",
+                "externalKey" : "party2"
+              }
+            } ],
             "tradeDate" : {
+              "value" : "1994-12-12",
               "meta" : {
                 "globalKey" : "3e530c"
-              },
-              "value" : "1994-12-12"
+              }
             },
             "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "ca05a501",
+                "externalReference" : "party2"
+              },
               "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "SW2000",
                   "meta" : {
                     "scheme" : "http://www.barclays.com/swaps/trade-id"
-                  },
-                  "value" : "SW2000"
+                  }
                 },
                 "version" : 1
               } ],
-              "issuerReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ca05a501"
-              },
               "meta" : {
-                "globalKey" : "fc2ee432"
+                "globalKey" : "958d38d8"
               }
             } ]
           }
         }
       } ],
+      "eventQualifier" : "Execution",
       "after" : [ {
-        "meta" : {
-          "globalKey" : "74748122"
-        },
-        "state" : {
-          "positionState" : "EXECUTED"
-        },
         "trade" : {
-          "meta" : {
-            "globalKey" : "41b6d4d1"
-          },
-          "party" : [ {
-            "meta" : {
-              "externalKey" : "party1",
-              "globalKey" : "a82d45fc"
-            },
-            "name" : {
-              "value" : "Party A"
+          "tradeIdentifier" : [ {
+            "issuerReference" : {
+              "globalReference" : "ca05a501",
+              "externalReference" : "party2"
             },
-            "partyId" : [ {
+            "assignedIdentifier" : [ {
               "identifier" : {
+                "value" : "SW2000",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                },
-                "value" : "PARTYAUS33"
+                  "scheme" : "http://www.barclays.com/swaps/trade-id"
+                }
               },
-              "identifierType" : "BIC",
-              "meta" : {
-                "globalKey" : "3d5ebc15"
-              }
-            } ]
-          }, {
+              "version" : 1
+            } ],
             "meta" : {
-              "externalKey" : "party2",
-              "globalKey" : "ca05a501"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                },
-                "value" : "BARCGB2L"
-              },
-              "identifierType" : "BIC",
-              "meta" : {
-                "globalKey" : "ca05a501"
-              }
-            } ]
+              "globalKey" : "958d38d8"
+            }
           } ],
+          "tradeDate" : {
+            "value" : "1994-12-12",
+            "meta" : {
+              "globalKey" : "3e530c"
+            }
+          },
           "tradableProduct" : {
-            "counterparty" : [ {
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "a82d45fc"
-              },
-              "role" : "PARTY_1"
-            }, {
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "ca05a501"
-              },
-              "role" : "PARTY_2"
-            } ],
             "product" : {
               "contractualProduct" : {
                 "productTaxonomy" : [ {
@@ -1743,46 +1707,40 @@
                   "payout" : {
                     "interestRatePayout" : [ {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da36cf11"
+                      "rateSpecification" : {
+                        "floatingRate" : {
+                          "rateOption" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "rateOption-1"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
-                            "globalKey" : "b7d7eda0"
+                            "globalKey" : "0"
                           }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "28c89"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6,
-                          "rollConvention" : "14"
-                        },
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "ACT/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1994-12-14",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -1791,103 +1749,108 @@
                             },
                             "meta" : {
                               "globalKey" : "ea1a6ec6"
-                            },
-                            "unadjustedDate" : "1994-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ea1a6ec6"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "floatingCalcPeriodDates",
-                          "globalKey" : "a54e5fcd"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1999-12-14",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "DEFR"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "primaryBusinessCenters",
-                                  "globalKey" : "1ff50d"
+                                  "globalKey" : "1ff50d",
+                                  "externalKey" : "primaryBusinessCenters"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365af8de"
                               }
                             },
                             "meta" : {
                               "globalKey" : "a8d53690"
-                            },
-                            "unadjustedDate" : "1999-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "a8d53690"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "ACT/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "4443c8bb"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "8c0b539f"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "959"
+                            "globalKey" : "18a9b"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 6
+                          "rollConvention" : "14"
+                        },
+                        "meta" : {
+                          "globalKey" : "3836d691",
+                          "externalKey" : "floatingCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "floatingRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateOption" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "rateOption-1"
+                            "globalKey" : "107"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da36cf11"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7d7eda0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "8563938d"
                         }
                       },
                       "resetDates" : {
                         "calculationPeriodDatesReference" : {
-                          "externalReference" : "floatingCalcPeriodDates",
-                          "globalReference" : "a54e5fcd"
+                          "globalReference" : "3836d691",
+                          "externalReference" : "floatingCalcPeriodDates"
                         },
+                        "resetRelativeTo" : "CalculationPeriodStartDate",
                         "fixingDates" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "131ae8a2"
+                            "globalKey" : "eff6d356"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -1896,82 +1859,79 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "resetDates",
-                            "globalReference" : "d533d3ee"
+                            "globalReference" : "25625c64",
+                            "externalReference" : "resetDates"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "resetDates",
-                          "globalKey" : "d533d3ee"
+                        "resetFrequency" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         },
                         "resetDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "resetFrequency" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6
-                        },
-                        "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                        "meta" : {
+                          "globalKey" : "25625c64",
+                          "externalKey" : "resetDates"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "56791807"
                       }
                     }, {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
-                      "calculationPeriodDates" : {
-                        "calculationPeriodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
-                            },
-                            "meta" : {
-                              "globalKey" : "da36cf11"
+                      "rateSpecification" : {
+                        "fixedRate" : {
+                          "rateSchedule" : {
+                            "price" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "price-1"
+                              }
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
-                          "meta" : {
-                            "globalKey" : "b7d7eda0"
-                          }
-                        },
-                        "calculationPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "2b8fa"
-                          },
-                          "period" : "Y",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "14"
-                        },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        }
+                      },
+                      "dayCountFraction" : {
+                        "value" : "30E/360"
+                      },
+                      "calculationPeriodDates" : {
                         "effectiveDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1994-12-14",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -1980,241 +1940,292 @@
                             },
                             "meta" : {
                               "globalKey" : "ea1a6ec6"
-                            },
-                            "unadjustedDate" : "1994-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ea1a6ec6"
                           }
                         },
-                        "meta" : {
-                          "externalKey" : "fixedCalcPeriodDates",
-                          "globalKey" : "fbf296c2"
-                        },
                         "terminationDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "1999-12-14",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "primaryBusinessCenters",
-                                  "globalReference" : "1ff50d"
+                                  "globalReference" : "1ff50d",
+                                  "externalReference" : "primaryBusinessCenters"
                                 },
                                 "meta" : {
                                   "globalKey" : "da36cf11"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "b7d7eda0"
                               }
                             },
                             "meta" : {
                               "globalKey" : "97297aae"
-                            },
-                            "unadjustedDate" : "1999-12-14"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "97297aae"
                           }
-                        }
-                      },
-                      "dayCountFraction" : {
-                        "value" : "30E/360"
-                      },
-                      "meta" : {
-                        "globalKey" : "8b5a674a"
-                      },
-                      "paymentDates" : {
-                        "meta" : {
-                          "globalKey" : "8c0b550e"
                         },
-                        "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                        "paymentDatesAdjustments" : {
+                        "calculationPeriodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCentersReference" : {
-                              "externalReference" : "primaryBusinessCenters",
-                              "globalReference" : "1ff50d"
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
                             },
                             "meta" : {
                               "globalKey" : "da36cf11"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "b7d7eda0"
                           }
                         },
-                        "paymentFrequency" : {
+                        "calculationPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
                           "meta" : {
-                            "globalKey" : "ac8"
+                            "globalKey" : "1794a"
                           },
-                          "period" : "Y",
-                          "periodMultiplier" : 1
+                          "rollConvention" : "14"
+                        },
+                        "meta" : {
+                          "globalKey" : "a5f8cf12",
+                          "externalKey" : "fixedCalcPeriodDates"
                         }
                       },
-                      "rateSpecification" : {
-                        "fixedRate" : {
+                      "paymentDates" : {
+                        "paymentFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "Y",
                           "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "rateSchedule" : {
-                            "price" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "price-1"
-                              }
+                            "globalKey" : "78"
+                          }
+                        },
+                        "payRelativeTo" : "CalculationPeriodEndDate",
+                        "paymentDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "1ff50d",
+                              "externalReference" : "primaryBusinessCenters"
+                            },
+                            "meta" : {
+                              "globalKey" : "da36cf11"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "b7d7eda0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "b32991fe"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3703de42"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "e40a62af"
+                      "globalKey" : "a74ffedb"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "88a15c60"
+                  "globalKey" : "4be6f88c"
                 }
               },
               "meta" : {
-                "globalKey" : "88a15c60"
+                "globalKey" : "4be6f88c"
               }
             },
             "tradeLot" : [ {
               "priceQuantity" : [ {
-                "meta" : {
-                  "globalKey" : "3ce21b9b"
-                },
-                "observable" : {
-                  "meta" : {
-                    "globalKey" : "53c66a4c"
-                  },
-                  "rateOption" : {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      } ]
-                    },
-                    "value" : {
-                      "floatingRateIndex" : {
-                        "value" : "EUR-LIBOR-BBA"
-                      },
-                      "indexTenor" : {
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 50000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "EUR",
                         "meta" : {
-                          "globalKey" : "959"
-                        },
-                        "period" : "M",
-                        "periodMultiplier" : 6
+                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                        }
                       }
                     }
-                  }
-                },
-                "quantity" : [ {
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     } ]
-                  },
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
+                  }
+                } ],
+                "observable" : {
+                  "rateOption" : {
+                    "value" : {
+                      "floatingRateIndex" : {
+                        "value" : "EUR-LIBOR-BBA"
+                      },
+                      "indexTenor" : {
+                        "periodMultiplier" : 6,
+                        "period" : "M",
                         "meta" : {
-                          "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
+                          "globalKey" : "107"
+                        }
                       }
                     },
-                    "value" : 50000000
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      } ]
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "2505dd46"
                   }
-                } ]
-              }, {
-                "meta" : {
-                  "globalKey" : "4882fcbc"
                 },
+                "meta" : {
+                  "globalKey" : "c0d07bed"
+                }
+              }, {
                 "price" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    } ]
-                  },
                   "value" : {
+                    "value" : 0.06,
                     "unit" : {
                       "currency" : {
+                        "value" : "EUR",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
+                        }
                       }
                     },
-                    "value" : 0.06,
                     "perUnitOf" : {
                       "currency" : {
+                        "value" : "EUR",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
+                        }
                       }
                     },
-                    "priceType" : "INTEREST_RATE"
-                  }
-                } ],
-                "quantity" : [ {
+                    "priceType" : "InterestRate"
+                  },
                   "meta" : {
                     "location" : [ {
                       "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
+                      "value" : "price-1"
                     } ]
-                  },
+                  }
+                } ],
+                "quantity" : [ {
                   "value" : {
+                    "value" : 50000000,
                     "unit" : {
                       "currency" : {
+                        "value" : "EUR",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                        },
-                        "value" : "EUR"
+                        }
                       }
-                    },
-                    "value" : 50000000
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    } ]
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "c7dc9ac4"
+                }
               } ]
+            } ],
+            "counterparty" : [ {
+              "role" : "Party1",
+              "partyReference" : {
+                "globalReference" : "9495a03c",
+                "externalReference" : "party1"
+              }
+            }, {
+              "role" : "Party2",
+              "partyReference" : {
+                "globalReference" : "ca05a501",
+                "externalReference" : "party2"
+              }
             } ]
           },
-          "tradeDate" : {
-            "meta" : {
-              "globalKey" : "3e530c"
-            },
-            "value" : "1994-12-12"
-          },
-          "tradeIdentifier" : [ {
-            "assignedIdentifier" : [ {
+          "party" : [ {
+            "partyId" : [ {
               "identifier" : {
+                "value" : "PARTYAUS33",
                 "meta" : {
-                  "scheme" : "http://www.barclays.com/swaps/trade-id"
-                },
-                "value" : "SW2000"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                }
               },
-              "version" : 1
+              "identifierType" : "BIC",
+              "meta" : {
+                "globalKey" : "3d5ebc15"
+              }
             } ],
-            "issuerReference" : {
-              "externalReference" : "party2",
-              "globalReference" : "ca05a501"
+            "name" : {
+              "value" : "Party A"
             },
             "meta" : {
-              "globalKey" : "fc2ee432"
+              "globalKey" : "9495a03c",
+              "externalKey" : "party1"
+            }
+          }, {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "BARCGB2L",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                }
+              },
+              "identifierType" : "BIC",
+              "meta" : {
+                "globalKey" : "ca05a501"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "ca05a501",
+              "externalKey" : "party2"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "b2493d2f"
+          }
+        },
+        "state" : {
+          "positionState" : "Executed"
+        },
+        "meta" : {
+          "globalKey" : "ed5a94fe"
         }
       } ],
-      "eventQualifier" : "Execution",
       "meta" : {
-        "globalKey" : "a5bcedab"
+        "globalKey" : "b45f561b"
+      }
+    },
+    "previousWorkflowStep" : {
+      "globalReference" : "75bcdcc"
+    },
+    "messageInformation" : {
+      "messageId" : {
+        "value" : "msg-2"
       }
     },
+    "timestamp" : [ {
+      "dateTime" : "1994-12-12T19:13:00Z",
+      "qualification" : "eventCreationDateTime"
+    } ],
     "eventIdentifier" : [ {
       "assignedIdentifier" : [ {
         "identifier" : {
@@ -2225,58 +2236,47 @@
         "globalKey" : "313800"
       }
     } ],
-    "messageInformation" : {
-      "messageId" : {
-        "value" : "msg-2"
-      }
-    },
-    "meta" : {
-      "globalKey" : "40e10834"
-    },
+    "action" : "Correct",
     "party" : [ {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "ca05a501"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "BARCGB2L",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "BARCGB2L"
+          }
         },
         "identifierType" : "BIC",
         "meta" : {
           "globalKey" : "ca05a501"
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "a82d45fc"
-      },
-      "name" : {
-        "value" : "Party A"
-      },
+        "globalKey" : "ca05a501",
+        "externalKey" : "party2"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "PARTYAUS33",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "PARTYAUS33"
+          }
         },
         "identifierType" : "BIC",
         "meta" : {
           "globalKey" : "3d5ebc15"
         }
-      } ]
+      } ],
+      "name" : {
+        "value" : "Party A"
+      },
+      "meta" : {
+        "globalKey" : "9495a03c",
+        "externalKey" : "party1"
+      }
     } ],
-    "previousWorkflowStep" : {
-      "globalReference" : "75bcdcc"
-    },
-    "timestamp" : [ {
-      "dateTime" : "1994-12-12T19:13:00Z",
-      "qualification" : "EVENT_CREATION_DATE_TIME"
-    } ]
+    "meta" : {
+      "globalKey" : "a855caf8"
+    }
   } ]
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/event-common-enum.rosetta b/rosetta-source/src/main/resources/event-common-enum.rosetta
new file mode 100644
index 0000000000..ac1d98be61
--- /dev/null
+++ b/rosetta-source/src/main/resources/event-common-enum.rosetta
@@ -0,0 +1,152 @@
+namespace cdm.event.common : <"Business event concepts: primitives, contract state and associated state transition function specifications.">
+version "${project.version}"
+
+import cdm.base.*
+
+enum ConfirmationStatusEnum: <"Enumeration for the different types of confirmation status.">
+	Confirmed
+	Unconfirmed
+
+enum AffirmationStatusEnum: <"Enumeration for the different types of affirmation status.">
+	Affirmed
+	Unaffirmed
+	
+enum ExecutionTypeEnum: <"The enumerated values to specify how a contract has been executed, e.g. electronically, verbally, ...">
+	Electronic <"Execution via electronic execution facility, derivatives contract market, or other electronic message such as an instant message.">
+	OffFacility <"Bilateral execution between counterparties not pursuant to the rules of a SEF or DCM.">
+	//ICMA-P2
+	OnVenue <"Execution via a platform that may or may not be covered by a regulatory defintion. OnVenue is intended to distinguish trades executed on a trading platform from those executed via phone, email or messaging apps. The role and details of the venue are included in the party attribute of the trade. The general rule is that if the parties utilitzed the services of the platform to execute the trade then it would be considered OnVenue.">
+	
+enum ActionEnum: <"The enumeration values to specify the actions associated with transactions.">
+	New <"A new instance of a transaction event, which is also characterized by the fact that the eventIdentifier has an associated version 1.">
+	Correct <"A correction of a prior instance of the transaction event. The eventIdentifier has an associated version greater than 1.">
+	Cancel <"A cancellation of a prior instance of the transaction event. The eventIdentifier has an associated version greater than 1.">
+
+enum AssetTransferTypeEnum: <"The qualification of the type of asset transfer.">
+	FreeOfPayment <"The transfer of assets takes place without a corresponding exchange of payment.">
+
+enum EventIntentEnum: <"The enumeration values to qualify the intent associated with a transaction event.">
+	Allocation <"The intent is to allocate one or more trades as part of an allocated block trade.">
+	CashFlow <"The intent is to designate a stand-alone cash transfer as a result of Trade contracual terms e.g. incurred by payout for instance a Performance Amount or a Floating Rate Amount. The particular CashFlow at stake shall be further specified in priceTransferEnum or transferTypeEnum. For clarity, such intentEnum value shall not be used whenever a cash transfer is not stand-alone but is instead embedded in another Event as part of the composable modelling e.g. Decrease with Fees, Cross-Currency Notional Reset, etc. or any other Event whenever including a cash transfer with other features. For clarity, a principal payment related to a Principal Exhange is excluded as well, because a dedicated intentEnum value exists for this event i.e. PrincipalExchange value.">
+	Clearing <"The intent is to clear the contract.">
+	Compression <"The intent is to compress multiple trades as part of a netting or compression event.">
+	ContractFormation <"The intent is to form a contract from an execution.">
+	ContractTermsAmendment <"The intent is to amend the terms of the contract through renegotiation.">
+	CorporateActionAdjustment <"The intent is to take into effect the occurrence of a Corporate Action and the particular Corporate Action at stake shall be further specified in CorporateActionTypeEnum.">
+	CreditEvent <"The intent is to take into effect the occurrence of a Credit Event.">
+	Decrease <"The intent is to Decrease the quantity or notional of the contract.">
+    EarlyTerminationProvision <"The intent is to fully unwind the Trade, as a result of the application of Trade contractual terms (e.g. an obligation to do so before Termination Date as part of any kind of Early Termination terms) as defined within the CDM EarlyTerminationProvision data type. Accordingly, increase and decrease of positions which result from negotiation by the parties shall not be designated by such intentEnum. For clarity, partial exercise of an option before its expiration date is excluded as well, though related to Trade contract terms, because a dedicated intentEnum value exists for this event i.e. OptionExercise value.">
+	Increase <"The intent is to Increase the quantity or notional of the contract.">
+	IndexTransition <"The intent is to replace an interest rate index by another one during the life of a trade and add a transition spread on top of this index (and on top of the spreads already defined in the trade, if any). ">
+    NotionalReset <"The intent is to increase or to decrease the notional of the Trade, in accordance with Notional Reset features e.g. could apply for Cross Currency Swaps, Equity Performance Swaps, etc.">
+	NotionalStep <"The intent is to increase or to decrease the notional of the Trade, in accordance with Step features attached to a Payout Quantity.">
+	Novation <"The intent is to novate the contract.">
+	ObservationRecord <"The intent is to record any kind of stand-alone obervervations e.g. internal data recording, usage of CDM for recording and/or exchanging data as part of pricing 'consensus' processing, etc. For clarity, such intentEnum value shall not be used whenever an observation is not stand-alone but is instead embedded in another Event as part of the composable modelling e.g. CashFlow to which an observation of prices is associated, etc.">
+    OptionExercise <"The intent is to Exercise a contract that is made of one or several option payout legs. For clarity, such intentEnum value shall not be used whenever an optional right is exercised in relation with a Trade which composition includes other types of payout legs e.g. right to call or to cancel before Termination Date as part of any kind of Early Termination terms other than genuine bermuda or american style features described in option payout. ">
+	OptionalExtension <"The intent is to extend the trade through exercise of an optional right as defined within the CDM OptionProvision data type.">
+	OptionalCancellation <"The intent is to cancel the trade through exercise of an optional right as defined within the CDM OptionProvision data type.">
+	PrincipalExchange <"The intent is to pay or to receive a cash transfer, in accordance with Principal Exchange features.">
+	Reallocation <"The intent is to reallocate one or more trades as part of an allocated block trade.">
+	Repurchase <"The intent is to close a repo transaction through repurchase.">
+
+enum RecordAmountTypeEnum: <"The enumeration of the account level for the billing summary.">
+    AccountTotal
+    GrandTotal
+    ParentTotal
+
+enum TransferStatusEnum: <"The enumeration values to specify the transfer status.">
+	Disputed <"The transfer is disputed.">
+	Instructed <"The transfer has been instructed.">
+	Pending <"The transfer is pending instruction.">
+	Settled <"The transfer has been settled.">
+	Netted <"The transfer has been netted into a separate Transfer.">
+
+enum InstructionFunctionEnum: <"The enumeration values indicating the BusinessEvent function associated input instructions.">
+	Execution
+	ContractFormation
+	QuantityChange
+	Renegotiation
+	Compression
+
+enum CallTypeEnum: <"Represents the enumeration values that indicate the intended status of message type, such as expected call, notification of a call or a margin call.">
+	MarginCall <"Identifies an actionable Margin Call.">
+	Notification <"Identifies a notification of a Margin Call for legal obligation to notify other party to initiate a margin call when notifying party is calculation or valuation agent.">
+	ExpectedCall <"Identifies an expected Margin Call instruction for either party to notify the other or their service provider of an expected margin call movement.">
+	
+enum MarginCallActionEnum: <"Represents the enumeration values to identify the collateral action instruction.">
+	Delivery <"Indicates an instruction of a new collateral asset delivery.">
+	Return <"Indicates an instruction for a return of a principals collateral asset delivery.">
+
+enum CollateralStatusEnum: <"Represents the enumeration list to identify the settlement status of the collateral.">
+	FullAmount <"Indicates the collateral balance amount in full, inclusive of any pre-agreed collateral positions in transit for settlement.">
+	SettledAmount <"Indicates the collateral is settled and not an in transit pre-agreed collateral amount/s.">
+	InTransitAmount <"Indicates collateral amount in transit settlement cycle only, excluding settled collateral amount/s.">
+
+enum MarginCallResponseTypeEnum: <"Represents the enumeration values to define the response type to a margin call.">
+	AgreeinFull <"Specifies a 'Full Agreement' to Margin Call.">
+	PartiallyAgree <"Specifies a 'Partial agreement' to Margin Call.">
+	Dispute <"Specifies a 'Full Dispute' to a Margin call.">
+
+enum RegMarginTypeEnum: <"Represents the enumeration values to specify the margin type in relation to bilateral or regulatory obligation.">
+	VM <"Indicates Variation Margin">
+	RegIM <"Indicates Regulatory Initial Margin">
+	NonRegIM <"Indicates Non Regulatory Initial margin or independent amount">
+
+enum RegIMRoleEnum: <"Represents the enumeration values to specify the role of the party in relation to a regulatory initial margin call.">
+	Pledgor <"Indicates 'Pledgor' party of initial margin call.">
+	Secured <"Indicates 'Secured' party of initial margin call.">
+
+enum HaircutIndicatorEnum: <"Represents the enumeration indicators to specify if an asset or group of assets valuation is based on any valuation treatment haircut.">
+	PreHaircut <"Indicates Pre haircut value">
+	PostHaircut <"Indicates Post haircut value">
+
+enum PerformanceTransferTypeEnum: <"The enumerated values to specify the origin of a performance transfer">
+	Commodity
+	Correlation
+	Dividend
+	Equity
+	Interest
+	Volatility
+	Variance
+
+enum CorporateActionTypeEnum: <"The enumerated values to specify the origin of a corporate action transfer.">
+	CashDividend <"Corporate action triggered by the distribution of a cash dividend.">
+	StockDividend <"Corporate action triggered by the distribution of a stock dividend.">
+	StockSplit <"Corporate action triggered by a stock split. A stock split or stock divide increases the number of shares in a public company. The price is adjusted such that the before and after market capitalization of the company remains the same and dilutiondoes not occur. The value maps closely to the ISO code (SPLF) defined as a distribution of subsidiary stock to the shareholders of the parent company without a surrender of shares.">
+	ReverseStockSplit <"Corporate action triggered by a reverse split. A reverse stock split or reverse split is a process by a company of issuing to each shareholder in that company a smaller number of new shares in proportion to that shareholder's original shares that are subsequently canceled. A reverse stock split is also called a stock merge. The reduction in the number of issued shares is accompanied by a proportional increase in the share price. The value maps closely to the ISO code (SPLR) defined as a decrease in a company's number of outstanding equities without any change in the shareholder's equity or the aggregate market value at the time of the split. Equity price and nominal value are increased accordingly.">
+	SpinOff <"Corporate action triggered by a spin Off. A spin-out, also known as a spin-off or a starburst, refers to a type of corporate action where a company splits off sections of itself as a separate business. The value maps closely to the ISO code (SOFF) defined as a a distribution of subsidiary stock to the shareholders of the parent company without a surrender of shares. Spin-off represents a form of divestiture usually resulting in an independent company or in an existing company. For example, demerger, distribution, unbundling.">
+	Merger <"Corporate action triggered by a merger. Mergers and acquisitions (abbreviated M&A) is an aspect of corporate strategy, corporate finance and management dealing with the buying, selling, dividing and combining of different companies and similar entities that can help an enterprise grow rapidly in its sector or location of origin, or a new field or new location, without creating a subsidiary, other child entity or using a joint venture. The distinction between a merger and an acquisition has become increasingly blurred in various respects (particularly in terms of the ultimate economic outcome), although it has not completely disappeared in all situations. The value maps closely to the ISO code (MRGR) defined as an offer made to shareholders, normally by a third party, requesting them to sell (tender) or exchange their equities.">
+	Delisting <"Corporate action triggered by the removal of a security from a stock exchange.">
+	StockNameChange <"Corporate action triggered by a change in the name used to trade the security.">
+	StockIdentifierChange <"Corporate action triggered by a change in the code used to trade the security.">
+	RightsIssue <"Corporate action triggered by an issuance to shareholders of rights to purchase additional shares at a discount.">
+	Takeover <"Corporate action triggered by a takeover. A takeover is the purchase of onecompany (the target) by another (the acquirer, or bidder). The value maps to the ISO code (TEND) but is finer grained than TEND which emcompasses Tender/Acquisition/Takeover/Purchase Offer/Buyback. ISO defines the TEND code as an offer made to shareholders, normally by a third party, requesting them to sell (tender) or exchange their equities.">
+	StockReclassification <"Corporate action triggered by a Stock Reclassification.">
+	BonusIssue <"Corporate action triggered by a bonus issue. A bonus issue or bonus share is a free share of stock given to current shareholders in a company, based upon the number of shares that the shareholder already owns. While the issue of bonus shares increases the total number of shares issued and owned, it does not change the value of the company. The value maps closely to the ISO code (BONU) defined as a bonus, scrip or capitalisation issue. Security holders receive additional assets free of payment from the issuer, in proportion to their holding.">
+	ClassAction <"Corporate action triggered by a Class Action. An action where an individual represents a group in a court claim. The judgment from the suit is for all the members of the group (class). The value maps closely to the ISO code (CLSA) defined as the situation where interested parties seek restitution for financial loss. The security holder may be offered the opportunity to join a class action proceeding and would need to respond with an instruction.">
+	EarlyRedemption <"Corporate action triggered by an early redemption. The value maps closely to the ISO code (MCAL) defined as the redemption of an entire issue outstanding of securities, for example, bonds, preferred equity, funds, by the issuer or its agent, for example, asset manager, before final maturity.">
+	Liquidation <"Corporate action triggered by a liquidation. When a business or firm is terminated or bankrupt, its assets are sold (liquidated) and the proceeds pay creditors. Any leftovers are distributed to shareholders. The value maps closely to the ISO code (LIQU) defined as a distribution of cash, assets or both. Debt may be paid in order of priority based on preferred claims to assets specified by the security.">
+
+enum CreditEventTypeEnum: <"Represents the enumerated values to specify a credit event type.">
+    [docReference ISDA FpML_Coding_Scheme schemeLocation "http://www.fpml.org/coding-scheme/credit-event-type"]
+
+	Bankruptcy <"The reference entity has been dissolved or has become insolvent. It also covers events that may be a precursor to insolvency such as instigation of bankruptcy or insolvency proceedings. Sovereign trades are not subject to Bankruptcy as 'technically' a Sovereign cannot become bankrupt. ISDA 2003 Term: Bankruptcy.">
+	DistressedRatingsDowngrade <"Results from the fact that the rating of the reference obligation is downgraded to a distressed rating level. From a usage standpoint, this credit event is typically not applicable in case of RMBS trades.">
+	FailureToPay <"This credit event triggers, after the expiration of any applicable grace period, if the reference entity fails to make due payments in an aggregrate amount of not less than the payment requirement on one or more obligations (e.g. a missed coupon payment). ISDA 2003 Term: Failure to Pay.">
+	FailureToPayInterest <"Corresponds to the failure by the Reference Entity to pay an expected interest amount or the payment of an actual interest amount that is less than the expected interest amount. ISDA 2003 Term: Failure to Pay Interest.">
+	FailureToPayPrincipal <"Corresponds to the failure by the Reference Entity to pay an expected principal amount or the payment of an actual principal amount that is less than the expected principal amount. ISDA 2003 Term: Failure to Pay Principal.">
+	GovernmentalIntervention <"A governmental intervention is an event resulting from an action by a governmental authority that materially impacts the reference entity's obligations, such as an interest rate reduction, principal reduction, deferral of interest or principal, change in priority ranking, or change in currency or composition of payment. ISDA 2014 Term: Governmental Intervention.">
+	ImpliedWritedown <"Results from the fact that losses occur to the underlying instruments that do not result in reductions of the outstanding principal of the reference obligation.">
+	MaturityExtension <"Results from the fact that the underlier fails to make principal payments as expected.">
+	ObligationAcceleration <"One or more of the obligations have been declared due and payable before they would otherwise have been due and payable as a result of, or on the basis of, the occurrence of a default, event of default or other similar condition or event other than failure to pay (preferred by the market over Obligation Default, because more definitive and encompasses the definition of Obligation Default - this is more favorable to the Seller). Subject to the default requirement amount. ISDA 2003 Term: Obligation Acceleration.">
+	ObligationDefault <"One or more of the obligations have become capable of being declared due and payable before they would otherwise have been due and payable as a result of, or on the basis of, the occurrence of a default, event of default or other similar condition or event other than failure to pay. ISDA 2003 Term: Obligation Default.">
+	RepudiationMoratorium <"The reference entity, or a governmental authority, either refuses to recognise or challenges the validity of one or more obligations of the reference entity, or imposes a moratorium thereby postponing payments on one or more of the obligations of the reference entity. Subject to the default requirement amount. ISDA 2003 Term: Repudiation/Moratorium.">
+	Restructuring <"A restructuring is an event that materially impacts the reference entity's obligations, such as an interest rate reduction, principal reduction, deferral of interest or principal, change in priority ranking, or change in currency or composition of payment. ISDA 2003 Term: Restructuring.">
+	Writedown <"Results from the fact that the underlier writes down its outstanding principal amount.">
+
+enum ValuationTypeEnum: <"Method used for the valuation of the transaction by the valuation party.">
+    MarkToMarket <"Mark-to-Market">
+    MarkToModel <"Mark-to-Model">
+
+enum ValuationSourceEnum: <"Source for the valuation of the transaction by the valuation party.">
+    CentralCounterparty <"Central Counterparty's Valuation">
diff --git a/rosetta-source/src/main/resources/legaldocumentation-master-enum.rosetta b/rosetta-source/src/main/resources/legaldocumentation-master-enum.rosetta
new file mode 100644
index 0000000000..788e6ed06f
--- /dev/null
+++ b/rosetta-source/src/main/resources/legaldocumentation-master-enum.rosetta
@@ -0,0 +1,409 @@
+namespace cdm.legaldocumentation.master : <"Master agreement concepts.">
+version "${project.version}"
+
+import cdm.base.*
+
+enum MasterAgreementTypeEnum: <"The enumerated values to specify the type of the master agreement governing the transaction.">
+    // docReference removed due to from ISDA to ISDAMaster
+	//[docReference ISDA FpML_Coding_Scheme schemeLocation "http://www.fpml.org/coding-scheme/master-agreement-type"]
+
+	AFB <"AFB Master Agreement for Foreign Exchange and Derivatives Transactions">
+	Bespoke <"A Bespoke (custom) Master Agreement, including one-off agreements for transactions">
+	CMA <"Clearing Master Agreement">
+	CMOF <"Contrato Marco de Operaciones Financieras">
+	EEIPower <"EEI Master Power Purchase and Sale Agreement">
+	EFETElectricity <"EFET General Agreement Concerning the Delivery and Acceptance of Electricity">
+	EFETGas <"EFET General Agreement Concerning The Delivery And Acceptance of Natural Gas">
+	EMA <"European Master Agreement and the Derivatives Annex (Banking Federation of the European Union)">
+	FBF <"Master Agreement Relating to transactions on Forward Financial Instruments (Federation Bancaire Francaise)">
+	GasEDI <"GasEDI Base Contract for Short-term Sale and Purchase of Natural Gas">
+	German <"German Master Agreement for Financial derivatives and Addendum for Options on Stock Exchange Indices or Securities">
+	GMRA <"ICMA Global Master Agreement for REPO Trades">
+	GMSLA <"ISLA Global Master Agreement for Securities Lending">
+	GTMA <"FOA Grid Trade Master Agreement">
+	ICOM <"International Currency Options Market Master Agreement">
+	IETA_ERPA displayName "IETA-ERPA" <"International Emissions Trading Association Emissions Reduction Purchase Agreement">
+	IETA_ETMA displayName "IETA-ETMA" <"International Emissions Trading Association Emissions Trading Master Agreement">
+	IETA_IETMA displayName "IETA-IETMA" <"International Emissions Trading Association International Emissions Trading Master Agreement">
+	IFEMA <"International Foreign Exchange Master Agreement">
+	IFEOMA <"International Foreign Exchange and Options Master Agreement">
+	ISDAMaster <"ISDA Master Agreement">
+	ISDAFIA_CDEA displayName "ISDAFIA-CDEA" <"ISDA-FIA Cleared Derivatives Execution Agreement">
+	JSCC <"Master agreement of Japan Securities Clearing Corporation">
+	LBMA <"International Bullion Master Agreement Terms published by the London Bullion Market Association">
+	LEAP <"Leadership in Energy Automated Processing">
+	MCPSA <"CTA Master Coal Purchase and Sales Agreement">
+	NAESBGas <"NAESB Base Contract for Sale and Purchase of Natural Gas">
+	NBP <"Short Term Flat NBP Trading Terms and Conditions">
+	RussianDerivatives <"Standard Documentation for Derivative Transactions on the Russian Financial Markets">
+	RussianRepo <"Master Agreement and Contractual Terms for Repurchase Agreements on the Russian Financial Market">
+	SCoTA <"globalCOAL Standard Coal Trading Agreement">
+	Swiss <"Swiss Master Agreement for OTC Derivatives Instruments">
+	TTF <"TTF Hub Natural Gas Trading Terms and Conditions">
+	ZBT <"Zeebrugge Hub Natural Gas Trading Terms and Conditions">
+
+enum MasterConfirmationAnnexTypeEnum: <"The enumerated values to specify the type of annex to be used with master confirmation agreement governing the transaction.">
+	[docReference ISDA FpML_Coding_Scheme schemeLocation "http://www.fpml.org/coding-scheme/master-confirmation-annex-type"]
+
+	ISDA2004IndexVarianceSwapAmericasInterdealer <"The Index Variance Swap 2004 Annex to the ISDA 2004 Americas Interdealer Master Equity Derivatives Confirmation Agreement and to the Revised ISDA 2004 Americas Interdealer Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2004ShareVarianceSwapAmericasInterdealer <"The Share Variance Swap 2004 Annex to the ISDA 2004 Americas Interdealer Master Equity Derivatives Confirmation Agreement and to the Revised ISDA 2004 Americas Interdealer Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2007DispersionVarianceSwapEuropean <"The Dispersion Variance Swap Annex to the Revised 2007 ISDA European Variance Swap Master Confirmation Agreement applies.">
+	ISDA2007EquityFinanceSwapEuropean <"The EFS (Equity Share Finance Swap) 2007 Annex to the ISDA 2007 European Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2007IndexVarianceSwapAmericasInterdealer <"The Index Variance Swap 2007 Annex to the Revised ISDA 2004 Americas Interdealer Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2007ShareVarianceSwapAmericasInterdealer <"The Share Variance Swap 2007 Annex to the Revised ISDA 2004 Americas Interdealer Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2007VarianceOptionEuropean <"The Variance Option Standard Terms Appendix to the Revised ISDA 2007 European Variance Swap Master Confirmation Agreement applies.">
+	ISDA2008EquityFinanceSwapAsiaExcludingJapan <"The Cash-settled Open Market EFS (Equity Finance Share Swap) 2008 Annex to the ISDA 2008 AEJ (Asia Excluding Japan) Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2008EquityFinanceSwapAsiaExcludingJapanRev1 <"The Cash-settled Open Market EFS (Equity Finance Share Swap) Annex to the Revised ISDA 2008 AEJ (Asia Excluding Japan) Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2008EquityOptionAsiaExcludingJapan <"The Open Market Equity Option 2008 Annex to the ISDA 2008 AEJ (Asia Excluding Japan) Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2008EquityOptionAsiaExcludingJapanRev1 <"The Open Market Equity Option Annex to the Revised ISDA 2008 AEJ (Asia Excluding Japan) Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2008EquityOptionJapan <"The Equity Option 2008 Annex to the ISDA 2008 Japanese Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2009ClosedMarketsOptionsAsiaExcludingJapan <"The Cash-settled Closed Market Index and Share Options 2009 Annex to the Revised ISDA 2008 AEJ (Asia Excluding Japan) Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2009EquityEuropeanInterdealerSS <"The Interdealer Share Swap 2009 Annex to the ISDA 2009 European Interdealer Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2009EquityEuropeanIS <"The Index Swap 2009 Annex to the ISDA 2007 European Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2009IndexShareOptionAmericas <"The Index and Share Options 2009 Annex to the ISDA 2009 Americas Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2009IndexSwapEuropeanInterdealer <"The Interdealer Index Swap 2009 Annex to the ISDA 2009 European Interdealer Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2009IndexSwapPanAsiaInterdealer <"The Index Swap 2009 Annex to the ISDA 2009 Pan-Asia Interdealer Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2009ShareSwapPanAsia <"The Share Swap 2009 Annex to the ISDA 2009 Pan-Asia Interdealer Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2010FairValueShareSwapEuropeanInterdealer <"The Fair Value Interdealer Share Swap 2010 Annex to the ISDA 2009 European Interdealer Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2010IndexShareOptionEMEAInterdealer <"The Cash-settled Index Option/Cash/Physically-settled Share Option 2010 Annex to the ISDA 2010 EMEA EM Interdealer Master Equity Derivatives Confirmation Agreement applies.">
+
+enum MasterConfirmationTypeEnum: <"The enumerated values to specify the type of master confirmation agreement governing the transaction. While FpML positions the date a prefix, the CDM positions it as the suffix to handle grammar type constraints.">
+	[docReference ISDA FpML_Coding_Scheme schemeLocation "http://www.fpml.org/coding-scheme/master-confirmation-type"]
+
+	_2003CreditIndex displayName "2003CreditIndex" <"Used for CDS Index trades. Relevant Master Confirmation determined by the contents of the creditDefaultSwap element. Best practice is to use the most specific code that applies.">
+	_2004EquityEuropeanInterdealer displayName "2004EquityEuropeanInterdealer" <"A privately negotiated European Interdealer Master Confirmation Agreement applies.">
+	_2005VarianceSwapEuropeanInterdealer displayName "2005VarianceSwapEuropeanInterdealer" <"A privately negotiated European Interdealer Master Confirmation Agreement applies.">
+	_2006DividendSwapEuropean displayName "2006DividendSwapEuropean" <"A European Interdealer Master Confirmation Agreement not defined by ISDA, and modified by the parties to the transaction applies.">
+	_2006DividendSwapEuropeanInterdealer displayName "2006DividendSwapEuropeanInterdealer" <"A European Interdealer Master Confirmation Agreement not defined by ISDA applies.">
+	_2014CreditAsia displayName "2014CreditAsia" <"Dummy MCA value mirroring the matrix term value AsiaCorporate.">
+	_2014CreditAsiaFinancial displayName "2014CreditAsiaFinancial" <"Dummy MCA value mirroring the matrix term value AsiaFinancialCorporate.">
+	_2014CreditAustraliaNewZealand displayName "2014CreditAustraliaNewZealand" <"Dummy MCA value mirroring the matrix term value AustraliaCorporate/NewZealandCorporate.">
+	_2014CreditAustraliaNewZealandFinancial displayName "2014CreditAustraliaNewZealandFinancial" <"Dummy MCA value mirroring the matrix term value AustraliaFinancialCorporate/NewZealandFinancialCorporate.">
+	_2014CreditEuropean displayName "2014CreditEuropean" <"Dummy MCA value mirroring the matrix term value EuropeanCorporate.">
+	_2014CreditEuropeanCoCoFinancial displayName "2014CreditEuropeanCoCoFinancial" <"Dummy MCA value mirroring the matrix term value EuropeanCoCoFinancialCorporate.">
+	_2014CreditEuropeanFinancial displayName "2014CreditEuropeanFinancial" <"Dummy MCA value mirroring the matrix term value EuropeanFinancialCorporate.">
+	_2014CreditJapan displayName "2014CreditJapan" <"Dummy MCA value mirroring the matrix term value JapanCorporate.">
+	_2014CreditJapanFinancial displayName "2014CreditJapanFinancial" <"Dummy MCA value mirroring the matrix term value JapanFinancialCorporate.">
+	_2014CreditNorthAmerican displayName "2014CreditNorthAmerican" <"Dummy MCA value mirroring the matrix term value NorthAmericanCorporate.">
+	_2014CreditNorthAmericanFinancial displayName "2014CreditNorthAmericanFinancial" <"Dummy MCA value mirroring the matrix term value NorthAmericanFinancialCorporate.">
+	_2014CreditSingapore displayName "2014CreditSingapore" <"Dummy MCA value mirroring the matrix term values SingaporeCorporate.">
+	_2014CreditSingaporeFinancial displayName "2014CreditSingaporeFinancial" <"Dummy MCA value mirroring the matrix term values SingaporeFinancialCorporate.">
+	_2014CreditSovereignAsia displayName "2014CreditSovereignAsia" <"Dummy MCA value mirroring the matrix term value AsiaSovereign.">
+	_2014CreditSovereignEmergingEuropeanAndMiddleEastern displayName "2014CreditSovereignEmergingEuropeanAndMiddleEastern" <"Dummy MCA value mirroring the matrix term value EmergingEuropeanAndMiddleEasternSovereign.">
+	_2014CreditSovereignJapan displayName "2014CreditSovereignJapan" <"Dummy MCA value mirroring the matrix term value JapanSovereign.">
+	_2014CreditSovereignLatinAmerican displayName "2014CreditSovereignLatinAmerican" <"Dummy MCA value mirroring the matrix term value LatinAmericaSovereign.">
+	_2014CreditSovereignWesternEuropean displayName "2014CreditSovereignWesternEuropean" <"Dummy MCA value mirroring the matrix term value WesternEuropeanSovereign.">
+	_2014StandardCreditAsia displayName "2014StandardCreditAsia" <"Dummy MCA value mirroring the matrix term values StandardAsiaCorporate.">
+	_2014StandardCreditAsiaFinancial displayName "2014StandardCreditAsiaFinancial" <"Dummy MCA value mirroring the matrix term values StandardAsiaFinancialCorporate.">
+	_2014StandardCreditAustraliaNewZealand displayName "2014StandardCreditAustraliaNewZealand" <"Dummy MCA value mirroring the matrix term values StandardAustraliaCorporate and StandardNewZealandCorporate.">
+	_2014StandardCreditAustraliaNewZealandFinancial displayName "2014StandardCreditAustraliaNewZealandFinancial" <"Dummy MCA value mirroring the matrix term values StandardAustraliaFinancialCorporate and StandardNewZealandFinancialCorporate.">
+	_2014StandardCreditEuropean displayName "2014StandardCreditEuropean" <"Dummy MCA value mirroring the matrix term value StandardEuropeanCorporate.">
+	_2014StandardCreditEuropeanCoCoFinancial displayName "2014StandardCreditEuropeanCoCoFinancial" <"Dummy MCA value mirroring the matrix term value StandardEuropeanCoCoFinancialCorporate.">
+	_2014StandardCreditEuropeanFinancial displayName "2014StandardCreditEuropeanFinancial" <"Dummy MCA value mirroring the matrix term value StandardEuropeanFinancialCorporate.">
+	_2014StandardCreditJapan displayName "2014StandardCreditJapan" <"Dummy MCA value mirroring the matrix term values StandardJapanCorporate.">
+	_2014StandardCreditJapanFinancial displayName "2014StandardCreditJapanFinancial" <"Dummy MCA value mirroring the matrix term value StandardJapanFinancialCorporate.">
+	_2014StandardCreditNorthAmerican displayName "2014StandardCreditNorthAmerican" <"Dummy MCA value mirroring the matrix term value StandardNorthAmericanCorporate.">
+	_2014StandardCreditNorthAmericanFinancial displayName "2014StandardCreditNorthAmericanFinancial" <"Dummy MCA value mirroring the matrix term value standardNorthAmericanFinancialCorporate.">
+	_2014StandardCreditSingapore displayName "2014StandardCreditSingapore" <"Dummy MCA value mirroring the matrix term values StandardSingaporeCorporate.">
+	_2014StandardCreditSingaporeFinancial displayName "2014StandardCreditSingaporeFinancial" <"Dummy MCA value mirroring the matrix term value StandardSingaporeFinancialCorporate.">
+	_2014StandardCreditSovereignAsia displayName "2014StandardCreditSovereignAsia" <"Dummy MCA value mirroring the matrix term value StandardAsiaSovereign.">
+	_2014StandardCreditSovereignEmergingEuropeanAndMiddleEastern displayName "2014StandardCreditSovereignEmergingEuropeanAndMiddleEastern" <"Dummy MCA value mirroring the matrix term value StandardEmergingEuropeanAndMiddleEasternSovereign.">
+	_2014StandardCreditSovereignJapan displayName "2014StandardCreditSovereignJapan" <"Dummy MCA value mirroring the matrix term values StandardJapanSovereign.">
+	_2014StandardCreditSovereignLatinAmerican displayName "2014StandardCreditSovereignLatinAmerican" <"Dummy MCA value mirroring the matrix term value StandardLatinAmericaSovereign.">
+	_2014StandardCreditSovereignWesternEuropean displayName "2014StandardCreditSovereignWesternEuropean" <"Dummy MCA value mirroring the matrix term value StandardWesternEuropeanSovereign.">
+	DJ_CDX_EM displayName "DJ.CDX.EM" <"Used for CDS Index trades executed under the Dow Jones CDX Emerging Markets Master Confirmation.">
+	DJ_CDX_EM_DIV displayName "DJ.CDX.EM.DIV" <"Used for CDS Index trades executed under the Dow Jones CDX Emerging Markets Diversified Master Confirmation.">
+	DJ_CDX_NA displayName "DJ.CDX.NA" <"Used for CDS Index trades executed under the Dow Jones CDX Master Confirmation that covers CDX.NA.IG, CDX.NA.HY, and CDX.NA.XO.">
+	DJ_iTraxx_Europe displayName "DJ.iTraxx.Europe" <"Used for CDS Index trades executed under the Dow Jones iTraxx Europe Master Confirmation Agreement.">
+	EquityAmericas <"A general reference to the types of Americas Master Confirmation Agreements. Use the more specific values to reference a specific type of Americas Master Confirmation Agreement.">
+	EquityAsia <"A general reference to the types of Asia Master Confirmation Agreements. Use the more specific values to reference a specific type of Asia Master Confirmation Agreement.">
+	EquityEuropean <"A general reference to the types of European Master Confirmation Agreements. Use the more specific values to reference a specific type of European Master Confirmation Agreement.">
+	ISDA1999Credit <"ISDA 1999 Master Credit Derivatives Confirmation Agreement">
+	ISDA2003CreditAsia <"ISDA 2003 Master Credit Derivatives Confirmation Agreement interpreted as if Asia had been specified as the relevant Transaction Type in the Transaction Supplement.">
+	ISDA2003CreditAustraliaNewZealand <"ISDA 2003 Master Credit Derivatives Confirmation Agreement interpreted as if Australia and New Zealand had been specified as the relevant Transaction Type in the Transaction Supplement.">
+	ISDA2003CreditEuropean <"ISDA 2003 Master Credit Derivatives Confirmation Agreement interpreted as if European had been specified as the relevant Transaction Type in the Transaction Supplement.">
+	ISDA2003CreditJapan <"ISDA 2003 Master Credit Derivatives Confirmation Agreement interpreted as if Japan had been specified as the relevant Transaction Type in the Transaction Supplement.">
+	ISDA2003CreditNorthAmerican <"ISDA 2003 Master Credit Derivatives Confirmation Agreement interpreted as if North American had been specified as the relevant Transaction Type in the Transaction Supplement.">
+	ISDA2003CreditSingapore <"ISDA 2003 Master Credit Derivatives Confirmation Agreement interpreted as if Singapore had been specified as the relevant Transaction Type in the Transaction Supplement.">
+	ISDA2003CreditSovereignAsia <"ISDA Sovereign 2003 Master Credit Derivatives Confirmation Agreement interpreted as if Asia had been specified as the relevant Transaction Type in the Transaction Supplement. The 2003 Sovereign Master Confirmation has been superceded by the 2004.">
+	ISDA2003CreditSovereignCentralAndEasternEurope <"ISDA Sovereign 2003 Master Credit Derivatives Confirmation Agreement interpreted as if Central and Eastern Europe had been specified as the relevant Transaction Type in the Transaction Supplement. The 2003 Sovereign Master Confirmation has been superceded by the 2004.">
+	ISDA2003CreditSovereignJapan <"ISDA Sovereign 2003 Master Credit Derivatives Confirmation Agreement interpreted as if Japan had been specified as the relevant Transaction Type in the Transaction Supplement. The 2003 Sovereign Master Confirmation has been superceded by the 2004.">
+	ISDA2003CreditSovereignLatinAmerica <"ISDA Sovereign 2003 Master Credit Derivatives Confirmation Agreement interpreted as if Latin America had been specified as the relevant Transaction Type in the Transaction Supplement. The 2003 Sovereign Master Confirmation has been superceded by the 2004.">
+	ISDA2003CreditSovereignMiddleEast <"ISDA Sovereign 2003 Master Credit Derivatives Confirmation Agreement interpreted as if Middle East had been specified as the relevant Transaction Type in the Transaction Supplement. The 2003 Sovereign Master Confirmation has been superceded by the 2004.">
+	ISDA2003CreditSovereignWesternEurope <"ISDA Sovereign 2003 Master Credit Derivatives Confirmation Agreement interpreted as if Western Europe had been specified as the relevant Transaction Type in the Transaction Supplement. The 2003 Sovereign Master Confirmation has been superceded by the 2004.">
+	ISDA2003StandardCreditAsia <"Dummy MCA value mirroring the matrix term values StandardAsiaCorporate.">
+	ISDA2003StandardCreditAustraliaNewZealand <"Dummy MCA value mirroring the matrix term values StandardAustraliaCorporate/Sovereign and StandardNewZealandCorporate/Sovereign.">
+	ISDA2003StandardCreditEuropean <"Dummy MCA value mirroring the matrix term value StandardEuropeanCorporate.">
+	ISDA2003StandardCreditJapan <"Dummy MCA value mirroring the matrix term values StandardJapanCorporate.">
+	ISDA2003StandardCreditNorthAmerican <"Dummy MCA value mirroring the matrix term value StandardNorthAmericanCorporate.">
+	ISDA2003StandardCreditSingapore <"Dummy MCA value mirroring the matrix term values StandardSingaporeCorporate/Sovereign.">
+	ISDA2004CreditSovereignAsia <"ISDA Sovereign 2004 Master Credit Derivatives Confirmation Agreement interpreted as if Asia had been specified as the relevant Transaction Type in the Transaction Supplement.">
+	ISDA2004CreditSovereignEmergingEuropeanAndMiddleEastern <"ISDA Sovereign 2004 Master Credit Derivatives Confirmation Agreement interpreted as if Emerging European and Middle Eastern had been specified as the relevant Transaction Type in the Transaction Supplement.">
+	ISDA2004CreditSovereignJapan <"ISDA Sovereign 2004 Master Credit Derivatives Confirmation Agreement interpreted as if Japan had been specified as the relevant Transaction Type in the Transaction Supplement.">
+	ISDA2004CreditSovereignLatinAmerican <"ISDA Sovereign 2004 Master Credit Derivatives Confirmation Agreement interpreted as if Latin American had been specified as the relevant Transaction Type in the Transaction Supplement.">
+	ISDA2004CreditSovereignWesternEuropean <"ISDA Sovereign 2004 Master Credit Derivatives Confirmation Agreement interpreted as if Western European had been specified as the relevant Transaction Type in the Transaction Supplement.">
+	ISDA2004EquityAmericasInterdealer <"The ISDA 2004 Americas Interdealer Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2004EquityAmericasInterdealerRev1 <"The Revised ISDA 2004 Americas Interdealer Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2004StandardCreditSovereignAsia <"Dummy MCA value mirroring the matrix term values StandardAsiaSovereign.">
+	ISDA2004StandardCreditSovereignEmergingEuropeanAndMiddleEastern <"Dummy MCA value mirroring the matrix term value StandardEmergingEuropeanAndMiddleEasternSovereign.">
+	ISDA2004StandardCreditSovereignJapan <"Dummy MCA value mirroring the matrix term values StandardJapanSovereign.">
+	ISDA2004StandardCreditSovereignLatinAmerican <"Dummy MCA value mirroring the matrix term value StandardLatinAmericaSovereign.">
+	ISDA2004StandardCreditSovereignWesternEuropean <"Dummy MCA value mirroring the matrix term value StandardWesternEuropeanSovereign.">
+	ISDA2005EquityAsiaExcludingJapanInterdealer <"ISDA 2005 AEJ (Asia Excluding Japan) Interdealer Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2005EquityAsiaExcludingJapanInterdealerRev2 <"Second Revised ISDA 2005 AEJ (Asia Excluding Japan) Interdealer Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2005EquityJapaneseInterdealer <"The ISDA 2005 Japanese Interdealer Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2006VarianceSwapJapanese <"ISDA 2006 Variance Swap Japanese Confirmation Agreement applies.">
+	ISDA2006VarianceSwapJapaneseInterdealer <"ISDA 2006 Variance Swap Japanese Interdealer Confirmation Agreement applies.">
+	ISDA2007EquityEuropean <"The ISDA 2007 European Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2007VarianceSwapAmericas <"The ISDA 2007 Americas Master Variance Swap Confirmation Agreement applies.">
+	ISDA2007VarianceSwapAsiaExcludingJapan <"The ISDA 2007 AEJ Master Variance Swap Confirmation Agreement applies.">
+	ISDA2007VarianceSwapAsiaExcludingJapanRev1 <"The Revised ISDA 2007 AEJ Master Variance Swap Confirmation Agreement applies.">
+	ISDA2007VarianceSwapAsiaExcludingJapanRev2 <"The Second Revised ISDA 2007 AEJ Master Variance Swap Confirmation Agreement applies.">
+	ISDA2007VarianceSwapEuropean <"The ISDA 2007 European Variance Swap Master Confirmation Agreement applies.">
+	ISDA2007VarianceSwapEuropeanRev1 <"The Revised ISDA 2007 European Variance Swap Master Confirmation Agreement applies.">
+	ISDA2008DividendSwapJapan <"The ISDA 2008 Japanese Dividend Swap Master Confirmation Agreement applies.">
+	ISDA2008DividendSwapJapaneseRev1 <"The Revised ISDA 2008 Japanese Dividend Swap Master Confirmation Agreement applies.">
+	ISDA2008EquityAmericas <"The ISDA 2008 Americas Master Designated/Exchange-Traded Contract Option Confirmation Agreement applies.">
+	ISDA2008EquityAsiaExcludingJapan <"The ISDA 2008 AEJ (Asia Excluding Japan) Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2008EquityAsiaExcludingJapanRev1 <"The Revised ISDA 2008 AEJ (Asia Excluding Japan) Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2008EquityJapan <"The ISDA 2008 Japanese Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2009EquityAmericas <"The ISDA 2009 Americas Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2009EquityEuropeanInterdealer <"The ISDA 2009 European Interdealer Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2009EquityPanAsia <"2009 Pan-Asia Interdealer Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2010EquityEMEAInterdealer <"The ISDA 2010 EMEA EM Interdealer Master Equity Derivatives Confirmation Agreement applies.">
+	ISDA2013VolatilitySwapAmericas <"The ISDA 2013 Americas Master Volatility Swap Confirmation Agreement applies.">
+	ISDA2013VolatilitySwapAsiaExcludingJapan <"The ISDA 2013 AEJ Master Volatility Swap Confirmation Agreement applies.">
+	ISDA2013VolatilitySwapEuropean <"The ISDA 2013 European Volatility Swap Master Confirmation Agreement applies.">
+	ISDA2013VolatilitySwapJapanese <"The ISDA 2013 Volatility Swap Japanese Confirmation Agreement applies.">
+
+enum MasterAgreementClauseIdentifierEnum:
+	ISLA_GMSLA_001 <"Date of Agreement">
+	ISLA_GMSLA_002 <"Parties">
+	ISLA_GMSLA_003 <"Specific Roles">
+	ISLA_GMSLA_004 <"Eligible Collateral">
+	ISLA_GMSLA_005 <"Margin">
+	ISLA_GMSLA_006 <"Aggregation">
+	ISLA_GMSLA_007 <"Collateral Disapplication">
+	ISLA_GMSLA_008 <"Settlement Netting">
+	ISLA_GMSLA_009 <"Notification Time">
+	ISLA_GMSLA_010 <"Indemnity">
+	ISLA_GMSLA_011 <"Base Currency">
+	ISLA_GMSLA_012 <"Places of Business">
+	ISLA_GMSLA_013 <"Value">
+	ISLA_GMSLA_014 <"Automatic Early Termination">
+	ISLA_GMSLA_015 <"Designated Offices">
+	ISLA_GMSLA_016 <"Address for Notices">
+	ISLA_GMSLA_017 <"Process Agent">
+	ISLA_GMSLA_018 <"Party Acting as Agent">
+	ISLA_GMSLA_019 <"Pooled Principal Transactions ">
+	ISLA_GMSLA_020 <"Party Preparing the Agreement ">
+	ISLA_GMSLA_021 <"Default Interest Rate">
+	ISLA_GMSLA_022 <"Existing Transactions">
+	ISLA_GMSLA_023 <"Automation">
+	ISLA_GMSLA_024 <"Act of Insolvency">
+	ISLA_GMSLA_025 <"Buy-In">
+	ISLA_GMSLA_026 <"Currency Conversions">
+	ISLA_GMSLA_027 <"Scope">
+	ISLA_GMSLA_028 <"Collateral Delivery Timings">
+	ISLA_GMSLA_029 <"Delivery">
+	ISLA_GMSLA_030 <"Substitution of Collateral">
+	ISLA_GMSLA_031 <"Manufactured Payments">
+	ISLA_GMSLA_032 <"Corporate Actions">
+	ISLA_GMSLA_033 <"Payment of Rates">
+	ISLA_GMSLA_034 <"Rate Applicable to Loaned Securities">
+	ISLA_GMSLA_035 <"Lender's Right to Terminate a Loan">
+	ISLA_GMSLA_036 <"Borrower's Right to Terminate a Loan">
+	ISLA_GMSLA_037 <"Failure to Deliver Event of Default">
+	ISLA_GMSLA_038 <"Failure to Redeliver">
+	ISLA_GMSLA_039 <"Assets Transferred to a Trustee">
+	ISLA_GMSLA_040 <"Suspension Event of Default">
+	ISLA_GMSLA_041 <"Costs and Expenses">
+	ISLA_GMSLA_042 <"Set-Off">
+	ISLA_GMSLA_043 <"Default Market Value Fallbacks">
+	ISLA_GMSLA_044 <"Assignment">
+	ISLA_GMSLA_045 <"Telephone Recordings">
+	ISLA_GMSLA_046 <"Waiver of Immunity">
+	ISLA_GMSLA_047 <"Agreement to Deliver Documents">
+	ISLA_GMSLA_048 <"Collateral Transfer Details">
+	ISLA_GMSLA_049 <"Confidentiality">
+	ISLA_GMSLA_050 <"Correction">
+	ISLA_GMSLA_051 <"Minimum Collateral Transfer Amount">
+	ISLA_GMSLA_052 <"Non-Reliance Representation">
+	ISLA_GMSLA_053 <"Records and Statements">
+	ISLA_GMSLA_054 <"Recovery and Resolution">
+	ISLA_GMSLA_055 <"Security Agreement Details">
+	ISLA_GMSLA_056 <"Triparty Services">
+
+enum MasterAgreementVariantIdentifierEnum:
+	ISLA_GMSLA_001_01 <"Agreement is Undated">
+	ISLA_GMSLA_001_02 <"Agreement is Dated">
+	ISLA_GMSLA_002_01 <"Name and Place of Incorporation">
+	ISLA_GMSLA_002_02 <"Names and Place of Incorporation plus Additional Information">
+	ISLA_GMSLA_002_03 <"Defining the Party's Role as Lender or Borrower">
+	ISLA_GMSLA_003_01 <"Non-specific Roles">
+	ISLA_GMSLA_003_02 <"Specific Roles">
+	ISLA_GMSLA_004_01 <"GMSLA Schedule">
+	ISLA_GMSLA_004_02 <"Outside of GMSLA">
+	ISLA_GMSLA_004_03 <"Additional Criteria">
+	ISLA_GMSLA_005_01 <"GMSLA Schedule">
+	ISLA_GMSLA_005_02 <"Outside of GMSLA">
+	ISLA_GMSLA_006_01 <"Aggregation Applies">
+	ISLA_GMSLA_006_02 <"Aggregation Does Not Apply">
+	ISLA_GMSLA_006_03 <"Aggregation Applies Separately to Loan Groups">
+	ISLA_GMSLA_006_04 <"Aggregation Applies to Some but Not All Loans">
+	ISLA_GMSLA_006_05 <"Neither Aggregation nor Loan by Loan Applies">
+	ISLA_GMSLA_007_01 <"Standard">
+	ISLA_GMSLA_007_02 <"Collateral Disapplied">
+	ISLA_GMSLA_008_01 <"Netting of Collateral Shall Apply">
+	ISLA_GMSLA_008_02 <"Netting of Collateral Shall Not Apply">
+	ISLA_GMSLA_008_03 <"Netting of Collateral Shall Apply with Multiple Payments or Delivery Options">
+	ISLA_GMSLA_008_04 <"Netting of Collateral Shall Apply Separately per Group of Loans">
+	ISLA_GMSLA_009_01 <"Specified Time">
+	ISLA_GMSLA_009_02 <"Notification Time by Collateral Type">
+	ISLA_GMSLA_009_03 <"Notification Time as Agreed">
+	ISLA_GMSLA_009_04 <"No Notification Time">
+	ISLA_GMSLA_010_01 <"Indemnity Applies">
+	ISLA_GMSLA_010_02 <"Indemnity does not Apply">
+	ISLA_GMSLA_011_01 <"Single Base Currency">
+	ISLA_GMSLA_011_02 <"Single Base Currency with Fallback">
+	ISLA_GMSLA_011_03 <"Single Base Currency with Multiple Fallback Options">
+	ISLA_GMSLA_012_01 <"Locations are Specified Without Reference to Party">
+	ISLA_GMSLA_012_02 <"Locations are Specified Separately per Party">
+	ISLA_GMSLA_012_03 <"Not all Places of Business Have to be Open">
+	ISLA_GMSLA_013_01 <"Standard Bid Price">
+	ISLA_GMSLA_013_02 <"Standard Mid Price">
+	ISLA_GMSLA_013_03 <"2018 Standard">
+	ISLA_GMSLA_013_04 <"Borrowers Agreement to Pricing Source">
+	ISLA_GMSLA_013_05 <"Pre-agreed Pricing Source">
+	ISLA_GMSLA_013_06 <"Time Variation">
+	ISLA_GMSLA_014_01 <"Automatic Early Termination does not Apply">
+	ISLA_GMSLA_014_02 <"Automatic Early Termination Applies">
+	ISLA_GMSLA_014_03 <"Automatic Early Termination Applies in Modified Form)">
+	ISLA_GMSLA_014_04 <"Automatic Early Termination is specified separately for each Principal">
+	ISLA_GMSLA_014_05 <"Automatic Early Termination is not applicable unless required due to the systems of law">
+	ISLA_GMSLA_015_01 <"Party Specifies a Single Designated Office">
+	ISLA_GMSLA_015_02 <"Party Specifies Multiple Designated Offices">
+	ISLA_GMSLA_016_01 <"2000 Standard">
+	ISLA_GMSLA_016_02 <"2010 Standard">
+	ISLA_GMSLA_016_03 <"2018 Standard">
+	ISLA_GMSLA_016_04 <"Plus Email">
+	ISLA_GMSLA_016_05 <"Separate Address for Legal and Operational Notices">
+	ISLA_GMSLA_016_06 <"Special Instructions">
+	ISLA_GMSLA_017_01 <"No Process Agent">
+	ISLA_GMSLA_017_02 <"Process Agent Specified">
+	ISLA_GMSLA_017_03 <"Process Agent to be Appointed">
+	ISLA_GMSLA_018_01 <"A Party will not act as Agent">
+	ISLA_GMSLA_018_02 <"A Party may act as Agent">
+	ISLA_GMSLA_018_03 <"A Party will always act as Agent">
+	ISLA_GMSLA_019_01 <"Pooled Principal Transactions Shall Not Apply">
+	ISLA_GMSLA_019_02 <"Pooled Principal Transactions Shall  Apply">
+	ISLA_GMSLA_019_03 <"Pooled Principal Transactions May Apply">
+	ISLA_GMSLA_020_01 <"Simple Election">
+	ISLA_GMSLA_020_02 <"Election with Modifications">
+	ISLA_GMSLA_021_01 <"Term Rate">
+	ISLA_GMSLA_021_02 <"Overnight Rate">
+	ISLA_GMSLA_021_03 <"Risk Free Rate">
+	ISLA_GMSLA_021_04 <"Non-Defaulting Party Election">
+	ISLA_GMSLA_021_05 <"Spread">
+	ISLA_GMSLA_022_01 <"Agreement Covers Existing Loans">
+	ISLA_GMSLA_022_02 <"Agreement Does Not Cover Existing Loans">
+	ISLA_GMSLA_023_01 <"Automation Does Not Apply">
+	ISLA_GMSLA_023_02 <"Automation May Apply">
+	ISLA_GMSLA_024_01 <"Standard Pre-Print">
+	ISLA_GMSLA_024_02 <"Grace Period Amendment">
+	ISLA_GMSLA_024_03 <"Jurisdictional Amendments">
+	ISLA_GMSLA_025_01 <"Transferor Pays Costs and Expenses">
+	ISLA_GMSLA_025_02 <"Transferor Pays Costs and Expenses other than those arising from Negligence">
+	ISLA_GMSLA_025_03 <"Transferor only Liable for Cost and Expenses if Reasonable Notice of Buy-in">
+	ISLA_GMSLA_025_04 <"Buy-in Expanded to Cover Buy-in Exercised by an Exchange">
+	ISLA_GMSLA_026_01 <"Standard">
+	ISLA_GMSLA_026_02 <"Selecting Party other than Lender">
+	ISLA_GMSLA_026_03 <"Variation of Exchange Rate Source">
+	ISLA_GMSLA_027_01 <"Standard Scope">
+	ISLA_GMSLA_027_02 <"Limited Scope">
+	ISLA_GMSLA_028_01 <"Same Day">
+	ISLA_GMSLA_028_02 <"Alternative Delivery Time">
+	ISLA_GMSLA_028_03 <"Same Day with Notification Time">
+	ISLA_GMSLA_028_04 <"Alternative Delivery Time with Notification Time">
+	ISLA_GMSLA_028_05 <"Asset Dependent">
+	ISLA_GMSLA_029_01 <"Simultaneous delivery of securities and collateral">
+	ISLA_GMSLA_029_02 <"Collateral Delivery as specified in the Security Agreement">
+	ISLA_GMSLA_029_03 <"Lender to Deliver Securities once Collateral is Delivered">
+	ISLA_GMSLA_030_01 <"Borrower Request">
+	ISLA_GMSLA_030_02 <"Borrower Request/Lender Consent">
+	ISLA_GMSLA_030_03 <"Lender or Borrower Request">
+	ISLA_GMSLA_030_04 <"Pre-approval of Alternative Collateral">
+	ISLA_GMSLA_031_01 <"Manufactured Payment of Amount Such Party Would Be Entitled to Receive">
+	ISLA_GMSLA_031_02 <"Manufactured Payment of Amount Such Lender Would Be Entitled to Receive">
+	ISLA_GMSLA_031_03 <"Manufactured Payment Only in Relation to Loaned Securities">
+	ISLA_GMSLA_031_04 <"Additional Sum to Be Paid to Cover Tax Relief">
+	ISLA_GMSLA_031_05 <"Notice Requirement">
+	ISLA_GMSLA_032_01 <"Standard">
+	ISLA_GMSLA_032_02 <"Reasonable Notice Defined">
+	ISLA_GMSLA_032_03 <"No Right to Instruct">
+	ISLA_GMSLA_033_01 <"Payment Within a Week">
+	ISLA_GMSLA_033_02 <"Payment Within 10 Days">
+	ISLA_GMSLA_033_03 <"Payment Upon Maturity">
+	ISLA_GMSLA_034_01 <"Such Rate as Agreed">
+	ISLA_GMSLA_034_02 <"VAT Added">
+	ISLA_GMSLA_034_03 <"No Deduction">
+	ISLA_GMSLA_034_04 <"No Rate Payable">
+	ISLA_GMSLA_035_01 <"Lender May Terminate a Loan at any Time">
+	ISLA_GMSLA_035_02 <"Lender May Not Terminate a Loan">
+	ISLA_GMSLA_036_01 <"Borrower May Terminate a Loan at Any Time">
+	ISLA_GMSLA_036_02 <"Borrower May Terminate a Loan Subject to Notice">
+	ISLA_GMSLA_036_03 <"Borrower May Terminate a Loan Subject to Limitations Concerning Corporate Actions">
+	ISLA_GMSLA_036_04 <"Borrower May Terminate a Loan Subject to Paying the Rate for the Full Term">
+	ISLA_GMSLA_037_01 <"Failure to Deliver Event of Default Applies">
+	ISLA_GMSLA_037_02 <"Failure to Deliver Event of Default does not Apply">
+	ISLA_GMSLA_037_03 <"Failure to Deliver Event of Default does not Apply to Lender">
+	ISLA_GMSLA_038_01 <"2000 Standard">
+	ISLA_GMSLA_038_02 <"2010 Standard">
+	ISLA_GMSLA_038_03 <"2018 Standard">
+	ISLA_GMSLA_038_04 <"2000 Modified No Lender Close Out">
+	ISLA_GMSLA_039_01 <"2000 Standard">
+	ISLA_GMSLA_039_02 <"2010/2018 Standard">
+	ISLA_GMSLA_039_03 <"Hybrid">
+	ISLA_GMSLA_040_01 <"2000 Standard">
+	ISLA_GMSLA_040_02 <"2010/2018 Standard">
+	ISLA_GMSLA_040_03 <"Hybrid">
+	ISLA_GMSLA_041_01 <"Standard Costs and Expenses">
+	ISLA_GMSLA_041_02 <"Limitation of Costs and Expenses">
+	ISLA_GMSLA_041_03 <"Expansion of Costs and Expenses">
+	ISLA_GMSLA_042_01 <"No Contractual Set-Off">
+	ISLA_GMSLA_042_02 <"Simple Contractual Set-Off">
+	ISLA_GMSLA_042_03 <"Set-Off with Unascertained Obligations Amendment">
+	ISLA_GMSLA_043_01 <"Standard Paragraph 11.2(a)">
+	ISLA_GMSLA_043_02 <"Amended Paragraph 11.2,(a) applies">
+	ISLA_GMSLA_044_01 <"Consent">
+	ISLA_GMSLA_044_02 <"Consent with Standard Exclusions">
+	ISLA_GMSLA_044_03 <"Consent with Additional Exclusions">
+	ISLA_GMSLA_044_04 <"Pre-approved Assignments">
+	ISLA_GMSLA_045_01 <"Parties May Record All Conversations">
+	ISLA_GMSLA_045_02 <"Parties Agree to Obtain Consent">
+	ISLA_GMSLA_045_03 <"Parties Limit the Conversations that May be Recorded">
+	ISLA_GMSLA_045_04 <"Submission as Evidence">
+	ISLA_GMSLA_046_01 <"Standard Waiver of Immunity Applies">
+	ISLA_GMSLA_046_02 <"Waiver of Immunity may Not Apply">
+	ISLA_GMSLA_047_01 <"No Additional Documentation Required">
+	ISLA_GMSLA_047_02 <"Additional Documentation Required">
+	ISLA_GMSLA_048_01 <"Collateral Transfer Details not included">
+	ISLA_GMSLA_048_02 <"Collateral Transfer Details included">
+	ISLA_GMSLA_049_01 <"Confidentiality Clause">
+	ISLA_GMSLA_049_02 <"Permitted Disclosure Clause">
+	ISLA_GMSLA_050_01 <"Paragraph 20.1 Amended to Refer  Paragraph 6">
+	ISLA_GMSLA_050_02 <"Paragraph 27.2 Amended to refer to the 2010 GMSLA">
+	ISLA_GMSLA_051_01 <"MCTA  Delivery only">
+	ISLA_GMSLA_051_02 <"MCTA  Delivery and Re-Delivery">
+	ISLA_GMSLA_051_03 <"MCTA  Drops to Zero for a Defaulting Party">
+	ISLA_GMSLA_052_01 <"No Non-Reliance Representation">
+	ISLA_GMSLA_052_02 <"Non-Reliance Representation Added">
+	ISLA_GMSLA_053_01 <"No Records and Statements Clause">
+	ISLA_GMSLA_053_02 <"Records and Statements Clause Added">
+	ISLA_GMSLA_054_01 <"Recovery and Resolution not Included">
+	ISLA_GMSLA_054_02 <"Recovery and Resolution Included in GMSLA">
+	ISLA_GMSLA_054_03 <"Recovery and Resolution Included by Protocol">
+	ISLA_GMSLA_054_04 <"Recovery and Resolution Incorporated by Reference">
+	ISLA_GMSLA_055_01 <"Security Agreement Details Included">
+	ISLA_GMSLA_056_01 <"Triparty Services Not Referenced">
+	ISLA_GMSLA_056_02 <"Triparty Services May Apply">
diff --git a/rosetta-source/src/main/resources/observable-asset-enum.rosetta b/rosetta-source/src/main/resources/observable-asset-enum.rosetta
new file mode 100644
index 0000000000..96dafe4946
--- /dev/null
+++ b/rosetta-source/src/main/resources/observable-asset-enum.rosetta
@@ -0,0 +1,330 @@
+namespace cdm.observable.asset : <"Observable asset concepts: schedule, settlement, price and quantity notation etc.">
+version "${project.version}"
+
+import cdm.base.*
+import cdm.mapping.config.*
+
+enum InformationProviderEnum: <"The enumerated values to specify the list of information providers.">
+	[docReference ISDA FpML_Coding_Scheme schemeLocation "http://www.fpml.org/coding-scheme/information-provider"]
+
+	AssocBanksSingapore <"The Association of Banks in Singapore.">
+	BancoCentralChile <"The central bank of Chile.">
+	BankOfCanada <"The central bank of Canada.">
+	BankOfEngland <"The Bank Of England.">
+	BankOfJapan <"The central bank of Japan.">
+	Bloomberg <"Bloomberg LP.">
+	EuroCentralBank <"The European Central Bank.">
+	FederalReserve <"The Federal Reserve, the central bank of the United States.">
+	FHLBSF <"The Federal Home Loan Bank of San Francisco, or its successor.">
+	ICESWAP <"ICESWAP Rate Administrator which means ICE Benchmark Administration, or any successor thereto, as administrator of the ICE Swap Rate.">
+	ISDA <"International Swaps and Derivatives Association, Inc.">
+	Refinitiv <"Refinitiv, formerly Thomson Reuters Financial & Risk.">
+	ReserveBankAustralia <"The Reserve Bank of Australia.">
+	ReserveBankNewZealand <"The Reserve Bank of New Zealand.">
+	Reuters <"Reuters Group Plc.">
+	SAFEX <"South African Futures Exchange, or its successor.">
+	Telerate <"Telerate, Inc.">
+	TOKYOSWAP <"The Tokyo Swap Reference Rate (or TSR) Administrator, which means Refinitiv Asia Pacific Limited, or any successor thereto, as administrator of the TSR.">
+
+enum PriceExpressionEnum: <"Enumerated values to specify whether the price is expressed in absolute or relative terms.">
+ 	AbsoluteTerms <"The price is expressed as an absolute amount.">
+ 	PercentageOfNotional <"The price is expressed in percentage of the notional amount.">
+ 	ParValueFraction <"Denotes a price expressed in percentage of face value with fractions which is used for quoting bonds, e.g. 101 3/8 indicates that the buyer will pay 101.375 of the face value.">
+	PerOption <"Denotes a price expressed per number of options.">
+	
+enum QuotationSideEnum: <"The enumerated values to specify the side from which perspective a value is quoted.">
+	Afternoon <"Denotes a value as the Afternoon fixing reported in or by the relevant Price Source as specified in the relevant Confirmation.">
+	Ask <"Denotes a value 'asked' by a seller for an asset, i.e. the value at which a seller is willing to sell.">
+	Bid <"Denotes a value 'bid' by a buyer for an asset, i.e. the value a buyer is willing to pay.">
+	Closing <"Denotes a value as the Closing price reported in or by the relevant Price Source as specified in the relevant Confirmation.">
+	High <"Denotes a value as the High price reported in or by the relevant Price Source as specified in the relevant Confirmation.">
+	Index <"Denotes a value as the Index price reported in or by the relevant Price Source as specified in the relevant Confirmation.">
+	MeanOfBidAndAsk <"Denotes a value as the Average of the Bid and Ask prices reported in or by the relevant Price Source as specified in the relevant Confirmation.">
+	LocationalMarginal <"Denotes a value as the Locational Marginal price reported in or by the relevant Price Source as specified in the relevant Confirmation.">
+	Low <"Denotes a value as the Low price reported in or by the relevant Price Source as specified in the relevant Confirmation.">
+	MarginalHourly <"Denotes a value as the Marginal Hourly price reported in or by the relevant Price Source as specified in the relevant Confirmation.">
+	MarketClearing <"Denotes a value as the Market Clearing price reported in or by the relevant Price Source as specified in the relevant Confirmation.">
+	MeanOfHighAndLow <"Denotes a value as the Average of the High and Low prices reported in or by the relevant Price Source as specified in the relevant Confirmation.">
+	Morning <"Denotes a value as the Morning fixing reported in or by the relevant Price Source as specified in the relevant Confirmation.">
+	Official <"Denotes a value as the Official price reported in or by the relevant Price Source as specified in the relevant Confirmation.">
+	Opening <"Denotes a value as the Opening price reported in or by the relevant Price Source as specified in the relevant Confirmation.">
+	OSP <"Denotes a value as the Official Settlement Price reported in or by the relevant Price Source as specified in the relevant Confirmation.">
+	Settlement <"Denotes a value as the Settlement price reported in or by the relevant Price Source as specified in the relevant Confirmation.">
+	Spot <"Denotes a value as the Spot price reported in or by the relevant Price Source as specified in the relevant Confirmation.">
+	Mid <"Denotes a value as the Average of the Midpoint of prices reported in or by the relevant Price Source as specified in the relevant Confirmation.">
+	NationalSingle <"Denotes a value as the National Single price reported in or by the relevant Price Source as specified in the relevant Confirmation.">
+	WeightedAverage <"Denotes a value as the Volume Weighted Average of prices effective on the Pricing Date.">
+	UnWeightedAverage <"Denotes a value as the Non-volume Weighted Average of prices effective on the Pricing Date.">
+	
+enum QuotationStyleEnum: <"The enumerated values to specify the actual quotation style (e.g. PointsUpFront, TradedSpread) used to quote a credit default swap fee leg.">
+	PointsUpFront <"When quotation style is 'PointsUpFront', the initialPoints element of the Credit Default Swap feeLeg should be populated">
+	TradedSpread <"When quotation style is 'TradedSpread', the marketFixedRate element of the Credit Default Swap feeLeg should be populated">
+	Price <"When quotation style is 'Price', the marketPrice element of the Credit Default Swap feeLeg should be populated">
+
+
+enum ValuationMethodEnum: <"The enumerated values to specify the ISDA defined methodology for determining the final price of the reference obligation for purposes of cash settlement.">
+	Market
+	Highest
+	AverageMarket
+	AverageHighest
+	BlendedMarket
+	BlendedHighest
+	AverageBlendedMarket
+	AverageBlendedHighest
+
+enum CommodityReferencePriceEnum: <"The enumeration values to specify the Commodity Reference Prices specified in the Annex to the 2005 ISDA Commodity Definitions.">
+	//[docReference ISDA FpML_Coding_Scheme schemeLocation "http://www.fpml.org/coding-scheme/commodity-reference-price"]
+
+	ALUMINIUM_ALLOY_LME_15_MONTH displayName "ALUMINIUM ALLOY-LME 15 MONTH" <"Per 2005 ISDA Commodity Definitions, Sub-Annex A, Section 7.1 Commodity Reference Prices, as amended and supplemented through the date on which parties enter into the relevant transaction.">
+	COAL_CENTRAL_APPALACHIAN_NYMEX displayName "COAL-CENTRAL APPALACHIAN-NYMEX" <"A code for the NYMEX Central Appalachian Coal commodity">
+	COCOA_ICE displayName "COCOA-ICE" <"A code for the ICE Futures U.S. (‘ICUS’) Cocoa commodity">
+	COFFEE_ARABICA_ICE displayName "COFFEE ARABICA-ICE" <"A code for the ICUS Coffee C commodity">
+	COFFEE_ROBUSTA_ICE displayName "COFFEE ROBUSTA-ICE" <"A code for the ICUS Coffee C commodity">
+	COPPER_COMEX displayName "COPPER-COMEX" <"A code for the COMEX (‘CMX’) Copper Grade #1 commodity">
+	CORN_CBOT displayName "CORN-CBOT" <"A code for the Chicago Board of Trade (‘CBOT’) Corn commodity">
+	COTTON_NO__2_ICE displayName "COTTON NO. 2-ICE" <"A code for the ICUS Cotton No. 2 commodity">
+	ETHANOL_CBOT displayName "ETHANOL-CBOT" <"A code for the CBOT Ethanol commodity">
+	FEEDER_CATTLE_CME displayName "FEEDER CATTLE-CME" <"A code for the CME Feeder Cattle commodity">
+	FROZEN_CONCENTRATED_ORANGE_JUICE_NO__1_ICE displayName "FROZEN CONCENTRATED ORANGE JUICE NO. 1-ICE" <"A code for the ICUS Frozen Concentrated Orange Juice commodity">
+	GASOLINE_RBOB_NEW_YORK_ICE displayName "GASOLINE-RBOB-NEW YORK-ICE" <"A code for the NYMEX Gasoline Blendstock (RBOB) commodity">
+	GASOLINE_RBOB_NEW_YORK_NYMEX displayName "GASOLINE-RBOB-NEW YORK-NYMEX" <"A code for the NYMEX Gasoline Blendstock (RBOB) commodity">
+	GOLD_COMEX displayName "GOLD-COMEX" <"A code for the CMX Gold commodity">
+	HEATING_OIL_NEW_YORK_NYMEX displayName "HEATING OIL-NEW YORK-NYMEX" <"A code for the NYMEX No. 2 Heating Oil, New York Harbor commodity">
+	LEAN_HOGS_CME displayName "LEAN HOGS-CME" <"A code for the CME Lean Hogs commodity">
+	LIVE_CATTLE_CME displayName "LIVE CATTLE-CME" <"A code for the CME Live Cattle commodity">
+	LUMBER_CME displayName "LUMBER-CME" <"A code for the CME Random Length Lumber commodity">
+	MILK_CLASS_III_CME displayName "MILK-CLASS III-CME" <"A code for the CME Milk Class III commodity">
+	MILK_NONFAT_DRY_CME displayName "MILK-NONFAT-DRY-CME" <"A code for the CME Non Fat Dry Milk commodity">
+	NATURAL_GAS_NYMEX displayName "NATURAL GAS-NYMEX" <"A code for the NYMEX Natural Gas commodity">
+	NATURAL_GAS_PEPL__TEXOK_MAINLINE__INSIDE_FERC displayName "NATURAL GAS-PEPL (TEXOK MAINLINE)-INSIDE FERC" <"A code for the NYMEX Panhandle Basis Swap commodity">
+	NATURAL_GAS_W__TEXAS__WAHA__INSIDE_FERC displayName "NATURAL GAS-W. TEXAS (WAHA)-INSIDE FERC" <"A code for the NYMEX Waha Basis Swap commodity">
+	OATS_CBOT displayName "OATS-CBOT" <"A code for the CBOT Oats commodity">
+	OIL_WTI_NYMEX displayName "OIL-WTI-NYMEX" <"A code for the NYMEX Crude Oil, Light Sweet commodity">
+	PALLADIUM_NYMEX displayName "PALLADIUM-NYMEX" <"A code for the NYMEX Palladium commodity">
+	PLATINUM_NYMEX displayName "PLATINUM-NYMEX" <"A code for the NYMEX Platinum commodity">
+	RICE_CBOT displayName "RICE-CBOT" <"A code for the CBOT Rough Rice commodity">
+	SILVER_COMEX displayName "SILVER-COMEX" <"A code for the CMX Silver commodity">
+	SOYBEANS_CBOT displayName "SOYBEANS-CBOT" <"A code for the CBOT Soybeans commodity">
+	SOYBEAN_MEAL_CBOT displayName "SOYBEAN MEAL-CBOT" <"A code for the CBOT Soybean Meal commodity">
+	SOYBEAN_OIL_CBOT displayName "SOYBEAN OIL-CBOT" <"A code for the CBOT Soybean Oil commodity">
+	SUGAR___11__WORLD__ICE displayName "SUGAR # 11 (WORLD)-ICE" <"A code for the ICUS Sugar No. 11 commodity">
+	SUGAR___16__US__ICE displayName "SUGAR # 16 (US)-ICE" <"A code for the ICUS Sugar No. 16 commodity">
+	WHEAT_CBOT displayName "WHEAT-CBOT" <"A code for the CBOT Wheat commodity">
+	WHEAT_HRW_KCBOT displayName "WHEAT HRW-KCBOT" <"A code for the Kansas City Board of Trade (‘KCBT’)Wheat commodity">
+	WHEAT_RED_SPRING_MGE displayName "WHEAT RED SPRING-MGE" <"A code for the Wheat commodity">
+
+
+enum QuoteBasisEnum: <"The enumerated values to specify how an exchange rate is quoted.">
+	Currency1PerCurrency2 <"The amount of currency1 for one unit of currency2">
+	Currency2PerCurrency1 <"The amount of currency2 for one unit of currency1">
+
+enum QuotationRateTypeEnum: <"The enumerated values to specify the type of quotation rate to be obtained from each cash settlement reference bank.">
+	Bid <"A bid rate.">
+	Ask <"An ask rate.">
+	Mid <"A mid-market rate.">
+	ExercisingPartyPays <"If optional early termination is applicable to a swap transaction, the rate, which may be a bid or ask rate, which would result, if seller is in-the-money, in the higher absolute value of the cash settlement amount, or, is seller is out-of-the-money, in the lower absolute value of the cash settlement amount.">
+
+enum CreditRatingAgencyEnum: <"Represents the enumerated values to specify the rating agencies.">
+	//[docReference ISDA FpML_Coding_Scheme schemeLocation "http://www.fpml.org/coding-scheme/credit-rating-agency"]
+	[synonym AcadiaSoft_AM_1_0 value "AgencyEnum"]
+
+	AMBest <"A. M. Best">
+	CBRS <"Canadian Bond Rating Service">
+	DBRS <"Dominion Bond Rating Service">
+		[synonym AcadiaSoft_AM_1_0 value "DBRS"]
+	Fitch <"Fitch">
+		[synonym AcadiaSoft_AM_1_0 value "FITCH"]
+	Japanagency <"Japan Credit Rating Agency, Ltd.">
+	Moodys <"Moody's">
+		[synonym AcadiaSoft_AM_1_0 value "MOODYS"]
+	RatingAndInvestmentInformation <"Rating And Investment Information, Inc.">
+	StandardAndPoors <"Standard And Poor's">
+		[synonym AcadiaSoft_AM_1_0 value "STANDARD_POORS"]
+
+enum CreditRatingOutlookEnum: <"Represents the enumerated values to specify the credit rating outlook.">
+    Positive  <"Denotes a rating may be raised.">
+    Negative <"Denotes a rating may be lowered.">
+	Stable <"Denotes a rating is not likely to change.">
+    Developing <"Denotes a rating may be raised, lowered, or affirmed.">
+
+enum CreditRatingCreditWatchEnum: <"Represents the enumerated values to specify the credit watch rating.">
+    Positive  <"Denotes a rating may be raised.">
+    Negative <"Denotes a rating may be lowered.">
+    Developing <"Denotes a rating may be raised, lowered, or affirmed.">
+
+enum CreditNotationMismatchResolutionEnum: <"Represents and enumeration list to identify the characteritics of the rating if there are several agency issue ratings but not equivalent, reference will be made to label characteritics of the rating such as the lowest/highest available.">
+	Lowest <"Denotes the lowest credit notation if several notations are listed.">
+	Highest <"Denotes the highest credit notation if several notations are listed.">
+	ReferenceAgency <"Denotes that a credit notation issued from a defined reference agency is used if several notations are listed.">
+	Average <"Denotes the average credit notation if several notations are listed ">
+	SecondBest <"Denotes the second best credit notaiton if several notatons are listed">
+
+enum CreditNotationBoundaryEnum: <"Identifies an agency rating as a simple scale boundary of minimum or maximum.">
+	Minimum <"Denotes a minumum boundary">
+	Maximum <"Denotes a maxiumum boundary">
+
+enum InterpolationMethodEnum: <"The enumerated values to specify the interpolation method, e.g. linear.">
+	[docReference ISDA FpML_Coding_Scheme schemeLocation "http://www.fpml.org/coding-scheme/interpolation-method"]
+
+	Linear <"Linear Interpolation applicable.">
+	LinearZeroYield <"Linear Interpolation applicable.">
+	None <"No Interpolation applicable.">
+
+enum SettlementRateOptionEnum: <"The enumerated values to specify the settlement rate options as specified in the Annex A to the 1998 FX and Currency Options Definitions.">
+	[docReference ISDA FpML_Coding_Scheme schemeLocation "http://www.fpml.org/coding-scheme/settlement-rate-option"]
+
+	ARS_BNAR_ARS01 displayName "ARS.BNAR/ARS01" <"The Spot Rate for a Rate Calculation Date will be the Argentine Peso/U.S. Dollar Specified Rate, expressed as the amount of Argentine Pesos per one U.S. Dollar, for settlement on the same day (or, if such day is not a Business Day in New York, for settlement on the first succeeding day that is a Business Day in both Buenos Aires and New York) which appears on the Reuters Screen BNAR Page at the close of business in Buenos Aires on that Rate Calculation Date.">
+	ARS_EMTA_INDICATIVE_SURVEY_RATE_ARS04 displayName "ARS.EMTA.INDICATIVE.SURVEY.RATE/ARS04" <"The Spot Rate for a Rate Calculation Date will be the Argentine Peso/U.S. Dollar Specified Rate for U.S. Dollars, expressed as the amount of Argentine Pesos per one U.S. Dollar, for settlement on the same day, as published on EMTA's web site (www.emta.org) at approximately 1:00 p.m. (Buenos Aires time), or as soon thereafter as practicable, on such Rate Calculation Date. The Spot Rate shall be calculated by EMTA (or a service provider EMTA may select in its sole discretion) pursuant to the EMTA ARS Indicative Survey Methodology (which means a methodology, dated as of January 2, 2003, as amended from time to time, for a centralized industry-wide survey of financial institutions that are active participants in the Argentine Peso/U.S. Dollar markets for the purpose of determining the EMTA ARS Indicative Survey Rate).">
+	ARS_EMTA_INDUSTRY_SURVEY_RATE_ARS03 displayName "ARS.EMTA.INDUSTRY.SURVEY.RATE/ARS03" <"The Spot Rate for a Rate Calculation Date will be the Argentine Peso/U.S. Dollar Specified Rate for U.S. Dollars, expressed as the amount of Argentine Pesos per one U.S. Dollar, for settlement on the same day, as published on EMTA's web site (www.emta.org) at approximately 1:00 p.m. (Buenos Aires time), or as soon thereafter as practicable, on such Rate Calculation Date. The Spot Rate shall be calculated by EMTA (or a service provider EMTA may select in its sole discretion) pursuant to the EMTA ARS Industry Survey Methodology (which means a methodology, dated as of January 2, 2003, as amended from time to time, for a centralized industry-wide survey of financial institutions in Buenos Aires that are active participants in the Argentine Peso/U.S. Dollar spot markets for the purpose of determining the EMTA ARS Industry Survey Rate).">
+	ARS_MAE_ARS05 displayName "ARS.MAE/ARS05" <"The Spot Rate for a Rate Calculation Date will be the volume weighted average Argentine Peso/U.S. Dollar Rate of all trades executed in the electronic market for a Rate Calculation Day expressed as the amount of Argentine Pesos per one U.S. Dollar, for settlement on the same day, reported by the Mercado Abierto Electronico (the 'MAE') at approximately 3:00 pm, Buenos Aires time, and published on the FOREX-MAE Page as the 'PPN' rate ('Promedio Ponderado Noticiado') on www.mae.com.ar on that Rate Calculation Date.">
+	ARS_OFFICIAL_RATE_ARS02 displayName "ARS.OFFICIAL.RATE/ARS02" <"The Spot Rate for a Rate Calculation Date will be the Argentine Peso/U.S. Dollar offered rate for U.S. Dollars, expressed as the amount of Argentine Pesos per one U.S. Dollar, for settlement on the same day quoted by Banco de la Nacion (in accordance with the Convertibility Law of March 27, 1991 and Regulatory Decree No. 529/91 of April 1, 1991, as may be amended from time to time) for that Rate Calculation Date.">
+	BRL_BRBY_BRL01 displayName "BRL.BRBY/BRL01" <"The Spot Rate for a Rate Calculation Date will be the Brazilian Real/U.S. Dollar Specified Rate, expressed as the amount of Brazilian Reais per one U.S. Dollar, for settlement in two Business Days (where such days are Business Days in both Sao Paulo and New York) which appears on the Reuters Screen BRBY Page under the caption 'INTBK FLTING (LAST)' at approximately 11:00 a.m., Sao Paulo time, on that Rate Calculation Date.">
+	BRL_EMTA_INDICATIVE_SURVEY_RATE_BRL13 displayName "BRL.EMTA.INDICATIVE.SURVEY.RATE/BRL13" <"The Spot Rate for a Rate Calculation Date will be the Brazilian Real/U.S. Dollar Specified Rate for U.S. Dollars, expressed as the amount of Brazilian Reais per one U.S. Dollar, for settlement in two Business Days, as published on EMTA's web site (www.emta.org) at approximately 12:00 p.m. (Sao Paulo time), or as soon thereafter as practicable, on such Rate Calculation Date. The Spot Rate shall be calculated by EMTA (or a service provider EMTA may select in its sole discretion) pursuant to the EMTA BRL Indicative Survey Methodology (which means a methodology, dated as of March 1, 2004, as amended from time to time, for a centralized industry-wide survey of financial institutions that are active participants in the Brazilian Real/U.S. Dollar markets for the purpose of determining the EMTA BRL Indicative Survey Rate).">
+	BRL_EMTA_INDUSTRY_SURVEY_RATE_BRL12 displayName "BRL.EMTA.INDUSTRY.SURVEY.RATE/BRL12" <"The Spot Rate for a Rate Calculation Date will be the Brazilian Real/U.S. Dollar Specified Rate for U.S. Dollars, expressed as the amount of Brazilian Reais per one U.S. Dollar, for settlement in two Business Days, as published on EMTA's web site (www.emta.org) at approximately 3:45 p.m. (Sao Paulo time), or as soon thereafter as practicable, on such Rate Calculation Date. The Spot Rate shall be calculated by EMTA (or a service provider EMTA may select in its sole discretion) pursuant to the EMTA BRL Industry Survey Methodology (which means a methodology, dated as of March 1, 2004, as amended from time to time, for a centralized industry-wide survey of financial institutions in Brazil that are active participants in the Brazilian Real/U.S. Dollar spot markets for the purpose of determining the EMTA BRL Industry Survey Rate).">
+	BRL_OFFICIAL_RATE_BRL02 displayName "BRL.OFFICIAL.RATE/BRL02" <"The Spot Rate for a Rate Calculation Date will be the Brazilian Real/U.S. Dollar Specified Rate, expressed as the amount of Brazilian Reais per one U.S. Dollar, for settlement in two Business Days (where such days are Business Days in both Sao Paulo and New York) reported by the Banco Central do Brasil in the 'Diario Oficial da Uniao' on the first Business Day following that Rate Calculation Date.">
+	BRL_PCOT_COMMERCIAL_BRL03 displayName "BRL.PCOT-COMMERCIAL/BRL03" <"The Spot Rate for a Rate Calculation Date will be the Brazilian Real/U.S. Dollar commercial rate, expressed as the amount of Brazilian Reais per one U.S. Dollar, for settlement in two Business Days (where such days are Business Days in both Sao Paulo and New York) reported by the Banco Central do Brasil on SISBACEN Data System under transaction code PCOT- 390, Option 3, at the Specified Time, if any, on that Rate Calculation Date.">
+	BRL_PCOT_FLOATING_BRL04 displayName "BRL.PCOT-FLOATING/BRL04" <"The Spot Rate for a Rate Calculation Date will be the Brazilian Real/U.S. Dollar floating rate, expressed as the amount of Brazilian Reais per one U.S. Dollar, for settlement in two Business Days (where such days are Business Days in both Sao Paulo and New York) reported by the Banco Central do Brasil on SISBACEN Data System under transaction code PCOT- 390, Option 3, at the Specified Time, if any, on that Rate Calculation Date.">
+	BRL_PTAX_BRL09 displayName "BRL.PTAX/BRL09" <"The Spot Rate for a Rate Calculation Date will be the Brazilian Real/U.S. Dollar offered rate for U.S. Dollars, expressed as the amount of Brazilian Reais per one U.S. Dollar, for settlement in two Business Days reported by the Banco Central do Brasil on SISBACEN Data System under transaction code PTAX-800 ('Consulta de Cambio' or Exchange Rate Inquiry), Option 5 ('Cotacoes para Contabilidade' or 'Rates for Accounting Purposes') by approximately 6:00 p.m., Sao Paulo time, on that Rate Calculation Date.">
+	BRL_PTAX_COMMERCIAL_BRL05 displayName "BRL.PTAX-COMMERCIAL/BRL05" <"The Spot Rate for a Rate Calculation Date will be the Brazilian Real/U.S. Dollar commercial rate, expressed as the amount of Brazilian Reais per one U.S. Dollar, for settlement in two Business Days (where such days are Business Days in both Sao Paulo and New York) reported by the Banco Central do Brasil on SISBACEN Data System under transaction code PTAX- 800 ('Consultas de Cambio' or Exchange Rate Inquiry), Option 5 ('Cotacoes para Contabilidad' or Rates for Accounting Purposes) market type 'L' (corresponding to U.S. Dollars traded in the foreign exchange market segment officially denominated 'Livre' and commonly known as 'Comercial') as of 7:30 p.m., Sao Paulo time, on that Rate Calculation Date.">
+	BRL_PTAX_COMMERCIAL_BRFR_BRL06 displayName "BRL.PTAX-COMMERCIAL.BRFR/BRL06" <"The Spot Rate for a Rate Calculation Date will be the Brazilian Real/U.S. Dollar commercial rate, expressed as the amount of Brazilian Reais per one U.S. Dollar, for settlement in two Business Days (where such days are Business Days in both Sao Paulo and New York) reported by the Banco Central do Brasil which appears on the Reuters Screen BRFR Page at PTAX-800 as of 11:00 a.m., Sao Paulo time, on the first Business Day following that Rate Calculation Date. 23">
+	BRL_PTAX_FLOATING_BRL07 displayName "BRL.PTAX-FLOATING/BRL07" <"The Spot Rate for a Rate Calculation Date will be the Brazilian Real/U.S. Dollar floating rate, expressed as the amount of Brazilian Reais per one U.S. Dollar, for settlement in two Business Days (where such days are Business Days in both Sao Paulo and New York) reported by the Banco Central do Brasil on SISBACEN Data System under transaction code PTAX- 800 ('Consultas de Cambio' or Exchange Rate Inquiry), Option 5 ('Cotacoes para Contabilidad' or Rates for Accounting Purposes) market type 'F' (corresponding to U.S. Dollars traded in the foreign exchange market segment officially denominated 'Flutuante') as of 7:30 p.m., Sao Paulo time, on that Rate Calculation Date.">
+	BRL_PTAX_FLOATING_BRFR_BRL08 displayName "BRL.PTAX-FLOATING.BRFR/BRL08" <"The Spot Rate for a Rate Calculation Date will be the Brazilian Real/U.S. Dollar floating rate, expressed as the amount of Brazilian Reais per one U.S. Dollar, for settlement in two Business Days (where such days are Business Days in both Sao Paulo and New York) reported by the Banco Central do Brasil on the SISBACEN Data System which appears on the Reuters Screen BRFR Page at PTAX-800 as of 11:00 a.m., Sao Paulo time, on the first Business Day following that Rate Calculation Date.">
+	CLP_BCCH_CLP01 displayName "CLP.BCCH/CLP01" <"The Spot Rate for a Rate Calculation Date will be the Chilean Peso/U.S. Dollar observado rate, expressed as the amount of Chilean Pesos per one U.S. Dollar, for settlement on the same day (or, if such day is not a Business Day in New York, for settlement on the first succeeding day that is a Business Day in both Santiago and New York) reported by the Banco Central de Chile which appears on the Reuters Screen BCCH Page under the caption 'OBSERVADO' at 10:00 a.m., Santiago time, on the first Business Day following that Rate Calculation Date.">
+	CLP_CHILD_INFORMAL_CLP02 displayName "CLP.CHILD-INFORMAL/CLP02" <"The Spot Rate for a Rate Calculation Date will be the Chilean Peso/U.S. Dollar informal rate, expressed as the amount of Chilean Pesos per one U.S. Dollar, for settlement on the same day (or, if such day is not a Business Day in New York, for settlement on the first succeeding day that is a Business Day in both Santiago and New York) of the informal exchange market which appears on the Reuters Screen CHILD Page at the Specified Time, if any, on that Rate Calculation Date.">
+	CLP_CHILD_INTERBANK_CLP03 displayName "CLP.CHILD-INTERBANK/CLP03" <"The Spot Rate for a Rate Calculation Date will be the Chilean Peso/U.S. Dollar interbank rate, expressed as the amount of Chilean Pesos per one U.S. Dollar, for settlement on the same day (or, if such day is not a Business Day in New York, for settlement on the first succeeding day that is a Business Day in both Santiago and New York) reported by the Banco Central de Chile for the formal exchange market which appears on the Reuters Screen CHILD Page at the Specified Time, if any, on that Rate Calculation Date.">
+	CLP_CHILD_OBSERVADO_CLP04 displayName "CLP.CHILD-OBSERVADO/CLP04" <"The Spot Rate for a Rate Calculation Date will be the Chilean Peso/U.S. Dollar observado rate, expressed as the amount of Chilean Pesos per one U.S. Dollar, for settlement on the same day (or, if such day is not a Business Day in New York, for settlement on the first succeeding day that is a Business Day in both Santiago and New York) reported by the Banco Central de Chile which appears on the Reuters Screen CHILD Page on the first Business Day following that Rate Calculation Date.">
+	CLP_CHILG_INFORMAL_CLP05 displayName "CLP.CHILG-INFORMAL/CLP05" <"The Spot Rate for a Rate Calculation Date will be the Chilean Peso/U.S. Dollar informal rate, expressed as the amount of Chilean Pesos per one U.S. Dollar, for settlement on the same day (or, if such day is not a Business Day in New York, for settlement on the first succeeding day that is a Business Day in both Santiago and New York) of the informal exchange market which appears on the Reuters Screen CHILG Page at the Specified Time, if any, on that Rate Calculation Date.">
+	CLP_CHILG_INTERBANK_CLP06 displayName "CLP.CHILG-INTERBANK/CLP06" <"The Spot Rate for a Rate Calculation Date will be the Chilean Peso/U.S. Dollar interbank rate, expressed as the amount of Chilean Pesos per one U.S. Dollar, for settlement on the same day (or, if such day is not a Business Day in New York, for settlement on the first succeeding day that is a Business Day in both Santiago and New York) reported by the Banco Central de Chile for the formal exchange market which appears on the Reuters Screen CHILG Page at the Specified Time, if any, on that Rate Calculation Date.">
+	CLP_CHILG_OBSERVADO_CLP07 displayName "CLP.CHILG-OBSERVADO/CLP07" <"The Spot Rate for a Rate Calculation Date will be the Chilean Peso/U.S. Dollar observado rate, expressed as the amount of Chilean Pesos per one U.S. Dollar, for settlement on the same day (or, if such day is not a Business Day in New York, for settlement on the first succeeding day that is a Business Day in both Santiago and New York) reported by the Banco Central de Chile which appears on the Reuters Screen CHILG Page under 'OBSERVADO' at the Specified Time, if any, on the first Business Day following that Rate Calculation Date.">
+	CLP_DOLAR_OBS_CLP10 displayName "CLP.DOLAR.OBS/CLP10" <"The Spot Rate for a Rate Calculation Date will be the Chilean Peso/U.S. Dollar 'observado' rate, expressed as the amount of Chilean Pesos per one U.S. Dollar, for settlement in one Business Day reported by the Banco Central de Chile (www.bcentral.cl) as the 'Dolar Observado' (Dollar Observado) rate by not later than 10:30 a.m., Santiago time, on the first Business Day following that Rate Calculation Date.">
+	CLP_EMTA_INDICATIVE_SURVEY_RATE_CLP11 displayName "CLP.EMTA.INDICATIVE.SURVEY.RATE/CLP11" <"The Spot Rate for a Rate Calculation Date will be the Chilean Peso/U.S. Dollar Specified Rate for U.S. Dollars, expressed as the amount of Chilean Pesos per one U.S. Dollar, for settlement on the same day, as published on EMTA's web site (www.emta.org) at approximately 11:00 a.m., Santiago time, or as soon thereafter as practicable, on such Rate Calculation Date. The Spot Rate shall be calculated by EMTA (or a service provider EMTA may select in its sole discretion) pursuant to the EMTA CLP Indicative Survey Methodology (which means a methodology, dated as of August 1, 2006, as amended from time to time, for a centralized industry-wide survey of financial institutions that are active participants in the Chilean Peso/U.S. Dollar markets for the purpose of determining the EMTA CLP Indicative Survey Rate).">
+	CLP_OFFICIAL_RATE_CLP08 displayName "CLP.OFFICIAL.RATE/CLP08" <"The Spot Rate for a Rate Calculation Date will be the Chilean Peso/U.S. Dollar Specified Rate, expressed as the amount of Chilean Pesos per one U.S. Dollar (or, if such day is not a Business Day in New York, for settlement on the first succeeding day that is a Business Day in both Santiago and New York), calculated in accordance with Title I, Chapter 1 Number 6 of the Compendium of International Exchange Norms of the Banco Central de Chile and published by the Banco Central de Chile at the Specified Time, if any, on the first Business Day following that Rate Calculation Date.">
+	CLP_TELERATE_38942_CLP09 displayName "CLP.TELERATE.38942/CLP09" <"The Spot Rate for a Rate Calculation Date will be the Chilean Peso/U.S. Dollar observado rate, expressed as the amount of Chilean Pesos per one U.S. Dollar, for settlement on the same day (or, if such day is not a Business Day in New York, for settlement on the first succeeding day that is a Business Day in both Santiago and New York) reported by the Banco Central de Chile which appears on the Telerate Page 38942 opposite the caption 'Observado' at the Specified Time, if any, on the first Business Day following the Rate Calculation Date.">
+	CNY_SAEC_CNY01 displayName "CNY.SAEC/CNY01" <"The Spot Rate for a Rate Calculation Date will be the Chinese Renminbi/U.S. Dollar official fixing rate, expressed as the amount of Chinese Renminbi per one U.S. Dollar, for settlement in two Business Days reported by the People's Bank of China, Beijing, People's Republic of China, which appears on the Reuters Screen 'SAEC' Page opposite the symbol 'USDCNY=' at approximately 9:15 a.m., Beijing time, on that Rate Calculation Date.">
+	CNY_SFEMC_INDICATIVE_SURVEY_RATE_CNY02 displayName "CNY.SFEMC.INDICATIVE.SURVEY.RATE/CNY02" <"The Spot Rate for a Rate Calculation Date will be the Chinese Renminbi/U.S. Dollar Specified Rate for U.S. Dollars, expressed as the amount of Chinese Renminbi per one U.S. Dollar, for settlement in two Business Days, as published on SFEMC's website (www.sfemc.org) at approximately 3:30 p.m. (Singapore time), or as soon thereafter as practicable, on such Rate Calculation Date. The Spot Rate will be calculated by SFEMC (or a service provider SFEMC may select in its sole discretion) pursuant to the SFEMC CNY Indicative Survey Methodology (which means a methodology, dated as of December 1, 2004, as amended from time to time, for a centralized industry-wide survey of financial institutions that are active participants in the Chinese Renminbi/U.S. Dollar markets for the purpose of determining the SFEMC CNY Indicative Survey Rate).">
+	COP_CO_COL03_COP01 displayName "COP.CO/COL03/COP01" <"The Spot Rate for a Rate Calculation Date will be the Colombian Peso/U.S. Dollar fixing rate, expressed as the amount of Colombian Pesos per one U.S. Dollar, for settlement on the same day (unless such day is not a Business Day in New York, then for settlement on the first succeeding day that is a Business Day in Bogota and New York) reported by the Colombian Banking Superintendency which appears on the Reuters Screen CO/COL03 Page opposite the caption 'TRCM' ('Tasa de Cierre Representative del Mercado' or closing market price) at 12:00 noon, Bogota time, on the first Business Day following that Rate Calculation Date.">
+	COP_EMTA_INDICATIVE_SURVEY_RATE_COP03 displayName "COP.EMTA.INDICATIVE.SURVEY.RATE/COP03" <"The Spot Rate for a Rate Calculation Date will be the Colombian Peso/U.S. Dollar Specified Rate for U.S. Dollars, expressed as the amount of Colombian Pesos per one U.S. Dollar, for settlement on the same day, as published on EMTA's web site (www.emta.org) at approximately 11:30 a.m., Bogota time, or as soon thereafter as practicable, on such Rate Calculation Date. The Spot Rate shall be calculated by EMTA (or a service provider EMTA may select in its sole discretion) pursuant to the EMTA COP Indicative Survey Methodology (which means a methodology, dated as of August 1, 2006, as amended from time to time, for a centralized industry-wide survey of financial institutions that are active participants in the Colombian Peso/U.S. Dollar markets for the purpose of determining the EMTA COP Indicative Survey Rate).">
+	COP_TRM_COP02 displayName "COP.TRM/COP02" <"The Spot Rate for a Rate Calculation Date will be the Colombian Peso/U.S. Dollar fixing rate, expressed as the amount of Colombian Pesos per one U.S. Dollar, for settlement on the same day reported by the Colombian Financial Superintendency (www.banrep.gov.co) as the 'Tasa Representativa del Mercado (TRM)' (also referred to as the 'Tasa de Cambio Representativa del Mercado' (TCRM)) by not later than 10:30 a.m., Bogota time, on the first Business Day following that Rate Calculation Date.">
+	CURRENCY_IMPLIED_RATE__ADR__CURA1 displayName "CURRENCY-IMPLIED.RATE.(ADR)/CURA1" <"the Spot Rate for a Rate Calculation Date will be the Reference Currency/U.S. Dollar exchange rate, expressed as the amount of Reference Currency per one U.S. Dollar, determined on the basis of quotations provided by Reference Dealers on that Rate Calculation Date of that day's price of a Specified Company's American Depositary Receipt or American Depositary Receipts (the 'ADR' or 'ADRs', as appropriate) and the price of the local share or shares of such Specified Company of the same type and in the same quantity represented by such ADR or ADRs, as the case may be (the 'Share' or 'Shares', as appropriate). The Calculation Agent will request each of the Reference Dealers to provide a firm quotation of (A) in the case where one ADR represents less than one Share, its bid and offer price (in the Reference Currency) for one Share and its bid and offer price (in U.S. Dollars) for the number of ADRs which represent such Share and (B) in all other cases, its bid and offer price (in the Reference Currency) for the Share or Shares, as the case may be, and its bid and offer price (in U.S. Dollars) for one ADR. If one or more quotations are provided, the rate for a Rate Calculation Date will equal the ratio of (1) the arithmetic mean of the midpoint of the bid and offer prices quoted in the Reference Currency by each Reference Dealer for such Share or Shares, as the case may be, and (2) the arithmetic mean of the midpoint of the bid and offer prices quoted in U.S. Dollars by each Reference Dealer for such ADR or ADRs, as the case may be, subject to an adjustment, if any, by the Calculation Agent to reduce the effect of momentary disparities in the prices of the Share or Shares and the ADR or ADRs, as appropriate. The quotations used to determine the Spot Rate for a Rate Calculation Date will be determined in each case at the Specified Time on the Rate Calculation Date or, if no such time is specified, the time chosen by the Calculation Agent.">
+	CURRENCY_IMPLIED_RATE__LOCAL_ASSET__CURA2 displayName "CURRENCY-IMPLIED.RATE.(LOCAL.ASSET)/CURA2" <"The Spot Rate for a Rate Calculation Date will be the Reference Currency/Settlement Currency exchange rate, expressed as the amount of Reference Currency per one unit of Settlement Currency, determined on the basis of quotations provided by Reference Dealers on that Rate Calculation Date for that day's price of Local Assets. The Calculation Agent will request each of the Reference Dealers to provide a firm quotation of its bid and offer price (in both the Reference Currency and the Settlement Currency) for an amount of Local Assets whose face value equals the Specified Amount. If one or more quotations are provided, the rate for a Rate Calculation Date will equal the ratio of (A) the arithmetic mean of the midpoint of the bid and offer prices quoted in the Reference Currency by each Reference Dealer for such Local Assets and (B) the arithmetic mean of the midpoint of the bid and offer prices quoted in the Settlement Currency by each Reference Dealer for such Local Assets. The quotations used to determine the Spot Rate for a Rate Calculation Date will be determined in each case at the Specified Time on the Rate Calculation Date or, if no such time is specified, the time chosen by the Calculation Agent.">
+	CURRENCY_MUTUAL_AGREEMENT_CURA3 displayName "CURRENCY-MUTUAL.AGREEMENT/CURA3" <"The Spot Rate for a Rate Calculation Date will be the Reference Currency/Settlement Currency Specified Rate, expressed as the amount of the Reference Currency per one unit of Settlement Currency, for settlement on the Settlement Date agreed upon by the parties on or prior to that Rate Calculation Date (or, if different, the day on which rates for that date would, in the ordinary course, be published or announced).">
+	CURRENCY_REFERENCE_DEALERS_CURA4 displayName "CURRENCY-REFERENCE.DEALERS/CURA4" <"The Spot Rate for a Rate Calculation Date will be determined on the basis of quotations provided by Reference Dealers on that Rate Calculation Date of that day's Specified Rate, expressed as the amount of Reference Currency per one unit of Settlement Currency, for settlement on the Settlement Date. The Calculation Agent will request the Specified Office of each of the Reference Dealers to provide a firm quotation of its Specified Rate for a transaction where the amount of Reference Currency equals the Specified Amount. If four quotations are provided, the rate for a Rate Calculation Date will be the arithmetic mean of the Specified Rates, without regard to the Specified Rates having the highest and lowest value. If exactly three quotations are provided, the rate for a Rate Calculation Date will be the Specified Rate provided by the Reference Dealer that remains after disregarding the Specified Rates having the highest and lowest values. For this purpose, if more than one quotation has the same highest value or lowest value, then the Specified Rate of one of such quotations shall be disregarded. If exactly two quotations are provided, the rate for a Rate Calculation Date will be the arithmetic mean of the Specified Rates. If only one quotation is provided, the rate for a Rate Calculation Date will be the Specified Rate quoted by that Reference Dealer. The quotations used to determine the Spot Rate for a Rate Calculation Date will be determined in each case at the Specified Time on that Rate Calculation Date or, if no such time is specified, the time chosen by the Calculation Agent.">
+	CURRENCY_WHOLESALE_MARKET_CURA5 displayName "CURRENCY-WHOLESALE.MARKET/CURA5" <"The Spot Rate for a Rate Calculation Date will be determined by the Calculation Agent on the basis of that day's Specified Rate, expressed as the amount of Reference Currency per one unit of Settlement Currency, in a legal and customary wholesale market in which there is no, or minimal, Governmental Authority controls or interference, except as a participant in such market.">
+	ECS_DNRP_ECS01 displayName "ECS.DNRP/ECS01" <"The Spot Rate for a Rate Calculation Date will be the Ecuadorian Sucre/U.S. Dollar Specified Rate, expressed as the amount of Ecuadorian Sucres per one U.S. Dollar, for settlement in one Business Day (where such day is a Business Day in Guayaquil and New York) which appears on Reuters Screen DNRP Page at 12:00 noon, Guayaquil time, on that Rate Calculation Date.">
+	IDR_ABS_IDR01 displayName "IDR.ABS/IDR01" <"The Spot Rate for a Rate Calculation Date will be the Indonesian Rupiah/U.S. Dollar spot rate at 11:00 a.m., Singapore time, expressed as the amount of Indonesian Rupiah per one U.S. Dollar, for settlement in two Business Days, reported by the Association of Banks in Singapore which appears on the Telerate Page 50157 to the right of the caption 'Spot' under the column 'IDR' at approximately 11:30 a.m., Singapore time, on that Rate Calculation Date.">
+	IDR_JISDOR_IDR04 displayName "IDR.JISDOR/IDR04" <"The Spot Rate for a Rate Calculation Date will be the Indonesian Rupiah/U.S. Dollar weighted average spot rate in the interbank market based on traded IDR/USD spot foreign exchange transactions during a specified time period which are captured on a real time basis, expressed as the amount of Indonesian Rupiah per one U.S. Dollar, for settlement in two Business Days, published by Bank Indonesia at approximately 10:00 a.m., Jakarta time, on that Rate Calculation Date as the Jakarta Interbank Spot Dollar Rate USD - IDR on Bank Indonesia's website or otherwise made available by Bank Indonesia (or its successor as administrator).">
+	IDR_SFEMC_INDICATIVE_SURVEY_RATE_IDR02 displayName "IDR.SFEMC.INDICATIVE.SURVEY.RATE/IDR02" <"The Spot Rate for a Rate Calculation Date will be the Indonesian Rupiah/U.S. Dollar Specified Rate for U.S. Dollars, expressed as the amount of Indonesian Rupiah per one U.S. Dollar, for settlement in two Business Days, as published on SFEMC's website (www.sfemc.org) at approximately 3:30 p.m., Singapore time, or as soon thereafter as practicable, on such Rate Calculation Date. The Spot Rate will be calculated by SFEMC (or a service provider SFEMC may select in its sole discretion) pursuant to the SFEMC IDR Indicative Survey Methodology (which means a methodology, dated as of December 1, 2004, as amended from time to time, for a centralized industry-wide survey of financial institutions that are active participants in the Indonesian Rupiah/U.S. Dollar markets for the purpose of determining the SFEMC IDR Indicative Survey Rate).">
+	IDR_VWAP_IDR03 displayName "IDR.VWAP/IDR03" <"The Spot Rate for a Rate Calculation Date will be the Indonesian Rupiah/U.S. Dollar implied spot rate expressed as the amount of Indonesian Rupiah per one U.S. Dollar, for settlement in two Business Days, reported by ABS Benchmarks Administration Co Pte. Ltd. (or its successor as administrator or sponsor of that rate), which appears on Thomson Reuters Screen ABSFIX01 Page at approximately 11:30 a.m., Singapore time, on that Rate Calculation Date.">
+	ILS_BOIJ_ILS01 displayName "ILS.BOIJ/ILS01" <"The Spot Rate for a Rate Calculation Date will be the Israeli Shekel/U.S. Dollar Specified Rate, expressed as the amount of Israeli Shekels per one U.S. Dollar, for settlement in two Business Days which appears on the Reuters Screen BOIJ Page as of 1:00 p.m., Tel Aviv time, on that Rate Calculation Date.">
+	ILS_FXIL_ILS02 displayName "ILS.FXIL/ILS02" <"The Spot Rate for a Rate Calculation Date will be the Israeli Shekel/U.S. Dollar Specified Rate, expressed as the amount of Israeli Shekels per one U.S. Dollar, for settlement in two Business Days which appears on the Reuters Screen FXIL Page as of 1:00 p.m., Tel Aviv time, on that Rate Calculation Date.">
+	INR_FBIL_INR01 displayName "INR.FBIL/INR01" <"The Spot Rate for a Rate Calculation Date will be the Indian Rupee/U.S. Dollar reference rate, expressed as the amount of Indian Rupee per one U.S. Dollar, for settlement in two Business Days, reported by Financial Benchmarks India Pvt. Ltd. (www.fbil.org.in) at approximately 1:30 p.m., Mumbai time, or as soon thereafter as practicable, on that Rate Calculation Date.">
+	INR_RBIB_INR01 displayName "INR.RBIB/INR01" <"The Spot Rate for a Rate Calculation Date will be the Indian Rupee/U.S. Dollar reference rate, expressed as the amount of Indian Rupee per one U.S. Dollar, for settlement in two Business Days reported by the Reserve Bank of India which appears on the Reuters Screen RBIB Page at approximately 12:30 p.m., Mumbai time, or as soon thereafter as practicable, on that Rate Calculation Date.">
+	INR_SFEMC_INDICATIVE_SURVEY_RATE_INR02 displayName "INR.SFEMC.INDICATIVE.SURVEY.RATE/INR02" <"The Spot Rate for a Rate Calculation Date will be the Indian Rupee/U.S. Dollar Specified Rate for U.S. Dollars, expressed as the amount of Indian Rupee per one U.S. Dollar, for settlement in two Business Days, as published on SFEMC's website (www.sfemc.org) at approximately 3:30 p.m. (Singapore time), or as soon thereafter as practicable, on such Rate Calculation Date. The Spot Rate will be calculated by SFEMC (or a service provider SFEMC may select in its sole discretion) pursuant to the SFEMC INR Indicative Survey Methodology (which means a methodology, dated as of December 1, 2004, as amended from time to time, for a centralized industry-wide survey of financial institutions that are active participants in the Indian Rupee/U.S. Dollar markets for the purpose of determining the SFEMC INR Indicative Survey Rate).">
+	KRW_KEBEY_KRW01 displayName "KRW.KEBEY/KRW01" <"The Spot Rate for a Rate Calculation Date will be the Korean Won/U.S. Dollar Specified Rate, expressed as the amount of Korean Won per one U.S. Dollar, for settlement in two Business Days which appears on the Reuters Screen KEBEY Page at the Specified Time, if any, on that Rate Calculation Date.">
+	KRW_KFTC18_KRW02 displayName "KRW.KFTC18/KRW02" <"The Spot Rate for a Rate Calculation Date will be the Korean Won/U.S. Dollar market average rate, expressed as the amount of Korean Won per one U.S. Dollar, for settlement in two Business Days reported by the Korea Financial Telecommunications and Clearing Corporation which appears on the Reuters Screen KFTC18 Page to the right of the caption 'USD Today' that is available at approximately 3:30 p.m., Seoul time, on the Rate Calculation Date or as soon thereafter as practicable.">
+	KRW_SFEMC_INDICATIVE_SURVEY_RATE_KRW04 displayName "KRW.SFEMC.INDICATIVE.SURVEY.RATE/KRW04" <"The Spot Rate for a Rate Calculation Date will be the Korean Won/U.S. Dollar Specified Rate for U.S. Dollars, expressed as the amount of Korean Won per one U.S. Dollar, for settlement in two Business Days, as published on SFEMC's website (www.sfemc.org) at approximately 3:30 p.m., Singapore time, or as soon thereafter as practicable, on such Rate Calculation Date. The Spot Rate will be calculated by SFEMC (or a service provider SFEMC may select in its sole discretion) pursuant to the SFEMC KRW Indicative Survey Methodology (which means a methodology, dated as of December 1, 2004, as amended from time to time, for a centralized industry-wide survey of financial institutions that are active participants in the Korean Won/U.S. Dollar markets for the purpose of determining the SFEMC KRW Indicative Survey Rate).">
+	KRW_TELERATE_45644_KRW03 displayName "KRW.TELERATE.45644/KRW03" <"The Spot Rate for a Rate Calculation Date will be the Korean Won/U.S. Dollar market average rate, expressed as the amount of Korean Won per one U.S. Dollar, for settlement in two Business Days reported by the Korea Financial Telecommunications and Clearing Corporation which appears on Telerate Page 45644 to the right of the caption 'USD Today' that is available at approximately 3:30 p.m., Seoul time, on the Rate Calculation Date or as soon thereafter as practicable.">
+	KZT_EMTA_INDICATIVE_SURVEY_RATE_KZT02 displayName "KZT.EMTA.INDICATIVE.SURVEY.RATE/KZT02" <"The Spot Rate for a Rate Calculation Date will be the Kazakhstan Tenge / U.S. Dollar Specified Rate for U.S. Dollars, expressed as the amount of Kazakhstan Tenge per one U.S. Dollar, for settlement on the same Business Day, as published on EMTA's website (www.emta.org) at approximately 1:00 p.m., Almaty time, or as soon thereafter as practicable, on that Rate Calculation Date. The Spot Rate shall be calculated by EMTA (or a service provider EMTA may select in its sole discretion) pursuant to the EMTA KZT Indicative Survey Methodology (which means a methodology, dated as of March 16, 2009, as amended from time to time, for a centralized industry-wide survey of financial institutions that are active participants in the Kazakhstan Tenge/U.S. Dollar markets for the purpose of determining the EMTA KZT Indicative Survey Rate).">
+	KZT_KASE_KZT01 displayName "KZT.KASE/KZT01" <"The Spot Rate for a Rate Calculation Date will be the Kazakhstan Tenge / U.S. Dollar weighted average rate, expressed as the amount of Kazakhstan Tenge per one U.S. Dollar, for settlement on the same Business Day reported by the Kazakhstan Stock Exchange (www.kase.kz) at approximately 11:00 am, Almaty time, on that Rate Calculation Date.">
+	LBP_BDLX_LBP01 displayName "LBP.BDLX/LBP01" <"The Spot Rate for a Rate Calculation Date will be the Lebanese Pound/U.S. Dollar Specified Rate, expressed as the amount of Lebanese Pounds per one U.S. Dollar, for settlement in two Business Days which appears on the Reuters Screen BDLX Page as of 12:00 noon, Beirut time, on that Rate Calculation Date.">
+	MAD_OFFICIAL_RATE_MAD01 displayName "MAD.OFFICIAL.RATE/MAD01" <"The Spot Rate for a Rate Calculation Date will be the Moroccan Dirham/U.S. Dollar Specified Rate, expressed as the amount of Moroccan Dirham per one U.S. Dollar, for settlement in two Business Days reported by the Central Bank of Morocco as of 1:00 p.m., Rabat time, on that Rate Calculation Date.">
+	MXP_BNMX_MXP01 displayName "MXP.BNMX/MXP01" <"The Spot Rate for a Rate Calculation Date will be the Mexican Pesos/U.S. Dollar Specified rate, expressed as the amount of Mexican Pesos per one U.S. Dollar, for settlement in two Business Days reported by Banco de Mexico which appears on the Reuters Screen BNMX Page opposite the caption 'Fix' at the close of business in Mexico City on that Rate Calculation Date.">
+	MXP_FIXING_RATE_MXP02 displayName "MXP.FIXING.RATE/MXP02" <"The Spot Rate for a Rate Calculation Date will be the Mexican Peso/U.S. Dollar fixing rate, expressed as the amount of Mexican Pesos per one U.S. Dollar, for settlement in two Business Days which is published by Banco de Mexico in the Official Gazette of the Federation pursuant to the 'Disposiciones aplicables a la determinacion del tipo de Cambio para solventar obligaciones denominadas en moneda extranjera pagaderas en la Republica Mexicana' (Rules applicable to determine the exchange rate to pay obligations denominated in foreign currency payable in Mexico) on the first Business Day following that Rate Calculation Date.">
+	MXP_MEX01_MXP03 displayName "MXP.MEX01/MXP03" <"The Spot Rate for a Rate Calculation Date will be the Mexican Peso/U.S. Dollar fixing rate, expressed as the amount of Mexican Pesos per one U.S. Dollar, for settlement in two Business Days reported by Banco de Mexico which appears on Reuters Screen MEX01 Page under the heading 'MXNFIX=RR', at the close of business in Mexico City on that Rate Calculation Date.">
+	MXP_PUBLISHED_MXP04 displayName "MXP.PUBLISHED/MXP04" <"The Spot Rate for a Rate Calculation Date will be the Mexican Peso/U.S. Dollar fixing rate, expressed as the amount of Mexican Pesos per one U.S. Dollar, for settlement in two Business Days which is published by the Bolsa Mexicana de Valores, S.A. de C.V. (as established in Section 2 of the 'Resolution concerning the exchange rate applicable for calculating the Mexican Peso equivalent of principal and interest of Mexican Treasury Notes denominated in foreign currency and payable in Mexican Pesos' published in the Diario Oficial de la Federacion on November 11, 1991) in the Movimiento Diario del Mercado de Valores de la Bolsa Mexicana de Valores, S.A. de C.V. under the heading 'Movimiento Diario del Mercado de Valores' on that Rate Calculation Date.">
+	MYR_ABS_MYR01 displayName "MYR.ABS/MYR01" <"The Spot Rate for a Rate Calculation Date will be the Malaysian Ringgit/U.S. Dollar spot rate at 11:00 a.m., Singapore time, expressed as the amount of Malaysian Ringgit per one U.S. Dollar, for settlement in two Business Days, reported by the Association of Banks in Singapore, which appears on the Telerate Page 50157 to the right of the caption 'Spot' under the column 'MYR' at approximately 11:30 a.m., Singapore time, on that Rate Calculation Date.">
+	MYR_KL_REF_MYR04 displayName "MYR.KL.REF/MYR04" <"The Spot Rate for a Rate Calculation Date will be the Malaysian Ringgit/U.S. Dollar reference rate, expressed as the amount of Malaysian Ringgit per one U.S. Dollar, for settlement in two Business Days, calculated and reported by Bank Negara Malaysia as its Kuala Lumpur USD/MYR Reference Rate, which appears on Thomson Reuters Screen MYRFIX2 Page at approximately 3:30 p.m., Kuala Lumpur time, on that Rate Calculation Date.">
+	MYR_PPKM_MYR03 displayName "MYR.PPKM/MYR03" <"The Spot Rate for a Rate Calculation Date will be the Malaysian Ringgit/U.S. Dollar spot rate expressed as the amount of Malaysian Ringgit per one U.S. Dollar, for settlement in two Business Days, reported by Persatuan Pasaran Kewangan Malaysia (ACI - Malaysia), which appears on Thomson Reuters Screen MYRFIX2 Page at approximately 11:10 a.m., Kuala Lumpur time, on that Rate Calculation Date.">
+	MYR_SFEMC_INDICATIVE_SURVEY_RATE_MYR02 displayName "MYR.SFEMC.INDICATIVE.SURVEY.RATE/MYR02" <"The Spot Rate for a Rate Calculation Date will be the Malaysian Ringgit/U.S. Dollar Specified Rate for U.S. Dollars, expressed as the amount of Malaysian Ringgit per one U.S. Dollar, for settlement in two Business Days, as published on SFEMC's website (www.sfemc.org) at approximately 3:30 p.m., Singapore time, or as soon thereafter as practicable, on such Rate Calculation Date. The Spot Rate will be calculated by SFEMC (or a service provider SFEMC may select in its sole discretion) pursuant to the SFEMC MYR Indicative Survey Methodology (which means a methodology, dated as of July 15, 2005, as amended from time to time, for a centralized industry-wide survey of financial institutions that are active participants in the Malaysian Ringgit/U.S. Dollar markets for the purpose of determining the SFEMC MYR Indicative Survey Rate).">
+	PEN_EMTA_INDICATIVE_SURVEY_RATE_PEN04 displayName "PEN.EMTA.INDICATIVE.SURVEY.RATE/PEN04" <"The Spot Rate for a Rate Calculation Date will be the Peruvian Sol/U.S. Dollar Specified Rate for U.S. Dollars, expressed as the amount of Peruvian Soles per one U.S. Dollar, for settlement on the same day, as published on EMTA's web site (www.emta.org) at approximately 11:00 a.m., Lima time, or as soon thereafter as practicable, on such Rate Calculation Date. The Spot Rate shall be calculated by EMTA (or a service provider EMTA may select in its sole discretion) pursuant to the EMTA PEN Indicative Survey Methodology (which means a methodology, dated as of August 1, 2006, as amended from time to time, for a centralized industry-wide survey of financial institutions that are active participants in the Peruvian Sol/U.S. Dollar markets for the purpose of determining the EMTA PEN Indicative Survey Rate).">
+	PEN_INTERBANK_AVE_PEN05 displayName "PEN.INTERBANK.AVE/PEN05" <"The Spot Rate for a Rate Calculation Date will be the Peruvian Sol/U.S. Dollar average exchange rate in the interbank market expressed as the amount of Peruvian New Soles per one U.S. Dollar for settlement on the same day reported by the Banco Central de Reserva del Peru (www.bcrp.gob.pe) as the 'Tipo de Cambio Interbancario Promedio' at approximately 2:00 p.m., Lima time, on that Rate Calculation Date.">
+	PEN_PDSB_PEN01 displayName "PEN.PDSB/PEN01" <"The Spot Rate for a Rate Calculation Date will be the Peruvian Sol/U.S. Dollar fixing rate (mid market last), expressed as the amount of Peruvian Sols per one U.S. Dollar, for settlement on that same day which appears on the Reuters Screen PDSB Page opposite the caption 'PEN=' as of 12:00 noon, Lima time, on that Rate Calculation Date.">
+	PEN_WT_AVE_PEN03 displayName "PEN.WT.AVE/PEN03" <"The Spot Rate for a Rate Calculation Date will be the midpoint of the Peruvian Sol/U.S. Dollar closing weighted average bid and offer ('compra y venta') exchange rates expressed as the amount of Peruvian New Soles per one U.S. Dollar for settlement on the same day, reported by the Superintendencia de Banca, Seguros y AFP (www.sbs.gob.pe) of the Republic of Peru at approximately 5:00 p.m., Lima time, on that Rate Calculation Date.">
+	PHP_BAPPESO_PHP06 displayName "PHP.BAPPESO/PHP06" <"The Spot Rate for a Rate Calculation Date will be the Philippine Peso/U.S. Dollar morning weighted average rate for that Rate Calculation Date, expressed as the amount of Philippine Pesos per one U.S. Dollar, for settlement in one Business Day, sponsored by Bankers Association of the Philippines (www.bap.org.ph) as its 'BAP AM Weighted Average Rate' at approximately 11:30 a.m., Manila time, or as soon thereafter as practicable, on that Rate Calculation Date.">
+	PHP_PDSPESO_PHP06 displayName "PHP.PDSPESO/PHP06" <"The Spot Rate for a Rate Calculation Date will be the Philippine Peso/U.S. Dollar morning weighted average rate for that Rate Calculation Date, expressed as the amount of Philippine Pesos per one U.S. Dollar, for settlement in one Business Day reported by the Philippine Dealing System PDEX which appears on the Reuters Screen PDSPESO Page to the right of the caption 'AM WT AVE' at approximately 11:30 a.m., Manila time, or as soon thereafter as practicable, on that Rate Calculation Date.">
+	PHP_PHPESO_PHP01 displayName "PHP.PHPESO/PHP01" <"The Spot Rate for a Rate Calculation Date will be the Philippine Peso/U.S. Dollar tom rate (mid market), expressed as the amount of Philippine Pesos per one U.S. Dollar, for settlement in one Business Day which appears on the Reuters Screen PHPESO Page at approximately 11:00 a.m., Manila time, on that Rate Calculation Date.">
+	PHP_SFEMC_INDICATIVE_SURVEY_RATE_PHP05 displayName "PHP.SFEMC.INDICATIVE.SURVEY.RATE/PHP05" <"The Spot Rate for a Rate Calculation Date will be the Philippine Peso/U.S. Dollar Specified Rate for U.S. Dollars, expressed as the amount of Philippine Pesos per one U.S. Dollar, for settlement in one Business Day, as published on SFEMC's website (www.sfemc.org) at approximately 3:30 p.m., Singapore time, or as soon thereafter as practicable, on such Rate Calculation Date. The Spot Rate will be calculated by SFEMC (or a service provider SFEMC may select in its sole discretion) pursuant to the SFEMC PHP Indicative Survey Methodology (which means a methodology, dated as of December 1, 2004, as amended from time to time, for a centralized industry-wide survey of financial institutions that are active participants in the Philippine Peso/U.S. Dollar markets for the purpose of determining the SFEMC PHP Indicative Survey Rate).">
+	PHP_TELERATE_15439_PHP03 displayName "PHP.TELERATE.15439/PHP03" <"The Spot Rate for a Rate Calculation Date will be the Philippine Peso/U.S. Dollar tom rate (mid market), expressed as the amount of Philippine Pesos per one U.S. Dollar, for settlement in one Business Day which appears on the Telerate Page 15439 at approximately 11:00 a.m., Manila time, on that Rate Calculation Date.">
+	PHP_TELERATE_2920_PHP02 displayName "PHP.TELERATE.2920/PHP02" <"The Spot Rate for a Rate Calculation Date will be the Philippine Peso/U.S. Dollar Specified Rate, expressed as the amount of Philippine Pesos per one U.S. Dollar, for settlement in one Business Day which appears on the Telerate Page 2920 at the Specified Time, if any, on that Rate Calculation Date.">
+	PKR_SBPK_PKR01 displayName "PKR.SBPK/PKR01" <"The Spot Rate for a Rate Calculation Date will be the Pakistani Rupee/U.S. Dollar reference rate expressed as the amount of Pakistani Rupees per one U.S. Dollar, for settlement in two Business Days reported by the State Bank of Pakistan (www.sbp.org.pk) at approximately 2:30 pm, Karachi time, on that Rate Calculation Date.">
+	PKR_SFEMC_INDICATIVE_SURVEY_RATE_PKR02 displayName "PKR.SFEMC.INDICATIVE.SURVEY.RATE/PKR02" <"The Spot Rate for a Rate Calculation Date will be the Pakistani Rupee/U.S. Dollar Specified Rate for U.S. Dollars, expressed as the amount of Pakistani Rupees per one U.S. Dollar, for settlement in two Business Days, as published on SFEMC's website (www.sfemc.org) at approximately 3:30 p.m. Singapore time, or as soon thereafter as practicable, on that Rate Calculation Date. The Spot Rate shall be calculated by SFEMC (or a service provider SFEMC may select in its sole discretion) pursuant to the SFEMC PKR Indicative Survey Methodology (which means a methodology, dated as of July 14, 2008, as amended from time to time, for a centralized industry-wide survey of financial institutions that are active participants in the Pakistani Rupee/U.S. Dollar markets for the purpose of determining the SFEMC PKR Indicative Survey Rate).">
+	PLZ_NBPQ_PLZ01 displayName "PLZ.NBPQ/PLZ01" <"The Spot Rate for a Rate Calculation Date will be the Polish Zloty/U.S. Dollar Specified Rate, expressed as the amount of Polish Zloty per one U.S. Dollar, for settlement in two Business Days reported by the National Bank of Poland which appears on the Reuters Screen NBPQ Page at the Specified Time, if any, on that Rate Calculation Date.">
+	PLZ_NBPR_PLZ02 displayName "PLZ.NBPR/PLZ02" <"The Spot Rate for a Rate Calculation Date will be the Polish Zloty/U.S. Dollar fixing rate, expressed as the amount of Polish Zloty per one U.S. Dollar, for settlement in two Business Days reported by the National Bank of Poland which appears on the Reuters Screen NBPR Page at the Specified Time, if any, on that Rate Calculation Date.">
+	RUB_CME_EMTA_RUB03 displayName "RUB.CME-EMTA/RUB03" <"The Spot Rate for a Rate Calculation Date will be the Russian Ruble/U.S. Dollar Specified Rate, expressed as the amount of Russian Rubles per one U.S. Dollar, for settlement in one Business Day, calculated by the Chicago Mercantile Exchange ('CME') and as published on CME's website, which appears on the Reuters Screen EMTA Page, at approximately 1:30 p.m., Moscow time, on that Rate Calculation Date. The Spot Rate shall be calculated by the CME pursuant to the Chicago Mercantile Exchange / EMTA, Inc. Daily Russian Ruble Per U.S. Dollar Reference Rate Methodology (which means a methodology, effective as of June 16, 2005, as amended from time to time, for a centralized industry-wide survey of financial institutions in Russia that are active participants in the Russian Ruble/U.S. Dollar spot market for the purpose of determining the RUB CME-EMTA Rate).">
+	RUB_EMTA_INDICATIVE_SURVEY_RATE_RUB04 displayName "RUB.EMTA.INDICATIVE.SURVEY.RATE/RUB04" <"The Spot Rate for a Rate Calculation Date will be the Russian Ruble/U.S. Dollar Specified Rate for U.S. Dollars, expressed as the amount of Russian Rubles per one U.S. Dollar, for settlement in one Business Day, as published on EMTA's web site (www.emta.org) at approximately 2:45 p.m., Moscow time, or as soon thereafter as practicable, on such Rate Calculation Date. The Spot Rate shall be calculated by EMTA (or a service provider EMTA may select in its sole discretion) pursuant to the EMTA RUB Indicative Survey Methodology (which means a methodology dated as of June 16, 2005, as amended from time to time, for a centralized industry-wide survey of financial institutions that are active participants in the Russian Ruble/U.S. Dollar spot market for the purpose of determining the EMTA RUB Indicative Survey Rate).">
+	RUB_MICEXFRX_RUB01 displayName "RUB.MICEXFRX/RUB01" <"The Spot Rate for a Rate Calculation Date will be the Russian Ruble/U.S. Dollar Specified Rate, expressed as the amount of Russian Rubies per one U.S. Dollar, for settlement on the same day reported by the Moscow Interbank Currency Exchange which appears on the Reuters Screen MICEXFRX Page as of 10:30 a.m., Moscow time, on that Rate Calculation Date.">
+	RUB_MMVB_RUB02 displayName "RUB.MMVB/RUB02" <"The Spot Rate for a Rate Calculation Date will be the Russian Ruble/U.S. Dollar Specified Rate, expressed as the amount of Russian Rubies per one U.S. Dollar, for settlement on the same day reported by the Moscow Interbank Currency Exchange which appears on the Reuters Screen MMVB Page as of 10:30 a.m., Moscow time, on that Rate Calculation Date.">
+	SGD_VWAP_SGD3 displayName "SGD.VWAP/SGD3" <"The Spot Rate for a Rate Calculation Date will be the Singapore Dollar/U.S. Dollar spot rate expressed as the amount of Singapore Dollar per one U.S. Dollar for settlement in two Business Days, reported by ABS Benchmarks Administration Co Pte. Ltd. (or its successor as administrator or sponsor of the rate), which appears on Thomson Reuters Screen ABSFIX01 Page at approximately 11:30 a.m., Singapore time, on that Rate Calculation Date.">
+	SKK_NBSB_SKK01 displayName "SKK.NBSB/SKK01" <"The Spot Rate for a Rate Calculation Date will be the Slovak Koruna/U.S. Dollar Specified Rate, expressed as the amount of Slovak Koruna per one U.S. Dollar, for settlement in two Business Days reported by the National Bank of Slovakia which appears on the Reuters Screen NBSB Page as of 11:40 a.m., Bratislava time, on that Rate Calculation Date.">
+	THB_ABS_THB01 displayName "THB.ABS/THB01" <"The Spot Rate for a Rate Calculation Date will be the Thai Baht/U.S. Dollar spot rate at 11:00 a.m., Singapore time, expressed as the amount of Thai Bhaht per one U.S. Dollar, for settlement in two Business Days, reported by the Association of Banks in Singapore which appears on the Reuters Screen ABSIRFIX01 Page to the right of the caption 'Spot' under the column 'THB' at approximately 11:30 a.m., Singapore time, on that Rate Calculation Date.">
+	THB_VWAP_THB01 displayName "THB.VWAP/THB01" <"The Spot Rate for a Rate Calculation Date will be the Thai Baht / U.S. Dollar spot rate expressed as the amount of Thai Baht per one U.S. Dollar for settlement in two Business Days, reported by ABS Benchmarks Administration Co Pte. Ltd. (or its successor as administrator or sponsor of the rate), which appears on Thomson Reuters Screen ABSFIX01 Page at approximately 11:30 a.m., Singapore time, on that Rate Calculation Date.">
+	TWD_SFEMC_INDICATIVE_SURVEY_RATE_TWD04 displayName "TWD.SFEMC.INDICATIVE.SURVEY.RATE/TWD04" <"The Spot Rate for a Rate Calculation Date will be the Taiwanese Dollar/U.S. Dollar Specified Rate for U.S. Dollars, expressed as the amount of Taiwanese Dollars per one U.S. Dollar, for settlement in two Business Days, as published on SFEMC's website (www.sfemc.org) at approximately 3:30 p.m., Singapore time, or as soon thereafter as practicable, on such Rate Calculation Date. The Spot Rate will be calculated by SFEMC (or a service provider SFEMC may select in its sole discretion) pursuant to the SFEMC TWD Indicative Survey Methodology (which means a methodology, dated as of December 1, 2004, as amended from time to time, for a centralized industry-wide survey of financial institutions that are active participants in the Taiwanese Dollar/U.S. Dollar markets for the purpose of determining the SFEMC TWD Indicative Survey Rate).">
+	TWD_TAIFX1_TWD03 displayName "TWD.TAIFX1/TWD03" <"The Spot Rate for a Rate Calculation Date will be the Taiwanese Dollar/U.S. Dollar spot rate, expressed as the amount of Taiwanese Dollars per one U.S. Dollar, for settlement in two Business Days, reported by the Taipei Forex Inc. which appears on the Reuters Screen TAIFX1 Page under the heading 'Spot' as of 11:00 a.m. Taipei time, on that Rate Calculation Date, or if no rate appears as of 11:00 a.m., Taipei time, the rate that first appears in any of the next succeeding 15 minute intervals after such time, up to and including 12:00 noon, Taipei time on that Rate Calculation Date.">
+	TWD_TELERATE_6161_TWD01 displayName "TWD.TELERATE.6161/TWD01" <"The Spot Rate for a Rate Calculation Date will be the Taiwanese Dollar/U.S. Dollar spot rate, expressed as the amount of Taiwanese Dollars per one U.S. Dollar, for settlement in two Business Days, reported by the Taipei Forex Inc. which appears on the Telerate Page 6161 under the heading 'Spot' as of 11:00 a.m., Taipei time, on that Rate Calculation Date, or if no rate appears as of 11:00 a.m., Taipei time, the rate that first appears in any of the next succeeding 15 minute intervals after such time, up to and including 12:00 noon, Taipei time, on that Rate Calculation Date.">
+	TWD_TFEMA_TWD02 displayName "TWD.TFEMA/TWD02" <"The Spot Rate for a Rate Calculation Date will be the Taiwanese Dollar/U.S. Dollar Specified Rate, expressed as the amount of Taiwanese Dollars per one U.S. Dollar, for settlement in two Business Days which appears on the Reuters Screen TFEMA Page as of 11:00 a.m., Taipei time, on that Rate Calculation Date.">
+	UAH_EMTA_INDICATIVE_SURVEY_RATE_UAH03 displayName "UAH.EMTA.INDICATIVE.SURVEY.RATE/UAH03" <"The Spot Rate for a Rate Calculation Date will be the Ukrainian Hryvnia/U.S. Dollar Specified Rate for U.S. Dollars, expressed as the amount of Ukrainian Hryvnia per one U.S. Dollar, for settlement on the same Business Day, as published on EMTA's website (www.emta.org) at approximately 2:00 p.m., Kiev time, or as soon thereafter as practicable, on that Rate Calculation Date. The Spot Rate shall be calculated by EMTA (or a service provider EMTA may select in its sole discretion) pursuant to the EMTA UAH Indicative Survey Methodology (which means a methodology, dated as of March 16, 2009, as amended from time to time, for a centralized industry-wide survey of financial institutions that are active participants in the Ukrainian Hryvnia / U.S. Dollar markets for the purpose of determining the EMTA UAH Indicative Survey Rate).">
+	UAH_EMTA_INDUSTRY_SURVEY_RATE_UAH02 displayName "UAH.EMTA.INDUSTRY.SURVEY.RATE/UAH02" <"The Spot Rate for a Rate Calculation Date will be the Ukrainian Hryvnia/U.S. Dollar Specified Rate for U.S. Dollars expressed as the amount of Ukrainian Hryvnia per one U.S. Dollar, for settlement on the same Business Day calculated by Thomson Reuters pursuant to the EMTA UAH Industry Survey Methodology, which rate appears on EMTA's website (www.emta.org) and on Thomson Reuters Page EMTAUAHFIX at approximately 11:30 am, Kiev time, on that Rate Calculation Date. The 'EMTA UAH Industry Survey Methodology' as used herein means the methodology dated as of March 16, 2009, for a centralized industry wide survey of financial institutions in the Ukrainian Hryvnia/U.S. Dollar spot market for the purposes of determining the EMTA UAH Industry Survey Rate.">
+	UAH_GFI_UAH01 displayName "UAH.GFI/UAH01" <"The Spot Rate for a Rate Calculation Date will be the Ukrainian Hryvnia/U.S. Dollar spot rate, expressed as the amount of Ukrainian Hryvnia per one U.S. Dollar, for settlement on the same Business Day reported by GFI Brokers on Thomson Reuters Page GFIU by 9:30 am, London time, on that Rate Calculation Date.">
+	VEF_FIX_VEF01 displayName "VEF.FIX/VEF01" <"The Spot Rate for a Rate Calculation Date will be the midpoint of the Venezuelan Bolivar /U.S. Dollar Tipo de Cambio De Referencia buying and selling rates, expressed as the amount of Venezuelan Bolivar per one U.S. Dollar, for settlement in two Business Days reported by the Banco Central de Venezuela (www.bcv.org.ve) at approximately 5:00 p.m., Caracas time, on that Rate Calculation Date.">
+	VND_ABS_VND01 displayName "VND.ABS/VND01" <"The Spot Rate for a Rate Calculation Date will be the Vietnamese Dong/U.S. Dollar spot rate at 11:00 a.m., Singapore time, expressed as the amount of Vietnamese Dong per one U.S. Dollar, for settlement in two Business Days reported by the Association of Banks in Singapore, which appears on the Reuters Screen ABSIRFIX01 Page to the right of the caption 'Spot' under the column 'VND' at approximately 11:30 a.m., Singapore time, on that Rate Calculation Date.">
+	VND_FX_VND02 displayName "VND.FX/VND02" <"The Spot Rate for a Rate Calculation Date will be the Vietnamese Dong/U.S. Dollar spot rate expressed as the amount of Vietnamese Dong per one U.S. Dollar, for settlement in two Business Days which appears on Reuters Screen VNDFIX=VN Page under the caption 'Spot' and to the right of the caption 'Average' at approximately 11:00 am, Hanoi time, on that Rate Calculation Date.">
+	VND_SFEMC_INDICATIVE_SURVEY_RATE_VND03 displayName "VND.SFEMC.INDICATIVE.SURVEY.RATE/VND03" <"The Spot Rate for a Rate Calculation Date will be the Vietnamese Dong/U.S. Dollar Specified Rate for U.S. Dollars, expressed as the amount of Vietnamese Dong per one U.S. Dollar, for settlement in two Business Days, as published on SFEMC's website (www.sfemc.org) at approximately 3:30 p.m., Singapore time, or as soon as thereafter as practicable, on that Rate Calculation Date. The Spot Rate shall be calculated by SFEMC (or a service provider SFEMC may select in its sole discretion) pursuant to the SFEMC VND Indicative Survey Methodology (which means a methodology, dated as of July 14, 2008, as amended from time to time, for a centralized industry-wide survey of financial institutions that are active participants in the Vietnamese Dong/U.S. Dollar markets for the purpose of determining the SFEMC VND Indicative Survey Rate).">
+
+enum PartyDeterminationEnum: <"The enumerated values to specify how a calculation agent will be determined.">
+	ExercisingParty <"The party that gives notice of exercise. Per 2000 ISDA Definitions, Section 11.1. Parties, paragraph (d).">
+	NonExercisingParty <"The party that is given notice of exercise. Per 2000 ISDA Definitions, Section 11.1. Parties, paragraph (e).">
+	AsSpecifiedInMasterAgreement <"The Calculation Agent is determined by reference to the relevant master agreement.">
+	AsSpecifiedInStandardTermsSupplement <"The Calculation Agent is determined by reference to the relevant standard terms supplement.">
+	Both <"Both parties with joined rights to be a calculation agent.">
+
+enum PriceTypeEnum: <"Provides enumerated values for types of prices in the Price data type in order to explain how to interpret the amount and use it in calculations.">
+ 	AssetPrice <"Denotes a price expressed as a cash amount in a given currency to purchase a unit of an asset (e.g. a security or a commodity).">
+ 	CashPrice <"Denotes a price expressed as a cash amount for an upfront fee or other purposes. For example, {amount, unitOfAmount, PerUnitOfAmount} = [12,500, USD, null] = USD 12,500.">
+    Correlation <"Denotes a price expressed as the weighted average of all pairwise correlation coefficients.">
+    Dividend <"Denotes a price expressed as the dividend payment from a index or share.">
+	ExchangeRate <"Denotes a rate to convert one currency or other measure of value to another. Foreign Exchange rates are represented in decimals, e.g. {amount, unitOfAmount, PerUnitOfAmount} = [1.23, USD, GBP] = USD 1.23 for every 1 GBP.">
+ 	InterestRate <"Denotes a price expressed as a rate to be applied to quantity/notional amount and represented as decimal, e.g. {amount, unitOfAmount, PerUnitOfAmount} = [0.08, EUR, EUR] = 8%  of the EUR notional quantity/amount or 8 cents for every EUR of notional amount.">
+		[docReference ICMA GMRA namingConvention "Pricing Rate"
+			provision "As defined in the GMRA, paragraph 2(ll) The pricing rate is the per annum percentage rate for calculation of the Price Differential agreed to by Buyer and Seller in relation to that Transaction."]
+		[docReference ICMA ERCCBestPractice namingConvention "Pricing Rate"	
+			provision "ERCC Guide: Annex II  Glossary of repo terminology. Repo rate is the market term for the annualised percentage rate of interest on the cash in a repo. Legally-speaking, however, the term is a misnomer, as the legal form of a repo is not an interest-paying loan or deposit. Rather, the return is just the difference between two securities prices. In the GMRA, the repo rate is called the Pricing Rate. Traditionally, the repo rate was the price of a Repurchase Transaction but Buy/Sell-Backs are now often quoted in the same way."]
+    Variance <"Denotes a price expressed as the the arithmetic average of the squared differences from the mean value of an observable price.">
+    Volatility <"Denotes a price expressed as the the square root of the arithmetic average of the squared differences from the mean value of an observable price.">
+
+enum CashPriceTypeEnum: <"Provides a list of possible types of cash prices, applicable when PriceTypeEnum is itself of type CashPrice.">
+ 	Premium <"Denotes the amount payable by the buyer to the seller for an option. The premium is paid on the specified premium payment date or on each premium payment date if specified.">
+ 	Fee <"A generic term for describing a non-scheduled cashflow that can be associated either with the initial contract, with some later corrections to it (e.g. a correction to the day count fraction that has a cashflow impact) or with some lifecycle events. Fees that are specifically associated with termination and partial termination, increase, amendment, and exercise events are qualified accordingly.">
+ 	Discount <"Denotes a discount factor expressed as a decimal, e.g. 0.95.">
+
+enum FeeTypeEnum: <"The enumerated values to specify an event that has given rise to a fee.">
+ 	Assignment <"A cash flow resulting from the assignment of a contract to a new counterparty.">
+	BrokerageCommission <"The brokerage commission.">
+ 	Increase <"A cash flow associated with an increase lifecycle event.">
+ 	Novation <"The novation fee.">
+ 	PartialTermination <"A cash flow associated with a partial termination lifecycle event.">
+	Premium <"Denotes the amount payable by the buyer to the seller for an option. The premium is paid on the specified premium payment date or on each premium payment date if specified.">
+	Renegotiation <"A cash flow associated with a renegotiation lifecycle event.">
+ 	Termination <"A cash flow associated with a termination lifecycle event.">
+ 	Upfront <"An upfront cashflow associated to the swap to adjust for a difference between the swap price and the current market price.">
+	CreditEvent <"A cash flow associated with a credit event.">
+	CorporateAction <"A cash flow associated with a corporate action">
+
+enum PremiumTypeEnum: <"The enumerated values to specify the premium type for forward start options.">
+	PrePaid
+	PostPaid
+	Variable
+	Fixed
+
+enum PriceOperandEnum:
+    AccruedInterest
+    Commission
+    ForwardPoint
+
+enum CsaTypeEnum:  <"How is the Creadit Support Annex defined for this transaction as defined in the 2021 ISDA Definitions, section 18.2.1 ">
+	NoCSA  displayName "NoCSA" <"There is no CSA applicable">
+	ExistingCSA  displayName "ExistingCSA" <"Thre is an existing Credit Support Annex">
+	ReferenceVMCSA displayName "ReferenceVMCSA" <"There is a bilateral Credit Support Annex specific to the transaction">
+
+enum OptionReferenceTypeEnum: <"The enumeration values to specify the reference source that determines the final settlement price of the option.">
+   Future <"Reference from the price of a future contract.">
+   Spot <"Reference from an underlyer spot price.">
diff --git a/rosetta-source/src/main/resources/observable-common-enum.rosetta b/rosetta-source/src/main/resources/observable-common-enum.rosetta
new file mode 100644
index 0000000000..6dd26f4f04
--- /dev/null
+++ b/rosetta-source/src/main/resources/observable-common-enum.rosetta
@@ -0,0 +1,33 @@
+namespace cdm.observable.common
+version "${project.version}"
+
+import cdm.base.*
+
+enum TimeTypeEnum: <"The enumerated values to specify points in the day when option exercise and valuation can occur.">
+	Close <"The official closing time of the exchange on the valuation date.">
+	Open <"The official opening time of the exchange on the valuation date.">
+	OSP <"The time at which the official settlement price is determined.">
+	SpecificTime <"The time specified in the element equityExpirationTime or valuationTime (as appropriate).">
+	XETRA <"The time at which the official settlement price (following the auction by the exchange) is determined by the exchange.">
+	DerivativesClose <"The official closing time of the derivatives exchange on which a derivative contract is listed on that security underlier.">
+	AsSpecifiedInMasterConfirmation <"The time is determined as provided in the relevant Master Confirmation.">
+
+enum DeterminationMethodEnum: <"The enumerated values to specify the method according to which an amount or a date is determined.">
+	[docReference ISDA FpML_Coding_Scheme schemeLocation "http://www.fpml.org/coding-scheme/determination-method"]
+
+	AgreedInitialPrice <"Agreed separately between the parties.">
+	AsSpecifiedInMasterConfirmation <"As specified in Master Confirmation.">
+	CalculationAgent <"Determined by the Calculation Agent.">
+	ClosingPrice <"Official Closing Price.">
+	DividendCurrency <"Determined by the Currency of Equity Dividends.">
+	ExpiringContractLevel <"The initial Index Level is the level of the Expiring Contract as provided in the Master Confirmation.">
+	HedgeExecution <"Determined by the Hedging Party.">
+	IssuerPaymentCurrency <"Issuer Payment Currency.">
+	NAV <"Net Asset Value.">
+	OpenPrice <"Opening Price of the Market.">
+	OSPPrice <"OSP Price.">
+	SettlementCurrency <"Settlement Currency.">
+	StrikeDateDetermination <"Date on which the strike is determined in respect of a forward starting swap.">
+	TWAPPrice <"Official TWAP Price.">
+	ValuationTime <"Price determined at valuation time.">
+	VWAPPrice <"Official VWAP Price.">
diff --git a/rosetta-source/src/main/resources/product-asset-enum.rosetta b/rosetta-source/src/main/resources/product-asset-enum.rosetta
new file mode 100644
index 0000000000..763f8d54bd
--- /dev/null
+++ b/rosetta-source/src/main/resources/product-asset-enum.rosetta
@@ -0,0 +1,151 @@
+namespace cdm.product.asset : <"Product concepts applicable to specific asset classes.">
+version "${project.version}"
+
+import cdm.base.*
+import cdm.mapping.config.*
+
+enum CompoundingMethodEnum: <"The enumerated values to specify the type of compounding, e.g. flat, straight.">
+	Flat <"Flat compounding. Compounding excludes the spread. Note that the first compounding period has it's interest calculated including any spread then subsequent periods compound this at a rate excluding the spread.">
+	None <"No compounding is to be applied.">
+	Straight <"Straight compounding. Compounding includes the spread.">
+	SpreadExclusive <"Spread Exclusive compounding.">
+
+enum DayDistributionEnum: <"Denotes the method by which the pricing days are distributed across the pricing period.">
+	All
+	First
+	Last
+	Penultimate
+
+enum DiscountingTypeEnum: <"The enumerated values to specify the method of calculating discounted payment amounts. This enumerations combines the FpML DiscountingTypeEnum and FraDiscountingEnum enumerations.">
+	Standard <"As specified by the 2006 ISDA Definitions, Section 8.4. Discounting, paragraph (a).">
+	FRA <"As specified by the 2006 ISDA Definitions, Section 8.4. Discounting, paragraph (b).">
+	FRAYield <"As specified by the 2006 ISDA Definitions, Section 8.4. Discounting, paragraph (e).">
+	AFMA <"As specified by the Australian Financial Markets Association (AFMA) OTC Financial Product Conventions. This discounting method should not be used for a trade documented under a legal framework where the 2006 ISDA Definitions have been incorporated.">
+
+enum DividendAmountTypeEnum: <"The enumerated values to specify whether the dividend is paid with respect to the Dividend Period.">
+	RecordAmount <"The record date for a dividend occurs during a dividend period.">
+	ExAmount <"The ex-date for a dividend occurs during a dividend period.">
+	PaidAmount <"The payment date for a dividend occurs during a dividend period.">
+	AsSpecifiedInMasterConfirmation <"The Amount is determined as provided in the relevant Master Confirmation.">
+
+enum DividendCompositionEnum: <"The enumerated values to specify how the composition of Dividends is to be determined.">
+	EquityAmountReceiverElection <"The Equity Amount Receiver determines the composition of dividends (subject to conditions).">
+	CalculationAgentElection <"The Calculation Agent determines the composition of dividends (subject to conditions).">
+
+enum DividendDateReferenceEnum: <"The enumerated values to specify the date by reference to which the dividend will be paid.">
+	AdHocDate <"The dividend date will be specified ad-hoc by the parties, typically on the dividend ex-date.">
+	CashSettlementPaymentDate <"If 'Dividend Payment Date(s)' is specified in the Transaction Supplement as 'Cash Settlement Payment Date', then the Dividend Payment Date in respect of a Dividend Amount shall be the Cash Settlement Payment Date relating to the end of the Dividend Period during which the Shares commenced trading 'ex' the relevant dividend on the Exchange.">
+	CashSettlePaymentDateExDiv <"If 'Dividend Payment Date(s)' is specified in the Transaction Supplement as 'Cash Settlement Payment Date – Ex Dividend'', then the Dividend Payment Date in respect of a Dividend Amount shall be the Cash Settlement Payment Date relating to the end of the Dividend Period during which the Shares commenced trading 'ex' the relevant dividend on the Exchange.">
+	CashSettlePaymentDateIssuerPayment <"If 'Dividend Payment Date(s)' is specified in the Transaction Supplement as 'Cash Settlement Payment Date – Issuer Payment', then the Dividend Payment Date in respect of a Dividend Amount shall be the Cash Settlement Payment Date relating to the end of the Dividend Period during which the issuer pays the relevant dividend to a holder of record provided that in the case where the Equity Amount Payer is the party specified to be the sole Hedging Party and the Hedging Party has not received the Dividend Amount by such date, then the date falling a number of Currency Business Days as specified in the Cash Settlement Payment Date after actual receipt by the Hedging Party of the Received Ex Amount or Paid Ex Amount (as applicable).">
+	CumulativeEquityExDiv <"Total of dividends which go ex, paid on next following Equity Payment Date, which is immediately following the Dividend Period during which the Shares commence trading ex-dividend on the Exchange.">
+	CumulativeEquityPaid <"Total of paid dividends, paid on next following Equity Payment Date, which is immediately following the Dividend Period during which the dividend is paid by the Issuer to the holders of record of a Share.">
+	CumulativeEquityExDivBeforeReset <"Total of paid dividends, paid on next following Equity Payment Date, which is immediately following the Dividend Ex Date, unless the Dividend Ex Date is between the Equity Valuation and Payment Date in which case the dividend is deferred to the following Equity Payment Date">
+	CumulativeEquityPaidBeforeReset <"Total of paid dividends, paid on next following Equity Payment Date, which is immediately following the Dividend Pay Date, unless the Dividend Pay Date is between the Equity Valuation and Payment Date (not including the Valuation Date) in which case the dividend is deferred to the following Equity Payment Date">
+	CumulativeEquityPaidInclReset <"Total of paid dividends, paid on next following Equity Payment Date, which is immediately following the Dividend Pay Date, unless the Dividend Pay Date is between the Equity Valuation and Payment Date (including the Valuation Date) in which case the dividend is deferred to the following Equity Payment Date">
+	CumulativeInterestExDiv <"Total of dividends which go ex, paid on next following Interest Payment Date, which is immediately following the Dividend Period during which the Shares commence trading ex-dividend on the Exchange, or where the date on which the Shares commence trading ex-dividend is a Payment Date, such Payment Date.">
+	CumulativeInterestPaid <"Total of paid dividends, paid on next following Interest Payment Date, which is immediately following the Dividend Period during which the dividend is paid by the Issuer to the holders of record of a Share.">
+	CumulativeInterestPaidInclReset <"Total of paid dividends, paid on next following Interest Payment Date, which is immediately following the Dividend Pay Date, unless the Dividend Pay Date is between the Equity Valuation and Payment Date (including the Valuation Date) in which case the dividend is deferred to the following Interest Payment Date.">
+	CumulativeInterestPaidBeforeReset <"Total of paid dividends, paid on next following Interest Payment Date, which is immediately following the Dividend Pay Date, unless the Dividend Pay Date is between the Equity Valuation and Payment Date (not including the Valuation Date) in which case the dividend is deferred to the following Interest Payment Date.">
+	DividendPaymentDate <"Date on which the dividend will be paid by the issuer.">
+	DividendValuationDate <"In respect of each Dividend Period, the relevant Dividend Valuation Date.">
+	EquityPaymentDate <"Equity payment date of the swap.">
+	ExDate <"Date on which a holder of the security is entitled to the dividend.">
+	FloatingAmountPaymentDate <"If 'Dividend Payment Date(s)' is specified in the Transaction Supplement as 'Floating Amount Payment Date', then the Dividend Payment Date in respect of a Dividend Amount shall be the first Payment Date falling at least one Settlement Cycle after the date that the Shares have commenced trading 'ex' the relevant dividend on the Exchange.">
+	FollowingPaymentDate <"The next payment date of the swap.">
+	RecordDate <"Date on which the dividend will be recorded in the books of the paying agent.">
+	SharePayment <"If 'Dividend Payment Date(s)' is specified in the Transaction Supplement as 'Share Payment', then the Dividend Payment Date in respect of a Dividend Amount shall fall on a date on or before the date that is two (or any other number that is specified in the Transaction Supplement) Currency Business Days following the day on which the Issuer of the Shares pays the relevant dividend to holders of record of the Shares.">
+	TerminationDate <"Termination date of the swap.">
+	TradeDate <"Trade date of the swap">
+	UnwindOrEquityExDiv <"Pays a fraction of the Dividend Amount on each Unwind Trade Settlement Date which occurs after the Dividend Ex Date, until position is fully unwound OR on the next Equity Pay Date after the Dividend Pay Date. This will be whichever date comes first or a combination of both.">
+	UnwindOrEquityPaid <"Pays a fraction of the Dividend Amount on each Unwind Trade Settlement Date which occurs after the Dividend Pay Date, until position is fully unwound OR on the next Equity Pay Date after the Dividend Pay Date. This will be whichever date comes first or a combination of both.">
+	UnwindOrInterestExDiv <"Pays a fraction of the Dividend Amount on each Unwind Trade Settlement Date which occurs after the Dividend Ex Date, until position is fully unwound OR on the next Interest Pay Date after the Dividend Ex Date. This will be whichever date comes first or a combination of both.">
+	UnwindOrInterestPaid <"Pays a fraction of the Dividend Amount on each Unwind Trade Settlement Date which occurs after the Dividend Pay Date, until position is fully unwound OR on the next Interest Pay Date after the Dividend Pay Date. This will be whichever date comes first or a combination of both.">
+	UnwindExDiv <"Pays a fraction of the total on each Unwind Trade Settlement Date which occurs after the Dividend Ex Date, until trade is fully unwound.">
+	UnwindPaid <"Pays a fraction of the total on each Unwind Trade Settlement Date which occurs after the Dividend Pay Date, until trade is fully unwound.">
+
+enum DividendEntitlementEnum: <"The enumerated values to specify the date on which the receiver of the equity payout is entitled to the dividend.">
+	ExDate <"Dividend entitlement is on the dividend ex-date.">
+	RecordDate <"Dividend entitlement is on the dividend record date.">
+		[synonym FIX_5_0_SP2 value "RecordDate"]
+
+enum DividendPeriodEnum: <"2002 ISDA Equity Derivatives Definitions: First Period, Second Period |">
+	FirstPeriod <"2002 ISDA Equity Derivatives Definitions: First Period means each period from, and including, one Cash Settlement Payment Date or Settlement Date, as the case may be, to, but excluding, the next following Cash Settlement Payment Date or Settlement Date, as the case may be, except that (i) the initial Dividend Period will commence on, and include, the Clearance System Business Day that is one Settlement Cycle following the Trade Date and (ii) the final Dividend Period will end on, but exclude, the final Cash Settlement Payment Date or Settlement Date, as the case may be.">
+	SecondPeriod <"2002 ISDA Equity Derivatives Definitions: Second Period means each period from, but excluding, one Valuation Date to, and including, the next Valuation Date, except that (i) the initial Dividend Period will commence on, but exclude, the Trade Date and (ii) the final Dividend Period will end on, and include, the final Valuation Date or, in respect of a Physically-settled Forward Transaction to which Variable Obligation is not applicable, the date that is one Settlement Cycle prior to the Settlement Date.">
+
+enum IndexAnnexSourceEnum: <"The enumerated values to specify the CDX index annex source.">
+	MasterConfirmation <"As defined in the relevant form of Master Confirmation applicable to the confirmation of Dow Jones CDX indices.">
+	Publisher <"As defined in the relevant form of Master Confirmation applicable to the confirmation of Dow Jones CDX indices.">
+
+enum InterestShortfallCapEnum: <"The enumerated values to specify the interest shortfall cap, applicable to mortgage derivatives.">
+	Fixed
+	Variable
+
+enum LoadTypeEnum: <"Specifies the load type of the delivery.">
+    BaseLoad <"Base load">
+    PeakLoad <"Peak load">
+    OffPeak <"Off-peak load">
+    BlockHours <"Block Hours">
+    Shaped <"Shaped">
+    GasDay <"Gas Day">
+    Other <"Other">
+    
+enum NegativeInterestRateTreatmentEnum: <"The enumerated values to specify the method of calculating payment obligations when a floating rate is negative (either due to a quoted negative floating rate or by operation of a spread that is subtracted from the floating rate).">
+	NegativeInterestRateMethod <"Negative Interest Rate Method. Per 2000 ISDA Definitions, Section 6.4 Negative Interest Rates, paragraphs (b) and (c).">
+	ZeroInterestRateMethod <"Zero Interest Rate Method. Per 2000 ISDA Definitions, Section 6.4. Negative Interest Rates, paragraphs (d) and (e).">
+	ZeroInterestRateExcludingSpreadMethod <"Per 2021 ISDA Definitions section 6.8.6">
+
+enum NonCashDividendTreatmentEnum: <"The enumerated values to specify the treatment of Non-Cash Dividends.">
+	PotentialAdjustmentEvent <"The treatment of any non-cash dividend shall be determined in accordance with the Potential Adjustment Event provisions.">
+	CashEquivalent <"Any non-cash dividend shall be treated as a Declared Cash Equivalent Dividend.">
+
+enum RateTreatmentEnum: <"The enumerated values to specify the methods for converting rates from one basis to another.">
+	BondEquivalentYield <"Bond Equivalent Yield. Per Annex to the 2000 ISDA Definitions (June 2000 Version), Section 7.3. Certain General Definitions Relating to Floating Rate Options, paragraph (g).">
+	MoneyMarketYield <"Money Market Yield. Per Annex to the 2000 ISDA Definitions (June 2000 Version), Section 7.3. Certain General Definitions Relating to Floating Rate Options, paragraph (h).">
+
+enum ReturnTypeEnum: <"The enumerated values to specify the type of return associated the equity payout.">
+	Price <"Price return, i.e. excluding dividends.">
+	Total <"Total return, i.e. including dividend and price components.">
+
+enum SettledEntityMatrixSourceEnum: <"The enumerated values to specify the relevant settled entity matrix source.">
+	ConfirmationAnnex <"The Relevant Settled Entity Matrix shall be the list agreed for this purpose by the parties. The list is not included as part of the electronic confirmation.">
+	NotApplicable <"The term is not applicable.">
+	Publisher <"The Settled Entity Matrix published by the Index Publisher.">
+
+enum SpreadScheduleTypeEnum: <"The enumerated values to specify a long or short spread value.">
+	Long <"Represents a Long Spread Schedule. Spread schedules defined as 'Long' will be applied to Long Positions.">
+	Short <"Represents a Short Spread Schedule. Spread schedules defined as 'Short' will be applied to Short Positions.">
+
+enum RollSourceCalendarEnum: <"Used in conjunction with an exchange-based pricing source. Identifies a date source calendar from which the pricing dates and thus roll to the next contract will be based off (e.g. pricing is based on the NYMEX WTI First Nearby Futures Contract, if Future is chosen, the pricing will roll to the next futures contract on expiration, if ListedOption is chosen, the pricing will roll to the next futures contract on the Option expiration date which is three business days before the expiration of the NYMEX WTI futures contract.) Omitting this element will result in the default behavior expected with the pricing source described within the commodity element.">
+   ListedOption
+   Future
+
+enum CreditSeniorityEnum: <"Seniority of debt instruments comprising the index.">
+	[docReference ISDA FpML_Coding_Scheme schemeLocation "http://www.fpml.org/coding-scheme/credit-seniority"]
+
+	Other <"Other as defined under EMIR.">
+	SeniorLossAbsorbingCapacity <"Senior Loss Absorbing Capacity (RED Tier Code: SNRLAC).">
+	SeniorSec <"Senior domestic (RED Tier Code: SECDOM).">
+	SeniorUnSec <"Senior foreign (RED Tier Code: SNRFOR).">
+	SubLowerTier2 <"Subordinate, Lower Tier 2 (RED Tier Code: SUBLT2).">
+	SubTier1 <"Subordinate Tier 1 (RED Tier Code: PREFT1).">
+	SubTier3 <"Subordinate, Tier 3.">
+	SubUpperTier2 <"Subordinate, Upper Tier 2 (RED Tier Code: JRSUBUT2).">
+
+enum RealisedVarianceMethodEnum: <"The contract specifies which price must satisfy the boundary condition.  Used for variance, volatility and correlation caps and floors.">
+
+    Previous <"For a return on day T, the observed price on T-1 must be in range.">
+    Last <"For a return on day T, the observed price on T must be in range.">
+    Both <"For a return on day T, the observed prices on both T and T-1 must be in range">
+
+enum FPVFinalPriceElectionFallbackEnum: <"Specifies the fallback provisions in respect to the applicable Futures Price Valuation.">
+
+	  FPVClose <"In respect of the Early Final Valuation Date, the provisions for FPV Close shall apply.">
+	  FPVHedgeExecution <"In respect of the Early Final Valuation Date, the provisions for FPV Hedge Execution shall apply.">
+
+enum FinalPrincipalExchangeCalculationEnum: <"To be specified only for products that embed a redemption payment.">
+    Floored <"If Floored is set then Principal Exchange takes the form: Notional Amount * Max(1, Index Final/ Index Base).">
+    NonFloored <"If NonFloored is set then the Principal Exchange takes the form: Notional Amount * Index Final / Index Base.">
+
+enum SpreadCalculationMethodEnum: <"Method by which spread is calculated. For example on an asset swap: 'ParPar' or 'Proceeds' may be the method indicated.">
+    ParPar
+    Proceeds
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/Basis-ex01-LIBOR-vs-SOFR.json b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/Basis-ex01-LIBOR-vs-SOFR.json
index d9e1d85955..bba0f4edc4 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/Basis-ex01-LIBOR-vs-SOFR.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/Basis-ex01-LIBOR-vs-SOFR.json
@@ -1,273 +1,80 @@
 {
-  "creditLimitInformation" : {
-    "limitApplicable" : [ {
-      "amountRemaining" : 998777731300,
-      "amountUtilized" : 1222268700,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NOTIONAL"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 100000000,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    }, {
-      "amountRemaining" : 999994399919,
-      "amountUtilized" : 5600080,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NPV"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : -1181958,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    }, {
-      "amountRemaining" : 999999900607,
-      "amountUtilized" : 99392,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "PV01"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 227,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    }, {
-      "amountRemaining" : 999999898145,
-      "amountUtilized" : 101854,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "PV01"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 227,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "ACCOUNT"
-      }
-    }, {
-      "amountRemaining" : 998800000000,
-      "amountUtilized" : 1200000000,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NOTIONAL"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 100000000,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "ACCOUNT"
-      }
-    }, {
-      "amountRemaining" : 999994854696,
-      "amountUtilized" : 5145303,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NPV"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : -1181958,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "ACCOUNT"
-      }
-    } ]
-  },
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "cme_message_id"
-      },
-      "value" : "0109369931"
-    },
-    "sentBy" : {
-      "meta" : {
-        "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "meta" : {
-        "scheme" : "cme_firm_id"
-      },
-      "value" : "010"
-    }, {
-      "meta" : {
-        "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "13a3c110"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "cad560cc"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "010S3"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "6a05b6df"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              }
-            } ],
-            "clearedDate" : "2018-10-31",
-            "meta" : {
-              "globalKey" : "cad560cc"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "ba4f"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "9369931",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "010"
-                },
-                "meta" : {
-                  "globalKey" : "ba4f"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "43401077-2",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "66b48bac"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "MARKIT_WIRE"
-                },
+                  "value" : "43401077",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43401965",
+                  "meta" : {
+                    "scheme" : "platform_side_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43401077",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "4a63df84"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "66b48bac"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
               },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "66b48bac"
-              },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS9369931",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "4ac79bd4"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-31",
+              "meta" : {
+                "globalKey" : "3f129f"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "ba4f"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -278,46 +85,48 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "245965f8"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-2"
+                              }
+                            },
+                            "spreadSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "5a9469c9"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d1d"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "2"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -326,42 +135,149 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "65ba31b"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2022-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "245965f8"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "5a9469c9"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "4710a047"
-                              },
-                              "unadjustedDate" : "2022-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "4710a047"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "245965f8"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "5a9469c9"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "2049"
+                            },
+                            "rollConvention" : "2"
+                          },
+                          "meta" : {
+                            "globalKey" : "b72a0ef1",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b",
+                                "externalKey" : "floatPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "e18d000c",
+                            "externalKey" : "floatingLegPaymentDates"
+                          }
+                        },
+                        "resetDates" : {
+                          "calculationPeriodDatesReference" : {
+                            "globalReference" : "b72a0ef1",
+                            "externalReference" : "floatingCalcPeriodDates"
+                          },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
+                          "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "1a78799e"
+                            },
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "21479e"
+                              }
+                            },
+                            "dateRelativeTo" : {
+                              "globalReference" : "6cfd7cb9",
+                              "externalReference" : "floatingLegResetDates"
+                            }
+                          },
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "245965f8"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "5a9469c9"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "6cfd7cb9",
+                            "externalKey" : "floatingLegResetDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -369,555 +285,554 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2019-02-04",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-02-04",
                               "adjustedStartDate" : "2018-11-02",
+                              "adjustedEndDate" : "2019-02-04",
                               "meta" : {
-                                "globalKey" : "221e9424"
+                                "globalKey" : "5fc4ab60"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2018-10-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a34171"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "510ee8a8"
+                              "globalKey" : "8eb4ffe4"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-05-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-05-02",
                               "adjustedStartDate" : "2019-02-04",
+                              "adjustedEndDate" : "2019-05-02",
                               "meta" : {
-                                "globalKey" : "38468420"
+                                "globalKey" : "399f4fe4"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-01-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a3f3b1"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "72013b62"
+                              "globalKey" : "735a0726"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-08-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-08-02",
                               "adjustedStartDate" : "2019-05-02",
+                              "adjustedEndDate" : "2019-08-02",
                               "meta" : {
-                                "globalKey" : "292bd203"
+                                "globalKey" : "c421d883"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-04-30",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a40ad2"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "9639ca05"
+                              "globalKey" : "312fd085"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-11-04",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-11-04",
                               "adjustedStartDate" : "2019-08-02",
+                              "adjustedEndDate" : "2019-11-04",
                               "meta" : {
-                                "globalKey" : "874747e4"
+                                "globalKey" : "bbda8920"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-07-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a42231"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "50315ea8"
+                              "globalKey" : "84c49fe4"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-02-03",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-02-03",
                               "adjustedStartDate" : "2019-11-04",
+                              "adjustedEndDate" : "2020-02-03",
                               "meta" : {
-                                "globalKey" : "c9420221"
+                                "globalKey" : "a07c4143"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-10-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a43971"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "8765efa4"
+                              "globalKey" : "5ea02ec6"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-05-05",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-05-05",
                               "adjustedStartDate" : "2020-02-03",
+                              "adjustedEndDate" : "2020-05-05",
                               "meta" : {
-                                "globalKey" : "ade45525"
+                                "globalKey" : "e2779661"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-01-30",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a4eb92"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "c7e4616a"
+                              "globalKey" : "fc77a2a6"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-08-03",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-08-03",
                               "adjustedStartDate" : "2020-05-05",
+                              "adjustedEndDate" : "2020-08-03",
                               "meta" : {
-                                "globalKey" : "3bd08f21"
+                                "globalKey" : "3d295ae5"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-04-30",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a502d2"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "609afe24"
+                              "globalKey" : "61f3c9e8"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-11-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-11-02",
                               "adjustedStartDate" : "2020-08-03",
+                              "adjustedEndDate" : "2020-11-02",
                               "meta" : {
-                                "globalKey" : "f7cfa1e2"
+                                "globalKey" : "c5f70b04"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-07-30",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a51a12"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "bba8e2a4"
+                              "globalKey" : "89d04bc6"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-02-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-02-02",
                               "adjustedStartDate" : "2020-11-02",
+                              "adjustedEndDate" : "2021-02-02",
                               "meta" : {
-                                "globalKey" : "69920d64"
+                                "globalKey" : "d9ae9e4"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-10-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a53133"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "b6e993e6"
+                              "globalKey" : "5af27066"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-05-04",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-05-04",
                               "adjustedStartDate" : "2021-02-02",
+                              "adjustedEndDate" : "2021-05-04",
                               "meta" : {
-                                "globalKey" : "4fe93926"
+                                "globalKey" : "847c7a62"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-01-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a5e373"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "f91cde6a"
+                              "globalKey" : "2db01fa6"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-08-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-08-02",
                               "adjustedStartDate" : "2021-05-04",
+                              "adjustedEndDate" : "2021-08-02",
                               "meta" : {
-                                "globalKey" : "ddd57322"
+                                "globalKey" : "df2e3ee6"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-04-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a5fab3"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "91d37b24"
+                              "globalKey" : "932c46e8"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-11-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-11-02",
                               "adjustedStartDate" : "2021-08-02",
+                              "adjustedEndDate" : "2021-11-02",
                               "meta" : {
-                                "globalKey" : "cebac124"
+                                "globalKey" : "69b0c7a4"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-07-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a611f3"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "b60c09e6"
+                              "globalKey" : "51021066"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-02-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-02-02",
                               "adjustedStartDate" : "2021-11-02",
+                              "adjustedEndDate" : "2022-02-02",
                               "meta" : {
-                                "globalKey" : "42320564"
+                                "globalKey" : "e63ae1e4"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-10-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a62933"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "b30193e6"
+                              "globalKey" : "570a7066"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-05-03",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-05-03",
                               "adjustedStartDate" : "2022-02-02",
+                              "adjustedEndDate" : "2022-05-03",
                               "meta" : {
-                                "globalKey" : "f3a2f623"
+                                "globalKey" : "5b679a01"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-01-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a6dbb1"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "2c0a3466"
+                              "globalKey" : "93ced844"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-08-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-08-02",
                               "adjustedStartDate" : "2022-05-03",
+                              "adjustedEndDate" : "2022-08-02",
                               "meta" : {
-                                "globalKey" : "b4c09264"
+                                "globalKey" : "82e7fb86"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-04-28",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a6f294"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "8c36a266"
+                              "globalKey" : "5a5e0b88"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-11-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-11-02",
                               "adjustedStartDate" : "2022-08-02",
+                              "adjustedEndDate" : "2022-11-02",
                               "meta" : {
-                                "globalKey" : "a75ab924"
+                                "globalKey" : "4250bfa4"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-07-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a709f3"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "b22409e6"
+                              "globalKey" : "4d1a1066"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
                         "meta" : {
-                          "globalKey" : "864ee76b"
+                          "globalKey" : "27aec6bd"
+                        }
+                      }, {
+                        "payerReceiver" : {
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "637fde94"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "97b8e49c"
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-2"
                             }
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "rateSpecification" : {
                           "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "rateOption" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
-                                "value" : "rateOption-2"
+                                "value" : "rateOption-1"
                               }
                             },
-                            "spreadSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           }
                         },
-                        "resetDates" : {
-                          "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "65ba31b"
-                          },
-                          "fixingDates" : {
-                            "meta" : {
-                              "globalKey" : "3d9c8eea"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              } ],
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
+                          "effectiveDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
+                              "dateAdjustments" : {
+                                "businessDayConvention" : "NONE",
+                                "meta" : {
+                                  "globalKey" : "24a738"
+                                }
+                              },
                               "meta" : {
-                                "globalKey" : "21479e"
+                                "globalKey" : "ecea117a"
                               }
                             },
-                            "businessDayConvention" : "NONE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "2de3a193"
+                            "meta" : {
+                              "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "2de3a193"
+                          "terminationDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2022-11-02",
+                              "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
+                                "businessCenters" : {
+                                  "businessCentersReference" : {
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "float2PrimaryBusinessCenters"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "cdc49572"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "3ff9943"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "f07bcfc1"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "f07bcfc1"
+                            }
                           },
-                          "resetDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
+                                "globalReference" : "42f910b",
+                                "externalReference" : "float2PrimaryBusinessCenters"
                               },
                               "meta" : {
-                                "globalKey" : "245965f8"
+                                "globalKey" : "cdc49572"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "5a9469c9"
+                              "globalKey" : "3ff9943"
                             }
                           },
-                          "resetFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
                             "meta" : {
-                              "globalKey" : "956"
+                              "globalKey" : "1a3b"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                            "rollConvention" : "2"
                           },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
-                        }
-                      }, {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
                           "meta" : {
-                            "globalKey" : "0"
+                            "globalKey" : "f5d68523",
+                            "externalKey" : "floating2CalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
                           },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-2"
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4abf7e"
+                            },
+                            "dayType" : "Business"
+                          },
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b",
+                                "externalKey" : "float2PrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "c943f240",
+                            "externalKey" : "floating2LegPaymentDates"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
+                        "resetDates" : {
+                          "calculationPeriodDatesReference" : {
+                            "globalReference" : "f5d68523",
+                            "externalReference" : "floating2CalcPeriodDates"
+                          },
+                          "resetRelativeTo" : "CalculationPeriodEndDate",
+                          "fixingDates" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "1bc532b"
+                            },
+                            "businessDayConvention" : "PRECEDING",
                             "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "float2PrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
+                              "businessCenter" : [ {
+                                "value" : "USGS"
+                              } ],
                               "meta" : {
-                                "globalKey" : "cdc49572"
+                                "globalKey" : "27e40a"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "3ff9943"
+                            "dateRelativeTo" : {
+                              "globalReference" : "a9324b19",
+                              "externalReference" : "floatingLeg2ResetDates"
                             }
                           },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "159eb"
-                            },
-                            "period" : "Y",
+                          "resetFrequency" : {
                             "periodMultiplier" : 1,
-                            "rollConvention" : "2"
-                          },
-                          "effectiveDate" : {
-                            "adjustableDate" : {
-                              "dateAdjustments" : {
-                                "businessDayConvention" : "NONE",
-                                "meta" : {
-                                  "globalKey" : "24a738"
-                                }
-                              },
-                              "meta" : {
-                                "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
-                            },
+                            "period" : "Y",
                             "meta" : {
-                              "globalKey" : "ecea117a"
+                              "globalKey" : "78"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floating2CalcPeriodDates",
-                            "globalKey" : "fee4d84d"
-                          },
-                          "terminationDate" : {
-                            "adjustableDate" : {
-                              "dateAdjustments" : {
-                                "businessCenters" : {
-                                  "businessCentersReference" : {
-                                    "externalReference" : "float2PrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "cdc49572"
-                                  }
-                                },
-                                "businessDayConvention" : "MODFOLLOWING",
-                                "meta" : {
-                                  "globalKey" : "3ff9943"
-                                }
+                          "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "float2PrimaryBusinessCenters"
                               },
                               "meta" : {
-                                "globalKey" : "f07bcfc1"
-                              },
-                              "unadjustedDate" : "2022-11-02"
+                                "globalKey" : "cdc49572"
+                              }
                             },
                             "meta" : {
-                              "globalKey" : "f07bcfc1"
+                              "globalKey" : "3ff9943"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "a9324b19",
+                            "externalKey" : "floatingLeg2ResetDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -925,411 +840,496 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2019-11-06",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-11-04",
                               "adjustedStartDate" : "2018-11-02",
+                              "adjustedEndDate" : "2019-11-04",
                               "meta" : {
-                                "globalKey" : "2824e282"
+                                "globalKey" : "36ad0d3e"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-11-01",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a43d8f"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "1997d748"
+                              "globalKey" : "28200204"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-11-04",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-11-02",
                               "adjustedStartDate" : "2019-11-04",
+                              "adjustedEndDate" : "2020-11-02",
                               "meta" : {
-                                "globalKey" : "9a621101"
+                                "globalKey" : "75afc645"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-10-30",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a53152"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "86c42fc5"
+                              "globalKey" : "6211e509"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-11-04",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-11-02",
                               "adjustedStartDate" : "2020-11-02",
+                              "adjustedEndDate" : "2021-11-02",
                               "meta" : {
-                                "globalKey" : "6f985c00"
+                                "globalKey" : "e4834c00"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-11-01",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a62d8f"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "7f7282c4"
+                              "globalKey" : "f45d72c4"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-11-04",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-11-02",
                               "adjustedStartDate" : "2021-11-02",
+                              "adjustedEndDate" : "2022-11-02",
                               "meta" : {
-                                "globalKey" : "48385400"
+                                "globalKey" : "bd234400"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-11-01",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a7258f"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "7b8a82c4"
+                              "globalKey" : "f07572c4"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
                         "meta" : {
-                          "globalKey" : "6cb1d10f"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floating2LegPaymentDates",
-                            "globalKey" : "86770284"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "float2PrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "97b8e49c"
-                            }
-                          },
-                          "paymentDaysOffset" : {
-                            "meta" : {
-                              "globalKey" : "ea4baf42"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 2,
-                            "dayType" : "BUSINESS"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
-                          }
-                        },
-                        "resetDates" : {
-                          "calculationPeriodDatesReference" : {
-                            "externalReference" : "floating2CalcPeriodDates",
-                            "globalReference" : "fee4d84d"
-                          },
-                          "fixingDates" : {
-                            "meta" : {
-                              "globalKey" : "8c648123"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "USGS"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "27e40a"
-                              }
-                            },
-                            "businessDayConvention" : "PRECEDING",
-                            "dateRelativeTo" : {
-                              "externalReference" : "floatingLeg2ResetDates",
-                              "globalReference" : "323023eb"
-                            }
-                          },
-                          "meta" : {
-                            "externalKey" : "floatingLeg2ResetDates",
-                            "globalKey" : "323023eb"
-                          },
-                          "resetDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "float2PrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "cdc49572"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "3ff9943"
-                            }
-                          },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                          "globalKey" : "60ae7d0b"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "251b9d3a"
+                        "globalKey" : "bd429908"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "251b9d3a"
+                    "globalKey" : "bd429908"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "251b9d3a"
+                  "globalKey" : "bd429908"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "a0407424"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-2"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-LIBOR-BBA"
-                        },
-                        "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
-                        }
-                      }
-                    }
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0002,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.0002,
-                      "arithmeticOperator" : "ADD",
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate",
+                      "arithmeticOperator" : "Add"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "e84ab7ac"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "54f5dcc9"
-                    },
                     "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-LIBOR-BBA"
+                        },
+                        "indexTenor" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
+                        }
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                          "value" : "rateOption-2"
                         } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-SOFR-COMPOUND"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "828026c7"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "584936a8"
+                  }
+                }, {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 100000000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
                         }
                       }
-                    }
-                  },
-                  "quantity" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-SOFR-COMPOUND"
                         }
                       },
-                      "value" : 100000000.00
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "49c5bc57"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f129f"
-              },
-              "value" : "2018-10-31"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "9369931"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "43401077-2"
+                    "globalKey" : "fbce0222"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "ba4f",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "43401077"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "010",
                   "meta" : {
-                    "scheme" : "platform_side_id"
-                  },
-                  "value" : "43401965"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ba4f"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "ba4f",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "43401077"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "8128d0fa"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS9369931"
+                  "value" : "MARKIT_WIRE"
+                },
+                "meta" : {
+                  "globalKey" : "66b48bac"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "66b48bac",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "66b48bac",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2018-10-31",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "010S3",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "17709ff2"
+                "globalKey" : "71eec9f",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "f3ee8ff6"
+            }
+          },
+          "meta" : {
+            "globalKey" : "f3ee8ff6"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "0109369931",
+      "meta" : {
+        "scheme" : "cme_message_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_clearingorg_id"
+      }
+    },
+    "sentTo" : [ {
+      "value" : "010",
+      "meta" : {
+        "scheme" : "cme_firm_id"
+      }
+    }, {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_exchange_id"
+      }
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-10-31T09:33:27-05:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-10-31T14:14:45.895Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
+    "qualification" : "clearingReceiptDateTime"
   } ],
+  "creditLimitInformation" : {
+    "limitApplicable" : [ {
+      "limitType" : {
+        "value" : "Notional",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 1222268700,
+      "amountRemaining" : 998777731300,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 100000000
+    }, {
+      "limitType" : {
+        "value" : "NPV",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 5600080,
+      "amountRemaining" : 999994399919,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : -1181958
+    }, {
+      "limitType" : {
+        "value" : "PV01",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 99392,
+      "amountRemaining" : 999999900607,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 227
+    }, {
+      "limitType" : {
+        "value" : "PV01",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 101854,
+      "amountRemaining" : 999999898145,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Account",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 227
+    }, {
+      "limitType" : {
+        "value" : "Notional",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 1200000000,
+      "amountRemaining" : 998800000000,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Account",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 100000000
+    }, {
+      "limitType" : {
+        "value" : "NPV",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 5145303,
+      "amountRemaining" : 999994854696,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Account",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : -1181958
+    } ]
+  },
   "workflowState" : {
-    "workflowStatus" : "CLEARED"
+    "workflowStatus" : "Cleared"
+  },
+  "meta" : {
+    "globalKey" : "afd5a3e0"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/FRA-ex01.json b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/FRA-ex01.json
index 336d845be3..95c69b65b8 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/FRA-ex01.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/FRA-ex01.json
@@ -1,158 +1,73 @@
 {
-  "creditLimitInformation" : {
-    "limitApplicable" : [ {
-      "amountRemaining" : 999999999999833220,
-      "amountUtilized" : -165719,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "AUD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "PV01"
-      },
-      "limitAmount" : 999999999999998980,
-      "limitImpactDueToTrade" : -5029,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    } ]
-  },
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "cme_message_id"
-      },
-      "value" : "6002553802"
-    },
-    "sentBy" : {
-      "meta" : {
-        "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "meta" : {
-        "scheme" : "cme_firm_id"
-      },
-      "value" : "999"
-    }, {
-      "meta" : {
-        "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "2b860a14"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "d02143f1"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "999-123"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "88c5360e"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              }
-            } ],
-            "clearedDate" : "2014-10-03",
-            "meta" : {
-              "globalKey" : "d02143f1"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "dd19"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "2894761",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "999"
-                },
-                "meta" : {
-                  "globalKey" : "dd19"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "QAC_11111",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "9e635873"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "PLATFORM"
-                },
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "216418a5"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "9e635873"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
               },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "9e635873"
-              },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS2894761",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e12c31ab"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2014-10-03",
+              "meta" : {
+                "globalKey" : "3ef283"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "dd19"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -163,48 +78,63 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
                         "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
                               "adjustedDate" : {
+                                "value" : "2015-01-07",
                                 "meta" : {
                                   "globalKey" : "3ef847"
-                                },
-                                "value" : "2015-01-07"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "0"
                               }
                             },
                             "meta" : {
-                              "externalKey" : "resetDate",
-                              "globalKey" : "0"
+                              "globalKey" : "0",
+                              "externalKey" : "resetDate"
                             }
                           },
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
                               "adjustedDate" : {
+                                "value" : "2015-04-08",
                                 "meta" : {
                                   "globalKey" : "3ef908"
-                                },
-                                "value" : "2015-04-08"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "0"
@@ -213,19 +143,15 @@
                             "meta" : {
                               "globalKey" : "0"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
-                        "discountingMethod" : {
-                          "discountingType" : "FRA"
-                        },
-                        "meta" : {
-                          "globalKey" : "1a3477ac"
-                        },
                         "paymentDate" : {
+                          "unadjustedDate" : "2015-01-07",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "AUSY"
@@ -234,75 +160,77 @@
                                 "globalKey" : "1ed59a"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "3659d96b"
                             }
                           },
                           "meta" : {
                             "globalKey" : "57ddf584"
-                          },
-                          "unadjustedDate" : "2015-01-07"
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
                           }
+                        },
+                        "discountingMethod" : {
+                          "discountingType" : "FRA"
+                        },
+                        "meta" : {
+                          "globalKey" : "6f3ee7f4"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
                         "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
                               "adjustedDate" : {
+                                "value" : "2015-01-07",
                                 "meta" : {
                                   "globalKey" : "3ef847"
-                                },
-                                "value" : "2015-01-07"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "0"
                               }
                             },
                             "meta" : {
-                              "externalKey" : "resetDate",
-                              "globalKey" : "0"
+                              "globalKey" : "0",
+                              "externalKey" : "resetDate"
                             }
                           },
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
                               "adjustedDate" : {
+                                "value" : "2015-04-08",
                                 "meta" : {
                                   "globalKey" : "3ef908"
-                                },
-                                "value" : "2015-04-08"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "0"
@@ -311,19 +239,15 @@
                             "meta" : {
                               "globalKey" : "0"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
-                        "discountingMethod" : {
-                          "discountingType" : "FRA"
-                        },
-                        "meta" : {
-                          "globalKey" : "143a1642"
-                        },
                         "paymentDate" : {
+                          "unadjustedDate" : "2015-01-07",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "AUSY"
@@ -332,37 +256,23 @@
                                 "globalKey" : "1ed59a"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "3659d96b"
                             }
                           },
                           "meta" : {
                             "globalKey" : "57ddf584"
-                          },
-                          "unadjustedDate" : "2015-01-07"
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
                           }
                         },
                         "resetDates" : {
                           "fixingDates" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "5efecdf8"
+                              "globalKey" : "94a13cf0"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "PRECEDING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "AUSY"
@@ -371,194 +281,284 @@
                                 "globalKey" : "1ed59a"
                               }
                             },
-                            "businessDayConvention" : "PRECEDING",
                             "dateRelativeTo" : {
-                              "externalReference" : "resetDate",
-                              "globalReference" : "0"
+                              "globalReference" : "0",
+                              "externalReference" : "resetDate"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "5efecdf8"
+                            "globalKey" : "94a13cf0"
                           }
+                        },
+                        "discountingMethod" : {
+                          "discountingType" : "FRA"
+                        },
+                        "meta" : {
+                          "globalKey" : "29b3d386"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "e6084416"
+                        "globalKey" : "674ba12"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "e6084416"
+                    "globalKey" : "674ba12"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "e6084416"
+                  "globalKey" : "674ba12"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "13dbf5d3"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0125,
                       "unit" : {
                         "currency" : {
                           "value" : "AUD"
                         }
                       },
-                      "value" : 0.0125,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "AUD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 125000000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "AUD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "67a2c48d"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 125000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "AUD"
                         }
-                      },
-                      "value" : 125000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "8bbe3e46"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "8628cdd6"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "AUD-BBR-BBSW"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "AUD"
-                        }
-                      },
-                      "value" : 125000000.00
+                    "meta" : {
+                      "globalKey" : "3eefe016"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ef283"
-              },
-              "value" : "2014-10-03"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "2894761"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "QAC_11111"
+                    "globalKey" : "1c23a5f2"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
               }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "dd19",
+                  "externalReference" : "clearing_firm"
+                }
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "999",
                   "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "22222"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "dd19"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "dd19",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "22222"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "94df7aa5"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS2894761"
+                  "value" : "PLATFORM"
+                },
+                "meta" : {
+                  "globalKey" : "9e635873"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "9e635873",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "9e635873",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2014-10-03",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "999-123",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "a7071c09"
+                "globalKey" : "c26b8e",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "c4be493d"
+            }
+          },
+          "meta" : {
+            "globalKey" : "c4be493d"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "6002553802",
+      "meta" : {
+        "scheme" : "cme_message_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_clearingorg_id"
+      }
+    },
+    "sentTo" : [ {
+      "value" : "999",
+      "meta" : {
+        "scheme" : "cme_firm_id"
+      }
+    }, {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_exchange_id"
+      }
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2014-10-03T07:06:24-05:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   } ],
+  "creditLimitInformation" : {
+    "limitApplicable" : [ {
+      "limitType" : {
+        "value" : "PV01",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : -165719,
+      "amountRemaining" : 999999999999833220,
+      "currency" : {
+        "value" : "AUD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 999999999999998980,
+      "limitImpactDueToTrade" : -5029
+    } ]
+  },
   "workflowState" : {
-    "workflowStatus" : "CLEARED"
+    "workflowStatus" : "Cleared"
+  },
+  "meta" : {
+    "globalKey" : "48b85210"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/FRA-ex02.json b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/FRA-ex02.json
index ee04550af0..32f7e9cc23 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/FRA-ex02.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/FRA-ex02.json
@@ -1,273 +1,80 @@
 {
-  "creditLimitInformation" : {
-    "limitApplicable" : [ {
-      "amountRemaining" : 998777731300,
-      "amountUtilized" : 1222268700,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NOTIONAL"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 100000000,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    }, {
-      "amountRemaining" : 999994399919,
-      "amountUtilized" : 5600080,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NPV"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 382727,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    }, {
-      "amountRemaining" : 999999900607,
-      "amountUtilized" : 99392,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "PV01"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 4901,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    }, {
-      "amountRemaining" : 999999898145,
-      "amountUtilized" : 101854,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "PV01"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 4901,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "ACCOUNT"
-      }
-    }, {
-      "amountRemaining" : 998800000000,
-      "amountUtilized" : 1200000000,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NOTIONAL"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 100000000,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "ACCOUNT"
-      }
-    }, {
-      "amountRemaining" : 999994854696,
-      "amountUtilized" : 5145303,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NPV"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 382727,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "ACCOUNT"
-      }
-    } ]
-  },
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "cme_message_id"
-      },
-      "value" : "0109369927"
-    },
-    "sentBy" : {
-      "meta" : {
-        "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "meta" : {
-        "scheme" : "cme_firm_id"
-      },
-      "value" : "010"
-    }, {
-      "meta" : {
-        "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "80db9be0"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "23e336a4"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "010S3"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "6a05b6df"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              }
-            } ],
-            "clearedDate" : "2018-10-31",
-            "meta" : {
-              "globalKey" : "23e336a4"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "ba4f"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "9369927",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "010"
-                },
-                "meta" : {
-                  "globalKey" : "ba4f"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "43401180-2",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "66b48bac"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "MARKIT_WIRE"
-                },
+                  "value" : "43401180",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43401871",
+                  "meta" : {
+                    "scheme" : "platform_side_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43401180",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "812ee450"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "66b48bac"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "66b48bac"
               },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS9369927",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "4ac79bbb"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-31",
+              "meta" : {
+                "globalKey" : "3f129f"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "ba4f"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -278,48 +85,63 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        },
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
                           }
                         },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
                         "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
                               "adjustedDate" : {
+                                "value" : "2019-05-13",
                                 "meta" : {
                                   "globalKey" : "3f194d"
-                                },
-                                "value" : "2019-05-13"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "0"
                               }
                             },
                             "meta" : {
-                              "externalKey" : "resetDate",
-                              "globalKey" : "0"
+                              "globalKey" : "0",
+                              "externalKey" : "resetDate"
                             }
                           },
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
                               "adjustedDate" : {
+                                "value" : "2019-11-12",
                                 "meta" : {
                                   "globalKey" : "3f1acc"
-                                },
-                                "value" : "2019-11-12"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "0"
@@ -328,19 +150,15 @@
                             "meta" : {
                               "globalKey" : "0"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "discountingMethod" : {
-                          "discountingType" : "FRA"
-                        },
-                        "meta" : {
-                          "globalKey" : "fb2ec587"
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
                         },
                         "paymentDate" : {
+                          "unadjustedDate" : "2019-05-13",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -351,75 +169,77 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
                           "meta" : {
                             "globalKey" : "deb62aaf"
-                          },
-                          "unadjustedDate" : "2019-05-13"
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
                           }
+                        },
+                        "discountingMethod" : {
+                          "discountingType" : "FRA"
+                        },
+                        "meta" : {
+                          "globalKey" : "4c31ed05"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
                         "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
                               "adjustedDate" : {
+                                "value" : "2019-05-13",
                                 "meta" : {
                                   "globalKey" : "3f194d"
-                                },
-                                "value" : "2019-05-13"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "0"
                               }
                             },
                             "meta" : {
-                              "externalKey" : "resetDate",
-                              "globalKey" : "0"
+                              "globalKey" : "0",
+                              "externalKey" : "resetDate"
                             }
                           },
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
                               "adjustedDate" : {
+                                "value" : "2019-11-12",
                                 "meta" : {
                                   "globalKey" : "3f1acc"
-                                },
-                                "value" : "2019-11-12"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "0"
@@ -428,19 +248,15 @@
                             "meta" : {
                               "globalKey" : "0"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "discountingMethod" : {
-                          "discountingType" : "FRA"
-                        },
-                        "meta" : {
-                          "globalKey" : "33894623"
-                        },
                         "paymentDate" : {
+                          "unadjustedDate" : "2019-05-13",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -451,37 +267,23 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
                           "meta" : {
                             "globalKey" : "deb62aaf"
-                          },
-                          "unadjustedDate" : "2019-05-13"
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
                           }
                         },
                         "resetDates" : {
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "986a753e"
+                              "globalKey" : "75465ff2"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "PRECEDING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -490,204 +292,402 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "PRECEDING",
                             "dateRelativeTo" : {
-                              "externalReference" : "resetDate",
-                              "globalReference" : "0"
+                              "globalReference" : "0",
+                              "externalReference" : "resetDate"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "986a753e"
+                            "globalKey" : "75465ff2"
                           }
+                        },
+                        "discountingMethod" : {
+                          "discountingType" : "FRA"
+                        },
+                        "meta" : {
+                          "globalKey" : "b109457"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "6d531b3c"
+                        "globalKey" : "d5aba132"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "6d531b3c"
+                    "globalKey" : "d5aba132"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "6d531b3c"
+                  "globalKey" : "d5aba132"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "f07fac52"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.02345,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.02345,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 100000000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "1f75ddee"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "b31c328d"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d08"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
+                          "periodMultiplier" : 6,
                           "period" : "M",
-                          "periodMultiplier" : 6
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 100000000.00
+                    "meta" : {
+                      "globalKey" : "8280320a"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f129f"
-              },
-              "value" : "2018-10-31"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "9369927"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "43401180-2"
+                    "globalKey" : "5332145f"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "ba4f",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "43401180"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "010",
                   "meta" : {
-                    "scheme" : "platform_side_id"
-                  },
-                  "value" : "43401871"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ba4f"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "ba4f",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "43401180"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "3145d2c6"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS9369927"
+                  "value" : "MARKIT_WIRE"
+                },
+                "meta" : {
+                  "globalKey" : "66b48bac"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "66b48bac",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "66b48bac",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2018-10-31",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "010S3",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "17704219"
+                "globalKey" : "71eec9f",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "353a2f44"
+            }
+          },
+          "meta" : {
+            "globalKey" : "353a2f44"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "0109369927",
+      "meta" : {
+        "scheme" : "cme_message_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_clearingorg_id"
+      }
+    },
+    "sentTo" : [ {
+      "value" : "010",
+      "meta" : {
+        "scheme" : "cme_firm_id"
+      }
+    }, {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_exchange_id"
+      }
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-10-31T09:19:40-05:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-10-31T14:13:19.9Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
+    "qualification" : "clearingReceiptDateTime"
   } ],
+  "creditLimitInformation" : {
+    "limitApplicable" : [ {
+      "limitType" : {
+        "value" : "Notional",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 1222268700,
+      "amountRemaining" : 998777731300,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 100000000
+    }, {
+      "limitType" : {
+        "value" : "NPV",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 5600080,
+      "amountRemaining" : 999994399919,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 382727
+    }, {
+      "limitType" : {
+        "value" : "PV01",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 99392,
+      "amountRemaining" : 999999900607,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 4901
+    }, {
+      "limitType" : {
+        "value" : "PV01",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 101854,
+      "amountRemaining" : 999999898145,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Account",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 4901
+    }, {
+      "limitType" : {
+        "value" : "Notional",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 1200000000,
+      "amountRemaining" : 998800000000,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Account",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 100000000
+    }, {
+      "limitType" : {
+        "value" : "NPV",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 5145303,
+      "amountRemaining" : 999994854696,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Account",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 382727
+    } ]
+  },
   "workflowState" : {
-    "workflowStatus" : "CLEARED"
+    "workflowStatus" : "Cleared"
+  },
+  "meta" : {
+    "globalKey" : "945767f4"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex01-Fixed-Float.json b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex01-Fixed-Float.json
index 28afea8265..4248a82e14 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex01-Fixed-Float.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex01-Fixed-Float.json
@@ -1,158 +1,80 @@
 {
-  "creditLimitInformation" : {
-    "limitApplicable" : [ {
-      "amountRemaining" : 10000000000000000000000000000,
-      "amountUtilized" : 5191,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "PV01"
-      },
-      "limitAmount" : 10000000000000000000000000000,
-      "limitImpactDueToTrade" : -2596,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "HOUSE"
-      }
-    } ]
-  },
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "cme_message_id"
-      },
-      "value" : "3706576530"
-    },
-    "sentBy" : {
-      "meta" : {
-        "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "meta" : {
-        "scheme" : "cme_firm_id"
-      },
-      "value" : "999"
-    }, {
-      "meta" : {
-        "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "f0223414"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "f5f1e79f"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "999-123"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "88c5360e"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              }
-            } ],
-            "clearedDate" : "2016-09-27",
-            "meta" : {
-              "globalKey" : "f5f1e79f"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "dd19"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "2894761",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "999"
-                },
-                "meta" : {
-                  "globalKey" : "dd19"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "QAC_11111",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "9e635873"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "PLATFORM"
-                },
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "platform_side_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "ec7a6521"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "9e635873"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "9e635873"
               },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS2894761",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e12c31ab"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2016-09-27",
+              "meta" : {
+                "globalKey" : "3f025b"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "dd19"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -163,39 +85,46 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "settlementTerms" : {
-                          "meta" : {
-                            "globalKey" : "f3dec170"
-                          },
                           "settlementCurrency" : {
                             "value" : "USD"
                           },
+                          "meta" : {
+                            "globalKey" : "2f19a22e"
+                          },
                           "cashSettlementTerms" : [ {
-                            "meta" : {
-                              "globalKey" : "5b6a270a"
+                            "valuationMethod" : {
+                              "valuationSource" : {
+                                "settlementRateOption" : {
+                                  "settlementRateOption" : {
+                                    "value" : "KRW.KFTC18/KRW02"
+                                  }
+                                }
+                              }
                             },
                             "valuationDate" : {
                               "fxFixingDate" : {
+                                "periodMultiplier" : -2,
+                                "period" : "D",
                                 "meta" : {
-                                  "globalKey" : "b553ef69"
+                                  "globalKey" : "51499835"
                                 },
-                                "period" : "D",
-                                "periodMultiplier" : -2,
-                                "dayType" : "BUSINESS",
+                                "dayType" : "Business",
+                                "businessDayConvention" : "NONE",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
@@ -206,52 +135,39 @@
                                     "globalKey" : "4f80e30"
                                   }
                                 },
-                                "businessDayConvention" : "NONE",
                                 "dateRelativeToPaymentDates" : {
                                   "paymentDatesReference" : [ {
-                                    "externalReference" : "floatingLegPaymentDates",
-                                    "globalReference" : "5ccd476f"
+                                    "globalReference" : "e1ccbd11",
+                                    "externalReference" : "floatingLegPaymentDates"
                                   } ]
                                 }
                               }
                             },
-                            "valuationMethod" : {
-                              "valuationSource" : {
-                                "settlementRateOption" : {
-                                  "settlementRateOption" : {
-                                    "value" : "KRW.KFTC18/KRW02"
-                                  }
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "96a507c8"
                             }
                           } ]
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "46f4e10"
-                              },
-                              "meta" : {
-                                "globalKey" : "245965f8"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "5a9469c9"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c4f"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "28"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2016-09-28",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -260,149 +176,77 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecac8294"
-                              },
-                              "unadjustedDate" : "2016-09-28"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecac8294"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "aceb94e9"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2017-09-28",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "46f4e10"
+                                    "globalReference" : "46f4e10",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "245965f8"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "5a9469c9"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "572978ed"
-                              },
-                              "unadjustedDate" : "2017-09-28"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "572978ed"
                             }
-                          }
-                        },
-                        "cashflowRepresentation" : {
-                          "cashflowsMatchParameters" : true,
-                          "paymentCalculationPeriod" : [ {
-                            "adjustedPaymentDate" : "2016-12-28",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-12-28",
-                              "adjustedStartDate" : "2016-09-28",
-                              "meta" : {
-                                "globalKey" : "b418ca73"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2016-09-27",
-                                  "meta" : {
-                                    "globalKey" : "7918ac42"
-                                  },
-                                  "observedRate" : 1.34528
-                                } ]
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "46f4e10",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
-                              "notionalAmount" : 1000000.00
-                            } ],
+                              "meta" : {
+                                "globalKey" : "245965f8"
+                              }
+                            },
                             "meta" : {
-                              "globalKey" : "a20f18f"
+                              "globalKey" : "5a9469c9"
                             }
-                          }, {
-                            "adjustedPaymentDate" : "2017-03-28",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-03-28",
-                              "adjustedStartDate" : "2016-12-28",
-                              "meta" : {
-                                "globalKey" : "b618aba6"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2016-12-27",
-                                  "meta" : {
-                                    "globalKey" : "7a16075"
-                                  },
-                                  "observedRate" : 0
-                                } ]
-                              },
-                              "notionalAmount" : 1000000.00
-                            } ],
-                            "meta" : {
-                              "globalKey" : "959f1882"
-                            }
-                          }, {
-                            "adjustedPaymentDate" : "2017-06-28",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-06-28",
-                              "adjustedStartDate" : "2017-03-28",
-                              "meta" : {
-                                "globalKey" : "32a360e6"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2017-03-27",
-                                  "meta" : {
-                                    "globalKey" : "7a212b5"
-                                  },
-                                  "observedRate" : 0
-                                } ]
-                              },
-                              "notionalAmount" : 1000000.00
-                            } ],
-                            "meta" : {
-                              "globalKey" : "457d0e82"
-                            }
-                          }, {
-                            "adjustedPaymentDate" : "2017-09-28",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-09-28",
-                              "adjustedStartDate" : "2017-06-28",
-                              "meta" : {
-                                "globalKey" : "26f27766"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2017-09-27",
-                                  "meta" : {
-                                    "globalKey" : "7a24135"
-                                  },
-                                  "observedRate" : 0
-                                } ]
-                              },
-                              "notionalAmount" : 1000000.00
-                            } ],
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "6d1f65c2"
-                            }
-                          } ]
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
-                        "meta" : {
-                          "globalKey" : "a1a27430"
+                              "globalKey" : "17f7b"
+                            },
+                            "rollConvention" : "28"
+                          },
+                          "meta" : {
+                            "globalKey" : "39439663",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
                         },
                         "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "5ccd476f"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                          "payRelativeTo" : "CalculationPeriodEndDate",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "KRSE"
@@ -410,48 +254,33 @@
                                 "value" : "USNY"
                               } ],
                               "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "46f4e10"
+                                "globalKey" : "46f4e10",
+                                "externalKey" : "floatPrimaryBusinessCenters"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97f8a1a1"
                             }
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "e1ccbd11",
+                            "externalKey" : "floatingLegPaymentDates"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "aceb94e9"
+                            "globalReference" : "39439663",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -1,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "ad359f64"
+                              "globalKey" : "b674cc3a"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -1,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "KRSE"
@@ -460,75 +289,175 @@
                                 "globalKey" : "2355f9"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "e409980d"
+                              "globalReference" : "923b7355",
+                              "externalReference" : "floatingLegResetDates"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "e409980d"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "46f4e10"
+                                "globalReference" : "46f4e10",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "245965f8"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "5a9469c9"
                             }
                           },
-                          "resetFrequency" : {
+                          "meta" : {
+                            "globalKey" : "923b7355",
+                            "externalKey" : "floatingLegResetDates"
+                          }
+                        },
+                        "cashflowRepresentation" : {
+                          "cashflowsMatchParameters" : true,
+                          "paymentCalculationPeriod" : [ {
+                            "adjustedPaymentDate" : "2016-12-28",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2016-09-28",
+                              "adjustedEndDate" : "2016-12-28",
+                              "meta" : {
+                                "globalKey" : "4f0ed0f3"
+                              },
+                              "notionalAmount" : 1000000.00,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2016-09-27",
+                                  "observedRate" : 1.34528,
+                                  "meta" : {
+                                    "globalKey" : "7918ac42"
+                                  }
+                                } ]
+                              }
+                            } ],
                             "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                              "globalKey" : "a516f80f"
+                            }
+                          }, {
+                            "adjustedPaymentDate" : "2017-03-28",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2016-12-28",
+                              "adjustedEndDate" : "2017-03-28",
+                              "meta" : {
+                                "globalKey" : "5a218826"
+                              },
+                              "notionalAmount" : 1000000.00,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2016-12-27",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a16075"
+                                  }
+                                } ]
+                              }
+                            } ],
+                            "meta" : {
+                              "globalKey" : "39a7f502"
+                            }
+                          }, {
+                            "adjustedPaymentDate" : "2017-06-28",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2017-03-28",
+                              "adjustedEndDate" : "2017-06-28",
+                              "meta" : {
+                                "globalKey" : "cd996766"
+                              },
+                              "notionalAmount" : 1000000.00,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2017-03-27",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a212b5"
+                                  }
+                                } ]
+                              }
+                            } ],
+                            "meta" : {
+                              "globalKey" : "e0731502"
+                            }
+                          }, {
+                            "adjustedPaymentDate" : "2017-09-28",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2017-06-28",
+                              "adjustedEndDate" : "2017-09-28",
+                              "meta" : {
+                                "globalKey" : "c1e87de6"
+                              },
+                              "notionalAmount" : 1000000.00,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2017-09-27",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a24135"
+                                  }
+                                } ]
+                              }
+                            } ],
+                            "meta" : {
+                              "globalKey" : "8156c42"
+                            }
+                          } ]
+                        },
+                        "meta" : {
+                          "globalKey" : "c3f337a2"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "settlementTerms" : {
-                          "meta" : {
-                            "globalKey" : "3e719dde"
-                          },
                           "settlementCurrency" : {
                             "value" : "USD"
                           },
+                          "meta" : {
+                            "globalKey" : "224e3900"
+                          },
                           "cashSettlementTerms" : [ {
-                            "meta" : {
-                              "globalKey" : "a5fd0378"
+                            "valuationMethod" : {
+                              "valuationSource" : {
+                                "settlementRateOption" : {
+                                  "settlementRateOption" : {
+                                    "value" : "KRW.KFTC18/KRW02"
+                                  }
+                                }
+                              }
                             },
                             "valuationDate" : {
                               "fxFixingDate" : {
+                                "periodMultiplier" : -2,
+                                "period" : "D",
                                 "meta" : {
-                                  "globalKey" : "a888863b"
+                                  "globalKey" : "447e2f07"
                                 },
-                                "period" : "D",
-                                "periodMultiplier" : -2,
-                                "dayType" : "BUSINESS",
+                                "dayType" : "Business",
+                                "businessDayConvention" : "NONE",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
@@ -539,52 +468,41 @@
                                     "globalKey" : "4f80e30"
                                   }
                                 },
-                                "businessDayConvention" : "NONE",
                                 "dateRelativeToPaymentDates" : {
                                   "paymentDatesReference" : [ {
-                                    "externalReference" : "fixedLegPaymentDates",
-                                    "globalReference" : "5ccd476f"
+                                    "globalReference" : "e1ccbd11",
+                                    "externalReference" : "fixedLegPaymentDates"
                                   } ]
                                 }
                               }
                             },
-                            "valuationMethod" : {
-                              "valuationSource" : {
-                                "settlementRateOption" : {
-                                  "settlementRateOption" : {
-                                    "value" : "KRW.KFTC18/KRW02"
-                                  }
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "89d99e9a"
                             }
                           } ]
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "46f4e10"
-                              },
-                              "meta" : {
-                                "globalKey" : "116cc910"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "47a7cce1"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c4f"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "28"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2016-09-28",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -593,341 +511,423 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecac8294"
-                              },
-                              "unadjustedDate" : "2016-09-28"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecac8294"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "ed6b27e9"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2017-09-28",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "fixedPrimaryBusinessCenters",
-                                    "globalReference" : "46f4e10"
+                                    "globalReference" : "46f4e10",
+                                    "externalReference" : "fixedPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "116cc910"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "47a7cce1"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "443cdc05"
-                              },
-                              "unadjustedDate" : "2017-09-28"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "443cdc05"
                             }
-                          }
-                        },
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "46f4e10",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "116cc910"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "47a7cce1"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f7b"
+                            },
+                            "rollConvention" : "28"
+                          },
+                          "meta" : {
+                            "globalKey" : "3f2e4563",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "KRSE"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "46f4e10",
+                                "externalKey" : "fixedPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "97f8a1a1"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "e1ccbd11",
+                            "externalKey" : "fixedLegPaymentDates"
+                          }
+                        },
                         "cashflowRepresentation" : {
                           "cashflowsMatchParameters" : true,
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2016-12-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-12-28",
                               "adjustedStartDate" : "2016-09-28",
+                              "adjustedEndDate" : "2016-12-28",
                               "meta" : {
-                                "globalKey" : "5a8f0e7f"
+                                "globalKey" : "b5a08ce1"
                               },
-                              "fixedRate" : 0.044,
-                              "notionalAmount" : 1000000.00
+                              "notionalAmount" : 1000000.00,
+                              "fixedRate" : 0.044
                             } ],
                             "meta" : {
-                              "globalKey" : "f8019ce3"
+                              "globalKey" : "53131b45"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-03-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-03-28",
                               "adjustedStartDate" : "2016-12-28",
+                              "adjustedEndDate" : "2017-03-28",
                               "meta" : {
-                                "globalKey" : "5d2f017f"
+                                "globalKey" : "b60d69e1"
                               },
-                              "fixedRate" : 0.044,
-                              "notionalAmount" : 1000000.00
+                              "notionalAmount" : 1000000.00,
+                              "fixedRate" : 0.044
                             } ],
                             "meta" : {
-                              "globalKey" : "ca7f2223"
+                              "globalKey" : "235d8a85"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-06-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-06-28",
                               "adjustedStartDate" : "2017-03-28",
+                              "adjustedEndDate" : "2017-06-28",
                               "meta" : {
-                                "globalKey" : "5d9bde7f"
+                                "globalKey" : "b8ad5ce1"
                               },
-                              "fixedRate" : 0.044,
-                              "notionalAmount" : 1000000.00
+                              "notionalAmount" : 1000000.00,
+                              "fixedRate" : 0.044
                             } ],
                             "meta" : {
-                              "globalKey" : "128e7663"
+                              "globalKey" : "6d9ff4c5"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-09-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-09-28",
                               "adjustedStartDate" : "2017-06-28",
+                              "adjustedEndDate" : "2017-09-28",
                               "meta" : {
-                                "globalKey" : "5df5f67f"
+                                "globalKey" : "b90774e1"
                               },
-                              "fixedRate" : 0.044,
-                              "notionalAmount" : 1000000.00
+                              "notionalAmount" : 1000000.00,
+                              "fixedRate" : 0.044
                             } ],
                             "meta" : {
-                              "globalKey" : "5a8b05a3"
+                              "globalKey" : "b59c8405"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
                         "meta" : {
-                          "globalKey" : "ead64630"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "5ccd476f"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "KRSE"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "fixedPrimaryBusinessCenters",
-                                "globalKey" : "46f4e10"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "97f8a1a1"
-                            }
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                          "globalKey" : "a2f1befc"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "5cd09800"
+                        "globalKey" : "b6a7939a"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "5cd09800"
+                    "globalKey" : "b6a7939a"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "5cd09800"
+                  "globalKey" : "b6a7939a"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "59ad81d9"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5d862026"
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 1000000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "KRW"
+                        }
+                      }
                     },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
+                    }
+                  } ],
+                  "observable" : {
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "KRW-CD-KSDA-Bloomberg"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "KRW"
-                        }
-                      },
-                      "value" : 1000000.00
+                    "meta" : {
+                      "globalKey" : "533cd7c6"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "8e998c26"
                   },
+                  "meta" : {
+                    "globalKey" : "a3732dc5"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.044,
                       "unit" : {
                         "currency" : {
                           "value" : "KRW"
                         }
                       },
-                      "value" : 0.044,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "KRW"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 1000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "KRW"
                         }
-                      },
-                      "value" : 1000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f025b"
-              },
-              "value" : "2016-09-27"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
-                  },
-                  "value" : "2894761"
-                }
-              }, {
-                "identifier" : {
+                  } ],
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "QAC_11111"
+                    "globalKey" : "4497f89a"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "dd19",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "22222"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "999",
                   "meta" : {
-                    "scheme" : "platform_side_id"
-                  },
-                  "value" : "22222"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "dd19"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "dd19",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "22222"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "f7b46357"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS2894761"
+                  "value" : "PLATFORM"
+                },
+                "meta" : {
+                  "globalKey" : "9e635873"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "9e635873",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "9e635873",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2016-09-27",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "999-123",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "a7071c09"
+                "globalKey" : "c26b8e",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "4fc1bfe7"
+            }
+          },
+          "meta" : {
+            "globalKey" : "4fc1bfe7"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "3706576530",
+      "meta" : {
+        "scheme" : "cme_message_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_clearingorg_id"
+      }
+    },
+    "sentTo" : [ {
+      "value" : "999",
+      "meta" : {
+        "scheme" : "cme_firm_id"
+      }
+    }, {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_exchange_id"
+      }
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2016-09-27T07:56:03-05:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   } ],
+  "creditLimitInformation" : {
+    "limitApplicable" : [ {
+      "limitType" : {
+        "value" : "PV01",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 5191,
+      "amountRemaining" : 10000000000000000000000000000,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "House",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 10000000000000000000000000000,
+      "limitImpactDueToTrade" : -2596
+    } ]
+  },
   "workflowState" : {
-    "workflowStatus" : "CLEARED"
+    "workflowStatus" : "Cleared"
+  },
+  "meta" : {
+    "globalKey" : "6318523a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex02-Fixed-Float.json b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex02-Fixed-Float.json
index 0cfbec422a..21df31e3b8 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex02-Fixed-Float.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex02-Fixed-Float.json
@@ -1,273 +1,80 @@
 {
-  "creditLimitInformation" : {
-    "limitApplicable" : [ {
-      "amountRemaining" : 998777731300,
-      "amountUtilized" : 1222268700,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NOTIONAL"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 100000000,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    }, {
-      "amountRemaining" : 999994399919,
-      "amountUtilized" : 5600080,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NPV"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 1492336,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    }, {
-      "amountRemaining" : 999999900607,
-      "amountUtilized" : 99392,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "PV01"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 46973,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    }, {
-      "amountRemaining" : 999999898145,
-      "amountUtilized" : 101854,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "PV01"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 46973,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "ACCOUNT"
-      }
-    }, {
-      "amountRemaining" : 998800000000,
-      "amountUtilized" : 1200000000,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NOTIONAL"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 100000000,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "ACCOUNT"
-      }
-    }, {
-      "amountRemaining" : 999994854696,
-      "amountUtilized" : 5145303,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NPV"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 1492336,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "ACCOUNT"
-      }
-    } ]
-  },
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "cme_message_id"
-      },
-      "value" : "0109369929"
-    },
-    "sentBy" : {
-      "meta" : {
-        "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "meta" : {
-        "scheme" : "cme_firm_id"
-      },
-      "value" : "010"
-    }, {
-      "meta" : {
-        "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "b9213c1e"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "bba9f92d"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "010S3"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "6a05b6df"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              }
-            } ],
-            "clearedDate" : "2018-10-31",
-            "meta" : {
-              "globalKey" : "bba9f92d"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "ba4f"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "9369929",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "010"
-                },
-                "meta" : {
-                  "globalKey" : "ba4f"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "43401154-2",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "66b48bac"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "MARKIT_WIRE"
-                },
+                  "value" : "43401154",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43401919",
+                  "meta" : {
+                    "scheme" : "platform_side_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43401154",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "19127a16"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "66b48bac"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "66b48bac"
               },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS9369929",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "4ac79bbd"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-31",
+              "meta" : {
+                "globalKey" : "3f129f"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "ba4f"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -278,46 +85,42 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "116cc910"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "47a7cce1"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d7a"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "2"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -326,42 +129,95 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "fb326cde"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2023-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "fixedPrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "fixedPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "116cc910"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "47a7cce1"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "dae8fb5f"
-                              },
-                              "unadjustedDate" : "2023-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "dae8fb5f"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "116cc910"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "47a7cce1"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "2b8c"
+                            },
+                            "rollConvention" : "2"
+                          },
+                          "meta" : {
+                            "globalKey" : "9866d134",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b",
+                                "externalKey" : "fixedPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "9e5a4d0f",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -369,239 +225,184 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2019-05-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-05-02",
                               "adjustedStartDate" : "2018-11-02",
+                              "adjustedEndDate" : "2019-05-02",
                               "meta" : {
-                                "globalKey" : "71c2601"
+                                "globalKey" : "1e163e9f"
                               },
-                              "fixedRate" : 0.02781,
-                              "notionalAmount" : 100000000.00
+                              "notionalAmount" : 100000000.00,
+                              "fixedRate" : 0.02781
                             } ],
                             "meta" : {
-                              "globalKey" : "700485ff"
+                              "globalKey" : "86fe9e9d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-11-04",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-11-04",
                               "adjustedStartDate" : "2019-05-02",
+                              "adjustedEndDate" : "2019-11-04",
                               "meta" : {
-                                "globalKey" : "7e403bf"
+                                "globalKey" : "21105121"
                               },
-                              "fixedRate" : 0.02781,
-                              "notionalAmount" : 100000000.00
+                              "notionalAmount" : 100000000.00,
+                              "fixedRate" : 0.02781
                             } ],
                             "meta" : {
-                              "globalKey" : "37b037b"
+                              "globalKey" : "1ca750dd"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-05-05",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-05-05",
                               "adjustedStartDate" : "2019-11-04",
+                              "adjustedEndDate" : "2020-05-05",
                               "meta" : {
-                                "globalKey" : "ade8aa0"
+                                "globalKey" : "21d832a0"
                               },
-                              "fixedRate" : 0.02781,
-                              "notionalAmount" : 100000000.00
+                              "notionalAmount" : 100000000.00,
+                              "fixedRate" : 0.02781
                             } ],
                             "meta" : {
-                              "globalKey" : "1faa6c7b"
+                              "globalKey" : "36a4147b"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-11-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-11-02",
                               "adjustedStartDate" : "2020-05-05",
+                              "adjustedEndDate" : "2020-11-02",
                               "meta" : {
-                                "globalKey" : "ba42644"
+                                "globalKey" : "24d2a6bc"
                               },
-                              "fixedRate" : 0.02781,
-                              "notionalAmount" : 100000000.00
+                              "notionalAmount" : 100000000.00,
+                              "fixedRate" : 0.02781
                             } ],
                             "meta" : {
-                              "globalKey" : "aa966cc2"
+                              "globalKey" : "c3c4ed3a"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-05-04",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-05-04",
                               "adjustedStartDate" : "2020-11-02",
+                              "adjustedEndDate" : "2021-05-04",
                               "meta" : {
-                                "globalKey" : "e9f0ebf"
+                                "globalKey" : "25984621"
                               },
-                              "fixedRate" : 0.02781,
-                              "notionalAmount" : 100000000.00
+                              "notionalAmount" : 100000000.00,
+                              "fixedRate" : 0.02781
                             } ],
                             "meta" : {
-                              "globalKey" : "c87b0ffb"
+                              "globalKey" : "df74475d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-11-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-11-02",
                               "adjustedStartDate" : "2021-05-04",
+                              "adjustedEndDate" : "2021-11-02",
                               "meta" : {
-                                "globalKey" : "f652283"
+                                "globalKey" : "2893325d"
                               },
-                              "fixedRate" : 0.02781,
-                              "notionalAmount" : 100000000.00
+                              "notionalAmount" : 100000000.00,
+                              "fixedRate" : 0.02781
                             } ],
                             "meta" : {
-                              "globalKey" : "551c6101"
+                              "globalKey" : "6e4a70db"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-05-03",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-05-03",
                               "adjustedStartDate" : "2021-11-02",
+                              "adjustedEndDate" : "2022-05-03",
                               "meta" : {
-                                "globalKey" : "125f9a60"
+                                "globalKey" : "29594260"
                               },
-                              "fixedRate" : 0.02781,
-                              "notionalAmount" : 100000000.00
+                              "notionalAmount" : 100000000.00,
+                              "fixedRate" : 0.02781
                             } ],
                             "meta" : {
-                              "globalKey" : "714bbafd"
+                              "globalKey" : "884562fd"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-11-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-11-02",
                               "adjustedStartDate" : "2022-05-03",
+                              "adjustedEndDate" : "2022-11-02",
                               "meta" : {
-                                "globalKey" : "13261ec2"
+                                "globalKey" : "2c53bdfe"
                               },
-                              "fixedRate" : 0.02781,
-                              "notionalAmount" : 100000000.00
+                              "notionalAmount" : 100000000.00,
+                              "fixedRate" : 0.02781
                             } ],
                             "meta" : {
-                              "globalKey" : "ffa25540"
+                              "globalKey" : "18cff47c"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-05-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-05-02",
                               "adjustedStartDate" : "2022-11-02",
+                              "adjustedEndDate" : "2023-05-02",
                               "meta" : {
-                                "globalKey" : "16202601"
+                                "globalKey" : "2d1a3e9f"
                               },
-                              "fixedRate" : 0.02781,
-                              "notionalAmount" : 100000000.00
+                              "notionalAmount" : 100000000.00,
+                              "fixedRate" : 0.02781
                             } ],
                             "meta" : {
-                              "globalKey" : "1a1c65ff"
+                              "globalKey" : "31167e9d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-11-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-11-02",
                               "adjustedStartDate" : "2023-05-02",
+                              "adjustedEndDate" : "2023-11-02",
                               "meta" : {
-                                "globalKey" : "16e71b01"
+                                "globalKey" : "3014499f"
                               },
-                              "fixedRate" : 0.02781,
-                              "notionalAmount" : 100000000.00
+                              "notionalAmount" : 100000000.00,
+                              "fixedRate" : 0.02781
                             } ],
                             "meta" : {
-                              "globalKey" : "aa28497f"
+                              "globalKey" : "c355781d"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "30/360"
-                        },
                         "meta" : {
-                          "globalKey" : "c1aab9c3"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "637fde97"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "fixedPrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "97b8e49c"
-                            }
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "959"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                          "globalKey" : "9c3bc1a1"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "245965f8"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "5a9469c9"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d1d"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "2"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -610,42 +411,149 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "ad209b1b"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2023-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "245965f8"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "5a9469c9"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "edd59847"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "edd59847"
+                            }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
-                              "unadjustedDate" : "2023-11-02"
+                              "meta" : {
+                                "globalKey" : "245965f8"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "5a9469c9"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "2049"
+                            },
+                            "rollConvention" : "2"
+                          },
+                          "meta" : {
+                            "globalKey" : "927c16f1",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b",
+                                "externalKey" : "floatPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "e18d000c",
+                            "externalKey" : "floatingLegPaymentDates"
+                          }
+                        },
+                        "resetDates" : {
+                          "calculationPeriodDatesReference" : {
+                            "globalReference" : "927c16f1",
+                            "externalReference" : "floatingCalcPeriodDates"
+                          },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
+                          "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "1a78799e"
+                            },
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "21479e"
+                              }
+                            },
+                            "dateRelativeTo" : {
+                              "globalReference" : "6cfd7cb9",
+                              "externalReference" : "floatingLegResetDates"
+                            }
+                          },
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "245965f8"
+                              }
                             },
                             "meta" : {
-                              "globalKey" : "edd59847"
+                              "globalKey" : "5a9469c9"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "6cfd7cb9",
+                            "externalKey" : "floatingLegResetDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -653,737 +561,829 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2019-02-04",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-02-04",
                               "adjustedStartDate" : "2018-11-02",
+                              "adjustedEndDate" : "2019-02-04",
                               "meta" : {
-                                "globalKey" : "221e9424"
+                                "globalKey" : "5fc4ab60"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2018-10-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a34171"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "510ee8a8"
+                              "globalKey" : "8eb4ffe4"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-05-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-05-02",
                               "adjustedStartDate" : "2019-02-04",
+                              "adjustedEndDate" : "2019-05-02",
                               "meta" : {
-                                "globalKey" : "38468420"
+                                "globalKey" : "399f4fe4"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-01-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a3f3b1"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "72013b62"
+                              "globalKey" : "735a0726"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-08-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-08-02",
                               "adjustedStartDate" : "2019-05-02",
+                              "adjustedEndDate" : "2019-08-02",
                               "meta" : {
-                                "globalKey" : "292bd203"
+                                "globalKey" : "c421d883"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-04-30",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a40ad2"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "9639ca05"
+                              "globalKey" : "312fd085"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-11-04",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-11-04",
                               "adjustedStartDate" : "2019-08-02",
+                              "adjustedEndDate" : "2019-11-04",
                               "meta" : {
-                                "globalKey" : "874747e4"
+                                "globalKey" : "bbda8920"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-07-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a42231"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "50315ea8"
+                              "globalKey" : "84c49fe4"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-02-03",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-02-03",
                               "adjustedStartDate" : "2019-11-04",
+                              "adjustedEndDate" : "2020-02-03",
                               "meta" : {
-                                "globalKey" : "c9420221"
+                                "globalKey" : "a07c4143"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-10-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a43971"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "8765efa4"
+                              "globalKey" : "5ea02ec6"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-05-05",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-05-05",
                               "adjustedStartDate" : "2020-02-03",
+                              "adjustedEndDate" : "2020-05-05",
                               "meta" : {
-                                "globalKey" : "ade45525"
+                                "globalKey" : "e2779661"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-01-30",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a4eb92"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "c7e4616a"
+                              "globalKey" : "fc77a2a6"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-08-03",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-08-03",
                               "adjustedStartDate" : "2020-05-05",
+                              "adjustedEndDate" : "2020-08-03",
                               "meta" : {
-                                "globalKey" : "3bd08f21"
+                                "globalKey" : "3d295ae5"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-04-30",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a502d2"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "609afe24"
+                              "globalKey" : "61f3c9e8"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-11-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-11-02",
                               "adjustedStartDate" : "2020-08-03",
+                              "adjustedEndDate" : "2020-11-02",
                               "meta" : {
-                                "globalKey" : "f7cfa1e2"
+                                "globalKey" : "c5f70b04"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-07-30",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a51a12"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "bba8e2a4"
+                              "globalKey" : "89d04bc6"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-02-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-02-02",
                               "adjustedStartDate" : "2020-11-02",
+                              "adjustedEndDate" : "2021-02-02",
                               "meta" : {
-                                "globalKey" : "69920d64"
+                                "globalKey" : "d9ae9e4"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-10-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a53133"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "b6e993e6"
+                              "globalKey" : "5af27066"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-05-04",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-05-04",
                               "adjustedStartDate" : "2021-02-02",
+                              "adjustedEndDate" : "2021-05-04",
                               "meta" : {
-                                "globalKey" : "4fe93926"
+                                "globalKey" : "847c7a62"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-01-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a5e373"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "f91cde6a"
+                              "globalKey" : "2db01fa6"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-08-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-08-02",
                               "adjustedStartDate" : "2021-05-04",
+                              "adjustedEndDate" : "2021-08-02",
                               "meta" : {
-                                "globalKey" : "ddd57322"
+                                "globalKey" : "df2e3ee6"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-04-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a5fab3"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "91d37b24"
+                              "globalKey" : "932c46e8"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-11-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-11-02",
                               "adjustedStartDate" : "2021-08-02",
+                              "adjustedEndDate" : "2021-11-02",
                               "meta" : {
-                                "globalKey" : "cebac124"
+                                "globalKey" : "69b0c7a4"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-07-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a611f3"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "b60c09e6"
+                              "globalKey" : "51021066"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-02-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-02-02",
                               "adjustedStartDate" : "2021-11-02",
+                              "adjustedEndDate" : "2022-02-02",
                               "meta" : {
-                                "globalKey" : "42320564"
+                                "globalKey" : "e63ae1e4"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-10-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a62933"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "b30193e6"
+                              "globalKey" : "570a7066"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-05-03",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-05-03",
                               "adjustedStartDate" : "2022-02-02",
+                              "adjustedEndDate" : "2022-05-03",
                               "meta" : {
-                                "globalKey" : "f3a2f623"
+                                "globalKey" : "5b679a01"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-01-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a6dbb1"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "2c0a3466"
+                              "globalKey" : "93ced844"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-08-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-08-02",
                               "adjustedStartDate" : "2022-05-03",
+                              "adjustedEndDate" : "2022-08-02",
                               "meta" : {
-                                "globalKey" : "b4c09264"
+                                "globalKey" : "82e7fb86"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-04-28",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a6f294"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "8c36a266"
+                              "globalKey" : "5a5e0b88"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-11-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-11-02",
                               "adjustedStartDate" : "2022-08-02",
+                              "adjustedEndDate" : "2022-11-02",
                               "meta" : {
-                                "globalKey" : "a75ab924"
+                                "globalKey" : "4250bfa4"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-07-29",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a709f3"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "b22409e6"
+                              "globalKey" : "4d1a1066"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-02-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-02-02",
                               "adjustedStartDate" : "2022-11-02",
+                              "adjustedEndDate" : "2023-02-02",
                               "meta" : {
-                                "globalKey" : "1ad1fda2"
+                                "globalKey" : "bedada22"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-10-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a72171"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "af199424"
+                              "globalKey" : "532270a4"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-05-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-05-02",
                               "adjustedStartDate" : "2023-02-02",
+                              "adjustedEndDate" : "2023-05-02",
                               "meta" : {
-                                "globalKey" : "975cb2e2"
+                                "globalKey" : "3252b962"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2023-01-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a7d3b1"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "5ef78a24"
+                              "globalKey" : "f9ed90a4"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-08-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-08-02",
                               "adjustedStartDate" : "2023-05-02",
+                              "adjustedEndDate" : "2023-08-02",
                               "meta" : {
-                                "globalKey" : "8babb1a6"
+                                "globalKey" : "26a1b826"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2023-04-27",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a7ea75"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "8699c9a8"
+                              "globalKey" : "218fd028"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-11-02",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-11-02",
                               "adjustedStartDate" : "2023-08-02",
+                              "adjustedEndDate" : "2023-11-02",
                               "meta" : {
-                                "globalKey" : "7ffab162"
+                                "globalKey" : "1af0b7e2"
                               },
+                              "notionalAmount" : 100000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2023-07-31",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a80231"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 100000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "ae3c0a24"
+                              "globalKey" : "493210a4"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
                         "meta" : {
-                          "globalKey" : "d663a255"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "637fde94"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "97b8e49c"
-                            }
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
-                          }
-                        },
-                        "resetDates" : {
-                          "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "ad209b1b"
-                          },
-                          "fixingDates" : {
-                            "meta" : {
-                              "globalKey" : "3d9c8eea"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "21479e"
-                              }
-                            },
-                            "businessDayConvention" : "NONE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "2de3a193"
-                            }
-                          },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "2de3a193"
-                          },
-                          "resetDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "245965f8"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "5a9469c9"
-                            }
-                          },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "globalKey" : "efab1639"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "a946a0b2"
+                        "globalKey" : "18ffd5f8"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "a946a0b2"
+                    "globalKey" : "18ffd5f8"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "a946a0b2"
+                  "globalKey" : "18ffd5f8"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "5200f2ce"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.02781,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.02781,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 100000000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "ee1d66f2"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "7b78abf0"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
+                    "rateOption" : {
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 100000000.00
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f129f"
-              },
-              "value" : "2018-10-31"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "9369929"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "43401154-2"
+                    "globalKey" : "5332091c"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "ba4f",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "43401154"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "010",
                   "meta" : {
-                    "scheme" : "platform_side_id"
-                  },
-                  "value" : "43401919"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ba4f"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "ba4f",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "43401154"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "5e9b0f0c"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS9369929"
+                  "value" : "MARKIT_WIRE"
+                },
+                "meta" : {
+                  "globalKey" : "66b48bac"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "66b48bac",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "66b48bac",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2018-10-31",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "010S3",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "1770499b"
+                "globalKey" : "71eec9f",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "9993adb9"
+            }
+          },
+          "meta" : {
+            "globalKey" : "9993adb9"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "0109369929",
+      "meta" : {
+        "scheme" : "cme_message_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_clearingorg_id"
+      }
+    },
+    "sentTo" : [ {
+      "value" : "010",
+      "meta" : {
+        "scheme" : "cme_firm_id"
+      }
+    }, {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_exchange_id"
+      }
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-10-31T09:20:59-05:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-10-31T14:13:57.104Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
+    "qualification" : "clearingReceiptDateTime"
   } ],
+  "creditLimitInformation" : {
+    "limitApplicable" : [ {
+      "limitType" : {
+        "value" : "Notional",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 1222268700,
+      "amountRemaining" : 998777731300,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 100000000
+    }, {
+      "limitType" : {
+        "value" : "NPV",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 5600080,
+      "amountRemaining" : 999994399919,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 1492336
+    }, {
+      "limitType" : {
+        "value" : "PV01",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 99392,
+      "amountRemaining" : 999999900607,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 46973
+    }, {
+      "limitType" : {
+        "value" : "PV01",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 101854,
+      "amountRemaining" : 999999898145,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Account",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 46973
+    }, {
+      "limitType" : {
+        "value" : "Notional",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 1200000000,
+      "amountRemaining" : 998800000000,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Account",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 100000000
+    }, {
+      "limitType" : {
+        "value" : "NPV",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 5145303,
+      "amountRemaining" : 999994854696,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Account",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 1492336
+    } ]
+  },
   "workflowState" : {
-    "workflowStatus" : "CLEARED"
+    "workflowStatus" : "Cleared"
+  },
+  "meta" : {
+    "globalKey" : "816206e4"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex03-Fixed-Float-with-Amortizing-Schedule.json b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex03-Fixed-Float-with-Amortizing-Schedule.json
index 6b5b5b4d2e..c682ef71a7 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex03-Fixed-Float-with-Amortizing-Schedule.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex03-Fixed-Float-with-Amortizing-Schedule.json
@@ -1,227 +1,80 @@
 {
-  "creditLimitInformation" : {
-    "limitApplicable" : [ {
-      "amountRemaining" : 999999999999971710,
-      "amountUtilized" : -27327,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "PV01"
-      },
-      "limitAmount" : 999999999999998980,
-      "limitImpactDueToTrade" : -2682,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "HOUSE"
-      }
-    }, {
-      "amountRemaining" : 999999999994680,
-      "amountUtilized" : 5318,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "PV01"
-      },
-      "limitAmount" : 999999999999999,
-      "limitImpactDueToTrade" : -2682,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "ACCOUNT"
-      }
-    }, {
-      "amountRemaining" : 999999988651958,
-      "amountUtilized" : 11348040,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NOTIONAL"
-      },
-      "limitAmount" : 999999999999999,
-      "limitImpactDueToTrade" : 2134797,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "ACCOUNT"
-      }
-    }, {
-      "amountRemaining" : 999999999882034,
-      "amountUtilized" : 117964,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NPV"
-      },
-      "limitAmount" : 999999999999999,
-      "limitImpactDueToTrade" : -266248,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "ACCOUNT"
-      }
-    } ]
-  },
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "cme_message_id"
-      },
-      "value" : "6008842628"
-    },
-    "sentBy" : {
-      "meta" : {
-        "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "meta" : {
-        "scheme" : "cme_firm_id"
-      },
-      "value" : "999"
-    }, {
-      "meta" : {
-        "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "52900375"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "3e553cd4"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "999-123"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "88c5360e"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              }
-            } ],
-            "clearedDate" : "2018-04-20",
-            "meta" : {
-              "globalKey" : "60677577"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "dd19"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "2894761",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "999"
-                },
-                "meta" : {
-                  "globalKey" : "dd19"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "QAC-11111",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "9e635873"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "PLATFORM"
-                },
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "platform_side_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "6bc81893"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "9e635873"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
               },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "9e635873"
-              },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS2894761",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e12c31ab"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-04-20",
+              "meta" : {
+                "globalKey" : "3f1114"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "dd19"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -232,46 +85,40 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "26cfaa"
-                              },
-                              "meta" : {
-                                "globalKey" : "245965f8"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "5a9469c9"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28ca8"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "24"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-24",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -280,42 +127,149 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3d250"
-                              },
-                              "unadjustedDate" : "2018-04-24"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3d250"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "73411fb0"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2024-04-24",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "26cfaa"
+                                    "globalReference" : "26cfaa",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "245965f8"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "5a9469c9"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "bdaa17b1"
-                              },
-                              "unadjustedDate" : "2024-04-24"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "bdaa17b1"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "26cfaa",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "245965f8"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "5a9469c9"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "18aba"
+                            },
+                            "rollConvention" : "24"
+                          },
+                          "meta" : {
+                            "globalKey" : "7361ff22",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "SGSI"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "26cfaa",
+                                "externalKey" : "floatPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3661d37b"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "8f18bcae",
+                            "externalKey" : "floatingLegPaymentDates"
+                          }
+                        },
+                        "resetDates" : {
+                          "calculationPeriodDatesReference" : {
+                            "globalReference" : "7361ff22",
+                            "externalReference" : "floatingCalcPeriodDates"
+                          },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
+                          "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "19aa31cc"
+                            },
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "SGSI"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42e7bcc"
+                              }
+                            },
+                            "dateRelativeTo" : {
+                              "globalReference" : "e99d59aa",
+                              "externalReference" : "floatingLegResetDates"
+                            }
+                          },
+                          "resetFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "107"
+                            }
+                          },
+                          "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "26cfaa",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "245965f8"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "5a9469c9"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "e99d59aa",
+                            "externalKey" : "floatingLegResetDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -323,415 +277,310 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2018-10-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-10-24",
                               "adjustedStartDate" : "2018-04-24",
+                              "adjustedEndDate" : "2018-10-24",
                               "meta" : {
-                                "globalKey" : "bb78b4c6"
+                                "globalKey" : "f164c1c6"
                               },
+                              "notionalAmount" : 2800000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2018-04-20",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a3119c"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 2800000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "e527af5e"
+                              "globalKey" : "1b13bc5e"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-04-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-04-24",
                               "adjustedStartDate" : "2018-10-24",
+                              "adjustedEndDate" : "2019-04-24",
                               "meta" : {
-                                "globalKey" : "db4757e8"
+                                "globalKey" : "1a463ae8"
                               },
+                              "notionalAmount" : 3500000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2018-10-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a3405a"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 3500000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "c1c7d900"
+                              "globalKey" : "c6bc00"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-10-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-10-24",
                               "adjustedStartDate" : "2019-04-24",
+                              "adjustedEndDate" : "2019-10-24",
                               "meta" : {
-                                "globalKey" : "4296b50"
+                                "globalKey" : "3a157850"
                               },
+                              "notionalAmount" : 4200000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-04-18",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a4095e"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 4200000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "51506de8"
+                              "globalKey" : "873c7ae8"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-04-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-04-24",
                               "adjustedStartDate" : "2019-10-24",
+                              "adjustedEndDate" : "2020-04-24",
                               "meta" : {
-                                "globalKey" : "19f1c725"
+                                "globalKey" : "58f0aa25"
                               },
+                              "notionalAmount" : 4900000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-10-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a4385a"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 4900000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "23ea503d"
+                              "globalKey" : "62e9333d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-10-26",
                               "adjustedStartDate" : "2020-04-24",
+                              "adjustedEndDate" : "2020-10-26",
                               "meta" : {
-                                "globalKey" : "aca0518b"
+                                "globalKey" : "7c299947"
                               },
+                              "notionalAmount" : 5600000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-04-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a501da"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 5600000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "45c83a25"
+                              "globalKey" : "155181e1"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-04-26",
                               "adjustedStartDate" : "2020-10-26",
+                              "adjustedEndDate" : "2021-04-26",
                               "meta" : {
-                                "globalKey" : "cfd8a5ad"
+                                "globalKey" : "ed788ad"
                               },
+                              "notionalAmount" : 6300000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-10-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a5305a"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 6300000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "25d214c7"
+                              "globalKey" : "64d0f7c7"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-10-25",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-10-25",
                               "adjustedStartDate" : "2021-04-26",
+                              "adjustedEndDate" : "2021-10-25",
                               "meta" : {
-                                "globalKey" : "c3d47e50"
+                                "globalKey" : "2cf1edf2"
                               },
+                              "notionalAmount" : 7000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-04-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a5f9da"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 7000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "ec2fffe9"
+                              "globalKey" : "554d6f8b"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-04-25",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-04-25",
                               "adjustedStartDate" : "2021-10-25",
+                              "adjustedEndDate" : "2022-04-25",
                               "meta" : {
-                                "globalKey" : "d7e800eb"
+                                "globalKey" : "16e6e3eb"
                               },
+                              "notionalAmount" : 7700000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-10-21",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a6283b"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 7700000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "bd150904"
+                              "globalKey" : "fc13ec04"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-10-25",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-10-25",
                               "adjustedStartDate" : "2022-04-25",
+                              "adjustedEndDate" : "2022-10-25",
                               "meta" : {
-                                "globalKey" : "ca14cf"
+                                "globalKey" : "36b621cf"
                               },
+                              "notionalAmount" : 8400000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-04-21",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a6f1bb"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 8400000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "4c9d9e68"
+                              "globalKey" : "8289ab68"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-04-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-04-24",
                               "adjustedStartDate" : "2022-10-25",
+                              "adjustedEndDate" : "2023-04-24",
                               "meta" : {
-                                "globalKey" : "ebb27c53"
+                                "globalKey" : "5de2c1f5"
                               },
+                              "notionalAmount" : 9100000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-10-20",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a7201c"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 9100000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "60131d6b"
+                              "globalKey" : "d243630d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-10-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-10-24",
                               "adjustedStartDate" : "2023-04-24",
+                              "adjustedEndDate" : "2023-10-24",
                               "meta" : {
-                                "globalKey" : "8d9700d"
+                                "globalKey" : "3ec57d0d"
                               },
+                              "notionalAmount" : 9800000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2023-04-20",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a7e99c"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 9800000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "e3e092a5"
+                              "globalKey" : "19cc9fa5"
                             }
                           }, {
                             "adjustedPaymentDate" : "2024-04-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2024-04-24",
                               "adjustedStartDate" : "2023-10-24",
+                              "adjustedEndDate" : "2024-04-24",
                               "meta" : {
-                                "globalKey" : "d0b9be96"
+                                "globalKey" : "fb8a196"
                               },
+                              "notionalAmount" : 10500000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2023-10-20",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a8181c"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 10500000.00
-                            } ],
-                            "meta" : {
-                              "globalKey" : "689267ae"
-                            }
-                          } ]
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
-                        "meta" : {
-                          "globalKey" : "d1633bf6"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "1a0d9dd8"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "SGSI"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "26cfaa"
                               }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "3661d37b"
-                            }
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "959"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
-                          }
-                        },
-                        "resetDates" : {
-                          "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "73411fb0"
-                          },
-                          "fixingDates" : {
-                            "meta" : {
-                              "globalKey" : "41e2418"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "SGSI"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "42e7bcc"
-                              }
-                            },
-                            "businessDayConvention" : "NONE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "27f3a9c4"
-                            }
-                          },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "27f3a9c4"
-                          },
-                          "resetDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "26cfaa"
-                              },
-                              "meta" : {
-                                "globalKey" : "245965f8"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "5a9469c9"
-                            }
-                          },
-                          "resetFrequency" : {
+                            } ],
                             "meta" : {
-                              "globalKey" : "959"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                              "globalKey" : "a7914aae"
+                            }
+                          } ]
+                        },
+                        "meta" : {
+                          "globalKey" : "966ef0b4"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "26cfaa"
-                              },
-                              "meta" : {
-                                "globalKey" : "116cc910"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "47a7cce1"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28ca8"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "24"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-24",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -740,42 +589,93 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3d250"
-                              },
-                              "unadjustedDate" : "2018-04-24"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3d250"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "b3c0b2b0"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2024-04-24",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "fixedPrimaryBusinessCenters",
-                                    "globalReference" : "26cfaa"
+                                    "globalReference" : "26cfaa",
+                                    "externalReference" : "fixedPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "116cc910"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "47a7cce1"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "aabd7ac9"
-                              },
-                              "unadjustedDate" : "2024-04-24"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "aabd7ac9"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "26cfaa",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "116cc910"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "47a7cce1"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "18aba"
+                            },
+                            "rollConvention" : "24"
+                          },
+                          "meta" : {
+                            "globalKey" : "794cae22",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "SGSI"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "26cfaa",
+                                "externalKey" : "fixedPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3661d37b"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "8f18bcae",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -783,569 +683,543 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2018-10-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-10-24",
                               "adjustedStartDate" : "2018-04-24",
+                              "adjustedEndDate" : "2018-10-24",
                               "meta" : {
-                                "globalKey" : "a45d4254"
+                                "globalKey" : "cba05bac"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 2800000.00
+                              "notionalAmount" : 2800000.00,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "ae1a0ebc"
+                              "globalKey" : "d55d2814"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-04-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-04-24",
                               "adjustedStartDate" : "2018-10-24",
+                              "adjustedEndDate" : "2019-04-24",
                               "meta" : {
-                                "globalKey" : "d71efeb8"
+                                "globalKey" : "9595cbc8"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 3500000.00
+                              "notionalAmount" : 3500000.00,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "f85bd4a0"
+                              "globalKey" : "b6d2a1b0"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-10-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-10-24",
                               "adjustedStartDate" : "2019-04-24",
+                              "adjustedEndDate" : "2019-10-24",
                               "meta" : {
-                                "globalKey" : "7ada51c"
+                                "globalKey" : "61be51e4"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 4200000.00
+                              "notionalAmount" : 4200000.00,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "b82f6984"
+                              "globalKey" : "1240164c"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-04-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-04-24",
                               "adjustedStartDate" : "2019-10-24",
+                              "adjustedEndDate" : "2020-04-24",
                               "meta" : {
-                                "globalKey" : "16999c75"
+                                "globalKey" : "d4d0e5ab"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 4900000.00
+                              "notionalAmount" : 4900000.00,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "de9b6a5d"
+                              "globalKey" : "9cd2b393"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-10-26",
                               "adjustedStartDate" : "2020-04-24",
+                              "adjustedEndDate" : "2020-10-26",
                               "meta" : {
-                                "globalKey" : "47292b97"
+                                "globalKey" : "a0f97349"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 5600000.00
+                              "notionalAmount" : 5600000.00,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "a1d9993d"
+                              "globalKey" : "fba9e0ef"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-04-26",
                               "adjustedStartDate" : "2020-10-26",
+                              "adjustedEndDate" : "2021-04-26",
                               "meta" : {
-                                "globalKey" : "79eaef7d"
+                                "globalKey" : "6aefcc23"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 6300000.00
+                              "notionalAmount" : 6300000.00,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "ec1b66a3"
+                              "globalKey" : "dd204349"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-10-25",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-10-25",
                               "adjustedStartDate" : "2021-04-26",
+                              "adjustedEndDate" : "2021-10-25",
                               "meta" : {
-                                "globalKey" : "aa792182"
+                                "globalKey" : "37184e7e"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 7000000.00
+                              "notionalAmount" : 7000000.00,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "aa39ae89"
+                              "globalKey" : "36d8db85"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-04-25",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-04-25",
                               "adjustedStartDate" : "2021-10-25",
+                              "adjustedEndDate" : "2022-04-25",
                               "meta" : {
-                                "globalKey" : "b965151a"
+                                "globalKey" : "aa2a6de6"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 7700000.00
+                              "notionalAmount" : 7700000.00,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "d0a5aba1"
+                              "globalKey" : "c16b046d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-10-25",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-10-25",
                               "adjustedStartDate" : "2022-04-25",
+                              "adjustedEndDate" : "2022-10-25",
                               "meta" : {
-                                "globalKey" : "e9f3bb7e"
+                                "globalKey" : "7652f402"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 8400000.00
+                              "notionalAmount" : 8400000.00,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "90794085"
+                              "globalKey" : "1cd87909"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-04-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-04-24",
                               "adjustedStartDate" : "2022-10-25",
+                              "adjustedEndDate" : "2023-04-24",
                               "meta" : {
-                                "globalKey" : "1cb50383"
+                                "globalKey" : "4048605d"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 9100000.00
+                              "notionalAmount" : 9100000.00,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "d905b96b"
+                              "globalKey" : "fc991645"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-10-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-10-24",
                               "adjustedStartDate" : "2023-04-24",
+                              "adjustedEndDate" : "2023-10-24",
                               "meta" : {
-                                "globalKey" : "296de11b"
+                                "globalKey" : "b58d95c5"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 9800000.00
+                              "notionalAmount" : 9800000.00,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "75038583"
+                              "globalKey" : "1233a2d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2024-04-24",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2024-04-24",
                               "adjustedStartDate" : "2023-10-24",
+                              "adjustedEndDate" : "2024-04-24",
                               "meta" : {
-                                "globalKey" : "2d4ae3a4"
+                                "globalKey" : "d1d0845c"
                               },
-                              "fixedRate" : 0.015,
-                              "notionalAmount" : 10500000.00
+                              "notionalAmount" : 10500000.00,
+                              "fixedRate" : 0.015
                             } ],
                             "meta" : {
-                              "globalKey" : "9060918c"
+                              "globalKey" : "34e63244"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
                         "meta" : {
-                          "globalKey" : "fd6238ca"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "1a0d9dd8"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "SGSI"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "fixedPrimaryBusinessCenters",
-                                "globalKey" : "26cfaa"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "3661d37b"
-                            }
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "959"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                          "globalKey" : "5e5a8132"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "799014c0"
+                        "globalKey" : "380a31e6"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "799014c0"
+                    "globalKey" : "380a31e6"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "799014c0"
+                  "globalKey" : "380a31e6"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "394670aa"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "d316d91"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "SGD-SOR-VWAP"
-                        },
-                        "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6
-                        }
-                      }
-                    }
-                  },
                   "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 2800000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "SGD"
                         }
                       },
-                      "value" : 2800000.00,
                       "datedValue" : [ {
                         "date" : "2018-04-24",
+                        "value" : 2800000.00,
                         "meta" : {
                           "globalKey" : "bee4fb92"
-                        },
-                        "value" : 2800000.00
+                        }
                       }, {
                         "date" : "2018-10-24",
+                        "value" : 3500000.00,
                         "meta" : {
                           "globalKey" : "eeacdb76"
-                        },
-                        "value" : 3500000.00
+                        }
                       }, {
                         "date" : "2019-04-24",
+                        "value" : 4200000.00,
                         "meta" : {
                           "globalKey" : "1e75565a"
-                        },
-                        "value" : 4200000.00
+                        }
                       }, {
                         "date" : "2019-10-24",
+                        "value" : 4900000.00,
                         "meta" : {
                           "globalKey" : "2a677133"
-                        },
-                        "value" : 4900000.00
+                        }
                       }, {
                         "date" : "2020-04-24",
+                        "value" : 5600000.00,
                         "meta" : {
                           "globalKey" : "5a2fec17"
-                        },
-                        "value" : 5600000.00
+                        }
                       }, {
                         "date" : "2020-10-24",
+                        "value" : 6300000.00,
                         "meta" : {
                           "globalKey" : "89f7cbfb"
-                        },
-                        "value" : 6300000.00
+                        }
                       }, {
                         "date" : "2021-04-24",
+                        "value" : 7000000.00,
                         "meta" : {
                           "globalKey" : "b9c046df"
-                        },
-                        "value" : 7000000.00
+                        }
                       }, {
                         "date" : "2021-10-24",
+                        "value" : 7700000.00,
                         "meta" : {
                           "globalKey" : "c5b261b8"
-                        },
-                        "value" : 7700000.00
+                        }
                       }, {
                         "date" : "2022-04-24",
+                        "value" : 8400000.00,
                         "meta" : {
                           "globalKey" : "f57adc9c"
-                        },
-                        "value" : 8400000.00
+                        }
                       }, {
                         "date" : "2022-10-24",
+                        "value" : 9100000.00,
                         "meta" : {
                           "globalKey" : "2542bc80"
-                        },
-                        "value" : 9100000.00
+                        }
                       }, {
                         "date" : "2023-04-24",
+                        "value" : 9800000.00,
                         "meta" : {
                           "globalKey" : "31357259"
-                        },
-                        "value" : 9800000.00
+                        }
                       }, {
                         "date" : "2023-10-24",
+                        "value" : 10500000.00,
                         "meta" : {
                           "globalKey" : "32189862"
-                        },
-                        "value" : 10500000.00
+                        }
                       } ]
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "a99c9826"
-                  },
-                  "price" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "price-1"
+                        "value" : "quantity-1"
                       } ]
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "SGD-SOR-VWAP"
+                        },
+                        "indexTenor" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
                     },
+                    "meta" : {
+                      "globalKey" : "98fb42a1"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "92e8fbbc"
+                  }
+                }, {
+                  "price" : [ {
                     "value" : {
+                      "value" : 0.015,
                       "unit" : {
                         "currency" : {
                           "value" : "SGD"
                         }
                       },
-                      "value" : 0.015,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "SGD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 2800000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "SGD"
                         }
                       },
-                      "value" : 2800000.00,
                       "datedValue" : [ {
                         "date" : "2018-04-24",
+                        "value" : 2800000.00,
                         "meta" : {
                           "globalKey" : "bee4fb92"
-                        },
-                        "value" : 2800000.00
+                        }
                       }, {
                         "date" : "2018-10-24",
+                        "value" : 3500000.00,
                         "meta" : {
                           "globalKey" : "eeacdb76"
-                        },
-                        "value" : 3500000.00
+                        }
                       }, {
                         "date" : "2019-04-24",
+                        "value" : 4200000.00,
                         "meta" : {
                           "globalKey" : "1e75565a"
-                        },
-                        "value" : 4200000.00
+                        }
                       }, {
                         "date" : "2019-10-24",
+                        "value" : 4900000.00,
                         "meta" : {
                           "globalKey" : "2a677133"
-                        },
-                        "value" : 4900000.00
+                        }
                       }, {
                         "date" : "2020-04-24",
+                        "value" : 5600000.00,
                         "meta" : {
                           "globalKey" : "5a2fec17"
-                        },
-                        "value" : 5600000.00
+                        }
                       }, {
                         "date" : "2020-10-24",
+                        "value" : 6300000.00,
                         "meta" : {
                           "globalKey" : "89f7cbfb"
-                        },
-                        "value" : 6300000.00
+                        }
                       }, {
                         "date" : "2021-04-24",
+                        "value" : 7000000.00,
                         "meta" : {
                           "globalKey" : "b9c046df"
-                        },
-                        "value" : 7000000.00
+                        }
                       }, {
                         "date" : "2021-10-24",
+                        "value" : 7700000.00,
                         "meta" : {
                           "globalKey" : "c5b261b8"
-                        },
-                        "value" : 7700000.00
+                        }
                       }, {
                         "date" : "2022-04-24",
+                        "value" : 8400000.00,
                         "meta" : {
                           "globalKey" : "f57adc9c"
-                        },
-                        "value" : 8400000.00
+                        }
                       }, {
                         "date" : "2022-10-24",
+                        "value" : 9100000.00,
                         "meta" : {
                           "globalKey" : "2542bc80"
-                        },
-                        "value" : 9100000.00
+                        }
                       }, {
                         "date" : "2023-04-24",
+                        "value" : 9800000.00,
                         "meta" : {
                           "globalKey" : "31357259"
-                        },
-                        "value" : 9800000.00
+                        }
                       }, {
                         "date" : "2023-10-24",
+                        "value" : 10500000.00,
                         "meta" : {
                           "globalKey" : "32189862"
-                        },
-                        "value" : 10500000.00
+                        }
+                      } ]
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
                       } ]
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1114"
-              },
-              "value" : "2018-04-20"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
-                  },
-                  "value" : "2894761"
-                }
-              }, {
-                "identifier" : {
+                  } ],
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "QAC-11111"
+                    "globalKey" : "89f66c9a"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "dd19",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "22222"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "999",
                   "meta" : {
-                    "scheme" : "platform_side_id"
-                  },
-                  "value" : "22222"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "dd19"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "dd19",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "22222"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "da630249"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS2894761"
+                  "value" : "PLATFORM"
+                },
+                "meta" : {
+                  "globalKey" : "9e635873"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "9e635873",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "9e635873",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2018-04-20",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "999-123",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "a7071c09"
+                "globalKey" : "c26b8e",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "2652db63"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "e1e7d1eb"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "dd19"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                }
-              },
               "quantity" : {
+                "value" : 700.00,
                 "unit" : {
                   "currency" : {
                     "value" : "SGD"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "dd19",
+                  "externalReference" : "clearing_firm"
                 },
-                "value" : 700.00
+                "receiverPartyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
+                }
               },
               "settlementDate" : {
+                "unadjustedDate" : "2018-04-24",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "SGSI"
@@ -1354,31 +1228,157 @@
                       "globalKey" : "26cfaa"
                     }
                   },
-                  "businessDayConvention" : "MODFOLLOWING",
                   "meta" : {
                     "globalKey" : "3661d37b"
                   }
-                },
-                "unadjustedDate" : "2018-04-24"
+                }
               },
               "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
+                "priceTransfer" : "Upfront"
               }
+            },
+            "meta" : {
+              "globalKey" : "8650c077"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "539bf0f4"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "6008842628",
+      "meta" : {
+        "scheme" : "cme_message_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_clearingorg_id"
+      }
+    },
+    "sentTo" : [ {
+      "value" : "999",
+      "meta" : {
+        "scheme" : "cme_firm_id"
+      }
+    }, {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_exchange_id"
+      }
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-04-20T06:23:50-05:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-04-20T11:23:49.254Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
+    "qualification" : "clearingReceiptDateTime"
   } ],
+  "creditLimitInformation" : {
+    "limitApplicable" : [ {
+      "limitType" : {
+        "value" : "PV01",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : -27327,
+      "amountRemaining" : 999999999999971710,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "House",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 999999999999998980,
+      "limitImpactDueToTrade" : -2682
+    }, {
+      "limitType" : {
+        "value" : "PV01",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 5318,
+      "amountRemaining" : 999999999994680,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Account",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 999999999999999,
+      "limitImpactDueToTrade" : -2682
+    }, {
+      "limitType" : {
+        "value" : "Notional",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 11348040,
+      "amountRemaining" : 999999988651958,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Account",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 999999999999999,
+      "limitImpactDueToTrade" : 2134797
+    }, {
+      "limitType" : {
+        "value" : "NPV",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 117964,
+      "amountRemaining" : 999999999882034,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Account",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 999999999999999,
+      "limitImpactDueToTrade" : -266248
+    } ]
+  },
   "workflowState" : {
-    "workflowStatus" : "CLEARED"
+    "workflowStatus" : "Cleared"
+  },
+  "meta" : {
+    "globalKey" : "516aa715"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex04-Fixed-Float-with-Compounding.json b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex04-Fixed-Float-with-Compounding.json
index 1efb9578ff..7dda36ab0c 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex04-Fixed-Float-with-Compounding.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex04-Fixed-Float-with-Compounding.json
@@ -1,171 +1,80 @@
 {
-  "creditLimitInformation" : {
-    "limitApplicable" : [ {
-      "amountRemaining" : 999999999999572220,
-      "amountUtilized" : -426743,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "PV01"
-      },
-      "limitAmount" : 999999999999998980,
-      "limitImpactDueToTrade" : -310483,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "HOUSE"
-      }
-    } ]
-  },
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "cme_message_id"
-      },
-      "value" : "1K08850539"
-    },
-    "sentBy" : {
-      "meta" : {
-        "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "meta" : {
-        "scheme" : "cme_firm_id"
-      },
-      "value" : "999"
-    }, {
-      "meta" : {
-        "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "a84836c6"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "22294487"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "999-123"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "88c5360e"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              }
-            } ],
-            "clearedDate" : "2018-04-24",
-            "meta" : {
-              "globalKey" : "22294487"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "dd19"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "2894761",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "999"
-                },
-                "meta" : {
-                  "globalKey" : "dd19"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "QAC-11111",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "9e635873"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "PLATFORM"
-                },
-                "meta" : {
-                  "globalKey" : "9e635873"
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "SEF",
-                "globalKey" : "75895dac"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "PARTY123"
-                },
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "package_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "position_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "6bc81893"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "75895dac"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
               },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "9e635873"
-              },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS2894761",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e12c31ab"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-04-24",
+              "meta" : {
+                "globalKey" : "3f1118"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "dd19"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -176,46 +85,42 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "116cc910"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "47a7cce1"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c4d"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "26"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2013-07-26",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -224,42 +129,95 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec508292"
-                              },
-                              "unadjustedDate" : "2013-07-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec508292"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "33439deb"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2020-07-26",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "fixedPrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "fixedPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "116cc910"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "47a7cce1"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "5ab5c347"
-                              },
-                              "unadjustedDate" : "2020-07-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "5ab5c347"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "116cc910"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "47a7cce1"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f79"
+                            },
+                            "rollConvention" : "26"
+                          },
+                          "meta" : {
+                            "globalKey" : "6370a421",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b",
+                                "externalKey" : "fixedPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "e18d000c",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -267,491 +225,436 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2013-10-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2013-10-28",
                               "adjustedStartDate" : "2013-07-26",
+                              "adjustedEndDate" : "2013-10-28",
                               "meta" : {
-                                "globalKey" : "6a521c51"
+                                "globalKey" : "b42c558f"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "39097335"
+                              "globalKey" : "82e3ac73"
                             }
                           }, {
                             "adjustedPaymentDate" : "2014-01-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2014-01-27",
                               "adjustedStartDate" : "2013-10-28",
+                              "adjustedEndDate" : "2014-01-27",
                               "meta" : {
-                                "globalKey" : "6cf1a274"
+                                "globalKey" : "b49a178c"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "9d1b2f9"
+                              "globalKey" : "517a2811"
                             }
                           }, {
                             "adjustedPaymentDate" : "2014-04-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2014-04-28",
                               "adjustedStartDate" : "2014-01-27",
+                              "adjustedEndDate" : "2014-04-28",
                               "meta" : {
-                                "globalKey" : "6d5ef012"
+                                "globalKey" : "b73999ee"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "53965076"
+                              "globalKey" : "9d70fa52"
                             }
                           }, {
                             "adjustedPaymentDate" : "2014-07-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2014-07-28",
                               "adjustedStartDate" : "2014-04-28",
+                              "adjustedEndDate" : "2014-07-28",
                               "meta" : {
-                                "globalKey" : "6db90bd3"
+                                "globalKey" : "b794264d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "9b92e377"
+                              "globalKey" : "e56dfdf1"
                             }
                           }, {
                             "adjustedPaymentDate" : "2014-10-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2014-10-27",
                               "adjustedStartDate" : "2014-07-28",
+                              "adjustedEndDate" : "2014-10-27",
                               "meta" : {
-                                "globalKey" : "6e12af74"
+                                "globalKey" : "b7ee3a8c"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "e1da25b9"
+                              "globalKey" : "2bb5b0d1"
                             }
                           }, {
                             "adjustedPaymentDate" : "2015-01-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-01-26",
                               "adjustedStartDate" : "2014-10-27",
+                              "adjustedEndDate" : "2015-01-26",
                               "meta" : {
-                                "globalKey" : "70b22a54"
+                                "globalKey" : "b85a9f6c"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "b2a25a3a"
+                              "globalKey" : "fa4acf52"
                             }
                           }, {
                             "adjustedPaymentDate" : "2015-04-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-04-27",
                               "adjustedStartDate" : "2015-01-26",
+                              "adjustedEndDate" : "2015-04-27",
                               "meta" : {
-                                "globalKey" : "711f77f2"
+                                "globalKey" : "bafa21ce"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "fc66f7b7"
+                              "globalKey" : "4641a193"
                             }
                           }, {
                             "adjustedPaymentDate" : "2015-07-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-07-27",
                               "adjustedStartDate" : "2015-04-27",
+                              "adjustedEndDate" : "2015-07-27",
                               "meta" : {
-                                "globalKey" : "717993b3"
+                                "globalKey" : "bb54ae2d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "44638ab8"
+                              "globalKey" : "8e3ea532"
                             }
                           }, {
                             "adjustedPaymentDate" : "2015-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-10-26",
                               "adjustedStartDate" : "2015-07-27",
+                              "adjustedEndDate" : "2015-10-26",
                               "meta" : {
-                                "globalKey" : "71d33754"
+                                "globalKey" : "bbaec26c"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "8aaaccfa"
+                              "globalKey" : "d4865812"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-01-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-01-26",
                               "adjustedStartDate" : "2015-10-26",
+                              "adjustedEndDate" : "2016-01-26",
                               "meta" : {
-                                "globalKey" : "74732693"
+                                "globalKey" : "bc1b2b0d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "5d284e79"
+                              "globalKey" : "a4d052f3"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-04-26",
                               "adjustedStartDate" : "2016-01-26",
+                              "adjustedEndDate" : "2016-04-26",
                               "meta" : {
-                                "globalKey" : "74e00393"
+                                "globalKey" : "bebb1e0d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "a537a2b9"
+                              "globalKey" : "ef12bd33"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-07-26",
                               "adjustedStartDate" : "2016-04-26",
+                              "adjustedEndDate" : "2016-07-26",
                               "meta" : {
-                                "globalKey" : "753a1b93"
+                                "globalKey" : "bf15360d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "ed3431f9"
+                              "globalKey" : "370f4c73"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-10-26",
                               "adjustedStartDate" : "2016-07-26",
+                              "adjustedEndDate" : "2016-10-26",
                               "meta" : {
-                                "globalKey" : "75943393"
+                                "globalKey" : "bf6f4e0d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "3530c139"
+                              "globalKey" : "7f0bdbb3"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-01-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-01-26",
                               "adjustedStartDate" : "2016-10-26",
+                              "adjustedEndDate" : "2017-01-26",
                               "meta" : {
-                                "globalKey" : "78342693"
+                                "globalKey" : "bfdc2b0d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "7ae4679"
+                              "globalKey" : "4f564af3"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-04-26",
                               "adjustedStartDate" : "2017-01-26",
+                              "adjustedEndDate" : "2017-04-26",
                               "meta" : {
-                                "globalKey" : "78a10393"
+                                "globalKey" : "c27c1e0d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "4fbd9ab9"
+                              "globalKey" : "9998b533"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-07-26",
                               "adjustedStartDate" : "2017-04-26",
+                              "adjustedEndDate" : "2017-07-26",
                               "meta" : {
-                                "globalKey" : "78fb1b93"
+                                "globalKey" : "c2d6360d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "97ba29f9"
+                              "globalKey" : "e1954473"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-10-26",
                               "adjustedStartDate" : "2017-07-26",
+                              "adjustedEndDate" : "2017-10-26",
                               "meta" : {
-                                "globalKey" : "79553393"
+                                "globalKey" : "c3304e0d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "dfb6b939"
+                              "globalKey" : "2991d3b3"
                             }
                           }, {
                             "adjustedPaymentDate" : "2018-01-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-01-26",
                               "adjustedStartDate" : "2017-10-26",
+                              "adjustedEndDate" : "2018-01-26",
                               "meta" : {
-                                "globalKey" : "7bf52693"
+                                "globalKey" : "c39d2b0d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "b2343e79"
+                              "globalKey" : "f9dc42f3"
                             }
                           }, {
                             "adjustedPaymentDate" : "2018-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-04-26",
                               "adjustedStartDate" : "2018-01-26",
+                              "adjustedEndDate" : "2018-04-26",
                               "meta" : {
-                                "globalKey" : "7c620393"
+                                "globalKey" : "c63d1e0d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "fa4392b9"
+                              "globalKey" : "441ead33"
                             }
                           }, {
                             "adjustedPaymentDate" : "2018-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-07-26",
                               "adjustedStartDate" : "2018-04-26",
+                              "adjustedEndDate" : "2018-07-26",
                               "meta" : {
-                                "globalKey" : "7cbc1b93"
+                                "globalKey" : "c697360d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "424021f9"
+                              "globalKey" : "8c1b3c73"
                             }
                           }, {
                             "adjustedPaymentDate" : "2018-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-10-26",
                               "adjustedStartDate" : "2018-07-26",
+                              "adjustedEndDate" : "2018-10-26",
                               "meta" : {
-                                "globalKey" : "7d163393"
+                                "globalKey" : "c6f14e0d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "8a3cb139"
+                              "globalKey" : "d417cbb3"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-01-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-01-28",
                               "adjustedStartDate" : "2018-10-26",
+                              "adjustedEndDate" : "2019-01-28",
                               "meta" : {
-                                "globalKey" : "7fb70f51"
+                                "globalKey" : "c75e328f"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "6024d075"
+                              "globalKey" : "a7cbf3b3"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-04-26",
                               "adjustedStartDate" : "2019-01-28",
+                              "adjustedEndDate" : "2019-04-26",
                               "meta" : {
-                                "globalKey" : "80230b15"
+                                "globalKey" : "c9ff06cb"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "a4c9923b"
+                              "globalKey" : "eea58df1"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-07-26",
                               "adjustedStartDate" : "2019-04-26",
+                              "adjustedEndDate" : "2019-07-26",
                               "meta" : {
-                                "globalKey" : "807d1b93"
+                                "globalKey" : "ca58360d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "ecc619f9"
+                              "globalKey" : "36a13473"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-10-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-10-28",
                               "adjustedStartDate" : "2019-07-26",
+                              "adjustedEndDate" : "2019-10-28",
                               "meta" : {
-                                "globalKey" : "80d81c51"
+                                "globalKey" : "cab2558f"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "382d4335"
+                              "globalKey" : "82077c73"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-01-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-01-27",
                               "adjustedStartDate" : "2019-10-28",
+                              "adjustedEndDate" : "2020-01-27",
                               "meta" : {
-                                "globalKey" : "8377a274"
+                                "globalKey" : "cb20178c"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "8f582f9"
+                              "globalKey" : "509df811"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-04-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-04-27",
                               "adjustedStartDate" : "2020-01-27",
+                              "adjustedEndDate" : "2020-04-27",
                               "meta" : {
-                                "globalKey" : "83e47bb3"
+                                "globalKey" : "cdbf962d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "5104d378"
+                              "globalKey" : "9adfedf2"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-07-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-07-27",
                               "adjustedStartDate" : "2020-04-27",
+                              "adjustedEndDate" : "2020-07-27",
                               "meta" : {
-                                "globalKey" : "843e93b3"
+                                "globalKey" : "ce19ae2d"
                               },
-                              "fixedRate" : 0.01453,
-                              "notionalAmount" : 17000000.00
+                              "notionalAmount" : 17000000.00,
+                              "fixedRate" : 0.01453
                             } ],
                             "meta" : {
-                              "globalKey" : "990162b8"
+                              "globalKey" : "e2dc7d32"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "30/360"
-                        },
                         "meta" : {
-                          "globalKey" : "e897583d"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "637fde94"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "fixedPrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "97b8e49c"
-                            }
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                          "globalKey" : "f8056f15"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "245965f8"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "5a9469c9"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c4d"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "26"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2013-07-26",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -760,873 +663,970 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec508292"
-                              },
-                              "unadjustedDate" : "2013-07-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec508292"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "f2c40aeb"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2020-07-26",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "245965f8"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "5a9469c9"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "6da2602f"
-                              },
-                              "unadjustedDate" : "2020-07-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "6da2602f"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "245965f8"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "5a9469c9"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f79"
+                            },
+                            "rollConvention" : "26"
+                          },
+                          "meta" : {
+                            "globalKey" : "5d85f521",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b",
+                                "externalKey" : "floatPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "9e5a4d0f",
+                            "externalKey" : "floatingLegPaymentDates"
+                          }
+                        },
+                        "resetDates" : {
+                          "calculationPeriodDatesReference" : {
+                            "globalReference" : "5d85f521",
+                            "externalReference" : "floatingCalcPeriodDates"
+                          },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
+                          "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "1a78799e"
+                            },
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "21479e"
+                              }
+                            },
+                            "dateRelativeTo" : {
+                              "globalReference" : "6cfd7cb9",
+                              "externalReference" : "floatingLegResetDates"
+                            }
+                          },
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "245965f8"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "5a9469c9"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "6cfd7cb9",
+                            "externalKey" : "floatingLegResetDates"
                           }
                         },
+                        "compoundingMethod" : "SpreadExclusive",
                         "cashflowRepresentation" : {
                           "cashflowsMatchParameters" : true,
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2014-01-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2013-10-28",
                               "adjustedStartDate" : "2013-07-26",
+                              "adjustedEndDate" : "2013-10-28",
                               "meta" : {
-                                "globalKey" : "ae664711"
+                                "globalKey" : "e2f9884d"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2013-07-24",
+                                  "observedRate" : 0.002643,
                                   "meta" : {
                                     "globalKey" : "57d9f269"
-                                  },
-                                  "observedRate" : 0.002643
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             }, {
-                              "adjustedEndDate" : "2014-01-27",
                               "adjustedStartDate" : "2013-10-28",
+                              "adjustedEndDate" : "2014-01-27",
                               "meta" : {
-                                "globalKey" : "f060f685"
+                                "globalKey" : "c79b35a7"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2013-10-24",
+                                  "observedRate" : 0.002381,
                                   "meta" : {
                                     "globalKey" : "57d9fee0"
-                                  },
-                                  "observedRate" : 0.002381
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "6d61a4af"
+                              "globalKey" : "d9d40715"
                             }
                           }, {
                             "adjustedPaymentDate" : "2014-07-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2014-04-28",
                               "adjustedStartDate" : "2014-01-27",
+                              "adjustedEndDate" : "2014-04-28",
                               "meta" : {
-                                "globalKey" : "a01d0e4d"
+                                "globalKey" : "7e1b22b"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2014-01-23",
+                                  "observedRate" : 0.002386,
                                   "meta" : {
                                     "globalKey" : "57dab106"
-                                  },
-                                  "observedRate" : 0.002386
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             }, {
-                              "adjustedEndDate" : "2014-07-28",
                               "adjustedStartDate" : "2014-04-28",
+                              "adjustedEndDate" : "2014-07-28",
                               "meta" : {
-                                "globalKey" : "fd1c1144"
+                                "globalKey" : "981217c4"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2014-04-24",
+                                  "observedRate" : 0.0022785,
                                   "meta" : {
                                     "globalKey" : "bed5f35e"
-                                  },
-                                  "observedRate" : 0.0022785
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "1c57c33"
+                              "globalKey" : "254e6915"
                             }
                           }, {
                             "adjustedPaymentDate" : "2015-01-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2014-10-27",
                               "adjustedStartDate" : "2014-07-28",
+                              "adjustedEndDate" : "2014-10-27",
                               "meta" : {
-                                "globalKey" : "5589a9e8"
+                                "globalKey" : "23b1130a"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2014-07-24",
+                                  "observedRate" : 0.002351,
                                   "meta" : {
                                     "globalKey" : "57dadf43"
-                                  },
-                                  "observedRate" : 0.002351
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             }, {
-                              "adjustedEndDate" : "2015-01-26",
                               "adjustedStartDate" : "2014-10-27",
+                              "adjustedEndDate" : "2015-01-26",
                               "meta" : {
-                                "globalKey" : "9265d9f0"
+                                "globalKey" : "69a01912"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2014-10-23",
+                                  "observedRate" : 0.002336,
                                   "meta" : {
                                     "globalKey" : "57daf62b"
-                                  },
-                                  "observedRate" : 0.002336
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "1a73bf62"
+                              "globalKey" : "60f66b22"
                             }
                           }, {
                             "adjustedPaymentDate" : "2015-07-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-04-27",
                               "adjustedStartDate" : "2015-01-26",
+                              "adjustedEndDate" : "2015-04-27",
                               "meta" : {
-                                "globalKey" : "4221f98d"
+                                "globalKey" : "a9e69d6b"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2015-01-22",
+                                  "observedRate" : 0.002561,
                                   "meta" : {
                                     "globalKey" : "57dbb026"
-                                  },
-                                  "observedRate" : 0.002561
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             }, {
-                              "adjustedEndDate" : "2015-07-27",
                               "adjustedStartDate" : "2015-04-27",
+                              "adjustedEndDate" : "2015-07-27",
                               "meta" : {
-                                "globalKey" : "244f3923"
+                                "globalKey" : "bf453fa3"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2015-04-23",
+                                  "observedRate" : 0.00277,
                                   "meta" : {
                                     "globalKey" : "44052f1d"
-                                  },
-                                  "observedRate" : 0.00277
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "a536bad1"
+                              "globalKey" : "c8bfa7b3"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-01-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-10-26",
                               "adjustedStartDate" : "2015-07-27",
+                              "adjustedEndDate" : "2015-10-26",
                               "meta" : {
-                                "globalKey" : "f78ea46f"
+                                "globalKey" : "c5b60d91"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2015-07-23",
+                                  "observedRate" : 0.002951,
                                   "meta" : {
                                     "globalKey" : "57dbedaa"
-                                  },
-                                  "observedRate" : 0.002951
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             }, {
-                              "adjustedEndDate" : "2016-01-26",
                               "adjustedStartDate" : "2015-10-26",
+                              "adjustedEndDate" : "2016-01-26",
                               "meta" : {
-                                "globalKey" : "695166cc"
+                                "globalKey" : "d5a434c"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2015-10-22",
+                                  "observedRate" : 0.003199,
                                   "meta" : {
                                     "globalKey" : "57dc5ba6"
-                                  },
-                                  "observedRate" : 0.003199
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "bf5bc3d7"
+                              "globalKey" : "d2ad0cf5"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-04-26",
                               "adjustedStartDate" : "2016-01-26",
+                              "adjustedEndDate" : "2016-04-26",
                               "meta" : {
-                                "globalKey" : "e5dd7921"
+                                "globalKey" : "80d37fa1"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2016-01-22",
+                                  "observedRate" : 0.006191,
                                   "meta" : {
                                     "globalKey" : "57de6afb"
-                                  },
-                                  "observedRate" : 0.006191
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             }, {
-                              "adjustedEndDate" : "2016-07-26",
                               "adjustedStartDate" : "2016-04-26",
+                              "adjustedEndDate" : "2016-07-26",
                               "meta" : {
-                                "globalKey" : "415ea427"
+                                "globalKey" : "dc54aaa7"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2016-04-22",
+                                  "observedRate" : 0.0063585,
                                   "meta" : {
                                     "globalKey" : "bf10ae01"
-                                  },
-                                  "observedRate" : 0.0063585
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "47e1e1c0"
+                              "globalKey" : "5ec591c0"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-01-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-10-26",
                               "adjustedStartDate" : "2016-07-26",
+                              "adjustedEndDate" : "2016-10-26",
                               "meta" : {
-                                "globalKey" : "baa32e88"
+                                "globalKey" : "55993508"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2016-07-22",
+                                  "observedRate" : 0.00721,
                                   "meta" : {
                                     "globalKey" : "44065062"
-                                  },
-                                  "observedRate" : 0.00721
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             }, {
-                              "adjustedEndDate" : "2017-01-26",
                               "adjustedStartDate" : "2016-10-26",
+                              "adjustedEndDate" : "2017-01-26",
                               "meta" : {
-                                "globalKey" : "a943551e"
+                                "globalKey" : "4d4c319e"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2016-10-24",
+                                  "observedRate" : 0.0088372,
                                   "meta" : {
                                     "globalKey" : "bf2f49f8"
-                                  },
-                                  "observedRate" : 0.0088372
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "33d751f0"
+                              "globalKey" : "53cdd7f0"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-04-26",
                               "adjustedStartDate" : "2017-01-26",
+                              "adjustedEndDate" : "2017-04-26",
                               "meta" : {
-                                "globalKey" : "270fd99e"
+                                "globalKey" : "c205e01e"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2017-01-24",
+                                  "observedRate" : 0.0103178,
                                   "meta" : {
                                     "globalKey" : "c071cb78"
-                                  },
-                                  "observedRate" : 0.0103178
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             }, {
-                              "adjustedEndDate" : "2017-07-26",
                               "adjustedStartDate" : "2017-04-26",
+                              "adjustedEndDate" : "2017-07-26",
                               "meta" : {
-                                "globalKey" : "b2d854b1"
+                                "globalKey" : "4dce5b31"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2017-04-24",
+                                  "observedRate" : 0.011665,
                                   "meta" : {
                                     "globalKey" : "57eb5e8b"
-                                  },
-                                  "observedRate" : 0.011665
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "94a0232d"
+                              "globalKey" : "ab83d32d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2018-01-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-10-26",
                               "adjustedStartDate" : "2017-07-26",
+                              "adjustedEndDate" : "2017-10-26",
                               "meta" : {
-                                "globalKey" : "fd73d85"
+                                "globalKey" : "aacd4405"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2017-07-24",
+                                  "observedRate" : 0.0131389,
                                   "meta" : {
                                     "globalKey" : "c09b5f5f"
-                                  },
-                                  "observedRate" : 0.0131389
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             }, {
-                              "adjustedEndDate" : "2018-01-26",
                               "adjustedStartDate" : "2017-10-26",
+                              "adjustedEndDate" : "2018-01-26",
                               "meta" : {
-                                "globalKey" : "83513079"
+                                "globalKey" : "275a0cf9"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2017-10-24",
+                                  "observedRate" : 0.0137064,
                                   "meta" : {
                                     "globalKey" : "c09e2553"
-                                  },
-                                  "observedRate" : 0.0137064
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "7f1ebfae"
+                              "globalKey" : "9f1545ae"
                             }
                           }, {
                             "adjustedPaymentDate" : "2018-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-04-26",
                               "adjustedStartDate" : "2018-01-26",
+                              "adjustedEndDate" : "2018-04-26",
                               "meta" : {
-                                "globalKey" : "136245"
+                                "globalKey" : "9b0968c5"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2018-01-24",
+                                  "observedRate" : 0.0175246,
                                   "meta" : {
                                     "globalKey" : "c0d6541f"
-                                  },
-                                  "observedRate" : 0.0175246
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             }, {
-                              "adjustedEndDate" : "2018-07-26",
                               "adjustedStartDate" : "2018-04-26",
+                              "adjustedEndDate" : "2018-07-26",
                               "meta" : {
-                                "globalKey" : "3b2f083e"
+                                "globalKey" : "d6250ebe"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2018-04-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a31218"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "5d3e9c33"
+                              "globalKey" : "74224c33"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-01-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-10-26",
                               "adjustedStartDate" : "2018-07-26",
+                              "adjustedEndDate" : "2018-10-26",
                               "meta" : {
-                                "globalKey" : "2f7e077e"
+                                "globalKey" : "ca740dfe"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2018-07-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a32958"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             }, {
-                              "adjustedEndDate" : "2019-01-28",
                               "adjustedStartDate" : "2018-10-26",
+                              "adjustedEndDate" : "2019-01-28",
                               "meta" : {
-                                "globalKey" : "cc1c240"
+                                "globalKey" : "4a67d97c"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2018-10-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a34098"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "e8acd15e"
+                              "globalKey" : "a240921a"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-04-26",
                               "adjustedStartDate" : "2019-01-28",
+                              "adjustedEndDate" : "2019-04-26",
                               "meta" : {
-                                "globalKey" : "22e9b23c"
+                                "globalKey" : "24427e00"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-01-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a3f2d8"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             }, {
-                              "adjustedEndDate" : "2019-07-26",
                               "adjustedStartDate" : "2019-04-26",
+                              "adjustedEndDate" : "2019-07-26",
                               "meta" : {
-                                "globalKey" : "13cf003e"
+                                "globalKey" : "aec506be"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-04-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a40a18"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "5c53b85c"
+                              "globalKey" : "59ecee98"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-01-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-10-28",
                               "adjustedStartDate" : "2019-07-26",
+                              "adjustedEndDate" : "2019-10-28",
                               "meta" : {
-                                "globalKey" : "71ea7600"
+                                "globalKey" : "a67db73c"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-07-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a42158"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             }, {
-                              "adjustedEndDate" : "2020-01-27",
                               "adjustedStartDate" : "2019-10-28",
+                              "adjustedEndDate" : "2020-01-27",
                               "meta" : {
-                                "globalKey" : "b3e5303d"
+                                "globalKey" : "8b1f6f5f"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-10-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a43898"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "7bcb0498"
+                              "globalKey" : "e83d66fe"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-07-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-04-27",
                               "adjustedStartDate" : "2020-01-27",
+                              "adjustedEndDate" : "2020-04-27",
                               "meta" : {
-                                "globalKey" : "2ebb0cbf"
+                                "globalKey" : "c9b1133f"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-01-23",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a4eab9"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             }, {
-                              "adjustedEndDate" : "2020-07-27",
                               "adjustedStartDate" : "2020-04-27",
+                              "adjustedEndDate" : "2020-07-27",
                               "meta" : {
-                                "globalKey" : "230a0bff"
+                                "globalKey" : "be00127f"
                               },
+                              "notionalAmount" : 17000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-04-23",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a501f9"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 17000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "9438063b"
+                              "globalKey" : "ab1bb63b"
                             }
                           } ]
                         },
-                        "compoundingMethod" : "SPREAD_EXCLUSIVE",
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
                         "meta" : {
-                          "globalKey" : "8b0e47d2"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "637fde97"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "97b8e49c"
-                            }
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "959"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
-                          }
-                        },
-                        "resetDates" : {
-                          "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "f2c40aeb"
-                          },
-                          "fixingDates" : {
-                            "meta" : {
-                              "globalKey" : "3d9c8eea"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "21479e"
-                              }
-                            },
-                            "businessDayConvention" : "NONE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "2de3a193"
-                            }
-                          },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "2de3a193"
-                          },
-                          "resetDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "245965f8"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "5a9469c9"
-                            }
-                          },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "globalKey" : "1cf19b80"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "3b83980f"
+                        "globalKey" : "8e274295"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "3b83980f"
+                    "globalKey" : "8e274295"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "3b83980f"
+                  "globalKey" : "8e274295"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "7458d4fc"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.01453,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.01453,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 17000000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "16c1ca84"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 17000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 17000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "455ecf5b"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 17000000.00
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1118"
-              },
-              "value" : "2018-04-24"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "2894761"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "QAC-11111"
+                    "globalKey" : "f59f22c7"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "dd19",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
+                }
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "999",
                   "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "22222"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "dd19"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "dd19",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "package_trade_id"
-                  },
-                  "value" : "22222"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "position_trade_id"
-                  },
-                  "value" : "22222"
+                  "value" : "PLATFORM"
+                },
+                "meta" : {
+                  "globalKey" : "9e635873"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "da630249"
+                "globalKey" : "9e635873",
+                "externalKey" : "trade_source"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS2894761"
+                  "value" : "PARTY123"
+                },
+                "meta" : {
+                  "globalKey" : "75895dac"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "75895dac",
+                "externalKey" : "SEF"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "9e635873",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2018-04-24",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "999-123",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "a7071c09"
+                "globalKey" : "c26b8e",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "eca78a37"
+            }
+          },
+          "meta" : {
+            "globalKey" : "eca78a37"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "1K08850539",
+      "meta" : {
+        "scheme" : "cme_message_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_clearingorg_id"
+      }
+    },
+    "sentTo" : [ {
+      "value" : "999",
+      "meta" : {
+        "scheme" : "cme_firm_id"
+      }
+    }, {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_exchange_id"
+      }
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-04-24T15:51:59-05:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-04-24T20:51:51Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
+    "qualification" : "clearingReceiptDateTime"
   } ],
+  "creditLimitInformation" : {
+    "limitApplicable" : [ {
+      "limitType" : {
+        "value" : "PV01",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : -426743,
+      "amountRemaining" : 999999999999572220,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "House",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 999999999999998980,
+      "limitImpactDueToTrade" : -310483
+    } ]
+  },
   "workflowState" : {
-    "workflowStatus" : "CLEARED"
+    "workflowStatus" : "Cleared"
+  },
+  "meta" : {
+    "globalKey" : "521765c"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex05-Fixed-Float-with-Long-Stub.json b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex05-Fixed-Float-with-Long-Stub.json
index 31f1c15ca5..b7a1f48d0a 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex05-Fixed-Float-with-Long-Stub.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex05-Fixed-Float-with-Long-Stub.json
@@ -1,171 +1,94 @@
 {
-  "creditLimitInformation" : {
-    "limitApplicable" : [ {
-      "amountRemaining" : 999999999999994620,
-      "amountUtilized" : 4356,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "PV01"
-      },
-      "limitAmount" : 999999999999998980,
-      "limitImpactDueToTrade" : 0,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "HOUSE"
-      }
-    } ]
-  },
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "cme_message_id"
-      },
-      "value" : "5608850157"
-    },
-    "sentBy" : {
-      "meta" : {
-        "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "meta" : {
-        "scheme" : "cme_firm_id"
-      },
-      "value" : "999"
-    }, {
-      "meta" : {
-        "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "6169ef5b"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "68fdeeea"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "999-123"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "88c5360e"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              }
-            } ],
-            "clearedDate" : "2018-04-24",
-            "meta" : {
-              "globalKey" : "68fdeeea"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "dd19"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "2894761",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "999"
-                },
-                "meta" : {
-                  "globalKey" : "dd19"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "QAC-11111",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "9e635873"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "PLATFORM"
-                },
-                "meta" : {
-                  "globalKey" : "9e635873"
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "SEF",
-                "globalKey" : "75895dac"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "PARTY123"
-                },
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "risk_approval_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "package_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "position_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "b5faa0b7"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "75895dac"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
               },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "9e635873"
-              },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS2894761",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e12c31ab"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-04-24",
+              "meta" : {
+                "globalKey" : "3f1118"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "dd19"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -176,46 +99,42 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "116cc910"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "47a7cce1"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28caa"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "26"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-24",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -224,44 +143,97 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3d250"
-                              },
-                              "unadjustedDate" : "2018-04-24"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3d250"
                             }
                           },
-                          "firstRegularPeriodStartDate" : "2018-10-26",
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "81fbcf3"
-                          },
-                          "stubPeriodType" : "LONG_INITIAL",
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2023-04-26",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "fixedPrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "fixedPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "116cc910"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "47a7cce1"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "7623407"
-                              },
-                              "unadjustedDate" : "2023-04-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "7623407"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "116cc910"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "47a7cce1"
+                            }
+                          },
+                          "firstRegularPeriodStartDate" : "2018-10-26",
+                          "stubPeriodType" : "LongInitial",
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "18abc"
+                            },
+                            "rollConvention" : "26"
+                          },
+                          "meta" : {
+                            "globalKey" : "85b0386d",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b",
+                                "externalKey" : "fixedPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "9e5a4d0f",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -269,158 +241,265 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2018-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-10-26",
                               "adjustedStartDate" : "2018-04-24",
+                              "adjustedEndDate" : "2018-10-26",
                               "meta" : {
-                                "globalKey" : "4db1c6e6"
+                                "globalKey" : "4cbf649a"
                               },
-                              "fixedRate" : 0.032,
-                              "notionalAmount" : 700000.00
+                              "notionalAmount" : 700000.00,
+                              "fixedRate" : 0.032
                             } ],
                             "meta" : {
-                              "globalKey" : "5ad8448c"
+                              "globalKey" : "59e5e240"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-04-26",
                               "adjustedStartDate" : "2018-10-26",
+                              "adjustedEndDate" : "2019-04-26",
                               "meta" : {
-                                "globalKey" : "50abd968"
+                                "globalKey" : "4d874258"
                               },
-                              "fixedRate" : 0.032,
-                              "notionalAmount" : 700000.00
+                              "notionalAmount" : 700000.00,
+                              "fixedRate" : 0.032
                             } ],
                             "meta" : {
-                              "globalKey" : "7552608e"
+                              "globalKey" : "722dc97e"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-10-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-10-28",
                               "adjustedStartDate" : "2019-04-26",
+                              "adjustedEndDate" : "2019-10-28",
                               "meta" : {
-                                "globalKey" : "5173b726"
+                                "globalKey" : "508154da"
                               },
-                              "fixedRate" : 0.032,
-                              "notionalAmount" : 700000.00
+                              "notionalAmount" : 700000.00,
+                              "fixedRate" : 0.032
                             } ],
                             "meta" : {
-                              "globalKey" : "8c8de0a"
+                              "globalKey" : "7d67bbe"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-04-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-04-27",
                               "adjustedStartDate" : "2019-10-28",
+                              "adjustedEndDate" : "2020-04-27",
                               "meta" : {
-                                "globalKey" : "546d5549"
+                                "globalKey" : "51492ed7"
                               },
-                              "fixedRate" : 0.032,
-                              "notionalAmount" : 700000.00
+                              "notionalAmount" : 700000.00,
+                              "fixedRate" : 0.032
                             } ],
                             "meta" : {
-                              "globalKey" : "218dad0e"
+                              "globalKey" : "1e69869c"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-10-26",
                               "adjustedStartDate" : "2020-04-27",
+                              "adjustedEndDate" : "2020-10-26",
                               "meta" : {
-                                "globalKey" : "5533d229"
+                                "globalKey" : "5442c1b7"
                               },
-                              "fixedRate" : 0.032,
-                              "notionalAmount" : 700000.00
+                              "notionalAmount" : 700000.00,
+                              "fixedRate" : 0.032
                             } ],
                             "meta" : {
-                              "globalKey" : "afe43fcf"
+                              "globalKey" : "aef32f5d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-04-26",
                               "adjustedStartDate" : "2020-10-26",
+                              "adjustedEndDate" : "2021-04-26",
                               "meta" : {
-                                "globalKey" : "582dd968"
+                                "globalKey" : "55094258"
                               },
-                              "fixedRate" : 0.032,
-                              "notionalAmount" : 700000.00
+                              "notionalAmount" : 700000.00,
+                              "fixedRate" : 0.032
                             } ],
                             "meta" : {
-                              "globalKey" : "ca5e508e"
+                              "globalKey" : "c739b97e"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-10-26",
                               "adjustedStartDate" : "2021-04-26",
+                              "adjustedEndDate" : "2021-10-26",
                               "meta" : {
-                                "globalKey" : "58f4ce68"
+                                "globalKey" : "58034d58"
                               },
-                              "fixedRate" : 0.032,
-                              "notionalAmount" : 700000.00
+                              "notionalAmount" : 700000.00,
+                              "fixedRate" : 0.032
                             } ],
                             "meta" : {
-                              "globalKey" : "5a6a340e"
+                              "globalKey" : "5978b2fe"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-04-26",
                               "adjustedStartDate" : "2021-10-26",
+                              "adjustedEndDate" : "2022-04-26",
                               "meta" : {
-                                "globalKey" : "5beed968"
+                                "globalKey" : "58ca4258"
                               },
-                              "fixedRate" : 0.032,
-                              "notionalAmount" : 700000.00
+                              "notionalAmount" : 700000.00,
+                              "fixedRate" : 0.032
                             } ],
                             "meta" : {
-                              "globalKey" : "74e4488e"
+                              "globalKey" : "71bfb17e"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-10-26",
                               "adjustedStartDate" : "2022-04-26",
+                              "adjustedEndDate" : "2022-10-26",
                               "meta" : {
-                                "globalKey" : "5cb5ce68"
+                                "globalKey" : "5bc44d58"
                               },
-                              "fixedRate" : 0.032,
-                              "notionalAmount" : 700000.00
+                              "notionalAmount" : 700000.00,
+                              "fixedRate" : 0.032
                             } ],
                             "meta" : {
-                              "globalKey" : "4f02c0e"
+                              "globalKey" : "3feaafe"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-04-26",
                               "adjustedStartDate" : "2022-10-26",
+                              "adjustedEndDate" : "2023-04-26",
                               "meta" : {
-                                "globalKey" : "5fafd968"
+                                "globalKey" : "5c8b4258"
                               },
-                              "fixedRate" : 0.032,
-                              "notionalAmount" : 700000.00
+                              "notionalAmount" : 700000.00,
+                              "fixedRate" : 0.032
                             } ],
                             "meta" : {
-                              "globalKey" : "1f6a408e"
+                              "globalKey" : "1c45a97e"
                             }
                           } ]
                         },
+                        "meta" : {
+                          "globalKey" : "4a61976b"
+                        }
+                      }, {
+                        "payerReceiver" : {
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
+                        },
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-2"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        },
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
                         "dayCountFraction" : {
-                          "value" : "30/360"
+                          "value" : "ACT/360"
                         },
-                        "meta" : {
-                          "globalKey" : "c4b88555"
+                        "calculationPeriodDates" : {
+                          "effectiveDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-24",
+                              "dateAdjustments" : {
+                                "businessDayConvention" : "NONE",
+                                "meta" : {
+                                  "globalKey" : "24a738"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "ece3d250"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "ece3d250"
+                            }
+                          },
+                          "terminationDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2023-04-26",
+                              "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
+                                "businessCenters" : {
+                                  "businessCentersReference" : {
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "245965f8"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "5a9469c9"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "1a4ed0ef"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "1a4ed0ef"
+                            }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "245965f8"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "5a9469c9"
+                            }
+                          },
+                          "firstRegularPeriodStartDate" : "2018-07-26",
+                          "stubPeriodType" : "LongInitial",
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f79"
+                            },
+                            "rollConvention" : "26"
+                          },
+                          "meta" : {
+                            "globalKey" : "7e9a56ea",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
                         },
                         "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "637fde97"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                          "payRelativeTo" : "CalculationPeriodEndDate",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -428,126 +507,71 @@
                                 "value" : "USNY"
                               } ],
                               "meta" : {
-                                "externalKey" : "fixedPrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
+                                "globalKey" : "42f910b",
+                                "externalKey" : "floatPrimaryBusinessCenters"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "959"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6
+                          "meta" : {
+                            "globalKey" : "e18d000c",
+                            "externalKey" : "floatingLegPaymentDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "resetDates" : {
+                          "calculationPeriodDatesReference" : {
+                            "globalReference" : "7e9a56ea",
+                            "externalReference" : "floatingCalcPeriodDates"
+                          },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
+                          "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "0"
+                              "globalKey" : "c1bdb713"
                             },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }, {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-2"
-                            }
-                          }
-                        },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
+                            "dayType" : "Business",
+                            "businessDayConvention" : "PRECEDING",
                             "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              } ],
                               "meta" : {
-                                "globalKey" : "245965f8"
+                                "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "5a9469c9"
+                            "dateRelativeTo" : {
+                              "globalReference" : "10fc752e",
+                              "externalReference" : "floatingLegResetDates"
                             }
                           },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c4d"
-                            },
-                            "period" : "M",
+                          "resetFrequency" : {
                             "periodMultiplier" : 3,
-                            "rollConvention" : "26"
-                          },
-                          "effectiveDate" : {
-                            "adjustableDate" : {
-                              "dateAdjustments" : {
-                                "businessDayConvention" : "NONE",
-                                "meta" : {
-                                  "globalKey" : "24a738"
-                                }
-                              },
-                              "meta" : {
-                                "globalKey" : "ece3d250"
-                              },
-                              "unadjustedDate" : "2018-04-24"
-                            },
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "ece3d250"
+                              "globalKey" : "aa"
                             }
                           },
-                          "firstRegularPeriodStartDate" : "2018-07-26",
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "b8e2c3f0"
-                          },
-                          "stubPeriodType" : "LONG_INITIAL",
-                          "terminationDate" : {
-                            "adjustableDate" : {
-                              "dateAdjustments" : {
-                                "businessCenters" : {
-                                  "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "245965f8"
-                                  }
-                                },
-                                "businessDayConvention" : "MODFOLLOWING",
-                                "meta" : {
-                                  "globalKey" : "5a9469c9"
-                                }
+                          "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
                               "meta" : {
-                                "globalKey" : "1a4ed0ef"
-                              },
-                              "unadjustedDate" : "2023-04-26"
+                                "globalKey" : "245965f8"
+                              }
                             },
                             "meta" : {
-                              "globalKey" : "1a4ed0ef"
+                              "globalKey" : "5a9469c9"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "10fc752e",
+                            "externalKey" : "floatingLegResetDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -555,778 +579,754 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2018-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-07-26",
                               "adjustedStartDate" : "2018-04-24",
+                              "adjustedEndDate" : "2018-07-26",
                               "meta" : {
-                                "globalKey" : "2a54a814"
+                                "globalKey" : "5ee7e950"
                               },
+                              "notionalAmount" : 700000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2018-04-20",
+                                  "observedRate" : 0.0236253,
                                   "meta" : {
                                     "globalKey" : "c25359f9"
-                                  },
-                                  "observedRate" : 0.0236253
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "49393fee"
+                              "globalKey" : "7dcc812a"
                             }
                           }, {
                             "adjustedPaymentDate" : "2018-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-10-26",
                               "adjustedStartDate" : "2018-07-26",
+                              "adjustedEndDate" : "2018-10-26",
                               "meta" : {
-                                "globalKey" : "675d10b1"
+                                "globalKey" : "2531731"
                               },
+                              "notionalAmount" : 700000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2018-07-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a32958"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "b994e94b"
+                              "globalKey" : "548aefcb"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-01-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-01-28",
                               "adjustedStartDate" : "2018-10-26",
+                              "adjustedEndDate" : "2019-01-28",
                               "meta" : {
-                                "globalKey" : "44a0cb73"
+                                "globalKey" : "8246e2af"
                               },
+                              "notionalAmount" : 700000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2018-10-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a34098"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "48dfc7cf"
+                              "globalKey" : "8685df0b"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-04-26",
                               "adjustedStartDate" : "2019-01-28",
+                              "adjustedEndDate" : "2019-04-26",
                               "meta" : {
-                                "globalKey" : "5ac8bb6f"
+                                "globalKey" : "5c218733"
                               },
+                              "notionalAmount" : 700000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-01-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a3f2d8"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "69d21a89"
+                              "globalKey" : "6b2ae64d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-07-26",
                               "adjustedStartDate" : "2019-04-26",
+                              "adjustedEndDate" : "2019-07-26",
                               "meta" : {
-                                "globalKey" : "4bae0971"
+                                "globalKey" : "e6a40ff1"
                               },
+                              "notionalAmount" : 700000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-04-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a40a18"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "8e0aa94b"
+                              "globalKey" : "2900afcb"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-10-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-10-28",
                               "adjustedStartDate" : "2019-07-26",
+                              "adjustedEndDate" : "2019-10-28",
                               "meta" : {
-                                "globalKey" : "a9c97f33"
+                                "globalKey" : "de5cc06f"
                               },
+                              "notionalAmount" : 700000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-07-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a42158"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "48023dcf"
+                              "globalKey" : "7c957f0b"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-01-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-01-27",
                               "adjustedStartDate" : "2019-10-28",
+                              "adjustedEndDate" : "2020-01-27",
                               "meta" : {
-                                "globalKey" : "ebc43970"
+                                "globalKey" : "c2fe7892"
                               },
+                              "notionalAmount" : 700000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-10-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a43898"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "7f36cecb"
+                              "globalKey" : "56710ded"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-04-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-04-27",
                               "adjustedStartDate" : "2020-01-27",
+                              "adjustedEndDate" : "2020-04-27",
                               "meta" : {
-                                "globalKey" : "669a15f2"
+                                "globalKey" : "1901c72"
                               },
+                              "notionalAmount" : 700000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-01-23",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a4eab9"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "2d5fec0d"
+                              "globalKey" : "c855f28d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-07-27",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-07-27",
                               "adjustedStartDate" : "2020-04-27",
+                              "adjustedEndDate" : "2020-07-27",
                               "meta" : {
-                                "globalKey" : "5ae91532"
+                                "globalKey" : "f5df1bb2"
                               },
+                              "notionalAmount" : 700000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-04-23",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a501f9"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "55022c0d"
+                              "globalKey" : "eff8328d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-10-26",
                               "adjustedStartDate" : "2020-07-27",
+                              "adjustedEndDate" : "2020-10-26",
                               "meta" : {
-                                "globalKey" : "1a51d931"
+                                "globalKey" : "e8794253"
                               },
+                              "notionalAmount" : 700000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-07-23",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a51939"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "b379c1cb"
+                              "globalKey" : "81a12aed"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-01-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-01-26",
                               "adjustedStartDate" : "2020-10-26",
+                              "adjustedEndDate" : "2021-01-26",
                               "meta" : {
-                                "globalKey" : "8c1444b3"
+                                "globalKey" : "301d2133"
                               },
+                              "notionalAmount" : 700000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-10-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a5305a"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "aeba730d"
+                              "globalKey" : "52c34f8d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-04-26",
                               "adjustedStartDate" : "2021-01-26",
+                              "adjustedEndDate" : "2021-04-26",
                               "meta" : {
-                                "globalKey" : "89ef9f3"
+                                "globalKey" : "a3950073"
                               },
+                              "notionalAmount" : 700000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-01-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a5e29a"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "5e98690d"
+                              "globalKey" : "f98e6f8d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-07-26",
                               "adjustedStartDate" : "2021-04-26",
+                              "adjustedEndDate" : "2021-07-26",
                               "meta" : {
-                                "globalKey" : "fcedf933"
+                                "globalKey" : "97e3ffb3"
                               },
+                              "notionalAmount" : 700000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-04-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a5f9da"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "863aa90d"
+                              "globalKey" : "2130af8d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-10-26",
                               "adjustedStartDate" : "2021-07-26",
+                              "adjustedEndDate" : "2021-10-26",
                               "meta" : {
-                                "globalKey" : "f13cf873"
+                                "globalKey" : "8c32fef3"
                               },
+                              "notionalAmount" : 700000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-07-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a6111a"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "addce90d"
+                              "globalKey" : "48d2ef8d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-01-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-01-26",
                               "adjustedStartDate" : "2021-10-26",
+                              "adjustedEndDate" : "2022-01-26",
                               "meta" : {
-                                "globalKey" : "64b43cb3"
+                                "globalKey" : "8bd1933"
                               },
+                              "notionalAmount" : 700000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-10-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a6285a"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "aad2730d"
+                              "globalKey" : "4edb4f8d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-04-26",
                               "adjustedStartDate" : "2022-01-26",
+                              "adjustedEndDate" : "2022-04-26",
                               "meta" : {
-                                "globalKey" : "e13ef231"
+                                "globalKey" : "7c34f8b1"
                               },
+                              "notionalAmount" : 700000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-01-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a6dad8"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "5ab0694b"
+                              "globalKey" : "f5a66fcb"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-07-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-07-26",
                               "adjustedStartDate" : "2022-04-26",
+                              "adjustedEndDate" : "2022-07-26",
                               "meta" : {
-                                "globalKey" : "d58df133"
+                                "globalKey" : "7083f7b3"
                               },
+                              "notionalAmount" : 700000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-04-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a6f1da"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "8252a90d"
+                              "globalKey" : "1d48af8d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-10-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-10-26",
                               "adjustedStartDate" : "2022-07-26",
+                              "adjustedEndDate" : "2022-10-26",
                               "meta" : {
-                                "globalKey" : "c9dcf073"
+                                "globalKey" : "64d2f6f3"
                               },
+                              "notionalAmount" : 700000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-07-22",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a7091a"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "a9f4e90d"
+                              "globalKey" : "44eaef8d"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-01-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-01-26",
                               "adjustedStartDate" : "2022-10-26",
+                              "adjustedEndDate" : "2023-01-26",
                               "meta" : {
-                                "globalKey" : "3d5434f1"
+                                "globalKey" : "e15d1171"
                               },
+                              "notionalAmount" : 700000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-10-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a72098"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 700000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "a6ea734b"
+                              "globalKey" : "4af34fcb"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-04-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-04-26",
                               "adjustedStartDate" : "2023-01-26",
+                              "adjustedEndDate" : "2023-04-26",
                               "meta" : {
-                                "globalKey" : "b9deea31"
+                                "globalKey" : "54d4f0b1"
                               },
+                              "notionalAmount" : 700000.00,
                               "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2023-01-24",
-                                  "meta" : {
-                                    "globalKey" : "7a7d2d8"
-                                  },
-                                  "observedRate" : 0
-                                } ]
-                              },
-                              "notionalAmount" : 700000.00
-                            } ],
-                            "meta" : {
-                              "globalKey" : "56c8694b"
-                            }
-                          } ]
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "c25e0877"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "637fde94"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "97b8e49c"
-                            }
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
-                          }
-                        },
-                        "resetDates" : {
-                          "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "b8e2c3f0"
-                          },
-                          "fixingDates" : {
-                            "meta" : {
-                              "globalKey" : "e4e1cc5f"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "21479e"
-                              }
-                            },
-                            "businessDayConvention" : "PRECEDING",
-                            "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "d1e29a08"
-                            }
-                          },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "d1e29a08"
-                          },
-                          "resetDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "245965f8"
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2023-01-24",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a7d2d8"
+                                  }
+                                } ]
                               }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
+                            } ],
                             "meta" : {
-                              "globalKey" : "5a9469c9"
+                              "globalKey" : "f1be6fcb"
                             }
-                          },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          } ]
                         },
                         "stubPeriod" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "b8e2c3f0"
+                            "globalReference" : "7e9a56ea",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
                           "initialStub" : {
                             "floatingRate" : [ {
                               "floatingRateIndex" : "USD-LIBOR-BBA",
                               "indexTenor" : {
-                                "meta" : {
-                                  "globalKey" : "956"
-                                },
+                                "periodMultiplier" : 3,
                                 "period" : "M",
-                                "periodMultiplier" : 3
+                                "meta" : {
+                                  "globalKey" : "aa"
+                                }
                               }
                             }, {
                               "floatingRateIndex" : "USD-LIBOR-BBA",
                               "indexTenor" : {
-                                "meta" : {
-                                  "globalKey" : "959"
-                                },
+                                "periodMultiplier" : 6,
                                 "period" : "M",
-                                "periodMultiplier" : 6
+                                "meta" : {
+                                  "globalKey" : "107"
+                                }
                               }
                             } ]
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "1a7f3519"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "19a7602"
+                        "globalKey" : "3194b2ce"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "19a7602"
+                    "globalKey" : "3194b2ce"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "19a7602"
+                  "globalKey" : "3194b2ce"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "dd8b87c7"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.032,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.032,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 700000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "d3e57119"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 700000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 700000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "57b053c8"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 700000.00
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1118"
-              },
-              "value" : "2018-04-24"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
-                  },
-                  "value" : "2894761"
-                }
-              }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "client_trade_id"
                   },
-                  "value" : "QAC-11111"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "22222"
+                    "globalKey" : "683bc2f4"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "dd19",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "risk_approval_id"
-                  },
-                  "value" : "22222"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "999",
                   "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "22222"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "dd19"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "dd19",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "package_trade_id"
-                  },
-                  "value" : "22222"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "position_trade_id"
-                  },
-                  "value" : "22222"
+                  "value" : "PLATFORM"
+                },
+                "meta" : {
+                  "globalKey" : "9e635873"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "3c60fd2d"
+                "globalKey" : "9e635873",
+                "externalKey" : "trade_source"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS2894761"
+                  "value" : "PARTY123"
+                },
+                "meta" : {
+                  "globalKey" : "75895dac"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "75895dac",
+                "externalKey" : "SEF"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "9e635873",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2018-04-24",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "999-123",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "a7071c09"
+                "globalKey" : "c26b8e",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "9e37bb2a"
+            }
+          },
+          "meta" : {
+            "globalKey" : "9e37bb2a"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "5608850157",
+      "meta" : {
+        "scheme" : "cme_message_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_clearingorg_id"
+      }
+    },
+    "sentTo" : [ {
+      "value" : "999",
+      "meta" : {
+        "scheme" : "cme_firm_id"
+      }
+    }, {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_exchange_id"
+      }
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-04-24T09:29:25-05:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-04-24T14:29:24.693956Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
+    "qualification" : "clearingReceiptDateTime"
   } ],
+  "creditLimitInformation" : {
+    "limitApplicable" : [ {
+      "limitType" : {
+        "value" : "PV01",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 4356,
+      "amountRemaining" : 999999999999994620,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "House",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 999999999999998980,
+      "limitImpactDueToTrade" : 0
+    } ]
+  },
   "workflowState" : {
-    "workflowStatus" : "CLEARED"
+    "workflowStatus" : "Cleared"
+  },
+  "meta" : {
+    "globalKey" : "e0c9a1db"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex06-Fixed-Float-Non-Deliverable.json b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex06-Fixed-Float-Non-Deliverable.json
index d896c41af5..571f0e7f26 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex06-Fixed-Float-Non-Deliverable.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex06-Fixed-Float-Non-Deliverable.json
@@ -1,158 +1,80 @@
 {
-  "creditLimitInformation" : {
-    "limitApplicable" : [ {
-      "amountRemaining" : 999999999999996030,
-      "amountUtilized" : 2954,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "PV01"
-      },
-      "limitAmount" : 999999999999998980,
-      "limitImpactDueToTrade" : 4734,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "HOUSE"
-      }
-    } ]
-  },
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "cme_message_id"
-      },
-      "value" : "0106625451"
-    },
-    "sentBy" : {
-      "meta" : {
-        "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "meta" : {
-        "scheme" : "cme_firm_id"
-      },
-      "value" : "999"
-    }, {
-      "meta" : {
-        "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "f411c66b"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "89a4bfd2"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "999-123"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "88c5360e"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              }
-            } ],
-            "clearedDate" : "2016-09-27",
-            "meta" : {
-              "globalKey" : "89a4bfd2"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "dd19"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "2894761",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "999"
-                },
-                "meta" : {
-                  "globalKey" : "dd19"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "QAC-11111",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "9e635873"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "PLATFORM"
-                },
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "platform_side_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "6bc81893"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "9e635873"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "9e635873"
               },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS2894761",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e12c31ab"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2016-09-27",
+              "meta" : {
+                "globalKey" : "3f025b"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "dd19"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -163,39 +85,46 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "settlementTerms" : {
-                          "meta" : {
-                            "globalKey" : "3806d9a1"
-                          },
                           "settlementCurrency" : {
                             "value" : "USD"
                           },
+                          "meta" : {
+                            "globalKey" : "16f9ab6b"
+                          },
                           "cashSettlementTerms" : [ {
-                            "meta" : {
-                              "globalKey" : "9f923f3b"
+                            "valuationMethod" : {
+                              "valuationSource" : {
+                                "settlementRateOption" : {
+                                  "settlementRateOption" : {
+                                    "value" : "INR.RBIB/INR01"
+                                  }
+                                }
+                              }
                             },
                             "valuationDate" : {
                               "fxFixingDate" : {
+                                "periodMultiplier" : -2,
+                                "period" : "D",
                                 "meta" : {
-                                  "globalKey" : "d203d7ef"
+                                  "globalKey" : "6df980bb"
                                 },
-                                "period" : "D",
-                                "periodMultiplier" : -2,
-                                "dayType" : "BUSINESS",
+                                "dayType" : "Business",
+                                "businessDayConvention" : "NONE",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "INMU"
@@ -206,52 +135,41 @@
                                     "globalKey" : "45138fc"
                                   }
                                 },
-                                "businessDayConvention" : "NONE",
                                 "dateRelativeToPaymentDates" : {
                                   "paymentDatesReference" : [ {
-                                    "externalReference" : "fixedLegPaymentDates",
-                                    "globalReference" : "fe5a8a71"
+                                    "globalReference" : "e0d2b7f3",
+                                    "externalReference" : "fixedLegPaymentDates"
                                   } ]
                                 }
                               }
                             },
-                            "valuationMethod" : {
-                              "valuationSource" : {
-                                "settlementRateOption" : {
-                                  "settlementRateOption" : {
-                                    "value" : "INR.RBIB/INR01"
-                                  }
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "7e851105"
                             }
                           } ]
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "45138fc"
-                              },
-                              "meta" : {
-                                "globalKey" : "116cc910"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "47a7cce1"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "2b91d"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "28"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2016-09-28",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -260,75 +178,85 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecac8294"
-                              },
-                              "unadjustedDate" : "2016-09-28"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecac8294"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "cc8ab9db"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2017-09-28",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "fixedPrimaryBusinessCenters",
-                                    "globalReference" : "45138fc"
+                                    "globalReference" : "45138fc",
+                                    "externalReference" : "fixedPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "116cc910"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "47a7cce1"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "443cdc05"
-                              },
-                              "unadjustedDate" : "2017-09-28"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "443cdc05"
                             }
-                          }
-                        },
-                        "cashflowRepresentation" : {
-                          "cashflowsMatchParameters" : true,
-                          "paymentCalculationPeriod" : [ {
-                            "adjustedPaymentDate" : "2017-09-28",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-09-28",
-                              "adjustedStartDate" : "2016-09-28",
-                              "meta" : {
-                                "globalKey" : "5ddac6ff"
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "45138fc",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
                               },
-                              "fixedRate" : 0.066,
-                              "notionalAmount" : 1000000.00
-                            } ],
+                              "meta" : {
+                                "globalKey" : "116cc910"
+                              }
+                            },
                             "meta" : {
-                              "globalKey" : "5a6fd623"
+                              "globalKey" : "47a7cce1"
                             }
-                          } ]
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
-                        "meta" : {
-                          "globalKey" : "91be1c7a"
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "1796d"
+                            },
+                            "rollConvention" : "28"
+                          },
+                          "meta" : {
+                            "globalKey" : "3f2e3f55",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
                         },
                         "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "fe5a8a71"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4ab7fc"
+                            },
+                            "dayType" : "Business"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "INMU"
@@ -336,81 +264,82 @@
                                 "value" : "USNY"
                               } ],
                               "meta" : {
-                                "externalKey" : "fixedPrimaryBusinessCenters",
-                                "globalKey" : "45138fc"
+                                "globalKey" : "45138fc",
+                                "externalKey" : "fixedPrimaryBusinessCenters"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97da8c8d"
                             }
                           },
-                          "paymentDaysOffset" : {
-                            "meta" : {
-                              "globalKey" : "ea4baf04"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "dayType" : "BUSINESS"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "e0d2b7f3",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "cashflowRepresentation" : {
+                          "cashflowsMatchParameters" : true,
+                          "paymentCalculationPeriod" : [ {
+                            "adjustedPaymentDate" : "2017-09-28",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2016-09-28",
+                              "adjustedEndDate" : "2017-09-28",
+                              "meta" : {
+                                "globalKey" : "b5bbc461"
+                              },
+                              "notionalAmount" : 1000000.00,
+                              "fixedRate" : 0.066
+                            } ],
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
+                              "globalKey" : "b250d385"
                             }
-                          }
+                          } ]
+                        },
+                        "meta" : {
+                          "globalKey" : "b7e7af1c"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "settlementTerms" : {
-                          "meta" : {
-                            "globalKey" : "ed73fd33"
-                          },
                           "settlementCurrency" : {
                             "value" : "USD"
                           },
+                          "meta" : {
+                            "globalKey" : "23c51499"
+                          },
                           "cashSettlementTerms" : [ {
-                            "meta" : {
-                              "globalKey" : "54ff62cd"
+                            "valuationMethod" : {
+                              "valuationSource" : {
+                                "settlementRateOption" : {
+                                  "settlementRateOption" : {
+                                    "value" : "INR.RBIB/INR01"
+                                  }
+                                }
+                              }
                             },
                             "valuationDate" : {
                               "fxFixingDate" : {
+                                "periodMultiplier" : -2,
+                                "period" : "D",
                                 "meta" : {
-                                  "globalKey" : "decf411d"
+                                  "globalKey" : "7ac4e9e9"
                                 },
-                                "period" : "D",
-                                "periodMultiplier" : -2,
-                                "dayType" : "BUSINESS",
+                                "dayType" : "Business",
+                                "businessDayConvention" : "NONE",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "INMU"
@@ -421,52 +350,39 @@
                                     "globalKey" : "45138fc"
                                   }
                                 },
-                                "businessDayConvention" : "NONE",
                                 "dateRelativeToPaymentDates" : {
                                   "paymentDatesReference" : [ {
-                                    "externalReference" : "floatingLegPaymentDates",
-                                    "globalReference" : "fe5a8a71"
+                                    "globalReference" : "e0d2b7f3",
+                                    "externalReference" : "floatingLegPaymentDates"
                                   } ]
                                 }
                               }
                             },
-                            "valuationMethod" : {
-                              "valuationSource" : {
-                                "settlementRateOption" : {
-                                  "settlementRateOption" : {
-                                    "value" : "INR.RBIB/INR01"
-                                  }
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "8b507a33"
                             }
                           } ]
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "45138fc"
-                              },
-                              "meta" : {
-                                "globalKey" : "245965f8"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "5a9469c9"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "2b91d"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "28"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2016-09-28",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -475,139 +391,118 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecac8294"
-                              },
-                              "unadjustedDate" : "2016-09-28"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecac8294"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "8c0b26db"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2017-09-28",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "45138fc"
+                                    "globalReference" : "45138fc",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "245965f8"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "5a9469c9"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "572978ed"
-                              },
-                              "unadjustedDate" : "2017-09-28"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "572978ed"
                             }
-                          }
-                        },
-                        "cashflowRepresentation" : {
-                          "cashflowsMatchParameters" : true,
-                          "paymentCalculationPeriod" : [ {
-                            "adjustedPaymentDate" : "2017-09-28",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-09-28",
-                              "adjustedStartDate" : "2016-09-28",
-                              "meta" : {
-                                "globalKey" : "c7cff6c5"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2017-09-28",
-                                  "meta" : {
-                                    "globalKey" : "7a24154"
-                                  },
-                                  "observedRate" : 0
-                                } ]
-                              },
-                              "notionalAmount" : 1000000.00
-                            } ],
-                            "meta" : {
-                              "globalKey" : "dfce521"
-                            }
-                          } ]
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
-                        "meta" : {
-                          "globalKey" : "f16cb6fc"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "fe5a8a71"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "INMU"
-                              }, {
-                                "value" : "USNY"
-                              } ],
+                              "businessCentersReference" : {
+                                "globalReference" : "45138fc",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
                               "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "45138fc"
+                                "globalKey" : "245965f8"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "97da8c8d"
+                              "globalKey" : "5a9469c9"
                             }
                           },
-                          "paymentDaysOffset" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
                             "meta" : {
-                              "globalKey" : "ea4baf04"
+                              "globalKey" : "1796d"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "dayType" : "BUSINESS"
+                            "rollConvention" : "28"
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "39439055",
+                            "externalKey" : "floatingCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
                             "meta" : {
-                              "globalKey" : "0"
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4ab7fc"
                             },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                            "dayType" : "Business"
+                          },
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "INMU"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "45138fc",
+                                "externalKey" : "floatPrimaryBusinessCenters"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "97da8c8d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "e0d2b7f3",
+                            "externalKey" : "floatingLegPaymentDates"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "8c0b26db"
+                            "globalReference" : "39439055",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodEndDate",
                           "fixingDates" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "54620b84"
+                              "globalKey" : "c9b9dd8c"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
+                            "businessDayConvention" : "PRECEDING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "INMU"
@@ -616,218 +511,323 @@
                                 "globalKey" : "225d8d"
                               }
                             },
-                            "businessDayConvention" : "PRECEDING",
                             "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "7433fe20"
+                              "globalReference" : "b214dc1a",
+                              "externalReference" : "floatingLegResetDates"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "7433fe20"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "45138fc"
+                                "globalReference" : "45138fc",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "245965f8"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "5a9469c9"
                             }
                           },
-                          "resetFrequency" : {
+                          "meta" : {
+                            "globalKey" : "b214dc1a",
+                            "externalKey" : "floatingLegResetDates"
+                          }
+                        },
+                        "cashflowRepresentation" : {
+                          "cashflowsMatchParameters" : true,
+                          "paymentCalculationPeriod" : [ {
+                            "adjustedPaymentDate" : "2017-09-28",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2016-09-28",
+                              "adjustedEndDate" : "2017-09-28",
+                              "meta" : {
+                                "globalKey" : "3cbae6c5"
+                              },
+                              "notionalAmount" : 1000000.00,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2017-09-28",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a24154"
+                                  }
+                                } ]
+                              }
+                            } ],
                             "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                              "globalKey" : "82e7d521"
+                            }
+                          } ]
+                        },
+                        "meta" : {
+                          "globalKey" : "e3859734"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "276b542"
+                        "globalKey" : "a0b04098"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "276b542"
+                    "globalKey" : "a0b04098"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "276b542"
+                  "globalKey" : "a0b04098"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "2029ada9"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.066,
                       "unit" : {
                         "currency" : {
                           "value" : "INR"
                         }
                       },
-                      "value" : 0.066,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "INR"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 1000000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "INR"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "e50c0777"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 1000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "INR"
                         }
-                      },
-                      "value" : 1000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "788df4c7"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "61c6a255"
-                    },
                     "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "INR-FBIL-MIBOR-OIS-COMPOUND"
+                        }
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
                           "value" : "rateOption-1"
                         } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "INR-FBIL-MIBOR-OIS-COMPOUND"
-                        }
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "INR"
-                        }
-                      },
-                      "value" : 1000000.00
+                    "meta" : {
+                      "globalKey" : "d70da84b"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f025b"
-              },
-              "value" : "2016-09-27"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "2894761"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "QAC-11111"
+                    "globalKey" : "f651ac0f"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "dd19",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "22222"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "999",
                   "meta" : {
-                    "scheme" : "platform_side_id"
-                  },
-                  "value" : "22222"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "dd19"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "dd19",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "22222"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "da630249"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS2894761"
+                  "value" : "PLATFORM"
+                },
+                "meta" : {
+                  "globalKey" : "9e635873"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "9e635873",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "9e635873",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2016-09-27",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "999-123",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "a7071c09"
+                "globalKey" : "c26b8e",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "e6934004"
+            }
+          },
+          "meta" : {
+            "globalKey" : "e6934004"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "0106625451",
+      "meta" : {
+        "scheme" : "cme_message_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_clearingorg_id"
+      }
+    },
+    "sentTo" : [ {
+      "value" : "999",
+      "meta" : {
+        "scheme" : "cme_firm_id"
+      }
+    }, {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_exchange_id"
+      }
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2016-09-27T05:45:25-05:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   } ],
+  "creditLimitInformation" : {
+    "limitApplicable" : [ {
+      "limitType" : {
+        "value" : "PV01",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 2954,
+      "amountRemaining" : 999999999999996030,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "House",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 999999999999998980,
+      "limitImpactDueToTrade" : 4734
+    } ]
+  },
   "workflowState" : {
-    "workflowStatus" : "CLEARED"
+    "workflowStatus" : "Cleared"
+  },
+  "meta" : {
+    "globalKey" : "994c5f0b"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex07-Fixed-Float-Zero-Coupon-BRL-CDI.json b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex07-Fixed-Float-Zero-Coupon-BRL-CDI.json
index 155f0f118c..9e27026bcf 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex07-Fixed-Float-Zero-Coupon-BRL-CDI.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex07-Fixed-Float-Zero-Coupon-BRL-CDI.json
@@ -1,204 +1,80 @@
 {
-  "creditLimitInformation" : {
-    "limitApplicable" : [ {
-      "amountRemaining" : 999999999874,
-      "amountUtilized" : 125,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "PV01"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : -125,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    }, {
-      "amountRemaining" : 999995597082,
-      "amountUtilized" : -4402917,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NPV"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 4402917,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    }, {
-      "amountRemaining" : 999900000000,
-      "amountUtilized" : 100000000,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NOTIONAL"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 100000000,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    } ]
-  },
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "cme_message_id"
-      },
-      "value" : "0102845192"
-    },
-    "sentBy" : {
-      "meta" : {
-        "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "meta" : {
-        "scheme" : "cme_firm_id"
-      },
-      "value" : "999"
-    }, {
-      "meta" : {
-        "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "72c93ecb"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "c3fac4ab"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "999-123"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "88c5360e"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              }
-            } ],
-            "clearedDate" : "2015-05-20",
-            "meta" : {
-              "globalKey" : "c3fac4ab"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "dd19"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "2894761",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "999"
-                },
-                "meta" : {
-                  "globalKey" : "dd19"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "QAC-11111",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "9e635873"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "PLATFORM"
-                },
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "risk_approval_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "6bc81893"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "9e635873"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "9e635873"
               },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS2894761",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e12c31ab"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2015-05-20",
+              "meta" : {
+                "globalKey" : "3ef954"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "dd19"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -209,39 +85,46 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "settlementTerms" : {
-                          "meta" : {
-                            "globalKey" : "e2cf4e39"
-                          },
                           "settlementCurrency" : {
                             "value" : "USD"
                           },
+                          "meta" : {
+                            "globalKey" : "e54a07e5"
+                          },
                           "cashSettlementTerms" : [ {
-                            "meta" : {
-                              "globalKey" : "4a5ab3d3"
+                            "valuationMethod" : {
+                              "valuationSource" : {
+                                "settlementRateOption" : {
+                                  "settlementRateOption" : {
+                                    "value" : "BRL.PTAX/BRL09"
+                                  }
+                                }
+                              }
                             },
                             "valuationDate" : {
                               "fxFixingDate" : {
+                                "periodMultiplier" : -1,
+                                "period" : "D",
                                 "meta" : {
-                                  "globalKey" : "6b223df1"
+                                  "globalKey" : "79e4d95b"
                                 },
-                                "period" : "D",
-                                "periodMultiplier" : -1,
-                                "dayType" : "BUSINESS",
+                                "dayType" : "Business",
+                                "businessDayConvention" : "PRECEDING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "BRBD"
@@ -252,52 +135,39 @@
                                     "globalKey" : "3f03a97"
                                   }
                                 },
-                                "businessDayConvention" : "PRECEDING",
                                 "dateRelativeToCalculationPeriodDates" : {
                                   "calculationPeriodDatesReference" : [ {
-                                    "externalReference" : "floatingLegTerminationDate",
-                                    "globalReference" : "500aa139"
+                                    "globalReference" : "500aa139",
+                                    "externalReference" : "floatingLegTerminationDate"
                                   } ]
                                 }
                               }
                             },
-                            "valuationMethod" : {
-                              "valuationSource" : {
-                                "settlementRateOption" : {
-                                  "settlementRateOption" : {
-                                    "value" : "BRL.PTAX/BRL09"
-                                  }
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "4cd56d7f"
                             }
                           } ]
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "1f3c92"
-                              },
-                              "meta" : {
-                                "globalKey" : "245965f8"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "meta" : {
-                              "globalKey" : "cdb8d3c0"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "25e2ab"
-                            },
-                            "period" : "T",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "NONE"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "CAL/252"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2015-05-20",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -306,85 +176,86 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec8a9b8c"
-                              },
-                              "unadjustedDate" : "2015-05-20"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec8a9b8c"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "6a67203a"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2015-07-01",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "NONE",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "BRBD"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "floatPrimaryBusinessCenters",
-                                    "globalKey" : "1f3c92"
+                                    "globalKey" : "1f3c92",
+                                    "externalKey" : "floatPrimaryBusinessCenters"
                                   }
                                 },
-                                "businessDayConvention" : "NONE",
                                 "meta" : {
                                   "globalKey" : "a97eaa5a"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "500aa139"
-                              },
-                              "unadjustedDate" : "2015-07-01"
+                              }
                             },
                             "meta" : {
-                              "externalKey" : "floatingLegTerminationDate",
-                              "globalKey" : "500aa139"
+                              "globalKey" : "500aa139",
+                              "externalKey" : "floatingLegTerminationDate"
                             }
-                          }
-                        },
-                        "cashflowRepresentation" : {
-                          "cashflowsMatchParameters" : true,
-                          "paymentCalculationPeriod" : [ {
-                            "adjustedPaymentDate" : "2015-07-02",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-07-01",
-                              "adjustedStartDate" : "2015-05-20",
-                              "meta" : {
-                                "globalKey" : "5dfd648"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2015-06-30",
-                                  "meta" : {
-                                    "globalKey" : "ec670a6d"
-                                  },
-                                  "observationWeight" : 1,
-                                  "observedRate" : 0
-                                } ]
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "1f3c92",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
-                              "notionalAmount" : 9856218.36
-                            } ],
+                              "meta" : {
+                                "globalKey" : "245965f8"
+                              }
+                            },
                             "meta" : {
-                              "globalKey" : "fa10b6c6"
+                              "globalKey" : "cdb8d3c0"
                             }
-                          } ]
-                        },
-                        "dayCountFraction" : {
-                          "value" : "CAL/252"
-                        },
-                        "meta" : {
-                          "globalKey" : "7e8f5bb"
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "T",
+                            "meta" : {
+                              "globalKey" : "24b525"
+                            },
+                            "rollConvention" : "NONE"
+                          },
+                          "meta" : {
+                            "globalKey" : "d5e8c5c0",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
                         },
                         "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "5720d4fe"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "T",
+                            "meta" : {
+                              "globalKey" : "73"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 1,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4abbbd"
+                            },
+                            "dayType" : "Business"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "BRBD"
@@ -395,51 +266,27 @@
                                 "globalKey" : "3f03a97"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da1616c6"
                             }
                           },
-                          "paymentDaysOffset" : {
-                            "meta" : {
-                              "globalKey" : "ea4baf23"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 1,
-                            "dayType" : "BUSINESS"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "a2d"
-                            },
-                            "period" : "T",
-                            "periodMultiplier" : 1
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "f0df7870",
+                            "externalKey" : "floatingLegPaymentDates"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "6a67203a"
+                            "globalReference" : "d5e8c5c0",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
                           "fixingDates" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "a15dffd4"
+                              "globalKey" : "16b5d1dc"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "BRBD"
@@ -448,87 +295,123 @@
                                 "globalKey" : "1f3c92"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "ccf788a8"
+                              "globalReference" : "1f9fcf70",
+                              "externalReference" : "floatingLegResetDates"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "ccf788a8"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "63"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "1f3c92"
+                                "globalReference" : "1f3c92",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "245965f8"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "meta" : {
                               "globalKey" : "cdb8d3c0"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "83d"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "1f9fcf70",
+                            "externalKey" : "floatingLegResetDates"
                           }
+                        },
+                        "cashflowRepresentation" : {
+                          "cashflowsMatchParameters" : true,
+                          "paymentCalculationPeriod" : [ {
+                            "adjustedPaymentDate" : "2015-07-02",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2015-05-20",
+                              "adjustedEndDate" : "2015-07-01",
+                              "meta" : {
+                                "globalKey" : "5106fb84"
+                              },
+                              "notionalAmount" : 9856218.36,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2015-06-30",
+                                  "observedRate" : 0,
+                                  "observationWeight" : 1,
+                                  "meta" : {
+                                    "globalKey" : "ec670fef"
+                                  }
+                                } ]
+                              }
+                            } ],
+                            "meta" : {
+                              "globalKey" : "4537dc02"
+                            }
+                          } ]
+                        },
+                        "meta" : {
+                          "globalKey" : "f2671957"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-3"
+                            }
+                          },
                           "futureValueNotional" : {
-                            "calculationPeriodNumberOfDays" : 29,
-                            "currency" : {
-                              "value" : "BRL"
-                            },
                             "quantity" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
                             },
+                            "currency" : {
+                              "value" : "BRL"
+                            },
+                            "calculationPeriodNumberOfDays" : 29,
                             "valueDate" : "2015-06-30"
                           },
                           "meta" : {
                             "globalKey" : "ec753add"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-3"
-                            }
                           }
                         },
                         "settlementTerms" : {
-                          "meta" : {
-                            "globalKey" : "1b30f30b"
-                          },
                           "settlementCurrency" : {
                             "value" : "USD"
                           },
+                          "meta" : {
+                            "globalKey" : "fa2527d3"
+                          },
                           "cashSettlementTerms" : [ {
-                            "meta" : {
-                              "globalKey" : "82bc58a5"
+                            "valuationMethod" : {
+                              "valuationSource" : {
+                                "settlementRateOption" : {
+                                  "settlementRateOption" : {
+                                    "value" : "BRL.PTAX/BRL09"
+                                  }
+                                }
+                              }
                             },
                             "valuationDate" : {
                               "fxFixingDate" : {
+                                "periodMultiplier" : -1,
+                                "period" : "D",
                                 "meta" : {
-                                  "globalKey" : "7ffd5ddf"
+                                  "globalKey" : "8ebff949"
                                 },
-                                "period" : "D",
-                                "periodMultiplier" : -1,
-                                "dayType" : "BUSINESS",
+                                "dayType" : "Business",
+                                "businessDayConvention" : "PRECEDING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "BRBD"
@@ -539,52 +422,41 @@
                                     "globalKey" : "3f03a97"
                                   }
                                 },
-                                "businessDayConvention" : "PRECEDING",
                                 "dateRelativeToCalculationPeriodDates" : {
                                   "calculationPeriodDatesReference" : [ {
-                                    "externalReference" : "fixedLegTerminationDate",
-                                    "globalReference" : "c7a84f60"
+                                    "globalReference" : "c7a84f60",
+                                    "externalReference" : "fixedLegTerminationDate"
                                   } ]
                                 }
                               }
                             },
-                            "valuationMethod" : {
-                              "valuationSource" : {
-                                "settlementRateOption" : {
-                                  "settlementRateOption" : {
-                                    "value" : "BRL.PTAX/BRL09"
-                                  }
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "61b08d6d"
                             }
                           } ]
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "1f3c92"
-                              },
-                              "meta" : {
-                                "globalKey" : "116cc910"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "meta" : {
-                              "globalKey" : "bacc36d8"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "25e2ab"
-                            },
-                            "period" : "T",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "NONE"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "CAL/252"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2015-05-20",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -593,76 +465,86 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec8a9b8c"
-                              },
-                              "unadjustedDate" : "2015-05-20"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec8a9b8c"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "3570fe49"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2015-07-01",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "FOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "BRBD"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "fixedPrimaryBusinessCenters",
-                                    "globalKey" : "1f3c92"
+                                    "globalKey" : "1f3c92",
+                                    "externalKey" : "fixedPrimaryBusinessCenters"
                                   }
                                 },
-                                "businessDayConvention" : "FOLLOWING",
                                 "meta" : {
                                   "globalKey" : "211c5881"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "c7a84f60"
-                              },
-                              "unadjustedDate" : "2015-07-01"
+                              }
                             },
                             "meta" : {
-                              "externalKey" : "fixedLegTerminationDate",
-                              "globalKey" : "c7a84f60"
+                              "globalKey" : "c7a84f60",
+                              "externalKey" : "fixedLegTerminationDate"
                             }
-                          }
-                        },
-                        "cashflowRepresentation" : {
-                          "cashflowsMatchParameters" : true,
-                          "paymentCalculationPeriod" : [ {
-                            "adjustedPaymentDate" : "2015-07-02",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-07-01",
-                              "adjustedStartDate" : "2015-05-20",
-                              "meta" : {
-                                "globalKey" : "9f04c8ca"
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "1f3c92",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
                               },
-                              "fixedRate" : 0.1323,
-                              "notionalAmount" : 9856218.36
-                            } ],
+                              "meta" : {
+                                "globalKey" : "116cc910"
+                              }
+                            },
                             "meta" : {
-                              "globalKey" : "47459848"
+                              "globalKey" : "bacc36d8"
                             }
-                          } ]
-                        },
-                        "dayCountFraction" : {
-                          "value" : "CAL/252"
-                        },
-                        "meta" : {
-                          "globalKey" : "a9ee2f65"
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "T",
+                            "meta" : {
+                              "globalKey" : "24b525"
+                            },
+                            "rollConvention" : "NONE"
+                          },
+                          "meta" : {
+                            "globalKey" : "60fb2a91",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
                         },
                         "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "5720d4fe"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "T",
+                            "meta" : {
+                              "globalKey" : "73"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 1,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4abbbd"
+                            },
+                            "dayType" : "Business"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "BRBD"
@@ -673,235 +555,353 @@
                                 "globalKey" : "3f03a97"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da1616c6"
                             }
                           },
-                          "paymentDaysOffset" : {
-                            "meta" : {
-                              "globalKey" : "ea4baf23"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 1,
-                            "dayType" : "BUSINESS"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "a2d"
-                            },
-                            "period" : "T",
-                            "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "f0df7870",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "cashflowRepresentation" : {
+                          "cashflowsMatchParameters" : true,
+                          "paymentCalculationPeriod" : [ {
+                            "adjustedPaymentDate" : "2015-07-02",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2015-05-20",
+                              "adjustedEndDate" : "2015-07-01",
+                              "meta" : {
+                                "globalKey" : "bfaee0f6"
+                              },
+                              "notionalAmount" : 9856218.36,
+                              "fixedRate" : 0.1323
+                            } ],
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
+                              "globalKey" : "67efb074"
                             }
-                          }
+                          } ]
+                        },
+                        "meta" : {
+                          "globalKey" : "5fa6a1eb"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "9494048a"
+                        "globalKey" : "e4eeccf4"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "9494048a"
+                    "globalKey" : "e4eeccf4"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "9494048a"
+                  "globalKey" : "e4eeccf4"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "fb78437f"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "33a3d745"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "BRL-CDI"
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 9856218.36,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "BRL"
                         }
                       }
-                    }
-                  },
-                  "quantity" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "BRL"
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "BRL-CDI"
                         }
                       },
-                      "value" : 9856218.36
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "40d7115b"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "260039b"
                   },
+                  "meta" : {
+                    "globalKey" : "4d0f7677"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.1323,
                       "unit" : {
                         "currency" : {
                           "value" : "BRL"
                         }
                       },
-                      "value" : 0.1323,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "BRL"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-3"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 9856218.36,
                       "unit" : {
                         "currency" : {
                           "value" : "BRL"
                         }
-                      },
-                      "value" : 9856218.36
-                    }
-                  }, {
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "quantity-3"
                       } ]
-                    },
+                    }
+                  }, {
                     "value" : {
+                      "value" : 9998162.07,
                       "unit" : {
                         "currency" : {
                           "value" : "BRL"
                         }
-                      },
-                      "value" : 9998162.07
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ef954"
-              },
-              "value" : "2015-05-20"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
-                  },
-                  "value" : "2894761"
-                }
-              }, {
-                "identifier" : {
+                  } ],
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "QAC-11111"
+                    "globalKey" : "49a06fc5"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "dd19",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "22222"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "999",
                   "meta" : {
-                    "scheme" : "risk_approval_id"
-                  },
-                  "value" : "22222"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "dd19"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "dd19",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "22222"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "da630249"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS2894761"
+                  "value" : "PLATFORM"
+                },
+                "meta" : {
+                  "globalKey" : "9e635873"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "9e635873",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "9e635873",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2015-05-20",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "999-123",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "a7071c09"
+                "globalKey" : "c26b8e",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "e40a6841"
+            }
+          },
+          "meta" : {
+            "globalKey" : "e40a6841"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "0102845192",
+      "meta" : {
+        "scheme" : "cme_message_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_clearingorg_id"
+      }
+    },
+    "sentTo" : [ {
+      "value" : "999",
+      "meta" : {
+        "scheme" : "cme_firm_id"
+      }
+    }, {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_exchange_id"
+      }
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2015-05-20T10:41:23-06:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   } ],
+  "creditLimitInformation" : {
+    "limitApplicable" : [ {
+      "limitType" : {
+        "value" : "PV01",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 125,
+      "amountRemaining" : 999999999874,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : -125
+    }, {
+      "limitType" : {
+        "value" : "NPV",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : -4402917,
+      "amountRemaining" : 999995597082,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 4402917
+    }, {
+      "limitType" : {
+        "value" : "Notional",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 100000000,
+      "amountRemaining" : 999900000000,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 100000000
+    } ]
+  },
   "workflowState" : {
-    "workflowStatus" : "CLEARED"
+    "workflowStatus" : "Cleared"
+  },
+  "meta" : {
+    "globalKey" : "789c2893"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex08-Fixed-Float-Zero.json b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex08-Fixed-Float-Zero.json
index e3169b2602..4eca97d8e6 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex08-Fixed-Float-Zero.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex08-Fixed-Float-Zero.json
@@ -1,273 +1,80 @@
 {
-  "creditLimitInformation" : {
-    "limitApplicable" : [ {
-      "amountRemaining" : 998777731300,
-      "amountUtilized" : 1222268700,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NOTIONAL"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 100000000,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    }, {
-      "amountRemaining" : 999994399919,
-      "amountUtilized" : 5600080,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NPV"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 686210,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    }, {
-      "amountRemaining" : 999999900607,
-      "amountUtilized" : 99392,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "PV01"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 10082,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    }, {
-      "amountRemaining" : 999999898145,
-      "amountUtilized" : 101854,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "PV01"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 10082,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "ACCOUNT"
-      }
-    }, {
-      "amountRemaining" : 998800000000,
-      "amountUtilized" : 1200000000,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NOTIONAL"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 100000000,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "ACCOUNT"
-      }
-    }, {
-      "amountRemaining" : 999994854696,
-      "amountUtilized" : 5145303,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NPV"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 686210,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "ACCOUNT"
-      }
-    } ]
-  },
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "cme_message_id"
-      },
-      "value" : "0109369921"
-    },
-    "sentBy" : {
-      "meta" : {
-        "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "meta" : {
-        "scheme" : "cme_firm_id"
-      },
-      "value" : "010"
-    }, {
-      "meta" : {
-        "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "da1bf469"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "bc881593"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "010S3"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "6a05b6df"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              }
-            } ],
-            "clearedDate" : "2018-10-31",
-            "meta" : {
-              "globalKey" : "bc881593"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "ba4f"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "9369921",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "010"
-                },
-                "meta" : {
-                  "globalKey" : "ba4f"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "43401224-2",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "66b48bac"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "MARKIT_WIRE"
-                },
+                  "value" : "43401224",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43401813",
+                  "meta" : {
+                    "scheme" : "platform_side_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43401224",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "5eb0e833"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "66b48bac"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "66b48bac"
               },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS9369921",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "4ac79bb5"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-31",
+              "meta" : {
+                "globalKey" : "3f129f"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "ba4f"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -278,46 +85,42 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "116cc910"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "47a7cce1"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "25e2ab"
-                            },
-                            "period" : "T",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "NONE"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -326,75 +129,77 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "c57b8f4d"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2019-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "fixedPrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "fixedPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "116cc910"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "47a7cce1"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "3fd51b5f"
-                              },
-                              "unadjustedDate" : "2019-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "3fd51b5f"
                             }
-                          }
-                        },
-                        "cashflowRepresentation" : {
-                          "cashflowsMatchParameters" : true,
-                          "paymentCalculationPeriod" : [ {
-                            "adjustedPaymentDate" : "2019-11-04",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-11-04",
-                              "adjustedStartDate" : "2018-11-02",
-                              "meta" : {
-                                "globalKey" : "7c8e01d"
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
                               },
-                              "fixedRate" : 0.02178,
-                              "notionalAmount" : 100000000.00
-                            } ],
+                              "meta" : {
+                                "globalKey" : "116cc910"
+                              }
+                            },
                             "meta" : {
-                              "globalKey" : "35fdfd9"
+                              "globalKey" : "47a7cce1"
                             }
-                          } ]
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "c6b5eab9"
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "T",
+                            "meta" : {
+                              "globalKey" : "24b525"
+                            },
+                            "rollConvention" : "NONE"
+                          },
+                          "meta" : {
+                            "globalKey" : "2b433acd",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
                         },
                         "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "637fdf6b"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "T",
+                            "meta" : {
+                              "globalKey" : "73"
+                            }
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                          "payRelativeTo" : "CalculationPeriodEndDate",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -402,80 +207,76 @@
                                 "value" : "USNY"
                               } ],
                               "meta" : {
-                                "externalKey" : "fixedPrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
+                                "globalKey" : "42f910b",
+                                "externalKey" : "fixedPrimaryBusinessCenters"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "a2d"
-                            },
-                            "period" : "T",
-                            "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "902c5c23",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "cashflowRepresentation" : {
+                          "cashflowsMatchParameters" : true,
+                          "paymentCalculationPeriod" : [ {
+                            "adjustedPaymentDate" : "2019-11-04",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2018-11-02",
+                              "adjustedEndDate" : "2019-11-04",
+                              "meta" : {
+                                "globalKey" : "1e1bd103"
+                              },
+                              "notionalAmount" : 100000000.00,
+                              "fixedRate" : 0.02178
+                            } ],
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
+                              "globalKey" : "19b2d0bf"
                             }
-                          }
+                          } ]
+                        },
+                        "meta" : {
+                          "globalKey" : "4d63d41"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "245965f8"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "5a9469c9"
-                            }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d1d"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "2"
-                          },
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -484,132 +285,77 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "120cbb1b"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2019-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "245965f8"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "5a9469c9"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "52c1b847"
-                              },
-                              "unadjustedDate" : "2019-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "52c1b847"
                             }
-                          }
-                        },
-                        "cashflowRepresentation" : {
-                          "cashflowsMatchParameters" : true,
-                          "paymentCalculationPeriod" : [ {
-                            "adjustedPaymentDate" : "2019-11-04",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-02-04",
-                              "adjustedStartDate" : "2018-11-02",
-                              "meta" : {
-                                "globalKey" : "221e9424"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2018-10-31",
-                                  "meta" : {
-                                    "globalKey" : "7a34171"
-                                  },
-                                  "observedRate" : 0
-                                } ]
-                              },
-                              "notionalAmount" : 100000000.00
-                            }, {
-                              "adjustedEndDate" : "2019-05-02",
-                              "adjustedStartDate" : "2019-02-04",
-                              "meta" : {
-                                "globalKey" : "38468420"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2019-01-31",
-                                  "meta" : {
-                                    "globalKey" : "7a3f3b1"
-                                  },
-                                  "observedRate" : 0
-                                } ]
-                              },
-                              "notionalAmount" : 100000000.00
-                            }, {
-                              "adjustedEndDate" : "2019-08-02",
-                              "adjustedStartDate" : "2019-05-02",
-                              "meta" : {
-                                "globalKey" : "292bd203"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2019-04-30",
-                                  "meta" : {
-                                    "globalKey" : "7a40ad2"
-                                  },
-                                  "observedRate" : 0
-                                } ]
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
-                              "notionalAmount" : 100000000.00
-                            }, {
-                              "adjustedEndDate" : "2019-11-04",
-                              "adjustedStartDate" : "2019-08-02",
                               "meta" : {
-                                "globalKey" : "874747e4"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2019-07-31",
-                                  "meta" : {
-                                    "globalKey" : "7a42231"
-                                  },
-                                  "observedRate" : 0
-                                } ]
-                              },
-                              "notionalAmount" : 100000000.00
-                            } ],
+                                "globalKey" : "245965f8"
+                              }
+                            },
                             "meta" : {
-                              "globalKey" : "1802bdc1"
+                              "globalKey" : "5a9469c9"
                             }
-                          } ]
-                        },
-                        "compoundingMethod" : "STRAIGHT",
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "9f2921d0"
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "2049"
+                            },
+                            "rollConvention" : "2"
+                          },
+                          "meta" : {
+                            "globalKey" : "2533f6f1",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
                         },
                         "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "637fdf6b"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "T",
+                            "meta" : {
+                              "globalKey" : "73"
+                            }
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                          "payRelativeTo" : "CalculationPeriodEndDate",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -617,48 +363,33 @@
                                 "value" : "USNY"
                               } ],
                               "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
+                                "globalKey" : "42f910b",
+                                "externalKey" : "floatPrimaryBusinessCenters"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "a2d"
-                            },
-                            "period" : "T",
-                            "periodMultiplier" : 1
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "902c5c23",
+                            "externalKey" : "floatingLegPaymentDates"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "120cbb1b"
+                            "globalReference" : "2533f6f1",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "3d9c8eea"
+                              "globalKey" : "1a78799e"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -667,228 +398,497 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "2de3a193"
+                              "globalReference" : "6cfd7cb9",
+                              "externalReference" : "floatingLegResetDates"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "2de3a193"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "245965f8"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "5a9469c9"
                             }
                           },
-                          "resetFrequency" : {
+                          "meta" : {
+                            "globalKey" : "6cfd7cb9",
+                            "externalKey" : "floatingLegResetDates"
+                          }
+                        },
+                        "compoundingMethod" : "Straight",
+                        "cashflowRepresentation" : {
+                          "cashflowsMatchParameters" : true,
+                          "paymentCalculationPeriod" : [ {
+                            "adjustedPaymentDate" : "2019-11-04",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2018-11-02",
+                              "adjustedEndDate" : "2019-02-04",
+                              "meta" : {
+                                "globalKey" : "5fc4ab60"
+                              },
+                              "notionalAmount" : 100000000.00,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2018-10-31",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a34171"
+                                  }
+                                } ]
+                              }
+                            }, {
+                              "adjustedStartDate" : "2019-02-04",
+                              "adjustedEndDate" : "2019-05-02",
+                              "meta" : {
+                                "globalKey" : "399f4fe4"
+                              },
+                              "notionalAmount" : 100000000.00,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2019-01-31",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a3f3b1"
+                                  }
+                                } ]
+                              }
+                            }, {
+                              "adjustedStartDate" : "2019-05-02",
+                              "adjustedEndDate" : "2019-08-02",
+                              "meta" : {
+                                "globalKey" : "c421d883"
+                              },
+                              "notionalAmount" : 100000000.00,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2019-04-30",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a40ad2"
+                                  }
+                                } ]
+                              }
+                            }, {
+                              "adjustedStartDate" : "2019-08-02",
+                              "adjustedEndDate" : "2019-11-04",
+                              "meta" : {
+                                "globalKey" : "bbda8920"
+                              },
+                              "notionalAmount" : 100000000.00,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2019-07-31",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a42231"
+                                  }
+                                } ]
+                              }
+                            } ],
                             "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                              "globalKey" : "ca509385"
+                            }
+                          } ]
+                        },
+                        "meta" : {
+                          "globalKey" : "bf6d9548"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "e4d5f1c9"
+                        "globalKey" : "494851c9"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "e4d5f1c9"
+                    "globalKey" : "494851c9"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "e4d5f1c9"
+                  "globalKey" : "494851c9"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "173c8b0"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.02178,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.02178,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 100000000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "2d054d50"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "7b78abf0"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
+                    "rateOption" : {
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 100000000.00
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f129f"
-              },
-              "value" : "2018-10-31"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "9369921"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "43401224-2"
+                    "globalKey" : "5332091c"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "ba4f",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "43401224"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "010",
                   "meta" : {
-                    "scheme" : "platform_side_id"
-                  },
-                  "value" : "43401813"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ba4f"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "ba4f",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "43401224"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "b65669e9"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS9369921"
+                  "value" : "MARKIT_WIRE"
+                },
+                "meta" : {
+                  "globalKey" : "66b48bac"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "66b48bac",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "66b48bac",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2018-10-31",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "010S3",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "17702b93"
+                "globalKey" : "71eec9f",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "5a9d3227"
+            }
+          },
+          "meta" : {
+            "globalKey" : "5a9d3227"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "0109369921",
+      "meta" : {
+        "scheme" : "cme_message_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_clearingorg_id"
+      }
+    },
+    "sentTo" : [ {
+      "value" : "010",
+      "meta" : {
+        "scheme" : "cme_firm_id"
+      }
+    }, {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_exchange_id"
+      }
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-10-31T09:18:18-05:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-10-31T14:12:29.654Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
+    "qualification" : "clearingReceiptDateTime"
   } ],
+  "creditLimitInformation" : {
+    "limitApplicable" : [ {
+      "limitType" : {
+        "value" : "Notional",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 1222268700,
+      "amountRemaining" : 998777731300,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 100000000
+    }, {
+      "limitType" : {
+        "value" : "NPV",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 5600080,
+      "amountRemaining" : 999994399919,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 686210
+    }, {
+      "limitType" : {
+        "value" : "PV01",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 99392,
+      "amountRemaining" : 999999900607,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 10082
+    }, {
+      "limitType" : {
+        "value" : "PV01",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 101854,
+      "amountRemaining" : 999999898145,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Account",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 10082
+    }, {
+      "limitType" : {
+        "value" : "Notional",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 1200000000,
+      "amountRemaining" : 998800000000,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Account",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 100000000
+    }, {
+      "limitType" : {
+        "value" : "NPV",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 5145303,
+      "amountRemaining" : 999994854696,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Account",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 686210
+    } ]
+  },
   "workflowState" : {
-    "workflowStatus" : "CLEARED"
+    "workflowStatus" : "Cleared"
+  },
+  "meta" : {
+    "globalKey" : "99c63009"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex09-OIS.json b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex09-OIS.json
index ef4b8d0e02..82a50fbb86 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex09-OIS.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex09-OIS.json
@@ -1,273 +1,80 @@
 {
-  "creditLimitInformation" : {
-    "limitApplicable" : [ {
-      "amountRemaining" : 998777731300,
-      "amountUtilized" : 1222268700,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NOTIONAL"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 100000000,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    }, {
-      "amountRemaining" : 999994399919,
-      "amountUtilized" : 5600080,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NPV"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 925850,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    }, {
-      "amountRemaining" : 999999900607,
-      "amountUtilized" : 99392,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "PV01"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 19885,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    }, {
-      "amountRemaining" : 999999898145,
-      "amountUtilized" : 101854,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "PV01"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 19885,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "ACCOUNT"
-      }
-    }, {
-      "amountRemaining" : 998800000000,
-      "amountUtilized" : 1200000000,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NOTIONAL"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 100000000,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "ACCOUNT"
-      }
-    }, {
-      "amountRemaining" : 999994854696,
-      "amountUtilized" : 5145303,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NPV"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 925850,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "ACCOUNT"
-      }
-    } ]
-  },
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "cme_message_id"
-      },
-      "value" : "0109369935"
-    },
-    "sentBy" : {
-      "meta" : {
-        "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "meta" : {
-        "scheme" : "cme_firm_id"
-      },
-      "value" : "010"
-    }, {
-      "meta" : {
-        "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "c7ddb8e7"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "af83238e"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "010S3"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "6a05b6df"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              }
-            } ],
-            "clearedDate" : "2018-10-31",
-            "meta" : {
-              "globalKey" : "af83238e"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "ba4f"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "9369935",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "010"
-                },
-                "meta" : {
-                  "globalKey" : "ba4f"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "43400962-2",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "66b48bac"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "MARKIT_WIRE"
-                },
+                  "value" : "43400962",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43402071",
+                  "meta" : {
+                    "scheme" : "platform_side_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43400962",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "69a054cb"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "66b48bac"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "66b48bac"
               },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS9369935",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "4ac79bd8"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-31",
+              "meta" : {
+                "globalKey" : "3f129f"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "ba4f"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -278,46 +85,42 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "116cc910"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "47a7cce1"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "159eb"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "2"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -326,176 +129,174 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "d870d80d"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2020-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "fixedPrimaryBusinessCenters",
-                                    "globalReference" : "27e4e9"
+                                    "globalReference" : "27e4e9",
+                                    "externalReference" : "fixedPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "116cc910"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "47a7cce1"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "e69a135f"
-                              },
-                              "unadjustedDate" : "2020-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "e69a135f"
                             }
-                          }
-                        },
-                        "cashflowRepresentation" : {
-                          "cashflowsMatchParameters" : true,
-                          "paymentCalculationPeriod" : [ {
-                            "adjustedPaymentDate" : "2019-11-06",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-11-04",
-                              "adjustedStartDate" : "2018-11-02",
-                              "meta" : {
-                                "globalKey" : "7c94179"
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
                               },
-                              "fixedRate" : 0.02226,
-                              "notionalAmount" : 100000000.00
-                            } ],
-                            "meta" : {
-                              "globalKey" : "6c9f273"
-                            }
-                          }, {
-                            "adjustedPaymentDate" : "2020-11-04",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-11-02",
-                              "adjustedStartDate" : "2019-11-04",
                               "meta" : {
-                                "globalKey" : "b89603d"
-                              },
-                              "fixedRate" : 0.02226,
-                              "notionalAmount" : 100000000.00
-                            } ],
+                                "globalKey" : "116cc910"
+                              }
+                            },
                             "meta" : {
-                              "globalKey" : "ade557f9"
+                              "globalKey" : "47a7cce1"
                             }
-                          } ]
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "46e91cd1"
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "1a3b"
+                            },
+                            "rollConvention" : "2"
+                          },
+                          "meta" : {
+                            "globalKey" : "670a7e3",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
                         },
                         "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "eb988f26"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4abf7e"
+                            },
+                            "dayType" : "Business"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USNY"
                               } ],
                               "meta" : {
-                                "externalKey" : "fixedPrimaryBusinessCenters",
-                                "globalKey" : "27e4e9"
+                                "globalKey" : "27e4e9",
+                                "externalKey" : "fixedPrimaryBusinessCenters"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "3662e8ba"
                             }
                           },
-                          "paymentDaysOffset" : {
-                            "meta" : {
-                              "globalKey" : "ea4baf42"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 2,
-                            "dayType" : "BUSINESS"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "5ddd0f5e",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "cashflowRepresentation" : {
+                          "cashflowsMatchParameters" : true,
+                          "paymentCalculationPeriod" : [ {
+                            "adjustedPaymentDate" : "2019-11-06",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2018-11-02",
+                              "adjustedEndDate" : "2019-11-04",
+                              "meta" : {
+                                "globalKey" : "1e1bd427"
+                              },
+                              "notionalAmount" : 100000000.00,
+                              "fixedRate" : 0.02226
+                            } ],
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
+                              "globalKey" : "1d1c8521"
                             }
-                          }
+                          }, {
+                            "adjustedPaymentDate" : "2020-11-04",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2019-11-04",
+                              "adjustedEndDate" : "2020-11-02",
+                              "meta" : {
+                                "globalKey" : "21ddb563"
+                              },
+                              "notionalAmount" : 100000000.00,
+                              "fixedRate" : 0.02226
+                            } ],
+                            "meta" : {
+                              "globalKey" : "c439ad1f"
+                            }
+                          } ]
+                        },
+                        "meta" : {
+                          "globalKey" : "cca6bf8f"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "245965f8"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "5a9469c9"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "159eb"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "2"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -504,159 +305,116 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "97f1450d"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2020-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "27e4e9"
+                                    "globalReference" : "27e4e9",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "245965f8"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "5a9469c9"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "f986b047"
-                              },
-                              "unadjustedDate" : "2020-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "f986b047"
                             }
-                          }
-                        },
-                        "cashflowRepresentation" : {
-                          "cashflowsMatchParameters" : true,
-                          "paymentCalculationPeriod" : [ {
-                            "adjustedPaymentDate" : "2019-11-06",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-11-04",
-                              "adjustedStartDate" : "2018-11-02",
-                              "meta" : {
-                                "globalKey" : "2824e282"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2019-11-01",
-                                  "meta" : {
-                                    "globalKey" : "7a43d8f"
-                                  },
-                                  "observedRate" : 0
-                                } ]
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
-                              "notionalAmount" : 100000000.00
-                            } ],
-                            "meta" : {
-                              "globalKey" : "1997d748"
-                            }
-                          }, {
-                            "adjustedPaymentDate" : "2020-11-04",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-11-02",
-                              "adjustedStartDate" : "2019-11-04",
                               "meta" : {
-                                "globalKey" : "9a621101"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2020-10-30",
-                                  "meta" : {
-                                    "globalKey" : "7a53152"
-                                  },
-                                  "observedRate" : 0
-                                } ]
-                              },
-                              "notionalAmount" : 100000000.00
-                            } ],
+                                "globalKey" : "245965f8"
+                              }
+                            },
                             "meta" : {
-                              "globalKey" : "86c42fc5"
+                              "globalKey" : "5a9469c9"
                             }
-                          } ]
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "a13925be"
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "1a3b"
+                            },
+                            "rollConvention" : "2"
+                          },
+                          "meta" : {
+                            "globalKey" : "85f8e3",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
                         },
                         "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "eb988f26"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4abf7e"
+                            },
+                            "dayType" : "Business"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USNY"
                               } ],
                               "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "27e4e9"
+                                "globalKey" : "27e4e9",
+                                "externalKey" : "floatPrimaryBusinessCenters"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "3662e8ba"
                             }
                           },
-                          "paymentDaysOffset" : {
-                            "meta" : {
-                              "globalKey" : "ea4baf42"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 2,
-                            "dayType" : "BUSINESS"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "5ddd0f5e",
+                            "externalKey" : "floatingLegPaymentDates"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "97f1450d"
+                            "globalReference" : "85f8e3",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodEndDate",
                           "fixingDates" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "69232be0"
+                              "globalKey" : "de7afde8"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
+                            "businessDayConvention" : "PRECEDING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USNY"
@@ -665,221 +423,463 @@
                                 "globalKey" : "27e4e9"
                               }
                             },
-                            "businessDayConvention" : "PRECEDING",
                             "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "e6d027c"
+                              "globalReference" : "4c4de076",
+                              "externalReference" : "floatingLegResetDates"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "e6d027c"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "245965f8"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "5a9469c9"
                             }
                           },
-                          "resetFrequency" : {
+                          "meta" : {
+                            "globalKey" : "4c4de076",
+                            "externalKey" : "floatingLegResetDates"
+                          }
+                        },
+                        "cashflowRepresentation" : {
+                          "cashflowsMatchParameters" : true,
+                          "paymentCalculationPeriod" : [ {
+                            "adjustedPaymentDate" : "2019-11-06",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2018-11-02",
+                              "adjustedEndDate" : "2019-11-04",
+                              "meta" : {
+                                "globalKey" : "36ad0d3e"
+                              },
+                              "notionalAmount" : 100000000.00,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2019-11-01",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a43d8f"
+                                  }
+                                } ]
+                              }
+                            } ],
                             "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                              "globalKey" : "28200204"
+                            }
+                          }, {
+                            "adjustedPaymentDate" : "2020-11-04",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2019-11-04",
+                              "adjustedEndDate" : "2020-11-02",
+                              "meta" : {
+                                "globalKey" : "75afc645"
+                              },
+                              "notionalAmount" : 100000000.00,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2020-10-30",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a53152"
+                                  }
+                                } ]
+                              }
+                            } ],
+                            "meta" : {
+                              "globalKey" : "6211e509"
+                            }
+                          } ]
+                        },
+                        "meta" : {
+                          "globalKey" : "ff82384a"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "4e06178f"
+                        "globalKey" : "817b02d9"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "4e06178f"
+                    "globalKey" : "817b02d9"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "4e06178f"
+                  "globalKey" : "817b02d9"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "368d7cd4"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.02226,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.02226,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
-                }, {
+                  } ],
                   "meta" : {
-                    "globalKey" : "2d5dbd2c"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "35d60749"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-Federal Funds-H.15-OIS-COMPOUND"
+                    "globalKey" : "9b221dac"
+                  }
+                }, {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 100000000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
                         }
                       }
-                    }
-                  },
-                  "quantity" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-Federal Funds-H.15-OIS-COMPOUND"
                         }
                       },
-                      "value" : 100000000.00
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "84eae1d7"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f129f"
-              },
-              "value" : "2018-10-31"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "9369935"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "43400962-2"
+                    "globalKey" : "36f327a2"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "ba4f",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "43400962"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "010",
                   "meta" : {
-                    "scheme" : "platform_side_id"
-                  },
-                  "value" : "43402071"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ba4f"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "ba4f",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "43400962"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "c31d1081"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS9369935"
+                  "value" : "MARKIT_WIRE"
+                },
+                "meta" : {
+                  "globalKey" : "66b48bac"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "66b48bac",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "66b48bac",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2018-10-31",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "010S3",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "1770aef6"
+                "globalKey" : "71eec9f",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "7fa77b66"
+            }
+          },
+          "meta" : {
+            "globalKey" : "7fa77b66"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "0109369935",
+      "meta" : {
+        "scheme" : "cme_message_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_clearingorg_id"
+      }
+    },
+    "sentTo" : [ {
+      "value" : "010",
+      "meta" : {
+        "scheme" : "cme_firm_id"
+      }
+    }, {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_exchange_id"
+      }
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-10-31T09:36:28-05:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-10-31T14:15:55.608Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
+    "qualification" : "clearingReceiptDateTime"
   } ],
+  "creditLimitInformation" : {
+    "limitApplicable" : [ {
+      "limitType" : {
+        "value" : "Notional",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 1222268700,
+      "amountRemaining" : 998777731300,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 100000000
+    }, {
+      "limitType" : {
+        "value" : "NPV",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 5600080,
+      "amountRemaining" : 999994399919,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 925850
+    }, {
+      "limitType" : {
+        "value" : "PV01",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 99392,
+      "amountRemaining" : 999999900607,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 19885
+    }, {
+      "limitType" : {
+        "value" : "PV01",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 101854,
+      "amountRemaining" : 999999898145,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Account",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 19885
+    }, {
+      "limitType" : {
+        "value" : "Notional",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 1200000000,
+      "amountRemaining" : 998800000000,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Account",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 100000000
+    }, {
+      "limitType" : {
+        "value" : "NPV",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 5145303,
+      "amountRemaining" : 999994854696,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Account",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 925850
+    } ]
+  },
   "workflowState" : {
-    "workflowStatus" : "CLEARED"
+    "workflowStatus" : "Cleared"
+  },
+  "meta" : {
+    "globalKey" : "7caabcef"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex10-OIS.json b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex10-OIS.json
index c0724550be..90de6acd9e 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex10-OIS.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex10-OIS.json
@@ -1,273 +1,80 @@
 {
-  "creditLimitInformation" : {
-    "limitApplicable" : [ {
-      "amountRemaining" : 998777731300,
-      "amountUtilized" : 1222268700,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NOTIONAL"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 100000000,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    }, {
-      "amountRemaining" : 999994399919,
-      "amountUtilized" : 5600080,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NPV"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 708934,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    }, {
-      "amountRemaining" : 999999900607,
-      "amountUtilized" : 99392,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "PV01"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 19784,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    }, {
-      "amountRemaining" : 999999898145,
-      "amountUtilized" : 101854,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "PV01"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 19784,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "ACCOUNT"
-      }
-    }, {
-      "amountRemaining" : 998800000000,
-      "amountUtilized" : 1200000000,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NOTIONAL"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 100000000,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "ACCOUNT"
-      }
-    }, {
-      "amountRemaining" : 999994854696,
-      "amountUtilized" : 5145303,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NPV"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 708934,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "ACCOUNT"
-      }
-    } ]
-  },
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "cme_message_id"
-      },
-      "value" : "0109369933"
-    },
-    "sentBy" : {
-      "meta" : {
-        "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "meta" : {
-        "scheme" : "cme_firm_id"
-      },
-      "value" : "010"
-    }, {
-      "meta" : {
-        "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "d606f318"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "914de6f8"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "010S3"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "6a05b6df"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              }
-            } ],
-            "clearedDate" : "2018-10-31",
-            "meta" : {
-              "globalKey" : "914de6f8"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "ba4f"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "9369933",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "010"
-                },
-                "meta" : {
-                  "globalKey" : "ba4f"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "43401034-2",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "66b48bac"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "MARKIT_WIRE"
-                },
+                  "value" : "43401034",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43402020",
+                  "meta" : {
+                    "scheme" : "platform_side_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43401034",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "df30235e"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "66b48bac"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
               },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "66b48bac"
-              },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS9369933",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "4ac79bd6"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-31",
+              "meta" : {
+                "globalKey" : "3f129f"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "ba4f"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -278,46 +85,42 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "116cc910"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "47a7cce1"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "159eb"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "2"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -326,176 +129,174 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "d870d80d"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2020-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "fixedPrimaryBusinessCenters",
-                                    "globalReference" : "27e4e9"
+                                    "globalReference" : "27e4e9",
+                                    "externalReference" : "fixedPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "116cc910"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "47a7cce1"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "e69a135f"
-                              },
-                              "unadjustedDate" : "2020-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "e69a135f"
                             }
-                          }
-                        },
-                        "cashflowRepresentation" : {
-                          "cashflowsMatchParameters" : true,
-                          "paymentCalculationPeriod" : [ {
-                            "adjustedPaymentDate" : "2019-11-06",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-11-04",
-                              "adjustedStartDate" : "2018-11-02",
-                              "meta" : {
-                                "globalKey" : "7c9bd3b"
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
                               },
-                              "fixedRate" : 0.02345,
-                              "notionalAmount" : 100000000.00
-                            } ],
-                            "meta" : {
-                              "globalKey" : "6ca6e35"
-                            }
-                          }, {
-                            "adjustedPaymentDate" : "2020-11-04",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-11-02",
-                              "adjustedStartDate" : "2019-11-04",
                               "meta" : {
-                                "globalKey" : "b89dbff"
-                              },
-                              "fixedRate" : 0.02345,
-                              "notionalAmount" : 100000000.00
-                            } ],
+                                "globalKey" : "116cc910"
+                              }
+                            },
                             "meta" : {
-                              "globalKey" : "ade5d3bb"
+                              "globalKey" : "47a7cce1"
                             }
-                          } ]
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "632e184d"
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "1a3b"
+                            },
+                            "rollConvention" : "2"
+                          },
+                          "meta" : {
+                            "globalKey" : "670a7e3",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
                         },
                         "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "eb988f26"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4abf7e"
+                            },
+                            "dayType" : "Business"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USNY"
                               } ],
                               "meta" : {
-                                "externalKey" : "fixedPrimaryBusinessCenters",
-                                "globalKey" : "27e4e9"
+                                "globalKey" : "27e4e9",
+                                "externalKey" : "fixedPrimaryBusinessCenters"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "3662e8ba"
                             }
                           },
-                          "paymentDaysOffset" : {
-                            "meta" : {
-                              "globalKey" : "ea4baf42"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 2,
-                            "dayType" : "BUSINESS"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "5ddd0f5e",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "cashflowRepresentation" : {
+                          "cashflowsMatchParameters" : true,
+                          "paymentCalculationPeriod" : [ {
+                            "adjustedPaymentDate" : "2019-11-06",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2018-11-02",
+                              "adjustedEndDate" : "2019-11-04",
+                              "meta" : {
+                                "globalKey" : "1e1bd825"
+                              },
+                              "notionalAmount" : 100000000.00,
+                              "fixedRate" : 0.02345
+                            } ],
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
+                              "globalKey" : "1d1c891f"
                             }
-                          }
+                          }, {
+                            "adjustedPaymentDate" : "2020-11-04",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2019-11-04",
+                              "adjustedEndDate" : "2020-11-02",
+                              "meta" : {
+                                "globalKey" : "21ddb961"
+                              },
+                              "notionalAmount" : 100000000.00,
+                              "fixedRate" : 0.02345
+                            } ],
+                            "meta" : {
+                              "globalKey" : "c439b11d"
+                            }
+                          } ]
+                        },
+                        "meta" : {
+                          "globalKey" : "fbc7510b"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "245965f8"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "5a9469c9"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "159eb"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "2"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -504,159 +305,116 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "97f1450d"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2020-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "27e4e9"
+                                    "globalReference" : "27e4e9",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "245965f8"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "5a9469c9"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "f986b047"
-                              },
-                              "unadjustedDate" : "2020-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "f986b047"
                             }
-                          }
-                        },
-                        "cashflowRepresentation" : {
-                          "cashflowsMatchParameters" : true,
-                          "paymentCalculationPeriod" : [ {
-                            "adjustedPaymentDate" : "2019-11-06",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-11-04",
-                              "adjustedStartDate" : "2018-11-02",
-                              "meta" : {
-                                "globalKey" : "2824e282"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2019-11-01",
-                                  "meta" : {
-                                    "globalKey" : "7a43d8f"
-                                  },
-                                  "observedRate" : 0
-                                } ]
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
-                              "notionalAmount" : 100000000.00
-                            } ],
-                            "meta" : {
-                              "globalKey" : "1997d748"
-                            }
-                          }, {
-                            "adjustedPaymentDate" : "2020-11-04",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-11-02",
-                              "adjustedStartDate" : "2019-11-04",
                               "meta" : {
-                                "globalKey" : "9a621101"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2020-10-30",
-                                  "meta" : {
-                                    "globalKey" : "7a53152"
-                                  },
-                                  "observedRate" : 0
-                                } ]
-                              },
-                              "notionalAmount" : 100000000.00
-                            } ],
+                                "globalKey" : "245965f8"
+                              }
+                            },
                             "meta" : {
-                              "globalKey" : "86c42fc5"
+                              "globalKey" : "5a9469c9"
                             }
-                          } ]
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "ee016f9f"
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "1a3b"
+                            },
+                            "rollConvention" : "2"
+                          },
+                          "meta" : {
+                            "globalKey" : "85f8e3",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
                         },
                         "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "eb988f26"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4abf7e"
+                            },
+                            "dayType" : "Business"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USNY"
                               } ],
                               "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "27e4e9"
+                                "globalKey" : "27e4e9",
+                                "externalKey" : "floatPrimaryBusinessCenters"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "3662e8ba"
                             }
                           },
-                          "paymentDaysOffset" : {
-                            "meta" : {
-                              "globalKey" : "ea4baf42"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 2,
-                            "dayType" : "BUSINESS"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "5ddd0f5e",
+                            "externalKey" : "floatingLegPaymentDates"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "97f1450d"
+                            "globalReference" : "85f8e3",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodEndDate",
                           "fixingDates" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "691fe6c1"
+                              "globalKey" : "de77b8c9"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
+                            "businessDayConvention" : "PRECEDING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USGS"
@@ -665,221 +423,463 @@
                                 "globalKey" : "27e40a"
                               }
                             },
-                            "businessDayConvention" : "PRECEDING",
                             "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "5b354c5d"
+                              "globalReference" : "99162a57",
+                              "externalReference" : "floatingLegResetDates"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "5b354c5d"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "floatPrimaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "245965f8"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "5a9469c9"
                             }
                           },
-                          "resetFrequency" : {
+                          "meta" : {
+                            "globalKey" : "99162a57",
+                            "externalKey" : "floatingLegResetDates"
+                          }
+                        },
+                        "cashflowRepresentation" : {
+                          "cashflowsMatchParameters" : true,
+                          "paymentCalculationPeriod" : [ {
+                            "adjustedPaymentDate" : "2019-11-06",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2018-11-02",
+                              "adjustedEndDate" : "2019-11-04",
+                              "meta" : {
+                                "globalKey" : "36ad0d3e"
+                              },
+                              "notionalAmount" : 100000000.00,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2019-11-01",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a43d8f"
+                                  }
+                                } ]
+                              }
+                            } ],
                             "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                              "globalKey" : "28200204"
+                            }
+                          }, {
+                            "adjustedPaymentDate" : "2020-11-04",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2019-11-04",
+                              "adjustedEndDate" : "2020-11-02",
+                              "meta" : {
+                                "globalKey" : "75afc645"
+                              },
+                              "notionalAmount" : 100000000.00,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2020-10-30",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a53152"
+                                  }
+                                } ]
+                              }
+                            } ],
+                            "meta" : {
+                              "globalKey" : "6211e509"
+                            }
+                          } ]
+                        },
+                        "meta" : {
+                          "globalKey" : "6095736b"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "88fdc8ec"
+                        "globalKey" : "f8073b76"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "88fdc8ec"
+                    "globalKey" : "f8073b76"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "88fdc8ec"
+                  "globalKey" : "f8073b76"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "f07fac52"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.02345,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.02345,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
-                }, {
+                  } ],
                   "meta" : {
-                    "globalKey" : "e84ab7ac"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "54f5dcc9"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-SOFR-COMPOUND"
+                    "globalKey" : "1f75ddee"
+                  }
+                }, {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 100000000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
                         }
                       }
-                    }
-                  },
-                  "quantity" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-SOFR-COMPOUND"
                         }
                       },
-                      "value" : 100000000.00
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "49c5bc57"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f129f"
-              },
-              "value" : "2018-10-31"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "9369933"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "43401034-2"
+                    "globalKey" : "fbce0222"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "ba4f",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "43401034"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "010",
                   "meta" : {
-                    "scheme" : "platform_side_id"
-                  },
-                  "value" : "43402020"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ba4f"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "ba4f",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "43401034"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "13f38654"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS9369933"
+                  "value" : "MARKIT_WIRE"
+                },
+                "meta" : {
+                  "globalKey" : "66b48bac"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "66b48bac",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "66b48bac",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2018-10-31",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "010S3",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "1770a774"
+                "globalKey" : "71eec9f",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "5799fd36"
+            }
+          },
+          "meta" : {
+            "globalKey" : "5799fd36"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "0109369933",
+      "meta" : {
+        "scheme" : "cme_message_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_clearingorg_id"
+      }
+    },
+    "sentTo" : [ {
+      "value" : "010",
+      "meta" : {
+        "scheme" : "cme_firm_id"
+      }
+    }, {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_exchange_id"
+      }
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-10-31T09:34:54-05:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-10-31T14:15:19.417Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
+    "qualification" : "clearingReceiptDateTime"
   } ],
+  "creditLimitInformation" : {
+    "limitApplicable" : [ {
+      "limitType" : {
+        "value" : "Notional",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 1222268700,
+      "amountRemaining" : 998777731300,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 100000000
+    }, {
+      "limitType" : {
+        "value" : "NPV",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 5600080,
+      "amountRemaining" : 999994399919,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 708934
+    }, {
+      "limitType" : {
+        "value" : "PV01",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 99392,
+      "amountRemaining" : 999999900607,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 19784
+    }, {
+      "limitType" : {
+        "value" : "PV01",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 101854,
+      "amountRemaining" : 999999898145,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Account",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 19784
+    }, {
+      "limitType" : {
+        "value" : "Notional",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 1200000000,
+      "amountRemaining" : 998800000000,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Account",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 100000000
+    }, {
+      "limitType" : {
+        "value" : "NPV",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 5145303,
+      "amountRemaining" : 999994854696,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Account",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 708934
+    } ]
+  },
   "workflowState" : {
-    "workflowStatus" : "CLEARED"
+    "workflowStatus" : "Cleared"
+  },
+  "meta" : {
+    "globalKey" : "2174cb64"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex11-OIS.json b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex11-OIS.json
index 78261b0bb8..662a4cb337 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex11-OIS.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/IRS-ex11-OIS.json
@@ -1,171 +1,66 @@
 {
-  "creditLimitInformation" : {
-    "limitApplicable" : [ {
-      "amountRemaining" : 999999999999435900,
-      "amountUtilized" : 563110,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "PV01"
-      },
-      "limitAmount" : 999999999999998980,
-      "limitImpactDueToTrade" : -3991,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "HOUSE"
-      }
-    } ]
-  },
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "cme_message_id"
-      },
-      "value" : "1K08850892"
-    },
-    "sentBy" : {
-      "meta" : {
-        "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "meta" : {
-        "scheme" : "cme_firm_id"
-      },
-      "value" : "999"
-    }, {
-      "meta" : {
-        "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "b141c638"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "c0e06535"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "999-123"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "88c5360e"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              }
-            } ],
-            "clearedDate" : "2018-04-24",
-            "meta" : {
-              "globalKey" : "9e70562b"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "dd19"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "2894761",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "999"
-                },
-                "meta" : {
-                  "globalKey" : "dd19"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "QAC-11111",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "9e635873"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "PLATFORM"
-                },
-                "meta" : {
-                  "globalKey" : "9e635873"
+                  "value" : "22222",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "SEF",
-                "globalKey" : "75895dac"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "value" : "PARTY123"
-                },
+                "globalKey" : "255fce6f"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "75895dac"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "dd19"
-              },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "9e635873"
               },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS2894761",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e12c31ab"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-04-24",
+              "meta" : {
+                "globalKey" : "3f1118"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "dd19"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -176,46 +71,40 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "245965f8"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "5a9469c9"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "2b91b"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "26"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2013-07-26",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -224,42 +113,154 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec508292"
-                              },
-                              "unadjustedDate" : "2013-07-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec508292"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "13bc74dd"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2025-07-26",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "27e4e9"
+                                    "globalReference" : "27e4e9",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "245965f8"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "5a9469c9"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "af7b382f"
-                              },
-                              "unadjustedDate" : "2025-07-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "af7b382f"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "245965f8"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "5a9469c9"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "1796b"
+                            },
+                            "rollConvention" : "26"
+                          },
+                          "meta" : {
+                            "globalKey" : "a6201713",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4abf7e"
+                            },
+                            "dayType" : "Business"
+                          },
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "27e4e9",
+                                "externalKey" : "floatPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3662e8ba"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "5ddd0f5e",
+                            "externalKey" : "floatingLegPaymentDates"
+                          }
+                        },
+                        "resetDates" : {
+                          "calculationPeriodDatesReference" : {
+                            "globalReference" : "a6201713",
+                            "externalReference" : "floatingCalcPeriodDates"
+                          },
+                          "resetRelativeTo" : "CalculationPeriodEndDate",
+                          "fixingDates" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "de7afde8"
+                            },
+                            "businessDayConvention" : "PRECEDING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "27e4e9"
+                              }
+                            },
+                            "dateRelativeTo" : {
+                              "globalReference" : "4c4de076",
+                              "externalReference" : "floatingLegResetDates"
+                            }
+                          },
+                          "resetFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
+                          },
+                          "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "245965f8"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "5a9469c9"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "4c4de076",
+                            "externalKey" : "floatingLegResetDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -267,420 +268,310 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2014-07-30",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2014-07-28",
                               "adjustedStartDate" : "2013-07-26",
+                              "adjustedEndDate" : "2014-07-28",
                               "meta" : {
-                                "globalKey" : "f7ac65ae"
+                                "globalKey" : "634906a"
                               },
+                              "notionalAmount" : 5000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2014-07-25",
+                                  "observedRate" : 0.0008347,
                                   "meta" : {
                                     "globalKey" : "bebc8677"
-                                  },
-                                  "observedRate" : 0.0008347
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 5000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "d9c2998c"
+                              "globalKey" : "e84ac448"
                             }
                           }, {
                             "adjustedPaymentDate" : "2015-07-29",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-07-27",
                               "adjustedStartDate" : "2014-07-28",
+                              "adjustedEndDate" : "2015-07-27",
                               "meta" : {
-                                "globalKey" : "9edab0b7"
+                                "globalKey" : "46f70359"
                               },
+                              "notionalAmount" : 5000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2015-07-24",
+                                  "observedRate" : 0.0011009,
                                   "meta" : {
                                     "globalKey" : "bec85b83"
-                                  },
-                                  "observedRate" : 0.0011009
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 5000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "10247d94"
+                              "globalKey" : "b840d036"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-07-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-07-26",
                               "adjustedStartDate" : "2015-07-27",
+                              "adjustedEndDate" : "2016-07-26",
                               "meta" : {
-                                "globalKey" : "40f076c6"
+                                "globalKey" : "e90cc968"
                               },
+                              "notionalAmount" : 5000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2016-07-25",
+                                  "observedRate" : 0.0027493,
                                   "meta" : {
                                     "globalKey" : "beda3572"
-                                  },
-                                  "observedRate" : 0.0027493
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 5000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "416ddca2"
+                              "globalKey" : "e98a2f44"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-07-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-07-26",
                               "adjustedStartDate" : "2016-07-26",
+                              "adjustedEndDate" : "2017-07-26",
                               "meta" : {
-                                "globalKey" : "1813f3d4"
+                                "globalKey" : "8cfee3d4"
                               },
+                              "notionalAmount" : 5000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2017-07-25",
+                                  "observedRate" : 0.0067469,
                                   "meta" : {
                                     "globalKey" : "bf138b1f"
-                                  },
-                                  "observedRate" : 0.0067469
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 5000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "3c0961b0"
+                              "globalKey" : "b0f451b0"
                             }
                           }, {
                             "adjustedPaymentDate" : "2018-07-30",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-07-26",
                               "adjustedStartDate" : "2017-07-26",
+                              "adjustedEndDate" : "2018-07-26",
                               "meta" : {
-                                "globalKey" : "3942922c"
+                                "globalKey" : "ae2d822c"
                               },
+                              "notionalAmount" : 5000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2018-07-25",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a32977"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 5000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "a938e60a"
+                              "globalKey" : "1e23d60a"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-07-30",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-07-26",
                               "adjustedStartDate" : "2018-07-26",
+                              "adjustedEndDate" : "2019-07-26",
                               "meta" : {
-                                "globalKey" : "11e28a2c"
+                                "globalKey" : "86cd7a2c"
                               },
+                              "notionalAmount" : 5000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2019-07-25",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a42177"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 5000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "a550e60a"
+                              "globalKey" : "1a3bd60a"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-07-29",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-07-27",
                               "adjustedStartDate" : "2019-07-26",
+                              "adjustedEndDate" : "2020-07-27",
                               "meta" : {
-                                "globalKey" : "1f68bd4e"
+                                "globalKey" : "61224aac"
                               },
+                              "notionalAmount" : 5000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2020-07-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a51958"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 5000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "420ab22b"
+                              "globalKey" : "83c43f89"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-07-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-07-26",
                               "adjustedStartDate" : "2020-07-27",
+                              "adjustedEndDate" : "2021-07-26",
                               "meta" : {
-                                "globalKey" : "c4d7528d"
+                                "globalKey" : "6cf3a52f"
                               },
+                              "notionalAmount" : 5000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2021-07-23",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a61139"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 5000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "76ace069"
+                              "globalKey" : "1ec9330b"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-07-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-07-26",
                               "adjustedStartDate" : "2021-07-26",
+                              "adjustedEndDate" : "2022-07-26",
                               "meta" : {
-                                "globalKey" : "9bc2722c"
+                                "globalKey" : "10ad622c"
                               },
+                              "notionalAmount" : 5000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2022-07-25",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a70977"
-                                  },
-                                  "observedRate" : 0
-                                } ]
-                              },
-                              "notionalAmount" : 5000000.00
-                            } ],
-                            "meta" : {
-                              "globalKey" : "71100808"
-                            }
-                          }, {
-                            "adjustedPaymentDate" : "2023-07-28",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-07-26",
-                              "adjustedStartDate" : "2022-07-26",
-                              "meta" : {
-                                "globalKey" : "74626a2c"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2023-07-25",
-                                  "meta" : {
-                                    "globalKey" : "7a80177"
-                                  },
-                                  "observedRate" : 0
-                                } ]
-                              },
-                              "notionalAmount" : 5000000.00
-                            } ],
-                            "meta" : {
-                              "globalKey" : "6d280808"
-                            }
-                          }, {
-                            "adjustedPaymentDate" : "2024-07-30",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2024-07-26",
-                              "adjustedStartDate" : "2023-07-26",
-                              "meta" : {
-                                "globalKey" : "4d02622c"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2024-07-25",
-                                  "meta" : {
-                                    "globalKey" : "7a8f977"
-                                  },
-                                  "observedRate" : 0
-                                } ]
-                              },
-                              "notionalAmount" : 5000000.00
-                            } ],
-                            "meta" : {
-                              "globalKey" : "91c8e60a"
-                            }
-                          }, {
-                            "adjustedPaymentDate" : "2025-07-30",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2025-07-28",
-                              "adjustedStartDate" : "2024-07-26",
-                              "meta" : {
-                                "globalKey" : "8f6ed0ae"
-                              },
-                              "floatingRateDefinition" : {
-                                "rateObservation" : [ {
-                                  "adjustedFixingDate" : "2025-07-25",
-                                  "meta" : {
-                                    "globalKey" : "7a9f177"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 5000000.00
-                            } ],
-                            "meta" : {
-                              "globalKey" : "f7ad5c8c"
-                            }
-                          } ]
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "5e3574b3"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "eb988f26"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "27e4e9"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "3662e8ba"
-                            }
-                          },
-                          "paymentDaysOffset" : {
-                            "meta" : {
-                              "globalKey" : "ea4baf42"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 2,
-                            "dayType" : "BUSINESS"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
                               }
-                            }
-                          }
-                        },
-                        "resetDates" : {
-                          "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "13bc74dd"
-                          },
-                          "fixingDates" : {
+                            } ],
                             "meta" : {
-                              "globalKey" : "69232be0"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "USNY"
-                              } ],
+                              "globalKey" : "e5faf808"
+                            }
+                          }, {
+                            "adjustedPaymentDate" : "2023-07-28",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2022-07-26",
+                              "adjustedEndDate" : "2023-07-26",
                               "meta" : {
-                                "globalKey" : "27e4e9"
+                                "globalKey" : "e94d5a2c"
+                              },
+                              "notionalAmount" : 5000000.00,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2023-07-25",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a80177"
+                                  }
+                                } ]
                               }
-                            },
-                            "businessDayConvention" : "PRECEDING",
-                            "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "e6d027c"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "e212f808"
                             }
-                          },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "e6d027c"
-                          },
-                          "resetDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
+                          }, {
+                            "adjustedPaymentDate" : "2024-07-30",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2023-07-26",
+                              "adjustedEndDate" : "2024-07-26",
                               "meta" : {
-                                "globalKey" : "245965f8"
+                                "globalKey" : "c1ed522c"
+                              },
+                              "notionalAmount" : 5000000.00,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2024-07-25",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a8f977"
+                                  }
+                                } ]
                               }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
+                            } ],
                             "meta" : {
-                              "globalKey" : "5a9469c9"
+                              "globalKey" : "6b3d60a"
                             }
-                          },
-                          "resetFrequency" : {
+                          }, {
+                            "adjustedPaymentDate" : "2025-07-30",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2024-07-26",
+                              "adjustedEndDate" : "2025-07-28",
+                              "meta" : {
+                                "globalKey" : "9df6fb6a"
+                              },
+                              "notionalAmount" : 5000000.00,
+                              "floatingRateDefinition" : {
+                                "rateObservation" : [ {
+                                  "adjustedFixingDate" : "2025-07-25",
+                                  "observedRate" : 0,
+                                  "meta" : {
+                                    "globalKey" : "7a9f177"
+                                  }
+                                } ]
+                              }
+                            } ],
                             "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                              "globalKey" : "6358748"
+                            }
+                          } ]
+                        },
+                        "meta" : {
+                          "globalKey" : "5fad3c2d"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "116cc910"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "47a7cce1"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "2b91b"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "26"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2013-07-26",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -689,42 +580,101 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec508292"
-                              },
-                              "unadjustedDate" : "2013-07-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec508292"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "543c07dd"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2025-07-26",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "fixedPrimaryBusinessCenters",
-                                    "globalReference" : "27e4e9"
+                                    "globalReference" : "27e4e9",
+                                    "externalReference" : "fixedPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "116cc910"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "47a7cce1"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "9c8e9b47"
-                              },
-                              "unadjustedDate" : "2025-07-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "9c8e9b47"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "116cc910"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "47a7cce1"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "1796b"
+                            },
+                            "rollConvention" : "26"
+                          },
+                          "meta" : {
+                            "globalKey" : "ac0ac613",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4abf7e"
+                            },
+                            "dayType" : "Business"
+                          },
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "27e4e9",
+                                "externalKey" : "fixedPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3662e8ba"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "5ddd0f5e",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -732,410 +682,403 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2014-07-30",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2014-07-28",
                               "adjustedStartDate" : "2013-07-26",
+                              "adjustedEndDate" : "2014-07-28",
                               "meta" : {
-                                "globalKey" : "dd4fbd3"
+                                "globalKey" : "9b8ded8d"
                               },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000.00
+                              "notionalAmount" : 5000000.00,
+                              "fixedRate" : 0.0695
                             } ],
                             "meta" : {
-                              "globalKey" : "3f1884b5"
+                              "globalKey" : "ccd1766f"
                             }
                           }, {
                             "adjustedPaymentDate" : "2015-07-29",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-07-27",
                               "adjustedStartDate" : "2014-07-28",
+                              "adjustedEndDate" : "2015-07-27",
                               "meta" : {
-                                "globalKey" : "11958ef6"
+                                "globalKey" : "9f4fd28a"
                               },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000.00
+                              "notionalAmount" : 5000000.00,
+                              "fixedRate" : 0.0695
                             } ],
                             "meta" : {
-                              "globalKey" : "e7e93739"
+                              "globalKey" : "75a37acd"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-07-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-07-26",
                               "adjustedStartDate" : "2015-07-27",
+                              "adjustedEndDate" : "2016-07-26",
                               "meta" : {
-                                "globalKey" : "155616d6"
+                                "globalKey" : "a3105a6a"
                               },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000.00
+                              "notionalAmount" : 5000000.00,
+                              "fixedRate" : 0.0695
                             } ],
                             "meta" : {
-                              "globalKey" : "90b9de7a"
+                              "globalKey" : "1e74220e"
                             }
                           }, {
                             "adjustedPaymentDate" : "2017-07-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2017-07-26",
                               "adjustedStartDate" : "2016-07-26",
+                              "adjustedEndDate" : "2017-07-26",
                               "meta" : {
-                                "globalKey" : "19171315"
+                                "globalKey" : "a6d0e60b"
                               },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000.00
+                              "notionalAmount" : 5000000.00,
+                              "fixedRate" : 0.0695
                             } ],
                             "meta" : {
-                              "globalKey" : "3b3fd2b9"
+                              "globalKey" : "c8f9a5af"
                             }
                           }, {
                             "adjustedPaymentDate" : "2018-07-30",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2018-07-26",
                               "adjustedStartDate" : "2017-07-26",
+                              "adjustedEndDate" : "2018-07-26",
                               "meta" : {
-                                "globalKey" : "1cd81315"
+                                "globalKey" : "aa91e60b"
                               },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000.00
+                              "notionalAmount" : 5000000.00,
+                              "fixedRate" : 0.0695
                             } ],
                             "meta" : {
-                              "globalKey" : "e92f7bf7"
+                              "globalKey" : "76e94eed"
                             }
                           }, {
                             "adjustedPaymentDate" : "2019-07-30",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2019-07-26",
                               "adjustedStartDate" : "2018-07-26",
+                              "adjustedEndDate" : "2019-07-26",
                               "meta" : {
-                                "globalKey" : "20991315"
+                                "globalKey" : "ae52e60b"
                               },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000.00
+                              "notionalAmount" : 5000000.00,
+                              "fixedRate" : 0.0695
                             } ],
                             "meta" : {
-                              "globalKey" : "93b573f7"
+                              "globalKey" : "216f46ed"
                             }
                           }, {
                             "adjustedPaymentDate" : "2020-07-29",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2020-07-27",
                               "adjustedStartDate" : "2019-07-26",
+                              "adjustedEndDate" : "2020-07-27",
                               "meta" : {
-                                "globalKey" : "245a8774"
+                                "globalKey" : "b213e9cc"
                               },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000.00
+                              "notionalAmount" : 5000000.00,
+                              "fixedRate" : 0.0695
                             } ],
                             "meta" : {
-                              "globalKey" : "3c8707b7"
+                              "globalKey" : "ca406a0f"
                             }
                           }, {
                             "adjustedPaymentDate" : "2021-07-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2021-07-26",
                               "adjustedStartDate" : "2020-07-27",
+                              "adjustedEndDate" : "2021-07-26",
                               "meta" : {
-                                "globalKey" : "281b16d6"
+                                "globalKey" : "b5d55a6a"
                               },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000.00
+                              "notionalAmount" : 5000000.00,
+                              "fixedRate" : 0.0695
                             } ],
                             "meta" : {
-                              "globalKey" : "e557b67a"
+                              "globalKey" : "7311fa0e"
                             }
                           }, {
                             "adjustedPaymentDate" : "2022-07-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2022-07-26",
                               "adjustedStartDate" : "2021-07-26",
+                              "adjustedEndDate" : "2022-07-26",
                               "meta" : {
-                                "globalKey" : "2bdc1315"
+                                "globalKey" : "b995e60b"
                               },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000.00
+                              "notionalAmount" : 5000000.00,
+                              "fixedRate" : 0.0695
                             } ],
                             "meta" : {
-                              "globalKey" : "8fddaab9"
+                              "globalKey" : "1d977daf"
                             }
                           }, {
                             "adjustedPaymentDate" : "2023-07-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2023-07-26",
                               "adjustedStartDate" : "2022-07-26",
+                              "adjustedEndDate" : "2023-07-26",
                               "meta" : {
-                                "globalKey" : "2f9d1315"
+                                "globalKey" : "bd56e60b"
                               },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000.00
+                              "notionalAmount" : 5000000.00,
+                              "fixedRate" : 0.0695
                             } ],
                             "meta" : {
-                              "globalKey" : "3a63a2b9"
+                              "globalKey" : "c81d75af"
                             }
                           }, {
                             "adjustedPaymentDate" : "2024-07-30",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2024-07-26",
                               "adjustedStartDate" : "2023-07-26",
-                              "meta" : {
-                                "globalKey" : "335e1315"
-                              },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000.00
-                            } ],
-                            "meta" : {
-                              "globalKey" : "e8534bf7"
-                            }
-                          }, {
-                            "adjustedPaymentDate" : "2025-07-30",
-                            "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2025-07-28",
-                              "adjustedStartDate" : "2024-07-26",
-                              "meta" : {
-                                "globalKey" : "371ffbd3"
-                              },
-                              "fixedRate" : 0.0695,
-                              "notionalAmount" : 5000000.00
-                            } ],
-                            "meta" : {
-                              "globalKey" : "92da2cb5"
-                            }
-                          } ]
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "9f78b7b1"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "eb988f26"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "fixedPrimaryBusinessCenters",
-                                "globalKey" : "27e4e9"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "3662e8ba"
-                            }
-                          },
-                          "paymentDaysOffset" : {
-                            "meta" : {
-                              "globalKey" : "ea4baf42"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 2,
-                            "dayType" : "BUSINESS"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                              "adjustedEndDate" : "2024-07-26",
+                              "meta" : {
+                                "globalKey" : "c117e60b"
+                              },
+                              "notionalAmount" : 5000000.00,
+                              "fixedRate" : 0.0695
+                            } ],
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
+                              "globalKey" : "760d1eed"
                             }
-                          }
+                          }, {
+                            "adjustedPaymentDate" : "2025-07-30",
+                            "calculationPeriod" : [ {
+                              "adjustedStartDate" : "2024-07-26",
+                              "adjustedEndDate" : "2025-07-28",
+                              "meta" : {
+                                "globalKey" : "c4d8ed8d"
+                              },
+                              "notionalAmount" : 5000000.00,
+                              "fixedRate" : 0.0695
+                            } ],
+                            "meta" : {
+                              "globalKey" : "20931e6f"
+                            }
+                          } ]
+                        },
+                        "meta" : {
+                          "globalKey" : "7e27fb8b"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "a5886ae4"
+                        "globalKey" : "44898938"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "a5886ae4"
+                    "globalKey" : "44898938"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "a5886ae4"
+                  "globalKey" : "44898938"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "8eeac768"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "35d60749"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-Federal Funds-H.15-OIS-COMPOUND"
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 5000000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
                         }
                       }
-                    }
-                  },
-                  "quantity" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-Federal Funds-H.15-OIS-COMPOUND"
                         }
                       },
-                      "value" : 5000000.00
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "84eae1d7"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "fa00c2ba"
                   },
+                  "meta" : {
+                    "globalKey" : "914d61e6"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0695,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.0695,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 5000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 5000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "46179486"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "dd19",
+                  "externalReference" : "clearing_firm"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1118"
-              },
-              "value" : "2018-04-24"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "999",
                   "meta" : {
-                    "scheme" : "cme_trade_id"
-                  },
-                  "value" : "2894761"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "dd19"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "dd19",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "QAC-11111"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "22222"
+                  "value" : "PLATFORM"
+                },
+                "meta" : {
+                  "globalKey" : "9e635873"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "6a8bf565"
+                "globalKey" : "9e635873",
+                "externalKey" : "trade_source"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS2894761"
+                  "value" : "PARTY123"
+                },
+                "meta" : {
+                  "globalKey" : "75895dac"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "75895dac",
+                "externalKey" : "SEF"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "9e635873",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2018-04-24",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "999-123",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "dd19",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "a7071c09"
+                "globalKey" : "c26b8e",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "757c0b6d"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "7428a280"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "dd19"
-                }
-              },
               "quantity" : {
+                "value" : 1500.00,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 },
-                "value" : 1500.00
+                "receiverPartyReference" : {
+                  "globalReference" : "dd19",
+                  "externalReference" : "clearing_firm"
+                }
               },
               "settlementDate" : {
+                "unadjustedDate" : "2018-04-25",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "USNY"
@@ -1144,31 +1087,88 @@
                       "globalKey" : "27e4e9"
                     }
                   },
-                  "businessDayConvention" : "MODFOLLOWING",
                   "meta" : {
                     "globalKey" : "3662e8ba"
                   }
-                },
-                "unadjustedDate" : "2018-04-25"
+                }
               },
               "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
+                "priceTransfer" : "Upfront"
               }
+            },
+            "meta" : {
+              "globalKey" : "4af286fe"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "60ebd1b1"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "1K08850892",
+      "meta" : {
+        "scheme" : "cme_message_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_clearingorg_id"
+      }
+    },
+    "sentTo" : [ {
+      "value" : "999",
+      "meta" : {
+        "scheme" : "cme_firm_id"
+      }
+    }, {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_exchange_id"
+      }
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-04-24T16:30:07-05:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-04-24T21:30:03Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
+    "qualification" : "clearingReceiptDateTime"
   } ],
+  "creditLimitInformation" : {
+    "limitApplicable" : [ {
+      "limitType" : {
+        "value" : "PV01",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 563110,
+      "amountRemaining" : 999999999999435900,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "House",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 999999999999998980,
+      "limitImpactDueToTrade" : -3991
+    } ]
+  },
   "workflowState" : {
-    "workflowStatus" : "CLEARED"
+    "workflowStatus" : "Cleared"
+  },
+  "meta" : {
+    "globalKey" : "53b7d08"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/SWAPTION_TERMINATED_DUE_TO_EXERCISE.json b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/SWAPTION_TERMINATED_DUE_TO_EXERCISE.json
index 4b85891f1a..dadc5e8563 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/SWAPTION_TERMINATED_DUE_TO_EXERCISE.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/SWAPTION_TERMINATED_DUE_TO_EXERCISE.json
@@ -1,132 +1,66 @@
 {
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "cme_message_id"
-      },
-      "value" : "TESTBOOKLE844409"
-    },
-    "sentBy" : {
-      "meta" : {
-        "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "meta" : {
-        "scheme" : "cme_firm_id"
-      },
-      "value" : "TESTBOOKLE"
-    }, {
-      "meta" : {
-        "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "d421fd90"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "b9a2039"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "pacct1"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "b74cc29e"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "9d362d34"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "9d362d34"
-              }
-            } ],
-            "clearedDate" : "2013-08-21",
-            "meta" : {
-              "globalKey" : "c113e78b"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "9d362d34"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "844409",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "TESTBOOKLE"
-                },
-                "meta" : {
-                  "globalKey" : "9d362d34"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "scenario1",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "44f1e133"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME_TRADE_REPORT"
-                },
+                  "value" : "scenario1",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "8d9bf17c"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "44f1e133"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "9d362d34"
-              },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "44f1e133"
               },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS844409",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "ee46e52d"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2013-08-21",
+              "meta" : {
+                "globalKey" : "3eea15"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "9d362d34"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -135,30 +69,23 @@
                   } ],
                   "economicTerms" : {
                     "payout" : {
-                      "meta" : {
-                        "globalKey" : "3ba0f2a6"
-                      },
                       "optionPayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "buyerSeller" : {
-                          "buyer" : "PARTY_1",
-                          "seller" : "PARTY_2"
+                          "buyer" : "Party1",
+                          "seller" : "Party2"
                         },
                         "exerciseTerms" : {
                           "optionStyle" : {
                             "europeanExercise" : {
-                              "earliestExerciseTime" : {
-                                "businessCenter" : {
-                                  "value" : "USNY"
-                                },
-                                "hourMinuteTime" : "09:00:00"
-                              },
                               "expirationDate" : [ {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2014-09-24",
                                   "dateAdjustments" : {
+                                    "businessDayConvention" : "FOLLOWING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "USNY"
@@ -167,35 +94,36 @@
                                         "globalKey" : "27e4e9"
                                       }
                                     },
-                                    "businessDayConvention" : "FOLLOWING",
                                     "meta" : {
                                       "globalKey" : "212500d8"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "2297c580"
-                                  },
-                                  "unadjustedDate" : "2014-09-24"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "2297c580"
                                 }
                               } ],
+                              "earliestExerciseTime" : {
+                                "hourMinuteTime" : "09:00:00",
+                                "businessCenter" : {
+                                  "value" : "USNY"
+                                }
+                              },
                               "expirationTime" : {
+                                "hourMinuteTime" : "11:00:00",
                                 "businessCenter" : {
                                   "value" : "USNY"
-                                },
-                                "hourMinuteTime" : "11:00:00"
+                                }
                               },
                               "meta" : {
-                                "globalKey" : "548eee0d"
+                                "globalKey" : "229ace0d"
                               }
                             }
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "3ba0f2a6"
-                        },
                         "underlier" : {
                           "contractualProduct" : {
                             "productTaxonomy" : [ {
@@ -206,46 +134,42 @@
                               "payout" : {
                                 "interestRatePayout" : [ {
                                   "payerReceiver" : {
-                                    "payer" : "PARTY_1",
-                                    "receiver" : "PARTY_2"
+                                    "payer" : "Party1",
+                                    "receiver" : "Party2"
                                   },
                                   "priceQuantity" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
                                     "quantitySchedule" : {
                                       "address" : {
                                         "scope" : "DOCUMENT",
                                         "value" : "quantity-1"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "0"
                                     }
                                   },
-                                  "calculationPeriodDates" : {
-                                    "calculationPeriodDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "fixedPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "116cc910"
+                                  "rateSpecification" : {
+                                    "fixedRate" : {
+                                      "rateSchedule" : {
+                                        "price" : {
+                                          "address" : {
+                                            "scope" : "DOCUMENT",
+                                            "value" : "price-1"
+                                          }
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
-                                        "globalKey" : "47a7cce1"
+                                        "globalKey" : "0"
                                       }
-                                    },
-                                    "calculationPeriodFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "28caa"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6,
-                                      "rollConvention" : "26"
-                                    },
+                                    }
+                                  },
+                                  "dayCountFraction" : {
+                                    "value" : "ACT/360"
+                                  },
+                                  "calculationPeriodDates" : {
                                     "effectiveDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2014-09-26",
                                         "dateAdjustments" : {
                                           "businessDayConvention" : "NONE",
                                           "meta" : {
@@ -254,42 +178,94 @@
                                         },
                                         "meta" : {
                                           "globalKey" : "ec706b12"
-                                        },
-                                        "unadjustedDate" : "2014-09-26"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "ec706b12"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "fixedCalcPeriodDates",
-                                      "globalKey" : "181db4ae"
-                                    },
                                     "terminationDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2016-09-26",
                                         "dateAdjustments" : {
+                                          "businessDayConvention" : "MODFOLLOWING",
                                           "businessCenters" : {
                                             "businessCentersReference" : {
-                                              "externalReference" : "fixedPrimaryBusinessCenters",
-                                              "globalReference" : "42f910b"
+                                              "globalReference" : "42f910b",
+                                              "externalReference" : "fixedPrimaryBusinessCenters"
                                             },
                                             "meta" : {
                                               "globalKey" : "116cc910"
                                             }
                                           },
-                                          "businessDayConvention" : "MODFOLLOWING",
                                           "meta" : {
                                             "globalKey" : "47a7cce1"
                                           }
                                         },
                                         "meta" : {
                                           "globalKey" : "9a0e32c7"
-                                        },
-                                        "unadjustedDate" : "2016-09-26"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "9a0e32c7"
                                       }
+                                    },
+                                    "calculationPeriodDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "fixedPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "116cc910"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "47a7cce1"
+                                      }
+                                    },
+                                    "calculationPeriodFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "18abc"
+                                      },
+                                      "rollConvention" : "26"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "c37bd764",
+                                      "externalKey" : "fixedCalcPeriodDates"
+                                    }
+                                  },
+                                  "paymentDates" : {
+                                    "paymentFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "107"
+                                      }
+                                    },
+                                    "payRelativeTo" : "CalculationPeriodEndDate",
+                                    "paymentDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        }, {
+                                          "value" : "USNY"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "42f910b",
+                                          "externalKey" : "fixedPrimaryBusinessCenters"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "97b8e49c"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "9e5a4d0f"
                                     }
                                   },
                                   "cashflowRepresentation" : {
@@ -297,154 +273,100 @@
                                     "paymentCalculationPeriod" : [ {
                                       "adjustedPaymentDate" : "2015-03-26",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2015-03-26",
                                         "adjustedStartDate" : "2014-09-26",
+                                        "adjustedEndDate" : "2015-03-26",
                                         "meta" : {
-                                          "globalKey" : "eabb173c"
+                                          "globalKey" : "f938a384"
                                         },
-                                        "fixedRate" : 0.0225,
-                                        "notionalAmount" : 10000000.00
+                                        "notionalAmount" : 10000000.00,
+                                        "fixedRate" : 0.0225
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "71796a2"
+                                        "globalKey" : "159522ea"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2015-09-28",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2015-09-28",
                                         "adjustedStartDate" : "2015-03-26",
+                                        "adjustedEndDate" : "2015-09-28",
                                         "meta" : {
-                                          "globalKey" : "eb82f4fa"
+                                          "globalKey" : "fc32b606"
                                         },
-                                        "fixedRate" : 0.0225,
-                                        "notionalAmount" : 10000000.00
+                                        "notionalAmount" : 10000000.00,
+                                        "fixedRate" : 0.0225
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "9a8e141e"
+                                        "globalKey" : "ab3dd52a"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-03-29",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-03-29",
                                         "adjustedStartDate" : "2015-09-28",
+                                        "adjustedEndDate" : "2016-03-29",
                                         "meta" : {
-                                          "globalKey" : "ee7d7bdb"
+                                          "globalKey" : "fcfa9785"
                                         },
-                                        "fixedRate" : 0.0225,
-                                        "notionalAmount" : 10000000.00
+                                        "notionalAmount" : 10000000.00,
+                                        "fixedRate" : 0.0225
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "b6bd7d1e"
+                                        "globalKey" : "c53a98c8"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-09-26",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-09-26",
                                         "adjustedStartDate" : "2016-03-29",
+                                        "adjustedEndDate" : "2016-09-26",
                                         "meta" : {
-                                          "globalKey" : "ef43177f"
+                                          "globalKey" : "fff50ba1"
                                         },
-                                        "fixedRate" : 0.0225,
-                                        "notionalAmount" : 10000000.00
+                                        "notionalAmount" : 10000000.00,
+                                        "fixedRate" : 0.0225
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "41a97d65"
+                                        "globalKey" : "525b7187"
                                       }
                                     } ]
                                   },
-                                  "dayCountFraction" : {
-                                    "value" : "ACT/360"
-                                  },
                                   "meta" : {
-                                    "globalKey" : "ee4aa148"
+                                    "globalKey" : "64470b64"
+                                  }
+                                }, {
+                                  "payerReceiver" : {
+                                    "payer" : "Party2",
+                                    "receiver" : "Party1"
                                   },
-                                  "paymentDates" : {
-                                    "meta" : {
-                                      "globalKey" : "637fde97"
+                                  "priceQuantity" : {
+                                    "quantitySchedule" : {
+                                      "address" : {
+                                        "scope" : "DOCUMENT",
+                                        "value" : "quantity-2"
+                                      }
                                     },
-                                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                    "paymentDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        }, {
-                                          "value" : "USNY"
-                                        } ],
-                                        "meta" : {
-                                          "externalKey" : "fixedPrimaryBusinessCenters",
-                                          "globalKey" : "42f910b"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "97b8e49c"
-                                      }
-                                    },
-                                    "paymentFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "959"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6
+                                    "meta" : {
+                                      "globalKey" : "0"
                                     }
                                   },
                                   "rateSpecification" : {
-                                    "fixedRate" : {
+                                    "floatingRate" : {
+                                      "rateOption" : {
+                                        "address" : {
+                                          "scope" : "DOCUMENT",
+                                          "value" : "rateOption-1"
+                                        }
+                                      },
                                       "meta" : {
                                         "globalKey" : "0"
-                                      },
-                                      "rateSchedule" : {
-                                        "price" : {
-                                          "address" : {
-                                            "scope" : "DOCUMENT",
-                                            "value" : "price-1"
-                                          }
-                                        }
                                       }
                                     }
-                                  }
-                                }, {
-                                  "payerReceiver" : {
-                                    "payer" : "PARTY_2",
-                                    "receiver" : "PARTY_1"
                                   },
-                                  "priceQuantity" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
-                                    "quantitySchedule" : {
-                                      "address" : {
-                                        "scope" : "DOCUMENT",
-                                        "value" : "quantity-2"
-                                      }
-                                    }
+                                  "dayCountFraction" : {
+                                    "value" : "ACT/360"
                                   },
                                   "calculationPeriodDates" : {
-                                    "calculationPeriodDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "floatPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "245965f8"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "5a9469c9"
-                                      }
-                                    },
-                                    "calculationPeriodFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "28c4d"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3,
-                                      "rollConvention" : "26"
-                                    },
                                     "effectiveDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2014-09-26",
                                         "dateAdjustments" : {
                                           "businessDayConvention" : "NONE",
                                           "meta" : {
@@ -453,501 +375,548 @@
                                         },
                                         "meta" : {
                                           "globalKey" : "ec706b12"
-                                        },
-                                        "unadjustedDate" : "2014-09-26"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "ec706b12"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "floatingCalcPeriodDates",
-                                      "globalKey" : "ca0be2eb"
-                                    },
                                     "terminationDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2016-09-26",
                                         "dateAdjustments" : {
+                                          "businessDayConvention" : "MODFOLLOWING",
                                           "businessCenters" : {
                                             "businessCentersReference" : {
-                                              "externalReference" : "floatPrimaryBusinessCenters",
-                                              "globalReference" : "42f910b"
+                                              "globalReference" : "42f910b",
+                                              "externalReference" : "floatPrimaryBusinessCenters"
                                             },
                                             "meta" : {
                                               "globalKey" : "245965f8"
                                             }
                                           },
-                                          "businessDayConvention" : "MODFOLLOWING",
                                           "meta" : {
                                             "globalKey" : "5a9469c9"
                                           }
                                         },
                                         "meta" : {
                                           "globalKey" : "acfacfaf"
-                                        },
-                                        "unadjustedDate" : "2016-09-26"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "acfacfaf"
                                       }
+                                    },
+                                    "calculationPeriodDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "floatPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "245965f8"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "5a9469c9"
+                                      }
+                                    },
+                                    "calculationPeriodFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "17f79"
+                                      },
+                                      "rollConvention" : "26"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "bd911d21",
+                                      "externalKey" : "floatingCalcPeriodDates"
+                                    }
+                                  },
+                                  "paymentDates" : {
+                                    "paymentFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "107"
+                                      }
+                                    },
+                                    "payRelativeTo" : "CalculationPeriodEndDate",
+                                    "paymentDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        }, {
+                                          "value" : "USNY"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "42f910b",
+                                          "externalKey" : "floatPrimaryBusinessCenters"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "97b8e49c"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "9e5a4d0f"
+                                    }
+                                  },
+                                  "resetDates" : {
+                                    "calculationPeriodDatesReference" : {
+                                      "globalReference" : "bd911d21",
+                                      "externalReference" : "floatingCalcPeriodDates"
+                                    },
+                                    "resetRelativeTo" : "CalculationPeriodStartDate",
+                                    "fixingDates" : {
+                                      "periodMultiplier" : -2,
+                                      "period" : "D",
+                                      "meta" : {
+                                        "globalKey" : "1a78799e"
+                                      },
+                                      "dayType" : "Business",
+                                      "businessDayConvention" : "NONE",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "21479e"
+                                        }
+                                      },
+                                      "dateRelativeTo" : {
+                                        "globalReference" : "6cfd7cb9",
+                                        "externalReference" : "floatingLegResetDates"
+                                      }
+                                    },
+                                    "resetFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "aa"
+                                      }
+                                    },
+                                    "resetDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "floatPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "245965f8"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "5a9469c9"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "6cfd7cb9",
+                                      "externalKey" : "floatingLegResetDates"
                                     }
                                   },
+                                  "compoundingMethod" : "Flat",
                                   "cashflowRepresentation" : {
                                     "cashflowsMatchParameters" : true,
                                     "paymentCalculationPeriod" : [ {
                                       "adjustedPaymentDate" : "2015-03-26",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2014-12-29",
                                         "adjustedStartDate" : "2014-09-26",
+                                        "adjustedEndDate" : "2014-12-29",
                                         "meta" : {
-                                          "globalKey" : "a6f9f57a"
+                                          "globalKey" : "a85bd414"
                                         },
+                                        "notionalAmount" : 10000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2014-09-24",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "79f58d8"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 10000000.00
+                                        }
                                       }, {
-                                        "adjustedEndDate" : "2015-03-26",
                                         "adjustedStartDate" : "2014-12-29",
+                                        "adjustedEndDate" : "2015-03-26",
                                         "meta" : {
-                                          "globalKey" : "80dd11b5"
+                                          "globalKey" : "be7a161b"
                                         },
+                                        "notionalAmount" : 10000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2014-12-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "79f6ff9"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 10000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "c4fae3d5"
+                                        "globalKey" : "a4754861"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2015-09-28",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2015-06-26",
                                         "adjustedStartDate" : "2015-03-26",
+                                        "adjustedEndDate" : "2015-06-26",
                                         "meta" : {
-                                          "globalKey" : "f8493d37"
+                                          "globalKey" : "933f43b7"
                                         },
+                                        "notionalAmount" : 10000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2015-03-24",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a02258"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 10000000.00
+                                        }
                                       }, {
-                                        "adjustedEndDate" : "2015-09-28",
                                         "adjustedStartDate" : "2015-06-26",
+                                        "adjustedEndDate" : "2015-09-28",
                                         "meta" : {
-                                          "globalKey" : "5664b2f9"
+                                          "globalKey" : "8af7f435"
                                         },
+                                        "notionalAmount" : 10000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2015-06-24",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a03998"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 10000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "c7243c3e"
+                                        "globalKey" : "77a526fa"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-03-29",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2015-12-29",
                                         "adjustedStartDate" : "2015-09-28",
+                                        "adjustedEndDate" : "2015-12-29",
                                         "meta" : {
-                                          "globalKey" : "83039eb8"
+                                          "globalKey" : "eac84296"
                                         },
+                                        "notionalAmount" : 10000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2015-09-24",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a050d8"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 10000000.00
+                                        }
                                       }, {
-                                        "adjustedEndDate" : "2016-03-29",
                                         "adjustedStartDate" : "2015-12-29",
+                                        "adjustedEndDate" : "2016-03-29",
                                         "meta" : {
-                                          "globalKey" : "f82fbb78"
+                                          "globalKey" : "9c3897f8"
                                         },
+                                        "notionalAmount" : 10000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2015-12-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a067f9"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 10000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "843a449d"
+                                        "globalKey" : "b0d6077f"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-09-26",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-06-27",
                                         "adjustedStartDate" : "2016-03-29",
+                                        "adjustedEndDate" : "2016-06-27",
                                         "meta" : {
-                                          "globalKey" : "aedfa36"
+                                          "globalKey" : "c46c5fa"
                                         },
+                                        "notionalAmount" : 10000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2016-03-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a11a39"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 10000000.00
+                                        }
                                       }, {
-                                        "adjustedEndDate" : "2016-09-26",
                                         "adjustedStartDate" : "2016-06-27",
+                                        "adjustedEndDate" : "2016-09-26",
                                         "meta" : {
-                                          "globalKey" : "c6ed0cf7"
+                                          "globalKey" : "95147619"
                                         },
+                                        "notionalAmount" : 10000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2016-06-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a13179"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 10000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "2864585b"
+                                        "globalKey" : "592ef139"
                                       }
                                     } ]
                                   },
-                                  "compoundingMethod" : "FLAT",
-                                  "dayCountFraction" : {
-                                    "value" : "ACT/360"
-                                  },
                                   "meta" : {
-                                    "globalKey" : "d5b1e093"
-                                  },
-                                  "paymentDates" : {
-                                    "meta" : {
-                                      "globalKey" : "637fde97"
-                                    },
-                                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                    "paymentDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        }, {
-                                          "value" : "USNY"
-                                        } ],
-                                        "meta" : {
-                                          "externalKey" : "floatPrimaryBusinessCenters",
-                                          "globalKey" : "42f910b"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "97b8e49c"
-                                      }
-                                    },
-                                    "paymentFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "959"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6
-                                    }
-                                  },
-                                  "rateSpecification" : {
-                                    "floatingRate" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
-                                      "rateOption" : {
-                                        "address" : {
-                                          "scope" : "DOCUMENT",
-                                          "value" : "rateOption-1"
-                                        }
-                                      }
-                                    }
-                                  },
-                                  "resetDates" : {
-                                    "calculationPeriodDatesReference" : {
-                                      "externalReference" : "floatingCalcPeriodDates",
-                                      "globalReference" : "ca0be2eb"
-                                    },
-                                    "fixingDates" : {
-                                      "meta" : {
-                                        "globalKey" : "3d9c8eea"
-                                      },
-                                      "period" : "D",
-                                      "periodMultiplier" : -2,
-                                      "dayType" : "BUSINESS",
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        } ],
-                                        "meta" : {
-                                          "globalKey" : "21479e"
-                                        }
-                                      },
-                                      "businessDayConvention" : "NONE",
-                                      "dateRelativeTo" : {
-                                        "externalReference" : "floatingLegResetDates",
-                                        "globalReference" : "2de3a193"
-                                      }
-                                    },
-                                    "meta" : {
-                                      "externalKey" : "floatingLegResetDates",
-                                      "globalKey" : "2de3a193"
-                                    },
-                                    "resetDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "floatPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "245965f8"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "5a9469c9"
-                                      }
-                                    },
-                                    "resetFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "956"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3
-                                    },
-                                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                                    "globalKey" : "4d6a0353"
                                   }
                                 } ],
                                 "meta" : {
-                                  "globalKey" : "4a5055db"
+                                  "globalKey" : "1becd8b7"
                                 }
                               }
                             },
                             "meta" : {
-                              "globalKey" : "4a5055db"
+                              "globalKey" : "1becd8b7"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "4a5055db"
+                            "globalKey" : "1becd8b7"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "27b95582"
                         }
-                      } ]
+                      } ],
+                      "meta" : {
+                        "globalKey" : "27b95582"
+                      }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "3ba0f2a6"
+                    "globalKey" : "27b95582"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "3ba0f2a6"
+                  "globalKey" : "27b95582"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "46b33af3"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0225,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.0225,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 10000000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "8fb4236d"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 10000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 10000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "975cb782"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000.00
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3eea15"
-              },
-              "value" : "2013-08-21"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "844409"
+                  "meta" : {
+                    "globalKey" : "a032462e"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "9d362d34",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
+                }
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "TESTBOOKLE",
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "scenario1"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "9d362d34"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "9d362d34",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "scenario1"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "b44b8932"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS844409"
+                  "value" : "CME_TRADE_REPORT"
+                },
+                "meta" : {
+                  "globalKey" : "44f1e133"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "44f1e133",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "44f1e133",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "9d362d34",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2013-08-21",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "9d362d34",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "pacct1",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "9d362d34",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "d842f70b"
+                "globalKey" : "f1e3dc1e",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "331a32dd"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "9ccb52e4"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "9d362d34"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                }
-              },
               "quantity" : {
+                "value" : 100000.00,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "9d362d34",
+                  "externalReference" : "clearing_firm"
                 },
-                "value" : 100000.00
+                "receiverPartyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
+                }
               },
               "settlementDate" : {
+                "unadjustedDate" : "2014-09-25",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "USNY"
@@ -956,28 +925,59 @@
                       "globalKey" : "27e4e9"
                     }
                   },
-                  "businessDayConvention" : "MODFOLLOWING",
                   "meta" : {
                     "globalKey" : "3662e8ba"
                   }
-                },
-                "unadjustedDate" : "2014-09-25"
+                }
               },
               "transferExpression" : {
-                "priceTransfer" : "PREMIUM"
+                "priceTransfer" : "Premium"
               }
+            },
+            "meta" : {
+              "globalKey" : "48f59ccc"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "2a00c60f"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "TESTBOOKLE844409",
+      "meta" : {
+        "scheme" : "cme_message_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_clearingorg_id"
+      }
+    },
+    "sentTo" : [ {
+      "value" : "TESTBOOKLE",
+      "meta" : {
+        "scheme" : "cme_firm_id"
+      }
+    }, {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_exchange_id"
+      }
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2014-09-24T09:30:15Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   } ],
   "workflowState" : {
-    "workflowStatus" : "TERMINATED"
+    "workflowStatus" : "Terminated"
+  },
+  "meta" : {
+    "globalKey" : "103e4f9a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/SWAP_CREATED_DUE_TO_EXERCISE.json b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/SWAP_CREATED_DUE_TO_EXERCISE.json
index 152625dad4..2dc2ac0182 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/SWAP_CREATED_DUE_TO_EXERCISE.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/SWAP_CREATED_DUE_TO_EXERCISE.json
@@ -1,132 +1,73 @@
 {
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "cme_message_id"
-      },
-      "value" : "MSG4529898"
-    },
-    "sentBy" : {
-      "meta" : {
-        "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "meta" : {
-        "scheme" : "cme_firm_id"
-      },
-      "value" : "TESTBOOKLE"
-    }, {
-      "meta" : {
-        "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "7fc4108d"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "45fd8c9a"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "pacct1"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "b74cc29e"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "9d362d34"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "9d362d34"
-              }
-            } ],
-            "clearedDate" : "2014-09-24",
-            "meta" : {
-              "globalKey" : "45fd8c9a"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "9d362d34"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "844510",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "TESTBOOKLE"
-                },
-                "meta" : {
-                  "globalKey" : "9d362d34"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "scenario1",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "44f1e133"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME_TRADE_REPORT"
-                },
+                  "value" : "scenario1",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "844409",
+                  "meta" : {
+                    "scheme" : "swaption_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "34859cce"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "44f1e133"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "9d362d34"
               },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "44f1e133"
-              },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS844510",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "ee46e904"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2014-09-24",
+              "meta" : {
+                "globalKey" : "3ef258"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "9d362d34"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -137,46 +78,42 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "fixedPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "116cc910"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "47a7cce1"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28caa"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "26"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2014-09-26",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -185,42 +122,94 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec706b12"
-                              },
-                              "unadjustedDate" : "2014-09-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec706b12"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "181db4ae"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2016-09-26",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "fixedPrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "fixedPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "116cc910"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "47a7cce1"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "9a0e32c7"
-                              },
-                              "unadjustedDate" : "2016-09-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "9a0e32c7"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "fixedPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "116cc910"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "47a7cce1"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "18abc"
+                            },
+                            "rollConvention" : "26"
+                          },
+                          "meta" : {
+                            "globalKey" : "c37bd764",
+                            "externalKey" : "fixedCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b",
+                                "externalKey" : "fixedPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "9e5a4d0f"
                           }
                         },
                         "cashflowRepresentation" : {
@@ -228,154 +217,100 @@
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2015-03-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-03-26",
                               "adjustedStartDate" : "2014-09-26",
+                              "adjustedEndDate" : "2015-03-26",
                               "meta" : {
-                                "globalKey" : "eabb173c"
+                                "globalKey" : "f938a384"
                               },
-                              "fixedRate" : 0.0225,
-                              "notionalAmount" : 10000000.00
+                              "notionalAmount" : 10000000.00,
+                              "fixedRate" : 0.0225
                             } ],
                             "meta" : {
-                              "globalKey" : "71796a2"
+                              "globalKey" : "159522ea"
                             }
                           }, {
                             "adjustedPaymentDate" : "2015-09-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-09-28",
                               "adjustedStartDate" : "2015-03-26",
+                              "adjustedEndDate" : "2015-09-28",
                               "meta" : {
-                                "globalKey" : "eb82f4fa"
+                                "globalKey" : "fc32b606"
                               },
-                              "fixedRate" : 0.0225,
-                              "notionalAmount" : 10000000.00
+                              "notionalAmount" : 10000000.00,
+                              "fixedRate" : 0.0225
                             } ],
                             "meta" : {
-                              "globalKey" : "9a8e141e"
+                              "globalKey" : "ab3dd52a"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-03-29",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-03-29",
                               "adjustedStartDate" : "2015-09-28",
+                              "adjustedEndDate" : "2016-03-29",
                               "meta" : {
-                                "globalKey" : "ee7d7bdb"
+                                "globalKey" : "fcfa9785"
                               },
-                              "fixedRate" : 0.0225,
-                              "notionalAmount" : 10000000.00
+                              "notionalAmount" : 10000000.00,
+                              "fixedRate" : 0.0225
                             } ],
                             "meta" : {
-                              "globalKey" : "b6bd7d1e"
+                              "globalKey" : "c53a98c8"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-09-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-09-26",
                               "adjustedStartDate" : "2016-03-29",
+                              "adjustedEndDate" : "2016-09-26",
                               "meta" : {
-                                "globalKey" : "ef43177f"
+                                "globalKey" : "fff50ba1"
                               },
-                              "fixedRate" : 0.0225,
-                              "notionalAmount" : 10000000.00
+                              "notionalAmount" : 10000000.00,
+                              "fixedRate" : 0.0225
                             } ],
                             "meta" : {
-                              "globalKey" : "41a97d65"
+                              "globalKey" : "525b7187"
                             }
                           } ]
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
                         "meta" : {
-                          "globalKey" : "ee4aa148"
+                          "globalKey" : "64470b64"
+                        }
+                      }, {
+                        "payerReceiver" : {
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "637fde97"
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-2"
+                            }
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "fixedPrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        },
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "97b8e49c"
+                              "globalKey" : "0"
                             }
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "959"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }, {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-2"
-                            }
-                          }
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
                         },
                         "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "245965f8"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "5a9469c9"
-                            }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c4d"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "26"
-                          },
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2014-09-26",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -384,482 +319,547 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec706b12"
-                              },
-                              "unadjustedDate" : "2014-09-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec706b12"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "ca0be2eb"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2016-09-26",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "floatPrimaryBusinessCenters",
-                                    "globalReference" : "42f910b"
+                                    "globalReference" : "42f910b",
+                                    "externalReference" : "floatPrimaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "245965f8"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "5a9469c9"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "acfacfaf"
-                              },
-                              "unadjustedDate" : "2016-09-26"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "acfacfaf"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "245965f8"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "5a9469c9"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f79"
+                            },
+                            "rollConvention" : "26"
+                          },
+                          "meta" : {
+                            "globalKey" : "bd911d21",
+                            "externalKey" : "floatingCalcPeriodDates"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b",
+                                "externalKey" : "floatPrimaryBusinessCenters"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "9e5a4d0f"
+                          }
+                        },
+                        "resetDates" : {
+                          "calculationPeriodDatesReference" : {
+                            "globalReference" : "bd911d21",
+                            "externalReference" : "floatingCalcPeriodDates"
+                          },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
+                          "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "1a78799e"
+                            },
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "21479e"
+                              }
+                            },
+                            "dateRelativeTo" : {
+                              "globalReference" : "6cfd7cb9",
+                              "externalReference" : "floatingLegResetDates"
+                            }
+                          },
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "42f910b",
+                                "externalReference" : "floatPrimaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "245965f8"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "5a9469c9"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "6cfd7cb9",
+                            "externalKey" : "floatingLegResetDates"
                           }
                         },
+                        "compoundingMethod" : "Flat",
                         "cashflowRepresentation" : {
                           "cashflowsMatchParameters" : true,
                           "paymentCalculationPeriod" : [ {
                             "adjustedPaymentDate" : "2015-03-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2014-12-29",
                               "adjustedStartDate" : "2014-09-26",
+                              "adjustedEndDate" : "2014-12-29",
                               "meta" : {
-                                "globalKey" : "a6f9f57a"
+                                "globalKey" : "a85bd414"
                               },
+                              "notionalAmount" : 10000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2014-09-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "79f58d8"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 10000000.00
+                              }
                             }, {
-                              "adjustedEndDate" : "2015-03-26",
                               "adjustedStartDate" : "2014-12-29",
+                              "adjustedEndDate" : "2015-03-26",
                               "meta" : {
-                                "globalKey" : "80dd11b5"
+                                "globalKey" : "be7a161b"
                               },
+                              "notionalAmount" : 10000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2014-12-23",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "79f6ff9"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 10000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "c4fae3d5"
+                              "globalKey" : "a4754861"
                             }
                           }, {
                             "adjustedPaymentDate" : "2015-09-28",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-06-26",
                               "adjustedStartDate" : "2015-03-26",
+                              "adjustedEndDate" : "2015-06-26",
                               "meta" : {
-                                "globalKey" : "f8493d37"
+                                "globalKey" : "933f43b7"
                               },
+                              "notionalAmount" : 10000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2015-03-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a02258"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 10000000.00
+                              }
                             }, {
-                              "adjustedEndDate" : "2015-09-28",
                               "adjustedStartDate" : "2015-06-26",
+                              "adjustedEndDate" : "2015-09-28",
                               "meta" : {
-                                "globalKey" : "5664b2f9"
+                                "globalKey" : "8af7f435"
                               },
+                              "notionalAmount" : 10000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2015-06-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a03998"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 10000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "c7243c3e"
+                              "globalKey" : "77a526fa"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-03-29",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2015-12-29",
                               "adjustedStartDate" : "2015-09-28",
+                              "adjustedEndDate" : "2015-12-29",
                               "meta" : {
-                                "globalKey" : "83039eb8"
+                                "globalKey" : "eac84296"
                               },
+                              "notionalAmount" : 10000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2015-09-24",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a050d8"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 10000000.00
+                              }
                             }, {
-                              "adjustedEndDate" : "2016-03-29",
                               "adjustedStartDate" : "2015-12-29",
+                              "adjustedEndDate" : "2016-03-29",
                               "meta" : {
-                                "globalKey" : "f82fbb78"
+                                "globalKey" : "9c3897f8"
                               },
+                              "notionalAmount" : 10000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2015-12-23",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a067f9"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 10000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "843a449d"
+                              "globalKey" : "b0d6077f"
                             }
                           }, {
                             "adjustedPaymentDate" : "2016-09-26",
                             "calculationPeriod" : [ {
-                              "adjustedEndDate" : "2016-06-27",
                               "adjustedStartDate" : "2016-03-29",
+                              "adjustedEndDate" : "2016-06-27",
                               "meta" : {
-                                "globalKey" : "aedfa36"
+                                "globalKey" : "c46c5fa"
                               },
+                              "notionalAmount" : 10000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2016-03-23",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a11a39"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 10000000.00
+                              }
                             }, {
-                              "adjustedEndDate" : "2016-09-26",
                               "adjustedStartDate" : "2016-06-27",
+                              "adjustedEndDate" : "2016-09-26",
                               "meta" : {
-                                "globalKey" : "c6ed0cf7"
+                                "globalKey" : "95147619"
                               },
+                              "notionalAmount" : 10000000.00,
                               "floatingRateDefinition" : {
                                 "rateObservation" : [ {
                                   "adjustedFixingDate" : "2016-06-23",
+                                  "observedRate" : 0,
                                   "meta" : {
                                     "globalKey" : "7a13179"
-                                  },
-                                  "observedRate" : 0
+                                  }
                                 } ]
-                              },
-                              "notionalAmount" : 10000000.00
+                              }
                             } ],
                             "meta" : {
-                              "globalKey" : "2864585b"
+                              "globalKey" : "592ef139"
                             }
                           } ]
                         },
-                        "compoundingMethod" : "FLAT",
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
                         "meta" : {
-                          "globalKey" : "d5b1e093"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "637fde97"
-                          },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "floatPrimaryBusinessCenters",
-                                "globalKey" : "42f910b"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "97b8e49c"
-                            }
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "959"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
-                          }
-                        },
-                        "resetDates" : {
-                          "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "ca0be2eb"
-                          },
-                          "fixingDates" : {
-                            "meta" : {
-                              "globalKey" : "3d9c8eea"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "21479e"
-                              }
-                            },
-                            "businessDayConvention" : "NONE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "2de3a193"
-                            }
-                          },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "2de3a193"
-                          },
-                          "resetDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "floatPrimaryBusinessCenters",
-                                "globalReference" : "42f910b"
-                              },
-                              "meta" : {
-                                "globalKey" : "245965f8"
-                              }
-                            },
-                            "businessDayConvention" : "MODFOLLOWING",
-                            "meta" : {
-                              "globalKey" : "5a9469c9"
-                            }
-                          },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "globalKey" : "4d6a0353"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "4a5055db"
+                        "globalKey" : "1becd8b7"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "4a5055db"
+                    "globalKey" : "1becd8b7"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "4a5055db"
+                  "globalKey" : "1becd8b7"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "46b33af3"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0225,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.0225,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 10000000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "8fb4236d"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 10000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 10000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "975cb782"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000.00
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ef258"
-              },
-              "value" : "2014-09-24"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "844510"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "scenario1"
+                    "globalKey" : "a032462e"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "9d362d34",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
+                }
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "TESTBOOKLE",
                   "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "scenario1"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "9d362d34"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "9d362d34",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "swaption_trade_id"
-                  },
-                  "value" : "844409"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "65b0988e"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS844510"
+                  "value" : "CME_TRADE_REPORT"
+                },
+                "meta" : {
+                  "globalKey" : "44f1e133"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "44f1e133",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "44f1e133",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "9d362d34",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2014-09-24",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "9d362d34",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "pacct1",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "9d362d34",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "d8516122"
+                "globalKey" : "f1e3dc1e",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "dd55eb3a"
+            }
+          },
+          "meta" : {
+            "globalKey" : "dd55eb3a"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "MSG4529898",
+      "meta" : {
+        "scheme" : "cme_message_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_clearingorg_id"
+      }
+    },
+    "sentTo" : [ {
+      "value" : "TESTBOOKLE",
+      "meta" : {
+        "scheme" : "cme_firm_id"
+      }
+    }, {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_exchange_id"
+      }
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2014-09-24T09:30:17Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   } ],
   "workflowState" : {
-    "workflowStatus" : "CLEARED"
+    "workflowStatus" : "Cleared"
+  },
+  "meta" : {
+    "globalKey" : "9359a39"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/Swaption-ex01.json b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/Swaption-ex01.json
index 7dad14c4bf..7b785aaa37 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/Swaption-ex01.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/Swaption-ex01.json
@@ -1,132 +1,73 @@
 {
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "cme_message_id"
-      },
-      "value" : "3702896735"
-    },
-    "sentBy" : {
-      "meta" : {
-        "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "meta" : {
-        "scheme" : "cme_firm_id"
-      },
-      "value" : "0220"
-    }, {
-      "meta" : {
-        "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "abfdcd26"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "ca0f80b5"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "0220HOUSE2"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "2cea5582"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "1693c0"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "1693c0"
-              }
-            } ],
-            "clearedDate" : "2015-01-13",
-            "meta" : {
-              "globalKey" : "8202f"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "1693c0"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "2896735",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "0220"
-                },
-                "meta" : {
-                  "globalKey" : "1693c0"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "2098916",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "902a6db3"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CHI2WIRE"
-                },
+                  "value" : "19427806",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "19427806",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "887441fc"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "902a6db3"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "1693c0"
               },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "902a6db3"
-              },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS2896735",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e12d1a10"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2015-01-13",
+              "meta" : {
+                "globalKey" : "3ef84d"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "1693c0"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -135,30 +76,23 @@
                   } ],
                   "economicTerms" : {
                     "payout" : {
-                      "meta" : {
-                        "globalKey" : "d223d368"
-                      },
                       "optionPayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "buyerSeller" : {
-                          "buyer" : "PARTY_1",
-                          "seller" : "PARTY_2"
+                          "buyer" : "Party1",
+                          "seller" : "Party2"
                         },
                         "exerciseTerms" : {
                           "optionStyle" : {
                             "europeanExercise" : {
-                              "earliestExerciseTime" : {
-                                "businessCenter" : {
-                                  "value" : "USNY"
-                                },
-                                "hourMinuteTime" : "09:00:00"
-                              },
                               "expirationDate" : [ {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2015-07-13",
                                   "dateAdjustments" : {
+                                    "businessDayConvention" : "PRECEDING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "USNY"
@@ -167,35 +101,36 @@
                                         "globalKey" : "27e4e9"
                                       }
                                     },
-                                    "businessDayConvention" : "PRECEDING",
                                     "meta" : {
                                       "globalKey" : "4c776966"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "77d87b9"
-                                  },
-                                  "unadjustedDate" : "2015-07-13"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "77d87b9"
                                 }
                               } ],
+                              "earliestExerciseTime" : {
+                                "hourMinuteTime" : "09:00:00",
+                                "businessCenter" : {
+                                  "value" : "USNY"
+                                }
+                              },
                               "expirationTime" : {
+                                "hourMinuteTime" : "11:00:00",
                                 "businessCenter" : {
                                   "value" : "USNY"
-                                },
-                                "hourMinuteTime" : "11:00:00"
+                                }
                               },
                               "meta" : {
-                                "globalKey" : "efe6ebc6"
+                                "globalKey" : "31db4746"
                               }
                             }
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "d223d368"
-                        },
                         "underlier" : {
                           "contractualProduct" : {
                             "productTaxonomy" : [ {
@@ -206,46 +141,42 @@
                               "payout" : {
                                 "interestRatePayout" : [ {
                                   "payerReceiver" : {
-                                    "payer" : "PARTY_1",
-                                    "receiver" : "PARTY_2"
+                                    "payer" : "Party1",
+                                    "receiver" : "Party2"
                                   },
                                   "priceQuantity" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
                                     "quantitySchedule" : {
                                       "address" : {
                                         "scope" : "DOCUMENT",
                                         "value" : "quantity-1"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "0"
                                     }
                                   },
-                                  "calculationPeriodDates" : {
-                                    "calculationPeriodDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "fixedPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "116cc910"
+                                  "rateSpecification" : {
+                                    "fixedRate" : {
+                                      "rateSchedule" : {
+                                        "price" : {
+                                          "address" : {
+                                            "scope" : "DOCUMENT",
+                                            "value" : "price-1"
+                                          }
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
-                                        "globalKey" : "47a7cce1"
+                                        "globalKey" : "0"
                                       }
-                                    },
-                                    "calculationPeriodFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "28c8a"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6,
-                                      "rollConvention" : "15"
-                                    },
+                                    }
+                                  },
+                                  "dayCountFraction" : {
+                                    "value" : "30/360"
+                                  },
+                                  "calculationPeriodDates" : {
                                     "effectiveDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2015-07-15",
                                         "dateAdjustments" : {
                                           "businessDayConvention" : "NONE",
                                           "meta" : {
@@ -254,42 +185,94 @@
                                         },
                                         "meta" : {
                                           "globalKey" : "ec8c6947"
-                                        },
-                                        "unadjustedDate" : "2015-07-15"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "ec8c6947"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "fixedCalcPeriodDates",
-                                      "globalKey" : "2539abae"
-                                    },
                                     "terminationDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2022-07-15",
                                         "dateAdjustments" : {
+                                          "businessDayConvention" : "MODFOLLOWING",
                                           "businessCenters" : {
                                             "businessCentersReference" : {
-                                              "externalReference" : "fixedPrimaryBusinessCenters",
-                                              "globalReference" : "42f910b"
+                                              "globalReference" : "42f910b",
+                                              "externalReference" : "fixedPrimaryBusinessCenters"
                                             },
                                             "meta" : {
                                               "globalKey" : "116cc910"
                                             }
                                           },
-                                          "businessDayConvention" : "MODFOLLOWING",
                                           "meta" : {
                                             "globalKey" : "47a7cce1"
                                           }
                                         },
                                         "meta" : {
                                           "globalKey" : "957a6472"
-                                        },
-                                        "unadjustedDate" : "2022-07-15"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "957a6472"
                                       }
+                                    },
+                                    "calculationPeriodDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "fixedPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "116cc910"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "47a7cce1"
+                                      }
+                                    },
+                                    "calculationPeriodFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "18a9c"
+                                      },
+                                      "rollConvention" : "15"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "6718e864",
+                                      "externalKey" : "fixedCalcPeriodDates"
+                                    }
+                                  },
+                                  "paymentDates" : {
+                                    "paymentFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "107"
+                                      }
+                                    },
+                                    "payRelativeTo" : "CalculationPeriodEndDate",
+                                    "paymentDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        }, {
+                                          "value" : "USNY"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "42f910b",
+                                          "externalKey" : "fixedPrimaryBusinessCenters"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "97b8e49c"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "9e5a4d0f"
                                     }
                                   },
                                   "cashflowRepresentation" : {
@@ -297,294 +280,240 @@
                                     "paymentCalculationPeriod" : [ {
                                       "adjustedPaymentDate" : "2016-01-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-01-15",
                                         "adjustedStartDate" : "2015-07-15",
+                                        "adjustedEndDate" : "2016-01-15",
                                         "meta" : {
-                                          "globalKey" : "daf48d55"
+                                          "globalKey" : "4e94250b"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000.00
+                                        "notionalAmount" : 5000000.00,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "b0e46666"
+                                        "globalKey" : "2483fe1c"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-07-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-07-15",
                                         "adjustedStartDate" : "2016-01-15",
+                                        "adjustedEndDate" : "2016-07-15",
                                         "meta" : {
-                                          "globalKey" : "dbbb8255"
+                                          "globalKey" : "518e300b"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000.00
+                                        "notionalAmount" : 5000000.00,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "40f049e6"
+                                        "globalKey" : "b6c2f79c"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-01-17",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-01-17",
                                         "adjustedStartDate" : "2016-07-15",
+                                        "adjustedEndDate" : "2017-01-17",
                                         "meta" : {
-                                          "globalKey" : "deb67613"
+                                          "globalKey" : "52552c8d"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000.00
+                                        "notionalAmount" : 5000000.00,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "5ed4f862"
+                                        "globalKey" : "d273aedc"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-07-17",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-07-17",
                                         "adjustedStartDate" : "2017-01-17",
+                                        "adjustedEndDate" : "2017-07-17",
                                         "meta" : {
-                                          "globalKey" : "df7d7295"
+                                          "globalKey" : "5550204b"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000.00
+                                        "notionalAmount" : 5000000.00,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "eee0e364"
+                                        "globalKey" : "64b3911a"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-01-16",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-01-16",
                                         "adjustedStartDate" : "2017-07-17",
+                                        "adjustedEndDate" : "2018-01-16",
                                         "meta" : {
-                                          "globalKey" : "e2770936"
+                                          "globalKey" : "5617118a"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000.00
+                                        "notionalAmount" : 5000000.00,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "7a5aae6"
+                                        "globalKey" : "7b45b33a"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-07-16",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-07-16",
                                         "adjustedStartDate" : "2018-01-16",
+                                        "adjustedEndDate" : "2018-07-16",
                                         "meta" : {
-                                          "globalKey" : "e33dfa75"
+                                          "globalKey" : "5910a82b"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000.00
+                                        "notionalAmount" : 5000000.00,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "97b18aa5"
+                                        "globalKey" : "d84385b"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-01-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-01-15",
                                         "adjustedStartDate" : "2018-07-16",
+                                        "adjustedEndDate" : "2019-01-15",
                                         "meta" : {
-                                          "globalKey" : "e6379116"
+                                          "globalKey" : "59d7996a"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000.00
+                                        "notionalAmount" : 5000000.00,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "b0765227"
+                                        "globalKey" : "24165a7b"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-07-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-07-15",
                                         "adjustedStartDate" : "2019-01-15",
+                                        "adjustedEndDate" : "2019-07-15",
                                         "meta" : {
-                                          "globalKey" : "e6fe8255"
+                                          "globalKey" : "5cd1300b"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000.00
+                                        "notionalAmount" : 5000000.00,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "408231e6"
+                                        "globalKey" : "b654df9c"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-01-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-01-15",
                                         "adjustedStartDate" : "2019-07-15",
+                                        "adjustedEndDate" : "2020-01-15",
                                         "meta" : {
-                                          "globalKey" : "e9f88d55"
+                                          "globalKey" : "5d98250b"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000.00
+                                        "notionalAmount" : 5000000.00,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "5afc4666"
+                                        "globalKey" : "ce9bde1c"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-07-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-07-15",
                                         "adjustedStartDate" : "2020-01-15",
+                                        "adjustedEndDate" : "2020-07-15",
                                         "meta" : {
-                                          "globalKey" : "eabf8255"
+                                          "globalKey" : "6092300b"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000.00
+                                        "notionalAmount" : 5000000.00,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "eb0829e6"
+                                        "globalKey" : "60dad79c"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-01-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-01-15",
                                         "adjustedStartDate" : "2020-07-15",
+                                        "adjustedEndDate" : "2021-01-15",
                                         "meta" : {
-                                          "globalKey" : "edb98d55"
+                                          "globalKey" : "6159250b"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000.00
+                                        "notionalAmount" : 5000000.00,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "5823e66"
+                                        "globalKey" : "7921d61c"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-07-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-07-15",
                                         "adjustedStartDate" : "2021-01-15",
+                                        "adjustedEndDate" : "2021-07-15",
                                         "meta" : {
-                                          "globalKey" : "ee808255"
+                                          "globalKey" : "6453300b"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000.00
+                                        "notionalAmount" : 5000000.00,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "958e21e6"
+                                        "globalKey" : "b60cf9c"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2022-01-18",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2022-01-18",
                                         "adjustedStartDate" : "2021-07-15",
+                                        "adjustedEndDate" : "2022-01-18",
                                         "meta" : {
-                                          "globalKey" : "f17bea72"
+                                          "globalKey" : "651a304e"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000.00
+                                        "notionalAmount" : 5000000.00,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "b5281d60"
+                                        "globalKey" : "28c6633c"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2022-07-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2022-07-15",
                                         "adjustedStartDate" : "2022-01-18",
+                                        "adjustedEndDate" : "2022-07-15",
                                         "meta" : {
-                                          "globalKey" : "f2418d98"
+                                          "globalKey" : "68158d28"
                                         },
-                                        "fixedRate" : 0.02,
-                                        "notionalAmount" : 5000000.00
+                                        "notionalAmount" : 5000000.00,
+                                        "fixedRate" : 0.02
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "40142529"
+                                        "globalKey" : "b5e824b9"
                                       }
                                     } ]
                                   },
-                                  "dayCountFraction" : {
-                                    "value" : "30/360"
-                                  },
                                   "meta" : {
-                                    "globalKey" : "f3446fb6"
-                                  },
-                                  "paymentDates" : {
-                                    "meta" : {
-                                      "globalKey" : "637fde97"
-                                    },
-                                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                    "paymentDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        }, {
-                                          "value" : "USNY"
-                                        } ],
-                                        "meta" : {
-                                          "externalKey" : "fixedPrimaryBusinessCenters",
-                                          "globalKey" : "42f910b"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "97b8e49c"
-                                      }
-                                    },
-                                    "paymentFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "959"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6
-                                    }
-                                  },
-                                  "rateSpecification" : {
-                                    "fixedRate" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
-                                      "rateSchedule" : {
-                                        "price" : {
-                                          "address" : {
-                                            "scope" : "DOCUMENT",
-                                            "value" : "price-1"
-                                          }
-                                        }
-                                      }
-                                    }
+                                    "globalKey" : "6e99bb76"
                                   }
                                 }, {
                                   "payerReceiver" : {
-                                    "payer" : "PARTY_2",
-                                    "receiver" : "PARTY_1"
+                                    "payer" : "Party2",
+                                    "receiver" : "Party1"
                                   },
                                   "priceQuantity" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
                                     "quantitySchedule" : {
                                       "address" : {
                                         "scope" : "DOCUMENT",
                                         "value" : "quantity-2"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "0"
                                     }
                                   },
-                                  "calculationPeriodDates" : {
-                                    "calculationPeriodDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "floatPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "245965f8"
+                                  "rateSpecification" : {
+                                    "floatingRate" : {
+                                      "rateOption" : {
+                                        "address" : {
+                                          "scope" : "DOCUMENT",
+                                          "value" : "rateOption-1"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
-                                        "globalKey" : "5a9469c9"
+                                        "globalKey" : "0"
                                       }
-                                    },
-                                    "calculationPeriodFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "28c2d"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3,
-                                      "rollConvention" : "15"
-                                    },
+                                    }
+                                  },
+                                  "dayCountFraction" : {
+                                    "value" : "ACT/360"
+                                  },
+                                  "calculationPeriodDates" : {
                                     "effectiveDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2015-07-15",
                                         "dateAdjustments" : {
                                           "businessDayConvention" : "NONE",
                                           "meta" : {
@@ -593,42 +522,148 @@
                                         },
                                         "meta" : {
                                           "globalKey" : "ec8c6947"
-                                        },
-                                        "unadjustedDate" : "2015-07-15"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "ec8c6947"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "floatingCalcPeriodDates",
-                                      "globalKey" : "d727d9eb"
-                                    },
                                     "terminationDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2022-07-15",
                                         "dateAdjustments" : {
+                                          "businessDayConvention" : "MODFOLLOWING",
                                           "businessCenters" : {
                                             "businessCentersReference" : {
-                                              "externalReference" : "floatPrimaryBusinessCenters",
-                                              "globalReference" : "42f910b"
+                                              "globalReference" : "42f910b",
+                                              "externalReference" : "floatPrimaryBusinessCenters"
                                             },
                                             "meta" : {
                                               "globalKey" : "245965f8"
                                             }
                                           },
-                                          "businessDayConvention" : "MODFOLLOWING",
                                           "meta" : {
                                             "globalKey" : "5a9469c9"
                                           }
                                         },
                                         "meta" : {
                                           "globalKey" : "a867015a"
-                                        },
-                                        "unadjustedDate" : "2022-07-15"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "a867015a"
                                       }
+                                    },
+                                    "calculationPeriodDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "floatPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "245965f8"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "5a9469c9"
+                                      }
+                                    },
+                                    "calculationPeriodFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "17f59"
+                                      },
+                                      "rollConvention" : "15"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "612e2e21",
+                                      "externalKey" : "floatingCalcPeriodDates"
+                                    }
+                                  },
+                                  "paymentDates" : {
+                                    "paymentFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "aa"
+                                      }
+                                    },
+                                    "payRelativeTo" : "CalculationPeriodEndDate",
+                                    "paymentDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        }, {
+                                          "value" : "USNY"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "42f910b",
+                                          "externalKey" : "floatPrimaryBusinessCenters"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "97b8e49c"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "e18d000c"
+                                    }
+                                  },
+                                  "resetDates" : {
+                                    "calculationPeriodDatesReference" : {
+                                      "globalReference" : "612e2e21",
+                                      "externalReference" : "floatingCalcPeriodDates"
+                                    },
+                                    "resetRelativeTo" : "CalculationPeriodStartDate",
+                                    "fixingDates" : {
+                                      "periodMultiplier" : -2,
+                                      "period" : "D",
+                                      "meta" : {
+                                        "globalKey" : "1a78799e"
+                                      },
+                                      "dayType" : "Business",
+                                      "businessDayConvention" : "NONE",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "21479e"
+                                        }
+                                      },
+                                      "dateRelativeTo" : {
+                                        "globalReference" : "6cfd7cb9",
+                                        "externalReference" : "floatingLegResetDates"
+                                      }
+                                    },
+                                    "resetFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "aa"
+                                      }
+                                    },
+                                    "resetDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "floatPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "245965f8"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "5a9469c9"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "6cfd7cb9",
+                                      "externalKey" : "floatingLegResetDates"
                                     }
                                   },
                                   "cashflowRepresentation" : {
@@ -636,928 +671,862 @@
                                     "paymentCalculationPeriod" : [ {
                                       "adjustedPaymentDate" : "2015-10-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2015-10-15",
                                         "adjustedStartDate" : "2015-07-15",
+                                        "adjustedEndDate" : "2015-10-15",
                                         "meta" : {
-                                          "globalKey" : "aa2a36d8"
+                                          "globalKey" : "45203d58"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2015-07-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a04003"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "33093267"
+                                        "globalKey" : "cdff38e7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-01-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-01-15",
                                         "adjustedStartDate" : "2015-10-15",
+                                        "adjustedEndDate" : "2016-01-15",
                                         "meta" : {
-                                          "globalKey" : "1da17b18"
+                                          "globalKey" : "c1aa5798"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2015-10-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a05743"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "2ffebc67"
+                                        "globalKey" : "d40798e7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-04-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-04-15",
                                         "adjustedStartDate" : "2016-01-15",
+                                        "adjustedEndDate" : "2016-04-15",
                                         "meta" : {
-                                          "globalKey" : "9a2c3058"
+                                          "globalKey" : "352236d8"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2016-01-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a10983"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "dfdcb267"
+                                        "globalKey" : "7ad2b8e7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-07-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-07-15",
                                         "adjustedStartDate" : "2016-04-15",
+                                        "adjustedEndDate" : "2016-07-15",
                                         "meta" : {
-                                          "globalKey" : "8e7b2f98"
+                                          "globalKey" : "29713618"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2016-04-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a120c3"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "77ef267"
+                                        "globalKey" : "a274f8e7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-10-17",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-10-17",
                                         "adjustedStartDate" : "2016-07-15",
+                                        "adjustedEndDate" : "2016-10-17",
                                         "meta" : {
-                                          "globalKey" : "ec96a55a"
+                                          "globalKey" : "2129e696"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2016-07-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a13803"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "c17686eb"
+                                        "globalKey" : "f609c827"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-01-17",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-01-17",
                                         "adjustedStartDate" : "2016-10-17",
+                                        "adjustedEndDate" : "2017-01-17",
                                         "meta" : {
-                                          "globalKey" : "63779ad8"
+                                          "globalKey" : "7807758"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2016-10-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a14f43"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "c1d5c229"
+                                        "globalKey" : "65de9ea9"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-04-18",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-04-18",
                                         "adjustedStartDate" : "2017-01-17",
+                                        "adjustedEndDate" : "2017-04-18",
                                         "meta" : {
-                                          "globalKey" : "14e88b59"
+                                          "globalKey" : "7cad2f37"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2017-01-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a20183"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "3ade626b"
+                                        "globalKey" : "a2a30649"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-07-17",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-07-17",
                                         "adjustedStartDate" : "2017-04-18",
+                                        "adjustedEndDate" : "2017-07-17",
                                         "meta" : {
-                                          "globalKey" : "d60627d8"
+                                          "globalKey" : "a42d90fa"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2017-04-12",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a218a4"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "9b0ad0a9"
+                                        "globalKey" : "693239cb"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-10-16",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-10-16",
                                         "adjustedStartDate" : "2017-07-17",
+                                        "adjustedEndDate" : "2017-10-16",
                                         "meta" : {
-                                          "globalKey" : "93ba1357"
+                                          "globalKey" : "61e17c79"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2017-07-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a23003"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "f7cd8de7"
+                                        "globalKey" : "c5f4f709"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-01-16",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-01-16",
                                         "adjustedStartDate" : "2017-10-16",
+                                        "adjustedEndDate" : "2018-01-16",
                                         "meta" : {
-                                          "globalKey" : "57c7ed9"
+                                          "globalKey" : "a9855b59"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2017-10-12",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a24724"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "f30e3f29"
+                                        "globalKey" : "97171ba9"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-04-16",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-04-16",
                                         "adjustedStartDate" : "2018-01-16",
+                                        "adjustedEndDate" : "2018-04-16",
                                         "meta" : {
-                                          "globalKey" : "82073419"
+                                          "globalKey" : "1cfd3a99"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2018-01-12",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a2f964"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "a2ec3529"
+                                        "globalKey" : "3de23ba9"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-07-16",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-07-16",
                                         "adjustedStartDate" : "2018-04-16",
+                                        "adjustedEndDate" : "2018-07-16",
                                         "meta" : {
-                                          "globalKey" : "76563359"
+                                          "globalKey" : "114c39d9"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2018-04-12",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a310a4"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "ca8e7529"
+                                        "globalKey" : "65847ba9"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-10-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-10-15",
                                         "adjustedStartDate" : "2018-07-16",
+                                        "adjustedEndDate" : "2018-10-15",
                                         "meta" : {
-                                          "globalKey" : "35bef758"
+                                          "globalKey" : "3e6607a"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2018-07-12",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a327e4"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "29060ae7"
+                                        "globalKey" : "f72d7409"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-01-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-01-15",
                                         "adjustedStartDate" : "2018-10-15",
+                                        "adjustedEndDate" : "2019-01-15",
                                         "meta" : {
-                                          "globalKey" : "a78162da"
+                                          "globalKey" : "4b8a3f5a"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2018-10-11",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a33f05"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "2446bc29"
+                                        "globalKey" : "c84f98a9"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-04-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-04-15",
                                         "adjustedStartDate" : "2019-01-15",
+                                        "adjustedEndDate" : "2019-04-15",
                                         "meta" : {
-                                          "globalKey" : "240c181a"
+                                          "globalKey" : "bf021e9a"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-01-11",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a3f145"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "d424b229"
+                                        "globalKey" : "6f1ab8a9"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-07-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-07-15",
                                         "adjustedStartDate" : "2019-04-15",
+                                        "adjustedEndDate" : "2019-07-15",
                                         "meta" : {
-                                          "globalKey" : "185b175a"
+                                          "globalKey" : "b3511dda"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-04-11",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a40885"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "fbc6f229"
+                                        "globalKey" : "96bcf8a9"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-10-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-10-15",
                                         "adjustedStartDate" : "2019-07-15",
+                                        "adjustedEndDate" : "2019-10-15",
                                         "meta" : {
-                                          "globalKey" : "caa169a"
+                                          "globalKey" : "a7a01d1a"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-07-11",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a41fc5"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "23693229"
+                                        "globalKey" : "be5f38a9"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-01-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-01-15",
                                         "adjustedStartDate" : "2019-10-15",
+                                        "adjustedEndDate" : "2020-01-15",
                                         "meta" : {
-                                          "globalKey" : "80215ada"
+                                          "globalKey" : "242a375a"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-10-11",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a43705"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "205ebc29"
+                                        "globalKey" : "c46798a9"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-04-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-04-15",
                                         "adjustedStartDate" : "2020-01-15",
+                                        "adjustedEndDate" : "2020-04-15",
                                         "meta" : {
-                                          "globalKey" : "fcac1058"
+                                          "globalKey" : "97a216d8"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-01-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a4e983"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "d03cb267"
+                                        "globalKey" : "6b32b8e7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-07-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-07-15",
                                         "adjustedStartDate" : "2020-04-15",
+                                        "adjustedEndDate" : "2020-07-15",
                                         "meta" : {
-                                          "globalKey" : "f0fb0f1c"
+                                          "globalKey" : "8bf1159c"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-04-09",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a50047"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "f7def1eb"
+                                        "globalKey" : "92d4f86b"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-10-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-10-15",
                                         "adjustedStartDate" : "2020-07-15",
+                                        "adjustedEndDate" : "2020-10-15",
                                         "meta" : {
-                                          "globalKey" : "e54a0ed8"
+                                          "globalKey" : "80401558"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-07-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a51803"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "1f813267"
+                                        "globalKey" : "ba7738e7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-01-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-01-15",
                                         "adjustedStartDate" : "2020-10-15",
+                                        "adjustedEndDate" : "2021-01-15",
                                         "meta" : {
-                                          "globalKey" : "58c15318"
+                                          "globalKey" : "fcca2f98"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-10-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a52f43"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "1c76bc67"
+                                        "globalKey" : "c07f98e7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-04-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-04-15",
                                         "adjustedStartDate" : "2021-01-15",
+                                        "adjustedEndDate" : "2021-04-15",
                                         "meta" : {
-                                          "globalKey" : "d54c0858"
+                                          "globalKey" : "70420ed8"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2021-01-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a5e183"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "cc54b267"
+                                        "globalKey" : "674ab8e7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-07-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-07-15",
                                         "adjustedStartDate" : "2021-04-15",
+                                        "adjustedEndDate" : "2021-07-15",
                                         "meta" : {
-                                          "globalKey" : "c99b0798"
+                                          "globalKey" : "64910e18"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2021-04-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a5f8c3"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "f3f6f267"
+                                        "globalKey" : "8eecf8e7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-10-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-10-15",
                                         "adjustedStartDate" : "2021-07-15",
+                                        "adjustedEndDate" : "2021-10-15",
                                         "meta" : {
-                                          "globalKey" : "bdea06d8"
+                                          "globalKey" : "58e00d58"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2021-07-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a61003"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "1b993267"
+                                        "globalKey" : "b68f38e7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2022-01-18",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2022-01-18",
                                         "adjustedStartDate" : "2021-10-15",
+                                        "adjustedEndDate" : "2022-01-18",
                                         "meta" : {
-                                          "globalKey" : "d013fcdb"
+                                          "globalKey" : "da88b175"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2021-10-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a62743"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "740ebb2d"
+                                        "globalKey" : "7e836fc7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2022-04-19",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2022-04-19",
                                         "adjustedStartDate" : "2022-01-18",
+                                        "adjustedEndDate" : "2022-04-19",
                                         "meta" : {
-                                          "globalKey" : "86a37758"
+                                          "globalKey" : "ee681b36"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2022-01-14",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a6d9a2"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "f235e56b"
+                                        "globalKey" : "59fa8949"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2022-07-15",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2022-07-15",
                                         "adjustedStartDate" : "2022-04-19",
+                                        "adjustedEndDate" : "2022-07-15",
                                         "meta" : {
-                                          "globalKey" : "a90e6214"
+                                          "globalKey" : "10c9f31c"
                                         },
+                                        "notionalAmount" : 5000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2022-04-13",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a6f0c3"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 5000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "f6e254e3"
+                                        "globalKey" : "5e9de5eb"
                                       }
                                     } ]
                                   },
-                                  "dayCountFraction" : {
-                                    "value" : "ACT/360"
-                                  },
                                   "meta" : {
-                                    "globalKey" : "84ea0d62"
-                                  },
-                                  "paymentDates" : {
-                                    "meta" : {
-                                      "globalKey" : "637fde94"
-                                    },
-                                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                    "paymentDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        }, {
-                                          "value" : "USNY"
-                                        } ],
-                                        "meta" : {
-                                          "externalKey" : "floatPrimaryBusinessCenters",
-                                          "globalKey" : "42f910b"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "97b8e49c"
-                                      }
-                                    },
-                                    "paymentFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "956"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3
-                                    }
-                                  },
-                                  "rateSpecification" : {
-                                    "floatingRate" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
-                                      "rateOption" : {
-                                        "address" : {
-                                          "scope" : "DOCUMENT",
-                                          "value" : "rateOption-1"
-                                        }
-                                      }
-                                    }
-                                  },
-                                  "resetDates" : {
-                                    "calculationPeriodDatesReference" : {
-                                      "externalReference" : "floatingCalcPeriodDates",
-                                      "globalReference" : "d727d9eb"
-                                    },
-                                    "fixingDates" : {
-                                      "meta" : {
-                                        "globalKey" : "3d9c8eea"
-                                      },
-                                      "period" : "D",
-                                      "periodMultiplier" : -2,
-                                      "dayType" : "BUSINESS",
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        } ],
-                                        "meta" : {
-                                          "globalKey" : "21479e"
-                                        }
-                                      },
-                                      "businessDayConvention" : "NONE",
-                                      "dateRelativeTo" : {
-                                        "externalReference" : "floatingLegResetDates",
-                                        "globalReference" : "2de3a193"
-                                      }
-                                    },
-                                    "meta" : {
-                                      "externalKey" : "floatingLegResetDates",
-                                      "globalKey" : "2de3a193"
-                                    },
-                                    "resetDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "floatPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "245965f8"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "5a9469c9"
-                                      }
-                                    },
-                                    "resetFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "956"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3
-                                    },
-                                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                                    "globalKey" : "3b370cfe"
                                   }
                                 } ],
                                 "meta" : {
-                                  "globalKey" : "f8d4ebec"
+                                  "globalKey" : "139147c8"
                                 }
                               }
                             },
                             "meta" : {
-                              "globalKey" : "f8d4ebec"
+                              "globalKey" : "139147c8"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "f8d4ebec"
+                            "globalKey" : "139147c8"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "181043c4"
                         }
-                      } ]
+                      } ],
+                      "meta" : {
+                        "globalKey" : "181043c4"
+                      }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "d223d368"
+                    "globalKey" : "181043c4"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "d223d368"
+                  "globalKey" : "181043c4"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "1609049a"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.02,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.02,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 5000000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "ab178ea6"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 5000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 5000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "dd05b62c"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 5000000.00
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ef84d"
-              },
-              "value" : "2015-01-13"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "2896735"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "2098916"
+                    "globalKey" : "bd147858"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "1693c0",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
+                }
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "0220",
                   "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "19427806"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "1693c0"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "1693c0",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "19427806"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "788aaa3c"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS2896735"
+                  "value" : "CHI2WIRE"
+                },
+                "meta" : {
+                  "globalKey" : "902a6db3"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "902a6db3",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "902a6db3",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "1693c0",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2015-01-13",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "1693c0",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "0220HOUSE2",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "1693c0",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "aa6f7f2e"
+                "globalKey" : "eed0d802",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "5c88a961"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "8b365d84"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "1693c0"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                }
-              },
               "quantity" : {
+                "value" : 500.00,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "1693c0",
+                  "externalReference" : "clearing_firm"
                 },
-                "value" : 500.00
+                "receiverPartyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
+                }
               },
               "settlementDate" : {
+                "unadjustedDate" : "2015-01-15",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "USNY"
@@ -1566,28 +1535,59 @@
                       "globalKey" : "27e4e9"
                     }
                   },
-                  "businessDayConvention" : "MODFOLLOWING",
                   "meta" : {
                     "globalKey" : "3662e8ba"
                   }
-                },
-                "unadjustedDate" : "2015-01-15"
+                }
               },
               "transferExpression" : {
-                "priceTransfer" : "PREMIUM"
+                "priceTransfer" : "Premium"
               }
+            },
+            "meta" : {
+              "globalKey" : "3e20ea80"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "c77797bf"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "3702896735",
+      "meta" : {
+        "scheme" : "cme_message_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_clearingorg_id"
+      }
+    },
+    "sentTo" : [ {
+      "value" : "0220",
+      "meta" : {
+        "scheme" : "cme_firm_id"
+      }
+    }, {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_exchange_id"
+      }
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2015-01-13T09:59:10-06:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   } ],
   "workflowState" : {
-    "workflowStatus" : "CLEARED"
+    "workflowStatus" : "Cleared"
+  },
+  "meta" : {
+    "globalKey" : "436011f2"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/Swaption-ex02.json b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/Swaption-ex02.json
index 0206f85285..fb09ba6e59 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/Swaption-ex02.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/Swaption-ex02.json
@@ -1,227 +1,80 @@
 {
-  "creditLimitInformation" : {
-    "limitApplicable" : [ {
-      "amountRemaining" : 998777731300,
-      "amountUtilized" : 1222268700,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NOTIONAL"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 100000000,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    }, {
-      "amountRemaining" : 999994399919,
-      "amountUtilized" : 5600080,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NPV"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 2131203,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "CUSTOMER"
-      }
-    }, {
-      "amountRemaining" : 998800000000,
-      "amountUtilized" : 1200000000,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NOTIONAL"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 100000000,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "ACCOUNT"
-      }
-    }, {
-      "amountRemaining" : 999994854696,
-      "amountUtilized" : 5145303,
-      "currency" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
-        },
-        "value" : "USD"
-      },
-      "limitType" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
-        },
-        "value" : "NPV"
-      },
-      "limitAmount" : 1000000000000,
-      "limitImpactDueToTrade" : 2131203,
-      "limitLevel" : {
-        "meta" : {
-          "scheme" : "creditLimitLevelScheme"
-        },
-        "value" : "ACCOUNT"
-      }
-    } ]
-  },
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "cme_message_id"
-      },
-      "value" : "0109369939"
-    },
-    "sentBy" : {
-      "meta" : {
-        "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "meta" : {
-        "scheme" : "cme_firm_id"
-      },
-      "value" : "010"
-    }, {
-      "meta" : {
-        "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "e3133c43"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "43c8bce"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "010S3"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "6a05b6df"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              }
-            } ],
-            "clearedDate" : "2018-10-31",
-            "meta" : {
-              "globalKey" : "59ad001b"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "ba4f"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "9369939",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "010"
-                },
-                "meta" : {
-                  "globalKey" : "ba4f"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "43400915-2",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "66b48bac"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "MARKIT_WIRE"
-                },
+                  "value" : "43400915",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43402096",
+                  "meta" : {
+                    "scheme" : "platform_side_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "43400915",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "a9b32e8a"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "66b48bac"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "66b48bac"
               },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS9369939",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "4ac79bdc"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-31",
+              "meta" : {
+                "globalKey" : "3f129f"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "ba4f"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -230,30 +83,23 @@
                   } ],
                   "economicTerms" : {
                     "payout" : {
-                      "meta" : {
-                        "globalKey" : "e5ab3bf3"
-                      },
                       "optionPayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "buyerSeller" : {
-                          "buyer" : "PARTY_1",
-                          "seller" : "PARTY_2"
+                          "buyer" : "Party1",
+                          "seller" : "Party2"
                         },
                         "exerciseTerms" : {
                           "optionStyle" : {
                             "europeanExercise" : {
-                              "earliestExerciseTime" : {
-                                "businessCenter" : {
-                                  "value" : "USNY"
-                                },
-                                "hourMinuteTime" : "09:00:00"
-                              },
                               "expirationDate" : [ {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2018-11-30",
                                   "dateAdjustments" : {
+                                    "businessDayConvention" : "PRECEDING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "USNY"
@@ -262,35 +108,36 @@
                                         "globalKey" : "27e4e9"
                                       }
                                     },
-                                    "businessDayConvention" : "PRECEDING",
                                     "meta" : {
                                       "globalKey" : "4c776966"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "cda77148"
-                                  },
-                                  "unadjustedDate" : "2018-11-30"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "cda77148"
                                 }
                               } ],
+                              "earliestExerciseTime" : {
+                                "hourMinuteTime" : "09:00:00",
+                                "businessCenter" : {
+                                  "value" : "USNY"
+                                }
+                              },
                               "expirationTime" : {
+                                "hourMinuteTime" : "11:00:00",
                                 "businessCenter" : {
                                   "value" : "USNY"
-                                },
-                                "hourMinuteTime" : "11:00:00"
+                                }
                               },
                               "meta" : {
-                                "globalKey" : "54d375d5"
+                                "globalKey" : "da4631d5"
                               }
                             }
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "e5ab3bf3"
-                        },
                         "underlier" : {
                           "contractualProduct" : {
                             "productTaxonomy" : [ {
@@ -301,46 +148,42 @@
                               "payout" : {
                                 "interestRatePayout" : [ {
                                   "payerReceiver" : {
-                                    "payer" : "PARTY_1",
-                                    "receiver" : "PARTY_2"
+                                    "payer" : "Party1",
+                                    "receiver" : "Party2"
                                   },
                                   "priceQuantity" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
                                     "quantitySchedule" : {
                                       "address" : {
                                         "scope" : "DOCUMENT",
                                         "value" : "quantity-1"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "0"
                                     }
                                   },
-                                  "calculationPeriodDates" : {
-                                    "calculationPeriodDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "fixedPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "116cc910"
+                                  "rateSpecification" : {
+                                    "fixedRate" : {
+                                      "rateSchedule" : {
+                                        "price" : {
+                                          "address" : {
+                                            "scope" : "DOCUMENT",
+                                            "value" : "price-1"
+                                          }
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
-                                        "globalKey" : "47a7cce1"
+                                        "globalKey" : "0"
                                       }
-                                    },
-                                    "calculationPeriodFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "12d7c"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6,
-                                      "rollConvention" : "4"
-                                    },
+                                    }
+                                  },
+                                  "dayCountFraction" : {
+                                    "value" : "30/360"
+                                  },
+                                  "calculationPeriodDates" : {
                                     "effectiveDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2018-12-04",
                                         "dateAdjustments" : {
                                           "businessDayConvention" : "NONE",
                                           "meta" : {
@@ -349,42 +192,95 @@
                                         },
                                         "meta" : {
                                           "globalKey" : "eceb093c"
-                                        },
-                                        "unadjustedDate" : "2018-12-04"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "eceb093c"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "fixedCalcPeriodDates",
-                                      "globalKey" : "44f9fedc"
-                                    },
                                     "terminationDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2021-12-04",
                                         "dateAdjustments" : {
+                                          "businessDayConvention" : "MODFOLLOWING",
                                           "businessCenters" : {
                                             "businessCentersReference" : {
-                                              "externalReference" : "fixedPrimaryBusinessCenters",
-                                              "globalReference" : "42f910b"
+                                              "globalReference" : "42f910b",
+                                              "externalReference" : "fixedPrimaryBusinessCenters"
                                             },
                                             "meta" : {
                                               "globalKey" : "116cc910"
                                             }
                                           },
-                                          "businessDayConvention" : "MODFOLLOWING",
                                           "meta" : {
                                             "globalKey" : "47a7cce1"
                                           }
                                         },
                                         "meta" : {
                                           "globalKey" : "fdfee45d"
-                                        },
-                                        "unadjustedDate" : "2021-12-04"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "fdfee45d"
                                       }
+                                    },
+                                    "calculationPeriodDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "fixedPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "116cc910"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "47a7cce1"
+                                      }
+                                    },
+                                    "calculationPeriodFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "2b8e"
+                                      },
+                                      "rollConvention" : "4"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "c40d6a76",
+                                      "externalKey" : "fixedCalcPeriodDates"
+                                    }
+                                  },
+                                  "paymentDates" : {
+                                    "paymentFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "107"
+                                      }
+                                    },
+                                    "payRelativeTo" : "CalculationPeriodEndDate",
+                                    "paymentDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        }, {
+                                          "value" : "USNY"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "42f910b",
+                                          "externalKey" : "fixedPrimaryBusinessCenters"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "97b8e49c"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "9e5a4d0f",
+                                      "externalKey" : "fixedLegPaymentDates"
                                     }
                                   },
                                   "cashflowRepresentation" : {
@@ -392,183 +288,128 @@
                                     "paymentCalculationPeriod" : [ {
                                       "adjustedPaymentDate" : "2019-06-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-06-04",
                                         "adjustedStartDate" : "2018-12-04",
+                                        "adjustedEndDate" : "2019-06-04",
                                         "meta" : {
-                                          "globalKey" : "739421d"
+                                          "globalKey" : "1e352783"
                                         },
-                                        "fixedRate" : 0.02356,
-                                        "notionalAmount" : 100000000.00
+                                        "notionalAmount" : 100000000.00,
+                                        "fixedRate" : 0.02356
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "e0c17b19"
+                                        "globalKey" : "f7bd607f"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-12-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-12-04",
                                         "adjustedStartDate" : "2019-06-04",
+                                        "adjustedEndDate" : "2019-12-04",
                                         "meta" : {
-                                          "globalKey" : "800371d"
+                                          "globalKey" : "212f3283"
                                         },
-                                        "fixedRate" : 0.02356,
-                                        "notionalAmount" : 100000000.00
+                                        "notionalAmount" : 100000000.00,
+                                        "fixedRate" : 0.02356
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "70cd5e99"
+                                        "globalKey" : "89fc59ff"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-06-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-06-04",
                                         "adjustedStartDate" : "2019-12-04",
+                                        "adjustedEndDate" : "2020-06-04",
                                         "meta" : {
-                                          "globalKey" : "afa421d"
+                                          "globalKey" : "21f62783"
                                         },
-                                        "fixedRate" : 0.02356,
-                                        "notionalAmount" : 100000000.00
+                                        "notionalAmount" : 100000000.00,
+                                        "fixedRate" : 0.02356
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "8b477319"
+                                        "globalKey" : "a243587f"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-12-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-12-04",
                                         "adjustedStartDate" : "2020-06-04",
+                                        "adjustedEndDate" : "2020-12-04",
                                         "meta" : {
-                                          "globalKey" : "bc1371d"
+                                          "globalKey" : "24f03283"
                                         },
-                                        "fixedRate" : 0.02356,
-                                        "notionalAmount" : 100000000.00
+                                        "notionalAmount" : 100000000.00,
+                                        "fixedRate" : 0.02356
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "1b535699"
+                                        "globalKey" : "348251ff"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-06-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-06-04",
                                         "adjustedStartDate" : "2020-12-04",
+                                        "adjustedEndDate" : "2021-06-04",
                                         "meta" : {
-                                          "globalKey" : "ebb421d"
+                                          "globalKey" : "25b72783"
                                         },
-                                        "fixedRate" : 0.02356,
-                                        "notionalAmount" : 100000000.00
+                                        "notionalAmount" : 100000000.00,
+                                        "fixedRate" : 0.02356
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "35cd6b19"
+                                        "globalKey" : "4cc9507f"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-12-06",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-12-06",
                                         "adjustedStartDate" : "2021-06-04",
+                                        "adjustedEndDate" : "2021-12-06",
                                         "meta" : {
-                                          "globalKey" : "f831fdb"
+                                          "globalKey" : "28b13a05"
                                         },
-                                        "fixedRate" : 0.02356,
-                                        "notionalAmount" : 100000000.00
+                                        "notionalAmount" : 100000000.00,
+                                        "fixedRate" : 0.02356
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "c943e895"
+                                        "globalKey" : "e27202bf"
                                       }
                                     } ]
                                   },
-                                  "dayCountFraction" : {
-                                    "value" : "30/360"
-                                  },
                                   "meta" : {
-                                    "globalKey" : "7ed9dee1"
-                                  },
-                                  "paymentDates" : {
-                                    "meta" : {
-                                      "externalKey" : "fixedLegPaymentDates",
-                                      "globalKey" : "637fde97"
-                                    },
-                                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                    "paymentDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        }, {
-                                          "value" : "USNY"
-                                        } ],
-                                        "meta" : {
-                                          "externalKey" : "fixedPrimaryBusinessCenters",
-                                          "globalKey" : "42f910b"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "97b8e49c"
-                                      }
-                                    },
-                                    "paymentFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "959"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6
-                                    }
-                                  },
-                                  "rateSpecification" : {
-                                    "fixedRate" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
-                                      "rateSchedule" : {
-                                        "price" : {
-                                          "address" : {
-                                            "scope" : "DOCUMENT",
-                                            "value" : "price-1"
-                                          }
-                                        }
-                                      }
-                                    }
+                                    "globalKey" : "1fd76483"
                                   }
                                 }, {
                                   "payerReceiver" : {
-                                    "payer" : "PARTY_2",
-                                    "receiver" : "PARTY_1"
+                                    "payer" : "Party2",
+                                    "receiver" : "Party1"
                                   },
                                   "priceQuantity" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
                                     "quantitySchedule" : {
                                       "address" : {
                                         "scope" : "DOCUMENT",
                                         "value" : "quantity-2"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "0"
                                     }
                                   },
-                                  "calculationPeriodDates" : {
-                                    "calculationPeriodDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "floatPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "245965f8"
+                                  "rateSpecification" : {
+                                    "floatingRate" : {
+                                      "rateOption" : {
+                                        "address" : {
+                                          "scope" : "DOCUMENT",
+                                          "value" : "rateOption-1"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
-                                        "globalKey" : "5a9469c9"
+                                        "globalKey" : "0"
                                       }
-                                    },
-                                    "calculationPeriodFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "12d1f"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3,
-                                      "rollConvention" : "4"
-                                    },
+                                    }
+                                  },
+                                  "dayCountFraction" : {
+                                    "value" : "ACT/360"
+                                  },
+                                  "calculationPeriodDates" : {
                                     "effectiveDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2018-12-04",
                                         "dateAdjustments" : {
                                           "businessDayConvention" : "NONE",
                                           "meta" : {
@@ -577,42 +418,149 @@
                                         },
                                         "meta" : {
                                           "globalKey" : "eceb093c"
-                                        },
-                                        "unadjustedDate" : "2018-12-04"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "eceb093c"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "floatingCalcPeriodDates",
-                                      "globalKey" : "f6e82d19"
-                                    },
                                     "terminationDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2021-12-04",
                                         "dateAdjustments" : {
+                                          "businessDayConvention" : "MODFOLLOWING",
                                           "businessCenters" : {
                                             "businessCentersReference" : {
-                                              "externalReference" : "floatPrimaryBusinessCenters",
-                                              "globalReference" : "42f910b"
+                                              "globalReference" : "42f910b",
+                                              "externalReference" : "floatPrimaryBusinessCenters"
                                             },
                                             "meta" : {
                                               "globalKey" : "245965f8"
                                             }
                                           },
-                                          "businessDayConvention" : "MODFOLLOWING",
                                           "meta" : {
                                             "globalKey" : "5a9469c9"
                                           }
                                         },
                                         "meta" : {
                                           "globalKey" : "10eb8145"
-                                        },
-                                        "unadjustedDate" : "2021-12-04"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "10eb8145"
                                       }
+                                    },
+                                    "calculationPeriodDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "floatPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "245965f8"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "5a9469c9"
+                                      }
+                                    },
+                                    "calculationPeriodFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "204b"
+                                      },
+                                      "rollConvention" : "4"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "be22b033",
+                                      "externalKey" : "floatingCalcPeriodDates"
+                                    }
+                                  },
+                                  "paymentDates" : {
+                                    "paymentFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "aa"
+                                      }
+                                    },
+                                    "payRelativeTo" : "CalculationPeriodEndDate",
+                                    "paymentDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        }, {
+                                          "value" : "USNY"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "42f910b",
+                                          "externalKey" : "floatPrimaryBusinessCenters"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "97b8e49c"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "e18d000c",
+                                      "externalKey" : "floatingLegPaymentDates"
+                                    }
+                                  },
+                                  "resetDates" : {
+                                    "calculationPeriodDatesReference" : {
+                                      "globalReference" : "be22b033",
+                                      "externalReference" : "floatingCalcPeriodDates"
+                                    },
+                                    "resetRelativeTo" : "CalculationPeriodStartDate",
+                                    "fixingDates" : {
+                                      "periodMultiplier" : -2,
+                                      "period" : "D",
+                                      "meta" : {
+                                        "globalKey" : "1a78799e"
+                                      },
+                                      "dayType" : "Business",
+                                      "businessDayConvention" : "NONE",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "21479e"
+                                        }
+                                      },
+                                      "dateRelativeTo" : {
+                                        "globalReference" : "6cfd7cb9",
+                                        "externalReference" : "floatingLegResetDates"
+                                      }
+                                    },
+                                    "resetFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "aa"
+                                      }
+                                    },
+                                    "resetDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "floatPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "245965f8"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "5a9469c9"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "6cfd7cb9",
+                                      "externalKey" : "floatingLegResetDates"
                                     }
                                   },
                                   "cashflowRepresentation" : {
@@ -620,584 +568,510 @@
                                     "paymentCalculationPeriod" : [ {
                                       "adjustedPaymentDate" : "2019-03-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-03-04",
                                         "adjustedStartDate" : "2018-12-04",
+                                        "adjustedEndDate" : "2019-03-04",
                                         "meta" : {
-                                          "globalKey" : "cc4d4503"
+                                          "globalKey" : "70562183"
                                         },
+                                        "notionalAmount" : 100000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2018-11-30",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a34912"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "c5959c7"
+                                        "globalKey" : "b0623647"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-06-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-06-04",
                                         "adjustedStartDate" : "2019-03-04",
+                                        "adjustedEndDate" : "2019-06-04",
                                         "meta" : {
-                                          "globalKey" : "48d7fa05"
+                                          "globalKey" : "e3ce0085"
                                         },
+                                        "notionalAmount" : 100000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-02-28",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a3fb14"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "bc374f89"
+                                        "globalKey" : "572d5609"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-09-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-09-04",
                                         "adjustedStartDate" : "2019-06-04",
+                                        "adjustedEndDate" : "2019-09-04",
                                         "meta" : {
-                                          "globalKey" : "3d26f9a2"
+                                          "globalKey" : "d81d0022"
                                         },
+                                        "notionalAmount" : 100000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-05-31",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a412b1"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "e3d98fe6"
+                                        "globalKey" : "7ecf9666"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-12-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-12-04",
                                         "adjustedStartDate" : "2019-09-04",
+                                        "adjustedEndDate" : "2019-12-04",
                                         "meta" : {
-                                          "globalKey" : "3175fd1f"
+                                          "globalKey" : "cc6c039f"
                                         },
+                                        "notionalAmount" : 100000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-09-02",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a42e2e"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "b7bd423"
+                                        "globalKey" : "a671daa3"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-03-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-03-04",
                                         "adjustedStartDate" : "2019-12-04",
+                                        "adjustedEndDate" : "2020-03-04",
                                         "meta" : {
-                                          "globalKey" : "a4ed415f"
+                                          "globalKey" : "48f61ddf"
                                         },
+                                        "notionalAmount" : 100000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-12-02",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a4456e"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "8715e23"
+                                        "globalKey" : "ac7a3aa3"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-06-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-06-04",
                                         "adjustedStartDate" : "2020-03-04",
+                                        "adjustedEndDate" : "2020-06-04",
                                         "meta" : {
-                                          "globalKey" : "2177f69f"
+                                          "globalKey" : "bc6dfd1f"
                                         },
+                                        "notionalAmount" : 100000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-03-02",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a4f7ae"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "b84f5423"
+                                        "globalKey" : "53455aa3"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-09-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-09-04",
                                         "adjustedStartDate" : "2020-06-04",
+                                        "adjustedEndDate" : "2020-09-04",
                                         "meta" : {
-                                          "globalKey" : "15c6f5df"
+                                          "globalKey" : "b0bcfc5f"
                                         },
+                                        "notionalAmount" : 100000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-06-02",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a50eee"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "dff19423"
+                                        "globalKey" : "7ae79aa3"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-12-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-12-04",
                                         "adjustedStartDate" : "2020-09-04",
+                                        "adjustedEndDate" : "2020-12-04",
                                         "meta" : {
-                                          "globalKey" : "a15f51f"
+                                          "globalKey" : "a50bfb9f"
                                         },
+                                        "notionalAmount" : 100000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-09-02",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a5262e"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "793d423"
+                                        "globalKey" : "a289daa3"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-03-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-03-04",
                                         "adjustedStartDate" : "2020-12-04",
+                                        "adjustedEndDate" : "2021-03-04",
                                         "meta" : {
-                                          "globalKey" : "7d8d395f"
+                                          "globalKey" : "219615df"
                                         },
+                                        "notionalAmount" : 100000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-12-02",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a53d6e"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "4895e23"
+                                        "globalKey" : "a8923aa3"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-06-04",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-06-04",
                                         "adjustedStartDate" : "2021-03-04",
+                                        "adjustedEndDate" : "2021-06-04",
                                         "meta" : {
-                                          "globalKey" : "fa17ee9f"
+                                          "globalKey" : "950df51f"
                                         },
+                                        "notionalAmount" : 100000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2021-03-02",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a5efae"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "b4675423"
+                                        "globalKey" : "4f5d5aa3"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-09-07",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-09-07",
                                         "adjustedStartDate" : "2021-06-04",
+                                        "adjustedEndDate" : "2021-09-07",
                                         "meta" : {
-                                          "globalKey" : "8d199fa2"
+                                          "globalKey" : "8e7b7e3c"
                                         },
+                                        "notionalAmount" : 100000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2021-06-02",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a606ee"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "378992e9"
+                                        "globalKey" : "38eb7183"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-12-06",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-12-06",
                                         "adjustedStartDate" : "2021-09-07",
+                                        "adjustedEndDate" : "2021-12-06",
                                         "meta" : {
-                                          "globalKey" : "51a0ed9d"
+                                          "globalKey" : "1fc856bf"
                                         },
+                                        "notionalAmount" : 100000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2021-09-03",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a61e4d"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 100000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "9b1fb2a3"
+                                        "globalKey" : "69471bc5"
                                       }
                                     } ]
                                   },
-                                  "dayCountFraction" : {
-                                    "value" : "ACT/360"
-                                  },
                                   "meta" : {
-                                    "globalKey" : "173e5b27"
-                                  },
-                                  "paymentDates" : {
-                                    "meta" : {
-                                      "externalKey" : "floatingLegPaymentDates",
-                                      "globalKey" : "637fde94"
-                                    },
-                                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                    "paymentDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        }, {
-                                          "value" : "USNY"
-                                        } ],
-                                        "meta" : {
-                                          "externalKey" : "floatPrimaryBusinessCenters",
-                                          "globalKey" : "42f910b"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "97b8e49c"
-                                      }
-                                    },
-                                    "paymentFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "956"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3
-                                    }
-                                  },
-                                  "rateSpecification" : {
-                                    "floatingRate" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
-                                      "rateOption" : {
-                                        "address" : {
-                                          "scope" : "DOCUMENT",
-                                          "value" : "rateOption-1"
-                                        }
-                                      }
-                                    }
-                                  },
-                                  "resetDates" : {
-                                    "calculationPeriodDatesReference" : {
-                                      "externalReference" : "floatingCalcPeriodDates",
-                                      "globalReference" : "f6e82d19"
-                                    },
-                                    "fixingDates" : {
-                                      "meta" : {
-                                        "globalKey" : "3d9c8eea"
-                                      },
-                                      "period" : "D",
-                                      "periodMultiplier" : -2,
-                                      "dayType" : "BUSINESS",
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        } ],
-                                        "meta" : {
-                                          "globalKey" : "21479e"
-                                        }
-                                      },
-                                      "businessDayConvention" : "NONE",
-                                      "dateRelativeTo" : {
-                                        "externalReference" : "floatingLegResetDates",
-                                        "globalReference" : "2de3a193"
-                                      }
-                                    },
-                                    "meta" : {
-                                      "externalKey" : "floatingLegResetDates",
-                                      "globalKey" : "2de3a193"
-                                    },
-                                    "resetDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "floatPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "245965f8"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "5a9469c9"
-                                      }
-                                    },
-                                    "resetFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "956"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3
-                                    },
-                                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                                    "globalKey" : "55f07d27"
                                   }
                                 } ],
                                 "meta" : {
-                                  "globalKey" : "1a308ba6"
+                                  "globalKey" : "bf64dac4"
                                 }
                               }
                             },
                             "meta" : {
-                              "globalKey" : "1a308ba6"
+                              "globalKey" : "bf64dac4"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "1a308ba6"
+                            "globalKey" : "bf64dac4"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "a2384f11"
                         }
-                      } ]
+                      } ],
+                      "meta" : {
+                        "globalKey" : "a2384f11"
+                      }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "e5ab3bf3"
+                    "globalKey" : "a2384f11"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "e5ab3bf3"
+                  "globalKey" : "a2384f11"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "2becf472"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.02356,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.02356,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 100000000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "51b199ce"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "7b78abf0"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 100000000.00
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f129f"
-              },
-              "value" : "2018-10-31"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "9369939"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "43400915-2"
+                    "globalKey" : "5332091c"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "ba4f",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "43400915"
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
                 }
-              }, {
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "010",
                   "meta" : {
-                    "scheme" : "platform_side_id"
-                  },
-                  "value" : "43402096"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ba4f"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "ba4f",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "43400915"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "49e07680"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS9369939"
+                  "value" : "MARKIT_WIRE"
+                },
+                "meta" : {
+                  "globalKey" : "66b48bac"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "66b48bac",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "66b48bac",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2018-10-31",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "010S3",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "1770bdfa"
+                "globalKey" : "71eec9f",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "94a6be21"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "6faedd09"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "ba4f"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                }
-              },
               "quantity" : {
+                "value" : 250.00,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "ba4f",
+                  "externalReference" : "clearing_firm"
                 },
-                "value" : 250.00
+                "receiverPartyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
+                }
               },
               "settlementDate" : {
+                "unadjustedDate" : "2018-11-02",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "USNY"
@@ -1206,31 +1080,157 @@
                       "globalKey" : "27e4e9"
                     }
                   },
-                  "businessDayConvention" : "MODFOLLOWING",
                   "meta" : {
                     "globalKey" : "3662e8ba"
                   }
-                },
-                "unadjustedDate" : "2018-11-02"
+                }
               },
               "transferExpression" : {
-                "priceTransfer" : "PREMIUM"
+                "priceTransfer" : "Premium"
               }
+            },
+            "meta" : {
+              "globalKey" : "14451e55"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "9b1e2ed4"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "0109369939",
+      "meta" : {
+        "scheme" : "cme_message_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_clearingorg_id"
+      }
+    },
+    "sentTo" : [ {
+      "value" : "010",
+      "meta" : {
+        "scheme" : "cme_firm_id"
+      }
+    }, {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_exchange_id"
+      }
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-10-31T09:37:48-05:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-10-31T14:16:26.588Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
+    "qualification" : "clearingReceiptDateTime"
   } ],
+  "creditLimitInformation" : {
+    "limitApplicable" : [ {
+      "limitType" : {
+        "value" : "Notional",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 1222268700,
+      "amountRemaining" : 998777731300,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 100000000
+    }, {
+      "limitType" : {
+        "value" : "NPV",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 5600080,
+      "amountRemaining" : 999994399919,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Customer",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 2131203
+    }, {
+      "limitType" : {
+        "value" : "Notional",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 1200000000,
+      "amountRemaining" : 998800000000,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Account",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 100000000
+    }, {
+      "limitType" : {
+        "value" : "NPV",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/credit-limit-type"
+        }
+      },
+      "amountUtilized" : 5145303,
+      "amountRemaining" : 999994854696,
+      "currency" : {
+        "value" : "USD",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/ext/iso4217-2001-08-15"
+        }
+      },
+      "limitLevel" : {
+        "value" : "Account",
+        "meta" : {
+          "scheme" : "creditLimitLevelScheme"
+        }
+      },
+      "limitAmount" : 1000000000000,
+      "limitImpactDueToTrade" : 2131203
+    } ]
+  },
   "workflowState" : {
-    "workflowStatus" : "CLEARED"
+    "workflowStatus" : "Cleared"
+  },
+  "meta" : {
+    "globalKey" : "9f551ccf"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/Swaption-ex03-Straddle-Physical-Exercise.json b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/Swaption-ex03-Straddle-Physical-Exercise.json
index ba140bb1eb..6f8580dead 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/Swaption-ex03-Straddle-Physical-Exercise.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-cleared-confirm-1-17/Swaption-ex03-Straddle-Physical-Exercise.json
@@ -1,132 +1,73 @@
 {
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "cme_message_id"
-      },
-      "value" : "3702894761"
-    },
-    "sentBy" : {
-      "meta" : {
-        "scheme" : "cme_clearingorg_id"
-      },
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "meta" : {
-        "scheme" : "cme_firm_id"
-      },
-      "value" : "010"
-    }, {
-      "meta" : {
-        "scheme" : "cme_exchange_id"
-      },
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "c4726cd0"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "8abc2ea6"
-          },
           "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "clearing_firm_accounts"
-                },
-                "value" : "HOUSE2"
-              },
-              "meta" : {
-                "externalKey" : "account1",
-                "globalKey" : "d22971c2"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              },
-              "servicingParty" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
-              }
-            } ],
-            "clearedDate" : "2015-01-12",
-            "meta" : {
-              "globalKey" : "6db3ec90"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "clearing_firm",
-                "globalKey" : "ba4f"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "1051b",
+                "externalReference" : "clearing_service"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "2894761",
                   "meta" : {
-                    "scheme" : "clearing_member_firms"
-                  },
-                  "value" : "010"
-                },
-                "meta" : {
-                  "globalKey" : "ba4f"
+                    "scheme" : "cme_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing_service",
-                "globalKey" : "1051b"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CME"
-                },
-                "meta" : {
-                  "globalKey" : "1051b"
+                  "value" : "2052340",
+                  "meta" : {
+                    "scheme" : "client_trade_id"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "trade_source",
-                "globalKey" : "902a6db3"
-              },
-              "partyId" : [ {
+              }, {
                 "identifier" : {
-                  "value" : "CHI2WIRE"
-                },
+                  "value" : "19300360",
+                  "meta" : {
+                    "scheme" : "platform_trade_id"
+                  }
+                }
+              }, {
+                "identifier" : {
+                  "value" : "19300360",
+                  "meta" : {
+                    "scheme" : "block_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "2b401f94"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1010000023",
                 "meta" : {
-                  "globalKey" : "902a6db3"
+                  "scheme" : "cftc_Namespace"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "clearing_firm",
-                "globalReference" : "ba4f"
               },
-              "partyReference" : {
-                "externalReference" : "trade_source",
-                "globalReference" : "902a6db3"
-              },
-              "role" : "DATA_SUBMITTER"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CCCIRS2894761",
+                  "meta" : {
+                    "scheme" : "reg_trade_id"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e12c31ab"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2014-10-23",
+              "meta" : {
+                "globalKey" : "3ef297"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "ba4f"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -135,30 +76,24 @@
                   } ],
                   "economicTerms" : {
                     "payout" : {
-                      "meta" : {
-                        "globalKey" : "c4c9142f"
-                      },
                       "optionPayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "buyerSeller" : {
-                          "buyer" : "PARTY_1",
-                          "seller" : "PARTY_2"
+                          "buyer" : "Party1",
+                          "seller" : "Party2"
                         },
+                        "optionType" : "Straddle",
                         "exerciseTerms" : {
                           "optionStyle" : {
                             "europeanExercise" : {
-                              "earliestExerciseTime" : {
-                                "businessCenter" : {
-                                  "value" : "USNY"
-                                },
-                                "hourMinuteTime" : "09:00:00"
-                              },
                               "expirationDate" : [ {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2015-04-23",
                                   "dateAdjustments" : {
+                                    "businessDayConvention" : "PRECEDING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "USNY"
@@ -167,36 +102,36 @@
                                         "globalKey" : "27e4e9"
                                       }
                                     },
-                                    "businessDayConvention" : "PRECEDING",
                                     "meta" : {
                                       "globalKey" : "4c776966"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "d0eb86af"
-                                  },
-                                  "unadjustedDate" : "2015-04-23"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "d0eb86af"
                                 }
                               } ],
+                              "earliestExerciseTime" : {
+                                "hourMinuteTime" : "09:00:00",
+                                "businessCenter" : {
+                                  "value" : "USNY"
+                                }
+                              },
                               "expirationTime" : {
+                                "hourMinuteTime" : "11:00:00",
                                 "businessCenter" : {
                                   "value" : "USNY"
-                                },
-                                "hourMinuteTime" : "11:00:00"
+                                }
                               },
                               "meta" : {
-                                "globalKey" : "43b07fbc"
+                                "globalKey" : "9e2df03c"
                               }
                             }
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "c4c9142f"
-                        },
-                        "optionType" : "STRADDLE",
                         "underlier" : {
                           "contractualProduct" : {
                             "productTaxonomy" : [ {
@@ -207,46 +142,42 @@
                               "payout" : {
                                 "interestRatePayout" : [ {
                                   "payerReceiver" : {
-                                    "payer" : "PARTY_1",
-                                    "receiver" : "PARTY_2"
+                                    "payer" : "Party1",
+                                    "receiver" : "Party2"
                                   },
                                   "priceQuantity" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
                                     "quantitySchedule" : {
                                       "address" : {
                                         "scope" : "DOCUMENT",
                                         "value" : "quantity-1"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "0"
                                     }
                                   },
-                                  "calculationPeriodDates" : {
-                                    "calculationPeriodDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "fixedPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "116cc910"
+                                  "rateSpecification" : {
+                                    "fixedRate" : {
+                                      "rateSchedule" : {
+                                        "price" : {
+                                          "address" : {
+                                            "scope" : "DOCUMENT",
+                                            "value" : "price-1"
+                                          }
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
-                                        "globalKey" : "47a7cce1"
+                                        "globalKey" : "0"
                                       }
-                                    },
-                                    "calculationPeriodFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "28cab"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6,
-                                      "rollConvention" : "27"
-                                    },
+                                    }
+                                  },
+                                  "dayCountFraction" : {
+                                    "value" : "30/360"
+                                  },
+                                  "calculationPeriodDates" : {
                                     "effectiveDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2015-04-27",
                                         "dateAdjustments" : {
                                           "businessDayConvention" : "NONE",
                                           "meta" : {
@@ -255,42 +186,94 @@
                                         },
                                         "meta" : {
                                           "globalKey" : "ec89c593"
-                                        },
-                                        "unadjustedDate" : "2015-04-27"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "ec89c593"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "fixedCalcPeriodDates",
-                                      "globalKey" : "5edaa9ad"
-                                    },
                                     "terminationDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2022-04-27",
                                         "dateAdjustments" : {
+                                          "businessDayConvention" : "MODFOLLOWING",
                                           "businessCenters" : {
                                             "businessCentersReference" : {
-                                              "externalReference" : "fixedPrimaryBusinessCenters",
-                                              "globalReference" : "42f910b"
+                                              "globalReference" : "42f910b",
+                                              "externalReference" : "fixedPrimaryBusinessCenters"
                                             },
                                             "meta" : {
                                               "globalKey" : "116cc910"
                                             }
                                           },
-                                          "businessDayConvention" : "MODFOLLOWING",
                                           "meta" : {
                                             "globalKey" : "47a7cce1"
                                           }
                                         },
                                         "meta" : {
                                           "globalKey" : "625214a6"
-                                        },
-                                        "unadjustedDate" : "2022-04-27"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "625214a6"
                                       }
+                                    },
+                                    "calculationPeriodDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "fixedPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "116cc910"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "47a7cce1"
+                                      }
+                                    },
+                                    "calculationPeriodFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "18abd"
+                                      },
+                                      "rollConvention" : "27"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "5b077805",
+                                      "externalKey" : "fixedCalcPeriodDates"
+                                    }
+                                  },
+                                  "paymentDates" : {
+                                    "paymentFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "107"
+                                      }
+                                    },
+                                    "payRelativeTo" : "CalculationPeriodEndDate",
+                                    "paymentDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        }, {
+                                          "value" : "USNY"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "42f910b",
+                                          "externalKey" : "fixedPrimaryBusinessCenters"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "97b8e49c"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "9e5a4d0f"
                                     }
                                   },
                                   "cashflowRepresentation" : {
@@ -298,294 +281,240 @@
                                     "paymentCalculationPeriod" : [ {
                                       "adjustedPaymentDate" : "2015-10-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2015-10-27",
                                         "adjustedStartDate" : "2015-04-27",
+                                        "adjustedEndDate" : "2015-10-27",
                                         "meta" : {
-                                          "globalKey" : "6e8dc534"
+                                          "globalKey" : "7e6a8fcc"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000.00
+                                        "notionalAmount" : 3000000.00,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "891a3379"
+                                        "globalKey" : "98f6fe11"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-04-27",
                                         "adjustedStartDate" : "2015-10-27",
+                                        "adjustedEndDate" : "2016-04-27",
                                         "meta" : {
-                                          "globalKey" : "7187d034"
+                                          "globalKey" : "7f3184cc"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000.00
+                                        "notionalAmount" : 3000000.00,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "a39447f9"
+                                        "globalKey" : "b13dfc91"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-10-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-10-27",
                                         "adjustedStartDate" : "2016-04-27",
+                                        "adjustedEndDate" : "2016-10-27",
                                         "meta" : {
-                                          "globalKey" : "724ec534"
+                                          "globalKey" : "822b8fcc"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000.00
+                                        "notionalAmount" : 3000000.00,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "33a02b79"
+                                        "globalKey" : "437cf611"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-04-27",
                                         "adjustedStartDate" : "2016-10-27",
+                                        "adjustedEndDate" : "2017-04-27",
                                         "meta" : {
-                                          "globalKey" : "7548d034"
+                                          "globalKey" : "82f284cc"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000.00
+                                        "notionalAmount" : 3000000.00,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "4e1a3ff9"
+                                        "globalKey" : "5bc3f491"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-10-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-10-27",
                                         "adjustedStartDate" : "2017-04-27",
+                                        "adjustedEndDate" : "2017-10-27",
                                         "meta" : {
-                                          "globalKey" : "760fc534"
+                                          "globalKey" : "85ec8fcc"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000.00
+                                        "notionalAmount" : 3000000.00,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "de262379"
+                                        "globalKey" : "ee02ee11"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-04-27",
                                         "adjustedStartDate" : "2017-10-27",
+                                        "adjustedEndDate" : "2018-04-27",
                                         "meta" : {
-                                          "globalKey" : "7909d034"
+                                          "globalKey" : "86b384cc"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000.00
+                                        "notionalAmount" : 3000000.00,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "f8a037f9"
+                                        "globalKey" : "649ec91"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-10-29",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-10-29",
                                         "adjustedStartDate" : "2018-04-27",
+                                        "adjustedEndDate" : "2018-10-29",
                                         "meta" : {
-                                          "globalKey" : "79d1adf2"
+                                          "globalKey" : "89ad974e"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000.00
+                                        "notionalAmount" : 3000000.00,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "8c16b575"
+                                        "globalKey" : "9bf29ed1"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-04-29",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-04-29",
                                         "adjustedStartDate" : "2018-10-29",
+                                        "adjustedEndDate" : "2019-04-29",
                                         "meta" : {
-                                          "globalKey" : "7ccbc074"
+                                          "globalKey" : "8a75750c"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000.00
+                                        "notionalAmount" : 3000000.00,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "a690d177"
+                                        "globalKey" : "b43a860f"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-10-28",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-10-28",
                                         "adjustedStartDate" : "2019-04-29",
+                                        "adjustedEndDate" : "2019-10-28",
                                         "meta" : {
-                                          "globalKey" : "7d924115"
+                                          "globalKey" : "8d6f7c4b"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000.00
+                                        "notionalAmount" : 3000000.00,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "34e767f9"
+                                        "globalKey" : "44c4a32f"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-04-27",
                                         "adjustedStartDate" : "2019-10-28",
+                                        "adjustedEndDate" : "2020-04-27",
                                         "meta" : {
-                                          "globalKey" : "808bd3f5"
+                                          "globalKey" : "8e35f92b"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000.00
+                                        "notionalAmount" : 3000000.00,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "4dac2bba"
+                                        "globalKey" : "5b5650f0"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-10-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-10-27",
                                         "adjustedStartDate" : "2020-04-27",
+                                        "adjustedEndDate" : "2020-10-27",
                                         "meta" : {
-                                          "globalKey" : "8152c534"
+                                          "globalKey" : "912f8fcc"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000.00
+                                        "notionalAmount" : 3000000.00,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "ddb80b79"
+                                        "globalKey" : "ed94d611"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-04-27",
                                         "adjustedStartDate" : "2020-10-27",
+                                        "adjustedEndDate" : "2021-04-27",
                                         "meta" : {
-                                          "globalKey" : "844cd034"
+                                          "globalKey" : "91f684cc"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000.00
+                                        "notionalAmount" : 3000000.00,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "f8321ff9"
+                                        "globalKey" : "5dbd491"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-10-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-10-27",
                                         "adjustedStartDate" : "2021-04-27",
+                                        "adjustedEndDate" : "2021-10-27",
                                         "meta" : {
-                                          "globalKey" : "8513c534"
+                                          "globalKey" : "94f08fcc"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000.00
+                                        "notionalAmount" : 3000000.00,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "883e0379"
+                                        "globalKey" : "981ace11"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2022-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2022-04-27",
                                         "adjustedStartDate" : "2021-10-27",
+                                        "adjustedEndDate" : "2022-04-27",
                                         "meta" : {
-                                          "globalKey" : "880dd034"
+                                          "globalKey" : "95b784cc"
                                         },
-                                        "fixedRate" : 0.01,
-                                        "notionalAmount" : 3000000.00
+                                        "notionalAmount" : 3000000.00,
+                                        "fixedRate" : 0.01
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "a2b817f9"
+                                        "globalKey" : "b061cc91"
                                       }
                                     } ]
                                   },
-                                  "dayCountFraction" : {
-                                    "value" : "30/360"
-                                  },
                                   "meta" : {
-                                    "globalKey" : "4eb9b8c9"
-                                  },
-                                  "paymentDates" : {
-                                    "meta" : {
-                                      "globalKey" : "637fde97"
-                                    },
-                                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                    "paymentDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        }, {
-                                          "value" : "USNY"
-                                        } ],
-                                        "meta" : {
-                                          "externalKey" : "fixedPrimaryBusinessCenters",
-                                          "globalKey" : "42f910b"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "97b8e49c"
-                                      }
-                                    },
-                                    "paymentFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "959"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6
-                                    }
-                                  },
-                                  "rateSpecification" : {
-                                    "fixedRate" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
-                                      "rateSchedule" : {
-                                        "price" : {
-                                          "address" : {
-                                            "scope" : "DOCUMENT",
-                                            "value" : "price-1"
-                                          }
-                                        }
-                                      }
-                                    }
+                                    "globalKey" : "e10acf01"
                                   }
                                 }, {
                                   "payerReceiver" : {
-                                    "payer" : "PARTY_2",
-                                    "receiver" : "PARTY_1"
+                                    "payer" : "Party2",
+                                    "receiver" : "Party1"
                                   },
                                   "priceQuantity" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
                                     "quantitySchedule" : {
                                       "address" : {
                                         "scope" : "DOCUMENT",
                                         "value" : "quantity-2"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "0"
                                     }
                                   },
-                                  "calculationPeriodDates" : {
-                                    "calculationPeriodDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "floatPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "245965f8"
+                                  "rateSpecification" : {
+                                    "floatingRate" : {
+                                      "rateOption" : {
+                                        "address" : {
+                                          "scope" : "DOCUMENT",
+                                          "value" : "rateOption-1"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
-                                        "globalKey" : "5a9469c9"
+                                        "globalKey" : "0"
                                       }
-                                    },
-                                    "calculationPeriodFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "28c4e"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3,
-                                      "rollConvention" : "27"
-                                    },
+                                    }
+                                  },
+                                  "dayCountFraction" : {
+                                    "value" : "ACT/360"
+                                  },
+                                  "calculationPeriodDates" : {
                                     "effectiveDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2015-04-27",
                                         "dateAdjustments" : {
                                           "businessDayConvention" : "NONE",
                                           "meta" : {
@@ -594,42 +523,148 @@
                                         },
                                         "meta" : {
                                           "globalKey" : "ec89c593"
-                                        },
-                                        "unadjustedDate" : "2015-04-27"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "ec89c593"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "floatingCalcPeriodDates",
-                                      "globalKey" : "10c8d7ea"
-                                    },
                                     "terminationDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2022-04-27",
                                         "dateAdjustments" : {
+                                          "businessDayConvention" : "MODFOLLOWING",
                                           "businessCenters" : {
                                             "businessCentersReference" : {
-                                              "externalReference" : "floatPrimaryBusinessCenters",
-                                              "globalReference" : "42f910b"
+                                              "globalReference" : "42f910b",
+                                              "externalReference" : "floatPrimaryBusinessCenters"
                                             },
                                             "meta" : {
                                               "globalKey" : "245965f8"
                                             }
                                           },
-                                          "businessDayConvention" : "MODFOLLOWING",
                                           "meta" : {
                                             "globalKey" : "5a9469c9"
                                           }
                                         },
                                         "meta" : {
                                           "globalKey" : "753eb18e"
-                                        },
-                                        "unadjustedDate" : "2022-04-27"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "753eb18e"
                                       }
+                                    },
+                                    "calculationPeriodDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "floatPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "245965f8"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "5a9469c9"
+                                      }
+                                    },
+                                    "calculationPeriodFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "17f7a"
+                                      },
+                                      "rollConvention" : "27"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "551cbdc2",
+                                      "externalKey" : "floatingCalcPeriodDates"
+                                    }
+                                  },
+                                  "paymentDates" : {
+                                    "paymentFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "aa"
+                                      }
+                                    },
+                                    "payRelativeTo" : "CalculationPeriodEndDate",
+                                    "paymentDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        }, {
+                                          "value" : "USNY"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "42f910b",
+                                          "externalKey" : "floatPrimaryBusinessCenters"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "97b8e49c"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "e18d000c"
+                                    }
+                                  },
+                                  "resetDates" : {
+                                    "calculationPeriodDatesReference" : {
+                                      "globalReference" : "551cbdc2",
+                                      "externalReference" : "floatingCalcPeriodDates"
+                                    },
+                                    "resetRelativeTo" : "CalculationPeriodStartDate",
+                                    "fixingDates" : {
+                                      "periodMultiplier" : -2,
+                                      "period" : "D",
+                                      "meta" : {
+                                        "globalKey" : "1a78799e"
+                                      },
+                                      "dayType" : "Business",
+                                      "businessDayConvention" : "NONE",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "21479e"
+                                        }
+                                      },
+                                      "dateRelativeTo" : {
+                                        "globalReference" : "6cfd7cb9",
+                                        "externalReference" : "floatingLegResetDates"
+                                      }
+                                    },
+                                    "resetFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "aa"
+                                      }
+                                    },
+                                    "resetDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "42f910b",
+                                          "externalReference" : "floatPrimaryBusinessCenters"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "245965f8"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "5a9469c9"
+                                      }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "6cfd7cb9",
+                                      "externalKey" : "floatingLegResetDates"
                                     }
                                   },
                                   "cashflowRepresentation" : {
@@ -637,928 +672,862 @@
                                     "paymentCalculationPeriod" : [ {
                                       "adjustedPaymentDate" : "2015-07-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2015-07-27",
                                         "adjustedStartDate" : "2015-04-27",
+                                        "adjustedEndDate" : "2015-07-27",
                                         "meta" : {
-                                          "globalKey" : "1b56c1cc"
+                                          "globalKey" : "b64cc84c"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2015-04-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a029f9"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "6417b0a7"
+                                        "globalKey" : "ff0db727"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2015-10-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2015-10-27",
                                         "adjustedStartDate" : "2015-07-27",
+                                        "adjustedEndDate" : "2015-10-27",
                                         "meta" : {
-                                          "globalKey" : "fa5c10c"
+                                          "globalKey" : "aa9bc78c"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2015-07-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a04139"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "8bb9f0a7"
+                                        "globalKey" : "26aff727"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-01-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-01-27",
                                         "adjustedStartDate" : "2015-10-27",
+                                        "adjustedEndDate" : "2016-01-27",
                                         "meta" : {
-                                          "globalKey" : "831d054c"
+                                          "globalKey" : "2725e1cc"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2015-10-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a05879"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "88af7aa7"
+                                        "globalKey" : "2cb85727"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-04-27",
                                         "adjustedStartDate" : "2016-01-27",
+                                        "adjustedEndDate" : "2016-04-27",
                                         "meta" : {
-                                          "globalKey" : "ffa7baca"
+                                          "globalKey" : "9a9dc14a"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2016-01-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a10af7"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "388d70e5"
+                                        "globalKey" : "d3837765"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-07-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-07-27",
                                         "adjustedStartDate" : "2016-04-27",
+                                        "adjustedEndDate" : "2016-07-27",
                                         "meta" : {
-                                          "globalKey" : "f3f6ba0a"
+                                          "globalKey" : "8eecc08a"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2016-04-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a12237"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "602fb0e5"
+                                        "globalKey" : "fb25b765"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2016-10-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2016-10-27",
                                         "adjustedStartDate" : "2016-07-27",
+                                        "adjustedEndDate" : "2016-10-27",
                                         "meta" : {
-                                          "globalKey" : "e845b94a"
+                                          "globalKey" : "833bbfca"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2016-07-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a13977"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "87d1f0e5"
+                                        "globalKey" : "22c7f765"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-01-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-01-27",
                                         "adjustedStartDate" : "2016-10-27",
+                                        "adjustedEndDate" : "2017-01-27",
                                         "meta" : {
-                                          "globalKey" : "5bbcfd8a"
+                                          "globalKey" : "ffc5da0a"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2016-10-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a150b7"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "84c77ae5"
+                                        "globalKey" : "28d05765"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-04-27",
                                         "adjustedStartDate" : "2017-01-27",
+                                        "adjustedEndDate" : "2017-04-27",
                                         "meta" : {
-                                          "globalKey" : "d847b2ca"
+                                          "globalKey" : "733db94a"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2017-01-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a202f7"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "34a570e5"
+                                        "globalKey" : "cf9b7765"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-07-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-07-27",
                                         "adjustedStartDate" : "2017-04-27",
+                                        "adjustedEndDate" : "2017-07-27",
                                         "meta" : {
-                                          "globalKey" : "cc96b20a"
+                                          "globalKey" : "678cb88a"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2017-04-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a21a37"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "5c47b0e5"
+                                        "globalKey" : "f73db765"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2017-10-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2017-10-27",
                                         "adjustedStartDate" : "2017-07-27",
+                                        "adjustedEndDate" : "2017-10-27",
                                         "meta" : {
-                                          "globalKey" : "c0e5b14a"
+                                          "globalKey" : "5bdbb7ca"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2017-07-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a23177"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "83e9f0e5"
+                                        "globalKey" : "1edff765"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-01-29",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-01-29",
                                         "adjustedStartDate" : "2017-10-27",
+                                        "adjustedEndDate" : "2018-01-29",
                                         "meta" : {
-                                          "globalKey" : "9e296c0c"
+                                          "globalKey" : "dbcf8348"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2017-10-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a248b7"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "1334cf69"
+                                        "globalKey" : "50dae6a5"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-04-27",
                                         "adjustedStartDate" : "2018-01-29",
+                                        "adjustedEndDate" : "2018-04-27",
                                         "meta" : {
-                                          "globalKey" : "b4515c08"
+                                          "globalKey" : "b5aa27cc"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2018-01-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a2faf7"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "34272223"
+                                        "globalKey" : "357fede7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-07-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-07-27",
                                         "adjustedStartDate" : "2018-04-27",
+                                        "adjustedEndDate" : "2018-07-27",
                                         "meta" : {
-                                          "globalKey" : "a536aa0a"
+                                          "globalKey" : "402cb08a"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2018-04-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a31237"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "585fb0e5"
+                                        "globalKey" : "f355b765"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2018-10-29",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2018-10-29",
                                         "adjustedStartDate" : "2018-07-27",
+                                        "adjustedEndDate" : "2018-10-29",
                                         "meta" : {
-                                          "globalKey" : "3521fcc"
+                                          "globalKey" : "37e56108"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2018-07-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a32977"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "12574569"
+                                        "globalKey" : "46ea86a5"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-01-28",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-01-28",
                                         "adjustedStartDate" : "2018-10-29",
+                                        "adjustedEndDate" : "2019-01-28",
                                         "meta" : {
-                                          "globalKey" : "454cda09"
+                                          "globalKey" : "1c87192b"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2018-10-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a340b7"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "498bd665"
+                                        "globalKey" : "20c61587"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-04-29",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-04-29",
                                         "adjustedStartDate" : "2019-01-28",
+                                        "adjustedEndDate" : "2019-04-29",
                                         "meta" : {
-                                          "globalKey" : "f508f1cc"
+                                          "globalKey" : "5ccd95aa"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-01-24",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a3f2d8"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "c0df9de9"
+                                        "globalKey" : "28a441c7"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-07-29",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-07-29",
                                         "adjustedStartDate" : "2019-04-29",
+                                        "adjustedEndDate" : "2019-07-29",
                                         "meta" : {
-                                          "globalKey" : "eb0cc9ca"
+                                          "globalKey" : "8602d04a"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-04-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a40a37"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "ea36b6a7"
+                                        "globalKey" : "852cbd27"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2019-10-28",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2019-10-28",
                                         "adjustedStartDate" : "2019-07-29",
+                                        "adjustedEndDate" : "2019-10-28",
                                         "meta" : {
-                                          "globalKey" : "aa758dc9"
+                                          "globalKey" : "789cf6eb"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-07-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a42177"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "48ae4c65"
+                                        "globalKey" : "16d5b587"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-01-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-01-27",
                                         "adjustedStartDate" : "2019-10-28",
+                                        "adjustedEndDate" : "2020-01-27",
                                         "meta" : {
-                                          "globalKey" : "e751be0a"
+                                          "globalKey" : "be8bfd2c"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2019-10-24",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a43898"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "7ac45365"
+                                        "globalKey" : "51fe9287"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-04-27",
                                         "adjustedStartDate" : "2020-01-27",
+                                        "adjustedEndDate" : "2020-04-27",
                                         "meta" : {
-                                          "globalKey" : "62279a8c"
+                                          "globalKey" : "fd1da10c"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-01-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a4eab9"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "28ed70a7"
+                                        "globalKey" : "c3e37727"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-07-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-07-27",
                                         "adjustedStartDate" : "2020-04-27",
+                                        "adjustedEndDate" : "2020-07-27",
                                         "meta" : {
-                                          "globalKey" : "567699cc"
+                                          "globalKey" : "f16ca04c"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-04-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a501f9"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "508fb0a7"
+                                        "globalKey" : "eb85b727"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2020-10-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2020-10-27",
                                         "adjustedStartDate" : "2020-07-27",
+                                        "adjustedEndDate" : "2020-10-27",
                                         "meta" : {
-                                          "globalKey" : "4ac5990c"
+                                          "globalKey" : "e5bb9f8c"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-07-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a51939"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "7831f0a7"
+                                        "globalKey" : "1327f727"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-01-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-01-27",
                                         "adjustedStartDate" : "2020-10-27",
+                                        "adjustedEndDate" : "2021-01-27",
                                         "meta" : {
-                                          "globalKey" : "be3cdd4c"
+                                          "globalKey" : "6245b9cc"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2020-10-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a53079"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "75277aa7"
+                                        "globalKey" : "19305727"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-04-27",
                                         "adjustedStartDate" : "2021-01-27",
+                                        "adjustedEndDate" : "2021-04-27",
                                         "meta" : {
-                                          "globalKey" : "3ac792ca"
+                                          "globalKey" : "d5bd994a"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2021-01-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a5e2f7"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "250570e5"
+                                        "globalKey" : "bffb7765"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-07-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-07-27",
                                         "adjustedStartDate" : "2021-04-27",
+                                        "adjustedEndDate" : "2021-07-27",
                                         "meta" : {
-                                          "globalKey" : "2f1691cc"
+                                          "globalKey" : "ca0c984c"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2021-04-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a5f9f9"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "4ca7b0a7"
+                                        "globalKey" : "e79db727"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2021-10-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2021-10-27",
                                         "adjustedStartDate" : "2021-07-27",
+                                        "adjustedEndDate" : "2021-10-27",
                                         "meta" : {
-                                          "globalKey" : "2365910c"
+                                          "globalKey" : "be5b978c"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2021-07-23",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a61139"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "7449f0a7"
+                                        "globalKey" : "f3ff727"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2022-01-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2022-01-27",
                                         "adjustedStartDate" : "2021-10-27",
+                                        "adjustedEndDate" : "2022-01-27",
                                         "meta" : {
-                                          "globalKey" : "96dcd58a"
+                                          "globalKey" : "3ae5b20a"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2021-10-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a628b7"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "713f7ae5"
+                                        "globalKey" : "15485765"
                                       }
                                     }, {
                                       "adjustedPaymentDate" : "2022-04-27",
                                       "calculationPeriod" : [ {
-                                        "adjustedEndDate" : "2022-04-27",
                                         "adjustedStartDate" : "2022-01-27",
+                                        "adjustedEndDate" : "2022-04-27",
                                         "meta" : {
-                                          "globalKey" : "13678aca"
+                                          "globalKey" : "ae5d914a"
                                         },
+                                        "notionalAmount" : 3000000.00,
                                         "floatingRateDefinition" : {
                                           "rateObservation" : [ {
                                             "adjustedFixingDate" : "2022-01-25",
+                                            "observedRate" : 0,
                                             "meta" : {
                                               "globalKey" : "7a6daf7"
-                                            },
-                                            "observedRate" : 0
+                                            }
                                           } ]
-                                        },
-                                        "notionalAmount" : 3000000.00
+                                        }
                                       } ],
                                       "meta" : {
-                                        "globalKey" : "211d70e5"
+                                        "globalKey" : "bc137765"
                                       }
                                     } ]
                                   },
-                                  "dayCountFraction" : {
-                                    "value" : "ACT/360"
-                                  },
                                   "meta" : {
-                                    "globalKey" : "3d24d29d"
-                                  },
-                                  "paymentDates" : {
-                                    "meta" : {
-                                      "globalKey" : "637fde94"
-                                    },
-                                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                    "paymentDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        }, {
-                                          "value" : "USNY"
-                                        } ],
-                                        "meta" : {
-                                          "externalKey" : "floatPrimaryBusinessCenters",
-                                          "globalKey" : "42f910b"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "97b8e49c"
-                                      }
-                                    },
-                                    "paymentFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "956"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3
-                                    }
-                                  },
-                                  "rateSpecification" : {
-                                    "floatingRate" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
-                                      "rateOption" : {
-                                        "address" : {
-                                          "scope" : "DOCUMENT",
-                                          "value" : "rateOption-1"
-                                        }
-                                      }
-                                    }
-                                  },
-                                  "resetDates" : {
-                                    "calculationPeriodDatesReference" : {
-                                      "externalReference" : "floatingCalcPeriodDates",
-                                      "globalReference" : "10c8d7ea"
-                                    },
-                                    "fixingDates" : {
-                                      "meta" : {
-                                        "globalKey" : "3d9c8eea"
-                                      },
-                                      "period" : "D",
-                                      "periodMultiplier" : -2,
-                                      "dayType" : "BUSINESS",
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        } ],
-                                        "meta" : {
-                                          "globalKey" : "21479e"
-                                        }
-                                      },
-                                      "businessDayConvention" : "NONE",
-                                      "dateRelativeTo" : {
-                                        "externalReference" : "floatingLegResetDates",
-                                        "globalReference" : "2de3a193"
-                                      }
-                                    },
-                                    "meta" : {
-                                      "externalKey" : "floatingLegResetDates",
-                                      "globalKey" : "2de3a193"
-                                    },
-                                    "resetDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "floatPrimaryBusinessCenters",
-                                          "globalReference" : "42f910b"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "245965f8"
-                                        }
-                                      },
-                                      "businessDayConvention" : "MODFOLLOWING",
-                                      "meta" : {
-                                        "globalKey" : "5a9469c9"
-                                      }
-                                    },
-                                    "resetFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "956"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3
-                                    },
-                                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                                    "globalKey" : "e45e8f53"
                                   }
                                 } ],
                                 "meta" : {
-                                  "globalKey" : "8c3dcc34"
+                                  "globalKey" : "64df0fb2"
                                 }
                               }
                             },
                             "meta" : {
-                              "globalKey" : "8c3dcc34"
+                              "globalKey" : "64df0fb2"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "8c3dcc34"
+                            "globalKey" : "64df0fb2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "74e9f72d"
                         }
-                      } ]
+                      } ],
+                      "meta" : {
+                        "globalKey" : "74e9f72d"
+                      }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "c4c9142f"
+                    "globalKey" : "74e9f72d"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "c4c9142f"
+                  "globalKey" : "74e9f72d"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "d39ab81b"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.01,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.01,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 3000000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "9fbc4b45"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 3000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 3000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "f472d3ee"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 3000000.00
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ef297"
-              },
-              "value" : "2014-10-23"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "cme_trade_id"
                   },
-                  "value" : "2894761"
-                }
-              }, {
-                "identifier" : {
                   "meta" : {
-                    "scheme" : "client_trade_id"
-                  },
-                  "value" : "2052340"
+                    "globalKey" : "edd0cb9a"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "ba4f",
+                  "externalReference" : "clearing_firm"
                 }
               }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
+                }
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "010",
                   "meta" : {
-                    "scheme" : "platform_trade_id"
-                  },
-                  "value" : "19300360"
+                    "scheme" : "clearing_member_firms"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ba4f"
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "ba4f",
+                "externalKey" : "clearing_firm"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "block_trade_id"
-                  },
-                  "value" : "19300360"
+                  "value" : "CME"
+                },
+                "meta" : {
+                  "globalKey" : "1051b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "clearing_service",
-                "globalReference" : "1051b"
-              },
               "meta" : {
-                "globalKey" : "97d581d4"
+                "globalKey" : "1051b",
+                "externalKey" : "clearing_service"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "reg_trade_id"
-                  },
-                  "value" : "CCCIRS2894761"
+                  "value" : "CHI2WIRE"
+                },
+                "meta" : {
+                  "globalKey" : "902a6db3"
                 }
               } ],
-              "issuer" : {
+              "meta" : {
+                "globalKey" : "902a6db3",
+                "externalKey" : "trade_source"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "902a6db3",
+                "externalReference" : "trade_source"
+              },
+              "role" : "DataSubmitter",
+              "ownershipPartyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              }
+            } ],
+            "clearedDate" : "2015-01-12",
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
+              },
+              "accountNumber" : {
+                "value" : "HOUSE2",
                 "meta" : {
-                  "scheme" : "cftc_Namespace"
-                },
-                "value" : "1010000023"
+                  "scheme" : "clearing_firm_accounts"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "ba4f",
+                "externalReference" : "clearing_firm"
               },
               "meta" : {
-                "globalKey" : "a7071c09"
+                "globalKey" : "e5aa0442",
+                "externalKey" : "account1"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "41288b48"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "674ba136"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "clearing_firm",
-                  "globalReference" : "ba4f"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "clearing_service",
-                  "globalReference" : "1051b"
-                }
-              },
               "quantity" : {
+                "value" : 300.00,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "ba4f",
+                  "externalReference" : "clearing_firm"
                 },
-                "value" : 300.00
+                "receiverPartyReference" : {
+                  "globalReference" : "1051b",
+                  "externalReference" : "clearing_service"
+                }
               },
               "settlementDate" : {
+                "unadjustedDate" : "2014-10-27",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "USNY"
@@ -1567,28 +1536,59 @@
                       "globalKey" : "27e4e9"
                     }
                   },
-                  "businessDayConvention" : "MODFOLLOWING",
                   "meta" : {
                     "globalKey" : "3662e8ba"
                   }
-                },
-                "unadjustedDate" : "2014-10-27"
+                }
               },
               "transferExpression" : {
-                "priceTransfer" : "PREMIUM"
+                "priceTransfer" : "Premium"
               }
+            },
+            "meta" : {
+              "globalKey" : "fea955f6"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "f87227ae"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "3702894761",
+      "meta" : {
+        "scheme" : "cme_message_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_clearingorg_id"
+      }
+    },
+    "sentTo" : [ {
+      "value" : "010",
+      "meta" : {
+        "scheme" : "cme_firm_id"
+      }
+    }, {
+      "value" : "CME",
+      "meta" : {
+        "scheme" : "cme_exchange_id"
+      }
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2015-01-12T05:41:31-06:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   } ],
   "workflowState" : {
-    "workflowStatus" : "CLEARED"
+    "workflowStatus" : "Cleared"
+  },
+  "meta" : {
+    "globalKey" : "b6dd56ac"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/Contract_Submission.json b/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/Contract_Submission.json
index b919324084..2ceceb37bf 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/Contract_Submission.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/Contract_Submission.json
@@ -1,91 +1,70 @@
 {
-  "action" : "NEW",
-  "messageInformation" : {
-    "sentBy" : {
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "8264922c"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "f0183091"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "f0183091"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "partyA",
-                "globalKey" : "c6abc049"
-              },
-              "name" : {
-                "value" : "Michigan Avenue Bank - Executing Bank"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "7ffa3ef",
+                "externalReference" : "partyA"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "ONB2-TEST-I"
-                },
-                "meta" : {
-                  "globalKey" : "c455d30c"
+                  "value" : "43401154-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "partyB",
-                "globalKey" : "a4bfd493"
-              },
-              "name" : {
-                "value" : "CMEEVENT1"
+                "globalKey" : "195feba4"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "d18c5c37",
+                "externalReference" : "partyB"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "EVENTTEST1"
-                },
-                "meta" : {
-                  "globalKey" : "58b757a5"
+                  "value" : "43401154-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "partyC",
-                "globalKey" : "5b6941a5"
+                "globalKey" : "19606003"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "5b6941a5",
+                "externalReference" : "partyC"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "SWAPSWIRE"
-                },
-                "meta" : {
-                  "globalKey" : "5b6941a5"
+                  "value" : "43401154-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "1960d462"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-31",
+              "meta" : {
+                "globalKey" : "3f129f"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "partyB",
-                  "globalReference" : "a4bfd493"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "partyA",
-                  "globalReference" : "c6abc049"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
                         "value" : "InterestRateSwap"
@@ -99,47 +78,40 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "42f910b"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "97b8e49c"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d1d"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "2"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -148,20 +120,17 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegCalcPeriodDates",
-                            "globalKey" : "4ae6ffbb"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2023-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "GBLO"
@@ -172,34 +141,20 @@
                                     "globalKey" : "42f910b"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "97b8e49c"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "5f686b9a"
-                              },
-                              "unadjustedDate" : "2023-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "5f686b9a"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "d5a0ceae"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "637fde94"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -210,44 +165,67 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "956"
+                              "globalKey" : "2049"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                            "rollConvention" : "2"
+                          },
+                          "meta" : {
+                            "globalKey" : "84705d1",
+                            "externalKey" : "floatingLegCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "e18d000c",
+                            "externalKey" : "floatingLegPaymentDates"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingLegCalcPeriodDates",
-                            "globalReference" : "4ae6ffbb"
+                            "globalReference" : "84705d1",
+                            "externalReference" : "floatingLegCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "3d9c8eea"
+                              "globalKey" : "1a78799e"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -256,17 +234,20 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "4e1ce8fe"
+                              "globalReference" : "4f77242a",
+                              "externalReference" : "floatingLegResetDates"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "4e1ce8fe"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -277,63 +258,56 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "meta" : {
+                            "globalKey" : "4f77242a",
+                            "externalKey" : "floatingLegResetDates"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "2bf99b28"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "42f910b"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "97b8e49c"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d7a"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "2"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -342,20 +316,17 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedLegCalcPeriodDates",
-                            "globalKey" : "3ce499be"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2023-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "GBLO"
@@ -366,34 +337,20 @@
                                     "globalKey" : "42f910b"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "97b8e49c"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "5f686b9a"
-                              },
-                              "unadjustedDate" : "2023-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "5f686b9a"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "30/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "1ade63a2"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "637fde97"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -404,212 +361,254 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "959"
+                              "globalKey" : "2b8c"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 6
+                            "rollConvention" : "2"
+                          },
+                          "meta" : {
+                            "globalKey" : "8471114",
+                            "externalKey" : "fixedLegCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "9e5a4d0f",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "5dfa41ba"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "99f1de50"
+                        "globalKey" : "91b1ece2"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "7c9e7f23"
+                    "globalKey" : "745e8db5"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "7c9e7f23"
+                  "globalKey" : "745e8db5"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "7b78abf0"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 100000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
                     },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
+                    }
+                  } ],
+                  "observable" : {
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 100000000
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "5200f2ce"
                   },
+                  "meta" : {
+                    "globalKey" : "5332091c"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.02781,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.02781,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "ee1d66f2"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "d18c5c37",
+                  "externalReference" : "partyB"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "7ffa3ef",
+                  "externalReference" : "partyA"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f129f"
-              },
-              "value" : "2018-10-31"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43401154-2"
+                  "value" : "ONB2-TEST-I"
+                },
+                "meta" : {
+                  "globalKey" : "c455d30c"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyA",
-                "globalReference" : "c6abc049"
+              "name" : {
+                "value" : "Michigan Avenue Bank - Executing Bank"
               },
               "meta" : {
-                "globalKey" : "c99dfdfa"
+                "globalKey" : "7ffa3ef",
+                "externalKey" : "partyA"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43401154-2"
+                  "value" : "EVENTTEST1"
+                },
+                "meta" : {
+                  "globalKey" : "58b757a5"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyB",
-                "globalReference" : "a4bfd493"
+              "name" : {
+                "value" : "CMEEVENT1"
               },
               "meta" : {
-                "globalKey" : "c99dfdfb"
+                "globalKey" : "d18c5c37",
+                "externalKey" : "partyB"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43401154-2"
+                  "value" : "SWAPSWIRE"
+                },
+                "meta" : {
+                  "globalKey" : "5b6941a5"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyC",
-                "globalReference" : "5b6941a5"
-              },
               "meta" : {
-                "globalKey" : "c99dfdfc"
+                "globalKey" : "5b6941a5",
+                "externalKey" : "partyC"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "92032099"
+            }
+          },
+          "meta" : {
+            "globalKey" : "92032099"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "sentBy" : {
+      "value" : "CME"
+    },
+    "sentTo" : [ {
+      "value" : "CME"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-10-31T14:13:57.104Z",
-    "qualification" : "TRANSACTION_CREATION_DATE_TIME"
+    "qualification" : "transactionCreationDateTime"
   }, {
     "dateTime" : "2018-10-31T14:13:57.104Z",
-    "qualification" : "EVENT_SENT_DATE_TIME"
+    "qualification" : "eventSentDateTime"
   }, {
     "dateTime" : "2018-10-31T14:01:16Z",
-    "qualification" : "EXECUTION_DATE_TIME"
+    "qualification" : "executionDateTime"
   } ],
+  "action" : "New",
   "workflowState" : {
+    "workflowStatus" : "Submitted",
     "partyCustomisedWorkflow" : [ {
+      "partyName" : "ONB2-TEST-I",
       "customisedWorkflow" : [ {
         "itemName" : "ClientOrderId",
         "itemValue" : "43401154-2"
@@ -628,9 +627,9 @@
       }, {
         "itemName" : "PartyIdentifier",
         "itemValue" : "Custom"
-      } ],
-      "partyName" : "ONB2-TEST-I"
+      } ]
     }, {
+      "partyName" : "EVENTTEST1",
       "customisedWorkflow" : [ {
         "itemName" : "ClientOrderId",
         "itemValue" : "43401154-2"
@@ -649,9 +648,10 @@
       }, {
         "itemName" : "PartyIdentifier",
         "itemValue" : "Custom"
-      } ],
-      "partyName" : "EVENTTEST1"
-    } ],
-    "workflowStatus" : "SUBMITTED"
+      } ]
+    } ]
+  },
+  "meta" : {
+    "globalKey" : "a3b505be"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_FRA_Submission.json b/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_FRA_Submission.json
index aef38d4863..617eb8012e 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_FRA_Submission.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_FRA_Submission.json
@@ -1,87 +1,66 @@
 {
-  "action" : "NEW",
-  "messageInformation" : {
-    "sentBy" : {
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "c615c16e"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "d22c8a25"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "d22c8a25"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "partyA",
-                "globalKey" : "c6abc049"
-              },
-              "name" : {
-                "value" : "Michigan Avenue Bank - Executing Bank"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "7ffa3ef",
+                "externalReference" : "partyA"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "ONB2-TEST-I"
-                },
-                "meta" : {
-                  "globalKey" : "c455d30c"
+                  "value" : "43401180-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "partyB",
-                "globalKey" : "a4bfd493"
-              },
-              "name" : {
-                "value" : "CMEEVENT1"
+                "globalKey" : "196139bd"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "d18c5c37",
+                "externalReference" : "partyB"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "EVENTTEST1"
-                },
-                "meta" : {
-                  "globalKey" : "58b757a5"
+                  "value" : "43401180-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "partyC",
-                "globalKey" : "5b6941a5"
+                "globalKey" : "1961ae1c"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "5b6941a5",
+                "externalReference" : "partyC"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "SWAPSWIRE"
-                },
-                "meta" : {
-                  "globalKey" : "5b6941a5"
+                  "value" : "43401180-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "1962227b"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-31",
+              "meta" : {
+                "globalKey" : "3f129f"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "partyA",
-                  "globalReference" : "c6abc049"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "partyB",
-                  "globalReference" : "a4bfd493"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -92,48 +71,63 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
                         "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
                               "adjustedDate" : {
+                                "value" : "2019-05-13",
                                 "meta" : {
                                   "globalKey" : "3f194d"
-                                },
-                                "value" : "2019-05-13"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "0"
                               }
                             },
                             "meta" : {
-                              "externalKey" : "resetDate",
-                              "globalKey" : "0"
+                              "globalKey" : "0",
+                              "externalKey" : "resetDate"
                             }
                           },
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
                               "adjustedDate" : {
+                                "value" : "2019-11-12",
                                 "meta" : {
                                   "globalKey" : "3f1acc"
-                                },
-                                "value" : "2019-11-12"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "0"
@@ -142,19 +136,15 @@
                             "meta" : {
                               "globalKey" : "0"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "discountingMethod" : {
-                          "discountingType" : "FRA"
-                        },
-                        "meta" : {
-                          "globalKey" : "fb2ec587"
-                        },
                         "paymentDate" : {
+                          "unadjustedDate" : "2019-05-13",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -165,75 +155,77 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
                           "meta" : {
                             "globalKey" : "deb62aaf"
-                          },
-                          "unadjustedDate" : "2019-05-13"
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
                           }
+                        },
+                        "discountingMethod" : {
+                          "discountingType" : "FRA"
+                        },
+                        "meta" : {
+                          "globalKey" : "4c31ed05"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
                         "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
                               "adjustedDate" : {
+                                "value" : "2019-05-13",
                                 "meta" : {
                                   "globalKey" : "3f194d"
-                                },
-                                "value" : "2019-05-13"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "0"
                               }
                             },
                             "meta" : {
-                              "externalKey" : "resetDate",
-                              "globalKey" : "0"
+                              "globalKey" : "0",
+                              "externalKey" : "resetDate"
                             }
                           },
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
                               "adjustedDate" : {
+                                "value" : "2019-11-12",
                                 "meta" : {
                                   "globalKey" : "3f1acc"
-                                },
-                                "value" : "2019-11-12"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "0"
@@ -242,19 +234,15 @@
                             "meta" : {
                               "globalKey" : "0"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "discountingMethod" : {
-                          "discountingType" : "FRA"
-                        },
-                        "meta" : {
-                          "globalKey" : "8c4408ae"
-                        },
                         "paymentDate" : {
+                          "unadjustedDate" : "2019-05-13",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -265,37 +253,23 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
                           "meta" : {
                             "globalKey" : "deb62aaf"
-                          },
-                          "unadjustedDate" : "2019-05-13"
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
                           }
                         },
                         "resetDates" : {
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "f12537c9"
+                              "globalKey" : "ce01227d"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -304,194 +278,219 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "resetDate",
-                              "globalReference" : "0"
+                              "globalReference" : "0",
+                              "externalReference" : "resetDate"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "f12537c9"
+                            "globalKey" : "ce01227d"
                           }
+                        },
+                        "discountingMethod" : {
+                          "discountingType" : "FRA"
+                        },
+                        "meta" : {
+                          "globalKey" : "2024e022"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "c60dddc7"
+                        "globalKey" : "eabfecfd"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "c60dddc7"
+                    "globalKey" : "eabfecfd"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "c60dddc7"
+                  "globalKey" : "eabfecfd"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "f07fac52"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.02345,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.02345,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 100000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "1f75ddee"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "b31c328d"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d08"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
+                          "periodMultiplier" : 6,
                           "period" : "M",
-                          "periodMultiplier" : 6
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 100000000
+                    "meta" : {
+                      "globalKey" : "8280320a"
                     }
-                  } ]
+                  },
+                  "meta" : {
+                    "globalKey" : "5332145f"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "7ffa3ef",
+                  "externalReference" : "partyA"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "d18c5c37",
+                  "externalReference" : "partyB"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f129f"
-              },
-              "value" : "2018-10-31"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43401180-2"
+                  "value" : "ONB2-TEST-I"
+                },
+                "meta" : {
+                  "globalKey" : "c455d30c"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyA",
-                "globalReference" : "c6abc049"
+              "name" : {
+                "value" : "Michigan Avenue Bank - Executing Bank"
               },
               "meta" : {
-                "globalKey" : "ce8429d3"
+                "globalKey" : "7ffa3ef",
+                "externalKey" : "partyA"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43401180-2"
+                  "value" : "EVENTTEST1"
+                },
+                "meta" : {
+                  "globalKey" : "58b757a5"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyB",
-                "globalReference" : "a4bfd493"
+              "name" : {
+                "value" : "CMEEVENT1"
               },
               "meta" : {
-                "globalKey" : "ce8429d4"
+                "globalKey" : "d18c5c37",
+                "externalKey" : "partyB"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43401180-2"
+                  "value" : "SWAPSWIRE"
+                },
+                "meta" : {
+                  "globalKey" : "5b6941a5"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyC",
-                "globalReference" : "5b6941a5"
-              },
               "meta" : {
-                "globalKey" : "ce8429d5"
+                "globalKey" : "5b6941a5",
+                "externalKey" : "partyC"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "e94128ab"
+            }
+          },
+          "meta" : {
+            "globalKey" : "e94128ab"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "sentBy" : {
+      "value" : "CME"
+    },
+    "sentTo" : [ {
+      "value" : "CME"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-10-31T14:13:19.9Z",
-    "qualification" : "TRANSACTION_CREATION_DATE_TIME"
+    "qualification" : "transactionCreationDateTime"
   }, {
     "dateTime" : "2018-10-31T14:13:19.9Z",
-    "qualification" : "EVENT_SENT_DATE_TIME"
+    "qualification" : "eventSentDateTime"
   }, {
     "dateTime" : "2018-10-31T14:02:14Z",
-    "qualification" : "EXECUTION_DATE_TIME"
+    "qualification" : "executionDateTime"
   } ],
+  "action" : "New",
   "workflowState" : {
+    "workflowStatus" : "Submitted",
     "partyCustomisedWorkflow" : [ {
+      "partyName" : "ONB2-TEST-I",
       "customisedWorkflow" : [ {
         "itemName" : "ClientOrderId",
         "itemValue" : "43401180-2"
@@ -510,9 +509,9 @@
       }, {
         "itemName" : "PartyIdentifier",
         "itemValue" : "Custom"
-      } ],
-      "partyName" : "ONB2-TEST-I"
+      } ]
     }, {
+      "partyName" : "EVENTTEST1",
       "customisedWorkflow" : [ {
         "itemName" : "ClientOrderId",
         "itemValue" : "43401180-2"
@@ -531,9 +530,10 @@
       }, {
         "itemName" : "PartyIdentifier",
         "itemValue" : "Custom"
-      } ],
-      "partyName" : "EVENTTEST1"
-    } ],
-    "workflowStatus" : "SUBMITTED"
+      } ]
+    } ]
+  },
+  "meta" : {
+    "globalKey" : "694b8926"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_IRS_Submission.json b/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_IRS_Submission.json
index b919324084..2ceceb37bf 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_IRS_Submission.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_IRS_Submission.json
@@ -1,91 +1,70 @@
 {
-  "action" : "NEW",
-  "messageInformation" : {
-    "sentBy" : {
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "8264922c"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "f0183091"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "f0183091"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "partyA",
-                "globalKey" : "c6abc049"
-              },
-              "name" : {
-                "value" : "Michigan Avenue Bank - Executing Bank"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "7ffa3ef",
+                "externalReference" : "partyA"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "ONB2-TEST-I"
-                },
-                "meta" : {
-                  "globalKey" : "c455d30c"
+                  "value" : "43401154-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "partyB",
-                "globalKey" : "a4bfd493"
-              },
-              "name" : {
-                "value" : "CMEEVENT1"
+                "globalKey" : "195feba4"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "d18c5c37",
+                "externalReference" : "partyB"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "EVENTTEST1"
-                },
-                "meta" : {
-                  "globalKey" : "58b757a5"
+                  "value" : "43401154-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "partyC",
-                "globalKey" : "5b6941a5"
+                "globalKey" : "19606003"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "5b6941a5",
+                "externalReference" : "partyC"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "SWAPSWIRE"
-                },
-                "meta" : {
-                  "globalKey" : "5b6941a5"
+                  "value" : "43401154-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "1960d462"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-31",
+              "meta" : {
+                "globalKey" : "3f129f"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "partyB",
-                  "globalReference" : "a4bfd493"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "partyA",
-                  "globalReference" : "c6abc049"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
                         "value" : "InterestRateSwap"
@@ -99,47 +78,40 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "42f910b"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "97b8e49c"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d1d"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "2"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -148,20 +120,17 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegCalcPeriodDates",
-                            "globalKey" : "4ae6ffbb"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2023-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "GBLO"
@@ -172,34 +141,20 @@
                                     "globalKey" : "42f910b"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "97b8e49c"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "5f686b9a"
-                              },
-                              "unadjustedDate" : "2023-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "5f686b9a"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "d5a0ceae"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "637fde94"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -210,44 +165,67 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "956"
+                              "globalKey" : "2049"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                            "rollConvention" : "2"
+                          },
+                          "meta" : {
+                            "globalKey" : "84705d1",
+                            "externalKey" : "floatingLegCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "e18d000c",
+                            "externalKey" : "floatingLegPaymentDates"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingLegCalcPeriodDates",
-                            "globalReference" : "4ae6ffbb"
+                            "globalReference" : "84705d1",
+                            "externalReference" : "floatingLegCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "3d9c8eea"
+                              "globalKey" : "1a78799e"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -256,17 +234,20 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "4e1ce8fe"
+                              "globalReference" : "4f77242a",
+                              "externalReference" : "floatingLegResetDates"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "4e1ce8fe"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -277,63 +258,56 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "meta" : {
+                            "globalKey" : "4f77242a",
+                            "externalKey" : "floatingLegResetDates"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "2bf99b28"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "42f910b"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "97b8e49c"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d7a"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "2"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -342,20 +316,17 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedLegCalcPeriodDates",
-                            "globalKey" : "3ce499be"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2023-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "GBLO"
@@ -366,34 +337,20 @@
                                     "globalKey" : "42f910b"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "97b8e49c"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "5f686b9a"
-                              },
-                              "unadjustedDate" : "2023-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "5f686b9a"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "30/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "1ade63a2"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "637fde97"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -404,212 +361,254 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "959"
+                              "globalKey" : "2b8c"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 6
+                            "rollConvention" : "2"
+                          },
+                          "meta" : {
+                            "globalKey" : "8471114",
+                            "externalKey" : "fixedLegCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "9e5a4d0f",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "5dfa41ba"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "99f1de50"
+                        "globalKey" : "91b1ece2"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "7c9e7f23"
+                    "globalKey" : "745e8db5"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "7c9e7f23"
+                  "globalKey" : "745e8db5"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "7b78abf0"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 100000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
                     },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
+                    }
+                  } ],
+                  "observable" : {
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 100000000
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "5200f2ce"
                   },
+                  "meta" : {
+                    "globalKey" : "5332091c"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.02781,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.02781,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "ee1d66f2"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "d18c5c37",
+                  "externalReference" : "partyB"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "7ffa3ef",
+                  "externalReference" : "partyA"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f129f"
-              },
-              "value" : "2018-10-31"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43401154-2"
+                  "value" : "ONB2-TEST-I"
+                },
+                "meta" : {
+                  "globalKey" : "c455d30c"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyA",
-                "globalReference" : "c6abc049"
+              "name" : {
+                "value" : "Michigan Avenue Bank - Executing Bank"
               },
               "meta" : {
-                "globalKey" : "c99dfdfa"
+                "globalKey" : "7ffa3ef",
+                "externalKey" : "partyA"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43401154-2"
+                  "value" : "EVENTTEST1"
+                },
+                "meta" : {
+                  "globalKey" : "58b757a5"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyB",
-                "globalReference" : "a4bfd493"
+              "name" : {
+                "value" : "CMEEVENT1"
               },
               "meta" : {
-                "globalKey" : "c99dfdfb"
+                "globalKey" : "d18c5c37",
+                "externalKey" : "partyB"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43401154-2"
+                  "value" : "SWAPSWIRE"
+                },
+                "meta" : {
+                  "globalKey" : "5b6941a5"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyC",
-                "globalReference" : "5b6941a5"
-              },
               "meta" : {
-                "globalKey" : "c99dfdfc"
+                "globalKey" : "5b6941a5",
+                "externalKey" : "partyC"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "92032099"
+            }
+          },
+          "meta" : {
+            "globalKey" : "92032099"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "sentBy" : {
+      "value" : "CME"
+    },
+    "sentTo" : [ {
+      "value" : "CME"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-10-31T14:13:57.104Z",
-    "qualification" : "TRANSACTION_CREATION_DATE_TIME"
+    "qualification" : "transactionCreationDateTime"
   }, {
     "dateTime" : "2018-10-31T14:13:57.104Z",
-    "qualification" : "EVENT_SENT_DATE_TIME"
+    "qualification" : "eventSentDateTime"
   }, {
     "dateTime" : "2018-10-31T14:01:16Z",
-    "qualification" : "EXECUTION_DATE_TIME"
+    "qualification" : "executionDateTime"
   } ],
+  "action" : "New",
   "workflowState" : {
+    "workflowStatus" : "Submitted",
     "partyCustomisedWorkflow" : [ {
+      "partyName" : "ONB2-TEST-I",
       "customisedWorkflow" : [ {
         "itemName" : "ClientOrderId",
         "itemValue" : "43401154-2"
@@ -628,9 +627,9 @@
       }, {
         "itemName" : "PartyIdentifier",
         "itemValue" : "Custom"
-      } ],
-      "partyName" : "ONB2-TEST-I"
+      } ]
     }, {
+      "partyName" : "EVENTTEST1",
       "customisedWorkflow" : [ {
         "itemName" : "ClientOrderId",
         "itemValue" : "43401154-2"
@@ -649,9 +648,10 @@
       }, {
         "itemName" : "PartyIdentifier",
         "itemValue" : "Custom"
-      } ],
-      "partyName" : "EVENTTEST1"
-    } ],
-    "workflowStatus" : "SUBMITTED"
+      } ]
+    } ]
+  },
+  "meta" : {
+    "globalKey" : "a3b505be"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_LIBOR-SOFR_Basis_Submission.json b/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_LIBOR-SOFR_Basis_Submission.json
index f611d39d6b..9f80cdaf1d 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_LIBOR-SOFR_Basis_Submission.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_LIBOR-SOFR_Basis_Submission.json
@@ -1,91 +1,70 @@
 {
-  "action" : "NEW",
-  "messageInformation" : {
-    "sentBy" : {
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "1b677b35"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "bc8cdd77"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "bc8cdd77"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "partyA",
-                "globalKey" : "c6abc049"
-              },
-              "name" : {
-                "value" : "Michigan Avenue Bank - Executing Bank"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "7ffa3ef",
+                "externalReference" : "partyA"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "ONB2-TEST-I"
-                },
-                "meta" : {
-                  "globalKey" : "c455d30c"
+                  "value" : "43401077-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "partyB",
-                "globalKey" : "a4bfd493"
-              },
-              "name" : {
-                "value" : "CMEEVENT1"
+                "globalKey" : "1952c824"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "d18c5c37",
+                "externalReference" : "partyB"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "EVENTTEST1"
-                },
-                "meta" : {
-                  "globalKey" : "58b757a5"
+                  "value" : "43401077-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "partyC",
-                "globalKey" : "5b6941a5"
+                "globalKey" : "19533c83"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "5b6941a5",
+                "externalReference" : "partyC"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "SWAPSWIRE"
-                },
-                "meta" : {
-                  "globalKey" : "5b6941a5"
+                  "value" : "43401077-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "1953b0e2"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-31",
+              "meta" : {
+                "globalKey" : "3f129f"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "partyA",
-                  "globalReference" : "c6abc049"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "partyB",
-                  "globalReference" : "a4bfd493"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
                         "value" : "InterestRateSwap"
@@ -99,47 +78,48 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "42f910b"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-2"
+                              }
+                            },
+                            "spreadSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "97b8e49c"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d1d"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "2"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -148,20 +128,17 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegCalcPeriodDates",
-                            "globalKey" : "418007bb"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2022-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "GBLO"
@@ -172,34 +149,20 @@
                                     "globalKey" : "42f910b"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "97b8e49c"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "5601739a"
-                              },
-                              "unadjustedDate" : "2022-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "5601739a"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "6a45b14e"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "637fde94"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -210,52 +173,67 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "956"
+                              "globalKey" : "2049"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                            "rollConvention" : "2"
+                          },
+                          "meta" : {
+                            "globalKey" : "b538fdd1",
+                            "externalKey" : "floatingLegCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-2"
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b"
                               }
                             },
-                            "spreadSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "e18d000c",
+                            "externalKey" : "floatingLegPaymentDates"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingLegCalcPeriodDates",
-                            "globalReference" : "418007bb"
+                            "globalReference" : "b538fdd1",
+                            "externalReference" : "floatingLegCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "3d9c8eea"
+                              "globalKey" : "1a78799e"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -264,17 +242,20 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "4e1ce8fe"
+                              "globalReference" : "4f77242a",
+                              "externalReference" : "floatingLegResetDates"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "4e1ce8fe"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -285,63 +266,54 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "meta" : {
+                            "globalKey" : "4f77242a",
+                            "externalKey" : "floatingLegResetDates"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "76dc0646"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "42f910b"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "97b8e49c"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "159eb"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "2"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -350,20 +322,17 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLeg2CalcPeriodDates",
-                            "globalKey" : "d702e52d"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2022-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "GBLO"
@@ -374,34 +343,20 @@
                                     "globalKey" : "42f910b"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "97b8e49c"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "5601739a"
-                              },
-                              "unadjustedDate" : "2022-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "5601739a"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "59ce72e0"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLeg2PaymentDates",
-                            "globalKey" : "86770284"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -412,51 +367,74 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
-                          "paymentDaysOffset" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
                             "meta" : {
-                              "globalKey" : "ea4baf42"
+                              "globalKey" : "1a3b"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 2,
-                            "dayType" : "BUSINESS"
+                            "rollConvention" : "2"
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "b538f7c3",
+                            "externalKey" : "floatingLeg2CalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
                             "meta" : {
-                              "globalKey" : "0"
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4abf7e"
                             },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                            "dayType" : "Business"
+                          },
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "c943f240",
+                            "externalKey" : "floatingLeg2PaymentDates"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingLeg2CalcPeriodDates",
-                            "globalReference" : "d702e52d"
+                            "globalReference" : "b538f7c3",
+                            "externalReference" : "floatingLeg2CalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodEndDate",
                           "fixingDates" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "8c648123"
+                              "globalKey" : "1bc532b"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
+                            "businessDayConvention" : "PRECEDING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USGS"
@@ -465,17 +443,20 @@
                                 "globalKey" : "27e40a"
                               }
                             },
-                            "businessDayConvention" : "PRECEDING",
                             "dateRelativeTo" : {
-                              "externalReference" : "floatingLeg2ResetDates",
-                              "globalReference" : "ebe35d10"
+                              "globalReference" : "5654a190",
+                              "externalReference" : "floatingLeg2ResetDates"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLeg2ResetDates",
-                            "globalKey" : "ebe35d10"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -486,217 +467,235 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                          "meta" : {
+                            "globalKey" : "5654a190",
+                            "externalKey" : "floatingLeg2ResetDates"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "ca19e30e"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "f473eaae"
+                        "globalKey" : "b49619d4"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "e72c5dfb"
+                    "globalKey" : "a74e8d21"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "e72c5dfb"
+                  "globalKey" : "a74e8d21"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "a0407424"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-2"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-LIBOR-BBA"
-                        },
-                        "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
-                        }
-                      }
-                    }
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0002,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.0002,
-                      "arithmeticOperator" : "ADD",
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate",
+                      "arithmeticOperator" : "Add"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "e84ab7ac"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "54f5dcc9"
-                    },
                     "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-LIBOR-BBA"
+                        },
+                        "indexTenor" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
+                        }
+                      },
                       "meta" : {
                         "location" : [ {
                           "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
+                          "value" : "rateOption-2"
                         } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-SOFR-COMPOUND"
-                        }
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
                   },
+                  "meta" : {
+                    "globalKey" : "584936a8"
+                  }
+                }, {
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 100000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-2"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-SOFR-COMPOUND"
                         }
                       },
-                      "value" : 100000000
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "49c5bc57"
                     }
-                  } ]
+                  },
+                  "meta" : {
+                    "globalKey" : "fbce0222"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "7ffa3ef",
+                  "externalReference" : "partyA"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "d18c5c37",
+                  "externalReference" : "partyB"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f129f"
-              },
-              "value" : "2018-10-31"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43401077-2"
+                  "value" : "ONB2-TEST-I"
+                },
+                "meta" : {
+                  "globalKey" : "c455d30c"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyA",
-                "globalReference" : "c6abc049"
+              "name" : {
+                "value" : "Michigan Avenue Bank - Executing Bank"
               },
               "meta" : {
-                "globalKey" : "984bba7a"
+                "globalKey" : "7ffa3ef",
+                "externalKey" : "partyA"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43401077-2"
+                  "value" : "EVENTTEST1"
+                },
+                "meta" : {
+                  "globalKey" : "58b757a5"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyB",
-                "globalReference" : "a4bfd493"
+              "name" : {
+                "value" : "CMEEVENT1"
               },
               "meta" : {
-                "globalKey" : "984bba7b"
+                "globalKey" : "d18c5c37",
+                "externalKey" : "partyB"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43401077-2"
+                  "value" : "SWAPSWIRE"
+                },
+                "meta" : {
+                  "globalKey" : "5b6941a5"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyC",
-                "globalReference" : "5b6941a5"
-              },
               "meta" : {
-                "globalKey" : "984bba7c"
+                "globalKey" : "5b6941a5",
+                "externalKey" : "partyC"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "d4c4a19d"
+            }
+          },
+          "meta" : {
+            "globalKey" : "d4c4a19d"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "sentBy" : {
+      "value" : "CME"
+    },
+    "sentTo" : [ {
+      "value" : "CME"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-10-31T14:14:45.895Z",
-    "qualification" : "TRANSACTION_CREATION_DATE_TIME"
+    "qualification" : "transactionCreationDateTime"
   }, {
     "dateTime" : "2018-10-31T14:14:45.895Z",
-    "qualification" : "EVENT_SENT_DATE_TIME"
+    "qualification" : "eventSentDateTime"
   }, {
     "dateTime" : "2018-10-31T14:00:16Z",
-    "qualification" : "EXECUTION_DATE_TIME"
+    "qualification" : "executionDateTime"
   } ],
+  "action" : "New",
   "workflowState" : {
+    "workflowStatus" : "Submitted",
     "partyCustomisedWorkflow" : [ {
+      "partyName" : "ONB2-TEST-I",
       "customisedWorkflow" : [ {
         "itemName" : "ClientOrderId",
         "itemValue" : "43401077-2"
@@ -715,9 +714,9 @@
       }, {
         "itemName" : "PartyIdentifier",
         "itemValue" : "Custom"
-      } ],
-      "partyName" : "ONB2-TEST-I"
+      } ]
     }, {
+      "partyName" : "EVENTTEST1",
       "customisedWorkflow" : [ {
         "itemName" : "ClientOrderId",
         "itemValue" : "43401077-2"
@@ -736,9 +735,10 @@
       }, {
         "itemName" : "PartyIdentifier",
         "itemValue" : "Custom"
-      } ],
-      "partyName" : "EVENTTEST1"
-    } ],
-    "workflowStatus" : "SUBMITTED"
+      } ]
+    } ]
+  },
+  "meta" : {
+    "globalKey" : "541c4ef1"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_OIS_SOFR_Submission.json b/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_OIS_SOFR_Submission.json
index 62702f2779..2dee0cf561 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_OIS_SOFR_Submission.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_OIS_SOFR_Submission.json
@@ -1,91 +1,70 @@
 {
-  "action" : "NEW",
-  "messageInformation" : {
-    "sentBy" : {
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "64dff528"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "5165d62a"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "5165d62a"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "partyA",
-                "globalKey" : "c6abc049"
-              },
-              "name" : {
-                "value" : "Michigan Avenue Bank - Executing Bank"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "7ffa3ef",
+                "externalReference" : "partyA"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "ONB2-TEST-I"
-                },
-                "meta" : {
-                  "globalKey" : "c455d30c"
+                  "value" : "43401034-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "partyB",
-                "globalKey" : "a4bfd493"
-              },
-              "name" : {
-                "value" : "CMEEVENT1"
+                "globalKey" : "1950eb65"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "d18c5c37",
+                "externalReference" : "partyB"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "EVENTTEST1"
-                },
-                "meta" : {
-                  "globalKey" : "58b757a5"
+                  "value" : "43401034-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "partyC",
-                "globalKey" : "5b6941a5"
+                "globalKey" : "19515fc4"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "5b6941a5",
+                "externalReference" : "partyC"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "SWAPSWIRE"
-                },
-                "meta" : {
-                  "globalKey" : "5b6941a5"
+                  "value" : "43401034-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "1951d423"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-31",
+              "meta" : {
+                "globalKey" : "3f129f"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "partyB",
-                  "globalReference" : "a4bfd493"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "partyA",
-                  "globalReference" : "c6abc049"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
                         "value" : "InterestRateSwap"
@@ -99,45 +78,40 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "27e4e9"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "3662e8ba"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "159eb"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "2"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -146,20 +120,17 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegCalcPeriodDates",
-                            "globalKey" : "c852e52d"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2020-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
@@ -168,34 +139,20 @@
                                     "globalKey" : "27e4e9"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "3662e8ba"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "d5552f38"
-                              },
-                              "unadjustedDate" : "2020-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "d5552f38"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "5f3f283a"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "eb988f26"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USNY"
@@ -204,51 +161,72 @@
                                 "globalKey" : "27e4e9"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "3662e8ba"
                             }
                           },
-                          "paymentDaysOffset" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
                             "meta" : {
-                              "globalKey" : "ea4baf42"
+                              "globalKey" : "1a3b"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 2,
-                            "dayType" : "BUSINESS"
+                            "rollConvention" : "2"
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "ecec5783",
+                            "externalKey" : "floatingLegCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
                             "meta" : {
-                              "globalKey" : "0"
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4abf7e"
                             },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                            "dayType" : "Business"
+                          },
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "27e4e9"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "3662e8ba"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "5ddd0f5e",
+                            "externalKey" : "floatingLegPaymentDates"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingLegCalcPeriodDates",
-                            "globalReference" : "c852e52d"
+                            "globalReference" : "ecec5783",
+                            "externalReference" : "floatingLegCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodEndDate",
                           "fixingDates" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "691fe6c1"
+                              "globalKey" : "de77b8c9"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
+                            "businessDayConvention" : "PRECEDING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USGS"
@@ -257,17 +235,20 @@
                                 "globalKey" : "27e40a"
                               }
                             },
-                            "businessDayConvention" : "PRECEDING",
                             "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "86b967ee"
+                              "globalReference" : "7d42756a",
+                              "externalReference" : "floatingLegResetDates"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "86b967ee"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USNY"
@@ -276,61 +257,56 @@
                                 "globalKey" : "27e4e9"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "3662e8ba"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                          "meta" : {
+                            "globalKey" : "7d42756a",
+                            "externalKey" : "floatingLegResetDates"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "dab28428"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "27e4e9"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "3662e8ba"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "159eb"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "2"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -339,20 +315,17 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedLegCalcPeriodDates",
-                            "globalKey" : "c852e52d"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2020-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
@@ -361,34 +334,20 @@
                                     "globalKey" : "27e4e9"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "3662e8ba"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "d5552f38"
-                              },
-                              "unadjustedDate" : "2020-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "d5552f38"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "4f6c376e"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "eb988f26"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USNY"
@@ -397,213 +356,253 @@
                                 "globalKey" : "27e4e9"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "3662e8ba"
                             }
                           },
-                          "paymentDaysOffset" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
                             "meta" : {
-                              "globalKey" : "ea4baf42"
+                              "globalKey" : "1a3b"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 2,
-                            "dayType" : "BUSINESS"
+                            "rollConvention" : "2"
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "ecec5783",
+                            "externalKey" : "fixedLegCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
                             "meta" : {
-                              "globalKey" : "0"
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4abf7e"
                             },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                            "dayType" : "Business"
+                          },
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "27e4e9"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "3662e8ba"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "5ddd0f5e",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "ad61ec42"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "8c120a28"
+                        "globalKey" : "f7636a6a"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "3fe60b5"
+                    "globalKey" : "6f4fc0f7"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "3fe60b5"
+                  "globalKey" : "6f4fc0f7"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "e84ab7ac"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "54f5dcc9"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-SOFR-COMPOUND"
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 100000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
                         }
                       }
-                    }
-                  },
-                  "quantity" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-SOFR-COMPOUND"
                         }
                       },
-                      "value" : 100000000
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "49c5bc57"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "f07fac52"
                   },
+                  "meta" : {
+                    "globalKey" : "fbce0222"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.02345,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.02345,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "1f75ddee"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "d18c5c37",
+                  "externalReference" : "partyB"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "7ffa3ef",
+                  "externalReference" : "partyA"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f129f"
-              },
-              "value" : "2018-10-31"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43401034-2"
+                  "value" : "ONB2-TEST-I"
+                },
+                "meta" : {
+                  "globalKey" : "c455d30c"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyA",
-                "globalReference" : "c6abc049"
+              "name" : {
+                "value" : "Michigan Avenue Bank - Executing Bank"
               },
               "meta" : {
-                "globalKey" : "914e117b"
+                "globalKey" : "7ffa3ef",
+                "externalKey" : "partyA"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43401034-2"
+                  "value" : "EVENTTEST1"
+                },
+                "meta" : {
+                  "globalKey" : "58b757a5"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyB",
-                "globalReference" : "a4bfd493"
+              "name" : {
+                "value" : "CMEEVENT1"
               },
               "meta" : {
-                "globalKey" : "914e117c"
+                "globalKey" : "d18c5c37",
+                "externalKey" : "partyB"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43401034-2"
+                  "value" : "SWAPSWIRE"
+                },
+                "meta" : {
+                  "globalKey" : "5b6941a5"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyC",
-                "globalReference" : "5b6941a5"
-              },
               "meta" : {
-                "globalKey" : "914e117d"
+                "globalKey" : "5b6941a5",
+                "externalKey" : "partyC"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "61d01508"
+            }
+          },
+          "meta" : {
+            "globalKey" : "61d01508"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "sentBy" : {
+      "value" : "CME"
+    },
+    "sentTo" : [ {
+      "value" : "CME"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-10-31T14:15:19.417Z",
-    "qualification" : "TRANSACTION_CREATION_DATE_TIME"
+    "qualification" : "transactionCreationDateTime"
   }, {
     "dateTime" : "2018-10-31T14:15:19.417Z",
-    "qualification" : "EVENT_SENT_DATE_TIME"
+    "qualification" : "eventSentDateTime"
   }, {
     "dateTime" : "2018-10-31T13:59:18Z",
-    "qualification" : "EXECUTION_DATE_TIME"
+    "qualification" : "executionDateTime"
   } ],
+  "action" : "New",
   "workflowState" : {
+    "workflowStatus" : "Submitted",
     "partyCustomisedWorkflow" : [ {
+      "partyName" : "ONB2-TEST-I",
       "customisedWorkflow" : [ {
         "itemName" : "ClientOrderId",
         "itemValue" : "43401034-2"
@@ -622,9 +621,9 @@
       }, {
         "itemName" : "PartyIdentifier",
         "itemValue" : "Custom"
-      } ],
-      "partyName" : "ONB2-TEST-I"
+      } ]
     }, {
+      "partyName" : "EVENTTEST1",
       "customisedWorkflow" : [ {
         "itemName" : "ClientOrderId",
         "itemValue" : "43401034-2"
@@ -643,9 +642,10 @@
       }, {
         "itemName" : "PartyIdentifier",
         "itemValue" : "Custom"
-      } ],
-      "partyName" : "EVENTTEST1"
-    } ],
-    "workflowStatus" : "SUBMITTED"
+      } ]
+    } ]
+  },
+  "meta" : {
+    "globalKey" : "1df84be2"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_OIS_Submission.json b/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_OIS_Submission.json
index 389f125bd5..00db19681f 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_OIS_Submission.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_OIS_Submission.json
@@ -1,91 +1,70 @@
 {
-  "action" : "NEW",
-  "messageInformation" : {
-    "sentBy" : {
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "2a0aa6fe"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "32e07a30"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "32e07a30"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "partyA",
-                "globalKey" : "c6abc049"
-              },
-              "name" : {
-                "value" : "Michigan Avenue Bank - Executing Bank"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "7ffa3ef",
+                "externalReference" : "partyA"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "ONB2-TEST-I"
-                },
-                "meta" : {
-                  "globalKey" : "c455d30c"
+                  "value" : "43400962-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "partyB",
-                "globalKey" : "a4bfd493"
-              },
-              "name" : {
-                "value" : "CMEEVENT1"
+                "globalKey" : "181c3bea"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "d18c5c37",
+                "externalReference" : "partyB"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "EVENTTEST1"
-                },
-                "meta" : {
-                  "globalKey" : "58b757a5"
+                  "value" : "43400962-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "partyC",
-                "globalKey" : "5b6941a5"
+                "globalKey" : "181cb049"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "5b6941a5",
+                "externalReference" : "partyC"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "SWAPSWIRE"
-                },
-                "meta" : {
-                  "globalKey" : "5b6941a5"
+                  "value" : "43400962-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "181d24a8"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-31",
+              "meta" : {
+                "globalKey" : "3f129f"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "partyB",
-                  "globalReference" : "a4bfd493"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "partyA",
-                  "globalReference" : "c6abc049"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
                         "value" : "InterestRateSwap"
@@ -99,45 +78,40 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "27e4e9"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "3662e8ba"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "159eb"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "2"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -146,20 +120,17 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegCalcPeriodDates",
-                            "globalKey" : "c852e52d"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2020-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
@@ -168,34 +139,20 @@
                                     "globalKey" : "27e4e9"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "3662e8ba"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "d5552f38"
-                              },
-                              "unadjustedDate" : "2020-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "d5552f38"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "1276de59"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "eb988f26"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USNY"
@@ -204,51 +161,72 @@
                                 "globalKey" : "27e4e9"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "3662e8ba"
                             }
                           },
-                          "paymentDaysOffset" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
                             "meta" : {
-                              "globalKey" : "ea4baf42"
+                              "globalKey" : "1a3b"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 2,
-                            "dayType" : "BUSINESS"
+                            "rollConvention" : "2"
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "ecec5783",
+                            "externalKey" : "floatingLegCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
                             "meta" : {
-                              "globalKey" : "0"
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4abf7e"
                             },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                            "dayType" : "Business"
+                          },
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "27e4e9"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "3662e8ba"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "5ddd0f5e",
+                            "externalKey" : "floatingLegPaymentDates"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingLegCalcPeriodDates",
-                            "globalReference" : "c852e52d"
+                            "globalReference" : "ecec5783",
+                            "externalReference" : "floatingLegCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodEndDate",
                           "fixingDates" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "69232be0"
+                              "globalKey" : "de7afde8"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
+                            "businessDayConvention" : "PRECEDING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USNY"
@@ -257,17 +235,20 @@
                                 "globalKey" : "27e4e9"
                               }
                             },
-                            "businessDayConvention" : "PRECEDING",
                             "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "39f11e0d"
+                              "globalReference" : "307a2b89",
+                              "externalReference" : "floatingLegResetDates"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "39f11e0d"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USNY"
@@ -276,61 +257,56 @@
                                 "globalKey" : "27e4e9"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "3662e8ba"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                          "meta" : {
+                            "globalKey" : "307a2b89",
+                            "externalKey" : "floatingLegResetDates"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "8dea3a47"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "27e4e9"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "3662e8ba"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "159eb"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "2"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -339,20 +315,17 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedLegCalcPeriodDates",
-                            "globalKey" : "c852e52d"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2020-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
@@ -361,34 +334,20 @@
                                     "globalKey" : "27e4e9"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "3662e8ba"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "d5552f38"
-                              },
-                              "unadjustedDate" : "2020-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "d5552f38"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "4f6c376e"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "eb988f26"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USNY"
@@ -397,213 +356,253 @@
                                 "globalKey" : "27e4e9"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "3662e8ba"
                             }
                           },
-                          "paymentDaysOffset" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
                             "meta" : {
-                              "globalKey" : "ea4baf42"
+                              "globalKey" : "1a3b"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 2,
-                            "dayType" : "BUSINESS"
+                            "rollConvention" : "2"
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "ecec5783",
+                            "externalKey" : "fixedLegCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
                             "meta" : {
-                              "globalKey" : "0"
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDaysOffset" : {
+                            "periodMultiplier" : 2,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "ea4abf7e"
                             },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                            "dayType" : "Business"
+                          },
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "27e4e9"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "3662e8ba"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "5ddd0f5e",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "ad61ec42"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "4805e207"
+                        "globalKey" : "b3574249"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "bff23894"
+                    "globalKey" : "2b4398d6"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "bff23894"
+                  "globalKey" : "2b4398d6"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "2d5dbd2c"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "35d60749"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-Federal Funds-H.15-OIS-COMPOUND"
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 100000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
                         }
                       }
-                    }
-                  },
-                  "quantity" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-Federal Funds-H.15-OIS-COMPOUND"
                         }
                       },
-                      "value" : 100000000
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "84eae1d7"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "368d7cd4"
                   },
+                  "meta" : {
+                    "globalKey" : "36f327a2"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.02226,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.02226,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "9b221dac"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "d18c5c37",
+                  "externalReference" : "partyB"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "7ffa3ef",
+                  "externalReference" : "partyA"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f129f"
-              },
-              "value" : "2018-10-31"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43400962-2"
+                  "value" : "ONB2-TEST-I"
+                },
+                "meta" : {
+                  "globalKey" : "c455d30c"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyA",
-                "globalReference" : "c6abc049"
+              "name" : {
+                "value" : "Michigan Avenue Bank - Executing Bank"
               },
               "meta" : {
-                "globalKey" : "a8754c0"
+                "globalKey" : "7ffa3ef",
+                "externalKey" : "partyA"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43400962-2"
+                  "value" : "EVENTTEST1"
+                },
+                "meta" : {
+                  "globalKey" : "58b757a5"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyB",
-                "globalReference" : "a4bfd493"
+              "name" : {
+                "value" : "CMEEVENT1"
               },
               "meta" : {
-                "globalKey" : "a8754c1"
+                "globalKey" : "d18c5c37",
+                "externalKey" : "partyB"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43400962-2"
+                  "value" : "SWAPSWIRE"
+                },
+                "meta" : {
+                  "globalKey" : "5b6941a5"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyC",
-                "globalReference" : "5b6941a5"
-              },
               "meta" : {
-                "globalKey" : "a8754c2"
+                "globalKey" : "5b6941a5",
+                "externalKey" : "partyC"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "566d7f0a"
+            }
+          },
+          "meta" : {
+            "globalKey" : "566d7f0a"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "sentBy" : {
+      "value" : "CME"
+    },
+    "sentTo" : [ {
+      "value" : "CME"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-10-31T14:15:55.608Z",
-    "qualification" : "TRANSACTION_CREATION_DATE_TIME"
+    "qualification" : "transactionCreationDateTime"
   }, {
     "dateTime" : "2018-10-31T14:15:55.608Z",
-    "qualification" : "EVENT_SENT_DATE_TIME"
+    "qualification" : "eventSentDateTime"
   }, {
     "dateTime" : "2018-10-31T13:57:57Z",
-    "qualification" : "EXECUTION_DATE_TIME"
+    "qualification" : "executionDateTime"
   } ],
+  "action" : "New",
   "workflowState" : {
+    "workflowStatus" : "Submitted",
     "partyCustomisedWorkflow" : [ {
+      "partyName" : "ONB2-TEST-I",
       "customisedWorkflow" : [ {
         "itemName" : "ClientOrderId",
         "itemValue" : "43400962-2"
@@ -622,9 +621,9 @@
       }, {
         "itemName" : "PartyIdentifier",
         "itemValue" : "Custom"
-      } ],
-      "partyName" : "ONB2-TEST-I"
+      } ]
     }, {
+      "partyName" : "EVENTTEST1",
       "customisedWorkflow" : [ {
         "itemName" : "ClientOrderId",
         "itemValue" : "43400962-2"
@@ -643,9 +642,10 @@
       }, {
         "itemName" : "PartyIdentifier",
         "itemValue" : "Custom"
-      } ],
-      "partyName" : "EVENTTEST1"
-    } ],
-    "workflowStatus" : "SUBMITTED"
+      } ]
+    } ]
+  },
+  "meta" : {
+    "globalKey" : "d63ff80"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_Swaption_Submission.json b/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_Swaption_Submission.json
index 5279e07262..8f79bc06b4 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_Swaption_Submission.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_Swaption_Submission.json
@@ -1,87 +1,66 @@
 {
-  "action" : "NEW",
-  "messageInformation" : {
-    "sentBy" : {
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "703ef8cf"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "cfb5221d"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "6159fe30"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "partyA",
-                "globalKey" : "c6abc049"
-              },
-              "name" : {
-                "value" : "Michigan Avenue Bank - Executing Bank"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "7ffa3ef",
+                "externalReference" : "partyA"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "ONB2-TEST-I"
-                },
-                "meta" : {
-                  "globalKey" : "c455d30c"
+                  "value" : "43400915-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "partyB",
-                "globalKey" : "a4bfd493"
-              },
-              "name" : {
-                "value" : "CMEEVENT1"
+                "globalKey" : "181a0152"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "d18c5c37",
+                "externalReference" : "partyB"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "EVENTTEST1"
-                },
-                "meta" : {
-                  "globalKey" : "58b757a5"
+                  "value" : "43400915-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "partyC",
-                "globalKey" : "5b6941a5"
+                "globalKey" : "181a75b1"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "5b6941a5",
+                "externalReference" : "partyC"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "SWAPSWIRE"
-                },
-                "meta" : {
-                  "globalKey" : "5b6941a5"
+                  "value" : "43400915-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "181aea10"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-31",
+              "meta" : {
+                "globalKey" : "3f129f"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "partyA",
-                  "globalReference" : "c6abc049"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "partyB",
-                  "globalReference" : "a4bfd493"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -90,30 +69,23 @@
                   } ],
                   "economicTerms" : {
                     "payout" : {
-                      "meta" : {
-                        "globalKey" : "f7ad5714"
-                      },
                       "optionPayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "buyerSeller" : {
-                          "buyer" : "PARTY_1",
-                          "seller" : "PARTY_2"
+                          "buyer" : "Party1",
+                          "seller" : "Party2"
                         },
                         "exerciseTerms" : {
                           "optionStyle" : {
                             "europeanExercise" : {
-                              "earliestExerciseTime" : {
-                                "businessCenter" : {
-                                  "value" : "USNY"
-                                },
-                                "hourMinuteTime" : "09:00:00"
-                              },
                               "expirationDate" : [ {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2018-11-30",
                                   "dateAdjustments" : {
+                                    "businessDayConvention" : "PRECEDING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "GBLO"
@@ -124,40 +96,41 @@
                                         "globalKey" : "42f910b"
                                       }
                                     },
-                                    "businessDayConvention" : "PRECEDING",
                                     "meta" : {
                                       "globalKey" : "7aafea48"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "6ffd81aa"
-                                  },
-                                  "unadjustedDate" : "2018-11-30"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "6ffd81aa"
                                 }
                               } ],
+                              "earliestExerciseTime" : {
+                                "hourMinuteTime" : "09:00:00",
+                                "businessCenter" : {
+                                  "value" : "USNY"
+                                }
+                              },
                               "expirationTime" : {
+                                "hourMinuteTime" : "11:00:00",
                                 "businessCenter" : {
                                   "value" : "USNY"
-                                },
-                                "hourMinuteTime" : "11:00:00"
+                                }
                               },
                               "meta" : {
-                                "externalKey" : "exercisePeriod",
-                                "globalKey" : "8bbcdd37"
+                                "globalKey" : "cfbec037",
+                                "externalKey" : "exercisePeriod"
                               }
                             }
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "f7ad5714"
-                        },
                         "underlier" : {
                           "contractualProduct" : {
                             "productTaxonomy" : [ {
-                              "source" : "OTHER",
+                              "source" : "Other",
                               "value" : {
                                 "name" : {
                                   "value" : "InterestRateSwap"
@@ -171,47 +144,40 @@
                               "payout" : {
                                 "interestRatePayout" : [ {
                                   "payerReceiver" : {
-                                    "payer" : "PARTY_2",
-                                    "receiver" : "PARTY_1"
+                                    "payer" : "Party2",
+                                    "receiver" : "Party1"
                                   },
                                   "priceQuantity" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
                                     "quantitySchedule" : {
                                       "address" : {
                                         "scope" : "DOCUMENT",
                                         "value" : "quantity-1"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "0"
                                     }
                                   },
-                                  "calculationPeriodDates" : {
-                                    "calculationPeriodDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        }, {
-                                          "value" : "USNY"
-                                        } ],
-                                        "meta" : {
-                                          "globalKey" : "42f910b"
+                                  "rateSpecification" : {
+                                    "floatingRate" : {
+                                      "rateOption" : {
+                                        "address" : {
+                                          "scope" : "DOCUMENT",
+                                          "value" : "rateOption-1"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
-                                        "globalKey" : "97b8e49c"
+                                        "globalKey" : "0"
                                       }
-                                    },
-                                    "calculationPeriodFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "12d1f"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3,
-                                      "rollConvention" : "4"
-                                    },
+                                    }
+                                  },
+                                  "dayCountFraction" : {
+                                    "value" : "ACT/360"
+                                  },
+                                  "calculationPeriodDates" : {
                                     "effectiveDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2018-12-04",
                                         "dateAdjustments" : {
                                           "businessDayConvention" : "NONE",
                                           "meta" : {
@@ -220,20 +186,17 @@
                                         },
                                         "meta" : {
                                           "globalKey" : "eceb093c"
-                                        },
-                                        "unadjustedDate" : "2018-12-04"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "eceb093c"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "floatingLegCalcPeriodDates",
-                                      "globalKey" : "41120a39"
-                                    },
                                     "terminationDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2021-12-04",
                                         "dateAdjustments" : {
+                                          "businessDayConvention" : "MODFOLLOWING",
                                           "businessCenters" : {
                                             "businessCenter" : [ {
                                               "value" : "GBLO"
@@ -244,34 +207,20 @@
                                               "globalKey" : "42f910b"
                                             }
                                           },
-                                          "businessDayConvention" : "MODFOLLOWING",
                                           "meta" : {
                                             "globalKey" : "97b8e49c"
                                           }
                                         },
                                         "meta" : {
                                           "globalKey" : "14a80d18"
-                                        },
-                                        "unadjustedDate" : "2021-12-04"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "14a80d18"
                                       }
-                                    }
-                                  },
-                                  "dayCountFraction" : {
-                                    "value" : "ACT/360"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "c4ddd44a"
-                                  },
-                                  "paymentDates" : {
-                                    "meta" : {
-                                      "externalKey" : "floatingLegPaymentDates",
-                                      "globalKey" : "637fde94"
                                     },
-                                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                    "paymentDatesAdjustments" : {
+                                    "calculationPeriodDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
                                       "businessCenters" : {
                                         "businessCenter" : [ {
                                           "value" : "GBLO"
@@ -282,44 +231,67 @@
                                           "globalKey" : "42f910b"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
                                         "globalKey" : "97b8e49c"
                                       }
                                     },
-                                    "paymentFrequency" : {
+                                    "calculationPeriodFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
                                       "meta" : {
-                                        "globalKey" : "956"
+                                        "globalKey" : "204b"
                                       },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3
+                                      "rollConvention" : "4"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "607eff13",
+                                      "externalKey" : "floatingLegCalcPeriodDates"
                                     }
                                   },
-                                  "rateSpecification" : {
-                                    "floatingRate" : {
+                                  "paymentDates" : {
+                                    "paymentFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
                                       "meta" : {
-                                        "globalKey" : "0"
-                                      },
-                                      "rateOption" : {
-                                        "address" : {
-                                          "scope" : "DOCUMENT",
-                                          "value" : "rateOption-1"
+                                        "globalKey" : "aa"
+                                      }
+                                    },
+                                    "payRelativeTo" : "CalculationPeriodEndDate",
+                                    "paymentDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        }, {
+                                          "value" : "USNY"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "42f910b"
                                         }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "97b8e49c"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "e18d000c",
+                                      "externalKey" : "floatingLegPaymentDates"
                                     }
                                   },
                                   "resetDates" : {
                                     "calculationPeriodDatesReference" : {
-                                      "externalReference" : "floatingLegCalcPeriodDates",
-                                      "globalReference" : "41120a39"
+                                      "globalReference" : "607eff13",
+                                      "externalReference" : "floatingLegCalcPeriodDates"
                                     },
+                                    "resetRelativeTo" : "CalculationPeriodStartDate",
                                     "fixingDates" : {
+                                      "periodMultiplier" : -2,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "3d9c8eea"
+                                        "globalKey" : "1a78799e"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : -2,
-                                      "dayType" : "BUSINESS",
+                                      "dayType" : "Business",
+                                      "businessDayConvention" : "NONE",
                                       "businessCenters" : {
                                         "businessCenter" : [ {
                                           "value" : "GBLO"
@@ -328,17 +300,20 @@
                                           "globalKey" : "21479e"
                                         }
                                       },
-                                      "businessDayConvention" : "NONE",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "floatingLegResetDates",
-                                        "globalReference" : "4e1ce8fe"
+                                        "globalReference" : "4f77242a",
+                                        "externalReference" : "floatingLegResetDates"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "floatingLegResetDates",
-                                      "globalKey" : "4e1ce8fe"
+                                    "resetFrequency" : {
+                                      "periodMultiplier" : 3,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "aa"
+                                      }
                                     },
                                     "resetDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
                                       "businessCenters" : {
                                         "businessCenter" : [ {
                                           "value" : "GBLO"
@@ -349,63 +324,56 @@
                                           "globalKey" : "42f910b"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
                                         "globalKey" : "97b8e49c"
                                       }
                                     },
-                                    "resetFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "956"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 3
-                                    },
-                                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                                    "meta" : {
+                                      "globalKey" : "4f77242a",
+                                      "externalKey" : "floatingLegResetDates"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "8a3c6c88"
                                   }
                                 }, {
                                   "payerReceiver" : {
-                                    "payer" : "PARTY_1",
-                                    "receiver" : "PARTY_2"
+                                    "payer" : "Party1",
+                                    "receiver" : "Party2"
                                   },
                                   "priceQuantity" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
                                     "quantitySchedule" : {
                                       "address" : {
                                         "scope" : "DOCUMENT",
                                         "value" : "quantity-2"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "0"
                                     }
                                   },
-                                  "calculationPeriodDates" : {
-                                    "calculationPeriodDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "GBLO"
-                                        }, {
-                                          "value" : "USNY"
-                                        } ],
-                                        "meta" : {
-                                          "globalKey" : "42f910b"
+                                  "rateSpecification" : {
+                                    "fixedRate" : {
+                                      "rateSchedule" : {
+                                        "price" : {
+                                          "address" : {
+                                            "scope" : "DOCUMENT",
+                                            "value" : "price-1"
+                                          }
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
-                                        "globalKey" : "97b8e49c"
+                                        "globalKey" : "0"
                                       }
-                                    },
-                                    "calculationPeriodFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "12d7c"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6,
-                                      "rollConvention" : "4"
-                                    },
+                                    }
+                                  },
+                                  "dayCountFraction" : {
+                                    "value" : "30/360"
+                                  },
+                                  "calculationPeriodDates" : {
                                     "effectiveDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2018-12-04",
                                         "dateAdjustments" : {
                                           "businessDayConvention" : "NONE",
                                           "meta" : {
@@ -414,20 +382,17 @@
                                         },
                                         "meta" : {
                                           "globalKey" : "eceb093c"
-                                        },
-                                        "unadjustedDate" : "2018-12-04"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "eceb093c"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "fixedLegCalcPeriodDates",
-                                      "globalKey" : "330fa43c"
-                                    },
                                     "terminationDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2021-12-04",
                                         "dateAdjustments" : {
+                                          "businessDayConvention" : "MODFOLLOWING",
                                           "businessCenters" : {
                                             "businessCenter" : [ {
                                               "value" : "GBLO"
@@ -438,34 +403,20 @@
                                               "globalKey" : "42f910b"
                                             }
                                           },
-                                          "businessDayConvention" : "MODFOLLOWING",
                                           "meta" : {
                                             "globalKey" : "97b8e49c"
                                           }
                                         },
                                         "meta" : {
                                           "globalKey" : "14a80d18"
-                                        },
-                                        "unadjustedDate" : "2021-12-04"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "14a80d18"
                                       }
-                                    }
-                                  },
-                                  "dayCountFraction" : {
-                                    "value" : "30/360"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "96b34c42"
-                                  },
-                                  "paymentDates" : {
-                                    "meta" : {
-                                      "externalKey" : "fixedLegPaymentDates",
-                                      "globalKey" : "637fde97"
                                     },
-                                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                    "paymentDatesAdjustments" : {
+                                    "calculationPeriodDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
                                       "businessCenters" : {
                                         "businessCenter" : [ {
                                           "value" : "GBLO"
@@ -476,231 +427,265 @@
                                           "globalKey" : "42f910b"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
                                         "globalKey" : "97b8e49c"
                                       }
                                     },
-                                    "paymentFrequency" : {
+                                    "calculationPeriodFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
                                       "meta" : {
-                                        "globalKey" : "959"
+                                        "globalKey" : "2b8e"
                                       },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6
+                                      "rollConvention" : "4"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "607f0a56",
+                                      "externalKey" : "fixedLegCalcPeriodDates"
                                     }
                                   },
-                                  "rateSpecification" : {
-                                    "fixedRate" : {
+                                  "paymentDates" : {
+                                    "paymentFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
                                       "meta" : {
-                                        "globalKey" : "0"
-                                      },
-                                      "rateSchedule" : {
-                                        "price" : {
-                                          "address" : {
-                                            "scope" : "DOCUMENT",
-                                            "value" : "price-1"
-                                          }
+                                        "globalKey" : "107"
+                                      }
+                                    },
+                                    "payRelativeTo" : "CalculationPeriodEndDate",
+                                    "paymentDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "GBLO"
+                                        }, {
+                                          "value" : "USNY"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "42f910b"
                                         }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "97b8e49c"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "9e5a4d0f",
+                                      "externalKey" : "fixedLegPaymentDates"
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "4ec9cf5a"
                                   }
                                 } ],
                                 "meta" : {
-                                  "globalKey" : "1edfa48c"
+                                  "globalKey" : "bf180be2"
                                 }
                               }
                             },
                             "meta" : {
-                              "globalKey" : "18c455f"
+                              "globalKey" : "a1c4acb5"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "18c455f"
+                            "globalKey" : "a1c4acb5"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "adcae16a"
                         }
-                      } ]
+                      } ],
+                      "meta" : {
+                        "globalKey" : "adcae16a"
+                      }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "f7ad5714"
+                    "globalKey" : "adcae16a"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "f7ad5714"
+                  "globalKey" : "adcae16a"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "7b78abf0"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 100000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
                     },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
+                    }
+                  } ],
+                  "observable" : {
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 100000000
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "2becf472"
                   },
+                  "meta" : {
+                    "globalKey" : "5332091c"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.02356,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.02356,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "51b199ce"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "7ffa3ef",
+                  "externalReference" : "partyA"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "d18c5c37",
+                  "externalReference" : "partyB"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f129f"
-              },
-              "value" : "2018-10-31"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43400915-2"
+                  "value" : "ONB2-TEST-I"
+                },
+                "meta" : {
+                  "globalKey" : "c455d30c"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyA",
-                "globalReference" : "c6abc049"
+              "name" : {
+                "value" : "Michigan Avenue Bank - Executing Bank"
               },
               "meta" : {
-                "globalKey" : "2296028"
+                "globalKey" : "7ffa3ef",
+                "externalKey" : "partyA"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43400915-2"
+                  "value" : "EVENTTEST1"
+                },
+                "meta" : {
+                  "globalKey" : "58b757a5"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyB",
-                "globalReference" : "a4bfd493"
+              "name" : {
+                "value" : "CMEEVENT1"
               },
               "meta" : {
-                "globalKey" : "2296029"
+                "globalKey" : "d18c5c37",
+                "externalKey" : "partyB"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43400915-2"
+                  "value" : "SWAPSWIRE"
+                },
+                "meta" : {
+                  "globalKey" : "5b6941a5"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyC",
-                "globalReference" : "5b6941a5"
-              },
               "meta" : {
-                "globalKey" : "229602a"
+                "globalKey" : "5b6941a5",
+                "externalKey" : "partyC"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "cbabdc70"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "d922164d"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "partyA",
-                  "globalReference" : "c6abc049"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "partyB",
-                  "globalReference" : "a4bfd493"
-                }
-              },
               "quantity" : {
+                "value" : 250,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "7ffa3ef",
+                  "externalReference" : "partyA"
                 },
-                "value" : 250
+                "receiverPartyReference" : {
+                  "globalReference" : "d18c5c37",
+                  "externalReference" : "partyB"
+                }
               },
               "settlementDate" : {
+                "unadjustedDate" : "2018-11-02",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "GBLO"
@@ -711,35 +696,49 @@
                       "globalKey" : "42f910b"
                     }
                   },
-                  "businessDayConvention" : "FOLLOWING",
                   "meta" : {
                     "globalKey" : "da556d3a"
                   }
-                },
-                "unadjustedDate" : "2018-11-02"
+                }
               },
               "transferExpression" : {
-                "priceTransfer" : "PREMIUM"
+                "priceTransfer" : "Premium"
               }
+            },
+            "meta" : {
+              "globalKey" : "d4f55491"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "b0607a21"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "sentBy" : {
+      "value" : "CME"
+    },
+    "sentTo" : [ {
+      "value" : "CME"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-10-31T14:16:26.588Z",
-    "qualification" : "TRANSACTION_CREATION_DATE_TIME"
+    "qualification" : "transactionCreationDateTime"
   }, {
     "dateTime" : "2018-10-31T14:16:26.588Z",
-    "qualification" : "EVENT_SENT_DATE_TIME"
+    "qualification" : "eventSentDateTime"
   }, {
     "dateTime" : "2018-10-31T13:56:35Z",
-    "qualification" : "EXECUTION_DATE_TIME"
+    "qualification" : "executionDateTime"
   } ],
+  "action" : "New",
   "workflowState" : {
+    "workflowStatus" : "Submitted",
     "partyCustomisedWorkflow" : [ {
+      "partyName" : "ONB2-TEST-I",
       "customisedWorkflow" : [ {
         "itemName" : "ClientOrderId",
         "itemValue" : "43400915-2"
@@ -758,9 +757,9 @@
       }, {
         "itemName" : "PartyIdentifier",
         "itemValue" : "Custom"
-      } ],
-      "partyName" : "ONB2-TEST-I"
+      } ]
     }, {
+      "partyName" : "EVENTTEST1",
       "customisedWorkflow" : [ {
         "itemName" : "ClientOrderId",
         "itemValue" : "43400915-2"
@@ -779,9 +778,10 @@
       }, {
         "itemName" : "PartyIdentifier",
         "itemValue" : "Custom"
-      } ],
-      "partyName" : "EVENTTEST1"
-    } ],
-    "workflowStatus" : "SUBMITTED"
+      } ]
+    } ]
+  },
+  "meta" : {
+    "globalKey" : "d3babb39"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_ZCS_Submission.json b/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_ZCS_Submission.json
index 96eeff7ff0..ba69ebe3ec 100644
--- a/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_ZCS_Submission.json
+++ b/rosetta-source/src/main/resources/result-json-files/cme-submission-irs-1-0/USD_ZCS_Submission.json
@@ -1,91 +1,70 @@
 {
-  "action" : "NEW",
-  "messageInformation" : {
-    "sentBy" : {
-      "value" : "CME"
-    },
-    "sentTo" : [ {
-      "value" : "CME"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "9bcf9cbb"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "b1e8ca6d"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "b1e8ca6d"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "partyA",
-                "globalKey" : "c6abc049"
-              },
-              "name" : {
-                "value" : "Michigan Avenue Bank - Executing Bank"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "7ffa3ef",
+                "externalReference" : "partyA"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "ONB2-TEST-I"
-                },
-                "meta" : {
-                  "globalKey" : "c455d30c"
+                  "value" : "43401224-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "partyB",
-                "globalKey" : "a4bfd493"
-              },
-              "name" : {
-                "value" : "CMEEVENT1"
+                "globalKey" : "196ca608"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "d18c5c37",
+                "externalReference" : "partyB"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "EVENTTEST1"
-                },
-                "meta" : {
-                  "globalKey" : "58b757a5"
+                  "value" : "43401224-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "partyC",
-                "globalKey" : "5b6941a5"
+                "globalKey" : "196d1a67"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "5b6941a5",
+                "externalReference" : "partyC"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
-                  "value" : "SWAPSWIRE"
-                },
-                "meta" : {
-                  "globalKey" : "5b6941a5"
+                  "value" : "43401224-2",
+                  "meta" : {
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "196d8ec6"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-31",
+              "meta" : {
+                "globalKey" : "3f129f"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "partyB",
-                  "globalReference" : "a4bfd493"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "partyA",
-                  "globalReference" : "c6abc049"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
                         "value" : "InterestRateSwap"
@@ -99,47 +78,40 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCenter" : [ {
-                                "value" : "GBLO"
-                              }, {
-                                "value" : "USNY"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "42f910b"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "97b8e49c"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d1d"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "2"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -148,20 +120,17 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegCalcPeriodDates",
-                            "globalKey" : "254b1fbb"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2019-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "GBLO"
@@ -172,35 +141,20 @@
                                     "globalKey" : "42f910b"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "97b8e49c"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "39cc8b9a"
-                              },
-                              "unadjustedDate" : "2019-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "39cc8b9a"
                             }
-                          }
-                        },
-                        "compoundingMethod" : "STRAIGHT",
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "98100ea9"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "floatingLegPaymentDates",
-                            "globalKey" : "637fdf6b"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -211,44 +165,67 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "a2d"
+                              "globalKey" : "2049"
                             },
-                            "period" : "T",
-                            "periodMultiplier" : 1
+                            "rollConvention" : "2"
+                          },
+                          "meta" : {
+                            "globalKey" : "bc0ee5d1",
+                            "externalKey" : "floatingLegCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "T",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                              "globalKey" : "73"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCenter" : [ {
+                                "value" : "GBLO"
+                              }, {
+                                "value" : "USNY"
+                              } ],
+                              "meta" : {
+                                "globalKey" : "42f910b"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "97b8e49c"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "902c5c23",
+                            "externalKey" : "floatingLegPaymentDates"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingLegCalcPeriodDates",
-                            "globalReference" : "254b1fbb"
+                            "globalReference" : "bc0ee5d1",
+                            "externalReference" : "floatingLegCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "3d9c8eea"
+                              "globalKey" : "1a78799e"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -257,17 +234,20 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "floatingLegResetDates",
-                              "globalReference" : "4e1ce8fe"
+                              "globalReference" : "4f77242a",
+                              "externalReference" : "floatingLegResetDates"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingLegResetDates",
-                            "globalKey" : "4e1ce8fe"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -278,53 +258,57 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "meta" : {
+                            "globalKey" : "4f77242a",
+                            "externalKey" : "floatingLegResetDates"
+                          }
+                        },
+                        "compoundingMethod" : "Straight",
+                        "meta" : {
+                          "globalKey" : "5289d023"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessDayConvention" : "NONE",
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
+                            },
                             "meta" : {
-                              "globalKey" : "24a738"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "25e2ab"
-                            },
-                            "period" : "T",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "NONE"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-11-02",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -333,20 +317,17 @@
                               },
                               "meta" : {
                                 "globalKey" : "ecea117a"
-                              },
-                              "unadjustedDate" : "2018-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ecea117a"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedLegCalcPeriodDates",
-                            "globalKey" : "96367c51"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2019-11-02",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "GBLO"
@@ -357,34 +338,48 @@
                                     "globalKey" : "42f910b"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "97b8e49c"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "39cc8b9a"
-                              },
-                              "unadjustedDate" : "2019-11-02"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "39cc8b9a"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "T",
+                            "meta" : {
+                              "globalKey" : "24b525"
+                            },
+                            "rollConvention" : "NONE"
+                          },
+                          "meta" : {
+                            "globalKey" : "99c6cdf1",
+                            "externalKey" : "fixedLegCalcPeriodDates"
                           }
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "cea683c3"
-                        },
                         "paymentDates" : {
-                          "meta" : {
-                            "externalKey" : "fixedLegPaymentDates",
-                            "globalKey" : "637fdf6b"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "T",
+                            "meta" : {
+                              "globalKey" : "73"
+                            }
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                          "payRelativeTo" : "CalculationPeriodEndDate",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -395,212 +390,216 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "97b8e49c"
                             }
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "a2d"
-                            },
-                            "period" : "T",
-                            "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "902c5c23",
+                            "externalKey" : "fixedLegPaymentDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                        "meta" : {
+                          "globalKey" : "6b90cd93"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "686b457a"
+                        "globalKey" : "f9576590"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "5747cd"
+                    "globalKey" : "914367e3"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "5747cd"
+                  "globalKey" : "914367e3"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "7b78abf0"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 100000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
                     },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
+                    }
+                  } ],
+                  "observable" : {
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "USD-LIBOR-BBA"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 100000000
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "173c8b0"
                   },
+                  "meta" : {
+                    "globalKey" : "5332091c"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.02178,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.02178,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "2d054d50"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "d18c5c37",
+                  "externalReference" : "partyB"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "7ffa3ef",
+                  "externalReference" : "partyA"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f129f"
-              },
-              "value" : "2018-10-31"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43401224-2"
+                  "value" : "ONB2-TEST-I"
+                },
+                "meta" : {
+                  "globalKey" : "c455d30c"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyA",
-                "globalReference" : "c6abc049"
+              "name" : {
+                "value" : "Michigan Avenue Bank - Executing Bank"
               },
               "meta" : {
-                "globalKey" : "f965af5e"
+                "globalKey" : "7ffa3ef",
+                "externalKey" : "partyA"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43401224-2"
+                  "value" : "EVENTTEST1"
+                },
+                "meta" : {
+                  "globalKey" : "58b757a5"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyB",
-                "globalReference" : "a4bfd493"
+              "name" : {
+                "value" : "CMEEVENT1"
               },
               "meta" : {
-                "globalKey" : "f965af5f"
+                "globalKey" : "d18c5c37",
+                "externalKey" : "partyB"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "43401224-2"
+                  "value" : "SWAPSWIRE"
+                },
+                "meta" : {
+                  "globalKey" : "5b6941a5"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "partyC",
-                "globalReference" : "5b6941a5"
-              },
               "meta" : {
-                "globalKey" : "f965af60"
+                "globalKey" : "5b6941a5",
+                "externalKey" : "partyC"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "77fbc8ed"
+            }
+          },
+          "meta" : {
+            "globalKey" : "77fbc8ed"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "sentBy" : {
+      "value" : "CME"
+    },
+    "sentTo" : [ {
+      "value" : "CME"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-10-31T14:12:29.654Z",
-    "qualification" : "TRANSACTION_CREATION_DATE_TIME"
+    "qualification" : "transactionCreationDateTime"
   }, {
     "dateTime" : "2018-10-31T14:12:29.654Z",
-    "qualification" : "EVENT_SENT_DATE_TIME"
+    "qualification" : "eventSentDateTime"
   }, {
     "dateTime" : "2018-10-31T14:03:01Z",
-    "qualification" : "EXECUTION_DATE_TIME"
+    "qualification" : "executionDateTime"
   } ],
+  "action" : "New",
   "workflowState" : {
+    "workflowStatus" : "Submitted",
     "partyCustomisedWorkflow" : [ {
+      "partyName" : "ONB2-TEST-I",
       "customisedWorkflow" : [ {
         "itemName" : "ClientOrderId",
         "itemValue" : "43401224-2"
@@ -619,9 +618,9 @@
       }, {
         "itemName" : "PartyIdentifier",
         "itemValue" : "Custom"
-      } ],
-      "partyName" : "ONB2-TEST-I"
+      } ]
     }, {
+      "partyName" : "EVENTTEST1",
       "customisedWorkflow" : [ {
         "itemName" : "ClientOrderId",
         "itemValue" : "43401224-2"
@@ -640,9 +639,10 @@
       }, {
         "itemName" : "PartyIdentifier",
         "itemValue" : "Custom"
-      } ],
-      "partyName" : "EVENTTEST1"
-    } ],
-    "workflowStatus" : "SUBMITTED"
+      } ]
+    } ]
+  },
+  "meta" : {
+    "globalKey" : "c63c6afd"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade1.json b/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade1.json
index be91487417..b08b18fab6 100644
--- a/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade1.json
+++ b/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade1.json
@@ -1,146 +1,119 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "meta" : {
-          "scheme" : "EventProcessingId"
-        },
-        "value" : "581067"
-      }
-    } ],
-    "issuerReference" : {
-      "externalReference" : "DTCCDEMO0321",
-      "globalReference" : "50f20d5"
-    },
-    "meta" : {
-      "globalKey" : "6f659a58"
-    }
-  }, {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "meta" : {
-          "scheme" : "EventProcessingId"
-        },
-        "value" : "581067"
-      }
-    } ],
-    "issuerReference" : {
-      "externalReference" : "DTCCDEMO0456",
-      "globalReference" : "50f24f8"
-    },
-    "meta" : {
-      "globalKey" : "6f659e7b"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "perFpMLReqmt"
-      },
-      "value" : "MKREQ1f"
-    },
-    "sentBy" : {
-      "value" : "DTCCDEMOSUB1"
-    },
-    "sentTo" : [ {
-      "value" : "DTCC"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "80f2617a"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "618f7d03"
-          },
-          "trade" : {
-            "collateral" : {
-              "independentAmount" : {
-                "payerPartyReference" : {
-                  "externalReference" : "DTCCDEMO0321",
-                  "globalReference" : "50f20d5"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "DTCCDEMO0456",
-                  "globalReference" : "50f24f8"
-                },
-                "paymentDetail" : [ {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "2003-10-01",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster",
                   "meta" : {
-                    "globalKey" : "a7568501"
+                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
+                  }
+                }
+              },
+              "vintage" : 2016
+            },
+            "meta" : {
+              "globalKey" : "b4b93928"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualDefinitionsType" : [ {
+                  "value" : "ISDA2014Credit",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+                  }
+                } ],
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/matrix-type"
+                    }
                   },
-                  "paymentRule" : {
-                    "percentageRule" : {
-                      "notionalAmountReference" : {
-                        "externalReference" : "calculationAmount",
-                        "globalReference" : "0"
-                      },
-                      "paymentPercent" : 0.02
+                  "matrixTerm" : {
+                    "value" : "StandardAsiaCorporate",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/credit-matrix-transaction-type"
                     }
                   }
                 } ]
               }
             },
             "meta" : {
-              "globalKey" : "c8e59ab6"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "DTCCDEMO0321",
-                "globalKey" : "50f20d5"
+              "globalKey" : "b2984c06"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "50f20d5",
+                "externalReference" : "DTCCDEMO0321"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "D_0423_R1_S6_3Assgn",
                   "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCCDEMO0321"
-                },
-                "meta" : {
-                  "globalKey" : "50f20d5"
+                    "scheme" : "TradeRefNbr"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "DTCCDEMO0456",
-                "globalKey" : "50f24f8"
+                "globalKey" : "e4e5589b"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "50f24f8",
+                "externalReference" : "DTCCDEMO0456"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "D_0423_R1_S6_3Assgn",
                   "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCCDEMO0456"
-                },
+                    "scheme" : "TradeRefNbr"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e6c6bd98"
+              }
+            }, {
+              "issuer" : {
+                "value" : "UAL001",
                 "meta" : {
-                  "globalKey" : "50f24f8"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
+              },
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "USIA010555",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/Unique-transaction-identifier"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "34d1440b"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2017-05-30",
+              "meta" : {
+                "globalKey" : "3f095e"
+              }
+            },
             "tradableProduct" : {
-              "ancillaryParty" : [ {
-                "partyReference" : [ {
-                  "externalReference" : "DTCCDEMO0321",
-                  "globalReference" : "50f20d5"
-                } ],
-                "role" : "CALCULATION_AGENT_INDEPENDENT"
-              } ],
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "DTCCDEMO0321",
-                  "globalReference" : "50f20d5"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "DTCCDEMO0456",
-                  "globalReference" : "50f24f8"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -148,400 +121,429 @@
                     "productQualifier" : "CreditDefaultSwap_SingleName"
                   } ],
                   "economicTerms" : {
-                    "calculationAgent" : {
-                      "calculationAgentBusinessCenter" : {
-                        "meta" : {
-                          "scheme" : "http://www.fpml.org/spec/2000/business-center"
-                        },
-                        "value" : "GBLO"
-                      },
-                      "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-                    },
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2017-05-31",
                         "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
                             "globalKey" : "3a4b88ab"
                           }
                         },
                         "meta" : {
                           "globalKey" : "26edb64a"
-                        },
-                        "unadjustedDate" : "2017-05-31"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "26edb64a"
                       }
                     },
-                    "payout" : {
-                      "creditDefaultPayout" : {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
-                        },
-                        "priceQuantity" : {
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2022-03-20",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "generalTerms" : {
-                          "referenceInformation" : {
-                            "referenceEntity" : {
-                              "entityId" : [ {
-                                "meta" : {
-                                  "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED"
-                                },
-                                "value" : "21657K"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "a16dcbbc"
-                              },
-                              "name" : {
-                                "meta" : {
-                                  "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
-                                },
-                                "value" : "PFIZED INC."
-                              }
-                            },
-                            "referenceObligation" : [ {
-                              "security" : {
-                                "productIdentifier" : [ {
-                                  "value" : {
-                                    "identifier" : {
-                                      "meta" : {
-                                        "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
-                                      },
-                                      "value" : "US635405AQ55"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "fbdc209e"
-                                    },
-                                    "source" : "ISIN"
-                                  }
-                                } ],
-                                "securityType" : "DEBT"
-                              }
-                            } ]
+                            "globalKey" : "3a4b88ab"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "691ab472"
+                          "globalKey" : "2781d47f"
                         }
                       },
+                      "meta" : {
+                        "globalKey" : "2781d47f"
+                      }
+                    },
+                    "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "calculationPeriodDates" : {
                           "firstPeriodStartDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2017-03-20",
                               "meta" : {
                                 "globalKey" : "3f08d4"
-                              },
-                              "unadjustedDate" : "2017-03-20"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "3f08d4"
                             }
                           },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
                           "meta" : {
-                            "globalKey" : "28c1432d"
+                            "globalKey" : "4527fe47"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "158c626c"
-                        },
                         "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
                           "firstPaymentDate" : "2017-06-20",
                           "meta" : {
-                            "globalKey" : "a7bba742"
+                            "globalKey" : "a7bb9e96"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "69541770"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
+                        "generalTerms" : {
+                          "referenceInformation" : {
+                            "referenceEntity" : {
+                              "entityId" : [ {
+                                "value" : "21657K",
+                                "meta" : {
+                                  "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED"
                                 }
+                              } ],
+                              "name" : {
+                                "value" : "PFIZED INC.",
+                                "meta" : {
+                                  "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "a16dcbbc"
                               }
-                            }
+                            },
+                            "referenceObligation" : [ {
+                              "security" : {
+                                "productIdentifier" : [ {
+                                  "value" : {
+                                    "identifier" : {
+                                      "value" : "US635405AQ55",
+                                      "meta" : {
+                                        "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
+                                      }
+                                    },
+                                    "source" : "ISIN",
+                                    "meta" : {
+                                      "globalKey" : "fbdc209e"
+                                    }
+                                  }
+                                } ],
+                                "securityType" : "Debt"
+                              }
+                            } ]
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "691ab472"
                         }
-                      } ],
+                      },
                       "meta" : {
-                        "globalKey" : "2f77493a"
+                        "globalKey" : "2168b3e2"
                       }
                     },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
+                    "calculationAgent" : {
+                      "calculationAgentParty" : "CalculationAgentIndependent",
+                      "calculationAgentBusinessCenter" : {
+                        "value" : "GBLO",
                         "meta" : {
-                          "globalKey" : "2781d47f"
-                        },
-                        "unadjustedDate" : "2022-03-20"
-                      },
-                      "meta" : {
-                        "globalKey" : "2781d47f"
+                          "scheme" : "http://www.fpml.org/spec/2000/business-center"
+                        }
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "85bcbe03"
+                    "globalKey" : "5cb5889f"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "85bcbe03"
+                  "globalKey" : "5cb5889f"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "1f273178"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0100,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "value" : 0.0100,
                       "perUnitOf" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "48eb1e55"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "c5befd88"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 1000000,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
-                      },
-                      "value" : 1000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "d478ac4b"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "50f20d5",
+                  "externalReference" : "DTCCDEMO0321"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "50f24f8",
+                  "externalReference" : "DTCCDEMO0456"
+                }
+              } ],
+              "ancillaryParty" : [ {
+                "role" : "CalculationAgentIndependent",
+                "partyReference" : [ {
+                  "globalReference" : "50f20d5",
+                  "externalReference" : "DTCCDEMO0321"
                 } ]
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f095e"
-              },
-              "value" : "2017-05-30"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCCDEMO0321",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "D_0423_R1_S6_3Assgn"
+                    "scheme" : "DTCC"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "50f20d5"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "DTCCDEMO0321",
-                "globalReference" : "50f20d5"
-              },
               "meta" : {
-                "globalKey" : "7323a265"
+                "globalKey" : "50f20d5",
+                "externalKey" : "DTCCDEMO0321"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCCDEMO0456",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "D_0423_R1_S6_3Assgn"
+                    "scheme" : "DTCC"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "50f24f8"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "DTCCDEMO0456",
-                "globalReference" : "50f24f8"
-              },
               "meta" : {
-                "globalKey" : "7323a688"
+                "globalKey" : "50f24f8",
+                "externalKey" : "DTCCDEMO0456"
               }
-            }, {
-              "assignedIdentifier" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/Unique-transaction-identifier"
-                  },
-                  "value" : "USIA010555"
-                }
-              } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+            } ],
+            "collateral" : {
+              "independentAmount" : {
+                "payerPartyReference" : {
+                  "globalReference" : "50f20d5",
+                  "externalReference" : "DTCCDEMO0321"
                 },
-                "value" : "UAL001"
-              },
-              "meta" : {
-                "globalKey" : "a66c948d"
+                "receiverPartyReference" : {
+                  "globalReference" : "50f24f8",
+                  "externalReference" : "DTCCDEMO0456"
+                },
+                "paymentDetail" : [ {
+                  "paymentRule" : {
+                    "percentageRule" : {
+                      "paymentPercent" : 0.02,
+                      "notionalAmountReference" : {
+                        "globalReference" : "0",
+                        "externalReference" : "calculationAmount"
+                      }
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "a7568501"
+                  }
+                } ]
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "ecde11ca"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "1e916af9"
-            },
             "transfer" : {
               "quantity" : {
+                "value" : 67000,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/ext/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
-                },
-                "value" : 67000
+                }
               },
               "settlementDate" : {
                 "unadjustedDate" : "2017-06-02"
               }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "2003-10-01",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "meta" : {
-                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
-                  },
-                  "value" : "ISDA_MASTER"
-                }
-              },
-              "vintage" : 2016
-            },
-            "meta" : {
-              "globalKey" : "b4b93928"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualDefinitionsType" : [ {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-                  },
-                  "value" : "ISDA_2014_CREDIT"
-                } ],
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/credit-matrix-transaction-type"
-                    },
-                    "value" : "STANDARD_ASIA_CORPORATE"
-                  },
-                  "matrixType" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/matrix-type"
-                    },
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-                  }
-                } ]
-              }
             },
             "meta" : {
-              "globalKey" : "31db6986"
+              "globalKey" : "1e916af9"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "6de9bc6f"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "MKREQ1f",
+      "meta" : {
+        "scheme" : "perFpMLReqmt"
+      }
+    },
+    "sentBy" : {
+      "value" : "DTCCDEMOSUB1"
+    },
+    "sentTo" : [ {
+      "value" : "DTCC"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2007-10-31T18:08:40.335-05:00",
-    "qualification" : "EVENT_SUBMITTED_DATE_TIME"
+    "qualification" : "eventSubmittedDateTime"
   }, {
     "dateTime" : "2007-10-31T18:08:40.335-05:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "issuerReference" : {
+      "globalReference" : "50f20d5",
+      "externalReference" : "DTCCDEMO0321"
+    },
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "581067",
+        "meta" : {
+          "scheme" : "EventProcessingId"
+        }
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "191ab14e"
+    }
+  }, {
+    "issuerReference" : {
+      "globalReference" : "50f24f8",
+      "externalReference" : "DTCCDEMO0456"
+    },
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "581067",
+        "meta" : {
+          "scheme" : "EventProcessingId"
+        }
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "1afc164b"
+    }
   } ],
+  "action" : "New",
   "workflowState" : {
+    "workflowStatus" : "Submitted",
     "partyCustomisedWorkflow" : [ {
+      "partyReference" : {
+        "globalReference" : "50f20d5",
+        "externalReference" : "DTCCDEMO0321"
+      },
       "customisedWorkflow" : [ {
         "itemName" : "comment",
         "itemValue" : "New DTCCDEMO0321 Trade for XXX notional"
@@ -563,12 +565,12 @@
       }, {
         "itemName" : "branchLocation",
         "itemValue" : "water street 1"
-      } ],
-      "partyReference" : {
-        "externalReference" : "DTCCDEMO0321",
-        "globalReference" : "50f20d5"
-      }
+      } ]
     }, {
+      "partyReference" : {
+        "globalReference" : "50f24f8",
+        "externalReference" : "DTCCDEMO0456"
+      },
       "customisedWorkflow" : [ {
         "itemName" : "comment",
         "itemValue" : "New DTCCDEMO0456 Trade for XXX notional"
@@ -590,13 +592,11 @@
       }, {
         "itemName" : "branchLocation",
         "itemValue" : "water street 2"
-      } ],
-      "partyReference" : {
-        "externalReference" : "DTCCDEMO0456",
-        "globalReference" : "50f24f8"
-      }
+      } ]
     } ],
-    "warehouseIdentity" : "DTCC_TIW_GOLD",
-    "workflowStatus" : "SUBMITTED"
+    "warehouseIdentity" : "DTCC_TIW_Gold"
+  },
+  "meta" : {
+    "globalKey" : "a602e72e"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade2.json b/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade2.json
index 7dfe890ae9..1fc2adb049 100644
--- a/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade2.json
+++ b/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade2.json
@@ -1,126 +1,122 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "issuerReference" : {
-      "externalReference" : "DTCC00001234",
-      "globalReference" : "c01a15e4"
-    },
-    "meta" : {
-      "globalKey" : "5d63d132"
-    }
-  }, {
-    "issuerReference" : {
-      "externalReference" : "DTCC00005678",
-      "globalReference" : "bfffbd41"
-    },
-    "meta" : {
-      "globalKey" : "5d65b232"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "perFpMLReqmt"
-      },
-      "value" : "MSERV20181008.0004086555"
-    },
-    "sentBy" : {
-      "value" : "MarkitSERV"
-    },
-    "sentTo" : [ {
-      "value" : "DTCC"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "255a429e"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "2006-05-01",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster",
+                  "meta" : {
+                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
+                  }
+                }
+              },
+              "vintage" : 2002
+            },
+            "meta" : {
+              "globalKey" : "29b7f6da"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualDefinitionsType" : [ {
+                  "value" : "ISDA2014Credit",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+                  }
+                } ],
+                "contractualTermsSupplement" : [ {
+                  "contractualTermsSupplementType" : {
+                    "value" : "iTraxxEurope",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/contractual-supplement"
+                    }
+                  },
+                  "publicationDate" : "2014-09-20"
+                }, {
+                  "contractualTermsSupplementType" : {
+                    "value" : "iTraxxEuropeSwaption",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/ext/swaption-supplement"
+                    }
+                  },
+                  "publicationDate" : "2017-03-20"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "c08a3ed2"
+            }
+          } ]
+        }
+      },
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "1f5688e"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "352fb7c4"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "DTCC00001234",
-                "globalKey" : "c01a15e4"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "c01a15e4",
+                "externalReference" : "DTCC00001234"
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCC00001234"
-                },
-                "meta" : {
-                  "globalKey" : "5d63d132"
-                }
-              }, {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "810RI27100804CP",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "DTCCZBUT11V806EZRVTWT807"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "dd44cc56"
+                    "scheme" : "TradeRefNbr"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "DTCC00005678",
-                "globalKey" : "bfffbd41"
+                "globalKey" : "1e5c4c79"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "bfffbd41",
+                "externalReference" : "DTCC00005678"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "810RI27100803",
                   "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCC00005678"
-                },
+                    "scheme" : "TradeRefNbr"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "d2db4a8b"
+              }
+            }, {
+              "issuer" : {
+                "value" : "1030229152",
                 "meta" : {
-                  "globalKey" : "5d65b232"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              }, {
+              },
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "IL196459337",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "DTCC7H6GLXDRUGQFU57RNE97"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "283f4b3"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "ee859c79"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-07-17",
+              "meta" : {
+                "globalKey" : "3f11d1"
+              }
+            },
             "tradableProduct" : {
-              "ancillaryParty" : [ {
-                "partyReference" : [ {
-                  "externalReference" : "DTCC00005678",
-                  "globalReference" : "bfffbd41"
-                } ],
-                "role" : "CALCULATION_AGENT_INDEPENDENT"
-              } ],
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "DTCC00001234",
-                  "globalReference" : "c01a15e4"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "DTCC00005678",
-                  "globalReference" : "bfffbd41"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -128,90 +124,81 @@
                     "productQualifier" : "CreditDefaultSwaption"
                   } ],
                   "economicTerms" : {
-                    "calculationAgent" : {
-                      "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-                    },
                     "payout" : {
-                      "meta" : {
-                        "globalKey" : "3b77bac1"
-                      },
                       "optionPayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "settlementTerms" : {
+                          "settlementType" : "Physical",
                           "meta" : {
                             "globalKey" : "f3b1d0d7"
-                          },
-                          "settlementType" : "PHYSICAL"
+                          }
                         },
                         "buyerSeller" : {
-                          "buyer" : "PARTY_1",
-                          "seller" : "PARTY_2"
+                          "buyer" : "Party1",
+                          "seller" : "Party2"
                         },
+                        "optionType" : "Put",
                         "exerciseTerms" : {
-                          "exerciseProcedure" : {
-                            "followUpConfirmation" : true
-                          },
                           "optionStyle" : {
                             "europeanExercise" : {
-                              "earliestExerciseTime" : {
-                                "hourMinuteTime" : "00:00:00"
-                              },
                               "expirationDate" : [ {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2018-09-19",
                                   "dateAdjustments" : {
-                                    "businessDayConvention" : "NOT_APPLICABLE",
+                                    "businessDayConvention" : "NotApplicable",
                                     "meta" : {
                                       "globalKey" : "3a4b88ab"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "270f523e"
-                                  },
-                                  "unadjustedDate" : "2018-09-19"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "270f523e"
                                 }
                               } ],
+                              "earliestExerciseTime" : {
+                                "hourMinuteTime" : "00:00:00"
+                              },
                               "expirationTime" : {
                                 "hourMinuteTime" : "23:00:00"
                               },
                               "meta" : {
-                                "globalKey" : "119e60c"
+                                "globalKey" : "ef162e8c"
                               }
                             }
                           },
                           "strike" : {
                             "strikePrice" : {
+                              "value" : 0.0003000,
                               "unit" : {
                                 "currency" : {
+                                  "value" : "EUR",
                                   "meta" : {
                                     "scheme" : "http://www.fpml.org/ext/iso4217"
-                                  },
-                                  "value" : "EUR"
+                                  }
                                 }
                               },
-                              "value" : 0.0003000,
-                              "arithmeticOperator" : "ADD",
                               "perUnitOf" : {
                                 "currency" : {
+                                  "value" : "EUR",
                                   "meta" : {
                                     "scheme" : "http://www.fpml.org/ext/iso4217"
-                                  },
-                                  "value" : "EUR"
+                                  }
                                 }
                               },
-                              "priceType" : "INTEREST_RATE"
+                              "priceType" : "InterestRate",
+                              "arithmeticOperator" : "Add"
                             }
+                          },
+                          "exerciseProcedure" : {
+                            "followUpConfirmation" : true
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "3b77bac1"
-                        },
-                        "optionType" : "PUT",
                         "underlier" : {
                           "contractualProduct" : {
                             "productTaxonomy" : [ {
@@ -221,87 +208,58 @@
                             "economicTerms" : {
                               "effectiveDate" : {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2018-03-20",
                                   "dateAdjustments" : {
-                                    "businessDayConvention" : "NOT_APPLICABLE",
+                                    "businessDayConvention" : "NotApplicable",
                                     "meta" : {
                                       "globalKey" : "3a4b88ab"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "2709b47f"
-                                  },
-                                  "unadjustedDate" : "2018-03-20"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "2709b47f"
                                 }
                               },
-                              "payout" : {
-                                "creditDefaultPayout" : {
-                                  "payerReceiver" : {
-                                    "payer" : "PARTY_2",
-                                    "receiver" : "PARTY_1"
-                                  },
-                                  "priceQuantity" : {
+                              "terminationDate" : {
+                                "adjustableDate" : {
+                                  "unadjustedDate" : "2023-06-20",
+                                  "dateAdjustments" : {
+                                    "businessDayConvention" : "NotApplicable",
                                     "meta" : {
-                                      "externalKey" : "calculationAmount",
-                                      "globalKey" : "0"
-                                    },
-                                    "quantitySchedule" : {
-                                      "address" : {
-                                        "scope" : "DOCUMENT",
-                                        "value" : "quantity-1"
-                                      }
-                                    }
-                                  },
-                                  "generalTerms" : {
-                                    "indexReferenceInformation" : {
-                                      "indexId" : [ {
-                                        "meta" : {
-                                          "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair"
-                                        },
-                                        "value" : "2I667KFN3"
-                                      } ],
-                                      "indexName" : {
-                                        "meta" : {
-                                          "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
-                                        },
-                                        "value" : "ITRAXX EUROPE CROSSOVER SERIES 29 VERSION 1"
-                                      },
-                                      "meta" : {
-                                        "globalKey" : "950d2f55"
-                                      }
+                                      "globalKey" : "3a4b88ab"
                                     }
                                   },
                                   "meta" : {
-                                    "globalKey" : "9ade1f56"
+                                    "globalKey" : "27a2ad3f"
                                   }
                                 },
+                                "meta" : {
+                                  "globalKey" : "27a2ad3f"
+                                }
+                              },
+                              "payout" : {
                                 "interestRatePayout" : [ {
                                   "payerReceiver" : {
-                                    "payer" : "PARTY_1",
-                                    "receiver" : "PARTY_2"
+                                    "payer" : "Party1",
+                                    "receiver" : "Party2"
                                   },
                                   "priceQuantity" : {
-                                    "meta" : {
-                                      "externalKey" : "calculationAmount",
-                                      "globalKey" : "0"
-                                    },
                                     "quantitySchedule" : {
                                       "address" : {
                                         "scope" : "DOCUMENT",
                                         "value" : "quantity-1"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "0",
+                                      "externalKey" : "calculationAmount"
                                     }
                                   },
-                                  "meta" : {
-                                    "globalKey" : "58b93681"
-                                  },
                                   "rateSpecification" : {
                                     "fixedRate" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
                                       "rateSchedule" : {
                                         "price" : {
                                           "address" : {
@@ -309,276 +267,320 @@
                                             "value" : "price-1"
                                           }
                                         }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "0"
                                       }
                                     }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "58b93681"
                                   }
                                 } ],
-                                "meta" : {
-                                  "globalKey" : "4e059fd7"
-                                }
-                              },
-                              "terminationDate" : {
-                                "adjustableDate" : {
-                                  "dateAdjustments" : {
-                                    "businessDayConvention" : "NOT_APPLICABLE",
+                                "creditDefaultPayout" : {
+                                  "payerReceiver" : {
+                                    "payer" : "Party2",
+                                    "receiver" : "Party1"
+                                  },
+                                  "priceQuantity" : {
+                                    "quantitySchedule" : {
+                                      "address" : {
+                                        "scope" : "DOCUMENT",
+                                        "value" : "quantity-1"
+                                      }
+                                    },
                                     "meta" : {
-                                      "globalKey" : "3a4b88ab"
+                                      "globalKey" : "0",
+                                      "externalKey" : "calculationAmount"
                                     }
                                   },
-                                  "meta" : {
-                                    "globalKey" : "27a2ad3f"
+                                  "generalTerms" : {
+                                    "indexReferenceInformation" : {
+                                      "indexName" : {
+                                        "value" : "ITRAXX EUROPE CROSSOVER SERIES 29 VERSION 1",
+                                        "meta" : {
+                                          "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
+                                        }
+                                      },
+                                      "indexId" : [ {
+                                        "value" : "2I667KFN3",
+                                        "meta" : {
+                                          "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair"
+                                        }
+                                      } ],
+                                      "meta" : {
+                                        "globalKey" : "a36eae15"
+                                      }
+                                    }
                                   },
-                                  "unadjustedDate" : "2023-06-20"
+                                  "meta" : {
+                                    "globalKey" : "a93f9e16"
+                                  }
                                 },
                                 "meta" : {
-                                  "globalKey" : "27a2ad3f"
+                                  "globalKey" : "2c4cfcf5"
                                 }
                               }
                             },
                             "meta" : {
-                              "globalKey" : "f4836429"
+                              "globalKey" : "4d49d15"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "f4836429"
+                            "globalKey" : "4d49d15"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "c7285305"
                         }
-                      } ]
+                      } ],
+                      "meta" : {
+                        "globalKey" : "c7285305"
+                      }
+                    },
+                    "calculationAgent" : {
+                      "calculationAgentParty" : "CalculationAgentIndependent"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "12b52417"
+                    "globalKey" : "eaab8eaf"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "12b52417"
+                  "globalKey" : "eaab8eaf"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "7476ef6c"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0500000000,
                       "unit" : {
                         "currency" : {
+                          "value" : "EUR",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "EUR"
+                          }
                         }
                       },
-                      "value" : 0.0500000000,
                       "perUnitOf" : {
                         "currency" : {
+                          "value" : "EUR",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "EUR"
+                          }
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "99d6ddfe"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "1a66fe14"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 15000000.00000,
                       "unit" : {
                         "currency" : {
+                          "value" : "EUR",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "EUR"
+                          }
                         }
-                      },
-                      "value" : 15000000.00000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a104e1c2"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "c01a15e4",
+                  "externalReference" : "DTCC00001234"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "bfffbd41",
+                  "externalReference" : "DTCC00005678"
+                }
+              } ],
+              "ancillaryParty" : [ {
+                "role" : "CalculationAgentIndependent",
+                "partyReference" : [ {
+                  "globalReference" : "bfffbd41",
+                  "externalReference" : "DTCC00005678"
                 } ]
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f11d1"
-              },
-              "value" : "2018-07-17"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCC00001234",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "810RI27100804CP"
+                    "scheme" : "DTCC"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "5d63d132"
                 }
-              } ],
-              "issuerReference" : {
-                "externalReference" : "DTCC00001234",
-                "globalReference" : "c01a15e4"
-              },
-              "meta" : {
-                "globalKey" : "d335c55d"
-              }
-            }, {
-              "assignedIdentifier" : [ {
+              }, {
                 "identifier" : {
+                  "value" : "DTCCZBUT11V806EZRVTWT807",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "810RI27100803"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "dd44cc56"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "DTCC00005678",
-                "globalReference" : "bfffbd41"
-              },
               "meta" : {
-                "globalKey" : "98eca8ef"
+                "globalKey" : "c01a15e4",
+                "externalKey" : "DTCC00001234"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCC00005678",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "IL196459337"
-                }
-              } ],
-              "issuer" : {
+                    "scheme" : "DTCC"
+                  }
+                },
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "5d65b232"
+                }
+              }, {
+                "identifier" : {
+                  "value" : "DTCC7H6GLXDRUGQFU57RNE97",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "1030229152"
-              },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "283f4b3"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "6c541efb"
+                "globalKey" : "bfffbd41",
+                "externalKey" : "DTCC00005678"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "6a989c60"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "d83299ca"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "DTCC00001234",
-                  "globalReference" : "c01a15e4"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "DTCC00005678",
-                  "globalReference" : "bfffbd41"
-                }
-              },
               "quantity" : {
+                "value" : 137437.50000,
                 "unit" : {
                   "currency" : {
+                    "value" : "EUR",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/ext/iso4217"
-                    },
-                    "value" : "EUR"
+                    }
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "c01a15e4",
+                  "externalReference" : "DTCC00001234"
                 },
-                "value" : 137437.50000
+                "receiverPartyReference" : {
+                  "globalReference" : "bfffbd41",
+                  "externalReference" : "DTCC00005678"
+                }
               },
               "settlementDate" : {
+                "unadjustedDate" : "2018-07-20",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
-                },
-                "unadjustedDate" : "2018-07-20"
-              },
-              "transferExpression" : {
-                "priceTransfer" : "PREMIUM"
-              }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "2006-05-01",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "meta" : {
-                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
-                  },
-                  "value" : "ISDA_MASTER"
                 }
               },
-              "vintage" : 2002
-            },
-            "meta" : {
-              "globalKey" : "29b7f6da"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualDefinitionsType" : [ {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-                  },
-                  "value" : "ISDA_2014_CREDIT"
-                } ],
-                "contractualTermsSupplement" : [ {
-                  "contractualTermsSupplementType" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/contractual-supplement"
-                    },
-                    "value" : "I_TRAXX_EUROPE"
-                  },
-                  "publicationDate" : "2014-09-20"
-                }, {
-                  "contractualTermsSupplementType" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/ext/swaption-supplement"
-                    },
-                    "value" : "I_TRAXX_EUROPE_SWAPTION"
-                  },
-                  "publicationDate" : "2017-03-20"
-                } ]
+              "transferExpression" : {
+                "priceTransfer" : "Premium"
               }
             },
             "meta" : {
-              "globalKey" : "c08a3ed2"
+              "globalKey" : "2d5a4fa2"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "15689402"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "MSERV20181008.0004086555",
+      "meta" : {
+        "scheme" : "perFpMLReqmt"
+      }
+    },
+    "sentBy" : {
+      "value" : "MarkitSERV"
+    },
+    "sentTo" : [ {
+      "value" : "DTCC"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-10-08T05:57:52.137-05:00",
-    "qualification" : "EVENT_SUBMITTED_DATE_TIME"
+    "qualification" : "eventSubmittedDateTime"
   }, {
     "dateTime" : "2018-10-08T10:58:02.462Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "issuerReference" : {
+      "globalReference" : "c01a15e4",
+      "externalReference" : "DTCC00001234"
+    },
+    "meta" : {
+      "globalKey" : "5d63d132"
+    }
+  }, {
+    "issuerReference" : {
+      "globalReference" : "bfffbd41",
+      "externalReference" : "DTCC00005678"
+    },
+    "meta" : {
+      "globalKey" : "5d65b232"
+    }
   } ],
+  "action" : "New",
   "workflowState" : {
+    "workflowStatus" : "Submitted",
     "partyCustomisedWorkflow" : [ {
+      "partyReference" : {
+        "globalReference" : "bfffbd41",
+        "externalReference" : "DTCC00005678"
+      },
       "customisedWorkflow" : [ {
         "itemName" : "comment",
         "itemValue" : "MSGID-999d63ed-4a36-40a9-9d9b-0f88b276d7b4"
@@ -588,13 +590,11 @@
       }, {
         "itemName" : "branchLocation",
         "itemValue" : "NEW YORK"
-      } ],
-      "partyReference" : {
-        "externalReference" : "DTCC00005678",
-        "globalReference" : "bfffbd41"
-      }
+      } ]
     } ],
-    "warehouseIdentity" : "DTCC_TIW_GOLD",
-    "workflowStatus" : "SUBMITTED"
+    "warehouseIdentity" : "DTCC_TIW_Gold"
+  },
+  "meta" : {
+    "globalKey" : "ee2f660c"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade3.json b/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade3.json
index 8c51f29b42..ab357e77ff 100644
--- a/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade3.json
+++ b/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade3.json
@@ -1,126 +1,132 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "issuerReference" : {
-      "externalReference" : "DTCC00005678",
-      "globalReference" : "aa32cc29"
-    },
-    "meta" : {
-      "globalKey" : "5d65b232"
-    }
-  }, {
-    "issuerReference" : {
-      "externalReference" : "DTCC00001234",
-      "globalReference" : "b38cc8f1"
-    },
-    "meta" : {
-      "globalKey" : "5d63d132"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "perFpMLReqmt"
-      },
-      "value" : "MSERV20181022.0005217595"
-    },
-    "sentBy" : {
-      "value" : "MarkitSERV"
-    },
-    "sentTo" : [ {
-      "value" : "DTCC"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "a77889c1"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "1992-09-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster",
+                  "meta" : {
+                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
+                  }
+                }
+              },
+              "vintage" : 1992
+            },
+            "meta" : {
+              "globalKey" : "f42c8e93"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualDefinitionsType" : [ {
+                  "value" : "ISDA2014Credit",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+                  }
+                } ],
+                "contractualTermsSupplement" : [ {
+                  "contractualTermsSupplementType" : {
+                    "value" : "CDX",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/contractual-supplement"
+                    }
+                  },
+                  "publicationDate" : "2014-09-22"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "945b3ce1"
+            }
+          } ]
+        }
+      },
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "5dd1a9c8"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "9a7c48bb"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "DTCC00005678",
-                "globalKey" : "aa32cc29"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "aa32cc29",
+                "externalReference" : "DTCC00005678"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "204069260",
                   "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCC00005678"
-                },
-                "meta" : {
-                  "globalKey" : "5d65b232"
+                    "scheme" : "TradeRefNbr"
+                  }
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "40d2285d"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "b38cc8f1",
+                "externalReference" : "DTCC00001234"
+              },
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "4876781",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "DTCCRR3QWICWWIPCS8A4S074"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "ecb7039b"
+                    "scheme" : "TradeRefNbr"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "DTCC00001234",
-                "globalKey" : "b38cc8f1"
+                "globalKey" : "44923bb"
+              }
+            }, {
+              "issuer" : {
+                "value" : "M710DSN29N",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                }
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "1TTRVD82HTWGNT13LB8QG2G6L0DDN5SA",
                   "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCC00001234"
-                },
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "9cbaf17e"
+              }
+            }, {
+              "issuer" : {
+                "value" : "M710DSN29N",
                 "meta" : {
-                  "globalKey" : "5d63d132"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
                 }
-              }, {
+              },
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "1TTRVD82HTWGNT13LB8QG2G6L0DDN5SA",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "DTCCDGQCSV2PHVF7I2743539"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "d0b77f63"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "9cbaf17e"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-08",
+              "meta" : {
+                "globalKey" : "3f1288"
+              }
+            },
             "tradableProduct" : {
-              "ancillaryParty" : [ {
-                "partyReference" : [ {
-                  "externalReference" : "DTCC00001234",
-                  "globalReference" : "b38cc8f1"
-                } ],
-                "role" : "CALCULATION_AGENT_INDEPENDENT"
-              } ],
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "DTCC00001234",
-                  "globalReference" : "b38cc8f1"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "DTCC00005678",
-                  "globalReference" : "aa32cc29"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -128,93 +134,60 @@
                     "productQualifier" : "CreditDefaultSwap_Index"
                   } ],
                   "economicTerms" : {
-                    "calculationAgent" : {
-                      "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-                    },
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-03-20",
                         "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
                             "globalKey" : "3a4b88ab"
                           }
                         },
                         "meta" : {
                           "globalKey" : "2709b47f"
-                        },
-                        "unadjustedDate" : "2018-03-20"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "2709b47f"
                       }
                     },
-                    "payout" : {
-                      "creditDefaultPayout" : {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
-                        },
-                        "priceQuantity" : {
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2023-06-20",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "generalTerms" : {
-                          "indexReferenceInformation" : {
-                            "indexId" : [ {
-                              "meta" : {
-                                "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair"
-                              },
-                              "value" : "2I65BYDP7"
-                            } ],
-                            "indexName" : {
-                              "meta" : {
-                                "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
-                              },
-                              "value" : "CDX.NA.IG.30"
-                            },
-                            "indexAnnexDate" : "2018-03-20",
-                            "meta" : {
-                              "globalKey" : "eeb2782d"
-                            }
+                            "globalKey" : "3a4b88ab"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "42fa862e"
+                          "globalKey" : "27a2ad3f"
                         }
                       },
+                      "meta" : {
+                        "globalKey" : "27a2ad3f"
+                      }
+                    },
+                    "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "5a5ff79f"
-                        },
                         "rateSpecification" : {
                           "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "rateSchedule" : {
                               "price" : {
                                 "address" : {
@@ -222,279 +195,306 @@
                                   "value" : "price-1"
                                 }
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "5a5ff79f"
                         }
                       } ],
-                      "meta" : {
-                        "globalKey" : "79c06fcd"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
                           "meta" : {
-                            "globalKey" : "3a4b88ab"
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "27a2ad3f"
+                        "generalTerms" : {
+                          "indexReferenceInformation" : {
+                            "indexName" : {
+                              "value" : "CDX.NA.IG.30",
+                              "meta" : {
+                                "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
+                              }
+                            },
+                            "indexId" : [ {
+                              "value" : "2I65BYDP7",
+                              "meta" : {
+                                "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair"
+                              }
+                            } ],
+                            "indexAnnexDate" : "2018-03-20",
+                            "meta" : {
+                              "globalKey" : "d84ac6ed"
+                            }
+                          }
                         },
-                        "unadjustedDate" : "2023-06-20"
+                        "meta" : {
+                          "globalKey" : "2c92d4ee"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "27a2ad3f"
+                        "globalKey" : "7f19560d"
                       }
+                    },
+                    "calculationAgent" : {
+                      "calculationAgentParty" : "CalculationAgentIndependent"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "1aba9327"
+                    "globalKey" : "394adb97"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "1aba9327"
+                  "globalKey" : "394adb97"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "1f273178"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0100000000,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "value" : 0.0100000000,
                       "perUnitOf" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "1a10e2d1"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "c5befd88"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 5000000.00000,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
-                      },
-                      "value" : 5000000.00000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "280b774f"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "b38cc8f1",
+                  "externalReference" : "DTCC00001234"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "aa32cc29",
+                  "externalReference" : "DTCC00005678"
+                }
+              } ],
+              "ancillaryParty" : [ {
+                "role" : "CalculationAgentIndependent",
+                "partyReference" : [ {
+                  "globalReference" : "b38cc8f1",
+                  "externalReference" : "DTCC00001234"
                 } ]
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1288"
-              },
-              "value" : "2018-10-08"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCC00005678",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "204069260"
+                    "scheme" : "DTCC"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "5d65b232"
                 }
-              } ],
-              "issuerReference" : {
-                "externalReference" : "DTCC00005678",
-                "globalReference" : "aa32cc29"
-              },
-              "meta" : {
-                "globalKey" : "64a35a41"
-              }
-            }, {
-              "assignedIdentifier" : [ {
+              }, {
                 "identifier" : {
+                  "value" : "DTCCRR3QWICWWIPCS8A4S074",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "4876781"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "ecb7039b"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "DTCC00001234",
-                "globalReference" : "b38cc8f1"
-              },
               "meta" : {
-                "globalKey" : "f149d41f"
+                "globalKey" : "aa32cc29",
+                "externalKey" : "DTCC00005678"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCC00001234",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "1TTRVD82HTWGNT13LB8QG2G6L0DDN5SA"
-                }
-              } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                    "scheme" : "DTCC"
+                  }
                 },
-                "value" : "M710DSN29N"
-              },
-              "meta" : {
-                "globalKey" : "caca0600"
-              }
-            }, {
-              "assignedIdentifier" : [ {
+                "meta" : {
+                  "globalKey" : "5d63d132"
+                }
+              }, {
                 "identifier" : {
+                  "value" : "DTCCDGQCSV2PHVF7I2743539",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "1TTRVD82HTWGNT13LB8QG2G6L0DDN5SA"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "d0b77f63"
                 }
               } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
-                },
-                "value" : "M710DSN29N"
-              },
               "meta" : {
-                "globalKey" : "caca0600"
+                "globalKey" : "b38cc8f1",
+                "externalKey" : "DTCC00001234"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "2f8a9413"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "732cc44d"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "DTCC00005678",
-                  "globalReference" : "aa32cc29"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "DTCC00001234",
-                  "globalReference" : "b38cc8f1"
-                }
-              },
               "quantity" : {
+                "value" : 123456.00000,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/ext/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
-                },
-                "value" : 123456.00000
+                }
               },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
-              }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "1992-09-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "meta" : {
-                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
-                  },
-                  "value" : "ISDA_MASTER"
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "aa32cc29",
+                  "externalReference" : "DTCC00005678"
+                },
+                "receiverPartyReference" : {
+                  "globalReference" : "b38cc8f1",
+                  "externalReference" : "DTCC00001234"
                 }
               },
-              "vintage" : 1992
-            },
-            "meta" : {
-              "globalKey" : "f42c8e93"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualDefinitionsType" : [ {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-                  },
-                  "value" : "ISDA_2014_CREDIT"
-                } ],
-                "contractualTermsSupplement" : [ {
-                  "contractualTermsSupplementType" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/contractual-supplement"
-                    },
-                    "value" : "CDX"
-                  },
-                  "publicationDate" : "2014-09-22"
-                } ]
+              "transferExpression" : {
+                "priceTransfer" : "Upfront"
               }
             },
             "meta" : {
-              "globalKey" : "945b3ce1"
+              "globalKey" : "94a1f8af"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "4f626f82"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "MSERV20181022.0005217595",
+      "meta" : {
+        "scheme" : "perFpMLReqmt"
+      }
+    },
+    "sentBy" : {
+      "value" : "MarkitSERV"
+    },
+    "sentTo" : [ {
+      "value" : "DTCC"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-10-22T05:45:24.382-04:00",
-    "qualification" : "EVENT_SUBMITTED_DATE_TIME"
+    "qualification" : "eventSubmittedDateTime"
   }, {
     "dateTime" : "2018-10-22T09:45:36.701Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   } ],
+  "eventIdentifier" : [ {
+    "issuerReference" : {
+      "globalReference" : "aa32cc29",
+      "externalReference" : "DTCC00005678"
+    },
+    "meta" : {
+      "globalKey" : "5d65b232"
+    }
+  }, {
+    "issuerReference" : {
+      "globalReference" : "b38cc8f1",
+      "externalReference" : "DTCC00001234"
+    },
+    "meta" : {
+      "globalKey" : "5d63d132"
+    }
+  } ],
+  "action" : "New",
   "workflowState" : {
+    "workflowStatus" : "Submitted",
     "partyCustomisedWorkflow" : [ {
+      "partyReference" : {
+        "globalReference" : "b38cc8f1",
+        "externalReference" : "DTCC00001234"
+      },
       "customisedWorkflow" : [ {
         "itemName" : "superId",
         "itemValue" : "Bilateral"
       }, {
         "itemName" : "deskId",
         "itemValue" : "KCEC407"
-      } ],
-      "partyReference" : {
-        "externalReference" : "DTCC00001234",
-        "globalReference" : "b38cc8f1"
-      }
+      } ]
     } ],
-    "warehouseIdentity" : "DTCC_TIW_GOLD",
-    "workflowStatus" : "SUBMITTED"
+    "warehouseIdentity" : "DTCC_TIW_Gold"
+  },
+  "meta" : {
+    "globalKey" : "2c204bb5"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade4.json b/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade4.json
index c093cf8ddf..eebc45bf07 100644
--- a/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade4.json
+++ b/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade4.json
@@ -1,126 +1,137 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "issuerReference" : {
-      "externalReference" : "DTCC00001234",
-      "globalReference" : "8c5248c"
-    },
-    "meta" : {
-      "globalKey" : "5d63d132"
-    }
-  }, {
-    "issuerReference" : {
-      "externalReference" : "DTCC00005678",
-      "globalReference" : "acf57a09"
-    },
-    "meta" : {
-      "globalKey" : "5d65b232"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "perFpMLReqmt"
-      },
-      "value" : "MSERV20181022.0006142001"
-    },
-    "sentBy" : {
-      "value" : "MarkitSERV"
-    },
-    "sentTo" : [ {
-      "value" : "DTCC"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "35747966"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "1999-04-07",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster",
+                  "meta" : {
+                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
+                  }
+                }
+              },
+              "vintage" : 1992
+            },
+            "meta" : {
+              "globalKey" : "d00b6716"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualDefinitionsType" : [ {
+                  "value" : "ISDA2014Credit",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+                  }
+                } ],
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/matrix-type"
+                    }
+                  },
+                  "matrixTerm" : {
+                    "value" : "StandardNorthAmericanCorporate",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/credit-matrix-transaction-type"
+                    }
+                  }
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "b5190ef6"
+            }
+          } ]
+        }
+      },
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "ec3e761a"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "e0883633"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "DTCC00001234",
-                "globalKey" : "8c5248c"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "8c5248c",
+                "externalReference" : "DTCC00001234"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "15367807",
                   "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCC00001234"
-                },
-                "meta" : {
-                  "globalKey" : "5d63d132"
+                    "scheme" : "TradeRefNbr"
+                  }
                 }
-              }, {
+              } ],
+              "meta" : {
+                "globalKey" : "12b31a3d"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "acf57a09",
+                "externalReference" : "DTCC00005678"
+              },
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "CDV-3651370",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "DTCCG5GSEF7VJP5I7OUK5573"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "25efdafe"
+                    "scheme" : "TradeRefNbr"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "DTCC00005678",
-                "globalKey" : "acf57a09"
+                "globalKey" : "93703483"
+              }
+            }, {
+              "issuer" : {
+                "value" : "9J6AQFWC2C",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                }
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "TRADESERV20181022206086611CVKAN4",
                   "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCC00005678"
-                },
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "5d8455c3"
+              }
+            }, {
+              "issuer" : {
+                "value" : "9J6AQFWC2C",
                 "meta" : {
-                  "globalKey" : "5d65b232"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
                 }
-              }, {
+              },
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "TRADESERV2018102221714656009C39J",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "DTCCO2RNE8IBXP4R0TD8PU41"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "ef79b17b"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "fe369ef2"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-10-22",
+              "meta" : {
+                "globalKey" : "3f1296"
+              }
+            },
             "tradableProduct" : {
-              "ancillaryParty" : [ {
-                "partyReference" : [ {
-                  "externalReference" : "DTCC00001234",
-                  "globalReference" : "8c5248c"
-                } ],
-                "role" : "CALCULATION_AGENT_INDEPENDENT"
-              } ],
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "DTCC00001234",
-                  "globalReference" : "8c5248c"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "DTCC00005678",
-                  "globalReference" : "acf57a09"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -128,453 +139,442 @@
                     "productQualifier" : "CreditDefaultSwap_SingleName"
                   } ],
                   "economicTerms" : {
-                    "calculationAgent" : {
-                      "calculationAgentBusinessCenter" : {
-                        "meta" : {
-                          "scheme" : "http://www.fpml.org/spec/2000/business-center"
-                        },
-                        "value" : "USNY"
-                      },
-                      "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-                    },
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-10-23",
                         "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
                             "globalKey" : "3a4b88ab"
                           }
                         },
                         "meta" : {
                           "globalKey" : "27105182"
-                        },
-                        "unadjustedDate" : "2018-10-23"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "27105182"
                       }
                     },
-                    "payout" : {
-                      "creditDefaultPayout" : {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
-                        },
-                        "priceQuantity" : {
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2020-03-20",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "generalTerms" : {
-                          "referenceInformation" : {
-                            "referenceEntity" : {
-                              "entityId" : [ {
-                                "meta" : {
-                                  "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED"
-                                },
-                                "value" : "57BGE9AD0"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "36296790"
-                              },
-                              "name" : {
-                                "meta" : {
-                                  "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
-                                },
-                                "value" : "LEXMARK INTERNATIONAL, INC."
-                              }
-                            },
-                            "referenceObligation" : [ {
-                              "security" : {
-                                "productIdentifier" : [ {
-                                  "value" : {
-                                    "identifier" : {
-                                      "meta" : {
-                                        "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
-                                      },
-                                      "value" : "US529772AF23"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "bd4d21e9"
-                                    },
-                                    "source" : "ISIN"
-                                  }
-                                } ],
-                                "securityType" : "DEBT"
-                              }
-                            } ]
+                            "globalKey" : "3a4b88ab"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "b766645b"
+                          "globalKey" : "2745c47f"
                         }
                       },
+                      "meta" : {
+                        "globalKey" : "2745c47f"
+                      }
+                    },
+                    "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "calculationPeriodDates" : {
                           "firstPeriodStartDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-09-20",
                               "meta" : {
                                 "globalKey" : "3f1254"
-                              },
-                              "unadjustedDate" : "2018-09-20"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "3f1254"
                             }
                           },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
                           "meta" : {
-                            "globalKey" : "28c14cad"
+                            "globalKey" : "cb0747c7"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "2addd56c"
-                        },
                         "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
                           "firstPaymentDate" : "2018-12-20",
                           "meta" : {
-                            "globalKey" : "ac0d2dc2"
+                            "globalKey" : "ac0d2516"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "27584470"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
+                        "generalTerms" : {
+                          "referenceInformation" : {
+                            "referenceEntity" : {
+                              "entityId" : [ {
+                                "value" : "57BGE9AD0",
+                                "meta" : {
+                                  "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED"
                                 }
+                              } ],
+                              "name" : {
+                                "value" : "LEXMARK INTERNATIONAL, INC.",
+                                "meta" : {
+                                  "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "36296790"
+                              }
+                            },
+                            "referenceObligation" : [ {
+                              "security" : {
+                                "productIdentifier" : [ {
+                                  "value" : {
+                                    "identifier" : {
+                                      "value" : "US529772AF23",
+                                      "meta" : {
+                                        "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
+                                      }
+                                    },
+                                    "source" : "ISIN",
+                                    "meta" : {
+                                      "globalKey" : "bd4d21e9"
+                                    }
+                                  }
+                                } ],
+                                "securityType" : "Debt"
                               }
-                            }
+                            } ]
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "b766645b"
                         }
-                      } ],
+                      },
                       "meta" : {
-                        "globalKey" : "3da747f1"
+                        "globalKey" : "e6e010cb"
                       }
                     },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
+                    "calculationAgent" : {
+                      "calculationAgentParty" : "CalculationAgentIndependent",
+                      "calculationAgentBusinessCenter" : {
+                        "value" : "USNY",
                         "meta" : {
-                          "globalKey" : "2745c47f"
-                        },
-                        "unadjustedDate" : "2020-03-20"
-                      },
-                      "meta" : {
-                        "globalKey" : "2745c47f"
+                          "scheme" : "http://www.fpml.org/spec/2000/business-center"
+                        }
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "ffedd53f"
+                    "globalKey" : "bfd0201b"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "ffedd53f"
+                  "globalKey" : "bfd0201b"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "1f273178"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0100000000,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "value" : 0.0100000000,
                       "perUnitOf" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "b883d895"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "c5befd88"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000.00000,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
-                      },
-                      "value" : 100000000.00000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "57f73a0b"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "8c5248c",
+                  "externalReference" : "DTCC00001234"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "acf57a09",
+                  "externalReference" : "DTCC00005678"
+                }
+              } ],
+              "ancillaryParty" : [ {
+                "role" : "CalculationAgentIndependent",
+                "partyReference" : [ {
+                  "globalReference" : "8c5248c",
+                  "externalReference" : "DTCC00001234"
                 } ]
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1296"
-              },
-              "value" : "2018-10-22"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCC00001234",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "15367807"
+                    "scheme" : "DTCC"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "5d63d132"
                 }
-              } ],
-              "issuerReference" : {
-                "externalReference" : "DTCC00001234",
-                "globalReference" : "8c5248c"
-              },
-              "meta" : {
-                "globalKey" : "d103221"
-              }
-            }, {
-              "assignedIdentifier" : [ {
+              }, {
                 "identifier" : {
+                  "value" : "DTCCG5GSEF7VJP5I7OUK5573",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "CDV-3651370"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "25efdafe"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "DTCC00005678",
-                "globalReference" : "acf57a09"
-              },
               "meta" : {
-                "globalKey" : "87eef4e7"
+                "globalKey" : "8c5248c",
+                "externalKey" : "DTCC00001234"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCC00005678",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "TRADESERV20181022206086611CVKAN4"
-                }
-              } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                    "scheme" : "DTCC"
+                  }
                 },
-                "value" : "9J6AQFWC2C"
-              },
-              "meta" : {
-                "globalKey" : "6174b91f"
-              }
-            }, {
-              "assignedIdentifier" : [ {
+                "meta" : {
+                  "globalKey" : "5d65b232"
+                }
+              }, {
                 "identifier" : {
+                  "value" : "DTCCO2RNE8IBXP4R0TD8PU41",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "TRADESERV2018102221714656009C39J"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "ef79b17b"
                 }
               } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
-                },
-                "value" : "9J6AQFWC2C"
-              },
               "meta" : {
-                "globalKey" : "9eb9728e"
+                "globalKey" : "acf57a09",
+                "externalKey" : "DTCC00005678"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "d1debe0d"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "350b05e7"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "DTCC00001234",
-                  "globalReference" : "8c5248c"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "DTCC00005678",
-                  "globalReference" : "acf57a09"
-                }
-              },
               "quantity" : {
+                "value" : 2345.00000,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/ext/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "8c5248c",
+                  "externalReference" : "DTCC00001234"
                 },
-                "value" : 2345.00000
+                "receiverPartyReference" : {
+                  "globalReference" : "acf57a09",
+                  "externalReference" : "DTCC00005678"
+                }
               },
               "settlementDate" : {
                 "unadjustedDate" : "2018-10-25"
               },
               "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
-              }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "1999-04-07",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "meta" : {
-                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
-                  },
-                  "value" : "ISDA_MASTER"
-                }
-              },
-              "vintage" : 1992
-            },
-            "meta" : {
-              "globalKey" : "d00b6716"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualDefinitionsType" : [ {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-                  },
-                  "value" : "ISDA_2014_CREDIT"
-                } ],
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/credit-matrix-transaction-type"
-                    },
-                    "value" : "STANDARD_NORTH_AMERICAN_CORPORATE"
-                  },
-                  "matrixType" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/matrix-type"
-                    },
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-                  }
-                } ]
+                "priceTransfer" : "Upfront"
               }
             },
             "meta" : {
-              "globalKey" : "97373076"
+              "globalKey" : "bd37b867"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "3e7abc74"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "MSERV20181022.0006142001",
+      "meta" : {
+        "scheme" : "perFpMLReqmt"
+      }
+    },
+    "sentBy" : {
+      "value" : "MarkitSERV"
+    },
+    "sentTo" : [ {
+      "value" : "DTCC"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-10-22T10:05:42.26-04:00",
-    "qualification" : "EVENT_SUBMITTED_DATE_TIME"
+    "qualification" : "eventSubmittedDateTime"
   }, {
     "dateTime" : "2018-10-22T14:05:57.974Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "issuerReference" : {
+      "globalReference" : "8c5248c",
+      "externalReference" : "DTCC00001234"
+    },
+    "meta" : {
+      "globalKey" : "5d63d132"
+    }
+  }, {
+    "issuerReference" : {
+      "globalReference" : "acf57a09",
+      "externalReference" : "DTCC00005678"
+    },
+    "meta" : {
+      "globalKey" : "5d65b232"
+    }
   } ],
+  "action" : "New",
   "workflowState" : {
+    "workflowStatus" : "Submitted",
     "partyCustomisedWorkflow" : [ {
+      "partyReference" : {
+        "globalReference" : "8c5248c",
+        "externalReference" : "DTCC00001234"
+      },
       "customisedWorkflow" : [ {
         "itemName" : "superId",
         "itemValue" : "S6140087.3.SE11161006.3"
       }, {
         "itemName" : "deskId",
         "itemValue" : "S Kathpalia"
-      } ],
-      "partyReference" : {
-        "externalReference" : "DTCC00001234",
-        "globalReference" : "8c5248c"
-      }
+      } ]
     }, {
+      "partyReference" : {
+        "globalReference" : "acf57a09",
+        "externalReference" : "DTCC00005678"
+      },
       "customisedWorkflow" : [ {
         "itemName" : "comment",
         "itemValue" : "SUBFOLDER_ID"
-      } ],
-      "partyReference" : {
-        "externalReference" : "DTCC00005678",
-        "globalReference" : "acf57a09"
-      }
+      } ]
     } ],
-    "warehouseIdentity" : "DTCC_TIW_GOLD",
-    "workflowStatus" : "SUBMITTED"
+    "warehouseIdentity" : "DTCC_TIW_Gold"
+  },
+  "meta" : {
+    "globalKey" : "1c43f10e"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade5.json b/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade5.json
index 42c0dc75bd..0186a7521b 100644
--- a/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade5.json
+++ b/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade5.json
@@ -1,126 +1,108 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "issuerReference" : {
-      "externalReference" : "DTCC00001234",
-      "globalReference" : "2c7d7a2c"
-    },
-    "meta" : {
-      "globalKey" : "5d63d132"
-    }
-  }, {
-    "issuerReference" : {
-      "externalReference" : "DTCC00005678",
-      "globalReference" : "723f92c"
-    },
-    "meta" : {
-      "globalKey" : "5d65b232"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "perFpMLReqmt"
-      },
-      "value" : "MSERV20181022.0006130535"
-    },
-    "sentBy" : {
-      "value" : "MarkitSERV"
-    },
-    "sentTo" : [ {
-      "value" : "DTCC"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "5e343776"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "1995-07-28",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster",
+                  "meta" : {
+                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
+                  }
+                }
+              },
+              "vintage" : 2002
+            },
+            "meta" : {
+              "globalKey" : "cbf7f35"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualDefinitionsType" : [ {
+                  "value" : "ISDA2003Credit",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+                  }
+                } ],
+                "contractualTermsSupplement" : [ {
+                  "publicationDate" : "2018-10-09"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "8517df9d"
+            }
+          } ]
+        }
+      },
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "e6112b3d"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "e6112b3d"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "DTCC00001234",
-                "globalKey" : "2c7d7a2c"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "2c7d7a2c",
+                "externalReference" : "DTCC00001234"
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCC00001234"
-                },
-                "meta" : {
-                  "globalKey" : "5d63d132"
-                }
-              }, {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "SJDBTEST2210OS",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "DTCC549300FSLUWD8ETI2P24"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "49a8309e"
+                    "scheme" : "TradeRefNbr"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "DTCC00005678",
-                "globalKey" : "723f92c"
+                "globalKey" : "fe057df8"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "723f92c",
+                "externalReference" : "DTCC00005678"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "SJDBTEST2210",
                   "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCC00005678"
-                },
+                    "scheme" : "TradeRefNbr"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "4da0dc94"
+              }
+            }, {
+              "issuer" : {
+                "value" : "9J6AQFWC2C",
                 "meta" : {
-                  "globalKey" : "5d65b232"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              }, {
+              },
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "TRADESERV20181022211981783OAVSFL",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "DTCC549300FSLUWD8ETI2P24"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "49a8309e"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "ff3335db"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2018-09-25",
+              "meta" : {
+                "globalKey" : "3f1259"
+              }
+            },
             "tradableProduct" : {
-              "ancillaryParty" : [ {
-                "partyReference" : [ {
-                  "externalReference" : "DTCC00005678",
-                  "globalReference" : "723f92c"
-                } ],
-                "role" : "CALCULATION_AGENT_INDEPENDENT"
-              } ],
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "DTCC00005678",
-                  "globalReference" : "723f92c"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "DTCC00001234",
-                  "globalReference" : "2c7d7a2c"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -128,83 +110,91 @@
                     "productQualifier" : "CreditDefaultSwap_SingleName"
                   } ],
                   "economicTerms" : {
-                    "calculationAgent" : {
-                      "calculationAgentBusinessCenter" : {
+                    "effectiveDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2018-09-25",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
                         "meta" : {
-                          "scheme" : "http://www.fpml.org/spec/2000/business-center"
+                          "globalKey" : "270f68c4"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "270f68c4"
+                      }
+                    },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2046-09-25",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
                         },
-                        "value" : "USNY"
+                        "meta" : {
+                          "globalKey" : "2a5848c4"
+                        }
                       },
-                      "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+                      "meta" : {
+                        "globalKey" : "2a5848c4"
+                      }
                     },
                     "dateAdjustments" : {
+                      "businessDayConvention" : "NotApplicable",
                       "businessCenters" : {
                         "businessCenter" : [ {
+                          "value" : "GBLO",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/business-center"
-                          },
-                          "value" : "GBLO"
+                          }
                         }, {
+                          "value" : "USNY",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/business-center"
-                          },
-                          "value" : "USNY"
+                          }
                         } ],
                         "meta" : {
                           "globalKey" : "42f910b"
                         }
                       },
-                      "businessDayConvention" : "NOT_APPLICABLE",
                       "meta" : {
                         "globalKey" : "b7a5bb40"
                       }
                     },
-                    "effectiveDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "270f68c4"
-                        },
-                        "unadjustedDate" : "2018-09-25"
-                      },
-                      "meta" : {
-                        "globalKey" : "270f68c4"
-                      }
-                    },
                     "payout" : {
                       "creditDefaultPayout" : {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
                         "generalTerms" : {
                           "referenceInformation" : {
                             "referenceEntity" : {
-                              "meta" : {
-                                "globalKey" : "260265d9"
-                              },
                               "name" : {
+                                "value" : "THEISSUEROFTHEREFERENCEOBLIGATION",
                                 "meta" : {
                                   "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
-                                },
-                                "value" : "THEISSUEROFTHEREFERENCEOBLIGATION"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "260265d9"
                               }
                             },
                             "referenceObligation" : [ {
@@ -212,212 +202,222 @@
                                 "productIdentifier" : [ {
                                   "value" : {
                                     "identifier" : {
+                                      "value" : "US02147DAK72",
                                       "meta" : {
                                         "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
-                                      },
-                                      "value" : "US02147DAK72"
+                                      }
                                     },
+                                    "source" : "ISIN",
                                     "meta" : {
                                       "globalKey" : "1b1f8e04"
-                                    },
-                                    "source" : "ISIN"
+                                    }
                                   }
                                 } ],
-                                "securityType" : "DEBT"
+                                "securityType" : "Debt"
                               }
                             } ]
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "b289aec7"
-                        },
                         "protectionTerms" : [ {
                           "floatingAmountEvents" : {
                             "interestShortfall" : {
+                              "interestShortfallCap" : "Fixed",
                               "compounding" : false,
-                              "interestShortfallCap" : "FIXED",
                               "rateSource" : {
+                                "value" : "USD-LIBOR-BBA",
                                 "meta" : {
                                   "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
-                                },
-                                "value" : "USD-LIBOR-BBA"
+                                }
                               }
                             }
                           },
                           "meta" : {
-                            "globalKey" : "b12b8c10"
+                            "globalKey" : "cddbd672"
                           }
-                        } ]
+                        } ],
+                        "meta" : {
+                          "globalKey" : "cf39f929"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "b289aec7"
+                        "globalKey" : "cf39f929"
                       }
                     },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
+                    "calculationAgent" : {
+                      "calculationAgentParty" : "CalculationAgentIndependent",
+                      "calculationAgentBusinessCenter" : {
+                        "value" : "USNY",
                         "meta" : {
-                          "globalKey" : "2a5848c4"
-                        },
-                        "unadjustedDate" : "2046-09-25"
-                      },
-                      "meta" : {
-                        "globalKey" : "2a5848c4"
+                          "scheme" : "http://www.fpml.org/spec/2000/business-center"
+                        }
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "1a7f6726"
+                    "globalKey" : "23add8bc"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "1a7f6726"
+                  "globalKey" : "23add8bc"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "4628ea45"
-                  },
                   "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 23000000.00000,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
-                      },
-                      "value" : 23000000.00000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "7ef45e5b"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "723f92c",
+                  "externalReference" : "DTCC00005678"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "2c7d7a2c",
+                  "externalReference" : "DTCC00001234"
+                }
+              } ],
+              "ancillaryParty" : [ {
+                "role" : "CalculationAgentIndependent",
+                "partyReference" : [ {
+                  "globalReference" : "723f92c",
+                  "externalReference" : "DTCC00005678"
                 } ]
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1259"
-              },
-              "value" : "2018-09-25"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCC00001234",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "SJDBTEST2210OS"
+                    "scheme" : "DTCC"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "5d63d132"
                 }
-              } ],
-              "issuerReference" : {
-                "externalReference" : "DTCC00001234",
-                "globalReference" : "2c7d7a2c"
-              },
-              "meta" : {
-                "globalKey" : "6d58931c"
-              }
-            }, {
-              "assignedIdentifier" : [ {
+              }, {
                 "identifier" : {
+                  "value" : "DTCC549300FSLUWD8ETI2P24",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "SJDBTEST2210"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "49a8309e"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "DTCC00005678",
-                "globalReference" : "723f92c"
-              },
               "meta" : {
-                "globalKey" : "7895dcb8"
+                "globalKey" : "2c7d7a2c",
+                "externalKey" : "DTCC00001234"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCC00005678",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "TRADESERV20181022211981783OAVSFL"
-                }
-              } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                    "scheme" : "DTCC"
+                  }
                 },
-                "value" : "9J6AQFWC2C"
-              },
-              "meta" : {
-                "globalKey" : "52ebf337"
-              }
-            } ]
-          }
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "1995-07-28",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "meta" : {
-                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
-                  },
-                  "value" : "ISDA_MASTER"
+                "meta" : {
+                  "globalKey" : "5d65b232"
                 }
-              },
-              "vintage" : 2002
-            },
-            "meta" : {
-              "globalKey" : "cbf7f35"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualDefinitionsType" : [ {
+              }, {
+                "identifier" : {
+                  "value" : "DTCC549300FSLUWD8ETI2P24",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-                  },
-                  "value" : "ISDA_2003_CREDIT"
-                } ],
-                "contractualTermsSupplement" : [ {
-                  "publicationDate" : "2018-10-09"
-                } ]
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "49a8309e"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "723f92c",
+                "externalKey" : "DTCC00005678"
               }
-            },
+            } ],
             "meta" : {
-              "globalKey" : "8517df9d"
+              "globalKey" : "4790d37b"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "4790d37b"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "MSERV20181022.0006130535",
+      "meta" : {
+        "scheme" : "perFpMLReqmt"
+      }
+    },
+    "sentBy" : {
+      "value" : "MarkitSERV"
+    },
+    "sentTo" : [ {
+      "value" : "DTCC"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-10-22T08:39:37.457-04:00",
-    "qualification" : "EVENT_SUBMITTED_DATE_TIME"
+    "qualification" : "eventSubmittedDateTime"
   }, {
     "dateTime" : "2018-10-22T12:39:55.914Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   } ],
+  "eventIdentifier" : [ {
+    "issuerReference" : {
+      "globalReference" : "2c7d7a2c",
+      "externalReference" : "DTCC00001234"
+    },
+    "meta" : {
+      "globalKey" : "5d63d132"
+    }
+  }, {
+    "issuerReference" : {
+      "globalReference" : "723f92c",
+      "externalReference" : "DTCC00005678"
+    },
+    "meta" : {
+      "globalKey" : "5d65b232"
+    }
+  } ],
+  "action" : "New",
   "workflowState" : {
-    "warehouseIdentity" : "DTCC_TIW_GOLD",
-    "workflowStatus" : "SUBMITTED"
+    "workflowStatus" : "Submitted",
+    "warehouseIdentity" : "DTCC_TIW_Gold"
+  },
+  "meta" : {
+    "globalKey" : "95071f90"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade6.json b/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade6.json
index 9a4f5088e2..6c9532cd8f 100644
--- a/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade6.json
+++ b/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade6.json
@@ -1,119 +1,119 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "issuerReference" : {
-      "externalReference" : "DTCC00005678",
-      "globalReference" : "723f92c"
-    },
-    "meta" : {
-      "globalKey" : "5d65b232"
-    }
-  }, {
-    "issuerReference" : {
-      "externalReference" : "DTCC00001234",
-      "globalReference" : "d32eca83"
-    },
-    "meta" : {
-      "globalKey" : "5d63d132"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "perFpMLReqmt"
-      },
-      "value" : "MSERV20181026.0007196855"
-    },
-    "sentBy" : {
-      "value" : "MarkitSERV"
-    },
-    "sentTo" : [ {
-      "value" : "DTCC"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "be557646"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "2016-01-15",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster",
+                  "meta" : {
+                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
+                  }
+                }
+              },
+              "vintage" : 2002
+            },
+            "meta" : {
+              "globalKey" : "1a984368"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualDefinitionsType" : [ {
+                  "value" : "ISDA2014Credit",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+                  }
+                } ],
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/matrix-type"
+                    }
+                  },
+                  "matrixTerm" : {
+                    "value" : "StandardNorthAmericanCorporate",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/coding-scheme/credit-matrix-transaction-type"
+                    }
+                  }
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "b5190ef6"
+            }
+          } ]
+        }
+      },
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "8951d0b2"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "b6570146"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "DTCC00005678",
-                "globalKey" : "723f92c"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "723f92c",
+                "externalReference" : "DTCC00005678"
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCC00005678"
-                },
-                "meta" : {
-                  "globalKey" : "5d65b232"
-                }
-              }, {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "105424OCT1KP_CP",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "DTCC549300FSLUWD8ETI2P24"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "49a8309e"
+                    "scheme" : "TradeRefNbr"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "DTCC00001234",
-                "globalKey" : "d32eca83"
+                "globalKey" : "935955c4"
+              }
+            }, {
+              "issuerReference" : {
+                "globalReference" : "d32eca83",
+                "externalReference" : "DTCC00001234"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "1054_26OCT1",
                   "meta" : {
-                    "scheme" : "DTCC"
-                  },
-                  "value" : "DTCC00001234"
-                },
+                    "scheme" : "TradeRefNbr"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "f628ff64"
+              }
+            }, {
+              "issuer" : {
+                "value" : "9J6AQFWC2C",
                 "meta" : {
-                  "globalKey" : "5d63d132"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              }, {
+              },
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "TRADESERV20181026560757688K9W667",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "DTCC549300J6MD8PFY96XF36"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "f05980f5"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "667cb9aa"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2017-11-15",
+              "meta" : {
+                "globalKey" : "3f0acf"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "DTCC00005678",
-                  "globalReference" : "723f92c"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "DTCC00001234",
-                  "globalReference" : "d32eca83"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -121,400 +121,402 @@
                     "productQualifier" : "CreditDefaultSwap_SingleName"
                   } ],
                   "economicTerms" : {
-                    "calculationAgent" : {
-                      "calculationAgentBusinessCenter" : {
-                        "meta" : {
-                          "scheme" : "http://www.fpml.org/spec/2000/business-center"
-                        },
-                        "value" : "USNY"
-                      },
-                      "calculationAgentPartyEnum" : "AS_SPECIFIED_IN_MASTER_AGREEMENT"
-                    },
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2017-11-16",
                         "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
                             "globalKey" : "3a4b88ab"
                           }
                         },
                         "meta" : {
                           "globalKey" : "26f31f7b"
-                        },
-                        "unadjustedDate" : "2017-11-16"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "26f31f7b"
                       }
                     },
-                    "payout" : {
-                      "creditDefaultPayout" : {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
-                        },
-                        "priceQuantity" : {
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2020-03-20",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "generalTerms" : {
-                          "referenceInformation" : {
-                            "referenceEntity" : {
-                              "entityId" : [ {
-                                "meta" : {
-                                  "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED"
-                                },
-                                "value" : "57BGE9AD0"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "36296790"
-                              },
-                              "name" : {
-                                "meta" : {
-                                  "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
-                                },
-                                "value" : "LEXMARK INTERNATIONAL, INC."
-                              }
-                            },
-                            "referenceObligation" : [ {
-                              "security" : {
-                                "productIdentifier" : [ {
-                                  "value" : {
-                                    "identifier" : {
-                                      "meta" : {
-                                        "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
-                                      },
-                                      "value" : "US529772AF23"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "bd4d21e9"
-                                    },
-                                    "source" : "ISIN"
-                                  }
-                                } ],
-                                "securityType" : "DEBT"
-                              }
-                            } ]
+                            "globalKey" : "3a4b88ab"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "b766645b"
+                          "globalKey" : "2745c47f"
                         }
                       },
+                      "meta" : {
+                        "globalKey" : "2745c47f"
+                      }
+                    },
+                    "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "calculationPeriodDates" : {
                           "firstPeriodStartDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2017-09-20",
                               "meta" : {
                                 "globalKey" : "3f0a54"
-                              },
-                              "unadjustedDate" : "2017-09-20"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "3f0a54"
                             }
                           },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
                           "meta" : {
-                            "globalKey" : "28c144ad"
+                            "globalKey" : "5a4b3fc7"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "d58bc56c"
-                        },
                         "paymentDates" : {
-                          "firstPaymentDate" : "2017-12-20",
-                          "meta" : {
-                            "globalKey" : "a86a35c2"
-                          },
                           "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
+                            "periodMultiplier" : 3,
                             "period" : "M",
-                            "periodMultiplier" : 3
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "firstPaymentDate" : "2017-12-20",
+                          "meta" : {
+                            "globalKey" : "a86a2d16"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
+                        "meta" : {
+                          "globalKey" : "d82c5470"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
+                          }
+                        },
+                        "generalTerms" : {
+                          "referenceInformation" : {
+                            "referenceEntity" : {
+                              "entityId" : [ {
+                                "value" : "57BGE9AD0",
+                                "meta" : {
+                                  "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED"
+                                }
+                              } ],
+                              "name" : {
+                                "value" : "LEXMARK INTERNATIONAL, INC.",
+                                "meta" : {
+                                  "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
                                 }
+                              },
+                              "meta" : {
+                                "globalKey" : "36296790"
                               }
-                            }
+                            },
+                            "referenceObligation" : [ {
+                              "security" : {
+                                "productIdentifier" : [ {
+                                  "value" : {
+                                    "identifier" : {
+                                      "value" : "US529772AF23",
+                                      "meta" : {
+                                        "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
+                                      }
+                                    },
+                                    "source" : "ISIN",
+                                    "meta" : {
+                                      "globalKey" : "bd4d21e9"
+                                    }
+                                  }
+                                } ],
+                                "securityType" : "Debt"
+                              }
+                            } ]
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "b766645b"
                         }
-                      } ],
+                      },
                       "meta" : {
-                        "globalKey" : "e85537f1"
+                        "globalKey" : "750c20cb"
                       }
                     },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
+                    "calculationAgent" : {
+                      "calculationAgentPartyEnum" : "AsSpecifiedInMasterAgreement",
+                      "calculationAgentBusinessCenter" : {
+                        "value" : "USNY",
                         "meta" : {
-                          "globalKey" : "2745c47f"
-                        },
-                        "unadjustedDate" : "2020-03-20"
-                      },
-                      "meta" : {
-                        "globalKey" : "2745c47f"
+                          "scheme" : "http://www.fpml.org/spec/2000/business-center"
+                        }
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "291b9e27"
+                    "globalKey" : "8d58ac03"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "291b9e27"
+                  "globalKey" : "8d58ac03"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "1f273178"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0100000000,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "value" : 0.0100000000,
                       "perUnitOf" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "48eb1e55"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "c5befd88"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 1000000.00000,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/ext/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
-                      },
-                      "value" : 1000000.00000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "d478ac4b"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "723f92c",
+                  "externalReference" : "DTCC00005678"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "d32eca83",
+                  "externalReference" : "DTCC00001234"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f0acf"
-              },
-              "value" : "2017-11-15"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCC00005678",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "105424OCT1KP_CP"
+                    "scheme" : "DTCC"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "5d65b232"
                 }
-              } ],
-              "issuerReference" : {
-                "externalReference" : "DTCC00005678",
-                "globalReference" : "723f92c"
-              },
-              "meta" : {
-                "globalKey" : "3214c9e8"
-              }
-            }, {
-              "assignedIdentifier" : [ {
+              }, {
                 "identifier" : {
+                  "value" : "DTCC549300FSLUWD8ETI2P24",
                   "meta" : {
-                    "scheme" : "TradeRefNbr"
-                  },
-                  "value" : "1054_26OCT1"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "49a8309e"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "DTCC00001234",
-                "globalReference" : "d32eca83"
-              },
               "meta" : {
-                "globalKey" : "eaa16988"
+                "globalKey" : "723f92c",
+                "externalKey" : "DTCC00005678"
               }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "DTCC00001234",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "TRADESERV20181026560757688K9W667"
-                }
-              } ],
-              "issuer" : {
+                    "scheme" : "DTCC"
+                  }
+                },
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "5d63d132"
+                }
+              }, {
+                "identifier" : {
+                  "value" : "DTCC549300J6MD8PFY96XF36",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "9J6AQFWC2C"
-              },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "f05980f5"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "de3bf46"
+                "globalKey" : "d32eca83",
+                "externalKey" : "DTCC00001234"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "e60653ae"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "f842c338"
-            },
             "transfer" : {
               "quantity" : {
+                "value" : 3456.00000,
                 "unit" : {
                   "currency" : {
+                    "value" : "USD",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/ext/iso4217"
-                    },
-                    "value" : "USD"
+                    }
                   }
-                },
-                "value" : 3456.00000
+                }
               },
               "settlementDate" : {
                 "unadjustedDate" : "2017-11-20"
               }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "2016-01-15",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "meta" : {
-                    "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
-                  },
-                  "value" : "ISDA_MASTER"
-                }
-              },
-              "vintage" : 2002
-            },
-            "meta" : {
-              "globalKey" : "1a984368"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualDefinitionsType" : [ {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-                  },
-                  "value" : "ISDA_2014_CREDIT"
-                } ],
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/credit-matrix-transaction-type"
-                    },
-                    "value" : "STANDARD_NORTH_AMERICAN_CORPORATE"
-                  },
-                  "matrixType" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/coding-scheme/matrix-type"
-                    },
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-                  }
-                } ]
-              }
             },
             "meta" : {
-              "globalKey" : "97373076"
+              "globalKey" : "f842c338"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "5294b34a"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "MSERV20181026.0007196855",
+      "meta" : {
+        "scheme" : "perFpMLReqmt"
+      }
+    },
+    "sentBy" : {
+      "value" : "MarkitSERV"
+    },
+    "sentTo" : [ {
+      "value" : "DTCC"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-10-26T09:32:15.288-04:00",
-    "qualification" : "EVENT_SUBMITTED_DATE_TIME"
+    "qualification" : "eventSubmittedDateTime"
   }, {
     "dateTime" : "2018-10-26T13:33:14.616Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "issuerReference" : {
+      "globalReference" : "723f92c",
+      "externalReference" : "DTCC00005678"
+    },
+    "meta" : {
+      "globalKey" : "5d65b232"
+    }
+  }, {
+    "issuerReference" : {
+      "globalReference" : "d32eca83",
+      "externalReference" : "DTCC00001234"
+    },
+    "meta" : {
+      "globalKey" : "5d63d132"
+    }
   } ],
+  "action" : "New",
   "workflowState" : {
+    "workflowStatus" : "Submitted",
     "partyCustomisedWorkflow" : [ {
+      "partyReference" : {
+        "globalReference" : "723f92c",
+        "externalReference" : "DTCC00005678"
+      },
       "customisedWorkflow" : [ {
         "itemName" : "comment",
         "itemValue" : "Comment text"
@@ -542,12 +544,12 @@
       }, {
         "itemName" : "amount",
         "itemValue" : "129.0000000000"
-      } ],
-      "partyReference" : {
-        "externalReference" : "DTCC00005678",
-        "globalReference" : "723f92c"
-      }
+      } ]
     }, {
+      "partyReference" : {
+        "globalReference" : "d32eca83",
+        "externalReference" : "DTCC00001234"
+      },
       "customisedWorkflow" : [ {
         "itemName" : "comment",
         "itemValue" : "Comment text"
@@ -575,13 +577,11 @@
       }, {
         "itemName" : "amount",
         "itemValue" : "129.0000000000"
-      } ],
-      "partyReference" : {
-        "externalReference" : "DTCC00001234",
-        "globalReference" : "d32eca83"
-      }
+      } ]
     } ],
-    "warehouseIdentity" : "DTCC_TIW_GOLD",
-    "workflowStatus" : "SUBMITTED"
+    "warehouseIdentity" : "DTCC_TIW_Gold"
+  },
+  "meta" : {
+    "globalKey" : "3c6dbef4"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/dtcc-9-0/SamplePayment.json b/rosetta-source/src/main/resources/result-json-files/dtcc-9-0/SamplePayment.json
index 6eab5b4d88..381893096e 100644
--- a/rosetta-source/src/main/resources/result-json-files/dtcc-9-0/SamplePayment.json
+++ b/rosetta-source/src/main/resources/result-json-files/dtcc-9-0/SamplePayment.json
@@ -1,28 +1,46 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "issuerReference" : {
-      "externalReference" : "DTCC00002222",
-      "globalReference" : "5d644570"
-    },
-    "meta" : {
-      "globalKey" : "5d644570"
-    }
-  }, {
-    "issuerReference" : {
-      "externalReference" : "DTCC00001111",
-      "globalReference" : "5d63cd30"
-    },
-    "meta" : {
-      "globalKey" : "5d63cd30"
-    }
-  } ],
+  "proposedEvent" : {
+    "instruction" : [ {
+      "primitiveInstruction" : {
+        "transfer" : {
+          "transferState" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 1418.33,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD",
+                    "meta" : {
+                      "scheme" : "http://www.fpml.org/ext/iso4217"
+                    }
+                  }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "5d63cd30",
+                  "externalReference" : "DTCC00001111"
+                },
+                "receiverPartyReference" : {
+                  "globalReference" : "5d644570",
+                  "externalReference" : "DTCC00002222"
+                }
+              }
+            },
+            "meta" : {
+              "globalKey" : "68d4a83e"
+            }
+          } ]
+        }
+      }
+    } ]
+  },
   "messageInformation" : {
     "messageId" : {
+      "value" : "MSERV20180911.0016700644",
       "meta" : {
         "scheme" : "perFpMLReqmt"
-      },
-      "value" : "MSERV20180911.0016700644"
+      }
     },
     "sentBy" : {
       "value" : "DTCC"
@@ -31,83 +49,65 @@
       "value" : "DTCC00002222"
     } ]
   },
-  "meta" : {
-    "globalKey" : "f87bf29f"
-  },
-  "party" : [ {
+  "timestamp" : [ {
+    "dateTime" : "2018-09-10T19:03:10.935-05:00",
+    "qualification" : "eventSubmittedDateTime"
+  }, {
+    "dateTime" : "2018-09-10T20:03:43.276-04:00",
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "issuerReference" : {
+      "globalReference" : "5d644570",
+      "externalReference" : "DTCC00002222"
+    },
     "meta" : {
-      "externalKey" : "DTCC00002222",
       "globalKey" : "5d644570"
+    }
+  }, {
+    "issuerReference" : {
+      "globalReference" : "5d63cd30",
+      "externalReference" : "DTCC00001111"
     },
+    "meta" : {
+      "globalKey" : "5d63cd30"
+    }
+  } ],
+  "action" : "New",
+  "party" : [ {
     "partyId" : [ {
       "identifier" : {
+        "value" : "DTCC00002222",
         "meta" : {
           "scheme" : "DTCC"
-        },
-        "value" : "DTCC00002222"
+        }
       },
       "meta" : {
         "globalKey" : "5d644570"
       }
-    } ]
-  }, {
+    } ],
     "meta" : {
-      "externalKey" : "DTCC00001111",
-      "globalKey" : "5d63cd30"
-    },
+      "globalKey" : "5d644570",
+      "externalKey" : "DTCC00002222"
+    }
+  }, {
     "partyId" : [ {
       "identifier" : {
+        "value" : "DTCC00001111",
         "meta" : {
           "scheme" : "DTCC"
-        },
-        "value" : "DTCC00001111"
+        }
       },
       "meta" : {
         "globalKey" : "5d63cd30"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "5d63cd30",
+      "externalKey" : "DTCC00001111"
+    }
   } ],
-  "proposedEvent" : {
-    "instruction" : [ {
-      "primitiveInstruction" : {
-        "transfer" : {
-          "transferState" : [ {
-            "meta" : {
-              "globalKey" : "acd37102"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "DTCC00001111",
-                  "globalReference" : "5d63cd30"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "DTCC00002222",
-                  "globalReference" : "5d644570"
-                }
-              },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "meta" : {
-                      "scheme" : "http://www.fpml.org/ext/iso4217"
-                    },
-                    "value" : "USD"
-                  }
-                },
-                "value" : 1418.33
-              }
-            }
-          } ]
-        }
-      }
-    } ]
-  },
-  "timestamp" : [ {
-    "dateTime" : "2018-09-10T19:03:10.935-05:00",
-    "qualification" : "EVENT_SUBMITTED_DATE_TIME"
-  }, {
-    "dateTime" : "2018-09-10T20:03:43.276-04:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+  "meta" : {
+    "globalKey" : "dcaa399f"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fis/isla1.json b/rosetta-source/src/main/resources/result-json-files/fis/isla1.json
index f7c7b138fb..21ace4b472 100644
--- a/rosetta-source/src/main/resources/result-json-files/fis/isla1.json
+++ b/rosetta-source/src/main/resources/result-json-files/fis/isla1.json
@@ -3,72 +3,29 @@
     "eventDate" : "2020-09-22",
     "instruction" : [ {
       "before" : {
-        "externalReference" : "TradeState",
-        "globalReference" : "4b005dce"
+        "globalReference" : "4fc2271e",
+        "externalReference" : "TradeState"
       }
     } ],
     "after" : [ {
-      "meta" : {
-        "externalKey" : "TradeState",
-        "globalKey" : "4b005dce"
-      },
       "trade" : {
-        "executionDetails" : {
-          "executionType" : "OFF_FACILITY",
-          "meta" : {
-            "globalKey" : "34596793"
-          }
-        },
-        "meta" : {
-          "globalKey" : "4b005dce"
-        },
-        "party" : [ {
-          "meta" : {
-            "externalKey" : "AGENT_LENDER",
-            "globalKey" : "73176f1c"
-          },
-          "name" : {
-            "value" : "KTKL"
-          },
-          "partyId" : [ {
+        "tradeIdentifier" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
-              "value" : "KTKLLEILLLLLLLLLLLLL"
-            },
-            "meta" : {
-              "globalKey" : "60098fe6"
+              "value" : "0266001"
             }
-          } ]
-        }, {
+          } ],
           "meta" : {
-            "externalKey" : "Borrower",
-            "globalKey" : "1f061e68"
-          },
-          "name" : {
-            "value" : "CP001"
-          },
-          "partyId" : [ {
-            "identifier" : {
-              "value" : "CP001LEI111111111111"
-            },
-            "meta" : {
-              "globalKey" : "12818f8c"
-            }
-          } ]
+            "globalKey" : "438fa6af"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2020-09-22",
+          "meta" : {
+            "globalKey" : "3f2256"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "AGENT_LENDER",
-              "globalReference" : "73176f1c"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "Borrower",
-              "globalReference" : "1f061e68"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -76,25 +33,9 @@
                 "productQualifier" : "SecurityLendingAgreement"
               } ],
               "economicTerms" : {
-                "collateral" : {
-                  "collateralProvisions" : {
-                    "collateralType" : "CASH",
-                    "eligibleCollateral" : [ {
-                      "criteria" : [ {
-                        "treatment" : {
-                          "valuationTreatment" : {
-                            "marginPercentage" : 1.00
-                          }
-                        }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "31"
-                      }
-                    } ]
-                  }
-                },
                 "effectiveDate" : {
                   "adjustableDate" : {
+                    "unadjustedDate" : "2020-09-22",
                     "dateAdjustments" : {
                       "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
@@ -103,141 +44,90 @@
                     },
                     "meta" : {
                       "globalKey" : "e742daa5"
-                    },
-                    "unadjustedDate" : "2020-09-22"
+                    }
                   },
                   "meta" : {
                     "globalKey" : "e742daa5"
                   }
                 },
                 "payout" : {
-                  "assetPayout" : [ {
-                    "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
-                    },
-                    "assetLeg" : [ {
-                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                      "settlementDate" : {
-                        "adjustableDate" : {
-                          "adjustedDate" : {
-                            "meta" : {
-                              "globalKey" : "3f2256"
-                            },
-                            "value" : "2020-09-22"
-                          },
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "24a738"
-                        }
-                      }
-                    } ],
-                    "dividendTerms" : {
-                      "manufacturedIncomeRequirement" : {
-                        "totalRatio" : 1.00
-                      }
-                    },
-                    "durationType" : {
-                      "durationType" : "OPEN"
-                    },
-                    "meta" : {
-                      "globalKey" : "ab8c6811"
-                    },
-                    "minimumFee" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 0.00,
-                      "meta" : {
-                        "globalKey" : "171b36"
-                      }
-                    },
-                    "securityInformation" : {
-                      "meta" : {
-                        "globalKey" : "7a5b92c5"
-                      },
-                      "security" : {
-                        "productIdentifier" : [ {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "productIdentifier-1"
-                          }
-                        } ],
-                        "securityType" : "EQUITY"
-                      }
-                    }
-                  } ],
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-2"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "25e2ab"
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-2"
+                            }
+                          }
                         },
-                        "period" : "T",
-                        "periodMultiplier" : 1,
-                        "rollConvention" : "NONE"
-                      },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
-                          "adjustedDate" : {
-                            "meta" : {
-                              "globalKey" : "3f2256"
-                            },
-                            "value" : "2020-09-22"
-                          },
                           "dateAdjustments" : {
                             "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "fa42f5cf"
                             }
                           },
+                          "adjustedDate" : {
+                            "value" : "2020-09-22",
+                            "meta" : {
+                              "globalKey" : "3f2256"
+                            }
+                          },
                           "meta" : {
-                            "externalKey" : "Effective_Date",
-                            "globalKey" : "fa42f5cf"
+                            "globalKey" : "fa42f5cf",
+                            "externalKey" : "Effective_Date"
                           }
                         },
                         "meta" : {
                           "globalKey" : "fa42f5cf"
                         }
                       },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "T",
+                        "meta" : {
+                          "globalKey" : "24b525"
+                        },
+                        "rollConvention" : "NONE"
+                      },
                       "meta" : {
-                        "globalKey" : "da118afa"
+                        "globalKey" : "914a2b74"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "4219475c"
-                    },
                     "paymentDates" : {
-                      "meta" : {
-                        "globalKey" : "b578507f"
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "T",
+                        "meta" : {
+                          "globalKey" : "73"
+                        }
                       },
                       "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -246,248 +136,300 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "a2d"
-                        },
-                        "period" : "T",
-                        "periodMultiplier" : 1
+                      "meta" : {
+                        "globalKey" : "fa98fa5b"
                       }
                     },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-2"
+                    "meta" : {
+                      "globalKey" : "d3c969a8"
+                    }
+                  } ],
+                  "assetPayout" : [ {
+                    "payerReceiver" : {
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
+                    },
+                    "assetLeg" : [ {
+                      "settlementDate" : {
+                        "adjustableDate" : {
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
                             }
+                          },
+                          "adjustedDate" : {
+                            "value" : "2020-09-22",
+                            "meta" : {
+                              "globalKey" : "3f2256"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "24a738"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "24a738"
+                        }
+                      },
+                      "deliveryMethod" : "DeliveryVersusPayment"
+                    } ],
+                    "securityInformation" : {
+                      "security" : {
+                        "productIdentifier" : [ {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "productIdentifier-1"
+                          }
+                        } ],
+                        "securityType" : "Equity"
+                      },
+                      "meta" : {
+                        "globalKey" : "7a5b92c5"
+                      }
+                    },
+                    "durationType" : {
+                      "durationType" : "Open"
+                    },
+                    "minimumFee" : {
+                      "value" : 0.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "171b36"
                       }
+                    },
+                    "dividendTerms" : {
+                      "manufacturedIncomeRequirement" : {
+                        "totalRatio" : 1.00
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "37f53f11"
                     }
                   } ],
                   "meta" : {
-                    "globalKey" : "13d5cc2d"
+                    "globalKey" : "36ab7869"
+                  }
+                },
+                "collateral" : {
+                  "collateralProvisions" : {
+                    "collateralType" : "Cash",
+                    "eligibleCollateral" : [ {
+                      "criteria" : [ {
+                        "treatment" : {
+                          "valuationTreatment" : {
+                            "marginPercentage" : 1.00
+                          }
+                        }
+                      } ],
+                      "meta" : {
+                        "globalKey" : "31"
+                      }
+                    } ]
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "8e261cf4"
+                "globalKey" : "95a7e6ac"
               }
             },
             "meta" : {
-              "globalKey" : "8e261cf4"
+              "globalKey" : "95a7e6ac"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "c20e3921"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-2"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.050000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.050000,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ],
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
+                    "value" : "price-2"
                   } ]
-                },
+                }
+              } ],
+              "quantity" : [ {
                 "value" : {
+                  "value" : 100000000.00,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 100000000.00
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "481ec15e"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "a4ff65ff"
-                },
-                "productIdentifier" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "productIdentifier-1"
-                    } ]
-                  },
-                  "value" : {
-                    "identifier" : {
-                      "value" : "ST001"
-                    },
-                    "meta" : {
-                      "globalKey" : "a4ff65ff"
-                    },
-                    "source" : "SEDOL"
                   }
-                } ]
-              },
-              "price" : [ {
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "price-1"
+                    "value" : "quantity-2"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "7fb8eaff"
+              }
+            }, {
+              "price" : [ {
                 "value" : {
+                  "value" : 2.0000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 2.0000,
                   "perUnitOf" : {
-                    "financialUnit" : "SHARE"
+                    "financialUnit" : "Share"
                   },
-                  "priceType" : "ASSET_PRICE"
+                  "priceType" : "AssetPrice"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
                 }
               } ],
               "quantity" : [ {
+                "value" : {
+                  "value" : 50000000,
+                  "unit" : {
+                    "financialUnit" : "Share"
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-1"
                   } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "financialUnit" : "SHARE"
+                }
+              } ],
+              "observable" : {
+                "productIdentifier" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "ST001"
+                    },
+                    "source" : "SEDOL",
+                    "meta" : {
+                      "globalKey" : "a4ff65ff"
+                    }
                   },
-                  "value" : 50000000
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "productIdentifier-1"
+                    } ]
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "faed59e1"
                 }
-              } ]
+              },
+              "meta" : {
+                "globalKey" : "3b5ec440"
+              }
             } ]
-          } ]
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f2256"
-          },
-          "value" : "2020-09-22"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "value" : "0266001"
-            }
           } ],
-          "meta" : {
-            "globalKey" : "438fa6af"
-          }
-        } ]
-      }
-    }, {
-      "meta" : {
-        "globalKey" : "60a94911"
-      },
-      "trade" : {
-        "executionDetails" : {
-          "executionType" : "OFF_FACILITY",
-          "meta" : {
-            "globalKey" : "34596793"
-          }
-        },
-        "meta" : {
-          "globalKey" : "60a94911"
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "84088af0",
+              "externalReference" : "AGENT_LENDER"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "7c311b30",
+              "externalReference" : "Borrower"
+            }
+          } ]
         },
         "party" : [ {
-          "meta" : {
-            "externalKey" : "Lender0",
-            "globalKey" : "a896ecd"
-          },
-          "name" : {
-            "value" : "Standard Fund 1"
-          },
           "partyId" : [ {
             "identifier" : {
-              "value" : "FM1LEI11111111111111"
+              "value" : "KTKLLEILLLLLLLLLLLLL"
             },
             "meta" : {
-              "globalKey" : "87c4d1c6"
+              "globalKey" : "60098fe6"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "AGENT_LENDER",
-            "globalKey" : "73176f1c"
-          },
+          } ],
           "name" : {
             "value" : "KTKL"
           },
+          "meta" : {
+            "globalKey" : "84088af0",
+            "externalKey" : "AGENT_LENDER"
+          }
+        }, {
           "partyId" : [ {
             "identifier" : {
-              "value" : "KTKLLEILLLLLLLLLLLLL"
+              "value" : "CP001LEI111111111111"
             },
             "meta" : {
-              "globalKey" : "60098fe6"
+              "globalKey" : "12818f8c"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "Borrower",
-            "globalKey" : "1f061e68"
-          },
+          } ],
           "name" : {
             "value" : "CP001"
           },
-          "partyId" : [ {
+          "meta" : {
+            "globalKey" : "7c311b30",
+            "externalKey" : "Borrower"
+          }
+        } ],
+        "executionDetails" : {
+          "executionType" : "OffFacility",
+          "meta" : {
+            "globalKey" : "34596793"
+          }
+        },
+        "meta" : {
+          "globalKey" : "4fc2271e"
+        }
+      },
+      "meta" : {
+        "globalKey" : "4fc2271e",
+        "externalKey" : "TradeState"
+      }
+    }, {
+      "trade" : {
+        "tradeIdentifier" : [ {
+          "assignedIdentifier" : [ {
             "identifier" : {
-              "value" : "CP001LEI111111111111"
-            },
-            "meta" : {
-              "globalKey" : "12818f8c"
+              "value" : "0266001"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "438fa6af"
+          }
         } ],
+        "tradeDate" : {
+          "value" : "2020-09-22",
+          "meta" : {
+            "globalKey" : "3f2256"
+          }
+        },
         "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "Lender0",
-              "globalReference" : "a896ecd"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "Borrower",
-              "globalReference" : "1f061e68"
-            },
-            "role" : "PARTY_2"
-          } ],
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -495,25 +437,9 @@
                 "productQualifier" : "SecurityLendingAgreement"
               } ],
               "economicTerms" : {
-                "collateral" : {
-                  "collateralProvisions" : {
-                    "collateralType" : "CASH",
-                    "eligibleCollateral" : [ {
-                      "criteria" : [ {
-                        "treatment" : {
-                          "valuationTreatment" : {
-                            "marginPercentage" : 1.00
-                          }
-                        }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "31"
-                      }
-                    } ]
-                  }
-                },
                 "effectiveDate" : {
                   "adjustableDate" : {
+                    "unadjustedDate" : "2020-09-22",
                     "dateAdjustments" : {
                       "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
@@ -522,141 +448,90 @@
                     },
                     "meta" : {
                       "globalKey" : "e742daa5"
-                    },
-                    "unadjustedDate" : "2020-09-22"
+                    }
                   },
                   "meta" : {
                     "globalKey" : "e742daa5"
                   }
                 },
                 "payout" : {
-                  "assetPayout" : [ {
-                    "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
-                    },
-                    "assetLeg" : [ {
-                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                      "settlementDate" : {
-                        "adjustableDate" : {
-                          "adjustedDate" : {
-                            "meta" : {
-                              "globalKey" : "3f2256"
-                            },
-                            "value" : "2020-09-22"
-                          },
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "24a738"
-                        }
-                      }
-                    } ],
-                    "dividendTerms" : {
-                      "manufacturedIncomeRequirement" : {
-                        "totalRatio" : 1.00
-                      }
-                    },
-                    "durationType" : {
-                      "durationType" : "OPEN"
-                    },
-                    "meta" : {
-                      "globalKey" : "ab8c6811"
-                    },
-                    "minimumFee" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 0.00,
-                      "meta" : {
-                        "globalKey" : "171b36"
-                      }
-                    },
-                    "securityInformation" : {
-                      "meta" : {
-                        "globalKey" : "7a5b92c5"
-                      },
-                      "security" : {
-                        "productIdentifier" : [ {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "productIdentifier-1"
-                          }
-                        } ],
-                        "securityType" : "EQUITY"
-                      }
-                    }
-                  } ],
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "25e2ab"
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
+                          }
                         },
-                        "period" : "T",
-                        "periodMultiplier" : 1,
-                        "rollConvention" : "NONE"
-                      },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
-                          "adjustedDate" : {
-                            "meta" : {
-                              "globalKey" : "3f2256"
-                            },
-                            "value" : "2020-09-22"
-                          },
                           "dateAdjustments" : {
                             "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "fa42f5cf"
                             }
                           },
+                          "adjustedDate" : {
+                            "value" : "2020-09-22",
+                            "meta" : {
+                              "globalKey" : "3f2256"
+                            }
+                          },
                           "meta" : {
-                            "externalKey" : "Effective_Date",
-                            "globalKey" : "fa42f5cf"
+                            "globalKey" : "fa42f5cf",
+                            "externalKey" : "Effective_Date"
                           }
                         },
                         "meta" : {
                           "globalKey" : "fa42f5cf"
                         }
                       },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "T",
+                        "meta" : {
+                          "globalKey" : "24b525"
+                        },
+                        "rollConvention" : "NONE"
+                      },
                       "meta" : {
-                        "globalKey" : "da118afa"
+                        "globalKey" : "914a2b74"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "4219475c"
-                    },
                     "paymentDates" : {
-                      "meta" : {
-                        "globalKey" : "b578507f"
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "T",
+                        "meta" : {
+                          "globalKey" : "73"
+                        }
                       },
                       "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -665,193 +540,235 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "a2d"
-                        },
-                        "period" : "T",
-                        "periodMultiplier" : 1
+                      "meta" : {
+                        "globalKey" : "fa98fa5b"
                       }
                     },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
+                    "meta" : {
+                      "globalKey" : "d3c969a8"
+                    }
+                  } ],
+                  "assetPayout" : [ {
+                    "payerReceiver" : {
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
+                    },
+                    "assetLeg" : [ {
+                      "settlementDate" : {
+                        "adjustableDate" : {
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
+                          "adjustedDate" : {
+                            "value" : "2020-09-22",
+                            "meta" : {
+                              "globalKey" : "3f2256"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "24a738"
+                        }
+                      },
+                      "deliveryMethod" : "DeliveryVersusPayment"
+                    } ],
+                    "securityInformation" : {
+                      "security" : {
+                        "productIdentifier" : [ {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "productIdentifier-1"
                           }
+                        } ],
+                        "securityType" : "Equity"
+                      },
+                      "meta" : {
+                        "globalKey" : "7a5b92c5"
+                      }
+                    },
+                    "durationType" : {
+                      "durationType" : "Open"
+                    },
+                    "minimumFee" : {
+                      "value" : 0.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "171b36"
+                      }
+                    },
+                    "dividendTerms" : {
+                      "manufacturedIncomeRequirement" : {
+                        "totalRatio" : 1.00
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "37f53f11"
                     }
                   } ],
                   "meta" : {
-                    "globalKey" : "13d5cc2d"
+                    "globalKey" : "36ab7869"
+                  }
+                },
+                "collateral" : {
+                  "collateralProvisions" : {
+                    "collateralType" : "Cash",
+                    "eligibleCollateral" : [ {
+                      "criteria" : [ {
+                        "treatment" : {
+                          "valuationTreatment" : {
+                            "marginPercentage" : 1.00
+                          }
+                        }
+                      } ],
+                      "meta" : {
+                        "globalKey" : "31"
+                      }
+                    } ]
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "8e261cf4"
+                "globalKey" : "95a7e6ac"
               }
             },
             "meta" : {
-              "globalKey" : "8e261cf4"
+              "globalKey" : "95a7e6ac"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "9ca05cf6"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.050000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.050000,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ],
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "quantity" : [ {
                 "value" : {
+                  "value" : 40000000.00,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 40000000.00
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "6b426e01"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "a4ff65ff"
-                },
-                "productIdentifier" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "productIdentifier-1"
-                    } ]
-                  },
-                  "value" : {
-                    "identifier" : {
-                      "value" : "ST001"
-                    },
-                    "meta" : {
-                      "globalKey" : "a4ff65ff"
-                    },
-                    "source" : "SEDOL"
                   }
-                } ]
-              },
-              "price" : [ {
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "price-2"
+                    "value" : "quantity-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "f76b41ca"
+              }
+            }, {
+              "price" : [ {
                 "value" : {
+                  "value" : 2.0000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 2.0000,
                   "perUnitOf" : {
-                    "financialUnit" : "SHARE"
+                    "financialUnit" : "Share"
                   },
-                  "priceType" : "ASSET_PRICE"
+                  "priceType" : "AssetPrice"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-2"
+                  } ]
                 }
               } ],
               "quantity" : [ {
+                "value" : {
+                  "value" : 20000000,
+                  "unit" : {
+                    "financialUnit" : "Share"
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-2"
                   } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "financialUnit" : "SHARE"
-                  },
-                  "value" : 20000000
                 }
-              } ]
-            } ]
-          } ]
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f2256"
-          },
-          "value" : "2020-09-22"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "value" : "0266001"
-            }
-          } ],
-          "meta" : {
-            "globalKey" : "438fa6af"
-          }
-        } ]
-      }
-    }, {
-      "meta" : {
-        "globalKey" : "750abd4"
-      },
-      "trade" : {
-        "executionDetails" : {
-          "executionType" : "OFF_FACILITY",
-          "meta" : {
-            "globalKey" : "34596793"
-          }
-        },
-        "meta" : {
-          "globalKey" : "750abd4"
+              } ],
+              "observable" : {
+                "productIdentifier" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "ST001"
+                    },
+                    "source" : "SEDOL",
+                    "meta" : {
+                      "globalKey" : "a4ff65ff"
+                    }
+                  },
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "productIdentifier-1"
+                    } ]
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "faed59e1"
+                }
+              },
+              "meta" : {
+                "globalKey" : "eda91de3"
+              }
+            } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "40ec509f",
+              "externalReference" : "Lender0"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "7c311b30",
+              "externalReference" : "Borrower"
+            }
+          } ]
         },
         "party" : [ {
-          "meta" : {
-            "externalKey" : "Lender1",
-            "globalKey" : "a89e32c"
-          },
-          "name" : {
-            "value" : "Standard Fund 2"
-          },
           "partyId" : [ {
             "identifier" : {
               "value" : "FM1LEI11111111111111"
@@ -859,15 +776,15 @@
             "meta" : {
               "globalKey" : "87c4d1c6"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "AGENT_LENDER",
-            "globalKey" : "73176f1c"
-          },
+          } ],
           "name" : {
-            "value" : "KTKL"
+            "value" : "Standard Fund 1"
           },
+          "meta" : {
+            "globalKey" : "40ec509f",
+            "externalKey" : "Lender0"
+          }
+        }, {
           "partyId" : [ {
             "identifier" : {
               "value" : "KTKLLEILLLLLLLLLLLLL"
@@ -875,15 +792,15 @@
             "meta" : {
               "globalKey" : "60098fe6"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "Borrower",
-            "globalKey" : "1f061e68"
-          },
+          } ],
           "name" : {
-            "value" : "CP001"
+            "value" : "KTKL"
           },
+          "meta" : {
+            "globalKey" : "84088af0",
+            "externalKey" : "AGENT_LENDER"
+          }
+        }, {
           "partyId" : [ {
             "identifier" : {
               "value" : "CP001LEI111111111111"
@@ -891,22 +808,47 @@
             "meta" : {
               "globalKey" : "12818f8c"
             }
-          } ]
+          } ],
+          "name" : {
+            "value" : "CP001"
+          },
+          "meta" : {
+            "globalKey" : "7c311b30",
+            "externalKey" : "Borrower"
+          }
         } ],
-        "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "Lender1",
-              "globalReference" : "a89e32c"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "Borrower",
-              "globalReference" : "1f061e68"
-            },
-            "role" : "PARTY_2"
+        "executionDetails" : {
+          "executionType" : "OffFacility",
+          "meta" : {
+            "globalKey" : "34596793"
+          }
+        },
+        "meta" : {
+          "globalKey" : "90855477"
+        }
+      },
+      "meta" : {
+        "globalKey" : "90855477"
+      }
+    }, {
+      "trade" : {
+        "tradeIdentifier" : [ {
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "0266001"
+            }
           } ],
+          "meta" : {
+            "globalKey" : "438fa6af"
+          }
+        } ],
+        "tradeDate" : {
+          "value" : "2020-09-22",
+          "meta" : {
+            "globalKey" : "3f2256"
+          }
+        },
+        "tradableProduct" : {
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -914,25 +856,9 @@
                 "productQualifier" : "SecurityLendingAgreement"
               } ],
               "economicTerms" : {
-                "collateral" : {
-                  "collateralProvisions" : {
-                    "collateralType" : "CASH",
-                    "eligibleCollateral" : [ {
-                      "criteria" : [ {
-                        "treatment" : {
-                          "valuationTreatment" : {
-                            "marginPercentage" : 1.00
-                          }
-                        }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "31"
-                      }
-                    } ]
-                  }
-                },
                 "effectiveDate" : {
                   "adjustableDate" : {
+                    "unadjustedDate" : "2020-09-22",
                     "dateAdjustments" : {
                       "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
@@ -941,141 +867,90 @@
                     },
                     "meta" : {
                       "globalKey" : "e742daa5"
-                    },
-                    "unadjustedDate" : "2020-09-22"
+                    }
                   },
                   "meta" : {
                     "globalKey" : "e742daa5"
                   }
                 },
                 "payout" : {
-                  "assetPayout" : [ {
-                    "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
-                    },
-                    "assetLeg" : [ {
-                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                      "settlementDate" : {
-                        "adjustableDate" : {
-                          "adjustedDate" : {
-                            "meta" : {
-                              "globalKey" : "3f2256"
-                            },
-                            "value" : "2020-09-22"
-                          },
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "24a738"
-                        }
-                      }
-                    } ],
-                    "dividendTerms" : {
-                      "manufacturedIncomeRequirement" : {
-                        "totalRatio" : 1.00
-                      }
-                    },
-                    "durationType" : {
-                      "durationType" : "OPEN"
-                    },
-                    "meta" : {
-                      "globalKey" : "ab8c6811"
-                    },
-                    "minimumFee" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 0.00,
-                      "meta" : {
-                        "globalKey" : "171b36"
-                      }
-                    },
-                    "securityInformation" : {
-                      "meta" : {
-                        "globalKey" : "7a5b92c5"
-                      },
-                      "security" : {
-                        "productIdentifier" : [ {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "productIdentifier-1"
-                          }
-                        } ],
-                        "securityType" : "EQUITY"
-                      }
-                    }
-                  } ],
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-1"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "25e2ab"
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-2"
+                            }
+                          }
                         },
-                        "period" : "T",
-                        "periodMultiplier" : 1,
-                        "rollConvention" : "NONE"
-                      },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
-                          "adjustedDate" : {
-                            "meta" : {
-                              "globalKey" : "3f2256"
-                            },
-                            "value" : "2020-09-22"
-                          },
                           "dateAdjustments" : {
                             "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "fa42f5cf"
                             }
                           },
+                          "adjustedDate" : {
+                            "value" : "2020-09-22",
+                            "meta" : {
+                              "globalKey" : "3f2256"
+                            }
+                          },
                           "meta" : {
-                            "externalKey" : "Effective_Date",
-                            "globalKey" : "fa42f5cf"
+                            "globalKey" : "fa42f5cf",
+                            "externalKey" : "Effective_Date"
                           }
                         },
                         "meta" : {
                           "globalKey" : "fa42f5cf"
                         }
                       },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "T",
+                        "meta" : {
+                          "globalKey" : "24b525"
+                        },
+                        "rollConvention" : "NONE"
+                      },
                       "meta" : {
-                        "globalKey" : "da118afa"
+                        "globalKey" : "914a2b74"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "4219475c"
-                    },
                     "paymentDates" : {
-                      "meta" : {
-                        "globalKey" : "b578507f"
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "T",
+                        "meta" : {
+                          "globalKey" : "73"
+                        }
                       },
                       "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -1084,193 +959,235 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "a2d"
-                        },
-                        "period" : "T",
-                        "periodMultiplier" : 1
+                      "meta" : {
+                        "globalKey" : "fa98fa5b"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "d3c969a8"
+                    }
+                  } ],
+                  "assetPayout" : [ {
+                    "payerReceiver" : {
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
+                    },
+                    "assetLeg" : [ {
+                      "settlementDate" : {
+                        "adjustableDate" : {
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
+                          "adjustedDate" : {
+                            "value" : "2020-09-22",
+                            "meta" : {
+                              "globalKey" : "3f2256"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "24a738"
+                        }
+                      },
+                      "deliveryMethod" : "DeliveryVersusPayment"
+                    } ],
+                    "securityInformation" : {
+                      "security" : {
+                        "productIdentifier" : [ {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "productIdentifier-1"
+                          }
+                        } ],
+                        "securityType" : "Equity"
+                      },
+                      "meta" : {
+                        "globalKey" : "7a5b92c5"
+                      }
+                    },
+                    "durationType" : {
+                      "durationType" : "Open"
+                    },
+                    "minimumFee" : {
+                      "value" : 0.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "171b36"
                       }
                     },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-2"
-                            }
-                          }
-                        }
+                    "dividendTerms" : {
+                      "manufacturedIncomeRequirement" : {
+                        "totalRatio" : 1.00
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "37f53f11"
                     }
                   } ],
                   "meta" : {
-                    "globalKey" : "13d5cc2d"
+                    "globalKey" : "36ab7869"
+                  }
+                },
+                "collateral" : {
+                  "collateralProvisions" : {
+                    "collateralType" : "Cash",
+                    "eligibleCollateral" : [ {
+                      "criteria" : [ {
+                        "treatment" : {
+                          "valuationTreatment" : {
+                            "marginPercentage" : 1.00
+                          }
+                        }
+                      } ],
+                      "meta" : {
+                        "globalKey" : "31"
+                      }
+                    } ]
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "8e261cf4"
+                "globalKey" : "95a7e6ac"
               }
             },
             "meta" : {
-              "globalKey" : "8e261cf4"
+              "globalKey" : "95a7e6ac"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "72d6f774"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-2"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.050000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.050000,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ],
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-1"
+                    "value" : "price-2"
                   } ]
-                },
+                }
+              } ],
+              "quantity" : [ {
                 "value" : {
+                  "value" : 20000000.00,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 20000000.00
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "76f8fce2"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "a4ff65ff"
-                },
-                "productIdentifier" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "productIdentifier-1"
-                    } ]
-                  },
-                  "value" : {
-                    "identifier" : {
-                      "value" : "ST001"
-                    },
-                    "meta" : {
-                      "globalKey" : "a4ff65ff"
-                    },
-                    "source" : "SEDOL"
                   }
-                } ]
-              },
-              "price" : [ {
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "price-1"
+                    "value" : "quantity-1"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e807f70c"
+              }
+            }, {
+              "price" : [ {
                 "value" : {
+                  "value" : 2.0000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 2.0000,
                   "perUnitOf" : {
-                    "financialUnit" : "SHARE"
+                    "financialUnit" : "Share"
                   },
-                  "priceType" : "ASSET_PRICE"
+                  "priceType" : "AssetPrice"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
                 }
               } ],
               "quantity" : [ {
+                "value" : {
+                  "value" : 10000000,
+                  "unit" : {
+                    "financialUnit" : "Share"
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-2"
                   } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "financialUnit" : "SHARE"
+                }
+              } ],
+              "observable" : {
+                "productIdentifier" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "ST001"
+                    },
+                    "source" : "SEDOL",
+                    "meta" : {
+                      "globalKey" : "a4ff65ff"
+                    }
                   },
-                  "value" : 10000000
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "productIdentifier-1"
+                    } ]
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "faed59e1"
                 }
-              } ]
+              },
+              "meta" : {
+                "globalKey" : "29173bc4"
+              }
             } ]
-          } ]
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f2256"
-          },
-          "value" : "2020-09-22"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "value" : "0266001"
-            }
           } ],
-          "meta" : {
-            "globalKey" : "438fa6af"
-          }
-        } ]
-      }
-    }, {
-      "meta" : {
-        "globalKey" : "5c5cce98"
-      },
-      "trade" : {
-        "executionDetails" : {
-          "executionType" : "OFF_FACILITY",
-          "meta" : {
-            "globalKey" : "34596793"
-          }
-        },
-        "meta" : {
-          "globalKey" : "5c5cce98"
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "40ec50a0",
+              "externalReference" : "Lender1"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "7c311b30",
+              "externalReference" : "Borrower"
+            }
+          } ]
         },
         "party" : [ {
-          "meta" : {
-            "externalKey" : "Lender2",
-            "globalKey" : "a8a578b"
-          },
-          "name" : {
-            "value" : "Standard Fund 3"
-          },
           "partyId" : [ {
             "identifier" : {
               "value" : "FM1LEI11111111111111"
@@ -1278,15 +1195,15 @@
             "meta" : {
               "globalKey" : "87c4d1c6"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "AGENT_LENDER",
-            "globalKey" : "73176f1c"
-          },
+          } ],
           "name" : {
-            "value" : "KTKL"
+            "value" : "Standard Fund 2"
           },
+          "meta" : {
+            "globalKey" : "40ec50a0",
+            "externalKey" : "Lender1"
+          }
+        }, {
           "partyId" : [ {
             "identifier" : {
               "value" : "KTKLLEILLLLLLLLLLLLL"
@@ -1294,15 +1211,15 @@
             "meta" : {
               "globalKey" : "60098fe6"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "Borrower",
-            "globalKey" : "1f061e68"
-          },
+          } ],
           "name" : {
-            "value" : "CP001"
+            "value" : "KTKL"
           },
+          "meta" : {
+            "globalKey" : "84088af0",
+            "externalKey" : "AGENT_LENDER"
+          }
+        }, {
           "partyId" : [ {
             "identifier" : {
               "value" : "CP001LEI111111111111"
@@ -1310,48 +1227,57 @@
             "meta" : {
               "globalKey" : "12818f8c"
             }
-          } ]
+          } ],
+          "name" : {
+            "value" : "CP001"
+          },
+          "meta" : {
+            "globalKey" : "7c311b30",
+            "externalKey" : "Borrower"
+          }
         } ],
-        "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "Lender2",
-              "globalReference" : "a8a578b"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "Borrower",
-              "globalReference" : "1f061e68"
-            },
-            "role" : "PARTY_2"
+        "executionDetails" : {
+          "executionType" : "OffFacility",
+          "meta" : {
+            "globalKey" : "34596793"
+          }
+        },
+        "meta" : {
+          "globalKey" : "da7353b6"
+        }
+      },
+      "meta" : {
+        "globalKey" : "da7353b6"
+      }
+    }, {
+      "trade" : {
+        "tradeIdentifier" : [ {
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "0266001"
+            }
           } ],
+          "meta" : {
+            "globalKey" : "438fa6af"
+          }
+        } ],
+        "tradeDate" : {
+          "value" : "2020-09-22",
+          "meta" : {
+            "globalKey" : "3f2256"
+          }
+        },
+        "tradableProduct" : {
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
                 "source" : "ISDA",
-                "productQualifier" : "SecurityLendingAgreement"
-              } ],
-              "economicTerms" : {
-                "collateral" : {
-                  "collateralProvisions" : {
-                    "collateralType" : "CASH",
-                    "eligibleCollateral" : [ {
-                      "criteria" : [ {
-                        "treatment" : {
-                          "valuationTreatment" : {
-                            "marginPercentage" : 1.00
-                          }
-                        }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "31"
-                      }
-                    } ]
-                  }
-                },
+                "productQualifier" : "SecurityLendingAgreement"
+              } ],
+              "economicTerms" : {
                 "effectiveDate" : {
                   "adjustableDate" : {
+                    "unadjustedDate" : "2020-09-22",
                     "dateAdjustments" : {
                       "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
@@ -1360,141 +1286,90 @@
                     },
                     "meta" : {
                       "globalKey" : "e742daa5"
-                    },
-                    "unadjustedDate" : "2020-09-22"
+                    }
                   },
                   "meta" : {
                     "globalKey" : "e742daa5"
                   }
                 },
                 "payout" : {
-                  "assetPayout" : [ {
-                    "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
-                    },
-                    "assetLeg" : [ {
-                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                      "settlementDate" : {
-                        "adjustableDate" : {
-                          "adjustedDate" : {
-                            "meta" : {
-                              "globalKey" : "3f2256"
-                            },
-                            "value" : "2020-09-22"
-                          },
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "24a738"
-                        }
-                      }
-                    } ],
-                    "dividendTerms" : {
-                      "manufacturedIncomeRequirement" : {
-                        "totalRatio" : 1.00
-                      }
-                    },
-                    "durationType" : {
-                      "durationType" : "OPEN"
-                    },
-                    "meta" : {
-                      "globalKey" : "ab8c6811"
-                    },
-                    "minimumFee" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 0.00,
-                      "meta" : {
-                        "globalKey" : "171b36"
-                      }
-                    },
-                    "securityInformation" : {
-                      "meta" : {
-                        "globalKey" : "7a5b92c5"
-                      },
-                      "security" : {
-                        "productIdentifier" : [ {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "productIdentifier-1"
-                          }
-                        } ],
-                        "securityType" : "EQUITY"
-                      }
-                    }
-                  } ],
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-2"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
                       }
                     },
-                    "calculationPeriodDates" : {
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "25e2ab"
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-1"
+                            }
+                          }
                         },
-                        "period" : "T",
-                        "periodMultiplier" : 1,
-                        "rollConvention" : "NONE"
-                      },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      }
+                    },
+                    "calculationPeriodDates" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
-                          "adjustedDate" : {
-                            "meta" : {
-                              "globalKey" : "3f2256"
-                            },
-                            "value" : "2020-09-22"
-                          },
                           "dateAdjustments" : {
                             "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "fa42f5cf"
                             }
                           },
+                          "adjustedDate" : {
+                            "value" : "2020-09-22",
+                            "meta" : {
+                              "globalKey" : "3f2256"
+                            }
+                          },
                           "meta" : {
-                            "externalKey" : "Effective_Date",
-                            "globalKey" : "fa42f5cf"
+                            "globalKey" : "fa42f5cf",
+                            "externalKey" : "Effective_Date"
                           }
                         },
                         "meta" : {
                           "globalKey" : "fa42f5cf"
                         }
                       },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "T",
+                        "meta" : {
+                          "globalKey" : "24b525"
+                        },
+                        "rollConvention" : "NONE"
+                      },
                       "meta" : {
-                        "globalKey" : "da118afa"
+                        "globalKey" : "914a2b74"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "4219475c"
-                    },
                     "paymentDates" : {
-                      "meta" : {
-                        "globalKey" : "b578507f"
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "T",
+                        "meta" : {
+                          "globalKey" : "73"
+                        }
                       },
                       "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -1503,209 +1378,251 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "a2d"
-                        },
-                        "period" : "T",
-                        "periodMultiplier" : 1
+                      "meta" : {
+                        "globalKey" : "fa98fa5b"
                       }
                     },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-1"
+                    "meta" : {
+                      "globalKey" : "d3c969a8"
+                    }
+                  } ],
+                  "assetPayout" : [ {
+                    "payerReceiver" : {
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
+                    },
+                    "assetLeg" : [ {
+                      "settlementDate" : {
+                        "adjustableDate" : {
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
+                          "adjustedDate" : {
+                            "value" : "2020-09-22",
+                            "meta" : {
+                              "globalKey" : "3f2256"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "24a738"
+                        }
+                      },
+                      "deliveryMethod" : "DeliveryVersusPayment"
+                    } ],
+                    "securityInformation" : {
+                      "security" : {
+                        "productIdentifier" : [ {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "productIdentifier-1"
                           }
+                        } ],
+                        "securityType" : "Equity"
+                      },
+                      "meta" : {
+                        "globalKey" : "7a5b92c5"
+                      }
+                    },
+                    "durationType" : {
+                      "durationType" : "Open"
+                    },
+                    "minimumFee" : {
+                      "value" : 0.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "171b36"
+                      }
+                    },
+                    "dividendTerms" : {
+                      "manufacturedIncomeRequirement" : {
+                        "totalRatio" : 1.00
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "37f53f11"
                     }
                   } ],
                   "meta" : {
-                    "globalKey" : "13d5cc2d"
+                    "globalKey" : "36ab7869"
+                  }
+                },
+                "collateral" : {
+                  "collateralProvisions" : {
+                    "collateralType" : "Cash",
+                    "eligibleCollateral" : [ {
+                      "criteria" : [ {
+                        "treatment" : {
+                          "valuationTreatment" : {
+                            "marginPercentage" : 1.00
+                          }
+                        }
+                      } ],
+                      "meta" : {
+                        "globalKey" : "31"
+                      }
+                    } ]
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "8e261cf4"
+                "globalKey" : "95a7e6ac"
               }
             },
             "meta" : {
-              "globalKey" : "8e261cf4"
+              "globalKey" : "95a7e6ac"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "7bbaa35"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-1"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.050000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.050000,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ],
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
+                    "value" : "price-1"
                   } ]
-                },
+                }
+              } ],
+              "quantity" : [ {
                 "value" : {
+                  "value" : 30000000.00,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 30000000.00
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "5c4f27e7"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "a4ff65ff"
-                },
-                "productIdentifier" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "productIdentifier-1"
-                    } ]
-                  },
-                  "value" : {
-                    "identifier" : {
-                      "value" : "ST001"
-                    },
-                    "meta" : {
-                      "globalKey" : "a4ff65ff"
-                    },
-                    "source" : "SEDOL"
                   }
-                } ]
-              },
-              "price" : [ {
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "price-2"
+                    "value" : "quantity-2"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "efb99c6b"
+              }
+            }, {
+              "price" : [ {
                 "value" : {
+                  "value" : 2.0000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 2.0000,
                   "perUnitOf" : {
-                    "financialUnit" : "SHARE"
+                    "financialUnit" : "Share"
                   },
-                  "priceType" : "ASSET_PRICE"
+                  "priceType" : "AssetPrice"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-2"
+                  } ]
                 }
               } ],
               "quantity" : [ {
+                "value" : {
+                  "value" : 15000000,
+                  "unit" : {
+                    "financialUnit" : "Share"
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-1"
                   } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "financialUnit" : "SHARE"
+                }
+              } ],
+              "observable" : {
+                "productIdentifier" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "ST001"
+                    },
+                    "source" : "SEDOL",
+                    "meta" : {
+                      "globalKey" : "a4ff65ff"
+                    }
                   },
-                  "value" : 15000000
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "productIdentifier-1"
+                    } ]
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "faed59e1"
                 }
-              } ]
+              },
+              "meta" : {
+                "globalKey" : "bc6891c9"
+              }
             } ]
-          } ]
-        },
-        "tradeDate" : {
-          "meta" : {
-            "globalKey" : "3f2256"
-          },
-          "value" : "2020-09-22"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
-            "identifier" : {
-              "value" : "0266001"
-            }
           } ],
-          "meta" : {
-            "globalKey" : "438fa6af"
-          }
-        } ]
-      }
-    }, {
-      "meta" : {
-        "globalKey" : "408d9fec"
-      },
-      "trade" : {
-        "executionDetails" : {
-          "executionType" : "OFF_FACILITY",
-          "meta" : {
-            "globalKey" : "34596793"
-          }
-        },
-        "meta" : {
-          "globalKey" : "408d9fec"
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "40ec50a1",
+              "externalReference" : "Lender2"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "7c311b30",
+              "externalReference" : "Borrower"
+            }
+          } ]
         },
         "party" : [ {
-          "meta" : {
-            "externalKey" : "Lender3",
-            "globalKey" : "632c86e9"
-          },
-          "name" : {
-            "value" : "Standard Fund 4"
-          },
           "partyId" : [ {
             "identifier" : {
-              "value" : "FM2LEI22222222222222"
+              "value" : "FM1LEI11111111111111"
             },
             "meta" : {
-              "globalKey" : "e0668cc5"
+              "globalKey" : "87c4d1c6"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "AGENT_LENDER",
-            "globalKey" : "73176f1c"
-          },
+          } ],
           "name" : {
-            "value" : "KTKL"
+            "value" : "Standard Fund 3"
           },
+          "meta" : {
+            "globalKey" : "40ec50a1",
+            "externalKey" : "Lender2"
+          }
+        }, {
           "partyId" : [ {
             "identifier" : {
               "value" : "KTKLLEILLLLLLLLLLLLL"
@@ -1713,15 +1630,15 @@
             "meta" : {
               "globalKey" : "60098fe6"
             }
-          } ]
-        }, {
-          "meta" : {
-            "externalKey" : "Borrower",
-            "globalKey" : "1f061e68"
-          },
+          } ],
           "name" : {
-            "value" : "CP001"
+            "value" : "KTKL"
           },
+          "meta" : {
+            "globalKey" : "84088af0",
+            "externalKey" : "AGENT_LENDER"
+          }
+        }, {
           "partyId" : [ {
             "identifier" : {
               "value" : "CP001LEI111111111111"
@@ -1729,22 +1646,47 @@
             "meta" : {
               "globalKey" : "12818f8c"
             }
-          } ]
+          } ],
+          "name" : {
+            "value" : "CP001"
+          },
+          "meta" : {
+            "globalKey" : "7c311b30",
+            "externalKey" : "Borrower"
+          }
         } ],
-        "tradableProduct" : {
-          "counterparty" : [ {
-            "partyReference" : {
-              "externalReference" : "Lender3",
-              "globalReference" : "632c86e9"
-            },
-            "role" : "PARTY_1"
-          }, {
-            "partyReference" : {
-              "externalReference" : "Borrower",
-              "globalReference" : "1f061e68"
-            },
-            "role" : "PARTY_2"
+        "executionDetails" : {
+          "executionType" : "OffFacility",
+          "meta" : {
+            "globalKey" : "34596793"
+          }
+        },
+        "meta" : {
+          "globalKey" : "bdab39dc"
+        }
+      },
+      "meta" : {
+        "globalKey" : "bdab39dc"
+      }
+    }, {
+      "trade" : {
+        "tradeIdentifier" : [ {
+          "assignedIdentifier" : [ {
+            "identifier" : {
+              "value" : "0266001"
+            }
           } ],
+          "meta" : {
+            "globalKey" : "438fa6af"
+          }
+        } ],
+        "tradeDate" : {
+          "value" : "2020-09-22",
+          "meta" : {
+            "globalKey" : "3f2256"
+          }
+        },
+        "tradableProduct" : {
           "product" : {
             "contractualProduct" : {
               "productTaxonomy" : [ {
@@ -1752,25 +1694,9 @@
                 "productQualifier" : "SecurityLendingAgreement"
               } ],
               "economicTerms" : {
-                "collateral" : {
-                  "collateralProvisions" : {
-                    "collateralType" : "CASH",
-                    "eligibleCollateral" : [ {
-                      "criteria" : [ {
-                        "treatment" : {
-                          "valuationTreatment" : {
-                            "marginPercentage" : 1.00
-                          }
-                        }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "31"
-                      }
-                    } ]
-                  }
-                },
                 "effectiveDate" : {
                   "adjustableDate" : {
+                    "unadjustedDate" : "2020-09-22",
                     "dateAdjustments" : {
                       "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
@@ -1779,141 +1705,90 @@
                     },
                     "meta" : {
                       "globalKey" : "e742daa5"
-                    },
-                    "unadjustedDate" : "2020-09-22"
+                    }
                   },
                   "meta" : {
                     "globalKey" : "e742daa5"
                   }
                 },
                 "payout" : {
-                  "assetPayout" : [ {
-                    "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
-                    },
-                    "assetLeg" : [ {
-                      "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                      "settlementDate" : {
-                        "adjustableDate" : {
-                          "adjustedDate" : {
-                            "meta" : {
-                              "globalKey" : "3f2256"
-                            },
-                            "value" : "2020-09-22"
-                          },
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "24a738"
-                        }
-                      }
-                    } ],
-                    "dividendTerms" : {
-                      "manufacturedIncomeRequirement" : {
-                        "totalRatio" : 1.00
-                      }
-                    },
-                    "durationType" : {
-                      "durationType" : "OPEN"
-                    },
-                    "meta" : {
-                      "globalKey" : "ab8c6811"
-                    },
-                    "minimumFee" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 0.00,
-                      "meta" : {
-                        "globalKey" : "171b36"
-                      }
-                    },
-                    "securityInformation" : {
-                      "meta" : {
-                        "globalKey" : "7a5b92c5"
-                      },
-                      "security" : {
-                        "productIdentifier" : [ {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "productIdentifier-1"
-                          }
-                        } ],
-                        "securityType" : "EQUITY"
-                      }
-                    }
-                  } ],
                   "interestRatePayout" : [ {
                     "payerReceiver" : {
-                      "payer" : "PARTY_1",
-                      "receiver" : "PARTY_2"
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
                     },
                     "priceQuantity" : {
-                      "meta" : {
-                        "globalKey" : "0"
-                      },
                       "quantitySchedule" : {
                         "address" : {
                           "scope" : "DOCUMENT",
                           "value" : "quantity-2"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "0"
+                      }
+                    },
+                    "rateSpecification" : {
+                      "fixedRate" : {
+                        "rateSchedule" : {
+                          "price" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "price-2"
+                            }
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
                       }
                     },
                     "calculationPeriodDates" : {
-                      "calculationPeriodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "25e2ab"
-                        },
-                        "period" : "T",
-                        "periodMultiplier" : 1,
-                        "rollConvention" : "NONE"
-                      },
                       "effectiveDate" : {
                         "adjustableDate" : {
-                          "adjustedDate" : {
-                            "meta" : {
-                              "globalKey" : "3f2256"
-                            },
-                            "value" : "2020-09-22"
-                          },
                           "dateAdjustments" : {
                             "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "fa42f5cf"
                             }
                           },
+                          "adjustedDate" : {
+                            "value" : "2020-09-22",
+                            "meta" : {
+                              "globalKey" : "3f2256"
+                            }
+                          },
                           "meta" : {
-                            "externalKey" : "Effective_Date",
-                            "globalKey" : "fa42f5cf"
+                            "globalKey" : "fa42f5cf",
+                            "externalKey" : "Effective_Date"
                           }
                         },
                         "meta" : {
                           "globalKey" : "fa42f5cf"
                         }
                       },
+                      "calculationPeriodFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "T",
+                        "meta" : {
+                          "globalKey" : "24b525"
+                        },
+                        "rollConvention" : "NONE"
+                      },
                       "meta" : {
-                        "globalKey" : "da118afa"
+                        "globalKey" : "914a2b74"
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "4219475c"
-                    },
                     "paymentDates" : {
-                      "meta" : {
-                        "globalKey" : "b578507f"
+                      "paymentFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "T",
+                        "meta" : {
+                          "globalKey" : "73"
+                        }
                       },
                       "paymentDatesAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -1922,181 +1797,306 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
-                      "paymentFrequency" : {
-                        "meta" : {
-                          "globalKey" : "a2d"
-                        },
-                        "period" : "T",
-                        "periodMultiplier" : 1
+                      "meta" : {
+                        "globalKey" : "fa98fa5b"
                       }
                     },
-                    "rateSpecification" : {
-                      "fixedRate" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "rateSchedule" : {
-                          "price" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "price-2"
+                    "meta" : {
+                      "globalKey" : "d3c969a8"
+                    }
+                  } ],
+                  "assetPayout" : [ {
+                    "payerReceiver" : {
+                      "payer" : "Party1",
+                      "receiver" : "Party2"
+                    },
+                    "assetLeg" : [ {
+                      "settlementDate" : {
+                        "adjustableDate" : {
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
+                          "adjustedDate" : {
+                            "value" : "2020-09-22",
+                            "meta" : {
+                              "globalKey" : "3f2256"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "24a738"
+                        }
+                      },
+                      "deliveryMethod" : "DeliveryVersusPayment"
+                    } ],
+                    "securityInformation" : {
+                      "security" : {
+                        "productIdentifier" : [ {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "productIdentifier-1"
                           }
+                        } ],
+                        "securityType" : "Equity"
+                      },
+                      "meta" : {
+                        "globalKey" : "7a5b92c5"
+                      }
+                    },
+                    "durationType" : {
+                      "durationType" : "Open"
+                    },
+                    "minimumFee" : {
+                      "value" : 0.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "171b36"
+                      }
+                    },
+                    "dividendTerms" : {
+                      "manufacturedIncomeRequirement" : {
+                        "totalRatio" : 1.00
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "37f53f11"
                     }
                   } ],
                   "meta" : {
-                    "globalKey" : "13d5cc2d"
+                    "globalKey" : "36ab7869"
+                  }
+                },
+                "collateral" : {
+                  "collateralProvisions" : {
+                    "collateralType" : "Cash",
+                    "eligibleCollateral" : [ {
+                      "criteria" : [ {
+                        "treatment" : {
+                          "valuationTreatment" : {
+                            "marginPercentage" : 1.00
+                          }
+                        }
+                      } ],
+                      "meta" : {
+                        "globalKey" : "31"
+                      }
+                    } ]
                   }
                 }
               },
               "meta" : {
-                "globalKey" : "8e261cf4"
+                "globalKey" : "95a7e6ac"
               }
             },
             "meta" : {
-              "globalKey" : "8e261cf4"
+              "globalKey" : "95a7e6ac"
             }
           },
           "tradeLot" : [ {
             "priceQuantity" : [ {
-              "meta" : {
-                "globalKey" : "ddf244b3"
-              },
               "price" : [ {
-                "meta" : {
-                  "location" : [ {
-                    "scope" : "DOCUMENT",
-                    "value" : "price-2"
-                  } ]
-                },
                 "value" : {
+                  "value" : 0.050000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 0.050000,
                   "perUnitOf" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "priceType" : "INTEREST_RATE"
-                }
-              } ],
-              "quantity" : [ {
+                  "priceType" : "InterestRate"
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "quantity-2"
+                    "value" : "price-2"
                   } ]
-                },
+                }
+              } ],
+              "quantity" : [ {
                 "value" : {
+                  "value" : 10000000.00,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
-                  },
-                  "value" : 10000000.00
-                }
-              } ]
-            }, {
-              "meta" : {
-                "globalKey" : "9a4080f8"
-              },
-              "observable" : {
-                "meta" : {
-                  "globalKey" : "a4ff65ff"
-                },
-                "productIdentifier" : [ {
-                  "meta" : {
-                    "location" : [ {
-                      "scope" : "DOCUMENT",
-                      "value" : "productIdentifier-1"
-                    } ]
-                  },
-                  "value" : {
-                    "identifier" : {
-                      "value" : "ST001"
-                    },
-                    "meta" : {
-                      "globalKey" : "a4ff65ff"
-                    },
-                    "source" : "SEDOL"
                   }
-                } ]
-              },
-              "price" : [ {
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
-                    "value" : "price-1"
+                    "value" : "quantity-2"
                   } ]
-                },
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "e05651ad"
+              }
+            }, {
+              "price" : [ {
                 "value" : {
+                  "value" : 2.0000,
                   "unit" : {
                     "currency" : {
                       "value" : "USD"
                     }
                   },
-                  "value" : 2.0000,
                   "perUnitOf" : {
-                    "financialUnit" : "SHARE"
+                    "financialUnit" : "Share"
                   },
-                  "priceType" : "ASSET_PRICE"
+                  "priceType" : "AssetPrice"
+                },
+                "meta" : {
+                  "location" : [ {
+                    "scope" : "DOCUMENT",
+                    "value" : "price-1"
+                  } ]
                 }
               } ],
               "quantity" : [ {
+                "value" : {
+                  "value" : 5000000,
+                  "unit" : {
+                    "financialUnit" : "Share"
+                  }
+                },
                 "meta" : {
                   "location" : [ {
                     "scope" : "DOCUMENT",
                     "value" : "quantity-1"
                   } ]
-                },
-                "value" : {
-                  "unit" : {
-                    "financialUnit" : "SHARE"
+                }
+              } ],
+              "observable" : {
+                "productIdentifier" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "ST001"
+                    },
+                    "source" : "SEDOL",
+                    "meta" : {
+                      "globalKey" : "a4ff65ff"
+                    }
                   },
-                  "value" : 5000000
+                  "meta" : {
+                    "location" : [ {
+                      "scope" : "DOCUMENT",
+                      "value" : "productIdentifier-1"
+                    } ]
+                  }
+                } ],
+                "meta" : {
+                  "globalKey" : "faed59e1"
                 }
-              } ]
+              },
+              "meta" : {
+                "globalKey" : "1c7c49da"
+              }
             } ]
+          } ],
+          "counterparty" : [ {
+            "role" : "Party1",
+            "partyReference" : {
+              "globalReference" : "f80b47e1",
+              "externalReference" : "Lender3"
+            }
+          }, {
+            "role" : "Party2",
+            "partyReference" : {
+              "globalReference" : "7c311b30",
+              "externalReference" : "Borrower"
+            }
           } ]
         },
-        "tradeDate" : {
+        "party" : [ {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "FM2LEI22222222222222"
+            },
+            "meta" : {
+              "globalKey" : "e0668cc5"
+            }
+          } ],
+          "name" : {
+            "value" : "Standard Fund 4"
+          },
           "meta" : {
-            "globalKey" : "3f2256"
+            "globalKey" : "f80b47e1",
+            "externalKey" : "Lender3"
+          }
+        }, {
+          "partyId" : [ {
+            "identifier" : {
+              "value" : "KTKLLEILLLLLLLLLLLLL"
+            },
+            "meta" : {
+              "globalKey" : "60098fe6"
+            }
+          } ],
+          "name" : {
+            "value" : "KTKL"
           },
-          "value" : "2020-09-22"
-        },
-        "tradeIdentifier" : [ {
-          "assignedIdentifier" : [ {
+          "meta" : {
+            "globalKey" : "84088af0",
+            "externalKey" : "AGENT_LENDER"
+          }
+        }, {
+          "partyId" : [ {
             "identifier" : {
-              "value" : "0266001"
+              "value" : "CP001LEI111111111111"
+            },
+            "meta" : {
+              "globalKey" : "12818f8c"
             }
           } ],
+          "name" : {
+            "value" : "CP001"
+          },
           "meta" : {
-            "globalKey" : "438fa6af"
+            "globalKey" : "7c311b30",
+            "externalKey" : "Borrower"
+          }
+        } ],
+        "executionDetails" : {
+          "executionType" : "OffFacility",
+          "meta" : {
+            "globalKey" : "34596793"
           }
-        } ]
+        },
+        "meta" : {
+          "globalKey" : "58d1bc0a"
+        }
+      },
+      "meta" : {
+        "globalKey" : "58d1bc0a"
       }
     } ],
     "meta" : {
-      "globalKey" : "e2358ec0"
+      "globalKey" : "cb26beba"
     }
   },
-  "meta" : {
-    "globalKey" : "2b7d3a5f"
-  },
   "timestamp" : [ {
     "dateTime" : "2020-09-22T09:10:16.607+01:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "meta" : {
+    "globalKey" : "e6bb5025"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex19-cds-execution-allocations.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex19-cds-execution-allocations.json
index 846a18ee3a..a0a32dd9ae 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex19-cds-execution-allocations.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex19-cds-execution-allocations.json
@@ -1,219 +1,77 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "123453212"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "90b09f73"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.party2.com/message-id"
-      },
-      "value" : "123453212"
-    },
-    "sentBy" : {
-      "value" : "PARTY2US33"
-    }
-  },
-  "meta" : {
-    "globalKey" : "d5e79bbc"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "ba5a80e5"
-          },
-          "trade" : {
-            "account" : [ {
-              "accountName" : {
-                "value" : "Barclays Global Investors 2"
-              },
-              "accountNumber" : {
-                "value" : "bgcf22j"
-              },
-              "meta" : {
-                "externalKey" : "ACC1",
-                "globalKey" : "bdce5d9e"
-              },
-              "servicingParty" : {
-                "externalReference" : "party1",
-                "globalReference" : "74a8b063"
-              }
-            }, {
-              "accountName" : {
-                "value" : "LDF Main Fund"
-              },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.party2.com/bondifre"
-                },
-                "value" : "5462346"
-              },
-              "meta" : {
-                "externalKey" : "ACC0",
-                "globalKey" : "4be66600"
-              },
-              "servicingParty" : {
-                "externalReference" : "party2",
-                "globalReference" : "1c9dd05d"
-              }
-            }, {
-              "accountName" : {
-                "value" : "CALPERS A/C 1"
-              },
-              "accountNumber" : {
-                "value" : "cvgh44h"
-              },
-              "meta" : {
-                "externalKey" : "ACC2",
-                "globalKey" : "f7bff62b"
-              },
-              "servicingParty" : {
-                "externalReference" : "party3",
-                "globalReference" : "d1a0fb04"
-              }
-            }, {
-              "accountName" : {
-                "value" : "CALPERS Account 23"
-              },
-              "accountNumber" : {
-                "value" : "cvgh45h"
-              },
-              "meta" : {
-                "externalKey" : "ACC3",
-                "globalKey" : "1b520970"
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster"
+                }
               },
-              "servicingParty" : {
-                "externalReference" : "party3",
-                "globalReference" : "d1a0fb04"
-              }
-            } ],
+              "vintage" : 1992
+            },
             "meta" : {
-              "globalKey" : "77f75ff4"
+              "globalKey" : "32000f4f"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualDefinitionsType" : [ {
+                  "value" : "ISDA1999Credit"
+                } ],
+                "contractualTermsSupplement" : [ {
+                  "contractualTermsSupplementType" : {
+                    "value" : "ISDA1999CreditRestructuring"
+                  }
+                }, {
+                  "contractualTermsSupplementType" : {
+                    "value" : "ISDA1999CreditSuccessorAndCreditEvents"
+                  }
+                }, {
+                  "contractualTermsSupplementType" : {
+                    "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+                  }
+                } ]
+              }
             },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "74a8b063"
-              },
-              "name" : {
-                "value" : "Barclays Global Investors"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300RK1FB0VMTPD087"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "4dbab523"
-                }
-              }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                  },
-                  "value" : "BARCGB22"
-                },
-                "identifierType" : "BIC",
-                "meta" : {
-                  "globalKey" : "ca05a4e7"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "1c9dd05d"
-              },
-              "name" : {
-                "value" : "Nomura Bank Global Risk Management"
+            "meta" : {
+              "globalKey" : "e00ce397"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "a6ad0dd",
+                "externalReference" : "party2"
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300Q4B2OQW6FDBA48"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "f236a5be"
-                }
-              }, {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "10000",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                  },
-                  "value" : "NBILGB2L"
-                },
-                "identifierType" : "BIC",
-                "meta" : {
-                  "globalKey" : "ce9d30a8"
+                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "party3",
-                "globalKey" : "d1a0fb04"
-              },
-              "name" : {
-                "value" : "California Public Employees' Retirement System"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "IBY5X3QKOI3QLECZM838"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e3553732"
-                }
-              }, {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                  },
-                  "value" : "CPERUS61"
-                },
-                "identifierType" : "BIC",
-                "meta" : {
-                  "globalKey" : "360f488f"
-                }
-              } ]
+                "globalKey" : "9843fe25"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2002-12-03",
+              "meta" : {
+                "globalKey" : "3e9303"
+              }
+            },
             "tradableProduct" : {
-              "ancillaryParty" : [ {
-                "partyReference" : [ {
-                  "externalReference" : "party2",
-                  "globalReference" : "1c9dd05d"
-                } ],
-                "role" : "CALCULATION_AGENT_INDEPENDENT"
-              } ],
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party3",
-                  "globalReference" : "d1a0fb04"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "1c9dd05d"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -221,13 +79,52 @@
                     "productQualifier" : "CreditDefaultSwap_SingleName"
                   } ],
                   "economicTerms" : {
-                    "calculationAgent" : {
-                      "calculationAgentBusinessCenter" : {
-                        "value" : "USNY"
+                    "effectiveDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2002-12-04",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NONE",
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "eb0a893c"
+                        }
                       },
-                      "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+                      "meta" : {
+                        "globalKey" : "eb0a893c"
+                      }
+                    },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2007-09-06",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "GBLO"
+                            }, {
+                              "value" : "USNY"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "42f910b"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "97b8e49c"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "77e72f96"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "77e72f96"
+                      }
                     },
                     "dateAdjustments" : {
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -238,84 +135,130 @@
                           "globalKey" : "42f910b"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "meta" : {
                         "globalKey" : "97b8e49c"
                       }
                     },
-                    "effectiveDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NONE",
+                    "payout" : {
+                      "interestRatePayout" : [ {
+                        "payerReceiver" : {
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
+                        },
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
                           "meta" : {
-                            "globalKey" : "24a738"
+                            "globalKey" : "0"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "eb0a893c"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
                         },
-                        "unadjustedDate" : "2002-12-04"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb0a893c"
-                      }
-                    },
-                    "payout" : {
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "204d"
+                            },
+                            "rollConvention" : "6"
+                          },
+                          "meta" : {
+                            "globalKey" : "204d"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "firstPaymentDate" : "2003-03-06",
+                          "meta" : {
+                            "globalKey" : "74746a24"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "c583c3f6"
+                        }
+                      } ],
                       "creditDefaultPayout" : {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "settlementTerms" : {
-                          "meta" : {
-                            "globalKey" : "10779c5"
-                          },
+                          "settlementType" : "Physical",
                           "settlementCurrency" : {
                             "value" : "USD"
                           },
-                          "settlementType" : "PHYSICAL",
+                          "meta" : {
+                            "globalKey" : "1a6e16dd"
+                          },
                           "physicalSettlementTerms" : {
+                            "physicalSettlementPeriod" : {
+                              "maximumBusinessDays" : 30
+                            },
                             "deliverableObligations" : {
                               "accruedInterest" : false,
+                              "category" : "BondOrLoan",
+                              "notSubordinated" : true,
+                              "specifiedCurrency" : {
+                                "applicable" : true
+                              },
+                              "notContingent" : true,
                               "assignableLoan" : {
                                 "applicable" : true
                               },
-                              "category" : "BOND_OR_LOAN",
                               "consentRequiredLoan" : {
                                 "applicable" : true
                               },
+                              "transferable" : true,
                               "maximumMaturity" : {
-                                "meta" : {
-                                  "globalKey" : "ae5"
-                                },
+                                "periodMultiplier" : 30,
                                 "period" : "Y",
-                                "periodMultiplier" : 30
-                              },
-                              "notBearer" : true,
-                              "notContingent" : true,
-                              "notSubordinated" : true,
-                              "specifiedCurrency" : {
-                                "applicable" : true
+                                "meta" : {
+                                  "globalKey" : "3fb"
+                                }
                               },
-                              "transferable" : true
+                              "notBearer" : true
                             },
                             "escrow" : true,
                             "meta" : {
-                              "globalKey" : "237559c8"
-                            },
-                            "physicalSettlementPeriod" : {
-                              "maximumBusinessDays" : 30
+                              "globalKey" : "3cdbf6e0"
                             }
                           }
                         },
@@ -323,333 +266,405 @@
                           "referenceInformation" : {
                             "referenceEntity" : {
                               "entityId" : [ {
+                                "value" : "008HA7",
                                 "meta" : {
                                   "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                                },
-                                "value" : "008HA7"
+                                }
                               } ],
-                              "meta" : {
-                                "externalKey" : "referenceEntity",
-                                "globalKey" : "6b99b4c1"
-                              },
                               "name" : {
                                 "value" : "Agrium Inc."
+                              },
+                              "meta" : {
+                                "globalKey" : "6b99b4c1",
+                                "externalKey" : "referenceEntity"
                               }
                             },
                             "referenceObligation" : [ {
-                              "primaryObligorReference" : {
-                                "externalReference" : "referenceEntity",
-                                "globalReference" : "6b99b4c1"
-                              },
                               "security" : {
                                 "productIdentifier" : [ {
                                   "value" : {
                                     "identifier" : {
+                                      "value" : "008916AB4",
                                       "meta" : {
                                         "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                                      },
-                                      "value" : "008916AB4"
+                                      }
                                     },
+                                    "source" : "CUSIP",
                                     "meta" : {
                                       "globalKey" : "ab7bdc95"
-                                    },
-                                    "source" : "CUSIP"
+                                    }
                                   }
                                 } ],
-                                "securityType" : "DEBT"
+                                "securityType" : "Debt"
+                              },
+                              "primaryObligorReference" : {
+                                "globalReference" : "6b99b4c1",
+                                "externalReference" : "referenceEntity"
                               }
                             } ],
                             "referencePrice" : {
+                              "value" : 1.0,
                               "unit" : {
                                 "currency" : {
                                   "value" : "USD"
                                 }
                               },
-                              "value" : 1.0,
                               "perUnitOf" : {
                                 "currency" : {
                                   "value" : "USD"
                                 }
                               },
-                              "priceType" : "ASSET_PRICE"
+                              "priceType" : "AssetPrice"
                             }
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "46a49141"
-                        },
                         "protectionTerms" : [ {
                           "creditEvents" : {
                             "bankruptcy" : true,
-                            "creditEventNotice" : {
-                              "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                              "publiclyAvailableInformation" : {
-                                "specifiedNumber" : 2,
-                                "standardPublicSources" : true
-                              }
-                            },
-                            "defaultRequirement" : {
-                              "unit" : {
-                                "currency" : {
-                                  "value" : "USD"
-                                }
-                              },
-                              "value" : 10000000.0,
-                              "meta" : {
-                                "globalKey" : "d467e427"
-                              }
-                            },
                             "failureToPay" : {
                               "applicable" : true,
                               "paymentRequirement" : {
+                                "value" : 1000000.0,
                                 "unit" : {
                                   "currency" : {
                                     "value" : "USD"
                                   }
                                 },
-                                "value" : 1000000.0,
                                 "meta" : {
                                   "globalKey" : "48eb1e55"
                                 }
                               }
                             },
-                            "meta" : {
-                              "globalKey" : "91e8f1c0"
-                            },
                             "restructuring" : {
                               "applicable" : true,
                               "restructuringType" : {
-                                "value" : "MOD_R"
+                                "value" : "ModR"
                               }
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "327bbbb5"
-                          },
-                          "obligations" : {
-                            "category" : "BORROWED_MONEY"
-                          }
-                        } ]
-                      },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d21"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "6"
-                          },
-                          "meta" : {
-                            "globalKey" : "12d21"
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "6ef9dd10"
-                        },
-                        "paymentDates" : {
-                          "firstPaymentDate" : "2003-03-06",
-                          "meta" : {
-                            "globalKey" : "747472d0"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
+                            "defaultRequirement" : {
+                              "value" : 10000000.0,
+                              "unit" : {
+                                "currency" : {
+                                  "value" : "USD"
                                 }
+                              },
+                              "meta" : {
+                                "globalKey" : "d467e427"
                               }
-                            }
-                          }
-                        }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "d18243d1"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "GBLO"
-                            }, {
-                              "value" : "USNY"
-                            } ],
+                            },
+                            "creditEventNotice" : {
+                              "notifyingParty" : [ "Party2", "Party1" ],
+                              "publiclyAvailableInformation" : {
+                                "standardPublicSources" : true,
+                                "specifiedNumber" : 2
+                              }
+                            },
                             "meta" : {
-                              "globalKey" : "42f910b"
+                              "globalKey" : "8badd6a0"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
+                          "obligations" : {
+                            "category" : "BorrowedMoney"
+                          },
                           "meta" : {
-                            "globalKey" : "97b8e49c"
+                            "globalKey" : "ce9ae895"
                           }
-                        },
+                        } ],
                         "meta" : {
-                          "globalKey" : "77e72f96"
-                        },
-                        "unadjustedDate" : "2007-09-06"
+                          "globalKey" : "e7a3465"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "77e72f96"
+                        "globalKey" : "491e76db"
+                      }
+                    },
+                    "calculationAgent" : {
+                      "calculationAgentParty" : "CalculationAgentIndependent",
+                      "calculationAgentBusinessCenter" : {
+                        "value" : "USNY"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "f0b9ed94"
+                    "globalKey" : "861c73e4"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "f0b9ed94"
+                  "globalKey" : "861c73e4"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "5aa0901d"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.01,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.01,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000.0,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000.0
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "b883d895"
-                  },
-                  "quantity" : [ {
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "f9717383"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 100000000.0,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000000.0
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "57f73a0b"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "856b3ec4",
+                  "externalReference" : "party3"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "a6ad0dd",
+                  "externalReference" : "party2"
+                }
+              } ],
+              "ancillaryParty" : [ {
+                "role" : "CalculationAgentIndependent",
+                "partyReference" : [ {
+                  "globalReference" : "a6ad0dd",
+                  "externalReference" : "party2"
                 } ]
               } ]
             },
-            "tradeDate" : {
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300RK1FB0VMTPD087",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "4dbab523"
+                }
+              }, {
+                "identifier" : {
+                  "value" : "BARCGB22",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                  }
+                },
+                "identifierType" : "BIC",
+                "meta" : {
+                  "globalKey" : "ca05a4e7"
+                }
+              } ],
+              "name" : {
+                "value" : "Barclays Global Investors"
+              },
               "meta" : {
-                "globalKey" : "3e9303"
+                "globalKey" : "f530f663",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300Q4B2OQW6FDBA48",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "f236a5be"
+                }
+              }, {
+                "identifier" : {
+                  "value" : "NBILGB2L",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                  }
+                },
+                "identifierType" : "BIC",
+                "meta" : {
+                  "globalKey" : "ce9d30a8"
+                }
+              } ],
+              "name" : {
+                "value" : "Nomura Bank Global Risk Management"
               },
-              "value" : "2002-12-03"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+              "meta" : {
+                "globalKey" : "a6ad0dd",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "IBY5X3QKOI3QLECZM838",
                   "meta" : {
-                    "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-                  },
-                  "value" : "10000"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e3553732"
+                }
+              }, {
+                "identifier" : {
+                  "value" : "CPERUS61",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+                  }
+                },
+                "identifierType" : "BIC",
+                "meta" : {
+                  "globalKey" : "360f488f"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "1c9dd05d"
+              "name" : {
+                "value" : "California Public Employees' Retirement System"
+              },
+              "meta" : {
+                "globalKey" : "856b3ec4",
+                "externalKey" : "party3"
+              }
+            } ],
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "bgcf22j"
+              },
+              "accountName" : {
+                "value" : "Barclays Global Investors 2"
+              },
+              "servicingParty" : {
+                "globalReference" : "f530f663",
+                "externalReference" : "party1"
+              },
+              "meta" : {
+                "globalKey" : "62d5755e",
+                "externalKey" : "ACC1"
+              }
+            }, {
+              "accountNumber" : {
+                "value" : "5462346",
+                "meta" : {
+                  "scheme" : "http://www.party2.com/bondifre"
+                }
+              },
+              "accountName" : {
+                "value" : "LDF Main Fund"
+              },
+              "servicingParty" : {
+                "globalReference" : "a6ad0dd",
+                "externalReference" : "party2"
+              },
+              "meta" : {
+                "globalKey" : "6d510600",
+                "externalKey" : "ACC0"
+              }
+            }, {
+              "accountNumber" : {
+                "value" : "cvgh44h"
+              },
+              "accountName" : {
+                "value" : "CALPERS A/C 1"
+              },
+              "servicingParty" : {
+                "globalReference" : "856b3ec4",
+                "externalReference" : "party3"
+              },
+              "meta" : {
+                "globalKey" : "3141dbab",
+                "externalKey" : "ACC2"
+              }
+            }, {
+              "accountNumber" : {
+                "value" : "cvgh45h"
+              },
+              "accountName" : {
+                "value" : "CALPERS Account 23"
+              },
+              "servicingParty" : {
+                "globalReference" : "856b3ec4",
+                "externalReference" : "party3"
               },
               "meta" : {
-                "globalKey" : "3960257d"
+                "globalKey" : "3c0ed4b0",
+                "externalKey" : "ACC3"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "b3fb4440"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "ea3aa059"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party3",
-                  "globalReference" : "d1a0fb04"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "1c9dd05d"
-                }
-              },
               "quantity" : {
+                "value" : 20000,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "856b3ec4",
+                  "externalReference" : "party3"
                 },
-                "value" : 20000
+                "receiverPartyReference" : {
+                  "globalReference" : "a6ad0dd",
+                  "externalReference" : "party2"
+                }
               },
               "settlementDate" : {
+                "unadjustedDate" : "2003-03-06",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "GBLO"
@@ -660,65 +675,50 @@
                       "globalKey" : "42f910b"
                     }
                   },
-                  "businessDayConvention" : "FOLLOWING",
                   "meta" : {
                     "globalKey" : "da556d3a"
                   }
-                },
-                "unadjustedDate" : "2003-03-06"
-              }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "value" : "ISDA_MASTER"
                 }
-              },
-              "vintage" : 1992
-            },
-            "meta" : {
-              "globalKey" : "32000f4f"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualDefinitionsType" : [ {
-                  "value" : "ISDA_1999_CREDIT"
-                } ],
-                "contractualTermsSupplement" : [ {
-                  "contractualTermsSupplementType" : {
-                    "value" : "ISDA_1999_CREDIT_RESTRUCTURING"
-                  }
-                }, {
-                  "contractualTermsSupplementType" : {
-                    "value" : "ISDA_1999_CREDIT_SUCCESSOR_AND_CREDIT_EVENTS"
-                  }
-                }, {
-                  "contractualTermsSupplementType" : {
-                    "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
-                  }
-                } ]
               }
             },
             "meta" : {
-              "globalKey" : "e00ce397"
+              "globalKey" : "19fcfeef"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "67e2e2af"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "123453212",
+      "meta" : {
+        "scheme" : "http://www.party2.com/message-id"
+      }
+    },
+    "sentBy" : {
+      "value" : "PARTY2US33"
+    }
   },
   "timestamp" : [ {
     "dateTime" : "2002-12-03T09:57:00Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "123453212"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "90b09f73"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "6416fbe0"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex54-execution-advice-trade-partial-termination-C11-00.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex54-execution-advice-trade-partial-termination-C11-00.json
index f4f0026de5..305e9d7afd 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex54-execution-advice-trade-partial-termination-C11-00.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex54-execution-advice-trade-partial-termination-C11-00.json
@@ -1,208 +1,208 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "IM/26"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "4286b0f"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.imgr.com/schemes/message-id"
-      },
-      "value" : "IM/26"
-    },
-    "sentBy" : {
-      "value" : "IMGRUS6S"
-    },
-    "sentTo" : [ {
-      "value" : "CUSTUS3T"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "a136e39f"
-  },
   "proposedEvent" : {
-    "effectiveDate" : "2009-07-23",
     "eventDate" : "2009-07-22",
+    "effectiveDate" : "2009-07-23",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "e07a86c6"
-          },
-          "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "_fund",
-                "globalReference" : "98b03772"
-              },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.imgr.com/schemes/account-id"
-                },
-                "value" : "FUND300"
+      "primitiveInstruction" : {
+        "quantityChange" : {
+          "change" : [ {
+            "quantity" : [ {
+              "value" : {
+                "value" : 10000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
               "meta" : {
-                "externalKey" : "_FUNDACCT",
-                "globalKey" : "628d7b32"
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
               }
-            }, {
-              "accountBeneficiary" : {
-                "externalReference" : "_cust",
-                "globalReference" : "6f1f29ef"
+            } ],
+            "meta" : {
+              "globalKey" : "b894a0b9"
+            }
+          } ],
+          "direction" : "Replace"
+        },
+        "transfer" : {
+          "transferState" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 12494.00,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.custodian.com/account-id"
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "9cdebf9e",
+                  "externalReference" : "_broker"
                 },
-                "value" : "76543"
+                "receiverPartyReference" : {
+                  "globalReference" : "add9f472",
+                  "externalReference" : "_fund"
+                }
               },
-              "meta" : {
-                "externalKey" : "_CUSTACCT",
-                "globalKey" : "5426e0e7"
+              "settlementDate" : {
+                "adjustedDate" : {
+                  "value" : "2009-07-23",
+                  "meta" : {
+                    "globalKey" : "3ec9d7"
+                  }
+                }
+              },
+              "transferExpression" : {
+                "priceTransfer" : "Termination"
               }
-            } ],
-            "meta" : {
-              "globalKey" : "e07a86c6"
             },
+            "meta" : {
+              "globalKey" : "c17ccce0"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
             "party" : [ {
-              "meta" : {
-                "externalKey" : "_fund",
-                "globalKey" : "98b03772"
-              },
-              "name" : {
-                "value" : "INVEST MANAGER"
-              },
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "5493000TK7OZL3NFEW61",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "5493000TK7OZL3NFEW61"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "183b210"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_broker",
-                "globalKey" : "6b3f585e"
-              },
+              } ],
               "name" : {
-                "value" : "BROKER"
+                "value" : "INVEST MANAGER"
               },
+              "meta" : {
+                "globalKey" : "add9f472",
+                "externalKey" : "_fund"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300E4CDNNLJRBKF36",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300E4CDNNLJRBKF36"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "ea328105"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_cust",
-                "globalKey" : "6f1f29ef"
-              },
+              } ],
               "name" : {
-                "value" : "Custodian"
+                "value" : "BROKER"
               },
+              "meta" : {
+                "globalKey" : "9cdebf9e",
+                "externalKey" : "_broker"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300FNRNXH6KYKUK07",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300FNRNXH6KYKUK07"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "aefc2f21"
                 }
-              } ]
-            } ]
-          }
-        }
-      },
-      "primitiveInstruction" : {
-        "quantityChange" : {
-          "change" : [ {
-            "meta" : {
-              "globalKey" : "d467e427"
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
-                } ]
+              } ],
+              "name" : {
+                "value" : "Custodian"
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 10000000
+              "meta" : {
+                "globalKey" : "b8297caf",
+                "externalKey" : "_cust"
               }
-            } ]
-          } ],
-          "direction" : "REPLACE"
-        },
-        "transfer" : {
-          "transferState" : [ {
-            "meta" : {
-              "globalKey" : "9d494868"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "6b3f585e"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "98b03772"
+            } ],
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "FUND300",
+                "meta" : {
+                  "scheme" : "http://www.imgr.com/schemes/account-id"
                 }
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 12494.00
+              "accountBeneficiary" : {
+                "globalReference" : "add9f472",
+                "externalReference" : "_fund"
               },
-              "settlementDate" : {
-                "adjustedDate" : {
-                  "meta" : {
-                    "globalKey" : "3ec9d7"
-                  },
-                  "value" : "2009-07-23"
+              "meta" : {
+                "globalKey" : "a2f9e8b2",
+                "externalKey" : "_FUNDACCT"
+              }
+            }, {
+              "accountNumber" : {
+                "value" : "76543",
+                "meta" : {
+                  "scheme" : "http://www.custodian.com/account-id"
                 }
               },
-              "transferExpression" : {
-                "priceTransfer" : "TERMINATION"
+              "accountBeneficiary" : {
+                "globalReference" : "b8297caf",
+                "externalReference" : "_cust"
+              },
+              "meta" : {
+                "globalKey" : "c2092c27",
+                "externalKey" : "_CUSTACCT"
               }
+            } ],
+            "meta" : {
+              "globalKey" : "c3091058"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "c3091058"
+          }
         }
       }
     } ]
   },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "IM/26",
+      "meta" : {
+        "scheme" : "http://www.imgr.com/schemes/message-id"
+      }
+    },
+    "sentBy" : {
+      "value" : "IMGRUS6S"
+    },
+    "sentTo" : [ {
+      "value" : "CUSTUS3T"
+    } ]
+  },
   "timestamp" : [ {
     "dateTime" : "2009-07-22T09:09:09-08:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "IM/26"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "4286b0f"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "1765d29"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex55-execution-advice-trade-partial-termination-cancellation-C11-10.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex55-execution-advice-trade-partial-termination-cancellation-C11-10.json
index 1ba0497f1c..d370ca3b91 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex55-execution-advice-trade-partial-termination-cancellation-C11-10.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex55-execution-advice-trade-partial-termination-cancellation-C11-10.json
@@ -1,207 +1,207 @@
 {
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "IM/27"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "4286b10"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.imgr.com/schemes/message-id"
-      },
-      "value" : "IM/27"
-    },
-    "sentBy" : {
-      "value" : "IMGRUS6S"
-    },
-    "sentTo" : [ {
-      "value" : "CUSTUS3T"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "95f39193"
-  },
   "proposedEvent" : {
-    "effectiveDate" : "2009-07-23",
     "eventDate" : "2009-07-22",
+    "effectiveDate" : "2009-07-23",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "e07a86c6"
-          },
-          "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "_fund",
-                "globalReference" : "98b03772"
-              },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.imgr.com/schemes/account-id"
-                },
-                "value" : "FUND300"
+      "primitiveInstruction" : {
+        "quantityChange" : {
+          "change" : [ {
+            "quantity" : [ {
+              "value" : {
+                "value" : 10000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
               "meta" : {
-                "externalKey" : "_FUNDACCT",
-                "globalKey" : "628d7b32"
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
               }
-            }, {
-              "accountBeneficiary" : {
-                "externalReference" : "_cust",
-                "globalReference" : "6f1f29ef"
+            } ],
+            "meta" : {
+              "globalKey" : "b894a0b9"
+            }
+          } ],
+          "direction" : "Replace"
+        },
+        "transfer" : {
+          "transferState" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 12494.00,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.custodian.com/account-id"
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "9cdebf9e",
+                  "externalReference" : "_broker"
                 },
-                "value" : "76543"
+                "receiverPartyReference" : {
+                  "globalReference" : "add9f472",
+                  "externalReference" : "_fund"
+                }
               },
-              "meta" : {
-                "externalKey" : "_CUSTACCT",
-                "globalKey" : "5426e0e7"
+              "settlementDate" : {
+                "adjustedDate" : {
+                  "value" : "2009-07-23",
+                  "meta" : {
+                    "globalKey" : "3ec9d7"
+                  }
+                }
+              },
+              "transferExpression" : {
+                "priceTransfer" : "Termination"
               }
-            } ],
-            "meta" : {
-              "globalKey" : "e07a86c6"
             },
+            "meta" : {
+              "globalKey" : "c17ccce0"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
             "party" : [ {
-              "meta" : {
-                "externalKey" : "_fund",
-                "globalKey" : "98b03772"
-              },
-              "name" : {
-                "value" : "INVEST MANAGER"
-              },
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "5493000TK7OZL3NFEW61",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "5493000TK7OZL3NFEW61"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "183b210"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_broker",
-                "globalKey" : "6b3f585e"
-              },
+              } ],
               "name" : {
-                "value" : "BROKER"
+                "value" : "INVEST MANAGER"
               },
+              "meta" : {
+                "globalKey" : "add9f472",
+                "externalKey" : "_fund"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300E4CDNNLJRBKF36",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300E4CDNNLJRBKF36"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "ea328105"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_cust",
-                "globalKey" : "6f1f29ef"
-              },
+              } ],
               "name" : {
-                "value" : "Custodian"
+                "value" : "BROKER"
               },
+              "meta" : {
+                "globalKey" : "9cdebf9e",
+                "externalKey" : "_broker"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300FNRNXH6KYKUK07",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300FNRNXH6KYKUK07"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "aefc2f21"
                 }
-              } ]
-            } ]
-          }
-        }
-      },
-      "primitiveInstruction" : {
-        "quantityChange" : {
-          "change" : [ {
-            "meta" : {
-              "globalKey" : "d467e427"
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
-                } ]
+              } ],
+              "name" : {
+                "value" : "Custodian"
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 10000000
+              "meta" : {
+                "globalKey" : "b8297caf",
+                "externalKey" : "_cust"
               }
-            } ]
-          } ],
-          "direction" : "REPLACE"
-        },
-        "transfer" : {
-          "transferState" : [ {
-            "meta" : {
-              "globalKey" : "9d494868"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "6b3f585e"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "98b03772"
+            } ],
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "FUND300",
+                "meta" : {
+                  "scheme" : "http://www.imgr.com/schemes/account-id"
                 }
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 12494.00
+              "accountBeneficiary" : {
+                "globalReference" : "add9f472",
+                "externalReference" : "_fund"
               },
-              "settlementDate" : {
-                "adjustedDate" : {
-                  "meta" : {
-                    "globalKey" : "3ec9d7"
-                  },
-                  "value" : "2009-07-23"
+              "meta" : {
+                "globalKey" : "a2f9e8b2",
+                "externalKey" : "_FUNDACCT"
+              }
+            }, {
+              "accountNumber" : {
+                "value" : "76543",
+                "meta" : {
+                  "scheme" : "http://www.custodian.com/account-id"
                 }
               },
-              "transferExpression" : {
-                "priceTransfer" : "TERMINATION"
+              "accountBeneficiary" : {
+                "globalReference" : "b8297caf",
+                "externalReference" : "_cust"
+              },
+              "meta" : {
+                "globalKey" : "c2092c27",
+                "externalKey" : "_CUSTACCT"
               }
+            } ],
+            "meta" : {
+              "globalKey" : "c3091058"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "c3091058"
+          }
         }
       }
     } ]
   },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "IM/27",
+      "meta" : {
+        "scheme" : "http://www.imgr.com/schemes/message-id"
+      }
+    },
+    "sentBy" : {
+      "value" : "IMGRUS6S"
+    },
+    "sentTo" : [ {
+      "value" : "CUSTUS3T"
+    } ]
+  },
   "timestamp" : [ {
     "dateTime" : "2009-07-22T09:19:09-08:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "IM/27"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "4286b10"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "d9d721d"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex56-execution-advice-trade-full-termination-C12-00.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex56-execution-advice-trade-full-termination-C12-00.json
index 834f8c2236..2490d5e0d5 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex56-execution-advice-trade-full-termination-C12-00.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex56-execution-advice-trade-full-termination-C12-00.json
@@ -1,208 +1,208 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "IM/28"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "4286b11"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.imgr.com/schemes/message-id"
-      },
-      "value" : "IM/28"
-    },
-    "sentBy" : {
-      "value" : "IMGRUS6S"
-    },
-    "sentTo" : [ {
-      "value" : "CUSTUS3T"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "f0ea4688"
-  },
   "proposedEvent" : {
-    "effectiveDate" : "2009-07-27",
     "eventDate" : "2009-07-24",
+    "effectiveDate" : "2009-07-27",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "e07a86c6"
-          },
-          "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "_fund",
-                "globalReference" : "98b03772"
-              },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.imgr.com/schemes/account-id"
-                },
-                "value" : "FUND300"
+      "primitiveInstruction" : {
+        "quantityChange" : {
+          "change" : [ {
+            "quantity" : [ {
+              "value" : {
+                "value" : 0,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
               "meta" : {
-                "externalKey" : "_FUNDACCT",
-                "globalKey" : "628d7b32"
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
               }
-            }, {
-              "accountBeneficiary" : {
-                "externalReference" : "_cust",
-                "globalReference" : "6f1f29ef"
+            } ],
+            "meta" : {
+              "globalKey" : "2cc4b8a"
+            }
+          } ],
+          "direction" : "Replace"
+        },
+        "transfer" : {
+          "transferState" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 37777.00,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.custodian.com/account-id"
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "9cdebf9e",
+                  "externalReference" : "_broker"
                 },
-                "value" : "76543"
+                "receiverPartyReference" : {
+                  "globalReference" : "add9f472",
+                  "externalReference" : "_fund"
+                }
               },
-              "meta" : {
-                "externalKey" : "_CUSTACCT",
-                "globalKey" : "5426e0e7"
+              "settlementDate" : {
+                "adjustedDate" : {
+                  "value" : "2009-07-27",
+                  "meta" : {
+                    "globalKey" : "3ec9db"
+                  }
+                }
+              },
+              "transferExpression" : {
+                "priceTransfer" : "Termination"
               }
-            } ],
-            "meta" : {
-              "globalKey" : "e07a86c6"
             },
+            "meta" : {
+              "globalKey" : "2591dbdb"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
             "party" : [ {
-              "meta" : {
-                "externalKey" : "_fund",
-                "globalKey" : "98b03772"
-              },
-              "name" : {
-                "value" : "INVEST MANAGER"
-              },
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "5493000TK7OZL3NFEW61",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "5493000TK7OZL3NFEW61"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "183b210"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_broker",
-                "globalKey" : "6b3f585e"
-              },
+              } ],
               "name" : {
-                "value" : "BROKER"
+                "value" : "INVEST MANAGER"
               },
+              "meta" : {
+                "globalKey" : "add9f472",
+                "externalKey" : "_fund"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300E4CDNNLJRBKF36",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300E4CDNNLJRBKF36"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "ea328105"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_cust",
-                "globalKey" : "6f1f29ef"
-              },
+              } ],
               "name" : {
-                "value" : "Custodian"
+                "value" : "BROKER"
               },
+              "meta" : {
+                "globalKey" : "9cdebf9e",
+                "externalKey" : "_broker"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300FNRNXH6KYKUK07",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300FNRNXH6KYKUK07"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "aefc2f21"
                 }
-              } ]
-            } ]
-          }
-        }
-      },
-      "primitiveInstruction" : {
-        "quantityChange" : {
-          "change" : [ {
-            "meta" : {
-              "globalKey" : "171b36"
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
-                } ]
+              } ],
+              "name" : {
+                "value" : "Custodian"
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 0
+              "meta" : {
+                "globalKey" : "b8297caf",
+                "externalKey" : "_cust"
               }
-            } ]
-          } ],
-          "direction" : "REPLACE"
-        },
-        "transfer" : {
-          "transferState" : [ {
-            "meta" : {
-              "globalKey" : "183f888d"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "6b3f585e"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "98b03772"
+            } ],
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "FUND300",
+                "meta" : {
+                  "scheme" : "http://www.imgr.com/schemes/account-id"
                 }
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 37777.00
+              "accountBeneficiary" : {
+                "globalReference" : "add9f472",
+                "externalReference" : "_fund"
               },
-              "settlementDate" : {
-                "adjustedDate" : {
-                  "meta" : {
-                    "globalKey" : "3ec9db"
-                  },
-                  "value" : "2009-07-27"
+              "meta" : {
+                "globalKey" : "a2f9e8b2",
+                "externalKey" : "_FUNDACCT"
+              }
+            }, {
+              "accountNumber" : {
+                "value" : "76543",
+                "meta" : {
+                  "scheme" : "http://www.custodian.com/account-id"
                 }
               },
-              "transferExpression" : {
-                "priceTransfer" : "TERMINATION"
+              "accountBeneficiary" : {
+                "globalReference" : "b8297caf",
+                "externalReference" : "_cust"
+              },
+              "meta" : {
+                "globalKey" : "c2092c27",
+                "externalKey" : "_CUSTACCT"
               }
+            } ],
+            "meta" : {
+              "globalKey" : "c3091058"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "c3091058"
+          }
         }
       }
     } ]
   },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "IM/28",
+      "meta" : {
+        "scheme" : "http://www.imgr.com/schemes/message-id"
+      }
+    },
+    "sentBy" : {
+      "value" : "IMGRUS6S"
+    },
+    "sentTo" : [ {
+      "value" : "CUSTUS3T"
+    } ]
+  },
   "timestamp" : [ {
     "dateTime" : "2009-07-24T12:12:12-08:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "IM/28"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "4286b11"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "1784e012"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex57-execution-advice-trade-full-termination_correction-C12-20.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex57-execution-advice-trade-full-termination_correction-C12-20.json
index e99befeec2..046812ca68 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex57-execution-advice-trade-full-termination_correction-C12-20.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex57-execution-advice-trade-full-termination_correction-C12-20.json
@@ -1,208 +1,208 @@
 {
-  "action" : "CORRECT",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "IM/30"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "4286b28"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.imgr.com/schemes/message-id"
-      },
-      "value" : "IM/30"
-    },
-    "sentBy" : {
-      "value" : "IMGRUS6S"
-    },
-    "sentTo" : [ {
-      "value" : "CUSTUS3T"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "4eb792bd"
-  },
   "proposedEvent" : {
-    "effectiveDate" : "2009-07-27",
     "eventDate" : "2009-07-24",
+    "effectiveDate" : "2009-07-27",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "e07a86c6"
-          },
-          "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "_fund",
-                "globalReference" : "98b03772"
-              },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.imgr.com/schemes/account-id"
-                },
-                "value" : "FUND300"
+      "primitiveInstruction" : {
+        "quantityChange" : {
+          "change" : [ {
+            "quantity" : [ {
+              "value" : {
+                "value" : 0,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
               "meta" : {
-                "externalKey" : "_FUNDACCT",
-                "globalKey" : "628d7b32"
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
               }
-            }, {
-              "accountBeneficiary" : {
-                "externalReference" : "_cust",
-                "globalReference" : "6f1f29ef"
+            } ],
+            "meta" : {
+              "globalKey" : "2cc4b8a"
+            }
+          } ],
+          "direction" : "Replace"
+        },
+        "transfer" : {
+          "transferState" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 37588.00,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.custodian.com/account-id"
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "9cdebf9e",
+                  "externalReference" : "_broker"
                 },
-                "value" : "76543"
+                "receiverPartyReference" : {
+                  "globalReference" : "add9f472",
+                  "externalReference" : "_fund"
+                }
               },
-              "meta" : {
-                "externalKey" : "_CUSTACCT",
-                "globalKey" : "5426e0e7"
+              "settlementDate" : {
+                "adjustedDate" : {
+                  "value" : "2009-07-27",
+                  "meta" : {
+                    "globalKey" : "3ec9db"
+                  }
+                }
+              },
+              "transferExpression" : {
+                "priceTransfer" : "Termination"
               }
-            } ],
-            "meta" : {
-              "globalKey" : "e07a86c6"
             },
+            "meta" : {
+              "globalKey" : "580af47d"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
             "party" : [ {
-              "meta" : {
-                "externalKey" : "_fund",
-                "globalKey" : "98b03772"
-              },
-              "name" : {
-                "value" : "INVEST MANAGER"
-              },
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "5493000TK7OZL3NFEW61",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "5493000TK7OZL3NFEW61"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "183b210"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_broker",
-                "globalKey" : "6b3f585e"
-              },
+              } ],
               "name" : {
-                "value" : "BROKER"
+                "value" : "INVEST MANAGER"
               },
+              "meta" : {
+                "globalKey" : "add9f472",
+                "externalKey" : "_fund"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300E4CDNNLJRBKF36",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300E4CDNNLJRBKF36"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "ea328105"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_cust",
-                "globalKey" : "6f1f29ef"
-              },
+              } ],
               "name" : {
-                "value" : "Custodian"
+                "value" : "BROKER"
               },
+              "meta" : {
+                "globalKey" : "9cdebf9e",
+                "externalKey" : "_broker"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300FNRNXH6KYKUK07",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300FNRNXH6KYKUK07"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "aefc2f21"
                 }
-              } ]
-            } ]
-          }
-        }
-      },
-      "primitiveInstruction" : {
-        "quantityChange" : {
-          "change" : [ {
-            "meta" : {
-              "globalKey" : "171b36"
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
-                } ]
+              } ],
+              "name" : {
+                "value" : "Custodian"
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 0
+              "meta" : {
+                "globalKey" : "b8297caf",
+                "externalKey" : "_cust"
               }
-            } ]
-          } ],
-          "direction" : "REPLACE"
-        },
-        "transfer" : {
-          "transferState" : [ {
-            "meta" : {
-              "globalKey" : "8c7e12ab"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "6b3f585e"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "98b03772"
+            } ],
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "FUND300",
+                "meta" : {
+                  "scheme" : "http://www.imgr.com/schemes/account-id"
                 }
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 37588.00
+              "accountBeneficiary" : {
+                "globalReference" : "add9f472",
+                "externalReference" : "_fund"
               },
-              "settlementDate" : {
-                "adjustedDate" : {
-                  "meta" : {
-                    "globalKey" : "3ec9db"
-                  },
-                  "value" : "2009-07-27"
+              "meta" : {
+                "globalKey" : "a2f9e8b2",
+                "externalKey" : "_FUNDACCT"
+              }
+            }, {
+              "accountNumber" : {
+                "value" : "76543",
+                "meta" : {
+                  "scheme" : "http://www.custodian.com/account-id"
                 }
               },
-              "transferExpression" : {
-                "priceTransfer" : "TERMINATION"
+              "accountBeneficiary" : {
+                "globalReference" : "b8297caf",
+                "externalReference" : "_cust"
+              },
+              "meta" : {
+                "globalKey" : "c2092c27",
+                "externalKey" : "_CUSTACCT"
               }
+            } ],
+            "meta" : {
+              "globalKey" : "c3091058"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "c3091058"
+          }
         }
       }
     } ]
   },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "IM/30",
+      "meta" : {
+        "scheme" : "http://www.imgr.com/schemes/message-id"
+      }
+    },
+    "sentBy" : {
+      "value" : "IMGRUS6S"
+    },
+    "sentTo" : [ {
+      "value" : "CUSTUS3T"
+    } ]
+  },
   "timestamp" : [ {
     "dateTime" : "2009-07-24T12:14:14-08:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "IM/30"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "4286b28"
+    }
+  } ],
+  "action" : "Correct",
+  "meta" : {
+    "globalKey" : "bbe36047"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex59-execution-advice-trade-amendment-F02-00.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex59-execution-advice-trade-amendment-F02-00.json
index 5b16e189a6..525150a9a1 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex59-execution-advice-trade-amendment-F02-00.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex59-execution-advice-trade-amendment-F02-00.json
@@ -1,155 +1,72 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "IM/69"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "4286b8e"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.imgr.com/schemes/message-id"
-      },
-      "value" : "IM/69"
-    },
-    "sentBy" : {
-      "value" : "IMGRUS6S"
-    },
-    "sentTo" : [ {
-      "value" : "CUSTUS3T"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "9b46a320"
-  },
   "proposedEvent" : {
-    "effectiveDate" : "2009-09-08",
     "eventDate" : "2009-09-08",
+    "effectiveDate" : "2009-09-08",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "dc16a0c5"
-          },
-          "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "_fund",
-                "globalReference" : "7233a0bd"
-              },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.imgr.com/schemes/account-id"
-                },
-                "value" : "FUND100"
-              },
-              "meta" : {
-                "externalKey" : "_FUNDACCT",
-                "globalKey" : "628d73b0"
-              }
-            }, {
-              "accountBeneficiary" : {
-                "externalReference" : "_cust",
-                "globalReference" : "6f1f29ef"
+      "primitiveInstruction" : {
+        "transfer" : {
+          "transferState" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 4600.00,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.custodian.com/account-id"
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "29bfd33d",
+                  "externalReference" : "_fund"
                 },
-                "value" : "98765"
+                "receiverPartyReference" : {
+                  "globalReference" : "7e552bcc",
+                  "externalReference" : "_broker"
+                }
               },
-              "meta" : {
-                "externalKey" : "_CUSTACCT",
-                "globalKey" : "54440069"
+              "transferExpression" : {
+                "priceTransfer" : "Renegotiation"
               }
-            } ],
-            "meta" : {
-              "globalKey" : "4bead54e"
             },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "_fund",
-                "globalKey" : "7233a0bd"
-              },
-              "name" : {
-                "value" : "INVEST MGR"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "959800NKRMZ8NEKQ0A23"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "696247f0"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_broker",
-                "globalKey" : "9627fd8c"
-              },
-              "name" : {
-                "value" : "BROKER 33"
+            "meta" : {
+              "globalKey" : "7e0f89a6"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "29bfd33d",
+                "externalReference" : "_fund"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "CONTR3456",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300E4CDNNLJRBKF36"
+                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+                  }
                 },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "ea328105"
-                }
-              } ]
-            }, {
+                "version" : 2
+              } ],
               "meta" : {
-                "externalKey" : "_cust",
-                "globalKey" : "6f1f29ef"
-              },
-              "name" : {
-                "value" : "Custodian"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300FNRNXH6KYKUK07"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "aefc2f21"
-                }
-              } ]
+                "globalKey" : "e60af948"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2009-09-08",
+              "meta" : {
+                "globalKey" : "3eca48"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "7233a0bd"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "9627fd8c"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
                         "value" : "Credit:Index:CDX:CDXHY"
@@ -162,307 +79,390 @@
                   "economicTerms" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2009-09-08",
                         "meta" : {
                           "globalKey" : "3eca48"
-                        },
-                        "unadjustedDate" : "2009-09-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "3eca48"
                       }
                     },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2012-06-20",
+                        "meta" : {
+                          "globalKey" : "3ee194"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ee194"
+                      }
+                    },
                     "payout" : {
-                      "creditDefaultPayout" : {
+                      "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
-                        "generalTerms" : {
-                          "indexReferenceInformation" : {
-                            "indexId" : [ {
-                              "meta" : {
-                                "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-1-0"
-                              },
-                              "value" : "2I65B3BA0"
-                            } ],
-                            "indexName" : {
-                              "value" : "CDX-NAIGHVOLS10.5Y"
-                            },
-                            "excludedReferenceEntity" : [ {
-                              "referenceEntity" : {
-                                "entityId" : [ {
-                                  "meta" : {
-                                    "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-1-0"
-                                  },
-                                  "value" : "ABC1234567"
-                                } ],
-                                "meta" : {
-                                  "globalKey" : "e883dbb2"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
                                 }
                               }
-                            } ],
-                            "indexAnnexDate" : "2007-03-06",
-                            "indexAnnexVersion" : 2,
-                            "indexSeries" : 10,
+                            },
                             "meta" : {
-                              "globalKey" : "c29f01e4"
-                            }
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "8d0acb25"
-                        }
-                      },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
+                              "globalKey" : "0"
                             }
                           }
                         },
                         "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
                           "firstPeriodStartDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2009-06-20",
                               "meta" : {
                                 "globalKey" : "3ec994"
-                              },
-                              "unadjustedDate" : "2009-06-20"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "3ec994"
                             }
                           },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
                           "meta" : {
-                            "globalKey" : "28c103ed"
+                            "globalKey" : "c9d95f07"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "4afb93ec"
-                        },
                         "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
                           "firstPaymentDate" : "2009-09-20",
                           "meta" : {
-                            "globalKey" : "8afb2e82"
+                            "globalKey" : "8afb25d6"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "2760b5f0"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
+                        "generalTerms" : {
+                          "indexReferenceInformation" : {
+                            "indexName" : {
+                              "value" : "CDX-NAIGHVOLS10.5Y"
                             },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
+                            "indexId" : [ {
+                              "value" : "2I65B3BA0",
+                              "meta" : {
+                                "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-1-0"
+                              }
+                            } ],
+                            "indexSeries" : 10,
+                            "indexAnnexVersion" : 2,
+                            "indexAnnexDate" : "2007-03-06",
+                            "excludedReferenceEntity" : [ {
+                              "referenceEntity" : {
+                                "entityId" : [ {
+                                  "value" : "ABC1234567",
+                                  "meta" : {
+                                    "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-1-0"
+                                  }
+                                } ],
+                                "meta" : {
+                                  "globalKey" : "e883dbb2"
                                 }
                               }
+                            } ],
+                            "meta" : {
+                              "globalKey" : "16d002e4"
                             }
                           }
-                        }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "a481a1e7"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3ee194"
                         },
-                        "unadjustedDate" : "2012-06-20"
+                        "meta" : {
+                          "globalKey" : "e13bcc25"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "3ee194"
+                        "globalKey" : "3774e615"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "2fc9ff59"
+                    "globalKey" : "1a2b00b5"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "2fc9ff59"
+                  "globalKey" : "1a2b00b5"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "478ae7c4"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.023,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.023,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "51c414ad"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a9d210bc"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 70000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 70000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "e6be80f3"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "29bfd33d",
+                  "externalReference" : "_fund"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "7e552bcc",
+                  "externalReference" : "_broker"
+                }
               } ]
             },
-            "tradeDate" : {
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "959800NKRMZ8NEKQ0A23",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "696247f0"
+                }
+              } ],
+              "name" : {
+                "value" : "INVEST MGR"
+              },
               "meta" : {
-                "globalKey" : "3eca48"
+                "globalKey" : "29bfd33d",
+                "externalKey" : "_fund"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300E4CDNNLJRBKF36",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "ea328105"
+                }
+              } ],
+              "name" : {
+                "value" : "BROKER 33"
               },
-              "value" : "2009-09-08"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+              "meta" : {
+                "globalKey" : "7e552bcc",
+                "externalKey" : "_broker"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300FNRNXH6KYKUK07",
                   "meta" : {
-                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-                  },
-                  "value" : "CONTR3456"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "version" : 2
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "aefc2f21"
+                }
               } ],
-              "issuerReference" : {
-                "externalReference" : "_fund",
-                "globalReference" : "7233a0bd"
+              "name" : {
+                "value" : "Custodian"
               },
               "meta" : {
-                "globalKey" : "ee841248"
+                "globalKey" : "b8297caf",
+                "externalKey" : "_cust"
               }
-            } ]
+            } ],
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "FUND100",
+                "meta" : {
+                  "scheme" : "http://www.imgr.com/schemes/account-id"
+                }
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "29bfd33d",
+                "externalReference" : "_fund"
+              },
+              "meta" : {
+                "globalKey" : "a2ddb9b0",
+                "externalKey" : "_FUNDACCT"
+              }
+            }, {
+              "accountNumber" : {
+                "value" : "98765",
+                "meta" : {
+                  "scheme" : "http://www.custodian.com/account-id"
+                }
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "b8297caf",
+                "externalReference" : "_cust"
+              },
+              "meta" : {
+                "globalKey" : "2f5c7329",
+                "externalKey" : "_CUSTACCT"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "80ae8c32"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "c16a2bf7"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "7233a0bd"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "9627fd8c"
-                }
-              },
               "quantity" : {
+                "value" : 387300.00,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 387300.00
+                }
               },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
-              }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "transfer" : {
-          "transferState" : [ {
-            "meta" : {
-              "globalKey" : "bd4d7db6"
-            },
-            "transfer" : {
               "payerReceiver" : {
                 "payerPartyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "7233a0bd"
+                  "globalReference" : "29bfd33d",
+                  "externalReference" : "_fund"
                 },
                 "receiverPartyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "9627fd8c"
+                  "globalReference" : "7e552bcc",
+                  "externalReference" : "_broker"
                 }
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 4600.00
-              },
               "transferExpression" : {
-                "priceTransfer" : "RENEGOTIATION"
+                "priceTransfer" : "Upfront"
               }
+            },
+            "meta" : {
+              "globalKey" : "5580d145"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "98a51df7"
+          }
         }
       }
     } ]
   },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "IM/69",
+      "meta" : {
+        "scheme" : "http://www.imgr.com/schemes/message-id"
+      }
+    },
+    "sentBy" : {
+      "value" : "IMGRUS6S"
+    },
+    "sentTo" : [ {
+      "value" : "CUSTUS3T"
+    } ]
+  },
   "timestamp" : [ {
     "dateTime" : "2009-09-08T10:03:09-08:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "IM/69"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "4286b8e"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "6e498154"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex60-execution-advice-trade-amendment-correction-F02-10.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex60-execution-advice-trade-amendment-correction-F02-10.json
index a5b5b47b8f..0dbd35e836 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex60-execution-advice-trade-amendment-correction-F02-10.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex60-execution-advice-trade-amendment-correction-F02-10.json
@@ -1,155 +1,72 @@
 {
-  "action" : "CORRECT",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "IM/69"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "4286b8e"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.imgr.com/schemes/message-id"
-      },
-      "value" : "IM/69"
-    },
-    "sentBy" : {
-      "value" : "IMGRUS6S"
-    },
-    "sentTo" : [ {
-      "value" : "CUSTUS3T"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "e9bb8f6c"
-  },
   "proposedEvent" : {
-    "effectiveDate" : "2009-09-08",
     "eventDate" : "2009-09-08",
+    "effectiveDate" : "2009-09-08",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "b351c158"
-          },
-          "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "_fund",
-                "globalReference" : "7233a0bd"
-              },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.imgr.com/schemes/account-id"
-                },
-                "value" : "FUND100"
-              },
-              "meta" : {
-                "externalKey" : "_FUNDACCT",
-                "globalKey" : "628d73b0"
-              }
-            }, {
-              "accountBeneficiary" : {
-                "externalReference" : "_cust",
-                "globalReference" : "6f1f29ef"
+      "primitiveInstruction" : {
+        "transfer" : {
+          "transferState" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 4600.00,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.custodian.com/account-id"
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "29bfd33d",
+                  "externalReference" : "_fund"
                 },
-                "value" : "98765"
+                "receiverPartyReference" : {
+                  "globalReference" : "7e552bcc",
+                  "externalReference" : "_broker"
+                }
               },
-              "meta" : {
-                "externalKey" : "_CUSTACCT",
-                "globalKey" : "54440069"
+              "transferExpression" : {
+                "priceTransfer" : "Renegotiation"
               }
-            } ],
-            "meta" : {
-              "globalKey" : "a7182321"
             },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "_fund",
-                "globalKey" : "7233a0bd"
-              },
-              "name" : {
-                "value" : "INVEST MGR"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "959800NKRMZ8NEKQ0A23"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "696247f0"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_broker",
-                "globalKey" : "9627fd8c"
-              },
-              "name" : {
-                "value" : "BROKER 33"
+            "meta" : {
+              "globalKey" : "7e0f89a6"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "29bfd33d",
+                "externalReference" : "_fund"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "CONTR3456",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300E4CDNNLJRBKF36"
+                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+                  }
                 },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "ea328105"
-                }
-              } ]
-            }, {
+                "version" : 2
+              } ],
               "meta" : {
-                "externalKey" : "_cust",
-                "globalKey" : "6f1f29ef"
-              },
-              "name" : {
-                "value" : "Custodian"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300FNRNXH6KYKUK07"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "aefc2f21"
-                }
-              } ]
+                "globalKey" : "e60af948"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2009-09-08",
+              "meta" : {
+                "globalKey" : "3eca48"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "7233a0bd"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "9627fd8c"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
                         "value" : "Credit:Index:CDX:CDXIG"
@@ -162,307 +79,390 @@
                   "economicTerms" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2009-09-08",
                         "meta" : {
                           "globalKey" : "3eca48"
-                        },
-                        "unadjustedDate" : "2009-09-08"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "3eca48"
                       }
                     },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2012-06-20",
+                        "meta" : {
+                          "globalKey" : "3ee194"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ee194"
+                      }
+                    },
                     "payout" : {
-                      "creditDefaultPayout" : {
+                      "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
-                        "generalTerms" : {
-                          "indexReferenceInformation" : {
-                            "indexId" : [ {
-                              "meta" : {
-                                "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-1-0"
-                              },
-                              "value" : "2I65B3BA0"
-                            } ],
-                            "indexName" : {
-                              "value" : "CDX-NAIGHVOLS10.5Y"
-                            },
-                            "excludedReferenceEntity" : [ {
-                              "referenceEntity" : {
-                                "entityId" : [ {
-                                  "meta" : {
-                                    "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-1-0"
-                                  },
-                                  "value" : "ABC1234567"
-                                } ],
-                                "meta" : {
-                                  "globalKey" : "e883dbb2"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
                                 }
                               }
-                            } ],
-                            "indexAnnexDate" : "2007-03-06",
-                            "indexAnnexVersion" : 2,
-                            "indexSeries" : 10,
+                            },
                             "meta" : {
-                              "globalKey" : "c29f01e4"
-                            }
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "8d0acb25"
-                        }
-                      },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
+                              "globalKey" : "0"
                             }
                           }
                         },
                         "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
                           "firstPeriodStartDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2009-06-20",
                               "meta" : {
                                 "globalKey" : "3ec994"
-                              },
-                              "unadjustedDate" : "2009-06-20"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "3ec994"
                             }
                           },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
                           "meta" : {
-                            "globalKey" : "28c103ed"
+                            "globalKey" : "c9d95f07"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "4afb93ec"
-                        },
                         "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
                           "firstPaymentDate" : "2009-09-20",
                           "meta" : {
-                            "globalKey" : "8afb2e82"
+                            "globalKey" : "8afb25d6"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "2760b5f0"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
+                        "generalTerms" : {
+                          "indexReferenceInformation" : {
+                            "indexName" : {
+                              "value" : "CDX-NAIGHVOLS10.5Y"
                             },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
+                            "indexId" : [ {
+                              "value" : "2I65B3BA0",
+                              "meta" : {
+                                "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-1-0"
+                              }
+                            } ],
+                            "indexSeries" : 10,
+                            "indexAnnexVersion" : 2,
+                            "indexAnnexDate" : "2007-03-06",
+                            "excludedReferenceEntity" : [ {
+                              "referenceEntity" : {
+                                "entityId" : [ {
+                                  "value" : "ABC1234567",
+                                  "meta" : {
+                                    "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-1-0"
+                                  }
+                                } ],
+                                "meta" : {
+                                  "globalKey" : "e883dbb2"
                                 }
                               }
+                            } ],
+                            "meta" : {
+                              "globalKey" : "16d002e4"
                             }
                           }
-                        }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "a481a1e7"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3ee194"
                         },
-                        "unadjustedDate" : "2012-06-20"
+                        "meta" : {
+                          "globalKey" : "e13bcc25"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "3ee194"
+                        "globalKey" : "3774e615"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "1f1437ac"
+                    "globalKey" : "9753908"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "1f1437ac"
+                  "globalKey" : "9753908"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "478ae7c4"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.023,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.023,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "51c414ad"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a9d210bc"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 70000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 70000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "e6be80f3"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "29bfd33d",
+                  "externalReference" : "_fund"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "7e552bcc",
+                  "externalReference" : "_broker"
+                }
               } ]
             },
-            "tradeDate" : {
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "959800NKRMZ8NEKQ0A23",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "696247f0"
+                }
+              } ],
+              "name" : {
+                "value" : "INVEST MGR"
+              },
               "meta" : {
-                "globalKey" : "3eca48"
+                "globalKey" : "29bfd33d",
+                "externalKey" : "_fund"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300E4CDNNLJRBKF36",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "ea328105"
+                }
+              } ],
+              "name" : {
+                "value" : "BROKER 33"
               },
-              "value" : "2009-09-08"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+              "meta" : {
+                "globalKey" : "7e552bcc",
+                "externalKey" : "_broker"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300FNRNXH6KYKUK07",
                   "meta" : {
-                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-                  },
-                  "value" : "CONTR3456"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "version" : 2
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "aefc2f21"
+                }
               } ],
-              "issuerReference" : {
-                "externalReference" : "_fund",
-                "globalReference" : "7233a0bd"
+              "name" : {
+                "value" : "Custodian"
               },
               "meta" : {
-                "globalKey" : "ee841248"
+                "globalKey" : "b8297caf",
+                "externalKey" : "_cust"
               }
-            } ]
+            } ],
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "FUND100",
+                "meta" : {
+                  "scheme" : "http://www.imgr.com/schemes/account-id"
+                }
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "29bfd33d",
+                "externalReference" : "_fund"
+              },
+              "meta" : {
+                "globalKey" : "a2ddb9b0",
+                "externalKey" : "_FUNDACCT"
+              }
+            }, {
+              "accountNumber" : {
+                "value" : "98765",
+                "meta" : {
+                  "scheme" : "http://www.custodian.com/account-id"
+                }
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "b8297caf",
+                "externalReference" : "_cust"
+              },
+              "meta" : {
+                "globalKey" : "2f5c7329",
+                "externalKey" : "_CUSTACCT"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "8437ce05"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "c16a2bf7"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "7233a0bd"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "9627fd8c"
-                }
-              },
               "quantity" : {
+                "value" : 387300.00,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
-                },
-                "value" : 387300.00
+                }
               },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
-              }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "transfer" : {
-          "transferState" : [ {
-            "meta" : {
-              "globalKey" : "bd4d7db6"
-            },
-            "transfer" : {
               "payerReceiver" : {
                 "payerPartyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "7233a0bd"
+                  "globalReference" : "29bfd33d",
+                  "externalReference" : "_fund"
                 },
                 "receiverPartyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "9627fd8c"
+                  "globalReference" : "7e552bcc",
+                  "externalReference" : "_broker"
                 }
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
-                  }
-                },
-                "value" : 4600.00
-              },
               "transferExpression" : {
-                "priceTransfer" : "RENEGOTIATION"
+                "priceTransfer" : "Upfront"
               }
+            },
+            "meta" : {
+              "globalKey" : "5580d145"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "fe41328a"
+          }
         }
       }
     } ]
   },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "IM/69",
+      "meta" : {
+        "scheme" : "http://www.imgr.com/schemes/message-id"
+      }
+    },
+    "sentBy" : {
+      "value" : "IMGRUS6S"
+    },
+    "sentTo" : [ {
+      "value" : "CUSTUS3T"
+    } ]
+  },
   "timestamp" : [ {
     "dateTime" : "2009-09-08T12:03:09-08:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "IM/69"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "4286b8e"
+    }
+  } ],
+  "action" : "Correct",
+  "meta" : {
+    "globalKey" : "eb0e3fe6"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex61-execution-advice-trade-change-F03-00.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex61-execution-advice-trade-change-F03-00.json
index 3bbe64375f..d8b2dedf33 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex61-execution-advice-trade-change-F03-00.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex61-execution-advice-trade-change-F03-00.json
@@ -1,142 +1,142 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "IM/74"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "4286ba8"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.imgr.com/schemes/message-id"
-      },
-      "value" : "IM/74"
-    },
-    "sentBy" : {
-      "value" : "IMGRUS6S"
-    },
-    "sentTo" : [ {
-      "value" : "CUSTUS3T"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "9146fcac"
-  },
   "proposedEvent" : {
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "31e5d93f"
-          },
           "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "_fund",
-                "globalReference" : "7233a0bd"
-              },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.imgr.com/schemes/account-id"
-                },
-                "value" : "FUND100"
-              },
-              "meta" : {
-                "externalKey" : "_FUNDACCT",
-                "globalKey" : "628d73b0"
-              }
-            }, {
-              "accountBeneficiary" : {
-                "externalReference" : "_cust",
-                "globalReference" : "6f1f29ef"
-              },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.custodian.com/account-id"
-                },
-                "value" : "98765"
-              },
-              "meta" : {
-                "externalKey" : "_CUSTACCT",
-                "globalKey" : "54440069"
-              }
-            } ],
-            "meta" : {
-              "globalKey" : "31e5d93f"
-            },
             "party" : [ {
-              "meta" : {
-                "externalKey" : "_fund",
-                "globalKey" : "7233a0bd"
-              },
-              "name" : {
-                "value" : "INVEST MGR"
-              },
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "959800NKRMZ8NEKQ0A23",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "959800NKRMZ8NEKQ0A23"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "696247f0"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_broker",
-                "globalKey" : "9627fd8c"
-              },
+              } ],
               "name" : {
-                "value" : "BROKER 33"
+                "value" : "INVEST MGR"
               },
+              "meta" : {
+                "globalKey" : "29bfd33d",
+                "externalKey" : "_fund"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300E4CDNNLJRBKF36",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300E4CDNNLJRBKF36"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "ea328105"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_cust",
-                "globalKey" : "6f1f29ef"
-              },
+              } ],
               "name" : {
-                "value" : "Custodian"
+                "value" : "BROKER 33"
               },
+              "meta" : {
+                "globalKey" : "7e552bcc",
+                "externalKey" : "_broker"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300FNRNXH6KYKUK07",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300FNRNXH6KYKUK07"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "aefc2f21"
                 }
-              } ]
-            } ]
+              } ],
+              "name" : {
+                "value" : "Custodian"
+              },
+              "meta" : {
+                "globalKey" : "b8297caf",
+                "externalKey" : "_cust"
+              }
+            } ],
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "FUND100",
+                "meta" : {
+                  "scheme" : "http://www.imgr.com/schemes/account-id"
+                }
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "29bfd33d",
+                "externalReference" : "_fund"
+              },
+              "meta" : {
+                "globalKey" : "a2ddb9b0",
+                "externalKey" : "_FUNDACCT"
+              }
+            }, {
+              "accountNumber" : {
+                "value" : "98765",
+                "meta" : {
+                  "scheme" : "http://www.custodian.com/account-id"
+                }
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "b8297caf",
+                "externalReference" : "_cust"
+              },
+              "meta" : {
+                "globalKey" : "2f5c7329",
+                "externalKey" : "_CUSTACCT"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "8fd7ae11"
+            }
+          },
+          "meta" : {
+            "globalKey" : "8fd7ae11"
           }
         }
       }
     } ]
   },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "IM/74",
+      "meta" : {
+        "scheme" : "http://www.imgr.com/schemes/message-id"
+      }
+    },
+    "sentBy" : {
+      "value" : "IMGRUS6S"
+    },
+    "sentTo" : [ {
+      "value" : "CUSTUS3T"
+    } ]
+  },
   "timestamp" : [ {
     "dateTime" : "2009-09-20T10:33:09-08:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "IM/74"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "4286ba8"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "21c7e91c"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex62-execution-advice-trade-change-correction-F03-10.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex62-execution-advice-trade-change-correction-F03-10.json
index 5da837b602..15a136b149 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex62-execution-advice-trade-change-correction-F03-10.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex62-execution-advice-trade-change-correction-F03-10.json
@@ -1,142 +1,142 @@
 {
-  "action" : "CORRECT",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "IM/75"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "4286ba9"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.imgr.com/schemes/message-id"
-      },
-      "value" : "IM/75"
-    },
-    "sentBy" : {
-      "value" : "IMGRUS6S"
-    },
-    "sentTo" : [ {
-      "value" : "CUSTUS3T"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "d3ce44b0"
-  },
   "proposedEvent" : {
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "31e5d93f"
-          },
           "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "_fund",
-                "globalReference" : "7233a0bd"
-              },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.imgr.com/schemes/account-id"
-                },
-                "value" : "FUND100"
-              },
-              "meta" : {
-                "externalKey" : "_FUNDACCT",
-                "globalKey" : "628d73b0"
-              }
-            }, {
-              "accountBeneficiary" : {
-                "externalReference" : "_cust",
-                "globalReference" : "6f1f29ef"
-              },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.custodian.com/account-id"
-                },
-                "value" : "98765"
-              },
-              "meta" : {
-                "externalKey" : "_CUSTACCT",
-                "globalKey" : "54440069"
-              }
-            } ],
-            "meta" : {
-              "globalKey" : "31e5d93f"
-            },
             "party" : [ {
-              "meta" : {
-                "externalKey" : "_fund",
-                "globalKey" : "7233a0bd"
-              },
-              "name" : {
-                "value" : "INVEST MGR"
-              },
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "959800NKRMZ8NEKQ0A23",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "959800NKRMZ8NEKQ0A23"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "696247f0"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_broker",
-                "globalKey" : "9627fd8c"
-              },
+              } ],
               "name" : {
-                "value" : "BROKER 33"
+                "value" : "INVEST MGR"
               },
+              "meta" : {
+                "globalKey" : "29bfd33d",
+                "externalKey" : "_fund"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300E4CDNNLJRBKF36",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300E4CDNNLJRBKF36"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "ea328105"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_cust",
-                "globalKey" : "6f1f29ef"
-              },
+              } ],
               "name" : {
-                "value" : "Custodian"
+                "value" : "BROKER 33"
               },
+              "meta" : {
+                "globalKey" : "7e552bcc",
+                "externalKey" : "_broker"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300FNRNXH6KYKUK07",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300FNRNXH6KYKUK07"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "aefc2f21"
                 }
-              } ]
-            } ]
+              } ],
+              "name" : {
+                "value" : "Custodian"
+              },
+              "meta" : {
+                "globalKey" : "b8297caf",
+                "externalKey" : "_cust"
+              }
+            } ],
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "FUND100",
+                "meta" : {
+                  "scheme" : "http://www.imgr.com/schemes/account-id"
+                }
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "29bfd33d",
+                "externalReference" : "_fund"
+              },
+              "meta" : {
+                "globalKey" : "a2ddb9b0",
+                "externalKey" : "_FUNDACCT"
+              }
+            }, {
+              "accountNumber" : {
+                "value" : "98765",
+                "meta" : {
+                  "scheme" : "http://www.custodian.com/account-id"
+                }
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "b8297caf",
+                "externalReference" : "_cust"
+              },
+              "meta" : {
+                "globalKey" : "2f5c7329",
+                "externalKey" : "_CUSTACCT"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "8fd7ae11"
+            }
+          },
+          "meta" : {
+            "globalKey" : "8fd7ae11"
           }
         }
       }
     } ]
   },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "IM/75",
+      "meta" : {
+        "scheme" : "http://www.imgr.com/schemes/message-id"
+      }
+    },
+    "sentBy" : {
+      "value" : "IMGRUS6S"
+    },
+    "sentTo" : [ {
+      "value" : "CUSTUS3T"
+    } ]
+  },
   "timestamp" : [ {
     "dateTime" : "2009-09-20T11:33:09-08:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "IM/75"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "4286ba9"
+    }
+  } ],
+  "action" : "Correct",
+  "meta" : {
+    "globalKey" : "a66ca9e0"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex64-execution-advice-trade-initiation-correction.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex64-execution-advice-trade-initiation-correction.json
index f1d54f9b53..f88574135c 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex64-execution-advice-trade-initiation-correction.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex64-execution-advice-trade-initiation-correction.json
@@ -1,169 +1,65 @@
 {
-  "action" : "CORRECT",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "0483608"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "4714405f"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.amag.com/coding-scheme/message-id"
-      },
-      "value" : "0483608"
-    },
-    "sentBy" : {
-      "value" : "AMAGGB22XXX"
-    },
-    "sentTo" : [ {
-      "value" : "CCSTUS6S"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "1e6cd443"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "3acbca3"
-          },
-          "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "SKY",
-                "globalReference" : "40987e93"
-              },
-              "accountName" : {
-                "value" : "SkyAccount"
-              },
-              "accountNumber" : {
-                "value" : "1234"
-              },
-              "meta" : {
-                "externalKey" : "INTAC1",
-                "globalKey" : "e70f7faf"
-              }
-            }, {
-              "accountBeneficiary" : {
-                "externalReference" : "SKY",
-                "globalReference" : "40987e93"
-              },
-              "accountName" : {
-                "value" : "Sky General Account"
-              },
-              "accountNumber" : {
-                "value" : "47896325"
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster"
+                }
               },
-              "meta" : {
-                "externalKey" : "GEN478",
-                "globalKey" : "ced6891b"
-              }
-            } ],
+              "vintage" : 2002
+            },
             "meta" : {
-              "globalKey" : "3acbca3"
+              "globalKey" : "328cfa59"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualDefinitionsType" : [ {
+                  "value" : "ISDA2000"
+                } ]
+              }
             },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "AMAG",
-                "globalKey" : "949fb7a6"
-              },
-              "name" : {
-                "value" : "International Bank Asset Management"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "969500T86SHG919ON888"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "3f13bd61"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "SKY",
-                "globalKey" : "40987e93"
-              },
-              "name" : {
-                "value" : "Sky Limited"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300XQFX97CITUR430"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "37ee66b8"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "CST",
-                "globalKey" : "7e692bf1"
-              },
-              "name" : {
-                "value" : "Standards Slav. Int'l"
+            "meta" : {
+              "globalKey" : "6b41335a"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "d4fdd613",
+                "externalReference" : "SKY"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "IRS2",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300FL0LHI0TEZ8V48"
+                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+                  }
                 },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "3db89a47"
-                }
-              } ]
-            }, {
+                "version" : 2
+              } ],
               "meta" : {
-                "externalKey" : "FIRST",
-                "globalKey" : "43aba2b3"
-              },
-              "name" : {
-                "value" : "First International Bank, MozartStrasse, Frankfurt"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300E0S1LZYZ9QNX81"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "13e8a01c"
-                }
-              } ]
+                "globalKey" : "aba94d2b"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2007-07-27",
+              "meta" : {
+                "globalKey" : "3eb9db"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "SKY",
-                  "globalReference" : "40987e93"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "FIRST",
-                  "globalReference" : "43aba2b3"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -174,77 +70,70 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "BCT1",
-                                "globalReference" : "99ecd50c"
-                              },
-                              "meta" : {
-                                "globalKey" : "1f065e"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "365a0a2f"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28cc3"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "30"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2007-07-30",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "BCT1",
-                                    "globalReference" : "99ecd50c"
+                                    "globalReference" : "99ecd50c",
+                                    "externalReference" : "BCT1"
                                   },
                                   "meta" : {
                                     "globalKey" : "1f065e"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "365a0a2f"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "d83acb11"
-                              },
-                              "unadjustedDate" : "2007-07-30"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "d83acb11"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "CALC1",
-                            "globalKey" : "42858c42"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2037-07-30",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
@@ -254,431 +143,542 @@
                                     "value" : "JPTO"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "BCT1",
-                                    "globalKey" : "99ecd50c"
+                                    "globalKey" : "99ecd50c",
+                                    "externalKey" : "BCT1"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "706f885d"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "9a6e183f"
-                              },
-                              "unadjustedDate" : "2037-07-30"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "9a6e183f"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
-                        "meta" : {
-                          "globalKey" : "aa6dba61"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "8ff37aa4"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "BCT1",
-                                "globalReference" : "99ecd50c"
+                                "globalReference" : "99ecd50c",
+                                "externalReference" : "BCT1"
                               },
                               "meta" : {
                                 "globalKey" : "1f065e"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "365a0a2f"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "959"
+                              "globalKey" : "18ad5"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 6
+                            "rollConvention" : "30"
+                          },
+                          "meta" : {
+                            "globalKey" : "b4c01db4",
+                            "externalKey" : "CALC1"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "99ecd50c",
+                                "externalReference" : "BCT1"
+                              },
+                              "meta" : {
+                                "globalKey" : "1f065e"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "365a0a2f"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "8f10f362"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "985e3ed1"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "BCT1",
-                                "globalReference" : "99ecd50c"
-                              },
-                              "meta" : {
-                                "globalKey" : "1f065e"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "365a0a2f"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c66"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "30"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2007-07-30",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "FOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "BCT1",
-                                    "globalReference" : "99ecd50c"
+                                    "globalReference" : "99ecd50c",
+                                    "externalReference" : "BCT1"
                                   },
                                   "meta" : {
                                     "globalKey" : "1f065e"
                                   }
                                 },
-                                "businessDayConvention" : "FOLLOWING",
                                 "meta" : {
                                   "globalKey" : "211c224d"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "c2fce32f"
-                              },
-                              "unadjustedDate" : "2007-07-30"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "c2fce32f"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "CALC2",
-                            "globalKey" : "e5693c55"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2037-07-30",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "BCT1",
-                                    "globalReference" : "99ecd50c"
+                                    "globalReference" : "99ecd50c",
+                                    "externalReference" : "BCT1"
                                   },
                                   "meta" : {
                                     "globalKey" : "1f065e"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "365a0a2f"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "634fdb11"
-                              },
-                              "unadjustedDate" : "2037-07-30"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "634fdb11"
                             }
-                          }
-                        },
-                        "compoundingMethod" : "FLAT",
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
-                        "meta" : {
-                          "globalKey" : "ac606ac8"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "8ff37c13"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "BCT1",
-                                "globalReference" : "99ecd50c"
+                                "globalReference" : "99ecd50c",
+                                "externalReference" : "BCT1"
                               },
                               "meta" : {
                                 "globalKey" : "1f065e"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "365a0a2f"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "ac8"
+                              "globalKey" : "17f92"
                             },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
+                            "rollConvention" : "30"
+                          },
+                          "meta" : {
+                            "globalKey" : "81e1e301",
+                            "externalKey" : "CALC2"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "99ecd50c",
+                                "externalReference" : "BCT1"
+                              },
+                              "meta" : {
+                                "globalKey" : "1f065e"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "365a0a2f"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "9b0bf291"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "CALC2",
-                            "globalReference" : "e5693c55"
+                            "globalReference" : "81e1e301",
+                            "externalReference" : "CALC2"
                           },
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "c705a064"
+                              "globalKey" : "536cd230"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
                             "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "RES2",
-                              "globalReference" : "f807970e"
+                              "globalReference" : "cda103d8",
+                              "externalReference" : "RES2"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "RES2",
-                            "globalKey" : "f807970e"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "BCT1",
-                                "globalReference" : "99ecd50c"
+                                "globalReference" : "99ecd50c",
+                                "externalReference" : "BCT1"
                               },
                               "meta" : {
                                 "globalKey" : "1f065e"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "365a0a2f"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "cda103d8",
+                            "externalKey" : "RES2"
                           }
+                        },
+                        "compoundingMethod" : "Flat",
+                        "meta" : {
+                          "globalKey" : "9eebc47c"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "c7e5e847"
+                        "globalKey" : "1ef1ef8b"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "c7e5e847"
+                    "globalKey" : "1ef1ef8b"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "c7e5e847"
+                  "globalKey" : "1ef1ef8b"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "a8099f56"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0987,
                       "unit" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "value" : 0.0987,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 12300000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "JPY"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "592a4b6a"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 12300000000,
                       "unit" : {
                         "currency" : {
                           "value" : "JPY"
                         }
-                      },
-                      "value" : 12300000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "e376a5a2"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "94cf67df"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "JPY-BBSF-Bloomberg-15:00"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "JPY"
-                        }
-                      },
-                      "value" : 12300000000
+                    "meta" : {
+                      "globalKey" : "51c872d"
                     }
-                  } ]
+                  },
+                  "meta" : {
+                    "globalKey" : "7ce2984e"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "d4fdd613",
+                  "externalReference" : "SKY"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1a22ef33",
+                  "externalReference" : "FIRST"
+                }
               } ]
             },
-            "tradeDate" : {
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "969500T86SHG919ON888",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "3f13bd61"
+                }
+              } ],
+              "name" : {
+                "value" : "International Bank Asset Management"
+              },
               "meta" : {
-                "globalKey" : "3eb9db"
+                "globalKey" : "315fcde6",
+                "externalKey" : "AMAG"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300XQFX97CITUR430",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "37ee66b8"
+                }
+              } ],
+              "name" : {
+                "value" : "Sky Limited"
               },
-              "value" : "2007-07-27"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+              "meta" : {
+                "globalKey" : "d4fdd613",
+                "externalKey" : "SKY"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300FL0LHI0TEZ8V48",
                   "meta" : {
-                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-                  },
-                  "value" : "IRS2"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "version" : 2
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "3db89a47"
+                }
               } ],
-              "issuerReference" : {
-                "externalReference" : "SKY",
-                "globalReference" : "40987e93"
+              "name" : {
+                "value" : "Standards Slav. Int'l"
               },
               "meta" : {
-                "globalKey" : "8159332b"
+                "globalKey" : "963b1b31",
+                "externalKey" : "CST"
               }
-            } ]
-          }
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "value" : "ISDA_MASTER"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300E0S1LZYZ9QNX81",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "13e8a01c"
                 }
+              } ],
+              "name" : {
+                "value" : "First International Bank, MozartStrasse, Frankfurt"
               },
-              "vintage" : 2002
-            },
-            "meta" : {
-              "globalKey" : "328cfa59"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualDefinitionsType" : [ {
-                  "value" : "ISDA2000"
-                } ]
+              "meta" : {
+                "globalKey" : "1a22ef33",
+                "externalKey" : "FIRST"
               }
-            },
+            } ],
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "1234"
+              },
+              "accountName" : {
+                "value" : "SkyAccount"
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "d4fdd613",
+                "externalReference" : "SKY"
+              },
+              "meta" : {
+                "globalKey" : "cc67f72f",
+                "externalKey" : "INTAC1"
+              }
+            }, {
+              "accountNumber" : {
+                "value" : "47896325"
+              },
+              "accountName" : {
+                "value" : "Sky General Account"
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "d4fdd613",
+                "externalReference" : "SKY"
+              },
+              "meta" : {
+                "globalKey" : "15710f9b",
+                "externalKey" : "GEN478"
+              }
+            } ],
             "meta" : {
-              "globalKey" : "6b41335a"
+              "globalKey" : "d05562cf"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "d05562cf"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "0483608",
+      "meta" : {
+        "scheme" : "http://www.amag.com/coding-scheme/message-id"
+      }
+    },
+    "sentBy" : {
+      "value" : "AMAGGB22XXX"
+    },
+    "sentTo" : [ {
+      "value" : "CCSTUS6S"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2007-07-27T11:02:00Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "0483608"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "4714405f"
+    }
+  } ],
+  "action" : "Correct",
+  "meta" : {
+    "globalKey" : "104691d9"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex65-execution-advice-trade-partial-termination.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex65-execution-advice-trade-partial-termination.json
index 9f43b6f0cf..c0d14f9f9f 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex65-execution-advice-trade-partial-termination.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex65-execution-advice-trade-partial-termination.json
@@ -1,220 +1,220 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "0485402"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "47152195"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.amag.com/coding-scheme/message-id"
-      },
-      "value" : "0485402"
-    },
-    "sentBy" : {
-      "value" : "AMAGGB22XXX"
-    },
-    "sentTo" : [ {
-      "value" : "CCSTUS6S"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "b07f817e"
-  },
   "proposedEvent" : {
-    "effectiveDate" : "2008-07-30",
     "eventDate" : "2008-07-25",
+    "effectiveDate" : "2008-07-30",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "48760cd2"
-          },
-          "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "SKY",
-                "globalReference" : "836533e"
-              },
-              "accountName" : {
-                "value" : "SkyAccount"
-              },
-              "accountNumber" : {
-                "value" : "1234"
+      "primitiveInstruction" : {
+        "quantityChange" : {
+          "change" : [ {
+            "quantity" : [ {
+              "value" : {
+                "value" : 10000000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "JPY"
+                  }
+                }
               },
               "meta" : {
-                "externalKey" : "INTAC1",
-                "globalKey" : "e70f7faf"
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
               }
-            }, {
-              "accountBeneficiary" : {
-                "externalReference" : "SKY",
-                "globalReference" : "836533e"
-              },
-              "accountName" : {
-                "value" : "Sky General Account"
+            } ],
+            "meta" : {
+              "globalKey" : "f6044efe"
+            }
+          } ],
+          "direction" : "Replace"
+        },
+        "transfer" : {
+          "transferState" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 123000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "JPY"
+                  }
+                }
               },
-              "accountNumber" : {
-                "value" : "47896325"
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "1a22ef33",
+                  "externalReference" : "FIRST"
+                },
+                "receiverPartyReference" : {
+                  "globalReference" : "2c792bfe",
+                  "externalReference" : "SKY"
+                }
               },
-              "meta" : {
-                "externalKey" : "GEN478",
-                "globalKey" : "ced6891b"
+              "transferExpression" : {
+                "priceTransfer" : "Termination"
               }
-            } ],
-            "meta" : {
-              "globalKey" : "48760cd2"
             },
+            "meta" : {
+              "globalKey" : "37479b34"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
             "party" : [ {
-              "meta" : {
-                "externalKey" : "AMAG",
-                "globalKey" : "949fb7a6"
-              },
-              "name" : {
-                "value" : "International Bank Asset Management"
-              },
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "969500T86SHG919ON888",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "969500T86SHG919ON888"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "3f13bd61"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "SKY",
-                "globalKey" : "836533e"
-              },
+              } ],
               "name" : {
-                "value" : "Sky Limited"
+                "value" : "International Bank Asset Management"
               },
+              "meta" : {
+                "globalKey" : "315fcde6",
+                "externalKey" : "AMAG"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300HTD3SZJWA5TS80",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300HTD3SZJWA5TS80"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "ff8c3b63"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "CST",
-                "globalKey" : "7e692bf1"
-              },
+              } ],
               "name" : {
-                "value" : "Standards Slav. Int'l"
+                "value" : "Sky Limited"
               },
+              "meta" : {
+                "globalKey" : "2c792bfe",
+                "externalKey" : "SKY"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300FL0LHI0TEZ8V48",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300FL0LHI0TEZ8V48"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "3db89a47"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "FIRST",
-                "globalKey" : "43aba2b3"
-              },
+              } ],
               "name" : {
-                "value" : "First International Bank, MozartStrasse, Frankfurt"
+                "value" : "Standards Slav. Int'l"
               },
+              "meta" : {
+                "globalKey" : "963b1b31",
+                "externalKey" : "CST"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300E0S1LZYZ9QNX81",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300E0S1LZYZ9QNX81"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "13e8a01c"
                 }
-              } ]
-            } ]
-          }
-        }
-      },
-      "primitiveInstruction" : {
-        "quantityChange" : {
-          "change" : [ {
-            "meta" : {
-              "globalKey" : "a4d6d942"
-            },
-            "quantity" : [ {
+              } ],
+              "name" : {
+                "value" : "First International Bank, MozartStrasse, Frankfurt"
+              },
               "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
-                } ]
+                "globalKey" : "1a22ef33",
+                "externalKey" : "FIRST"
+              }
+            } ],
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "1234"
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "JPY"
-                  }
-                },
-                "value" : 10000000000
+              "accountName" : {
+                "value" : "SkyAccount"
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "2c792bfe",
+                "externalReference" : "SKY"
+              },
+              "meta" : {
+                "globalKey" : "cc67f72f",
+                "externalKey" : "INTAC1"
               }
-            } ]
-          } ],
-          "direction" : "REPLACE"
-        },
-        "transfer" : {
-          "transferState" : [ {
-            "meta" : {
-              "globalKey" : "14b421d4"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "FIRST",
-                  "globalReference" : "43aba2b3"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "SKY",
-                  "globalReference" : "836533e"
-                }
+            }, {
+              "accountNumber" : {
+                "value" : "47896325"
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "JPY"
-                  }
-                },
-                "value" : 123000000
+              "accountName" : {
+                "value" : "Sky General Account"
               },
-              "transferExpression" : {
-                "priceTransfer" : "TERMINATION"
+              "accountBeneficiary" : {
+                "globalReference" : "2c792bfe",
+                "externalReference" : "SKY"
+              },
+              "meta" : {
+                "globalKey" : "15710f9b",
+                "externalKey" : "GEN478"
               }
+            } ],
+            "meta" : {
+              "globalKey" : "17b0da92"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "17b0da92"
+          }
         }
       }
     } ]
   },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "0485402",
+      "meta" : {
+        "scheme" : "http://www.amag.com/coding-scheme/message-id"
+      }
+    },
+    "sentBy" : {
+      "value" : "AMAGGB22XXX"
+    },
+    "sentTo" : [ {
+      "value" : "CCSTUS6S"
+    } ]
+  },
   "timestamp" : [ {
     "dateTime" : "2008-07-25T13:15:00Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "0485402"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "47152195"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "53e5e7d0"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex66-execution-advice-trade-full-termination.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex66-execution-advice-trade-full-termination.json
index d9c88e705d..de3fe09d84 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex66-execution-advice-trade-full-termination.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex66-execution-advice-trade-full-termination.json
@@ -1,220 +1,220 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "0485635"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "47152977"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.amag.com/coding-scheme/message-id"
-      },
-      "value" : "0485635"
-    },
-    "sentBy" : {
-      "value" : "AMAGGB22XXX"
-    },
-    "sentTo" : [ {
-      "value" : "CCSTUS6S"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "5f7d5201"
-  },
   "proposedEvent" : {
-    "effectiveDate" : "2009-07-30",
     "eventDate" : "2008-07-26",
+    "effectiveDate" : "2009-07-30",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "48760cd2"
-          },
-          "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "SKY",
-                "globalReference" : "836533e"
-              },
-              "accountName" : {
-                "value" : "SkyAccount"
-              },
-              "accountNumber" : {
-                "value" : "1234"
+      "primitiveInstruction" : {
+        "quantityChange" : {
+          "change" : [ {
+            "quantity" : [ {
+              "value" : {
+                "value" : 0,
+                "unit" : {
+                  "currency" : {
+                    "value" : "JPY"
+                  }
+                }
               },
               "meta" : {
-                "externalKey" : "INTAC1",
-                "globalKey" : "e70f7faf"
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
               }
-            }, {
-              "accountBeneficiary" : {
-                "externalReference" : "SKY",
-                "globalReference" : "836533e"
-              },
-              "accountName" : {
-                "value" : "Sky General Account"
+            } ],
+            "meta" : {
+              "globalKey" : "2c742bd"
+            }
+          } ],
+          "direction" : "Replace"
+        },
+        "transfer" : {
+          "transferState" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 123000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "JPY"
+                  }
+                }
               },
-              "accountNumber" : {
-                "value" : "47896325"
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "1a22ef33",
+                  "externalReference" : "FIRST"
+                },
+                "receiverPartyReference" : {
+                  "globalReference" : "2c792bfe",
+                  "externalReference" : "SKY"
+                }
               },
-              "meta" : {
-                "externalKey" : "GEN478",
-                "globalKey" : "ced6891b"
+              "transferExpression" : {
+                "priceTransfer" : "Termination"
               }
-            } ],
-            "meta" : {
-              "globalKey" : "48760cd2"
             },
+            "meta" : {
+              "globalKey" : "37479b34"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
             "party" : [ {
-              "meta" : {
-                "externalKey" : "AMAG",
-                "globalKey" : "949fb7a6"
-              },
-              "name" : {
-                "value" : "International Bank Asset Management"
-              },
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "969500T86SHG919ON888",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "969500T86SHG919ON888"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "3f13bd61"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "SKY",
-                "globalKey" : "836533e"
-              },
+              } ],
               "name" : {
-                "value" : "Sky Limited"
+                "value" : "International Bank Asset Management"
               },
+              "meta" : {
+                "globalKey" : "315fcde6",
+                "externalKey" : "AMAG"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300HTD3SZJWA5TS80",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300HTD3SZJWA5TS80"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "ff8c3b63"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "CST",
-                "globalKey" : "7e692bf1"
-              },
+              } ],
               "name" : {
-                "value" : "Standards Slav. Int'l"
+                "value" : "Sky Limited"
               },
+              "meta" : {
+                "globalKey" : "2c792bfe",
+                "externalKey" : "SKY"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300FL0LHI0TEZ8V48",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300FL0LHI0TEZ8V48"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "3db89a47"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "FIRST",
-                "globalKey" : "43aba2b3"
-              },
+              } ],
               "name" : {
-                "value" : "First International Bank, MozartStrasse, Frankfurt"
+                "value" : "Standards Slav. Int'l"
               },
+              "meta" : {
+                "globalKey" : "963b1b31",
+                "externalKey" : "CST"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300E0S1LZYZ9QNX81",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300E0S1LZYZ9QNX81"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "13e8a01c"
                 }
-              } ]
-            } ]
-          }
-        }
-      },
-      "primitiveInstruction" : {
-        "quantityChange" : {
-          "change" : [ {
-            "meta" : {
-              "globalKey" : "16f1a3"
-            },
-            "quantity" : [ {
+              } ],
+              "name" : {
+                "value" : "First International Bank, MozartStrasse, Frankfurt"
+              },
               "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
-                } ]
+                "globalKey" : "1a22ef33",
+                "externalKey" : "FIRST"
+              }
+            } ],
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "1234"
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "JPY"
-                  }
-                },
-                "value" : 0
+              "accountName" : {
+                "value" : "SkyAccount"
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "2c792bfe",
+                "externalReference" : "SKY"
+              },
+              "meta" : {
+                "globalKey" : "cc67f72f",
+                "externalKey" : "INTAC1"
               }
-            } ]
-          } ],
-          "direction" : "REPLACE"
-        },
-        "transfer" : {
-          "transferState" : [ {
-            "meta" : {
-              "globalKey" : "14b421d4"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "FIRST",
-                  "globalReference" : "43aba2b3"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "SKY",
-                  "globalReference" : "836533e"
-                }
+            }, {
+              "accountNumber" : {
+                "value" : "47896325"
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "JPY"
-                  }
-                },
-                "value" : 123000000
+              "accountName" : {
+                "value" : "Sky General Account"
               },
-              "transferExpression" : {
-                "priceTransfer" : "TERMINATION"
+              "accountBeneficiary" : {
+                "globalReference" : "2c792bfe",
+                "externalReference" : "SKY"
+              },
+              "meta" : {
+                "globalKey" : "15710f9b",
+                "externalKey" : "GEN478"
               }
+            } ],
+            "meta" : {
+              "globalKey" : "17b0da92"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "17b0da92"
+          }
         }
       }
     } ]
   },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "0485635",
+      "meta" : {
+        "scheme" : "http://www.amag.com/coding-scheme/message-id"
+      }
+    },
+    "sentBy" : {
+      "value" : "AMAGGB22XXX"
+    },
+    "sentTo" : [ {
+      "value" : "CCSTUS6S"
+    } ]
+  },
   "timestamp" : [ {
     "dateTime" : "2009-07-26T10:55:00Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "0485635"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "47152977"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "3757b131"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex67-execution-advice-trade-full-termination-correction.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex67-execution-advice-trade-full-termination-correction.json
index 5eabcdfd03..b87d0a5877 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex67-execution-advice-trade-full-termination-correction.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex67-execution-advice-trade-full-termination-correction.json
@@ -1,220 +1,220 @@
 {
-  "action" : "CORRECT",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "0485674"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "471529f2"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.amag.com/coding-scheme/message-id"
-      },
-      "value" : "0485674"
-    },
-    "sentBy" : {
-      "value" : "AMAGGB22XXX"
-    },
-    "sentTo" : [ {
-      "value" : "CCSTUS6S"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "cf82dd85"
-  },
   "proposedEvent" : {
-    "effectiveDate" : "2009-07-30",
     "eventDate" : "2008-07-26",
+    "effectiveDate" : "2009-07-30",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "48760cd2"
-          },
-          "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "SKY",
-                "globalReference" : "836533e"
-              },
-              "accountName" : {
-                "value" : "SkyAccount"
-              },
-              "accountNumber" : {
-                "value" : "1234"
+      "primitiveInstruction" : {
+        "quantityChange" : {
+          "change" : [ {
+            "quantity" : [ {
+              "value" : {
+                "value" : 0,
+                "unit" : {
+                  "currency" : {
+                    "value" : "JPY"
+                  }
+                }
               },
               "meta" : {
-                "externalKey" : "INTAC1",
-                "globalKey" : "e70f7faf"
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
               }
-            }, {
-              "accountBeneficiary" : {
-                "externalReference" : "SKY",
-                "globalReference" : "836533e"
-              },
-              "accountName" : {
-                "value" : "Sky General Account"
+            } ],
+            "meta" : {
+              "globalKey" : "2c742bd"
+            }
+          } ],
+          "direction" : "Replace"
+        },
+        "transfer" : {
+          "transferState" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 100000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "JPY"
+                  }
+                }
               },
-              "accountNumber" : {
-                "value" : "47896325"
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "2c792bfe",
+                  "externalReference" : "SKY"
+                },
+                "receiverPartyReference" : {
+                  "globalReference" : "1a22ef33",
+                  "externalReference" : "FIRST"
+                }
               },
-              "meta" : {
-                "externalKey" : "GEN478",
-                "globalKey" : "ced6891b"
+              "transferExpression" : {
+                "priceTransfer" : "Termination"
               }
-            } ],
-            "meta" : {
-              "globalKey" : "48760cd2"
             },
+            "meta" : {
+              "globalKey" : "ad3b74b3"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
             "party" : [ {
-              "meta" : {
-                "externalKey" : "AMAG",
-                "globalKey" : "949fb7a6"
-              },
-              "name" : {
-                "value" : "International Bank Asset Management"
-              },
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "969500T86SHG919ON888",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "969500T86SHG919ON888"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "3f13bd61"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "SKY",
-                "globalKey" : "836533e"
-              },
+              } ],
               "name" : {
-                "value" : "Sky Limited"
+                "value" : "International Bank Asset Management"
               },
+              "meta" : {
+                "globalKey" : "315fcde6",
+                "externalKey" : "AMAG"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300HTD3SZJWA5TS80",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300HTD3SZJWA5TS80"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "ff8c3b63"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "CST",
-                "globalKey" : "7e692bf1"
-              },
+              } ],
               "name" : {
-                "value" : "Standards Slav. Int'l"
+                "value" : "Sky Limited"
               },
+              "meta" : {
+                "globalKey" : "2c792bfe",
+                "externalKey" : "SKY"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300FL0LHI0TEZ8V48",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300FL0LHI0TEZ8V48"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "3db89a47"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "FIRST",
-                "globalKey" : "43aba2b3"
-              },
+              } ],
               "name" : {
-                "value" : "First International Bank, MozartStrasse, Frankfurt"
+                "value" : "Standards Slav. Int'l"
               },
+              "meta" : {
+                "globalKey" : "963b1b31",
+                "externalKey" : "CST"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300E0S1LZYZ9QNX81",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300E0S1LZYZ9QNX81"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "13e8a01c"
                 }
-              } ]
-            } ]
-          }
-        }
-      },
-      "primitiveInstruction" : {
-        "quantityChange" : {
-          "change" : [ {
-            "meta" : {
-              "globalKey" : "16f1a3"
-            },
-            "quantity" : [ {
+              } ],
+              "name" : {
+                "value" : "First International Bank, MozartStrasse, Frankfurt"
+              },
               "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
-                } ]
+                "globalKey" : "1a22ef33",
+                "externalKey" : "FIRST"
+              }
+            } ],
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "1234"
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "JPY"
-                  }
-                },
-                "value" : 0
+              "accountName" : {
+                "value" : "SkyAccount"
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "2c792bfe",
+                "externalReference" : "SKY"
+              },
+              "meta" : {
+                "globalKey" : "cc67f72f",
+                "externalKey" : "INTAC1"
               }
-            } ]
-          } ],
-          "direction" : "REPLACE"
-        },
-        "transfer" : {
-          "transferState" : [ {
-            "meta" : {
-              "globalKey" : "b6d0c4f5"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "SKY",
-                  "globalReference" : "836533e"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "FIRST",
-                  "globalReference" : "43aba2b3"
-                }
+            }, {
+              "accountNumber" : {
+                "value" : "47896325"
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "JPY"
-                  }
-                },
-                "value" : 100000000
+              "accountName" : {
+                "value" : "Sky General Account"
               },
-              "transferExpression" : {
-                "priceTransfer" : "TERMINATION"
+              "accountBeneficiary" : {
+                "globalReference" : "2c792bfe",
+                "externalReference" : "SKY"
+              },
+              "meta" : {
+                "globalKey" : "15710f9b",
+                "externalKey" : "GEN478"
               }
+            } ],
+            "meta" : {
+              "globalKey" : "17b0da92"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "17b0da92"
+          }
         }
       }
     } ]
   },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "0485674",
+      "meta" : {
+        "scheme" : "http://www.amag.com/coding-scheme/message-id"
+      }
+    },
+    "sentBy" : {
+      "value" : "AMAGGB22XXX"
+    },
+    "sentTo" : [ {
+      "value" : "CCSTUS6S"
+    } ]
+  },
   "timestamp" : [ {
     "dateTime" : "2009-07-26T13:48:00Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "0485674"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "471529f2"
+    }
+  } ],
+  "action" : "Correct",
+  "meta" : {
+    "globalKey" : "46e68e17"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/pkg-ex01-pkge-execution-notification.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/pkg-ex01-pkge-execution-notification.json
index 3353b568a6..2b8aa5914e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/pkg-ex01-pkge-execution-notification.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/pkg-ex01-pkge-execution-notification.json
@@ -1,128 +1,128 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "123453212"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "90b09f73"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.sefco.com/message-id"
-      },
-      "value" : "123453212"
-    },
-    "sentBy" : {
-      "value" : "SEF"
-    }
-  },
-  "meta" : {
-    "globalKey" : "4611c8d0"
-  },
   "proposedEvent" : {
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "7ef3ace1"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "7ef3ace1"
-            },
             "party" : [ {
-              "meta" : {
-                "externalKey" : "sef",
-                "globalKey" : "39ced991"
-              },
-              "name" : {
-                "value" : "SEF Corp"
-              },
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300RE0FSXJE8G1L65",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300RE0FSXJE8G1L65"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "5c7a105b"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "de2b9c62"
-              },
+              } ],
               "name" : {
-                "value" : "Megaclient"
+                "value" : "SEF Corp"
               },
+              "meta" : {
+                "globalKey" : "8f9d39d1",
+                "externalKey" : "sef"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "HWUPKR0MPOU8FGXBT394",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "HWUPKR0MPOU8FGXBT394"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "10150c05"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "a9caa31a"
-              },
+              } ],
               "name" : {
-                "value" : "EBY"
+                "value" : "Megaclient"
               },
+              "meta" : {
+                "globalKey" : "de0165a2",
+                "externalKey" : "party1"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300Q4B2OQW6FDBA48",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300Q4B2OQW6FDBA48"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "f236a5be"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearingbroker",
-                "globalKey" : "35173494"
-              },
+              } ],
               "name" : {
-                "value" : "FCM B"
+                "value" : "EBY"
               },
+              "meta" : {
+                "globalKey" : "3f25399a",
+                "externalKey" : "party2"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "969500A1DO2476C1ZL52",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "969500A1DO2476C1ZL52"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "56f52642"
                 }
-              } ]
-            } ]
+              } ],
+              "name" : {
+                "value" : "FCM B"
+              },
+              "meta" : {
+                "globalKey" : "723ea514",
+                "externalKey" : "clearingbroker"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "368b8d61"
+            }
+          },
+          "meta" : {
+            "globalKey" : "368b8d61"
           }
         }
       }
     } ]
   },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "123453212",
+      "meta" : {
+        "scheme" : "http://www.sefco.com/message-id"
+      }
+    },
+    "sentBy" : {
+      "value" : "SEF"
+    }
+  },
   "timestamp" : [ {
     "dateTime" : "2014-01-15T09:57:00Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "123453212"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "90b09f73"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "7301f40a"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/pkg-ex02-swap-spread-single-trade-execution-notification.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/pkg-ex02-swap-spread-single-trade-execution-notification.json
index 15edaee7bd..9f26b731eb 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/pkg-ex02-swap-spread-single-trade-execution-notification.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/pkg-ex02-swap-spread-single-trade-execution-notification.json
@@ -1,161 +1,34 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "123453212"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "90b09f73"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.sefco.com/message-id"
-      },
-      "value" : "123453212"
-    },
-    "sentBy" : {
-      "value" : "SEF"
-    }
-  },
-  "meta" : {
-    "globalKey" : "5990f3b4"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "d42954a1"
-          },
           "trade" : {
-            "executionDetails" : {
-              "meta" : {
-                "globalKey" : "94591b30"
-              },
-              "packageReference" : {
-                "listId" : {
-                  "assignedIdentifier" : [ {
-                    "identifier" : {
-                      "meta" : {
-                        "scheme" : "http://www.sefco.com/packages/package-id"
-                      },
-                      "value" : "123"
-                    }
-                  } ],
-                  "issuer" : {
-                    "value" : "SEF123"
-                  },
-                  "meta" : {
-                    "globalKey" : "94591b30"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "94591b30"
-                }
-              }
-            },
-            "meta" : {
-              "globalKey" : "d42954a1"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "sef",
-                "globalKey" : "39ced991"
-              },
-              "name" : {
-                "value" : "SEF Corp"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300RE0FSXJE8G1L65"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "5c7a105b"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "de2b9c62"
-              },
-              "name" : {
-                "value" : "Megaclient"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "HWUPKR0MPOU8FGXBT394"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "10150c05"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "a9caa31a"
-              },
-              "name" : {
-                "value" : "EBY"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "8f9d39d1",
+                "externalReference" : "sef"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "1",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300Q4B2OQW6FDBA48"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "f236a5be"
+                    "scheme" : "http://www.sefco.com/swaps/trade-id"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "clearingbroker",
-                "globalKey" : "35173494"
-              },
-              "name" : {
-                "value" : "FCM B"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "969500A1DO2476C1ZL52"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "56f52642"
-                }
-              } ]
+                "globalKey" : "c9faf35d"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2014-01-15",
+              "meta" : {
+                "globalKey" : "3ef04f"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "a9caa31a"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "de2b9c62"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -166,46 +39,40 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters1",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "774d8b35"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "ad888f06"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c2f"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "17"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2014-01-17",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -214,103 +81,108 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec68c749"
-                              },
-                              "unadjustedDate" : "2014-01-17"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec68c749"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates1",
-                            "globalKey" : "4585373d"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2024-01-17",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "primaryBusinessCenters1",
-                                    "globalKey" : "27e4e9"
+                                    "globalKey" : "27e4e9",
+                                    "externalKey" : "primaryBusinessCenters1"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "3662e8ba"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "45e43309"
-                              },
-                              "unadjustedDate" : "2024-01-17"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "45e43309"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
-                        "meta" : {
-                          "globalKey" : "72f18401"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "de68326a"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters1",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters1"
                               },
                               "meta" : {
                                 "globalKey" : "774d8b35"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "ad888f06"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "956"
+                              "globalKey" : "17f5b"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                            "rollConvention" : "17"
+                          },
+                          "meta" : {
+                            "globalKey" : "c0b0d64f",
+                            "externalKey" : "floatingCalcPeriodDates1"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters1"
+                              },
+                              "meta" : {
+                                "globalKey" : "774d8b35"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "ad888f06"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "678cc676"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates1",
-                            "globalReference" : "4585373d"
+                            "globalReference" : "c0b0d64f",
+                            "externalReference" : "floatingCalcPeriodDates1"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "fa6da954"
+                              "globalKey" : "ff9b708"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -321,82 +193,79 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "resetDates1",
-                              "globalReference" : "336116df"
+                              "globalReference" : "3fd2c49f",
+                              "externalReference" : "resetDates1"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "resetDates1",
-                            "globalKey" : "336116df"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters1",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters1"
                               },
                               "meta" : {
                                 "globalKey" : "774d8b35"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "ad888f06"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "meta" : {
+                            "globalKey" : "3fd2c49f",
+                            "externalKey" : "resetDates1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "eda318ab"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters1",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "774d8b35"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "ad888f06"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c8c"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "17"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30E/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2014-01-17",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -405,241 +274,372 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec68c749"
-                              },
-                              "unadjustedDate" : "2014-01-17"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec68c749"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates1",
-                            "globalKey" : "8864444c"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2019-01-17",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "primaryBusinessCenters1",
-                                    "globalReference" : "27e4e9"
+                                    "globalReference" : "27e4e9",
+                                    "externalReference" : "primaryBusinessCenters1"
                                   },
                                   "meta" : {
                                     "globalKey" : "774d8b35"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "ad888f06"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "7b310155"
-                              },
-                              "unadjustedDate" : "2019-01-17"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "7b310155"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "30E/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "a701c451"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "de68326d"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters1",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters1"
                               },
                               "meta" : {
                                 "globalKey" : "774d8b35"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "ad888f06"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "959"
+                              "globalKey" : "18a9e"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 6
+                            "rollConvention" : "17"
+                          },
+                          "meta" : {
+                            "globalKey" : "5fb968c6",
+                            "externalKey" : "fixedCalcPeriodDates1"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters1"
+                              },
+                              "meta" : {
+                                "globalKey" : "774d8b35"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "ad888f06"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "63f7839"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "798842a9"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "7f0fb712"
+                        "globalKey" : "f0825594"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "7f0fb712"
+                    "globalKey" : "f0825594"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "7f0fb712"
+                  "globalKey" : "f0825594"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "6559d05a"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "d24945b1"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-CMS-Reuters"
-                        },
-                        "indexTenor" : {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 50000000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD",
                           "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                          }
                         }
                       }
-                    }
-                  },
-                  "quantity" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-CMS-Reuters"
+                        },
+                        "indexTenor" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                            "globalKey" : "aa"
+                          }
                         }
                       },
-                      "value" : 50000000.00
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "76de639b"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "20288845"
                   },
+                  "meta" : {
+                    "globalKey" : "c6f45906"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.02232,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "value" : 0.02232,
                       "perUnitOf" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 50000000.00,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
-                      },
-                      "value" : 50000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "e4e8805b"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "3f25399a",
+                  "externalReference" : "party2"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "de0165a2",
+                  "externalReference" : "party1"
+                }
               } ]
             },
-            "tradeDate" : {
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300RE0FSXJE8G1L65",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "5c7a105b"
+                }
+              } ],
+              "name" : {
+                "value" : "SEF Corp"
+              },
               "meta" : {
-                "globalKey" : "3ef04f"
+                "globalKey" : "8f9d39d1",
+                "externalKey" : "sef"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "HWUPKR0MPOU8FGXBT394",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "10150c05"
+                }
+              } ],
+              "name" : {
+                "value" : "Megaclient"
               },
-              "value" : "2014-01-15"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+              "meta" : {
+                "globalKey" : "de0165a2",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300Q4B2OQW6FDBA48",
                   "meta" : {
-                    "scheme" : "http://www.sefco.com/swaps/trade-id"
-                  },
-                  "value" : "1"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "f236a5be"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "sef",
-                "globalReference" : "39ced991"
+              "name" : {
+                "value" : "EBY"
+              },
+              "meta" : {
+                "globalKey" : "3f25399a",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "969500A1DO2476C1ZL52",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "56f52642"
+                }
+              } ],
+              "name" : {
+                "value" : "FCM B"
               },
               "meta" : {
-                "globalKey" : "27445"
+                "globalKey" : "723ea514",
+                "externalKey" : "clearingbroker"
               }
-            } ]
+            } ],
+            "executionDetails" : {
+              "packageReference" : {
+                "listId" : {
+                  "issuer" : {
+                    "value" : "SEF123"
+                  },
+                  "assignedIdentifier" : [ {
+                    "identifier" : {
+                      "value" : "123",
+                      "meta" : {
+                        "scheme" : "http://www.sefco.com/packages/package-id"
+                      }
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "df4b43f4"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "df4b43f4"
+                }
+              },
+              "meta" : {
+                "globalKey" : "df4b43f4"
+              }
+            },
+            "meta" : {
+              "globalKey" : "335c1c65"
+            }
+          },
+          "meta" : {
+            "globalKey" : "335c1c65"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "123453212",
+      "meta" : {
+        "scheme" : "http://www.sefco.com/message-id"
+      }
+    },
+    "sentBy" : {
+      "value" : "SEF"
+    }
   },
   "timestamp" : [ {
     "dateTime" : "2014-01-15T09:57:00Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "123453212"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "90b09f73"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "4d9817ea"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/pkg-ex55-execution-notification.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/pkg-ex55-execution-notification.json
index 3793aeb51d..011dfa29b6 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/pkg-ex55-execution-notification.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/pkg-ex55-execution-notification.json
@@ -1,244 +1,244 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "123453212"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "90b09f73"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.sefco.com/message-id"
-      },
-      "value" : "123453212"
-    },
-    "sentBy" : {
-      "value" : "SEF"
-    },
-    "sentTo" : [ {
-      "value" : "IM"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "351bb3ff"
-  },
   "proposedEvent" : {
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "52a8c1b6"
-          },
           "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "party1",
-                "globalReference" : "de2b9c62"
-              },
-              "accountNumber" : {
-                "value" : "1111"
-              },
-              "meta" : {
-                "externalKey" : "party1acct",
-                "globalKey" : "706c17ac"
-              },
-              "servicingParty" : {
-                "externalReference" : "fcm1",
-                "globalReference" : "35091d13"
-              }
-            }, {
-              "accountBeneficiary" : {
-                "externalReference" : "party2",
-                "globalReference" : "a9caa31a"
-              },
-              "accountNumber" : {
-                "value" : "2222"
-              },
-              "meta" : {
-                "externalKey" : "party2acct",
-                "globalKey" : "723d976e"
-              },
-              "servicingParty" : {
-                "externalReference" : "fcm2",
-                "globalReference" : "d8abd746"
-              }
-            } ],
-            "meta" : {
-              "globalKey" : "52a8c1b6"
-            },
             "party" : [ {
-              "meta" : {
-                "externalKey" : "sef",
-                "globalKey" : "39ced991"
-              },
-              "name" : {
-                "value" : "SEF Corp"
-              },
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300RE0FSXJE8G1L65",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300RE0FSXJE8G1L65"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "5c7a105b"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "dealer",
-                "globalKey" : "f159c80d"
-              },
+              } ],
               "name" : {
-                "value" : "Dealer, N.A."
+                "value" : "SEF Corp"
               },
+              "meta" : {
+                "globalKey" : "8f9d39d1",
+                "externalKey" : "sef"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "FB0QLOLRQ9EUQ13C5P60",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "FB0QLOLRQ9EUQ13C5P60"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "e9311473"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "im",
-                "globalKey" : "adcf5898"
-              },
+              } ],
               "name" : {
-                "value" : "InvestmentManager, Inc."
+                "value" : "Dealer, N.A."
               },
+              "meta" : {
+                "globalKey" : "1eb4544d",
+                "externalKey" : "dealer"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "969500EBDH6VO20UN688",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "969500EBDH6VO20UN688"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "f028163a"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "de2b9c62"
-              },
+              } ],
               "name" : {
-                "value" : "Megaclient"
+                "value" : "InvestmentManager, Inc."
               },
+              "meta" : {
+                "globalKey" : "1f6e9118",
+                "externalKey" : "im"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "HWUPKR0MPOU8FGXBT394",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "HWUPKR0MPOU8FGXBT394"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "10150c05"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "a9caa31a"
-              },
+              } ],
               "name" : {
-                "value" : "EBY"
+                "value" : "Megaclient"
               },
+              "meta" : {
+                "globalKey" : "de0165a2",
+                "externalKey" : "party1"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300Q4B2OQW6FDBA48",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300Q4B2OQW6FDBA48"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "f236a5be"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "b9cd191"
-              },
+              } ],
               "name" : {
-                "value" : "Broker Corp."
+                "value" : "EBY"
               },
+              "meta" : {
+                "globalKey" : "3f25399a",
+                "externalKey" : "party2"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "BROKER1",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                  },
-                  "value" : "BROKER1"
+                  }
                 },
                 "identifierType" : "BIC",
                 "meta" : {
                   "globalKey" : "37894954"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "fcm1",
-                "globalKey" : "35091d13"
-              },
+              } ],
               "name" : {
-                "value" : "FCM A"
+                "value" : "Broker Corp."
               },
+              "meta" : {
+                "globalKey" : "6d4f7311",
+                "externalKey" : "broker1"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "969500A1DO2476C1ZL52",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "969500A1DO2476C1ZL52"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "56f52642"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "fcm2",
-                "globalKey" : "d8abd746"
-              },
+              } ],
               "name" : {
-                "value" : "FCM B"
+                "value" : "FCM A"
               },
+              "meta" : {
+                "globalKey" : "723ea513",
+                "externalKey" : "fcm1"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "969500X8N10IIFS92509",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "969500X8N10IIFS92509"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "fa89c8f4"
                 }
-              } ]
-            } ]
+              } ],
+              "name" : {
+                "value" : "FCM B"
+              },
+              "meta" : {
+                "globalKey" : "83356346",
+                "externalKey" : "fcm2"
+              }
+            } ],
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "1111"
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "de0165a2",
+                "externalReference" : "party1"
+              },
+              "servicingParty" : {
+                "globalReference" : "723ea513",
+                "externalReference" : "fcm1"
+              },
+              "meta" : {
+                "globalKey" : "9f8dae6c",
+                "externalKey" : "party1acct"
+              }
+            }, {
+              "accountNumber" : {
+                "value" : "2222"
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "3f25399a",
+                "externalReference" : "party2"
+              },
+              "servicingParty" : {
+                "globalReference" : "83356346",
+                "externalReference" : "fcm2"
+              },
+              "meta" : {
+                "globalKey" : "3e180a6e",
+                "externalKey" : "party2acct"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "c3ca2ab6"
+            }
+          },
+          "meta" : {
+            "globalKey" : "c3ca2ab6"
           }
         }
       }
     } ]
   },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "123453212",
+      "meta" : {
+        "scheme" : "http://www.sefco.com/message-id"
+      }
+    },
+    "sentBy" : {
+      "value" : "SEF"
+    },
+    "sentTo" : [ {
+      "value" : "IM"
+    } ]
+  },
   "timestamp" : [ {
     "dateTime" : "2014-01-15T09:57:00Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "123453212"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "90b09f73"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "38207b"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/pkg-ex60-request-clearing.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/pkg-ex60-request-clearing.json
index 63e9b187dd..17cc9f5da6 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/pkg-ex60-request-clearing.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/pkg-ex60-request-clearing.json
@@ -1,172 +1,172 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "123453212"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "90b09f73"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.sefco.com/message-id"
-      },
-      "value" : "123453212"
-    },
-    "sentBy" : {
-      "value" : "SEF"
-    },
-    "sentTo" : [ {
-      "value" : "CCP"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "3e04e5e3"
-  },
   "proposedEvent" : {
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "f430199e"
-          },
           "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "party1",
-                "globalReference" : "de2b9c62"
-              },
-              "accountNumber" : {
-                "value" : "1111"
-              },
-              "meta" : {
-                "externalKey" : "party1acct",
-                "globalKey" : "5f4bb8d"
-              },
-              "partyReference" : {
-                "externalReference" : "fcm1",
-                "globalReference" : "35091d13"
-              },
-              "servicingParty" : {
-                "externalReference" : "fcm1",
-                "globalReference" : "35091d13"
-              }
-            } ],
-            "meta" : {
-              "globalKey" : "f430199e"
-            },
             "party" : [ {
-              "meta" : {
-                "externalKey" : "sef",
-                "globalKey" : "39ced991"
-              },
-              "name" : {
-                "value" : "SEF Corp"
-              },
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300RE0FSXJE8G1L65",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300RE0FSXJE8G1L65"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "5c7a105b"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "dealer",
-                "globalKey" : "f159c80d"
-              },
+              } ],
               "name" : {
-                "value" : "Dealer, N.A."
+                "value" : "SEF Corp"
               },
+              "meta" : {
+                "globalKey" : "8f9d39d1",
+                "externalKey" : "sef"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "FB0QLOLRQ9EUQ13C5P60",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "FB0QLOLRQ9EUQ13C5P60"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "e9311473"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "dco",
-                "globalKey" : "b022bef8"
-              },
+              } ],
               "name" : {
-                "value" : "ClearCo, N.A."
+                "value" : "Dealer, N.A."
               },
+              "meta" : {
+                "globalKey" : "1eb4544d",
+                "externalKey" : "dealer"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "CCP123",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-                  },
-                  "value" : "CCP123"
+                  }
                 },
                 "identifierType" : "BIC",
                 "meta" : {
                   "globalKey" : "79ee2e1e"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "de2b9c62"
-              },
+              } ],
               "name" : {
-                "value" : "Megaclient"
+                "value" : "ClearCo, N.A."
               },
+              "meta" : {
+                "globalKey" : "239e2c78",
+                "externalKey" : "dco"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "HWUPKR0MPOU8FGXBT394",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "HWUPKR0MPOU8FGXBT394"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "10150c05"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "fcm1",
-                "globalKey" : "35091d13"
-              },
+              } ],
               "name" : {
-                "value" : "FCM A"
+                "value" : "Megaclient"
               },
+              "meta" : {
+                "globalKey" : "de0165a2",
+                "externalKey" : "party1"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "969500A1DO2476C1ZL52",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "969500A1DO2476C1ZL52"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "56f52642"
                 }
-              } ]
-            } ]
+              } ],
+              "name" : {
+                "value" : "FCM A"
+              },
+              "meta" : {
+                "globalKey" : "723ea513",
+                "externalKey" : "fcm1"
+              }
+            } ],
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "723ea513",
+                "externalReference" : "fcm1"
+              },
+              "accountNumber" : {
+                "value" : "1111"
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "de0165a2",
+                "externalReference" : "party1"
+              },
+              "servicingParty" : {
+                "globalReference" : "723ea513",
+                "externalReference" : "fcm1"
+              },
+              "meta" : {
+                "globalKey" : "a639208d",
+                "externalKey" : "party1acct"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "b9661962"
+            }
+          },
+          "meta" : {
+            "globalKey" : "b9661962"
           }
         }
       }
     } ]
   },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "123453212",
+      "meta" : {
+        "scheme" : "http://www.sefco.com/message-id"
+      }
+    },
+    "sentBy" : {
+      "value" : "SEF"
+    },
+    "sentTo" : [ {
+      "value" : "CCP"
+    } ]
+  },
   "timestamp" : [ {
     "dateTime" : "2014-01-15T09:57:00Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "123453212"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "90b09f73"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "ac0699db"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/pkg-ex61-clearing-confirmed.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/pkg-ex61-clearing-confirmed.json
index 85458fa510..b45ee5df9a 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/pkg-ex61-clearing-confirmed.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/pkg-ex61-clearing-confirmed.json
@@ -1,184 +1,34 @@
 {
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "123453212"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "90b09f73"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.ccp123.com/message-id"
-      },
-      "value" : "123453212"
-    },
-    "sentBy" : {
-      "value" : "CCP123"
-    },
-    "sentTo" : [ {
-      "value" : "FCM1"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "407183db"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "773e2db"
-          },
           "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "party1",
-                "globalReference" : "de2b9c62"
-              },
-              "accountNumber" : {
-                "value" : "1111"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "8f9d39d1",
+                "externalReference" : "sef"
               },
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "1",
+                  "meta" : {
+                    "scheme" : "http://www.sefco.com/swaps/trade-id"
+                  }
+                }
+              } ],
               "meta" : {
-                "externalKey" : "party1acct",
-                "globalKey" : "5f4bb8d"
-              },
-              "partyReference" : {
-                "externalReference" : "fcm1",
-                "globalReference" : "35091d13"
-              },
-              "servicingParty" : {
-                "externalReference" : "fcm1",
-                "globalReference" : "35091d13"
+                "globalKey" : "c9faf35d"
               }
             } ],
-            "executionDetails" : {
+            "tradeDate" : {
+              "value" : "2014-01-15",
               "meta" : {
-                "globalKey" : "94591b30"
-              },
-              "packageReference" : {
-                "listId" : {
-                  "assignedIdentifier" : [ {
-                    "identifier" : {
-                      "meta" : {
-                        "scheme" : "http://sefco.com/package_id"
-                      },
-                      "value" : "123"
-                    }
-                  } ],
-                  "issuer" : {
-                    "value" : "SEF123"
-                  },
-                  "meta" : {
-                    "globalKey" : "94591b30"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "94591b30"
-                }
+                "globalKey" : "3ef04f"
               }
             },
-            "meta" : {
-              "globalKey" : "773e2db"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "sef",
-                "globalKey" : "39ced991"
-              },
-              "name" : {
-                "value" : "SEF Corp"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300RE0FSXJE8G1L65"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "5c7a105b"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "dealer",
-                "globalKey" : "f159c80d"
-              },
-              "name" : {
-                "value" : "Dealer, N.A."
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "FB0QLOLRQ9EUQ13C5P60"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e9311473"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "de2b9c62"
-              },
-              "name" : {
-                "value" : "Megaclient"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "HWUPKR0MPOU8FGXBT394"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "10150c05"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "fcm1",
-                "globalKey" : "35091d13"
-              },
-              "name" : {
-                "value" : "FCM A"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "969500A1DO2476C1ZL52"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "56f52642"
-                }
-              } ]
-            } ],
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "dealer",
-                  "globalReference" : "f159c80d"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "fcm1",
-                  "globalReference" : "35091d13"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -189,46 +39,40 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters1",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "774d8b35"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "ad888f06"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c2f"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "17"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2014-01-17",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -237,103 +81,108 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec68c749"
-                              },
-                              "unadjustedDate" : "2014-01-17"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec68c749"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates1",
-                            "globalKey" : "4585373d"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2024-01-17",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "primaryBusinessCenters1",
-                                    "globalKey" : "27e4e9"
+                                    "globalKey" : "27e4e9",
+                                    "externalKey" : "primaryBusinessCenters1"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "3662e8ba"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "45e43309"
-                              },
-                              "unadjustedDate" : "2024-01-17"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "45e43309"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
-                        "meta" : {
-                          "globalKey" : "72f18401"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "de68326a"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters1",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters1"
                               },
                               "meta" : {
                                 "globalKey" : "774d8b35"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "ad888f06"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "956"
+                              "globalKey" : "17f5b"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                            "rollConvention" : "17"
+                          },
+                          "meta" : {
+                            "globalKey" : "c0b0d64f",
+                            "externalKey" : "floatingCalcPeriodDates1"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters1"
+                              },
+                              "meta" : {
+                                "globalKey" : "774d8b35"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "ad888f06"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "678cc676"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates1",
-                            "globalReference" : "4585373d"
+                            "globalReference" : "c0b0d64f",
+                            "externalReference" : "floatingCalcPeriodDates1"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "fa6da954"
+                              "globalKey" : "ff9b708"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -344,82 +193,79 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "resetDates1",
-                              "globalReference" : "336116df"
+                              "globalReference" : "3fd2c49f",
+                              "externalReference" : "resetDates1"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "resetDates1",
-                            "globalKey" : "336116df"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters1",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters1"
                               },
                               "meta" : {
                                 "globalKey" : "774d8b35"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "ad888f06"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
-                        }
-                      }, {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "meta" : {
+                            "globalKey" : "3fd2c49f",
+                            "externalKey" : "resetDates1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "eda318ab"
+                        }
+                      }, {
+                        "payerReceiver" : {
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters1",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "774d8b35"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "ad888f06"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c8c"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "17"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30E/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2014-01-17",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -428,241 +274,395 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec68c749"
-                              },
-                              "unadjustedDate" : "2014-01-17"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec68c749"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates1",
-                            "globalKey" : "8864444c"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2019-01-17",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "primaryBusinessCenters1",
-                                    "globalReference" : "27e4e9"
+                                    "globalReference" : "27e4e9",
+                                    "externalReference" : "primaryBusinessCenters1"
                                   },
                                   "meta" : {
                                     "globalKey" : "774d8b35"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "ad888f06"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "7b310155"
-                              },
-                              "unadjustedDate" : "2019-01-17"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "7b310155"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "30E/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "a701c451"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "de68326d"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters1",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters1"
                               },
                               "meta" : {
                                 "globalKey" : "774d8b35"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "ad888f06"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "959"
+                              "globalKey" : "18a9e"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 6
+                            "rollConvention" : "17"
+                          },
+                          "meta" : {
+                            "globalKey" : "5fb968c6",
+                            "externalKey" : "fixedCalcPeriodDates1"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters1"
+                              },
+                              "meta" : {
+                                "globalKey" : "774d8b35"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "ad888f06"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "63f7839"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "798842a9"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "7f0fb712"
+                        "globalKey" : "f0825594"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "7f0fb712"
+                    "globalKey" : "f0825594"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "7f0fb712"
+                  "globalKey" : "f0825594"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "6c1aedb2"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "d24945b1"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-CMS-Reuters"
-                        },
-                        "indexTenor" : {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 25000000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD",
                           "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                          }
                         }
                       }
-                    }
-                  },
-                  "quantity" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-CMS-Reuters"
+                        },
+                        "indexTenor" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                            "globalKey" : "aa"
+                          }
                         }
                       },
-                      "value" : 25000000.00
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "76de639b"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "26e9a59d"
                   },
+                  "meta" : {
+                    "globalKey" : "2752a85e"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.02232,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "value" : 0.02232,
                       "perUnitOf" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 25000000.00,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
-                      },
-                      "value" : 25000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "b64b0e03"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "1eb4544d",
+                  "externalReference" : "dealer"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "723ea513",
+                  "externalReference" : "fcm1"
+                }
               } ]
             },
-            "tradeDate" : {
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300RE0FSXJE8G1L65",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "5c7a105b"
+                }
+              } ],
+              "name" : {
+                "value" : "SEF Corp"
+              },
               "meta" : {
-                "globalKey" : "3ef04f"
+                "globalKey" : "8f9d39d1",
+                "externalKey" : "sef"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "FB0QLOLRQ9EUQ13C5P60",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e9311473"
+                }
+              } ],
+              "name" : {
+                "value" : "Dealer, N.A."
               },
-              "value" : "2014-01-15"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+              "meta" : {
+                "globalKey" : "1eb4544d",
+                "externalKey" : "dealer"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "HWUPKR0MPOU8FGXBT394",
                   "meta" : {
-                    "scheme" : "http://www.sefco.com/swaps/trade-id"
-                  },
-                  "value" : "1"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "10150c05"
                 }
               } ],
-              "issuerReference" : {
-                "externalReference" : "sef",
-                "globalReference" : "39ced991"
+              "name" : {
+                "value" : "Megaclient"
+              },
+              "meta" : {
+                "globalKey" : "de0165a2",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "969500A1DO2476C1ZL52",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "56f52642"
+                }
+              } ],
+              "name" : {
+                "value" : "FCM A"
+              },
+              "meta" : {
+                "globalKey" : "723ea513",
+                "externalKey" : "fcm1"
+              }
+            } ],
+            "executionDetails" : {
+              "packageReference" : {
+                "listId" : {
+                  "issuer" : {
+                    "value" : "SEF123"
+                  },
+                  "assignedIdentifier" : [ {
+                    "identifier" : {
+                      "value" : "123",
+                      "meta" : {
+                        "scheme" : "http://sefco.com/package_id"
+                      }
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "df4b43f4"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "df4b43f4"
+                }
+              },
+              "meta" : {
+                "globalKey" : "df4b43f4"
+              }
+            },
+            "account" : [ {
+              "partyReference" : {
+                "globalReference" : "723ea513",
+                "externalReference" : "fcm1"
+              },
+              "accountNumber" : {
+                "value" : "1111"
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "de0165a2",
+                "externalReference" : "party1"
+              },
+              "servicingParty" : {
+                "globalReference" : "723ea513",
+                "externalReference" : "fcm1"
               },
               "meta" : {
-                "globalKey" : "27445"
+                "globalKey" : "a639208d",
+                "externalKey" : "party1acct"
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "9121a1cd"
+            }
+          },
+          "meta" : {
+            "globalKey" : "9121a1cd"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "123453212",
+      "meta" : {
+        "scheme" : "http://www.ccp123.com/message-id"
+      }
+    },
+    "sentBy" : {
+      "value" : "CCP123"
+    },
+    "sentTo" : [ {
+      "value" : "FCM1"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2014-01-15T09:57:00Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "123453212"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "90b09f73"
+    }
+  } ],
+  "meta" : {
+    "globalKey" : "9c8eafab"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/bond-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/bond-option.json
index 8f81d11978..377a402c43 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/bond-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/bond-option.json
@@ -1,65 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "c8ac0249"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "cc4aa816"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Trade234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/coding-scheme/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "5c8ba844"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-05-10",
+      "meta" : {
+        "globalKey" : "3eb14a",
+        "externalKey" : "TRADEDATE"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -67,39 +32,33 @@
             "productQualifier" : "InterestRate_Option_DebtOption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "a9049674"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "35f85f44"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "JPY"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
+                      "unadjustedDate" : "2006-06-22",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "JPTO"
@@ -108,48 +67,32 @@
                             "globalKey" : "22da41"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211ff630"
                         }
-                      },
-                      "unadjustedDate" : "2006-06-22"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "a15ed25a"
                     }
                   },
-                  "settlementType" : "PHYSICAL"
+                  "meta" : {
+                    "globalKey" : "35f85f44"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "limitedRightToConfirm" : false,
-                    "manualExercise" : {
-                      "exerciseNotice" : {
-                        "businessCenter" : {
-                          "value" : "JPTO"
-                        },
-                        "exerciseNoticeGiver" : "BUYER"
-                      }
-                    },
-                    "splitTicket" : false
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "JPTO"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-06-19",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "JPTO"
@@ -158,56 +101,66 @@
                                 "globalKey" : "22da41"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "211ff630"
                             }
                           },
                           "meta" : {
                             "globalKey" : "9c40487d"
-                          },
-                          "unadjustedDate" : "2006-06-19"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "9c40487d"
                         }
                       } ],
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "JPTO"
+                        }
+                      },
                       "expirationTime" : {
+                        "hourMinuteTime" : "14:30:00",
                         "businessCenter" : {
                           "value" : "JPTO"
-                        },
-                        "hourMinuteTime" : "14:30:00"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "4e21c36f"
+                        "globalKey" : "d363f4ef"
                       }
                     }
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 99.7,
                       "unit" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "value" : 99.7,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "exerciseNotice" : {
+                        "exerciseNoticeGiver" : "Buyer",
+                        "businessCenter" : {
+                          "value" : "JPTO"
+                        }
+                      }
+                    },
+                    "followUpConfirmation" : true,
+                    "limitedRightToConfirm" : false,
+                    "splitTicket" : false
                   }
                 },
-                "meta" : {
-                  "globalKey" : "a9049674"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "1ff493"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -215,140 +168,183 @@
                         "value" : "productIdentifier-1"
                       }
                     } ],
-                    "securityType" : "DEBT"
+                    "securityType" : "Debt"
+                  },
+                  "meta" : {
+                    "globalKey" : "1ff493"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "9eb735d8"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "9eb735d8"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "6f89384a"
+            "globalKey" : "1a0d08c2"
           }
         },
         "meta" : {
-          "globalKey" : "6f89384a"
+          "globalKey" : "1a0d08c2"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "bfb5991c"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "c772c8fb"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "CUSIP"
-                  },
-                  "value" : "ExampleCUSIP1"
-                },
-                "meta" : {
-                  "globalKey" : "c772c8fb"
-                },
-                "source" : "CUSIP"
-              }
-            } ]
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 10000000000,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
-              },
-              "value" : 10000000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 1,
               "unit" : {
-                "financialUnit" : "CONTRACT"
+                "financialUnit" : "Contract"
               },
-              "value" : 1,
               "multiplier" : {
+                "value" : 10000000000,
                 "unit" : {
                   "currency" : {
                     "value" : "JPY"
                   }
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "ExampleCUSIP1",
+                  "meta" : {
+                    "scheme" : "CUSIP"
+                  }
                 },
-                "value" : 10000000000
+                "source" : "CUSIP",
+                "meta" : {
+                  "globalKey" : "c772c8fb"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "26e65665"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "7aeade46"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "Party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TRADEDATE",
-        "globalKey" : "3eb14a"
-      },
-      "value" : "2006-05-10"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "Party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/coding-scheme/trade-id"
-          },
-          "value" : "Trade234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "7215e0ba"
+        "globalKey" : "33f59568",
+        "externalKey" : "Party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "e0f2aca0"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "d0bfa09f"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59568"
-        }
-      },
       "quantity" : {
+        "value" : 25000000,
         "unit" : {
           "currency" : {
             "value" : "JPY"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
         },
-        "value" : 25000000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "Party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2006-05-15",
         "dateAdjustments" : {
+          "businessDayConvention" : "FOLLOWING",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "JPTO"
@@ -357,16 +353,20 @@
               "globalKey" : "22da41"
             }
           },
-          "businessDayConvention" : "FOLLOWING",
           "meta" : {
             "globalKey" : "211ff630"
           }
-        },
-        "unadjustedDate" : "2006-05-15"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "211d2771"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "98629ed1"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/cb-option-2.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/cb-option-2.json
index ab42cf73da..0deb3b11ea 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/cb-option-2.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/cb-option-2.json
@@ -1,65 +1,29 @@
 {
-  "meta" : {
-    "globalKey" : "14e5f0ca"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "14e5f0ca"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "PartyA",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "PartyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Bond1",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "PartyB",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "10ca1193"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2004-12-24",
+      "meta" : {
+        "globalKey" : "3ea318"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "PartyA",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "PartyB",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "PartyA",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -67,45 +31,38 @@
             "productQualifier" : "InterestRate_Option_DebtOption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "ffc3f85f"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "a4f95ea9"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "JPY"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 8,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "6446a93f"
+                          "globalKey" : "bfe34747"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 8,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -116,42 +73,33 @@
                             "globalKey" : "42a8663"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "EXERCISE",
-                          "globalReference" : "709ae601"
+                          "globalReference" : "2da32bc1",
+                          "externalReference" : "EXERCISE"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "6446a93f"
+                      "globalKey" : "bfe34747"
                     }
                   },
-                  "settlementType" : "PHYSICAL"
+                  "meta" : {
+                    "globalKey" : "95fcb1"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "limitedRightToConfirm" : false,
-                    "manualExercise" : {
-                      "exerciseNotice" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "exerciseNoticeGiver" : "SELLER"
-                      }
-                    },
-                    "splitTicket" : true
-                  },
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2004-12-29",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -162,29 +110,23 @@
                                 "globalKey" : "42a8663"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da506292"
                             }
                           },
                           "meta" : {
                             "globalKey" : "dc6674d5"
-                          },
-                          "unadjustedDate" : "2004-12-29"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "dc6674d5"
                         }
                       },
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2009-06-01",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -195,34 +137,38 @@
                                 "globalKey" : "42a8663"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da506292"
                             }
                           },
                           "meta" : {
                             "globalKey" : "dd0515f1"
-                          },
-                          "unadjustedDate" : "2009-06-01"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "dd0515f1"
                         }
                       },
-                      "expirationTime" : {
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "16:00:00"
+                        }
                       },
-                      "meta" : {
-                        "externalKey" : "EXERCISE",
-                        "globalKey" : "709ae601"
+                      "expirationTime" : {
+                        "hourMinuteTime" : "16:00:00",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
                       },
                       "multipleExercise" : {
                         "integralMultipleAmount" : 1,
                         "minimumNumberOfOptions" : 20,
                         "maximumNumberOfOptions" : 200
+                      },
+                      "meta" : {
+                        "globalKey" : "2da32bc1",
+                        "externalKey" : "EXERCISE"
                       }
                     }
                   },
@@ -231,25 +177,31 @@
                       "swapUnwindValue" : {
                         "floatingRateIndex" : "JPY-LIBOR-BBA",
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
+                          "periodMultiplier" : 6,
                           "period" : "M",
-                          "periodMultiplier" : 6
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         },
                         "spread" : 27
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "exerciseNotice" : {
+                        "exerciseNoticeGiver" : "Seller",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      }
+                    },
+                    "followUpConfirmation" : true,
+                    "limitedRightToConfirm" : false,
+                    "splitTicket" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "ffc3f85f"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "1ff493"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -257,97 +209,145 @@
                         "value" : "productIdentifier-1"
                       }
                     } ],
-                    "securityType" : "DEBT"
+                    "securityType" : "Debt"
+                  },
+                  "meta" : {
+                    "globalKey" : "1ff493"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "691e3ccb"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "691e3ccb"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "168b5335"
+            "globalKey" : "e6ce1ef5"
           }
         },
         "meta" : {
-          "globalKey" : "168b5335"
+          "globalKey" : "e6ce1ef5"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "35e03288"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "847bd748"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "ISIN"
-                  },
-                  "value" : "ExampleISIN2"
-                },
-                "meta" : {
-                  "globalKey" : "847bd748"
-                },
-                "source" : "ISIN"
-              }
-            } ]
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 200,
               "unit" : {
-                "financialUnit" : "CONTRACT"
+                "financialUnit" : "Contract"
               },
-              "value" : 200,
               "multiplier" : {
+                "value" : 10000000,
                 "unit" : {
                   "currency" : {
                     "value" : "JPY"
                   }
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "ExampleISIN2",
+                  "meta" : {
+                    "scheme" : "ISIN"
+                  }
                 },
-                "value" : 10000000
+                "source" : "ISIN",
+                "meta" : {
+                  "globalKey" : "847bd748"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "aff11b8"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "76b52888"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "PartyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "PartyA"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "PartyA"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3ea318"
-      },
-      "value" : "2004-12-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "PartyA"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/eqd-trade-id"
-          },
-          "value" : "Bond1"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "PartyA",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "f511a869"
+        "globalKey" : "33f59568",
+        "externalKey" : "PartyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "d6cb94d0"
+    }
+  },
+  "meta" : {
+    "globalKey" : "d6cb94d0"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/cb-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/cb-option.json
index f0458bf8da..2f58c1318a 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/cb-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/cb-option.json
@@ -1,65 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "a5e553e7"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "a5e553e7"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Trade234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/coding-scheme/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "5c8ba844"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-01-16",
+      "meta" : {
+        "globalKey" : "3eb050",
+        "externalKey" : "TRADEDATE"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -67,45 +32,38 @@
             "productQualifier" : "InterestRate_Option_DebtOption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "ebaee01c"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "ac1ca336"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "CHF"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 8,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "57e6d19e"
+                          "globalKey" : "b3836fa6"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 8,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -116,42 +74,33 @@
                             "globalKey" : "4273a82"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "EXERCISE",
-                          "globalReference" : "2d9f6860"
+                          "globalReference" : "2aac48a0",
+                          "externalReference" : "EXERCISE"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "57e6d19e"
+                      "globalKey" : "b3836fa6"
                     }
                   },
-                  "settlementType" : "PHYSICAL"
+                  "meta" : {
+                    "globalKey" : "7b9413e"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "limitedRightToConfirm" : false,
-                    "manualExercise" : {
-                      "exerciseNotice" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "exerciseNoticeGiver" : "SELLER"
-                      }
-                    },
-                    "splitTicket" : true
-                  },
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-01-19",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -162,29 +111,23 @@
                                 "globalKey" : "4273a82"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da4d16b1"
                             }
                           },
                           "meta" : {
                             "globalKey" : "3529f2fe"
-                          },
-                          "unadjustedDate" : "2006-01-19"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "3529f2fe"
                         }
                       },
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2010-08-05",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -195,69 +138,79 @@
                                 "globalKey" : "4273a82"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da4d16b1"
                             }
                           },
                           "meta" : {
                             "globalKey" : "7683e50c"
-                          },
-                          "unadjustedDate" : "2010-08-05"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "7683e50c"
                         }
                       },
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      },
                       "expirationTime" : {
+                        "hourMinuteTime" : "16:00:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "16:00:00"
+                        }
                       },
                       "meta" : {
-                        "externalKey" : "EXERCISE",
-                        "globalKey" : "2d9f6860"
+                        "globalKey" : "2aac48a0",
+                        "externalKey" : "EXERCISE"
                       }
                     }
                   },
                   "strike" : {
                     "referenceSwapCurve" : {
-                      "makeWholeAmount" : {
+                      "swapUnwindValue" : {
                         "floatingRateIndex" : "EUR-LIBOR-BBA",
-                        "side" : "BID",
-                        "spread" : 85,
-                        "earlyCallDate" : {
+                        "indexTenor" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "3eb1d3"
-                          },
-                          "value" : "2006-07-19"
+                            "globalKey" : "107"
+                          }
                         },
-                        "interpolationMethod" : "LINEAR_ZERO_YIELD"
+                        "spread" : 85,
+                        "side" : "Bid"
                       },
-                      "swapUnwindValue" : {
+                      "makeWholeAmount" : {
                         "floatingRateIndex" : "EUR-LIBOR-BBA",
-                        "indexTenor" : {
+                        "spread" : 85,
+                        "side" : "Bid",
+                        "interpolationMethod" : "LinearZeroYield",
+                        "earlyCallDate" : {
+                          "value" : "2006-07-19",
                           "meta" : {
-                            "globalKey" : "959"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6
-                        },
-                        "side" : "BID",
-                        "spread" : 85
+                            "globalKey" : "3eb1d3"
+                          }
+                        }
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "exerciseNotice" : {
+                        "exerciseNoticeGiver" : "Seller",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      }
+                    },
+                    "followUpConfirmation" : true,
+                    "limitedRightToConfirm" : false,
+                    "splitTicket" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "ebaee01c"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "1ff493"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -265,98 +218,145 @@
                         "value" : "productIdentifier-1"
                       }
                     } ],
-                    "securityType" : "DEBT"
+                    "securityType" : "Debt"
+                  },
+                  "meta" : {
+                    "globalKey" : "1ff493"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "1b788866"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "1b788866"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "6e0add72"
+            "globalKey" : "6bc3efd0"
           }
         },
         "meta" : {
-          "globalKey" : "6e0add72"
+          "globalKey" : "6bc3efd0"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "1baa5fa7"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "847bd747"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "ISIN"
-                  },
-                  "value" : "ExampleISIN1"
-                },
-                "meta" : {
-                  "globalKey" : "847bd747"
-                },
-                "source" : "ISIN"
-              }
-            } ]
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 1,
               "unit" : {
-                "financialUnit" : "CONTRACT"
+                "financialUnit" : "Contract"
               },
-              "value" : 1,
               "multiplier" : {
+                "value" : 1100000,
                 "unit" : {
                   "currency" : {
                     "value" : "CHF"
                   }
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "ExampleISIN1",
+                  "meta" : {
+                    "scheme" : "ISIN"
+                  }
                 },
-                "value" : 1100000
+                "source" : "ISIN",
+                "meta" : {
+                  "globalKey" : "847bd747"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "aff1199"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "d5ed9ce7"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "Party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TRADEDATE",
-        "globalKey" : "3eb050"
-      },
-      "value" : "2006-01-16"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "Party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/coding-scheme/trade-id"
-          },
-          "value" : "Trade234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "7215e0ba"
+        "globalKey" : "33f59568",
+        "externalKey" : "Party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "d1beb7e9"
+    }
+  },
+  "meta" : {
+    "globalKey" : "d1beb7e9"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex10-physical-oil-pipeline-crude-wti-floating-price.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex10-physical-oil-pipeline-crude-wti-floating-price.json
index c50b5a6435..f63343e5ff 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex10-physical-oil-pipeline-crude-wti-floating-price.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex10-physical-oil-pipeline-crude-wti-floating-price.json
@@ -1,138 +1,101 @@
 {
-  "meta" : {
-    "globalKey" : "d4e0c05"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "a977e59e"
         }
       } ],
       "meta" : {
-        "globalKey" : "fb7fd677"
+        "globalKey" : "9598cc47"
       }
-    },
-    "meta" : {
-      "globalKey" : "d4e0c05"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.PartyB.com/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-01-28",
+      "meta" : {
+        "globalKey" : "3ec85c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-06-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25fdf5ec"
-                },
-                "unadjustedDate" : "2009-06-01"
+                }
               },
               "meta" : {
                 "globalKey" : "25fdf5ec"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-06-30",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "25fe62c9"
+                }
+              },
+              "meta" : {
+                "globalKey" : "25fe62c9"
+              }
+            },
             "payout" : {
               "commodityPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "f7f45f67"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "pricingDates" : {
                   "parametricDates" : {
-                    "dayDistribution" : "ALL",
-                    "dayType" : "BUSINESS"
+                    "dayType" : "Business",
+                    "dayDistribution" : "All"
                   }
                 },
                 "underlier" : {
@@ -145,114 +108,151 @@
                   "meta" : {
                     "globalKey" : "0"
                   }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "f7f45f67"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
-                  "meta" : {
-                    "globalKey" : "3a4b88ab"
-                  }
                 },
                 "meta" : {
-                  "globalKey" : "25fe62c9"
-                },
-                "unadjustedDate" : "2009-06-30"
-              },
+                  "globalKey" : "17ade845"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "25fe62c9"
+                "globalKey" : "17ade845"
               }
             }
           },
           "meta" : {
-            "globalKey" : "d4ee1656"
+            "globalKey" : "775cc1e2"
           }
         },
         "meta" : {
-          "globalKey" : "d4ee1656"
+          "globalKey" : "775cc1e2"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a6ae2716"
-          },
           "observable" : {
             "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-1"
-                } ]
-              },
               "value" : {
                 "productIdentifier" : [ {
                   "value" : {
                     "identifier" : {
+                      "value" : "OIL-WTI-NYMEX",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/spec/2008/commodity-reference-price-1-0"
-                      },
-                      "value" : "OIL-WTI-NYMEX"
+                      }
                     },
+                    "source" : "ISDACRP",
                     "meta" : {
                       "globalKey" : "465ddc73"
-                    },
-                    "source" : "ISDACRP"
+                    }
                   }
                 } ],
-                "priceQuoteType" : "SETTLEMENT"
+                "priceQuoteType" : "Settlement"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-1"
+                } ]
               }
             },
             "meta" : {
-              "globalKey" : "a6ae2716"
+              "globalKey" : "2f16bbaa"
             }
+          },
+          "meta" : {
+            "globalKey" : "2f16bbaa"
           }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec85c"
-      },
-      "value" : "2009-01-28"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "a977e59e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fb7fd677"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "764303eb"
+    }
+  },
+  "meta" : {
+    "globalKey" : "764303eb"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex11-physical-oil-pipeline-heating-oil-fixed-price.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex11-physical-oil-pipeline-heating-oil-fixed-price.json
index 839af8c53a..a73e25fffd 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex11-physical-oil-pipeline-heating-oil-fixed-price.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex11-physical-oil-pipeline-heating-oil-fixed-price.json
@@ -1,126 +1,92 @@
 {
-  "meta" : {
-    "globalKey" : "dfaebb88"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "a977e59e"
         }
       } ],
       "meta" : {
-        "globalKey" : "fb7fd677"
+        "globalKey" : "9598cc47"
       }
-    },
-    "meta" : {
-      "globalKey" : "dfaebb88"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.PartyB.com/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-01-28",
+      "meta" : {
+        "globalKey" : "3ec85c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-08-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25ffd66c"
-                },
-                "unadjustedDate" : "2009-08-01"
+                }
               },
               "meta" : {
                 "globalKey" : "25ffd66c"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-08-31",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "2600470a"
+                }
+              },
+              "meta" : {
+                "globalKey" : "2600470a"
+              }
+            },
             "payout" : {
               "commodityPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "meta" : {
                   "globalKey" : "7610bbd9"
@@ -128,8 +94,8 @@
               } ],
               "fixedPricePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "fixedPrice" : {
                   "price" : {
@@ -146,102 +112,136 @@
               "meta" : {
                 "globalKey" : "11b904e6"
               }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
-                  "meta" : {
-                    "globalKey" : "3a4b88ab"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "2600470a"
-                },
-                "unadjustedDate" : "2009-08-31"
-              },
-              "meta" : {
-                "globalKey" : "2600470a"
-              }
             }
           },
           "meta" : {
-            "globalKey" : "eb01e050"
+            "globalKey" : "cc45208"
           }
         },
         "meta" : {
-          "globalKey" : "eb01e050"
+          "globalKey" : "cc45208"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "8638118f"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 1.45,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 1.45,
-              "cashPrice" : {
-                "cashPriceType" : "FEE"
-              },
               "perUnitOf" : {
                 "capacityUnit" : "USGAL"
               },
-              "priceType" : "CASH_PRICE"
+              "priceType" : "CashPrice",
+              "cashPrice" : {
+                "cashPriceType" : "Fee"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "5114f3d1"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec85c"
-      },
-      "value" : "2009-01-28"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "a977e59e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fb7fd677"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "5851e01c"
+    }
+  },
+  "meta" : {
+    "globalKey" : "5851e01c"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex12-physical-gas-europe-zbt-fixed-price.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex12-physical-gas-europe-zbt-fixed-price.json
index b118e21fc6..4cf259142c 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex12-physical-gas-europe-zbt-fixed-price.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex12-physical-gas-europe-zbt-fixed-price.json
@@ -1,126 +1,92 @@
 {
-  "meta" : {
-    "globalKey" : "cd13ceee"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "a977e59e"
         }
       } ],
       "meta" : {
-        "globalKey" : "fb7fd677"
+        "globalKey" : "9598cc47"
       }
-    },
-    "meta" : {
-      "globalKey" : "cd13ceee"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.PartyB.com/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-01-28",
+      "meta" : {
+        "globalKey" : "3ec85c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-03-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25fb252c"
-                },
-                "unadjustedDate" : "2009-03-01"
+                }
               },
               "meta" : {
                 "globalKey" : "25fb252c"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-03-31",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "25fb95ca"
+                }
+              },
+              "meta" : {
+                "globalKey" : "25fb95ca"
+              }
+            },
             "payout" : {
               "commodityPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "76108015"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "76108015"
+                  }
                 },
                 "meta" : {
                   "globalKey" : "76108015"
@@ -128,8 +94,8 @@
               } ],
               "fixedPricePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "fixedPrice" : {
                   "price" : {
@@ -146,102 +112,136 @@
               "meta" : {
                 "globalKey" : "1556862a"
               }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
-                  "meta" : {
-                    "globalKey" : "3a4b88ab"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "25fb95ca"
-                },
-                "unadjustedDate" : "2009-03-31"
-              },
-              "meta" : {
-                "globalKey" : "25fb95ca"
-              }
             }
           },
           "meta" : {
-            "globalKey" : "21b7a70c"
+            "globalKey" : "a62b9b4c"
           }
         },
         "meta" : {
-          "globalKey" : "21b7a70c"
+          "globalKey" : "a62b9b4c"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "abfd4039"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 5.0,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 5.0,
-              "cashPrice" : {
-                "cashPriceType" : "FEE"
-              },
               "perUnitOf" : {
                 "capacityUnit" : "GJ"
               },
-              "priceType" : "CASH_PRICE"
+              "priceType" : "CashPrice",
+              "cashPrice" : {
+                "cashPriceType" : "Fee"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "5c75ca27"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec85c"
-      },
-      "value" : "2009-01-28"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "a977e59e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fb7fd677"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "66363142"
+    }
+  },
+  "meta" : {
+    "globalKey" : "66363142"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex13-physical-gas-us-tw-west-texas-pool-floating-price-4-days.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex13-physical-gas-us-tw-west-texas-pool-floating-price-4-days.json
index 75151ea3c1..d829053fb6 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex13-physical-gas-us-tw-west-texas-pool-floating-price-4-days.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex13-physical-gas-us-tw-west-texas-pool-floating-price-4-days.json
@@ -1,130 +1,96 @@
 {
-  "meta" : {
-    "globalKey" : "f5714ecd"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "a977e59e"
         }
       } ],
       "meta" : {
-        "globalKey" : "fb7fd677"
+        "globalKey" : "9598cc47"
       }
-    },
-    "meta" : {
-      "globalKey" : "f5714ecd"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.PartyB.com/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-01-28",
+      "meta" : {
+        "globalKey" : "3ec85c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-04-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25fc156c"
-                },
-                "unadjustedDate" : "2009-04-01"
+                }
               },
               "meta" : {
                 "globalKey" : "25fc156c"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-04-04",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "25fc20af"
+                }
+              },
+              "meta" : {
+                "globalKey" : "25fc20af"
+              }
+            },
             "payout" : {
               "commodityPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "commodityPriceReturnTerms" : {
                   "spread" : {
@@ -136,12 +102,9 @@
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "111bf979"
-                },
                 "pricingDates" : {
                   "parametricDates" : {
-                    "dayDistribution" : "ALL"
+                    "dayDistribution" : "All"
                   }
                 },
                 "underlier" : {
@@ -154,132 +117,169 @@
                   "meta" : {
                     "globalKey" : "0"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "111bf979"
                 }
               } ],
               "meta" : {
                 "globalKey" : "111bf979"
               }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
-                  "meta" : {
-                    "globalKey" : "3a4b88ab"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "25fc20af"
-                },
-                "unadjustedDate" : "2009-04-04"
-              },
-              "meta" : {
-                "globalKey" : "25fc20af"
-              }
             }
           },
           "meta" : {
-            "globalKey" : "6f955242"
+            "globalKey" : "4eb9ac56"
           }
         },
         "meta" : {
-          "globalKey" : "6f955242"
+          "globalKey" : "4eb9ac56"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "58a13636"
-          },
+          "price" : [ {
+            "value" : {
+              "value" : 15.0,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              },
+              "priceType" : "AssetPrice",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
           "observable" : {
             "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-1"
-                } ]
-              },
               "value" : {
                 "productIdentifier" : [ {
                   "value" : {
                     "identifier" : {
+                      "value" : "NATURAL GAS-NYMEX",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/spec/2008/commodity-reference-price-1-0"
-                      },
-                      "value" : "NATURAL GAS-NYMEX"
+                      }
                     },
+                    "source" : "ISDACRP",
                     "meta" : {
                       "globalKey" : "d80ddb64"
-                    },
-                    "source" : "ISDACRP"
+                    }
                   }
                 } ],
-                "priceQuoteType" : "SETTLEMENT"
+                "priceQuoteType" : "Settlement"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-1"
+                } ]
               }
             },
             "meta" : {
-              "globalKey" : "4afe0645"
+              "globalKey" : "14c2c25b"
             }
           },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 15.0,
-              "arithmeticOperator" : "ADD",
-              "priceType" : "ASSET_PRICE"
-            }
-          } ]
+          "meta" : {
+            "globalKey" : "f9491b2"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec85c"
-      },
-      "value" : "2009-01-28"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "a977e59e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fb7fd677"
+      }
+    },
+    "meta" : {
+      "globalKey" : "a5b081b"
+    }
+  },
+  "meta" : {
+    "globalKey" : "a5b081b"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex14-physical-gas-europe-ttf-fixed-price.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex14-physical-gas-europe-ttf-fixed-price.json
index cb9ec775b0..7a82cd3a37 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex14-physical-gas-europe-ttf-fixed-price.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex14-physical-gas-europe-ttf-fixed-price.json
@@ -1,114 +1,92 @@
 {
-  "meta" : {
-    "globalKey" : "4e1f4188"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "EFET_GAS"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "21983017"
         }
       } ],
       "meta" : {
-        "globalKey" : "21983017"
+        "globalKey" : "9598cc47"
       }
-    },
-    "meta" : {
-      "globalKey" : "4e1f4188"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.PartyB.com/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-01-28",
+      "meta" : {
+        "globalKey" : "3ec85c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-06-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25fdf5ec"
-                },
-                "unadjustedDate" : "2009-06-01"
+                }
               },
               "meta" : {
                 "globalKey" : "25fdf5ec"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-07-01",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "25fee62c"
+                }
+              },
+              "meta" : {
+                "globalKey" : "25fee62c"
+              }
+            },
             "payout" : {
               "commodityPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "76108015"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "76108015"
+                  }
                 },
                 "meta" : {
                   "globalKey" : "76108015"
@@ -116,8 +94,8 @@
               } ],
               "fixedPricePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "fixedPrice" : {
                   "price" : {
@@ -134,102 +112,124 @@
               "meta" : {
                 "globalKey" : "1556862a"
               }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
-                  "meta" : {
-                    "globalKey" : "3a4b88ab"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "25fee62c"
-                },
-                "unadjustedDate" : "2009-07-01"
-              },
-              "meta" : {
-                "globalKey" : "25fee62c"
-              }
             }
           },
           "meta" : {
-            "globalKey" : "6184482e"
+            "globalKey" : "4bc0ea6a"
           }
         },
         "meta" : {
-          "globalKey" : "6184482e"
+          "globalKey" : "4bc0ea6a"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "58fd41d1"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 1.2,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 1.2,
-              "cashPrice" : {
-                "cashPriceType" : "FEE"
-              },
               "perUnitOf" : {
                 "capacityUnit" : "USTHM"
               },
-              "priceType" : "CASH_PRICE"
+              "priceType" : "CashPrice",
+              "cashPrice" : {
+                "cashPriceType" : "Fee"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "ed81e18f"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec85c"
-      },
-      "value" : "2009-01-28"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "EFETGas"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "21983017"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "21983017"
+      }
+    },
+    "meta" : {
+      "globalKey" : "bf39eadc"
+    }
+  },
+  "meta" : {
+    "globalKey" : "bf39eadc"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex15-physical-oil-pipeline-crude-wcs-fixed-price.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex15-physical-oil-pipeline-crude-wcs-fixed-price.json
index ac8aaad9e2..3957e3d7af 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex15-physical-oil-pipeline-crude-wcs-fixed-price.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex15-physical-oil-pipeline-crude-wcs-fixed-price.json
@@ -1,96 +1,92 @@
 {
-  "meta" : {
-    "globalKey" : "cdc33c77"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "cdc33c77"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
+            "scheme" : "http://www.PartyA.com/com-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+        "globalKey" : "9598cc47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.PartyB.com/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-01-28",
+      "meta" : {
+        "globalKey" : "3ec85c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-11-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "2602a72c"
-                },
-                "unadjustedDate" : "2009-11-01"
+                }
               },
               "meta" : {
                 "globalKey" : "2602a72c"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-11-30",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "26031409"
+                }
+              },
+              "meta" : {
+                "globalKey" : "26031409"
+              }
+            },
             "payout" : {
               "commodityPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "meta" : {
                   "globalKey" : "7610bbd9"
@@ -98,140 +94,144 @@
               } ],
               "fixedPricePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
-                },
-                "fixedPrice" : {
-                  "price" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    }
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "bd4818a5"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "888e6686"
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 20,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "24053e8e"
+                    },
+                    "dayType" : "Calendar"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                   "paymentDatesAdjustments" : {
                     "businessDayConvention" : "NEAREST",
                     "meta" : {
                       "globalKey" : "979ebc3e"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "2405ecee"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 20,
-                    "dayType" : "CALENDAR"
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "187f256c"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
                   "meta" : {
-                    "globalKey" : "3a4b88ab"
+                    "globalKey" : "3e8c9ba6"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "26031409"
+                "fixedPrice" : {
+                  "price" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2009-11-30"
-              },
+                "meta" : {
+                  "globalKey" : "c7c08b39"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "26031409"
+                "globalKey" : "22f79800"
               }
             }
           },
           "meta" : {
-            "globalKey" : "5b095549"
+            "globalKey" : "840f7083"
           }
         },
         "meta" : {
-          "globalKey" : "5b095549"
+          "globalKey" : "840f7083"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "fb0d8fae"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 41.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 41.0,
-              "cashPrice" : {
-                "cashPriceType" : "FEE"
-              },
               "perUnitOf" : {
                 "capacityUnit" : "USGAL"
               },
-              "priceType" : "CASH_PRICE"
+              "priceType" : "CashPrice",
+              "cashPrice" : {
+                "cashPriceType" : "Fee"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "76ef3992"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec85c"
-      },
-      "value" : "2009-01-28"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "49590937"
+    }
+  },
+  "meta" : {
+    "globalKey" : "49590937"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex16-physical-power-us-eei-floating-price.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex16-physical-power-us-eei-floating-price.json
index 31c4f8be71..a05d6c55c5 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex16-physical-power-us-eei-floating-price.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex16-physical-power-us-eei-floating-price.json
@@ -1,113 +1,95 @@
 {
-  "meta" : {
-    "globalKey" : "9b9d713"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "9b9d713"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
+            "scheme" : "http://www.PartyA.com/com-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+        "globalKey" : "9598cc47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.PartyB.com/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-01-28",
+      "meta" : {
+        "globalKey" : "3ec85c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-08-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25ffd66c"
-                },
-                "unadjustedDate" : "2009-08-01"
+                }
               },
               "meta" : {
                 "globalKey" : "25ffd66c"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-08-31",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "2600470a"
+                }
+              },
+              "meta" : {
+                "globalKey" : "2600470a"
+              }
+            },
             "payout" : {
               "commodityPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "externalKey" : "floatingLegCalculationPeriods",
-                      "globalKey" : "12601"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1,
-                    "balanceOfFirstPeriod" : false
-                  },
                   "meta" : {
-                    "globalKey" : "12601"
+                    "globalKey" : "7610bbd9"
                   }
                 },
                 "commodityPriceReturnTerms" : {
@@ -120,11 +102,10 @@
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "8f311667"
-                },
                 "pricingDates" : {
                   "parametricDates" : {
+                    "dayType" : "Business",
+                    "dayDistribution" : "All",
                     "businessCenters" : {
                       "commodityBusinessCalendar" : [ {
                         "value" : "ICE/10X-DAILY"
@@ -132,9 +113,21 @@
                       "meta" : {
                         "globalKey" : "802f9b7f"
                       }
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "11e9",
+                      "externalKey" : "floatingLegCalculationPeriods"
                     },
-                    "dayDistribution" : "ALL",
-                    "dayType" : "BUSINESS"
+                    "balanceOfFirstPeriod" : false
+                  },
+                  "meta" : {
+                    "globalKey" : "11e9"
                   }
                 },
                 "underlier" : {
@@ -147,132 +140,139 @@
                   "meta" : {
                     "globalKey" : "0"
                   }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "8f311667"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
-                  "meta" : {
-                    "globalKey" : "3a4b88ab"
-                  }
                 },
                 "meta" : {
-                  "globalKey" : "2600470a"
-                },
-                "unadjustedDate" : "2009-08-31"
-              },
+                  "globalKey" : "a1745d3b"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "2600470a"
+                "globalKey" : "a1745d3b"
               }
             }
           },
           "meta" : {
-            "globalKey" : "36806a17"
+            "globalKey" : "e562f759"
           }
         },
         "meta" : {
-          "globalKey" : "36806a17"
+          "globalKey" : "e562f759"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "f2b9520a"
-          },
+          "price" : [ {
+            "value" : {
+              "value" : 3.0,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              },
+              "priceType" : "AssetPrice",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
           "observable" : {
             "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-1"
-                } ]
-              },
               "value" : {
                 "productIdentifier" : [ {
                   "value" : {
                     "identifier" : {
+                      "value" : "ELECTRICITY-ERCOT-NORTH PEAK-ICE/10X DAILY-POWER",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/commodity-reference-price-1-0"
-                      },
-                      "value" : "ELECTRICITY-ERCOT-NORTH PEAK-ICE/10X DAILY-POWER"
+                      }
                     },
+                    "source" : "ISDACRP",
                     "meta" : {
                       "globalKey" : "a27254fb"
-                    },
-                    "source" : "ISDACRP"
+                    }
                   }
                 } ],
-                "priceQuoteType" : "MEAN_OF_HIGH_AND_LOW"
+                "priceQuoteType" : "MeanOfHighAndLow"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-1"
+                } ]
               }
             },
             "meta" : {
-              "globalKey" : "8f2e3262"
+              "globalKey" : "569819de"
             }
           },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 3.0,
-              "arithmeticOperator" : "ADD",
-              "priceType" : "ASSET_PRICE"
-            }
-          } ]
+          "meta" : {
+            "globalKey" : "1029e544"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec85c"
-      },
-      "value" : "2009-01-28"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "2a2719ed"
+    }
+  },
+  "meta" : {
+    "globalKey" : "2a2719ed"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex17-physical-power-uk-gtma-fixed-price.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex17-physical-power-uk-gtma-fixed-price.json
index 7c6de66b24..80d6f65cf9 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex17-physical-power-uk-gtma-fixed-price.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex17-physical-power-uk-gtma-fixed-price.json
@@ -1,96 +1,92 @@
 {
-  "meta" : {
-    "globalKey" : "dcdcf3e9"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "dcdcf3e9"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
+            "scheme" : "http://www.PartyA.com/com-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+        "globalKey" : "9598cc47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.PartyB.com/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-01-28",
+      "meta" : {
+        "globalKey" : "3ec85c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-06-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25fdf5ec"
-                },
-                "unadjustedDate" : "2009-06-01"
+                }
               },
               "meta" : {
                 "globalKey" : "25fdf5ec"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-06-30",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "25fe62c9"
+                }
+              },
+              "meta" : {
+                "globalKey" : "25fe62c9"
+              }
+            },
             "payout" : {
               "commodityPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "76108015"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "76108015"
+                  }
                 },
                 "meta" : {
                   "globalKey" : "76108015"
@@ -98,8 +94,8 @@
               } ],
               "fixedPricePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "meta" : {
                   "globalKey" : "71129f01"
@@ -108,72 +104,76 @@
               "meta" : {
                 "globalKey" : "6c0b0c96"
               }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
-                  "meta" : {
-                    "globalKey" : "3a4b88ab"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "25fe62c9"
-                },
-                "unadjustedDate" : "2009-06-30"
-              },
-              "meta" : {
-                "globalKey" : "25fe62c9"
-              }
             }
           },
           "meta" : {
-            "globalKey" : "f23b887"
+            "globalKey" : "2cb93cb3"
           }
         },
         "meta" : {
-          "globalKey" : "f23b887"
+          "globalKey" : "2cb93cb3"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec85c"
       },
-      "value" : "2009-01-28"
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "bb67bef3"
+    }
+  },
+  "meta" : {
+    "globalKey" : "bb67bef3"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex18-physical-power-us-eei-fixed-price-shaped-volume.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex18-physical-power-us-eei-fixed-price-shaped-volume.json
index 0f50dd59bc..25e58c92a8 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex18-physical-power-us-eei-fixed-price-shaped-volume.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex18-physical-power-us-eei-fixed-price-shaped-volume.json
@@ -1,96 +1,92 @@
 {
-  "meta" : {
-    "globalKey" : "8e048d66"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "8e048d66"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
+            "scheme" : "http://www.PartyA.com/com-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+        "globalKey" : "9598cc47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.PartyB.com/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-04-22",
+      "meta" : {
+        "globalKey" : "3e9116"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-05-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "252acdac"
-                },
-                "unadjustedDate" : "2002-05-01"
+                }
               },
               "meta" : {
                 "globalKey" : "252acdac"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-07-31",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "252d1eca"
+                }
+              },
+              "meta" : {
+                "globalKey" : "252d1eca"
+              }
+            },
             "payout" : {
               "commodityPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "meta" : {
                   "globalKey" : "7610bbd9"
@@ -98,8 +94,8 @@
               } ],
               "fixedPricePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "meta" : {
                   "globalKey" : "71129f01"
@@ -108,72 +104,76 @@
               "meta" : {
                 "globalKey" : "b63fc65a"
               }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
-                  "meta" : {
-                    "globalKey" : "3a4b88ab"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "252d1eca"
-                },
-                "unadjustedDate" : "2002-07-31"
-              },
-              "meta" : {
-                "globalKey" : "252d1eca"
-              }
             }
           },
           "meta" : {
-            "globalKey" : "f5afe584"
+            "globalKey" : "4ed71578"
           }
         },
         "meta" : {
-          "globalKey" : "f5afe584"
+          "globalKey" : "4ed71578"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9116"
       },
-      "value" : "2002-04-22"
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "ab3e85f8"
+    }
+  },
+  "meta" : {
+    "globalKey" : "ab3e85f8"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex19-physical-bullion-forward.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex19-physical-bullion-forward.json
index 6fbafd6cc0..42b906836a 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex19-physical-bullion-forward.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex19-physical-bullion-forward.json
@@ -1,122 +1,122 @@
 {
-  "meta" : {
-    "globalKey" : "77b82443"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "de7d171d",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
         }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2006"
-            }, {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9598cc47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "4a675f59",
+        "externalReference" : "partyB"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "2345",
+          "meta" : {
+            "scheme" : "http://www.PartyB.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "76841153"
         }
       } ],
       "meta" : {
-        "globalKey" : "66532fec"
+        "globalKey" : "9599b8e6"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2009-01-28",
+      "meta" : {
+        "globalKey" : "3ec85c"
       }
-    },
-    "meta" : {
-      "globalKey" : "77b82443"
     },
     "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "6146789d"
-      },
-      "name" : {
-        "value" : "Bank A"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
+          }
         },
         "identifierType" : "LEI",
         "meta" : {
           "globalKey" : "3f3e27a0"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "ea19ab19"
-      },
+      } ],
       "name" : {
-        "value" : "Bank B"
+        "value" : "Bank A"
       },
+      "meta" : {
+        "globalKey" : "de7d171d",
+        "externalKey" : "partyA"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
+          }
         },
         "identifierType" : "LEI",
         "meta" : {
           "globalKey" : "c803429b"
         }
-      } ]
-    } ],
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec85c"
-      },
-      "value" : "2009-01-28"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "1234"
-        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "6146789d"
+      "name" : {
+        "value" : "Bank B"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "4a675f59",
+        "externalKey" : "partyB"
       }
-    }, {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "2345"
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006"
+            }, {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "76841153"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "ea19ab19"
-      },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "66532fec"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "32abf3d7"
+    }
+  },
+  "meta" : {
+    "globalKey" : "32abf3d7"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex20-physical-coal-us-fixed-price.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex20-physical-coal-us-fixed-price.json
index e423941098..87f0dbede0 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex20-physical-coal-us-fixed-price.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex20-physical-coal-us-fixed-price.json
@@ -1,81 +1,77 @@
 {
-  "meta" : {
-    "globalKey" : "82b4a367"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "82b4a367"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
+            "scheme" : "http://www.PartyA.com/com-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+        "globalKey" : "9598cc47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.PartyB.com/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-01-28",
+      "meta" : {
+        "globalKey" : "3ec85c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2010-01-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "26174cac"
+                }
+              },
+              "meta" : {
+                "globalKey" : "26174cac"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2010-01-01",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
                 },
-                "unadjustedDate" : "2010-01-01"
+                "meta" : {
+                  "globalKey" : "26174cac"
+                }
               },
               "meta" : {
                 "globalKey" : "26174cac"
@@ -84,13 +80,13 @@
             "payout" : {
               "commodityPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "meta" : {
                   "globalKey" : "7610bbd9"
@@ -98,8 +94,8 @@
               } ],
               "fixedPricePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "fixedPrice" : {
                   "price" : {
@@ -116,102 +112,106 @@
               "meta" : {
                 "globalKey" : "11b904e6"
               }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
-                  "meta" : {
-                    "globalKey" : "3a4b88ab"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "26174cac"
-                },
-                "unadjustedDate" : "2010-01-01"
-              },
-              "meta" : {
-                "globalKey" : "26174cac"
-              }
             }
           },
           "meta" : {
-            "globalKey" : "53fbdc32"
+            "globalKey" : "a7d5c966"
           }
         },
         "meta" : {
-          "globalKey" : "53fbdc32"
+          "globalKey" : "a7d5c966"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "4706d475"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 45.37,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 45.37,
-              "cashPrice" : {
-                "cashPriceType" : "FEE"
-              },
               "perUnitOf" : {
                 "capacityUnit" : "MT"
               },
-              "priceType" : "CASH_PRICE"
+              "priceType" : "CashPrice",
+              "cashPrice" : {
+                "cashPriceType" : "Fee"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "22f7be6b"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec85c"
-      },
-      "value" : "2009-01-28"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "4fed49b3"
+    }
+  },
+  "meta" : {
+    "globalKey" : "4fed49b3"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex21-physical-power-us-eei-fixed-price-shaped-volume-and-price.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex21-physical-power-us-eei-fixed-price-shaped-volume-and-price.json
index 0f50dd59bc..25e58c92a8 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex21-physical-power-us-eei-fixed-price-shaped-volume-and-price.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex21-physical-power-us-eei-fixed-price-shaped-volume-and-price.json
@@ -1,96 +1,92 @@
 {
-  "meta" : {
-    "globalKey" : "8e048d66"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "8e048d66"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
+            "scheme" : "http://www.PartyA.com/com-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+        "globalKey" : "9598cc47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.PartyB.com/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-04-22",
+      "meta" : {
+        "globalKey" : "3e9116"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-05-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "252acdac"
-                },
-                "unadjustedDate" : "2002-05-01"
+                }
               },
               "meta" : {
                 "globalKey" : "252acdac"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-07-31",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "252d1eca"
+                }
+              },
+              "meta" : {
+                "globalKey" : "252d1eca"
+              }
+            },
             "payout" : {
               "commodityPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "meta" : {
                   "globalKey" : "7610bbd9"
@@ -98,8 +94,8 @@
               } ],
               "fixedPricePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "meta" : {
                   "globalKey" : "71129f01"
@@ -108,72 +104,76 @@
               "meta" : {
                 "globalKey" : "b63fc65a"
               }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
-                  "meta" : {
-                    "globalKey" : "3a4b88ab"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "252d1eca"
-                },
-                "unadjustedDate" : "2002-07-31"
-              },
-              "meta" : {
-                "globalKey" : "252d1eca"
-              }
             }
           },
           "meta" : {
-            "globalKey" : "f5afe584"
+            "globalKey" : "4ed71578"
           }
         },
         "meta" : {
-          "globalKey" : "f5afe584"
+          "globalKey" : "4ed71578"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9116"
       },
-      "value" : "2002-04-22"
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "ab3e85f8"
+    }
+  },
+  "meta" : {
+    "globalKey" : "ab3e85f8"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex22-physical-gas-option-multiple-expiration.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex22-physical-gas-option-multiple-expiration.json
index 632a398184..04d5d94081 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex22-physical-gas-option-multiple-expiration.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex22-physical-gas-option-multiple-expiration.json
@@ -1,88 +1,65 @@
 {
-  "meta" : {
-    "globalKey" : "b797451b"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "c5f10046"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
+            "scheme" : "http://www.PartyA.com/com-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+        "globalKey" : "9598cc47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.PartyB.com/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-04-22",
+      "meta" : {
+        "globalKey" : "3ec916"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "8b5ce9b"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "f3b1d0d7"
-                  },
-                  "settlementType" : "PHYSICAL"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
                   "exerciseProcedure" : {
                     "automaticExercise" : {
@@ -91,15 +68,12 @@
                     "followUpConfirmation" : false
                   }
                 },
-                "meta" : {
-                  "globalKey" : "8b5ce9b"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "contractualProduct" : {
                     "economicTerms" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2010-01-01",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -108,24 +82,41 @@
                           },
                           "meta" : {
                             "globalKey" : "ebf06b39"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "ebf06b39",
+                          "externalKey" : "physicalEffectiveDate"
+                        }
+                      },
+                      "terminationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2010-12-31",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
                           },
-                          "unadjustedDate" : "2010-01-01"
+                          "meta" : {
+                            "globalKey" : "ebfb2e97"
+                          }
                         },
                         "meta" : {
-                          "externalKey" : "physicalEffectiveDate",
-                          "globalKey" : "ebf06b39"
+                          "globalKey" : "ebfb2e97",
+                          "externalKey" : "physicalTerminationDate"
                         }
                       },
                       "payout" : {
                         "commodityPayout" : [ {
                           "settlementTerms" : {
-                            "meta" : {
-                              "globalKey" : "7610bbd9"
-                            },
+                            "settlementType" : "Cash",
                             "settlementCurrency" : {
                               "value" : "USD"
                             },
-                            "settlementType" : "CASH"
+                            "meta" : {
+                              "globalKey" : "7610bbd9"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "7610bbd9"
@@ -133,8 +124,8 @@
                         } ],
                         "fixedPricePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "fixedPrice" : {
                             "price" : {
@@ -151,141 +142,146 @@
                         "meta" : {
                           "globalKey" : "11b904e6"
                         }
-                      },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "ebfb2e97"
-                          },
-                          "unadjustedDate" : "2010-12-31"
-                        },
-                        "meta" : {
-                          "externalKey" : "physicalTerminationDate",
-                          "globalKey" : "ebfb2e97"
-                        }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "634c22aa"
+                      "globalKey" : "e1ea7b28"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "634c22aa"
+                    "globalKey" : "e1ea7b28"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "87542719"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "87542719"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "8b5ce9b"
+            "globalKey" : "87542719"
           }
         },
         "meta" : {
-          "globalKey" : "8b5ce9b"
+          "globalKey" : "87542719"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a7ba0eab"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 45.6,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 45.6,
-              "cashPrice" : {
-                "cashPriceType" : "FEE"
-              },
               "perUnitOf" : {
                 "capacityUnit" : "USMMBTU"
               },
-              "priceType" : "CASH_PRICE"
+              "priceType" : "CashPrice",
+              "cashPrice" : {
+                "cashPriceType" : "Fee"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "74122a75"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec916"
-      },
-      "value" : "2009-04-22"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "8e817630"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "e4573da1"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        }
-      },
       "quantity" : {
+        "value" : 36500.0,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
         },
-        "value" : 36500.0
+        "receiverPartyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2009-04-24",
         "dateAdjustments" : {
+          "businessDayConvention" : "FOLLOWING",
           "businessCenters" : {
             "businessCentersReference" : {
               "externalReference" : "bc1"
@@ -294,16 +290,20 @@
               "globalKey" : "17c10"
             }
           },
-          "businessDayConvention" : "FOLLOWING",
           "meta" : {
             "globalKey" : "20fe97ff"
           }
-        },
-        "unadjustedDate" : "2009-04-24"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "ba4d783b"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "d384c00b"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex23-physical-power-option-daily-expiration-efet.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex23-physical-power-option-daily-expiration-efet.json
index 75f6d748f7..d3c7128b02 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex23-physical-power-option-daily-expiration-efet.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex23-physical-power-option-daily-expiration-efet.json
@@ -1,95 +1,66 @@
 {
-  "meta" : {
-    "globalKey" : "e8832ab"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "803ea41"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "268151",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+        "globalKey" : "ede73b9e"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "268151",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ede7affd"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2008-11-12",
+      "meta" : {
+        "globalKey" : "3ec2cc"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "f8e0cfbf"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "f3b1d0d7"
-                  },
-                  "settlementType" : "PHYSICAL"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : false
-                    },
-                    "followUpConfirmation" : false
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationTime" : {
@@ -99,43 +70,63 @@
                         "globalKey" : "ced9ef1a"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : false
+                    },
+                    "followUpConfirmation" : false
                   }
                 },
-                "meta" : {
-                  "globalKey" : "f8e0cfbf"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "contractualProduct" : {
                     "economicTerms" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2010-01-01",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "26174cac"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "26174cac",
+                          "externalKey" : "forwardEffectiveDate"
+                        }
+                      },
+                      "terminationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2010-12-31",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NotApplicable",
+                            "meta" : {
+                              "globalKey" : "3a4b88ab"
+                            }
                           },
-                          "unadjustedDate" : "2010-01-01"
+                          "meta" : {
+                            "globalKey" : "2622100a"
+                          }
                         },
                         "meta" : {
-                          "externalKey" : "forwardEffectiveDate",
-                          "globalKey" : "26174cac"
+                          "globalKey" : "2622100a",
+                          "externalKey" : "forwardTerminationDate"
                         }
                       },
                       "payout" : {
                         "commodityPayout" : [ {
                           "settlementTerms" : {
-                            "meta" : {
-                              "globalKey" : "76108015"
-                            },
+                            "settlementType" : "Cash",
                             "settlementCurrency" : {
                               "value" : "EUR"
                             },
-                            "settlementType" : "CASH"
+                            "meta" : {
+                              "globalKey" : "76108015"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "76108015"
@@ -143,122 +134,127 @@
                         } ],
                         "fixedPricePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "meta" : {
-                            "externalKey" : "fixedLeg",
-                            "globalKey" : "71129f1f"
+                            "globalKey" : "71129f1f",
+                            "externalKey" : "fixedLeg"
                           }
                         } ],
                         "meta" : {
                           "globalKey" : "6c0b0cb4"
                         }
-                      },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "meta" : {
-                              "globalKey" : "3a4b88ab"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "2622100a"
-                          },
-                          "unadjustedDate" : "2010-12-31"
-                        },
-                        "meta" : {
-                          "externalKey" : "forwardTerminationDate",
-                          "globalKey" : "2622100a"
-                        }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "1b2f19aa"
+                      "globalKey" : "d0b05e12"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "1b2f19aa"
+                    "globalKey" : "d0b05e12"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "1fb7ec27"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "1fb7ec27"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "f8e0cfbf"
+            "globalKey" : "1fb7ec27"
           }
         },
         "meta" : {
-          "globalKey" : "f8e0cfbf"
+          "globalKey" : "1fb7ec27"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec2cc"
       },
-      "value" : "2008-11-12"
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "268151"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "99913774"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "268151"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "99913775"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "4d9c990b"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "82217a4c"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        }
-      },
       "quantity" : {
+        "value" : 280800.0,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
         },
-        "value" : 280800.0
+        "receiverPartyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2008-11-15",
         "dateAdjustments" : {
+          "businessDayConvention" : "MODFOLLOWING",
           "businessCenters" : {
             "businessCentersReference" : {
               "externalReference" : "bc1"
@@ -267,16 +263,20 @@
               "globalKey" : "17c10"
             }
           },
-          "businessDayConvention" : "MODFOLLOWING",
           "meta" : {
             "globalKey" : "363c7fe1"
           }
-        },
-        "unadjustedDate" : "2008-11-15"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "bd8feb26"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "fdbbf6fb"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex24-weather-index-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex24-weather-index-swap.json
index aa46dbf13e..b7707affba 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex24-weather-index-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex24-weather-index-swap.json
@@ -1,113 +1,92 @@
 {
-  "meta" : {
-    "globalKey" : "6074843"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "f41b0147",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "a977e59e"
         }
       } ],
       "meta" : {
-        "globalKey" : "fb7fd677"
+        "globalKey" : "9598cc47"
       }
-    },
-    "meta" : {
-      "globalKey" : "6074843"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "789ee147"
-      },
-      "name" : {
-        "value" : "ART Reinsurance LLC"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5299000NIGT14YW8ZD26"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "24297a9a"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "b84fae40"
-      },
-      "name" : {
-        "value" : "Mountain Ski Resorts Inc."
+      "issuerReference" : {
+        "globalReference" : "8e155a40",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "969500QCC36R89FI3U25"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "2770ccf0"
+            "scheme" : "http://www.PartyB.com/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2011-05-09",
+      "meta" : {
+        "globalKey" : "3ed949"
+      }
+    },
     "tradableProduct" : {
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2011-11-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "263eb72c"
-                },
-                "unadjustedDate" : "2011-11-01"
+                }
               },
               "meta" : {
                 "globalKey" : "263eb72c"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2012-04-30",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "26569a49"
+                }
+              },
+              "meta" : {
+                "globalKey" : "26569a49"
+              }
+            },
             "payout" : {
               "commodityPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "meta" : {
                   "globalKey" : "7610bbd9"
@@ -116,72 +95,93 @@
               "meta" : {
                 "globalKey" : "7610bbd9"
               }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
-                  "meta" : {
-                    "globalKey" : "3a4b88ab"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "26569a49"
-                },
-                "unadjustedDate" : "2012-04-30"
-              },
-              "meta" : {
-                "globalKey" : "26569a49"
-              }
             }
           },
           "meta" : {
-            "globalKey" : "fd8fb364"
+            "globalKey" : "ff410b6"
           }
         },
         "meta" : {
-          "globalKey" : "fd8fb364"
+          "globalKey" : "ff410b6"
         }
       }
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ed949"
-      },
-      "value" : "2011-05-09"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "5299000NIGT14YW8ZD26",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "24297a9a"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "789ee147"
+      "name" : {
+        "value" : "ART Reinsurance LLC"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "f41b0147",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "969500QCC36R89FI3U25",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "2770ccf0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "b84fae40"
+      "name" : {
+        "value" : "Mountain Ski Resorts Inc."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "8e155a40",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "a977e59e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fb7fd677"
+      }
+    },
+    "meta" : {
+      "globalKey" : "9038e23b"
+    }
+  },
+  "meta" : {
+    "globalKey" : "9038e23b"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex25-physical-bullion-forward-average-price.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex25-physical-bullion-forward-average-price.json
index 3cdb5d0a5b..bd3e691f40 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex25-physical-bullion-forward-average-price.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex25-physical-bullion-forward-average-price.json
@@ -1,121 +1,121 @@
 {
-  "meta" : {
-    "globalKey" : "f75c91d1"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "LBMA"
-            }
-          },
-          "vintage" : 1994
-        },
-        "meta" : {
-          "globalKey" : "9e4f2961"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "35df9397",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "TechCo1234",
+          "meta" : {
+            "scheme" : "http://www.techco.com/com-trade-id"
+          }
         }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1997_BULLION"
-            } ]
+      } ],
+      "meta" : {
+        "globalKey" : "5ebf0509"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "ba7adfee",
+        "externalReference" : "partyB"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "BankA5678",
+          "meta" : {
+            "scheme" : "http://www.banka.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "aee84709"
         }
       } ],
       "meta" : {
-        "globalKey" : "4630d248"
+        "globalKey" : "a0a9b88b"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2012-03-16",
+      "meta" : {
+        "globalKey" : "3ee0d0"
       }
-    },
-    "meta" : {
-      "globalKey" : "f75c91d1"
     },
     "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "4631cb97"
-      },
-      "name" : {
-        "value" : "Bank A"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "5299000NIGT14YW8ZD26",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5299000NIGT14YW8ZD26"
+          }
         },
         "identifierType" : "LEI",
         "meta" : {
           "globalKey" : "24297a9a"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "34ce4cee"
-      },
+      } ],
       "name" : {
-        "value" : "Bank B"
+        "value" : "Bank A"
       },
+      "meta" : {
+        "globalKey" : "35df9397",
+        "externalKey" : "partyA"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "549300UXZ1R1RBZVU469",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300UXZ1R1RBZVU469"
+          }
         },
         "identifierType" : "LEI",
         "meta" : {
           "globalKey" : "12b7e470"
         }
-      } ]
-    } ],
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee0d0"
-      },
-      "value" : "2012-03-16"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.techco.com/com-trade-id"
-          },
-          "value" : "TechCo1234"
-        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "4631cb97"
+      "name" : {
+        "value" : "Bank B"
       },
       "meta" : {
-        "globalKey" : "339c521f"
+        "globalKey" : "ba7adfee",
+        "externalKey" : "partyB"
       }
-    }, {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.banka.com/com-trade-id"
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "LBMA"
+            }
           },
-          "value" : "BankA5678"
+          "vintage" : 1994
+        },
+        "meta" : {
+          "globalKey" : "9e4f2961"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1997Bullion"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "aee84709"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "34ce4cee"
-      },
       "meta" : {
-        "globalKey" : "a3f35483"
+        "globalKey" : "4630d248"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "702165ef"
+    }
+  },
+  "meta" : {
+    "globalKey" : "702165ef"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex26-physical-metal-forward.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex26-physical-metal-forward.json
index c3c591dee6..1712d3dad9 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex26-physical-metal-forward.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex26-physical-metal-forward.json
@@ -1,121 +1,121 @@
 {
-  "meta" : {
-    "globalKey" : "e4a75c38"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "8038d83a",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.BankA.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
         }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2006"
-            }, {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9598cc47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "de0fe347",
+        "externalReference" : "partyB"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "2345",
+          "meta" : {
+            "scheme" : "http://www.BankB.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "76841153"
         }
       } ],
       "meta" : {
-        "globalKey" : "66532fec"
+        "globalKey" : "9599b8e6"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2013-03-05",
+      "meta" : {
+        "globalKey" : "3ee8c5",
+        "externalKey" : "TradeDate"
       }
-    },
-    "meta" : {
-      "globalKey" : "e4a75c38"
     },
     "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "1d9ca760"
-      },
-      "name" : {
-        "value" : "Bank A"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "BuyerPartyLEI",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "BuyerPartyLEI"
+          }
         },
         "meta" : {
           "globalKey" : "14418bfd"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "1f9379cb"
-      },
+      } ],
       "name" : {
-        "value" : "Bank B"
+        "value" : "Bank A"
       },
+      "meta" : {
+        "globalKey" : "8038d83a",
+        "externalKey" : "partyA"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "SellerPartyLEI",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "SellerPartyLEI"
+          }
         },
         "meta" : {
           "globalKey" : "1637ea09"
         }
-      } ]
-    } ],
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3ee8c5"
-      },
-      "value" : "2013-03-05"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.BankA.com/com-trade-id"
-          },
-          "value" : "1234"
-        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "1d9ca760"
+      "name" : {
+        "value" : "Bank B"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "de0fe347",
+        "externalKey" : "partyB"
       }
-    }, {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.BankB.com/com-trade-id"
-          },
-          "value" : "2345"
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006"
+            }, {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "76841153"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "1f9379cb"
-      },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "66532fec"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "1fb7c4a0"
+    }
+  },
+  "meta" : {
+    "globalKey" : "1fb7c4a0"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex29-physical-eu-emissions-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex29-physical-eu-emissions-option.json
index bc22d9f657..1842bcc0ca 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex29-physical-eu-emissions-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex29-physical-eu-emissions-option.json
@@ -1,101 +1,61 @@
 {
-  "meta" : {
-    "globalKey" : "2ce4af14"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "ec5c093b"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "9cf475a7"
-      },
-      "name" : {
-        "value" : "EnergyCoA"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "29c5a7",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123456",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5299000NIGT14YW8ZD26"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "24297a9a"
+            "scheme" : "http://www.PartyA.com/com-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "a049df7e"
-      },
-      "name" : {
-        "value" : "EnergyCoB"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "969500QCC36R89FI3U25"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "2770ccf0"
-        }
-      } ]
+        "globalKey" : "ebf7ca68"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2012-06-04",
+      "meta" : {
+        "globalKey" : "3ee184",
+        "externalKey" : "tradeDate"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "a049df7e"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "9cf475a7"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
-              "value" : "COMMODITY"
+              "value" : "Commodity"
             }
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "a84c396e"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "f3b1d0d7"
-                  },
-                  "settlementType" : "PHYSICAL"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2012-12-31",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -103,10 +63,9 @@
                             }
                           },
                           "meta" : {
-                            "externalKey" : "exerciseDate",
-                            "globalKey" : "ec373e97"
-                          },
-                          "unadjustedDate" : "2012-12-31"
+                            "globalKey" : "ec373e97",
+                            "externalKey" : "exerciseDate"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ec373e97"
@@ -119,17 +78,17 @@
                         "globalKey" : "f7a48c80"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "a84c396e"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "contractualProduct" : {
                     "economicTerms" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2012-12-31",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -138,23 +97,40 @@
                           },
                           "meta" : {
                             "globalKey" : "ec373e97"
-                          },
-                          "unadjustedDate" : "2012-12-31"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ec373e97"
                         }
                       },
+                      "terminationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2012-12-31",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ec373e97"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "ec373e97",
+                          "externalKey" : "physicalTerminationDate"
+                        }
+                      },
                       "payout" : {
                         "commodityPayout" : [ {
                           "settlementTerms" : {
-                            "meta" : {
-                              "globalKey" : "76108015"
-                            },
+                            "settlementType" : "Cash",
                             "settlementCurrency" : {
                               "value" : "EUR"
                             },
-                            "settlementType" : "CASH"
+                            "meta" : {
+                              "globalKey" : "76108015"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "76108015"
@@ -162,8 +138,8 @@
                         } ],
                         "fixedPricePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "fixedPrice" : {
                             "price" : {
@@ -180,138 +156,162 @@
                         "meta" : {
                           "globalKey" : "1556862a"
                         }
-                      },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "ec373e97"
-                          },
-                          "unadjustedDate" : "2012-12-31"
-                        },
-                        "meta" : {
-                          "externalKey" : "physicalTerminationDate",
-                          "globalKey" : "ec373e97"
-                        }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "3dd3344"
+                      "globalKey" : "16c243ca"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "3dd3344"
+                    "globalKey" : "16c243ca"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "962260b2"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "962260b2"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "4e43327b"
+            "globalKey" : "3c1959bf"
           }
         },
         "meta" : {
-          "globalKey" : "4e43327b"
+          "globalKey" : "3c1959bf"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3c10f6dd"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 7.38,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 7.38,
+              "priceType" : "CashPrice",
               "cashPrice" : {
-                "cashPriceType" : "FEE"
-              },
-              "priceType" : "CASH_PRICE"
+                "cashPriceType" : "Fee"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "460de4c3"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4ee5da7e",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "29c5a7",
+          "externalReference" : "partyA"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "tradeDate",
-        "globalKey" : "3ee184"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "5299000NIGT14YW8ZD26",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "24297a9a"
+        }
+      } ],
+      "name" : {
+        "value" : "EnergyCoA"
       },
-      "value" : "2012-06-04"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "29c5a7",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "969500QCC36R89FI3U25",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "123456"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "2770ccf0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "9cf475a7"
+      "name" : {
+        "value" : "EnergyCoB"
       },
       "meta" : {
-        "globalKey" : "55b93bbe"
+        "globalKey" : "4ee5da7e",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "cda8ef0f"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "d35f156f"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "a049df7e"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "9cf475a7"
-        }
-      },
       "quantity" : {
+        "value" : 1000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "4ee5da7e",
+          "externalReference" : "partyB"
         },
-        "value" : 1000
+        "receiverPartyReference" : {
+          "globalReference" : "29c5a7",
+          "externalReference" : "partyA"
+        }
       },
       "settlementDate" : {
         "relativeDate" : {
+          "periodMultiplier" : 3,
+          "period" : "D",
           "meta" : {
-            "globalKey" : "10a0c8c4"
+            "globalKey" : "d2a5d22"
           },
-          "period" : "D",
-          "periodMultiplier" : 3,
           "businessDayConvention" : "FOLLOWING",
           "dateRelativeTo" : {
-            "externalReference" : "tradeDate",
-            "globalReference" : "3ee184"
+            "globalReference" : "3ee184",
+            "externalReference" : "tradeDate"
           }
         }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "766eb25"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "8dcf4b76"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex30-physical-eu-emissions-forward.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex30-physical-eu-emissions-forward.json
index e6acaeb5d9..287a2ba9c6 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex30-physical-eu-emissions-forward.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex30-physical-eu-emissions-forward.json
@@ -1,76 +1,41 @@
 {
-  "meta" : {
-    "globalKey" : "cfc4a411"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "cfc4a411"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "9cf475a7"
-      },
-      "name" : {
-        "value" : "EnergyCoA"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "29c5a7",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123456",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5299000NIGT14YW8ZD26"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "24297a9a"
+            "scheme" : "http://www.PartyA.com/com-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "a049df7e"
-      },
-      "name" : {
-        "value" : "EnergyCoB"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "969500QCC36R89FI3U25"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "2770ccf0"
-        }
-      } ]
+        "globalKey" : "ebf7ca68"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2012-06-04",
+      "meta" : {
+        "globalKey" : "3ee184",
+        "externalKey" : "tradeDate"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "a049df7e"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "9cf475a7"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
-              "value" : "COMMODITY"
+              "value" : "Commodity"
             }
           } ],
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2012-12-31",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -79,23 +44,40 @@
                 },
                 "meta" : {
                   "globalKey" : "ec373e97"
-                },
-                "unadjustedDate" : "2012-12-31"
+                }
               },
               "meta" : {
                 "globalKey" : "ec373e97"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2012-12-31",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ec373e97"
+                }
+              },
+              "meta" : {
+                "globalKey" : "ec373e97",
+                "externalKey" : "physicalTerminationDate"
+              }
+            },
             "payout" : {
               "commodityPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "76108015"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "76108015"
+                  }
                 },
                 "meta" : {
                   "globalKey" : "76108015"
@@ -103,8 +85,8 @@
               } ],
               "fixedPricePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "fixedPrice" : {
                   "price" : {
@@ -121,85 +103,103 @@
               "meta" : {
                 "globalKey" : "1556862a"
               }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "ec373e97"
-                },
-                "unadjustedDate" : "2012-12-31"
-              },
-              "meta" : {
-                "externalKey" : "physicalTerminationDate",
-                "globalKey" : "ec373e97"
-              }
             }
           },
           "meta" : {
-            "globalKey" : "e93ee291"
+            "globalKey" : "fc23f317"
           }
         },
         "meta" : {
-          "globalKey" : "e93ee291"
+          "globalKey" : "fc23f317"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3c10f6dd"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 7.38,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 7.38,
+              "priceType" : "CashPrice",
               "cashPrice" : {
-                "cashPriceType" : "FEE"
-              },
-              "priceType" : "CASH_PRICE"
+                "cashPriceType" : "Fee"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "460de4c3"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4ee5da7e",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "29c5a7",
+          "externalReference" : "partyA"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "tradeDate",
-        "globalKey" : "3ee184"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "5299000NIGT14YW8ZD26",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "24297a9a"
+        }
+      } ],
+      "name" : {
+        "value" : "EnergyCoA"
       },
-      "value" : "2012-06-04"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "29c5a7",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "969500QCC36R89FI3U25",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "123456"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "2770ccf0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "9cf475a7"
+      "name" : {
+        "value" : "EnergyCoB"
       },
       "meta" : {
-        "globalKey" : "55b93bbe"
+        "globalKey" : "4ee5da7e",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "9b1d6467"
+    }
+  },
+  "meta" : {
+    "globalKey" : "9b1d6467"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex31-physical-us-emissions-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex31-physical-us-emissions-option.json
index 36bf2123ff..1b0a4e5e87 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex31-physical-us-emissions-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex31-physical-us-emissions-option.json
@@ -1,101 +1,61 @@
 {
-  "meta" : {
-    "globalKey" : "a414357c"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "c148fe9d"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "9d10a4a9"
-      },
-      "name" : {
-        "value" : "EnergyCoC"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "29c5a9",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123456",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5299000NIGT14YW8ZD26"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "24297a9a"
+            "scheme" : "http://www.PartyA.com/com-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "a0660e80"
-      },
-      "name" : {
-        "value" : "EnergyCoD"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "969500QCC36R89FI3U25"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "2770ccf0"
-        }
-      } ]
+        "globalKey" : "ebf7ca68"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2012-06-04",
+      "meta" : {
+        "globalKey" : "3ee184",
+        "externalKey" : "tradeDate"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "a0660e80"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "9d10a4a9"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
-              "value" : "COMMODITY"
+              "value" : "Commodity"
             }
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "68492755"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "f3b1d0d7"
-                  },
-                  "settlementType" : "PHYSICAL"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2012-12-31",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -103,10 +63,9 @@
                             }
                           },
                           "meta" : {
-                            "externalKey" : "exerciseDate",
-                            "globalKey" : "ec373e97"
-                          },
-                          "unadjustedDate" : "2012-12-31"
+                            "globalKey" : "ec373e97",
+                            "externalKey" : "exerciseDate"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ec373e97"
@@ -119,17 +78,17 @@
                         "globalKey" : "34c1ff67"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "68492755"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "contractualProduct" : {
                     "economicTerms" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2012-12-31",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -138,23 +97,40 @@
                           },
                           "meta" : {
                             "globalKey" : "ec373e97"
-                          },
-                          "unadjustedDate" : "2012-12-31"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ec373e97"
                         }
                       },
+                      "terminationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2012-12-31",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ec373e97"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "ec373e97",
+                          "externalKey" : "physicalTerminationDate"
+                        }
+                      },
                       "payout" : {
                         "commodityPayout" : [ {
                           "settlementTerms" : {
-                            "meta" : {
-                              "globalKey" : "76108015"
-                            },
+                            "settlementType" : "Cash",
                             "settlementCurrency" : {
                               "value" : "EUR"
                             },
-                            "settlementType" : "CASH"
+                            "meta" : {
+                              "globalKey" : "76108015"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "76108015"
@@ -162,8 +138,8 @@
                         } ],
                         "fixedPricePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "fixedPrice" : {
                             "price" : {
@@ -180,138 +156,162 @@
                         "meta" : {
                           "globalKey" : "1556862a"
                         }
-                      },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "ec373e97"
-                          },
-                          "unadjustedDate" : "2012-12-31"
-                        },
-                        "meta" : {
-                          "externalKey" : "physicalTerminationDate",
-                          "globalKey" : "ec373e97"
-                        }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "3dd3344"
+                      "globalKey" : "16c243ca"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "3dd3344"
+                    "globalKey" : "16c243ca"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "4a9b70d9"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "4a9b70d9"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "e402062"
+            "globalKey" : "f09269e6"
           }
         },
         "meta" : {
-          "globalKey" : "e402062"
+          "globalKey" : "f09269e6"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "44b32d4"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 1.93,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 1.93,
+              "priceType" : "CashPrice",
               "cashPrice" : {
-                "cashPriceType" : "FEE"
-              },
-              "priceType" : "CASH_PRICE"
+                "cashPriceType" : "Fee"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "851b27ac"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4ee5da80",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "29c5a9",
+          "externalReference" : "partyA"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "tradeDate",
-        "globalKey" : "3ee184"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "5299000NIGT14YW8ZD26",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "24297a9a"
+        }
+      } ],
+      "name" : {
+        "value" : "EnergyCoC"
       },
-      "value" : "2012-06-04"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "29c5a9",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "969500QCC36R89FI3U25",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "123456"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "2770ccf0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "9d10a4a9"
+      "name" : {
+        "value" : "EnergyCoD"
       },
       "meta" : {
-        "globalKey" : "55b93bbe"
+        "globalKey" : "4ee5da80",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "dca3ea23"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "192efff9"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "a0660e80"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "9d10a4a9"
-        }
-      },
       "quantity" : {
+        "value" : 1930.00,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "4ee5da80",
+          "externalReference" : "partyB"
         },
-        "value" : 1930.00
+        "receiverPartyReference" : {
+          "globalReference" : "29c5a9",
+          "externalReference" : "partyA"
+        }
       },
       "settlementDate" : {
         "relativeDate" : {
+          "periodMultiplier" : 2,
+          "period" : "D",
           "meta" : {
-            "globalKey" : "ba2fe36c"
+            "globalKey" : "b6abd4a8"
           },
-          "period" : "D",
-          "periodMultiplier" : 2,
           "businessDayConvention" : "NONE",
           "dateRelativeTo" : {
-            "externalReference" : "tradeDate",
-            "globalReference" : "3ee184"
+            "globalReference" : "3ee184",
+            "externalReference" : "tradeDate"
           }
         }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "41929c89"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "59ad7646"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex32-CPD-weather-index-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex32-CPD-weather-index-option.json
index 2161753ded..b56c7ff826 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex32-CPD-weather-index-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex32-CPD-weather-index-option.json
@@ -1,106 +1,56 @@
 {
-  "meta" : {
-    "globalKey" : "3c86e3ac"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "f41b0147",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "a977e59e"
         }
       } ],
       "meta" : {
-        "globalKey" : "fb7fd677"
+        "globalKey" : "9598cc47"
       }
-    },
-    "meta" : {
-      "globalKey" : "3fa96e4e"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "789ee147"
-      },
-      "name" : {
-        "value" : "ART Reinsurance LLC"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5299000NIGT14YW8ZD26"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "24297a9a"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "b84fae40"
-      },
-      "name" : {
-        "value" : "Mountain Ski Resorts Inc."
+      "issuerReference" : {
+        "globalReference" : "8e155a40",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "969500QCC36R89FI3U25"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "2770ccf0"
+            "scheme" : "http://www.PartyB.com/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2012-04-04",
+      "meta" : {
+        "globalKey" : "3ee104"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "b84fae40"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "789ee147"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
-              "value" : "COMMODITY"
+              "value" : "Commodity"
             }
           } ],
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2012-11-01",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -109,37 +59,32 @@
                 },
                 "meta" : {
                   "globalKey" : "ec35ddb9"
-                },
-                "unadjustedDate" : "2012-11-01"
+                }
               },
               "meta" : {
                 "globalKey" : "ec35ddb9"
               }
             },
             "payout" : {
-              "meta" : {
-                "globalKey" : "6dfa9e29"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "bb121f1f"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 5,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "51c08c98"
+                          "globalKey" : "c5ff16b6"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 5,
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -148,27 +93,30 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "dateRelativeTo" : {
                           "externalReference" : "weatherCalculationPeriods"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "51c08c98"
+                      "globalKey" : "c5ff16b6"
                     }
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "2f50a93d"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Put",
                 "exerciseTerms" : {
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2013-03-31",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -177,8 +125,7 @@
                           },
                           "meta" : {
                             "globalKey" : "ec4cd457"
-                          },
-                          "unadjustedDate" : "2013-03-31"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ec4cd457"
@@ -191,96 +138,149 @@
                   }
                 },
                 "meta" : {
-                  "globalKey" : "6dfa9e29"
-                },
-                "optionType" : "PUT"
-              } ]
+                  "globalKey" : "a14eb47"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "a14eb47"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "d99ecd2f"
+            "globalKey" : "75b91a4d"
           }
         },
         "meta" : {
-          "globalKey" : "d99ecd2f"
+          "globalKey" : "75b91a4d"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee104"
       },
-      "value" : "2012-04-04"
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "8e155a40",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "f41b0147",
+          "externalReference" : "partyA"
+        }
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "5299000NIGT14YW8ZD26",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "24297a9a"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "789ee147"
+      "name" : {
+        "value" : "ART Reinsurance LLC"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "f41b0147",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "969500QCC36R89FI3U25",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "2770ccf0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "b84fae40"
+      "name" : {
+        "value" : "Mountain Ski Resorts Inc."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "8e155a40",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "a977e59e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fb7fd677"
+      }
+    },
+    "meta" : {
+      "globalKey" : "155e0804"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "55332cde"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "b84fae40"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "789ee147"
-        }
-      },
       "quantity" : {
+        "value" : 5000.00,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "8e155a40",
+          "externalReference" : "partyB"
         },
-        "value" : 5000.00
+        "receiverPartyReference" : {
+          "globalReference" : "f41b0147",
+          "externalReference" : "partyA"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2012-11-04",
         "dateAdjustments" : {
           "businessDayConvention" : "MODFOLLOWING",
           "meta" : {
             "globalKey" : "fa42f5cf"
           }
-        },
-        "unadjustedDate" : "2012-11-04"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "1c8e5276"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "6023e17a"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex33-physical-bullion-forward-average-price.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex33-physical-bullion-forward-average-price.json
index 69ee04daf5..d233c66785 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex33-physical-bullion-forward-average-price.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex33-physical-bullion-forward-average-price.json
@@ -1,109 +1,109 @@
 {
-  "meta" : {
-    "globalKey" : "6b96cbaa"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "LBMA"
-            }
-          },
-          "vintage" : 1994
-        },
-        "meta" : {
-          "globalKey" : "9e4f2961"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "35df9397",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "TechCo1234",
+          "meta" : {
+            "scheme" : "http://www.techco.com/com-trade-id"
+          }
         }
       } ],
       "meta" : {
-        "globalKey" : "9e4f2961"
+        "globalKey" : "5ebf0509"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "ba7adfee",
+        "externalReference" : "partyB"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "BankA5678",
+          "meta" : {
+            "scheme" : "http://www.banka.com/com-trade-id"
+          }
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "a0a9b88b"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2012-03-16",
+      "meta" : {
+        "globalKey" : "3ee0d0"
       }
-    },
-    "meta" : {
-      "globalKey" : "6b96cbaa"
     },
     "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "4631cb97"
-      },
-      "name" : {
-        "value" : "Bank A"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "5299000NIGT14YW8ZD26",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5299000NIGT14YW8ZD26"
+          }
         },
         "identifierType" : "LEI",
         "meta" : {
           "globalKey" : "24297a9a"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "34ce4cee"
-      },
+      } ],
       "name" : {
-        "value" : "Bank B"
+        "value" : "Bank A"
       },
+      "meta" : {
+        "globalKey" : "35df9397",
+        "externalKey" : "partyA"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "549300UXZ1R1RBZVU469",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300UXZ1R1RBZVU469"
+          }
         },
         "identifierType" : "LEI",
         "meta" : {
           "globalKey" : "12b7e470"
         }
-      } ]
-    } ],
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee0d0"
-      },
-      "value" : "2012-03-16"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.techco.com/com-trade-id"
-          },
-          "value" : "TechCo1234"
-        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "4631cb97"
+      "name" : {
+        "value" : "Bank B"
       },
       "meta" : {
-        "globalKey" : "339c521f"
+        "globalKey" : "ba7adfee",
+        "externalKey" : "partyB"
       }
-    }, {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.banka.com/com-trade-id"
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "LBMA"
+            }
           },
-          "value" : "BankA5678"
+          "vintage" : 1994
+        },
+        "meta" : {
+          "globalKey" : "9e4f2961"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "34ce4cee"
-      },
       "meta" : {
-        "globalKey" : "a3f35483"
+        "globalKey" : "9e4f2961"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "5e854648"
+    }
+  },
+  "meta" : {
+    "globalKey" : "5e854648"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.json
index a1a0fb0e8a..856801bbc5 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.json
@@ -1,103 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "547a2196"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "d6eef5f1",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "COA1234567",
+          "meta" : {
+            "scheme" : "http://www.companyA.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "a977e59e"
         }
       } ],
       "meta" : {
-        "globalKey" : "fb7fd677"
+        "globalKey" : "1e4fcb44"
       }
-    },
-    "meta" : {
-      "globalKey" : "134566ec"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "c03438b1"
-      },
-      "name" : {
-        "value" : "Company A Inc."
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300U2FJ850G1P3962"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "139247df"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "62ed3bae"
-      },
-      "name" : {
-        "value" : "Company B Inc."
+      "issuerReference" : {
+        "globalReference" : "a97660ee",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "COB7654321",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300B23HNTO1OHFU87"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c201d9bd"
+            "scheme" : "http://www.companyB.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ca865982"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2012-04-10",
+      "meta" : {
+        "globalKey" : "3ee10a"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyB",
-          "globalReference" : "62ed3bae"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "c03438b1"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "62ed3bae"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -105,11 +47,9 @@
             "productQualifier" : "Commodity_Option"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2012-09-01",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -118,49 +58,61 @@
                 },
                 "meta" : {
                   "globalKey" : "ec33fd39"
-                },
-                "unadjustedDate" : "2012-09-01"
+                }
               },
               "meta" : {
                 "globalKey" : "ec33fd39"
               }
             },
-            "payout" : {
-              "meta" : {
-                "globalKey" : "7ce03b31"
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2012-09-30",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ec346a16"
+                }
               },
+              "meta" : {
+                "globalKey" : "ec346a16"
+              }
+            },
+            "payout" : {
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "d1e45698"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 5,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "1103983f"
+                          "globalKey" : "249651e1"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 5,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -169,268 +121,316 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "exerciseDate",
-                          "globalReference" : "dda11134"
+                          "globalReference" : "6d55c53c",
+                          "externalReference" : "exerciseDate"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "1103983f"
+                      "globalKey" : "249651e1"
                     }
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "e577103a"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Put",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
-                        "meta" : {
-                          "globalKey" : "dda11134"
-                        },
                         "relativeDate" : {
+                          "periodMultiplier" : 0,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "dda11134"
+                            "globalKey" : "6d55c53c"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 0,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
                           "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "calculationPeriodsSchedule",
-                            "globalReference" : "14042"
+                            "globalReference" : "12bc",
+                            "externalReference" : "calculationPeriodsSchedule"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "6d55c53c"
                         }
                       } ],
                       "meta" : {
-                        "externalKey" : "exerciseDate",
-                        "globalKey" : "dda11134"
+                        "globalKey" : "6d55c53c",
+                        "externalKey" : "exerciseDate"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
+                    }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "7ce03b31"
+                "underlier" : {
+                  "commodity" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "commodity-1"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
                 },
                 "observationTerms" : {
                   "calculationPeriodDates" : {
                     "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
                       "meta" : {
-                        "externalKey" : "calculationPeriodsSchedule",
-                        "globalKey" : "14042"
+                        "globalKey" : "12bc",
+                        "externalKey" : "calculationPeriodsSchedule"
                       },
-                      "period" : "T",
-                      "periodMultiplier" : 1,
                       "balanceOfFirstPeriod" : true
                     },
                     "meta" : {
-                      "globalKey" : "14042"
+                      "globalKey" : "12bc"
                     }
                   },
                   "observationDates" : {
                     "parametricDates" : {
-                      "dayDistribution" : "ALL",
-                      "dayType" : "BUSINESS"
-                    }
-                  }
-                },
-                "optionType" : "PUT",
-                "underlier" : {
-                  "commodity" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "commodity-1"
+                      "dayType" : "Business",
+                      "dayDistribution" : "All"
                     }
-                  },
-                  "meta" : {
-                    "globalKey" : "0"
-                  }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "ec346a16"
-                },
-                "unadjustedDate" : "2012-09-30"
-              },
+                  "globalKey" : "83dfabfd"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "ec346a16"
+                "globalKey" : "83dfabfd"
               }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "dcbca314"
+            "globalKey" : "5e4f954a"
           }
         },
         "meta" : {
-          "globalKey" : "dcbca314"
+          "globalKey" : "5e4f954a"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7bc49032"
-          },
-          "observable" : {
-            "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-1"
-                } ]
+          "quantity" : [ {
+            "value" : {
+              "value" : 10000,
+              "unit" : {
+                "capacityUnit" : "USMMBTU"
               },
-              "value" : {
-                "productIdentifier" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "meta" : {
-                        "scheme" : "http://www.companyA.com/coding-scheme/commodity-reference-price"
-                      },
-                      "value" : "NATURAL GAS-LOUISIANA (HENRY HUB)-GAS DAILY"
-                    },
-                    "meta" : {
-                      "globalKey" : "b5d477df"
-                    },
-                    "source" : "ISDACRP"
-                  }
-                } ],
-                "priceQuoteType" : "MID"
+              "frequency" : {
+                "periodMultiplier" : 1,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "63"
+                }
               }
             },
-            "meta" : {
-              "globalKey" : "4bbae29"
-            }
-          },
-          "quantity" : [ {
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 300000,
               "unit" : {
                 "capacityUnit" : "USMMBTU"
-              },
-              "value" : 10000,
-              "frequency" : {
-                "meta" : {
-                  "globalKey" : "83d"
-                },
-                "period" : "D",
-                "periodMultiplier" : 1
               }
-            }
-          }, {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "USMMBTU"
+            }
+          } ],
+          "observable" : {
+            "commodity" : {
+              "value" : {
+                "productIdentifier" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "NATURAL GAS-LOUISIANA (HENRY HUB)-GAS DAILY",
+                      "meta" : {
+                        "scheme" : "http://www.companyA.com/coding-scheme/commodity-reference-price"
+                      }
+                    },
+                    "source" : "ISDACRP",
+                    "meta" : {
+                      "globalKey" : "b5d477df"
+                    }
+                  }
+                } ],
+                "priceQuoteType" : "Mid"
               },
-              "value" : 300000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "92ba16f7"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "641ae2c2"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "d6eef5f1",
+          "externalReference" : "partyA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a97660ee",
+          "externalReference" : "partyB"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "a97660ee",
+          "externalReference" : "partyB"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee10a"
-      },
-      "value" : "2012-04-10"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300U2FJ850G1P3962",
           "meta" : {
-            "scheme" : "http://www.companyA.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "COA1234567"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "139247df"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "c03438b1"
+      "name" : {
+        "value" : "Company A Inc."
       },
       "meta" : {
-        "globalKey" : "5214759a"
+        "globalKey" : "d6eef5f1",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300B23HNTO1OHFU87",
           "meta" : {
-            "scheme" : "http://www.companyB.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "COB7654321"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c201d9bd"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "62ed3bae"
+      "name" : {
+        "value" : "Company B Inc."
       },
       "meta" : {
-        "globalKey" : "c92b93ba"
+        "globalKey" : "a97660ee",
+        "externalKey" : "partyB"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "a977e59e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fb7fd677"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "f12eb31a"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "2c701daa"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "c03438b1"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "62ed3bae"
-        }
-      },
       "quantity" : {
+        "value" : 40500.00,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "d6eef5f1",
+          "externalReference" : "partyA"
         },
-        "value" : 40500.00
+        "receiverPartyReference" : {
+          "globalReference" : "a97660ee",
+          "externalReference" : "partyB"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2012-04-12",
         "dateAdjustments" : {
           "businessDayConvention" : "FOLLOWING",
           "meta" : {
             "globalKey" : "d3bf0271"
           }
-        },
-        "unadjustedDate" : "2012-04-12"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "92b6ebbe"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "da0ccc58"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex35-call-option-gas-power-heat-rate-daily.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex35-call-option-gas-power-heat-rate-daily.json
index ccee4be106..f0f9e9ea79 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex35-call-option-gas-power-heat-rate-daily.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex35-call-option-gas-power-heat-rate-daily.json
@@ -1,97 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "bbe08b64"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2007-07-05",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "3b90c4e2"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "d6eef5f1",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "163476",
+          "meta" : {
+            "scheme" : "http://www.companyA.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "a977e59e"
         }
       } ],
       "meta" : {
-        "globalKey" : "1f68ddfc"
+        "globalKey" : "ec3028aa"
       }
-    },
-    "meta" : {
-      "globalKey" : "4a48e0e7"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "c03438b1"
-      },
-      "name" : {
-        "value" : "Company A Inc."
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300U2FJ850G1P3962"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "139247df"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "62ed3bae"
-      },
-      "name" : {
-        "value" : "Company B Inc."
+      "issuerReference" : {
+        "globalReference" : "a97660ee",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "163476",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300B23HNTO1OHFU87"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c201d9bd"
+            "scheme" : "http://www.companyB.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ec309d09"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2012-04-10",
+      "meta" : {
+        "globalKey" : "3ee10a"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "c03438b1"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "62ed3bae"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -101,6 +49,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2012-07-01",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -109,114 +58,108 @@
                 },
                 "meta" : {
                   "globalKey" : "ec321cb9"
-                },
-                "unadjustedDate" : "2012-07-01"
+                }
               },
               "meta" : {
                 "globalKey" : "ec321cb9"
               }
             },
-            "payout" : {
-              "meta" : {
-                "globalKey" : "de0c7345"
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2012-09-30",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ec346a16"
+                }
               },
+              "meta" : {
+                "globalKey" : "ec346a16"
+              }
+            },
+            "payout" : {
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "80e4ec45"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 10,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "5f4efe3e"
+                          "globalKey" : "5f357a72"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 10,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
                         "businessDayConvention" : "NONE"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "5f4efe3e"
+                      "globalKey" : "5f357a72"
                     }
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "80cb6879"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
-                        "meta" : {
-                          "globalKey" : "519de13"
-                        },
                         "relativeDate" : {
+                          "periodMultiplier" : 0,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "519de13"
+                            "globalKey" : "94ce921b"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 0,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
                           "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
                             "externalReference" : "pricingDates"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "94ce921b"
                         }
                       } ],
                       "meta" : {
-                        "externalKey" : "exerciseDate",
-                        "globalKey" : "519de13"
+                        "globalKey" : "94ce921b",
+                        "externalKey" : "exerciseDate"
                       }
                     }
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "de0c7345"
-                },
-                "observationTerms" : {
-                  "calculationPeriodDates" : {
-                    "calculationPeriodFrequency" : {
-                      "meta" : {
-                        "externalKey" : "calculationPeriodsSchedule",
-                        "globalKey" : "10432"
-                      },
-                      "period" : "D",
-                      "periodMultiplier" : 1,
-                      "balanceOfFirstPeriod" : true
-                    },
-                    "meta" : {
-                      "globalKey" : "10432"
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
                     }
                   }
                 },
-                "optionType" : "CALL",
                 "underlier" : {
                   "commodity" : {
                     "address" : {
@@ -227,182 +170,239 @@
                   "meta" : {
                     "globalKey" : "0"
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
+                },
+                "observationTerms" : {
+                  "calculationPeriodDates" : {
+                    "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "D",
+                      "meta" : {
+                        "globalKey" : "10cc",
+                        "externalKey" : "calculationPeriodsSchedule"
+                      },
+                      "balanceOfFirstPeriod" : true
+                    },
+                    "meta" : {
+                      "globalKey" : "10cc"
+                    }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "ec346a16"
-                },
-                "unadjustedDate" : "2012-09-30"
-              },
+                  "globalKey" : "316f8f5d"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "ec346a16"
+                "globalKey" : "316f8f5d"
               }
             }
           },
           "meta" : {
-            "globalKey" : "c7679818"
+            "globalKey" : "86d05c1a"
           }
         },
         "meta" : {
-          "globalKey" : "c7679818"
+          "globalKey" : "86d05c1a"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "ccd31017"
-          },
-          "observable" : {
-            "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-1"
-                } ]
+          "quantity" : [ {
+            "value" : {
+              "value" : 25.00,
+              "unit" : {
+                "capacityUnit" : "MW"
               },
-              "value" : {
-                "productIdentifier" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "meta" : {
-                        "scheme" : "http://www.companyA.com/coding-scheme/commodity-reference-price"
-                      },
-                      "value" : "ELECTRICITY-CAISO-SP 15 GEN HUB-DAY AHEAD"
-                    },
-                    "meta" : {
-                      "globalKey" : "1c138eb4"
-                    },
-                    "source" : "ISDACRP"
-                  }
-                } ],
-                "priceQuoteType" : "LOCATIONAL_MARGINAL"
+              "frequency" : {
+                "periodMultiplier" : 1,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "63"
+                }
               }
             },
-            "meta" : {
-              "globalKey" : "edaf3ce4"
-            }
-          },
-          "quantity" : [ {
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 2300,
               "unit" : {
                 "capacityUnit" : "MW"
-              },
-              "value" : 25.00,
-              "frequency" : {
-                "meta" : {
-                  "globalKey" : "83d"
-                },
-                "period" : "D",
-                "periodMultiplier" : 1
               }
-            }
-          }, {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "MW"
+            }
+          } ],
+          "observable" : {
+            "commodity" : {
+              "value" : {
+                "productIdentifier" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "ELECTRICITY-CAISO-SP 15 GEN HUB-DAY AHEAD",
+                      "meta" : {
+                        "scheme" : "http://www.companyA.com/coding-scheme/commodity-reference-price"
+                      }
+                    },
+                    "source" : "ISDACRP",
+                    "meta" : {
+                      "globalKey" : "1c138eb4"
+                    }
+                  }
+                } ],
+                "priceQuoteType" : "LocationalMarginal"
               },
-              "value" : 2300
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "c8385f9c"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "1208ef67"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "d6eef5f1",
+          "externalReference" : "partyA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a97660ee",
+          "externalReference" : "partyB"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee10a"
-      },
-      "value" : "2012-04-10"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300U2FJ850G1P3962",
           "meta" : {
-            "scheme" : "http://www.companyA.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "163476"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "139247df"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "c03438b1"
+      "name" : {
+        "value" : "Company A Inc."
       },
       "meta" : {
-        "globalKey" : "29531180"
+        "globalKey" : "d6eef5f1",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300B23HNTO1OHFU87",
           "meta" : {
-            "scheme" : "http://www.companyB.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "163476"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c201d9bd"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "62ed3bae"
+      "name" : {
+        "value" : "Company B Inc."
       },
       "meta" : {
-        "globalKey" : "29531181"
+        "globalKey" : "a97660ee",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2007-07-05",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "3b90c4e2"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "a977e59e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "1f68ddfc"
+      }
+    },
+    "meta" : {
+      "globalKey" : "ad4c4ccb"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "c951763d"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "c03438b1"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "62ed3bae"
-        }
-      },
       "quantity" : {
+        "value" : 342000.00,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "d6eef5f1",
+          "externalReference" : "partyA"
         },
-        "value" : 342000.00
+        "receiverPartyReference" : {
+          "globalReference" : "a97660ee",
+          "externalReference" : "partyB"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2012-04-05",
         "dateAdjustments" : {
           "businessDayConvention" : "FOLLOWING",
           "meta" : {
             "globalKey" : "d3bf0271"
           }
-        },
-        "unadjustedDate" : "2012-04-05"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "ad646a5d"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "cad13a68"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex36-gas-call-option-european-spread-negative-premium-floating-strike.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex36-gas-call-option-european-spread-negative-premium-floating-strike.json
index c7249d1fff..8efd519569 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex36-gas-call-option-european-spread-negative-premium-floating-strike.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex36-gas-call-option-european-spread-negative-premium-floating-strike.json
@@ -1,103 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "fd48ca50"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "d6eef5f1",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "COA24680",
+          "meta" : {
+            "scheme" : "http://www.companyA.com/spec/2012/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "a977e59e"
         }
       } ],
       "meta" : {
-        "globalKey" : "fb7fd677"
+        "globalKey" : "8a40d7fc"
       }
-    },
-    "meta" : {
-      "globalKey" : "d055b716"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "c03438b1"
-      },
-      "name" : {
-        "value" : "Company A Inc."
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300U2FJ850G1P3962"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "139247df"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "62ed3bae"
-      },
-      "name" : {
-        "value" : "Company B Inc."
+      "issuerReference" : {
+        "globalReference" : "a97660ee",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "COB13579",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300B23HNTO1OHFU87"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c201d9bd"
+            "scheme" : "http://www.companyB.com/spec/2012/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "8be79543"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2012-06-06",
+      "meta" : {
+        "globalKey" : "3ee186"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyB",
-          "globalReference" : "62ed3bae"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "c03438b1"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "62ed3bae"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -105,11 +47,9 @@
             "productQualifier" : "Commodity_Option"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2012-09-01",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -118,322 +58,382 @@
                 },
                 "meta" : {
                   "globalKey" : "ec33fd39"
-                },
-                "unadjustedDate" : "2012-09-01"
+                }
               },
               "meta" : {
                 "globalKey" : "ec33fd39"
               }
             },
-            "payout" : {
-              "meta" : {
-                "globalKey" : "d2f78148"
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2012-09-30",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ec346a16"
+                }
               },
+              "meta" : {
+                "globalKey" : "ec346a16"
+              }
+            },
+            "payout" : {
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7b032817"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 5,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "596d3a10"
+                          "globalKey" : "5951832e"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 5,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
                         "businessDayConvention" : "MODFOLLOWING"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "596d3a10"
+                      "globalKey" : "5951832e"
                     }
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7ae77135"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
-                        "meta" : {
-                          "globalKey" : "8fc2d7ae"
-                        },
                         "relativeDate" : {
+                          "periodMultiplier" : 5,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "8fc2d7ae"
+                            "globalKey" : "8c67b250"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 5,
                           "businessDayConvention" : "MODFOLLOWING",
                           "dateRelativeTo" : {
-                            "externalReference" : "calculationPeriodsSchedule",
-                            "globalReference" : "14042"
+                            "globalReference" : "12bc",
+                            "externalReference" : "calculationPeriodsSchedule"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "8c67b250"
                         }
                       } ],
                       "meta" : {
-                        "externalKey" : "exerciseDate",
-                        "globalKey" : "8fc2d7ae"
+                        "globalKey" : "8c67b250",
+                        "externalKey" : "exerciseDate"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
+                    }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "d2f78148"
+                "underlier" : {
+                  "commodity" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "commodity-1"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
                 },
                 "observationTerms" : {
                   "calculationPeriodDates" : {
                     "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "T",
                       "meta" : {
-                        "externalKey" : "calculationPeriodsSchedule",
-                        "globalKey" : "14042"
+                        "globalKey" : "12bc",
+                        "externalKey" : "calculationPeriodsSchedule"
                       },
-                      "period" : "T",
-                      "periodMultiplier" : 1,
                       "balanceOfFirstPeriod" : true
                     },
                     "meta" : {
-                      "globalKey" : "14042"
+                      "globalKey" : "12bc"
                     }
                   },
                   "observationDates" : {
                     "parametricDates" : {
-                      "dayDistribution" : "FIRST",
-                      "dayType" : "BUSINESS"
+                      "dayType" : "Business",
+                      "dayDistribution" : "First"
                     }
                   }
                 },
-                "optionType" : "CALL",
-                "underlier" : {
-                  "commodity" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "commodity-1"
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "0"
-                  }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
                 "meta" : {
-                  "globalKey" : "ec346a16"
-                },
-                "unadjustedDate" : "2012-09-30"
-              },
+                  "globalKey" : "95771464"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "ec346a16"
+                "globalKey" : "95771464"
               }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "298daa9d"
+            "globalKey" : "703cb631"
           }
         },
         "meta" : {
-          "globalKey" : "298daa9d"
+          "globalKey" : "703cb631"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7c9c093e"
-          },
+          "quantity" : [ {
+            "value" : {
+              "value" : 1000000,
+              "unit" : {
+                "capacityUnit" : "USMMBTU"
+              },
+              "frequency" : {
+                "periodMultiplier" : 1,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "63"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          }, {
+            "value" : {
+              "value" : 1000000,
+              "unit" : {
+                "capacityUnit" : "USMMBTU"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
           "observable" : {
             "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-1"
-                } ]
-              },
               "value" : {
                 "productIdentifier" : [ {
                   "value" : {
                     "identifier" : {
+                      "value" : "NATURAL GAS-NYMEX",
                       "meta" : {
                         "scheme" : "http://www.companyB.com/coding-scheme/commodity-reference-price"
-                      },
-                      "value" : "NATURAL GAS-NYMEX"
+                      }
                     },
+                    "source" : "ISDACRP",
                     "meta" : {
                       "globalKey" : "d80ddb64"
-                    },
-                    "source" : "ISDACRP"
+                    }
                   }
                 } ],
+                "priceQuoteType" : "Settlement",
                 "deliveryDateReference" : {
-                  "deliveryDateRollConvention" : {
+                  "deliveryNearby" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "83e"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 2
+                      "globalKey" : "6c"
+                    }
                   },
-                  "deliveryNearby" : {
+                  "deliveryDateRollConvention" : {
+                    "periodMultiplier" : 2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "954"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1
+                      "globalKey" : "82"
+                    }
                   }
-                },
-                "priceQuoteType" : "SETTLEMENT"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-1"
+                } ]
               }
             },
             "meta" : {
-              "globalKey" : "45bf8271"
+              "globalKey" : "3fbeb6f"
             }
           },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "USMMBTU"
-              },
-              "value" : 1000000,
-              "frequency" : {
-                "meta" : {
-                  "globalKey" : "83d"
-                },
-                "period" : "D",
-                "periodMultiplier" : 1
-              }
-            }
-          }, {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "USMMBTU"
-              },
-              "value" : 1000000
-            }
-          } ]
+          "meta" : {
+            "globalKey" : "6f514e98"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "d6eef5f1",
+          "externalReference" : "partyA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a97660ee",
+          "externalReference" : "partyB"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "a97660ee",
+          "externalReference" : "partyB"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee186"
-      },
-      "value" : "2012-06-06"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300U2FJ850G1P3962",
           "meta" : {
-            "scheme" : "http://www.companyA.com/spec/2012/trade-id-1-0"
-          },
-          "value" : "COA24680"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "139247df"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "c03438b1"
+      "name" : {
+        "value" : "Company A Inc."
       },
       "meta" : {
-        "globalKey" : "85f53452"
+        "globalKey" : "d6eef5f1",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300B23HNTO1OHFU87",
           "meta" : {
-            "scheme" : "http://www.companyB.com/spec/2012/trade-id-1-0"
-          },
-          "value" : "COB13579"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c201d9bd"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "62ed3bae"
+      "name" : {
+        "value" : "Company B Inc."
       },
       "meta" : {
-        "globalKey" : "b72ce33b"
+        "globalKey" : "a97660ee",
+        "externalKey" : "partyB"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "a977e59e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fb7fd677"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "4d65ac2e"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "3fae6cba"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "62ed3bae"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "c03438b1"
-        }
-      },
       "quantity" : {
+        "value" : 130100.00,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "a97660ee",
+          "externalReference" : "partyB"
         },
-        "value" : 130100.00
+        "receiverPartyReference" : {
+          "globalReference" : "d6eef5f1",
+          "externalReference" : "partyA"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2012-06-06",
         "dateAdjustments" : {
           "businessDayConvention" : "FOLLOWING",
           "meta" : {
             "globalKey" : "d3bf0271"
           }
-        },
-        "unadjustedDate" : "2012-06-06"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "3e748162"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "4ae4be10"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex37-gold-forward-offered-rate.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex37-gold-forward-offered-rate.json
index 02e8cc5c54..e5b2a331a7 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex37-gold-forward-offered-rate.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex37-gold-forward-offered-rate.json
@@ -1,626 +1,626 @@
 {
-  "meta" : {
-    "globalKey" : "f5d86b49"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "f5d86b49"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7f93fec0"
-      },
-      "name" : {
-        "value" : "Bank a"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "b1cc3da",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "BankA1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Bank A"
-        },
-        "meta" : {
-          "globalKey" : "762a577d"
+            "scheme" : "http://www.bankB.com/swaps/com-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "7f85e740"
-      },
-      "name" : {
-        "value" : "Bank B"
+        "globalKey" : "a0a01d3c"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "b1cc77c",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "BankB5678",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Bank B"
-        },
-        "meta" : {
-          "globalKey" : "762a577e"
+            "scheme" : "http://www.bankA.com/swaps/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "a0b08a1c"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2012-01-01",
+      "meta" : {
+        "globalKey" : "3ee041"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7f93fec0"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "7f85e740"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
+          "productTaxonomy" : [ {
+            "primaryAssetClass" : {
+              "value" : "Commodity"
+            }
+          }, {
+            "source" : "ISDA",
+            "productQualifier" : "InterestRate_IRSwap_Basis"
+          } ],
           "productIdentifier" : [ {
             "value" : {
               "identifier" : {
+                "value" : "Commodity:Metals:Precious:LoanLease:Cash",
                 "meta" : {
                   "scheme" : "http://www.dtcc.com/coding-scheme/external/GTR-Product-Id"
-                },
-                "value" : "Commodity:Metals:Precious:LoanLease:Cash"
+                }
               },
+              "source" : "Other",
               "meta" : {
                 "globalKey" : "1d68548"
-              },
-              "source" : "OTHER"
-            }
-          } ],
-          "productTaxonomy" : [ {
-            "primaryAssetClass" : {
-              "value" : "COMMODITY"
+              }
             }
-          }, {
-            "source" : "ISDA",
-            "productQualifier" : "InterestRate_IRSwap_Basis"
           } ],
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "27e4e9"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-2"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d1c"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "1"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2012-01-01",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "27e4e9"
+                            "globalKey" : "27e4e9",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "3662e8ba"
                         }
                       },
                       "meta" : {
                         "globalKey" : "595b0919"
-                      },
-                      "unadjustedDate" : "2012-01-01"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "595b0919"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "gofoperioddates1",
-                    "globalKey" : "289355ae"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-01-01",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "27e4e9"
+                            "globalReference" : "27e4e9",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "eb0b20ac"
-                      },
-                      "unadjustedDate" : "2013-01-01"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eb0b20ac"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "c2b06a26"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2012-04-01",
-                  "meta" : {
-                    "globalKey" : "35dc0fe2"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "27e4e9"
+                        "globalReference" : "27e4e9",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "2048"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "rollConvention" : "1"
+                  },
+                  "meta" : {
+                    "globalKey" : "5b4f46f0",
+                    "externalKey" : "gofoperioddates1"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-2"
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2012-04-01",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "27e4e9",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "c189efdc"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "gofoperioddates1",
-                    "globalReference" : "289355ae"
+                    "globalReference" : "5b4f46f0",
+                    "externalReference" : "gofoperioddates1"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "b5f21a29"
+                      "globalKey" : "c55408f5"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCentersReference" : {
-                      "externalReference" : "primaryBusinessCenters",
-                      "globalReference" : "27e4e9"
+                      "globalReference" : "27e4e9",
+                      "externalReference" : "primaryBusinessCenters"
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates1",
-                      "globalReference" : "dde7bfc1"
+                      "globalReference" : "4db20287",
+                      "externalReference" : "resetDates1"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates1",
-                    "globalKey" : "dde7bfc1"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "27e4e9"
+                        "globalReference" : "27e4e9",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "4db20287",
+                    "externalKey" : "resetDates1"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "4ac56ef4"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "27e4e9"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d1c"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "1"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2012-01-01",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "27e4e9"
+                            "globalReference" : "27e4e9",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "444628ac"
-                      },
-                      "unadjustedDate" : "2012-01-01"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "444628ac"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "gofoperioddates2",
-                    "globalKey" : "653b3241"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-01-01",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "27e4e9"
+                            "globalReference" : "27e4e9",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "eb0b20ac"
-                      },
-                      "unadjustedDate" : "2013-01-01"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eb0b20ac"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "583c5687"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2012-04-01",
-                  "meta" : {
-                    "globalKey" : "35dc0fe2"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "27e4e9"
+                        "globalReference" : "27e4e9",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "2048"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "rollConvention" : "1"
+                  },
+                  "meta" : {
+                    "globalKey" : "cdeadfbd",
+                    "externalKey" : "gofoperioddates2"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2012-04-01",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "27e4e9",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "c189efdc"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "gofoperioddates2",
-                    "globalReference" : "653b3241"
+                    "globalReference" : "cdeadfbd",
+                    "externalReference" : "gofoperioddates2"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "b5f21a2a"
+                      "globalKey" : "c55408f6"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCentersReference" : {
-                      "externalReference" : "primaryBusinessCenters",
-                      "globalReference" : "27e4e9"
+                      "globalReference" : "27e4e9",
+                      "externalReference" : "primaryBusinessCenters"
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates2",
-                      "globalReference" : "36be10e1"
+                      "globalReference" : "a68853a7",
+                      "externalReference" : "resetDates2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates2",
-                    "globalKey" : "36be10e1"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "27e4e9"
+                        "globalReference" : "27e4e9",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "a68853a7",
+                    "externalKey" : "resetDates2"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "89ec8721"
                 }
               } ],
               "meta" : {
-                "globalKey" : "9a5f22a1"
+                "globalKey" : "904ce3ad"
               }
             }
           },
           "meta" : {
-            "globalKey" : "40b9c37c"
+            "globalKey" : "b6b6cbb2"
           }
         },
         "meta" : {
-          "globalKey" : "40b9c37c"
+          "globalKey" : "b6b6cbb2"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "194dd656"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d05"
+          "quantity" : [ {
+            "value" : {
+              "value" : 100.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "XAU"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-2"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-2"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "XAU"
-                }
-              },
-              "value" : 100.00
+            "meta" : {
+              "globalKey" : "828026c7"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "9ecfec03"
           },
+          "meta" : {
+            "globalKey" : "4339ec02"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : -0.0001,
               "unit" : {
                 "currency" : {
                   "value" : "XAU"
                 }
               },
-              "value" : -0.0001,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "XAU"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100.00,
               "unit" : {
                 "currency" : {
                   "value" : "XAU"
                 }
-              },
-              "value" : 100.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "efd89b85"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "b1cc3da",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "b1cc77c",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee041"
-      },
-      "value" : "2012-01-01"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Bank A",
           "meta" : {
-            "scheme" : "http://www.bankB.com/swaps/com-trade-id"
-          },
-          "value" : "BankA1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "762a577d"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "7f93fec0"
+      "name" : {
+        "value" : "Bank a"
       },
       "meta" : {
-        "globalKey" : "9ce5b372"
+        "globalKey" : "b1cc3da",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Bank B",
           "meta" : {
-            "scheme" : "http://www.bankA.com/swaps/com-trade-id"
-          },
-          "value" : "BankB5678"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "762a577e"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "7f85e740"
+      "name" : {
+        "value" : "Bank B"
       },
       "meta" : {
-        "globalKey" : "d8d98fb4"
+        "globalKey" : "b1cc77c",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "18b60a19"
+    }
+  },
+  "meta" : {
+    "globalKey" : "18b60a19"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex40-gas-digital-option-storage-volume-trigger.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex40-gas-digital-option-storage-volume-trigger.json
index e1f255cdbb..ee4a231b6e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex40-gas-digital-option-storage-volume-trigger.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex40-gas-digital-option-storage-volume-trigger.json
@@ -1,76 +1,76 @@
 {
-  "meta" : {
-    "globalKey" : "d707810b"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "d707810b"
-    },
-    "party" : [ {
-      "contactInformation" : {
-        "address" : [ {
-          "country" : {
-            "value" : "US"
-          }
-        } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "8fe8c094",
+        "externalReference" : "PartyA"
       },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "ABCD1234",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/com-trade-id"
+          }
+        }
+      } ],
       "meta" : {
-        "externalKey" : "PartyA",
-        "globalKey" : "3c0bac94"
-      },
+        "globalKey" : "86a58769"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2013-05-10",
+      "meta" : {
+        "globalKey" : "3ee94a",
+        "externalKey" : "TradeDate"
+      }
+    },
+    "party" : [ {
       "partyId" : [ {
         "identifier" : {
+          "value" : "95980020140005196564",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "95980020140005196564"
+          }
         },
         "identifierType" : "LEI",
         "meta" : {
           "globalKey" : "a66e20f6"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "PartyB",
-        "globalKey" : "37ee66b8"
+      } ],
+      "contactInformation" : {
+        "address" : [ {
+          "country" : {
+            "value" : "US"
+          }
+        } ]
       },
+      "meta" : {
+        "globalKey" : "8fe8c094",
+        "externalKey" : "PartyA"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "549300XQFX97CITUR430",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300XQFX97CITUR430"
+          }
         },
         "identifierType" : "LEI",
         "meta" : {
           "globalKey" : "37ee66b8"
         }
-      } ]
-    } ],
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3ee94a"
-      },
-      "value" : "2013-05-10"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "ABCD1234"
-        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "PartyA",
-        "globalReference" : "3c0bac94"
-      },
       "meta" : {
-        "globalKey" : "61e700bf"
+        "globalKey" : "37ee66b8",
+        "externalKey" : "PartyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "3f8898f5"
+    }
+  },
+  "meta" : {
+    "globalKey" : "3f8898f5"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex42-index-return-swap-reinvestment-feature.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex42-index-return-swap-reinvestment-feature.json
index 5c31dbaf96..b26e322f87 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex42-index-return-swap-reinvestment-feature.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex42-index-return-swap-reinvestment-feature.json
@@ -1,109 +1,109 @@
 {
-  "meta" : {
-    "globalKey" : "645fba3"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2011-10-04",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "1c924383"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2006"
-            }, {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "8fe8c094",
+        "externalReference" : "PartyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "SUSNUMERIS",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "76841153"
         }
       } ],
       "meta" : {
-        "globalKey" : "88aa6470"
+        "globalKey" : "dd0d9f91"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2014-01-15",
+      "meta" : {
+        "globalKey" : "3ef04f",
+        "externalKey" : "TradeDate"
       }
-    },
-    "meta" : {
-      "globalKey" : "645fba3"
     },
     "party" : [ {
-      "contactInformation" : {
-        "address" : [ {
-          "country" : {
-            "value" : "US"
-          }
-        } ]
-      },
-      "meta" : {
-        "externalKey" : "PartyA",
-        "globalKey" : "3c0bac94"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "95980020140005196564",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "95980020140005196564"
+          }
         },
         "identifierType" : "LEI",
         "meta" : {
           "globalKey" : "a66e20f6"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "PartyB",
-        "globalKey" : "37ee66b8"
+      } ],
+      "contactInformation" : {
+        "address" : [ {
+          "country" : {
+            "value" : "US"
+          }
+        } ]
       },
+      "meta" : {
+        "globalKey" : "8fe8c094",
+        "externalKey" : "PartyA"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "549300XQFX97CITUR430",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300XQFX97CITUR430"
+          }
         },
         "identifierType" : "LEI",
         "meta" : {
           "globalKey" : "37ee66b8"
         }
-      } ]
-    } ],
-    "tradeDate" : {
+      } ],
       "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3ef04f"
-      },
-      "value" : "2014-01-15"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "SUSNUMERIS"
+        "globalKey" : "37ee66b8",
+        "externalKey" : "PartyB"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2011-10-04",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "1c924383"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006"
+            }, {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "76841153"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "PartyA",
-        "globalReference" : "3c0bac94"
-      },
       "meta" : {
-        "globalKey" : "bea9aee7"
+        "globalKey" : "88aa6470"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "e21d58d"
+    }
+  },
+  "meta" : {
+    "globalKey" : "e21d58d"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex43-WTI-variance-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex43-WTI-variance-swap.json
index 46ad92e570..93405fbfb3 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex43-WTI-variance-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex43-WTI-variance-swap.json
@@ -1,124 +1,124 @@
 {
-  "meta" : {
-    "globalKey" : "6605633e"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "1999-04-16",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "8fe8c094",
+        "externalReference" : "PartyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "T901234-123456",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "d08bdc77"
         }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2006"
-            } ]
+      } ],
+      "meta" : {
+        "globalKey" : "32a17ae8"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2012-05-20",
+      "meta" : {
+        "globalKey" : "3ee154",
+        "externalKey" : "TradeDate"
+      }
+    },
+    "tradableProduct" : {
+      "product" : {
+        "contractualProduct" : {
+          "economicTerms" : {
+            "calculationAgent" : {
+              "calculationAgentPartyEnum" : "AsSpecifiedInMasterAgreement"
+            }
+          },
+          "meta" : {
+            "globalKey" : "6f06d7ab"
           }
         },
         "meta" : {
-          "globalKey" : "6b413360"
+          "globalKey" : "6f06d7ab"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "6ecf8949"
       }
     },
-    "meta" : {
-      "globalKey" : "6605633e"
-    },
     "party" : [ {
-      "contactInformation" : {
-        "address" : [ {
-          "country" : {
-            "value" : "US"
-          }
-        } ]
-      },
-      "meta" : {
-        "externalKey" : "PartyA",
-        "globalKey" : "3c0bac94"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "95980020140005196564",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "95980020140005196564"
+          }
         },
         "identifierType" : "LEI",
         "meta" : {
           "globalKey" : "a66e20f6"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "PartyB",
-        "globalKey" : "37ee66b8"
+      } ],
+      "contactInformation" : {
+        "address" : [ {
+          "country" : {
+            "value" : "US"
+          }
+        } ]
       },
+      "meta" : {
+        "globalKey" : "8fe8c094",
+        "externalKey" : "PartyA"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "549300XQFX97CITUR430",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300XQFX97CITUR430"
+          }
         },
         "identifierType" : "LEI",
         "meta" : {
           "globalKey" : "37ee66b8"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "37ee66b8",
+        "externalKey" : "PartyB"
+      }
     } ],
-    "tradableProduct" : {
-      "product" : {
-        "contractualProduct" : {
-          "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentPartyEnum" : "AS_SPECIFIED_IN_MASTER_AGREEMENT"
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "1999-04-16",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
             }
-          },
-          "meta" : {
-            "globalKey" : "6f06d7ab"
           }
         },
         "meta" : {
-          "globalKey" : "6f06d7ab"
+          "globalKey" : "d08bdc77"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3ee154"
-      },
-      "value" : "2012-05-20"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "T901234-123456"
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "6b413360"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "PartyA",
-        "globalReference" : "3c0bac94"
-      },
       "meta" : {
-        "globalKey" : "feb4107e"
+        "globalKey" : "6ecf8949"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "b7dcba8"
+    }
+  },
+  "meta" : {
+    "globalKey" : "b7dcba8"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex44-index-return-swap-fixed-notional.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex44-index-return-swap-fixed-notional.json
index bed8be5fd9..ed5e1af3fb 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex44-index-return-swap-fixed-notional.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex44-index-return-swap-fixed-notional.json
@@ -1,108 +1,108 @@
 {
-  "meta" : {
-    "globalKey" : "4c48203f"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2010-03-23",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "9cb8df0"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2006"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "8fe8c094",
+        "externalReference" : "PartyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "ACIRST1234567",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "6b413360"
         }
       } ],
       "meta" : {
-        "globalKey" : "fd30db70"
+        "globalKey" : "f4d1842d"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2014-04-08",
+      "meta" : {
+        "globalKey" : "3ef108",
+        "externalKey" : "TradeDate"
       }
-    },
-    "meta" : {
-      "globalKey" : "4c48203f"
     },
     "party" : [ {
-      "contactInformation" : {
-        "address" : [ {
-          "country" : {
-            "value" : "US"
-          }
-        } ]
-      },
-      "meta" : {
-        "externalKey" : "PartyA",
-        "globalKey" : "3c0bac94"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "95980020140005196564",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "95980020140005196564"
+          }
         },
         "identifierType" : "LEI",
         "meta" : {
           "globalKey" : "a66e20f6"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "PartyB",
-        "globalKey" : "37ee66b8"
+      } ],
+      "contactInformation" : {
+        "address" : [ {
+          "country" : {
+            "value" : "US"
+          }
+        } ]
       },
+      "meta" : {
+        "globalKey" : "8fe8c094",
+        "externalKey" : "PartyA"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "549300XQFX97CITUR430",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300XQFX97CITUR430"
+          }
         },
         "identifierType" : "LEI",
         "meta" : {
           "globalKey" : "37ee66b8"
         }
-      } ]
-    } ],
-    "tradeDate" : {
+      } ],
       "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3ef108"
-      },
-      "value" : "2014-04-08"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
+        "globalKey" : "37ee66b8",
+        "externalKey" : "PartyB"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2010-03-23",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "ACIRST1234567"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "9cb8df0"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "6b413360"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "PartyA",
-        "globalReference" : "3c0bac94"
-      },
       "meta" : {
-        "globalKey" : "f506dc83"
+        "globalKey" : "fd30db70"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "dbd78397"
+    }
+  },
+  "meta" : {
+    "globalKey" : "dbd78397"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex45-ag-variance-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex45-ag-variance-swap.json
index 3ad1d3d3ff..74e5f89443 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex45-ag-variance-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex45-ag-variance-swap.json
@@ -1,110 +1,110 @@
 {
-  "meta" : {
-    "globalKey" : "e500b9c2"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2010-03-23",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "9cb8df0"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2006"
-            }, {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "8fe8c094",
+        "externalReference" : "PartyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "ACAVS1234567",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "76841153"
         }
       } ],
       "meta" : {
-        "globalKey" : "4b29f563"
+        "globalKey" : "f4d8ff3d"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2014-04-08",
+      "meta" : {
+        "globalKey" : "3ef108",
+        "externalKey" : "TradeDate"
       }
-    },
-    "meta" : {
-      "globalKey" : "e500b9c2"
     },
     "party" : [ {
-      "contactInformation" : {
-        "address" : [ {
-          "country" : {
-            "value" : "US"
-          }
-        } ]
-      },
-      "meta" : {
-        "externalKey" : "PartyA",
-        "globalKey" : "3c0bac94"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "95980020140005196564",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "95980020140005196564"
+          }
         },
         "identifierType" : "LEI",
         "meta" : {
           "globalKey" : "a66e20f6"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "PartyB",
-        "globalKey" : "37ee66b8"
+      } ],
+      "contactInformation" : {
+        "address" : [ {
+          "country" : {
+            "value" : "US"
+          }
+        } ]
       },
+      "meta" : {
+        "globalKey" : "8fe8c094",
+        "externalKey" : "PartyA"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "549300XQFX97CITUR430",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300XQFX97CITUR430"
+          }
         },
         "identifierType" : "LEI",
         "meta" : {
           "globalKey" : "37ee66b8"
         }
-      } ]
-    } ],
-    "tradeDate" : {
+      } ],
       "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3ef108"
-      },
-      "value" : "2014-04-08"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
+        "globalKey" : "37ee66b8",
+        "externalKey" : "PartyB"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2010-03-23",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "ACAVS1234567"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "9cb8df0"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006"
+            }, {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "76841153"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "PartyA",
-        "globalReference" : "3c0bac94"
-      },
       "meta" : {
-        "globalKey" : "111bd393"
+        "globalKey" : "4b29f563"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "8b9452ba"
+    }
+  },
+  "meta" : {
+    "globalKey" : "8b9452ba"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex47-physical-eu-emissions-option-pred-clearing.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex47-physical-eu-emissions-option-pred-clearing.json
index db8806c6b8..5de65e3541 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex47-physical-eu-emissions-option-pred-clearing.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex47-physical-eu-emissions-option-pred-clearing.json
@@ -1,121 +1,61 @@
 {
-  "meta" : {
-    "globalKey" : "f0bc9b3c"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "f7fbd413"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "9cf475a7"
-      },
-      "name" : {
-        "value" : "EnergyCoA"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5299000NIGT14YW8ZD26"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "24297a9a"
-        }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "a049df7e"
-      },
-      "name" : {
-        "value" : "EnergyCoB"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "29c5a7",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123456",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "969500QCC36R89FI3U25"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "2770ccf0"
+            "scheme" : "http://www.PartyA.com/com-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "clearing-svc",
-        "globalKey" : "b2687a98"
-      },
-      "name" : {
-        "value" : "ClearItAll Corp"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300IB5Q45JGNPND58"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e213e7d7"
-        }
-      } ]
+        "globalKey" : "ebf7ca68"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2012-06-04",
+      "meta" : {
+        "globalKey" : "3ee184",
+        "externalKey" : "tradeDate"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "a049df7e"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "9cf475a7"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
-              "value" : "COMMODITY"
+              "value" : "Commodity"
             }
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "a84c396e"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "f3b1d0d7"
-                  },
-                  "settlementType" : "PHYSICAL"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2012-12-31",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -123,10 +63,9 @@
                             }
                           },
                           "meta" : {
-                            "externalKey" : "exerciseDate",
-                            "globalKey" : "ec373e97"
-                          },
-                          "unadjustedDate" : "2012-12-31"
+                            "globalKey" : "ec373e97",
+                            "externalKey" : "exerciseDate"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ec373e97"
@@ -139,17 +78,17 @@
                         "globalKey" : "f7a48c80"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "a84c396e"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "contractualProduct" : {
                     "economicTerms" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2012-12-31",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -158,23 +97,40 @@
                           },
                           "meta" : {
                             "globalKey" : "ec373e97"
-                          },
-                          "unadjustedDate" : "2012-12-31"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ec373e97"
                         }
                       },
+                      "terminationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2012-12-31",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ec373e97"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "ec373e97",
+                          "externalKey" : "physicalTerminationDate"
+                        }
+                      },
                       "payout" : {
                         "commodityPayout" : [ {
                           "settlementTerms" : {
-                            "meta" : {
-                              "globalKey" : "76108015"
-                            },
+                            "settlementType" : "Cash",
                             "settlementCurrency" : {
                               "value" : "EUR"
                             },
-                            "settlementType" : "CASH"
+                            "meta" : {
+                              "globalKey" : "76108015"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "76108015"
@@ -182,8 +138,8 @@
                         } ],
                         "fixedPricePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "fixedPrice" : {
                             "price" : {
@@ -200,138 +156,182 @@
                         "meta" : {
                           "globalKey" : "1556862a"
                         }
-                      },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "ec373e97"
-                          },
-                          "unadjustedDate" : "2012-12-31"
-                        },
-                        "meta" : {
-                          "externalKey" : "physicalTerminationDate",
-                          "globalKey" : "ec373e97"
-                        }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "3dd3344"
+                      "globalKey" : "16c243ca"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "3dd3344"
+                    "globalKey" : "16c243ca"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "962260b2"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "962260b2"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "4e43327b"
+            "globalKey" : "3c1959bf"
           }
         },
         "meta" : {
-          "globalKey" : "4e43327b"
+          "globalKey" : "3c1959bf"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3c10f6dd"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 7.38,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 7.38,
+              "priceType" : "CashPrice",
               "cashPrice" : {
-                "cashPriceType" : "FEE"
-              },
-              "priceType" : "CASH_PRICE"
+                "cashPriceType" : "Fee"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "460de4c3"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4ee5da7e",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "29c5a7",
+          "externalReference" : "partyA"
+        }
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "5299000NIGT14YW8ZD26",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "24297a9a"
+        }
+      } ],
+      "name" : {
+        "value" : "EnergyCoA"
+      },
       "meta" : {
-        "externalKey" : "tradeDate",
-        "globalKey" : "3ee184"
+        "globalKey" : "29c5a7",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "969500QCC36R89FI3U25",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "2770ccf0"
+        }
+      } ],
+      "name" : {
+        "value" : "EnergyCoB"
       },
-      "value" : "2012-06-04"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "4ee5da7e",
+        "externalKey" : "partyB"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300IB5Q45JGNPND58",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "123456"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e213e7d7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "9cf475a7"
+      "name" : {
+        "value" : "ClearItAll Corp"
       },
       "meta" : {
-        "globalKey" : "55b93bbe"
+        "globalKey" : "fff6958",
+        "externalKey" : "clearing-svc"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "7caa6513"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "d35f156f"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "a049df7e"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "9cf475a7"
-        }
-      },
       "quantity" : {
+        "value" : 1000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "4ee5da7e",
+          "externalReference" : "partyB"
         },
-        "value" : 1000
+        "receiverPartyReference" : {
+          "globalReference" : "29c5a7",
+          "externalReference" : "partyA"
+        }
       },
       "settlementDate" : {
         "relativeDate" : {
+          "periodMultiplier" : 3,
+          "period" : "D",
           "meta" : {
-            "globalKey" : "10a0c8c4"
+            "globalKey" : "d2a5d22"
           },
-          "period" : "D",
-          "periodMultiplier" : 3,
           "businessDayConvention" : "FOLLOWING",
           "dateRelativeTo" : {
-            "externalReference" : "tradeDate",
-            "globalReference" : "3ee184"
+            "globalReference" : "3ee184",
+            "externalReference" : "tradeDate"
           }
         }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "766eb25"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "b78a7ff2"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex01-long-asia-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex01-long-asia-corp-fixreg.json
index f9ed8d77c1..d554fec7bf 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex01-long-asia-corp-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex01-long-asia-corp-fixreg.json
@@ -1,113 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "37c4b603"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_SUCCESSOR_AND_CREDIT_EVENTS"
-              }
-            }, {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
-              }
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "37209",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "91a1d99b"
         }
       } ],
       "meta" : {
-        "globalKey" : "e82472ec"
+        "globalKey" : "9862eeec"
       }
-    },
-    "meta" : {
-      "globalKey" : "37c4b603"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37209",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9863634b"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-04",
+      "meta" : {
+        "globalKey" : "3e9304"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -115,13 +47,54 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-12-05",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb0a8cfd"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "meta" : {
+                "globalKey" : "eb0a8cfd"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-12-05",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    }, {
+                      "value" : "JPTO"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "81e56a96"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "58681de7"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "28faf882"
+                }
+              },
+              "meta" : {
+                "globalKey" : "28faf882"
+              }
             },
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "GBLO"
@@ -134,84 +107,130 @@
                   "globalKey" : "81e56a96"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "58681de7"
               }
             },
-            "effectiveDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
+            "payout" : {
+              "interestRatePayout" : [ {
+                "payerReceiver" : {
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "eb0a8cfd"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2002-12-05"
-              },
-              "meta" : {
-                "globalKey" : "eb0a8cfd"
-              }
-            },
-            "payout" : {
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204c"
+                    },
+                    "rollConvention" : "5"
+                  },
+                  "meta" : {
+                    "globalKey" : "204c"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-03-05",
+                  "meta" : {
+                    "globalKey" : "7473f5c5"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c3ce76f8"
+                }
+              } ],
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "45e0d7b2"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "JPY"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "5f4774ca"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
+                      "category" : "BondOrLoan",
+                      "notSubordinated" : true,
+                      "specifiedCurrency" : {
+                        "applicable" : true
+                      },
+                      "notContingent" : true,
                       "assignableLoan" : {
                         "applicable" : true
                       },
-                      "category" : "BOND_OR_LOAN",
                       "consentRequiredLoan" : {
                         "applicable" : true
                       },
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
-                      "notContingent" : true,
-                      "notSubordinated" : true,
-                      "specifiedCurrency" : {
-                        "applicable" : true
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
                       },
-                      "transferable" : true
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "237559c8"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 30
+                      "globalKey" : "3cdbf6e0"
                     }
                   }
                 },
@@ -219,325 +238,306 @@
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "004CC9",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "004CC9"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "e414546d"
-                      },
                       "name" : {
                         "value" : "ACOM CO., LTD."
+                      },
+                      "meta" : {
+                        "globalKey" : "e414546d",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "e414546d"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "JP310860A032",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "JP310860A032"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "b94feaa3"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "e414546d",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : 1.0,
                       "unit" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "value" : 1.0,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "53ce487a"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "JPY"
-                        }
-                      },
-                      "value" : 1000000000.0,
-                      "meta" : {
-                        "globalKey" : "57e64854"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 100000000.0,
                         "unit" : {
                           "currency" : {
                             "value" : "JPY"
                           }
                         },
-                        "value" : 100000000.0,
                         "meta" : {
                           "globalKey" : "b883af02"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "28728bbd"
-                    },
                     "restructuring" : {
                       "applicable" : true,
                       "restructuringType" : {
                         "value" : "R"
                       }
+                    },
+                    "defaultRequirement" : {
+                      "value" : 1000000000.0,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "JPY"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "57e64854"
+                      }
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "8f38683"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "53d2889d"
-                  },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY",
+                    "category" : "BorrowedMoney",
                     "notSubordinated" : true
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d20"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "5"
                   },
                   "meta" : {
-                    "globalKey" : "12d20"
+                    "globalKey" : "15515017"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "a52eef0e"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-05",
-                  "meta" : {
-                    "globalKey" : "7473fe71"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "62eeb6b0"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "bee3688"
+                "globalKey" : "2543ecb8"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    }, {
-                      "value" : "JPTO"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "81e56a96"
-                    }
-                  },
-                  "businessDayConvention" : "MODFOLLOWING",
-                  "meta" : {
-                    "globalKey" : "58681de7"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "28faf882"
-                },
-                "unadjustedDate" : "2007-12-05"
-              },
-              "meta" : {
-                "globalKey" : "28faf882"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "a4c80788"
+            "globalKey" : "fed21d88"
           }
         },
         "meta" : {
-          "globalKey" : "a4c80788"
+          "globalKey" : "fed21d88"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a7b31de6"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.007,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "value" : 0.007,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 500000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
-              },
-              "value" : 500000000.0
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d74a447e"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "4eb09eda"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 500000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
-              },
-              "value" : 500000000.0
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "11fe4b42"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9304"
-      },
-      "value" : "2002-12-04"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37209"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "af3ad922"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37209"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af3ad923"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditSuccessorAndCreditEvents"
+              }
+            }, {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "91a1d99b"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "e82472ec"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "7fab373f"
+    }
+  },
+  "meta" : {
+    "globalKey" : "7fab373f"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex02-2003-short-asia-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex02-2003-short-asia-corp-fixreg.json
index 89b9d89858..8fedddf3e1 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex02-2003-short-asia-corp-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex02-2003-short-asia-corp-fixreg.json
@@ -1,85 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "a736d6f5"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2003-06-06",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_2003_CREDIT_JAPAN"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "xyz1234",
+          "meta" : {
+            "scheme" : "http://www.xyzbank.com/cd-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "d7d4c772"
         }
       } ],
       "meta" : {
-        "globalKey" : "d7d4c772"
+        "globalKey" : "36aee370"
       }
-    },
-    "meta" : {
-      "globalKey" : "a736d6f5"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "abc1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.abcbank.com/cd-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "4d7c7218"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-04",
+      "meta" : {
+        "globalKey" : "3e9304"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -87,37 +47,104 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "JPTO"
-              }
-            },
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-12-05",
                 "meta" : {
                   "globalKey" : "3e9305"
-                },
-                "unadjustedDate" : "2002-12-05"
+                }
               },
               "meta" : {
                 "globalKey" : "3e9305"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-12-05",
+                "meta" : {
+                  "globalKey" : "3ebb05"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ebb05"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204c"
+                    },
+                    "rollConvention" : "5"
+                  },
+                  "meta" : {
+                    "globalKey" : "204c"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
+                  "firstPaymentDate" : "2003-03-05",
+                  "meta" : {
+                    "globalKey" : "7473f5c5"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "e35a61d8"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "generalTerms" : {
@@ -126,229 +153,202 @@
                       "entityId" : [ {
                         "value" : "008FAQ"
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "7abf9ebb"
-                      },
                       "name" : {
                         "value" : "Aiful Corporation"
+                      },
+                      "meta" : {
+                        "globalKey" : "7abf9ebb",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "7abf9ebb"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "JP310504B117",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "JP310504B117"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "1098fb11"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "7abf9ebb",
+                        "externalReference" : "referenceEntity"
                       }
                     } ]
                   }
                 },
-                "meta" : {
-                  "globalKey" : "c50735f"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "meta" : {
-                      "globalKey" : "4cf"
-                    },
                     "restructuring" : {
                       "applicable" : true
+                    },
+                    "meta" : {
+                      "globalKey" : "4cf"
                     }
                   },
                   "meta" : {
                     "globalKey" : "4cf"
                   }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d20"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "5"
-                  },
-                  "meta" : {
-                    "globalKey" : "12d20"
-                  }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "178ae9ee"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-05",
-                  "meta" : {
-                    "globalKey" : "7473fe71"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "d69246bb"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "8bfee38d"
+                "globalKey" : "f12b8a93"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ebb05"
-                },
-                "unadjustedDate" : "2007-12-05"
-              },
-              "meta" : {
-                "globalKey" : "3ebb05"
+            "calculationAgent" : {
+              "calculationAgentBusinessCenter" : {
+                "value" : "JPTO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "585fbd7c"
+            "globalKey" : "b06430ae"
           }
         },
         "meta" : {
-          "globalKey" : "585fbd7c"
+          "globalKey" : "b06430ae"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "74ab6b98"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.007,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "value" : 0.007,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d74a447e"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "20c20768"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 500000000,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
-              },
-              "value" : 500000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "11fe4b42"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9304"
-      },
-      "value" : "2002-12-04"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.xyzbank.com/cd-trade-id"
-          },
-          "value" : "xyz1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "ea5bbca6"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.abcbank.com/cd-trade-id"
-          },
-          "value" : "abc1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "824b68b0"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2003-06-06",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2003CreditJapan"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "d7d4c772"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "d7d4c772"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "1c417d23"
+    }
+  },
+  "meta" : {
+    "globalKey" : "1c417d23"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex02-short-asia-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex02-short-asia-corp-fixreg.json
index 55b1579064..7843b9c55d 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex02-short-asia-corp-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex02-short-asia-corp-fixreg.json
@@ -1,85 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "7079e55a"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2002-02-02",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_1999_CREDIT"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "xyz1234",
+          "meta" : {
+            "scheme" : "http://www.xyzbank.com/cd-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "59c52de8"
         }
       } ],
       "meta" : {
-        "globalKey" : "59c52de8"
+        "globalKey" : "36aee370"
       }
-    },
-    "meta" : {
-      "globalKey" : "7079e55a"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "abc1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.abcbank.com/cd-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "4d7c7218"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-04",
+      "meta" : {
+        "globalKey" : "3e9304"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -89,267 +49,307 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-12-05",
                 "meta" : {
                   "globalKey" : "3e9305"
-                },
-                "unadjustedDate" : "2002-12-05"
+                }
               },
               "meta" : {
                 "globalKey" : "3e9305"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-12-05",
+                "meta" : {
+                  "globalKey" : "3ebb05"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ebb05"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204c"
+                    },
+                    "rollConvention" : "5"
                   },
+                  "meta" : {
+                    "globalKey" : "204c"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-03-05",
+                  "meta" : {
+                    "globalKey" : "7473f5c5"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "e35a61d8"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "008FAQ",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "008FAQ"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "7abf9ebb"
-                      },
                       "name" : {
                         "value" : "Aiful Corporation"
+                      },
+                      "meta" : {
+                        "globalKey" : "7abf9ebb",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "7abf9ebb"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "JP310504B117",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "JP310504B117"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "1098fb11"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "7abf9ebb",
+                        "externalReference" : "referenceEntity"
                       }
                     } ]
                   }
                 },
-                "meta" : {
-                  "globalKey" : "3a0117f1"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "meta" : {
-                      "globalKey" : "120d61"
-                    },
                     "restructuring" : {
                       "applicable" : true,
                       "restructuringType" : {
                         "value" : "R"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "120d61"
                     }
                   },
                   "meta" : {
                     "globalKey" : "120d61"
                   }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d20"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "5"
-                  },
-                  "meta" : {
-                    "globalKey" : "12d20"
-                  }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "178ae9ee"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-05",
-                  "meta" : {
-                    "globalKey" : "7473fe71"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "7b1b844d"
                 }
-              } ],
-              "meta" : {
-                "globalKey" : "1f7a479f"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ebb05"
-                },
-                "unadjustedDate" : "2007-12-05"
               },
               "meta" : {
-                "globalKey" : "3ebb05"
+                "globalKey" : "54733225"
               }
             }
           },
           "meta" : {
-            "globalKey" : "7f9ec2cb"
+            "globalKey" : "1633a845"
           }
         },
         "meta" : {
-          "globalKey" : "7f9ec2cb"
+          "globalKey" : "1633a845"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "74ab6b98"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.007,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "value" : 0.007,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d74a447e"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "20c20768"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 500000000,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
-              },
-              "value" : 500000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "11fe4b42"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9304"
-      },
-      "value" : "2002-12-04"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.xyzbank.com/cd-trade-id"
-          },
-          "value" : "xyz1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "ea5bbca6"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.abcbank.com/cd-trade-id"
-          },
-          "value" : "abc1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "824b68b0"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2002-02-02",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA1999Credit"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "59c52de8"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "59c52de8"
+      }
+    },
+    "meta" : {
+      "globalKey" : "108a36f2"
+    }
+  },
+  "meta" : {
+    "globalKey" : "108a36f2"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex03-long-aussie-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex03-long-aussie-corp-fixreg.json
index e890e428f0..624e03ba23 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex03-long-aussie-corp-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex03-long-aussie-corp-fixreg.json
@@ -1,117 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "ae68f665"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_RESTRUCTURING"
-              }
-            }, {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_SUCCESSOR_AND_CREDIT_EVENTS"
-              }
-            }, {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
-              }
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "37258",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "e00ce397"
         }
       } ],
       "meta" : {
-        "globalKey" : "27fc7ca6"
+        "globalKey" : "9862ef86"
       }
-    },
-    "meta" : {
-      "globalKey" : "ae68f665"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37258",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "986363e5"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-03",
+      "meta" : {
+        "globalKey" : "3e9303"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -119,13 +47,54 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-12-04",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb0a893c"
+                }
+              },
+              "meta" : {
+                "globalKey" : "eb0a893c"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-12-04",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    }, {
+                      "value" : "AUSY"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "81e165ef"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "58641940"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "34ad82bc"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "meta" : {
+                "globalKey" : "34ad82bc"
+              }
             },
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "GBLO"
@@ -138,87 +107,133 @@
                   "globalKey" : "81e165ef"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "58641940"
               }
             },
-            "effectiveDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
+            "payout" : {
+              "interestRatePayout" : [ {
+                "payerReceiver" : {
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "eb0a893c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2002-12-04"
-              },
-              "meta" : {
-                "globalKey" : "eb0a893c"
-              }
-            },
-            "payout" : {
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204b"
+                    },
+                    "rollConvention" : "4"
+                  },
+                  "meta" : {
+                    "globalKey" : "204b"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-03-04",
+                  "meta" : {
+                    "globalKey" : "74738166"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c21929fa"
+                }
+              } ],
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "e0cb4695"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "8ecc364d"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
+                      "category" : "BondOrLoan",
+                      "notSubordinated" : true,
+                      "specifiedCurrency" : {
+                        "applicable" : true,
+                        "currency" : {
+                          "value" : "AUD"
+                        }
+                      },
+                      "notContingent" : true,
                       "assignableLoan" : {
                         "applicable" : true
                       },
-                      "category" : "BOND_OR_LOAN",
                       "consentRequiredLoan" : {
                         "applicable" : true
                       },
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
-                      "notContingent" : true,
-                      "notSubordinated" : true,
-                      "specifiedCurrency" : {
-                        "applicable" : true,
-                        "currency" : {
-                          "value" : "AUD"
+                        "meta" : {
+                          "globalKey" : "3fb"
                         }
                       },
-                      "transferable" : true
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "1f4131d8"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 30
+                      "globalKey" : "cd422190"
                     }
                   }
                 },
@@ -226,329 +241,314 @@
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "GG3682",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "GG3682"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "d14d4364"
-                      },
                       "name" : {
                         "value" : "AMP Group Holdings Limited"
+                      },
+                      "meta" : {
+                        "globalKey" : "d14d4364",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligor" : {
-                        "meta" : {
-                          "globalKey" : "50746d95"
-                        },
-                        "name" : {
-                          "value" : "AMP (UK) Financial Services Plc"
-                        }
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "XS0092202836",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "XS0092202836"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "d53f660a"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligor" : {
+                        "name" : {
+                          "value" : "AMP (UK) Financial Services Plc"
+                        },
+                        "meta" : {
+                          "globalKey" : "50746d95"
+                        }
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : 1.0,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.0,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "26732c4"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "publicSource" : [ "The Australian Financial Review" ],
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000.0,
-                      "meta" : {
-                        "globalKey" : "d467e427"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 1000000.0,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000.0,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "e1f3d9b2"
-                    },
                     "restructuring" : {
                       "applicable" : true,
                       "restructuringType" : {
-                        "value" : "MOD_R"
+                        "value" : "ModR"
                       }
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "ab6c6f27"
-                  },
-                  "obligations" : {
-                    "category" : "BORROWED_MONEY"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d1f"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "4"
-                  },
-                  "meta" : {
-                    "globalKey" : "12d1f"
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "db64010c"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-04",
-                  "meta" : {
-                    "globalKey" : "74738a12"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
+                    "defaultRequirement" : {
+                      "value" : 10000000.0,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "d467e427"
                       }
-                    }
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "295a29d0"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    }, {
-                      "value" : "AUSY"
-                    } ],
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "publicSource" : [ "The Australian Financial Review" ],
+                        "specifiedNumber" : 2
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "81e165ef"
+                      "globalKey" : "98a09cd2"
                     }
                   },
-                  "businessDayConvention" : "MODFOLLOWING",
+                  "obligations" : {
+                    "category" : "BorrowedMoney"
+                  },
                   "meta" : {
-                    "globalKey" : "58641940"
+                    "globalKey" : "69f4ea47"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "34ad82bc"
-                },
-                "unadjustedDate" : "2007-12-04"
+                  "globalKey" : "d5a33194"
+                }
               },
               "meta" : {
-                "globalKey" : "34ad82bc"
+                "globalKey" : "58a6740e"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "28403808"
+            "globalKey" : "4103a3ce"
           }
         },
         "meta" : {
-          "globalKey" : "28403808"
+          "globalKey" : "4103a3ce"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a3f082cf"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0056,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0056,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000.0
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d467e427"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "da1fd711"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000.0
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "b894a0b9"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9303"
-      },
-      "value" : "2002-12-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37258"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "af3d1b3c"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37258"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af3d1b3d"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditRestructuring"
+              }
+            }, {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditSuccessorAndCreditEvents"
+              }
+            }, {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "e00ce397"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "27fc7ca6"
+      }
+    },
+    "meta" : {
+      "globalKey" : "2274ebab"
+    }
+  },
+  "meta" : {
+    "globalKey" : "2274ebab"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex04-short-aussie-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex04-short-aussie-corp-fixreg.json
index 13b2216558..6dab0842b0 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex04-short-aussie-corp-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex04-short-aussie-corp-fixreg.json
@@ -1,85 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "7c16a987"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2001-01-03",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_1999_CREDIT"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "xyz1234",
+          "meta" : {
+            "scheme" : "http://www.xyzbank.com/cd-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "477ee6c7"
         }
       } ],
       "meta" : {
-        "globalKey" : "477ee6c7"
+        "globalKey" : "36aee370"
       }
-    },
-    "meta" : {
-      "globalKey" : "7c16a987"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "abc1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.abcbank.com/cd-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "4d7c7218"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-03",
+      "meta" : {
+        "globalKey" : "3e9303"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -89,271 +49,311 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-12-04",
                 "meta" : {
                   "globalKey" : "3e9304"
-                },
-                "unadjustedDate" : "2002-12-04"
+                }
               },
               "meta" : {
                 "globalKey" : "3e9304"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-12-04",
+                "meta" : {
+                  "globalKey" : "3ebb04"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ebb04"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204b"
+                    },
+                    "rollConvention" : "4"
+                  },
+                  "meta" : {
+                    "globalKey" : "204b"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
+                  "firstPaymentDate" : "2003-03-04",
+                  "meta" : {
+                    "globalKey" : "74738166"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "e1a514da"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "0C575S",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "0C575S"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "c9147109"
-                      },
                       "name" : {
                         "value" : "Amcor Ltd"
+                      },
+                      "meta" : {
+                        "globalKey" : "c9147109",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligor" : {
-                        "meta" : {
-                          "globalKey" : "890343f2"
-                        },
-                        "name" : {
-                          "value" : "Sunclipse, Inc."
-                        }
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "US867211AA21",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "US867211AA21"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "8ae7145"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligor" : {
+                        "name" : {
+                          "value" : "Sunclipse, Inc."
+                        },
+                        "meta" : {
+                          "globalKey" : "890343f2"
+                        }
                       }
                     } ]
                   }
                 },
-                "meta" : {
-                  "globalKey" : "b4610036"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "meta" : {
-                      "globalKey" : "4741344"
-                    },
                     "restructuring" : {
                       "applicable" : true,
                       "restructuringType" : {
-                        "value" : "MOD_R"
+                        "value" : "ModR"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "4741344"
                     }
                   },
                   "meta" : {
                     "globalKey" : "4741344"
                   }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d1f"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "4"
-                  },
-                  "meta" : {
-                    "globalKey" : "12d1f"
-                  }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "4e603fac"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-04",
-                  "meta" : {
-                    "globalKey" : "74738a12"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "29d92fbe"
                 }
-              } ],
-              "meta" : {
-                "globalKey" : "6e71de62"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ebb04"
-                },
-                "unadjustedDate" : "2007-12-04"
               },
               "meta" : {
-                "globalKey" : "3ebb04"
+                "globalKey" : "96c6c124"
               }
             }
           },
           "meta" : {
-            "globalKey" : "104d9fde"
+            "globalKey" : "dfb2daa4"
           }
         },
         "meta" : {
-          "globalKey" : "104d9fde"
+          "globalKey" : "dfb2daa4"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "ef30e58"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0056,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0056,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d467e427"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "cf6ebca8"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "b894a0b9"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9303"
-      },
-      "value" : "2002-12-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.xyzbank.com/cd-trade-id"
-          },
-          "value" : "xyz1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "ea5bbca6"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.abcbank.com/cd-trade-id"
-          },
-          "value" : "abc1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "824b68b0"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2001-01-03",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA1999Credit"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "477ee6c7"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "477ee6c7"
+      }
+    },
+    "meta" : {
+      "globalKey" : "9aeae8b9"
+    }
+  },
+  "meta" : {
+    "globalKey" : "9aeae8b9"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex05-long-emasia-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex05-long-emasia-corp-fixreg.json
index c61b17e9a5..1fb98a560a 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex05-long-emasia-corp-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex05-long-emasia-corp-fixreg.json
@@ -1,113 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "311f8e8f"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_SUCCESSOR_AND_CREDIT_EVENTS"
-              }
-            }, {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
-              }
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "37260",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "91a1d99b"
         }
       } ],
       "meta" : {
-        "globalKey" : "e82472ec"
+        "globalKey" : "9862ef9d"
       }
-    },
-    "meta" : {
-      "globalKey" : "311f8e8f"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37260",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "986363fc"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-08-22",
+      "meta" : {
+        "globalKey" : "3e9216"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -115,13 +47,52 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-08-28",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb072254"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "meta" : {
+                "globalKey" : "eb072254"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-08-28",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "42f910b"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97b8e49c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "6cf5d300"
+                }
+              },
+              "meta" : {
+                "globalKey" : "6cf5d300"
+              }
             },
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "GBLO"
@@ -132,84 +103,130 @@
                   "globalKey" : "42f910b"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "97b8e49c"
               }
             },
-            "effectiveDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
+            "payout" : {
+              "interestRatePayout" : [ {
+                "payerReceiver" : {
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "eb072254"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2002-08-28"
-              },
-              "meta" : {
-                "globalKey" : "eb072254"
-              }
-            },
-            "payout" : {
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f7b"
+                    },
+                    "rollConvention" : "28"
+                  },
+                  "meta" : {
+                    "globalKey" : "17f7b"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2002-11-28",
+                  "meta" : {
+                    "globalKey" : "71c4304e"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "65477b2"
+                }
+              } ],
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "5b2a6e23"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "f8354c3f"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
-                      "assignableLoan" : {
+                      "category" : "BondOrLoan",
+                      "notSubordinated" : true,
+                      "specifiedCurrency" : {
                         "applicable" : true
                       },
-                      "category" : "BOND_OR_LOAN",
-                      "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
+                      "notSovereignLender" : true,
+                      "notDomesticLaw" : true,
                       "notContingent" : true,
                       "notDomesticIssuance" : true,
-                      "notDomesticLaw" : true,
-                      "notSovereignLender" : true,
-                      "notSubordinated" : true,
-                      "specifiedCurrency" : {
+                      "assignableLoan" : {
                         "applicable" : true
                       },
-                      "transferable" : true
+                      "transferable" : true,
+                      "maximumMaturity" : {
+                        "periodMultiplier" : 30,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
+                      },
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "86788e80"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 30
+                      "globalKey" : "23836c9c"
                     }
                   }
                 },
@@ -217,99 +234,75 @@
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "7I343A",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "7I343A"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "8695044e"
-                      },
                       "name" : {
                         "value" : "People's Republic of China"
+                      },
+                      "meta" : {
+                        "globalKey" : "8695044e",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "8695044e"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "US061194AB21",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "US061194AB21"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "d006af0e"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "8695044e",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : 1.0,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.0,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "53b5e15c"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000.0,
-                      "meta" : {
-                        "globalKey" : "d467e427"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 1000000.0,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000.0,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "fd4735fd"
-                    },
                     "obligationAcceleration" : true,
                     "repudiationMoratorium" : true,
                     "restructuring" : {
@@ -317,231 +310,238 @@
                       "restructuringType" : {
                         "value" : "R"
                       }
+                    },
+                    "defaultRequirement" : {
+                      "value" : 10000000.0,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "d467e427"
+                      }
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "e64fa283"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "70845dc"
-                  },
                   "obligations" : {
-                    "category" : "BOND_OR_LOAN",
+                    "category" : "BondOrLoan",
+                    "notSubordinated" : true,
+                    "notSovereignLender" : true,
                     "notDomesticCurrency" : {
                       "applicable" : true
                     },
-                    "notDomesticIssuance" : true,
                     "notDomesticLaw" : true,
-                    "notSovereignLender" : true,
-                    "notSubordinated" : true
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c4f"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "28"
+                    "notDomesticIssuance" : true
                   },
                   "meta" : {
-                    "globalKey" : "28c4f"
+                    "globalKey" : "e2b6cc62"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "e78e2c54"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2002-11-28",
-                  "meta" : {
-                    "globalKey" : "71c438fa"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "f50089e2"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "4581c7b0"
+                "globalKey" : "8fa162f0"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "42f910b"
-                    }
-                  },
-                  "businessDayConvention" : "MODFOLLOWING",
-                  "meta" : {
-                    "globalKey" : "97b8e49c"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "6cf5d300"
-                },
-                "unadjustedDate" : "2007-08-28"
-              },
-              "meta" : {
-                "globalKey" : "6cf5d300"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "684a3ff0"
+            "globalKey" : "2805f6c0"
           }
         },
         "meta" : {
-          "globalKey" : "684a3ff0"
+          "globalKey" : "2805f6c0"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3473b0d5"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0085,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0085,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000.0
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "5a0269cb"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000.0
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9216"
-      },
-      "value" : "2002-08-22"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37260"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "af3d7193"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37260"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af3d7194"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditSuccessorAndCreditEvents"
+              }
+            }, {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "91a1d99b"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "e82472ec"
+      }
+    },
+    "meta" : {
+      "globalKey" : "3b9a9093"
+    }
+  },
+  "meta" : {
+    "globalKey" : "3b9a9093"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex06-long-emeur-sov-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex06-long-emeur-sov-fixreg.json
index 58f1f81022..98ba7c1701 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex06-long-emeur-sov-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex06-long-emeur-sov-fixreg.json
@@ -1,109 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "5318c492"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
-              }
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "37261",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "2972ee0a"
         }
       } ],
       "meta" : {
-        "globalKey" : "1f123e59"
+        "globalKey" : "9862ef9e"
       }
-    },
-    "meta" : {
-      "globalKey" : "5318c492"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37261",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "986363fd"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-07-10",
+      "meta" : {
+        "globalKey" : "3e91ca"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -111,13 +47,52 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-07-11",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb05f243"
+                }
+              },
+              "meta" : {
+                "globalKey" : "eb05f243"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-07-11",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "42f910b"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97b8e49c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "854fa871"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "meta" : {
+                "globalKey" : "854fa871"
+              }
             },
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "GBLO"
@@ -128,73 +103,119 @@
                   "globalKey" : "42f910b"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "97b8e49c"
               }
             },
-            "effectiveDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
+            "payout" : {
+              "interestRatePayout" : [ {
+                "payerReceiver" : {
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "eb05f243"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2002-07-11"
-              },
-              "meta" : {
-                "globalKey" : "eb05f243"
-              }
-            },
-            "payout" : {
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f55"
+                    },
+                    "rollConvention" : "11"
+                  },
+                  "meta" : {
+                    "globalKey" : "17f55"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2002-10-11",
+                  "meta" : {
+                    "globalKey" : "719f5e3f"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c5577e09"
+                }
+              } ],
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "b7d5b000"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "54f32a42"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDaysNotSpecified" : true
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
-                      "category" : "BOND",
-                      "notBearer" : true,
-                      "notContingent" : true,
-                      "notDomesticIssuance" : true,
-                      "notDomesticLaw" : true,
+                      "category" : "Bond",
                       "notSubordinated" : true,
                       "specifiedCurrency" : {
                         "applicable" : true
                       },
-                      "transferable" : true
+                      "notDomesticLaw" : true,
+                      "notContingent" : true,
+                      "notDomesticIssuance" : true,
+                      "transferable" : true,
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "fee69a1d"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDaysNotSpecified" : true
+                      "globalKey" : "9c04145f"
                     }
                   }
                 },
@@ -202,98 +223,74 @@
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "1D216P",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "1D216P"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "b489e2c8"
-                      },
                       "name" : {
                         "value" : "Republic of Bulgaria"
+                      },
+                      "meta" : {
+                        "globalKey" : "b489e2c8",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "b489e2c8"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "XS0145624432",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "XS0145624432"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "7c111a7"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "b489e2c8",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : 1.0,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.0,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "49f4f931"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000.0,
-                      "meta" : {
-                        "globalKey" : "d467e427"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 1000000.0,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000.0,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "5904ee2e"
-                    },
                     "obligationAcceleration" : true,
                     "repudiationMoratorium" : true,
                     "restructuring" : {
@@ -301,230 +298,233 @@
                       "restructuringType" : {
                         "value" : "R"
                       }
+                    },
+                    "defaultRequirement" : {
+                      "value" : 10000000.0,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "d467e427"
+                      }
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "420d5ab4"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "5cff1d2d"
-                  },
                   "obligations" : {
-                    "category" : "BOND",
+                    "category" : "Bond",
+                    "notSubordinated" : true,
                     "notDomesticCurrency" : {
                       "applicable" : true
                     },
-                    "notDomesticIssuance" : true,
                     "notDomesticLaw" : true,
-                    "notSubordinated" : true
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c29"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "11"
+                    "notDomesticIssuance" : true
                   },
                   "meta" : {
-                    "globalKey" : "28c29"
+                    "globalKey" : "19c2ade7"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "10c2e41d"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2002-10-11",
-                  "meta" : {
-                    "globalKey" : "719f66eb"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "9daa6a45"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "8c85ace"
+                "globalKey" : "3607d9c"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "42f910b"
-                    }
-                  },
-                  "businessDayConvention" : "MODFOLLOWING",
-                  "meta" : {
-                    "globalKey" : "97b8e49c"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "854fa871"
-                },
-                "unadjustedDate" : "2006-07-11"
-              },
-              "meta" : {
-                "globalKey" : "854fa871"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "66f5f92e"
+            "globalKey" : "1bb518cc"
           }
         },
         "meta" : {
-          "globalKey" : "66f5f92e"
+          "globalKey" : "1bb518cc"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "9ebf521d"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0027,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0027,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000.0
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "392af183"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000.0
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e91ca"
-      },
-      "value" : "2002-07-10"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37261"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "af3d7554"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37261"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af3d7555"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "2972ee0a"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "1f123e59"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "efb4389e"
+    }
+  },
+  "meta" : {
+    "globalKey" : "efb4389e"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex07-2003-long-euro-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex07-2003-long-euro-corp-fixreg.json
index 46f98dd769..bfdd44961c 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex07-2003-long-euro-corp-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex07-2003-long-euro-corp-fixreg.json
@@ -1,109 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "bc3cc540"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "37262",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "955bda07"
         }
       } ],
       "meta" : {
-        "globalKey" : "8afb2a56"
+        "globalKey" : "9862ef9f"
       }
-    },
-    "meta" : {
-      "globalKey" : "bc3cc540"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37262",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "986363fe"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-02",
+      "meta" : {
+        "globalKey" : "3e9302"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -111,30 +47,26 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "EUTA"
-                } ],
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-12-03",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
                 "meta" : {
-                  "globalKey" : "428533f"
+                  "globalKey" : "eb0a857b"
                 }
               },
-              "businessDayConvention" : "FOLLOWING",
               "meta" : {
-                "globalKey" : "da4e2f6e"
+                "globalKey" : "eb0a857b"
               }
             },
-            "effectiveDate" : {
+            "terminationDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2008-01-15",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -142,387 +74,455 @@
                   }
                 },
                 "meta" : {
-                  "globalKey" : "eb0a857b"
-                },
-                "unadjustedDate" : "2002-12-03"
+                  "globalKey" : "ebb48fc7"
+                }
               },
               "meta" : {
-                "globalKey" : "eb0a857b"
+                "globalKey" : "ebb48fc7"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "EUTA"
+                } ],
+                "meta" : {
+                  "globalKey" : "428533f"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da4e2f6e"
               }
             },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f59"
+                    },
+                    "rollConvention" : "15"
                   },
+                  "meta" : {
+                    "globalKey" : "17f59"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-01-15",
+                  "meta" : {
+                    "globalKey" : "743e51fb"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "cec9d441"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "faf78580"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "145e2298"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
+                      "category" : "BondOrLoan",
+                      "notSubordinated" : true,
+                      "specifiedCurrency" : {
+                        "applicable" : true
+                      },
+                      "notContingent" : true,
                       "assignableLoan" : {
                         "applicable" : true
                       },
-                      "category" : "BOND_OR_LOAN",
                       "consentRequiredLoan" : {
                         "applicable" : true
                       },
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
-                      "notContingent" : true,
-                      "notSubordinated" : true,
-                      "specifiedCurrency" : {
-                        "applicable" : true
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
                       },
-                      "transferable" : true
+                      "notBearer" : true
                     },
                     "escrow" : true,
+                    "sixtyBusinessDaySettlementCap" : true,
                     "meta" : {
-                      "globalKey" : "f6ab2c99"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 30
-                    },
-                    "sixtyBusinessDaySettlementCap" : true
+                      "globalKey" : "1011c9b1"
+                    }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
-                    "allGuarantees" : true,
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "4A7324",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "4A7324"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "68c6dc05"
-                      },
                       "name" : {
                         "value" : "Invensys plc"
+                      },
+                      "meta" : {
+                        "globalKey" : "68c6dc05",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "68c6dc05"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "US826166AA89",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "US826166AA89"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "23a3fe83"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "68c6dc05",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
+                    "allGuarantees" : true,
                     "referencePrice" : {
+                      "value" : 1.0,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "value" : 1.0,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "7b64b258"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000.0,
-                      "meta" : {
-                        "globalKey" : "d467e427"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 1000000.0,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000.0,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "a4743943"
-                    },
                     "restructuring" : {
                       "applicable" : true,
-                      "multipleCreditEventNotices" : true,
-                      "multipleHolderObligation" : true,
                       "restructuringType" : {
-                        "value" : "MOD_MOD_R"
+                        "value" : "ModModR"
+                      },
+                      "multipleHolderObligation" : true,
+                      "multipleCreditEventNotices" : true
+                    },
+                    "defaultRequirement" : {
+                      "value" : 10000000.0,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "d467e427"
+                      }
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "ee3569fd"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "cf532e78"
-                  },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c2d"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "15"
+                    "category" : "BorrowedMoney"
                   },
                   "meta" : {
-                    "globalKey" : "28c2d"
+                    "globalKey" : "ad8b18b2"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "63c351e5"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-01-15",
-                  "meta" : {
-                    "globalKey" : "743e5aa7"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "f2a43286"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "f46f683d"
+                "globalKey" : "b7426807"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "ebb48fc7"
-                },
-                "unadjustedDate" : "2008-01-15"
-              },
-              "meta" : {
-                "globalKey" : "ebb48fc7"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "3a9a5c7f"
+            "globalKey" : "26eedf8d"
           }
         },
         "meta" : {
-          "globalKey" : "3a9a5c7f"
+          "globalKey" : "26eedf8d"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "f04dbb19"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.009,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.009,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 5000000.0
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10a70d"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "1969a807"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 5000000.0
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "28043a93"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9302"
-      },
-      "value" : "2002-12-02"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37262"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "af3d7915"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37262"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af3d7916"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "955bda07"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "8afb2a56"
+      }
+    },
+    "meta" : {
+      "globalKey" : "daf1421a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "daf1421a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex07-long-euro-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex07-long-euro-corp-fixreg.json
index f3ca645cb2..316aa0475d 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex07-long-euro-corp-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex07-long-euro-corp-fixreg.json
@@ -1,113 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "1ce70546"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_SUCCESSOR_AND_CREDIT_EVENTS"
-              }
-            }, {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
-              }
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "37262",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "91a1d99b"
         }
       } ],
       "meta" : {
-        "globalKey" : "e82472ec"
+        "globalKey" : "9862ef9f"
       }
-    },
-    "meta" : {
-      "globalKey" : "1ce70546"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37262",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "986363fe"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-02",
+      "meta" : {
+        "globalKey" : "3e9302"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -115,13 +47,52 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-12-03",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb0a857b"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "meta" : {
+                "globalKey" : "eb0a857b"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2008-01-15",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "EUTA"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "428533f"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97b1a6d0"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "65d7bfa1"
+                }
+              },
+              "meta" : {
+                "globalKey" : "65d7bfa1"
+              }
             },
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "GBLO"
@@ -132,84 +103,130 @@
                   "globalKey" : "428533f"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "97b1a6d0"
               }
             },
-            "effectiveDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
+            "payout" : {
+              "interestRatePayout" : [ {
+                "payerReceiver" : {
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "eb0a857b"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2002-12-03"
-              },
-              "meta" : {
-                "globalKey" : "eb0a857b"
-              }
-            },
-            "payout" : {
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f59"
+                    },
+                    "rollConvention" : "15"
+                  },
+                  "meta" : {
+                    "globalKey" : "17f59"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-01-15",
+                  "meta" : {
+                    "globalKey" : "743e51fb"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "cec9d441"
+                }
+              } ],
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "1b56c801"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "34bd6519"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
+                      "category" : "BondOrLoan",
+                      "notSubordinated" : true,
+                      "specifiedCurrency" : {
+                        "applicable" : true
+                      },
+                      "notContingent" : true,
                       "assignableLoan" : {
                         "applicable" : true
                       },
-                      "category" : "BOND_OR_LOAN",
                       "consentRequiredLoan" : {
                         "applicable" : true
                       },
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
-                      "notContingent" : true,
-                      "notSubordinated" : true,
-                      "specifiedCurrency" : {
-                        "applicable" : true
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
                       },
-                      "transferable" : true
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "237559c8"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 30
+                      "globalKey" : "3cdbf6e0"
                     }
                   }
                 },
@@ -217,322 +234,305 @@
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "4A7324",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "4A7324"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "68c6dc05"
-                      },
                       "name" : {
                         "value" : "Invensys plc"
+                      },
+                      "meta" : {
+                        "globalKey" : "68c6dc05",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "68c6dc05"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "US826166AA89",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "US826166AA89"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "23a3fe83"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "68c6dc05",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : 1.0,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "value" : 1.0,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "82e6ed00"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000.0,
-                      "meta" : {
-                        "globalKey" : "d467e427"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 1000000.0,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000.0,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "8d86ebdd"
-                    },
                     "restructuring" : {
                       "applicable" : true,
                       "restructuringType" : {
                         "value" : "R"
                       }
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "be83a292"
-                  },
-                  "obligations" : {
-                    "category" : "BORROWED_MONEY"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c2d"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "15"
-                  },
-                  "meta" : {
-                    "globalKey" : "28c2d"
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "63c351e5"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-01-15",
-                  "meta" : {
-                    "globalKey" : "743e5aa7"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
+                    "defaultRequirement" : {
+                      "value" : 10000000.0,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "d467e427"
                       }
-                    }
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "12f1bee5"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "EUTA"
-                    } ],
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "428533f"
+                      "globalKey" : "768f5863"
                     }
                   },
-                  "businessDayConvention" : "MODFOLLOWING",
+                  "obligations" : {
+                    "category" : "BorrowedMoney"
+                  },
                   "meta" : {
-                    "globalKey" : "97b1a6d0"
+                    "globalKey" : "87230598"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "65d7bfa1"
-                },
-                "unadjustedDate" : "2008-01-15"
+                  "globalKey" : "5a2159ca"
+                }
               },
               "meta" : {
-                "globalKey" : "65d7bfa1"
+                "globalKey" : "b77077cb"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "7d4af1f3"
+            "globalKey" : "902ee7df"
           }
         },
         "meta" : {
-          "globalKey" : "7d4af1f3"
+          "globalKey" : "902ee7df"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "f04dbb19"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.009,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.009,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 5000000.0
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10a70d"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "1969a807"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 5000000.0
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "28043a93"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9302"
-      },
-      "value" : "2002-12-02"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37262"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "af3d7915"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37262"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af3d7916"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditSuccessorAndCreditEvents"
+              }
+            }, {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "91a1d99b"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "e82472ec"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "213b835c"
+    }
+  },
+  "meta" : {
+    "globalKey" : "213b835c"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex08-2003-short-euro-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex08-2003-short-euro-corp-fixreg.json
index 560a5fcd03..16282f1c02 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex08-2003-short-euro-corp-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex08-2003-short-euro-corp-fixreg.json
@@ -1,85 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "d6e2a5ce"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2003-06-06",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_2003_CREDIT_EUROPEAN"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "xyz1234",
+          "meta" : {
+            "scheme" : "http://www.xyzbank.com/cd-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "12bff31b"
         }
       } ],
       "meta" : {
-        "globalKey" : "12bff31b"
+        "globalKey" : "36aee370"
       }
-    },
-    "meta" : {
-      "globalKey" : "d6e2a5ce"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "abc1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.abcbank.com/cd-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "4d7c7218"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-02",
+      "meta" : {
+        "globalKey" : "3e9302"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -89,261 +49,301 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-12-03",
                 "meta" : {
                   "globalKey" : "3e9303"
-                },
-                "unadjustedDate" : "2002-12-03"
+                }
               },
               "meta" : {
                 "globalKey" : "3e9303"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2008-01-15",
+                "meta" : {
+                  "globalKey" : "3ec04f"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ec04f"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f59"
+                    },
+                    "rollConvention" : "15"
+                  },
+                  "meta" : {
+                    "globalKey" : "17f59"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
+                  "firstPaymentDate" : "2003-01-15",
+                  "meta" : {
+                    "globalKey" : "743e51fb"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ee55bf21"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "002BB2",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "002BB2"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "9d5d9084"
-                      },
                       "name" : {
                         "value" : "Abbey National PLC"
+                      },
+                      "meta" : {
+                        "globalKey" : "9d5d9084",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligor" : {
-                        "entityId" : [ {
-                          "meta" : {
-                            "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                          },
-                          "value" : "GLEECI"
-                        } ],
-                        "meta" : {
-                          "globalKey" : "8b95e30a"
-                        },
-                        "name" : {
-                          "value" : "Abbey National Treasury Services plc"
-                        }
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "XS009316049",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "XS009316049"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "4bd6310a"
-                            },
-                            "source" : "ISIN"
+                            }
+                          }
+                        } ],
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligor" : {
+                        "entityId" : [ {
+                          "value" : "GLEECI",
+                          "meta" : {
+                            "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "name" : {
+                          "value" : "Abbey National Treasury Services plc"
+                        },
+                        "meta" : {
+                          "globalKey" : "8b95e30a"
+                        }
                       }
                     } ]
                   }
                 },
                 "meta" : {
-                  "globalKey" : "f895441a"
+                  "globalKey" : "b2f7757c"
                 }
               },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c2d"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "15"
-                  },
-                  "meta" : {
-                    "globalKey" : "28c2d"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "11179c05"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-01-15",
-                  "meta" : {
-                    "globalKey" : "743e5aa7"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
-                }
-              } ],
               "meta" : {
-                "globalKey" : "13b1cd9f"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ec04f"
-                },
-                "unadjustedDate" : "2008-01-15"
-              },
-              "meta" : {
-                "globalKey" : "3ec04f"
+                "globalKey" : "804a4d7b"
               }
             }
           },
           "meta" : {
-            "globalKey" : "1cbb0ced"
+            "globalKey" : "215a05e7"
           }
         },
         "meta" : {
-          "globalKey" : "1cbb0ced"
+          "globalKey" : "215a05e7"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "44142174"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.009,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.009,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10a70d"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "3e700d0c"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "28043a93"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9302"
-      },
-      "value" : "2002-12-02"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.xyzbank.com/cd-trade-id"
-          },
-          "value" : "xyz1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "ea5bbca6"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.abcbank.com/cd-trade-id"
-          },
-          "value" : "abc1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "824b68b0"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2003-06-06",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2003CreditEuropean"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "12bff31b"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "12bff31b"
+      }
+    },
+    "meta" : {
+      "globalKey" : "724d7b60"
+    }
+  },
+  "meta" : {
+    "globalKey" : "724d7b60"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex08-short-euro-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex08-short-euro-corp-fixreg.json
index 77acebe4fb..f596471e56 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex08-short-euro-corp-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex08-short-euro-corp-fixreg.json
@@ -1,85 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "571d19a2"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2001-01-03",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_1999_CREDIT"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "xyz1234",
+          "meta" : {
+            "scheme" : "http://www.xyzbank.com/cd-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "477ee6c7"
         }
       } ],
       "meta" : {
-        "globalKey" : "477ee6c7"
+        "globalKey" : "36aee370"
       }
-    },
-    "meta" : {
-      "globalKey" : "571d19a2"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "abc1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.abcbank.com/cd-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "4d7c7218"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-02",
+      "meta" : {
+        "globalKey" : "3e9302"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -89,261 +49,301 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-12-03",
                 "meta" : {
                   "globalKey" : "3e9303"
-                },
-                "unadjustedDate" : "2002-12-03"
+                }
               },
               "meta" : {
                 "globalKey" : "3e9303"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2008-01-15",
+                "meta" : {
+                  "globalKey" : "3ec04f"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ec04f"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f59"
+                    },
+                    "rollConvention" : "15"
+                  },
+                  "meta" : {
+                    "globalKey" : "17f59"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
+                  "firstPaymentDate" : "2003-01-15",
+                  "meta" : {
+                    "globalKey" : "743e51fb"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ee55bf21"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "002BB2",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "002BB2"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "9d5d9084"
-                      },
                       "name" : {
                         "value" : "Abbey National PLC"
+                      },
+                      "meta" : {
+                        "globalKey" : "9d5d9084",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligor" : {
-                        "entityId" : [ {
-                          "meta" : {
-                            "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                          },
-                          "value" : "GLEECI"
-                        } ],
-                        "meta" : {
-                          "globalKey" : "8b95e30a"
-                        },
-                        "name" : {
-                          "value" : "Abbey National Treasury Services plc"
-                        }
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "XS009316049",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "XS009316049"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "4bd6310a"
-                            },
-                            "source" : "ISIN"
+                            }
+                          }
+                        } ],
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligor" : {
+                        "entityId" : [ {
+                          "value" : "GLEECI",
+                          "meta" : {
+                            "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "name" : {
+                          "value" : "Abbey National Treasury Services plc"
+                        },
+                        "meta" : {
+                          "globalKey" : "8b95e30a"
+                        }
                       }
                     } ]
                   }
                 },
                 "meta" : {
-                  "globalKey" : "f895441a"
+                  "globalKey" : "b2f7757c"
                 }
               },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c2d"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "15"
-                  },
-                  "meta" : {
-                    "globalKey" : "28c2d"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "11179c05"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-01-15",
-                  "meta" : {
-                    "globalKey" : "743e5aa7"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
-                }
-              } ],
               "meta" : {
-                "globalKey" : "13b1cd9f"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ec04f"
-                },
-                "unadjustedDate" : "2008-01-15"
-              },
-              "meta" : {
-                "globalKey" : "3ec04f"
+                "globalKey" : "804a4d7b"
               }
             }
           },
           "meta" : {
-            "globalKey" : "1cbb0ced"
+            "globalKey" : "215a05e7"
           }
         },
         "meta" : {
-          "globalKey" : "1cbb0ced"
+          "globalKey" : "215a05e7"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "44142174"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.009,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.009,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10a70d"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "3e700d0c"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "28043a93"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9302"
-      },
-      "value" : "2002-12-02"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.xyzbank.com/cd-trade-id"
-          },
-          "value" : "xyz1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "ea5bbca6"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.abcbank.com/cd-trade-id"
-          },
-          "value" : "abc1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "824b68b0"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2001-01-03",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA1999Credit"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "477ee6c7"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "477ee6c7"
+      }
+    },
+    "meta" : {
+      "globalKey" : "a70c6f0c"
+    }
+  },
+  "meta" : {
+    "globalKey" : "a70c6f0c"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex09-long-euro-sov-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex09-long-euro-sov-fixreg.json
index b2309666c2..4c59d19acf 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex09-long-euro-sov-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex09-long-euro-sov-fixreg.json
@@ -1,109 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "2335ac3f"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
-              }
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "37263",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "2972ee0a"
         }
       } ],
       "meta" : {
-        "globalKey" : "1f123e59"
+        "globalKey" : "9862efa0"
       }
-    },
-    "meta" : {
-      "globalKey" : "2335ac3f"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37263",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "986363ff"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-11-13",
+      "meta" : {
+        "globalKey" : "3e92cd"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -111,30 +47,26 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-11-14",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
                 "meta" : {
-                  "globalKey" : "42f910b"
+                  "globalKey" : "eb09be86"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
-                "globalKey" : "97b8e49c"
+                "globalKey" : "eb09be86"
               }
             },
-            "effectiveDate" : {
+            "terminationDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2007-11-14",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -142,70 +74,149 @@
                   }
                 },
                 "meta" : {
-                  "globalKey" : "eb09be86"
-                },
-                "unadjustedDate" : "2002-11-14"
+                  "globalKey" : "eb9fe686"
+                }
               },
               "meta" : {
-                "globalKey" : "eb09be86"
+                "globalKey" : "eb9fe686"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "97b8e49c"
               }
             },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f58"
+                    },
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "17f58"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
+                  "firstPaymentDate" : "2003-02-14",
+                  "meta" : {
+                    "globalKey" : "745af55c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "cd319f03"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "10779c5"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "1a6e16dd"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
+                      "category" : "BondOrLoan",
+                      "specifiedCurrency" : {
+                        "applicable" : true
+                      },
+                      "notSovereignLender" : true,
+                      "notContingent" : true,
                       "assignableLoan" : {
                         "applicable" : true
                       },
-                      "category" : "BOND_OR_LOAN",
                       "consentRequiredLoan" : {
                         "applicable" : true
                       },
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
-                      "notContingent" : true,
-                      "notSovereignLender" : true,
-                      "specifiedCurrency" : {
-                        "applicable" : true
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
                       },
-                      "transferable" : true
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "237559c8"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 30
+                      "globalKey" : "3cdbf6e0"
                     }
                   }
                 },
@@ -213,98 +224,74 @@
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "4AB951",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "4AB951"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "546f933e"
-                      },
                       "name" : {
                         "value" : "Republic of Italy"
+                      },
+                      "meta" : {
+                        "globalKey" : "546f933e",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "546f933e"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "XS0125141316",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "XS0125141316"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "2f914ab8"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "546f933e",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : 1.0,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.0,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "7c0c585d"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000.0,
-                      "meta" : {
-                        "globalKey" : "d467e427"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 1000000.0,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000.0,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "5904ee2e"
-                    },
                     "obligationAcceleration" : true,
                     "repudiationMoratorium" : true,
                     "restructuring" : {
@@ -312,214 +299,227 @@
                       "restructuringType" : {
                         "value" : "R"
                       }
+                    },
+                    "defaultRequirement" : {
+                      "value" : 10000000.0,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "d467e427"
+                      }
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "420d5ab4"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "a28a54a3"
-                  },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c2c"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "14"
+                    "category" : "BorrowedMoney"
                   },
                   "meta" : {
-                    "globalKey" : "28c2c"
+                    "globalKey" : "6b29b7a9"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "d3873423"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-02-14",
-                  "meta" : {
-                    "globalKey" : "745afe08"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "f584a0df"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "f988bc00"
+                "globalKey" : "8c4ebcfc"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "eb9fe686"
-                },
-                "unadjustedDate" : "2007-11-14"
-              },
-              "meta" : {
-                "globalKey" : "eb9fe686"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "54443e54"
+            "globalKey" : "8c12a3e0"
           }
         },
         "meta" : {
-          "globalKey" : "54443e54"
+          "globalKey" : "8c12a3e0"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "aff2c312"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0011,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0011,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 50000000.0
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "27faaf2b"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "4e659f2e"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 50000000.0
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "d75b3635"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e92cd"
-      },
-      "value" : "2002-11-13"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37263"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "af3d7cd6"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37263"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af3d7cd7"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "2972ee0a"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "1f123e59"
+      }
+    },
+    "meta" : {
+      "globalKey" : "e4f03f6d"
+    }
+  },
+  "meta" : {
+    "globalKey" : "e4f03f6d"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex10-2003-long-us-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex10-2003-long-us-corp-fixreg.json
index 1eaac30bed..9b4f7bce61 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex10-2003-long-us-corp-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex10-2003-long-us-corp-fixreg.json
@@ -1,109 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "c23d4332"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "37264",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "955bda07"
         }
       } ],
       "meta" : {
-        "globalKey" : "8afb2a56"
+        "globalKey" : "9862efa1"
       }
-    },
-    "meta" : {
-      "globalKey" : "c23d4332"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37264",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "98636400"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-03",
+      "meta" : {
+        "globalKey" : "3e9303"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -111,30 +47,26 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-12-04",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
                 "meta" : {
-                  "globalKey" : "42f910b"
+                  "globalKey" : "eb0a893c"
                 }
               },
-              "businessDayConvention" : "FOLLOWING",
               "meta" : {
-                "globalKey" : "da556d3a"
+                "globalKey" : "eb0a893c"
               }
             },
-            "effectiveDate" : {
+            "terminationDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2007-09-06",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -142,386 +74,454 @@
                   }
                 },
                 "meta" : {
-                  "globalKey" : "eb0a893c"
-                },
-                "unadjustedDate" : "2002-12-04"
+                  "globalKey" : "eb9de7fe"
+                }
               },
               "meta" : {
-                "globalKey" : "eb0a893c"
+                "globalKey" : "eb9de7fe"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da556d3a"
               }
             },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204d"
+                    },
+                    "rollConvention" : "6"
                   },
+                  "meta" : {
+                    "globalKey" : "204d"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-03-06",
+                  "meta" : {
+                    "globalKey" : "74746a24"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c583c3f6"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "10779c5"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "1a6e16dd"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "maximumBusinessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
+                      "category" : "BondOrLoan",
+                      "notSubordinated" : true,
+                      "specifiedCurrency" : {
+                        "applicable" : true
+                      },
+                      "notContingent" : true,
                       "assignableLoan" : {
                         "applicable" : true
                       },
-                      "category" : "BOND_OR_LOAN",
                       "consentRequiredLoan" : {
                         "applicable" : true
                       },
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
-                      "notContingent" : true,
-                      "notSubordinated" : true,
-                      "specifiedCurrency" : {
-                        "applicable" : true
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
                       },
-                      "transferable" : true
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "237559c8"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "maximumBusinessDays" : 30
+                      "globalKey" : "3cdbf6e0"
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
-                    "allGuarantees" : false,
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "008HA7",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "008HA7"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "6b99b4c1"
-                      },
                       "name" : {
                         "value" : "Agrium Inc."
+                      },
+                      "meta" : {
+                        "globalKey" : "6b99b4c1",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "6b99b4c1"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "008916AB4",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                              },
-                              "value" : "008916AB4"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "ab7bdc95"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "6b99b4c1",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
+                    "allGuarantees" : false,
                     "referencePrice" : {
+                      "value" : 1.0,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.0,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "b83ac7f4"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000.0,
-                      "meta" : {
-                        "globalKey" : "d467e427"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 1000000.0,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000.0,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "4e1ddce0"
-                    },
                     "restructuring" : {
                       "applicable" : true,
-                      "multipleCreditEventNotices" : true,
-                      "multipleHolderObligation" : true,
                       "restructuringType" : {
-                        "value" : "MOD_R"
+                        "value" : "ModR"
+                      },
+                      "multipleHolderObligation" : true,
+                      "multipleCreditEventNotices" : true
+                    },
+                    "defaultRequirement" : {
+                      "value" : 10000000.0,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "d467e427"
+                      }
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "a52a5240"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "b5225ed5"
-                  },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d21"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "6"
+                    "category" : "BorrowedMoney"
                   },
                   "meta" : {
-                    "globalKey" : "12d21"
+                    "globalKey" : "7ae6fc35"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "6ef9dd10"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-06",
-                  "meta" : {
-                    "globalKey" : "747472d0"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "5af947c8"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "aed52304"
+                "globalKey" : "8c0b6992"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "eb9de7fe"
-                },
-                "unadjustedDate" : "2007-09-06"
-              },
-              "meta" : {
-                "globalKey" : "eb9de7fe"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "dd86fc5"
+            "globalKey" : "2784849d"
           }
         },
         "meta" : {
-          "globalKey" : "dd86fc5"
+          "globalKey" : "2784849d"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "bc2d9a59"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.01,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000.0
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c985b0c7"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000.0
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9303"
-      },
-      "value" : "2002-12-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37264"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "af3d8097"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37264"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af3d8098"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "955bda07"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "8afb2a56"
+      }
+    },
+    "meta" : {
+      "globalKey" : "b941f4ec"
+    }
+  },
+  "meta" : {
+    "globalKey" : "b941f4ec"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex10-long-us-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex10-long-us-corp-fixreg.json
index 0168837ee8..7269315a53 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex10-long-us-corp-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex10-long-us-corp-fixreg.json
@@ -1,117 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "f55cb1"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_RESTRUCTURING"
-              }
-            }, {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_SUCCESSOR_AND_CREDIT_EVENTS"
-              }
-            }, {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
-              }
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "37264",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "e00ce397"
         }
       } ],
       "meta" : {
-        "globalKey" : "27fc7ca6"
+        "globalKey" : "9862efa1"
       }
-    },
-    "meta" : {
-      "globalKey" : "f55cb1"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37264",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "98636400"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-03",
+      "meta" : {
+        "globalKey" : "3e9303"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -119,13 +47,52 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-12-04",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb0a893c"
+                }
+              },
+              "meta" : {
+                "globalKey" : "eb0a893c"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-09-06",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "42f910b"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97b8e49c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "77e72f96"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "meta" : {
+                "globalKey" : "77e72f96"
+              }
             },
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "GBLO"
@@ -136,84 +103,130 @@
                   "globalKey" : "42f910b"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "97b8e49c"
               }
             },
-            "effectiveDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
+            "payout" : {
+              "interestRatePayout" : [ {
+                "payerReceiver" : {
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "eb0a893c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2002-12-04"
-              },
-              "meta" : {
-                "globalKey" : "eb0a893c"
-              }
-            },
-            "payout" : {
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204d"
+                    },
+                    "rollConvention" : "6"
+                  },
+                  "meta" : {
+                    "globalKey" : "204d"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-03-06",
+                  "meta" : {
+                    "globalKey" : "74746a24"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c583c3f6"
+                }
+              } ],
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "10779c5"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "1a6e16dd"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "maximumBusinessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
+                      "category" : "BondOrLoan",
+                      "notSubordinated" : true,
+                      "specifiedCurrency" : {
+                        "applicable" : true
+                      },
+                      "notContingent" : true,
                       "assignableLoan" : {
                         "applicable" : true
                       },
-                      "category" : "BOND_OR_LOAN",
                       "consentRequiredLoan" : {
                         "applicable" : true
                       },
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
-                      "notContingent" : true,
-                      "notSubordinated" : true,
-                      "specifiedCurrency" : {
-                        "applicable" : true
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
                       },
-                      "transferable" : true
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "237559c8"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "maximumBusinessDays" : 30
+                      "globalKey" : "3cdbf6e0"
                     }
                   }
                 },
@@ -221,322 +234,309 @@
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "008HA7",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "008HA7"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "6b99b4c1"
-                      },
                       "name" : {
                         "value" : "Agrium Inc."
+                      },
+                      "meta" : {
+                        "globalKey" : "6b99b4c1",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "6b99b4c1"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "008916AB4",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                              },
-                              "value" : "008916AB4"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "ab7bdc95"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "6b99b4c1",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : 1.0,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.0,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "46a49141"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000.0,
-                      "meta" : {
-                        "globalKey" : "d467e427"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 1000000.0,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000.0,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "91e8f1c0"
-                    },
                     "restructuring" : {
                       "applicable" : true,
                       "restructuringType" : {
-                        "value" : "MOD_R"
+                        "value" : "ModR"
                       }
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "327bbbb5"
-                  },
-                  "obligations" : {
-                    "category" : "BORROWED_MONEY"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d21"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "6"
-                  },
-                  "meta" : {
-                    "globalKey" : "12d21"
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "6ef9dd10"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-06",
-                  "meta" : {
-                    "globalKey" : "747472d0"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
                     },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
+                    "defaultRequirement" : {
+                      "value" : 10000000.0,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "d467e427"
                       }
-                    }
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "d18243d1"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    } ],
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "42f910b"
+                      "globalKey" : "8badd6a0"
                     }
                   },
-                  "businessDayConvention" : "MODFOLLOWING",
+                  "obligations" : {
+                    "category" : "BorrowedMoney"
+                  },
                   "meta" : {
-                    "globalKey" : "97b8e49c"
+                    "globalKey" : "ce9ae895"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "77e72f96"
-                },
-                "unadjustedDate" : "2007-09-06"
+                  "globalKey" : "e7a3465"
+                }
               },
               "meta" : {
-                "globalKey" : "77e72f96"
+                "globalKey" : "491e76db"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "f0b9ed94"
+            "globalKey" : "861c73e4"
           }
         },
         "meta" : {
-          "globalKey" : "f0b9ed94"
+          "globalKey" : "861c73e4"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "bc2d9a59"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.01,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000.0
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c985b0c7"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000.0
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9303"
-      },
-      "value" : "2002-12-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37264"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "af3d8097"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37264"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af3d8098"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditRestructuring"
+              }
+            }, {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditSuccessorAndCreditEvents"
+              }
+            }, {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "e00ce397"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "27fc7ca6"
+      }
+    },
+    "meta" : {
+      "globalKey" : "1fdcf15"
+    }
+  },
+  "meta" : {
+    "globalKey" : "1fdcf15"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex11-2003-short-us-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex11-2003-short-us-corp-fixreg.json
index 1aacda5711..120e14e084 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex11-2003-short-us-corp-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex11-2003-short-us-corp-fixreg.json
@@ -1,85 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "a8444683"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2003-06-06",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_2003_CREDIT_NORTH_AMERICAN"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "xyz1234",
+          "meta" : {
+            "scheme" : "http://www.xyzbank.com/cd-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "24983006"
         }
       } ],
       "meta" : {
-        "globalKey" : "24983006"
+        "globalKey" : "36aee370"
       }
-    },
-    "meta" : {
-      "globalKey" : "a8444683"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "abc1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.abcbank.com/cd-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "4d7c7218"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-03",
+      "meta" : {
+        "globalKey" : "3e9303"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -89,264 +49,304 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-12-04",
                 "meta" : {
                   "globalKey" : "3e9304"
-                },
-                "unadjustedDate" : "2002-12-04"
+                }
               },
               "meta" : {
                 "globalKey" : "3e9304"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-09-06",
+                "meta" : {
+                  "globalKey" : "3eba46"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3eba46"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204d"
+                    },
+                    "rollConvention" : "6"
                   },
+                  "meta" : {
+                    "globalKey" : "204d"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-03-06",
+                  "meta" : {
+                    "globalKey" : "74746a24"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "e50faed6"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "8G836J",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "8G836J"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "92cc27"
-                      },
                       "name" : {
                         "value" : "Tenet Healthcare Corporation"
+                      },
+                      "meta" : {
+                        "globalKey" : "92cc27",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "92cc27"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "88033GAT7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                              },
-                              "value" : "88033GAT7"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "db5db955"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "92cc27",
+                        "externalReference" : "referenceEntity"
                       }
                     } ]
                   }
                 },
-                "meta" : {
-                  "globalKey" : "dbad4007"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "meta" : {
-                      "globalKey" : "4cf"
-                    },
                     "restructuring" : {
                       "applicable" : true
+                    },
+                    "meta" : {
+                      "globalKey" : "4cf"
                     }
                   },
                   "meta" : {
                     "globalKey" : "4cf"
                   }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d21"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "6"
-                  },
-                  "meta" : {
-                    "globalKey" : "12d21"
-                  }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "e0b59430"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-06",
-                  "meta" : {
-                    "globalKey" : "747472d0"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "b13cf463"
                 }
-              } ],
-              "meta" : {
-                "globalKey" : "433b8077"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3eba46"
-                },
-                "unadjustedDate" : "2007-09-06"
               },
               "meta" : {
-                "globalKey" : "3eba46"
+                "globalKey" : "54b323b9"
               }
             }
           },
           "meta" : {
-            "globalKey" : "375c4d73"
+            "globalKey" : "829e5e37"
           }
         },
         "meta" : {
-          "globalKey" : "375c4d73"
+          "globalKey" : "829e5e37"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "1f273178"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.01,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c5befd88"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9303"
-      },
-      "value" : "2002-12-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.xyzbank.com/cd-trade-id"
-          },
-          "value" : "xyz1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "ea5bbca6"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.abcbank.com/cd-trade-id"
-          },
-          "value" : "abc1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "824b68b0"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2003-06-06",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2003CreditNorthAmerican"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "24983006"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "24983006"
+      }
+    },
+    "meta" : {
+      "globalKey" : "6f1b110b"
+    }
+  },
+  "meta" : {
+    "globalKey" : "6f1b110b"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex11-short-us-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex11-short-us-corp-fixreg.json
index 54e8c8cdaf..017697b3b3 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex11-short-us-corp-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex11-short-us-corp-fixreg.json
@@ -1,85 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "95fccd8"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2001-01-04",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_1999_CREDIT"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "xyz1234",
+          "meta" : {
+            "scheme" : "http://www.xyzbank.com/cd-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "4933bf66"
         }
       } ],
       "meta" : {
-        "globalKey" : "4933bf66"
+        "globalKey" : "36aee370"
       }
-    },
-    "meta" : {
-      "globalKey" : "95fccd8"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "abc1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.abcbank.com/cd-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "4d7c7218"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-03",
+      "meta" : {
+        "globalKey" : "3e9303"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -89,267 +49,307 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-12-04",
                 "meta" : {
                   "globalKey" : "3e9304"
-                },
-                "unadjustedDate" : "2002-12-04"
+                }
               },
               "meta" : {
                 "globalKey" : "3e9304"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-09-06",
+                "meta" : {
+                  "globalKey" : "3eba46"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3eba46"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204d"
+                    },
+                    "rollConvention" : "6"
                   },
+                  "meta" : {
+                    "globalKey" : "204d"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-03-06",
+                  "meta" : {
+                    "globalKey" : "74746a24"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "e50faed6"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "8G836J",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "8G836J"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "92cc27"
-                      },
                       "name" : {
                         "value" : "Tenet Healthcare Corporation"
+                      },
+                      "meta" : {
+                        "globalKey" : "92cc27",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "92cc27"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "88033GAT7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                              },
-                              "value" : "88033GAT7"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "db5db955"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "92cc27",
+                        "externalReference" : "referenceEntity"
                       }
                     } ]
                   }
                 },
-                "meta" : {
-                  "globalKey" : "a9bf607c"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "meta" : {
-                      "globalKey" : "4741344"
-                    },
                     "restructuring" : {
                       "applicable" : true,
                       "restructuringType" : {
-                        "value" : "MOD_R"
+                        "value" : "ModR"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "4741344"
                     }
                   },
                   "meta" : {
                     "globalKey" : "4741344"
                   }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d21"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "6"
-                  },
-                  "meta" : {
-                    "globalKey" : "12d21"
-                  }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "e0b59430"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-06",
-                  "meta" : {
-                    "globalKey" : "747472d0"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "5a336dd8"
                 }
-              } ],
-              "meta" : {
-                "globalKey" : "bbe44dac"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3eba46"
-                },
-                "unadjustedDate" : "2007-09-06"
               },
               "meta" : {
-                "globalKey" : "3eba46"
+                "globalKey" : "f8db1fae"
               }
             }
           },
           "meta" : {
-            "globalKey" : "5229c71e"
+            "globalKey" : "58e1b2ac"
           }
         },
         "meta" : {
-          "globalKey" : "5229c71e"
+          "globalKey" : "58e1b2ac"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "1f273178"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.01,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c5befd88"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9303"
-      },
-      "value" : "2002-12-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.xyzbank.com/cd-trade-id"
-          },
-          "value" : "xyz1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "ea5bbca6"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.abcbank.com/cd-trade-id"
-          },
-          "value" : "abc1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "824b68b0"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2001-01-04",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA1999Credit"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "4933bf66"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "4933bf66"
+      }
+    },
+    "meta" : {
+      "globalKey" : "bb9b4fd6"
+    }
+  },
+  "meta" : {
+    "globalKey" : "bb9b4fd6"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex12-long-emasia-sov-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex12-long-emasia-sov-fixreg.json
index b99c153aa4..7fdecd7964 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex12-long-emasia-sov-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex12-long-emasia-sov-fixreg.json
@@ -1,109 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "2ee620f"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
-              }
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "37205",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "2972ee0a"
         }
       } ],
       "meta" : {
-        "globalKey" : "1f123e59"
+        "globalKey" : "9862eee8"
       }
-    },
-    "meta" : {
-      "globalKey" : "2ee620f"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37205",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "98636347"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-02",
+      "meta" : {
+        "globalKey" : "3e9302"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -111,13 +47,52 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-12-03",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb0a857b"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "meta" : {
+                "globalKey" : "eb0a857b"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-12-03",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "42f910b"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97b8e49c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "29255039"
+                }
+              },
+              "meta" : {
+                "globalKey" : "29255039"
+              }
             },
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "GBLO"
@@ -128,84 +103,130 @@
                   "globalKey" : "42f910b"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "97b8e49c"
               }
             },
-            "effectiveDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
+            "payout" : {
+              "interestRatePayout" : [ {
+                "payerReceiver" : {
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "eb0a857b"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2002-12-03"
-              },
-              "meta" : {
-                "globalKey" : "eb0a857b"
-              }
-            },
-            "payout" : {
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204a"
+                    },
+                    "rollConvention" : "3"
+                  },
+                  "meta" : {
+                    "globalKey" : "204a"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-03-03",
+                  "meta" : {
+                    "globalKey" : "74730d07"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c063dcfc"
+                }
+              } ],
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "5b2a6e23"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "f8354c3f"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
-                      "assignableLoan" : {
+                      "category" : "BondOrLoan",
+                      "notSubordinated" : true,
+                      "specifiedCurrency" : {
                         "applicable" : true
                       },
-                      "category" : "BOND_OR_LOAN",
-                      "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
+                      "notSovereignLender" : true,
+                      "notDomesticLaw" : true,
                       "notContingent" : true,
                       "notDomesticIssuance" : true,
-                      "notDomesticLaw" : true,
-                      "notSovereignLender" : true,
-                      "notSubordinated" : true,
-                      "specifiedCurrency" : {
+                      "assignableLoan" : {
                         "applicable" : true
                       },
-                      "transferable" : true
+                      "transferable" : true,
+                      "maximumMaturity" : {
+                        "periodMultiplier" : 30,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
+                      },
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "86788e80"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 30
+                      "globalKey" : "23836c9c"
                     }
                   }
                 },
@@ -213,98 +234,74 @@
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "8GB54M",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "8GB54M"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "5cf1ae36"
-                      },
                       "name" : {
                         "value" : "Kingdom of Thailand"
+                      },
+                      "meta" : {
+                        "globalKey" : "5cf1ae36",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "5cf1ae36"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "US88322KAC53",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "US88322KAC53"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "94d5df65"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "5cf1ae36",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : 1.0,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.0,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "d4955871"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000.0,
-                      "meta" : {
-                        "globalKey" : "d467e427"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 1000000.0,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000.0,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "5904ee2e"
-                    },
                     "obligationAcceleration" : true,
                     "repudiationMoratorium" : true,
                     "restructuring" : {
@@ -312,230 +309,233 @@
                       "restructuringType" : {
                         "value" : "R"
                       }
+                    },
+                    "defaultRequirement" : {
+                      "value" : 10000000.0,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "d467e427"
+                      }
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "420d5ab4"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "8b9137c0"
-                  },
                   "obligations" : {
-                    "category" : "BOND_OR_LOAN",
+                    "category" : "BondOrLoan",
+                    "notSovereignLender" : true,
                     "notDomesticCurrency" : {
                       "applicable" : true
                     },
-                    "notDomesticIssuance" : true,
                     "notDomesticLaw" : true,
-                    "notSovereignLender" : true
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d1e"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "3"
+                    "notDomesticIssuance" : true
                   },
                   "meta" : {
-                    "globalKey" : "12d1e"
+                    "globalKey" : "4854c87a"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "1199130a"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-03",
-                  "meta" : {
-                    "globalKey" : "747315b3"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "236adceb"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "ed96c8fb"
+                "globalKey" : "2dce336f"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "42f910b"
-                    }
-                  },
-                  "businessDayConvention" : "MODFOLLOWING",
-                  "meta" : {
-                    "globalKey" : "97b8e49c"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "29255039"
-                },
-                "unadjustedDate" : "2007-12-03"
-              },
-              "meta" : {
-                "globalKey" : "29255039"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "fcd836db"
+            "globalKey" : "e802ba1f"
           }
         },
         "meta" : {
-          "globalKey" : "fcd836db"
+          "globalKey" : "e802ba1f"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "eef8e284"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.012,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.012,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 20000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 20000000.0
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "694c96e8"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "f0236dfc"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 20000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 20000000.0
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "c0464618"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9302"
-      },
-      "value" : "2002-12-02"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37205"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "af3aca1e"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37205"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af3aca1f"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "2972ee0a"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "1f123e59"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "942b7abb"
+    }
+  },
+  "meta" : {
+    "globalKey" : "942b7abb"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex13-long-asia-sov-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex13-long-asia-sov-fixreg.json
index e145e9e525..75e44b6e3d 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex13-long-asia-sov-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex13-long-asia-sov-fixreg.json
@@ -1,104 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "247b729c"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "37206",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "2c703dad"
         }
       } ],
       "meta" : {
-        "globalKey" : "59f067be"
+        "globalKey" : "9862eee9"
       }
-    },
-    "meta" : {
-      "globalKey" : "247b729c"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37206",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "98636348"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-11-29",
+      "meta" : {
+        "globalKey" : "3e92dd"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -106,13 +47,52 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-11-30",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb09fa96"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "meta" : {
+                "globalKey" : "eb09fa96"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2005-11-30",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "42f910b"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97b8e49c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "12cbe3fe"
+                }
+              },
+              "meta" : {
+                "globalKey" : "12cbe3fe"
+              }
             },
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "GBLO"
@@ -123,83 +103,129 @@
                   "globalKey" : "42f910b"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "97b8e49c"
               }
             },
-            "effectiveDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
+            "payout" : {
+              "interestRatePayout" : [ {
+                "payerReceiver" : {
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "eb09fa96"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2002-11-30"
-              },
-              "meta" : {
-                "globalKey" : "eb09fa96"
-              }
-            },
-            "payout" : {
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f92"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "17f92"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-02-28",
+                  "meta" : {
+                    "globalKey" : "7461528e"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3031103b"
+                }
+              } ],
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "d49065f4"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "868944d0"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
+                      "category" : "BondOrLoan",
+                      "specifiedCurrency" : {
+                        "applicable" : true
+                      },
+                      "notContingent" : true,
                       "assignableLoan" : {
                         "applicable" : true
                       },
-                      "category" : "BOND_OR_LOAN",
                       "consentRequiredLoan" : {
                         "applicable" : true
                       },
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
-                      "notContingent" : true,
-                      "specifiedCurrency" : {
-                        "applicable" : true
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
                       },
-                      "transferable" : true
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "f6b4f991"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 30
+                      "globalKey" : "a8add86d"
                     }
                   }
                 },
@@ -207,98 +233,74 @@
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "4B818G",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "4B818G"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "23b559bc"
-                      },
                       "name" : {
                         "value" : "Japan"
+                      },
+                      "meta" : {
+                        "globalKey" : "23b559bc",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "23b559bc"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "JP1200551248",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "JP1200551248"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "bc59fbfb"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "23b559bc",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : 1.0,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.0,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "2b081273"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000.0,
-                      "meta" : {
-                        "globalKey" : "d467e427"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 1000000.0,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000.0,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "5904ee2e"
-                    },
                     "obligationAcceleration" : true,
                     "repudiationMoratorium" : true,
                     "restructuring" : {
@@ -306,224 +308,222 @@
                       "restructuringType" : {
                         "value" : "R"
                       }
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "a28a54a3"
-                  },
-                  "obligations" : {
-                    "category" : "BORROWED_MONEY"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c66"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "30"
-                  },
-                  "meta" : {
-                    "globalKey" : "28c66"
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "73eef16b"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-02-28",
-                  "meta" : {
-                    "globalKey" : "74615b3a"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
+                    "defaultRequirement" : {
+                      "value" : 10000000.0,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "d467e427"
                       }
-                    }
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "34f04c5e"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    } ],
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "42f910b"
+                      "globalKey" : "420d5ab4"
                     }
                   },
-                  "businessDayConvention" : "MODFOLLOWING",
+                  "obligations" : {
+                    "category" : "BorrowedMoney"
+                  },
                   "meta" : {
-                    "globalKey" : "97b8e49c"
+                    "globalKey" : "6b29b7a9"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "12cbe3fe"
-                },
-                "unadjustedDate" : "2005-11-30"
+                  "globalKey" : "9d3b6cf9"
+                }
               },
               "meta" : {
-                "globalKey" : "12cbe3fe"
+                "globalKey" : "d253ac74"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "eb95f59a"
+            "globalKey" : "b9f3b074"
           }
         },
         "meta" : {
-          "globalKey" : "eb95f59a"
+          "globalKey" : "b9f3b074"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "c3cda112"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0015,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0015,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000.0
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d467e427"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "b5e6812e"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000.0
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "b894a0b9"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e92dd"
-      },
-      "value" : "2002-11-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37206"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "af3acddf"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37206"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af3acde0"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "2c703dad"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "59f067be"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "79255c22"
+    }
+  },
+  "meta" : {
+    "globalKey" : "79255c22"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex14-long-emlatin-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex14-long-emlatin-corp-fixreg.json
index 026d8dd897..320f9dc624 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex14-long-emlatin-corp-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex14-long-emlatin-corp-fixreg.json
@@ -1,113 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "158ab43a"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_SUCCESSOR_AND_CREDIT_EVENTS"
-              }
-            }, {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
-              }
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "37203",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "91a1d99b"
         }
       } ],
       "meta" : {
-        "globalKey" : "e82472ec"
+        "globalKey" : "9862eee6"
       }
-    },
-    "meta" : {
-      "globalKey" : "158ab43a"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37203",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "98636345"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-08-23",
+      "meta" : {
+        "globalKey" : "3e9217"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -115,13 +47,52 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-08-28",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb072254"
+                }
+              },
+              "meta" : {
+                "globalKey" : "eb072254"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2004-08-28",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "42f910b"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97b8e49c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "50c0eb00"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "meta" : {
+                "globalKey" : "50c0eb00"
+              }
             },
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "GBLO"
@@ -132,80 +103,126 @@
                   "globalKey" : "42f910b"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "97b8e49c"
               }
             },
-            "effectiveDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
+            "payout" : {
+              "interestRatePayout" : [ {
+                "payerReceiver" : {
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "eb072254"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2002-08-28"
-              },
-              "meta" : {
-                "globalKey" : "eb072254"
-              }
-            },
-            "payout" : {
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18abe"
+                    },
+                    "rollConvention" : "28"
+                  },
+                  "meta" : {
+                    "globalKey" : "18abe"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-02-28",
+                  "meta" : {
+                    "globalKey" : "746152eb"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "409520ec"
+                }
+              } ],
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "6ed738e1"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "b5629a79"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDaysNotSpecified" : true
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
-                      "category" : "BOND",
-                      "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
-                      "notContingent" : true,
-                      "notDomesticIssuance" : true,
-                      "notDomesticLaw" : true,
+                      "category" : "Bond",
                       "notSubordinated" : true,
                       "specifiedCurrency" : {
                         "applicable" : true
                       },
-                      "transferable" : true
+                      "notDomesticLaw" : true,
+                      "notContingent" : true,
+                      "notDomesticIssuance" : true,
+                      "transferable" : true,
+                      "maximumMaturity" : {
+                        "periodMultiplier" : 30,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
+                      },
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "78333da4"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDaysNotSpecified" : true
+                      "globalKey" : "bebe9f3c"
                     }
                   }
                 },
@@ -213,102 +230,78 @@
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "05EF75",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "05EF75"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "7b58e286"
-                      },
                       "name" : {
                         "value" : "Banco Nacional de Desenvolvimento Economico E Social - BNDES"
+                      },
+                      "meta" : {
+                        "globalKey" : "7b58e286",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "7b58e286"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "US059614AG22",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "US059614AG22"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "75a41d18"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "7b58e286",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : 1.0,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.0,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "2e9ba8bb"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000.0,
-                      "meta" : {
-                        "globalKey" : "d467e427"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "gracePeriodExtension" : {
                         "applicable" : true
                       },
                       "paymentRequirement" : {
+                        "value" : 1000000.0,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000.0,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "8092144e"
-                    },
                     "obligationAcceleration" : true,
                     "repudiationMoratorium" : true,
                     "restructuring" : {
@@ -316,230 +309,237 @@
                       "restructuringType" : {
                         "value" : "R"
                       }
+                    },
+                    "defaultRequirement" : {
+                      "value" : 10000000.0,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "d467e427"
+                      }
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "9ba7e252"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "75a0d30d"
-                  },
                   "obligations" : {
-                    "category" : "BOND",
+                    "category" : "Bond",
+                    "notSubordinated" : true,
                     "notDomesticCurrency" : {
                       "applicable" : true
                     },
-                    "notDomesticIssuance" : true,
                     "notDomesticLaw" : true,
-                    "notSubordinated" : true
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28cac"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "28"
+                    "notDomesticIssuance" : true
                   },
                   "meta" : {
-                    "globalKey" : "28cac"
+                    "globalKey" : "7a8bf889"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "2a792f4e"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-02-28",
-                  "meta" : {
-                    "globalKey" : "74615b3d"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "5a374433"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "926c2c89"
+                "globalKey" : "50b024c7"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "42f910b"
-                    }
-                  },
-                  "businessDayConvention" : "MODFOLLOWING",
-                  "meta" : {
-                    "globalKey" : "97b8e49c"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "50c0eb00"
-                },
-                "unadjustedDate" : "2004-08-28"
-              },
-              "meta" : {
-                "globalKey" : "50c0eb00"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "5ce6e154"
+            "globalKey" : "92994c62"
           }
         },
         "meta" : {
-          "globalKey" : "5ce6e154"
+          "globalKey" : "92994c62"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "d824101a"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.365,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.365,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 1800000.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 1800000.0
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "eb0e965d"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "2c5df326"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 1800000.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 1800000.0
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "76c43543"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9217"
-      },
-      "value" : "2002-08-23"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37203"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "af3ac29c"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37203"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af3ac29d"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditSuccessorAndCreditEvents"
+              }
+            }, {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "91a1d99b"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "e82472ec"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "762dc18e"
+    }
+  },
+  "meta" : {
+    "globalKey" : "762dc18e"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex15-long-emlatin-sov-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex15-long-emlatin-sov-fixreg.json
index 9b3b283466..cc8c0fff67 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex15-long-emlatin-sov-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex15-long-emlatin-sov-fixreg.json
@@ -1,109 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "5ecce776"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
-              }
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "37204",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "2972ee0a"
         }
       } ],
       "meta" : {
-        "globalKey" : "1f123e59"
+        "globalKey" : "9862eee7"
       }
-    },
-    "meta" : {
-      "globalKey" : "5ecce776"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37204",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "98636346"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-11-22",
+      "meta" : {
+        "globalKey" : "3e92d6"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -111,13 +47,52 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-11-23",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb09e04f"
+                }
+              },
+              "meta" : {
+                "globalKey" : "eb09e04f"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-11-23",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "42f910b"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97b8e49c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "4e7199e5"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "meta" : {
+                "globalKey" : "4e7199e5"
+              }
             },
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "GBLO"
@@ -128,73 +103,119 @@
                   "globalKey" : "42f910b"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "97b8e49c"
               }
             },
-            "effectiveDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
+            "payout" : {
+              "interestRatePayout" : [ {
+                "payerReceiver" : {
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "eb09e04f"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2002-11-23"
-              },
-              "meta" : {
-                "globalKey" : "eb09e04f"
-              }
-            },
-            "payout" : {
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18ab9"
+                    },
+                    "rollConvention" : "23"
+                  },
+                  "meta" : {
+                    "globalKey" : "18ab9"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-05-23",
+                  "meta" : {
+                    "globalKey" : "74b65450"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3861e736"
+                }
+              } ],
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "b7d5b000"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "54f32a42"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDaysNotSpecified" : true
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
-                      "category" : "BOND",
-                      "notBearer" : true,
-                      "notContingent" : true,
-                      "notDomesticIssuance" : true,
-                      "notDomesticLaw" : true,
+                      "category" : "Bond",
                       "notSubordinated" : true,
                       "specifiedCurrency" : {
                         "applicable" : true
                       },
-                      "transferable" : true
+                      "notDomesticLaw" : true,
+                      "notContingent" : true,
+                      "notDomesticIssuance" : true,
+                      "transferable" : true,
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "fee69a1d"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDaysNotSpecified" : true
+                      "globalKey" : "9c04145f"
                     }
                   }
                 },
@@ -202,101 +223,77 @@
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "115CCB",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "115CCB"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "80f8c8cb"
-                      },
                       "name" : {
                         "value" : "Federative Republic of Brazil"
+                      },
+                      "meta" : {
+                        "globalKey" : "80f8c8cb",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "80f8c8cb"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "US105756AL40",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "US105756AL40"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "20e88f76"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "80f8c8cb",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : 1.0,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.0,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "315e3954"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000.0,
-                      "meta" : {
-                        "globalKey" : "d467e427"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "gracePeriodExtension" : {
                         "applicable" : true
                       },
                       "paymentRequirement" : {
+                        "value" : 1000000.0,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000.0,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "e3c2843f"
-                    },
                     "obligationAcceleration" : true,
                     "repudiationMoratorium" : true,
                     "restructuring" : {
@@ -304,230 +301,233 @@
                       "restructuringType" : {
                         "value" : "R"
                       }
+                    },
+                    "defaultRequirement" : {
+                      "value" : 10000000.0,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "d467e427"
+                      }
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "fed85243"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "89e0c1fc"
-                  },
                   "obligations" : {
-                    "category" : "BOND",
+                    "category" : "Bond",
+                    "notSubordinated" : true,
                     "notDomesticCurrency" : {
                       "applicable" : true
                     },
-                    "notDomesticIssuance" : true,
                     "notDomesticLaw" : true,
-                    "notSubordinated" : true
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28ca7"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "23"
+                    "notDomesticIssuance" : true
                   },
                   "meta" : {
-                    "globalKey" : "28ca7"
+                    "globalKey" : "8ecbe778"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "e62efa04"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-05-23",
-                  "meta" : {
-                    "globalKey" : "74b65ca2"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "8215306a"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "ed674158"
+                "globalKey" : "bb75b6f4"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "42f910b"
-                    }
-                  },
-                  "businessDayConvention" : "MODFOLLOWING",
-                  "meta" : {
-                    "globalKey" : "97b8e49c"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "4e7199e5"
-                },
-                "unadjustedDate" : "2007-11-23"
-              },
-              "meta" : {
-                "globalKey" : "4e7199e5"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "8f575a43"
+            "globalKey" : "e434e8ef"
           }
         },
         "meta" : {
-          "globalKey" : "8f575a43"
+          "globalKey" : "e434e8ef"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "caaeea24"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.266,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.266,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000.0
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d467e427"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "8b2e5a5c"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000.0
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "b894a0b9"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e92d6"
-      },
-      "value" : "2002-11-22"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37204"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "af3ac65d"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37204"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af3ac65e"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "2972ee0a"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "1f123e59"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "7a5db62a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "7a5db62a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex16-short-us-corp-fixreg-recovery-factor.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex16-short-us-corp-fixreg-recovery-factor.json
index ea5318413b..0317dbc0ab 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex16-short-us-corp-fixreg-recovery-factor.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex16-short-us-corp-fixreg-recovery-factor.json
@@ -1,85 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "5574164d"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2001-01-04",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_1999_CREDIT"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "xyz1234",
+          "meta" : {
+            "scheme" : "http://www.xyzbank.com/cd-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "4933bf66"
         }
       } ],
       "meta" : {
-        "globalKey" : "4933bf66"
+        "globalKey" : "36aee370"
       }
-    },
-    "meta" : {
-      "globalKey" : "5574164d"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "abc1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.abcbank.com/cd-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "4d7c7218"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-03",
+      "meta" : {
+        "globalKey" : "3e9303"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -89,279 +49,319 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-12-04",
                 "meta" : {
                   "globalKey" : "3e9304"
-                },
-                "unadjustedDate" : "2002-12-04"
+                }
               },
               "meta" : {
                 "globalKey" : "3e9304"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-09-06",
+                "meta" : {
+                  "globalKey" : "3eba46"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3eba46"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204d"
+                    },
+                    "rollConvention" : "6"
                   },
+                  "meta" : {
+                    "globalKey" : "204d"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-03-06",
+                  "meta" : {
+                    "globalKey" : "74746a24"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "e50faed6"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Cash",
                   "meta" : {
                     "globalKey" : "76102c6b"
                   },
-                  "settlementType" : "CASH",
                   "cashSettlementTerms" : [ {
+                    "recoveryFactor" : 0.60,
                     "meta" : {
                       "globalKey" : "b9f8"
-                    },
-                    "recoveryFactor" : 0.60
+                    }
                   } ]
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "8G836J",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "8G836J"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "92cc27"
-                      },
                       "name" : {
                         "value" : "Tenet Healthcare Corporation"
+                      },
+                      "meta" : {
+                        "globalKey" : "92cc27",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "92cc27"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "88033GAT7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                              },
-                              "value" : "88033GAT7"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "db5db955"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "92cc27",
+                        "externalReference" : "referenceEntity"
                       }
                     } ]
                   }
                 },
-                "meta" : {
-                  "globalKey" : "661c8331"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "meta" : {
-                      "globalKey" : "4741344"
-                    },
                     "restructuring" : {
                       "applicable" : true,
                       "restructuringType" : {
-                        "value" : "MOD_R"
+                        "value" : "ModR"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "4741344"
                     }
                   },
                   "meta" : {
                     "globalKey" : "4741344"
                   }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d21"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "6"
-                  },
-                  "meta" : {
-                    "globalKey" : "12d21"
-                  }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "e0b59430"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-06",
-                  "meta" : {
-                    "globalKey" : "747472d0"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "1690908d"
                 }
-              } ],
-              "meta" : {
-                "globalKey" : "5740d21"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3eba46"
-                },
-                "unadjustedDate" : "2007-09-06"
               },
               "meta" : {
-                "globalKey" : "3eba46"
+                "globalKey" : "d3bf6763"
               }
             }
           },
           "meta" : {
-            "globalKey" : "54463589"
+            "globalKey" : "d8284b61"
           }
         },
         "meta" : {
-          "globalKey" : "54463589"
+          "globalKey" : "d8284b61"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "1f273178"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.01,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c5befd88"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9303"
-      },
-      "value" : "2002-12-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.xyzbank.com/cd-trade-id"
-          },
-          "value" : "xyz1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "ea5bbca6"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.abcbank.com/cd-trade-id"
-          },
-          "value" : "abc1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "824b68b0"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2001-01-04",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA1999Credit"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "4933bf66"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "4933bf66"
+      }
+    },
+    "meta" : {
+      "globalKey" : "9a964901"
+    }
+  },
+  "meta" : {
+    "globalKey" : "9a964901"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex17-short-us-corp-portfolio-compression.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex17-short-us-corp-portfolio-compression.json
index 435188565c..347a659d34 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex17-short-us-corp-portfolio-compression.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex17-short-us-corp-portfolio-compression.json
@@ -1,109 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "bf7eaee3"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2004-07-28",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "cd69c735"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualMatrix" : [ {
-              "matrixTerm" : {
-                "value" : "NORTH_AMERICAN_CORPORATE"
-              },
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CONTINGENT_CREDIT_SPREAD_TRANSACTION"
-              },
-              "publicationDate" : "2008-08-15"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "xyz1234",
+          "meta" : {
+            "scheme" : "http://www.xyzbank.com/cd-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "c20f3bbc"
         }
       } ],
       "meta" : {
-        "globalKey" : "f526db71"
+        "globalKey" : "36aee370"
       }
-    },
-    "meta" : {
-      "globalKey" : "bf7eaee3"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "abc1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.abcbank.com/cd-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "4d7c7218"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-03",
+      "meta" : {
+        "globalKey" : "3e9303"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -113,267 +49,331 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-12-04",
                 "meta" : {
                   "globalKey" : "3e9304"
-                },
-                "unadjustedDate" : "2002-12-04"
+                }
               },
               "meta" : {
                 "globalKey" : "3e9304"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-09-06",
+                "meta" : {
+                  "globalKey" : "3eba46"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3eba46"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204d"
+                    },
+                    "rollConvention" : "6"
+                  },
+                  "meta" : {
+                    "globalKey" : "204d"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
+                  "firstPaymentDate" : "2003-03-06",
+                  "meta" : {
+                    "globalKey" : "74746a24"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "e50faed6"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "8G836J",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "8G836J"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "92cc27"
-                      },
                       "name" : {
                         "value" : "Tenet Healthcare Corporation"
+                      },
+                      "meta" : {
+                        "globalKey" : "92cc27",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "92cc27"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "88033GAT7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                              },
-                              "value" : "88033GAT7"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "db5db955"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "92cc27",
+                        "externalReference" : "referenceEntity"
                       }
                     } ]
                   }
                 },
-                "meta" : {
-                  "globalKey" : "a9bf607c"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "meta" : {
-                      "globalKey" : "4741344"
-                    },
                     "restructuring" : {
                       "applicable" : true,
                       "restructuringType" : {
-                        "value" : "MOD_R"
+                        "value" : "ModR"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "4741344"
                     }
                   },
                   "meta" : {
                     "globalKey" : "4741344"
                   }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d21"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "6"
-                  },
-                  "meta" : {
-                    "globalKey" : "12d21"
-                  }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "e0b59430"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-06",
-                  "meta" : {
-                    "globalKey" : "747472d0"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "5a336dd8"
                 }
-              } ],
-              "meta" : {
-                "globalKey" : "bbe44dac"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3eba46"
-                },
-                "unadjustedDate" : "2007-09-06"
               },
               "meta" : {
-                "globalKey" : "3eba46"
+                "globalKey" : "f8db1fae"
               }
             }
           },
           "meta" : {
-            "globalKey" : "5229c71e"
+            "globalKey" : "58e1b2ac"
           }
         },
         "meta" : {
-          "globalKey" : "5229c71e"
+          "globalKey" : "58e1b2ac"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "1f273178"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.01,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c5befd88"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9303"
-      },
-      "value" : "2002-12-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.xyzbank.com/cd-trade-id"
-          },
-          "value" : "xyz1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "ea5bbca6"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.abcbank.com/cd-trade-id"
-          },
-          "value" : "abc1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "824b68b0"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2004-07-28",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "cd69c735"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003ContingentCreditSpreadTransaction"
+              },
+              "publicationDate" : "2008-08-15"
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              },
+              "matrixTerm" : {
+                "value" : "NorthAmericanCorporate"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "415f7d0a"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "74771cbf"
+      }
+    },
+    "meta" : {
+      "globalKey" : "e261292f"
+    }
+  },
+  "meta" : {
+    "globalKey" : "e261292f"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex18-standard-north-american-corp.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex18-standard-north-american-corp.json
index d18302de4e..c71aac9848 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex18-standard-north-american-corp.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex18-standard-north-american-corp.json
@@ -1,89 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "4e2216b1"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualMatrix" : [ {
-              "matrixTerm" : {
-                "value" : "STANDARD_NORTH_AMERICAN_CORPORATE"
-              },
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "xyz1234",
+          "meta" : {
+            "scheme" : "http://www.xyzbank.com/cd-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "80f11ad5"
         }
       } ],
       "meta" : {
-        "globalKey" : "80f11ad5"
+        "globalKey" : "36aee370"
       }
-    },
-    "meta" : {
-      "globalKey" : "b735acd7"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "abc1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.abcbank.com/cd-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "4d7c7218"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-03-25",
+      "meta" : {
+        "globalKey" : "3ec8d9"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -93,47 +49,130 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-03-26",
                 "meta" : {
                   "globalKey" : "3ec8da"
-                },
-                "unadjustedDate" : "2009-03-26"
+                }
               },
               "meta" : {
                 "globalKey" : "3ec8da"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2014-06-20",
+                "meta" : {
+                  "globalKey" : "3ef194"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ef194"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "firstPeriodStartDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2009-03-20",
+                      "meta" : {
+                        "globalKey" : "3ec8d4"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3ec8d4"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f73"
+                    },
+                    "rollConvention" : "20"
                   },
+                  "meta" : {
+                    "globalKey" : "bf47be47"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2009-06-20",
+                  "meta" : {
+                    "globalKey" : "8aa3de96"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eff49770"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "8G836J",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "8G836J"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "54140007"
-                      },
                       "name" : {
                         "value" : "TENET HEALTHCARE CORPORATION"
+                      },
+                      "meta" : {
+                        "globalKey" : "54140007",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
@@ -141,250 +180,211 @@
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "8G836JAF2",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair-1-0"
-                              },
-                              "value" : "8G836JAF2"
+                              }
                             },
+                            "source" : "Other",
                             "meta" : {
                               "globalKey" : "1165f83f"
-                            },
-                            "source" : "OTHER"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
                       }
                     } ]
                   }
                 },
-                "meta" : {
-                  "globalKey" : "2fa76fbc"
-                },
                 "transactedPrice" : {
                   "marketFixedRate" : 0.02
-                }
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c47"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "20"
-                  },
-                  "firstPeriodStartDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3ec8d4"
-                      },
-                      "unadjustedDate" : "2009-03-20"
-                    },
-                    "meta" : {
-                      "globalKey" : "3ec8d4"
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "28c1032d"
-                  }
                 },
                 "meta" : {
-                  "globalKey" : "6afbe26c"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2009-06-20",
-                  "meta" : {
-                    "globalKey" : "8aa3e742"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "2fa76fbc"
                 }
-              } ],
-              "meta" : {
-                "globalKey" : "1fd4e030"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ef194"
-                },
-                "unadjustedDate" : "2014-06-20"
               },
               "meta" : {
-                "globalKey" : "3ef194"
+                "globalKey" : "a7b3d32c"
               }
             }
           },
           "meta" : {
-            "globalKey" : "fed9f34a"
+            "globalKey" : "3803c6a6"
           }
         },
         "meta" : {
-          "globalKey" : "fed9f34a"
+          "globalKey" : "3803c6a6"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "1f273178"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.01,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c5befd88"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec8d9"
-      },
-      "value" : "2009-03-25"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.xyzbank.com/cd-trade-id"
-          },
-          "value" : "xyz1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "ea5bbca6"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.abcbank.com/cd-trade-id"
-          },
-          "value" : "abc1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "824b68b0"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              },
+              "matrixTerm" : {
+                "value" : "StandardNorthAmericanCorporate"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "9ed2f955"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "9ed2f955"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "b5a45bb"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "c11af7da"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        }
-      },
       "quantity" : {
+        "value" : 1000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         },
-        "value" : 1000
+        "receiverPartyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2009-03-28",
         "adjustedDate" : {
+          "value" : "2009-03-30",
           "meta" : {
             "globalKey" : "3ec8de"
-          },
-          "value" : "2009-03-30"
-        },
-        "unadjustedDate" : "2009-03-28"
+          }
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "ebfa433a"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "b83fb2f5"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex19-cdx-index-option-pred-clearing.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex19-cdx-index-option-pred-clearing.json
index 9dc7efd9fc..d81b8c4ddf 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex19-cdx-index-option-pred-clearing.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex19-cdx-index-option-pred-clearing.json
@@ -1,132 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "fe9b5021"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "1997-11-05",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "95729254"
-        }
-      }, {
-        "agreementDate" : "2004-09-20",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "DJ.CDX.NA"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "44b33d52"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2003_CREDIT"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "521d2d0f"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "c96c85a9"
-      }
-    },
-    "meta" : {
-      "globalKey" : "2d0d5006"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59568"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Trade234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.PartyA.com/coding-scheme/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "clearing-svc",
-        "globalKey" : "b2687a98"
-      },
-      "name" : {
-        "value" : "ClearItAll Corp"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300IB5Q45JGNPND58"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e213e7d7"
-        }
-      } ]
+        "globalKey" : "5c8ba844"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-01-16",
+      "meta" : {
+        "globalKey" : "3eb050",
+        "externalKey" : "TRADEDATE"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "clearing-svc",
-          "globalReference" : "b2687a98"
-        } ],
-        "role" : "PREDETERMINED_CLEARING_ORGANIZATION_PARTY"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -135,113 +33,107 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "d4e556de"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "0",
+                    "externalReference" : "NOTIONAL"
+                  },
                   "meta" : {
                     "globalKey" : "8d28d340"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "NOTIONAL",
-                    "globalReference" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "5ec52713"
                   },
-                  "settlementType" : "PHYSICAL",
                   "physicalSettlementTerms" : {
                     "clearedPhysicalSettlement" : true,
+                    "predeterminedClearingOrganizationParty" : "PredeterminedClearingOrganizationParty",
                     "meta" : {
                       "globalKey" : "5d273b4a"
-                    },
-                    "predeterminedClearingOrganizationParty" : "PREDETERMINED_CLEARING_ORGANIZATION_PARTY"
+                    }
                   }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Payer",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "fallbackExercise" : false
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "USNY"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-08-20",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "25a605bf"
-                          },
-                          "unadjustedDate" : "2006-08-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "25a605bf"
                         }
                       } ],
-                      "expirationTime" : {
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
                         "businessCenter" : {
                           "value" : "USNY"
-                        },
-                        "hourMinuteTime" : "11:00:00"
+                        }
                       },
-                      "meta" : {
-                        "globalKey" : "e0e28f54"
+                      "expirationTime" : {
+                        "hourMinuteTime" : "11:00:00",
+                        "businessCenter" : {
+                          "value" : "USNY"
+                        }
                       },
                       "partialExercise" : {
-                        "integralMultipleAmount" : 1,
-                        "minimumNotionalAmount" : 1,
                         "notionaReference" : {
-                          "externalReference" : "NOTIONAL",
-                          "globalReference" : "0"
-                        }
+                          "globalReference" : "0",
+                          "externalReference" : "NOTIONAL"
+                        },
+                        "integralMultipleAmount" : 1,
+                        "minimumNotionalAmount" : 1
+                      },
+                      "meta" : {
+                        "globalKey" : "83132194"
                       }
                     }
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 0.0225,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.0225,
-                      "arithmeticOperator" : "ADD",
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate",
+                      "arithmeticOperator" : "Add"
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "fallbackExercise" : false
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "d4e556de"
-                },
-                "optionType" : "PAYER",
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -251,274 +143,377 @@
                     "economicTerms" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-03-21",
                           "meta" : {
                             "globalKey" : "3eb0d5"
-                          },
-                          "unadjustedDate" : "2006-03-21"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "3eb0d5"
                         }
                       },
+                      "terminationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2011-06-20",
+                          "meta" : {
+                            "globalKey" : "3ed994"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "3ed994"
+                        }
+                      },
                       "payout" : {
-                        "creditDefaultPayout" : {
+                        "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "externalKey" : "NOTIONAL",
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
-                                "value" : "quantity-2"
+                                "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "generalTerms" : {
-                            "indexReferenceInformation" : {
-                              "indexName" : {
-                                "value" : "Dow Jones CDX NA IG.2"
-                              },
-                              "indexAnnexDate" : "2005-07-06",
-                              "indexAnnexSource" : {
-                                "value" : "PUBLISHER"
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
+                                }
                               },
-                              "indexSeries" : 2,
                               "meta" : {
-                                "globalKey" : "964c1581"
+                                "globalKey" : "0"
                               }
                             }
                           },
-                          "meta" : {
-                            "globalKey" : "6ba10942"
-                          }
-                        },
-                        "interestRatePayout" : [ {
-                          "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
-                          },
-                          "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "quantitySchedule" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "quantity-1"
-                              }
-                            }
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
                           },
                           "calculationPeriodDates" : {
                             "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
                               "meta" : {
-                                "globalKey" : "28c47"
+                                "globalKey" : "17f73"
                               },
-                              "period" : "M",
-                              "periodMultiplier" : 3,
                               "rollConvention" : "20"
                             },
                             "meta" : {
-                              "globalKey" : "28c47"
+                              "globalKey" : "17f73"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "bbc10042"
-                          },
                           "paymentDates" : {
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "aa"
+                              }
+                            },
                             "firstPaymentDate" : "2006-06-20",
                             "lastRegularPaymentDate" : "2011-03-20",
                             "meta" : {
-                              "globalKey" : "9365796"
+                              "globalKey" : "9364eea"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "56649a5c"
+                          }
+                        } ],
+                        "creditDefaultPayout" : {
+                          "payerReceiver" : {
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
+                          },
+                          "priceQuantity" : {
+                            "quantitySchedule" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "quantity-2"
+                              }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "956"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 3
+                            "meta" : {
+                              "globalKey" : "0",
+                              "externalKey" : "NOTIONAL"
                             }
                           },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
+                          "generalTerms" : {
+                            "indexReferenceInformation" : {
+                              "indexName" : {
+                                "value" : "Dow Jones CDX NA IG.2"
                               },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
+                              "indexSeries" : 2,
+                              "indexAnnexDate" : "2005-07-06",
+                              "indexAnnexSource" : {
+                                "value" : "Publisher"
+                              },
+                              "meta" : {
+                                "globalKey" : "5598e89"
                               }
                             }
-                          }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "f0c9b440"
-                        }
-                      },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "meta" : {
-                            "globalKey" : "3ed994"
                           },
-                          "unadjustedDate" : "2011-06-20"
+                          "meta" : {
+                            "globalKey" : "daae824a"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "3ed994"
+                          "globalKey" : "9dc89d6e"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "8a4e2669"
+                      "globalKey" : "d9a8246f"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "8a4e2669"
+                    "globalKey" : "d9a8246f"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "7dad9894"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "7dad9894"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "d4e556de"
+            "globalKey" : "7dad9894"
           }
         },
         "meta" : {
-          "globalKey" : "d4e556de"
+          "globalKey" : "7dad9894"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "22a6e28e"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.019,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.019,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 50000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "27faaf2b"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "32356f32"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 50000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "d75b3635"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "Party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "PredeterminedClearingOrganizationParty",
+        "partyReference" : [ {
+          "globalReference" : "fff6958",
+          "externalReference" : "clearing-svc"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TRADEDATE",
-        "globalKey" : "3eb050"
-      },
-      "value" : "2006-01-16"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "Party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/coding-scheme/trade-id"
-          },
-          "value" : "Trade234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59567"
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "Party2"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300IB5Q45JGNPND58",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e213e7d7"
+        }
+      } ],
+      "name" : {
+        "value" : "ClearItAll Corp"
       },
       "meta" : {
-        "globalKey" : "7215e0ba"
+        "globalKey" : "fff6958",
+        "externalKey" : "clearing-svc"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "1997-11-05",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "95729254"
+        }
+      }, {
+        "agreementDate" : "2004-09-20",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "DJ.CDX.NA"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "44b33d52"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2003Credit"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "521d2d0f"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "c96c85a9"
+      }
+    },
+    "meta" : {
+      "globalKey" : "29d68a0e"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "f49473e7"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 45000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "Party2"
         },
-        "value" : 45000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
+        }
       },
       "settlementDate" : {
         "relativeDate" : {
+          "periodMultiplier" : 3,
+          "period" : "D",
           "meta" : {
-            "globalKey" : "c47305b0"
+            "globalKey" : "fd075b8e"
           },
-          "period" : "D",
-          "periodMultiplier" : 3,
-          "dayType" : "BUSINESS",
+          "dayType" : "Business",
+          "businessDayConvention" : "NONE",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "USNY"
@@ -529,16 +524,21 @@
               "globalKey" : "4f5ffd5"
             }
           },
-          "businessDayConvention" : "NONE",
           "dateRelativeTo" : {
-            "externalReference" : "TRADEDATE",
-            "globalReference" : "3eb050"
+            "globalReference" : "3eb050",
+            "externalReference" : "TRADEDATE"
           }
         }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "b02d3185"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "e9feceb7"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-indamt-ex01-short-us-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-indamt-ex01-short-us-corp-fixreg.json
index 4879b3c666..28cfa7ead9 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-indamt-ex01-short-us-corp-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-indamt-ex01-short-us-corp-fixreg.json
@@ -1,111 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "f042a00f"
-  },
   "trade" : {
-    "collateral" : {
-      "independentAmount" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "paymentDetail" : [ {
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "xyz1234",
           "meta" : {
-            "globalKey" : "b30a47c0"
-          },
-          "paymentRule" : {
-            "percentageRule" : {
-              "notionalAmountReference" : {
-                "externalReference" : "notional",
-                "globalReference" : "0"
-              },
-              "paymentPercent" : 0.02
-            }
-          }
-        } ]
-      }
-    },
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2003-06-06",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_2003_CREDIT_NORTH_AMERICAN"
-            }
+            "scheme" : "http://www.xyzbank.com/cd-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "24983006"
         }
       } ],
       "meta" : {
-        "globalKey" : "24983006"
+        "globalKey" : "36aee370"
       }
-    },
-    "meta" : {
-      "globalKey" : "f042a00f"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "abc1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.abcbank.com/cd-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "4d7c7218"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-03",
+      "meta" : {
+        "globalKey" : "3e9303"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -115,269 +49,335 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-12-04",
                 "meta" : {
                   "globalKey" : "3e9304"
-                },
-                "unadjustedDate" : "2002-12-04"
+                }
               },
               "meta" : {
                 "globalKey" : "3e9304"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-09-06",
+                "meta" : {
+                  "globalKey" : "3eba46"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3eba46"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "externalKey" : "notional",
-                    "globalKey" : "0"
+                    "globalKey" : "0",
+                    "externalKey" : "notional"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204d"
+                    },
+                    "rollConvention" : "6"
                   },
+                  "meta" : {
+                    "globalKey" : "204d"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-03-06",
+                  "meta" : {
+                    "globalKey" : "74746a24"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "e50faed6"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "notional"
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "8G836J",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "8G836J"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "92cc27"
-                      },
                       "name" : {
                         "value" : "Tenet Healthcare Corporation"
+                      },
+                      "meta" : {
+                        "globalKey" : "92cc27",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "92cc27"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "88033GAT7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                              },
-                              "value" : "88033GAT7"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "db5db955"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "92cc27",
+                        "externalReference" : "referenceEntity"
                       }
                     } ]
                   }
                 },
-                "meta" : {
-                  "globalKey" : "a9bf607c"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "meta" : {
-                      "globalKey" : "4741344"
-                    },
                     "restructuring" : {
                       "applicable" : true,
                       "restructuringType" : {
-                        "value" : "MOD_R"
+                        "value" : "ModR"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "4741344"
                     }
                   },
                   "meta" : {
                     "globalKey" : "4741344"
                   }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "notional",
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d21"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "6"
-                  },
-                  "meta" : {
-                    "globalKey" : "12d21"
-                  }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "e0b59430"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-06",
-                  "meta" : {
-                    "globalKey" : "747472d0"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "5a336dd8"
                 }
-              } ],
-              "meta" : {
-                "globalKey" : "bbe44dac"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3eba46"
-                },
-                "unadjustedDate" : "2007-09-06"
               },
               "meta" : {
-                "globalKey" : "3eba46"
+                "globalKey" : "f8db1fae"
               }
             }
           },
           "meta" : {
-            "globalKey" : "5229c71e"
+            "globalKey" : "58e1b2ac"
           }
         },
         "meta" : {
-          "globalKey" : "5229c71e"
+          "globalKey" : "58e1b2ac"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "1f273178"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.01,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c5befd88"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9303"
-      },
-      "value" : "2002-12-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.xyzbank.com/cd-trade-id"
-          },
-          "value" : "xyz1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "ea5bbca6"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.abcbank.com/cd-trade-id"
-          },
-          "value" : "abc1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "824b68b0"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2003-06-06",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2003CreditNorthAmerican"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "24983006"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "24983006"
       }
-    } ]
+    },
+    "collateral" : {
+      "independentAmount" : {
+        "payerPartyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        },
+        "receiverPartyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        },
+        "paymentDetail" : [ {
+          "paymentRule" : {
+            "percentageRule" : {
+              "paymentPercent" : 0.02,
+              "notionalAmountReference" : {
+                "globalReference" : "0",
+                "externalReference" : "notional"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "b30a47c0"
+          }
+        } ]
+      }
+    },
+    "meta" : {
+      "globalKey" : "73e3cb0d"
+    }
+  },
+  "meta" : {
+    "globalKey" : "73e3cb0d"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-swaption-1.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-swaption-1.json
index d2e9a23406..332e3f10d9 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-swaption-1.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-swaption-1.json
@@ -1,99 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "1725dd06"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "1997-11-05",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "95729254"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2003_CREDIT"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "521d2d0f"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "99e5143b"
-      }
-    },
-    "meta" : {
-      "globalKey" : "d6f059cf"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Trade123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "5c8ba463"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-12-05",
+      "meta" : {
+        "globalKey" : "3eb305",
+        "externalKey" : "TRADEDATE"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -101,55 +32,52 @@
             "productQualifier" : "CreditDefaultSwaption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "98dbfb4d"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "0",
+                    "externalReference" : "NOTIONAL"
+                  },
                   "meta" : {
                     "globalKey" : "8d28d340"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "NOTIONAL",
-                    "globalReference" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "f3b1d0d7"
-                  },
-                  "settlementType" : "PHYSICAL"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
-                "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "fallbackExercise" : false
+                "optionType" : "Call",
+                "feature" : {
+                  "knock" : {
+                    "knockOut" : {
+                      "trigger" : {
+                        "creditEventsReference" : {
+                          "globalReference" : "1333467d",
+                          "externalReference" : "CREDITEVENT"
+                        }
+                      }
                     }
-                  },
+                  }
+                },
+                "exerciseTerms" : {
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2007-03-05",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -160,54 +88,48 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da556d3a"
                             }
                           },
                           "meta" : {
                             "globalKey" : "80df3cd5"
-                          },
-                          "unadjustedDate" : "2007-03-05"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "80df3cd5"
                         }
                       } ],
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      },
                       "expirationTime" : {
+                        "hourMinuteTime" : "16:00:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "16:00:00"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "ab29442b"
+                        "globalKey" : "991d57eb"
                       }
                     }
                   },
                   "strike" : {
                     "strikeReference" : {
-                      "externalReference" : "SPREAD",
-                      "globalReference" : "0"
-                    }
-                  }
-                },
-                "feature" : {
-                  "knock" : {
-                    "knockOut" : {
-                      "trigger" : {
-                        "creditEventsReference" : {
-                          "externalReference" : "CREDITEVENT",
-                          "globalReference" : "acc58dfd"
-                        }
-                      }
+                      "globalReference" : "0",
+                      "externalReference" : "SPREAD"
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "fallbackExercise" : false
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "98dbfb4d"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -217,6 +139,7 @@
                     "economicTerms" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-03-06",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -225,386 +148,458 @@
                           },
                           "meta" : {
                             "globalKey" : "eb7a3e7e"
-                          },
-                          "unadjustedDate" : "2006-03-06"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eb7a3e7e"
                         }
                       },
+                      "terminationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2012-03-21",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ec2ea6cd"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "ec2ea6cd"
+                        }
+                      },
                       "payout" : {
-                        "creditDefaultPayout" : {
+                        "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
+                            "quantitySchedule" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "quantity-1"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "NOTIONAL",
                               "globalKey" : "0"
+                            }
+                          },
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "0",
+                                "externalKey" : "SPREAD"
+                              }
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "17f73"
+                              },
+                              "rollConvention" : "20"
                             },
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            }
+                          },
+                          "paymentDates" : {
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "aa"
+                              }
+                            },
+                            "firstPaymentDate" : "2007-03-20",
+                            "lastRegularPaymentDate" : "2012-03-20",
+                            "meta" : {
+                              "globalKey" : "7303ae2a"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "c031f99c"
+                          }
+                        } ],
+                        "creditDefaultPayout" : {
+                          "payerReceiver" : {
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
+                          },
+                          "priceQuantity" : {
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0",
+                              "externalKey" : "NOTIONAL"
                             }
                           },
                           "settlementTerms" : {
+                            "settlementType" : "Physical",
                             "meta" : {
-                              "globalKey" : "91ae6106"
+                              "globalKey" : "1a8bef8a"
                             },
-                            "settlementType" : "PHYSICAL",
                             "physicalSettlementTerms" : {
+                              "physicalSettlementPeriod" : {
+                                "maximumBusinessDays" : 30
+                              },
                               "deliverableObligations" : {
                                 "accruedInterest" : false,
-                                "category" : "BOND"
+                                "category" : "Bond"
                               },
                               "escrow" : true,
                               "meta" : {
-                                "globalKey" : "abed81bd"
-                              },
-                              "physicalSettlementPeriod" : {
-                                "maximumBusinessDays" : 30
+                                "globalKey" : "34cb1041"
                               }
                             }
                           },
                           "generalTerms" : {
                             "referenceInformation" : {
-                              "allGuarantees" : true,
                               "referenceEntity" : {
-                                "meta" : {
-                                  "globalKey" : "4573090"
-                                },
                                 "name" : {
                                   "value" : "Entity3"
+                                },
+                                "meta" : {
+                                  "globalKey" : "4573090"
                                 }
                               },
                               "referenceObligation" : [ {
-                                "primaryObligor" : {
-                                  "meta" : {
-                                    "globalKey" : "4573090"
-                                  },
-                                  "name" : {
-                                    "value" : "Entity3"
-                                  }
-                                },
                                 "security" : {
                                   "productIdentifier" : [ {
                                     "value" : {
                                       "identifier" : {
+                                        "value" : "ExampleCUSIP2",
                                         "meta" : {
                                           "scheme" : "CUSIP"
-                                        },
-                                        "value" : "ExampleCUSIP2"
+                                        }
                                       },
+                                      "source" : "CUSIP",
                                       "meta" : {
                                         "globalKey" : "c772c8fc"
-                                      },
-                                      "source" : "CUSIP"
+                                      }
                                     }
                                   } ],
-                                  "securityType" : "DEBT"
+                                  "securityType" : "Debt"
+                                },
+                                "primaryObligor" : {
+                                  "name" : {
+                                    "value" : "Entity3"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "4573090"
+                                  }
                                 }
                               } ],
+                              "allGuarantees" : true,
                               "referencePrice" : {
+                                "value" : 1.0000000000,
                                 "unit" : {
                                   "currency" : {
                                     "value" : "USD"
                                   }
                                 },
-                                "value" : 1.0000000000,
                                 "perUnitOf" : {
                                   "currency" : {
                                     "value" : "USD"
                                   }
                                 },
-                                "priceType" : "ASSET_PRICE"
+                                "priceType" : "AssetPrice"
                               }
                             }
                           },
-                          "meta" : {
-                            "globalKey" : "a4f0ea20"
-                          },
                           "protectionTerms" : [ {
                             "creditEvents" : {
-                              "creditEventNotice" : {
-                                "notifyingParty" : [ "PARTY_1", "PARTY_2" ],
-                                "publiclyAvailableInformation" : {
-                                  "publicSource" : [ "Standard Public Sources" ],
-                                  "specifiedNumber" : 2
-                                }
-                              },
-                              "defaultRequirement" : {
-                                "unit" : {
-                                  "currency" : {
-                                    "value" : "USD"
-                                  }
-                                },
-                                "value" : 1000000,
-                                "meta" : {
-                                  "globalKey" : "48eb1e55"
-                                }
-                              },
                               "failureToPay" : {
                                 "applicable" : true,
                                 "paymentRequirement" : {
+                                  "value" : 1000000,
                                   "unit" : {
                                     "currency" : {
                                       "value" : "USD"
                                     }
                                   },
-                                  "value" : 1000000,
                                   "meta" : {
                                     "globalKey" : "48eb1e55"
                                   }
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "CREDITEVENT",
-                                "globalKey" : "acc58dfd"
-                              },
                               "restructuring" : {
                                 "applicable" : true
+                              },
+                              "defaultRequirement" : {
+                                "value" : 1000000,
+                                "unit" : {
+                                  "currency" : {
+                                    "value" : "USD"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "48eb1e55"
+                                }
+                              },
+                              "creditEventNotice" : {
+                                "notifyingParty" : [ "Party1", "Party2" ],
+                                "publiclyAvailableInformation" : {
+                                  "publicSource" : [ "Standard Public Sources" ],
+                                  "specifiedNumber" : 2
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "1333467d",
+                                "externalKey" : "CREDITEVENT"
                               }
                             },
-                            "meta" : {
-                              "globalKey" : "91b93580"
-                            },
                             "obligations" : {
-                              "category" : "BOND"
-                            }
-                          } ]
-                        },
-                        "interestRatePayout" : [ {
-                          "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
-                          },
-                          "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "quantitySchedule" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "quantity-1"
-                              }
-                            }
-                          },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "28c47"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 3,
-                              "rollConvention" : "20"
+                              "category" : "Bond"
                             },
                             "meta" : {
-                              "globalKey" : "28c47"
+                              "globalKey" : "139ace00"
                             }
-                          },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
+                          } ],
                           "meta" : {
-                            "globalKey" : "e205902"
-                          },
-                          "paymentDates" : {
-                            "firstPaymentDate" : "2007-03-20",
-                            "lastRegularPaymentDate" : "2012-03-20",
-                            "meta" : {
-                              "globalKey" : "7303b6d6"
-                            },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "956"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 3
-                            }
-                          },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "externalKey" : "SPREAD",
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
-                              }
-                            }
+                            "globalKey" : "7f60c0d2"
                           }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "ec7d02e2"
-                        }
-                      },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "ec2ea6cd"
-                          },
-                          "unadjustedDate" : "2012-03-21"
                         },
                         "meta" : {
-                          "globalKey" : "ec2ea6cd"
+                          "globalKey" : "d3f7da6e"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "a523b3ed"
+                      "globalKey" : "64f8643d"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "a523b3ed"
+                    "globalKey" : "64f8643d"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "79baa295"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "79baa295"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "45e1a623"
+            "globalKey" : "41e83a3f"
           }
         },
         "meta" : {
-          "globalKey" : "45e1a623"
+          "globalKey" : "41e83a3f"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "f3a3e2c9"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0186,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0186,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "80d87657"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "Party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TRADEDATE",
-        "globalKey" : "3eb305"
-      },
-      "value" : "2006-12-05"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "Party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "Party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "1997-11-05",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "Trade123"
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "95729254"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2003Credit"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "521d2d0f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "72075119"
+        "globalKey" : "99e5143b"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "4c7d39e3"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "5f80e035"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 300000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "Party2"
         },
-        "value" : 300000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
+        }
       },
       "settlementDate" : {
         "relativeDate" : {
+          "periodMultiplier" : 3,
+          "period" : "D",
           "meta" : {
-            "globalKey" : "c47305b0"
+            "globalKey" : "fd075b8e"
           },
-          "period" : "D",
-          "periodMultiplier" : 3,
-          "dayType" : "BUSINESS",
+          "dayType" : "Business",
+          "businessDayConvention" : "NONE",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "USNY"
@@ -615,16 +610,21 @@
               "globalKey" : "4f5ffd5"
             }
           },
-          "businessDayConvention" : "NONE",
           "dateRelativeTo" : {
-            "externalReference" : "TRADEDATE",
-            "globalReference" : "3eb305"
+            "globalReference" : "3eb305",
+            "externalReference" : "TRADEDATE"
           }
         }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "93e45f7"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "ea9ef634"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-swaption-2.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-swaption-2.json
index 8ca3245fed..92b2ffb8f9 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-swaption-2.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-swaption-2.json
@@ -1,99 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "6f4c7d72"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "1997-11-05",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "95729254"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2003_CREDIT"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "521d2d0f"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "99e5143b"
-      }
-    },
-    "meta" : {
-      "globalKey" : "6395f6d7"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Trade234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "5c8ba844"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-06-27",
+      "meta" : {
+        "globalKey" : "3eb19b",
+        "externalKey" : "TRADEDATE"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -101,55 +32,52 @@
             "productQualifier" : "CreditDefaultSwaption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "bcf9a984"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "0",
+                    "externalReference" : "NOTIONAL"
+                  },
                   "meta" : {
                     "globalKey" : "8d28d340"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "NOTIONAL",
-                    "globalReference" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "f3b1d0d7"
-                  },
-                  "settlementType" : "PHYSICAL"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
-                "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "fallbackExercise" : false
+                "optionType" : "Put",
+                "feature" : {
+                  "knock" : {
+                    "knockOut" : {
+                      "trigger" : {
+                        "creditEventsReference" : {
+                          "globalReference" : "ae8d548",
+                          "externalReference" : "CREDITEVENT"
+                        }
+                      }
                     }
-                  },
+                  }
+                },
+                "exerciseTerms" : {
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "USNY"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-09-20",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -160,54 +88,48 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da556d3a"
                             }
                           },
                           "meta" : {
                             "globalKey" : "5f6d3466"
-                          },
-                          "unadjustedDate" : "2006-09-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "5f6d3466"
                         }
                       } ],
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "USNY"
+                        }
+                      },
                       "expirationTime" : {
+                        "hourMinuteTime" : "11:00:00",
                         "businessCenter" : {
                           "value" : "USNY"
-                        },
-                        "hourMinuteTime" : "11:00:00"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "25cd1f3"
+                        "globalKey" : "579df6f3"
                       }
                     }
                   },
                   "strike" : {
                     "strikeReference" : {
-                      "externalReference" : "SPREAD",
-                      "globalReference" : "0"
-                    }
-                  }
-                },
-                "feature" : {
-                  "knock" : {
-                    "knockOut" : {
-                      "trigger" : {
-                        "creditEventsReference" : {
-                          "externalReference" : "CREDITEVENT",
-                          "globalReference" : "987dca68"
-                        }
-                      }
+                      "globalReference" : "0",
+                      "externalReference" : "SPREAD"
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "fallbackExercise" : false
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "bcf9a984"
-                },
-                "optionType" : "PUT",
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -215,24 +137,26 @@
                       "productQualifier" : "CreditDefaultSwap_SingleName"
                     } ],
                     "economicTerms" : {
-                      "dateAdjustments" : {
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "GBLO"
-                          }, {
-                            "value" : "USNY"
-                          } ],
+                      "effectiveDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2006-09-21",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
                           "meta" : {
-                            "globalKey" : "42f910b"
+                            "globalKey" : "eb80184d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
-                          "globalKey" : "da556d3a"
+                          "globalKey" : "eb80184d"
                         }
                       },
-                      "effectiveDate" : {
+                      "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2011-09-21",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -240,419 +164,490 @@
                             }
                           },
                           "meta" : {
-                            "globalKey" : "eb80184d"
-                          },
-                          "unadjustedDate" : "2006-09-21"
+                            "globalKey" : "ec16404d"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "eb80184d"
+                          "globalKey" : "ec16404d"
+                        }
+                      },
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "GBLO"
+                          }, {
+                            "value" : "USNY"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "42f910b"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "da556d3a"
                         }
                       },
                       "payout" : {
-                        "creditDefaultPayout" : {
+                        "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "priceQuantity" : {
+                            "quantitySchedule" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "quantity-1"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "NOTIONAL",
                               "globalKey" : "0"
+                            }
+                          },
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "0",
+                                "externalKey" : "SPREAD"
+                              }
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "17f73"
+                              },
+                              "rollConvention" : "20"
                             },
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            }
+                          },
+                          "paymentDates" : {
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "aa"
+                              }
+                            },
+                            "firstPaymentDate" : "2006-12-20",
+                            "lastRegularPaymentDate" : "2011-09-20",
+                            "meta" : {
+                              "globalKey" : "1f081eea"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "754ee9fe"
+                          }
+                        } ],
+                        "creditDefaultPayout" : {
+                          "payerReceiver" : {
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
+                          },
+                          "priceQuantity" : {
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0",
+                              "externalKey" : "NOTIONAL"
                             }
                           },
                           "settlementTerms" : {
+                            "settlementType" : "Physical",
                             "meta" : {
-                              "globalKey" : "8240bda3"
+                              "globalKey" : "8933e791"
                             },
-                            "settlementType" : "PHYSICAL",
                             "physicalSettlementTerms" : {
+                              "physicalSettlementPeriod" : {
+                                "maximumBusinessDays" : 30
+                              },
                               "deliverableObligations" : {
                                 "accruedInterest" : false,
+                                "category" : "BondOrLoan",
+                                "notSubordinated" : true,
+                                "specifiedCurrency" : {
+                                  "applicable" : true,
+                                  "currency" : {
+                                    "value" : "USD"
+                                  }
+                                },
+                                "notContingent" : true,
                                 "assignableLoan" : {
                                   "applicable" : true
                                 },
-                                "category" : "BOND_OR_LOAN",
                                 "consentRequiredLoan" : {
                                   "applicable" : true
                                 },
-                                "excluded" : "true",
+                                "transferable" : true,
                                 "maximumMaturity" : {
-                                  "meta" : {
-                                    "globalKey" : "ae5"
-                                  },
+                                  "periodMultiplier" : 30,
                                   "period" : "Y",
-                                  "periodMultiplier" : 30
-                                },
-                                "notBearer" : true,
-                                "notContingent" : true,
-                                "notSubordinated" : true,
-                                "othReferenceEntityObligations" : "true",
-                                "specifiedCurrency" : {
-                                  "applicable" : true,
-                                  "currency" : {
-                                    "value" : "USD"
+                                  "meta" : {
+                                    "globalKey" : "3fb"
                                   }
                                 },
-                                "transferable" : true
+                                "notBearer" : true,
+                                "excluded" : "true",
+                                "othReferenceEntityObligations" : "true"
                               },
                               "escrow" : true,
                               "meta" : {
-                                "globalKey" : "e6e41cc"
-                              },
-                              "physicalSettlementPeriod" : {
-                                "maximumBusinessDays" : 30
+                                "globalKey" : "15616bba"
                               }
                             }
                           },
                           "generalTerms" : {
                             "referenceInformation" : {
-                              "allGuarantees" : false,
                               "referenceEntity" : {
-                                "meta" : {
-                                  "globalKey" : "457308e"
-                                },
                                 "name" : {
                                   "value" : "Entity1"
+                                },
+                                "meta" : {
+                                  "globalKey" : "457308e"
                                 }
                               },
                               "referenceObligation" : [ {
-                                "primaryObligor" : {
-                                  "meta" : {
-                                    "globalKey" : "457308e"
-                                  },
-                                  "name" : {
-                                    "value" : "Entity1"
-                                  }
-                                },
                                 "security" : {
                                   "productIdentifier" : [ {
                                     "value" : {
                                       "identifier" : {
+                                        "value" : "ExampleCUSIP1",
                                         "meta" : {
                                           "scheme" : "CUSIP"
-                                        },
-                                        "value" : "ExampleCUSIP1"
+                                        }
                                       },
+                                      "source" : "CUSIP",
                                       "meta" : {
                                         "globalKey" : "c772c8fb"
-                                      },
-                                      "source" : "CUSIP"
+                                      }
                                     }
                                   } ],
-                                  "securityType" : "DEBT"
-                                }
-                              } ],
-                              "referencePrice" : {
-                                "unit" : {
-                                  "currency" : {
-                                    "value" : "USD"
-                                  }
+                                  "securityType" : "Debt"
                                 },
-                                "value" : 1.0000000000,
-                                "perUnitOf" : {
-                                  "currency" : {
-                                    "value" : "USD"
+                                "primaryObligor" : {
+                                  "name" : {
+                                    "value" : "Entity1"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "457308e"
                                   }
-                                },
-                                "priceType" : "ASSET_PRICE"
-                              }
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "4a77ffcf"
-                          },
-                          "protectionTerms" : [ {
-                            "creditEvents" : {
-                              "bankruptcy" : true,
-                              "creditEventNotice" : {
-                                "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                                "publiclyAvailableInformation" : {
-                                  "publicSource" : [ "Standard Public Sources" ],
-                                  "specifiedNumber" : 2
                                 }
-                              },
-                              "defaultRequirement" : {
+                              } ],
+                              "allGuarantees" : false,
+                              "referencePrice" : {
+                                "value" : 1.0000000000,
                                 "unit" : {
                                   "currency" : {
                                     "value" : "USD"
                                   }
                                 },
-                                "value" : 10000000,
-                                "meta" : {
-                                  "globalKey" : "d467e427"
-                                }
-                              },
+                                "perUnitOf" : {
+                                  "currency" : {
+                                    "value" : "USD"
+                                  }
+                                },
+                                "priceType" : "AssetPrice"
+                              }
+                            }
+                          },
+                          "protectionTerms" : [ {
+                            "creditEvents" : {
+                              "bankruptcy" : true,
                               "failureToPay" : {
                                 "applicable" : true,
                                 "paymentRequirement" : {
+                                  "value" : 1000000,
                                   "unit" : {
                                     "currency" : {
                                       "value" : "USD"
                                     }
                                   },
-                                  "value" : 1000000,
                                   "meta" : {
                                     "globalKey" : "48eb1e55"
                                   }
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "CREDITEVENT",
-                                "globalKey" : "987dca68"
-                              },
                               "restructuring" : {
                                 "applicable" : true,
-                                "multipleHolderObligation" : true,
                                 "restructuringType" : {
-                                  "value" : "MOD_R"
+                                  "value" : "ModR"
+                                },
+                                "multipleHolderObligation" : true
+                              },
+                              "defaultRequirement" : {
+                                "value" : 10000000,
+                                "unit" : {
+                                  "currency" : {
+                                    "value" : "USD"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "d467e427"
                                 }
+                              },
+                              "creditEventNotice" : {
+                                "notifyingParty" : [ "Party2", "Party1" ],
+                                "publiclyAvailableInformation" : {
+                                  "publicSource" : [ "Standard Public Sources" ],
+                                  "specifiedNumber" : 2
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "ae8d548",
+                                "externalKey" : "CREDITEVENT"
                               }
                             },
-                            "meta" : {
-                              "globalKey" : "12f298dd"
-                            },
                             "obligations" : {
-                              "category" : "BORROWED_MONEY",
+                              "category" : "BorrowedMoney",
                               "excluded" : "true",
                               "othReferenceEntityObligations" : "true"
-                            }
-                          } ]
-                        },
-                        "interestRatePayout" : [ {
-                          "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
-                          },
-                          "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "quantitySchedule" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "quantity-1"
-                              }
-                            }
-                          },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "28c47"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 3,
-                              "rollConvention" : "20"
                             },
                             "meta" : {
-                              "globalKey" : "28c47"
+                              "globalKey" : "f11d33bd"
                             }
-                          },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
+                          } ],
                           "meta" : {
-                            "globalKey" : "eff5afe4"
-                          },
-                          "paymentDates" : {
-                            "firstPaymentDate" : "2006-12-20",
-                            "lastRegularPaymentDate" : "2011-09-20",
-                            "meta" : {
-                              "globalKey" : "1f082796"
-                            },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "956"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 3
-                            }
-                          },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "externalKey" : "SPREAD",
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
-                              }
-                            }
+                            "globalKey" : "e8426d31"
                           }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "a0e4f775"
-                        }
-                      },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "ec16404d"
-                          },
-                          "unadjustedDate" : "2011-09-21"
                         },
                         "meta" : {
-                          "globalKey" : "ec16404d"
+                          "globalKey" : "49661573"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "d3f1568b"
+                      "globalKey" : "8b502e99"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "d3f1568b"
+                    "globalKey" : "8b502e99"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "a12019ca"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "a12019ca"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "a2d139da"
+            "globalKey" : "25ccb834"
           }
         },
         "meta" : {
-          "globalKey" : "a2d139da"
+          "globalKey" : "25ccb834"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "92a37f9f"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.085,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.085,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d467e427"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c1cc7441"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "b894a0b9"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "Party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TRADEDATE",
-        "globalKey" : "3eb19b"
-      },
-      "value" : "2006-06-27"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "Party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "Party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "1997-11-05",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "Trade234"
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "95729254"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2003Credit"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "521d2d0f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "7215e0ba"
+        "globalKey" : "99e5143b"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "b62f6b5b"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "4b5f02a9"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59568"
-        }
-      },
       "quantity" : {
+        "value" : 65000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
         },
-        "value" : 65000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "Party2"
+        }
       },
       "settlementDate" : {
         "relativeDate" : {
+          "periodMultiplier" : 3,
+          "period" : "D",
           "meta" : {
-            "globalKey" : "c47305b0"
+            "globalKey" : "fd075b8e"
           },
-          "period" : "D",
-          "periodMultiplier" : 3,
-          "dayType" : "BUSINESS",
+          "dayType" : "Business",
+          "businessDayConvention" : "NONE",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "USNY"
@@ -663,16 +658,21 @@
               "globalKey" : "4f5ffd5"
             }
           },
-          "businessDayConvention" : "NONE",
           "dateRelativeTo" : {
-            "externalReference" : "TRADEDATE",
-            "globalReference" : "3eb19b"
+            "globalReference" : "3eb19b",
+            "externalReference" : "TRADEDATE"
           }
         }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "aecf3c03"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "8ba28fc8"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdindex-ex01-cdx.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdindex-ex01-cdx.json
index 19c483b355..148817c4e5 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdindex-ex01-cdx.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdindex-ex01-cdx.json
@@ -1,85 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "2e3e4c37"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2004-10-18",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "DJ.CDX.NA"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "e58a03ff",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "CDX1234",
+          "meta" : {
+            "scheme" : "http://www.newbank.com/trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "ae7fb3d4"
         }
       } ],
       "meta" : {
-        "globalKey" : "ae7fb3d4"
+        "globalKey" : "e6b4a6ee"
       }
-    },
-    "meta" : {
-      "globalKey" : "b3d18505"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "a0936c7f"
-      },
-      "name" : {
-        "value" : "New Bank, New York"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "HPFHU0OQ28E4N0NFVK49"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "eb844200"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "9518becf"
-      },
-      "name" : {
-        "value" : "Massive Bank, New York"
+      "issuerReference" : {
+        "globalReference" : "4ce0bf4f",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234A6",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900O1WT2BXINL9612"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "f5817694"
+            "scheme" : "http://www.massivebank.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ebf0fa4b"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2005-01-24",
+      "meta" : {
+        "globalKey" : "3ea858"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "a0936c7f"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "9518becf"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -89,226 +49,266 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2004-03-23",
                 "meta" : {
                   "globalKey" : "3ea0d7"
-                },
-                "unadjustedDate" : "2004-03-23"
+                }
               },
               "meta" : {
                 "globalKey" : "3ea0d7"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-03-20",
+                "meta" : {
+                  "globalKey" : "3ec8d4"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ec8d4"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "generalTerms" : {
-                  "indexReferenceInformation" : {
-                    "indexName" : {
-                      "value" : "Dow Jones CDX NA IG.2"
-                    },
-                    "indexAnnexDate" : "2004-07-06",
-                    "indexAnnexSource" : {
-                      "value" : "PUBLISHER"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
                     },
-                    "indexSeries" : 2,
                     "meta" : {
-                      "globalKey" : "92a91d81"
+                      "globalKey" : "0"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "c762cfa0"
+                  "globalKey" : "5a5ff79f"
                 }
-              },
-              "interestRatePayout" : [ {
+              } ],
+              "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "5a5ff79f"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
+                "generalTerms" : {
+                  "indexReferenceInformation" : {
+                    "indexName" : {
+                      "value" : "Dow Jones CDX NA IG.2"
                     },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
+                    "indexSeries" : 2,
+                    "indexAnnexDate" : "2004-07-06",
+                    "indexAnnexSource" : {
+                      "value" : "Publisher"
+                    },
+                    "meta" : {
+                      "globalKey" : "53b8689"
                     }
                   }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "a049273f"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ec8d4"
                 },
-                "unadjustedDate" : "2009-03-20"
+                "meta" : {
+                  "globalKey" : "39f538a8"
+                }
               },
               "meta" : {
-                "globalKey" : "3ec8d4"
+                "globalKey" : "383edb69"
               }
             }
           },
           "meta" : {
-            "globalKey" : "2427143e"
+            "globalKey" : "9c4bc46"
           }
         },
         "meta" : {
-          "globalKey" : "2427143e"
+          "globalKey" : "9c4bc46"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "56a5905f"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0060,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0060,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "7e0c7b81"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e58a03ff",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4ce0bf4f",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea858"
-      },
-      "value" : "2005-01-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "HPFHU0OQ28E4N0NFVK49",
           "meta" : {
-            "scheme" : "http://www.newbank.com/trade-id"
-          },
-          "value" : "CDX1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "eb844200"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "a0936c7f"
+      "name" : {
+        "value" : "New Bank, New York"
       },
       "meta" : {
-        "globalKey" : "affe98a4"
+        "globalKey" : "e58a03ff",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900O1WT2BXINL9612",
           "meta" : {
-            "scheme" : "http://www.massivebank.com/trade-id"
-          },
-          "value" : "1234A6"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "f5817694"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "9518becf"
+      "name" : {
+        "value" : "Massive Bank, New York"
       },
       "meta" : {
-        "globalKey" : "55beb023"
+        "globalKey" : "4ce0bf4f",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2004-10-18",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "DJ.CDX.NA"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "ae7fb3d4"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "ae7fb3d4"
+      }
+    },
+    "meta" : {
+      "globalKey" : "5afd403d"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "3cb073f2"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "a0936c7f"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "9518becf"
-        }
-      },
       "quantity" : {
+        "value" : 16000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "e58a03ff",
+          "externalReference" : "party1"
         },
-        "value" : 16000
+        "receiverPartyReference" : {
+          "globalReference" : "4ce0bf4f",
+          "externalReference" : "party2"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "309a8bea"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "50b01d67"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdindex-ex02-iTraxx.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdindex-ex02-iTraxx.json
index eb02ec77bb..f44c0d729e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdindex-ex02-iTraxx.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdindex-ex02-iTraxx.json
@@ -1,83 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "f6ac10d0"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2004-10-11",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "DJ.iTraxx.Europe"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "20c13e66",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "ITRAXX1234",
+          "meta" : {
+            "scheme" : "http://www.newbank.com/trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "d51e174"
         }
       } ],
       "meta" : {
-        "globalKey" : "d51e174"
+        "globalKey" : "348f2a71"
       }
-    },
-    "meta" : {
-      "globalKey" : "38c6c661"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "c576f3c8"
-      },
-      "name" : {
-        "value" : "New Bank, New York"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-person-id"
-          },
-          "value" : "549300X5I608U02HAI25"
-        },
-        "meta" : {
-          "globalKey" : "5444ea27"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "85c6fec"
-      },
-      "name" : {
-        "value" : "Massive Bank, New York"
+      "issuerReference" : {
+        "globalReference" : "c1910382",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234B6",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-person-id"
-          },
-          "value" : "VMPORTIB1LEXNX832U55"
-        },
-        "meta" : {
-          "globalKey" : "55cb2b87"
+            "scheme" : "http://www.massivebank.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ebf0fa6a"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2004-11-03",
+      "meta" : {
+        "globalKey" : "3ea2c3"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "85c6fec"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "c576f3c8"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -85,21 +47,32 @@
             "productQualifier" : "CreditDefaultSwap_Index"
           } ],
           "economicTerms" : {
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2010-03-20",
+                "meta" : {
+                  "globalKey" : "3ed0d4"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ed0d4"
+              }
+            },
             "payout" : {
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "generalTerms" : {
@@ -107,141 +80,168 @@
                     "indexName" : {
                       "value" : "Dow Jones iTraxx Europe Consumers Series 2 Version 1"
                     },
+                    "indexSeries" : 2,
+                    "indexAnnexVersion" : 1,
                     "excludedReferenceEntity" : [ {
                       "referenceEntity" : {
-                        "meta" : {
-                          "globalKey" : "43886e95"
-                        },
                         "name" : {
                           "value" : "TESCO PLC"
+                        },
+                        "meta" : {
+                          "globalKey" : "43886e95"
                         }
                       }
                     } ],
-                    "indexAnnexVersion" : 1,
-                    "indexSeries" : 2,
                     "meta" : {
-                      "globalKey" : "ac767880"
+                      "globalKey" : "ae1d399e"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "998c1edf"
+                  "globalKey" : "9b32dffd"
                 }
               },
               "meta" : {
-                "globalKey" : "998c1edf"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ed0d4"
-                },
-                "unadjustedDate" : "2010-03-20"
-              },
-              "meta" : {
-                "globalKey" : "3ed0d4"
+                "globalKey" : "9b32dffd"
               }
             }
           },
           "meta" : {
-            "globalKey" : "793b5195"
+            "globalKey" : "307d88d1"
           }
         },
         "meta" : {
-          "globalKey" : "793b5195"
+          "globalKey" : "307d88d1"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "c1910382",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "20c13e66",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea2c3"
-      },
-      "value" : "2004-11-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300X5I608U02HAI25",
           "meta" : {
-            "scheme" : "http://www.newbank.com/trade-id"
-          },
-          "value" : "ITRAXX1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-person-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "5444ea27"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "c576f3c8"
+      "name" : {
+        "value" : "New Bank, New York"
       },
       "meta" : {
-        "globalKey" : "f1464767"
+        "globalKey" : "20c13e66",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "VMPORTIB1LEXNX832U55",
           "meta" : {
-            "scheme" : "http://www.massivebank.com/trade-id"
-          },
-          "value" : "1234B6"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-person-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "55cb2b87"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "85c6fec"
+      "name" : {
+        "value" : "Massive Bank, New York"
       },
       "meta" : {
-        "globalKey" : "55bf2482"
+        "globalKey" : "c1910382",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2004-10-11",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "DJ.iTraxx.Europe"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "d51e174"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "d51e174"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "eae6a6d5"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "d014882f"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "c576f3c8"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "85c6fec"
-        }
-      },
       "quantity" : {
+        "value" : 17000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "20c13e66",
+          "externalReference" : "party1"
         },
-        "value" : 17000
+        "receiverPartyReference" : {
+          "globalReference" : "c1910382",
+          "externalReference" : "party2"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "a4ba95cd"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "8f9623e2"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdindex-ex03-iTraxx-contractual-supplement.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdindex-ex03-iTraxx-contractual-supplement.json
index c472c07a21..311f898fdf 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdindex-ex03-iTraxx-contractual-supplement.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdindex-ex03-iTraxx-contractual-supplement.json
@@ -1,135 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "53af5554"
-  },
   "trade" : {
-    "account" : [ {
-      "accountNumber" : {
-        "meta" : {
-          "scheme" : "http://www.partyA/accountId"
-        },
-        "value" : "12345PartyA"
-      },
-      "meta" : {
-        "externalKey" : "accountParty1",
-        "globalKey" : "31d4eab9"
-      },
-      "servicingParty" : {
-        "externalReference" : "party1",
-        "globalReference" : "6050007b"
-      }
-    }, {
-      "accountNumber" : {
-        "meta" : {
-          "scheme" : "http://partyB/accountId"
-        },
-        "value" : "67899PartyB"
-      },
-      "meta" : {
-        "externalKey" : "accountParty2",
-        "globalKey" : "ffd4b93f"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "41a0254c",
+        "externalReference" : "party2"
       },
-      "servicingParty" : {
-        "externalReference" : "party2",
-        "globalReference" : "a8f1da4c"
-      }
-    } ],
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2000-01-01",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "17d39ad0"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/contractual-supplement"
-                },
-                "value" : "I_TRAXX_EUROPE_DEALER"
-              },
-              "publicationDate" : "2005-09-19"
-            } ]
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "ITRAXX1234",
+          "meta" : {
+            "scheme" : "http://www.partyB.com/trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "848aea2c"
         }
       } ],
       "meta" : {
-        "globalKey" : "654a855c"
+        "globalKey" : "348f9ed0"
       }
-    },
-    "meta" : {
-      "globalKey" : "f271cda5"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "6050007b"
-      },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900O1WT2BXINL9612"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "f5817694"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "a8f1da4c"
-      },
-      "name" : {
-        "value" : "Party B"
+      "issuerReference" : {
+        "globalReference" : "cef3b6fb",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234B6",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300P7IVTDP12DEA19"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3e1538e4"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ebf0860b"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2005-11-03",
+      "meta" : {
+        "globalKey" : "3eaac3"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "6050007b"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "a8f1da4c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -137,21 +47,32 @@
             "productQualifier" : "CreditDefaultSwap_Index"
           } ],
           "economicTerms" : {
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2010-03-20",
+                "meta" : {
+                  "globalKey" : "3ed0d4"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ed0d4"
+              }
+            },
             "payout" : {
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "generalTerms" : {
@@ -159,145 +80,224 @@
                     "indexName" : {
                       "value" : "Dow Jones iTraxx Europe Consumers Series 2 Version 1"
                     },
+                    "indexSeries" : 2,
+                    "indexAnnexVersion" : 1,
+                    "indexAnnexDate" : "2005-11-01",
+                    "indexAnnexSource" : {
+                      "value" : "Publisher"
+                    },
                     "excludedReferenceEntity" : [ {
                       "referenceEntity" : {
-                        "meta" : {
-                          "globalKey" : "43886e95"
-                        },
                         "name" : {
                           "value" : "TESCO PLC"
+                        },
+                        "meta" : {
+                          "globalKey" : "43886e95"
                         }
                       }
                     } ],
-                    "indexAnnexDate" : "2005-11-01",
-                    "indexAnnexSource" : {
-                      "value" : "PUBLISHER"
-                    },
-                    "indexAnnexVersion" : 1,
-                    "indexSeries" : 2,
                     "meta" : {
-                      "globalKey" : "d58c2dc9"
+                      "globalKey" : "aba314c9"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "9ff7f70a"
+                  "globalKey" : "760ede0a"
                 }
               },
               "meta" : {
-                "globalKey" : "9ff7f70a"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ed0d4"
-                },
-                "unadjustedDate" : "2010-03-20"
-              },
-              "meta" : {
-                "globalKey" : "3ed0d4"
+                "globalKey" : "760ede0a"
               }
             }
           },
           "meta" : {
-            "globalKey" : "b934058a"
+            "globalKey" : "b14394b6"
           }
         },
         "meta" : {
-          "globalKey" : "b934058a"
+          "globalKey" : "b14394b6"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "2ebb90bf"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8b68721"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "cef3b6fb",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "41a0254c",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eaac3"
-      },
-      "value" : "2005-11-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900O1WT2BXINL9612",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "ITRAXX1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "f5817694"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "a8f1da4c"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "f1464768"
+        "globalKey" : "cef3b6fb",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300P7IVTDP12DEA19",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3e1538e4"
+        }
+      } ],
+      "name" : {
+        "value" : "Party B"
+      },
+      "meta" : {
+        "globalKey" : "41a0254c",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2000-01-01",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234B6"
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "17d39ad0"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "iTraxxEuropeDealer",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/contractual-supplement"
+                }
+              },
+              "publicationDate" : "2005-09-19"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "848aea2c"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "6050007b"
+      "meta" : {
+        "globalKey" : "654a855c"
+      }
+    },
+    "account" : [ {
+      "accountNumber" : {
+        "value" : "12345PartyA",
+        "meta" : {
+          "scheme" : "http://www.partyA/accountId"
+        }
+      },
+      "servicingParty" : {
+        "globalReference" : "cef3b6fb",
+        "externalReference" : "party1"
+      },
+      "meta" : {
+        "globalKey" : "31d4eab9",
+        "externalKey" : "accountParty1"
+      }
+    }, {
+      "accountNumber" : {
+        "value" : "67899PartyB",
+        "meta" : {
+          "scheme" : "http://partyB/accountId"
+        }
+      },
+      "servicingParty" : {
+        "globalReference" : "41a0254c",
+        "externalReference" : "party2"
       },
       "meta" : {
-        "globalKey" : "55bf2481"
+        "globalKey" : "ffd4b93f",
+        "externalKey" : "accountParty2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "2ea8d4bb"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "5c7ccc6f"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "a8f1da4c"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "6050007b"
-        }
-      },
       "quantity" : {
+        "value" : 17000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "41a0254c",
+          "externalReference" : "party2"
         },
-        "value" : 17000
+        "receiverPartyReference" : {
+          "globalReference" : "cef3b6fb",
+          "externalReference" : "party1"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "a4c8a98d"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "64b51b08"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdindex-ex04-iBoxx.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdindex-ex04-iBoxx.json
index bdc7a17a41..72d84c145d 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdindex-ex04-iBoxx.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdindex-ex04-iBoxx.json
@@ -1,97 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "8f9b3efa"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2004-10-18",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION"
-          }
-        },
-        "meta" : {
-          "globalKey" : "842d2b20"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "e58a03ff",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "CDX1234",
+          "meta" : {
+            "scheme" : "http://www.newbank.com/trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "6b413360"
         }
       } ],
       "meta" : {
-        "globalKey" : "1231fc40"
+        "globalKey" : "e6b4a6ee"
       }
-    },
-    "meta" : {
-      "globalKey" : "19a73908"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "a0936c7f"
-      },
-      "name" : {
-        "value" : "New Bank, New York"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "HPFHU0OQ28E4N0NFVK49"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "eb844200"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "9518becf"
-      },
-      "name" : {
-        "value" : "Massive Bank, New York"
+      "issuerReference" : {
+        "globalReference" : "4ce0bf4f",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234A6",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900O1WT2BXINL9612"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "f5817694"
+            "scheme" : "http://www.massivebank.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ebf0fa4b"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2005-01-24",
+      "meta" : {
+        "globalKey" : "3ea858"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "a0936c7f"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "9518becf"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -101,76 +49,45 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2014-03-23",
                 "meta" : {
                   "globalKey" : "3ef0d7"
-                },
-                "unadjustedDate" : "2014-03-23"
+                }
               },
               "meta" : {
                 "globalKey" : "3ef0d7"
               }
             },
-            "payout" : {
-              "creditDefaultPayout" : {
-                "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
-                    }
-                  }
-                },
-                "generalTerms" : {
-                  "indexReferenceInformation" : {
-                    "indexId" : [ {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
-                      },
-                      "value" : "DE0006301161"
-                    } ],
-                    "indexName" : {
-                      "value" : "iBoxx EUR Corporates"
-                    },
-                    "meta" : {
-                      "globalKey" : "3f94f315"
-                    }
-                  }
-                },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2019-03-20",
                 "meta" : {
-                  "globalKey" : "1902a0f4"
+                  "globalKey" : "3f18d4"
                 }
               },
+              "meta" : {
+                "globalKey" : "3f18d4"
+              }
+            },
+            "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "2c4ccb73"
-                },
                 "rateSpecification" : {
                   "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "174d4182"
-                    },
                     "rateOption" : {
                       "address" : {
                         "scope" : "DOCUMENT",
@@ -185,221 +102,304 @@
                         }
                       }
                     },
+                    "meta" : {
+                      "globalKey" : "174d4182"
+                    },
                     "initialRate" : {
+                      "value" : 0.025,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.025,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
                     }
                   }
                 },
                 "resetDates" : {
+                  "initialFixingDate" : {
+                    "initialFixingDate" : "2014-03-23"
+                  },
                   "finalFixingDate" : {
+                    "unadjustedDate" : "2019-03-20",
                     "dateAdjustments" : {
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "meta" : {
                         "globalKey" : "3a4b88ab"
                       }
                     },
                     "meta" : {
                       "globalKey" : "2727bc7f"
-                    },
-                    "unadjustedDate" : "2019-03-20"
-                  },
-                  "initialFixingDate" : {
-                    "initialFixingDate" : "2014-03-23"
+                    }
                   },
                   "meta" : {
-                    "globalKey" : "fc698996"
+                    "globalKey" : "1a4469d6"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "4a27abb3"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "d78d067"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3f18d4"
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
+                },
+                "generalTerms" : {
+                  "indexReferenceInformation" : {
+                    "indexName" : {
+                      "value" : "iBoxx EUR Corporates"
+                    },
+                    "indexId" : [ {
+                      "value" : "DE0006301161",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "8b0e5955"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2019-03-20"
+                "meta" : {
+                  "globalKey" : "647c0734"
+                }
               },
               "meta" : {
-                "globalKey" : "3f18d4"
+                "globalKey" : "16a21da1"
               }
             }
           },
           "meta" : {
-            "globalKey" : "507b7656"
+            "globalKey" : "b828b7be"
           }
         },
         "meta" : {
-          "globalKey" : "507b7656"
+          "globalKey" : "b828b7be"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "8be2eb38"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "b67ad2b1"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
-                  },
-                  "value" : "USD-LIBOR-BBA"
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.02,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.02,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 1000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 1000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
             },
+            "meta" : {
+              "globalKey" : "18df836f"
+            }
+          },
+          "meta" : {
+            "globalKey" : "bd6e2aee"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e58a03ff",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4ce0bf4f",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea858"
-      },
-      "value" : "2005-01-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "HPFHU0OQ28E4N0NFVK49",
           "meta" : {
-            "scheme" : "http://www.newbank.com/trade-id"
-          },
-          "value" : "CDX1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "eb844200"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "a0936c7f"
+      "name" : {
+        "value" : "New Bank, New York"
       },
       "meta" : {
-        "globalKey" : "affe98a4"
+        "globalKey" : "e58a03ff",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900O1WT2BXINL9612",
           "meta" : {
-            "scheme" : "http://www.massivebank.com/trade-id"
-          },
-          "value" : "1234A6"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "f5817694"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "9518becf"
+      "name" : {
+        "value" : "Massive Bank, New York"
       },
       "meta" : {
-        "globalKey" : "55beb023"
+        "globalKey" : "4ce0bf4f",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2004-10-18",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation"
+          }
+        },
+        "meta" : {
+          "globalKey" : "842d2b20"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "1231fc40"
+      }
+    },
+    "meta" : {
+      "globalKey" : "3e0b3ae4"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "3cb073f2"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "a0936c7f"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "9518becf"
-        }
-      },
       "quantity" : {
+        "value" : 16000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "e58a03ff",
+          "externalReference" : "party1"
         },
-        "value" : 16000
+        "receiverPartyReference" : {
+          "globalReference" : "4ce0bf4f",
+          "externalReference" : "party2"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "309a8bea"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "3ce2e7ce"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdindex-ex05-SP.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdindex-ex05-SP.json
index 086e015f6c..423f8edb20 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdindex-ex05-SP.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdindex-ex05-SP.json
@@ -1,99 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "948a713c"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-              },
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualTermsSupplement" : [ {
-              "publicationDate" : "2010-09-19"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "e58a03ff",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "CDX1234",
+          "meta" : {
+            "scheme" : "http://www.newbank.com/trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "2df00d48"
         }
       } ],
       "meta" : {
-        "globalKey" : "7ff7fe21"
+        "globalKey" : "e6b4a6ee"
       }
-    },
-    "meta" : {
-      "globalKey" : "61ae5ff1"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "a0936c7f"
-      },
-      "name" : {
-        "value" : "New Bank, New York"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "HPFHU0OQ28E4N0NFVK49"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "eb844200"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "9518becf"
-      },
-      "name" : {
-        "value" : "Massive Bank, New York"
+      "issuerReference" : {
+        "globalReference" : "4ce0bf4f",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234A6",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900O1WT2BXINL9612"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "f5817694"
+            "scheme" : "http://www.massivebank.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ebf0fa4b"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2005-01-24",
+      "meta" : {
+        "globalKey" : "3ea858"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "9518becf"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "a0936c7f"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -103,93 +49,58 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2014-05-20",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "269374ff"
-                },
-                "unadjustedDate" : "2014-05-20"
+                }
               },
               "meta" : {
                 "globalKey" : "269374ff"
               }
             },
-            "payout" : {
-              "creditDefaultPayout" : {
-                "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
-                },
-                "priceQuantity" : {
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2015-05-20",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
-                    "externalKey" : "calculationAmount",
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "generalTerms" : {
-                  "additionalTerm" : [ {
-                    "meta" : {
-                      "scheme" : "http://derivserv.dtcc.com/coding-scheme/additional-term"
-                    },
-                    "value" : "Y"
-                  } ],
-                  "indexReferenceInformation" : {
-                    "indexId" : [ {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/standard-and-poors"
-                      },
-                      "value" : "7FC48VAA0"
-                    } ],
-                    "indexName" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/standard-and-poors"
-                      },
-                      "value" : "S&P/ISDA U.S. 150 Credit Spread Index Series 1"
-                    },
-                    "meta" : {
-                      "globalKey" : "57a76907"
-                    }
+                    "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "24406a6d"
+                  "globalKey" : "26b17cff"
                 }
               },
+              "meta" : {
+                "globalKey" : "26b17cff"
+              }
+            },
+            "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "calculationAmount",
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "calculationAmount"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "5a5ff79f"
-                },
                 "rateSpecification" : {
                   "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "rateSchedule" : {
                       "price" : {
                         "address" : {
@@ -197,168 +108,257 @@
                           "value" : "price-1"
                         }
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   }
+                },
+                "meta" : {
+                  "globalKey" : "5a5ff79f"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "b5b9a50c"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "globalKey" : "3a4b88ab"
+                    "globalKey" : "0",
+                    "externalKey" : "calculationAmount"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "26b17cff"
+                "generalTerms" : {
+                  "indexReferenceInformation" : {
+                    "indexName" : {
+                      "value" : "S&P/ISDA U.S. 150 Credit Spread Index Series 1",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/standard-and-poors"
+                      }
+                    },
+                    "indexId" : [ {
+                      "value" : "7FC48VAA0",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/standard-and-poors"
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "5dd0ec47"
+                    }
+                  },
+                  "additionalTerm" : [ {
+                    "value" : "Y",
+                    "meta" : {
+                      "scheme" : "http://derivserv.dtcc.com/coding-scheme/additional-term"
+                    }
+                  } ]
                 },
-                "unadjustedDate" : "2015-05-20"
+                "meta" : {
+                  "globalKey" : "6200a8ff"
+                }
               },
               "meta" : {
-                "globalKey" : "26b17cff"
+                "globalKey" : "604a4bc0"
               }
             }
           },
           "meta" : {
-            "globalKey" : "adcb8314"
+            "globalKey" : "d6f8d320"
           }
         },
         "meta" : {
-          "globalKey" : "adcb8314"
+          "globalKey" : "d6f8d320"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "63df2e7c"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0085,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/ext/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
               },
-              "value" : 0.0085,
               "perUnitOf" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/ext/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "1806a104"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/ext/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4ce0bf4f",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "e58a03ff",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea858"
-      },
-      "value" : "2005-01-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "HPFHU0OQ28E4N0NFVK49",
           "meta" : {
-            "scheme" : "http://www.newbank.com/trade-id"
-          },
-          "value" : "CDX1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "eb844200"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "a0936c7f"
+      "name" : {
+        "value" : "New Bank, New York"
       },
       "meta" : {
-        "globalKey" : "affe98a4"
+        "globalKey" : "e58a03ff",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900O1WT2BXINL9612",
           "meta" : {
-            "scheme" : "http://www.massivebank.com/trade-id"
-          },
-          "value" : "1234A6"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "f5817694"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "9518becf"
+      "name" : {
+        "value" : "Massive Bank, New York"
       },
       "meta" : {
-        "globalKey" : "55beb023"
+        "globalKey" : "4ce0bf4f",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+              }
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualTermsSupplement" : [ {
+              "publicationDate" : "2010-09-19"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "2df00d48"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "7ff7fe21"
+      }
+    },
+    "meta" : {
+      "globalKey" : "21888fa5"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "b75f4b0b"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "a0936c7f"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "9518becf"
-        }
-      },
       "quantity" : {
+        "value" : 20000,
         "unit" : {
           "currency" : {
+            "value" : "USD",
             "meta" : {
               "scheme" : "http://www.fpml.org/ext/iso4217"
-            },
-            "value" : "USD"
+            }
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "e58a03ff",
+          "externalReference" : "party1"
         },
-        "value" : 20000
+        "receiverPartyReference" : {
+          "globalReference" : "4ce0bf4f",
+          "externalReference" : "party2"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "3f433c71"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "8d910756"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-ELCDS-ReferenceObligation.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-ELCDS-ReferenceObligation.json
index 6954f838dc..2c3b634e2f 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-ELCDS-ReferenceObligation.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-ELCDS-ReferenceObligation.json
@@ -1,126 +1,29 @@
 {
-  "meta" : {
-    "globalKey" : "4c488950"
-  },
   "trade" : {
-    "collateral" : {
-      "independentAmount" : {
-        "payerPartyReference" : {
-          "externalReference" : "DTCCPty2",
-          "globalReference" : "8e102e2c"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "DTCCPty1",
-          "globalReference" : "8e102e2b"
-        },
-        "paymentDetail" : [ {
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "8e102e2b",
+        "externalReference" : "DTCCPty1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "TW9236",
           "meta" : {
-            "globalKey" : "a7568501"
-          },
-          "paymentRule" : {
-            "percentageRule" : {
-              "notionalAmountReference" : {
-                "externalReference" : "calculationAmount",
-                "globalReference" : "0"
-              },
-              "paymentPercent" : 0.02
-            }
-          }
-        } ]
-      }
-    },
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2007-12-12",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "33d1515b"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "STANDARD_LCDS"
-              },
-              "publicationDate" : "2007-12-12"
-            } ]
+            "scheme" : "TradeRefNbr"
           }
-        },
-        "meta" : {
-          "globalKey" : "b6826249"
         }
       } ],
       "meta" : {
-        "globalKey" : "f1cee48e"
+        "globalKey" : "9b902fd3"
       }
-    },
-    "meta" : {
-      "globalKey" : "4c488950"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "DTCCPty1",
-        "globalKey" : "8e102e2b"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "DTCC"
-          },
-          "value" : "Party1"
-        },
-        "meta" : {
-          "globalKey" : "8e102e2b"
-        }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "DTCCPty2",
-        "globalKey" : "8e102e2c"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "DTCC"
-          },
-          "value" : "Party2"
-        },
-        "meta" : {
-          "globalKey" : "8e102e2c"
-        }
-      } ]
     } ],
+    "tradeDate" : {
+      "value" : "2007-10-31",
+      "meta" : {
+        "globalKey" : "3eba9f"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "DTCCPty1",
-          "globalReference" : "8e102e2b"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "DTCCPty1",
-          "globalReference" : "8e102e2b"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "DTCCPty2",
-          "globalReference" : "8e102e2c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -128,58 +31,134 @@
             "productQualifier" : "CreditDefaultSwap_Loan"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2007-11-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25c6972c"
-                },
-                "unadjustedDate" : "2007-11-01"
+                }
               },
               "meta" : {
                 "globalKey" : "25c6972c"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2010-06-17",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "261c39fc"
+                }
+              },
+              "meta" : {
+                "globalKey" : "261c39fc"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "externalKey" : "calculationAmount",
-                    "globalKey" : "0"
+                    "globalKey" : "0",
+                    "externalKey" : "calculationAmount"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f78"
+                    },
+                    "rollConvention" : "25"
                   },
+                  "meta" : {
+                    "globalKey" : "17f78"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2007-12-20",
+                  "meta" : {
+                    "globalKey" : "840c7d16"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "330a257d"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "calculationAmount"
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "BLMBERGID",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-Bloomberg"
-                        },
-                        "value" : "BLMBERGID"
+                        }
                       } ],
-                      "meta" : {
-                        "globalKey" : "5fb7a8be"
-                      },
                       "name" : {
                         "value" : "CompanyDEF"
+                      },
+                      "meta" : {
+                        "globalKey" : "5fb7a8be"
                       }
                     },
                     "referenceObligation" : [ {
@@ -187,265 +166,286 @@
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "64352VNC1",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP"
-                              },
-                              "value" : "64352VNC1"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "b56573a0"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
+                              "value" : "ISIN00000000",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
-                              },
-                              "value" : "ISIN00000000"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "88e600de"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
+                              "value" : "BLMBERGID",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-Bloomberg"
-                              },
-                              "value" : "BLMBERGID"
+                              }
                             },
+                            "source" : "BBGID",
                             "meta" : {
                               "globalKey" : "86561eb8"
-                            },
-                            "source" : "BBGID"
+                            }
                           }
                         } ],
                         "borrower" : [ {
-                          "meta" : {
-                            "globalKey" : "238916a4"
-                          },
                           "name" : {
                             "value" : "BorrowerName1"
+                          },
+                          "meta" : {
+                            "globalKey" : "238916a4"
                           }
                         }, {
-                          "meta" : {
-                            "globalKey" : "238916a5"
-                          },
                           "name" : {
                             "value" : "BorrowerName2"
+                          },
+                          "meta" : {
+                            "globalKey" : "238916a5"
                           }
                         } ],
-                        "creditAgreementDate" : "2005-11-04",
                         "facilityType" : {
+                          "value" : "RevolvingLoan",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/facility-type"
-                          },
-                          "value" : "RevolvingLoan"
-                        }
+                          }
+                        },
+                        "creditAgreementDate" : "2005-11-04"
                       }
                     } ],
                     "securedList" : false
                   }
                 },
-                "meta" : {
-                  "globalKey" : "ccfa90f9"
-                },
                 "protectionTerms" : [ {
-                  "meta" : {
-                    "globalKey" : "80d42974"
-                  },
                   "obligations" : {
-                    "cashSettlementOnly" : true,
-                    "category" : "LOAN",
-                    "continuity" : true,
-                    "deliveryOfCommitments" : true,
+                    "category" : "Loan",
+                    "fullFaithAndCreditObLiability" : true,
                     "designatedPriority" : {
+                      "value" : "FirstLienLoan",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/lien"
-                      },
-                      "value" : "FirstLienLoan"
-                    },
-                    "fullFaithAndCreditObLiability" : true
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "calculationAmount",
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c4c"
+                      }
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "25"
+                    "cashSettlementOnly" : true,
+                    "deliveryOfCommitments" : true,
+                    "continuity" : true
                   },
                   "meta" : {
-                    "globalKey" : "28c4c"
+                    "globalKey" : "153c5056"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "4e6b4829"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2007-12-20",
-                  "meta" : {
-                    "globalKey" : "840c85c2"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "6162b7db"
                 }
-              } ],
-              "meta" : {
-                "globalKey" : "729aece2"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
-                  "meta" : {
-                    "globalKey" : "3a4b88ab"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "261c39fc"
-                },
-                "unadjustedDate" : "2010-06-17"
               },
               "meta" : {
-                "globalKey" : "261c39fc"
+                "globalKey" : "41df0f58"
               }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "b2f108dc"
+            "globalKey" : "43d835f2"
           }
         },
         "meta" : {
-          "globalKey" : "b2f108dc"
+          "globalKey" : "43d835f2"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "b34678c3"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.013,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
               },
-              "value" : 0.013,
               "perUnitOf" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d467e427"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "b5889f9d"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
-              },
-              "value" : 10000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "b894a0b9"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "8e102e2b",
+          "externalReference" : "DTCCPty1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "8e102e2c",
+          "externalReference" : "DTCCPty2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "8e102e2b",
+          "externalReference" : "DTCCPty1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party1",
+          "meta" : {
+            "scheme" : "DTCC"
+          }
+        },
+        "meta" : {
+          "globalKey" : "8e102e2b"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3eba9f"
-      },
-      "value" : "2007-10-31"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "8e102e2b",
+        "externalKey" : "DTCCPty1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party2",
           "meta" : {
-            "scheme" : "TradeRefNbr"
+            "scheme" : "DTCC"
+          }
+        },
+        "meta" : {
+          "globalKey" : "8e102e2c"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "8e102e2c",
+        "externalKey" : "DTCCPty2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2007-12-12",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "TW9236"
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "33d1515b"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "StandardLCDS"
+              },
+              "publicationDate" : "2007-12-12"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "b6826249"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "DTCCPty1",
-        "globalReference" : "8e102e2b"
-      },
       "meta" : {
-        "globalKey" : "ddc3fd6b"
+        "globalKey" : "f1cee48e"
       }
-    } ]
+    },
+    "collateral" : {
+      "independentAmount" : {
+        "payerPartyReference" : {
+          "globalReference" : "8e102e2c",
+          "externalReference" : "DTCCPty2"
+        },
+        "receiverPartyReference" : {
+          "globalReference" : "8e102e2b",
+          "externalReference" : "DTCCPty1"
+        },
+        "paymentDetail" : [ {
+          "paymentRule" : {
+            "percentageRule" : {
+              "paymentPercent" : 0.02,
+              "notionalAmountReference" : {
+                "globalReference" : "0",
+                "externalReference" : "calculationAmount"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "a7568501"
+          }
+        } ]
+      }
+    },
+    "meta" : {
+      "globalKey" : "a7749c52"
+    }
+  },
+  "meta" : {
+    "globalKey" : "a7749c52"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-basket-tranche.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-basket-tranche.json
index dd22c514c7..62c2e2f9e1 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-basket-tranche.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-basket-tranche.json
@@ -1,89 +1,29 @@
 {
-  "meta" : {
-    "globalKey" : "bd277a40"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "955bda07"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "955bda07"
-      }
-    },
-    "meta" : {
-      "globalKey" : "bd277a40"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "c2eb8824"
-      },
-      "name" : {
-        "value" : "Morgan Stanley Captial Services"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "c6a2653c",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DJITRAXXUSDMS5Y",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "I7331LVCZKQKX5T7XV54"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "ed2a322e"
+            "scheme" : "http://www.barclaysglobal.com/partners/schema/v1-1/schemes/tradeID"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "139798fc"
-      },
-      "name" : {
-        "value" : "Barclays Global Investors"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "213800H14XVWOV87OI72"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "28e409fd"
-        }
-      } ]
+        "globalKey" : "ce5186a4"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2004-01-24",
+      "meta" : {
+        "globalKey" : "3ea058"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "c2eb8824"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "139798fc"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -93,6 +33,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2004-03-23",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -101,140 +42,194 @@
                 },
                 "meta" : {
                   "globalKey" : "eb3e6e4f"
-                },
-                "unadjustedDate" : "2004-03-23"
+                }
               },
               "meta" : {
                 "globalKey" : "eb3e6e4f"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-03-20",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ebd48b0c"
+                }
+              },
+              "meta" : {
+                "globalKey" : "ebd48b0c"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
-                  },
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/ACT.ISDA"
+                },
+                "meta" : {
+                  "globalKey" : "28d6c3e0"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "generalTerms" : {
                   "basketReferenceInformation" : {
-                    "basketId" : [ {
-                      "meta" : {
-                        "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
-                      },
-                      "value" : "BASKET089"
-                    } ],
                     "basketName" : {
+                      "value" : "CDS Basket Sample",
                       "meta" : {
                         "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
-                      },
-                      "value" : "CDS Basket Sample"
+                      }
                     },
+                    "basketId" : [ {
+                      "value" : "BASKET089",
+                      "meta" : {
+                        "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
+                      }
+                    } ],
                     "referencePool" : {
                       "referencePoolItem" : [ {
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "008HA7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                              },
-                              "value" : "008HA7"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "agriumEntity",
-                              "globalKey" : "6b99b4c1"
-                            },
                             "name" : {
                               "value" : "Agrium Inc."
+                            },
+                            "meta" : {
+                              "globalKey" : "6b99b4c1",
+                              "externalKey" : "agriumEntity"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "agriumEntity",
-                              "globalReference" : "6b99b4c1"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "008916AB4",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                                    },
-                                    "value" : "008916AB4"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "ab7bdc95"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "6b99b4c1",
+                              "externalReference" : "agriumEntity"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
                         }
                       }, {
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "8G836J",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                              },
-                              "value" : "8G836J"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "tenetEntity",
-                              "globalKey" : "92cc27"
-                            },
                             "name" : {
                               "value" : "Tenet Healthcare Corporation"
+                            },
+                            "meta" : {
+                              "globalKey" : "92cc27",
+                              "externalKey" : "tenetEntity"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "tenetEntity",
-                              "globalReference" : "92cc27"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "88033GAT7",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                                    },
-                                    "value" : "88033GAT7"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "db5db955"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "92cc27",
+                              "externalReference" : "tenetEntity"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
                         }
                       } ]
@@ -245,211 +240,216 @@
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "8793f193"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "gracePeriodExtension" : {
                         "applicable" : true,
                         "gracePeriod" : {
-                          "meta" : {
-                            "globalKey" : "83c"
-                          },
+                          "periodMultiplier" : 0,
                           "period" : "D",
-                          "periodMultiplier" : 0
+                          "meta" : {
+                            "globalKey" : "44"
+                          }
                         }
                       },
                       "paymentRequirement" : {
+                        "value" : 1000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "GBP"
                           }
                         },
-                        "value" : 1000000.00,
                         "meta" : {
                           "globalKey" : "48eae7c4"
                         }
                       }
                     },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "d7154083"
+                      "globalKey" : "f8d2401"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "969cb413"
-                  },
                   "obligations" : {
-                    "category" : "BOND_OR_LOAN"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
+                    "category" : "BondOrLoan"
                   },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/ACT.ISDA"
-                },
-                "meta" : {
-                  "globalKey" : "e55fc83e"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "1ccd1e11"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "90a9b011"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "ebd48b0c"
-                },
-                "unadjustedDate" : "2009-03-20"
+                  "globalKey" : "aed6dbbf"
+                }
               },
               "meta" : {
-                "globalKey" : "ebd48b0c"
+                "globalKey" : "925adf9f"
               }
             }
           },
           "meta" : {
-            "globalKey" : "aac09ea"
+            "globalKey" : "5ccda762"
           }
         },
         "meta" : {
-          "globalKey" : "aac09ea"
+          "globalKey" : "5ccda762"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3a43e344"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0060,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0060,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e38853c"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "3cfd1fa4",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "c6a2653c",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea058"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "I7331LVCZKQKX5T7XV54",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "ed2a322e"
+        }
+      } ],
+      "name" : {
+        "value" : "Morgan Stanley Captial Services"
       },
-      "value" : "2004-01-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "3cfd1fa4",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "213800H14XVWOV87OI72",
           "meta" : {
-            "scheme" : "http://www.barclaysglobal.com/partners/schema/v1-1/schemes/tradeID"
-          },
-          "value" : "DJITRAXXUSDMS5Y"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "28e409fd"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "139798fc"
+      "name" : {
+        "value" : "Barclays Global Investors"
       },
       "meta" : {
-        "globalKey" : "222d8a3c"
+        "globalKey" : "c6a2653c",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "955bda07"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "955bda07"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "64fabe28"
+    }
+  },
+  "meta" : {
+    "globalKey" : "64fabe28"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-basket.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-basket.json
index 537003f4c1..cc10f20a4b 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-basket.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-basket.json
@@ -1,89 +1,29 @@
 {
-  "meta" : {
-    "globalKey" : "455bc958"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "955bda07"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "955bda07"
-      }
-    },
-    "meta" : {
-      "globalKey" : "455bc958"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "fce386ae"
-      },
-      "name" : {
-        "value" : "Morgan Stanley Capital Services"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "c6a2653c",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DJITRAXXUSDMS5Y",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "I7331LVCZKQKX5T7XV54"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "ed2a322e"
+            "scheme" : "http://www.barclaysglobal.com/partners/schema/v1-1/schemes/tradeID"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "139798fc"
-      },
-      "name" : {
-        "value" : "Barclays Global Investors"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "213800H14XVWOV87OI72"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "28e409fd"
-        }
-      } ]
+        "globalKey" : "ce5186a4"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2004-01-24",
+      "meta" : {
+        "globalKey" : "3ea058"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "fce386ae"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "139798fc"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -93,6 +33,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2004-03-23",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -101,88 +42,141 @@
                 },
                 "meta" : {
                   "globalKey" : "eb3e6e4f"
-                },
-                "unadjustedDate" : "2004-03-23"
+                }
               },
               "meta" : {
                 "globalKey" : "eb3e6e4f"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-03-20",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ebd48b0c"
+                }
+              },
+              "meta" : {
+                "globalKey" : "ebd48b0c"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
-                  },
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/ACT.ISDA"
+                },
+                "meta" : {
+                  "globalKey" : "28d6c3e0"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "generalTerms" : {
                   "basketReferenceInformation" : {
-                    "nthToDefault" : 1,
                     "referencePool" : {
                       "referencePoolItem" : [ {
                         "constituentWeight" : {
                           "basketPercentage" : 0.60
                         },
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "008HA7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                              },
-                              "value" : "008HA7"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "agriumEntity",
-                              "globalKey" : "6b99b4c1"
-                            },
                             "name" : {
                               "value" : "Agrium Inc."
+                            },
+                            "meta" : {
+                              "globalKey" : "6b99b4c1",
+                              "externalKey" : "agriumEntity"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "agriumEntity",
-                              "globalReference" : "6b99b4c1"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "008916AB4",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                                    },
-                                    "value" : "008916AB4"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "ab7bdc95"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "6b99b4c1",
+                              "externalReference" : "agriumEntity"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
                         }
                       }, {
@@ -190,257 +184,263 @@
                           "basketPercentage" : 0.40
                         },
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "8G836J",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                              },
-                              "value" : "8G836J"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "tenetEntity",
-                              "globalKey" : "92cc27"
-                            },
                             "name" : {
                               "value" : "Tenet Healthcare Corporation"
+                            },
+                            "meta" : {
+                              "globalKey" : "92cc27",
+                              "externalKey" : "tenetEntity"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "tenetEntity",
-                              "globalReference" : "92cc27"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "88033GAT7",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                                    },
-                                    "value" : "88033GAT7"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "db5db955"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "92cc27",
+                              "externalReference" : "tenetEntity"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
                         }
                       } ]
-                    }
+                    },
+                    "nthToDefault" : 1
                   }
                 },
-                "meta" : {
-                  "globalKey" : "ae1b0af1"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "gracePeriodExtension" : {
                         "applicable" : true,
                         "gracePeriod" : {
-                          "meta" : {
-                            "globalKey" : "83c"
-                          },
+                          "periodMultiplier" : 0,
                           "period" : "D",
-                          "periodMultiplier" : 0
+                          "meta" : {
+                            "globalKey" : "44"
+                          }
                         }
                       },
                       "paymentRequirement" : {
+                        "value" : 1000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "GBP"
                           }
                         },
-                        "value" : 1000000.00,
                         "meta" : {
                           "globalKey" : "48eae7c4"
                         }
                       }
                     },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "d7154083"
+                      "globalKey" : "f8d2401"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "969cb413"
-                  },
                   "obligations" : {
-                    "category" : "BOND_OR_LOAN"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
+                    "category" : "BondOrLoan"
                   },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/ACT.ISDA"
-                },
-                "meta" : {
-                  "globalKey" : "e55fc83e"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "80299ef"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "90a9b011"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "ebd48b0c"
-                },
-                "unadjustedDate" : "2009-03-20"
+                  "globalKey" : "2d0c4241"
+                }
               },
               "meta" : {
-                "globalKey" : "ebd48b0c"
+                "globalKey" : "df7fbe21"
               }
             }
           },
           "meta" : {
-            "globalKey" : "1a67908c"
+            "globalKey" : "8779aa4"
           }
         },
         "meta" : {
-          "globalKey" : "1a67908c"
+          "globalKey" : "8779aa4"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3a43e344"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0060,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0060,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e38853c"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "51fdf32e",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "c6a2653c",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea058"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "I7331LVCZKQKX5T7XV54",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "ed2a322e"
+        }
+      } ],
+      "name" : {
+        "value" : "Morgan Stanley Capital Services"
       },
-      "value" : "2004-01-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "51fdf32e",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "213800H14XVWOV87OI72",
           "meta" : {
-            "scheme" : "http://www.barclaysglobal.com/partners/schema/v1-1/schemes/tradeID"
-          },
-          "value" : "DJITRAXXUSDMS5Y"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "28e409fd"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "139798fc"
+      "name" : {
+        "value" : "Barclays Global Investors"
       },
       "meta" : {
-        "globalKey" : "222d8a3c"
+        "globalKey" : "c6a2653c",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "955bda07"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "955bda07"
+      }
+    },
+    "meta" : {
+      "globalKey" : "e6c858f4"
+    }
+  },
+  "meta" : {
+    "globalKey" : "e6c858f4"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-custom-basket.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-custom-basket.json
index fdc0697619..d67adcb56c 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-custom-basket.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-custom-basket.json
@@ -1,89 +1,29 @@
 {
-  "meta" : {
-    "globalKey" : "263a25e7"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "955bda07"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "955bda07"
-      }
-    },
-    "meta" : {
-      "globalKey" : "263a25e7"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "c2eb8824"
-      },
-      "name" : {
-        "value" : "Morgan Stanley Captial Services"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "c6a2653c",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DJITRAXXUSDMS5Y",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "I7331LVCZKQKX5T7XV54"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "ed2a322e"
+            "scheme" : "http://www.barclaysglobal.com/partners/schema/v1-1/schemes/tradeID"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "139798fc"
-      },
-      "name" : {
-        "value" : "Barclays Global Investors"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "213800H14XVWOV87OI72"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "28e409fd"
-        }
-      } ]
+        "globalKey" : "ce5186a4"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2004-01-24",
+      "meta" : {
+        "globalKey" : "3ea058"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "c2eb8824"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "139798fc"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -93,6 +33,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2004-03-23",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -101,502 +42,561 @@
                 },
                 "meta" : {
                   "globalKey" : "eb3e6e4f"
-                },
-                "unadjustedDate" : "2004-03-23"
+                }
               },
               "meta" : {
                 "globalKey" : "eb3e6e4f"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-03-20",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ebd48b0c"
+                }
+              },
+              "meta" : {
+                "globalKey" : "ebd48b0c"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
-                  },
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/ACT.ISDA"
+                },
+                "meta" : {
+                  "globalKey" : "28d6c3e0"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "generalTerms" : {
                   "basketReferenceInformation" : {
-                    "basketId" : [ {
-                      "meta" : {
-                        "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
-                      },
-                      "value" : "BASKET089"
-                    } ],
                     "basketName" : {
+                      "value" : "CDS Basket Sample",
                       "meta" : {
                         "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
-                      },
-                      "value" : "CDS Basket Sample"
+                      }
                     },
-                    "nthToDefault" : 1,
+                    "basketId" : [ {
+                      "value" : "BASKET089",
+                      "meta" : {
+                        "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
+                      }
+                    } ],
                     "referencePool" : {
                       "referencePoolItem" : [ {
-                        "cashSettlementTermsReference" : {
-                          "externalReference" : "settlementTermsOne"
-                        },
                         "constituentWeight" : {
                           "basketPercentage" : 0.40
                         },
-                        "physicalSettlementTermsReference" : {
-                          "externalReference" : "settlementTermsOne"
-                        },
-                        "protectionTermsReference" : {
-                          "externalReference" : "protectionTermsOne",
-                          "globalReference" : "969cb413"
-                        },
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "008HA7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                              },
-                              "value" : "008HA7"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "agriumEntity",
-                              "globalKey" : "6b99b4c1"
-                            },
                             "name" : {
                               "value" : "Agrium Inc."
+                            },
+                            "meta" : {
+                              "globalKey" : "6b99b4c1",
+                              "externalKey" : "agriumEntity"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "agriumEntity",
-                              "globalReference" : "6b99b4c1"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "008916AB4",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                                    },
-                                    "value" : "008916AB4"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "ab7bdc95"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "6b99b4c1",
+                              "externalReference" : "agriumEntity"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
-                        }
-                      }, {
+                        },
+                        "protectionTermsReference" : {
+                          "globalReference" : "90a9b011",
+                          "externalReference" : "protectionTermsOne"
+                        },
                         "cashSettlementTermsReference" : {
                           "externalReference" : "settlementTermsOne"
                         },
-                        "constituentWeight" : {
-                          "basketPercentage" : 0.30
-                        },
                         "physicalSettlementTermsReference" : {
                           "externalReference" : "settlementTermsOne"
-                        },
-                        "protectionTermsReference" : {
-                          "externalReference" : "protectionTermsOne",
-                          "globalReference" : "969cb413"
+                        }
+                      }, {
+                        "constituentWeight" : {
+                          "basketPercentage" : 0.30
                         },
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "8G836J",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                              },
-                              "value" : "8G836J"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "tenetEntity",
-                              "globalKey" : "92cc27"
-                            },
                             "name" : {
                               "value" : "Tenet Healthcare Corporation"
+                            },
+                            "meta" : {
+                              "globalKey" : "92cc27",
+                              "externalKey" : "tenetEntity"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "tenetEntity",
-                              "globalReference" : "92cc27"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "88033GAT7",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                                    },
-                                    "value" : "88033GAT7"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "db5db955"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "92cc27",
+                              "externalReference" : "tenetEntity"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
-                        }
-                      }, {
+                        },
+                        "protectionTermsReference" : {
+                          "globalReference" : "90a9b011",
+                          "externalReference" : "protectionTermsOne"
+                        },
                         "cashSettlementTermsReference" : {
-                          "externalReference" : "settlementTermsTwo"
+                          "externalReference" : "settlementTermsOne"
                         },
+                        "physicalSettlementTermsReference" : {
+                          "externalReference" : "settlementTermsOne"
+                        }
+                      }, {
                         "constituentWeight" : {
                           "basketPercentage" : 0.30
                         },
-                        "physicalSettlementTermsReference" : {
-                          "externalReference" : "settlementTermsTwo"
-                        },
-                        "protectionTermsReference" : {
-                          "externalReference" : "protectionTermsTwo",
-                          "globalReference" : "14db9136"
-                        },
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "8G8KT",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                              },
-                              "value" : "8G8KT"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "telecoEntity",
-                              "globalKey" : "2c781556"
-                            },
                             "name" : {
                               "value" : "Teleco Corporation Europe"
+                            },
+                            "meta" : {
+                              "globalKey" : "2c781556",
+                              "externalKey" : "telecoEntity"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "tenetEntity",
-                              "globalReference" : "92cc27"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "88033GAT7",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                                    },
-                                    "value" : "88033GAT7"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "db5db955"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "92cc27",
+                              "externalReference" : "tenetEntity"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
+                        },
+                        "protectionTermsReference" : {
+                          "globalReference" : "71d88c7e",
+                          "externalReference" : "protectionTermsTwo"
+                        },
+                        "cashSettlementTermsReference" : {
+                          "externalReference" : "settlementTermsTwo"
+                        },
+                        "physicalSettlementTermsReference" : {
+                          "externalReference" : "settlementTermsTwo"
                         }
                       } ]
-                    }
+                    },
+                    "nthToDefault" : 1
                   }
                 },
-                "meta" : {
-                  "globalKey" : "c1cdf05d"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "gracePeriodExtension" : {
                         "applicable" : true,
                         "gracePeriod" : {
-                          "meta" : {
-                            "globalKey" : "83c"
-                          },
+                          "periodMultiplier" : 0,
                           "period" : "D",
-                          "periodMultiplier" : 0
+                          "meta" : {
+                            "globalKey" : "44"
+                          }
                         }
                       },
                       "paymentRequirement" : {
+                        "value" : 1000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "GBP"
                           }
                         },
-                        "value" : 1000000.00,
                         "meta" : {
                           "globalKey" : "48eae7c4"
                         }
                       }
                     },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "d7154083"
+                      "globalKey" : "f8d2401"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "protectionTermsOne",
-                    "globalKey" : "969cb413"
-                  },
                   "obligations" : {
-                    "category" : "BOND_OR_LOAN"
+                    "category" : "BondOrLoan"
+                  },
+                  "meta" : {
+                    "globalKey" : "90a9b011",
+                    "externalKey" : "protectionTermsOne"
                   }
                 }, {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "gracePeriodExtension" : {
                         "applicable" : true,
                         "gracePeriod" : {
+                          "periodMultiplier" : 1,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "ea4baf23"
+                            "globalKey" : "ea4abbbd"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 1,
-                          "dayType" : "BUSINESS"
+                          "dayType" : "Business"
                         }
                       },
                       "paymentRequirement" : {
+                        "value" : 1000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "GBP"
                           }
                         },
-                        "value" : 1000000.00,
                         "meta" : {
                           "globalKey" : "48eae7c4"
                         }
                       }
                     },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "909f0a66"
+                      "globalKey" : "e5b237ae"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "protectionTermsTwo",
-                    "globalKey" : "14db9136"
-                  },
                   "obligations" : {
-                    "category" : "BOND_OR_LOAN"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
+                    "category" : "BondOrLoan"
                   },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/ACT.ISDA"
-                },
-                "meta" : {
-                  "globalKey" : "e55fc83e"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "996a85b"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "71d88c7e",
+                    "externalKey" : "protectionTermsTwo"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "ebd48b0c"
-                },
-                "unadjustedDate" : "2009-03-20"
+                  "globalKey" : "ae48391b"
+                }
               },
               "meta" : {
-                "globalKey" : "ebd48b0c"
+                "globalKey" : "d373b13b"
               }
             }
           },
           "meta" : {
-            "globalKey" : "4bbaab22"
+            "globalKey" : "bc4679d8"
           }
         },
         "meta" : {
-          "globalKey" : "4bbaab22"
+          "globalKey" : "bc4679d8"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3a43e344"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0060,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0060,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e38853c"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d467a863"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-3"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 10000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-3"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "b88d63fd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "3cfd1fa4",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "c6a2653c",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea058"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "I7331LVCZKQKX5T7XV54",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "ed2a322e"
+        }
+      } ],
+      "name" : {
+        "value" : "Morgan Stanley Captial Services"
       },
-      "value" : "2004-01-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "3cfd1fa4",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "213800H14XVWOV87OI72",
           "meta" : {
-            "scheme" : "http://www.barclaysglobal.com/partners/schema/v1-1/schemes/tradeID"
-          },
-          "value" : "DJITRAXXUSDMS5Y"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "28e409fd"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "139798fc"
+      "name" : {
+        "value" : "Barclays Global Investors"
       },
       "meta" : {
-        "globalKey" : "222d8a3c"
+        "globalKey" : "c6a2653c",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "955bda07"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "955bda07"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "b62fe601"
+    }
+  },
+  "meta" : {
+    "globalKey" : "b62fe601"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-index-tranche.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-index-tranche.json
index aa1e65d3cc..f1cd206f9a 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-index-tranche.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-index-tranche.json
@@ -1,83 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "b95d8254"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2004-10-11",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "DJ.iTraxx.Europe"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "20c13e66",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "ITRAXX1234",
+          "meta" : {
+            "scheme" : "http://www.newbank.com/trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "d51e174"
         }
       } ],
       "meta" : {
-        "globalKey" : "d51e174"
+        "globalKey" : "348f2a71"
       }
-    },
-    "meta" : {
-      "globalKey" : "2b9b6ee5"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "c576f3c8"
-      },
-      "name" : {
-        "value" : "New Bank, New York"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-person-id"
-          },
-          "value" : "549300X5I608U02HAI25"
-        },
-        "meta" : {
-          "globalKey" : "5444ea27"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "85c6fec"
-      },
-      "name" : {
-        "value" : "Massive Bank, New York"
+      "issuerReference" : {
+        "globalReference" : "c1910382",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234B6",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-person-id"
-          },
-          "value" : "VMPORTIB1LEXNX832U55"
-        },
-        "meta" : {
-          "globalKey" : "55cb2b87"
+            "scheme" : "http://www.massivebank.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ebf0fa6a"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2004-11-03",
+      "meta" : {
+        "globalKey" : "3ea2c3"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "85c6fec"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "c576f3c8"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -85,21 +47,32 @@
             "productQualifier" : "CreditDefaultSwap_IndexTranche"
           } ],
           "economicTerms" : {
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2010-03-20",
+                "meta" : {
+                  "globalKey" : "3ed0d4"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ed0d4"
+              }
+            },
             "payout" : {
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "generalTerms" : {
@@ -107,140 +80,167 @@
                     "indexName" : {
                       "value" : "Dow Jones iTraxx Europe Consumers Series 2 Version 1"
                     },
-                    "indexAnnexVersion" : 1,
                     "indexSeries" : 2,
-                    "meta" : {
-                      "globalKey" : "c458fec4"
+                    "indexAnnexVersion" : 1,
+                    "tranche" : {
+                      "attachmentPoint" : 0.03,
+                      "exhaustionPoint" : 0.07
                     },
                     "settledEntityMatrix" : {
                       "matrixSource" : {
-                        "value" : "NOT_APPLICABLE"
+                        "value" : "NotApplicable"
                       }
                     },
-                    "tranche" : {
-                      "attachmentPoint" : 0.03,
-                      "exhaustionPoint" : 0.07
+                    "meta" : {
+                      "globalKey" : "df8f82d0"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "c29e8963"
+                  "globalKey" : "ddd50d6f"
                 }
               },
               "meta" : {
-                "globalKey" : "c29e8963"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ed0d4"
-                },
-                "unadjustedDate" : "2010-03-20"
-              },
-              "meta" : {
-                "globalKey" : "3ed0d4"
+                "globalKey" : "ddd50d6f"
               }
             }
           },
           "meta" : {
-            "globalKey" : "f54a891"
+            "globalKey" : "4b18d143"
           }
         },
         "meta" : {
-          "globalKey" : "f54a891"
+          "globalKey" : "4b18d143"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "c1910382",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "20c13e66",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea2c3"
-      },
-      "value" : "2004-11-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300X5I608U02HAI25",
           "meta" : {
-            "scheme" : "http://www.newbank.com/trade-id"
-          },
-          "value" : "ITRAXX1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-person-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "5444ea27"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "c576f3c8"
+      "name" : {
+        "value" : "New Bank, New York"
       },
       "meta" : {
-        "globalKey" : "f1464767"
+        "globalKey" : "20c13e66",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "VMPORTIB1LEXNX832U55",
           "meta" : {
-            "scheme" : "http://www.massivebank.com/trade-id"
-          },
-          "value" : "1234B6"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-person-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "55cb2b87"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "85c6fec"
+      "name" : {
+        "value" : "Massive Bank, New York"
       },
       "meta" : {
-        "globalKey" : "55bf2482"
+        "globalKey" : "c1910382",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2004-10-11",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "DJ.iTraxx.Europe"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "d51e174"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "d51e174"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "8587bb63"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "d014882f"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "c576f3c8"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "85c6fec"
-        }
-      },
       "quantity" : {
+        "value" : 17000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "20c13e66",
+          "externalReference" : "party1"
         },
-        "value" : 17000
+        "receiverPartyReference" : {
+          "globalReference" : "c1910382",
+          "externalReference" : "party2"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "a4ba95cd"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "787927f0"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-loan-ReferenceObligation.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-loan-ReferenceObligation.json
index 51158a0e44..8a239e0cd2 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-loan-ReferenceObligation.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-loan-ReferenceObligation.json
@@ -1,109 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "14201e93"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "109257",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/"
           }
-        },
-        "meta" : {
-          "globalKey" : "955bda07"
         }
       } ],
       "meta" : {
-        "globalKey" : "8afb2a56"
+        "globalKey" : "ebd7082f"
       }
-    },
-    "meta" : {
-      "globalKey" : "14201e93"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234567",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.partyB.com/"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "dc5b8a8"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-10-26",
+      "meta" : {
+        "globalKey" : "3eb29a"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -111,30 +47,26 @@
             "productQualifier" : "CreditDefaultSwap_Loan"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-10-27",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
                 "meta" : {
-                  "globalKey" : "42f910b"
+                  "globalKey" : "eb811f13"
                 }
               },
-              "businessDayConvention" : "FOLLOWING",
               "meta" : {
-                "globalKey" : "da556d3a"
+                "globalKey" : "eb811f13"
               }
             },
-            "effectiveDate" : {
+            "terminationDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2010-06-27",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -142,74 +74,153 @@
                   }
                 },
                 "meta" : {
-                  "globalKey" : "eb811f13"
-                },
-                "unadjustedDate" : "2006-10-27"
+                  "globalKey" : "ebf57e13"
+                }
               },
               "meta" : {
-                "globalKey" : "eb811f13"
+                "globalKey" : "ebf57e13"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da556d3a"
               }
             },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f73"
+                    },
+                    "rollConvention" : "20"
+                  },
+                  "meta" : {
+                    "globalKey" : "17f73"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
+                  "firstPaymentDate" : "2006-12-20",
+                  "lastRegularPaymentDate" : "2010-06-20",
+                  "meta" : {
+                    "globalKey" : "1b0ddfaa"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "7154aabe"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
-                    "globalKey" : "9e09e9e0"
+                    "globalKey" : "2cbcd158"
                   },
-                  "settlementType" : "PHYSICAL",
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "maximumBusinessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
-                      "category" : "LOAN",
+                      "category" : "Loan",
+                      "notSubordinated" : true,
+                      "notContingent" : true,
                       "consentRequiredLoan" : {
                         "applicable" : true
                       },
-                      "excluded" : "true",
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
                       },
                       "notBearer" : true,
-                      "notContingent" : true,
-                      "notSubordinated" : true,
-                      "othReferenceEntityObligations" : "true",
-                      "transferable" : true
+                      "excluded" : "true",
+                      "othReferenceEntityObligations" : "true"
                     },
                     "meta" : {
-                      "globalKey" : "3b5cd1d7"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "maximumBusinessDays" : 30
+                      "globalKey" : "ca0fb94f"
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
-                    "allGuarantees" : false,
                     "referenceEntity" : {
-                      "meta" : {
-                        "globalKey" : "444aeec5"
-                      },
                       "name" : {
                         "value" : "CompanyABC"
+                      },
+                      "meta" : {
+                        "globalKey" : "444aeec5"
                       }
                     },
                     "referenceObligation" : [ {
@@ -217,309 +228,298 @@
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "23490234",
                               "meta" : {
                                 "scheme" : "http://www.partyA.com/coding-scheme/instrument-id"
-                              },
-                              "value" : "23490234"
+                              }
                             },
+                            "source" : "Other",
                             "meta" : {
                               "globalKey" : "1648ec59"
-                            },
-                            "source" : "OTHER"
+                            }
                           }
                         } ],
-                        "creditAgreementDate" : "2005-11-04",
-                        "facilityType" : {
-                          "value" : "RevolvingLoan"
-                        },
                         "lien" : {
                           "value" : "FirstLienLoan"
                         },
+                        "facilityType" : {
+                          "value" : "RevolvingLoan"
+                        },
+                        "creditAgreementDate" : "2005-11-04",
                         "tranche" : {
                           "value" : "LN190325"
                         }
                       },
                       "primaryObligor" : {
-                        "meta" : {
-                          "globalKey" : "444aeec5"
-                        },
                         "name" : {
                           "value" : "CompanyABC"
+                        },
+                        "meta" : {
+                          "globalKey" : "444aeec5"
                         }
                       }
                     } ],
+                    "allGuarantees" : false,
                     "referencePrice" : {
+                      "value" : 1.0000000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.0000000000,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     },
                     "securedList" : false
                   }
                 },
-                "meta" : {
-                  "globalKey" : "47e7820e"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "publicSource" : [ "Standard Public Sources" ],
-                        "specifiedNumber" : 2
+                    "failureToPay" : {
+                      "applicable" : true,
+                      "paymentRequirement" : {
+                        "value" : 1000000,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "USD"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "48eb1e55"
+                        }
                       }
                     },
                     "defaultRequirement" : {
+                      "value" : 10000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 10000000,
                       "meta" : {
                         "globalKey" : "d467e427"
                       }
                     },
-                    "failureToPay" : {
-                      "applicable" : true,
-                      "paymentRequirement" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "USD"
-                          }
-                        },
-                        "value" : 1000000,
-                        "meta" : {
-                          "globalKey" : "48eb1e55"
-                        }
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "publicSource" : [ "Standard Public Sources" ],
+                        "specifiedNumber" : 2
                       }
                     },
                     "meta" : {
-                      "globalKey" : "6df875cd"
+                      "globalKey" : "a02353af"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "29e129d1"
-                  },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY",
+                    "category" : "BorrowedMoney",
+                    "notSubordinated" : true,
+                    "excluded" : "true",
+                    "othReferenceEntityObligations" : "true",
                     "designatedPriority" : {
                       "value" : "FirstLienLoan"
-                    },
-                    "excluded" : "true",
-                    "notSubordinated" : true,
-                    "othReferenceEntityObligations" : "true"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
                     }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c47"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "20"
                   },
                   "meta" : {
-                    "globalKey" : "28c47"
+                    "globalKey" : "c245b351"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "116f3724"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2006-12-20",
-                  "lastRegularPaymentDate" : "2010-06-20",
-                  "meta" : {
-                    "globalKey" : "1b0de856"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "4a484c96"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "d3fd29d6"
+                "globalKey" : "19615498"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "ebf57e13"
-                },
-                "unadjustedDate" : "2010-06-27"
-              },
-              "meta" : {
-                "globalKey" : "ebf57e13"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "4ce45ee9"
+            "globalKey" : "9420de51"
           }
         },
         "meta" : {
-          "globalKey" : "4ce45ee9"
+          "globalKey" : "9420de51"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "b3ef9a04"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.013,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.013,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d467e427"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "ca03a67c"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "b894a0b9"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb29a"
-      },
-      "value" : "2006-10-26"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.partyA.com/"
-          },
-          "value" : "109257"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "f60dada5"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.partyB.com/"
-          },
-          "value" : "1234567"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "555d4b40"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "955bda07"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "8afb2a56"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "c627f9cb"
+    }
+  },
+  "meta" : {
+    "globalKey" : "c627f9cb"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-loan-SecuredList.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-loan-SecuredList.json
index f733c0709c..5c423a7a83 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-loan-SecuredList.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-loan-SecuredList.json
@@ -1,109 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "ee2f3ecb"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "109257",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/"
           }
-        },
-        "meta" : {
-          "globalKey" : "955bda07"
         }
       } ],
       "meta" : {
-        "globalKey" : "8afb2a56"
+        "globalKey" : "ebd7082f"
       }
-    },
-    "meta" : {
-      "globalKey" : "ee2f3ecb"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234567",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.partyB.com/"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "dc5b8a8"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-12-01",
+      "meta" : {
+        "globalKey" : "3eb301"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -111,30 +47,26 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-12-02",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
                 "meta" : {
-                  "globalKey" : "42f910b"
+                  "globalKey" : "eb82a1ba"
                 }
               },
-              "businessDayConvention" : "FOLLOWING",
               "meta" : {
-                "globalKey" : "da556d3a"
+                "globalKey" : "eb82a1ba"
               }
             },
-            "effectiveDate" : {
+            "terminationDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2010-03-21",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -142,349 +74,417 @@
                   }
                 },
                 "meta" : {
-                  "globalKey" : "eb82a1ba"
-                },
-                "unadjustedDate" : "2006-12-02"
+                  "globalKey" : "ebf296cd"
+                }
               },
               "meta" : {
-                "globalKey" : "eb82a1ba"
+                "globalKey" : "ebf296cd"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da556d3a"
               }
             },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f73"
+                    },
+                    "rollConvention" : "20"
                   },
+                  "meta" : {
+                    "globalKey" : "17f73"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2007-03-20",
+                  "lastRegularPaymentDate" : "2010-03-20",
+                  "meta" : {
+                    "globalKey" : "6bbdbe2a"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c204893e"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
-                    "globalKey" : "9e09e9e0"
+                    "globalKey" : "2cbcd158"
                   },
-                  "settlementType" : "PHYSICAL",
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "maximumBusinessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
-                      "category" : "LOAN",
+                      "category" : "Loan",
+                      "notSubordinated" : true,
+                      "notContingent" : true,
                       "consentRequiredLoan" : {
                         "applicable" : true
                       },
-                      "excluded" : "true",
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
                       },
                       "notBearer" : true,
-                      "notContingent" : true,
-                      "notSubordinated" : true,
-                      "othReferenceEntityObligations" : "true",
-                      "transferable" : true
+                      "excluded" : "true",
+                      "othReferenceEntityObligations" : "true"
                     },
                     "meta" : {
-                      "globalKey" : "3b5cd1d7"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "maximumBusinessDays" : 30
+                      "globalKey" : "ca0fb94f"
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
-                    "allGuarantees" : false,
-                    "noReferenceObligation" : true,
                     "referenceEntity" : {
-                      "meta" : {
-                        "globalKey" : "444afa68"
-                      },
                       "name" : {
                         "value" : "CompanyDEF"
+                      },
+                      "meta" : {
+                        "globalKey" : "444afa68"
                       }
                     },
+                    "noReferenceObligation" : true,
+                    "allGuarantees" : false,
                     "referencePrice" : {
+                      "value" : 1.0000000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.0000000000,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     },
                     "securedList" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "a75b0232"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "publicSource" : [ "Standard Public Sources" ],
-                        "specifiedNumber" : 2
+                    "failureToPay" : {
+                      "applicable" : true,
+                      "paymentRequirement" : {
+                        "value" : 500000,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "USD"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "6c32a26b"
+                        }
                       }
                     },
                     "defaultRequirement" : {
+                      "value" : 5000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 5000000,
                       "meta" : {
                         "globalKey" : "1a10e2d1"
                       }
                     },
-                    "failureToPay" : {
-                      "applicable" : true,
-                      "paymentRequirement" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "USD"
-                          }
-                        },
-                        "value" : 500000,
-                        "meta" : {
-                          "globalKey" : "6c32a26b"
-                        }
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "publicSource" : [ "Standard Public Sources" ],
+                        "specifiedNumber" : 2
                       }
                     },
                     "meta" : {
-                      "globalKey" : "84a507f9"
+                      "globalKey" : "b45b5d03"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "c0000e25"
-                  },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY",
+                    "category" : "BorrowedMoney",
+                    "notSubordinated" : true,
+                    "excluded" : "true",
+                    "othReferenceEntityObligations" : "true",
                     "designatedPriority" : {
                       "value" : "FirstLienLoan"
-                    },
-                    "excluded" : "true",
-                    "notSubordinated" : true,
-                    "othReferenceEntityObligations" : "true"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
                     }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c47"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "20"
                   },
                   "meta" : {
-                    "globalKey" : "28c47"
+                    "globalKey" : "ff84437d"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "b384c8a4"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2007-03-20",
-                  "lastRegularPaymentDate" : "2010-03-20",
-                  "meta" : {
-                    "globalKey" : "6bbdc6d6"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "2f18b946"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "149d79b2"
+                "globalKey" : "9a136c8"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "ebf296cd"
-                },
-                "unadjustedDate" : "2010-03-21"
-              },
-              "meta" : {
-                "globalKey" : "ebf296cd"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "6db077ee"
+            "globalKey" : "6bbf54b4"
           }
         },
         "meta" : {
-          "globalKey" : "6db077ee"
+          "globalKey" : "6bbf54b4"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "5a207dbd"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0115,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0115,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e9ef39e3"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb301"
-      },
-      "value" : "2006-12-01"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.partyA.com/"
-          },
-          "value" : "109257"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "f60dada5"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.partyB.com/"
-          },
-          "value" : "1234567"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "555d4b40"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "955bda07"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "8afb2a56"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "4c55563b"
+    }
+  },
+  "meta" : {
+    "globalKey" : "4c55563b"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-mortgage-CMBS.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-mortgage-CMBS.json
index 5585b8d5c0..0025fd6e47 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-mortgage-CMBS.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-mortgage-CMBS.json
@@ -1,109 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "dcf4eaea"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "109257",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/"
           }
-        },
-        "meta" : {
-          "globalKey" : "955bda07"
         }
       } ],
       "meta" : {
-        "globalKey" : "8afb2a56"
+        "globalKey" : "ebd7082f"
       }
-    },
-    "meta" : {
-      "globalKey" : "dcf4eaea"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234567",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.partyB.com/"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "dc5b8a8"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-11-14",
+      "meta" : {
+        "globalKey" : "3eb2ce"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -111,31 +47,11 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
-                "meta" : {
-                  "globalKey" : "42f910b"
-                }
-              },
-              "businessDayConvention" : "FOLLOWING",
-              "meta" : {
-                "globalKey" : "da556d3a"
-              }
-            },
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2006-11-17",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "GBLO"
@@ -146,339 +62,423 @@
                       "globalKey" : "42f910b"
                     }
                   },
-                  "businessDayConvention" : "FOLLOWING",
                   "meta" : {
                     "globalKey" : "da556d3a"
                   }
                 },
                 "meta" : {
                   "globalKey" : "18601d49"
-                },
-                "unadjustedDate" : "2006-11-17"
+                }
               },
               "meta" : {
                 "globalKey" : "18601d49"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2046-07-12",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "f02f5604"
+                }
+              },
+              "meta" : {
+                "globalKey" : "f02f5604"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da556d3a"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "177f6"
+                    },
+                    "rollConvention" : "25"
                   },
+                  "meta" : {
+                    "globalKey" : "177f6"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "firstPaymentDate" : "2006-12-27",
+                  "lastRegularPaymentDate" : "2046-04-27",
+                  "meta" : {
+                    "globalKey" : "9e24630c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "d4617863"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "32319a6b"
                   },
-                  "settlementType" : "PHYSICAL",
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 5
+                    },
                     "escrow" : true,
                     "meta" : {
                       "globalKey" : "120d14"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 5
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
-                    "allGuarantees" : false,
                     "referenceEntity" : {
-                      "meta" : {
-                        "globalKey" : "65eff19"
-                      },
                       "name" : {
                         "value" : "MERRILL LYNCH/COUNTRYWIDE COMM, 2006-3"
+                      },
+                      "meta" : {
+                        "globalKey" : "65eff19"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligor" : {
-                        "meta" : {
-                          "globalKey" : "65eff19"
-                        },
-                        "name" : {
-                          "value" : "MERRILL LYNCH/COUNTRYWIDE COMM, 2006-3"
-                        }
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "60687VAQ8",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                              },
-                              "value" : "60687VAQ8"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "b9f84235"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
+                              "value" : "MLCFC 2006-3",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-Bloomberg-1-0"
-                              },
-                              "value" : "MLCFC 2006-3"
+                              }
                             },
+                            "source" : "BBGID",
                             "meta" : {
                               "globalKey" : "3b0c170b"
-                            },
-                            "source" : "BBGID"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligor" : {
+                        "name" : {
+                          "value" : "MERRILL LYNCH/COUNTRYWIDE COMM, 2006-3"
+                        },
+                        "meta" : {
+                          "globalKey" : "65eff19"
+                        }
                       }
-                    } ]
+                    } ],
+                    "allGuarantees" : false
                   }
                 },
-                "meta" : {
-                  "globalKey" : "2c14f072"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "failureToPayPrincipal" : true,
+                    "writedown" : true,
                     "meta" : {
                       "globalKey" : "99e0"
-                    },
-                    "writedown" : true
+                    }
                   },
                   "floatingAmountEvents" : {
-                    "additionalFixedPayments" : {
-                      "interestShortfallReimbursement" : true,
-                      "principalShortfallReimbursement" : true,
-                      "writedownReimbursement" : true
-                    },
                     "failureToPayPrincipal" : true,
-                    "floatingAmountProvisions" : {
-                      "wacCapInterestProvision" : true
-                    },
                     "interestShortfall" : {
+                      "interestShortfallCap" : "Fixed",
                       "compounding" : true,
-                      "interestShortfallCap" : "FIXED",
                       "rateSource" : {
                         "value" : "USD-LIBOR-BBA"
                       }
                     },
-                    "writedown" : true
-                  },
-                  "meta" : {
-                    "globalKey" : "b58a4098"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c0e"
+                    "writedown" : true,
+                    "floatingAmountProvisions" : {
+                      "wacCapInterestProvision" : true
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "25"
+                    "additionalFixedPayments" : {
+                      "interestShortfallReimbursement" : true,
+                      "principalShortfallReimbursement" : true,
+                      "writedownReimbursement" : true
+                    }
                   },
                   "meta" : {
-                    "globalKey" : "28c0e"
+                    "globalKey" : "35a9172a"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "33dfd49f"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2006-12-27",
-                  "lastRegularPaymentDate" : "2046-04-27",
-                  "meta" : {
-                    "globalKey" : "9e246bf4"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "9ab5b97e"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "62cdff6d"
+                "globalKey" : "7d4f43b"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "f02f5604"
-                },
-                "unadjustedDate" : "2046-07-12"
-              },
-              "meta" : {
-                "globalKey" : "f02f5604"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "ec5315c7"
+            "globalKey" : "39bad5ef"
           }
         },
         "meta" : {
-          "globalKey" : "ec5315c7"
+          "globalKey" : "39bad5ef"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a3617a4e"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.050,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.050,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 15000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 15000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "99d719c2"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c8cdcf72"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 15000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 15000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a10c1e7e"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb2ce"
-      },
-      "value" : "2006-11-14"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.partyA.com/"
-          },
-          "value" : "109257"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "f60dada5"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.partyB.com/"
-          },
-          "value" : "1234567"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "555d4b40"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "955bda07"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "8afb2a56"
+      }
+    },
+    "meta" : {
+      "globalKey" : "355d1e90"
+    }
+  },
+  "meta" : {
+    "globalKey" : "355d1e90"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-mortgage-RMBS.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-mortgage-RMBS.json
index 07b15c2be7..adb77c5980 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-mortgage-RMBS.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-mortgage-RMBS.json
@@ -1,109 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "fa3b9570"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "109257",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/"
           }
-        },
-        "meta" : {
-          "globalKey" : "955bda07"
         }
       } ],
       "meta" : {
-        "globalKey" : "8afb2a56"
+        "globalKey" : "ebd7082f"
       }
-    },
-    "meta" : {
-      "globalKey" : "fa3b9570"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234567",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.partyB.com/"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "dc5b8a8"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-10-05",
+      "meta" : {
+        "globalKey" : "3eb285"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -111,31 +47,38 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-10-11",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "42f910b"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "da556d3a"
+                  }
+                },
                 "meta" : {
-                  "globalKey" : "42f910b"
+                  "globalKey" : "b0cdd84f"
                 }
               },
-              "businessDayConvention" : "FOLLOWING",
               "meta" : {
-                "globalKey" : "da556d3a"
+                "globalKey" : "b0cdd84f"
               }
             },
-            "effectiveDate" : {
+            "terminationDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2035-09-25",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "GBLO"
@@ -146,60 +89,136 @@
                       "globalKey" : "42f910b"
                     }
                   },
-                  "businessDayConvention" : "FOLLOWING",
                   "meta" : {
                     "globalKey" : "da556d3a"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "b0cdd84f"
-                },
-                "unadjustedDate" : "2006-10-11"
+                  "globalKey" : "777d2cc1"
+                }
               },
               "meta" : {
-                "globalKey" : "b0cdd84f"
+                "globalKey" : "777d2cc1"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da556d3a"
               }
             },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "177d3"
+                    },
+                    "rollConvention" : "11"
+                  },
+                  "meta" : {
+                    "globalKey" : "177d3"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
                   },
+                  "firstPaymentDate" : "2006-11-01",
+                  "lastRegularPaymentDate" : "2035-06-01",
+                  "meta" : {
+                    "globalKey" : "715dd58c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3e124220"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "32319a6b"
                   },
-                  "settlementType" : "PHYSICAL",
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 5
+                    },
                     "escrow" : true,
                     "meta" : {
                       "globalKey" : "120d14"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 5
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
                     "referenceEntity" : {
-                      "meta" : {
-                        "globalKey" : "5df00e1c"
-                      },
                       "name" : {
                         "value" : "New Century Home Equity Loan Trust 2005-4"
+                      },
+                      "meta" : {
+                        "globalKey" : "5df00e1c"
                       }
                     },
                     "referenceObligation" : [ {
@@ -207,277 +226,258 @@
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "64352VNC1",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                              },
-                              "value" : "64352VNC1"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "b56573a0"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
+                              "value" : "NCHET 2005-4",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-Bloomberg-1-0"
-                              },
-                              "value" : "NCHET 2005-4"
+                              }
                             },
+                            "source" : "BBGID",
                             "meta" : {
                               "globalKey" : "1dd2314a"
-                            },
-                            "source" : "BBGID"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
                       }
                     } ]
                   }
                 },
-                "meta" : {
-                  "globalKey" : "c8d3fe2a"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "distressedRatingsDowngrade" : true,
                     "failureToPayPrincipal" : true,
+                    "distressedRatingsDowngrade" : true,
+                    "writedown" : true,
                     "meta" : {
                       "globalKey" : "12a6ef"
-                    },
-                    "writedown" : true
+                    }
                   },
                   "floatingAmountEvents" : {
-                    "additionalFixedPayments" : {
-                      "interestShortfallReimbursement" : true,
-                      "principalShortfallReimbursement" : true,
-                      "writedownReimbursement" : true
-                    },
                     "failureToPayPrincipal" : true,
-                    "floatingAmountProvisions" : {
-                      "stepUpProvision" : true
-                    },
                     "interestShortfall" : {
+                      "interestShortfallCap" : "Fixed",
                       "compounding" : false,
-                      "interestShortfallCap" : "FIXED",
                       "rateSource" : {
                         "value" : "USD-LIBOR-BBA"
                       }
                     },
-                    "writedown" : true
-                  },
-                  "meta" : {
-                    "globalKey" : "965f81a1"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28beb"
+                    "writedown" : true,
+                    "floatingAmountProvisions" : {
+                      "stepUpProvision" : true
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "11"
+                    "additionalFixedPayments" : {
+                      "interestShortfallReimbursement" : true,
+                      "principalShortfallReimbursement" : true,
+                      "writedownReimbursement" : true
+                    }
                   },
                   "meta" : {
-                    "globalKey" : "28beb"
+                    "globalKey" : "901637ff"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "8edc2882"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2006-11-01",
-                  "lastRegularPaymentDate" : "2035-06-01",
-                  "meta" : {
-                    "globalKey" : "715dde74"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "c28ab488"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "a689618"
+                "globalKey" : "3f8436a8"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "42f910b"
-                    }
-                  },
-                  "businessDayConvention" : "FOLLOWING",
-                  "meta" : {
-                    "globalKey" : "da556d3a"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "777d2cc1"
-                },
-                "unadjustedDate" : "2035-09-25"
-              },
-              "meta" : {
-                "globalKey" : "777d2cc1"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "5504f06f"
+            "globalKey" : "d52688e5"
           }
         },
         "meta" : {
-          "globalKey" : "5504f06f"
+          "globalKey" : "d52688e5"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a3617a4e"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.050,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.050,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 15000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 15000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "99d719c2"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c8cdcf72"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 15000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 15000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a10c1e7e"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb285"
-      },
-      "value" : "2006-10-05"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.partyA.com/"
-          },
-          "value" : "109257"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "f60dada5"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.partyB.com/"
-          },
-          "value" : "1234567"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "555d4b40"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "955bda07"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "8afb2a56"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "4de0b9bc"
+    }
+  },
+  "meta" : {
+    "globalKey" : "4de0b9bc"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdx-index-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdx-index-option.json
index 76f9e982a3..6c4d05ad03 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdx-index-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cdx-index-option.json
@@ -1,105 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "fdc0aa2"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "1997-11-05",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "95729254"
-        }
-      }, {
-        "agreementDate" : "2004-09-20",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "DJ.CDX.NA"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "44b33d52"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2003_CREDIT"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "521d2d0f"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "c96c85a9"
-      }
-    },
-    "meta" : {
-      "globalKey" : "e65a3a25"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Trade234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/coding-scheme/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "5c8ba844"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-01-16",
+      "meta" : {
+        "globalKey" : "3eb050",
+        "externalKey" : "TRADEDATE"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -108,106 +33,100 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "a9c55c44"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "0",
+                    "externalReference" : "NOTIONAL"
+                  },
                   "meta" : {
                     "globalKey" : "8d28d340"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "NOTIONAL",
-                    "globalReference" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "f3b1d0d7"
-                  },
-                  "settlementType" : "PHYSICAL"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Payer",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "fallbackExercise" : false
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "USNY"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-08-20",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "25a605bf"
-                          },
-                          "unadjustedDate" : "2006-08-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "25a605bf"
                         }
                       } ],
-                      "expirationTime" : {
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
                         "businessCenter" : {
                           "value" : "USNY"
-                        },
-                        "hourMinuteTime" : "11:00:00"
+                        }
                       },
-                      "meta" : {
-                        "globalKey" : "e0e28f54"
+                      "expirationTime" : {
+                        "hourMinuteTime" : "11:00:00",
+                        "businessCenter" : {
+                          "value" : "USNY"
+                        }
                       },
                       "partialExercise" : {
-                        "integralMultipleAmount" : 1,
-                        "minimumNotionalAmount" : 1,
                         "notionaReference" : {
-                          "externalReference" : "NOTIONAL",
-                          "globalReference" : "0"
-                        }
+                          "globalReference" : "0",
+                          "externalReference" : "NOTIONAL"
+                        },
+                        "integralMultipleAmount" : 1,
+                        "minimumNotionalAmount" : 1
+                      },
+                      "meta" : {
+                        "globalKey" : "83132194"
                       }
                     }
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 0.0225,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.0225,
-                      "arithmeticOperator" : "ADD",
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate",
+                      "arithmeticOperator" : "Add"
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "fallbackExercise" : false
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "a9c55c44"
-                },
-                "optionType" : "PAYER",
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -217,274 +136,350 @@
                     "economicTerms" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-03-21",
                           "meta" : {
                             "globalKey" : "3eb0d5"
-                          },
-                          "unadjustedDate" : "2006-03-21"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "3eb0d5"
                         }
                       },
+                      "terminationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2011-06-20",
+                          "meta" : {
+                            "globalKey" : "3ed994"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "3ed994"
+                        }
+                      },
                       "payout" : {
-                        "creditDefaultPayout" : {
+                        "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "externalKey" : "NOTIONAL",
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
-                                "value" : "quantity-2"
+                                "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "generalTerms" : {
-                            "indexReferenceInformation" : {
-                              "indexName" : {
-                                "value" : "Dow Jones CDX NA IG.2"
-                              },
-                              "indexAnnexDate" : "2005-07-06",
-                              "indexAnnexSource" : {
-                                "value" : "PUBLISHER"
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
+                                }
                               },
-                              "indexSeries" : 2,
                               "meta" : {
-                                "globalKey" : "964c1581"
+                                "globalKey" : "0"
                               }
                             }
                           },
-                          "meta" : {
-                            "globalKey" : "6ba10942"
-                          }
-                        },
-                        "interestRatePayout" : [ {
-                          "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
-                          },
-                          "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "quantitySchedule" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "quantity-1"
-                              }
-                            }
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
                           },
                           "calculationPeriodDates" : {
                             "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
                               "meta" : {
-                                "globalKey" : "28c47"
+                                "globalKey" : "17f73"
                               },
-                              "period" : "M",
-                              "periodMultiplier" : 3,
                               "rollConvention" : "20"
                             },
                             "meta" : {
-                              "globalKey" : "28c47"
+                              "globalKey" : "17f73"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "bbc10042"
-                          },
                           "paymentDates" : {
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "aa"
+                              }
+                            },
                             "firstPaymentDate" : "2006-06-20",
                             "lastRegularPaymentDate" : "2011-03-20",
                             "meta" : {
-                              "globalKey" : "9365796"
+                              "globalKey" : "9364eea"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "56649a5c"
+                          }
+                        } ],
+                        "creditDefaultPayout" : {
+                          "payerReceiver" : {
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
+                          },
+                          "priceQuantity" : {
+                            "quantitySchedule" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "quantity-2"
+                              }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "956"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 3
+                            "meta" : {
+                              "globalKey" : "0",
+                              "externalKey" : "NOTIONAL"
                             }
                           },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
+                          "generalTerms" : {
+                            "indexReferenceInformation" : {
+                              "indexName" : {
+                                "value" : "Dow Jones CDX NA IG.2"
                               },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
+                              "indexSeries" : 2,
+                              "indexAnnexDate" : "2005-07-06",
+                              "indexAnnexSource" : {
+                                "value" : "Publisher"
+                              },
+                              "meta" : {
+                                "globalKey" : "5598e89"
                               }
                             }
-                          }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "f0c9b440"
-                        }
-                      },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "meta" : {
-                            "globalKey" : "3ed994"
                           },
-                          "unadjustedDate" : "2011-06-20"
+                          "meta" : {
+                            "globalKey" : "daae824a"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "3ed994"
+                          "globalKey" : "9dc89d6e"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "8a4e2669"
+                      "globalKey" : "d9a8246f"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "8a4e2669"
+                    "globalKey" : "d9a8246f"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "528d9dfa"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "528d9dfa"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "a9c55c44"
+            "globalKey" : "528d9dfa"
           }
         },
         "meta" : {
-          "globalKey" : "a9c55c44"
+          "globalKey" : "528d9dfa"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "22a6e28e"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.019,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.019,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 50000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "27faaf2b"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "32356f32"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 50000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "d75b3635"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "Party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
+        }
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TRADEDATE",
-        "globalKey" : "3eb050"
-      },
-      "value" : "2006-01-16"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "Party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/coding-scheme/trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "Party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "1997-11-05",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "Trade234"
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "95729254"
+        }
+      }, {
+        "agreementDate" : "2004-09-20",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "DJ.CDX.NA"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "44b33d52"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2003Credit"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "521d2d0f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "7215e0ba"
+        "globalKey" : "c96c85a9"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "3fd7a88b"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "f49473e7"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 45000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "Party2"
         },
-        "value" : 45000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
+        }
       },
       "settlementDate" : {
         "relativeDate" : {
+          "periodMultiplier" : 3,
+          "period" : "D",
           "meta" : {
-            "globalKey" : "c47305b0"
+            "globalKey" : "fd075b8e"
           },
-          "period" : "D",
-          "periodMultiplier" : 3,
-          "dayType" : "BUSINESS",
+          "dayType" : "Business",
+          "businessDayConvention" : "NONE",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "USNY"
@@ -495,16 +490,21 @@
               "globalKey" : "4f5ffd5"
             }
           },
-          "businessDayConvention" : "NONE",
           "dateRelativeTo" : {
-            "externalReference" : "TRADEDATE",
-            "globalReference" : "3eb050"
+            "globalReference" : "3eb050",
+            "externalReference" : "TRADEDATE"
           }
         }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "b02d3185"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "304b8a1a"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/itraxx-index-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/itraxx-index-option.json
index ef670b8223..6ca8d516c5 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/itraxx-index-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/itraxx-index-option.json
@@ -1,65 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "2b0b0ee3"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "a1f959d2"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Trade234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/coding-scheme/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "5c8ba844"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-01-16",
+      "meta" : {
+        "globalKey" : "3eb050",
+        "externalKey" : "TRADEDATE"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -67,55 +32,40 @@
             "productQualifier" : "CreditDefaultSwaption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "1ea5dc35"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "0",
+                    "externalReference" : "NOTIONAL"
+                  },
                   "meta" : {
                     "globalKey" : "8d28d340"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "NOTIONAL",
-                    "globalReference" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "f3b1d0d7"
-                  },
-                  "settlementType" : "PHYSICAL"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Receiver",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "fallbackExercise" : false
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-12-20",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -124,53 +74,59 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "211e638d"
                             }
                           },
                           "meta" : {
                             "globalKey" : "2d387cf9"
-                          },
-                          "unadjustedDate" : "2006-12-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "2d387cf9"
                         }
                       } ],
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      },
                       "expirationTime" : {
+                        "hourMinuteTime" : "16:00:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "16:00:00"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "40b9738f"
+                        "globalKey" : "d1d6340f"
                       }
                     }
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 0.004,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "value" : 0.004,
-                      "arithmeticOperator" : "ADD",
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate",
+                      "arithmeticOperator" : "Add"
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "fallbackExercise" : false
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "1ea5dc35"
-                },
-                "optionType" : "RECEIVER",
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -178,14 +134,9 @@
                       "productQualifier" : "CreditDefaultSwap_Index"
                     } ],
                     "economicTerms" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "NONE",
-                        "meta" : {
-                          "globalKey" : "24a738"
-                        }
-                      },
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-03-20",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -194,67 +145,154 @@
                           },
                           "meta" : {
                             "globalKey" : "eb7a730c"
-                          },
-                          "unadjustedDate" : "2006-03-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eb7a730c"
                         }
                       },
+                      "terminationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2011-06-20",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ec136bcc"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "ec136bcc"
+                        }
+                      },
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "NONE",
+                        "meta" : {
+                          "globalKey" : "24a738"
+                        }
+                      },
                       "payout" : {
-                        "creditDefaultPayout" : {
+                        "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "priceQuantity" : {
+                            "quantitySchedule" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "quantity-1"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "NOTIONAL",
                               "globalKey" : "0"
+                            }
+                          },
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "0"
+                              }
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "17f73"
+                              },
+                              "rollConvention" : "20"
                             },
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            }
+                          },
+                          "paymentDates" : {
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "aa"
+                              }
+                            },
+                            "firstPaymentDate" : "2007-03-20",
+                            "lastRegularPaymentDate" : "2011-03-20",
+                            "meta" : {
+                              "globalKey" : "6f60b62a"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "c5a7813e"
+                          }
+                        } ],
+                        "creditDefaultPayout" : {
+                          "payerReceiver" : {
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
+                          },
+                          "priceQuantity" : {
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0",
+                              "externalKey" : "NOTIONAL"
                             }
                           },
                           "settlementTerms" : {
-                            "meta" : {
-                              "globalKey" : "a817b2b6"
-                            },
+                            "settlementType" : "Physical",
                             "settlementCurrency" : {
                               "value" : "USD"
                             },
-                            "settlementType" : "PHYSICAL",
+                            "meta" : {
+                              "globalKey" : "338d24c"
+                            },
                             "physicalSettlementTerms" : {
+                              "physicalSettlementPeriod" : {
+                                "maximumBusinessDays" : 30
+                              },
                               "deliverableObligations" : {
                                 "accruedInterest" : false,
+                                "category" : "BondOrLoan",
+                                "notSubordinated" : true,
+                                "notContingent" : true,
                                 "assignableLoan" : {
                                   "applicable" : true
                                 },
-                                "category" : "BOND_OR_LOAN",
                                 "consentRequiredLoan" : {
                                   "applicable" : true
                                 },
+                                "transferable" : true,
                                 "maximumMaturity" : {
-                                  "meta" : {
-                                    "globalKey" : "ae5"
-                                  },
+                                  "periodMultiplier" : 30,
                                   "period" : "Y",
-                                  "periodMultiplier" : 30
+                                  "meta" : {
+                                    "globalKey" : "3fb"
+                                  }
                                 },
-                                "notBearer" : true,
-                                "notContingent" : true,
-                                "notSubordinated" : true,
-                                "transferable" : true
+                                "notBearer" : true
                               },
                               "escrow" : true,
                               "meta" : {
-                                "globalKey" : "b173b779"
-                              },
-                              "physicalSettlementPeriod" : {
-                                "maximumBusinessDays" : 30
+                                "globalKey" : "c94d70f"
                               }
                             }
                           },
@@ -263,304 +301,266 @@
                               "indexName" : {
                                 "value" : "Dow Jones iTraxx Europe Consumers Series 2 Version 1"
                               },
+                              "indexSeries" : 2,
+                              "indexAnnexVersion" : 1,
+                              "indexAnnexDate" : "2006-11-01",
+                              "indexAnnexSource" : {
+                                "value" : "Publisher"
+                              },
                               "excludedReferenceEntity" : [ {
                                 "referenceEntity" : {
-                                  "meta" : {
-                                    "globalKey" : "43886e95"
-                                  },
                                   "name" : {
                                     "value" : "TESCO PLC"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "43886e95"
                                   }
                                 }
                               } ],
-                              "indexAnnexDate" : "2006-11-01",
-                              "indexAnnexSource" : {
-                                "value" : "PUBLISHER"
-                              },
-                              "indexAnnexVersion" : 1,
-                              "indexSeries" : 2,
                               "meta" : {
-                                "globalKey" : "f90435c9"
+                                "globalKey" : "dd7d1cc9"
                               }
                             }
                           },
-                          "meta" : {
-                            "globalKey" : "2f8ebc7a"
-                          },
                           "protectionTerms" : [ {
                             "creditEvents" : {
                               "bankruptcy" : true,
-                              "creditEventNotice" : {
-                                "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                                "publiclyAvailableInformation" : {
-                                  "publicSource" : [ "Standard" ],
-                                  "specifiedNumber" : 2
-                                }
-                              },
                               "failureToPay" : {
                                 "applicable" : true,
                                 "paymentRequirement" : {
+                                  "value" : 1000000,
                                   "unit" : {
                                     "currency" : {
                                       "value" : "USD"
                                     }
                                   },
-                                  "value" : 1000000,
                                   "meta" : {
                                     "globalKey" : "48eb1e55"
                                   }
                                 }
                               },
+                              "creditEventNotice" : {
+                                "notifyingParty" : [ "Party2", "Party1" ],
+                                "publiclyAvailableInformation" : {
+                                  "publicSource" : [ "Standard" ],
+                                  "specifiedNumber" : 2
+                                }
+                              },
                               "meta" : {
-                                "globalKey" : "469a7a71"
+                                "globalKey" : "a7a0f33d"
                               }
                             },
-                            "meta" : {
-                              "globalKey" : "80eddc26"
-                            },
                             "obligations" : {
-                              "category" : "BORROWED_MONEY"
-                            }
-                          } ]
-                        },
-                        "interestRatePayout" : [ {
-                          "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
-                          },
-                          "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "quantitySchedule" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "quantity-1"
-                              }
-                            }
-                          },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "28c47"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 3,
-                              "rollConvention" : "20"
+                              "category" : "BorrowedMoney"
                             },
                             "meta" : {
-                              "globalKey" : "28c47"
+                              "globalKey" : "ba3951f2"
                             }
-                          },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
+                          } ],
                           "meta" : {
-                            "globalKey" : "e55ed0a4"
-                          },
-                          "paymentDates" : {
-                            "firstPaymentDate" : "2007-03-20",
-                            "lastRegularPaymentDate" : "2011-03-20",
-                            "meta" : {
-                              "globalKey" : "6f60bed6"
-                            },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "956"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 3
-                            }
-                          },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
-                              }
-                            }
+                            "globalKey" : "247c6f0"
                           }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "eb58846a"
-                        }
-                      },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "ec136bcc"
-                          },
-                          "unadjustedDate" : "2011-06-20"
                         },
                         "meta" : {
-                          "globalKey" : "ec136bcc"
+                          "globalKey" : "c1639eae"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "939774e"
+                      "globalKey" : "8e068626"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "939774e"
+                    "globalKey" : "8e068626"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "b7150a9d"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "b7150a9d"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "31ae620b"
+            "globalKey" : "9248c047"
           }
         },
         "meta" : {
-          "globalKey" : "31ae620b"
+          "globalKey" : "9248c047"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "bda0c0bc"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.004,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.004,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 250000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 250000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "a8acbff5"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "f67756c4"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 250000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 250000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "6ceb3eab"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "Party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TRADEDATE",
-        "globalKey" : "3eb050"
-      },
-      "value" : "2006-01-16"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "Party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/coding-scheme/trade-id"
-          },
-          "value" : "Trade234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "7215e0ba"
+        "globalKey" : "33f59568",
+        "externalKey" : "Party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "3585b5e0"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "1edabe91"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 600000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "Party2"
         },
-        "value" : 600000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
+        }
       },
       "settlementDate" : {
         "relativeDate" : {
+          "periodMultiplier" : 3,
+          "period" : "D",
           "meta" : {
-            "globalKey" : "9a256129"
+            "globalKey" : "2ece588b"
           },
-          "period" : "D",
-          "periodMultiplier" : 3,
-          "dayType" : "BUSINESS",
+          "dayType" : "Business",
           "businessDayConvention" : "NONE",
           "dateRelativeTo" : {
-            "externalReference" : "TRADEDATE",
-            "globalReference" : "3eb050"
+            "globalReference" : "3eb050",
+            "externalReference" : "TRADEDATE"
           }
         }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "4ae1e1f1"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "5b67efd1"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.json
index c94f9bb580..a9509cf4ad 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.json
@@ -1,109 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "8ac99cdc"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "2092c901"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "6234330c"
-      }
-    },
-    "meta" : {
-      "globalKey" : "80f92be8"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "95918657"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-07-13",
+      "meta" : {
+        "globalKey" : "3e89cd",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Option:PriceReturnBasicPerformance:SingleName"
@@ -114,81 +39,43 @@
             "productQualifier" : "EquityOption_PriceReturnBasicPerformance_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
-              },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              }
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "1f6affff"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "4790ef7b"
-                  },
+                  "settlementType" : "Election",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "ELECTION"
+                  "meta" : {
+                    "globalKey" : "4790ef7b"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-07-13",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -197,8 +84,7 @@
                           },
                           "meta" : {
                             "globalKey" : "eae7f1c5"
-                          },
-                          "unadjustedDate" : "2001-07-13"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eae7f1c5"
@@ -206,6 +92,7 @@
                       },
                       "expirationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2005-09-27",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -214,53 +101,50 @@
                           },
                           "meta" : {
                             "globalKey" : "eb6226d3"
-                          },
-                          "unadjustedDate" : "2005-09-27"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eb6226d3"
                         }
                       },
-                      "expirationTimeType" : "CLOSE",
                       "latestExerciseTime" : {
+                        "hourMinuteTime" : "17:15:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "17:15:00"
-                      },
-                      "meta" : {
-                        "globalKey" : "260f119e"
+                        }
                       },
+                      "expirationTimeType" : "Close",
                       "multipleExercise" : {
                         "integralMultipleAmount" : 1,
                         "minimumNumberOfOptions" : 1,
                         "maximumNumberOfOptions" : 150000
+                      },
+                      "meta" : {
+                        "globalKey" : "260f119e"
                       }
                     }
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 32.00,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "value" : 32.00,
                       "perUnitOf" : {
-                        "financialUnit" : "SHARE"
+                        "financialUnit" : "Share"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
+                    }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "1f6affff"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -273,149 +157,265 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "9876f5ef"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "9876f5ef"
+              }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "b94c9d1"
+            "globalKey" : "b1dc3b51"
           }
         },
         "meta" : {
-          "globalKey" : "b94c9d1"
+          "globalKey" : "b1dc3b51"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "23fc586c"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "87c27b06"
+          "quantity" : [ {
+            "value" : {
+              "value" : 150000,
+              "unit" : {
+                "financialUnit" : "Contract"
+              },
+              "multiplier" : {
+                "value" : 1.00,
+                "unit" : {
+                  "financialUnit" : "Share"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "STM-FP",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : "STM-FP"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "78e02f1b"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "STMicroelectronics N.V. ordinary shares"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "12ca7141"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "CONTRACT"
+                }
               },
-              "value" : 150000,
-              "multiplier" : {
-                "unit" : {
-                  "financialUnit" : "SHARE"
-                },
-                "value" : 1.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "708ce5ba"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "10bcc820"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e89cd"
-      },
-      "value" : "2001-07-13"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "2092c901"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "6234330c"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "5c52b112"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "f53c9af4"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 405000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "value" : 405000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-07-17",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-07-17"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "805c5fcc"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "6fbfb05e"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex02-calendar-spread-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex02-calendar-spread-short-form.json
index f5979d657e..53066b3e6a 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex02-calendar-spread-short-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex02-calendar-spread-short-form.json
@@ -1,103 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "58c10c1b"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "2092c901"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "6234330c"
-      }
-    },
-    "meta" : {
-      "globalKey" : "14390717"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/tradeId/OTC"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "PartyB",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "95918657"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-07-13",
+      "meta" : {
+        "globalKey" : "3e89cd",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "PartyB",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "calendarSpread"
@@ -108,52 +39,43 @@
             "productQualifier" : "EquityOption_PriceReturnBasicPerformance_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "8c572638"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "ce8204b9"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "PHYSICAL"
+                  "meta" : {
+                    "globalKey" : "ce8204b9"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-07-13",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -162,8 +84,7 @@
                           },
                           "meta" : {
                             "globalKey" : "eae7f1c5"
-                          },
-                          "unadjustedDate" : "2001-07-13"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eae7f1c5"
@@ -171,6 +92,7 @@
                       },
                       "expirationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2002-09-27",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -179,20 +101,19 @@
                           },
                           "meta" : {
                             "globalKey" : "eb080ed3"
-                          },
-                          "unadjustedDate" : "2002-09-27"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eb080ed3"
                         }
                       },
-                      "expirationTimeType" : "CLOSE",
                       "latestExerciseTime" : {
+                        "hourMinuteTime" : "17:15:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "17:15:00"
+                        }
                       },
+                      "expirationTimeType" : "Close",
                       "meta" : {
                         "globalKey" : "5ec2769e"
                       }
@@ -201,18 +122,16 @@
                   "strike" : {
                     "strikePrice" : {
                       "value" : 32.00,
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
+                    }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "8c572638"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -225,152 +144,233 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "17fbbf4c"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "17fbbf4c"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "3674ee1"
+            "globalKey" : "32ac0975"
           }
         },
         "meta" : {
-          "globalKey" : "3674ee1"
+          "globalKey" : "32ac0975"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "87c27b06"
-          },
           "observable" : {
-            "meta" : {
-              "globalKey" : "87c27b06"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "STM-FP",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : "STM-FP"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "78e02f1b"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "STMicroelectronics N.V. ordinary shares"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "12ca7141"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "708ce5ba"
+            }
+          },
+          "meta" : {
+            "globalKey" : "708ce5ba"
           }
         }, {
-          "meta" : {
-            "globalKey" : "9d907bc9"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 150000,
               "unit" : {
-                "financialUnit" : "CONTRACT"
+                "financialUnit" : "Contract"
               },
-              "value" : 150000,
               "multiplier" : {
                 "unit" : {
-                  "financialUnit" : "SHARE"
+                  "financialUnit" : "Share"
                 }
               }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "147efd57"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "PartyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e89cd"
-      },
-      "value" : "2001-07-13"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyA.com/tradeId/OTC"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "PartyB"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "2092c901"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "6234330c"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "9f91b3d1"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "5dccfcc4"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "PartyB",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 405000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "PartyB"
         },
-        "value" : 405000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-07-17",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-07-17"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "88ea1bfc"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "d0aedd8d"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex03-call-or-put-spread-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex03-call-or-put-spread-short-form.json
index ca68c25d52..c156140075 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex03-call-or-put-spread-short-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex03-call-or-put-spread-short-form.json
@@ -1,103 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "3e72c29c"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "2092c901"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "6234330c"
-      }
-    },
-    "meta" : {
-      "globalKey" : "804f4b9c"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/tradeId/OTC"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "95918657"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-07-13",
+      "meta" : {
+        "globalKey" : "3e89cd",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "putSpread"
@@ -108,52 +39,43 @@
             "productQualifier" : "EquityOption_PriceReturnBasicPerformance_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "f6441787"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "ce8204b9"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "PHYSICAL"
+                  "meta" : {
+                    "globalKey" : "ce8204b9"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Put",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-07-13",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -162,8 +84,7 @@
                           },
                           "meta" : {
                             "globalKey" : "eae7f1c5"
-                          },
-                          "unadjustedDate" : "2001-07-13"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eae7f1c5"
@@ -171,6 +92,7 @@
                       },
                       "expirationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-09-27",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -179,20 +101,19 @@
                           },
                           "meta" : {
                             "globalKey" : "eaea06d3"
-                          },
-                          "unadjustedDate" : "2001-09-27"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eaea06d3"
                         }
                       },
-                      "expirationTimeType" : "CLOSE",
                       "latestExerciseTime" : {
+                        "hourMinuteTime" : "17:15:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "17:15:00"
+                        }
                       },
+                      "expirationTimeType" : "Close",
                       "meta" : {
                         "globalKey" : "2ce86e9e"
                       }
@@ -201,18 +122,16 @@
                   "strike" : {
                     "strikePrice" : {
                       "value" : 32.00,
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
+                    }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "f6441787"
-                },
-                "optionType" : "PUT",
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -225,152 +144,233 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "2145a09b"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "2145a09b"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "17a230bf"
+            "globalKey" : "bb50c393"
           }
         },
         "meta" : {
-          "globalKey" : "17a230bf"
+          "globalKey" : "bb50c393"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "87c27b06"
-          },
           "observable" : {
-            "meta" : {
-              "globalKey" : "87c27b06"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "STM-FP",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : "STM-FP"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "78e02f1b"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "STMicroelectronics N.V. ordinary shares"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "12ca7141"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "708ce5ba"
+            }
+          },
+          "meta" : {
+            "globalKey" : "708ce5ba"
           }
         }, {
-          "meta" : {
-            "globalKey" : "4ca4805c"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 10000,
               "unit" : {
-                "financialUnit" : "CONTRACT"
+                "financialUnit" : "Contract"
               },
-              "value" : 10000,
               "multiplier" : {
                 "unit" : {
-                  "financialUnit" : "SHARE"
+                  "financialUnit" : "Share"
                 }
               }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "47eb8b24"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e89cd"
-      },
-      "value" : "2001-07-13"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyA.com/tradeId/OTC"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "2092c901"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "6234330c"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "621d2bf0"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "556ca600"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 27000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "value" : 27000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-07-17",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-07-17"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "97f55c40"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "faf96c30"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex04-european-call-index-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex04-european-call-index-long-form.json
index fd8a1592ee..94ac35cbdd 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex04-european-call-index-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex04-european-call-index-long-form.json
@@ -1,109 +1,33 @@
 {
-  "meta" : {
-    "globalKey" : "853af91c"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "6b41335a"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "baf16b25"
-      }
-    },
-    "meta" : {
-      "globalKey" : "c51819da"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyB.com/eqd-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "9591fab6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-09-04",
+      "meta" : {
+        "globalKey" : "3e8a44"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Option:PriceReturnBasicPerformance:SingleIndex"
@@ -114,68 +38,37 @@
             "productQualifier" : "EquityOption_PriceReturnBasicPerformance_Index"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "indexAdjustmentEvents" : {
-                "indexCancellation" : "CANCELLATION_AND_PAYMENT",
-                "indexDisruption" : "CALCULATION_AGENT_ADJUSTMENT",
-                "indexModification" : "CALCULATION_AGENT_ADJUSTMENT"
-              },
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "indexDisclaimer" : true,
-                "nonReliance" : true
-              }
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "c9d386b6"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "a55e2c43"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "CHF"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "994a10b7"
+                          "globalKey" : "2c4c46fb"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
                         "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
                           "externalReference" : "valuation"
@@ -183,25 +76,24 @@
                       }
                     },
                     "meta" : {
-                      "globalKey" : "994a10b7"
+                      "globalKey" : "2c4c46fb"
                     }
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "38606287"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2004-12-19",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -210,8 +102,7 @@
                           },
                           "meta" : {
                             "globalKey" : "eb46d18b"
-                          },
-                          "unadjustedDate" : "2004-12-19"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eb46d18b"
@@ -225,23 +116,24 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 8700,
                       "unit" : {
                         "currency" : {
                           "value" : "CHF"
                         }
                       },
-                      "value" : 8700,
                       "perUnitOf" : {
-                        "financialUnit" : "INDEX_UNIT"
+                        "financialUnit" : "IndexUnit"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
+                    }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "c9d386b6"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "index" : {
                     "productIdentifier" : [ {
@@ -259,146 +151,254 @@
                   "meta" : {
                     "globalKey" : "0"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "5a4ea8dc"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "5a4ea8dc"
+              }
+            },
+            "extraordinaryEvents" : {
+              "indexAdjustmentEvents" : {
+                "indexModification" : "CalculationAgentAdjustment",
+                "indexCancellation" : "CancellationAndPayment",
+                "indexDisruption" : "CalculationAgentAdjustment"
+              },
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "indexDisclaimer" : true,
+                "additionalAcknowledgements" : true
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "18d34d8d"
+            "globalKey" : "7505acf5"
           }
         },
         "meta" : {
-          "globalKey" : "18d34d8d"
+          "globalKey" : "7505acf5"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "8b69ee51"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "cf29f49a"
+          "quantity" : [ {
+            "value" : {
+              "value" : 2500,
+              "unit" : {
+                "financialUnit" : "Contract"
+              },
+              "multiplier" : {
+                "value" : 1.00,
+                "unit" : {
+                  "financialUnit" : "IndexUnit"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : ".SSMI",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : ".SSMI"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "e929c01a"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "Swiss Market Index"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "97ddb474"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "CONTRACT"
+                }
               },
-              "value" : 2500,
-              "multiplier" : {
-                "unit" : {
-                  "financialUnit" : "INDEX_UNIT"
-                },
-                "value" : 1.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "16149ea6"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "ae56649d"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e8a44"
-      },
-      "value" : "2001-09-04"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/eqd-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "6b41335a"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "1b2141ce"
+        "globalKey" : "baf16b25"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "eeff9c6"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "f7fe1c2"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 300000,
         "unit" : {
           "currency" : {
             "value" : "CHF"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "value" : 300000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-09-06",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-09-06"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "8b9b3488"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "27a688ce"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex05-asian-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex05-asian-long-form.json
index 9441fe3ea6..416a56422a 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex05-asian-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex05-asian-long-form.json
@@ -1,107 +1,29 @@
 {
-  "meta" : {
-    "globalKey" : "a9bc612e"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "92c7c587"
-      }
-    },
-    "meta" : {
-      "globalKey" : "da46aded"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "95918657"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-06-28",
+      "meta" : {
+        "globalKey" : "3e819c"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -109,75 +31,43 @@
             "productQualifier" : "EquityOption_PriceReturnBasicPerformance_Index"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "indexAdjustmentEvents" : {
-                "indexCancellation" : "CANCELLATION_AND_PAYMENT",
-                "indexDisruption" : "CALCULATION_AGENT_ADJUSTMENT",
-                "indexModification" : "CALCULATION_AGENT_ADJUSTMENT"
-              },
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "indexDisclaimer" : true,
-                "nonReliance" : true
-              }
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "8429c137"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "76108015"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "76108015"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2002-07-01",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -186,14 +76,13 @@
                           },
                           "meta" : {
                             "globalKey" : "eb05ccb9"
-                          },
-                          "unadjustedDate" : "2002-07-01"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eb05ccb9"
                         }
                       } ],
-                      "expirationTimeType" : "CLOSE",
+                      "expirationTimeType" : "Close",
                       "meta" : {
                         "globalKey" : "896fcde1"
                       }
@@ -201,23 +90,24 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 17475.90,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "value" : 17475.90,
                       "perUnitOf" : {
-                        "financialUnit" : "INDEX_UNIT"
+                        "financialUnit" : "IndexUnit"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
+                    }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "8429c137"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "index" : {
                     "productIdentifier" : [ {
@@ -235,146 +125,256 @@
                   "meta" : {
                     "globalKey" : "0"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "865cdf97"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "865cdf97"
+              }
+            },
+            "extraordinaryEvents" : {
+              "indexAdjustmentEvents" : {
+                "indexModification" : "CalculationAgentAdjustment",
+                "indexCancellation" : "CancellationAndPayment",
+                "indexDisruption" : "CalculationAgentAdjustment"
+              },
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "indexDisclaimer" : true,
+                "additionalAcknowledgements" : true
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "8250470b"
+            "globalKey" : "28f58aef"
           }
         },
         "meta" : {
-          "globalKey" : "8250470b"
+          "globalKey" : "28f58aef"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a448de06"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "a5c5a60c"
+          "quantity" : [ {
+            "value" : {
+              "value" : 79.099093,
+              "unit" : {
+                "financialUnit" : "Contract"
+              },
+              "multiplier" : {
+                "value" : 1.00,
+                "unit" : {
+                  "financialUnit" : "IndexUnit"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : ".N225",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : ".N225"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "e926fb05"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "NIKKEI 225 INDEX"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "6e3f85f1"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "CONTRACT"
+                }
               },
-              "value" : 79.099093,
-              "multiplier" : {
-                "unit" : {
-                  "financialUnit" : "INDEX_UNIT"
-                },
-                "value" : 1.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "12ef1b74"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "8f88b4ee"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e819c"
-      },
-      "value" : "2000-06-28"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "4b17c3fd"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "a2a7481"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 213.5675511,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "value" : 213.5675511
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2000-07-03",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2000-07-03"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "e9d54d03"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "4704ebc0"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex06-averaging-in-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex06-averaging-in-long-form.json
index 9441fe3ea6..416a56422a 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex06-averaging-in-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex06-averaging-in-long-form.json
@@ -1,107 +1,29 @@
 {
-  "meta" : {
-    "globalKey" : "a9bc612e"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "92c7c587"
-      }
-    },
-    "meta" : {
-      "globalKey" : "da46aded"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "95918657"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-06-28",
+      "meta" : {
+        "globalKey" : "3e819c"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -109,75 +31,43 @@
             "productQualifier" : "EquityOption_PriceReturnBasicPerformance_Index"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "indexAdjustmentEvents" : {
-                "indexCancellation" : "CANCELLATION_AND_PAYMENT",
-                "indexDisruption" : "CALCULATION_AGENT_ADJUSTMENT",
-                "indexModification" : "CALCULATION_AGENT_ADJUSTMENT"
-              },
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "indexDisclaimer" : true,
-                "nonReliance" : true
-              }
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "8429c137"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "76108015"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "76108015"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2002-07-01",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -186,14 +76,13 @@
                           },
                           "meta" : {
                             "globalKey" : "eb05ccb9"
-                          },
-                          "unadjustedDate" : "2002-07-01"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eb05ccb9"
                         }
                       } ],
-                      "expirationTimeType" : "CLOSE",
+                      "expirationTimeType" : "Close",
                       "meta" : {
                         "globalKey" : "896fcde1"
                       }
@@ -201,23 +90,24 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 17475.90,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "value" : 17475.90,
                       "perUnitOf" : {
-                        "financialUnit" : "INDEX_UNIT"
+                        "financialUnit" : "IndexUnit"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
+                    }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "8429c137"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "index" : {
                     "productIdentifier" : [ {
@@ -235,146 +125,256 @@
                   "meta" : {
                     "globalKey" : "0"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "865cdf97"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "865cdf97"
+              }
+            },
+            "extraordinaryEvents" : {
+              "indexAdjustmentEvents" : {
+                "indexModification" : "CalculationAgentAdjustment",
+                "indexCancellation" : "CancellationAndPayment",
+                "indexDisruption" : "CalculationAgentAdjustment"
+              },
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "indexDisclaimer" : true,
+                "additionalAcknowledgements" : true
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "8250470b"
+            "globalKey" : "28f58aef"
           }
         },
         "meta" : {
-          "globalKey" : "8250470b"
+          "globalKey" : "28f58aef"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a448de06"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "a5c5a60c"
+          "quantity" : [ {
+            "value" : {
+              "value" : 79.099093,
+              "unit" : {
+                "financialUnit" : "Contract"
+              },
+              "multiplier" : {
+                "value" : 1.00,
+                "unit" : {
+                  "financialUnit" : "IndexUnit"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : ".N225",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : ".N225"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "e926fb05"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "NIKKEI 225 INDEX"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "6e3f85f1"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "CONTRACT"
+                }
               },
-              "value" : 79.099093,
-              "multiplier" : {
-                "unit" : {
-                  "financialUnit" : "INDEX_UNIT"
-                },
-                "value" : 1.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "12ef1b74"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "8f88b4ee"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e819c"
-      },
-      "value" : "2000-06-28"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "4b17c3fd"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "a2a7481"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 213.5675511,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "value" : 213.5675511
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2000-07-03",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2000-07-03"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "e9d54d03"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "4704ebc0"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex07-barrier-knockout-rebate-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex07-barrier-knockout-rebate-long-form.json
index 424eb4a676..176d0eb89d 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex07-barrier-knockout-rebate-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex07-barrier-knockout-rebate-long-form.json
@@ -1,161 +1,53 @@
 {
-  "meta" : {
-    "globalKey" : "5dd34da1"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "92c7c587"
-      }
-    },
-    "meta" : {
-      "globalKey" : "d1c328e5"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "95918657"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-07-01",
+      "meta" : {
+        "globalKey" : "3e91c1"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "indexAdjustmentEvents" : {
-                "indexCancellation" : "CANCELLATION_AND_PAYMENT",
-                "indexDisruption" : "CALCULATION_AGENT_ADJUSTMENT",
-                "indexModification" : "CALCULATION_AGENT_ADJUSTMENT"
-              },
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "indexDisclaimer" : true,
-                "nonReliance" : true
-              }
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "3b408342"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "47ca19d8"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "55ba1143"
+                          "globalKey" : "108646a1"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -164,88 +56,68 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "expirationDate",
-                          "globalReference" : "eb62db03"
+                          "globalReference" : "eb62db03",
+                          "externalReference" : "expirationDate"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "55ba1143"
+                      "globalKey" : "108646a1"
                     }
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "2964f36"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
-                "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
-                  "optionStyle" : {
-                    "europeanExercise" : {
-                      "expirationDate" : [ {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
+                "optionType" : "Call",
+                "feature" : {
+                  "barrier" : {
+                    "barrierCap" : {
+                      "schedule" : [ {
+                        "startDate" : "2002-03-29",
+                        "endDate" : "2002-07-12",
+                        "averagingPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "eb62db03"
+                            "globalKey" : "24b335"
                           },
-                          "unadjustedDate" : "2005-10-11"
-                        },
-                        "meta" : {
-                          "externalKey" : "expirationDate",
-                          "globalKey" : "eb62db03"
+                          "rollConvention" : "NONE"
                         }
                       } ],
-                      "expirationTimeType" : "CLOSE",
-                      "meta" : {
-                        "globalKey" : "89ccdc2b"
-                      }
-                    }
-                  }
-                },
-                "feature" : {
-                  "barrier" : {
-                    "barrierCap" : {
+                      "trigger" : {
+                        "level" : 1606.346
+                      },
                       "featurePayment" : {
-                        "amount" : 15000000,
-                        "currency" : {
-                          "value" : "EUR"
-                        },
-                        "meta" : {
-                          "globalKey" : "9e2b3962"
-                        },
                         "payerReceiver" : {
                           "payerPartyReference" : {
-                            "externalReference" : "party1",
-                            "globalReference" : "33f59567"
+                            "globalReference" : "33f59567",
+                            "externalReference" : "party1"
                           },
                           "receiverPartyReference" : {
-                            "externalReference" : "party2",
-                            "globalReference" : "33f59568"
+                            "globalReference" : "33f59568",
+                            "externalReference" : "party2"
                           }
                         },
+                        "amount" : 15000000,
+                        "time" : "Close",
+                        "currency" : {
+                          "value" : "EUR"
+                        },
                         "paymentDate" : {
-                          "meta" : {
-                            "globalKey" : "55ba1143"
-                          },
                           "relativeDate" : {
+                            "periodMultiplier" : 3,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "55ba1143"
+                              "globalKey" : "108646a1"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 3,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
@@ -254,63 +126,63 @@
                                 "globalKey" : "20a71d"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "expirationDate",
-                              "globalReference" : "eb62db03"
+                              "globalReference" : "eb62db03",
+                              "externalReference" : "expirationDate"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "108646a1"
                           }
                         },
-                        "time" : "CLOSE"
-                      },
+                        "meta" : {
+                          "globalKey" : "1b40effc"
+                        }
+                      }
+                    }
+                  },
+                  "knock" : {
+                    "knockOut" : {
                       "schedule" : [ {
+                        "startDate" : "2002-07-26",
+                        "endDate" : "2005-10-11",
                         "averagingPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "25a69b"
+                            "globalKey" : "24b335"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 1,
                           "rollConvention" : "NONE"
-                        },
-                        "endDate" : "2002-07-12",
-                        "startDate" : "2002-03-29"
+                        }
                       } ],
                       "trigger" : {
-                        "level" : 1606.346
-                      }
-                    }
-                  },
-                  "knock" : {
-                    "knockOut" : {
+                        "levelPercentage" : 1.50
+                      },
                       "featurePayment" : {
-                        "amount" : 880000,
-                        "currency" : {
-                          "value" : "EUR"
-                        },
-                        "meta" : {
-                          "globalKey" : "83d66d68"
-                        },
                         "payerReceiver" : {
                           "payerPartyReference" : {
-                            "externalReference" : "party1",
-                            "globalReference" : "33f59567"
+                            "globalReference" : "33f59567",
+                            "externalReference" : "party1"
                           },
                           "receiverPartyReference" : {
-                            "externalReference" : "party2",
-                            "globalReference" : "33f59568"
+                            "globalReference" : "33f59568",
+                            "externalReference" : "party2"
                           }
                         },
+                        "amount" : 880000,
+                        "time" : "SpecificTime",
+                        "currency" : {
+                          "value" : "EUR"
+                        },
                         "paymentDate" : {
-                          "meta" : {
-                            "globalKey" : "55ba1143"
-                          },
                           "relativeDate" : {
+                            "periodMultiplier" : 3,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "55ba1143"
+                              "globalKey" : "108646a1"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 3,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
@@ -319,37 +191,55 @@
                                 "globalKey" : "20a71d"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "expirationDate",
-                              "globalReference" : "eb62db03"
+                              "globalReference" : "eb62db03",
+                              "externalReference" : "expirationDate"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "108646a1"
                           }
                         },
-                        "time" : "SPECIFIC_TIME"
-                      },
-                      "schedule" : [ {
-                        "averagingPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "25a69b"
+                        "meta" : {
+                          "globalKey" : "ec2402"
+                        }
+                      }
+                    }
+                  }
+                },
+                "exerciseTerms" : {
+                  "optionStyle" : {
+                    "europeanExercise" : {
+                      "expirationDate" : [ {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2005-10-11",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "NONE"
+                          "meta" : {
+                            "globalKey" : "eb62db03"
+                          }
                         },
-                        "endDate" : "2005-10-11",
-                        "startDate" : "2002-07-26"
+                        "meta" : {
+                          "globalKey" : "eb62db03",
+                          "externalKey" : "expirationDate"
+                        }
                       } ],
-                      "trigger" : {
-                        "levelPercentage" : 1.50
+                      "expirationTimeType" : "Close",
+                      "meta" : {
+                        "globalKey" : "89ccdc2b"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
+                    }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "3b408342"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "index" : {
                     "productIdentifier" : [ {
@@ -367,142 +257,252 @@
                   "meta" : {
                     "globalKey" : "0"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "5142cb76"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "5142cb76"
+              }
+            },
+            "extraordinaryEvents" : {
+              "indexAdjustmentEvents" : {
+                "indexModification" : "CalculationAgentAdjustment",
+                "indexCancellation" : "CancellationAndPayment",
+                "indexDisruption" : "CalculationAgentAdjustment"
+              },
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "indexDisclaimer" : true,
+                "additionalAcknowledgements" : true
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "a28cdcee"
+            "globalKey" : "7ffe1070"
           }
         },
         "meta" : {
-          "globalKey" : "a28cdcee"
+          "globalKey" : "7ffe1070"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "f4cb6fe5"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "28893629"
+          "quantity" : [ {
+            "value" : {
+              "value" : 8000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : ".STOX50E",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : ".STOX50E"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "4b6ef3c2"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "STOXX 50 Euro"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "8a8c20ab"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
                 }
               },
-              "value" : 8000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "e89d8ef7"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "2aa15ca5"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e91c1"
-      },
-      "value" : "2002-07-01"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "44aaccb3"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "be20b3fc"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 400000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "value" : 400000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2002-07-30",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2002-07-30"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "1af62ebe"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "dd2854b1"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex08-basket-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex08-basket-long-form.json
index 1adb2fcff3..2c24ff64ac 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex08-basket-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex08-basket-long-form.json
@@ -1,111 +1,33 @@
 {
-  "meta" : {
-    "globalKey" : "1f16e2b1"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "92c7c587"
-      }
-    },
-    "meta" : {
-      "globalKey" : "792c9a30"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "95918657"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-06-28",
+      "meta" : {
+        "globalKey" : "3e819c"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Option:PriceReturnBasicPerformance:Basket"
@@ -116,81 +38,43 @@
             "productQualifier" : "EquityOption_PriceReturnBasicPerformance_Basket"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "CANCELLATION_AND_PAYMENT",
-                "shareForOther" : "CANCELLATION_AND_PAYMENT",
-                "shareForShare" : "ALTERNATIVE_OBLIGATION"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
-              },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              }
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "14f69eb3"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "76108015"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "76108015"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2002-07-01",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -199,30 +83,27 @@
                           },
                           "meta" : {
                             "globalKey" : "eb05ccb9"
-                          },
-                          "unadjustedDate" : "2002-07-01"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eb05ccb9"
                         }
                       } ],
-                      "expirationTimeType" : "CLOSE",
+                      "expirationTimeType" : "Close",
                       "meta" : {
                         "globalKey" : "896fcde1"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
+                    }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "14f69eb3"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "basket" : {
                     "basketConstituent" : [ {
-                      "meta" : {
-                        "globalKey" : "7a5b92c5"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "address" : {
@@ -235,12 +116,12 @@
                             "value" : "productIdentifier-2"
                           }
                         } ],
-                        "securityType" : "EQUITY"
-                      }
-                    }, {
+                        "securityType" : "Equity"
+                      },
                       "meta" : {
                         "globalKey" : "7a5b92c5"
-                      },
+                      }
+                    }, {
                       "security" : {
                         "productIdentifier" : [ {
                           "address" : {
@@ -253,229 +134,348 @@
                             "value" : "productIdentifier-4"
                           }
                         } ],
-                        "securityType" : "EQUITY"
+                        "securityType" : "Equity"
+                      },
+                      "meta" : {
+                        "globalKey" : "7a5b92c5"
                       }
                     } ]
                   },
                   "meta" : {
                     "globalKey" : "cc1d884a"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "f17dec51"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "f17dec51"
+              }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "AlternativeObligation",
+                "shareForOther" : "CancellationAndPayment",
+                "shareForCombined" : "CancellationAndPayment"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "b3a1a6e5"
+            "globalKey" : "d2bbf8c5"
           }
         },
         "meta" : {
-          "globalKey" : "b3a1a6e5"
+          "globalKey" : "d2bbf8c5"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "394e4c49"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-3"
-              } ]
-            },
             "value" : {
+              "value" : 79.099093,
               "unit" : {
-                "financialUnit" : "CONTRACT"
+                "financialUnit" : "Contract"
               },
-              "value" : 79.099093,
               "multiplier" : {
                 "value" : 1.00
               }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-3"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "f07b3cd7"
+          }
         } ]
       }, {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "cb98f2a7"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "ac9d2679"
+          "quantity" : [ {
+            "value" : {
+              "value" : 0.40,
+              "unit" : {
+                "financialUnit" : "Weight"
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "AHLD.NA",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : "AHLD.NA"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "d41b1d12"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "Ahold"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "8c96e84b"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "e707a8a7"
+            }
           },
+          "meta" : {
+            "globalKey" : "ac593b15"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 0.60,
+              "unit" : {
+                "financialUnit" : "Weight"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "WEIGHT"
-              },
-              "value" : 0.40
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "fc83068b"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "2798a45b"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-3"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "RD.NA",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : "RD.NA"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "eb1db1df"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-4"
+                  "value" : "productIdentifier-3"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "Royal Dutch"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "224702da"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-4"
+                } ]
               }
-            } ]
-          },
-          "quantity" : [ {
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "WEIGHT"
-              },
-              "value" : 0.60
+              "globalKey" : "cb7be705"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "32213575"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e819c"
-      },
-      "value" : "2000-06-28"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "e24e909e"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "a2a7481"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 213.5675511,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "value" : 213.5675511
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2000-07-03",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2000-07-03"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "e9d54d03"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "dac83221"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex09-bermuda-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex09-bermuda-long-form.json
index d6eef58942..9882d4ee89 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex09-bermuda-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex09-bermuda-long-form.json
@@ -1,114 +1,33 @@
 {
-  "meta" : {
-    "globalKey" : "fbfbdefc"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2002-03-15",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "d3c973e8"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            }, {
-              "value" : "ISDA1998FX"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "c7060b4e"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "8b041aa"
-      }
-    },
-    "meta" : {
-      "globalKey" : "92823cbf"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "LN 2962",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "d0c89d36"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-01-17",
+      "meta" : {
+        "globalKey" : "3e9051"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Option:PriceReturnBasicPerformance:SingleName"
@@ -116,97 +35,59 @@
             }
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "delisting" : "NEGOTIATED_CLOSEOUT",
-              "mergerEvents" : {
-                "shareForCombined" : "ALTERNATIVE_OBLIGATION",
-                "shareForOther" : "ALTERNATIVE_OBLIGATION",
-                "shareForShare" : "ALTERNATIVE_OBLIGATION"
-              },
-              "nationalizationOrInsolvency" : "NEGOTIATED_CLOSEOUT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "indexDisclaimer" : true,
-                "nonReliance" : true
-              }
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "5663db02"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "ce8204b9"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "PHYSICAL"
+                  "meta" : {
+                    "globalKey" : "ce8204b9"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 8.00,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "value" : 8.00,
                       "perUnitOf" : {
-                        "financialUnit" : "SHARE"
+                        "financialUnit" : "Share"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
+                    }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "5663db02"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -219,161 +100,280 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "c8e563c2"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "c8e563c2"
+              }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "AlternativeObligation",
+                "shareForOther" : "AlternativeObligation",
+                "shareForCombined" : "AlternativeObligation"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "indexDisclaimer" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "NegotiatedCloseout",
+              "delisting" : "NegotiatedCloseout"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "40ea7a51"
+            "globalKey" : "c3aeb53d"
           }
         },
         "meta" : {
-          "globalKey" : "40ea7a51"
+          "globalKey" : "c3aeb53d"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "b75e506"
-          },
-          "observable" : {
+          "quantity" : [ {
+            "value" : {
+              "value" : 31000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
-              "globalKey" : "c713539a"
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          }, {
+            "value" : {
+              "value" : 500000,
+              "unit" : {
+                "financialUnit" : "Contract"
+              },
+              "multiplier" : {
+                "value" : 1.00,
+                "unit" : {
+                  "financialUnit" : "Share"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "ES0113900J37",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : "ES0113900J37"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "3e577d56"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "Ordinary Shares of Banco Santander Central Hispano SA"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "c683eb30"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 31000
-            }
-          }, {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "CONTRACT"
+                }
               },
-              "value" : 500000,
-              "multiplier" : {
-                "unit" : {
-                  "financialUnit" : "SHARE"
-                },
-                "value" : 1.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "1b571fa6"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "66743812"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e9051"
-      },
-      "value" : "2002-01-17"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2002-03-15",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "LN 2962"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "d3c973e8"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            }, {
+              "value" : "ISDA1998FX"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "c7060b4e"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "64ee1cec"
+        "globalKey" : "8b041aa"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "1d78d711"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "e4f1b3fd"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 1350000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "value" : 1350000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2002-01-22",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2002-01-22"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "8b5b414d"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "fb3cd61e"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex10-binary-barrier-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex10-binary-barrier-long-form.json
index 2cf17ebb91..f3b26d335a 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex10-binary-barrier-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex10-binary-barrier-long-form.json
@@ -1,188 +1,136 @@
 {
-  "meta" : {
-    "globalKey" : "ed999905"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "92c7c587"
-      }
-    },
-    "meta" : {
-      "globalKey" : "f096f127"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "95918657"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-03-25",
+      "meta" : {
+        "globalKey" : "3e90d9"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "indexAdjustmentEvents" : {
-                "indexCancellation" : "CANCELLATION_AND_PAYMENT",
-                "indexDisruption" : "CALCULATION_AGENT_ADJUSTMENT",
-                "indexModification" : "CALCULATION_AGENT_ADJUSTMENT"
-              },
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "indexDisclaimer" : true,
-                "nonReliance" : true
-              }
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "67304174"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "709708a3"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "52114118"
+                          "globalKey" : "e6ba387a"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "EXCHANGE_BUSINESS",
+                        "dayType" : "ExchangeBusiness",
                         "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "expirationDate",
-                          "globalReference" : "eb053691"
+                          "globalReference" : "eb053691",
+                          "externalReference" : "expirationDate"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "52114118"
+                      "globalKey" : "e6ba387a"
                     }
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "5400005"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
-                "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
+                "optionType" : "Call",
+                "feature" : {
+                  "barrier" : {
+                    "barrierCap" : {
+                      "schedule" : [ {
+                        "startDate" : "2002-03-29",
+                        "endDate" : "2002-07-12",
+                        "averagingPeriodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "D",
+                          "meta" : {
+                            "globalKey" : "24b335"
+                          },
+                          "rollConvention" : "NONE"
+                        }
+                      } ],
+                      "trigger" : {
+                        "level" : 1606.346
+                      },
+                      "featurePayment" : {
+                        "payerReceiver" : {
+                          "payerPartyReference" : {
+                            "globalReference" : "33f59567",
+                            "externalReference" : "party1"
+                          },
+                          "receiverPartyReference" : {
+                            "globalReference" : "33f59568",
+                            "externalReference" : "party2"
+                          }
+                        },
+                        "amount" : 15000000,
+                        "time" : "Close",
+                        "currency" : {
+                          "value" : "EUR"
+                        },
+                        "paymentDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 3,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "6203a7f4"
+                            },
+                            "businessDayConvention" : "NONE",
+                            "dateRelativeTo" : {
+                              "globalReference" : "eb053691",
+                              "externalReference" : "expirationDate"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "6203a7f4"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "d92736cf"
+                        }
+                      }
                     }
-                  },
+                  }
+                },
+                "exerciseTerms" : {
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2002-06-25",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -191,15 +139,14 @@
                           },
                           "meta" : {
                             "globalKey" : "eb053691"
-                          },
-                          "unadjustedDate" : "2002-06-25"
+                          }
                         },
                         "meta" : {
-                          "externalKey" : "expirationDate",
-                          "globalKey" : "eb053691"
+                          "globalKey" : "eb053691",
+                          "externalKey" : "expirationDate"
                         }
                       } ],
-                      "expirationTimeType" : "SPECIFIC_TIME",
+                      "expirationTimeType" : "SpecificTime",
                       "meta" : {
                         "globalKey" : "41a32117"
                       }
@@ -207,81 +154,24 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 900,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "value" : 900,
                       "perUnitOf" : {
-                        "financialUnit" : "INDEX_UNIT"
+                        "financialUnit" : "IndexUnit"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
-                  }
-                },
-                "feature" : {
-                  "barrier" : {
-                    "barrierCap" : {
-                      "featurePayment" : {
-                        "amount" : 15000000,
-                        "currency" : {
-                          "value" : "EUR"
-                        },
-                        "meta" : {
-                          "globalKey" : "79ca2335"
-                        },
-                        "payerReceiver" : {
-                          "payerPartyReference" : {
-                            "externalReference" : "party1",
-                            "globalReference" : "33f59567"
-                          },
-                          "receiverPartyReference" : {
-                            "externalReference" : "party2",
-                            "globalReference" : "33f59568"
-                          }
-                        },
-                        "paymentDate" : {
-                          "meta" : {
-                            "globalKey" : "657a1396"
-                          },
-                          "relativeDate" : {
-                            "meta" : {
-                              "globalKey" : "657a1396"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 3,
-                            "businessDayConvention" : "NONE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "expirationDate",
-                              "globalReference" : "eb053691"
-                            }
-                          }
-                        },
-                        "time" : "CLOSE"
-                      },
-                      "schedule" : [ {
-                        "averagingPeriodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "25a69b"
-                          },
-                          "period" : "D",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "NONE"
-                        },
-                        "endDate" : "2002-07-12",
-                        "startDate" : "2002-03-29"
-                      } ],
-                      "trigger" : {
-                        "level" : 1606.346
-                      }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "67304174"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "index" : {
                     "productIdentifier" : [ {
@@ -299,142 +189,252 @@
                   "meta" : {
                     "globalKey" : "0"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "c738d114"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "c738d114"
+              }
+            },
+            "extraordinaryEvents" : {
+              "indexAdjustmentEvents" : {
+                "indexModification" : "CalculationAgentAdjustment",
+                "indexCancellation" : "CancellationAndPayment",
+                "indexDisruption" : "CalculationAgentAdjustment"
+              },
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "indexDisclaimer" : true,
+                "additionalAcknowledgements" : true
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "ec929020"
+            "globalKey" : "22f65992"
           }
         },
         "meta" : {
-          "globalKey" : "ec929020"
+          "globalKey" : "22f65992"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "373ff935"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "42e9a120"
+          "quantity" : [ {
+            "value" : {
+              "value" : 1000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : ".SP500",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : ".SP500"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "39b040fa"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "S and P 500"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "dd655da"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
                 }
               },
-              "value" : 1000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "1a4a82e0"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "78436875"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e90d9"
-      },
-      "value" : "2002-03-25"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "c611b365"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "fb88039e"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 5000000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "value" : 5000000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2002-03-25",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2002-03-25"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "9bbb272"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "141f3697"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex11-quanto-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex11-quanto-long-form.json
index d20040ee95..54006e9aae 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex11-quanto-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex11-quanto-long-form.json
@@ -1,107 +1,29 @@
 {
-  "meta" : {
-    "globalKey" : "80ea6b87"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "92c7c587"
-      }
-    },
-    "meta" : {
-      "globalKey" : "a289df53"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "95918657"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-07-13",
+      "meta" : {
+        "globalKey" : "3e89cd"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -109,81 +31,43 @@
             "productQualifier" : "EquityOption_PriceReturnBasicPerformance_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
-              },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              }
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "ccf87201"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "ce82407d"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL"
+                  "meta" : {
+                    "globalKey" : "ce82407d"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-07-13",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -192,8 +76,7 @@
                           },
                           "meta" : {
                             "globalKey" : "eae7f1c5"
-                          },
-                          "unadjustedDate" : "2001-07-13"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eae7f1c5"
@@ -201,6 +84,7 @@
                       },
                       "expirationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-09-27",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -209,53 +93,50 @@
                           },
                           "meta" : {
                             "globalKey" : "eaea06d3"
-                          },
-                          "unadjustedDate" : "2001-09-27"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eaea06d3"
                         }
                       },
-                      "expirationTimeType" : "CLOSE",
                       "latestExerciseTime" : {
+                        "hourMinuteTime" : "17:15:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "17:15:00"
-                      },
-                      "meta" : {
-                        "globalKey" : "8fb6f19e"
+                        }
                       },
+                      "expirationTimeType" : "Close",
                       "multipleExercise" : {
                         "integralMultipleAmount" : 1,
                         "minimumNumberOfOptions" : 1,
                         "maximumNumberOfOptions" : 150000
+                      },
+                      "meta" : {
+                        "globalKey" : "8fb6f19e"
                       }
                     }
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 32,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 32,
                       "perUnitOf" : {
-                        "financialUnit" : "SHARE"
+                        "financialUnit" : "Share"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
+                    }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "ccf87201"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -268,148 +149,267 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "b4280fe9"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "b4280fe9"
+              }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "aa44e2a1"
+            "globalKey" : "773d1799"
           }
         },
         "meta" : {
-          "globalKey" : "aa44e2a1"
+          "globalKey" : "773d1799"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "23fc586c"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "87c27b06"
+          "quantity" : [ {
+            "value" : {
+              "value" : 150000,
+              "unit" : {
+                "financialUnit" : "Contract"
+              },
+              "multiplier" : {
+                "value" : 1.00,
+                "unit" : {
+                  "financialUnit" : "Share"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "STM-FP",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : "STM-FP"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "78e02f1b"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "STMicroelectronics N.V. ordinary shares"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "12ca7141"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "CONTRACT"
+                }
               },
-              "value" : 150000,
-              "multiplier" : {
-                "unit" : {
-                  "financialUnit" : "SHARE"
-                },
-                "value" : 1.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "708ce5ba"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "10bcc820"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e89cd"
-      },
-      "value" : "2001-07-13"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "ccce1413"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "f53c9af4"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 405000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "value" : 405000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-07-17",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-07-17"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "805c5fcc"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "88f2b51f"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex12-vanilla-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex12-vanilla-short-form.json
index 888cd40992..78925b0cbc 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex12-vanilla-short-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex12-vanilla-short-form.json
@@ -1,103 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "3e72c29c"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "2092c901"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "6234330c"
-      }
-    },
-    "meta" : {
-      "globalKey" : "804f4b9c"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/tradeId/OTC"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "95918657"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-07-13",
+      "meta" : {
+        "globalKey" : "3e89cd",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "putSpread"
@@ -108,52 +39,43 @@
             "productQualifier" : "EquityOption_PriceReturnBasicPerformance_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "f6441787"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "ce8204b9"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "PHYSICAL"
+                  "meta" : {
+                    "globalKey" : "ce8204b9"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Put",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-07-13",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -162,8 +84,7 @@
                           },
                           "meta" : {
                             "globalKey" : "eae7f1c5"
-                          },
-                          "unadjustedDate" : "2001-07-13"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eae7f1c5"
@@ -171,6 +92,7 @@
                       },
                       "expirationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-09-27",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -179,20 +101,19 @@
                           },
                           "meta" : {
                             "globalKey" : "eaea06d3"
-                          },
-                          "unadjustedDate" : "2001-09-27"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eaea06d3"
                         }
                       },
-                      "expirationTimeType" : "CLOSE",
                       "latestExerciseTime" : {
+                        "hourMinuteTime" : "17:15:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "17:15:00"
+                        }
                       },
+                      "expirationTimeType" : "Close",
                       "meta" : {
                         "globalKey" : "2ce86e9e"
                       }
@@ -201,18 +122,16 @@
                   "strike" : {
                     "strikePrice" : {
                       "value" : 32.00,
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
+                    }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "f6441787"
-                },
-                "optionType" : "PUT",
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -225,152 +144,233 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "2145a09b"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "2145a09b"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "17a230bf"
+            "globalKey" : "bb50c393"
           }
         },
         "meta" : {
-          "globalKey" : "17a230bf"
+          "globalKey" : "bb50c393"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "87c27b06"
-          },
           "observable" : {
-            "meta" : {
-              "globalKey" : "87c27b06"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "STM-FP",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : "STM-FP"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "78e02f1b"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "STMicroelectronics N.V. ordinary shares"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "12ca7141"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "708ce5ba"
+            }
+          },
+          "meta" : {
+            "globalKey" : "708ce5ba"
           }
         }, {
-          "meta" : {
-            "globalKey" : "4ca4805c"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 10000,
               "unit" : {
-                "financialUnit" : "CONTRACT"
+                "financialUnit" : "Contract"
               },
-              "value" : 10000,
               "multiplier" : {
                 "unit" : {
-                  "financialUnit" : "SHARE"
+                  "financialUnit" : "Share"
                 }
               }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "47eb8b24"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e89cd"
-      },
-      "value" : "2001-07-13"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/tradeId/OTC"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "2092c901"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "6234330c"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "621d2bf0"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "556ca600"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 27000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "value" : 27000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-07-17",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-07-17"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "97f55c40"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "faf96c30"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex13-1996-american-call-stock.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex13-1996-american-call-stock.json
index e91b402d57..1d548f380b 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex13-1996-american-call-stock.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex13-1996-american-call-stock.json
@@ -1,105 +1,33 @@
 {
-  "meta" : {
-    "globalKey" : "6659d934"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_1996_EQUITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "c53bd5d7"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "f6b39ca2"
-      }
-    },
-    "meta" : {
-      "globalKey" : "13bc4e40"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/eqd-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "95918657"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-07-13",
+      "meta" : {
+        "globalKey" : "3e89cd"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Option:PriceReturnBasicPerformance:SingleName"
@@ -110,61 +38,43 @@
             "productQualifier" : "EquityOption_PriceReturnBasicPerformance_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "extraordinaryEvents" : {
-              "failureToDeliver" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "CANCELLATION_AND_PAYMENT",
-                "shareForOther" : "CANCELLATION_AND_PAYMENT",
-                "shareForShare" : "ALTERNATIVE_OBLIGATION"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "40504881"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "ce8204b9"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "PHYSICAL"
+                  "meta" : {
+                    "globalKey" : "ce8204b9"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-07-13",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -173,8 +83,7 @@
                           },
                           "meta" : {
                             "globalKey" : "eae7f1c5"
-                          },
-                          "unadjustedDate" : "2001-07-13"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eae7f1c5"
@@ -182,6 +91,7 @@
                       },
                       "expirationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-09-27",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -190,53 +100,50 @@
                           },
                           "meta" : {
                             "globalKey" : "eaea06d3"
-                          },
-                          "unadjustedDate" : "2001-09-27"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eaea06d3"
                         }
                       },
-                      "expirationTimeType" : "CLOSE",
                       "latestExerciseTime" : {
+                        "hourMinuteTime" : "17:15:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "17:15:00"
-                      },
-                      "meta" : {
-                        "globalKey" : "8fb6f19e"
+                        }
                       },
+                      "expirationTimeType" : "Close",
                       "multipleExercise" : {
                         "integralMultipleAmount" : 1,
                         "minimumNumberOfOptions" : 1,
                         "maximumNumberOfOptions" : 150000
+                      },
+                      "meta" : {
+                        "globalKey" : "8fb6f19e"
                       }
                     }
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 32.00,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "value" : 32.00,
                       "perUnitOf" : {
-                        "financialUnit" : "SHARE"
+                        "financialUnit" : "Share"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
+                    }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "40504881"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -249,161 +156,254 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "c2207e71"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "c2207e71"
+              }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "AlternativeObligation",
+                "shareForOther" : "CancellationAndPayment",
+                "shareForCombined" : "CancellationAndPayment"
+              },
+              "failureToDeliver" : true,
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "f8bf05b6"
+            "globalKey" : "1c4350ca"
           }
         },
         "meta" : {
-          "globalKey" : "f8bf05b6"
+          "globalKey" : "1c4350ca"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "40519cbb"
-          },
-          "observable" : {
+          "quantity" : [ {
+            "value" : {
+              "value" : 31000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
-              "globalKey" : "87c27b06"
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          }, {
+            "value" : {
+              "value" : 150000,
+              "unit" : {
+                "financialUnit" : "Contract"
+              },
+              "multiplier" : {
+                "value" : 1.00,
+                "unit" : {
+                  "financialUnit" : "Share"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "STM-FP",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.0/instrumentId"
-                  },
-                  "value" : "STM-FP"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "78e02f1b"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "STMicroelectronics N.V. ordinary shares"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "12ca7141"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 31000
-            }
-          }, {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "CONTRACT"
+                }
               },
-              "value" : 150000,
-              "multiplier" : {
-                "unit" : {
-                  "financialUnit" : "SHARE"
-                },
-                "value" : 1.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "708ce5ba"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "493632af"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e89cd"
-      },
-      "value" : "2001-07-13"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyA.com/eqd-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA1996Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "c53bd5d7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "f6b39ca2"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "9b5608f4"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "f53c9af4"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 405000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "value" : 405000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-07-17",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-07-17"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "805c5fcc"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "8ba593c0"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex14-american-call-stock-passthrough-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex14-american-call-stock-passthrough-long-form.json
index 5e9fc02cd5..91a4f7a986 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex14-american-call-stock-passthrough-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex14-american-call-stock-passthrough-long-form.json
@@ -1,109 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "9993ee99"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "2092c901"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "6234330c"
-      }
-    },
-    "meta" : {
-      "globalKey" : "2e0262e5"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "95918657"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-07-13",
+      "meta" : {
+        "globalKey" : "3e89cd",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Option:PriceReturnBasicPerformance:SingleName"
@@ -111,81 +36,54 @@
             }
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
-              },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              }
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "af369f46"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "4790ef7b"
-                  },
+                  "settlementType" : "Election",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "ELECTION"
+                  "meta" : {
+                    "globalKey" : "4790ef7b"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
+                },
+                "optionType" : "Call",
+                "feature" : {
+                  "passThrough" : {
+                    "passThroughItem" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
+                      },
+                      "passThroughPercentage" : 0.80
+                    } ]
+                  }
                 },
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-07-13",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -194,8 +92,7 @@
                           },
                           "meta" : {
                             "globalKey" : "eae7f1c5"
-                          },
-                          "unadjustedDate" : "2001-07-13"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eae7f1c5"
@@ -203,6 +100,7 @@
                       },
                       "expirationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2005-09-27",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -211,64 +109,50 @@
                           },
                           "meta" : {
                             "globalKey" : "eb6226d3"
-                          },
-                          "unadjustedDate" : "2005-09-27"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eb6226d3"
                         }
                       },
-                      "expirationTimeType" : "CLOSE",
                       "latestExerciseTime" : {
+                        "hourMinuteTime" : "17:15:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "17:15:00"
-                      },
-                      "meta" : {
-                        "globalKey" : "260f119e"
+                        }
                       },
+                      "expirationTimeType" : "Close",
                       "multipleExercise" : {
                         "integralMultipleAmount" : 1,
                         "minimumNumberOfOptions" : 1,
                         "maximumNumberOfOptions" : 150000
+                      },
+                      "meta" : {
+                        "globalKey" : "260f119e"
                       }
                     }
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 32.00,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "value" : 32.00,
                       "perUnitOf" : {
-                        "financialUnit" : "SHARE"
+                        "financialUnit" : "Share"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
+                    }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
                     }
                   }
                 },
-                "feature" : {
-                  "passThrough" : {
-                    "passThroughItem" : [ {
-                      "passThroughPercentage" : 0.80,
-                      "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
-                      }
-                    } ]
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "af369f46"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -281,149 +165,265 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "835ff788"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "835ff788"
+              }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "75df8534"
+            "globalKey" : "6042f106"
           }
         },
         "meta" : {
-          "globalKey" : "75df8534"
+          "globalKey" : "6042f106"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "23fc586c"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "87c27b06"
+          "quantity" : [ {
+            "value" : {
+              "value" : 150000,
+              "unit" : {
+                "financialUnit" : "Contract"
+              },
+              "multiplier" : {
+                "value" : 1.00,
+                "unit" : {
+                  "financialUnit" : "Share"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "STM-FP",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : "STM-FP"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "78e02f1b"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "STMicroelectronics N.V. ordinary shares"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "12ca7141"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "CONTRACT"
+                }
               },
-              "value" : 150000,
-              "multiplier" : {
-                "unit" : {
-                  "financialUnit" : "SHARE"
-                },
-                "value" : 1.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "708ce5ba"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "10bcc820"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e89cd"
-      },
-      "value" : "2001-07-13"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "2092c901"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "6234330c"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "fe12c64b"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "f53c9af4"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 405000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "value" : 405000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-07-17",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-07-17"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "805c5fcc"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "e6744957"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex15-basket-passthrough-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex15-basket-passthrough-long-form.json
index fca385bad5..d418d28638 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex15-basket-passthrough-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex15-basket-passthrough-long-form.json
@@ -1,111 +1,33 @@
 {
-  "meta" : {
-    "globalKey" : "bcbbca2"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "92c7c587"
-      }
-    },
-    "meta" : {
-      "globalKey" : "e6c5be61"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "95918657"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-06-28",
+      "meta" : {
+        "globalKey" : "3e819c"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Option:PriceReturnBasicPerformance:Basket"
@@ -113,81 +35,60 @@
             }
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "CANCELLATION_AND_PAYMENT",
-                "shareForOther" : "CANCELLATION_AND_PAYMENT",
-                "shareForShare" : "ALTERNATIVE_OBLIGATION"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
-              },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              }
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "548423e2"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "76108015"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "76108015"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
+                },
+                "optionType" : "Call",
+                "feature" : {
+                  "passThrough" : {
+                    "passThroughItem" : [ {
+                      "payerReceiver" : {
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
+                      },
+                      "passThroughPercentage" : 0.80
+                    }, {
+                      "payerReceiver" : {
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
+                      },
+                      "passThroughPercentage" : 1.20
+                    } ]
+                  }
                 },
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2002-07-01",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -196,47 +97,27 @@
                           },
                           "meta" : {
                             "globalKey" : "eb05ccb9"
-                          },
-                          "unadjustedDate" : "2002-07-01"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eb05ccb9"
                         }
                       } ],
-                      "expirationTimeType" : "CLOSE",
+                      "expirationTimeType" : "Close",
                       "meta" : {
                         "globalKey" : "896fcde1"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
+                    }
                   }
                 },
-                "feature" : {
-                  "passThrough" : {
-                    "passThroughItem" : [ {
-                      "passThroughPercentage" : 0.80,
-                      "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
-                      }
-                    }, {
-                      "passThroughPercentage" : 1.20,
-                      "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
-                      }
-                    } ]
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "548423e2"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "basket" : {
                     "basketConstituent" : [ {
-                      "meta" : {
-                        "globalKey" : "7a5b92c5"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "address" : {
@@ -249,12 +130,12 @@
                             "value" : "productIdentifier-2"
                           }
                         } ],
-                        "securityType" : "EQUITY"
-                      }
-                    }, {
+                        "securityType" : "Equity"
+                      },
                       "meta" : {
                         "globalKey" : "7a5b92c5"
-                      },
+                      }
+                    }, {
                       "security" : {
                         "productIdentifier" : [ {
                           "address" : {
@@ -267,229 +148,348 @@
                             "value" : "productIdentifier-4"
                           }
                         } ],
-                        "securityType" : "EQUITY"
+                        "securityType" : "Equity"
+                      },
+                      "meta" : {
+                        "globalKey" : "7a5b92c5"
                       }
                     } ]
                   },
                   "meta" : {
                     "globalKey" : "cc1d884a"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "a64deb00"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "a64deb00"
+              }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "AlternativeObligation",
+                "shareForOther" : "CancellationAndPayment",
+                "shareForCombined" : "CancellationAndPayment"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "f87a7114"
+            "globalKey" : "4dfe1a34"
           }
         },
         "meta" : {
-          "globalKey" : "f87a7114"
+          "globalKey" : "4dfe1a34"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "394e4c49"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-3"
-              } ]
-            },
             "value" : {
+              "value" : 79.099093,
               "unit" : {
-                "financialUnit" : "CONTRACT"
+                "financialUnit" : "Contract"
               },
-              "value" : 79.099093,
               "multiplier" : {
                 "value" : 1.00
               }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-3"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "f07b3cd7"
+          }
         } ]
       }, {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "cb98f2a7"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "ac9d2679"
+          "quantity" : [ {
+            "value" : {
+              "value" : 0.40,
+              "unit" : {
+                "financialUnit" : "Weight"
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "AHLD.NA",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : "AHLD.NA"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "d41b1d12"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "Ahold"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "8c96e84b"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "e707a8a7"
+            }
           },
+          "meta" : {
+            "globalKey" : "ac593b15"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 0.60,
+              "unit" : {
+                "financialUnit" : "Weight"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "WEIGHT"
-              },
-              "value" : 0.40
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "fc83068b"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "2798a45b"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-3"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "RD.NA",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : "RD.NA"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "eb1db1df"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-4"
+                  "value" : "productIdentifier-3"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "Royal Dutch"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "224702da"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-4"
+                } ]
               }
-            } ]
-          },
-          "quantity" : [ {
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "WEIGHT"
-              },
-              "value" : 0.60
+              "globalKey" : "cb7be705"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "32213575"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e819c"
-      },
-      "value" : "2000-06-28"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "3173470f"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "a2a7481"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 213.5675511,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "value" : 213.5675511
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2000-07-03",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2000-07-03"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "e9d54d03"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "12a08e52"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex16-equityOptionTransactionSupplement.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex16-equityOptionTransactionSupplement.json
index 08e8281526..083939b888 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex16-equityOptionTransactionSupplement.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex16-equityOptionTransactionSupplement.json
@@ -1,162 +1,162 @@
 {
-  "meta" : {
-    "globalKey" : "ffff9483"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/tradeId/OTC"
+          }
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "95918657"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2005-07-13",
+      "meta" : {
+        "globalKey" : "3ea9cd",
+        "externalKey" : "TradeDate"
+      }
+    },
+    "tradableProduct" : {
+      "product" : {
+        "contractualProduct" : {
+          "economicTerms" : {
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+          "meta" : {
+            "globalKey" : "4c4be8ea"
           }
         },
         "meta" : {
-          "globalKey" : "2092c901"
+          "globalKey" : "4c4be8ea"
         }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
       },
-      "meta" : {
-        "globalKey" : "6234330c"
-      }
-    },
-    "meta" : {
-      "globalKey" : "6edc6f4f"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      } ]
     },
     "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
+          }
         },
         "meta" : {
           "globalKey" : "33f59567"
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
+          }
         },
         "meta" : {
           "globalKey" : "33f59568"
         }
-      } ]
-    } ],
-    "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
       } ],
-      "product" : {
-        "contractualProduct" : {
-          "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
             }
           },
-          "meta" : {
-            "globalKey" : "4c4be8ea"
-          }
+          "vintage" : 2002
         },
         "meta" : {
-          "globalKey" : "4c4be8ea"
+          "globalKey" : "328cfa59"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3ea9cd"
-      },
-      "value" : "2005-07-13"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.PartyA.com/tradeId/OTC"
-          },
-          "value" : "1234"
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "2092c901"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "6234330c"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "4fdb43a3"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "b82cbaf4"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 405000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "value" : 405000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2005-07-17",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2005-07-17"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "434c7fcc"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "fd7940af"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex17-equityOptionTransactionSupplement-non-deliverable-share.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex17-equityOptionTransactionSupplement-non-deliverable-share.json
index 3dbddef888..c6aac4136b 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex17-equityOptionTransactionSupplement-non-deliverable-share.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex17-equityOptionTransactionSupplement-non-deliverable-share.json
@@ -1,138 +1,138 @@
 {
-  "meta" : {
-    "globalKey" : "4e16aaae"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2006-01-20",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_2005_EQUITY_ASIA_EXCLUDING_JAPAN_INTERDEALER"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1",
+          "meta" : {
+            "scheme" : "http://www.example.com/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "1525d633"
         }
       } ],
       "meta" : {
-        "globalKey" : "1525d633"
+        "globalKey" : "957a7e46"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1",
+          "meta" : {
+            "scheme" : "http://www.example.com/trade-id-1-0"
+          }
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "957af2a5"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2006-09-18",
+      "meta" : {
+        "globalKey" : "3eb252"
       }
-    },
-    "meta" : {
-      "globalKey" : "b7a76555"
     },
     "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
+          }
         },
         "meta" : {
           "globalKey" : "33f59567"
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
+          }
         },
         "meta" : {
           "globalKey" : "33f59568"
         }
-      } ]
-    } ],
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb252"
-      },
-      "value" : "2006-09-18"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.example.com/trade-id-1-0"
-          },
-          "value" : "1"
-        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c4abf9fc"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    }, {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.example.com/trade-id-1-0"
-          },
-          "value" : "1"
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2006-01-20",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2005EquityAsiaExcludingJapanInterdealer"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "1525d633"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c4abf9fd"
+        "globalKey" : "1525d633"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "4b2ca9f3"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "100c1099"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        }
-      },
       "quantity" : {
+        "value" : 1500000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         },
-        "value" : 1500000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2006-09-20",
         "dateAdjustments" : {
-          "businessDayConvention" : "NOT_APPLICABLE",
+          "businessDayConvention" : "NotApplicable",
           "meta" : {
             "globalKey" : "3a4b88ab"
           }
-        },
-        "unadjustedDate" : "2006-09-20"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "f70396f3"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "272ca26"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex18-equityOptionTransactionSupplement-non-deliverable-index.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex18-equityOptionTransactionSupplement-non-deliverable-index.json
index a12db994b3..0ede8dfe34 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex18-equityOptionTransactionSupplement-non-deliverable-index.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex18-equityOptionTransactionSupplement-non-deliverable-index.json
@@ -1,138 +1,138 @@
 {
-  "meta" : {
-    "globalKey" : "4ca9403c"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2006-01-20",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_2005_EQUITY_ASIA_EXCLUDING_JAPAN_INTERDEALER"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "2",
+          "meta" : {
+            "scheme" : "http://www.example.com/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "1525d633"
         }
       } ],
       "meta" : {
-        "globalKey" : "1525d633"
+        "globalKey" : "957a7e47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "2",
+          "meta" : {
+            "scheme" : "http://www.example.com/trade-id-1-0"
+          }
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "957af2a6"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2006-02-09",
+      "meta" : {
+        "globalKey" : "3eb089"
       }
-    },
-    "meta" : {
-      "globalKey" : "1f8895f5"
     },
     "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
+          }
         },
         "meta" : {
           "globalKey" : "33f59567"
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
+          }
         },
         "meta" : {
           "globalKey" : "33f59568"
         }
-      } ]
-    } ],
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb089"
-      },
-      "value" : "2006-02-09"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.example.com/trade-id-1-0"
-          },
-          "value" : "2"
-        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c4abfdbd"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    }, {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.example.com/trade-id-1-0"
-          },
-          "value" : "2"
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2006-01-20",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2005EquityAsiaExcludingJapanInterdealer"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "1525d633"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c4abfdbe"
+        "globalKey" : "1525d633"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "225c4293"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "2c5d87"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        }
-      },
       "quantity" : {
+        "value" : 750000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         },
-        "value" : 750000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2006-09-20",
         "dateAdjustments" : {
-          "businessDayConvention" : "NOT_APPLICABLE",
+          "businessDayConvention" : "NotApplicable",
           "meta" : {
             "globalKey" : "3a4b88ab"
           }
-        },
-        "unadjustedDate" : "2006-09-20"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "61542ec5"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "2aba1298"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex19-dividend-adjustment.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex19-dividend-adjustment.json
index 8a2f7c3f17..84b063d94e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex19-dividend-adjustment.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex19-dividend-adjustment.json
@@ -1,105 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "668553af"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "2092c901"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "6234330c"
-      }
-    },
-    "meta" : {
-      "globalKey" : "23713078"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "jb2890",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "jb2890"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "PartyB",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "e0602f0d"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-08-14",
+      "meta" : {
+        "globalKey" : "3eb20e",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "jb2890",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "jb2890",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "PartyB",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "jb2890",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -107,81 +32,43 @@
             "productQualifier" : "EquityOption_PriceReturnBasicPerformance_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
-              },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              }
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "4317b691"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "4790ef7b"
-                  },
+                  "settlementType" : "Election",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "ELECTION"
+                  "meta" : {
+                    "globalKey" : "4790ef7b"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-08-14",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -190,8 +77,7 @@
                           },
                           "meta" : {
                             "globalKey" : "eb7f0dc6"
-                          },
-                          "unadjustedDate" : "2006-08-14"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eb7f0dc6"
@@ -199,6 +85,7 @@
                       },
                       "expirationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2008-08-14",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -207,53 +94,50 @@
                           },
                           "meta" : {
                             "globalKey" : "ebbb1dc6"
-                          },
-                          "unadjustedDate" : "2008-08-14"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "ebbb1dc6"
                         }
                       },
-                      "expirationTimeType" : "CLOSE",
                       "latestExerciseTime" : {
+                        "hourMinuteTime" : "17:15:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "17:15:00"
-                      },
-                      "meta" : {
-                        "globalKey" : "debb9330"
+                        }
                       },
+                      "expirationTimeType" : "Close",
                       "multipleExercise" : {
                         "integralMultipleAmount" : 1,
                         "minimumNumberOfOptions" : 1,
                         "maximumNumberOfOptions" : 150000
+                      },
+                      "meta" : {
+                        "globalKey" : "debb9330"
                       }
                     }
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 32.00,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "value" : 32.00,
                       "perUnitOf" : {
-                        "financialUnit" : "SHARE"
+                        "financialUnit" : "Share"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
+                    }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "4317b691"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -266,149 +150,265 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "1848de1d"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "1848de1d"
+              }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "20642731"
+            "globalKey" : "d34fcccd"
           }
         },
         "meta" : {
-          "globalKey" : "20642731"
+          "globalKey" : "d34fcccd"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "23fc586c"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "87c27b06"
+          "quantity" : [ {
+            "value" : {
+              "value" : 150000,
+              "unit" : {
+                "financialUnit" : "Contract"
+              },
+              "multiplier" : {
+                "value" : 1.00,
+                "unit" : {
+                  "financialUnit" : "Share"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "STM-FP",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : "STM-FP"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "78e02f1b"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "STMicroelectronics N.V. ordinary shares"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "12ca7141"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "CONTRACT"
+                }
               },
-              "value" : 150000,
-              "multiplier" : {
-                "unit" : {
-                  "financialUnit" : "SHARE"
-                },
-                "value" : 1.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "708ce5ba"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "10bcc820"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "PartyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "jb2890"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "jb2890"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "jb2890"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3eb20e"
-      },
-      "value" : "2006-08-14"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "jb2890"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "PartyB"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "2092c901"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "jb2890",
-        "globalReference" : "33f59567"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "10d444d7"
+        "globalKey" : "6234330c"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "4141f9b4"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "83225137"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "PartyB",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "jb2890",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 405000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "PartyB"
         },
-        "value" : 405000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "jb2890"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2006-08-14",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2006-08-14"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "2714f143"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "4ef765f7"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex20-nested-basket.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex20-nested-basket.json
index ce495ae0f7..1da9cb6f32 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex20-nested-basket.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex20-nested-basket.json
@@ -1,105 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "f66be981"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "2092c901"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "6234330c"
-      }
-    },
-    "meta" : {
-      "globalKey" : "2a42c7cd"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/coding-scheme/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "95918657"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-07-13",
+      "meta" : {
+        "globalKey" : "3e89cd",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -107,81 +32,43 @@
             "productQualifier" : "EquityOption_PriceReturnBasicPerformance_Basket"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
-              },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              }
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "d11bff8d"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "4790ef7b"
-                  },
+                  "settlementType" : "Election",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "ELECTION"
+                  "meta" : {
+                    "globalKey" : "4790ef7b"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-07-13",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -190,8 +77,7 @@
                           },
                           "meta" : {
                             "globalKey" : "eae7f1c5"
-                          },
-                          "unadjustedDate" : "2001-07-13"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eae7f1c5"
@@ -199,6 +85,7 @@
                       },
                       "expirationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2005-09-27",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -207,49 +94,49 @@
                           },
                           "meta" : {
                             "globalKey" : "eb6226d3"
-                          },
-                          "unadjustedDate" : "2005-09-27"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eb6226d3"
                         }
                       },
-                      "expirationTimeType" : "CLOSE",
                       "latestExerciseTime" : {
+                        "hourMinuteTime" : "17:15:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "17:15:00"
-                      },
-                      "meta" : {
-                        "globalKey" : "260f119e"
+                        }
                       },
+                      "expirationTimeType" : "Close",
                       "multipleExercise" : {
                         "integralMultipleAmount" : 1,
                         "minimumNumberOfOptions" : 1,
                         "maximumNumberOfOptions" : 150000
+                      },
+                      "meta" : {
+                        "globalKey" : "260f119e"
                       }
                     }
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 32.00,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "value" : 32.00,
                       "perUnitOf" : {
-                        "financialUnit" : "SHARE"
+                        "financialUnit" : "Share"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
+                    }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "d11bff8d"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "basket" : {
                     "basketConstituent" : [ {
@@ -272,66 +159,66 @@
                     }, {
                       "basket" : {
                         "basketConstituent" : [ {
-                          "meta" : {
-                            "globalKey" : "22e11a3b"
-                          },
                           "security" : {
                             "productIdentifier" : [ {
                               "value" : {
                                 "identifier" : {
+                                  "value" : "005440.KS",
                                   "meta" : {
                                     "scheme" : "http://www.kse.or.kr/coding-scheme/instrument-id"
-                                  },
-                                  "value" : "005440.KS"
+                                  }
                                 },
+                                "source" : "Other",
                                 "meta" : {
                                   "globalKey" : "7ce157cb"
-                                },
-                                "source" : "OTHER"
+                                }
                               }
                             }, {
                               "value" : {
                                 "identifier" : {
                                   "value" : "HYUNDAI MOTOR COMPANY"
                                 },
+                                "source" : "Name",
                                 "meta" : {
                                   "globalKey" : "9006377f"
-                                },
-                                "source" : "NAME"
+                                }
                               }
                             } ],
-                            "securityType" : "EQUITY"
+                            "securityType" : "Equity"
+                          },
+                          "meta" : {
+                            "globalKey" : "22e11a3b"
                           }
                         }, {
-                          "meta" : {
-                            "globalKey" : "7b5cd0cc"
-                          },
                           "security" : {
                             "productIdentifier" : [ {
                               "value" : {
                                 "identifier" : {
+                                  "value" : "000270.KS",
                                   "meta" : {
                                     "scheme" : "http://www.kse.or.kr/coding-scheme/instrument-id"
-                                  },
-                                  "value" : "000270.KS"
+                                  }
                                 },
+                                "source" : "Other",
                                 "meta" : {
                                   "globalKey" : "7122c4cb"
-                                },
-                                "source" : "OTHER"
+                                }
                               }
                             }, {
                               "value" : {
                                 "identifier" : {
                                   "value" : "KIA MOTORS CORPORATION"
                                 },
+                                "source" : "Name",
                                 "meta" : {
                                   "globalKey" : "a71dfdce"
-                                },
-                                "source" : "NAME"
+                                }
                               }
                             } ],
-                            "securityType" : "EQUITY"
+                            "securityType" : "Equity"
+                          },
+                          "meta" : {
+                            "globalKey" : "7b5cd0cc"
                           }
                         } ]
                       },
@@ -343,182 +230,295 @@
                   "meta" : {
                     "globalKey" : "9b996a87"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "3a110f9d"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "3a110f9d"
+              }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "fe50d2ed"
+            "globalKey" : "f7d51e4d"
           }
         },
         "meta" : {
-          "globalKey" : "fe50d2ed"
+          "globalKey" : "f7d51e4d"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "704932e7"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-3"
-              } ]
-            },
             "value" : {
+              "value" : 150000,
               "unit" : {
-                "financialUnit" : "CONTRACT"
+                "financialUnit" : "Contract"
               },
-              "value" : 150000,
               "multiplier" : {
                 "value" : 1.00
               }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-3"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "98dd29f9"
+          }
         } ]
       }, {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "c57a184b"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "e6ea2e9c"
+          "quantity" : [ {
+            "value" : {
+              "value" : 0.50,
+              "unit" : {
+                "financialUnit" : "Weight"
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "FXI",
                   "meta" : {
                     "scheme" : "http://www.ftse.com/coding-scheme/instrument-id"
-                  },
-                  "value" : "FXI"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "e67b9ca7"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "FTSE/Xinhua China 25 Index"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "a78afae3"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
-            } ]
-          },
-          "quantity" : [ {
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "WEIGHT"
-              },
-              "value" : 0.50
+              "globalKey" : "f65ba4e4"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "9b1e4eaf"
           },
+          "meta" : {
+            "globalKey" : "c571553"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 0.50,
+              "unit" : {
+                "financialUnit" : "Weight"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "WEIGHT"
-              },
-              "value" : 0.50
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "c8ab8731"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e89cd"
-      },
-      "value" : "2001-07-13"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyA.com/coding-scheme/trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "2092c901"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "6234330c"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "84e1569"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "f53c9af4"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 405000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "value" : 405000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-07-17",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-07-17"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "805c5fcc"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "a6114cf5"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex21-flat-weight-basket.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex21-flat-weight-basket.json
index 530351e161..af34627d37 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex21-flat-weight-basket.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex21-flat-weight-basket.json
@@ -1,105 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "ba2e3b52"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "2092c901"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "6234330c"
-      }
-    },
-    "meta" : {
-      "globalKey" : "70419bde"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/coding-scheme/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "95918657"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-07-13",
+      "meta" : {
+        "globalKey" : "3e89cd",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -107,81 +32,43 @@
             "productQualifier" : "EquityOption_PriceReturnBasicPerformance_Basket"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
-              },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              }
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "914da5d0"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "4790ef7b"
-                  },
+                  "settlementType" : "Election",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "ELECTION"
+                  "meta" : {
+                    "globalKey" : "4790ef7b"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-07-13",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -190,8 +77,7 @@
                           },
                           "meta" : {
                             "globalKey" : "eae7f1c5"
-                          },
-                          "unadjustedDate" : "2001-07-13"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eae7f1c5"
@@ -199,6 +85,7 @@
                       },
                       "expirationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2005-09-27",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -207,49 +94,49 @@
                           },
                           "meta" : {
                             "globalKey" : "eb6226d3"
-                          },
-                          "unadjustedDate" : "2005-09-27"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eb6226d3"
                         }
                       },
-                      "expirationTimeType" : "CLOSE",
                       "latestExerciseTime" : {
+                        "hourMinuteTime" : "17:15:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "17:15:00"
-                      },
-                      "meta" : {
-                        "globalKey" : "260f119e"
+                        }
                       },
+                      "expirationTimeType" : "Close",
                       "multipleExercise" : {
                         "integralMultipleAmount" : 1,
                         "minimumNumberOfOptions" : 1,
                         "maximumNumberOfOptions" : 150000
+                      },
+                      "meta" : {
+                        "globalKey" : "260f119e"
                       }
                     }
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 32.00,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "value" : 32.00,
                       "perUnitOf" : {
-                        "financialUnit" : "SHARE"
+                        "financialUnit" : "Share"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
+                    }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "914da5d0"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "basket" : {
                     "basketConstituent" : [ {
@@ -270,9 +157,6 @@
                         "globalKey" : "0"
                       }
                     }, {
-                      "meta" : {
-                        "globalKey" : "7a5b92c5"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "address" : {
@@ -285,12 +169,12 @@
                             "value" : "productIdentifier-6"
                           }
                         } ],
-                        "securityType" : "EQUITY"
-                      }
-                    }, {
+                        "securityType" : "Equity"
+                      },
                       "meta" : {
                         "globalKey" : "7a5b92c5"
-                      },
+                      }
+                    }, {
                       "security" : {
                         "productIdentifier" : [ {
                           "address" : {
@@ -303,289 +187,405 @@
                             "value" : "productIdentifier-4"
                           }
                         } ],
-                        "securityType" : "EQUITY"
+                        "securityType" : "Equity"
+                      },
+                      "meta" : {
+                        "globalKey" : "7a5b92c5"
                       }
                     } ]
                   },
                   "meta" : {
                     "globalKey" : "cc1d884a"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "c8ee21e0"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "c8ee21e0"
+              }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "d6df4130"
+            "globalKey" : "2fd712d0"
           }
         },
         "meta" : {
-          "globalKey" : "d6df4130"
+          "globalKey" : "2fd712d0"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "704932e7"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-3"
-              } ]
-            },
             "value" : {
+              "value" : 150000,
               "unit" : {
-                "financialUnit" : "CONTRACT"
+                "financialUnit" : "Contract"
               },
-              "value" : 150000,
               "multiplier" : {
                 "value" : 1.00
               }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-3"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "98dd29f9"
+          }
         } ]
       }, {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "c57a184b"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "e6ea2e9c"
+          "quantity" : [ {
+            "value" : {
+              "value" : 0.50,
+              "unit" : {
+                "financialUnit" : "Weight"
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "FXI",
                   "meta" : {
                     "scheme" : "http://www.ftse.com/coding-scheme/instrument-id"
-                  },
-                  "value" : "FXI"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "e67b9ca7"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "FTSE/Xinhua China 25 Index"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "a78afae3"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "f65ba4e4"
+            }
           },
+          "meta" : {
+            "globalKey" : "c571553"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 0.25,
+              "unit" : {
+                "financialUnit" : "Weight"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "WEIGHT"
-              },
-              "value" : 0.50
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "6af5568d"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "c7cb0694"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-3"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "005440.KS",
                   "meta" : {
                     "scheme" : "http://www.kse.or.kr/coding-scheme/instrument-id"
-                  },
-                  "value" : "005440.KS"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "7ce157cb"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-6"
+                  "value" : "productIdentifier-3"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "HYUNDAI MOTOR COMPANY"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "9006377f"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-6"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "3195cbec"
+            }
           },
+          "meta" : {
+            "globalKey" : "2cdc3325"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 0.25,
+              "unit" : {
+                "financialUnit" : "Weight"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-4"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "WEIGHT"
-              },
-              "value" : 0.25
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2635589c"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "6b7d7fe3"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-5"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "000270.KS",
                   "meta" : {
                     "scheme" : "http://www.kse.or.kr/coding-scheme/instrument-id"
-                  },
-                  "value" : "000270.KS"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "7122c4cb"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-4"
+                  "value" : "productIdentifier-5"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "KIA MOTORS CORPORATION"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "a71dfdce"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-4"
+                } ]
               }
-            } ]
-          },
-          "quantity" : [ {
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-4"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "WEIGHT"
-              },
-              "value" : 0.25
+              "globalKey" : "4327c7d"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "ff78e3b6"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e89cd"
-      },
-      "value" : "2001-07-13"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyA.com/coding-scheme/trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "2092c901"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "6234330c"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "24ad8050"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "f53c9af4"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 405000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "value" : 405000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-07-17",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-07-17"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "805c5fcc"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "29e86c1c"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex22-equityOptionTransactionSupplement-index-option-asian-dates.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex22-equityOptionTransactionSupplement-index-option-asian-dates.json
index 1c931487de..cccd43a4ac 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex22-equityOptionTransactionSupplement-index-option-asian-dates.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex22-equityOptionTransactionSupplement-index-option-asian-dates.json
@@ -1,139 +1,139 @@
 {
-  "meta" : {
-    "globalKey" : "1f00ff78"
-  },
   "trade" : {
-    "collateral" : {
-      "independentAmount" : {
-        "payerPartyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "5d661eaa"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "5d661eab"
-        },
-        "paymentDetail" : [ {
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "5d661eab",
+        "externalReference" : "Party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "TW9236",
           "meta" : {
-            "globalKey" : "9e2bea61"
-          },
-          "paymentRule" : {
-            "percentageRule" : {
-              "notionalAmountReference" : {
-                "externalReference" : "Valuation"
-              },
-              "paymentPercent" : 0.02
-            }
-          }
-        } ]
-      }
-    },
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2002-06-20",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_2004_EQUITY_AMERICAS_INTERDEALER"
-            }
+            "scheme" : "TradeRefNbr"
           }
-        },
-        "meta" : {
-          "globalKey" : "cebfff6e"
         }
       } ],
       "meta" : {
-        "globalKey" : "cebfff6e"
+        "globalKey" : "a1285a34"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2002-10-31",
+      "meta" : {
+        "globalKey" : "3e929f"
       }
-    },
-    "meta" : {
-      "globalKey" : "a2b48aef"
     },
     "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "5d661eab"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "DTCC00006441",
           "meta" : {
             "scheme" : "DTCC"
-          },
-          "value" : "DTCC00006441"
+          }
         },
         "meta" : {
           "globalKey" : "5d661eab"
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "5d661eaa"
-      },
+        "globalKey" : "5d661eab",
+        "externalKey" : "Party1"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "DTCC00006440",
           "meta" : {
             "scheme" : "DTCC"
-          },
-          "value" : "DTCC00006440"
+          }
         },
         "meta" : {
           "globalKey" : "5d661eaa"
         }
-      } ]
-    } ],
-    "tradeDate" : {
+      } ],
       "meta" : {
-        "globalKey" : "3e929f"
-      },
-      "value" : "2002-10-31"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "TradeRefNbr"
-          },
-          "value" : "TW9236"
+        "globalKey" : "5d661eaa",
+        "externalKey" : "Party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2002-06-20",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2004EquityAmericasInterdealer"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "cebfff6e"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "5d661eab"
-      },
       "meta" : {
-        "globalKey" : "24dd6aa"
+        "globalKey" : "cebfff6e"
       }
-    } ]
+    },
+    "collateral" : {
+      "independentAmount" : {
+        "payerPartyReference" : {
+          "globalReference" : "5d661eaa",
+          "externalReference" : "Party2"
+        },
+        "receiverPartyReference" : {
+          "globalReference" : "5d661eab",
+          "externalReference" : "Party1"
+        },
+        "paymentDetail" : [ {
+          "paymentRule" : {
+            "percentageRule" : {
+              "paymentPercent" : 0.02,
+              "notionalAmountReference" : {
+                "externalReference" : "Valuation"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "9e2bea61"
+          }
+        } ]
+      }
+    },
+    "meta" : {
+      "globalKey" : "4b7193b9"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "50760e07"
-    },
     "transfer" : {
       "payerReceiver" : {
         "payerPartyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "5d661eab"
+          "globalReference" : "5d661eab",
+          "externalReference" : "Party1"
         },
         "receiverPartyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "5d661eaa"
+          "globalReference" : "5d661eaa",
+          "externalReference" : "Party2"
         }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2002-11-01",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2002-11-01"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "50760e07"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "78b20eee"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex23-equityOptionTransactionSupplement-index-option-cliquet.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex23-equityOptionTransactionSupplement-index-option-cliquet.json
index 1c931487de..cccd43a4ac 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex23-equityOptionTransactionSupplement-index-option-cliquet.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex23-equityOptionTransactionSupplement-index-option-cliquet.json
@@ -1,139 +1,139 @@
 {
-  "meta" : {
-    "globalKey" : "1f00ff78"
-  },
   "trade" : {
-    "collateral" : {
-      "independentAmount" : {
-        "payerPartyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "5d661eaa"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "5d661eab"
-        },
-        "paymentDetail" : [ {
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "5d661eab",
+        "externalReference" : "Party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "TW9236",
           "meta" : {
-            "globalKey" : "9e2bea61"
-          },
-          "paymentRule" : {
-            "percentageRule" : {
-              "notionalAmountReference" : {
-                "externalReference" : "Valuation"
-              },
-              "paymentPercent" : 0.02
-            }
-          }
-        } ]
-      }
-    },
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2002-06-20",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_2004_EQUITY_AMERICAS_INTERDEALER"
-            }
+            "scheme" : "TradeRefNbr"
           }
-        },
-        "meta" : {
-          "globalKey" : "cebfff6e"
         }
       } ],
       "meta" : {
-        "globalKey" : "cebfff6e"
+        "globalKey" : "a1285a34"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2002-10-31",
+      "meta" : {
+        "globalKey" : "3e929f"
       }
-    },
-    "meta" : {
-      "globalKey" : "a2b48aef"
     },
     "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "5d661eab"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "DTCC00006441",
           "meta" : {
             "scheme" : "DTCC"
-          },
-          "value" : "DTCC00006441"
+          }
         },
         "meta" : {
           "globalKey" : "5d661eab"
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "5d661eaa"
-      },
+        "globalKey" : "5d661eab",
+        "externalKey" : "Party1"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "DTCC00006440",
           "meta" : {
             "scheme" : "DTCC"
-          },
-          "value" : "DTCC00006440"
+          }
         },
         "meta" : {
           "globalKey" : "5d661eaa"
         }
-      } ]
-    } ],
-    "tradeDate" : {
+      } ],
       "meta" : {
-        "globalKey" : "3e929f"
-      },
-      "value" : "2002-10-31"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "TradeRefNbr"
-          },
-          "value" : "TW9236"
+        "globalKey" : "5d661eaa",
+        "externalKey" : "Party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2002-06-20",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2004EquityAmericasInterdealer"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "cebfff6e"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "5d661eab"
-      },
       "meta" : {
-        "globalKey" : "24dd6aa"
+        "globalKey" : "cebfff6e"
       }
-    } ]
+    },
+    "collateral" : {
+      "independentAmount" : {
+        "payerPartyReference" : {
+          "globalReference" : "5d661eaa",
+          "externalReference" : "Party2"
+        },
+        "receiverPartyReference" : {
+          "globalReference" : "5d661eab",
+          "externalReference" : "Party1"
+        },
+        "paymentDetail" : [ {
+          "paymentRule" : {
+            "percentageRule" : {
+              "paymentPercent" : 0.02,
+              "notionalAmountReference" : {
+                "externalReference" : "Valuation"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "9e2bea61"
+          }
+        } ]
+      }
+    },
+    "meta" : {
+      "globalKey" : "4b7193b9"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "50760e07"
-    },
     "transfer" : {
       "payerReceiver" : {
         "payerPartyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "5d661eab"
+          "globalReference" : "5d661eab",
+          "externalReference" : "Party1"
         },
         "receiverPartyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "5d661eaa"
+          "globalReference" : "5d661eaa",
+          "externalReference" : "Party2"
         }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2002-11-01",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2002-11-01"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "50760e07"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "78b20eee"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex24-equityOptionTransactionSupplement-index-option-asian-schedule.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex24-equityOptionTransactionSupplement-index-option-asian-schedule.json
index beecfe2569..84e633c489 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex24-equityOptionTransactionSupplement-index-option-asian-schedule.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex24-equityOptionTransactionSupplement-index-option-asian-schedule.json
@@ -1,150 +1,150 @@
 {
-  "meta" : {
-    "globalKey" : "26e3f413"
-  },
   "trade" : {
-    "collateral" : {
-      "independentAmount" : {
-        "payerPartyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "5d661eaa"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "5d661eab"
-        },
-        "paymentDetail" : [ {
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "5d661eab",
+        "externalReference" : "Party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "TW9236",
           "meta" : {
-            "globalKey" : "9e2bea61"
-          },
-          "paymentRule" : {
-            "percentageRule" : {
-              "notionalAmountReference" : {
-                "externalReference" : "Valuation"
-              },
-              "paymentPercent" : 0.02
-            }
-          }
-        } ]
-      }
-    },
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2002-06-20",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_2004_EQUITY_AMERICAS_INTERDEALER"
-            }
+            "scheme" : "TradeRefNbr"
           }
-        },
-        "meta" : {
-          "globalKey" : "cebfff6e"
         }
       } ],
       "meta" : {
-        "globalKey" : "cebfff6e"
+        "globalKey" : "a1285a34"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2002-10-31",
+      "meta" : {
+        "globalKey" : "3e929f"
       }
-    },
-    "meta" : {
-      "globalKey" : "a2b48aef"
     },
     "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "5d661eab"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "DTCC00006441",
           "meta" : {
             "scheme" : "DTCC"
-          },
-          "value" : "DTCC00006441"
+          }
         },
         "meta" : {
           "globalKey" : "5d661eab"
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "5d661eaa"
-      },
+        "globalKey" : "5d661eab",
+        "externalKey" : "Party1"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "DTCC00006440",
           "meta" : {
             "scheme" : "DTCC"
-          },
-          "value" : "DTCC00006440"
+          }
         },
         "meta" : {
           "globalKey" : "5d661eaa"
         }
-      } ]
-    } ],
-    "tradeDate" : {
+      } ],
       "meta" : {
-        "globalKey" : "3e929f"
-      },
-      "value" : "2002-10-31"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "TradeRefNbr"
-          },
-          "value" : "TW9236"
+        "globalKey" : "5d661eaa",
+        "externalKey" : "Party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2002-06-20",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2004EquityAmericasInterdealer"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "cebfff6e"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "5d661eab"
-      },
       "meta" : {
-        "globalKey" : "24dd6aa"
+        "globalKey" : "cebfff6e"
       }
-    } ]
-  },
-  "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "6e6ca6e4"
     },
-    "transfer" : {
-      "payerReceiver" : {
+    "collateral" : {
+      "independentAmount" : {
         "payerPartyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "5d661eab"
+          "globalReference" : "5d661eaa",
+          "externalReference" : "Party2"
         },
         "receiverPartyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "5d661eaa"
-        }
-      },
+          "globalReference" : "5d661eab",
+          "externalReference" : "Party1"
+        },
+        "paymentDetail" : [ {
+          "paymentRule" : {
+            "percentageRule" : {
+              "paymentPercent" : 0.02,
+              "notionalAmountReference" : {
+                "externalReference" : "Valuation"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "9e2bea61"
+          }
+        } ]
+      }
+    },
+    "meta" : {
+      "globalKey" : "4b7193b9"
+    }
+  },
+  "transferHistory" : [ {
+    "transfer" : {
       "quantity" : {
+        "value" : 225000,
         "unit" : {
           "currency" : {
+            "value" : "USD",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-            },
-            "value" : "USD"
+            }
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "5d661eab",
+          "externalReference" : "Party1"
         },
-        "value" : 225000
+        "receiverPartyReference" : {
+          "globalReference" : "5d661eaa",
+          "externalReference" : "Party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2002-11-01",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2002-11-01"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "e32f5bc"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "35a66d35"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex25-equityOptionTransactionSupplement-index-option-knock-in-knock-out-features.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex25-equityOptionTransactionSupplement-index-option-knock-in-knock-out-features.json
index 1c931487de..cccd43a4ac 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex25-equityOptionTransactionSupplement-index-option-knock-in-knock-out-features.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex25-equityOptionTransactionSupplement-index-option-knock-in-knock-out-features.json
@@ -1,139 +1,139 @@
 {
-  "meta" : {
-    "globalKey" : "1f00ff78"
-  },
   "trade" : {
-    "collateral" : {
-      "independentAmount" : {
-        "payerPartyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "5d661eaa"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "5d661eab"
-        },
-        "paymentDetail" : [ {
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "5d661eab",
+        "externalReference" : "Party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "TW9236",
           "meta" : {
-            "globalKey" : "9e2bea61"
-          },
-          "paymentRule" : {
-            "percentageRule" : {
-              "notionalAmountReference" : {
-                "externalReference" : "Valuation"
-              },
-              "paymentPercent" : 0.02
-            }
-          }
-        } ]
-      }
-    },
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2002-06-20",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_2004_EQUITY_AMERICAS_INTERDEALER"
-            }
+            "scheme" : "TradeRefNbr"
           }
-        },
-        "meta" : {
-          "globalKey" : "cebfff6e"
         }
       } ],
       "meta" : {
-        "globalKey" : "cebfff6e"
+        "globalKey" : "a1285a34"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2002-10-31",
+      "meta" : {
+        "globalKey" : "3e929f"
       }
-    },
-    "meta" : {
-      "globalKey" : "a2b48aef"
     },
     "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "5d661eab"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "DTCC00006441",
           "meta" : {
             "scheme" : "DTCC"
-          },
-          "value" : "DTCC00006441"
+          }
         },
         "meta" : {
           "globalKey" : "5d661eab"
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "5d661eaa"
-      },
+        "globalKey" : "5d661eab",
+        "externalKey" : "Party1"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "DTCC00006440",
           "meta" : {
             "scheme" : "DTCC"
-          },
-          "value" : "DTCC00006440"
+          }
         },
         "meta" : {
           "globalKey" : "5d661eaa"
         }
-      } ]
-    } ],
-    "tradeDate" : {
+      } ],
       "meta" : {
-        "globalKey" : "3e929f"
-      },
-      "value" : "2002-10-31"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "TradeRefNbr"
-          },
-          "value" : "TW9236"
+        "globalKey" : "5d661eaa",
+        "externalKey" : "Party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2002-06-20",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2004EquityAmericasInterdealer"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "cebfff6e"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "5d661eab"
-      },
       "meta" : {
-        "globalKey" : "24dd6aa"
+        "globalKey" : "cebfff6e"
       }
-    } ]
+    },
+    "collateral" : {
+      "independentAmount" : {
+        "payerPartyReference" : {
+          "globalReference" : "5d661eaa",
+          "externalReference" : "Party2"
+        },
+        "receiverPartyReference" : {
+          "globalReference" : "5d661eab",
+          "externalReference" : "Party1"
+        },
+        "paymentDetail" : [ {
+          "paymentRule" : {
+            "percentageRule" : {
+              "paymentPercent" : 0.02,
+              "notionalAmountReference" : {
+                "externalReference" : "Valuation"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "9e2bea61"
+          }
+        } ]
+      }
+    },
+    "meta" : {
+      "globalKey" : "4b7193b9"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "50760e07"
-    },
     "transfer" : {
       "payerReceiver" : {
         "payerPartyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "5d661eab"
+          "globalReference" : "5d661eab",
+          "externalReference" : "Party1"
         },
         "receiverPartyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "5d661eaa"
+          "globalReference" : "5d661eaa",
+          "externalReference" : "Party2"
         }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2002-11-01",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2002-11-01"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "50760e07"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "78b20eee"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex26-mixed-asset-basket.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex26-mixed-asset-basket.json
index bf4d47b9ee..8c4870bb2d 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex26-mixed-asset-basket.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex26-mixed-asset-basket.json
@@ -1,94 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "34106f8d"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2002-03-15",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "d3c973e8"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "75d60ac"
-      }
-    },
-    "meta" : {
-      "globalKey" : "dfb4f8d9"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/coding-scheme/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "95918657"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-07-13",
+      "meta" : {
+        "globalKey" : "3e89cd",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -96,81 +32,43 @@
             "productQualifier" : "EquityOption_PriceReturnBasicPerformance_Basket"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
-              },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              }
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "fcde3a06"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "4790ef7b"
-                  },
+                  "settlementType" : "Election",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "ELECTION"
+                  "meta" : {
+                    "globalKey" : "4790ef7b"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-07-13",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -179,8 +77,7 @@
                           },
                           "meta" : {
                             "globalKey" : "eae7f1c5"
-                          },
-                          "unadjustedDate" : "2001-07-13"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eae7f1c5"
@@ -188,6 +85,7 @@
                       },
                       "expirationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2005-09-27",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -196,49 +94,49 @@
                           },
                           "meta" : {
                             "globalKey" : "eb6226d3"
-                          },
-                          "unadjustedDate" : "2005-09-27"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eb6226d3"
                         }
                       },
-                      "expirationTimeType" : "CLOSE",
                       "latestExerciseTime" : {
+                        "hourMinuteTime" : "17:15:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "17:15:00"
-                      },
-                      "meta" : {
-                        "globalKey" : "260f119e"
+                        }
                       },
+                      "expirationTimeType" : "Close",
                       "multipleExercise" : {
                         "integralMultipleAmount" : 1,
                         "minimumNumberOfOptions" : 1,
                         "maximumNumberOfOptions" : 150000
+                      },
+                      "meta" : {
+                        "globalKey" : "260f119e"
                       }
                     }
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 32.00,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "value" : 32.00,
                       "perUnitOf" : {
-                        "financialUnit" : "SHARE"
+                        "financialUnit" : "Share"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
+                    }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "fcde3a06"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "basket" : {
                     "basketConstituent" : [ {
@@ -263,326 +161,428 @@
                   "meta" : {
                     "globalKey" : "0"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "a5510216"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "a5510216"
+              }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "c91fdd66"
+            "globalKey" : "7b7b7b86"
           }
         },
         "meta" : {
-          "globalKey" : "c91fdd66"
+          "globalKey" : "7b7b7b86"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "704932e7"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-3"
-              } ]
-            },
             "value" : {
+              "value" : 150000,
               "unit" : {
-                "financialUnit" : "CONTRACT"
+                "financialUnit" : "Contract"
               },
-              "value" : 150000,
               "multiplier" : {
                 "value" : 1.00
               }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-3"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "98dd29f9"
+          }
         } ]
       }, {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "75928200"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "e6ea2e9c"
+          "quantity" : [ {
+            "value" : {
+              "value" : 3,
+              "unit" : {
+                "financialUnit" : "IndexUnit"
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "FXI",
                   "meta" : {
                     "scheme" : "http://www.ftse.com/coding-scheme/instrument-id"
-                  },
-                  "value" : "FXI"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "e67b9ca7"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "FTSE/Xinhua China 25 Index"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "a78afae3"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "f65ba4e4"
+            }
           },
+          "meta" : {
+            "globalKey" : "3925de48"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 1
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "INDEX_UNIT"
-              },
-              "value" : 3
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "391c0fb"
-          },
+          } ],
           "observable" : {
             "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-2"
-                } ]
-              },
               "value" : {
                 "productIdentifier" : [ {
                   "value" : {
                     "identifier" : {
+                      "value" : "COPPER-LME CASH",
                       "meta" : {
                         "scheme" : "http://www.lme.co.uk/coding-scheme/instrument-id"
-                      },
-                      "value" : "COPPER-LME CASH"
+                      }
                     },
+                    "source" : "Other",
                     "meta" : {
                       "globalKey" : "b7ba2013"
-                    },
-                    "source" : "OTHER"
+                    }
                   }
                 } ],
+                "priceQuoteType" : "Settlement",
                 "deliveryDateReference" : {
                   "deliveryNearby" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 1,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
                   }
-                },
-                "priceQuoteType" : "SETTLEMENT"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-2"
+                } ]
               }
             },
             "meta" : {
-              "globalKey" : "3455b5ca"
+              "globalKey" : "565fef5e"
             }
           },
+          "meta" : {
+            "globalKey" : "834b670d"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 1
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-4"
               } ]
-            },
-            "value" : {
-              "value" : 1
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2a9a7446"
-          },
+          } ],
           "observable" : {
             "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-3"
-                } ]
-              },
               "value" : {
                 "productIdentifier" : [ {
                   "value" : {
                     "identifier" : {
+                      "value" : "ZINC-LME CASH",
                       "meta" : {
                         "scheme" : "http://www.lme.co.uk/coding-scheme/instrument-id"
-                      },
-                      "value" : "ZINC-LME CASH"
+                      }
                     },
+                    "source" : "Other",
                     "meta" : {
                       "globalKey" : "86db7c68"
-                    },
-                    "source" : "OTHER"
+                    }
                   }
                 } ],
+                "priceQuoteType" : "Settlement",
                 "deliveryDateReference" : {
                   "deliveryNearby" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 1,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
                   }
-                },
-                "priceQuoteType" : "SETTLEMENT"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-3"
+                } ]
               }
             },
             "meta" : {
-              "globalKey" : "40b9c695"
+              "globalKey" : "d67df7f3"
             }
           },
+          "meta" : {
+            "globalKey" : "3696fa2"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 1
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-4"
+                "value" : "quantity-5"
               } ]
-            },
-            "value" : {
-              "value" : 1
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "34b3bcec"
-          },
+          } ],
           "observable" : {
             "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-1"
-                } ]
-              },
               "value" : {
                 "productIdentifier" : [ {
                   "value" : {
                     "identifier" : {
+                      "value" : "NICKEL-LME CASH",
                       "meta" : {
                         "scheme" : "http://www.lme.co.uk/coding-scheme/instrument-id"
-                      },
-                      "value" : "NICKEL-LME CASH"
+                      }
                     },
+                    "source" : "Other",
                     "meta" : {
                       "globalKey" : "4c1cc102"
-                    },
-                    "source" : "OTHER"
+                    }
                   }
                 } ],
+                "priceQuoteType" : "Settlement",
                 "deliveryDateReference" : {
                   "deliveryNearby" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 1,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
                   }
-                },
-                "priceQuoteType" : "SETTLEMENT"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-1"
+                } ]
               }
             },
             "meta" : {
-              "globalKey" : "ac6d523b"
+              "globalKey" : "e13be10d"
             }
           },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-5"
-              } ]
-            },
-            "value" : {
-              "value" : 1
-            }
-          } ]
+          "meta" : {
+            "globalKey" : "e2758bc"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e89cd"
-      },
-      "value" : "2001-07-13"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyA.com/coding-scheme/trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2002-03-15",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "d3c973e8"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "75d60ac"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "cdbb06c7"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "f53c9af4"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 405000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "value" : 405000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-07-17",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-07-17"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "805c5fcc"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "5313e2d3"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex27-equityOptionTransactionSupplement-EMEA-interdealer.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex27-equityOptionTransactionSupplement-EMEA-interdealer.json
index 2bdace3bbe..6c87a8cc23 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex27-equityOptionTransactionSupplement-EMEA-interdealer.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex27-equityOptionTransactionSupplement-EMEA-interdealer.json
@@ -1,150 +1,150 @@
 {
-  "meta" : {
-    "globalKey" : "3b7ae6e0"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2011-01-01",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationAnnexType" : {
-              "value" : "ISDA_2010_INDEX_SHARE_OPTION_EMEA_INTERDEALER"
-            },
-            "masterConfirmationType" : {
-              "value" : "ISDA_2010_EQUITY_EMEA_INTERDEALER"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "9fd69ebc",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "2783639",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "4507dbe8"
         }
       } ],
       "meta" : {
-        "globalKey" : "4507dbe8"
+        "globalKey" : "4b810521"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "f9affefc",
+        "externalReference" : "partyB"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "2783639",
+          "meta" : {
+            "scheme" : "http://www.partyB.com/trade-id-1-0"
+          }
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "4b817980"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2011-02-11",
+      "meta" : {
+        "globalKey" : "3ed88b"
       }
-    },
-    "meta" : {
-      "globalKey" : "cea6e189"
     },
     "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "8f5e6444"
-      },
-      "name" : {
-        "value" : "XXXX Bank"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "XXXX1111",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "XXXX1111"
+          }
         },
         "meta" : {
           "globalKey" : "7fa55a40"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "530d6d04"
-      },
+      } ],
       "name" : {
-        "value" : "YYYY Bank"
+        "value" : "XXXX Bank"
       },
+      "meta" : {
+        "globalKey" : "9fd69ebc",
+        "externalKey" : "partyA"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "YYYY2222",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "YYYY2222"
+          }
         },
         "meta" : {
           "globalKey" : "1e302ac0"
         }
-      } ]
-    } ],
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ed88b"
-      },
-      "value" : "2011-02-11"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id-1-0"
-          },
-          "value" : "2783639"
-        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "8f5e6444"
+      "name" : {
+        "value" : "YYYY Bank"
       },
       "meta" : {
-        "globalKey" : "f7deac37"
+        "globalKey" : "f9affefc",
+        "externalKey" : "partyB"
       }
-    }, {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id-1-0"
-          },
-          "value" : "2783639"
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2011-01-01",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2010EquityEMEAInterdealer"
+            },
+            "masterConfirmationAnnexType" : {
+              "value" : "ISDA2010IndexShareOptionEMEAInterdealer"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "a875d0a8"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "530d6d04"
-      },
       "meta" : {
-        "globalKey" : "f7deac38"
+        "globalKey" : "a875d0a8"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "304bfe27"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "ba3bf597"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "8f5e6444"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "530d6d04"
-        }
-      },
       "quantity" : {
+        "value" : 50000,
         "unit" : {
           "currency" : {
+            "value" : "PLN",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217-2001-08-15"
-            },
-            "value" : "PLN"
+            }
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "9fd69ebc",
+          "externalReference" : "partyA"
         },
-        "value" : 50000
+        "receiverPartyReference" : {
+          "globalReference" : "f9affefc",
+          "externalReference" : "partyB"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2011-02-15",
         "dateAdjustments" : {
-          "businessDayConvention" : "NOT_APPLICABLE",
+          "businessDayConvention" : "NotApplicable",
           "meta" : {
             "globalKey" : "3a4b88ab"
           }
-        },
-        "unadjustedDate" : "2011-02-15"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "a8fcad4b"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "de7a0fb2"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex03-index-quanto-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex03-index-quanto-long-form.json
index 856db6811c..08945833e0 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex03-index-quanto-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex03-index-quanto-long-form.json
@@ -1,112 +1,50 @@
 {
-  "meta" : {
-    "globalKey" : "b90a83fa"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1734",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/eqs-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
       "meta" : {
-        "globalKey" : "92c7c587"
+        "globalKey" : "9591991c"
       }
-    },
-    "meta" : {
-      "globalKey" : "b90a83fa"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "5648",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/eqs-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9593db59"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-07-19",
+      "meta" : {
+        "globalKey" : "3e91d3",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Swap:PriceReturnBasicPerformance:Basket"
@@ -117,274 +55,247 @@
             "productQualifier" : "EquitySwap_PriceReturnBasicPerformance_Basket"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
-              "meta" : {
-                "externalKey" : "EffectiveDate",
-                "globalKey" : "6a2df5e0"
-              },
               "relativeDate" : {
+                "periodMultiplier" : 3,
+                "period" : "D",
                 "meta" : {
-                  "globalKey" : "6a2df5e0"
+                  "globalKey" : "fed6ed42"
                 },
-                "period" : "D",
-                "periodMultiplier" : 3,
-                "dayType" : "EXCHANGE_BUSINESS",
-                "businessDayConvention" : "NOT_APPLICABLE",
+                "dayType" : "ExchangeBusiness",
+                "businessDayConvention" : "NotApplicable",
                 "dateRelativeTo" : {
-                  "externalReference" : "TradeDate",
-                  "globalReference" : "3e91d3"
+                  "globalReference" : "3e91d3",
+                  "externalReference" : "TradeDate"
                 }
+              },
+              "meta" : {
+                "globalKey" : "fed6ed42",
+                "externalKey" : "EffectiveDate"
               }
             },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "indexAdjustmentEvents" : {
-                "indexCancellation" : "CANCELLATION_AND_PAYMENT",
-                "indexDisruption" : "CALCULATION_AGENT_ADJUSTMENT",
-                "indexModification" : "CALCULATION_AGENT_ADJUSTMENT"
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "23d29d63"
+                },
+                "businessDayConvention" : "NotApplicable",
+                "dateRelativeTo" : {
+                  "globalReference" : "bb917ef4",
+                  "externalReference" : "ReturnLegFinalPaymentDate"
+                }
               },
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "indexDisclaimer" : true,
-                "nonReliance" : true
+              "meta" : {
+                "globalKey" : "23d29d63",
+                "externalKey" : "TerminationDate"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "8e817bd8"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "NotionalAmount",
-                    "globalReference" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "NotionalAmount"
+                  },
+                  "meta" : {
+                    "globalKey" : "8e817bd8"
+                  }
+                },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "globalKey" : "6a2df5e0"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 3,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "6a2df5e0"
+                        "globalKey" : "fed6ed42"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 3,
-                      "dayType" : "EXCHANGE_BUSINESS",
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "dayType" : "ExchangeBusiness",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "TradeDate",
-                        "globalReference" : "3e91d3"
+                        "globalReference" : "3e91d3",
+                        "externalReference" : "TradeDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "fed6ed42"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "InterestLegPeriodDates",
-                    "globalKey" : "c59da08b"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "globalKey" : "2771f26b"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "2771f26b"
+                        "globalKey" : "23d29d63"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "ReturnLegFinalPaymentDate",
-                        "globalReference" : "ad48d812"
+                        "globalReference" : "bb917ef4",
+                        "externalReference" : "ReturnLegFinalPaymentDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "23d29d63"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "26d4a1e1",
+                    "externalKey" : "InterestLegPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "f0282530"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "75e7a585"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "75e7a585"
-                      },
                       "relativeDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "75e7a585"
+                          "globalKey" : "7248507d"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "dateRelativeTo" : {
-                          "externalReference" : "ReturnLegPaymentDate",
-                          "globalReference" : "fe9d6c44"
+                          "globalReference" : "94f84ae8",
+                          "externalReference" : "ReturnLegPaymentDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "7248507d"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "7248507d"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "InterestLegPeriodDates",
-                    "globalReference" : "c59da08b"
+                    "globalReference" : "26d4a1e1",
+                    "externalReference" : "InterestLegPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "9e9ada33"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3e97e86"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "8e646c79"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "NotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "NotionalAmount"
+                  }
                 },
-                "fxFeature" : [ {
-                  "quanto" : {
-                    "fxRate" : [ {
-                      "quotedCurrencyPair" : {
-                        "currency1" : {
-                          "value" : "USD"
-                        },
-                        "currency2" : {
-                          "value" : "EUR"
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "adjustableDates" : {
+                        "unadjustedDate" : [ "2002-10-21", "2004-01-20", "2004-04-22" ],
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
                         },
-                        "quoteBasis" : "CURRENCY_2_PER_CURRENCY_1"
+                        "meta" : {
+                          "globalKey" : "60230b82"
+                        }
                       },
-                      "rate" : 0.99140
-                    }, {
-                      "quotedCurrencyPair" : {
-                        "currency1" : {
-                          "value" : "USD"
-                        },
-                        "currency2" : {
-                          "value" : "HKD"
+                      "meta" : {
+                        "globalKey" : "60230b82",
+                        "externalKey" : "InterimValuationDate"
+                      }
+                    },
+                    "valuationTimeType" : "Close",
+                    "meta" : {
+                      "globalKey" : "abc4da15"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2004-07-21",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
                         },
-                        "quoteBasis" : "CURRENCY_2_PER_CURRENCY_1"
+                        "meta" : {
+                          "globalKey" : "25690940"
+                        }
                       },
-                      "rate" : 7.80
-                    } ]
-                  },
-                  "referenceCurrency" : {
-                    "meta" : {
-                      "externalKey" : "ReferenceCurrency",
-                      "globalKey" : "14966"
+                      "meta" : {
+                        "globalKey" : "25690940",
+                        "externalKey" : "FinalValuationDate"
+                      }
                     },
-                    "value" : "USD"
+                    "meta" : {
+                      "globalKey" : "97348ac2"
+                    }
                   }
-                } ],
-                "meta" : {
-                  "globalKey" : "3de9b49"
                 },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "ReturnLegPaymentDate",
-                    "globalKey" : "fe9d6c44"
-                  },
                   "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "externalKey" : "ReturnLegFinalPaymentDate",
-                        "globalKey" : "ad48d812"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "ad48d812"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessCentersReference" : {
-                          "externalReference" : "PrimaryBusinessCenter",
-                          "globalReference" : "41619c9"
-                        },
-                        "businessDayConvention" : "FOLLOWING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "FinalValuationDate",
-                          "globalReference" : "25690940"
-                        }
-                      }
-                    },
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "externalKey" : "ReturnLegInterimPaymentDate",
-                        "globalKey" : "d32f1716"
-                      },
                       "relativeDates" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "d32f1716"
+                          "globalKey" : "bc36cf4"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -392,22 +303,47 @@
                             "value" : "HKHK"
                           } ],
                           "meta" : {
-                            "externalKey" : "PrimaryBusinessCenter",
-                            "globalKey" : "41619c9"
+                            "globalKey" : "41619c9",
+                            "externalKey" : "PrimaryBusinessCenter"
                           }
                         },
+                        "dateRelativeTo" : {
+                          "globalReference" : "60230b82",
+                          "externalReference" : "InterimValuationDate"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "bc36cf4",
+                        "externalKey" : "ReturnLegInterimPaymentDate"
+                      }
+                    } ],
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "bb917ef4"
+                        },
+                        "dayType" : "CurrencyBusiness",
                         "businessDayConvention" : "FOLLOWING",
+                        "businessCentersReference" : {
+                          "globalReference" : "41619c9",
+                          "externalReference" : "PrimaryBusinessCenter"
+                        },
                         "dateRelativeTo" : {
-                          "externalReference" : "InterimValuationDate",
-                          "globalReference" : "60230b82"
+                          "globalReference" : "25690940",
+                          "externalReference" : "FinalValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "bb917ef4",
+                        "externalKey" : "ReturnLegFinalPaymentDate"
                       }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "priceReturnTerms" : {
-                    "returnType" : "PRICE"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "94f84ae8",
+                    "externalKey" : "ReturnLegPaymentDate"
                   }
                 },
                 "underlier" : {
@@ -469,408 +405,472 @@
                     "globalKey" : "0"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
+                "fxFeature" : [ {
+                  "referenceCurrency" : {
+                    "value" : "USD",
                     "meta" : {
-                      "globalKey" : "97348ac2"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
+                      "globalKey" : "14966",
+                      "externalKey" : "ReferenceCurrency"
+                    }
+                  },
+                  "quanto" : {
+                    "fxRate" : [ {
+                      "quotedCurrencyPair" : {
+                        "currency1" : {
+                          "value" : "USD"
                         },
-                        "meta" : {
-                          "globalKey" : "25690940"
+                        "currency2" : {
+                          "value" : "EUR"
                         },
-                        "unadjustedDate" : "2004-07-21"
+                        "quoteBasis" : "Currency2PerCurrency1"
                       },
-                      "meta" : {
-                        "externalKey" : "FinalValuationDate",
-                        "globalKey" : "25690940"
-                      }
-                    }
-                  },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "abc4da15"
-                    },
-                    "valuationDates" : {
-                      "adjustableDates" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
+                      "rate" : 0.99140
+                    }, {
+                      "quotedCurrencyPair" : {
+                        "currency1" : {
+                          "value" : "USD"
                         },
-                        "meta" : {
-                          "globalKey" : "60230b82"
+                        "currency2" : {
+                          "value" : "HKD"
                         },
-                        "unadjustedDate" : [ "2002-10-21", "2004-01-20", "2004-04-22" ]
+                        "quoteBasis" : "Currency2PerCurrency1"
                       },
-                      "meta" : {
-                        "externalKey" : "InterimValuationDate",
-                        "globalKey" : "60230b82"
-                      }
-                    },
-                    "valuationTimeType" : "CLOSE"
+                      "rate" : 7.80
+                    } ]
+                  }
+                } ],
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Price"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "903df27d"
                 }
-              } ]
-            },
-            "terminationDate" : {
+              } ],
               "meta" : {
-                "externalKey" : "TerminationDate",
-                "globalKey" : "2771f26b"
+                "globalKey" : "1f295e83"
+              }
+            },
+            "extraordinaryEvents" : {
+              "indexAdjustmentEvents" : {
+                "indexModification" : "CalculationAgentAdjustment",
+                "indexCancellation" : "CancellationAndPayment",
+                "indexDisruption" : "CalculationAgentAdjustment"
               },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "2771f26b"
-                },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NOT_APPLICABLE",
-                "dateRelativeTo" : {
-                  "externalReference" : "ReturnLegFinalPaymentDate",
-                  "globalReference" : "ad48d812"
-                }
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "indexDisclaimer" : true,
+                "additionalAcknowledgements" : true
               }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "f4dd65ff"
+            "globalKey" : "c8198cbb"
           }
         },
         "meta" : {
-          "globalKey" : "f4dd65ff"
+          "globalKey" : "c8198cbb"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "644a678e"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 5591987.41,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 5591987.41,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
+              "priceType" : "AssetPrice"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 1
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
-            "value" : {
-              "value" : 1
             }
           }, {
+            "value" : {
+              "value" : 5591987.41,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "25028a32"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 960,
               "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 5591987.41
+                "financialUnit" : "IndexUnit"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-4"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "a65aedc1"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "2a77a29d"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-5"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : ".FCHI",
                   "meta" : {
                     "scheme" : "http://www.abc.com/instrumentId"
-                  },
-                  "value" : ".FCHI"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
-                  "globalKey" : "e9239a9c"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                  "globalKey" : "e9239a9c"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-6"
+                  "value" : "productIdentifier-5"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "France CAC 40 Index"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "136fbb9"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-6"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "247cb103"
+            }
           },
+          "meta" : {
+            "globalKey" : "b6fec6e7"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 260,
+              "unit" : {
+                "financialUnit" : "IndexUnit"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-4"
+                "value" : "quantity-5"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "INDEX_UNIT"
-              },
-              "value" : 960
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "a13828f4"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "c2055d7"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-4"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : ".IBEX",
                   "meta" : {
                     "scheme" : "http://www.abc.com/instrumentId"
-                  },
-                  "value" : ".IBEX"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "e924f3aa"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-4"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "IBEX 35"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "130d8f41"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "77ea6509"
+            }
           },
+          "meta" : {
+            "globalKey" : "6ac3cea6"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 580,
+              "unit" : {
+                "financialUnit" : "IndexUnit"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-5"
+                "value" : "quantity-3"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "INDEX_UNIT"
-              },
-              "value" : 260
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "8d8b53f1"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "45eece93"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-3"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : ".HSI",
                   "meta" : {
                     "scheme" : "http://www.abc.com/instrumentId"
-                  },
-                  "value" : ".HSI"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "e6908ca0"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
+                  "value" : "productIdentifier-3"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "Hong Kong Hang Seng Index"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "9b007733"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-3"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "INDEX_UNIT"
+                }
               },
-              "value" : 580
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "24fb46fc"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d05"
-            },
-            "rateOption" : {
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 3
-                }
               }
+            } ],
+            "meta" : {
+              "globalKey" : "77eb03cd"
             }
           },
+          "meta" : {
+            "globalKey" : "5ce756eb"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
             "value" : {
+              "value" : -0.00220,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : -0.00220,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 3,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "828026c7"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "5a7d14a6"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e91d3"
-      },
-      "value" : "2002-07-19"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/eqs-trade-id"
-          },
-          "value" : "1734"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "1b67b752"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/eqs-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "5648"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "222d85b1"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "4840ebec"
+    }
+  },
+  "meta" : {
+    "globalKey" : "4840ebec"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex04-zero-strike-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex04-zero-strike-long-form.json
index 10e0ca9aae..b0885608fb 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex04-zero-strike-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex04-zero-strike-long-form.json
@@ -1,112 +1,50 @@
 {
-  "meta" : {
-    "globalKey" : "693850c6"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/eqs-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
       "meta" : {
-        "globalKey" : "92c7c587"
+        "globalKey" : "95918657"
       }
-    },
-    "meta" : {
-      "globalKey" : "693850c6"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "5678",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/eqs-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9593dbb6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-10-17",
+      "meta" : {
+        "globalKey" : "3e9291",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleName"
@@ -114,170 +52,123 @@
             }
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-10-24",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "252fd543"
-                },
-                "unadjustedDate" : "2002-10-24"
+                }
               },
               "meta" : {
-                "externalKey" : "EffectiveDate",
-                "globalKey" : "252fd543"
+                "globalKey" : "252fd543",
+                "externalKey" : "EffectiveDate"
               }
             },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "edf02740"
+                },
+                "businessDayConvention" : "NotApplicable",
+                "dateRelativeTo" : {
+                  "globalReference" : "55830660",
+                  "externalReference" : "FinalEquityPaymentDate"
+                }
               },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
+              "meta" : {
+                "globalKey" : "edf02740",
+                "externalKey" : "TerminationDate"
               }
             },
             "payout" : {
-              "meta" : {
-                "globalKey" : "9fb10ae3"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "4d5"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : false
+                  "reset" : false,
+                  "meta" : {
+                    "globalKey" : "4d5"
+                  }
                 },
-                "fxFeature" : [ {
-                  "composite" : {
-                    "determinationMethod" : "CALCULATION_AGENT"
-                  },
-                  "referenceCurrency" : {
-                    "meta" : {
-                      "externalKey" : "ReferenceCurrency",
-                      "globalKey" : "14966"
+                "valuationDates" : {
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2004-10-17",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "256bcafc"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "256bcafc",
+                        "externalKey" : "FinalValuationDate"
+                      }
                     },
-                    "value" : "USD"
+                    "meta" : {
+                      "globalKey" : "97374c7e"
+                    }
                   }
-                } ],
-                "meta" : {
-                  "globalKey" : "9fb10ae3"
                 },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "EquityPaymentDate",
-                    "globalKey" : "41f04cbe"
-                  },
                   "paymentDateSchedule" : {
                     "finalPaymentDate" : {
-                      "meta" : {
-                        "externalKey" : "FinalEquityPaymentDate",
-                        "globalKey" : "41f04cbe"
-                      },
                       "relativeDate" : {
+                        "periodMultiplier" : 5,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "41f04cbe"
+                          "globalKey" : "55830660"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 5,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "PrimaryBusinessCenter",
-                            "globalKey" : "27e4e9"
+                            "globalKey" : "27e4e9",
+                            "externalKey" : "PrimaryBusinessCenter"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "FinalValuationDate",
-                          "globalReference" : "256bcafc"
-                        }
-                      }
-                    }
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendCurrency" : {
-                      "currencyReference" : {
-                        "externalReference" : "ReferenceCurrency",
-                        "globalReference" : "14966"
-                      }
-                    },
-                    "dividendEntitlement" : "EX_DATE",
-                    "dividendPayoutRatio" : [ {
-                      "totalRatio" : 1
-                    } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "EQUITY_PAYMENT_DATE"
-                        }
-                      },
-                      "endDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "FinalValuationDate",
-                          "globalReference" : "256bcafc"
+                          "globalReference" : "256bcafc",
+                          "externalReference" : "FinalValuationDate"
                         }
                       },
-                      "startDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "TradeDate",
-                          "globalReference" : "3e9291"
-                        }
+                      "meta" : {
+                        "globalKey" : "55830660",
+                        "externalKey" : "FinalEquityPaymentDate"
                       }
-                    } ],
-                    "dividendReinvestment" : false,
-                    "excessDividendAmount" : "PAID_AMOUNT"
+                    }
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                  "meta" : {
+                    "globalKey" : "55830660",
+                    "externalKey" : "EquityPaymentDate"
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -290,201 +181,310 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
+                "fxFeature" : [ {
+                  "referenceCurrency" : {
+                    "value" : "USD",
                     "meta" : {
-                      "globalKey" : "97374c7e"
+                      "globalKey" : "14966",
+                      "externalKey" : "ReferenceCurrency"
+                    }
+                  },
+                  "composite" : {
+                    "determinationMethod" : "CalculationAgent"
+                  }
+                } ],
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
+                  },
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 1
+                    } ],
+                    "dividendReinvestment" : false,
+                    "dividendEntitlement" : "ExDate",
+                    "excessDividendAmount" : "PaidAmount",
+                    "dividendCurrency" : {
+                      "currencyReference" : {
+                        "globalReference" : "14966",
+                        "externalReference" : "ReferenceCurrency"
+                      }
                     },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "256bcafc"
-                        },
-                        "unadjustedDate" : "2004-10-17"
+                    "dividendPeriod" : [ {
+                      "startDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "3e9291",
+                          "externalReference" : "TradeDate"
+                        }
                       },
-                      "meta" : {
-                        "externalKey" : "FinalValuationDate",
-                        "globalKey" : "256bcafc"
+                      "endDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "256bcafc",
+                          "externalReference" : "FinalValuationDate"
+                        }
+                      },
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "EquityPaymentDate"
+                        }
                       }
-                    }
+                    } ]
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "meta" : {
-                "externalKey" : "TerminationDate",
-                "globalKey" : "f18f7c48"
-              },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "f18f7c48"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NOT_APPLICABLE",
-                "dateRelativeTo" : {
-                  "externalReference" : "FinalEquityPaymentDate",
-                  "globalReference" : "41f04cbe"
+                "meta" : {
+                  "globalKey" : "fc63351"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "fc63351"
               }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "2170e702"
+            "globalKey" : "ec30b14a"
           }
         },
         "meta" : {
-          "globalKey" : "2170e702"
+          "globalKey" : "ec30b14a"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "8a4d676f"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "31ccbb3c"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.abc.com/instrumentId"
-                  },
-                  "value" : "ZEE.NS"
-                },
-                "meta" : {
-                  "globalKey" : "83fb1ca9"
-                },
-                "source" : "OTHER"
-              }
-            }, {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "value" : "ZEE"
-                },
-                "meta" : {
-                  "globalKey" : "88d35645"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 1.8036,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 1.8036,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
+              "priceType" : "AssetPrice"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 31000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 31000
             }
           }, {
+            "value" : {
+              "value" : 55911.60,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "ZEE.NS",
+                  "meta" : {
+                    "scheme" : "http://www.abc.com/instrumentId"
+                  }
+                },
+                "source" : "Other",
+                "meta" : {
+                  "globalKey" : "83fb1ca9"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
+              }
+            }, {
+              "value" : {
+                "identifier" : {
+                  "value" : "ZEE"
+                },
+                "source" : "Name",
+                "meta" : {
+                  "globalKey" : "88d35645"
                 }
               },
-              "value" : 55911.60
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "7caac44"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "dfc20b2f"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e9291"
-      },
-      "value" : "2002-10-17"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/eqs-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/eqs-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "5678"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "222ee2ce"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "81610bec"
+    }
+  },
+  "meta" : {
+    "globalKey" : "81610bec"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex05-single-stock-plus-fee-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex05-single-stock-plus-fee-long-form.json
index df9a43c13c..2820d5c74e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex05-single-stock-plus-fee-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex05-single-stock-plus-fee-long-form.json
@@ -1,128 +1,50 @@
 {
-  "meta" : {
-    "globalKey" : "1348cd99"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1934",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/eqs-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
       "meta" : {
-        "globalKey" : "92c7c587"
+        "globalKey" : "9591a09e"
       }
-    },
-    "meta" : {
-      "globalKey" : "33a507b3"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "5978",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/eqs-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party3",
-        "globalKey" : "33f59569"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party C"
-        },
-        "meta" : {
-          "globalKey" : "33f59569"
-        }
-      } ]
+        "globalKey" : "9593e6f9"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-09-10",
+      "meta" : {
+        "globalKey" : "3e924a",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleName"
@@ -133,208 +55,210 @@
             "productQualifier" : "EquitySwap_TotalReturnBasicPerformance_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-09-12",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "252eb7f7"
-                },
-                "unadjustedDate" : "2002-09-12"
+                }
               },
               "meta" : {
-                "externalKey" : "EffectiveDate",
-                "globalKey" : "252eb7f7"
+                "globalKey" : "252eb7f7",
+                "externalKey" : "EffectiveDate"
               }
             },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "edf02740"
+                },
+                "businessDayConvention" : "NotApplicable",
+                "dateRelativeTo" : {
+                  "globalReference" : "23cbca9b",
+                  "externalReference" : "FinalEquityPaymentDate"
+                }
               },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
+              "meta" : {
+                "globalKey" : "edf02740",
+                "externalKey" : "TerminationDate"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
                 },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "globalKey" : "d174da04"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "d174da04"
+                        "globalKey" : "cdd584fc"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "EffectiveDate",
-                        "globalReference" : "252eb7f7"
+                        "globalReference" : "252eb7f7",
+                        "externalReference" : "EffectiveDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "cdd584fc"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "InterestLegPeriodDates",
-                    "globalKey" : "b55615c4"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "globalKey" : "f18f7c48"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "f18f7c48"
+                        "globalKey" : "edf02740"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "FinalEquityPaymentDate",
-                        "globalReference" : "8bd2b65f"
+                        "globalReference" : "23cbca9b",
+                        "externalReference" : "FinalEquityPaymentDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "edf02740"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "33464ec4",
+                    "externalKey" : "InterestLegPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "76358c47"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "78629cd1"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "78629cd1"
-                      },
                       "relativeDates" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "78629cd1"
+                          "globalKey" : "53b05215"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCentersReference" : {
-                          "externalReference" : "PrimaryBusinessCenter",
-                          "globalReference" : "4fc3867"
+                          "globalReference" : "4fc3867",
+                          "externalReference" : "PrimaryBusinessCenter"
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "FinalValuationDate",
-                          "globalReference" : "b9c8415a"
+                          "globalReference" : "b9c8415a",
+                          "externalReference" : "FinalValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "53b05215"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "53b05215"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "InterestLegPeriodDates",
-                    "globalReference" : "b55615c4"
+                    "globalReference" : "33464ec4",
+                    "externalReference" : "InterestLegPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "9e9ada33"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "93d8150b"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "b3686461"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "reset" : false,
                   "meta" : {
                     "globalKey" : "4d5"
-                  },
-                  "reset" : false
+                  }
                 },
-                "fxFeature" : [ {
-                  "composite" : {
-                    "determinationMethod" : "CALCULATION_AGENT"
-                  },
-                  "referenceCurrency" : {
+                "valuationDates" : {
+                  "valuationDatesInitial" : {
+                    "determinationMethod" : "CalculationAgent",
                     "meta" : {
-                      "externalKey" : "ReferenceCurrency",
-                      "globalKey" : "14966"
+                      "globalKey" : "b70ebdcf"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "CalculationAgent",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2004-03-12",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "4fc3867",
+                              "externalReference" : "PrimaryBusinessCenter"
+                            },
+                            "meta" : {
+                              "globalKey" : "bec926b7"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "dfc642a6"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "b9c8415a"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "b9c8415a",
+                        "externalKey" : "FinalValuationDate"
+                      }
                     },
-                    "value" : "USD"
+                    "meta" : {
+                      "globalKey" : "ec1fc029"
+                    }
                   }
-                } ],
-                "meta" : {
-                  "globalKey" : "f84d549a"
                 },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "EquityPaymentDate",
-                    "globalKey" : "8bd2b65f"
-                  },
                   "paymentDateSchedule" : {
                     "finalPaymentDate" : {
-                      "meta" : {
-                        "externalKey" : "FinalEquityPaymentDate",
-                        "globalKey" : "8bd2b65f"
-                      },
                       "relativeDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "8bd2b65f"
+                          "globalKey" : "23cbca9b"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -342,63 +266,32 @@
                             "value" : "TWTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "PrimaryBusinessCenter",
-                            "globalKey" : "4fc3867"
+                            "globalKey" : "4fc3867",
+                            "externalKey" : "PrimaryBusinessCenter"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "FinalValuationDate",
-                          "globalReference" : "b9c8415a"
+                          "globalReference" : "b9c8415a",
+                          "externalReference" : "FinalValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "23cbca9b",
+                        "externalKey" : "FinalEquityPaymentDate"
                       }
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "23cbca9b",
+                    "externalKey" : "EquityPaymentDate"
                   }
                 },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendCurrency" : {
-                      "currencyReference" : {
-                        "externalReference" : "ReferenceCurrency",
-                        "globalReference" : "14966"
-                      }
-                    },
-                    "dividendEntitlement" : "EX_DATE",
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "EX_DATE"
-                        }
-                      },
-                      "endDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "FinalValuationDate",
-                          "globalReference" : "b9c8415a"
-                        }
-                      },
-                      "startDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "TradeDate",
-                          "globalReference" : "3e924a"
-                        }
-                      }
-                    } ],
-                    "dividendReinvestment" : false,
-                    "excessDividendAmount" : "PAID_AMOUNT"
-                  },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
-                  }
-                },
-                "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
-                  "security" : {
-                    "productIdentifier" : [ {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-1"
+                "underlier" : {
+                  "security" : {
+                    "productIdentifier" : [ {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-1"
                       }
                     }, {
                       "address" : {
@@ -406,247 +299,354 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "CALCULATION_AGENT",
+                "fxFeature" : [ {
+                  "referenceCurrency" : {
+                    "value" : "USD",
                     "meta" : {
-                      "globalKey" : "ec1fc029"
+                      "globalKey" : "14966",
+                      "externalKey" : "ReferenceCurrency"
+                    }
+                  },
+                  "composite" : {
+                    "determinationMethod" : "CalculationAgent"
+                  }
+                } ],
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
+                  },
+                  "dividendReturnTerms" : {
+                    "dividendReinvestment" : false,
+                    "dividendEntitlement" : "ExDate",
+                    "excessDividendAmount" : "PaidAmount",
+                    "dividendCurrency" : {
+                      "currencyReference" : {
+                        "globalReference" : "14966",
+                        "externalReference" : "ReferenceCurrency"
+                      }
                     },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "PrimaryBusinessCenter",
-                              "globalReference" : "4fc3867"
-                            },
-                            "meta" : {
-                              "globalKey" : "bec926b7"
-                            }
-                          },
-                          "businessDayConvention" : "FOLLOWING",
-                          "meta" : {
-                            "globalKey" : "dfc642a6"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "b9c8415a"
-                        },
-                        "unadjustedDate" : "2004-03-12"
+                    "dividendPeriod" : [ {
+                      "startDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "3e924a",
+                          "externalReference" : "TradeDate"
+                        }
                       },
-                      "meta" : {
-                        "externalKey" : "FinalValuationDate",
-                        "globalKey" : "b9c8415a"
+                      "endDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "b9c8415a",
+                          "externalReference" : "FinalValuationDate"
+                        }
+                      },
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "ExDate"
+                        }
                       }
-                    }
-                  },
-                  "valuationDatesInitial" : {
-                    "determinationMethod" : "CALCULATION_AGENT",
-                    "meta" : {
-                      "globalKey" : "b70ebdcf"
-                    }
+                    } ]
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "meta" : {
-                "externalKey" : "TerminationDate",
-                "globalKey" : "f18f7c48"
-              },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "f18f7c48"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NOT_APPLICABLE",
-                "dateRelativeTo" : {
-                  "externalReference" : "FinalEquityPaymentDate",
-                  "globalReference" : "8bd2b65f"
+                "meta" : {
+                  "globalKey" : "4929eb06"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "723a6591"
               }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "6c67ad10"
+            "globalKey" : "c987f7d6"
           }
         },
         "meta" : {
-          "globalKey" : "6c67ad10"
+          "globalKey" : "c987f7d6"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "60af6e29"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "7df02426"
+          "quantity" : [ {
+            "value" : {
+              "value" : 18388000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "2881.TW",
                   "meta" : {
                     "scheme" : "http://www.abc.com/instrumentId"
-                  },
-                  "value" : "2881.TW"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "9e2da202"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "Fubon Financial Holdings Co., Ltd."
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "d37ed4e8"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
-            } ]
-          },
-          "quantity" : [ {
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 18388000
+              "globalKey" : "4014609a"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "5f0c6d08"
           },
+          "meta" : {
+            "globalKey" : "6724bddd"
+          }
+        }, {
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d08"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
+            },
+            "meta" : {
+              "globalKey" : "8280320a"
             }
+          },
+          "meta" : {
+            "globalKey" : "8280320a"
           }
         } ]
-      } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e924a"
-      },
-      "value" : "2002-09-10"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyA.com/eqs-trade-id"
-          },
-          "value" : "1934"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "1b83e654"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party C",
           "meta" : {
-            "scheme" : "http://www.partyB.com/eqs-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59569"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59569",
+        "externalKey" : "party3"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "5978"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "22592951"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "21a2317b"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "28152ca6"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party3",
-          "globalReference" : "33f59569"
-        }
-      },
       "quantity" : {
+        "value" : 1000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         },
-        "value" : 1000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59569",
+          "externalReference" : "party3"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2002-09-30",
         "dateAdjustments" : {
-          "businessDayConvention" : "NOT_APPLICABLE",
+          "businessDayConvention" : "NotApplicable",
           "meta" : {
             "globalKey" : "3a4b88ab"
           }
-        },
-        "unadjustedDate" : "2002-09-30"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "4583b5e8"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "70389ea3"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex07-long-form-with-stub.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex07-long-form-with-stub.json
index d2019da55b..7c794596cb 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex07-long-form-with-stub.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex07-long-form-with-stub.json
@@ -1,112 +1,50 @@
 {
-  "meta" : {
-    "globalKey" : "82834106"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/eqs-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
       "meta" : {
-        "globalKey" : "92c7c587"
+        "globalKey" : "95918657"
       }
-    },
-    "meta" : {
-      "globalKey" : "82834106"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "5678",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://http://www.partyB.com/eqs-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9593dbb6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-07-17",
+      "meta" : {
+        "globalKey" : "3e91d1",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "EXECUTION",
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Swap:PriceReturnBasicPerformance:Basket"
@@ -117,294 +55,339 @@
             "productQualifier" : "EquitySwap_PriceReturnBasicPerformance_Basket"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-07-20",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "252cf57f"
-                },
-                "unadjustedDate" : "2002-07-20"
+                }
               },
               "meta" : {
-                "externalKey" : "EffectiveDate",
-                "globalKey" : "252cf57f"
+                "globalKey" : "252cf57f",
+                "externalKey" : "EffectiveDate"
               }
             },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2004-07-20",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "EUTA"
+                    }, {
+                      "value" : "GBLO"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "4158421"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "da3b6050"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "5beec7fc"
+                }
+              },
+              "meta" : {
+                "globalKey" : "5beec7fc",
+                "externalKey" : "TerminationDate"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "607b91fd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "EquityNotionalAmount",
-                    "globalReference" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "EquityNotionalAmount"
+                  },
+                  "meta" : {
+                    "globalKey" : "607b91fd"
+                  }
+                },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "globalKey" : "6a2df5e0"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 3,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "6a2df5e0"
+                        "globalKey" : "fed6ed42"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 3,
-                      "dayType" : "EXCHANGE_BUSINESS",
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "dayType" : "ExchangeBusiness",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "TradeDate",
-                        "globalReference" : "3e91d1"
+                        "globalReference" : "3e91d1",
+                        "externalReference" : "TradeDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "fed6ed42"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "InterestLegPeriodDates",
-                    "globalKey" : "1644fbf"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "globalKey" : "3f6ba99f"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "3f6ba99f"
+                        "globalKey" : "a64d7697"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
+                      "businessDayConvention" : "NotApplicable",
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenter",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "primaryBusinessCenter"
                       },
-                      "businessDayConvention" : "NOT_APPLICABLE",
                       "dateRelativeTo" : {
-                        "externalReference" : "FinalEquityPaymentDate",
-                        "globalReference" : "25e78322"
+                        "globalReference" : "34302a04",
+                        "externalReference" : "FinalEquityPaymentDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "a64d7697"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f0e05395",
+                    "externalKey" : "InterestLegPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "32cd53e3"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "e9796435"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "e9796435"
-                      },
                       "relativeDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "e9796435"
+                          "globalKey" : "505b312d"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
+                        "businessDayConvention" : "NotApplicable",
                         "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenter",
-                          "globalReference" : "20a71d"
+                          "globalReference" : "20a71d",
+                          "externalReference" : "primaryBusinessCenter"
                         },
-                        "businessDayConvention" : "NOT_APPLICABLE",
                         "dateRelativeTo" : {
-                          "externalReference" : "EquityPaymentDate",
-                          "globalReference" : "2aba9b4d"
+                          "globalReference" : "37b3ad1",
+                          "externalReference" : "EquityPaymentDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "505b312d"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "505b312d"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "InterestLegPeriodDates",
-                    "globalReference" : "1644fbf"
+                    "globalReference" : "f0e05395",
+                    "externalReference" : "InterestLegPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "9e9ada33"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
                 },
                 "stubPeriod" : {
+                  "initialStub" : {
+                    "stubRate" : 0.02125
+                  },
                   "finalStub" : {
                     "floatingRate" : [ {
                       "floatingRateIndex" : "EUR-EURIBOR-Telerate",
                       "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "a8a"
-                        },
+                        "periodMultiplier" : 1,
                         "period" : "W",
-                        "periodMultiplier" : 1
+                        "meta" : {
+                          "globalKey" : "76"
+                        }
                       }
                     } ]
-                  },
-                  "initialStub" : {
-                    "stubRate" : 0.02125
                   }
+                },
+                "meta" : {
+                  "globalKey" : "366d63b5"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "2b06e7b0"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "EquityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
-                },
-                "fxFeature" : [ {
-                  "composite" : {
-                    "determinationMethod" : "CALCULATION_AGENT"
-                  },
-                  "referenceCurrency" : {
-                    "meta" : {
-                      "externalKey" : "ReferenceCurrency",
-                      "globalKey" : "10da2"
-                    },
-                    "value" : "EUR"
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "EquityNotionalAmount"
                   }
-                } ],
-                "meta" : {
-                  "globalKey" : "49c68673"
                 },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "EquityPaymentDate",
-                    "globalKey" : "2aba9b4d"
+                "valuationDates" : {
+                  "valuationDatesInitial" : {
+                    "determinationMethod" : "CalculationAgent",
+                    "valuationTimeType" : "Close",
+                    "meta" : {
+                      "globalKey" : "2e9ce1e9"
+                    }
                   },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "externalKey" : "FinalEquityPaymentDate",
-                        "globalKey" : "25e78322"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "25e78322"
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "adjustableDates" : {
+                        "unadjustedDate" : [ "2002-07-26", "2002-08-28", "2002-09-26", "2002-10-27", "2002-11-28", "2002-12-26", "2003-01-29", "2003-02-26", "2003-03-26", "2003-04-28", "2003-05-28", "2003-06-26", "2003-07-29", "2003-08-27", "2003-09-26", "2003-10-29", "2003-11-26", "2003-12-29", "2004-01-28", "2004-02-25", "2004-03-26", "2004-04-28", "2004-05-27", "2004-06-28" ],
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CALENDAR",
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenter",
-                          "globalReference" : "20a71d"
+                        "meta" : {
+                          "globalKey" : "5bd8e80d"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "5bd8e80d",
+                        "externalKey" : "InterimValuationDates"
+                      }
+                    },
+                    "valuationTimeType" : "Close",
+                    "meta" : {
+                      "globalKey" : "29ce035a"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2004-07-15",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
                         },
-                        "businessDayConvention" : "FOLLOWING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "FinalValuationDate",
-                          "globalReference" : "2568f2ba"
+                        "meta" : {
+                          "globalKey" : "2568f2ba"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "2568f2ba",
+                        "externalKey" : "FinalValuationDate"
                       }
                     },
+                    "meta" : {
+                      "globalKey" : "9734743c"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "externalKey" : "InterimEquityPaymentDate",
-                        "globalKey" : "49ca07af"
-                      },
                       "relativeDates" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "49ca07af"
+                          "globalKey" : "4963d0d"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CALENDAR",
+                        "dayType" : "Calendar",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenter",
-                            "globalKey" : "20a71d"
+                            "globalKey" : "20a71d",
+                            "externalKey" : "primaryBusinessCenter"
                           }
                         },
+                        "dateRelativeTo" : {
+                          "globalReference" : "5bd8e80d",
+                          "externalReference" : "InterimValuationDates"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "4963d0d",
+                        "externalKey" : "InterimEquityPaymentDate"
+                      }
+                    } ],
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "34302a04"
+                        },
+                        "dayType" : "Calendar",
                         "businessDayConvention" : "FOLLOWING",
+                        "businessCentersReference" : {
+                          "globalReference" : "20a71d",
+                          "externalReference" : "primaryBusinessCenter"
+                        },
                         "dateRelativeTo" : {
-                          "externalReference" : "InterimValuationDates",
-                          "globalReference" : "5bd8e80d"
+                          "globalReference" : "2568f2ba",
+                          "externalReference" : "FinalValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "34302a04",
+                        "externalKey" : "FinalEquityPaymentDate"
                       }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "37b3ad1",
+                    "externalKey" : "EquityPaymentDate"
                   }
                 },
                 "underlier" : {
                   "basket" : {
                     "basketConstituent" : [ {
-                      "meta" : {
-                        "globalKey" : "1ff493"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "address" : {
@@ -412,12 +395,12 @@
                             "value" : "productIdentifier-8"
                           }
                         } ],
-                        "securityType" : "DEBT"
-                      }
-                    }, {
+                        "securityType" : "Debt"
+                      },
                       "meta" : {
                         "globalKey" : "1ff493"
-                      },
+                      }
+                    }, {
                       "security" : {
                         "productIdentifier" : [ {
                           "address" : {
@@ -425,12 +408,12 @@
                             "value" : "productIdentifier-7"
                           }
                         } ],
-                        "securityType" : "DEBT"
-                      }
-                    }, {
+                        "securityType" : "Debt"
+                      },
                       "meta" : {
                         "globalKey" : "1ff493"
-                      },
+                      }
+                    }, {
                       "security" : {
                         "productIdentifier" : [ {
                           "address" : {
@@ -438,12 +421,12 @@
                             "value" : "productIdentifier-6"
                           }
                         } ],
-                        "securityType" : "DEBT"
-                      }
-                    }, {
+                        "securityType" : "Debt"
+                      },
                       "meta" : {
                         "globalKey" : "1ff493"
-                      },
+                      }
+                    }, {
                       "security" : {
                         "productIdentifier" : [ {
                           "address" : {
@@ -451,12 +434,12 @@
                             "value" : "productIdentifier-5"
                           }
                         } ],
-                        "securityType" : "DEBT"
-                      }
-                    }, {
+                        "securityType" : "Debt"
+                      },
                       "meta" : {
                         "globalKey" : "1ff493"
-                      },
+                      }
+                    }, {
                       "security" : {
                         "productIdentifier" : [ {
                           "address" : {
@@ -464,12 +447,12 @@
                             "value" : "productIdentifier-1"
                           }
                         } ],
-                        "securityType" : "DEBT"
-                      }
-                    }, {
+                        "securityType" : "Debt"
+                      },
                       "meta" : {
                         "globalKey" : "1ff493"
-                      },
+                      }
+                    }, {
                       "security" : {
                         "productIdentifier" : [ {
                           "address" : {
@@ -477,7 +460,10 @@
                             "value" : "productIdentifier-3"
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "meta" : {
+                        "globalKey" : "1ff493"
                       }
                     }, {
                       "index" : {
@@ -502,531 +488,545 @@
                     "globalKey" : "8f103e0e"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
+                "fxFeature" : [ {
+                  "referenceCurrency" : {
+                    "value" : "EUR",
                     "meta" : {
-                      "globalKey" : "9734743c"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "2568f2ba"
-                        },
-                        "unadjustedDate" : "2004-07-15"
-                      },
-                      "meta" : {
-                        "externalKey" : "FinalValuationDate",
-                        "globalKey" : "2568f2ba"
-                      }
+                      "globalKey" : "10da2",
+                      "externalKey" : "ReferenceCurrency"
                     }
                   },
-                  "valuationDatesInitial" : {
-                    "determinationMethod" : "CALCULATION_AGENT",
-                    "meta" : {
-                      "globalKey" : "2e9ce1e9"
-                    },
-                    "valuationTimeType" : "CLOSE"
-                  },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "29ce035a"
-                    },
-                    "valuationDates" : {
-                      "adjustableDates" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "5bd8e80d"
-                        },
-                        "unadjustedDate" : [ "2002-07-26", "2002-08-28", "2002-09-26", "2002-10-27", "2002-11-28", "2002-12-26", "2003-01-29", "2003-02-26", "2003-03-26", "2003-04-28", "2003-05-28", "2003-06-26", "2003-07-29", "2003-08-27", "2003-09-26", "2003-10-29", "2003-11-26", "2003-12-29", "2004-01-28", "2004-02-25", "2004-03-26", "2004-04-28", "2004-05-27", "2004-06-28" ]
-                      },
-                      "meta" : {
-                        "externalKey" : "InterimValuationDates",
-                        "globalKey" : "5bd8e80d"
-                      }
-                    },
-                    "valuationTimeType" : "CLOSE"
+                  "composite" : {
+                    "determinationMethod" : "CalculationAgent"
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "EUTA"
-                    }, {
-                      "value" : "GBLO"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "4158421"
-                    }
-                  },
-                  "businessDayConvention" : "FOLLOWING",
-                  "meta" : {
-                    "globalKey" : "da3b6050"
+                } ],
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "5beec7fc"
-                },
-                "unadjustedDate" : "2004-07-20"
-              },
+                  "globalKey" : "5b4df7bb"
+                }
+              } ],
               "meta" : {
-                "externalKey" : "TerminationDate",
-                "globalKey" : "5beec7fc"
+                "globalKey" : "37a9b7e6"
+              }
+            },
+            "extraordinaryEvents" : {
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
               }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "a56e4050"
+            "globalKey" : "c8200d8e"
           }
         },
         "meta" : {
-          "globalKey" : "a56e4050"
+          "globalKey" : "c8200d8e"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "d9cf2ad9"
-          },
           "quantity" : [ {
+            "value" : {
+              "value" : 1
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
-            "value" : {
-              "value" : 1
             }
           }, {
+            "value" : {
+              "value" : 10500000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "60163047"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 432000,
               "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 10500000.00
+                "financialUnit" : "Share"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-5"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "ace79907"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "2a954d0b"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-8"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "67812345",
                   "meta" : {
                     "scheme" : "http://www.abc.com/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "67812345"
+                  }
                 },
+                "source" : "ISIN",
                 "meta" : {
                   "globalKey" : "2a954d0b"
-                },
-                "source" : "ISIN"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-8"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "28145455"
+            }
           },
+          "meta" : {
+            "globalKey" : "94f9d891"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 227000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-5"
+                "value" : "quantity-6"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 432000
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "c5a064ab"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "8c7b3893"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-7"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "56781234",
                   "meta" : {
                     "scheme" : "http://www.abc.com/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "56781234"
+                  }
                 },
+                "source" : "ISIN",
                 "meta" : {
                   "globalKey" : "8c7b3893"
-                },
-                "source" : "ISIN"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-7"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "2ebd9cd"
+            }
           },
+          "meta" : {
+            "globalKey" : "bc272825"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 783000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-6"
+                "value" : "quantity-3"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 227000
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "13975e88"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "edf40b0b"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-6"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "45678123",
                   "meta" : {
                     "scheme" : "http://www.abc.com/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "45678123"
+                  }
                 },
+                "source" : "ISIN",
                 "meta" : {
                   "globalKey" : "edf40b0b"
-                },
-                "source" : "ISIN"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-6"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "d08d5655"
+            }
           },
+          "meta" : {
+            "globalKey" : "854f5112"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 344000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-3"
+                "value" : "quantity-4"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 783000
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "b2059e2f"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "4f695893"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-5"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "34567812",
                   "meta" : {
                     "scheme" : "http://www.abc.com/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "34567812"
+                  }
                 },
+                "source" : "ISIN",
                 "meta" : {
                   "globalKey" : "4f695893"
-                },
-                "source" : "ISIN"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-5"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "9dc1b9cd"
+            }
           },
+          "meta" : {
+            "globalKey" : "46ac5da9"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 340000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-4"
+                "value" : "quantity-7"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 344000
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "57ef322b"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "b0de890b"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "23456781",
                   "meta" : {
                     "scheme" : "http://www.abc.com/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "23456781"
+                  }
                 },
+                "source" : "ISIN",
                 "meta" : {
                   "globalKey" : "b0de890b"
-                },
-                "source" : "ISIN"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "6af29855"
+            }
           },
+          "meta" : {
+            "globalKey" : "8c6615b5"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 2486000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-7"
+                "value" : "quantity-8"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 340000
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "a7e97782"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "1253b893"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-3"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "12345678",
                   "meta" : {
                     "scheme" : "http://www.abc.com/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "12345678"
+                  }
                 },
+                "source" : "ISIN",
                 "meta" : {
                   "globalKey" : "1253b893"
-                },
-                "source" : "ISIN"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-3"
+                } ]
               }
-            } ]
-          },
-          "quantity" : [ {
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-8"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 2486000
+              "globalKey" : "382359cd"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "e6a9f4a4"
           },
+          "meta" : {
+            "globalKey" : "aef673fc"
+          }
+        }, {
           "observable" : {
-            "meta" : {
-              "globalKey" : "e6a9f4a4"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-4"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "MSCIWGBI",
                   "meta" : {
                     "scheme" : "http://www.bloomberg.com"
-                  },
-                  "value" : "MSCIWGBI"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "c25c4493"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-4"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "MSCI World Government Bond Index."
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "8b235557"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          }
-        }, {
-          "meta" : {
-            "globalKey" : "6a7429d1"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e0e"
-            },
-            "rateOption" : {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
+                  "value" : "productIdentifier-2"
                 } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EURIBOR-Telerate"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 3
-                }
               }
+            } ],
+            "meta" : {
+              "globalKey" : "ee949fdc"
             }
           },
+          "meta" : {
+            "globalKey" : "ee949fdc"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0050,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.0050,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
-          } ]
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EURIBOR-Telerate"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 3,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2bba16de"
+            }
+          },
+          "meta" : {
+            "globalKey" : "a1e64d09"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e91d1"
-      },
-      "value" : "2002-07-17"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      } ],
+      "adjustment" : "Execution"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/eqs-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://http://www.partyB.com/eqs-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "5678"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "222ee2ce"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "2ccbe424"
+    }
+  },
+  "meta" : {
+    "globalKey" : "2ccbe424"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex08-composite-basket-long-form-separate-spreads.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex08-composite-basket-long-form-separate-spreads.json
index 205530e67a..0c07841639 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex08-composite-basket-long-form-separate-spreads.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex08-composite-basket-long-form-separate-spreads.json
@@ -1,112 +1,50 @@
 {
-  "meta" : {
-    "globalKey" : "ff33d488"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1245",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/eqs-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
       "meta" : {
-        "globalKey" : "92c7c587"
+        "globalKey" : "95918677"
       }
-    },
-    "meta" : {
-      "globalKey" : "ff33d488"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "4569",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/eqs-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "95936378"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-07-17",
+      "meta" : {
+        "globalKey" : "3e91d1",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "EXECUTION",
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Swap:PriceReturnBasicPerformance:Basket"
@@ -117,444 +55,298 @@
             "productQualifier" : "EquitySwap_TotalReturnBasicPerformance_Basket"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
-              "meta" : {
-                "externalKey" : "EffectiveDate",
-                "globalKey" : "6a2df5e0"
-              },
               "relativeDate" : {
+                "periodMultiplier" : 3,
+                "period" : "D",
                 "meta" : {
-                  "globalKey" : "6a2df5e0"
+                  "globalKey" : "fed6ed42"
                 },
-                "period" : "D",
-                "periodMultiplier" : 3,
-                "dayType" : "EXCHANGE_BUSINESS",
-                "businessDayConvention" : "NOT_APPLICABLE",
+                "dayType" : "ExchangeBusiness",
+                "businessDayConvention" : "NotApplicable",
                 "dateRelativeTo" : {
-                  "externalReference" : "TradeDate",
-                  "globalReference" : "3e91d1"
+                  "globalReference" : "3e91d1",
+                  "externalReference" : "TradeDate"
                 }
+              },
+              "meta" : {
+                "globalKey" : "fed6ed42",
+                "externalKey" : "EffectiveDate"
               }
             },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "edf02740"
+                },
+                "businessDayConvention" : "NotApplicable",
+                "dateRelativeTo" : {
+                  "globalReference" : "1c4a714",
+                  "externalReference" : "FinalEquityPaymentDate"
+                }
               },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
+              "meta" : {
+                "globalKey" : "edf02740",
+                "externalKey" : "TerminationDate"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "607b91fd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "EquityNotionalAmount",
-                    "globalReference" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "EquityNotionalAmount"
+                  },
+                  "meta" : {
+                    "globalKey" : "607b91fd"
                   }
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "globalKey" : "6a2df5e0"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 3,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "6a2df5e0"
+                        "globalKey" : "fed6ed42"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 3,
-                      "dayType" : "EXCHANGE_BUSINESS",
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "dayType" : "ExchangeBusiness",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "TradeDate",
-                        "globalReference" : "3e91d1"
+                        "globalReference" : "3e91d1",
+                        "externalReference" : "TradeDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "fed6ed42"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "InterestLegPeriodDates",
-                    "globalKey" : "8fbb2a68"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "globalKey" : "f18f7c48"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "f18f7c48"
+                        "globalKey" : "edf02740"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "FinalEquityPaymentDate",
-                        "globalReference" : "f37c0032"
+                        "globalReference" : "1c4a714",
+                        "externalReference" : "FinalEquityPaymentDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "edf02740"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f0f22bbe",
+                    "externalKey" : "InterestLegPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "f5120739"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "9b9d36de"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "9b9d36de"
-                      },
                       "relativeDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "9b9d36de"
+                          "globalKey" : "97fde1d6"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "dateRelativeTo" : {
-                          "externalReference" : "EquityPaymentDate",
-                          "globalReference" : "ecd01e44"
+                          "globalReference" : "9cebe528",
+                          "externalReference" : "EquityPaymentDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "97fde1d6"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97fde1d6"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "InterestLegPeriodDates",
-                    "globalReference" : "8fbb2a68"
+                    "globalReference" : "f0f22bbe",
+                    "externalReference" : "InterestLegPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "9e9ada33"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "92fd2d87"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "727a2aed"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "EquityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
-                },
-                "fxFeature" : [ {
-                  "composite" : {
-                    "determinationMethod" : "CALCULATION_AGENT"
-                  },
-                  "referenceCurrency" : {
-                    "meta" : {
-                      "externalKey" : "ReferenceCurrency",
-                      "globalKey" : "10da2"
-                    },
-                    "value" : "EUR"
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "EquityNotionalAmount"
                   }
-                } ],
-                "meta" : {
-                  "globalKey" : "cc5cb074"
                 },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "EquityPaymentDate",
-                    "globalKey" : "ecd01e44"
-                  },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "externalKey" : "FinalEquityPaymentDate",
-                        "globalKey" : "f37c0032"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "f37c0032"
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "adjustableDates" : {
+                        "unadjustedDate" : [ "2002-10-17" ],
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessCentersReference" : {
-                          "externalReference" : "primaryBusinessCenter",
-                          "globalReference" : "27e4e9"
+                        "meta" : {
+                          "globalKey" : "252fbafc"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "252fbafc",
+                        "externalKey" : "InterimValuationDate"
+                      }
+                    },
+                    "valuationTimeType" : "Close",
+                    "meta" : {
+                      "globalKey" : "3e0a124f"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2004-01-17",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
                         },
-                        "businessDayConvention" : "FOLLOWING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "FinalValuationDate",
-                          "globalReference" : "256358bc"
+                        "meta" : {
+                          "globalKey" : "256358bc"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "256358bc",
+                        "externalKey" : "FinalValuationDate"
                       }
                     },
+                    "meta" : {
+                      "globalKey" : "972eda3e"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "externalKey" : "InterimEquityPaymentDate",
-                        "globalKey" : "2519d1b6"
-                      },
                       "relativeDates" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "2519d1b6"
+                          "globalKey" : "dfe60714"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenter",
-                            "globalKey" : "27e4e9"
+                            "globalKey" : "27e4e9",
+                            "externalKey" : "primaryBusinessCenter"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "InterimValuationDate",
-                          "globalReference" : "252fbafc"
-                        }
-                      }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendCurrency" : {
-                      "currencyReference" : {
-                        "externalReference" : "ReferenceCurrency",
-                        "globalReference" : "10da2"
-                      }
-                    },
-                    "dividendEntitlement" : "EX_DATE",
-                    "dividendPayoutRatio" : [ {
-                      "basketConstituent" : {
-                        "meta" : {
-                          "globalKey" : "7a5b92c5"
-                        },
-                        "security" : {
-                          "productIdentifier" : [ {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "productIdentifier-6"
-                            }
-                          }, {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "productIdentifier-12"
-                            }
-                          } ],
-                          "securityType" : "EQUITY"
-                        }
-                      },
-                      "totalRatio" : 0.85
-                    }, {
-                      "basketConstituent" : {
-                        "meta" : {
-                          "globalKey" : "7a5b92c5"
-                        },
-                        "security" : {
-                          "productIdentifier" : [ {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "productIdentifier-5"
-                            }
-                          }, {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "productIdentifier-10"
-                            }
-                          } ],
-                          "securityType" : "EQUITY"
-                        }
-                      },
-                      "totalRatio" : 0.85
-                    }, {
-                      "basketConstituent" : {
-                        "meta" : {
-                          "globalKey" : "7a5b92c5"
-                        },
-                        "security" : {
-                          "productIdentifier" : [ {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "productIdentifier-11"
-                            }
-                          }, {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "productIdentifier-3"
-                            }
-                          } ],
-                          "securityType" : "EQUITY"
-                        }
-                      },
-                      "totalRatio" : 0.85
-                    }, {
-                      "basketConstituent" : {
-                        "meta" : {
-                          "globalKey" : "7a5b92c5"
-                        },
-                        "security" : {
-                          "productIdentifier" : [ {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "productIdentifier-4"
-                            }
-                          }, {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "productIdentifier-9"
-                            }
-                          } ],
-                          "securityType" : "EQUITY"
+                          "globalReference" : "252fbafc",
+                          "externalReference" : "InterimValuationDate"
                         }
                       },
-                      "totalRatio" : 0.85
-                    }, {
-                      "basketConstituent" : {
-                        "meta" : {
-                          "globalKey" : "7a5b92c5"
-                        },
-                        "security" : {
-                          "productIdentifier" : [ {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "productIdentifier-8"
-                            }
-                          }, {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "productIdentifier-1"
-                            }
-                          } ],
-                          "securityType" : "EQUITY"
-                        }
-                      },
-                      "totalRatio" : 0.85
-                    }, {
-                      "basketConstituent" : {
+                      "meta" : {
+                        "globalKey" : "dfe60714",
+                        "externalKey" : "InterimEquityPaymentDate"
+                      }
+                    } ],
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "7a5b92c5"
+                          "globalKey" : "1c4a714"
                         },
-                        "security" : {
-                          "productIdentifier" : [ {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "productIdentifier-2"
-                            }
-                          }, {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "productIdentifier-7"
-                            }
-                          } ],
-                          "securityType" : "EQUITY"
-                        }
-                      },
-                      "totalRatio" : 0.85
-                    } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "EQUITY_PAYMENT_DATE"
-                        }
-                      },
-                      "endDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "FinalValuationDate",
-                          "globalReference" : "256358bc"
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "primaryBusinessCenter"
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "256358bc",
+                          "externalReference" : "FinalValuationDate"
                         }
                       },
-                      "startDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "TradeDate",
-                          "globalReference" : "3e91d1"
-                        }
+                      "meta" : {
+                        "globalKey" : "1c4a714",
+                        "externalKey" : "FinalEquityPaymentDate"
                       }
-                    } ],
-                    "dividendReinvestment" : false,
-                    "excessDividendAmount" : "PAID_AMOUNT"
+                    }
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                  "meta" : {
+                    "globalKey" : "9cebe528",
+                    "externalKey" : "EquityPaymentDate"
                   }
                 },
                 "underlier" : {
                   "basket" : {
                     "basketConstituent" : [ {
-                      "meta" : {
-                        "globalKey" : "7a5b92c5"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "address" : {
@@ -567,12 +359,12 @@
                             "value" : "productIdentifier-12"
                           }
                         } ],
-                        "securityType" : "EQUITY"
-                      }
-                    }, {
+                        "securityType" : "Equity"
+                      },
                       "meta" : {
                         "globalKey" : "7a5b92c5"
-                      },
+                      }
+                    }, {
                       "security" : {
                         "productIdentifier" : [ {
                           "address" : {
@@ -585,12 +377,12 @@
                             "value" : "productIdentifier-10"
                           }
                         } ],
-                        "securityType" : "EQUITY"
-                      }
-                    }, {
+                        "securityType" : "Equity"
+                      },
                       "meta" : {
                         "globalKey" : "7a5b92c5"
-                      },
+                      }
+                    }, {
                       "security" : {
                         "productIdentifier" : [ {
                           "address" : {
@@ -603,12 +395,12 @@
                             "value" : "productIdentifier-3"
                           }
                         } ],
-                        "securityType" : "EQUITY"
-                      }
-                    }, {
+                        "securityType" : "Equity"
+                      },
                       "meta" : {
                         "globalKey" : "7a5b92c5"
-                      },
+                      }
+                    }, {
                       "security" : {
                         "productIdentifier" : [ {
                           "address" : {
@@ -621,12 +413,12 @@
                             "value" : "productIdentifier-9"
                           }
                         } ],
-                        "securityType" : "EQUITY"
-                      }
-                    }, {
+                        "securityType" : "Equity"
+                      },
                       "meta" : {
                         "globalKey" : "7a5b92c5"
-                      },
+                      }
+                    }, {
                       "security" : {
                         "productIdentifier" : [ {
                           "address" : {
@@ -639,12 +431,12 @@
                             "value" : "productIdentifier-1"
                           }
                         } ],
-                        "securityType" : "EQUITY"
-                      }
-                    }, {
+                        "securityType" : "Equity"
+                      },
                       "meta" : {
                         "globalKey" : "7a5b92c5"
-                      },
+                      }
+                    }, {
                       "security" : {
                         "productIdentifier" : [ {
                           "address" : {
@@ -657,7 +449,10 @@
                             "value" : "productIdentifier-7"
                           }
                         } ],
-                        "securityType" : "EQUITY"
+                        "securityType" : "Equity"
+                      },
+                      "meta" : {
+                        "globalKey" : "7a5b92c5"
                       }
                     } ]
                   },
@@ -665,723 +460,928 @@
                     "globalKey" : "582779de"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
+                "fxFeature" : [ {
+                  "referenceCurrency" : {
+                    "value" : "EUR",
                     "meta" : {
-                      "globalKey" : "972eda3e"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
+                      "globalKey" : "10da2",
+                      "externalKey" : "ReferenceCurrency"
+                    }
+                  },
+                  "composite" : {
+                    "determinationMethod" : "CalculationAgent"
+                  }
+                } ],
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
+                  },
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 0.85,
+                      "basketConstituent" : {
+                        "security" : {
+                          "productIdentifier" : [ {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "productIdentifier-6"
+                            }
+                          }, {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "productIdentifier-12"
+                            }
+                          } ],
+                          "securityType" : "Equity"
                         },
                         "meta" : {
-                          "globalKey" : "256358bc"
+                          "globalKey" : "7a5b92c5"
+                        }
+                      }
+                    }, {
+                      "totalRatio" : 0.85,
+                      "basketConstituent" : {
+                        "security" : {
+                          "productIdentifier" : [ {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "productIdentifier-5"
+                            }
+                          }, {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "productIdentifier-10"
+                            }
+                          } ],
+                          "securityType" : "Equity"
                         },
-                        "unadjustedDate" : "2004-01-17"
-                      },
-                      "meta" : {
-                        "externalKey" : "FinalValuationDate",
-                        "globalKey" : "256358bc"
+                        "meta" : {
+                          "globalKey" : "7a5b92c5"
+                        }
                       }
-                    }
-                  },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "3e0a124f"
-                    },
-                    "valuationDates" : {
-                      "adjustableDates" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
+                    }, {
+                      "totalRatio" : 0.85,
+                      "basketConstituent" : {
+                        "security" : {
+                          "productIdentifier" : [ {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "productIdentifier-11"
+                            }
+                          }, {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "productIdentifier-3"
+                            }
+                          } ],
+                          "securityType" : "Equity"
                         },
                         "meta" : {
-                          "globalKey" : "252fbafc"
+                          "globalKey" : "7a5b92c5"
+                        }
+                      }
+                    }, {
+                      "totalRatio" : 0.85,
+                      "basketConstituent" : {
+                        "security" : {
+                          "productIdentifier" : [ {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "productIdentifier-4"
+                            }
+                          }, {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "productIdentifier-9"
+                            }
+                          } ],
+                          "securityType" : "Equity"
                         },
-                        "unadjustedDate" : [ "2002-10-17" ]
-                      },
-                      "meta" : {
-                        "externalKey" : "InterimValuationDate",
-                        "globalKey" : "252fbafc"
+                        "meta" : {
+                          "globalKey" : "7a5b92c5"
+                        }
+                      }
+                    }, {
+                      "totalRatio" : 0.85,
+                      "basketConstituent" : {
+                        "security" : {
+                          "productIdentifier" : [ {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "productIdentifier-8"
+                            }
+                          }, {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "productIdentifier-1"
+                            }
+                          } ],
+                          "securityType" : "Equity"
+                        },
+                        "meta" : {
+                          "globalKey" : "7a5b92c5"
+                        }
+                      }
+                    }, {
+                      "totalRatio" : 0.85,
+                      "basketConstituent" : {
+                        "security" : {
+                          "productIdentifier" : [ {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "productIdentifier-2"
+                            }
+                          }, {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "productIdentifier-7"
+                            }
+                          } ],
+                          "securityType" : "Equity"
+                        },
+                        "meta" : {
+                          "globalKey" : "7a5b92c5"
+                        }
+                      }
+                    } ],
+                    "dividendReinvestment" : false,
+                    "dividendEntitlement" : "ExDate",
+                    "excessDividendAmount" : "PaidAmount",
+                    "dividendCurrency" : {
+                      "currencyReference" : {
+                        "globalReference" : "10da2",
+                        "externalReference" : "ReferenceCurrency"
                       }
                     },
-                    "valuationTimeType" : "CLOSE"
+                    "dividendPeriod" : [ {
+                      "startDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "3e91d1",
+                          "externalReference" : "TradeDate"
+                        }
+                      },
+                      "endDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "256358bc",
+                          "externalReference" : "FinalValuationDate"
+                        }
+                      },
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "EquityPaymentDate"
+                        }
+                      }
+                    } ]
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "meta" : {
-                "externalKey" : "TerminationDate",
-                "globalKey" : "f18f7c48"
-              },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "f18f7c48"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NOT_APPLICABLE",
-                "dateRelativeTo" : {
-                  "externalReference" : "FinalEquityPaymentDate",
-                  "globalReference" : "f37c0032"
+                "meta" : {
+                  "globalKey" : "b8aee4b6"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "f66b8efd"
               }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "9827b4a2"
+            "globalKey" : "284bc712"
           }
         },
         "meta" : {
-          "globalKey" : "9827b4a2"
+          "globalKey" : "284bc712"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "63907204"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
             "value" : {
+              "value" : 19785157.16,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 19785157.16,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
+              "priceType" : "AssetPrice"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 1
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
-            "value" : {
-              "value" : 1
             }
           }, {
+            "value" : {
+              "value" : 19785157.16,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e7dce7c"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 432000,
               "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 19785157.16
+                "financialUnit" : "Share"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-5"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "fb1a5eb"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bd93d4ef"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-6"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "TIT.ME",
                   "meta" : {
                     "scheme" : "http://www.abc.com/instrumentId"
-                  },
-                  "value" : "TIT.ME"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "79fd3857"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-12"
+                  "value" : "productIdentifier-6"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "Telecom Italia spa"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "5d986ee6"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-12"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "f4e6c8f1"
+            }
           },
+          "meta" : {
+            "globalKey" : "7e8f302d"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 227000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-5"
+                "value" : "quantity-6"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 432000
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "264c0ec9"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "19405131"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-5"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "NOK1V.HE",
                   "meta" : {
                     "scheme" : "http://www.abc.com/instrumentId"
-                  },
-                  "value" : "NOK1V.HE"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "62f843cc"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-10"
+                  "value" : "productIdentifier-5"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "Nokya Oyj"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "b06a157d"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-10"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "ec9d4ef"
+            }
           },
+          "meta" : {
+            "globalKey" : "4f70147"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 783000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-6"
+                "value" : "quantity-3"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 227000
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "e20594f5"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f32d738"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-11"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "TIM.MI",
                   "meta" : {
                     "scheme" : "http://www.abc.com/instrumentId"
-                  },
-                  "value" : "TIM.MI"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "79fa09c2"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-3"
+                  "value" : "productIdentifier-11"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "Telecom Italia Mobile spa"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "64317ba"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-3"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "87280fc8"
+            }
           },
+          "meta" : {
+            "globalKey" : "cb0048c5"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 344000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-3"
+                "value" : "quantity-4"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 783000
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "812d19a5"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "82d82489"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-4"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "TEF.MC",
                   "meta" : {
                     "scheme" : "http://www.abc.com/instrumentId"
-                  },
-                  "value" : "TEF.MC"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "79be7d1f"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-9"
+                  "value" : "productIdentifier-4"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "Telefonica de Espana"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "132a4648"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-9"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "d82c6c97"
+            }
           },
+          "meta" : {
+            "globalKey" : "b72bbb73"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 340000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-4"
+                "value" : "quantity-7"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 344000
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "a0db8f91"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "c41e6af1"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-8"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "PTCO.IN",
                   "meta" : {
                     "scheme" : "http://www.abc.com/instrumentId"
-                  },
-                  "value" : "PTCO.IN"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "198e953"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
+                  "value" : "productIdentifier-8"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "Portugal Telecom SA"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "5feb7864"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "bfaef32f"
+            }
           },
+          "meta" : {
+            "globalKey" : "26e88f"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 2486000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-7"
+                "value" : "quantity-8"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 340000
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "aa2288b6"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "342ec0c7"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "VOD.L",
                   "meta" : {
                     "scheme" : "http://www.abc.com/instrumentId"
-                  },
-                  "value" : "VOD.L"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "eb5b5eb9"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-7"
+                  "value" : "productIdentifier-2"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "Vodafone Group"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "9b6ed3e0"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-8"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
+                }
               },
-              "value" : 2486000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "75e4aed1"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e0e"
-            },
-            "rateOption" : {
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
+                  "value" : "productIdentifier-7"
                 } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EURIBOR-Telerate"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 3
-                }
               }
+            } ],
+            "meta" : {
+              "globalKey" : "51a95819"
             }
           },
+          "meta" : {
+            "globalKey" : "3685d308"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0050,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.0050,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          }, {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-7"
+                "value" : "price-1"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 0.0050,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.0050,
               "datedValue" : [ {
                 "date" : "2002-03-17",
+                "value" : 0.0055,
                 "meta" : {
                   "globalKey" : "5c1aeced"
-                },
-                "value" : 0.0055
+                }
               } ],
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          }, {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-4"
+                "value" : "price-7"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 0.0050,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.0050,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          }, {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-6"
+                "value" : "price-4"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 0.0050,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.0050,
               "datedValue" : [ {
                 "date" : "2002-04-17",
+                "value" : 0.0042,
                 "meta" : {
                   "globalKey" : "5c1af48b"
-                },
-                "value" : 0.0042
+                }
               } ],
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          }, {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-3"
+                "value" : "price-6"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 0.0050,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.0050,
               "datedValue" : [ {
                 "date" : "2002-03-20",
+                "value" : 0.0065,
                 "meta" : {
                   "globalKey" : "5c1aed69"
-                },
-                "value" : 0.0065
+                }
               } ],
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          }, {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-5"
+                "value" : "price-3"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 0.0050,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.0050,
               "datedValue" : [ {
                 "date" : "2002-02-22",
+                "value" : 0.0022,
                 "meta" : {
                   "globalKey" : "5c1ae568"
-                },
-                "value" : 0.0022
+                }
               } ],
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-5"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EURIBOR-Telerate"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 3,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2bba16de"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "5bc6a131"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e91d1"
-      },
-      "value" : "2002-07-17"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      } ],
+      "adjustment" : "Execution"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/eqs-trade-id"
-          },
-          "value" : "1245"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "1b21b9ed"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/eqs-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "4569"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "206b8210"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "773215d0"
+    }
+  },
+  "meta" : {
+    "globalKey" : "773215d0"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex15-forward-starting-pre-european-interdealer-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex15-forward-starting-pre-european-interdealer-share-swap-short-form.json
index e69476d05b..bdc71130a7 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex15-forward-starting-pre-european-interdealer-share-swap-short-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex15-forward-starting-pre-european-interdealer-share-swap-short-form.json
@@ -1,94 +1,47 @@
 {
-  "meta" : {
-    "globalKey" : "6955f5a"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2009-09-01",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationAnnexType" : {
-              "value" : "ISDA_2009_EQUITY_EUROPEAN_INTERDEALER_SS"
-            },
-            "masterConfirmationType" : {
-              "value" : "ISDA_2009_EQUITY_EUROPEAN_INTERDEALER"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "4c54b2a2",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1558488",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/trade-id-1-0"
           }
         },
-        "meta" : {
-          "globalKey" : "81f44b30"
-        }
+        "version" : 1
       } ],
       "meta" : {
-        "globalKey" : "81f44b30"
+        "globalKey" : "975c9559"
       }
-    },
-    "meta" : {
-      "globalKey" : "6955f5a"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "f952948c"
-      },
-      "name" : {
-        "value" : "AAA Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "eed3b7e2"
-      },
-      "name" : {
-        "value" : "Mega Bank Ltd"
+      "issuerReference" : {
+        "globalReference" : "68bd5b2e",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "8848551",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
+            "scheme" : "http://www.partyB.com/trade-id-1-0"
+          }
         },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
-    } ],
-    "partyRole" : [ {
-      "partyReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "eed3b7e2"
-      },
-      "role" : "HEDGING_PARTY"
+        "version" : 1
+      } ],
+      "meta" : {
+        "globalKey" : "ec6c15a"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-09-09",
+      "meta" : {
+        "globalKey" : "3eca49"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "eed3b7e2"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "f952948c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -98,6 +51,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-10-09",
                 "dateAdjustments" : {
                   "businessDayConvention" : "FOLLOWING",
                   "meta" : {
@@ -106,33 +60,75 @@
                 },
                 "meta" : {
                   "globalKey" : "bf754eba"
+                }
+              },
+              "meta" : {
+                "globalKey" : "bf754eba",
+                "externalKey" : "equityEffectiveDate"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-12-09",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
+                  "meta" : {
+                    "globalKey" : "d3bf0271"
+                  }
                 },
-                "unadjustedDate" : "2009-10-09"
+                "meta" : {
+                  "globalKey" : "bf772f3a"
+                }
               },
               "meta" : {
-                "externalKey" : "equityEffectiveDate",
-                "globalKey" : "bf754eba"
+                "globalKey" : "bf772f3a"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "equityNotionalAmount"
+                  },
                   "meta" : {
                     "globalKey" : "54b65ddd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "equityNotionalAmount",
-                    "globalReference" : "4cf"
                   }
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-10-13",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -141,28 +137,24 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "3b28889f"
-                      },
-                      "unadjustedDate" : "2009-10-13"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "interestEffectiveDate",
-                      "globalKey" : "3b28889f"
+                      "globalKey" : "3b28889f",
+                      "externalKey" : "interestEffectiveDate"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "interestCalcPeriodDates",
-                    "globalKey" : "16cca080"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-12-11",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -171,132 +163,108 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "122b26e1"
-                      },
-                      "unadjustedDate" : "2009-12-11"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "interestTerminationDate",
-                      "globalKey" : "122b26e1"
+                      "globalKey" : "122b26e1",
+                      "externalKey" : "interestTerminationDate"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "16cca080",
+                    "externalKey" : "interestCalcPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "eeb78e83"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "interestLegPaymentDates",
-                    "globalKey" : "b3c2835f"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "b3c2835f"
-                      },
                       "periodicDates" : {
-                        "endDate" : {
-                          "meta" : {
-                            "globalKey" : "97eae877"
-                          },
+                        "startDate" : {
                           "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "97eae877"
+                              "globalKey" : "df205212"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "dateRelativeTo" : {
-                              "externalReference" : "interestTerminationDate",
-                              "globalReference" : "122b26e1"
+                              "globalReference" : "3b28889f",
+                              "externalReference" : "interestEffectiveDate"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "df205212"
                           }
                         },
-                        "periodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "EUTA"
-                            } ],
+                        "endDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "20a71d"
+                              "globalKey" : "944b936f"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "122b26e1",
+                              "externalReference" : "interestTerminationDate"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
-                            "globalKey" : "211dc30c"
+                            "globalKey" : "944b936f"
                           }
                         },
                         "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "12ce6"
+                            "globalKey" : "18ce"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
                           "rollConvention" : "9"
                         },
-                        "startDate" : {
-                          "meta" : {
-                            "globalKey" : "e2bfa71a"
-                          },
-                          "relativeDate" : {
+                        "periodDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "EUTA"
+                            } ],
                             "meta" : {
-                              "globalKey" : "e2bfa71a"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "interestEffectiveDate",
-                              "globalReference" : "3b28889f"
+                              "globalKey" : "20a71d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "211dc30c"
                           }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "5102c281"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "5102c281",
+                    "externalKey" : "interestLegPaymentDates"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "interestCalcPeriodDates",
-                    "globalReference" : "16cca080"
+                    "globalReference" : "16cca080",
+                    "externalReference" : "interestCalcPeriodDates"
                   },
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "36741a11"
+                      "globalKey" : "135004c5"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "CURRENCY_BUSINESS",
+                    "dayType" : "CurrencyBusiness",
+                    "businessDayConvention" : "PRECEDING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -305,93 +273,153 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "PRECEDING",
                     "dateRelativeTo" : {
-                      "externalReference" : "interestLegPaymentDates",
-                      "globalReference" : "b3c2835f"
+                      "globalReference" : "5102c281",
+                      "externalReference" : "interestLegPaymentDates"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "5dd36e9e"
-                  },
                   "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 1,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "f9c90e82"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "3a50ba7"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "9183aafb"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "reset" : true,
                   "meta" : {
-                    "externalKey" : "equityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
-                  "reset" : true
+                    "globalKey" : "4cf",
+                    "externalKey" : "equityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "10da2"
-                  },
                   "settlementCurrency" : {
                     "value" : "EUR"
+                  },
+                  "meta" : {
+                    "globalKey" : "10da2"
                   }
                 },
-                "meta" : {
-                  "externalKey" : "returnLeg",
-                  "globalKey" : "e28f581e"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "99224396"
+                "valuationDates" : {
+                  "valuationDatesInitial" : {
+                    "determinationMethod" : "AgreedInitialPrice",
+                    "meta" : {
+                      "globalKey" : "643bb87"
+                    }
                   },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "globalKey" : "815a0f35"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "815a0f35"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "EUTA"
-                          } ],
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "periodicDates" : {
+                        "startDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "9229ce57"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "bf754eba",
+                              "externalReference" : "equityEffectiveDate"
+                            }
+                          },
                           "meta" : {
-                            "globalKey" : "20a71d"
+                            "globalKey" : "9229ce57"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "finalValuationDate",
-                          "globalReference" : "bf772f3a"
+                        "endDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "b635d2a0"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "bf772f3a",
+                              "externalReference" : "finalValuationDate"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "b635d2a0"
+                          }
+                        },
+                        "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "18ce"
+                          },
+                          "rollConvention" : "9"
+                        },
+                        "periodDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "meta" : {
+                            "globalKey" : "d3bf0271"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "6e25f168",
+                        "externalKey" : "interimValuationDate"
                       }
                     },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "964475eb"
+                    "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                    "meta" : {
+                      "globalKey" : "2a105a71"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2009-12-09",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "meta" : {
+                            "globalKey" : "d3bf0271"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "bf772f3a"
+                        }
                       },
+                      "meta" : {
+                        "globalKey" : "bf772f3a",
+                        "externalKey" : "finalValuationDate"
+                      }
+                    },
+                    "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                    "meta" : {
+                      "globalKey" : "d2afe7a4"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
                       "relativeDates" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "964475eb"
+                          "globalKey" : "24ad6927"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -400,44 +428,47 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "interimValuationDate",
-                          "globalReference" : "edd10e00"
+                          "globalReference" : "6e25f168",
+                          "externalReference" : "interimValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "24ad6927"
                       }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendComposition" : "EQUITY_AMOUNT_RECEIVER_ELECTION",
-                    "dividendCurrency" : {
-                      "determinationMethod" : "ISSUER_PAYMENT_CURRENCY"
-                    },
-                    "dividendPayoutRatio" : [ {
-                      "cashRatio" : 1,
-                      "nonCashRatio" : 1,
-                      "totalRatio" : 1
                     } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "CASH_SETTLEMENT_PAYMENT_DATE"
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "fc30271"
+                        },
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "EUTA"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "20a71d"
+                          }
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "bf772f3a",
+                          "externalReference" : "finalValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "fc30271"
                       }
-                    } ],
-                    "firstOrSecondPeriod" : "SECOND_PERIOD",
-                    "nonCashDividendTreatment" : "POTENTIAL_ADJUSTMENT_EVENT"
+                    }
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                  "meta" : {
+                    "globalKey" : "35da2aea"
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -455,297 +486,266 @@
                         "value" : "productIdentifier-3"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
-                    "meta" : {
-                      "globalKey" : "d2afe7a4"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "FOLLOWING",
-                          "meta" : {
-                            "globalKey" : "d3bf0271"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "bf772f3a"
-                        },
-                        "unadjustedDate" : "2009-12-09"
-                      },
-                      "meta" : {
-                        "externalKey" : "finalValuationDate",
-                        "globalKey" : "bf772f3a"
-                      }
-                    },
-                    "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
-                  },
-                  "valuationDatesInitial" : {
-                    "determinationMethod" : "AGREED_INITIAL_PRICE",
-                    "meta" : {
-                      "globalKey" : "643bb87"
-                    }
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
                   },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "a9bb7709"
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 1,
+                      "cashRatio" : 1,
+                      "nonCashRatio" : 1
+                    } ],
+                    "firstOrSecondPeriod" : "SecondPeriod",
+                    "dividendCurrency" : {
+                      "determinationMethod" : "IssuerPaymentCurrency"
                     },
-                    "valuationDates" : {
-                      "meta" : {
-                        "externalKey" : "interimValuationDate",
-                        "globalKey" : "edd10e00"
-                      },
-                      "periodicDates" : {
-                        "endDate" : {
-                          "meta" : {
-                            "globalKey" : "b9d527a8"
-                          },
-                          "relativeDate" : {
-                            "meta" : {
-                              "globalKey" : "b9d527a8"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "finalValuationDate",
-                              "globalReference" : "bf772f3a"
-                            }
-                          }
-                        },
-                        "periodDatesAdjustments" : {
-                          "businessDayConvention" : "FOLLOWING",
-                          "meta" : {
-                            "globalKey" : "d3bf0271"
-                          }
-                        },
-                        "periodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12ce6"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "9"
-                        },
-                        "startDate" : {
-                          "meta" : {
-                            "globalKey" : "95c9235f"
-                          },
-                          "relativeDate" : {
-                            "meta" : {
-                              "globalKey" : "95c9235f"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "equityEffectiveDate",
-                              "globalReference" : "bf754eba"
-                            }
-                          }
+                    "nonCashDividendTreatment" : "PotentialAdjustmentEvent",
+                    "dividendComposition" : "EquityAmountReceiverElection",
+                    "dividendPeriod" : [ {
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "CashSettlementPaymentDate"
                         }
                       }
-                    },
-                    "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
-                  }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "FOLLOWING",
-                  "meta" : {
-                    "globalKey" : "d3bf0271"
+                    } ]
                   }
                 },
                 "meta" : {
-                  "globalKey" : "bf772f3a"
-                },
-                "unadjustedDate" : "2009-12-09"
-              },
+                  "globalKey" : "a2147b9c",
+                  "externalKey" : "returnLeg"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "bf772f3a"
+                "globalKey" : "1198c1d5"
               }
             }
           },
           "meta" : {
-            "globalKey" : "b147bd25"
+            "globalKey" : "bba39695"
           }
         },
         "meta" : {
-          "globalKey" : "b147bd25"
+          "globalKey" : "bba39695"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "55b1ca42"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "affa401e"
+          "price" : [ {
+            "value" : {
+              "value" : 0,
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Reuters"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
+                  "periodMultiplier" : 1,
                   "period" : "M",
-                  "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
+            },
+            "meta" : {
+              "globalKey" : "4f4caf8a"
             }
           },
-          "price" : [ {
+          "meta" : {
+            "globalKey" : "30213f06"
+          }
+        }, {
+          "quantity" : [ {
+            "value" : {
+              "value" : 100000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-1"
+                "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "value" : 0,
-              "arithmeticOperator" : "ADD",
-              "priceType" : "INTEREST_RATE"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "688e7596"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "ed6378f8"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "BMWG.DE",
                   "meta" : {
                     "scheme" : "http://www.example.com/instrument-id-Reuters-RIC-1-0"
-                  },
-                  "value" : "BMWG.DE"
+                  }
                 },
+                "source" : "RIC",
                 "meta" : {
                   "globalKey" : "305118e0"
-                },
-                "source" : "RIC"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
+                  "value" : "DE0005190003",
                   "meta" : {
                     "scheme" : "http://www.example.com/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "DE0005190003"
+                  }
                 },
+                "source" : "ISIN",
                 "meta" : {
                   "globalKey" : "d6dc5c0"
-                },
-                "source" : "ISIN"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-3"
+                  "value" : "productIdentifier-2"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "BMW ORD"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "b46c25d8"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-3"
+                } ]
               }
-            } ]
-          },
-          "quantity" : [ {
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 100000
+              "globalKey" : "bf0ba608"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "f067c1a6"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eca49"
-      },
-      "value" : "2009-09-09"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "68bd5b2e",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4c54b2a2",
+          "externalReference" : "party1"
+        }
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id-1-0"
-          },
-          "value" : "1558488"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "f952948c"
+      "name" : {
+        "value" : "AAA Bank"
       },
       "meta" : {
-        "globalKey" : "fda19759"
+        "globalKey" : "4c54b2a2",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id-1-0"
-          },
-          "value" : "8848551"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "eed3b7e2"
+      "name" : {
+        "value" : "Mega Bank Ltd"
       },
       "meta" : {
-        "globalKey" : "e4a8bda"
+        "globalKey" : "68bd5b2e",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "partyRole" : [ {
+      "partyReference" : {
+        "globalReference" : "68bd5b2e",
+        "externalReference" : "party2"
+      },
+      "role" : "HedgingParty"
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2009-09-01",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2009EquityEuropeanInterdealer"
+            },
+            "masterConfirmationAnnexType" : {
+              "value" : "ISDA2009EquityEuropeanInterdealerSS"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "3e010f70"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "3e010f70"
+      }
+    },
+    "meta" : {
+      "globalKey" : "4cce93ac"
+    }
+  },
+  "meta" : {
+    "globalKey" : "4cce93ac"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex16-forward-starting-post-european-interdealer-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex16-forward-starting-post-european-interdealer-share-swap-short-form.json
index e306b528c4..f358147596 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex16-forward-starting-post-european-interdealer-share-swap-short-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex16-forward-starting-post-european-interdealer-share-swap-short-form.json
@@ -1,94 +1,47 @@
 {
-  "meta" : {
-    "globalKey" : "e863651d"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2009-09-01",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationAnnexType" : {
-              "value" : "ISDA_2009_EQUITY_EUROPEAN_INTERDEALER_SS"
-            },
-            "masterConfirmationType" : {
-              "value" : "ISDA_2009_EQUITY_EUROPEAN_INTERDEALER"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "4c54b2a2",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1558488",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/trade-id-1-0"
           }
         },
-        "meta" : {
-          "globalKey" : "81f44b30"
-        }
+        "version" : 2
       } ],
       "meta" : {
-        "globalKey" : "81f44b30"
+        "globalKey" : "975c991a"
       }
-    },
-    "meta" : {
-      "globalKey" : "e863651d"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "f952948c"
-      },
-      "name" : {
-        "value" : "AAA Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "eed3b7e2"
-      },
-      "name" : {
-        "value" : "Mega Bank Ltd"
+      "issuerReference" : {
+        "globalReference" : "68bd5b2e",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "8848551",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
+            "scheme" : "http://www.partyB.com/trade-id-1-0"
+          }
         },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
-    } ],
-    "partyRole" : [ {
-      "partyReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "eed3b7e2"
-      },
-      "role" : "HEDGING_PARTY"
+        "version" : 2
+      } ],
+      "meta" : {
+        "globalKey" : "ec6c51b"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-09-09",
+      "meta" : {
+        "globalKey" : "3eca49"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "eed3b7e2"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "f952948c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -98,6 +51,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-10-09",
                 "dateAdjustments" : {
                   "businessDayConvention" : "FOLLOWING",
                   "meta" : {
@@ -106,33 +60,75 @@
                 },
                 "meta" : {
                   "globalKey" : "bf754eba"
+                }
+              },
+              "meta" : {
+                "globalKey" : "bf754eba",
+                "externalKey" : "equityEffectiveDate"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-12-09",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
+                  "meta" : {
+                    "globalKey" : "d3bf0271"
+                  }
                 },
-                "unadjustedDate" : "2009-10-09"
+                "meta" : {
+                  "globalKey" : "bf772f3a"
+                }
               },
               "meta" : {
-                "externalKey" : "equityEffectiveDate",
-                "globalKey" : "bf754eba"
+                "globalKey" : "bf772f3a"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "equityNotionalAmount"
+                  },
                   "meta" : {
                     "globalKey" : "54b65ddd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "equityNotionalAmount",
-                    "globalReference" : "4cf"
                   }
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-10-13",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -141,28 +137,24 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "3b28889f"
-                      },
-                      "unadjustedDate" : "2009-10-13"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "interestEffectiveDate",
-                      "globalKey" : "3b28889f"
+                      "globalKey" : "3b28889f",
+                      "externalKey" : "interestEffectiveDate"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "interestCalcPeriodDates",
-                    "globalKey" : "16cca080"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-12-11",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -171,132 +163,108 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "122b26e1"
-                      },
-                      "unadjustedDate" : "2009-12-11"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "interestTerminationDate",
-                      "globalKey" : "122b26e1"
+                      "globalKey" : "122b26e1",
+                      "externalKey" : "interestTerminationDate"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "16cca080",
+                    "externalKey" : "interestCalcPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "eeb78e83"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "interestLegPaymentDates",
-                    "globalKey" : "b3c2835f"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "b3c2835f"
-                      },
                       "periodicDates" : {
-                        "endDate" : {
-                          "meta" : {
-                            "globalKey" : "97eae877"
-                          },
+                        "startDate" : {
                           "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "97eae877"
+                              "globalKey" : "df205212"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "dateRelativeTo" : {
-                              "externalReference" : "interestTerminationDate",
-                              "globalReference" : "122b26e1"
+                              "globalReference" : "3b28889f",
+                              "externalReference" : "interestEffectiveDate"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "df205212"
                           }
                         },
-                        "periodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "EUTA"
-                            } ],
+                        "endDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "20a71d"
+                              "globalKey" : "944b936f"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "122b26e1",
+                              "externalReference" : "interestTerminationDate"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
-                            "globalKey" : "211dc30c"
+                            "globalKey" : "944b936f"
                           }
                         },
                         "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "12ce6"
+                            "globalKey" : "18ce"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
                           "rollConvention" : "9"
                         },
-                        "startDate" : {
-                          "meta" : {
-                            "globalKey" : "e2bfa71a"
-                          },
-                          "relativeDate" : {
+                        "periodDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "EUTA"
+                            } ],
                             "meta" : {
-                              "globalKey" : "e2bfa71a"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "interestEffectiveDate",
-                              "globalReference" : "3b28889f"
+                              "globalKey" : "20a71d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "211dc30c"
                           }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "5102c281"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "5102c281",
+                    "externalKey" : "interestLegPaymentDates"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "interestCalcPeriodDates",
-                    "globalReference" : "16cca080"
+                    "globalReference" : "16cca080",
+                    "externalReference" : "interestCalcPeriodDates"
                   },
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "36741a11"
+                      "globalKey" : "135004c5"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "CURRENCY_BUSINESS",
+                    "dayType" : "CurrencyBusiness",
+                    "businessDayConvention" : "PRECEDING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -305,99 +273,159 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "PRECEDING",
                     "dateRelativeTo" : {
-                      "externalReference" : "interestLegPaymentDates",
-                      "globalReference" : "b3c2835f"
+                      "globalReference" : "5102c281",
+                      "externalReference" : "interestLegPaymentDates"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "5dd36e9e"
-                  },
                   "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 1,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "f9c90e82"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "3a50ba7"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "9183aafb"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "equityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "equityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "10da2"
-                  },
                   "settlementCurrency" : {
                     "value" : "EUR"
+                  },
+                  "meta" : {
+                    "globalKey" : "10da2"
                   }
                 },
-                "meta" : {
-                  "externalKey" : "returnLeg",
-                  "globalKey" : "e28f581e"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "99224396"
+                "valuationDates" : {
+                  "valuationDatesInitial" : {
+                    "determinationMethod" : "AgreedInitialPrice",
+                    "meta" : {
+                      "globalKey" : "643bb87"
+                    }
                   },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "globalKey" : "815a0f35"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "815a0f35"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "EUTA"
-                          } ],
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "periodicDates" : {
+                        "startDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "9229ce57"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "bf754eba",
+                              "externalReference" : "equityEffectiveDate"
+                            }
+                          },
                           "meta" : {
-                            "globalKey" : "20a71d"
+                            "globalKey" : "9229ce57"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "finalValuationDate",
-                          "globalReference" : "bf772f3a"
+                        "endDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "b635d2a0"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "bf772f3a",
+                              "externalReference" : "finalValuationDate"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "b635d2a0"
+                          }
+                        },
+                        "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "18ce"
+                          },
+                          "rollConvention" : "9"
+                        },
+                        "periodDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "meta" : {
+                            "globalKey" : "d3bf0271"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "6e25f168",
+                        "externalKey" : "interimValuationDate"
                       }
                     },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "964475eb"
+                    "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                    "meta" : {
+                      "globalKey" : "2a105a71"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2009-12-09",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "meta" : {
+                            "globalKey" : "d3bf0271"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "bf772f3a"
+                        }
                       },
+                      "meta" : {
+                        "globalKey" : "bf772f3a",
+                        "externalKey" : "finalValuationDate"
+                      }
+                    },
+                    "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                    "meta" : {
+                      "globalKey" : "d2afe7a4"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
                       "relativeDates" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "964475eb"
+                          "globalKey" : "24ad6927"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -406,44 +434,47 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "interimValuationDate",
-                          "globalReference" : "edd10e00"
+                          "globalReference" : "6e25f168",
+                          "externalReference" : "interimValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "24ad6927"
                       }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendComposition" : "EQUITY_AMOUNT_RECEIVER_ELECTION",
-                    "dividendCurrency" : {
-                      "determinationMethod" : "ISSUER_PAYMENT_CURRENCY"
-                    },
-                    "dividendPayoutRatio" : [ {
-                      "cashRatio" : 1,
-                      "nonCashRatio" : 1,
-                      "totalRatio" : 1
                     } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "CASH_SETTLEMENT_PAYMENT_DATE"
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "fc30271"
+                        },
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "EUTA"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "20a71d"
+                          }
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "bf772f3a",
+                          "externalReference" : "finalValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "fc30271"
                       }
-                    } ],
-                    "firstOrSecondPeriod" : "SECOND_PERIOD",
-                    "nonCashDividendTreatment" : "POTENTIAL_ADJUSTMENT_EVENT"
+                    }
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                  "meta" : {
+                    "globalKey" : "35da2aea"
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -461,342 +492,311 @@
                         "value" : "productIdentifier-3"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
-                    "meta" : {
-                      "globalKey" : "d2afe7a4"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "FOLLOWING",
-                          "meta" : {
-                            "globalKey" : "d3bf0271"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "bf772f3a"
-                        },
-                        "unadjustedDate" : "2009-12-09"
-                      },
-                      "meta" : {
-                        "externalKey" : "finalValuationDate",
-                        "globalKey" : "bf772f3a"
-                      }
-                    },
-                    "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
-                  },
-                  "valuationDatesInitial" : {
-                    "determinationMethod" : "AGREED_INITIAL_PRICE",
-                    "meta" : {
-                      "globalKey" : "643bb87"
-                    }
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
                   },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "a9bb7709"
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 1,
+                      "cashRatio" : 1,
+                      "nonCashRatio" : 1
+                    } ],
+                    "firstOrSecondPeriod" : "SecondPeriod",
+                    "dividendCurrency" : {
+                      "determinationMethod" : "IssuerPaymentCurrency"
                     },
-                    "valuationDates" : {
-                      "meta" : {
-                        "externalKey" : "interimValuationDate",
-                        "globalKey" : "edd10e00"
-                      },
-                      "periodicDates" : {
-                        "endDate" : {
-                          "meta" : {
-                            "globalKey" : "b9d527a8"
-                          },
-                          "relativeDate" : {
-                            "meta" : {
-                              "globalKey" : "b9d527a8"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "finalValuationDate",
-                              "globalReference" : "bf772f3a"
-                            }
-                          }
-                        },
-                        "periodDatesAdjustments" : {
-                          "businessDayConvention" : "FOLLOWING",
-                          "meta" : {
-                            "globalKey" : "d3bf0271"
-                          }
-                        },
-                        "periodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12ce6"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "9"
-                        },
-                        "startDate" : {
-                          "meta" : {
-                            "globalKey" : "95c9235f"
-                          },
-                          "relativeDate" : {
-                            "meta" : {
-                              "globalKey" : "95c9235f"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "equityEffectiveDate",
-                              "globalReference" : "bf754eba"
-                            }
-                          }
+                    "nonCashDividendTreatment" : "PotentialAdjustmentEvent",
+                    "dividendComposition" : "EquityAmountReceiverElection",
+                    "dividendPeriod" : [ {
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "CashSettlementPaymentDate"
                         }
                       }
-                    },
-                    "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
-                  }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "FOLLOWING",
-                  "meta" : {
-                    "globalKey" : "d3bf0271"
+                    } ]
                   }
                 },
                 "meta" : {
-                  "globalKey" : "bf772f3a"
-                },
-                "unadjustedDate" : "2009-12-09"
-              },
+                  "globalKey" : "a2147b9c",
+                  "externalKey" : "returnLeg"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "bf772f3a"
+                "globalKey" : "1198c1d5"
               }
             }
           },
           "meta" : {
-            "globalKey" : "b147bd25"
+            "globalKey" : "bba39695"
           }
         },
         "meta" : {
-          "globalKey" : "b147bd25"
+          "globalKey" : "bba39695"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "8b695f9a"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "affa401e"
+          "price" : [ {
+            "value" : {
+              "value" : 0,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              },
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Reuters"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
+                  "periodMultiplier" : 1,
                   "period" : "M",
-                  "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
+            },
+            "meta" : {
+              "globalKey" : "4f4caf8a"
             }
           },
+          "meta" : {
+            "globalKey" : "e0ca7e2e"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 10,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
+                "financialUnit" : "Share"
+              },
+              "priceType" : "AssetPrice"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 100000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          }, {
+            "value" : {
+              "value" : 1000000,
+              "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "priceType" : "INTEREST_RATE"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "b93f6441"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "ed6378f8"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "BMWG.DE",
                   "meta" : {
                     "scheme" : "http://www.example.com/instrument-id-Reuters-RIC-1-0"
-                  },
-                  "value" : "BMWG.DE"
+                  }
                 },
+                "source" : "RIC",
                 "meta" : {
                   "globalKey" : "305118e0"
-                },
-                "source" : "RIC"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
+                  "value" : "DE0005190003",
                   "meta" : {
                     "scheme" : "http://www.example.com/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "DE0005190003"
+                  }
                 },
+                "source" : "ISIN",
                 "meta" : {
                   "globalKey" : "d6dc5c0"
-                },
-                "source" : "ISIN"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-3"
+                  "value" : "productIdentifier-2"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "BMW ORD"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "b46c25d8"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
                 }
               },
-              "value" : 10,
-              "perUnitOf" : {
-                "financialUnit" : "SHARE"
-              },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 100000
-            }
-          }, {
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-3"
+                } ]
+              }
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 1000000
+              "globalKey" : "bf0ba608"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "fc5fc3c1"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eca49"
-      },
-      "value" : "2009-09-09"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "68bd5b2e",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4c54b2a2",
+          "externalReference" : "party1"
+        }
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id-1-0"
-          },
-          "value" : "1558488"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
         },
-        "version" : 2
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "f952948c"
+      "name" : {
+        "value" : "AAA Bank"
       },
       "meta" : {
-        "globalKey" : "fdafaeda"
+        "globalKey" : "4c54b2a2",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id-1-0"
-          },
-          "value" : "8848551"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
         },
-        "version" : 2
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "eed3b7e2"
+      "name" : {
+        "value" : "Mega Bank Ltd"
+      },
+      "meta" : {
+        "globalKey" : "68bd5b2e",
+        "externalKey" : "party2"
+      }
+    } ],
+    "partyRole" : [ {
+      "partyReference" : {
+        "globalReference" : "68bd5b2e",
+        "externalReference" : "party2"
       },
+      "role" : "HedgingParty"
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2009-09-01",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2009EquityEuropeanInterdealer"
+            },
+            "masterConfirmationAnnexType" : {
+              "value" : "ISDA2009EquityEuropeanInterdealerSS"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "3e010f70"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "e58a35b"
+        "globalKey" : "3e010f70"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "66cb0023"
+    }
+  },
+  "meta" : {
+    "globalKey" : "66cb0023"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex17-cfd.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex17-cfd.json
index f6d11a2b48..636539834f 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex17-cfd.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex17-cfd.json
@@ -1,87 +1,56 @@
 {
-  "meta" : {
-    "globalKey" : "fbaf4bfb"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "46e37105",
+        "externalReference" : "PRIMARY"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "CFD123456789",
+          "meta" : {
+            "scheme" : "http://www.primarybank.com/trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
         }
       } ],
       "meta" : {
-        "globalKey" : "c4592b87"
+        "globalKey" : "ff26c7f2"
       }
-    },
-    "meta" : {
-      "globalKey" : "fbaf4bfb"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "PRIMARY",
-        "globalKey" : "46e37105"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "0987654321"
-        },
-        "meta" : {
-          "globalKey" : "46e37105"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "CROSS",
-        "globalKey" : "858ff69b"
+      "issuerReference" : {
+        "globalReference" : "858ff69b",
+        "externalReference" : "CROSS"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "CFD123456789",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "1234567890"
-        },
-        "meta" : {
-          "globalKey" : "858ff69b"
+            "scheme" : "http://www.crossbank.com/tradeId"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "db6f30f4"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-09-30",
+      "meta" : {
+        "globalKey" : "3eca5e",
+        "externalKey" : "TradeDate__CFD123456789"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "CROSS",
-          "globalReference" : "858ff69b"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "PRIMARY",
-          "globalReference" : "46e37105"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "EQCFD",
                 "meta" : {
                   "scheme" : "http://www.primarybank.com/productType"
-                },
-                "value" : "EQCFD"
+                }
               }
             }
           }, {
@@ -91,92 +60,126 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-10-07",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "2601cd72"
+                }
+              },
+              "meta" : {
+                "globalKey" : "2601cd72",
+                "externalKey" : "EffectiveDate__CFD123456789"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2019-10-01",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
                 },
-                "unadjustedDate" : "2009-10-07"
+                "meta" : {
+                  "globalKey" : "272e06ec"
+                }
               },
               "meta" : {
-                "externalKey" : "EffectiveDate__CFD123456789",
-                "globalKey" : "2601cd72"
+                "globalKey" : "272e06ec",
+                "externalKey" : "TerminationDate__CFD123456789"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-10-07",
                       "dateAdjustments" : {
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "meta" : {
                           "globalKey" : "3a4b88ab"
                         }
                       },
                       "meta" : {
                         "globalKey" : "2601cd72"
-                      },
-                      "unadjustedDate" : "2009-10-07"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "2601cd72"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "InterestLegPeriodDates-1",
-                    "globalKey" : "2dccd0ba"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2019-10-01",
                       "dateAdjustments" : {
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "meta" : {
                           "globalKey" : "3a4b88ab"
                         }
                       },
                       "meta" : {
                         "globalKey" : "272e06ec"
-                      },
-                      "unadjustedDate" : "2019-10-01"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "272e06ec"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "2dccd0ba",
+                    "externalKey" : "InterestLegPeriodDates-1"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "3b320400"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "c0a180b2"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
                       "adjustableDates" : {
+                        "unadjustedDate" : [ "2019-10-01" ],
                         "dateAdjustments" : {
                           "businessDayConvention" : "FOLLOWING",
                           "meta" : {
@@ -185,95 +188,87 @@
                         },
                         "meta" : {
                           "globalKey" : "c0a180b2"
-                        },
-                        "unadjustedDate" : [ "2019-10-01" ]
+                        }
                       },
                       "meta" : {
                         "globalKey" : "c0a180b2"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "c0a180b2"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "InterestLegPeriodDates-1",
-                    "globalReference" : "2dccd0ba"
+                    "globalReference" : "2dccd0ba",
+                    "externalReference" : "InterestLegPeriodDates-1"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "b20fcfd7"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ebac82f0"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "d307f031"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "4d5"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : false
+                  "reset" : false,
+                  "meta" : {
+                    "globalKey" : "4d5"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "14966"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
+                  },
+                  "meta" : {
+                    "globalKey" : "14966"
                   }
                 },
-                "fxFeature" : [ {
-                  "referenceCurrency" : {
-                    "meta" : {
-                      "externalKey" : "ReferenceCurrency",
-                      "globalKey" : "14966"
+                "valuationDates" : {
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2019-10-01",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "272e06ec"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "272e06ec",
+                        "externalKey" : "FinalValuationDate__CFD123456789"
+                      }
                     },
-                    "value" : "USD"
+                    "meta" : {
+                      "globalKey" : "98f9886e"
+                    }
                   }
-                } ],
-                "meta" : {
-                  "externalKey" : "EQ__CFD123456789",
-                  "globalKey" : "95617431"
                 },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "c0a180b2"
-                  },
                   "paymentDateSchedule" : {
                     "finalPaymentDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2019-10-01",
                         "dateAdjustments" : {
                           "businessDayConvention" : "FOLLOWING",
                           "meta" : {
@@ -282,299 +277,304 @@
                         },
                         "meta" : {
                           "globalKey" : "c0a180b2"
-                        },
-                        "unadjustedDate" : "2019-10-01"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "c0a180b2"
                       }
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "c0a180b2"
                   }
                 },
+                "underlier" : {
+                  "security" : {
+                    "productIdentifier" : [ {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-1"
+                      }
+                    } ],
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
+                  }
+                },
+                "fxFeature" : [ {
+                  "referenceCurrency" : {
+                    "value" : "USD",
+                    "meta" : {
+                      "globalKey" : "14966",
+                      "externalKey" : "ReferenceCurrency"
+                    }
+                  }
+                } ],
                 "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
+                  },
                   "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 1.0
+                    } ],
+                    "dividendReinvestment" : false,
+                    "dividendEntitlement" : "ExDate",
                     "dividendCurrency" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "dividendEntitlement" : "EX_DATE",
-                    "dividendPayoutRatio" : [ {
-                      "totalRatio" : 1.0
-                    } ],
                     "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "AD_HOC_DATE"
+                      "startDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "3eca5e",
+                          "externalReference" : "TradeDate__CFD123456789"
                         }
                       },
                       "endDate" : {
                         "dividendDate" : {
-                          "externalReference" : "FinalValuationDate__CFD123456789",
-                          "globalReference" : "272e06ec"
+                          "globalReference" : "272e06ec",
+                          "externalReference" : "FinalValuationDate__CFD123456789"
                         }
                       },
-                      "startDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "TradeDate__CFD123456789",
-                          "globalReference" : "3eca5e"
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "AdHocDate"
                         }
                       }
-                    } ],
-                    "dividendReinvestment" : false
-                  },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
-                  }
-                },
-                "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
-                  "security" : {
-                    "productIdentifier" : [ {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-1"
-                      }
-                    } ],
-                    "securityType" : "EQUITY"
-                  }
-                },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
-                    "meta" : {
-                      "globalKey" : "98f9886e"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "272e06ec"
-                        },
-                        "unadjustedDate" : "2019-10-01"
-                      },
-                      "meta" : {
-                        "externalKey" : "FinalValuationDate__CFD123456789",
-                        "globalKey" : "272e06ec"
-                      }
-                    }
-                  }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
-                  "meta" : {
-                    "globalKey" : "3a4b88ab"
+                    } ]
                   }
                 },
                 "meta" : {
-                  "globalKey" : "272e06ec"
-                },
-                "unadjustedDate" : "2019-10-01"
-              },
+                  "globalKey" : "315ae1ad",
+                  "externalKey" : "EQ__CFD123456789"
+                }
+              } ],
               "meta" : {
-                "externalKey" : "TerminationDate__CFD123456789",
-                "globalKey" : "272e06ec"
+                "globalKey" : "f8965cbd"
               }
             }
           },
           "meta" : {
-            "globalKey" : "506426a4"
+            "globalKey" : "1eb639f2"
           }
         },
         "meta" : {
-          "globalKey" : "506426a4"
+          "globalKey" : "1eb639f2"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "2bda2cf2"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "9a79305"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "RIC"
-                  },
-                  "value" : "XYZ.N"
-                },
-                "meta" : {
-                  "globalKey" : "9a79305"
-                },
-                "source" : "RIC"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 80.000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 80.000000,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "AssetPrice"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 48000,
               "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 48000
-            }
-          }, {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 3840000.000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 3840000.000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "5520294c"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d03"
-            },
-            "rateOption" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "XYZ.N",
+                  "meta" : {
+                    "scheme" : "RIC"
+                  }
+                },
+                "source" : "RIC",
+                "meta" : {
+                  "globalKey" : "9a79305"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 1
-                }
               }
+            } ],
+            "meta" : {
+              "globalKey" : "2b4acd9b"
             }
           },
+          "meta" : {
+            "globalKey" : "e9d29c32"
+          }
+        }, {
           "price" : [ {
+            "value" : {
+              "value" : 125.0,
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "price-2"
               } ]
-            },
-            "value" : {
-              "value" : 125.0,
-              "arithmeticOperator" : "ADD",
-              "priceType" : "INTEREST_RATE"
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 3840000.000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-3"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 1,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
                 }
               },
-              "value" : 3840000.000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "82801f45"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "8adb831c"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate__CFD123456789",
-        "globalKey" : "3eca5e"
-      },
-      "value" : "2009-09-30"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "858ff69b",
+          "externalReference" : "CROSS"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "46e37105",
+          "externalReference" : "PRIMARY"
+        }
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "0987654321",
           "meta" : {
-            "scheme" : "http://www.primarybank.com/trade-id"
-          },
-          "value" : "CFD123456789"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "46e37105"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "PRIMARY",
-        "globalReference" : "46e37105"
-      },
       "meta" : {
-        "globalKey" : "a486e9f6"
+        "globalKey" : "46e37105",
+        "externalKey" : "PRIMARY"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "1234567890",
           "meta" : {
-            "scheme" : "http://www.crossbank.com/tradeId"
-          },
-          "value" : "CFD123456789"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "858ff69b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "CROSS",
-        "globalReference" : "858ff69b"
-      },
       "meta" : {
-        "globalKey" : "9054f034"
+        "globalKey" : "858ff69b",
+        "externalKey" : "CROSS"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "c4592b87"
+      }
+    },
+    "meta" : {
+      "globalKey" : "f552011"
+    }
+  },
+  "meta" : {
+    "globalKey" : "f552011"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex18-pan-asia-interdealer-index-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex18-pan-asia-interdealer-index-swap-short-form.json
index ddc50ea4e2..c42ceb8671 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex18-pan-asia-interdealer-index-swap-short-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex18-pan-asia-interdealer-index-swap-short-form.json
@@ -1,126 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "19bb7f81"
-  },
   "trade" : {
-    "collateral" : {
-      "independentAmount" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ed3bb042"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ed3b3be4"
-        },
-        "paymentDetail" : [ {
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "d04eb552",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "TW9236",
           "meta" : {
-            "globalKey" : "a93dc25d"
-          },
-          "paymentRule" : {
-            "percentageRule" : {
-              "notionalAmountReference" : {
-                "externalReference" : "equityNotionalAmount",
-                "globalReference" : "4cf"
-              },
-              "paymentPercent" : 0.02
-            }
-          }
-        } ]
-      }
-    },
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2009-07-20",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationAnnexType" : {
-              "value" : "ISDA_2009_SHARE_SWAP_PAN_ASIA"
-            },
-            "masterConfirmationType" : {
-              "value" : "ISDA_2009_EQUITY_PAN_ASIA"
-            }
+            "scheme" : "http://www.partyA.com/tradeRefNbr"
           }
-        },
-        "meta" : {
-          "globalKey" : "c865c45c"
         }
       } ],
       "meta" : {
-        "globalKey" : "c865c45c"
+        "globalKey" : "29b63a54"
       }
-    },
-    "meta" : {
-      "globalKey" : "19bb7f81"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "ed3b3be4"
-      },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "DTCC"
-          },
-          "value" : "DTCC00006441"
-        },
-        "meta" : {
-          "globalKey" : "5d661eab"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "ed3bb042"
-      },
-      "name" : {
-        "value" : "Party B"
+      "issuerReference" : {
+        "globalReference" : "d04eb192",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "299442",
           "meta" : {
-            "scheme" : "DTCC"
-          },
-          "value" : "DTCC00006440"
-        },
-        "meta" : {
-          "globalKey" : "5d661eaa"
+            "scheme" : "http://www.partyB.com/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ee0b3014"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-09-10",
+      "meta" : {
+        "globalKey" : "3eca4a"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "ed3bb042"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "ed3bb042"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ed3bb042"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ed3b3be4"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -128,11 +47,9 @@
             "productQualifier" : "EquitySwap_TotalReturnBasicPerformance_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-10-12",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -141,87 +58,115 @@
                 },
                 "meta" : {
                   "globalKey" : "ebdafec4"
-                },
-                "unadjustedDate" : "2009-10-12"
+                }
               },
               "meta" : {
-                "externalKey" : "equityEffectiveDate",
-                "globalKey" : "ebdafec4"
+                "globalKey" : "ebdafec4",
+                "externalKey" : "equityEffectiveDate"
               }
             },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "ea96b216"
+                },
+                "businessDayConvention" : "NONE",
+                "dateRelativeTo" : {
+                  "globalReference" : "7e0a5d94",
+                  "externalReference" : "finalCashSettlementPaymentDate"
+                }
+              },
+              "meta" : {
+                "globalKey" : "ea96b216"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "equityNotionalAmount"
+                  },
                   "meta" : {
                     "globalKey" : "54b65ddd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "equityNotionalAmount",
-                    "globalReference" : "4cf"
                   }
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0",
+                      "externalKey" : "floatingRateCalculation"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "globalKey" : "49d4d2ac"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "49d4d2ac"
+                        "globalKey" : "46357da4"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
                       "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "equityEffectiveDate",
-                        "globalReference" : "ebdafec4"
+                        "globalReference" : "ebdafec4",
+                        "externalReference" : "equityEffectiveDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "46357da4"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalculationPeriodDates",
-                    "globalKey" : "2ffb1af2"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "globalKey" : "ee36071e"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "ee36071e"
+                        "globalKey" : "ea96b216"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
                       "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "finalCashSettlementPaymentDate",
-                        "globalReference" : "e9616632"
+                        "globalReference" : "7e0a5d94",
+                        "externalReference" : "finalCashSettlementPaymentDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "ea96b216"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "adeb53f2",
+                    "externalKey" : "floatingCalculationPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "f969a374"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "3122c5b6"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
                       "adjustableDates" : {
+                        "unadjustedDate" : [ "2009-10-12", "2009-11-13", "2009-12-12", "2010-01-14", "2010-02-12", "2010-03-12", "2010-04-12", "2010-05-13", "2010-06-02", "2010-07-12", "2010-08-12" ],
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -230,197 +175,106 @@
                         },
                         "meta" : {
                           "globalKey" : "3122c5b6"
-                        },
-                        "unadjustedDate" : [ "2009-10-12", "2009-11-13", "2009-12-12", "2010-01-14", "2010-02-12", "2010-03-12", "2010-04-12", "2010-05-13", "2010-06-02", "2010-07-12", "2010-08-12" ]
+                        }
                       },
                       "meta" : {
                         "globalKey" : "3122c5b6"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "externalKey" : "floatingRateCalculation",
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3122c5b6"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalculationPeriodDates",
-                    "globalReference" : "2ffb1af2"
+                    "globalReference" : "adeb53f2",
+                    "externalReference" : "floatingCalculationPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "c446e854"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c775537c"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "3bfe4fc2"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "equityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "equityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "14966"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "be1b004e"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "CashSettlementPaymentDate",
-                    "globalKey" : "1b5a7a64"
-                  },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "externalKey" : "finalCashSettlementPaymentDate",
-                        "globalKey" : "e9616632"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "e9616632"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "equityValuationDates",
-                          "globalReference" : "f3658729"
-                        }
-                      }
-                    },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "e9616632"
-                      },
-                      "relativeDates" : {
-                        "meta" : {
-                          "globalKey" : "e9616632"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "equityValuationDates",
-                          "globalReference" : "f3658729"
-                        }
-                      }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendCurrency" : {
-                      "determinationMethod" : "HEDGE_EXECUTION"
-                    },
-                    "dividendPayoutRatio" : [ {
-                      "cashRatio" : 2.5,
-                      "nonCashRatio" : 2.5,
-                      "totalRatio" : 0.85
-                    } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "DIVIDEND_VALUATION_DATE"
-                        }
-                      }
-                    } ]
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
-                  }
-                },
-                "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
-                  "security" : {
-                    "productIdentifier" : [ {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-1"
-                      }
-                    } ],
-                    "securityType" : "EQUITY"
+                  "meta" : {
+                    "globalKey" : "14966"
                   }
                 },
                 "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "524b126b"
-                    }
-                  },
                   "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "externalKey" : "equityValuationDates",
-                      "globalKey" : "f3658729"
-                    },
+                    "determinationMethod" : "ValuationTime",
                     "valuationDates" : {
-                      "meta" : {
-                        "globalKey" : "395e21f4"
-                      },
                       "periodicDates" : {
+                        "startDate" : {
+                          "adjustableDate" : {
+                            "unadjustedDate" : "2009-10-12",
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NotApplicable",
+                              "meta" : {
+                                "globalKey" : "3a4b88ab"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "2601e037"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "2601e037"
+                          }
+                        },
                         "endDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2010-08-12",
                             "dateAdjustments" : {
-                              "businessDayConvention" : "NOT_APPLICABLE",
+                              "businessDayConvention" : "NotApplicable",
                               "meta" : {
                                 "globalKey" : "3a4b88ab"
                               }
                             },
                             "meta" : {
                               "globalKey" : "261e07b7"
-                            },
-                            "unadjustedDate" : "2010-08-12"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "261e07b7"
                           }
                         },
+                        "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "17810"
+                          },
+                          "rollConvention" : "30"
+                        },
                         "periodDatesAdjustments" : {
+                          "businessDayConvention" : "PRECEDING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "USNY"
@@ -428,266 +282,412 @@
                               "value" : "GBLO"
                             } ],
                             "meta" : {
-                              "externalKey" : "businessCenters",
-                              "globalKey" : "4f5ffd5"
+                              "globalKey" : "4f5ffd5",
+                              "externalKey" : "businessCenters"
                             }
                           },
-                          "businessDayConvention" : "PRECEDING",
                           "meta" : {
                             "globalKey" : "7b765912"
                           }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "84d61122"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3edd7657",
+                      "externalKey" : "equityValuationDates"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "ValuationTime",
+                    "meta" : {
+                      "globalKey" : "524b126b"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
+                      "relativeDates" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "7e0a5d94"
                         },
-                        "periodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "28c28"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "30"
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "NONE",
+                        "dateRelativeTo" : {
+                          "globalReference" : "3edd7657",
+                          "externalReference" : "equityValuationDates"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "7e0a5d94"
+                      }
+                    } ],
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "7e0a5d94"
                         },
-                        "startDate" : {
-                          "adjustableDate" : {
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NOT_APPLICABLE",
-                              "meta" : {
-                                "globalKey" : "3a4b88ab"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "2601e037"
-                            },
-                            "unadjustedDate" : "2009-10-12"
-                          },
-                          "meta" : {
-                            "globalKey" : "2601e037"
-                          }
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "NONE",
+                        "dateRelativeTo" : {
+                          "globalReference" : "3edd7657",
+                          "externalReference" : "equityValuationDates"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "7e0a5d94",
+                        "externalKey" : "finalCashSettlementPaymentDate"
                       }
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e5f7e728",
+                    "externalKey" : "CashSettlementPaymentDate"
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "meta" : {
-                "globalKey" : "ee36071e"
-              },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "ee36071e"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NONE",
-                "dateRelativeTo" : {
-                  "externalReference" : "finalCashSettlementPaymentDate",
-                  "globalReference" : "e9616632"
+                "underlier" : {
+                  "security" : {
+                    "productIdentifier" : [ {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-1"
+                      }
+                    } ],
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
+                  }
+                },
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
+                  },
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 0.85,
+                      "cashRatio" : 2.5,
+                      "nonCashRatio" : 2.5
+                    } ],
+                    "dividendCurrency" : {
+                      "determinationMethod" : "HedgeExecution"
+                    },
+                    "dividendPeriod" : [ {
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "DividendValuationDate"
+                        }
+                      }
+                    } ]
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "2b58b3f4"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "cb76eb70"
               }
             },
             "terminationProvision" : {
               "earlyTerminationProvision" : {
-                "meta" : {
-                  "globalKey" : "4cf"
-                },
                 "optionalEarlyTermination" : {
                   "mutualEarlyTermination" : true
+                },
+                "meta" : {
+                  "globalKey" : "4cf"
                 }
               }
+            },
+            "extraordinaryEvents" : {
+              "additionalDisruptionEvents" : {
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "7f7dec4e"
+            "globalKey" : "9938435a"
           }
         },
         "meta" : {
-          "globalKey" : "7f7dec4e"
+          "globalKey" : "9938435a"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "42842d0a"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "8c98d20"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.example.com/instrument-id-Reuters-RIC-1-0"
-                  },
-                  "value" : "IBM.N"
-                },
-                "meta" : {
-                  "globalKey" : "8c98d20"
-                },
-                "source" : "RIC"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 37.44,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217-2001-08-15"
-                  },
-                  "value" : "USD"
+                  }
                 }
               },
-              "value" : 37.44,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "AssetPrice"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 760400,
               "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 760400
-            }
-          }, {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 28469376,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217-2001-08-15"
-                  },
-                  "value" : "USD"
+                  }
                 }
-              },
-              "value" : 28469376
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "4930fd53"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d08"
-            },
-            "rateOption" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "IBM.N",
+                  "meta" : {
+                    "scheme" : "http://www.example.com/instrument-id-Reuters-RIC-1-0"
+                  }
+                },
+                "source" : "RIC",
+                "meta" : {
+                  "globalKey" : "8c98d20"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
               }
+            } ],
+            "meta" : {
+              "globalKey" : "106816e0"
             }
           },
+          "meta" : {
+            "globalKey" : "a9cecb0a"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217-2001-08-15"
-                  },
-                  "value" : "USD"
+                  }
                 }
               },
-              "value" : 0.01,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217-2001-08-15"
-                  },
-                  "value" : "USD"
+                  }
+                }
+              },
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "8280320a"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "d2ab49bd"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eca4a"
-      },
-      "value" : "2009-09-10"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "d04eb192",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "d04eb552",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "d04eb192",
+          "externalReference" : "party2"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "d04eb192",
+          "externalReference" : "party2"
+        } ]
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "DTCC00006441",
           "meta" : {
-            "scheme" : "http://www.partyA.com/tradeRefNbr"
-          },
-          "value" : "TW9236"
+            "scheme" : "DTCC"
+          }
+        },
+        "meta" : {
+          "globalKey" : "5d661eab"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "ed3b3be4"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "38e8ea8a"
+        "globalKey" : "d04eb552",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "DTCC00006440",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id-1-0"
-          },
-          "value" : "299442"
+            "scheme" : "DTCC"
+          }
+        },
+        "meta" : {
+          "globalKey" : "5d661eaa"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "ed3bb042"
+      "name" : {
+        "value" : "Party B"
       },
       "meta" : {
-        "globalKey" : "3a2297ac"
+        "globalKey" : "d04eb192",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2009-07-20",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2009EquityPanAsia"
+            },
+            "masterConfirmationAnnexType" : {
+              "value" : "ISDA2009ShareSwapPanAsia"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c17018dc"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "c17018dc"
+      }
+    },
+    "collateral" : {
+      "independentAmount" : {
+        "payerPartyReference" : {
+          "globalReference" : "d04eb192",
+          "externalReference" : "party2"
+        },
+        "receiverPartyReference" : {
+          "globalReference" : "d04eb552",
+          "externalReference" : "party1"
+        },
+        "paymentDetail" : [ {
+          "paymentRule" : {
+            "percentageRule" : {
+              "paymentPercent" : 0.02,
+              "notionalAmountReference" : {
+                "globalReference" : "4cf",
+                "externalReference" : "equityNotionalAmount"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "a93dc25d"
+          }
+        } ]
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "77ba948d"
+    }
+  },
+  "meta" : {
+    "globalKey" : "77ba948d"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex19-european-interdealer-fair-value-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex19-european-interdealer-fair-value-share-swap-short-form.json
index 721d67b1a1..f4f4a5b67b 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex19-european-interdealer-fair-value-share-swap-short-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex19-european-interdealer-fair-value-share-swap-short-form.json
@@ -1,117 +1,49 @@
 {
-  "meta" : {
-    "globalKey" : "f6265e7d"
-  },
   "trade" : {
-    "collateral" : {
-      "independentAmount" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ed3bb042"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ed3b3be4"
-        },
-        "paymentDetail" : [ {
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "d04eb552",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "TW9236",
           "meta" : {
-            "globalKey" : "a93dc25d"
-          },
-          "paymentRule" : {
-            "percentageRule" : {
-              "notionalAmountReference" : {
-                "externalReference" : "equityNotionalAmount",
-                "globalReference" : "4cf"
-              },
-              "paymentPercent" : 0.02
-            }
-          }
-        } ]
-      }
-    },
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2009-07-20",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationAnnexType" : {
-              "value" : "ISDA_2010_FAIR_VALUE_SHARE_SWAP_EUROPEAN_INTERDEALER"
-            },
-            "masterConfirmationType" : {
-              "value" : "ISDA_2009_EQUITY_EUROPEAN_INTERDEALER"
-            }
+            "scheme" : "http://www.partyA.com/tradeRefNbr"
           }
-        },
-        "meta" : {
-          "globalKey" : "4dc1e52f"
         }
       } ],
       "meta" : {
-        "globalKey" : "4dc1e52f"
+        "globalKey" : "29b63a54"
       }
-    },
-    "meta" : {
-      "globalKey" : "f6265e7d"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "ed3b3be4"
-      },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "DTCC"
-          },
-          "value" : "DTCC00006441"
-        },
-        "meta" : {
-          "globalKey" : "5d661eab"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "ed3bb042"
-      },
-      "name" : {
-        "value" : "Party B"
+      "issuerReference" : {
+        "globalReference" : "d04eb192",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "299442",
           "meta" : {
-            "scheme" : "DTCC"
-          },
-          "value" : "DTCC00006440"
-        },
-        "meta" : {
-          "globalKey" : "5d661eaa"
+            "scheme" : "http://www.partyB.com/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ee0b3014"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2010-09-10",
+      "meta" : {
+        "globalKey" : "3ed24a"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ed3bb042"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ed3b3be4"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleName"
@@ -124,6 +56,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2010-10-12",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -132,85 +65,118 @@
                 },
                 "meta" : {
                   "globalKey" : "ebf906c4"
+                }
+              },
+              "meta" : {
+                "globalKey" : "ebf906c4",
+                "externalKey" : "equityEffectiveDate"
+              }
+            },
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "ea96b216"
                 },
-                "unadjustedDate" : "2010-10-12"
+                "businessDayConvention" : "NONE",
+                "dateRelativeTo" : {
+                  "globalReference" : "7e0a5d94",
+                  "externalReference" : "finalCashSettlementPaymentDate"
+                }
               },
               "meta" : {
-                "externalKey" : "equityEffectiveDate",
-                "globalKey" : "ebf906c4"
+                "globalKey" : "ea96b216"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "equityNotionalAmount"
+                  },
                   "meta" : {
                     "globalKey" : "54b65ddd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "equityNotionalAmount",
-                    "globalReference" : "4cf"
+                  }
+                },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0",
+                      "externalKey" : "floatingRateCalculation"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/day-count-fraction"
                   }
                 },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "globalKey" : "49d4d2ac"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "49d4d2ac"
+                        "globalKey" : "46357da4"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
                       "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "equityEffectiveDate",
-                        "globalReference" : "ebf906c4"
+                        "globalReference" : "ebf906c4",
+                        "externalReference" : "equityEffectiveDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "46357da4"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalculationPeriodDates",
-                    "globalKey" : "2ffb1af2"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "globalKey" : "ee36071e"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "ee36071e"
+                        "globalKey" : "ea96b216"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
                       "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "finalCashSettlementPaymentDate",
-                        "globalReference" : "e9616632"
+                        "globalReference" : "7e0a5d94",
+                        "externalReference" : "finalCashSettlementPaymentDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "ea96b216"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/day-count-fraction"
                   },
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "a8379b74"
+                  "meta" : {
+                    "globalKey" : "adeb53f2",
+                    "externalKey" : "floatingCalculationPeriodDates"
+                  }
                 },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "c19bcdb6"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
                       "adjustableDates" : {
+                        "unadjustedDate" : [ "2010-10-12", "2010-11-13", "2010-12-12", "2011-01-14", "2011-02-12", "2011-03-12", "2011-04-12", "2011-05-13", "2011-06-02", "2011-07-12", "2011-08-12" ],
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -219,466 +185,500 @@
                         },
                         "meta" : {
                           "globalKey" : "c19bcdb6"
-                        },
-                        "unadjustedDate" : [ "2010-10-12", "2010-11-13", "2010-12-12", "2011-01-14", "2011-02-12", "2011-03-12", "2011-04-12", "2011-05-13", "2011-06-02", "2011-07-12", "2011-08-12" ]
+                        }
                       },
                       "meta" : {
                         "globalKey" : "c19bcdb6"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "externalKey" : "floatingRateCalculation",
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "c19bcdb6"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalculationPeriodDates",
-                    "globalReference" : "2ffb1af2"
+                    "globalReference" : "adeb53f2",
+                    "externalReference" : "floatingCalculationPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "c446e854"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "e42a5b7c"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "f95f2dd5"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "equityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "equityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "14966"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "c1d00c61"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "CashSettlementPaymentDate",
-                    "globalKey" : "1b5a7a64"
-                  },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "externalKey" : "finalCashSettlementPaymentDate",
-                        "globalKey" : "e9616632"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "e9616632"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "equityValuationDates",
-                          "globalReference" : "46919729"
-                        }
-                      }
-                    },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "e9616632"
-                      },
-                      "relativeDates" : {
-                        "meta" : {
-                          "globalKey" : "e9616632"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "equityValuationDates",
-                          "globalReference" : "46919729"
-                        }
-                      }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendCurrency" : {
-                      "determinationMethod" : "SETTLEMENT_CURRENCY"
-                    },
-                    "dividendPayoutRatio" : [ {
-                      "cashRatio" : 2.5,
-                      "nonCashRatio" : 2.5,
-                      "totalRatio" : 0.85
-                    } ]
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
-                  }
-                },
-                "underlier" : {
                   "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
-                  "security" : {
-                    "productIdentifier" : [ {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-1"
-                      }
-                    } ],
-                    "securityType" : "EQUITY"
+                    "globalKey" : "14966"
                   }
                 },
                 "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "524b126b"
-                    }
-                  },
                   "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "externalKey" : "equityValuationDates",
-                      "globalKey" : "46919729"
-                    },
+                    "determinationMethod" : "ValuationTime",
                     "valuationDates" : {
-                      "meta" : {
-                        "globalKey" : "8c8a31f4"
-                      },
                       "periodicDates" : {
+                        "startDate" : {
+                          "adjustableDate" : {
+                            "unadjustedDate" : "2010-10-12",
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NotApplicable",
+                              "meta" : {
+                                "globalKey" : "3a4b88ab"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "261fe837"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "261fe837"
+                          }
+                        },
                         "endDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2011-08-12",
                             "dateAdjustments" : {
-                              "businessDayConvention" : "NOT_APPLICABLE",
+                              "businessDayConvention" : "NotApplicable",
                               "meta" : {
                                 "globalKey" : "3a4b88ab"
                               }
                             },
                             "meta" : {
                               "globalKey" : "263c0fb7"
-                            },
-                            "unadjustedDate" : "2011-08-12"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "263c0fb7"
                           }
                         },
+                        "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "17810"
+                          },
+                          "rollConvention" : "30"
+                        },
                         "periodDatesAdjustments" : {
+                          "businessDayConvention" : "PRECEDING",
                           "businessCenters" : {
                             "businessCenter" : [ {
+                              "value" : "USNY",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/coding-scheme/business-center"
-                              },
-                              "value" : "USNY"
+                              }
                             }, {
+                              "value" : "GBLO",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/coding-scheme/business-center"
-                              },
-                              "value" : "GBLO"
+                              }
                             } ],
                             "meta" : {
-                              "externalKey" : "businessCenters",
-                              "globalKey" : "4f5ffd5"
+                              "globalKey" : "4f5ffd5",
+                              "externalKey" : "businessCenters"
                             }
                           },
-                          "businessDayConvention" : "PRECEDING",
                           "meta" : {
                             "globalKey" : "7b765912"
                           }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "c6311122"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "80387657",
+                      "externalKey" : "equityValuationDates"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "ValuationTime",
+                    "meta" : {
+                      "globalKey" : "524b126b"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
+                      "relativeDates" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "7e0a5d94"
                         },
-                        "periodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "28c28"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "30"
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "NONE",
+                        "dateRelativeTo" : {
+                          "globalReference" : "80387657",
+                          "externalReference" : "equityValuationDates"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "7e0a5d94"
+                      }
+                    } ],
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "7e0a5d94"
                         },
-                        "startDate" : {
-                          "adjustableDate" : {
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NOT_APPLICABLE",
-                              "meta" : {
-                                "globalKey" : "3a4b88ab"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "261fe837"
-                            },
-                            "unadjustedDate" : "2010-10-12"
-                          },
-                          "meta" : {
-                            "globalKey" : "261fe837"
-                          }
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "NONE",
+                        "dateRelativeTo" : {
+                          "globalReference" : "80387657",
+                          "externalReference" : "equityValuationDates"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "7e0a5d94",
+                        "externalKey" : "finalCashSettlementPaymentDate"
+                      }
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "e5f7e728",
+                    "externalKey" : "CashSettlementPaymentDate"
+                  }
+                },
+                "underlier" : {
+                  "security" : {
+                    "productIdentifier" : [ {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-1"
                       }
+                    } ],
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
+                  }
+                },
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
+                  },
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 0.85,
+                      "cashRatio" : 2.5,
+                      "nonCashRatio" : 2.5
+                    } ],
+                    "dividendCurrency" : {
+                      "determinationMethod" : "SettlementCurrency"
                     }
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "meta" : {
-                "globalKey" : "ee36071e"
-              },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "ee36071e"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NONE",
-                "dateRelativeTo" : {
-                  "externalReference" : "finalCashSettlementPaymentDate",
-                  "globalReference" : "e9616632"
+                "meta" : {
+                  "globalKey" : "dccfc381"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "2d7e20fd"
               }
             },
             "terminationProvision" : {
               "earlyTerminationProvision" : {
-                "meta" : {
-                  "globalKey" : "4cf"
-                },
                 "optionalEarlyTermination" : {
                   "mutualEarlyTermination" : true
+                },
+                "meta" : {
+                  "globalKey" : "4cf"
                 }
               }
             }
           },
           "meta" : {
-            "globalKey" : "eb658050"
+            "globalKey" : "9591824e"
           }
         },
         "meta" : {
-          "globalKey" : "eb658050"
+          "globalKey" : "9591824e"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "42842d0a"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "8c98d20"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.example.com/instrument-id-Reuters-RIC-1-0"
-                  },
-                  "value" : "IBM.N"
-                },
-                "meta" : {
-                  "globalKey" : "8c98d20"
-                },
-                "source" : "RIC"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 37.44,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217-2001-08-15"
-                  },
-                  "value" : "USD"
+                  }
                 }
               },
-              "value" : 37.44,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "AssetPrice"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 760400,
               "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 760400
-            }
-          }, {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 28469376,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217-2001-08-15"
-                  },
-                  "value" : "USD"
+                  }
                 }
-              },
-              "value" : 28469376
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "4930fd53"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d08"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
+            "productIdentifier" : [ {
               "value" : {
-                "floatingRateIndex" : {
+                "identifier" : {
+                  "value" : "IBM.N",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
-                  },
-                  "value" : "USD-LIBOR-BBA"
+                    "scheme" : "http://www.example.com/instrument-id-Reuters-RIC-1-0"
+                  }
                 },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
+                "source" : "RIC",
+                "meta" : {
+                  "globalKey" : "8c98d20"
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "106816e0"
             }
           },
+          "meta" : {
+            "globalKey" : "a9cecb0a"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217-2001-08-15"
-                  },
-                  "value" : "USD"
+                  }
                 }
               },
-              "value" : 0.01,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217-2001-08-15"
-                  },
-                  "value" : "USD"
+                  }
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
             }
-          } ]
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
+                  }
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "8280320a"
+            }
+          },
+          "meta" : {
+            "globalKey" : "d2ab49bd"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ed24a"
-      },
-      "value" : "2010-09-10"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "d04eb192",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "d04eb552",
+          "externalReference" : "party1"
+        }
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "DTCC00006441",
           "meta" : {
-            "scheme" : "http://www.partyA.com/tradeRefNbr"
-          },
-          "value" : "TW9236"
+            "scheme" : "DTCC"
+          }
+        },
+        "meta" : {
+          "globalKey" : "5d661eab"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "ed3b3be4"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "38e8ea8a"
+        "globalKey" : "d04eb552",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "DTCC00006440",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id-1-0"
-          },
-          "value" : "299442"
+            "scheme" : "DTCC"
+          }
+        },
+        "meta" : {
+          "globalKey" : "5d661eaa"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "ed3bb042"
+      "name" : {
+        "value" : "Party B"
       },
       "meta" : {
-        "globalKey" : "3a2297ac"
+        "globalKey" : "d04eb192",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2009-07-20",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2009EquityEuropeanInterdealer"
+            },
+            "masterConfirmationAnnexType" : {
+              "value" : "ISDA2010FairValueShareSwapEuropeanInterdealer"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "a73b3def"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "a73b3def"
+      }
+    },
+    "collateral" : {
+      "independentAmount" : {
+        "payerPartyReference" : {
+          "globalReference" : "d04eb192",
+          "externalReference" : "party2"
+        },
+        "receiverPartyReference" : {
+          "globalReference" : "d04eb552",
+          "externalReference" : "party1"
+        },
+        "paymentDetail" : [ {
+          "paymentRule" : {
+            "percentageRule" : {
+              "paymentPercent" : 0.02,
+              "notionalAmountReference" : {
+                "globalReference" : "4cf",
+                "externalReference" : "equityNotionalAmount"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "a93dc25d"
+          }
+        } ]
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "b94fa407"
+    }
+  },
+  "meta" : {
+    "globalKey" : "b94fa407"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex01-equity-basket.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex01-equity-basket.json
index bfcda46938..d8f8f2e8e0 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex01-equity-basket.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex01-equity-basket.json
@@ -1,124 +1,50 @@
 {
-  "meta" : {
-    "externalKey" : "trs-eqbasket-trade",
-    "globalKey" : "caa70c10"
-  },
   "trade" : {
-    "collateral" : {
-      "independentAmount" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "770069bd"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1fd0ecfd"
-        },
-        "paymentDetail" : [ {
-          "meta" : {
-            "globalKey" : "22b12f2"
-          },
-          "paymentAmount" : {
-            "unit" : {
-              "currency" : {
-                "value" : "USD"
-              }
-            },
-            "value" : 1000,
-            "meta" : {
-              "globalKey" : "74b578a7"
-            }
-          },
-          "paymentDate" : {
-            "adjustableDate" : {
-              "dateAdjustments" : {
-                "businessDayConvention" : "NONE",
-                "meta" : {
-                  "globalKey" : "24a738"
-                }
-              },
-              "meta" : {
-                "globalKey" : "eb3c3b39"
-              },
-              "unadjustedDate" : "2004-01-01"
-            },
-            "meta" : {
-              "globalKey" : "eb3c3b39"
-            }
-          }
-        } ]
-      }
-    },
-    "meta" : {
-      "globalKey" : "caa70c10"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1fd0ecfd"
-      },
-      "name" : {
-        "value" : "ABCD Securities Inc."
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "63f6d8bd",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "TRS-02",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "QGPGHQ1ENZOOLJRFTH41"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "f54dfc9"
+            "scheme" : "http://www.abc.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "770069bd"
-      },
-      "name" : {
-        "value" : "HedgeCo Capital L.L.C."
+        "globalKey" : "297b834f"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "51e656fd",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "total-ret-swap-02",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "J6W9XJWVE853A9CVRQ85"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e4c8d6a7"
+            "scheme" : "http://www.hedgeco.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "eb1954bb"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2004-12-12",
+      "meta" : {
+        "globalKey" : "3ea30c",
+        "externalKey" : "r13"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "EXECUTION",
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "770069bd"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1fd0ecfd"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "770069bd"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Swap:PriceReturnBasicPerformance:Basket"
@@ -131,6 +57,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2004-12-14",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -139,63 +66,76 @@
                 },
                 "meta" : {
                   "globalKey" : "eb46bec6"
-                },
-                "unadjustedDate" : "2004-12-14"
+                }
               },
               "meta" : {
-                "externalKey" : "r2",
-                "globalKey" : "eb46bec6"
+                "globalKey" : "eb46bec6",
+                "externalKey" : "r2"
               }
             },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2004-12-14",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb46bec6"
+                }
               },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
+              "meta" : {
+                "globalKey" : "eb46bec6",
+                "externalKey" : "r3"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2004-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -204,19 +144,15 @@
                       },
                       "meta" : {
                         "globalKey" : "eb46bec6"
-                      },
-                      "unadjustedDate" : "2004-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eb46bec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "r120",
-                    "globalKey" : "a6a25bc0"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -225,28 +161,24 @@
                       },
                       "meta" : {
                         "globalKey" : "eb82cec6"
-                      },
-                      "unadjustedDate" : "2006-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eb82cec6"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "a6a25bc0",
+                    "externalKey" : "r120"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "dde89ad"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "119c6b42"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
                       "adjustableDates" : {
+                        "unadjustedDate" : [ "2004-12-14", "2005-12-14", "2006-12-14" ],
                         "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -257,248 +189,181 @@
                               "globalKey" : "4158421"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "da3b6050"
                           }
                         },
                         "meta" : {
                           "globalKey" : "119c6b42"
-                        },
-                        "unadjustedDate" : [ "2004-12-14", "2005-12-14", "2006-12-14" ]
+                        }
                       },
                       "meta" : {
                         "globalKey" : "119c6b42"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "119c6b42"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "r120",
-                    "globalReference" : "a6a25bc0"
+                    "globalReference" : "a6a25bc0",
+                    "externalReference" : "r120"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "eeca3a70"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "5d01cf1"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "d0f5ce43"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "r8",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "r8"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "14966"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
-                  }
-                },
-                "fxFeature" : [ {
-                  "composite" : {
-                    "determinationMethod" : "CALCULATION_AGENT"
                   },
-                  "referenceCurrency" : {
-                    "meta" : {
-                      "externalKey" : "r15",
-                      "globalKey" : "10da2"
-                    },
-                    "value" : "EUR"
+                  "meta" : {
+                    "globalKey" : "14966"
                   }
-                } ],
-                "meta" : {
-                  "externalKey" : "r1",
-                  "globalKey" : "99cb1410"
                 },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "r10",
-                    "globalKey" : "d579f9c4"
-                  },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "adjustableDate" : {
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "adjustableDates" : {
+                        "unadjustedDate" : [ "2004-12-17" ],
                         "dateAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "EUTA"
-                            }, {
-                              "value" : "GBLO"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "4158421"
-                            }
-                          },
-                          "businessDayConvention" : "FOLLOWING",
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
-                            "globalKey" : "da3b6050"
+                            "globalKey" : "3a4b88ab"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "d8edc182"
-                        },
-                        "unadjustedDate" : "2006-12-14"
+                          "globalKey" : "256dab7c"
+                        }
                       },
                       "meta" : {
-                        "externalKey" : "r12",
-                        "globalKey" : "d8edc182"
+                        "globalKey" : "256dab7c",
+                        "externalKey" : "r6"
                       }
                     },
-                    "interimPaymentDates" : [ {
-                      "adjustableDates" : {
-                        "dateAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "EUTA"
-                            }, {
+                    "valuationTimeType" : "Close",
+                    "meta" : {
+                      "globalKey" : "3e4802cf"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2006-01-17",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "259f68bc"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "259f68bc",
+                        "externalKey" : "r7"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "976aea3e"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
+                      "adjustableDates" : {
+                        "unadjustedDate" : [ "2004-12-14", "2005-12-14", "2006-12-14" ],
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "EUTA"
+                            }, {
                               "value" : "GBLO"
                             } ],
                             "meta" : {
                               "globalKey" : "4158421"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "da3b6050"
                           }
                         },
                         "meta" : {
                           "globalKey" : "119c6b42"
-                        },
-                        "unadjustedDate" : [ "2004-12-14", "2005-12-14", "2006-12-14" ]
+                        }
                       },
                       "meta" : {
-                        "externalKey" : "r11",
-                        "globalKey" : "119c6b42"
-                      }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendAmountType" : "RECORD_AMOUNT",
-                    "dividendCurrency" : {
-                      "currencyReference" : {
-                        "externalReference" : "r15",
-                        "globalReference" : "10da2"
+                        "globalKey" : "119c6b42",
+                        "externalKey" : "r11"
                       }
-                    },
-                    "dividendEntitlement" : "EX_DATE",
-                    "dividendPayoutRatio" : [ {
-                      "basketConstituent" : {
-                        "meta" : {
-                          "globalKey" : "7a5b92c5"
-                        },
-                        "security" : {
-                          "productIdentifier" : [ {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "productIdentifier-1"
-                            }
-                          }, {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "productIdentifier-2"
+                    } ],
+                    "finalPaymentDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2006-12-14",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "EUTA"
+                            }, {
+                              "value" : "GBLO"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "4158421"
                             }
-                          } ],
-                          "securityType" : "EQUITY"
-                        }
-                      },
-                      "totalRatio" : 0.85
-                    }, {
-                      "basketConstituent" : {
-                        "meta" : {
-                          "globalKey" : "7a5b92c5"
+                          },
+                          "meta" : {
+                            "globalKey" : "da3b6050"
+                          }
                         },
-                        "security" : {
-                          "productIdentifier" : [ {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "productIdentifier-4"
-                            }
-                          }, {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "productIdentifier-3"
-                            }
-                          } ],
-                          "securityType" : "EQUITY"
-                        }
-                      },
-                      "totalRatio" : 0.85
-                    } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "EQUITY_PAYMENT_DATE"
-                        }
-                      },
-                      "endDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "r7",
-                          "globalReference" : "259f68bc"
+                        "meta" : {
+                          "globalKey" : "d8edc182"
                         }
                       },
-                      "startDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "r13",
-                          "globalReference" : "3ea30c"
-                        }
+                      "meta" : {
+                        "globalKey" : "d8edc182",
+                        "externalKey" : "r12"
                       }
-                    } ],
-                    "dividendReinvestment" : false,
-                    "excessDividendAmount" : "PAID_AMOUNT"
+                    }
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                  "meta" : {
+                    "globalKey" : "91368244",
+                    "externalKey" : "r10"
                   }
                 },
                 "underlier" : {
                   "basket" : {
                     "basketConstituent" : [ {
-                      "meta" : {
-                        "globalKey" : "7a5b92c5"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "address" : {
@@ -511,12 +376,12 @@
                             "value" : "productIdentifier-2"
                           }
                         } ],
-                        "securityType" : "EQUITY"
-                      }
-                    }, {
+                        "securityType" : "Equity"
+                      },
                       "meta" : {
                         "globalKey" : "7a5b92c5"
-                      },
+                      }
+                    }, {
                       "security" : {
                         "productIdentifier" : [ {
                           "address" : {
@@ -529,7 +394,10 @@
                             "value" : "productIdentifier-3"
                           }
                         } ],
-                        "securityType" : "EQUITY"
+                        "securityType" : "Equity"
+                      },
+                      "meta" : {
+                        "globalKey" : "7a5b92c5"
                       }
                     } ]
                   },
@@ -537,355 +405,487 @@
                     "globalKey" : "cc1d884a"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
+                "fxFeature" : [ {
+                  "referenceCurrency" : {
+                    "value" : "EUR",
                     "meta" : {
-                      "globalKey" : "976aea3e"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "259f68bc"
-                        },
-                        "unadjustedDate" : "2006-01-17"
-                      },
-                      "meta" : {
-                        "externalKey" : "r7",
-                        "globalKey" : "259f68bc"
-                      }
+                      "globalKey" : "10da2",
+                      "externalKey" : "r15"
                     }
                   },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "3e4802cf"
-                    },
-                    "valuationDates" : {
-                      "adjustableDates" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
+                  "composite" : {
+                    "determinationMethod" : "CalculationAgent"
+                  }
+                } ],
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
+                  },
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 0.85,
+                      "basketConstituent" : {
+                        "security" : {
+                          "productIdentifier" : [ {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "productIdentifier-1"
+                            }
+                          }, {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "productIdentifier-2"
+                            }
+                          } ],
+                          "securityType" : "Equity"
                         },
                         "meta" : {
-                          "globalKey" : "256dab7c"
+                          "globalKey" : "7a5b92c5"
+                        }
+                      }
+                    }, {
+                      "totalRatio" : 0.85,
+                      "basketConstituent" : {
+                        "security" : {
+                          "productIdentifier" : [ {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "productIdentifier-4"
+                            }
+                          }, {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "productIdentifier-3"
+                            }
+                          } ],
+                          "securityType" : "Equity"
                         },
-                        "unadjustedDate" : [ "2004-12-17" ]
-                      },
-                      "meta" : {
-                        "externalKey" : "r6",
-                        "globalKey" : "256dab7c"
+                        "meta" : {
+                          "globalKey" : "7a5b92c5"
+                        }
+                      }
+                    } ],
+                    "dividendReinvestment" : false,
+                    "dividendEntitlement" : "ExDate",
+                    "dividendAmountType" : "RecordAmount",
+                    "excessDividendAmount" : "PaidAmount",
+                    "dividendCurrency" : {
+                      "currencyReference" : {
+                        "globalReference" : "10da2",
+                        "externalReference" : "r15"
                       }
                     },
-                    "valuationTimeType" : "CLOSE"
-                  }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
+                    "dividendPeriod" : [ {
+                      "startDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "3ea30c",
+                          "externalReference" : "r13"
+                        }
+                      },
+                      "endDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "259f68bc",
+                          "externalReference" : "r7"
+                        }
+                      },
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "EquityPaymentDate"
+                        }
+                      }
+                    } ]
                   }
                 },
                 "meta" : {
-                  "globalKey" : "eb46bec6"
-                },
-                "unadjustedDate" : "2004-12-14"
-              },
+                  "globalKey" : "5f7c9a32",
+                  "externalKey" : "r1"
+                }
+              } ],
               "meta" : {
-                "externalKey" : "r3",
-                "globalKey" : "eb46bec6"
+                "globalKey" : "22a7f6a1"
               }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
             }
           },
           "meta" : {
-            "globalKey" : "9af06246"
+            "globalKey" : "ac8d00e"
           }
         },
         "meta" : {
-          "globalKey" : "9af06246"
+          "globalKey" : "ac8d00e"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "63907204"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 19785157.16,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 19785157.16,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
+              "priceType" : "AssetPrice"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 1
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
-            "value" : {
-              "value" : 1
             }
           }, {
+            "value" : {
+              "value" : 19785157.16,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e7dce7c"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 432000,
               "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 19785157.16
+                "financialUnit" : "Share"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-4"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "fc7d4c3"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5a4c05c7"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "ISIN_XXXX",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "ISIN_XXXX"
+                  }
                 },
+                "source" : "ISIN",
                 "meta" : {
                   "globalKey" : "16efe07f"
-                },
-                "source" : "ISIN"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "Telecom Italia spa"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "5d986ee6"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "ef34b319"
+            }
           },
+          "meta" : {
+            "globalKey" : "78dd1a55"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 227000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-4"
+                "value" : "quantity-5"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 432000
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "f5df73f6"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "dfde5c1e"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-4"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "ISIN_YYYY",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "ISIN_YYYY"
+                  }
                 },
+                "source" : "ISIN",
                 "meta" : {
                   "globalKey" : "16f058bf"
-                },
-                "source" : "ISIN"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-3"
+                  "value" : "productIdentifier-4"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "Nokya Oyj"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "b06a157d"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-5"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
+                }
               },
-              "value" : 227000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "3d72659d"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e0e"
-            },
-            "rateOption" : {
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
+                  "value" : "productIdentifier-3"
                 } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EURIBOR-Telerate"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 3
-                }
               }
+            } ],
+            "meta" : {
+              "globalKey" : "1bed27a2"
             }
           },
+          "meta" : {
+            "globalKey" : "121a53fa"
+          }
+        }, {
           "price" : [ {
+            "value" : {
+              "value" : 0.0050,
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "price-2"
               } ]
-            },
-            "value" : {
-              "value" : 0.0050,
-              "arithmeticOperator" : "ADD",
-              "priceType" : "INTEREST_RATE"
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 19785157.16,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-3"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EURIBOR-Telerate"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 3,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
               },
-              "value" : 19785157.16
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2bba16de"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "e98b7331"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "r13",
-        "globalKey" : "3ea30c"
-      },
-      "value" : "2004-12-12"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "63f6d8bd",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "51e656fd",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "51e656fd",
+          "externalReference" : "party2"
+        } ]
+      } ],
+      "adjustment" : "Execution"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "QGPGHQ1ENZOOLJRFTH41",
           "meta" : {
-            "scheme" : "http://www.abc.com/swaps/trade-id"
-          },
-          "value" : "TRS-02"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "f54dfc9"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1fd0ecfd"
+      "name" : {
+        "value" : "ABCD Securities Inc."
       },
       "meta" : {
-        "globalKey" : "5c7fe0c5"
+        "globalKey" : "63f6d8bd",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "J6W9XJWVE853A9CVRQ85",
           "meta" : {
-            "scheme" : "http://www.hedgeco.com/swaps/trade-id"
-          },
-          "value" : "total-ret-swap-02"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e4c8d6a7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "770069bd"
+      "name" : {
+        "value" : "HedgeCo Capital L.L.C."
       },
       "meta" : {
-        "globalKey" : "2c3a2e93"
+        "globalKey" : "51e656fd",
+        "externalKey" : "party2"
+      }
+    } ],
+    "collateral" : {
+      "independentAmount" : {
+        "payerPartyReference" : {
+          "globalReference" : "51e656fd",
+          "externalReference" : "party2"
+        },
+        "receiverPartyReference" : {
+          "globalReference" : "63f6d8bd",
+          "externalReference" : "party1"
+        },
+        "paymentDetail" : [ {
+          "paymentDate" : {
+            "adjustableDate" : {
+              "unadjustedDate" : "2004-01-01",
+              "dateAdjustments" : {
+                "businessDayConvention" : "NONE",
+                "meta" : {
+                  "globalKey" : "24a738"
+                }
+              },
+              "meta" : {
+                "globalKey" : "eb3c3b39"
+              }
+            },
+            "meta" : {
+              "globalKey" : "eb3c3b39"
+            }
+          },
+          "paymentAmount" : {
+            "value" : 1000,
+            "unit" : {
+              "currency" : {
+                "value" : "USD"
+              }
+            },
+            "meta" : {
+              "globalKey" : "74b578a7"
+            }
+          },
+          "meta" : {
+            "globalKey" : "3e2a590e"
+          }
+        } ]
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "45904d56"
+    }
+  },
+  "meta" : {
+    "globalKey" : "45904d56",
+    "externalKey" : "trs-eqbasket-trade"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex02-single-equity.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex02-single-equity.json
index 67497851c4..5bf97ad0db 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex02-single-equity.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex02-single-equity.json
@@ -1,136 +1,56 @@
 {
-  "meta" : {
-    "externalKey" : "trs-eq1-trade",
-    "globalKey" : "c4e54859"
-  },
   "trade" : {
-    "collateral" : {
-      "independentAmount" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "770069bd"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1fd0ecfd"
-        },
-        "paymentDetail" : [ {
-          "meta" : {
-            "globalKey" : "2491af2"
-          },
-          "paymentAmount" : {
-            "unit" : {
-              "currency" : {
-                "value" : "USD"
-              }
-            },
-            "value" : 1000,
-            "meta" : {
-              "globalKey" : "74b578a7"
-            }
-          },
-          "paymentDate" : {
-            "adjustableDate" : {
-              "dateAdjustments" : {
-                "businessDayConvention" : "NONE",
-                "meta" : {
-                  "globalKey" : "24a738"
-                }
-              },
-              "meta" : {
-                "globalKey" : "eb5a4339"
-              },
-              "unadjustedDate" : "2005-01-01"
-            },
-            "meta" : {
-              "globalKey" : "eb5a4339"
-            }
-          }
-        } ]
-      }
-    },
-    "meta" : {
-      "globalKey" : "c4e54859"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1fd0ecfd"
-      },
-      "name" : {
-        "value" : "ABCD Securities Inc."
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "63f6d8bd",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "TRS-01",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "QGPGHQ1ENZOOLJRFTH41"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "f54dfc9"
+            "scheme" : "http://www.abc.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "770069bd"
-      },
-      "name" : {
-        "value" : "HedgeCo Capital L.L.C."
+        "globalKey" : "297b834e"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "51e656fd",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "total-ret-swap-01",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "J6W9XJWVE853A9CVRQ85"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e4c8d6a7"
+            "scheme" : "http://www.hedgeco.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "eb1954ba"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2004-10-10",
+      "meta" : {
+        "globalKey" : "3ea28a",
+        "externalKey" : "trs-eq1-TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "EXECUTION",
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1fd0ecfd"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1fd0ecfd"
-        } ],
-        "role" : "EXTRAORDINARY_DIVIDENDS_PARTY"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "770069bd"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1fd0ecfd"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "TotalReturnSwap",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-type-simple"
-                },
-                "value" : "TotalReturnSwap"
+                }
               }
             }
           }, {
@@ -140,6 +60,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2004-10-12",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -148,63 +69,76 @@
                 },
                 "meta" : {
                   "globalKey" : "eb44d6c4"
-                },
-                "unadjustedDate" : "2004-10-12"
+                }
               },
               "meta" : {
-                "externalKey" : "trs-eq1-EffectiveDate",
-                "globalKey" : "eb44d6c4"
+                "globalKey" : "eb44d6c4",
+                "externalKey" : "trs-eq1-EffectiveDate"
               }
             },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-10-12",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb80e6c4"
+                }
               },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
+              "meta" : {
+                "globalKey" : "eb80e6c4",
+                "externalKey" : "trs-eq1-TerminationDate"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2004-10-12",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -213,19 +147,15 @@
                       },
                       "meta" : {
                         "globalKey" : "eb44d6c4"
-                      },
-                      "unadjustedDate" : "2004-10-12"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eb44d6c4"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "trs-eq1-InterestLegPeriodDates",
-                    "globalKey" : "e60b9a80"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2004-10-12",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -234,28 +164,24 @@
                       },
                       "meta" : {
                         "globalKey" : "eb44d6c4"
-                      },
-                      "unadjustedDate" : "2004-10-12"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eb44d6c4"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e60b9a80",
+                    "externalKey" : "trs-eq1-InterestLegPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "c635cece"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "f937d1c4"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
                       "adjustableDates" : {
+                        "unadjustedDate" : [ "2004-10-12", "2005-10-12", "2006-10-12" ],
                         "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -266,124 +192,121 @@
                               "globalKey" : "4158421"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "da3b6050"
                           }
                         },
                         "meta" : {
                           "globalKey" : "f937d1c4"
-                        },
-                        "unadjustedDate" : [ "2004-10-12", "2005-10-12", "2006-10-12" ]
+                        }
                       },
                       "meta" : {
                         "globalKey" : "f937d1c4"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "f937d1c4"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "trs-eq1-InterestLegPeriodDates",
-                    "globalReference" : "e60b9a80"
+                    "globalReference" : "e60b9a80",
+                    "externalReference" : "trs-eq1-InterestLegPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "eea6b313"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "66ebf9d6"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "c0b20f84"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "trs-eq1-EquityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "trs-eq1-EquityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "14966"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
+                  },
+                  "meta" : {
+                    "globalKey" : "14966"
                   }
                 },
-                "meta" : {
-                  "externalKey" : "trs-eq1-equityLeg",
-                  "globalKey" : "30678192"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "trs-eq1-EquityPaymentDate",
-                    "globalKey" : "cd084ac4"
-                  },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "adjustableDate" : {
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "adjustableDates" : {
+                        "unadjustedDate" : [ "2004-10-12", "2004-11-13", "2004-12-12", "2005-01-14", "2005-02-12", "2005-03-12", "2005-04-12", "2005-05-13", "2005-06-12", "2005-07-12", "2005-08-12" ],
                         "dateAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "EUTA"
-                            }, {
-                              "value" : "GBLO"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "4158421"
-                            }
-                          },
-                          "businessDayConvention" : "FOLLOWING",
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
-                            "globalKey" : "da3b6050"
+                            "globalKey" : "3a4b88ab"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e8575202"
-                        },
-                        "unadjustedDate" : "2006-10-14"
+                          "globalKey" : "99796a33"
+                        }
                       },
                       "meta" : {
-                        "externalKey" : "trs-eq1-FinalEquityPaymentDate",
-                        "globalKey" : "e8575202"
+                        "globalKey" : "99796a33",
+                        "externalKey" : "trs-eq1-InterimValuationDate"
                       }
                     },
-                    "interimPaymentDates" : [ {
-                      "adjustableDates" : {
+                    "valuationTimeType" : "Close",
+                    "meta" : {
+                      "globalKey" : "e8b8f5c6"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2005-09-24",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "2588fd03"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "2588fd03",
+                        "externalKey" : "trs-eq1-FinalValuationDate"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "97547e85"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
+                      "adjustableDates" : {
+                        "unadjustedDate" : [ "2004-10-14", "2005-10-14", "2006-10-14" ],
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -394,64 +317,54 @@
                               "globalKey" : "4158421"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "da3b6050"
                           }
                         },
                         "meta" : {
                           "globalKey" : "da15ebc2"
-                        },
-                        "unadjustedDate" : [ "2004-10-14", "2005-10-14", "2006-10-14" ]
+                        }
                       },
                       "meta" : {
-                        "externalKey" : "trs-eq1-InterimEquityPaymentDate",
-                        "globalKey" : "da15ebc2"
+                        "globalKey" : "da15ebc2",
+                        "externalKey" : "trs-eq1-InterimEquityPaymentDate"
                       }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendAmountType" : "RECORD_AMOUNT",
-                    "dividendCurrency" : {
-                      "determinationMethod" : "DIVIDEND_CURRENCY"
-                    },
-                    "dividendEntitlement" : "EX_DATE",
-                    "dividendPayoutRatio" : [ {
-                      "totalRatio" : 0.85
                     } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "EQUITY_PAYMENT_DATE"
-                        }
-                      },
-                      "endDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "trs-eq1-TerminationDate",
-                          "globalReference" : "eb80e6c4"
+                    "finalPaymentDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2006-10-14",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "EUTA"
+                            }, {
+                              "value" : "GBLO"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "4158421"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "da3b6050"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "e8575202"
                         }
                       },
-                      "startDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "trs-eq1-TradeDate",
-                          "globalReference" : "3ea28a"
-                        }
+                      "meta" : {
+                        "globalKey" : "e8575202",
+                        "externalKey" : "trs-eq1-FinalEquityPaymentDate"
                       }
-                    } ],
-                    "dividendReinvestment" : false,
-                    "excessDividendAmount" : "RECORD_AMOUNT",
-                    "extraordinaryDividendsParty" : "EXTRAORDINARY_DIVIDENDS_PARTY"
+                    }
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                  "meta" : {
+                    "globalKey" : "b192f344",
+                    "externalKey" : "trs-eq1-EquityPaymentDate"
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -464,284 +377,371 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
-                    "meta" : {
-                      "globalKey" : "97547e85"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "2588fd03"
-                        },
-                        "unadjustedDate" : "2005-09-24"
-                      },
-                      "meta" : {
-                        "externalKey" : "trs-eq1-FinalValuationDate",
-                        "globalKey" : "2588fd03"
-                      }
-                    }
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
                   },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "e8b8f5c6"
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 0.85
+                    } ],
+                    "dividendReinvestment" : false,
+                    "dividendEntitlement" : "ExDate",
+                    "dividendAmountType" : "RecordAmount",
+                    "extraordinaryDividendsParty" : "ExtraordinaryDividendsParty",
+                    "excessDividendAmount" : "RecordAmount",
+                    "dividendCurrency" : {
+                      "determinationMethod" : "DividendCurrency"
                     },
-                    "valuationDates" : {
-                      "adjustableDates" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "99796a33"
-                        },
-                        "unadjustedDate" : [ "2004-10-12", "2004-11-13", "2004-12-12", "2005-01-14", "2005-02-12", "2005-03-12", "2005-04-12", "2005-05-13", "2005-06-12", "2005-07-12", "2005-08-12" ]
+                    "dividendPeriod" : [ {
+                      "startDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "3ea28a",
+                          "externalReference" : "trs-eq1-TradeDate"
+                        }
                       },
-                      "meta" : {
-                        "externalKey" : "trs-eq1-InterimValuationDate",
-                        "globalKey" : "99796a33"
+                      "endDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "eb80e6c4",
+                          "externalReference" : "trs-eq1-TerminationDate"
+                        }
+                      },
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "EquityPaymentDate"
+                        }
                       }
-                    },
-                    "valuationTimeType" : "CLOSE"
-                  }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
+                    } ]
                   }
                 },
                 "meta" : {
-                  "globalKey" : "eb80e6c4"
-                },
-                "unadjustedDate" : "2006-10-12"
-              },
+                  "globalKey" : "4e810460",
+                  "externalKey" : "trs-eq1-equityLeg"
+                }
+              } ],
               "meta" : {
-                "externalKey" : "trs-eq1-TerminationDate",
-                "globalKey" : "eb80e6c4"
+                "globalKey" : "df105c4a"
               }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
             }
           },
           "meta" : {
-            "globalKey" : "7a2712b1"
+            "globalKey" : "81470987"
           }
         },
         "meta" : {
-          "globalKey" : "7a2712b1"
+          "globalKey" : "81470987"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "ba98e23"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5fc33427"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                  },
-                  "value" : "SHPGY.O"
-                },
-                "meta" : {
-                  "globalKey" : "140c7e76"
-                },
-                "source" : "CUSIP"
-              }
-            }, {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
-                },
-                "meta" : {
-                  "globalKey" : "5518dd"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 37.44,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 37.44,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "AssetPrice"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 760400,
               "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 760400
-            }
-          }, {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 28469376,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 28469376
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "bd42f96b"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d03"
-            },
-            "rateOption" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "SHPGY.O",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
+                  }
+                },
+                "source" : "CUSIP",
+                "meta" : {
+                  "globalKey" : "140c7e76"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-LIBOR-BBA"
+                "identifier" : {
+                  "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
                 },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 1
+                "source" : "Name",
+                "meta" : {
+                  "globalKey" : "5518dd"
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "98a350b9"
             }
           },
+          "meta" : {
+            "globalKey" : "9cf8bd63"
+          }
+        }, {
           "price" : [ {
+            "value" : {
+              "value" : 0.0020,
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "price-2"
               } ]
-            },
-            "value" : {
-              "value" : 0.0020,
-              "arithmeticOperator" : "ADD",
-              "priceType" : "INTEREST_RATE"
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 19785157.16,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-3"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 1,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
                 }
               },
-              "value" : 19785157.16
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "82801f45"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "896bf87b"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "trs-eq1-TradeDate",
-        "globalKey" : "3ea28a"
-      },
-      "value" : "2004-10-10"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "51e656fd",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "63f6d8bd",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "63f6d8bd",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "ExtraordinaryDividendsParty",
+        "partyReference" : [ {
+          "globalReference" : "63f6d8bd",
+          "externalReference" : "party1"
+        } ]
+      } ],
+      "adjustment" : "Execution"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "QGPGHQ1ENZOOLJRFTH41",
           "meta" : {
-            "scheme" : "http://www.abc.com/swaps/trade-id"
-          },
-          "value" : "TRS-01"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "f54dfc9"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1fd0ecfd"
+      "name" : {
+        "value" : "ABCD Securities Inc."
       },
       "meta" : {
-        "globalKey" : "5c7fdd04"
+        "globalKey" : "63f6d8bd",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "J6W9XJWVE853A9CVRQ85",
           "meta" : {
-            "scheme" : "http://www.hedgeco.com/swaps/trade-id"
-          },
-          "value" : "total-ret-swap-01"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e4c8d6a7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "770069bd"
+      "name" : {
+        "value" : "HedgeCo Capital L.L.C."
       },
       "meta" : {
-        "globalKey" : "2c3a2ad2"
+        "globalKey" : "51e656fd",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "collateral" : {
+      "independentAmount" : {
+        "payerPartyReference" : {
+          "globalReference" : "51e656fd",
+          "externalReference" : "party2"
+        },
+        "receiverPartyReference" : {
+          "globalReference" : "63f6d8bd",
+          "externalReference" : "party1"
+        },
+        "paymentDetail" : [ {
+          "paymentDate" : {
+            "adjustableDate" : {
+              "unadjustedDate" : "2005-01-01",
+              "dateAdjustments" : {
+                "businessDayConvention" : "NONE",
+                "meta" : {
+                  "globalKey" : "24a738"
+                }
+              },
+              "meta" : {
+                "globalKey" : "eb5a4339"
+              }
+            },
+            "meta" : {
+              "globalKey" : "eb5a4339"
+            }
+          },
+          "paymentAmount" : {
+            "value" : 1000,
+            "unit" : {
+              "currency" : {
+                "value" : "USD"
+              }
+            },
+            "meta" : {
+              "globalKey" : "74b578a7"
+            }
+          },
+          "meta" : {
+            "globalKey" : "4791510e"
+          }
+        } ]
+      }
+    },
+    "meta" : {
+      "globalKey" : "1db7ae61"
+    }
+  },
+  "meta" : {
+    "globalKey" : "1db7ae61",
+    "externalKey" : "trs-eq1-trade"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex03-single-stock-execution-swap-with-fixing-and-dividend-payment-dates.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex03-single-stock-execution-swap-with-fixing-and-dividend-payment-dates.json
index c738c22235..2a3fdcde05 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex03-single-stock-execution-swap-with-fixing-and-dividend-payment-dates.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex03-single-stock-execution-swap-with-fixing-and-dividend-payment-dates.json
@@ -1,118 +1,50 @@
 {
-  "meta" : {
-    "globalKey" : "49c8df49"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "6234",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/eqs-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
       "meta" : {
-        "globalKey" : "92c7c587"
+        "globalKey" : "9593cc32"
       }
-    },
-    "meta" : {
-      "globalKey" : "49c8df49"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "6569",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/eqs-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "95944c36"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-09-24",
+      "meta" : {
+        "globalKey" : "3e8a58",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "EXECUTION",
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "EXTRAORDINARY_DIVIDENDS_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleName"
@@ -123,308 +55,300 @@
             "productQualifier" : "EquitySwap_TotalReturnBasicPerformance_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
-              "meta" : {
-                "externalKey" : "EffectiveDate",
-                "globalKey" : "6a2df5e0"
-              },
               "relativeDate" : {
+                "periodMultiplier" : 3,
+                "period" : "D",
                 "meta" : {
-                  "globalKey" : "6a2df5e0"
+                  "globalKey" : "fed6ed42"
                 },
-                "period" : "D",
-                "periodMultiplier" : 3,
-                "dayType" : "EXCHANGE_BUSINESS",
-                "businessDayConvention" : "NOT_APPLICABLE",
+                "dayType" : "ExchangeBusiness",
+                "businessDayConvention" : "NotApplicable",
                 "dateRelativeTo" : {
-                  "externalReference" : "TradeDate",
-                  "globalReference" : "3e8a58"
+                  "globalReference" : "3e8a58",
+                  "externalReference" : "TradeDate"
                 }
+              },
+              "meta" : {
+                "globalKey" : "fed6ed42",
+                "externalKey" : "EffectiveDate"
               }
             },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "edf02740"
+                },
+                "businessDayConvention" : "NotApplicable",
+                "dateRelativeTo" : {
+                  "globalReference" : "bb917ef4",
+                  "externalReference" : "FinalEquityPaymentDate"
+                }
               },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
+              "meta" : {
+                "globalKey" : "edf02740",
+                "externalKey" : "TerminationDate"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "EquityNotionalAmount"
+                  },
                   "meta" : {
                     "globalKey" : "607b91fd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "EquityNotionalAmount",
-                    "globalReference" : "4cf"
                   }
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "globalKey" : "6a2df5e0"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 3,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "6a2df5e0"
+                        "globalKey" : "fed6ed42"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 3,
-                      "dayType" : "EXCHANGE_BUSINESS",
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "dayType" : "ExchangeBusiness",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "TradeDate",
-                        "globalReference" : "3e8a58"
+                        "globalReference" : "3e8a58",
+                        "externalReference" : "TradeDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "fed6ed42"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "InterestLegPeriodDates",
-                    "globalKey" : "8fbb2a68"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "globalKey" : "f18f7c48"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "f18f7c48"
+                        "globalKey" : "edf02740"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "FinalEquityPaymentDate",
-                        "globalReference" : "ad48d812"
+                        "globalReference" : "bb917ef4",
+                        "externalReference" : "FinalEquityPaymentDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "edf02740"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f0f22bbe",
+                    "externalKey" : "InterestLegPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "f5120739"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "InterestLegPaymentDates",
-                    "globalKey" : "9b9d36de"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "9b9d36de"
-                      },
                       "relativeDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "9b9d36de"
+                          "globalKey" : "97fde1d6"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "dateRelativeTo" : {
-                          "externalReference" : "EquityPaymentDate",
-                          "globalReference" : "48d79a64"
+                          "globalReference" : "56b8bd08",
+                          "externalReference" : "EquityPaymentDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "97fde1d6"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97fde1d6",
+                    "externalKey" : "InterestLegPaymentDates"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "InterestLegPeriodDates",
-                    "globalReference" : "8fbb2a68"
+                    "globalReference" : "f0f22bbe",
+                    "externalReference" : "InterestLegPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "9e9ada33"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "92fd2d87"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "ffde871d"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "EquityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "EquityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "6d299e64"
-                },
-                "paymentDates" : {
                   "meta" : {
-                    "externalKey" : "EquityPaymentDate",
-                    "globalKey" : "48d79a64"
-                  },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "externalKey" : "FinalEquityPaymentDate",
-                        "globalKey" : "ad48d812"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "ad48d812"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessCentersReference" : {
-                          "externalReference" : "PrimaryBusinessCenter",
-                          "globalReference" : "27e4e9"
+                    "globalKey" : "7610bbd9"
+                  }
+                },
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "adjustableDates" : {
+                        "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ],
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
                         },
-                        "businessDayConvention" : "FOLLOWING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "FinalValuationDate",
-                          "globalReference" : "252ee503"
+                        "meta" : {
+                          "globalKey" : "e80e5233"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "e80e5233",
+                        "externalKey" : "InterimValuationDate"
                       }
                     },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "externalKey" : "InterimEquityPaymentDate",
-                        "globalKey" : "2519d1b6"
-                      },
-                      "relativeDates" : {
-                        "meta" : {
-                          "globalKey" : "2519d1b6"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessCenters" : {
+                    "valuationTimeType" : "Close",
+                    "meta" : {
+                      "globalKey" : "374dddc6"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2002-09-24",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "252ee503"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "252ee503",
+                        "externalKey" : "FinalValuationDate"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "96fa6685"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
+                      "relativeDates" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "dfe60714"
+                        },
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
+                        "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "PrimaryBusinessCenter",
-                            "globalKey" : "27e4e9"
+                            "globalKey" : "27e4e9",
+                            "externalKey" : "PrimaryBusinessCenter"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "InterimValuationDate",
-                          "globalReference" : "e80e5233"
+                          "globalReference" : "e80e5233",
+                          "externalReference" : "InterimValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "dfe60714",
+                        "externalKey" : "InterimEquityPaymentDate"
                       }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendCurrency" : {
-                      "determinationMethod" : "DIVIDEND_CURRENCY"
-                    },
-                    "dividendEntitlement" : "EX_DATE",
-                    "dividendPayoutRatio" : [ {
-                      "totalRatio" : 1
                     } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "SHARE_PAYMENT"
-                        }
-                      },
-                      "endDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "TerminationDate",
-                          "globalReference" : "f18f7c48"
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "bb917ef4"
+                        },
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "PrimaryBusinessCenter"
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "252ee503",
+                          "externalReference" : "FinalValuationDate"
                         }
                       },
-                      "startDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "TradeDate",
-                          "globalReference" : "3e8a58"
-                        }
+                      "meta" : {
+                        "globalKey" : "bb917ef4",
+                        "externalKey" : "FinalEquityPaymentDate"
                       }
-                    } ],
-                    "dividendReinvestment" : false,
-                    "excessDividendAmount" : "RECORD_AMOUNT",
-                    "extraordinaryDividendsParty" : "EXTRAORDINARY_DIVIDENDS_PARTY"
+                    }
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                  "meta" : {
+                    "globalKey" : "56b8bd08",
+                    "externalKey" : "EquityPaymentDate"
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -437,278 +361,354 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
-                    "meta" : {
-                      "globalKey" : "96fa6685"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "252ee503"
-                        },
-                        "unadjustedDate" : "2002-09-24"
-                      },
-                      "meta" : {
-                        "externalKey" : "FinalValuationDate",
-                        "globalKey" : "252ee503"
-                      }
-                    }
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
                   },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "374dddc6"
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 1
+                    } ],
+                    "dividendReinvestment" : false,
+                    "dividendEntitlement" : "ExDate",
+                    "extraordinaryDividendsParty" : "ExtraordinaryDividendsParty",
+                    "excessDividendAmount" : "RecordAmount",
+                    "dividendCurrency" : {
+                      "determinationMethod" : "DividendCurrency"
                     },
-                    "valuationDates" : {
-                      "adjustableDates" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "e80e5233"
-                        },
-                        "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ]
+                    "dividendPeriod" : [ {
+                      "startDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "3e8a58",
+                          "externalReference" : "TradeDate"
+                        }
                       },
-                      "meta" : {
-                        "externalKey" : "InterimValuationDate",
-                        "globalKey" : "e80e5233"
+                      "endDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "edf02740",
+                          "externalReference" : "TerminationDate"
+                        }
+                      },
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "SharePayment"
+                        }
                       }
-                    },
-                    "valuationTimeType" : "CLOSE"
+                    } ]
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "meta" : {
-                "externalKey" : "TerminationDate",
-                "globalKey" : "f18f7c48"
-              },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "f18f7c48"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NOT_APPLICABLE",
-                "dateRelativeTo" : {
-                  "externalReference" : "FinalEquityPaymentDate",
-                  "globalReference" : "ad48d812"
+                "meta" : {
+                  "globalKey" : "e17fa224"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "38ea0e2b"
               }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "2ad30fdf"
+            "globalKey" : "92515ad"
           }
         },
         "meta" : {
-          "globalKey" : "2ad30fdf"
+          "globalKey" : "92515ad"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "417e440b"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "26bb033f"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/schemes/4-1/instrumentId"
-                  },
-                  "value" : "SHPGY.O"
-                },
-                "meta" : {
-                  "globalKey" : "8c85a05e"
-                },
-                "source" : "OTHER"
-              }
-            }, {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
-                },
-                "meta" : {
-                  "globalKey" : "5518dd"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 37.44,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 37.44,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "AssetPrice"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 760400,
               "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 760400
-            }
-          }, {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 28469376,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 28469376
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "7dd9ec3"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d03"
-            },
-            "rateOption" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "SHPGY.O",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/schemes/4-1/instrumentId"
+                  }
+                },
+                "source" : "Other",
+                "meta" : {
+                  "globalKey" : "8c85a05e"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-LIBOR-BBA"
+                "identifier" : {
+                  "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
                 },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 1
+                "source" : "Name",
+                "meta" : {
+                  "globalKey" : "5518dd"
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "b0a564a1"
             }
           },
+          "meta" : {
+            "globalKey" : "b4fad14b"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
             "value" : {
+              "value" : 0.0020,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0020,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 1,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "82801f45"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "95c8caad"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e8a58"
-      },
-      "value" : "2001-09-24"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "ExtraordinaryDividendsParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      } ],
+      "adjustment" : "Execution"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/eqs-trade-id"
-          },
-          "value" : "6234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "23a97ce8"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/eqs-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "6569"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "23d5334e"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "72b93b4f"
+    }
+  },
+  "meta" : {
+    "globalKey" : "72b93b4f"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex04-index-ios.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex04-index-ios.json
index 289cab4915..4561665366 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex04-index-ios.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex04-index-ios.json
@@ -1,72 +1,49 @@
 {
-  "meta" : {
-    "externalKey" : "trs-ex4-trade",
-    "globalKey" : "f4a752e6"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "f4a752e6"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "54527a4c"
-      },
-      "name" : {
-        "value" : "ABCD Fund"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "4939658c",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "TRS-01",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "QGPGHQ1ENZOOLJRFTH41"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "f54dfc9"
+            "scheme" : "http://www.abc.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "770069bd"
-      },
-      "name" : {
-        "value" : "HedgeCo Capital L.L.C."
+        "globalKey" : "297b834e"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "51e656fd",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "total-ret-swap-01",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "J6W9XJWVE853A9CVRQ85"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e4c8d6a7"
+            "scheme" : "http://www.hedgeco.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "eb1954ba"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2011-03-23",
+      "meta" : {
+        "globalKey" : "3ed8d7"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "770069bd"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "54527a4c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleIndex"
@@ -79,464 +56,487 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2010-05-12",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "261b36f7"
-                },
-                "unadjustedDate" : "2010-05-12"
+                }
               },
               "meta" : {
                 "globalKey" : "261b36f7"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2038-01-12",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "296055f7"
+                }
+              },
+              "meta" : {
+                "globalKey" : "296055f7"
+              }
+            },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "0",
+                    "externalReference" : "returnNotional"
+                  },
                   "meta" : {
                     "globalKey" : "17f35490"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "returnNotional",
-                    "globalReference" : "0"
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "globalKey" : "7794f09a"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "7794f09a"
+                        "globalKey" : "73f59b92"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "initialValuationDate",
-                        "globalReference" : "261b36f7"
+                        "globalReference" : "261b36f7",
+                        "externalReference" : "initialValuationDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "73f59b92"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "interestCalculationDates",
-                    "globalKey" : "eb4735ce"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "globalKey" : "b9d527a8"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "b9d527a8"
+                        "globalKey" : "b635d2a0"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "finalValuationDate",
-                        "globalReference" : "296055f7"
+                        "globalReference" : "296055f7",
+                        "externalReference" : "finalValuationDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "b635d2a0"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "69376ece",
+                    "externalKey" : "interestCalculationDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "2fbce0ac"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "785dc99e"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "785dc99e"
-                      },
                       "relativeDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "785dc99e"
+                          "globalKey" : "74be7496"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "dateRelativeTo" : {
-                          "externalReference" : "returnPaymentDates",
-                          "globalReference" : "d2189e1"
+                          "globalReference" : "6d1b00ab",
+                          "externalReference" : "returnPaymentDates"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "74be7496"
                       }
                     } ]
+                  },
+                  "meta" : {
+                    "globalKey" : "74be7496"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "interimValuationDates",
-                    "globalReference" : "cd78cd69"
+                    "globalReference" : "dd77575f",
+                    "externalReference" : "interimValuationDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "a7c92a17"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "980e10b8"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "ed4e549c"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "returnNotional",
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "5b3509f0"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "returnPaymentDates",
-                    "globalKey" : "d2189e1"
-                  },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "globalKey" : "33ef8035"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "33ef8035"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "BUSINESS",
-                        "businessCentersReference" : {
-                          "externalReference" : "returnBusinessCenter"
-                        },
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "finalValuationDate",
-                          "globalReference" : "296055f7"
-                        }
-                      }
-                    },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "51f9cd36"
-                      },
-                      "relativeDates" : {
-                        "meta" : {
-                          "globalKey" : "51f9cd36"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "BUSINESS",
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "USNY"
-                          } ],
-                          "meta" : {
-                            "globalKey" : "27e4e9"
-                          }
-                        },
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "interimValuationDates",
-                          "globalReference" : "cd78cd69"
-                        }
-                      }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
-                  }
-                },
-                "underlier" : {
-                  "index" : {
-                    "productIdentifier" : [ {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-1"
-                      }
-                    }, {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-2"
-                      }
-                    } ]
                   },
                   "meta" : {
-                    "globalKey" : "0"
+                    "globalKey" : "0",
+                    "externalKey" : "returnNotional"
                   }
                 },
                 "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "fbc70e6c"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "296055f7"
-                        },
-                        "unadjustedDate" : "2038-01-12"
-                      },
-                      "meta" : {
-                        "externalKey" : "finalValuationDate",
-                        "globalKey" : "296055f7"
-                      }
-                    }
-                  },
                   "valuationDatesInitial" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "f881ef6c"
-                    },
+                    "determinationMethod" : "ValuationTime",
                     "valuationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2010-05-12",
                         "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
                             "globalKey" : "3a4b88ab"
                           }
                         },
                         "meta" : {
                           "globalKey" : "261b36f7"
-                        },
-                        "unadjustedDate" : "2010-05-12"
+                        }
                       },
                       "meta" : {
-                        "externalKey" : "initialValuationDate",
-                        "globalKey" : "261b36f7"
+                        "globalKey" : "261b36f7",
+                        "externalKey" : "initialValuationDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "f881ef6c"
                     }
                   },
                   "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "341a3b14"
-                    },
+                    "determinationMethod" : "ValuationTime",
                     "valuationDates" : {
-                      "meta" : {
-                        "externalKey" : "interimValuationDates",
-                        "globalKey" : "cd78cd69"
-                      },
                       "periodicDates" : {
+                        "startDate" : {
+                          "adjustableDate" : {
+                            "unadjustedDate" : "2010-06-12",
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NotApplicable",
+                              "meta" : {
+                                "globalKey" : "3a4b88ab"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "261c2737"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "261c2737"
+                          }
+                        },
                         "endDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2037-12-12",
                             "dateAdjustments" : {
-                              "businessDayConvention" : "NOT_APPLICABLE",
+                              "businessDayConvention" : "NotApplicable",
                               "meta" : {
                                 "globalKey" : "3a4b88ab"
                               }
                             },
                             "meta" : {
                               "globalKey" : "294ca0b7"
-                            },
-                            "unadjustedDate" : "2037-12-12"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "294ca0b7"
                           }
                         },
+                        "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "177d4"
+                          },
+                          "rollConvention" : "12"
+                        },
                         "periodDatesAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
                             "globalKey" : "3a4b88ab"
                           }
-                        },
-                        "periodFrequency" : {
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "dd77575f",
+                        "externalKey" : "interimValuationDates"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "4418c50a"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2038-01-12",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
-                            "globalKey" : "28bec"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "12"
+                            "globalKey" : "3a4b88ab"
+                          }
                         },
-                        "startDate" : {
-                          "adjustableDate" : {
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NOT_APPLICABLE",
-                              "meta" : {
-                                "globalKey" : "3a4b88ab"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "261c2737"
-                            },
-                            "unadjustedDate" : "2010-06-12"
-                          },
+                        "meta" : {
+                          "globalKey" : "296055f7"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "296055f7",
+                        "externalKey" : "finalValuationDate"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "fbc70e6c"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
+                      "relativeDates" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "cc60294"
+                        },
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "USNY"
+                          } ],
                           "meta" : {
-                            "globalKey" : "261c2737"
+                            "globalKey" : "27e4e9"
                           }
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "dd77575f",
+                          "externalReference" : "interimValuationDates"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "cc60294"
+                      }
+                    } ],
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "42382717"
+                        },
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
+                        "businessCentersReference" : {
+                          "externalReference" : "returnBusinessCenter"
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "296055f7",
+                          "externalReference" : "finalValuationDate"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "42382717"
                       }
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "6d1b00ab",
+                    "externalKey" : "returnPaymentDates"
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                },
+                "underlier" : {
+                  "index" : {
+                    "productIdentifier" : [ {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-1"
+                      }
+                    }, {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-2"
+                      }
+                    } ]
+                  },
                   "meta" : {
-                    "globalKey" : "3a4b88ab"
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "296055f7"
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
+                  }
                 },
-                "unadjustedDate" : "2038-01-12"
-              },
+                "meta" : {
+                  "globalKey" : "8d04a6ae"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "296055f7"
+                "globalKey" : "89a9db66"
               }
             }
           },
           "meta" : {
-            "globalKey" : "cdd3a69b"
+            "globalKey" : "32c5b85d"
           }
         },
         "meta" : {
-          "globalKey" : "cdd3a69b"
+          "globalKey" : "32c5b85d"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "bad340f7"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5ee780b1"
+          "quantity" : [ {
+            "value" : {
+              "value" : 31000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "IOS.FN30.650.67",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
-                  },
-                  "value" : "IOS.FN30.650.67"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "f92d7bd6"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
+                  "value" : "4A845HAA3",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair"
-                  },
-                  "value" : "4A845HAA3"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "52b306c7"
-                },
-                "source" : "OTHER"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
                 }
               },
-              "value" : 31000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "7e08956f"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "31a0d237"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ed8d7"
-      },
-      "value" : "2011-03-23"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "51e656fd",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4939658c",
+          "externalReference" : "party1"
+        }
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "QGPGHQ1ENZOOLJRFTH41",
           "meta" : {
-            "scheme" : "http://www.abc.com/swaps/trade-id"
-          },
-          "value" : "TRS-01"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "f54dfc9"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "54527a4c"
+      "name" : {
+        "value" : "ABCD Fund"
       },
       "meta" : {
-        "globalKey" : "5c7fdd04"
+        "globalKey" : "4939658c",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "J6W9XJWVE853A9CVRQ85",
           "meta" : {
-            "scheme" : "http://www.hedgeco.com/swaps/trade-id"
-          },
-          "value" : "total-ret-swap-01"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e4c8d6a7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "770069bd"
+      "name" : {
+        "value" : "HedgeCo Capital L.L.C."
       },
       "meta" : {
-        "globalKey" : "2c3a2ad2"
+        "globalKey" : "51e656fd",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "e9b48186"
+    }
+  },
+  "meta" : {
+    "globalKey" : "e9b48186",
+    "externalKey" : "trs-ex4-trade"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/dcd-ex01-dual-currency-deposit.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/dcd-ex01-dual-currency-deposit.json
index d179a8cae5..0e94382b5a 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/dcd-ex01-dual-currency-deposit.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/dcd-ex01-dual-currency-deposit.json
@@ -1,90 +1,90 @@
 {
-  "meta" : {
-    "globalKey" : "6f149486"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "6f149486"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "83376d18"
-      },
-      "name" : {
-        "value" : "MIDLAND"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "a2022158",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "MB87623",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "TR24TWEY5RVRQV65HD49"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e1284e85"
+            "scheme" : "http://www.midlandnb.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "f7a2ed32"
-      },
-      "name" : {
-        "value" : "ABN AMRO"
+        "globalKey" : "f2891f38"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "20e95db2",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "AA9876",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFXS5XCH7N0Y05NIXW11"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cff0a7d6"
+            "scheme" : "http://www.abn.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "814acd2"
+      }
     } ],
     "tradeDate" : {
+      "value" : "2008-06-24",
       "meta" : {
         "globalKey" : "3ec198"
-      },
-      "value" : "2008-06-24"
+      }
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "TR24TWEY5RVRQV65HD49",
           "meta" : {
-            "scheme" : "http://www.midlandnb.com/swaps/trade-id"
-          },
-          "value" : "MB87623"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e1284e85"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "83376d18"
+      "name" : {
+        "value" : "MIDLAND"
       },
       "meta" : {
-        "globalKey" : "1896266e"
+        "globalKey" : "a2022158",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFXS5XCH7N0Y05NIXW11",
           "meta" : {
-            "scheme" : "http://www.abn.com/swaps/trade-id"
-          },
-          "value" : "AA9876"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cff0a7d6"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "f7a2ed32"
+      "name" : {
+        "value" : "ABN AMRO"
       },
       "meta" : {
-        "globalKey" : "f7bfdcea"
+        "globalKey" : "20e95db2",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "d7db5824"
+    }
+  },
+  "meta" : {
+    "globalKey" : "d7db5824"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex13-fx-dbl-barrier-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex13-fx-dbl-barrier-option.json
index 092eacc020..695541fb4b 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex13-fx-dbl-barrier-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex13-fx-dbl-barrier-option.json
@@ -1,70 +1,55 @@
 {
-  "meta" : {
-    "globalKey" : "f41993ee"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "fd742ead"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "618c3061"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "618c3061",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "PARTYAUS33",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "e05045d7"
+        "globalKey" : "cf15004e"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "e05045d7",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DEUTDEFF",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "213800QILIUD4ROSUO03"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e05045d7"
+            "scheme" : "http://www.db.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "5246e55"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-01-03",
+      "meta" : {
+        "globalKey" : "3e9043"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "618c3061"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "DOUBLEBARRIER",
                 "meta" : {
                   "scheme" : "http://www.sample.com/coding-scheme/product-type-simple"
-                },
-                "value" : "DOUBLEBARRIER"
+                }
               }
             }
           }, {
@@ -73,28 +58,25 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "67e88617"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e90c6"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2002-03-06",
                     "meta" : {
                       "globalKey" : "3e90c6"
-                    },
-                    "valueDate" : "2002-03-06"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e90c6"
                   }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
                   "optionStyle" : {
@@ -102,10 +84,10 @@
                       "expirationDate" : [ {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2002-03-04",
                             "meta" : {
                               "globalKey" : "3e90c4"
-                            },
-                            "value" : "2002-03-04"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -116,10 +98,10 @@
                         }
                       } ],
                       "expirationTime" : {
+                        "hourMinuteTime" : "10:00:00",
                         "businessCenter" : {
                           "value" : "USNY"
-                        },
-                        "hourMinuteTime" : "10:00:00"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "f3490a66"
@@ -128,43 +110,40 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 105.05,
                       "unit" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "value" : 105.05,
-                      "composite" : {
-                        "baseValue" : 106
-                      },
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "EXCHANGE_RATE"
+                      "priceType" : "ExchangeRate",
+                      "composite" : {
+                        "baseValue" : 106
+                      }
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "67e88617"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -173,18 +152,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -195,132 +174,153 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "4cffd2e5"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "4cffd2e5"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "b3060021"
+            "globalKey" : "981d4cef"
           }
         },
         "meta" : {
-          "globalKey" : "b3060021"
+          "globalKey" : "981d4cef"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "e76661db"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
             "value" : {
+              "value" : 2500000000,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
-              },
-              "value" : 2500000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 23798191.34,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 23798191.34
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "565d985"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "618c3061",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9043"
-      },
-      "value" : "2002-01-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "PARTYAUS33"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "618c3061"
-      },
       "meta" : {
-        "globalKey" : "1ae1a04"
+        "globalKey" : "618c3061",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "213800QILIUD4ROSUO03",
           "meta" : {
-            "scheme" : "http://www.db.com/swaps/trade-id"
-          },
-          "value" : "DEUTDEFF"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e05045d7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "e05045d7"
-      },
       "meta" : {
-        "globalKey" : "efe549ad"
+        "globalKey" : "e05045d7",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "8cb24fc5"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "51f0d681"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "618c3061"
-        }
-      },
       "quantity" : {
+        "value" : 192765.35,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
         },
-        "value" : 192765.35
+        "receiverPartyReference" : {
+          "globalReference" : "618c3061",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2002-01-07",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2002-01-07"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "9b3b518b"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "f7b51a10"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex14-euro-digital-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex14-euro-digital-option.json
index 00e9211587..b4a44bd289 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex14-euro-digital-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex14-euro-digital-option.json
@@ -1,97 +1,79 @@
 {
-  "meta" : {
-    "globalKey" : "5ce1d53c"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "524985b3"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "ff8d4b3e"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "ff8d4b3e",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "CITI10014",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5493000SCC07UI6DB380"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "ff8d4b3e"
+            "scheme" : "http://www.citi.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "1006f88d"
+        "globalKey" : "dd7f996e"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "1006f88d",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UBSW20014",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFM8T61CT2L1QCEMIK50"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "1006f88d"
+            "scheme" : "http://www.ubsw.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "563356b8"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-11-12",
+      "meta" : {
+        "globalKey" : "3e8acc"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "1006f88d"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ff8d4b3e"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "EuroBinary",
                 "meta" : {
                   "scheme" : "http://www.sample.com/coding-scheme/product-type-simple"
-                },
-                "value" : "EuroBinary"
+                }
               }
             }
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "dbee49f0"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e8adc"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2001-11-28",
                     "meta" : {
                       "globalKey" : "3e8adc"
-                    },
-                    "valueDate" : "2001-11-28"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e8adc"
                   }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
                   "optionStyle" : {
@@ -99,10 +81,10 @@
                       "expirationDate" : [ {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2001-11-26",
                             "meta" : {
                               "globalKey" : "3e8ada"
-                            },
-                            "value" : "2001-11-26"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -113,10 +95,10 @@
                         }
                       } ],
                       "expirationTime" : {
+                        "hourMinuteTime" : "14:00:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "14:00:00"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "87b617f4"
@@ -127,7 +109,10 @@
                 "meta" : {
                   "globalKey" : "dbee49f0"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "dbee49f0"
+              }
             }
           },
           "meta" : {
@@ -137,83 +122,98 @@
         "meta" : {
           "globalKey" : "c9907432"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8acc"
       },
-      "value" : "2001-11-12"
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "1006f88d",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "ff8d4b3e",
+          "externalReference" : "party1"
+        }
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "5493000SCC07UI6DB380",
           "meta" : {
-            "scheme" : "http://www.citi.com/fx/trade-id"
-          },
-          "value" : "CITI10014"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "ff8d4b3e"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "ff8d4b3e"
-      },
       "meta" : {
-        "globalKey" : "1fd6eb24"
+        "globalKey" : "ff8d4b3e",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFM8T61CT2L1QCEMIK50",
           "meta" : {
-            "scheme" : "http://www.ubsw.com/fx/trade-id"
-          },
-          "value" : "UBSW20014"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "1006f88d"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "1006f88d"
-      },
       "meta" : {
-        "globalKey" : "38dba550"
+        "globalKey" : "1006f88d",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "3d744673"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "57ed3649"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "1006f88d"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ff8d4b3e"
-        }
-      },
       "quantity" : {
+        "value" : 53000,
         "unit" : {
           "currency" : {
             "value" : "GBP"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "1006f88d",
+          "externalReference" : "party2"
         },
-        "value" : 53000
+        "receiverPartyReference" : {
+          "globalReference" : "ff8d4b3e",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-11-14",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-11-14"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "fd390071"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "3ff1b024"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex15-euro-range-digital-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex15-euro-range-digital-option.json
index cb7e2b9c9d..36eae08a94 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex15-euro-range-digital-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex15-euro-range-digital-option.json
@@ -1,97 +1,79 @@
 {
-  "meta" : {
-    "globalKey" : "46631cf8"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "763cc7ce"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "ff8d4b3e"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "ff8d4b3e",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "CITI10015",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5493000SCC07UI6DB380"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "ff8d4b3e"
+            "scheme" : "http://www.citi.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "1006f88d"
+        "globalKey" : "dd7f996f"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "1006f88d",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UBSW20015",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFM8T61CT2L1QCEMIK50"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "1006f88d"
+            "scheme" : "http://www.ubsw.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "563356b9"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-11-12",
+      "meta" : {
+        "globalKey" : "3e8acc"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "1006f88d"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ff8d4b3e"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "EuroRangeBinary",
                 "meta" : {
                   "scheme" : "http://www.sample.com/coding-scheme/product-type-simple"
-                },
-                "value" : "EuroRangeBinary"
+                }
               }
             }
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "fee83cee"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e8ada"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2001-11-26",
                     "meta" : {
                       "globalKey" : "3e8ada"
-                    },
-                    "valueDate" : "2001-11-26"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e8ada"
                   }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
                   "optionStyle" : {
@@ -99,10 +81,10 @@
                       "expirationDate" : [ {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2001-11-26",
                             "meta" : {
                               "globalKey" : "3e8ada"
-                            },
-                            "value" : "2001-11-26"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -113,10 +95,10 @@
                         }
                       } ],
                       "expirationTime" : {
+                        "hourMinuteTime" : "14:00:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "14:00:00"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "87b617f4"
@@ -127,7 +109,10 @@
                 "meta" : {
                   "globalKey" : "fee83cee"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "fee83cee"
+              }
             }
           },
           "meta" : {
@@ -137,83 +122,98 @@
         "meta" : {
           "globalKey" : "c0eca62d"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8acc"
       },
-      "value" : "2001-11-12"
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "1006f88d",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "ff8d4b3e",
+          "externalReference" : "party1"
+        }
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "5493000SCC07UI6DB380",
           "meta" : {
-            "scheme" : "http://www.citi.com/fx/trade-id"
-          },
-          "value" : "CITI10015"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "ff8d4b3e"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "ff8d4b3e"
-      },
       "meta" : {
-        "globalKey" : "1fd6eee5"
+        "globalKey" : "ff8d4b3e",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFM8T61CT2L1QCEMIK50",
           "meta" : {
-            "scheme" : "http://www.ubsw.com/fx/trade-id"
-          },
-          "value" : "UBSW20015"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "1006f88d"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "1006f88d"
-      },
       "meta" : {
-        "globalKey" : "38dba911"
+        "globalKey" : "1006f88d",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "9f99630e"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "760f6caa"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "1006f88d"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ff8d4b3e"
-        }
-      },
       "quantity" : {
+        "value" : 43000,
         "unit" : {
           "currency" : {
             "value" : "GBP"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "1006f88d",
+          "externalReference" : "party2"
         },
-        "value" : 43000
+        "receiverPartyReference" : {
+          "globalReference" : "ff8d4b3e",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-11-14",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-11-14"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "2f8e9eb0"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "9e069a3e"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex16-one-touch-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex16-one-touch-option.json
index cbbe3e7872..ab8b559039 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex16-one-touch-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex16-one-touch-option.json
@@ -1,104 +1,88 @@
 {
-  "meta" : {
-    "globalKey" : "85023973"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "33ea2b27"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "ff8d4b3e"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "ff8d4b3e",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "CITI10016",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5493000SCC07UI6DB380"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "ff8d4b3e"
+            "scheme" : "http://www.citi.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "1006f88d"
+        "globalKey" : "dd7f9970"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "1006f88d",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UBSW20016",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFM8T61CT2L1QCEMIK50"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "1006f88d"
+            "scheme" : "http://www.ubsw.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "563356ba"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-11-12",
+      "meta" : {
+        "globalKey" : "3e8acc"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "1006f88d"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ff8d4b3e"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "OneTouch",
                 "meta" : {
                   "scheme" : "http://www.sample.com/coding-scheme/product-type-simple"
-                },
-                "value" : "OneTouch"
+                }
               }
             }
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "8766666f"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e8ada"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2001-11-26",
                     "meta" : {
                       "globalKey" : "3e8ada"
-                    },
-                    "valueDate" : "2001-11-26"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e8ada"
                   }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-11-12",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -107,15 +91,13 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "211e638d"
                             }
                           },
                           "meta" : {
                             "globalKey" : "7082b841"
-                          },
-                          "unadjustedDate" : "2001-11-12"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "7082b841"
@@ -124,10 +106,10 @@
                       "expirationDate" : {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2001-11-26",
                             "meta" : {
                               "globalKey" : "3e8ada"
-                            },
-                            "value" : "2001-11-26"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -138,10 +120,10 @@
                         }
                       },
                       "expirationTime" : {
+                        "hourMinuteTime" : "14:00:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "14:00:00"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "f7c3db75"
@@ -152,7 +134,10 @@
                 "meta" : {
                   "globalKey" : "8766666f"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "8766666f"
+              }
             }
           },
           "meta" : {
@@ -162,83 +147,98 @@
         "meta" : {
           "globalKey" : "43368b66"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8acc"
       },
-      "value" : "2001-11-12"
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "1006f88d",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "ff8d4b3e",
+          "externalReference" : "party1"
+        }
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "5493000SCC07UI6DB380",
           "meta" : {
-            "scheme" : "http://www.citi.com/fx/trade-id"
-          },
-          "value" : "CITI10016"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "ff8d4b3e"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "ff8d4b3e"
-      },
       "meta" : {
-        "globalKey" : "1fd6f2a6"
+        "globalKey" : "ff8d4b3e",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFM8T61CT2L1QCEMIK50",
           "meta" : {
-            "scheme" : "http://www.ubsw.com/fx/trade-id"
-          },
-          "value" : "UBSW20016"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "1006f88d"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "1006f88d"
-      },
       "meta" : {
-        "globalKey" : "38dbacd2"
+        "globalKey" : "1006f88d",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "655d4967"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "c437ea0c"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "1006f88d"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ff8d4b3e"
-        }
-      },
       "quantity" : {
+        "value" : 78000,
         "unit" : {
           "currency" : {
             "value" : "GBP"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "1006f88d",
+          "externalReference" : "party2"
         },
-        "value" : 78000
+        "receiverPartyReference" : {
+          "globalReference" : "ff8d4b3e",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-11-14",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-11-14"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "6f672e8e"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "6cf18c35"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex17-no-touch-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex17-no-touch-option.json
index d93d1de3bf..4fbeec0f0c 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex17-no-touch-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex17-no-touch-option.json
@@ -1,104 +1,88 @@
 {
-  "meta" : {
-    "globalKey" : "92e1f32f"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "1dc61be3"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "ff8d4b3e"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "ff8d4b3e",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "CITI10017",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5493000SCC07UI6DB380"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "ff8d4b3e"
+            "scheme" : "http://www.citi.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "1006f88d"
+        "globalKey" : "dd7f9971"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "1006f88d",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UBSW20018",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFM8T61CT2L1QCEMIK50"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "1006f88d"
+            "scheme" : "http://www.ubsw.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "563356bc"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-11-12",
+      "meta" : {
+        "globalKey" : "3e8acc"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "1006f88d"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ff8d4b3e"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "NoTouch",
                 "meta" : {
                   "scheme" : "http://www.sample.com/coding-scheme/product-type-simple"
-                },
-                "value" : "NoTouch"
+                }
               }
             }
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "8766666f"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e8ada"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2001-11-26",
                     "meta" : {
                       "globalKey" : "3e8ada"
-                    },
-                    "valueDate" : "2001-11-26"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e8ada"
                   }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-11-12",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -107,15 +91,13 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "211e638d"
                             }
                           },
                           "meta" : {
                             "globalKey" : "7082b841"
-                          },
-                          "unadjustedDate" : "2001-11-12"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "7082b841"
@@ -124,10 +106,10 @@
                       "expirationDate" : {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2001-11-26",
                             "meta" : {
                               "globalKey" : "3e8ada"
-                            },
-                            "value" : "2001-11-26"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -138,10 +120,10 @@
                         }
                       },
                       "expirationTime" : {
+                        "hourMinuteTime" : "14:00:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "14:00:00"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "f7c3db75"
@@ -152,7 +134,10 @@
                 "meta" : {
                   "globalKey" : "8766666f"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "8766666f"
+              }
             }
           },
           "meta" : {
@@ -162,83 +147,98 @@
         "meta" : {
           "globalKey" : "aefcb841"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8acc"
       },
-      "value" : "2001-11-12"
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "1006f88d",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "ff8d4b3e",
+          "externalReference" : "party1"
+        }
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "5493000SCC07UI6DB380",
           "meta" : {
-            "scheme" : "http://www.citi.com/fx/trade-id"
-          },
-          "value" : "CITI10017"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "ff8d4b3e"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "ff8d4b3e"
-      },
       "meta" : {
-        "globalKey" : "1fd6f667"
+        "globalKey" : "ff8d4b3e",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFM8T61CT2L1QCEMIK50",
           "meta" : {
-            "scheme" : "http://www.ubsw.com/fx/trade-id"
-          },
-          "value" : "UBSW20018"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "1006f88d"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "1006f88d"
-      },
       "meta" : {
-        "globalKey" : "38dbb454"
+        "globalKey" : "1006f88d",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "a2145bc1"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "c437ea0c"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "1006f88d"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ff8d4b3e"
-        }
-      },
       "quantity" : {
+        "value" : 78000,
         "unit" : {
           "currency" : {
             "value" : "GBP"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "1006f88d",
+          "externalReference" : "party2"
         },
-        "value" : 78000
+        "receiverPartyReference" : {
+          "globalReference" : "ff8d4b3e",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-11-14",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-11-14"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "6f672e8e"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "d2ae7c0f"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex18-double-one-touch-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex18-double-one-touch-option.json
index 2062f88070..f9bca674f0 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex18-double-one-touch-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex18-double-one-touch-option.json
@@ -1,104 +1,88 @@
 {
-  "meta" : {
-    "globalKey" : "1e1f9922"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "3f5c6896"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "ff8d4b3e"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "ff8d4b3e",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "CITI10018",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5493000SCC07UI6DB380"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "ff8d4b3e"
+            "scheme" : "http://www.citi.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "1006f88d"
+        "globalKey" : "dd7f9972"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "1006f88d",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UBSW20018",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFM8T61CT2L1QCEMIK50"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "1006f88d"
+            "scheme" : "http://www.ubsw.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "563356bc"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-11-12",
+      "meta" : {
+        "globalKey" : "3e8acc"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "1006f88d"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ff8d4b3e"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "DoubleOneTouch",
                 "meta" : {
                   "scheme" : "http://www.sample.com/coding-scheme/product-type-simple"
-                },
-                "value" : "DoubleOneTouch"
+                }
               }
             }
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "8766666f"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e8ada"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2001-11-26",
                     "meta" : {
                       "globalKey" : "3e8ada"
-                    },
-                    "valueDate" : "2001-11-26"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e8ada"
                   }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-11-12",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -107,15 +91,13 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "211e638d"
                             }
                           },
                           "meta" : {
                             "globalKey" : "7082b841"
-                          },
-                          "unadjustedDate" : "2001-11-12"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "7082b841"
@@ -124,10 +106,10 @@
                       "expirationDate" : {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2001-11-26",
                             "meta" : {
                               "globalKey" : "3e8ada"
-                            },
-                            "value" : "2001-11-26"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -138,10 +120,10 @@
                         }
                       },
                       "expirationTime" : {
+                        "hourMinuteTime" : "14:00:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "14:00:00"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "f7c3db75"
@@ -152,7 +134,10 @@
                 "meta" : {
                   "globalKey" : "8766666f"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "8766666f"
+              }
             }
           },
           "meta" : {
@@ -162,83 +147,98 @@
         "meta" : {
           "globalKey" : "2e23f615"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8acc"
       },
-      "value" : "2001-11-12"
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "1006f88d",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "ff8d4b3e",
+          "externalReference" : "party1"
+        }
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "5493000SCC07UI6DB380",
           "meta" : {
-            "scheme" : "http://www.citi.com/fx/trade-id"
-          },
-          "value" : "CITI10018"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "ff8d4b3e"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "ff8d4b3e"
-      },
       "meta" : {
-        "globalKey" : "1fd6fa28"
+        "globalKey" : "ff8d4b3e",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFM8T61CT2L1QCEMIK50",
           "meta" : {
-            "scheme" : "http://www.ubsw.com/fx/trade-id"
-          },
-          "value" : "UBSW20018"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "1006f88d"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "1006f88d"
-      },
       "meta" : {
-        "globalKey" : "38dbb454"
+        "globalKey" : "1006f88d",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "ea54ed16"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "c437ea0c"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "1006f88d"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ff8d4b3e"
-        }
-      },
       "quantity" : {
+        "value" : 78000,
         "unit" : {
           "currency" : {
             "value" : "GBP"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "1006f88d",
+          "externalReference" : "party2"
         },
-        "value" : 78000
+        "receiverPartyReference" : {
+          "globalReference" : "ff8d4b3e",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-11-14",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-11-14"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "6f672e8e"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "55df4224"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex19-double-no-touch-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex19-double-no-touch-option.json
index 727d48dff3..fef1fdbefb 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex19-double-no-touch-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex19-double-no-touch-option.json
@@ -1,104 +1,88 @@
 {
-  "meta" : {
-    "globalKey" : "d079b69f"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "ad64db53"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "ff8d4b3e"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "ff8d4b3e",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "CITI10019",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5493000SCC07UI6DB380"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "ff8d4b3e"
+            "scheme" : "http://www.citi.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "1006f88d"
+        "globalKey" : "dd7f9973"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "1006f88d",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UBSW20019",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFM8T61CT2L1QCEMIK50"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "1006f88d"
+            "scheme" : "http://www.ubsw.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "563356bd"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-11-12",
+      "meta" : {
+        "globalKey" : "3e8acc"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "1006f88d"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ff8d4b3e"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "DoubleNoTouch",
                 "meta" : {
                   "scheme" : "http://www.sample.com/coding-scheme/product-type-simple"
-                },
-                "value" : "DoubleNoTouch"
+                }
               }
             }
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "8766666f"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e8ada"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2001-11-26",
                     "meta" : {
                       "globalKey" : "3e8ada"
-                    },
-                    "valueDate" : "2001-11-26"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e8ada"
                   }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-11-12",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -107,15 +91,13 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "211e638d"
                             }
                           },
                           "meta" : {
                             "globalKey" : "7082b841"
-                          },
-                          "unadjustedDate" : "2001-11-12"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "7082b841"
@@ -124,10 +106,10 @@
                       "expirationDate" : {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2001-11-26",
                             "meta" : {
                               "globalKey" : "3e8ada"
-                            },
-                            "value" : "2001-11-26"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -138,10 +120,10 @@
                         }
                       },
                       "expirationTime" : {
+                        "hourMinuteTime" : "14:00:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "14:00:00"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "f7c3db75"
@@ -152,7 +134,10 @@
                 "meta" : {
                   "globalKey" : "8766666f"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "8766666f"
+              }
             }
           },
           "meta" : {
@@ -162,83 +147,98 @@
         "meta" : {
           "globalKey" : "326fbbb2"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8acc"
       },
-      "value" : "2001-11-12"
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "1006f88d",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "ff8d4b3e",
+          "externalReference" : "party1"
+        }
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "5493000SCC07UI6DB380",
           "meta" : {
-            "scheme" : "http://www.citi.com/fx/trade-id"
-          },
-          "value" : "CITI10019"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "ff8d4b3e"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "ff8d4b3e"
-      },
       "meta" : {
-        "globalKey" : "1fd6fde9"
+        "globalKey" : "ff8d4b3e",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFM8T61CT2L1QCEMIK50",
           "meta" : {
-            "scheme" : "http://www.ubsw.com/fx/trade-id"
-          },
-          "value" : "UBSW20019"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "1006f88d"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "1006f88d"
-      },
       "meta" : {
-        "globalKey" : "38dbb815"
+        "globalKey" : "1006f88d",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "8c4358d3"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "c437ea0c"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "1006f88d"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ff8d4b3e"
-        }
-      },
       "quantity" : {
+        "value" : 78000,
         "unit" : {
           "currency" : {
             "value" : "GBP"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "1006f88d",
+          "externalReference" : "party2"
         },
-        "value" : 78000
+        "receiverPartyReference" : {
+          "globalReference" : "ff8d4b3e",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-11-14",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-11-14"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "6f672e8e"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "a5f318a1"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex21-avg-rate-option-parametric-plus-rate-observation.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex21-avg-rate-option-parametric-plus-rate-observation.json
index d0b9f3d9ee..9fe339d8f9 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex21-avg-rate-option-parametric-plus-rate-observation.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex21-avg-rate-option-parametric-plus-rate-observation.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "442d797e"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "87e09d6f"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "38cb9fc3"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "38cb9fc3",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "CH-23948",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "7H6GLXDRUGQFU57RNE97"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "38cb9fc3"
+            "scheme" : "http://www.chase.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "e05045d7"
+        "globalKey" : "f5cc9d49"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "e05045d7",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DB-89080",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "213800QILIUD4ROSUO03"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e05045d7"
+            "scheme" : "http://www.db.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "20a000ec"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2010-08-16",
+      "meta" : {
+        "globalKey" : "3ed210"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "38cb9fc3"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,28 +48,25 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "e4c63bb0"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3ed304"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2010-12-04",
                     "meta" : {
                       "globalKey" : "3ed304"
-                    },
-                    "valueDate" : "2010-12-04"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3ed304"
                   }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
                   "optionStyle" : {
@@ -92,10 +74,10 @@
                       "expirationDate" : [ {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2010-11-30",
                             "meta" : {
                               "globalKey" : "3ed2de"
-                            },
-                            "value" : "2010-11-30"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -106,10 +88,10 @@
                         }
                       } ],
                       "expirationTime" : {
+                        "hourMinuteTime" : "12:30:00",
                         "businessCenter" : {
                           "value" : "MXMC"
-                        },
-                        "hourMinuteTime" : "12:30:00"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "300dc62e"
@@ -118,32 +100,82 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 12.40,
                       "unit" : {
                         "currency" : {
                           "value" : "MXN"
                         }
                       },
-                      "value" : 12.40,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "EXCHANGE_RATE"
+                      "priceType" : "ExchangeRate"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "e4c63bb0"
+                "underlier" : {
+                  "foreignExchange" : {
+                    "exchangedCurrency1" : {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "priceQuantity" : {
+                        "quantitySchedule" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "quantity-2"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "b141411f"
+                      }
+                    },
+                    "exchangedCurrency2" : {
+                      "payerReceiver" : {
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
+                      },
+                      "priceQuantity" : {
+                        "quantitySchedule" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "quantity-1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "b14144c1"
+                      }
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "c086df02"
+                  }
                 },
                 "observationTerms" : {
+                  "pricingTime" : {
+                    "hourMinuteTime" : "18:00:00",
+                    "businessCenter" : {
+                      "value" : "MXMC"
+                    }
+                  },
                   "informationSource" : {
                     "primarySource" : {
+                      "sourceProvider" : {
+                        "value" : "Reuters"
+                      },
                       "sourcePage" : {
                         "value" : "BNBX"
-                      },
-                      "sourceProvider" : {
-                        "value" : "REUTERS"
                       }
                     }
                   },
@@ -151,270 +183,238 @@
                     "observationSchedule" : {
                       "observationDate" : [ {
                         "adjustedDate" : "2010-11-01",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b8590"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-02",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b85af"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-03",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b85ce"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-04",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b85ed"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-05",
+                        "weight" : 3,
                         "meta" : {
                           "globalKey" : "79b860e"
-                        },
-                        "weight" : 3
+                        }
                       } ]
                     },
                     "periodicSchedule" : {
-                      "endDate" : {
-                        "adjustableDate" : {
-                          "meta" : {
-                            "globalKey" : "3ed2de"
-                          },
-                          "unadjustedDate" : "2010-11-30"
-                        },
-                        "meta" : {
-                          "globalKey" : "3ed2de"
-                        }
-                      },
-                      "periodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "25a69b"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 1,
-                        "rollConvention" : "NONE"
-                      },
                       "startDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2010-11-01",
                           "meta" : {
                             "globalKey" : "3ed2c1"
-                          },
-                          "unadjustedDate" : "2010-11-01"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "3ed2c1"
                         }
-                      }
-                    }
-                  },
-                  "pricingTime" : {
-                    "businessCenter" : {
-                      "value" : "MXMC"
-                    },
-                    "hourMinuteTime" : "18:00:00"
-                  }
-                },
-                "underlier" : {
-                  "foreignExchange" : {
-                    "exchangedCurrency1" : {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
                       },
-                      "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "quantitySchedule" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "quantity-2"
+                      "endDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2010-11-30",
+                          "meta" : {
+                            "globalKey" : "3ed2de"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "3ed2de"
                         }
                       },
-                      "meta" : {
-                        "globalKey" : "b141411f"
-                      }
-                    },
-                    "exchangedCurrency2" : {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
-                      },
-                      "priceQuantity" : {
+                      "periodFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "0"
+                          "globalKey" : "24b335"
                         },
-                        "quantitySchedule" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "quantity-1"
-                          }
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "b14144c1"
+                        "rollConvention" : "NONE"
                       }
                     }
-                  },
-                  "meta" : {
-                    "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "62442a76"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "62442a76"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "e4c63bb0"
+            "globalKey" : "62442a76"
           }
         },
         "meta" : {
-          "globalKey" : "e4c63bb0"
+          "globalKey" : "62442a76"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "43d0bd20"
-          },
-          "observable" : {
-            "currencyPair" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "currencyPair-1"
-                } ]
-              },
-              "value" : {
-                "currency1" : {
+          "quantity" : [ {
+            "value" : {
+              "value" : 5750000,
+              "unit" : {
+                "currency" : {
                   "value" : "MXN"
-                },
-                "currency2" : {
-                  "value" : "USD"
-                },
-                "quoteBasis" : "CURRENCY_1_PER_CURRENCY_2"
+                }
               }
             },
-            "meta" : {
-              "globalKey" : "23f037eb"
-            }
-          },
-          "quantity" : [ {
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 463709.68,
               "unit" : {
                 "currency" : {
-                  "value" : "MXN"
+                  "value" : "USD"
                 }
-              },
-              "value" : 5750000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
+            }
+          } ],
+          "observable" : {
+            "currencyPair" : {
+              "value" : {
+                "currency1" : {
+                  "value" : "MXN"
+                },
+                "currency2" : {
                   "value" : "USD"
-                }
+                },
+                "quoteBasis" : "Currency1PerCurrency2"
               },
-              "value" : 463709.68
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "currencyPair-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "5a16c575"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "81a3b3aa"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "38cb9fc3",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ed210"
-      },
-      "value" : "2010-08-16"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "7H6GLXDRUGQFU57RNE97",
           "meta" : {
-            "scheme" : "http://www.chase.com/fx/trade-id"
-          },
-          "value" : "CH-23948"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "38cb9fc3"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "38cb9fc3"
-      },
       "meta" : {
-        "globalKey" : "58f2643f"
+        "globalKey" : "38cb9fc3",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "213800QILIUD4ROSUO03",
           "meta" : {
-            "scheme" : "http://www.db.com/fx/trade-id"
-          },
-          "value" : "DB-89080"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e05045d7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "e05045d7"
-      },
       "meta" : {
-        "globalKey" : "1ac69284"
+        "globalKey" : "e05045d7",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "e42a0f91"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "4979b9cf"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "38cb9fc3"
-        }
-      },
       "quantity" : {
+        "value" : 1750,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
         },
-        "value" : 1750
+        "receiverPartyReference" : {
+          "globalReference" : "38cb9fc3",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2010-08-18",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2010-08-18"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "3d1120b3"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "a3f6ce04"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex23-straddle.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex23-straddle.json
index cf050e1b7e..ad9b181ef8 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex23-straddle.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex23-straddle.json
@@ -1,90 +1,90 @@
 {
-  "meta" : {
-    "globalKey" : "cd59d06f"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "cd59d06f"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "9afed11c"
-      },
-      "name" : {
-        "value" : "PARTYA"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "bb7fd25c",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123456789",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-3-0"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "ccc85952"
-      },
-      "name" : {
-        "value" : "ABN Amro"
+        "globalKey" : "262c8e4a"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "20e9d9d2",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123456789",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFXS5XCH7N0Y05NIXW11"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cff0a7d6"
+            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-3-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "262d02a9"
+      }
     } ],
     "tradeDate" : {
+      "value" : "2001-11-20",
       "meta" : {
         "globalKey" : "3e8ad4"
-      },
-      "value" : "2001-11-20"
+      }
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-3-0"
-          },
-          "value" : "123456789"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "9afed11c"
+      "name" : {
+        "value" : "PARTYA"
       },
       "meta" : {
-        "globalKey" : "f11a1900"
+        "globalKey" : "bb7fd25c",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFXS5XCH7N0Y05NIXW11",
           "meta" : {
-            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-3-0"
-          },
-          "value" : "123456789"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cff0a7d6"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "ccc85952"
+      "name" : {
+        "value" : "ABN Amro"
       },
       "meta" : {
-        "globalKey" : "f11a1901"
+        "globalKey" : "20e9d9d2",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "e8a0c78d"
+    }
+  },
+  "meta" : {
+    "globalKey" : "e8a0c78d"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex24-delta-hedge.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex24-delta-hedge.json
index e46285a906..47bd687295 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex24-delta-hedge.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex24-delta-hedge.json
@@ -1,90 +1,90 @@
 {
-  "meta" : {
-    "globalKey" : "cd59d06f"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "cd59d06f"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "9afed11c"
-      },
-      "name" : {
-        "value" : "PARTYA"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "bb7fd25c",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123456789",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-3-0"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "ccc85952"
-      },
-      "name" : {
-        "value" : "ABN Amro"
+        "globalKey" : "262c8e4a"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "20e9d9d2",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123456789",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFXS5XCH7N0Y05NIXW11"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cff0a7d6"
+            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-3-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "262d02a9"
+      }
     } ],
     "tradeDate" : {
+      "value" : "2001-12-04",
       "meta" : {
         "globalKey" : "3e8b04"
-      },
-      "value" : "2001-12-04"
+      }
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-3-0"
-          },
-          "value" : "123456789"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "9afed11c"
+      "name" : {
+        "value" : "PARTYA"
       },
       "meta" : {
-        "globalKey" : "f11a1900"
+        "globalKey" : "bb7fd25c",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFXS5XCH7N0Y05NIXW11",
           "meta" : {
-            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-3-0"
-          },
-          "value" : "123456789"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cff0a7d6"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "ccc85952"
+      "name" : {
+        "value" : "ABN Amro"
       },
       "meta" : {
-        "globalKey" : "f11a1901"
+        "globalKey" : "20e9d9d2",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "e8a0c78d"
+    }
+  },
+  "meta" : {
+    "globalKey" : "e8a0c78d"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex25-option-strategyComponentIdentifier.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex25-option-strategyComponentIdentifier.json
index 3ff08fdca8..760e4e9ee9 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex25-option-strategyComponentIdentifier.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex25-option-strategyComponentIdentifier.json
@@ -1,170 +1,170 @@
 {
-  "meta" : {
-    "globalKey" : "a516b4fd"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "a516b4fd"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "9afed11c"
-      },
-      "name" : {
-        "value" : "PARTYA"
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "1037777777",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+        }
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "01234567890123456789012345678913",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "ccc85952"
+        "globalKey" : "e06d1b0a",
+        "externalKey" : "Trade1-USI"
       },
-      "name" : {
-        "value" : "ABN Amro"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFXS5XCH7N0Y05NIXW11"
-        },
-        "identifierType" : "LEI",
+      "identifierType" : "UniqueTransactionIdentifier"
+    }, {
+      "issuer" : {
+        "value" : "1037777777",
         "meta" : {
-          "globalKey" : "cff0a7d6"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
         }
-      } ]
-    } ],
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8ad4"
       },
-      "value" : "2001-11-20"
-    },
-    "tradeIdentifier" : [ {
       "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "01234567890123456789012345678913",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-          },
-          "value" : "01234567890123456789012345678913"
+          }
         }
       } ],
+      "meta" : {
+        "globalKey" : "e06d1b0a",
+        "externalKey" : "Trade1-UTI"
+      },
+      "identifierType" : "UniqueTransactionIdentifier"
+    }, {
       "issuer" : {
+        "value" : "1037777777",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-        },
-        "value" : "1037777777"
-      },
-      "meta" : {
-        "externalKey" : "Trade1-USI",
-        "globalKey" : "5c94cae4"
+        }
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    }, {
       "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "01234567890123456789012345678914",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-          },
-          "value" : "01234567890123456789012345678913"
+          }
         }
       } ],
+      "meta" : {
+        "globalKey" : "e06d1b29",
+        "externalKey" : "Trade2-USI"
+      },
+      "identifierType" : "UniqueTransactionIdentifier"
+    }, {
       "issuer" : {
+        "value" : "1037777777",
         "meta" : {
           "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
-        },
-        "value" : "1037777777"
-      },
-      "meta" : {
-        "externalKey" : "Trade1-UTI",
-        "globalKey" : "5c94cae4"
+        }
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    }, {
       "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "01234567890123456789012345678914",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-          },
-          "value" : "01234567890123456789012345678914"
+          }
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-        },
-        "value" : "1037777777"
-      },
       "meta" : {
-        "externalKey" : "Trade2-USI",
-        "globalKey" : "5c953f43"
+        "globalKey" : "e06d1b29",
+        "externalKey" : "Trade2-UTI"
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
+      "identifierType" : "UniqueTransactionIdentifier"
     }, {
+      "issuerReference" : {
+        "globalReference" : "bb7fd25c",
+        "externalReference" : "party1"
+      },
       "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123456789",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-          },
-          "value" : "01234567890123456789012345678914"
+            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-3-0"
+          }
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
-        },
-        "value" : "1037777777"
-      },
       "meta" : {
-        "externalKey" : "Trade2-UTI",
-        "globalKey" : "5c953f43"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
+        "globalKey" : "262c8e4a"
+      }
     }, {
+      "issuerReference" : {
+        "globalReference" : "20e9d9d2",
+        "externalReference" : "party2"
+      },
       "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123456789",
           "meta" : {
             "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-3-0"
-          },
-          "value" : "123456789"
+          }
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "9afed11c"
+      "meta" : {
+        "globalKey" : "262d02a9"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2001-11-20",
+      "meta" : {
+        "globalKey" : "3e8ad4"
+      }
+    },
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
+        }
+      } ],
+      "name" : {
+        "value" : "PARTYA"
       },
       "meta" : {
-        "globalKey" : "f11a1900"
+        "globalKey" : "bb7fd25c",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFXS5XCH7N0Y05NIXW11",
           "meta" : {
-            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-3-0"
-          },
-          "value" : "123456789"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cff0a7d6"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "ccc85952"
+      "name" : {
+        "value" : "ABN Amro"
       },
       "meta" : {
-        "globalKey" : "f11a1901"
+        "globalKey" : "20e9d9d2",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "2930b1b3"
+    }
+  },
+  "meta" : {
+    "globalKey" : "2930b1b3"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex26-fxswap-multiple-USIs.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex26-fxswap-multiple-USIs.json
index 474b0f478e..b4500d3c7d 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex26-fxswap-multiple-USIs.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex26-fxswap-multiple-USIs.json
@@ -1,70 +1,95 @@
 {
-  "meta" : {
-    "globalKey" : "ff7c2fd"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "ff7c2fd"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "618c3061"
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "1031234567",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+        }
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "712345678901234567890123456789012",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
+            "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+          }
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "88f03f2f",
+        "externalKey" : "nearLegId"
+      },
+      "identifierType" : "UniqueTransactionIdentifier"
+    }, {
+      "issuer" : {
+        "value" : "1031234567",
         "meta" : {
-          "globalKey" : "618c3061"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
         }
-      } ]
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "712345678901234567890123456789013",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+          }
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "88f03f4e",
+        "externalKey" : "farLegId"
+      },
+      "identifierType" : "UniqueTransactionIdentifier"
     }, {
+      "issuerReference" : {
+        "globalReference" : "618c3061",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "PARTYAUS33",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
+        }
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "e05045d7"
+        "globalKey" : "cf15004e"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "e05045d7",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DEUTDEFF",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "213800QILIUD4ROSUO03"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e05045d7"
+            "scheme" : "http://www.db.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "5246e55"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-01-23",
+      "meta" : {
+        "globalKey" : "3e9057"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "618c3061"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "FxSwap",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-type-simple"
-                },
-                "value" : "FxSwap"
+                }
               }
             }
           }, {
@@ -75,35 +100,32 @@
             "payout" : {
               "forwardPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e9059"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2002-01-25",
                     "meta" : {
                       "globalKey" : "3e9059"
-                    },
-                    "valueDate" : "2002-01-25"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e9059"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "f2fab1db"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -112,18 +134,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -134,38 +156,38 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "f2fab1db"
                 }
               }, {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e9099"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2002-02-25",
                     "meta" : {
                       "globalKey" : "3e9099"
-                    },
-                    "valueDate" : "2002-02-25"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e9099"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "c6b74017"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-4"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -174,18 +196,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-3"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -196,6 +218,9 @@
                   "meta" : {
                     "globalKey" : "f381ccfe"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "c6b74017"
                 }
               } ],
               "meta" : {
@@ -213,200 +238,175 @@
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "879662ff"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 1.48,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 1.48,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 10000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 14800000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 14800000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2fc7841f"
-          },
-          "price" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "6b35fce1"
+          }
+        }, {
+          "price" : [ {
             "value" : {
+              "value" : 1.5,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 1.5,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-4"
+                "value" : "price-2"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 10000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-3"
+                "value" : "quantity-4"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 15000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 15000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-3"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "c928ffc1"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "618c3061",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9057"
-      },
-      "value" : "2002-01-23"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-          },
-          "value" : "712345678901234567890123456789012"
-        }
-      } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "value" : "1031234567"
-      },
-      "meta" : {
-        "externalKey" : "nearLegId",
-        "globalKey" : "f07e39ef"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    }, {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-          },
-          "value" : "712345678901234567890123456789013"
-        }
-      } ],
-      "issuer" : {
+        "identifierType" : "LEI",
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-        },
-        "value" : "1031234567"
-      },
-      "meta" : {
-        "externalKey" : "farLegId",
-        "globalKey" : "f07eae4e"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    }, {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "PARTYAUS33"
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "618c3061"
-      },
       "meta" : {
-        "globalKey" : "1ae1a04"
+        "globalKey" : "618c3061",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "213800QILIUD4ROSUO03",
           "meta" : {
-            "scheme" : "http://www.db.com/swaps/trade-id"
-          },
-          "value" : "DEUTDEFF"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e05045d7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "e05045d7"
-      },
       "meta" : {
-        "globalKey" : "efe549ad"
+        "globalKey" : "e05045d7",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "69d27243"
+    }
+  },
+  "meta" : {
+    "globalKey" : "69d27243"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex27-flexible-term-forward.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex27-flexible-term-forward.json
index 0cf8e6e614..06e1ee13c9 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex27-flexible-term-forward.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex27-flexible-term-forward.json
@@ -1,73 +1,73 @@
 {
-  "meta" : {
-    "globalKey" : "53b03791"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "53b03791"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "631b69f4",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "87654321",
+          "meta" : {
+            "scheme" : "http://www.bnpparibas.com/trade-id"
+          }
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "b634801"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2011-09-20",
+      "meta" : {
+        "globalKey" : "3eda54"
+      }
     },
     "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "eab00cf4"
-      },
-      "name" : {
-        "value" : "BNP Paribas S.A."
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "5493001RKR55V4X61F71",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5493001RKR55V4X61F71"
+          }
         },
         "identifierType" : "LEI",
         "meta" : {
           "globalKey" : "d0f863bc"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "7d3ef86e"
-      },
+      } ],
       "name" : {
-        "value" : "Client"
+        "value" : "BNP Paribas S.A."
       },
+      "meta" : {
+        "globalKey" : "631b69f4",
+        "externalKey" : "partyA"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "XXXXYYYZZ",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "XXXXYYYZZ"
+          }
         },
         "meta" : {
           "globalKey" : "774c6439"
         }
-      } ]
-    } ],
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eda54"
-      },
-      "value" : "2011-09-20"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.bnpparibas.com/trade-id"
-          },
-          "value" : "87654321"
-        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "eab00cf4"
+      "name" : {
+        "value" : "Client"
       },
       "meta" : {
-        "globalKey" : "483bb717"
+        "globalKey" : "4e3c19e4",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "81484a0f"
+    }
+  },
+  "meta" : {
+    "globalKey" : "81484a0f"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex29-fx-swap-with-multiple-identifiers.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex29-fx-swap-with-multiple-identifiers.json
index 1cc0c7cd3c..d341013a35 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex29-fx-swap-with-multiple-identifiers.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex29-fx-swap-with-multiple-identifiers.json
@@ -1,58 +1,93 @@
 {
-  "meta" : {
-    "globalKey" : "6840fc89"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "6840fc89"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "ExecutingParty",
-        "globalKey" : "8e102e3b"
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "USIPREFIX",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+        }
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "USITRADEID",
           "meta" : {
-            "scheme" : "MarkitSERV"
-          },
-          "value" : "PartyA"
-        },
-        "meta" : {
-          "globalKey" : "8e102e3b"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "707b8f21",
+        "externalKey" : "nearLeg"
+      },
+      "identifierType" : "UniqueTransactionIdentifier"
     }, {
+      "issuer" : {
+        "value" : "UTIPREFIX",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
+        }
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "UTITRADEID",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+          }
+        }
+      } ],
       "meta" : {
-        "externalKey" : "Counterparty",
-        "globalKey" : "8e102e3c"
+        "globalKey" : "6c76a59f",
+        "externalKey" : "nearLeg2"
       },
-      "partyId" : [ {
+      "identifierType" : "UniqueTransactionIdentifier"
+    }, {
+      "issuer" : {
+        "value" : "USIPREFIX",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+        }
+      },
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "USITRADEID",
           "meta" : {
-            "scheme" : "MarkitSERV"
-          },
-          "value" : "PartyB"
-        },
+            "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+          }
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "707b8f21",
+        "externalKey" : "farLeg"
+      },
+      "identifierType" : "UniqueTransactionIdentifier"
+    }, {
+      "issuer" : {
+        "value" : "UTIPREFIX",
         "meta" : {
-          "globalKey" : "8e102e3c"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
         }
-      } ]
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "UTITRADEID",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+          }
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "6c76a59f",
+        "externalKey" : "farLeg2"
+      },
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2012-01-01",
+      "meta" : {
+        "globalKey" : "3ee041"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Counterparty",
-          "globalReference" : "8e102e3c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "ExecutingParty",
-          "globalReference" : "8e102e3b"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,35 +98,32 @@
             "payout" : {
               "forwardPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3ee059"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2012-01-25",
                     "meta" : {
                       "globalKey" : "3ee059"
-                    },
-                    "valueDate" : "2012-01-25"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3ee059"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "58f4f70d"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -100,18 +132,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -119,48 +151,48 @@
                       }
                     },
                     "tenorPeriod" : {
-                      "meta" : {
-                        "globalKey" : "ac8"
-                      },
+                      "periodMultiplier" : 1,
                       "period" : "Y",
-                      "periodMultiplier" : 1
+                      "meta" : {
+                        "globalKey" : "78"
+                      }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "8f19b486"
+                    "globalKey" : "8f19aa36"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "58f4ecbd"
                 }
               }, {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e9099"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2002-02-25",
                     "meta" : {
                       "globalKey" : "3e9099"
-                    },
-                    "valueDate" : "2002-02-25"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e9099"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "c70b3f51"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-4"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -169,18 +201,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-3"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -188,247 +220,215 @@
                       }
                     },
                     "tenorPeriod" : {
-                      "meta" : {
-                        "globalKey" : "ac8"
-                      },
+                      "periodMultiplier" : 1,
                       "period" : "Y",
-                      "periodMultiplier" : 1
+                      "meta" : {
+                        "globalKey" : "78"
+                      }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "2e0e350a"
+                    "globalKey" : "2e0e2aba"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "c70b3501"
                 }
               } ],
               "meta" : {
-                "globalKey" : "20f76d1e"
+                "globalKey" : "33e74c7e"
               }
             }
           },
           "meta" : {
-            "globalKey" : "20f76d1e"
+            "globalKey" : "33e74c7e"
           }
         },
         "meta" : {
-          "globalKey" : "20f76d1e"
+          "globalKey" : "33e74c7e"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "4484b869"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 1.48,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 1.48,
-              "composite" : {
-                "arithmeticOperator" : "ADD",
-                "baseValue" : 1.00,
-                "operand" : 0.48,
-                "operandType" : "FORWARD_POINT"
-              },
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate",
+              "composite" : {
+                "baseValue" : 1.00,
+                "operand" : 0.48,
+                "arithmeticOperator" : "Add",
+                "operandType" : "ForwardPoint"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 10000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 14800000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 14800000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "aa08e8cc"
-          },
-          "price" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "1b7db2b7"
+          }
+        }, {
+          "price" : [ {
             "value" : {
+              "value" : 1.5,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 1.5,
-              "composite" : {
-                "arithmeticOperator" : "ADD",
-                "baseValue" : 1.00,
-                "operand" : 0.5,
-                "operandType" : "FORWARD_POINT"
-              },
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate",
+              "composite" : {
+                "baseValue" : 1.00,
+                "operand" : 0.5,
+                "arithmeticOperator" : "Add",
+                "operandType" : "ForwardPoint"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-4"
+                "value" : "price-2"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 10000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-3"
+                "value" : "quantity-4"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 15000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 15000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-3"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "981dcd74"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "8e102e3c",
+          "externalReference" : "Counterparty"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "8e102e3b",
+          "externalReference" : "ExecutingParty"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee041"
-      },
-      "value" : "2012-01-01"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "PartyA",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-          },
-          "value" : "USITRADEID"
-        }
-      } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+            "scheme" : "MarkitSERV"
+          }
         },
-        "value" : "USIPREFIX"
-      },
-      "meta" : {
-        "externalKey" : "nearLeg",
-        "globalKey" : "b0afbac7"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    }, {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-          },
-          "value" : "UTITRADEID"
-        }
-      } ],
-      "issuer" : {
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
-        },
-        "value" : "UTIPREFIX"
-      },
-      "meta" : {
-        "externalKey" : "nearLeg2",
-        "globalKey" : "4ca5cf27"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    }, {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-          },
-          "value" : "USITRADEID"
+          "globalKey" : "8e102e3b"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-        },
-        "value" : "USIPREFIX"
-      },
       "meta" : {
-        "externalKey" : "farLeg",
-        "globalKey" : "b0afbac7"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
+        "globalKey" : "8e102e3b",
+        "externalKey" : "ExecutingParty"
+      }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "PartyB",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-          },
-          "value" : "UTITRADEID"
+            "scheme" : "MarkitSERV"
+          }
+        },
+        "meta" : {
+          "globalKey" : "8e102e3c"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-        },
-        "value" : "UTIPREFIX"
-      },
       "meta" : {
-        "externalKey" : "farLeg2",
-        "globalKey" : "4ca5cf27"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+        "globalKey" : "8e102e3c",
+        "externalKey" : "Counterparty"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "7c81a7f9"
+    }
+  },
+  "meta" : {
+    "globalKey" : "7c81a7f9"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex30-variance-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex30-variance-swap.json
index c2fc3ea121..d29e40e365 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex30-variance-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex30-variance-swap.json
@@ -1,90 +1,40 @@
 {
-  "meta" : {
-    "globalKey" : "27a70a21"
-  },
   "trade" : {
-    "account" : [ {
-      "accountNumber" : {
-        "value" : "123-acc123"
-      },
-      "meta" : {
-        "externalKey" : "accountA",
-        "globalKey" : "8a148927"
-      },
-      "servicingParty" : {
-        "externalReference" : "partyA",
-        "globalReference" : "7dfd4938"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "d4d821f9"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "7dfd4938"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7dfd4938",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300SRLRVTR996F086"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "7dfd4938"
+            "scheme" : "http://www.citi.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "5c7a105b"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300RE0FSXJE8G1L65"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "5c7a105b"
-        }
-      } ]
+        "globalKey" : "984bc438"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2011-03-01",
+      "meta" : {
+        "globalKey" : "3ed8c1",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyB",
-          "globalReference" : "5c7a105b"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "5c7a105b"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "7dfd4938"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "FxVarianceSwap",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-type-simple"
-                },
-                "value" : "FxVarianceSwap"
+                }
               }
             }
           }, {
@@ -92,54 +42,51 @@
             "productQualifier" : "ForeignExchange_ParameterReturnVariance"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "c2799d8"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "4d487e6"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "adjustedDate" : {
+                        "value" : "2011-04-04",
                         "meta" : {
                           "globalKey" : "3ed904"
-                        },
-                        "value" : "2011-04-04"
+                        }
                       }
                     },
                     "meta" : {
                       "globalKey" : "0"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "4d487e6"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "c2799d8"
-                },
                 "observationTerms" : {
+                  "pricingTime" : {
+                    "hourMinuteTime" : "16:00:00",
+                    "businessCenter" : {
+                      "value" : "GBLO"
+                    }
+                  },
                   "informationSource" : {
                     "primarySource" : {
                       "sourcePage" : {
@@ -147,15 +94,8 @@
                       }
                     }
                   },
-                  "numberOfObservationDates" : 22,
                   "observable" : {
                     "currencyPair" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "currencyPair-1"
-                        } ]
-                      },
                       "value" : {
                         "currency1" : {
                           "value" : "EUR"
@@ -163,22 +103,38 @@
                         "currency2" : {
                           "value" : "USD"
                         },
-                        "quoteBasis" : "CURRENCY_2_PER_CURRENCY_1"
+                        "quoteBasis" : "Currency2PerCurrency1"
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "currencyPair-1"
+                        } ]
                       }
                     },
                     "meta" : {
-                      "globalKey" : "b11eca8"
+                      "globalKey" : "572ba858"
                     }
                   },
                   "observationDates" : {
                     "periodicSchedule" : {
-                      "dayType" : "BUSINESS",
+                      "startDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2011-03-01",
+                          "meta" : {
+                            "globalKey" : "3ed8c1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "3ed8c1"
+                        }
+                      },
                       "endDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2011-03-31",
                           "meta" : {
                             "globalKey" : "3ed8df"
-                          },
-                          "unadjustedDate" : "2011-03-31"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "3ed8df"
@@ -197,24 +153,37 @@
                           "globalKey" : "27e4e9"
                         }
                       },
-                      "startDate" : {
-                        "adjustableDate" : {
-                          "meta" : {
-                            "globalKey" : "3ed8c1"
-                          },
-                          "unadjustedDate" : "2011-03-01"
-                        },
+                      "dayType" : "Business"
+                    }
+                  },
+                  "numberOfObservationDates" : 22
+                },
+                "valuationDates" : {
+                  "valuationDatesFinal" : {
+                    "valuationDates" : {
+                      "relativeDates" : {
+                        "periodMultiplier" : 1,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "3ed8c1"
+                          "globalKey" : "cef5340c"
+                        },
+                        "dayType" : "Business",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "USNY"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "27e4e9"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "cef5340c"
                       }
-                    }
-                  },
-                  "pricingTime" : {
-                    "businessCenter" : {
-                      "value" : "GBLO"
                     },
-                    "hourMinuteTime" : "16:00:00"
+                    "meta" : {
+                      "globalKey" : "cef5340c"
+                    }
                   }
                 },
                 "returnTerms" : {
@@ -222,161 +191,192 @@
                     "annualizationFactor" : 252,
                     "meanAdjustment" : true,
                     "varianceStrikePrice" : {
+                      "value" : 0.1510,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.1510,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
                     },
                     "vegaNotionalAmount" : {
+                      "value" : 100000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 100000.00
-                    }
-                  }
-                },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "meta" : {
-                      "globalKey" : "3d99bee6"
-                    },
-                    "valuationDates" : {
-                      "meta" : {
-                        "globalKey" : "3d99bee6"
-                      },
-                      "relativeDates" : {
-                        "meta" : {
-                          "globalKey" : "3d99bee6"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 1,
-                        "dayType" : "BUSINESS",
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "USNY"
-                          } ],
-                          "meta" : {
-                            "globalKey" : "27e4e9"
-                          }
-                        }
                       }
                     }
                   }
+                },
+                "meta" : {
+                  "globalKey" : "7d03157c"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "7d03157c"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "f1a74ef4"
+            "globalKey" : "7cd6d8ac"
           }
         },
         "meta" : {
-          "globalKey" : "f1a74ef4"
+          "globalKey" : "7cd6d8ac"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a84d3a13"
-          },
           "quantity" : [ {
+            "value" : {
+              "value" : 100000.00
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
-            "value" : {
-              "value" : 100000.00
             }
           }, {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 33112582.78,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 33112582.78
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "615a084d"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "5c7a105b",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "7dfd4938",
+          "externalReference" : "partyA"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "5c7a105b",
+          "externalReference" : "partyB"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300SRLRVTR996F086",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "7dfd4938"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3ed8c1"
-      },
-      "value" : "2011-03-01"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "7dfd4938",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300RE0FSXJE8G1L65",
           "meta" : {
-            "scheme" : "http://www.citi.com/fx/trade-id"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "5c7a105b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "7dfd4938"
+      "meta" : {
+        "globalKey" : "5c7a105b",
+        "externalKey" : "partyB"
+      }
+    } ],
+    "account" : [ {
+      "accountNumber" : {
+        "value" : "123-acc123"
+      },
+      "servicingParty" : {
+        "globalReference" : "7dfd4938",
+        "externalReference" : "partyA"
       },
       "meta" : {
-        "globalKey" : "3cf6018e"
+        "globalKey" : "8a148927",
+        "externalKey" : "accountA"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "5469165"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "13047d3a"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "7dfd4938"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "5c7a105b"
-        }
-      },
       "quantity" : {
+        "value" : 5000.00,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "7dfd4938",
+          "externalReference" : "partyA"
         },
-        "value" : 5000.00
+        "receiverPartyReference" : {
+          "globalReference" : "5c7a105b",
+          "externalReference" : "partyB"
+        }
       },
       "settlementDate" : {
         "adjustedDate" : {
+          "value" : "2011-03-03",
           "meta" : {
             "globalKey" : "3ed8c3"
-          },
-          "value" : "2011-03-03"
+          }
         }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "1268de22"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "b59ab61d"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex31-volatility-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex31-volatility-swap.json
index 7d26d1bd14..bc485c3212 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex31-volatility-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex31-volatility-swap.json
@@ -1,90 +1,40 @@
 {
-  "meta" : {
-    "globalKey" : "e6b51dc5"
-  },
   "trade" : {
-    "account" : [ {
-      "accountNumber" : {
-        "value" : "123-acc123"
-      },
-      "meta" : {
-        "externalKey" : "accountA",
-        "globalKey" : "8a148927"
-      },
-      "servicingParty" : {
-        "externalReference" : "partyA",
-        "globalReference" : "7dfd4938"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "bbc1bad5"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "7dfd4938"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7dfd4938",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300SRLRVTR996F086"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "7dfd4938"
+            "scheme" : "http://www.citi.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "5c7a105b"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300RE0FSXJE8G1L65"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "5c7a105b"
-        }
-      } ]
+        "globalKey" : "984bc438"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2011-03-01",
+      "meta" : {
+        "globalKey" : "3ed8c1",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyB",
-          "globalReference" : "5c7a105b"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "5c7a105b"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "7dfd4938"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "FxVolatilitySwap",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-type-simple"
-                },
-                "value" : "FxVolatilitySwap"
+                }
               }
             }
           }, {
@@ -92,43 +42,40 @@
             "productQualifier" : "ForeignExchange_ParameterReturnVolatility"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "20eeca1c"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "4d487e6"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "adjustedDate" : {
+                        "value" : "2011-04-04",
                         "meta" : {
                           "globalKey" : "3ed904"
-                        },
-                        "value" : "2011-04-04"
+                        }
                       }
                     },
                     "meta" : {
                       "globalKey" : "0"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "4d487e6"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "20eeca1c"
-                },
                 "observationTerms" : {
+                  "pricingTime" : {
+                    "hourMinuteTime" : "16:00:00",
+                    "businessCenter" : {
+                      "value" : "GBLO"
+                    }
+                  },
                   "informationSource" : {
                     "primarySource" : {
                       "sourcePage" : {
@@ -136,15 +83,8 @@
                       }
                     }
                   },
-                  "numberOfObservationDates" : 22,
                   "observable" : {
                     "currencyPair" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "currencyPair-1"
-                        } ]
-                      },
                       "value" : {
                         "currency1" : {
                           "value" : "EUR"
@@ -152,22 +92,38 @@
                         "currency2" : {
                           "value" : "USD"
                         },
-                        "quoteBasis" : "CURRENCY_2_PER_CURRENCY_1"
+                        "quoteBasis" : "Currency2PerCurrency1"
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "currencyPair-1"
+                        } ]
                       }
                     },
                     "meta" : {
-                      "globalKey" : "b11eca8"
+                      "globalKey" : "572ba858"
                     }
                   },
                   "observationDates" : {
                     "periodicSchedule" : {
-                      "dayType" : "BUSINESS",
+                      "startDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2011-03-01",
+                          "meta" : {
+                            "globalKey" : "3ed8c1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "3ed8c1"
+                        }
+                      },
                       "endDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2011-03-31",
                           "meta" : {
                             "globalKey" : "3ed8df"
-                          },
-                          "unadjustedDate" : "2011-03-31"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "3ed8df"
@@ -186,24 +142,37 @@
                           "globalKey" : "27e4e9"
                         }
                       },
-                      "startDate" : {
-                        "adjustableDate" : {
-                          "meta" : {
-                            "globalKey" : "3ed8c1"
-                          },
-                          "unadjustedDate" : "2011-03-01"
-                        },
+                      "dayType" : "Business"
+                    }
+                  },
+                  "numberOfObservationDates" : 22
+                },
+                "valuationDates" : {
+                  "valuationDatesFinal" : {
+                    "valuationDates" : {
+                      "relativeDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "3ed8c1"
+                          "globalKey" : "cd405b6d"
+                        },
+                        "dayType" : "Business",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "USNY"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "27e4e9"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "cd405b6d"
                       }
-                    }
-                  },
-                  "pricingTime" : {
-                    "businessCenter" : {
-                      "value" : "GBLO"
                     },
-                    "hourMinuteTime" : "16:00:00"
+                    "meta" : {
+                      "globalKey" : "cd405b6d"
+                    }
                   }
                 },
                 "returnTerms" : {
@@ -211,143 +180,174 @@
                     "annualizationFactor" : 252,
                     "meanAdjustment" : true,
                     "volatilityStrikePrice" : {
+                      "value" : 0.1510,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.1510,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
                     }
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "meta" : {
-                      "globalKey" : "3d8ba765"
-                    },
-                    "valuationDates" : {
-                      "meta" : {
-                        "globalKey" : "3d8ba765"
-                      },
-                      "relativeDates" : {
-                        "meta" : {
-                          "globalKey" : "3d8ba765"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "dayType" : "BUSINESS",
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "USNY"
-                          } ],
-                          "meta" : {
-                            "globalKey" : "27e4e9"
-                          }
-                        }
-                      }
-                    }
-                  }
+                "meta" : {
+                  "globalKey" : "dfb524ec"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "dfb524ec"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "d9dc196c"
+            "globalKey" : "94554dd0"
           }
         },
         "meta" : {
-          "globalKey" : "d9dc196c"
+          "globalKey" : "94554dd0"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "1b20e667"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 100000.00,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 100000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "48fbe679"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "5c7a105b",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "7dfd4938",
+          "externalReference" : "partyA"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "5c7a105b",
+          "externalReference" : "partyB"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300SRLRVTR996F086",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "7dfd4938"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3ed8c1"
-      },
-      "value" : "2011-03-01"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "7dfd4938",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300RE0FSXJE8G1L65",
           "meta" : {
-            "scheme" : "http://www.citi.com/fx/trade-id"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "5c7a105b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "7dfd4938"
+      "meta" : {
+        "globalKey" : "5c7a105b",
+        "externalKey" : "partyB"
+      }
+    } ],
+    "account" : [ {
+      "accountNumber" : {
+        "value" : "123-acc123"
+      },
+      "servicingParty" : {
+        "globalReference" : "7dfd4938",
+        "externalReference" : "partyA"
       },
       "meta" : {
-        "globalKey" : "3cf6018e"
+        "globalKey" : "8a148927",
+        "externalKey" : "accountA"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "827406dd"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "13047d3a"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "7dfd4938"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "5c7a105b"
-        }
-      },
       "quantity" : {
+        "value" : 5000.00,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "7dfd4938",
+          "externalReference" : "partyA"
         },
-        "value" : 5000.00
+        "receiverPartyReference" : {
+          "globalReference" : "5c7a105b",
+          "externalReference" : "partyB"
+        }
       },
       "settlementDate" : {
         "adjustedDate" : {
+          "value" : "2011-03-03",
           "meta" : {
             "globalKey" : "3ed8c3"
-          },
-          "value" : "2011-03-03"
+          }
         }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "1268de22"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "ff94a1a5"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex32-forward-volatility-agreement.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex32-forward-volatility-agreement.json
index 21688c20db..45332c36f3 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex32-forward-volatility-agreement.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex32-forward-volatility-agreement.json
@@ -1,59 +1,35 @@
 {
-  "meta" : {
-    "globalKey" : "619786e6"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "619786e6"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7dfd4938"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7dfd4938",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300SRLRVTR996F086"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "7dfd4938"
+            "scheme" : "http://www.citi.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "5c7a105b"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300RE0FSXJE8G1L65"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "5c7a105b"
-        }
-      } ]
+        "globalKey" : "98447e48"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-09-16",
+      "meta" : {
+        "globalKey" : "3ef250",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "7dfd4938"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -63,31 +39,55 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3ef250"
       },
-      "value" : "2014-09-16"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "7dfd4938",
+          "externalReference" : "party1"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300SRLRVTR996F086",
           "meta" : {
-            "scheme" : "http://www.citi.com/fx/trade-id"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "7dfd4938"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "7dfd4938",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300RE0FSXJE8G1L65",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "5c7a105b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "7dfd4938"
-      },
       "meta" : {
-        "globalKey" : "3cf6017e"
+        "globalKey" : "5c7a105b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "220bd97a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "220bd97a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex33-target.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex33-target.json
index 0cfb74ac7e..f476c7bd54 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex33-target.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex33-target.json
@@ -1,57 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "59713423"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "59713423"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "77bec77a"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "77bec77a",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "ABC Bank"
-        },
-        "meta" : {
-          "globalKey" : "77bec77a"
+            "scheme" : "http://www.abc.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "a75e768a"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Counterparty"
-        },
-        "meta" : {
-          "globalKey" : "a75e768a"
-        }
-      } ]
+        "globalKey" : "98447e48"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2011-09-11",
+      "meta" : {
+        "globalKey" : "3eda4b"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "77bec77a"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -61,30 +38,53 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eda4b"
       },
-      "value" : "2011-09-11"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "77bec77a",
+          "externalReference" : "party1"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABC Bank",
           "meta" : {
-            "scheme" : "http://www.abc.com/trade-id"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "77bec77a"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "77bec77a"
-      },
       "meta" : {
-        "globalKey" : "3cf6017e"
+        "globalKey" : "77bec77a",
+        "externalKey" : "party1"
       }
-    } ]
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Counterparty",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "a75e768a"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "a75e768a",
+        "externalKey" : "party2"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "b51d6e77"
+    }
+  },
+  "meta" : {
+    "globalKey" : "b51d6e77"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex34-target-digital.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex34-target-digital.json
index f348b04d6d..044a26abae 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex34-target-digital.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex34-target-digital.json
@@ -1,57 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "f9391954"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "f9391954"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "ptyA",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "ptyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "ptyB",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "f43cbcc7"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2013-06-23",
+      "meta" : {
+        "globalKey" : "3ee997"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "ptyA",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -61,30 +38,53 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee997"
       },
-      "value" : "2013-06-23"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "ptyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/fx/trade-id"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "ptyA",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "787f6b5f"
+        "globalKey" : "33f59567",
+        "externalKey" : "ptyA"
       }
-    } ]
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party B",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "ptyB"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "8cbb91e8"
+    }
+  },
+  "meta" : {
+    "globalKey" : "8cbb91e8"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex35-target-pivot-settlement-period-schedule.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex35-target-pivot-settlement-period-schedule.json
index 96d374d742..d17ba6483f 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex35-target-pivot-settlement-period-schedule.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex35-target-pivot-settlement-period-schedule.json
@@ -1,57 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "f9391954"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "f9391954"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "ptyA",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "ptyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "ptyB",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "f43cbcc7"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2013-07-04",
+      "meta" : {
+        "globalKey" : "3ee9c4"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "ptyA",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -61,30 +38,53 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee9c4"
       },
-      "value" : "2013-07-04"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "ptyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/fx/trade-id"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "ptyA",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "787f6b5f"
+        "globalKey" : "33f59567",
+        "externalKey" : "ptyA"
       }
-    } ]
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party B",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "ptyB"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "8cbb91e8"
+    }
+  },
+  "meta" : {
+    "globalKey" : "8cbb91e8"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex35-target-pivot.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex35-target-pivot.json
index 96d374d742..d17ba6483f 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex35-target-pivot.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex35-target-pivot.json
@@ -1,57 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "f9391954"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "f9391954"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "ptyA",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "ptyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "ptyB",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "f43cbcc7"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2013-07-04",
+      "meta" : {
+        "globalKey" : "3ee9c4"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "ptyA",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -61,30 +38,53 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee9c4"
       },
-      "value" : "2013-07-04"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "ptyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/fx/trade-id"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "ptyA",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "787f6b5f"
+        "globalKey" : "33f59567",
+        "externalKey" : "ptyA"
       }
-    } ]
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party B",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "ptyB"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "8cbb91e8"
+    }
+  },
+  "meta" : {
+    "globalKey" : "8cbb91e8"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex36-target-leverage.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex36-target-leverage.json
index a4fea69d91..9bb59cd6ad 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex36-target-leverage.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex36-target-leverage.json
@@ -1,57 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "f9391954"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "f9391954"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "ptyA",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "ptyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "ptyB",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "f43cbcc7"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2010-11-07",
+      "meta" : {
+        "globalKey" : "3ed2c7"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "ptyA",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -61,30 +38,53 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ed2c7"
       },
-      "value" : "2010-11-07"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "ptyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/fx/trade-id"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "ptyA",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "787f6b5f"
+        "globalKey" : "33f59567",
+        "externalKey" : "ptyA"
       }
-    } ]
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party B",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "ptyB"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "8cbb91e8"
+    }
+  },
+  "meta" : {
+    "globalKey" : "8cbb91e8"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex37-target-knockout.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex37-target-knockout.json
index a4fea69d91..9bb59cd6ad 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex37-target-knockout.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex37-target-knockout.json
@@ -1,57 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "f9391954"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "f9391954"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "ptyA",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "ptyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "ptyB",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "f43cbcc7"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2010-11-07",
+      "meta" : {
+        "globalKey" : "3ed2c7"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "ptyA",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -61,30 +38,53 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ed2c7"
       },
-      "value" : "2010-11-07"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "ptyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/fx/trade-id"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "ptyA",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "787f6b5f"
+        "globalKey" : "33f59567",
+        "externalKey" : "ptyA"
       }
-    } ]
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party B",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "ptyB"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "8cbb91e8"
+    }
+  },
+  "meta" : {
+    "globalKey" : "8cbb91e8"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex38-target-rebate.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex38-target-rebate.json
index e0f08d2e3f..1bafdbd257 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex38-target-rebate.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex38-target-rebate.json
@@ -1,57 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "f9391954"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "f9391954"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "ptyA",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "ptyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "ptyB",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "f43cbcc7"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-02-27",
+      "meta" : {
+        "globalKey" : "3ef09b"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "ptyA",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -61,30 +38,53 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef09b"
       },
-      "value" : "2014-02-27"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "ptyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/fx/trade-id"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "ptyA",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "787f6b5f"
+        "globalKey" : "33f59567",
+        "externalKey" : "ptyA"
       }
-    } ]
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party B",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "ptyB"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "8cbb91e8"
+    }
+  },
+  "meta" : {
+    "globalKey" : "8cbb91e8"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex39-target-split.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex39-target-split.json
index 682d632012..36767dedd5 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex39-target-split.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex39-target-split.json
@@ -1,57 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "f9391954"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "f9391954"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "ptyA",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "ptyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "ptyB",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "f43cbcc7"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-12-21",
+      "meta" : {
+        "globalKey" : "3ef315"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "ptyA",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -61,30 +38,53 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef315"
       },
-      "value" : "2014-12-21"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "ptyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/fx/trade-id"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "ptyA",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "787f6b5f"
+        "globalKey" : "33f59567",
+        "externalKey" : "ptyA"
       }
-    } ]
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party B",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "ptyB"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "8cbb91e8"
+    }
+  },
+  "meta" : {
+    "globalKey" : "8cbb91e8"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex40-target-accelerated.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex40-target-accelerated.json
index 682d632012..36767dedd5 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex40-target-accelerated.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex40-target-accelerated.json
@@ -1,57 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "f9391954"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "f9391954"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "ptyA",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "ptyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "ptyB",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "f43cbcc7"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-12-21",
+      "meta" : {
+        "globalKey" : "3ef315"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "ptyA",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -61,30 +38,53 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef315"
       },
-      "value" : "2014-12-21"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "ptyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/fx/trade-id"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "ptyA",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "787f6b5f"
+        "globalKey" : "33f59567",
+        "externalKey" : "ptyA"
       }
-    } ]
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party B",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "ptyB"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "8cbb91e8"
+    }
+  },
+  "meta" : {
+    "globalKey" : "8cbb91e8"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex41-target-bonus-collar-settlement-period-schedule.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex41-target-bonus-collar-settlement-period-schedule.json
index 96d374d742..d17ba6483f 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex41-target-bonus-collar-settlement-period-schedule.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex41-target-bonus-collar-settlement-period-schedule.json
@@ -1,57 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "f9391954"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "f9391954"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "ptyA",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "ptyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "ptyB",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "f43cbcc7"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2013-07-04",
+      "meta" : {
+        "globalKey" : "3ee9c4"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "ptyA",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -61,30 +38,53 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee9c4"
       },
-      "value" : "2013-07-04"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "ptyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/fx/trade-id"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "ptyA",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "787f6b5f"
+        "globalKey" : "33f59567",
+        "externalKey" : "ptyA"
       }
-    } ]
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party B",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "ptyB"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "8cbb91e8"
+    }
+  },
+  "meta" : {
+    "globalKey" : "8cbb91e8"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex41-target-bonus-collar.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex41-target-bonus-collar.json
index 96d374d742..d17ba6483f 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex41-target-bonus-collar.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex41-target-bonus-collar.json
@@ -1,57 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "f9391954"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "f9391954"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "ptyA",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "ptyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "ptyB",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "f43cbcc7"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2013-07-04",
+      "meta" : {
+        "globalKey" : "3ee9c4"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "ptyA",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -61,30 +38,53 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee9c4"
       },
-      "value" : "2013-07-04"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "ptyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/fx/trade-id"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "ptyA",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "787f6b5f"
+        "globalKey" : "33f59567",
+        "externalKey" : "ptyA"
       }
-    } ]
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party B",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "ptyB"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "8cbb91e8"
+    }
+  },
+  "meta" : {
+    "globalKey" : "8cbb91e8"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex42-target-eki.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex42-target-eki.json
index 96d374d742..d17ba6483f 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex42-target-eki.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex42-target-eki.json
@@ -1,57 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "f9391954"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "f9391954"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "ptyA",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "ptyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "ptyB",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "f43cbcc7"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2013-07-04",
+      "meta" : {
+        "globalKey" : "3ee9c4"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "ptyA",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -61,30 +38,53 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee9c4"
       },
-      "value" : "2013-07-04"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "ptyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/fx/trade-id"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "ptyA",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "787f6b5f"
+        "globalKey" : "33f59567",
+        "externalKey" : "ptyA"
       }
-    } ]
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party B",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "ptyB"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "8cbb91e8"
+    }
+  },
+  "meta" : {
+    "globalKey" : "8cbb91e8"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex43-target-eki-settlement-period-schedule-references.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex43-target-eki-settlement-period-schedule-references.json
index 57e28af8d6..4ee944f955 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex43-target-eki-settlement-period-schedule-references.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex43-target-eki-settlement-period-schedule-references.json
@@ -1,57 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "f9391954"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "f9391954"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "ptyA",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "ptyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "ptyB",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "f43cbcc7"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-07-25",
+      "meta" : {
+        "globalKey" : "3ef1d9"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "ptyA",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -61,30 +38,53 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef1d9"
       },
-      "value" : "2014-07-25"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "ptyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/fx/trade-id"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "ptyA",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "787f6b5f"
+        "globalKey" : "33f59567",
+        "externalKey" : "ptyA"
       }
-    } ]
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party B",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "ptyB"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "8cbb91e8"
+    }
+  },
+  "meta" : {
+    "globalKey" : "8cbb91e8"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex43-target-eki-settlement-period-schedule.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex43-target-eki-settlement-period-schedule.json
index 57e28af8d6..4ee944f955 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex43-target-eki-settlement-period-schedule.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex43-target-eki-settlement-period-schedule.json
@@ -1,57 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "f9391954"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "f9391954"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "ptyA",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "ptyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "ptyB",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "f43cbcc7"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-07-25",
+      "meta" : {
+        "globalKey" : "3ef1d9"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "ptyA",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -61,30 +38,53 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef1d9"
       },
-      "value" : "2014-07-25"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "ptyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/fx/trade-id"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "ptyA",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "787f6b5f"
+        "globalKey" : "33f59567",
+        "externalKey" : "ptyA"
       }
-    } ]
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party B",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "ptyB"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "8cbb91e8"
+    }
+  },
+  "meta" : {
+    "globalKey" : "8cbb91e8"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex43-target-eki.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex43-target-eki.json
index 57e28af8d6..4ee944f955 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex43-target-eki.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex43-target-eki.json
@@ -1,57 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "f9391954"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "f9391954"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "ptyA",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "ptyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "ptyB",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "f43cbcc7"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-07-25",
+      "meta" : {
+        "globalKey" : "3ef1d9"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "ptyA",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -61,30 +38,53 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef1d9"
       },
-      "value" : "2014-07-25"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "ptyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/fx/trade-id"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "ptyA",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "787f6b5f"
+        "globalKey" : "33f59567",
+        "externalKey" : "ptyA"
       }
-    } ]
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party B",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "ptyB"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "8cbb91e8"
+    }
+  },
+  "meta" : {
+    "globalKey" : "8cbb91e8"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex44-accrual-forward.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex44-accrual-forward.json
index 3f4b2e83d1..0c2ab6f76f 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex44-accrual-forward.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex44-accrual-forward.json
@@ -1,59 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "dcb1dce6"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "dcb1dce6"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "7dfd4938"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7dfd4938",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300SRLRVTR996F086"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "7dfd4938"
+            "scheme" : "#partyA"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "5c7a105b"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300RE0FSXJE8G1L65"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "5c7a105b"
-        }
-      } ]
+        "globalKey" : "984bc438"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2011-03-26",
+      "meta" : {
+        "globalKey" : "3ed8da"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "7dfd4938"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -63,30 +38,55 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ed8da"
       },
-      "value" : "2011-03-26"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "7dfd4938",
+          "externalReference" : "partyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300SRLRVTR996F086",
           "meta" : {
-            "scheme" : "#partyA"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "7dfd4938"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "7dfd4938",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300RE0FSXJE8G1L65",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "5c7a105b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "7dfd4938"
-      },
       "meta" : {
-        "globalKey" : "3cf6018e"
+        "globalKey" : "5c7a105b",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "306ff37a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "306ff37a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex45-accrual-forward-leverage.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex45-accrual-forward-leverage.json
index 223d83940c..2ce5476ad6 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex45-accrual-forward-leverage.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex45-accrual-forward-leverage.json
@@ -1,59 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "dcb1dce6"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "dcb1dce6"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "7dfd4938"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7dfd4938",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300SRLRVTR996F086"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "7dfd4938"
+            "scheme" : "#partyA"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "5c7a105b"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300RE0FSXJE8G1L65"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "5c7a105b"
-        }
-      } ]
+        "globalKey" : "984bc438"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-06-09",
+      "meta" : {
+        "globalKey" : "3ef189"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "7dfd4938"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -63,30 +38,55 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef189"
       },
-      "value" : "2014-06-09"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "7dfd4938",
+          "externalReference" : "partyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300SRLRVTR996F086",
           "meta" : {
-            "scheme" : "#partyA"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "7dfd4938"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "7dfd4938",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300RE0FSXJE8G1L65",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "5c7a105b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "7dfd4938"
-      },
       "meta" : {
-        "globalKey" : "3cf6018e"
+        "globalKey" : "5c7a105b",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "306ff37a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "306ff37a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex46-accrual-forward-american-lose-boost.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex46-accrual-forward-american-lose-boost.json
index b1690bb6ff..52f866555e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex46-accrual-forward-american-lose-boost.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex46-accrual-forward-american-lose-boost.json
@@ -1,59 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "dcb1dce6"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "dcb1dce6"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "7dfd4938"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7dfd4938",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300SRLRVTR996F086"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "7dfd4938"
+            "scheme" : "#partyA"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "5c7a105b"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300RE0FSXJE8G1L65"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "5c7a105b"
-        }
-      } ]
+        "globalKey" : "984bc438"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2012-12-08",
+      "meta" : {
+        "globalKey" : "3ee308"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "7dfd4938"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -63,30 +38,55 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee308"
       },
-      "value" : "2012-12-08"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "7dfd4938",
+          "externalReference" : "partyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300SRLRVTR996F086",
           "meta" : {
-            "scheme" : "#partyA"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "7dfd4938"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "7dfd4938",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300RE0FSXJE8G1L65",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "5c7a105b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "7dfd4938"
-      },
       "meta" : {
-        "globalKey" : "3cf6018e"
+        "globalKey" : "5c7a105b",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "306ff37a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "306ff37a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex47-accrual-forward-european-fading-forward.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex47-accrual-forward-european-fading-forward.json
index 587ccc7bfe..d32c114169 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex47-accrual-forward-european-fading-forward.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex47-accrual-forward-european-fading-forward.json
@@ -1,59 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "dcb1dce6"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "dcb1dce6"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "7dfd4938"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7dfd4938",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300SRLRVTR996F086"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "7dfd4938"
+            "scheme" : "#partyA"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "5c7a105b"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300RE0FSXJE8G1L65"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "5c7a105b"
-        }
-      } ]
+        "globalKey" : "984bc438"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-01-17",
+      "meta" : {
+        "globalKey" : "3ef051"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "7dfd4938"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -63,30 +38,55 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef051"
       },
-      "value" : "2014-01-17"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "7dfd4938",
+          "externalReference" : "partyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300SRLRVTR996F086",
           "meta" : {
-            "scheme" : "#partyA"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "7dfd4938"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "7dfd4938",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300RE0FSXJE8G1L65",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "5c7a105b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "7dfd4938"
-      },
       "meta" : {
-        "globalKey" : "3cf6018e"
+        "globalKey" : "5c7a105b",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "306ff37a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "306ff37a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex48-accrual-option-strategy-fading-extra.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex48-accrual-option-strategy-fading-extra.json
index e912c53107..ddfd2c9583 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex48-accrual-option-strategy-fading-extra.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex48-accrual-option-strategy-fading-extra.json
@@ -1,59 +1,50 @@
 {
-  "meta" : {
-    "globalKey" : "30052359"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "30052359"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "7dfd4938"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7dfd4938",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123456789",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300SRLRVTR996F086"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "7dfd4938"
+            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-3-0"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "5c7a105b"
+        "globalKey" : "2633d43a"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "5c7a105b",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123456789",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300RE0FSXJE8G1L65"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "5c7a105b"
+            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-3-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "26344899"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-10-01",
+      "meta" : {
+        "globalKey" : "3ef281"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "7dfd4938"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -63,46 +54,55 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef281"
       },
-      "value" : "2014-10-01"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "7dfd4938",
+          "externalReference" : "partyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300SRLRVTR996F086",
           "meta" : {
-            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-3-0"
-          },
-          "value" : "123456789"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "7dfd4938"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "7dfd4938"
-      },
       "meta" : {
-        "globalKey" : "f11a1910"
+        "globalKey" : "7dfd4938",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300RE0FSXJE8G1L65",
           "meta" : {
-            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-3-0"
-          },
-          "value" : "123456789"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "5c7a105b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "5c7a105b"
-      },
       "meta" : {
-        "globalKey" : "f11a1911"
+        "globalKey" : "5c7a105b",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "ec22fe61"
+    }
+  },
+  "meta" : {
+    "globalKey" : "ec22fe61"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex49-accrual-forward-boost-strip-settlement-period-schedule.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex49-accrual-forward-boost-strip-settlement-period-schedule.json
index 36734aef75..b700ad8f1a 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex49-accrual-forward-boost-strip-settlement-period-schedule.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex49-accrual-forward-boost-strip-settlement-period-schedule.json
@@ -1,59 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "dcb1dce6"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "dcb1dce6"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "7dfd4938"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7dfd4938",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300SRLRVTR996F086"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "7dfd4938"
+            "scheme" : "#partyA"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "5c7a105b"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300RE0FSXJE8G1L65"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "5c7a105b"
-        }
-      } ]
+        "globalKey" : "984bc438"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2010-10-15",
+      "meta" : {
+        "globalKey" : "3ed28f"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "7dfd4938"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -63,30 +38,55 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ed28f"
       },
-      "value" : "2010-10-15"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "7dfd4938",
+          "externalReference" : "partyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300SRLRVTR996F086",
           "meta" : {
-            "scheme" : "#partyA"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "7dfd4938"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "7dfd4938",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300RE0FSXJE8G1L65",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "5c7a105b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "7dfd4938"
-      },
       "meta" : {
-        "globalKey" : "3cf6018e"
+        "globalKey" : "5c7a105b",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "306ff37a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "306ff37a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex49-accrual-forward-boost-strip.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex49-accrual-forward-boost-strip.json
index 36734aef75..b700ad8f1a 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex49-accrual-forward-boost-strip.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex49-accrual-forward-boost-strip.json
@@ -1,59 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "dcb1dce6"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "dcb1dce6"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "7dfd4938"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7dfd4938",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300SRLRVTR996F086"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "7dfd4938"
+            "scheme" : "#partyA"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "5c7a105b"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300RE0FSXJE8G1L65"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "5c7a105b"
-        }
-      } ]
+        "globalKey" : "984bc438"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2010-10-15",
+      "meta" : {
+        "globalKey" : "3ed28f"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "7dfd4938"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -63,30 +38,55 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ed28f"
       },
-      "value" : "2010-10-15"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "7dfd4938",
+          "externalReference" : "partyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300SRLRVTR996F086",
           "meta" : {
-            "scheme" : "#partyA"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "7dfd4938"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "7dfd4938",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300RE0FSXJE8G1L65",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "5c7a105b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "7dfd4938"
-      },
       "meta" : {
-        "globalKey" : "3cf6018e"
+        "globalKey" : "5c7a105b",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "306ff37a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "306ff37a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex50-accrual-forward-double-accrual.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex50-accrual-forward-double-accrual.json
index 587ccc7bfe..d32c114169 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex50-accrual-forward-double-accrual.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex50-accrual-forward-double-accrual.json
@@ -1,59 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "dcb1dce6"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "dcb1dce6"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "7dfd4938"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7dfd4938",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300SRLRVTR996F086"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "7dfd4938"
+            "scheme" : "#partyA"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "5c7a105b"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300RE0FSXJE8G1L65"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "5c7a105b"
-        }
-      } ]
+        "globalKey" : "984bc438"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-01-17",
+      "meta" : {
+        "globalKey" : "3ef051"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "7dfd4938"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -63,30 +38,55 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef051"
       },
-      "value" : "2014-01-17"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "7dfd4938",
+          "externalReference" : "partyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300SRLRVTR996F086",
           "meta" : {
-            "scheme" : "#partyA"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "7dfd4938"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "7dfd4938",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300RE0FSXJE8G1L65",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "5c7a105b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "7dfd4938"
-      },
       "meta" : {
-        "globalKey" : "3cf6018e"
+        "globalKey" : "5c7a105b",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "306ff37a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "306ff37a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex51-accrual-forward-american-keep-double-multi-settlement-settlement-period-schedule.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex51-accrual-forward-american-keep-double-multi-settlement-settlement-period-schedule.json
index 6b96f7f379..dcf68c0b9b 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex51-accrual-forward-american-keep-double-multi-settlement-settlement-period-schedule.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex51-accrual-forward-american-keep-double-multi-settlement-settlement-period-schedule.json
@@ -1,59 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "dcb1dce6"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "dcb1dce6"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "7dfd4938"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7dfd4938",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300SRLRVTR996F086"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "7dfd4938"
+            "scheme" : "#partyA"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "5c7a105b"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300RE0FSXJE8G1L65"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "5c7a105b"
-        }
-      } ]
+        "globalKey" : "984bc438"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-07-01",
+      "meta" : {
+        "globalKey" : "3ef1c1"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "7dfd4938"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -63,30 +38,55 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef1c1"
       },
-      "value" : "2014-07-01"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "7dfd4938",
+          "externalReference" : "partyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300SRLRVTR996F086",
           "meta" : {
-            "scheme" : "#partyA"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "7dfd4938"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "7dfd4938",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300RE0FSXJE8G1L65",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "5c7a105b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "7dfd4938"
-      },
       "meta" : {
-        "globalKey" : "3cf6018e"
+        "globalKey" : "5c7a105b",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "306ff37a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "306ff37a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex51-accrual-forward-american-keep-double-multi-settlement.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex51-accrual-forward-american-keep-double-multi-settlement.json
index 6b96f7f379..dcf68c0b9b 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex51-accrual-forward-american-keep-double-multi-settlement.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex51-accrual-forward-american-keep-double-multi-settlement.json
@@ -1,59 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "dcb1dce6"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "dcb1dce6"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "7dfd4938"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7dfd4938",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300SRLRVTR996F086"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "7dfd4938"
+            "scheme" : "#partyA"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "5c7a105b"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300RE0FSXJE8G1L65"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "5c7a105b"
-        }
-      } ]
+        "globalKey" : "984bc438"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-07-01",
+      "meta" : {
+        "globalKey" : "3ef1c1"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "7dfd4938"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -63,30 +38,55 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef1c1"
       },
-      "value" : "2014-07-01"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "7dfd4938",
+          "externalReference" : "partyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300SRLRVTR996F086",
           "meta" : {
-            "scheme" : "#partyA"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "7dfd4938"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "7dfd4938",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300RE0FSXJE8G1L65",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "5c7a105b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "7dfd4938"
-      },
       "meta" : {
-        "globalKey" : "3cf6018e"
+        "globalKey" : "5c7a105b",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "306ff37a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "306ff37a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex52-accrual-forward-collar.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex52-accrual-forward-collar.json
index 587ccc7bfe..d32c114169 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex52-accrual-forward-collar.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex52-accrual-forward-collar.json
@@ -1,59 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "dcb1dce6"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "dcb1dce6"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "7dfd4938"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7dfd4938",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300SRLRVTR996F086"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "7dfd4938"
+            "scheme" : "#partyA"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "5c7a105b"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300RE0FSXJE8G1L65"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "5c7a105b"
-        }
-      } ]
+        "globalKey" : "984bc438"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-01-17",
+      "meta" : {
+        "globalKey" : "3ef051"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "7dfd4938"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -63,30 +38,55 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef051"
       },
-      "value" : "2014-01-17"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "7dfd4938",
+          "externalReference" : "partyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300SRLRVTR996F086",
           "meta" : {
-            "scheme" : "#partyA"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "7dfd4938"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "7dfd4938",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300RE0FSXJE8G1L65",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "5c7a105b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "7dfd4938"
-      },
       "meta" : {
-        "globalKey" : "3cf6018e"
+        "globalKey" : "5c7a105b",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "306ff37a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "306ff37a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex53-accrual-forward-variable-strike.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex53-accrual-forward-variable-strike.json
index 88d394de94..9d85e2193c 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex53-accrual-forward-variable-strike.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex53-accrual-forward-variable-strike.json
@@ -1,59 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "dcb1dce6"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "dcb1dce6"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "7dfd4938"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7dfd4938",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300SRLRVTR996F086"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "7dfd4938"
+            "scheme" : "#partyA"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "5c7a105b"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300RE0FSXJE8G1L65"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "5c7a105b"
-        }
-      } ]
+        "globalKey" : "984bc438"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2011-07-07",
+      "meta" : {
+        "globalKey" : "3ed9c7"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "7dfd4938"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -63,30 +38,55 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ed9c7"
       },
-      "value" : "2011-07-07"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "7dfd4938",
+          "externalReference" : "partyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300SRLRVTR996F086",
           "meta" : {
-            "scheme" : "#partyA"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "7dfd4938"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "7dfd4938",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300RE0FSXJE8G1L65",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "5c7a105b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "7dfd4938"
-      },
       "meta" : {
-        "globalKey" : "3cf6018e"
+        "globalKey" : "5c7a105b",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "306ff37a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "306ff37a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex54-accrual-option-american.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex54-accrual-option-american.json
index c77ba6443b..12f45f6280 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex54-accrual-option-american.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex54-accrual-option-american.json
@@ -1,59 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "dcb1dce6"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "dcb1dce6"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "7dfd4938"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7dfd4938",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300SRLRVTR996F086"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "7dfd4938"
+            "scheme" : "#partyA"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "5c7a105b"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300RE0FSXJE8G1L65"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "5c7a105b"
-        }
-      } ]
+        "globalKey" : "984bc438"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-06-24",
+      "meta" : {
+        "globalKey" : "3ef198"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "7dfd4938"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -63,30 +38,55 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef198"
       },
-      "value" : "2014-06-24"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "7dfd4938",
+          "externalReference" : "partyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300SRLRVTR996F086",
           "meta" : {
-            "scheme" : "#partyA"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "7dfd4938"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "7dfd4938",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300RE0FSXJE8G1L65",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "5c7a105b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "7dfd4938"
-      },
       "meta" : {
-        "globalKey" : "3cf6018e"
+        "globalKey" : "5c7a105b",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "306ff37a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "306ff37a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex55-accrual-option-average-strike.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex55-accrual-option-average-strike.json
index 55dd74a6cc..0711d8c7c9 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex55-accrual-option-average-strike.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex55-accrual-option-average-strike.json
@@ -1,100 +1,100 @@
 {
-  "meta" : {
-    "globalKey" : "123876aa"
-  },
   "trade" : {
-    "contractDetails" : {
-      "governingLaw" : {
-        "value" : "GBEN"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7dfd4938",
+        "externalReference" : "partyA"
       },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "12345",
+          "meta" : {
+            "scheme" : "#partyA"
+          }
+        }
+      } ],
       "meta" : {
-        "globalKey" : "2146c4"
+        "globalKey" : "984bc438"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2005-10-03",
+      "meta" : {
+        "globalKey" : "3eaa83"
       }
     },
-    "meta" : {
-      "globalKey" : "123876aa"
+    "tradableProduct" : {
+      "product" : {
+        "contractualProduct" : {
+          "economicTerms" : {
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
+            }
+          },
+          "meta" : {
+            "globalKey" : "4c4be8ea"
+          }
+        },
+        "meta" : {
+          "globalKey" : "4c4be8ea"
+        }
+      },
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "7dfd4938",
+          "externalReference" : "partyA"
+        } ]
+      } ]
     },
     "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "7dfd4938"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "549300SRLRVTR996F086",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300SRLRVTR996F086"
+          }
         },
         "identifierType" : "LEI",
         "meta" : {
           "globalKey" : "7dfd4938"
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "5c7a105b"
-      },
+        "globalKey" : "7dfd4938",
+        "externalKey" : "partyA"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "549300RE0FSXJE8G1L65",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300RE0FSXJE8G1L65"
+          }
         },
         "identifierType" : "LEI",
         "meta" : {
           "globalKey" : "5c7a105b"
         }
-      } ]
-    } ],
-    "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "7dfd4938"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
       } ],
-      "product" : {
-        "contractualProduct" : {
-          "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            }
-          },
-          "meta" : {
-            "globalKey" : "4c4be8ea"
-          }
-        },
-        "meta" : {
-          "globalKey" : "4c4be8ea"
-        }
-      }
-    },
-    "tradeDate" : {
       "meta" : {
-        "globalKey" : "3eaa83"
-      },
-      "value" : "2005-10-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "#partyA"
-          },
-          "value" : "12345"
-        }
-      } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "7dfd4938"
+        "globalKey" : "5c7a105b",
+        "externalKey" : "partyB"
+      }
+    } ],
+    "contractDetails" : {
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "3cf6018e"
+        "globalKey" : "2146c4"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "b3ffe90a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "b3ffe90a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex56-accrual-option-average-rate.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex56-accrual-option-average-rate.json
index b35c8b4e86..2f1d4e6c08 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex56-accrual-option-average-rate.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex56-accrual-option-average-rate.json
@@ -1,59 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "dcb1dce6"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "dcb1dce6"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "7dfd4938"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7dfd4938",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300SRLRVTR996F086"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "7dfd4938"
+            "scheme" : "#partyA"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "5c7a105b"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300RE0FSXJE8G1L65"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "5c7a105b"
-        }
-      } ]
+        "globalKey" : "984bc438"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2008-01-11",
+      "meta" : {
+        "globalKey" : "3ec04b"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "7dfd4938"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -63,30 +38,55 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec04b"
       },
-      "value" : "2008-01-11"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "7dfd4938",
+          "externalReference" : "partyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300SRLRVTR996F086",
           "meta" : {
-            "scheme" : "#partyA"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "7dfd4938"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "7dfd4938",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300RE0FSXJE8G1L65",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "5c7a105b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "7dfd4938"
-      },
       "meta" : {
-        "globalKey" : "3cf6018e"
+        "globalKey" : "5c7a105b",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "306ff37a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "306ff37a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex57-accrual-digital-option-american.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex57-accrual-digital-option-american.json
index c77ba6443b..12f45f6280 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex57-accrual-digital-option-american.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex57-accrual-digital-option-american.json
@@ -1,59 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "dcb1dce6"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "dcb1dce6"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "7dfd4938"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7dfd4938",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300SRLRVTR996F086"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "7dfd4938"
+            "scheme" : "#partyA"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "5c7a105b"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300RE0FSXJE8G1L65"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "5c7a105b"
-        }
-      } ]
+        "globalKey" : "984bc438"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-06-24",
+      "meta" : {
+        "globalKey" : "3ef198"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "7dfd4938"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -63,30 +38,55 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef198"
       },
-      "value" : "2014-06-24"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "7dfd4938",
+          "externalReference" : "partyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300SRLRVTR996F086",
           "meta" : {
-            "scheme" : "#partyA"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "7dfd4938"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "7dfd4938",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300RE0FSXJE8G1L65",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "5c7a105b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "7dfd4938"
-      },
       "meta" : {
-        "globalKey" : "3cf6018e"
+        "globalKey" : "5c7a105b",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "306ff37a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "306ff37a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex58-accrual-range-accrual-european.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex58-accrual-range-accrual-european.json
index 4853371487..02a89d82c0 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex58-accrual-range-accrual-european.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex58-accrual-range-accrual-european.json
@@ -1,59 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "dcb1dce6"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "dcb1dce6"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "7dfd4938"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7dfd4938",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300SRLRVTR996F086"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "7dfd4938"
+            "scheme" : "#partyA"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "5c7a105b"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300RE0FSXJE8G1L65"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "5c7a105b"
-        }
-      } ]
+        "globalKey" : "984bc438"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2013-03-14",
+      "meta" : {
+        "globalKey" : "3ee8ce"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "7dfd4938"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -63,30 +38,55 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee8ce"
       },
-      "value" : "2013-03-14"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "7dfd4938",
+          "externalReference" : "partyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300SRLRVTR996F086",
           "meta" : {
-            "scheme" : "#partyA"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "7dfd4938"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "7dfd4938",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300RE0FSXJE8G1L65",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "5c7a105b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "7dfd4938"
-      },
       "meta" : {
-        "globalKey" : "3cf6018e"
+        "globalKey" : "5c7a105b",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "306ff37a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "306ff37a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex59-accrual-range-accrual-european.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex59-accrual-range-accrual-european.json
index b1690bb6ff..52f866555e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex59-accrual-range-accrual-european.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/fx-ex59-accrual-range-accrual-european.json
@@ -1,59 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "dcb1dce6"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "dcb1dce6"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "7dfd4938"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7dfd4938",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300SRLRVTR996F086"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "7dfd4938"
+            "scheme" : "#partyA"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "5c7a105b"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300RE0FSXJE8G1L65"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "5c7a105b"
-        }
-      } ]
+        "globalKey" : "984bc438"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2012-12-08",
+      "meta" : {
+        "globalKey" : "3ee308"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "7dfd4938"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
@@ -63,30 +38,55 @@
         "meta" : {
           "globalKey" : "4c4be8ea"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee308"
       },
-      "value" : "2012-12-08"
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "7dfd4938",
+          "externalReference" : "partyA"
+        } ]
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300SRLRVTR996F086",
           "meta" : {
-            "scheme" : "#partyA"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "7dfd4938"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "7dfd4938",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300RE0FSXJE8G1L65",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "5c7a105b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "7dfd4938"
-      },
       "meta" : {
-        "globalKey" : "3cf6018e"
+        "globalKey" : "5c7a105b",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "306ff37a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "306ff37a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/td-ex01-simple-term-deposit.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/td-ex01-simple-term-deposit.json
index 28e8a8de81..705e7151e4 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/td-ex01-simple-term-deposit.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/td-ex01-simple-term-deposit.json
@@ -1,84 +1,84 @@
 {
-  "meta" : {
-    "globalKey" : "de88c697"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "de88c697"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "e1284e85"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "e1284e85",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "MB87623",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "TR24TWEY5RVRQV65HD49"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e1284e85"
+            "scheme" : "http://www.hsbc.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "cff0a7d6"
+        "globalKey" : "f2891f38"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "cff0a7d6",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "AA9876",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFXS5XCH7N0Y05NIXW11"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cff0a7d6"
+            "scheme" : "http://www.abnamro.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "814acd2"
+      }
     } ],
     "tradeDate" : {
+      "value" : "2002-02-14",
       "meta" : {
         "globalKey" : "3e908e"
-      },
-      "value" : "2002-02-14"
+      }
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "TR24TWEY5RVRQV65HD49",
           "meta" : {
-            "scheme" : "http://www.hsbc.com/swaps/trade-id"
-          },
-          "value" : "MB87623"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e1284e85"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "e1284e85"
-      },
       "meta" : {
-        "globalKey" : "1896266e"
+        "globalKey" : "e1284e85",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFXS5XCH7N0Y05NIXW11",
           "meta" : {
-            "scheme" : "http://www.abnamro.com/swaps/trade-id"
-          },
-          "value" : "AA9876"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cff0a7d6"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "cff0a7d6"
-      },
       "meta" : {
-        "globalKey" : "f7bfdcea"
+        "globalKey" : "cff0a7d6",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "867a03f5"
+    }
+  },
+  "meta" : {
+    "globalKey" : "867a03f5"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/td-ex02-term-deposit-w-settlement-etc.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/td-ex02-term-deposit-w-settlement-etc.json
index 1b1729e30c..995cf49ace 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/td-ex02-term-deposit-w-settlement-etc.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/fx-derivatives/td-ex02-term-deposit-w-settlement-etc.json
@@ -1,90 +1,90 @@
 {
-  "meta" : {
-    "globalKey" : "6f149486"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "6f149486"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "83376d18"
-      },
-      "name" : {
-        "value" : "MIDLAND"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "a2022158",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "MB87623",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "TR24TWEY5RVRQV65HD49"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e1284e85"
+            "scheme" : "http://www.midlandnb.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "f7a2ed32"
-      },
-      "name" : {
-        "value" : "ABN AMRO"
+        "globalKey" : "f2891f38"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "20e95db2",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "AA9876",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFXS5XCH7N0Y05NIXW11"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cff0a7d6"
+            "scheme" : "http://www.abn.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "814acd2"
+      }
     } ],
     "tradeDate" : {
+      "value" : "2002-02-14",
       "meta" : {
         "globalKey" : "3e908e"
-      },
-      "value" : "2002-02-14"
+      }
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "TR24TWEY5RVRQV65HD49",
           "meta" : {
-            "scheme" : "http://www.midlandnb.com/swaps/trade-id"
-          },
-          "value" : "MB87623"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e1284e85"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "83376d18"
+      "name" : {
+        "value" : "MIDLAND"
       },
       "meta" : {
-        "globalKey" : "1896266e"
+        "globalKey" : "a2022158",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFXS5XCH7N0Y05NIXW11",
           "meta" : {
-            "scheme" : "http://www.abn.com/swaps/trade-id"
-          },
-          "value" : "AA9876"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cff0a7d6"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "f7a2ed32"
+      "name" : {
+        "value" : "ABN AMRO"
       },
       "meta" : {
-        "globalKey" : "f7bfdcea"
+        "globalKey" : "20e95db2",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "d7db5824"
+    }
+  },
+  "meta" : {
+    "globalKey" : "d7db5824"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/loan/loan_trade_ex002.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/loan/loan_trade_ex002.json
index ad2a944e89..9390fcf7d8 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/loan/loan_trade_ex002.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/loan/loan_trade_ex002.json
@@ -1,27 +1,27 @@
 {
-  "meta" : {
-    "globalKey" : "40cc93e1"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "40cc93e1"
-    },
     "party" : [ {
-      "meta" : {
-        "externalKey" : "US1LFM0001",
-        "globalKey" : "40cc93e1"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "US1LFM0001",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/party-id-MEI-1-0"
-          },
-          "value" : "US1LFM0001"
+          }
         },
         "meta" : {
           "globalKey" : "40cc93e1"
         }
-      } ]
-    } ]
+      } ],
+      "meta" : {
+        "globalKey" : "40cc93e1",
+        "externalKey" : "US1LFM0001"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "40cc93e1"
+    }
+  },
+  "meta" : {
+    "globalKey" : "40cc93e1"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/loan/loan_trade_ex003.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/loan/loan_trade_ex003.json
index ad2a944e89..9390fcf7d8 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/loan/loan_trade_ex003.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/loan/loan_trade_ex003.json
@@ -1,27 +1,27 @@
 {
-  "meta" : {
-    "globalKey" : "40cc93e1"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "40cc93e1"
-    },
     "party" : [ {
-      "meta" : {
-        "externalKey" : "US1LFM0001",
-        "globalKey" : "40cc93e1"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "US1LFM0001",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/party-id-MEI-1-0"
-          },
-          "value" : "US1LFM0001"
+          }
         },
         "meta" : {
           "globalKey" : "40cc93e1"
         }
-      } ]
-    } ]
+      } ],
+      "meta" : {
+        "globalKey" : "40cc93e1",
+        "externalKey" : "US1LFM0001"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "40cc93e1"
+    }
+  },
+  "meta" : {
+    "globalKey" : "40cc93e1"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/loan/loan_trade_ex004.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/loan/loan_trade_ex004.json
index ad2a944e89..9390fcf7d8 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/loan/loan_trade_ex004.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/loan/loan_trade_ex004.json
@@ -1,27 +1,27 @@
 {
-  "meta" : {
-    "globalKey" : "40cc93e1"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "40cc93e1"
-    },
     "party" : [ {
-      "meta" : {
-        "externalKey" : "US1LFM0001",
-        "globalKey" : "40cc93e1"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "US1LFM0001",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/party-id-MEI-1-0"
-          },
-          "value" : "US1LFM0001"
+          }
         },
         "meta" : {
           "globalKey" : "40cc93e1"
         }
-      } ]
-    } ]
+      } ],
+      "meta" : {
+        "globalKey" : "40cc93e1",
+        "externalKey" : "US1LFM0001"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "40cc93e1"
+    }
+  },
+  "meta" : {
+    "globalKey" : "40cc93e1"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/repo/repo-ex07-repo-triparty-float-rate.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/repo/repo-ex07-repo-triparty-float-rate.json
index e05ac04731..00b8dfdf94 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/repo/repo-ex07-repo-triparty-float-rate.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/repo/repo-ex07-repo-triparty-float-rate.json
@@ -1,94 +1,91 @@
 {
-  "meta" : {
-    "globalKey" : "88c7a9c5"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "88c7a9c5"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "PartyA",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "PartyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345678",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partya.com"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "PartyB",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "9e01e469"
+      }
     }, {
-      "meta" : {
-        "externalKey" : "PartyC",
-        "globalKey" : "e5fac6a0"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "PartyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "8745632",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "TriParty Agent"
-        },
-        "meta" : {
-          "globalKey" : "e5fac6a0"
+            "scheme" : "http://www.partyb.com"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "218799"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2012-08-05",
+      "meta" : {
+        "globalKey" : "3ee205"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "PartyB",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "PartyA",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2012-08-05",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -97,26 +94,23 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "212500d8"
                         }
                       },
                       "meta" : {
                         "globalKey" : "476b99f3"
-                      },
-                      "unadjustedDate" : "2012-08-05"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "476b99f3"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "e3e49203"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2012-11-08",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -125,79 +119,37 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "212500d8"
                         }
                       },
                       "meta" : {
                         "globalKey" : "942c9b10"
-                      },
-                      "unadjustedDate" : "2012-11-08"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "942c9b10"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e3e49203"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
                 "meta" : {
-                  "globalKey" : "f93ca2fd"
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "7e720523"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "dbfc8b3d"
-              },
               "securityPayout" : [ {
-                "meta" : {
-                  "globalKey" : "ef931c40"
-                },
-                "repoDuration" : "TERM",
                 "securityLeg" : [ {
                   "buyerSeller" : {
-                    "buyer" : "PARTY_1",
-                    "seller" : "PARTY_2"
-                  },
-                  "meta" : {
-                    "globalKey" : "c0a7574b"
-                  },
-                  "settlementAmount" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 250000000,
-                    "meta" : {
-                      "globalKey" : "a8acfbb9"
-                    }
+                    "buyer" : "Party1",
+                    "seller" : "Party2"
                   },
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2012-08-05",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -206,32 +158,42 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "212500d8"
                         }
                       },
                       "meta" : {
                         "globalKey" : "476b99f3"
-                      },
-                      "unadjustedDate" : "2012-08-05"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "476b99f3"
                     }
+                  },
+                  "settlementAmount" : {
+                    "value" : 250000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "a8acfbb9"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "fe882c45"
                   }
                 }, {
                   "buyerSeller" : {
-                    "buyer" : "PARTY_2",
-                    "seller" : "PARTY_1"
+                    "buyer" : "Party2",
+                    "seller" : "Party1"
                   },
-                  "meta" : {
-                    "globalKey" : "a6c8a609"
-                  },
-                  "settlementCurrency" : "USD",
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2012-11-08",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -240,135 +202,173 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "212500d8"
                         }
                       },
                       "meta" : {
                         "globalKey" : "942c9b10"
-                      },
-                      "unadjustedDate" : "2012-11-08"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "942c9b10"
                     }
+                  },
+                  "settlementCurrency" : "USD",
+                  "meta" : {
+                    "globalKey" : "a6c8a609"
                   }
-                } ]
-              } ]
+                } ],
+                "repoDuration" : "Term",
+                "meta" : {
+                  "globalKey" : "caca4a3a"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "6c67035d"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "dbfc8b3d"
+            "globalKey" : "6c67035d"
           }
         },
         "meta" : {
-          "globalKey" : "dbfc8b3d"
+          "globalKey" : "6c67035d"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "95061891"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "f93ffb67"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-Federal Funds-H.15"
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0030,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0030,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 250000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-Federal Funds-H.15"
+                }
               },
-              "value" : 250000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2ebf7179"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "6e31d449"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "PartyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "PartyA"
+        }
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3ee205"
-      },
-      "value" : "2012-08-05"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "PartyA"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partya.com"
-          },
-          "value" : "12345678"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "PartyA",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "13a01dbf"
+        "globalKey" : "33f59568",
+        "externalKey" : "PartyB"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "TriParty Agent",
           "meta" : {
-            "scheme" : "http://www.partyb.com"
-          },
-          "value" : "8745632"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "e5fac6a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "PartyB",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "6aaedc51"
+        "globalKey" : "e5fac6a0",
+        "externalKey" : "PartyC"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "f0ae713b"
+    }
+  },
+  "meta" : {
+    "globalKey" : "f0ae713b"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/repo/repo-ex08-repo-triparty-fixed-rate.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/repo/repo-ex08-repo-triparty-fixed-rate.json
index 18a652a493..e08e5f3fe7 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/repo/repo-ex08-repo-triparty-fixed-rate.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/repo/repo-ex08-repo-triparty-fixed-rate.json
@@ -1,327 +1,327 @@
 {
-  "meta" : {
-    "globalKey" : "5b036050"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "5b036050"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "PartyA",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "PartyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345678",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partya.com"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "PartyB",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "9e01e469"
+      }
     }, {
-      "meta" : {
-        "externalKey" : "PartyC",
-        "globalKey" : "e5fac6a0"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "PartyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "8745632",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "TriParty Agent"
-        },
-        "meta" : {
-          "globalKey" : "e5fac6a0"
+            "scheme" : "http://www.partyb.com"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "218799"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2010-01-09",
+      "meta" : {
+        "globalKey" : "3ed049"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "PartyB",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "PartyA",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2010-01-09",
                       "dateAdjustments" : {
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "meta" : {
                           "globalKey" : "3a4b88ab"
                         }
                       },
                       "meta" : {
                         "globalKey" : "26176ab4"
-                      },
-                      "unadjustedDate" : "2010-01-09"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "26176ab4"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "4b3b80c0"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2010-02-09",
                       "dateAdjustments" : {
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "meta" : {
                           "globalKey" : "3a4b88ab"
                         }
                       },
                       "meta" : {
                         "globalKey" : "26185af4"
-                      },
-                      "unadjustedDate" : "2010-02-09"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "26185af4"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "4b3b80c0"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
                 "meta" : {
-                  "globalKey" : "1b8e6260"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "6d25cbe0"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "7274420d"
-              },
               "securityPayout" : [ {
-                "meta" : {
-                  "globalKey" : "8f7247ad"
-                },
-                "repoDuration" : "TERM",
                 "securityLeg" : [ {
                   "buyerSeller" : {
-                    "buyer" : "PARTY_1",
-                    "seller" : "PARTY_2"
-                  },
-                  "meta" : {
-                    "globalKey" : "22f46d06"
-                  },
-                  "settlementAmount" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 700000000,
-                    "meta" : {
-                      "globalKey" : "e6adb8cf"
-                    }
+                    "buyer" : "Party1",
+                    "seller" : "Party2"
                   },
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2010-01-09",
                       "dateAdjustments" : {
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "meta" : {
                           "globalKey" : "3a4b88ab"
                         }
                       },
                       "meta" : {
                         "globalKey" : "26176ab4"
-                      },
-                      "unadjustedDate" : "2010-01-09"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "26176ab4"
                     }
-                  }
-                }, {
-                  "buyerSeller" : {
-                    "buyer" : "PARTY_2",
-                    "seller" : "PARTY_1"
-                  },
-                  "meta" : {
-                    "globalKey" : "94f13887"
                   },
                   "settlementAmount" : {
+                    "value" : 700000000,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 700036166.67,
                     "meta" : {
-                      "globalKey" : "c762b64c"
+                      "globalKey" : "e6adb8cf"
                     }
                   },
+                  "meta" : {
+                    "globalKey" : "6e4d705c"
+                  }
+                }, {
+                  "buyerSeller" : {
+                    "buyer" : "Party2",
+                    "seller" : "Party1"
+                  },
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2010-02-09",
                       "dateAdjustments" : {
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "meta" : {
                           "globalKey" : "3a4b88ab"
                         }
                       },
                       "meta" : {
                         "globalKey" : "26185af4"
-                      },
-                      "unadjustedDate" : "2010-02-09"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "26185af4"
                     }
+                  },
+                  "settlementAmount" : {
+                    "value" : 700036166.67,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "c762b64c"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "ba1a9837"
                   }
-                } ]
-              } ]
+                } ],
+                "repoDuration" : "Term",
+                "meta" : {
+                  "globalKey" : "dbc13fc7"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "5ca103a7"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "7274420d"
+            "globalKey" : "5ca103a7"
           }
         },
         "meta" : {
-          "globalKey" : "7274420d"
+          "globalKey" : "5ca103a7"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "771c2110"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.00006,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.00006,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 700000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 700000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "6c6800f0"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "PartyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "PartyA"
+        }
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3ed049"
-      },
-      "value" : "2010-01-09"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "PartyA"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partya.com"
-          },
-          "value" : "12345678"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "PartyA",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "13a01dbf"
+        "globalKey" : "33f59568",
+        "externalKey" : "PartyB"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "TriParty Agent",
           "meta" : {
-            "scheme" : "http://www.partyb.com"
-          },
-          "value" : "8745632"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "e5fac6a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "PartyB",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "6aaedc51"
+        "globalKey" : "e5fac6a0",
+        "externalKey" : "PartyC"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "2e415a66"
+    }
+  },
+  "meta" : {
+    "globalKey" : "2e415a66"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/securities/sec-ex001-trade-execution-future.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/securities/sec-ex001-trade-execution-future.json
index 0a53f7d828..16fcc91767 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/securities/sec-ex001-trade-execution-future.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/securities/sec-ex001-trade-execution-future.json
@@ -1,67 +1,67 @@
 {
-  "meta" : {
-    "globalKey" : "c0d7ff5b"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "c0d7ff5b"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+          }
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "95918657"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2012-07-13",
+      "meta" : {
+        "globalKey" : "3ee1cd",
+        "externalKey" : "TradeDate"
+      }
     },
     "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
+          }
         },
         "meta" : {
           "globalKey" : "33f59567"
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "exchange",
-        "globalKey" : "5eea62d5"
-      },
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "Exchange 123",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Exchange 123"
+          }
         },
         "meta" : {
           "globalKey" : "5eea62d5"
         }
-      } ]
-    } ],
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3ee1cd"
-      },
-      "value" : "2012-07-13"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.PartyA.com/eqd-trade-id"
-          },
-          "value" : "1234"
-        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "5eea62d5",
+        "externalKey" : "exchange"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "98acbf65"
+    }
+  },
+  "meta" : {
+    "globalKey" : "98acbf65"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/securities/sec-ex002-trade-execution-exchange-traded-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/securities/sec-ex002-trade-execution-exchange-traded-option.json
index 0a53f7d828..16fcc91767 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/securities/sec-ex002-trade-execution-exchange-traded-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/securities/sec-ex002-trade-execution-exchange-traded-option.json
@@ -1,67 +1,67 @@
 {
-  "meta" : {
-    "globalKey" : "c0d7ff5b"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "c0d7ff5b"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+          }
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "95918657"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2012-07-13",
+      "meta" : {
+        "globalKey" : "3ee1cd",
+        "externalKey" : "TradeDate"
+      }
     },
     "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
+          }
         },
         "meta" : {
           "globalKey" : "33f59567"
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "exchange",
-        "globalKey" : "5eea62d5"
-      },
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "Exchange 123",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Exchange 123"
+          }
         },
         "meta" : {
           "globalKey" : "5eea62d5"
         }
-      } ]
-    } ],
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3ee1cd"
-      },
-      "value" : "2012-07-13"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.PartyA.com/eqd-trade-id"
-          },
-          "value" : "1234"
-        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "5eea62d5",
+        "externalKey" : "exchange"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "98acbf65"
+    }
+  },
+  "meta" : {
+    "globalKey" : "98acbf65"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/AdditionalFixedPayments_mortgages.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/AdditionalFixedPayments_mortgages.json
index b4cb4efda3..96d4c6c866 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/AdditionalFixedPayments_mortgages.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/AdditionalFixedPayments_mortgages.json
@@ -1,112 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "3675dfd2"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "b2724407"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "8f4dd58"
-      }
-    },
-    "meta" : {
-      "globalKey" : "3675dfd2"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "gf4t5",
-        "globalKey" : "a9fe6e32"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "63b2e9b8",
+        "externalReference" : "yt67d"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56ERT7RHWE4",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "XYZBICXXX"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         },
-        "meta" : {
-          "globalKey" : "2283edb5"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "yt67d",
-        "globalKey" : "9ca2e804"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "ABCBICXXX"
-        },
-        "meta" : {
-          "globalKey" : "ba7399be"
-        }
-      } ]
+        "globalKey" : "7c1be68"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-10-05",
+      "meta" : {
+        "globalKey" : "3eb285"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "gf4t5",
-          "globalReference" : "a9fe6e32"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "yt67d",
-          "globalReference" : "9ca2e804"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "gf4t5",
-          "globalReference" : "a9fe6e32"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -114,31 +32,38 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-10-11",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "42f910b"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "da556d3a"
+                  }
+                },
                 "meta" : {
-                  "globalKey" : "42f910b"
+                  "globalKey" : "b0cdd84f"
                 }
               },
-              "businessDayConvention" : "FOLLOWING",
               "meta" : {
-                "globalKey" : "da556d3a"
+                "globalKey" : "b0cdd84f"
               }
             },
-            "effectiveDate" : {
+            "terminationDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2035-09-25",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "GBLO"
@@ -149,67 +74,142 @@
                       "globalKey" : "42f910b"
                     }
                   },
-                  "businessDayConvention" : "FOLLOWING",
                   "meta" : {
                     "globalKey" : "da556d3a"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "b0cdd84f"
-                },
-                "unadjustedDate" : "2006-10-11"
+                  "globalKey" : "777d2cc1"
+                }
               },
               "meta" : {
-                "globalKey" : "b0cdd84f"
+                "globalKey" : "777d2cc1"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da556d3a"
               }
             },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "177d3"
+                    },
+                    "rollConvention" : "11"
                   },
+                  "meta" : {
+                    "globalKey" : "177d3"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "firstPaymentDate" : "2006-11-01",
+                  "lastRegularPaymentDate" : "2035-06-01",
+                  "meta" : {
+                    "globalKey" : "715dd58c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3e124220"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "c124120"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "c004ba0"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 5
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "43d51263"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 5
+                      "globalKey" : "43c31ce3"
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
-                    "allGuarantees" : true,
                     "referenceEntity" : {
-                      "meta" : {
-                        "globalKey" : "5df00e1c"
-                      },
                       "name" : {
                         "value" : "New Century Home Equity Loan Trust 2005-4"
+                      },
+                      "meta" : {
+                        "globalKey" : "5df00e1c"
                       }
                     },
                     "referenceObligation" : [ {
@@ -217,285 +217,285 @@
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "64352VNC1",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                              },
-                              "value" : "64352VNC1"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "b56573a0"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
+                              "value" : "NCHET 2005-4",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-Bloomberg-1-0"
-                              },
-                              "value" : "NCHET 2005-4"
+                              }
                             },
+                            "source" : "BBGID",
                             "meta" : {
                               "globalKey" : "1dd2314a"
-                            },
-                            "source" : "BBGID"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
                       }
                     } ],
+                    "allGuarantees" : true,
                     "referencePrice" : {
+                      "value" : 0.26,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.26,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "58e44ec6"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2" ]
-                    },
-                    "distressedRatingsDowngrade" : true,
-                    "failureToPayInterest" : true,
                     "failureToPayPrincipal" : true,
-                    "impliedWritedown" : true,
+                    "failureToPayInterest" : true,
+                    "distressedRatingsDowngrade" : true,
                     "maturityExtension" : true,
+                    "writedown" : true,
+                    "impliedWritedown" : true,
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2" ]
+                    },
                     "meta" : {
                       "globalKey" : "59089299"
-                    },
-                    "writedown" : true
+                    }
+                  },
+                  "obligations" : {
+                    "category" : "BondOrLoan"
                   },
                   "floatingAmountEvents" : {
-                    "additionalFixedPayments" : {
-                      "interestShortfallReimbursement" : true,
-                      "principalShortfallReimbursement" : true
-                    },
                     "failureToPayPrincipal" : true,
-                    "floatingAmountProvisions" : {
-                      "stepUpProvision" : true
-                    },
-                    "impliedWritedown" : false,
                     "interestShortfall" : {
+                      "interestShortfallCap" : "Fixed",
                       "compounding" : false,
-                      "interestShortfallCap" : "FIXED",
                       "rateSource" : {
                         "value" : "USD-LIBOR-BBA"
                       }
                     },
-                    "writedown" : true
-                  },
-                  "meta" : {
-                    "globalKey" : "2eed4993"
-                  },
-                  "obligations" : {
-                    "category" : "BOND_OR_LOAN"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28beb"
+                    "writedown" : true,
+                    "impliedWritedown" : false,
+                    "floatingAmountProvisions" : {
+                      "stepUpProvision" : true
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "11"
+                    "additionalFixedPayments" : {
+                      "interestShortfallReimbursement" : true,
+                      "principalShortfallReimbursement" : true
+                    }
                   },
                   "meta" : {
-                    "globalKey" : "28beb"
+                    "globalKey" : "4c6fc51d"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "8edc2882"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2006-11-01",
-                  "lastRegularPaymentDate" : "2035-06-01",
-                  "meta" : {
-                    "globalKey" : "715dde74"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "6d53f4d0"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "99f4e7fc"
+                "globalKey" : "af7706b0"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "42f910b"
-                    }
-                  },
-                  "businessDayConvention" : "FOLLOWING",
-                  "meta" : {
-                    "globalKey" : "da556d3a"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "777d2cc1"
-                },
-                "unadjustedDate" : "2035-09-25"
-              },
-              "meta" : {
-                "globalKey" : "777d2cc1"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "653797e7"
+            "globalKey" : "ed2b9559"
           }
         },
         "meta" : {
-          "globalKey" : "653797e7"
+          "globalKey" : "ed2b9559"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a3617a4e"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.050,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.050,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 15000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 15000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "99d719c2"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c8cdcf72"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 15000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 15000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a10c1e7e"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "63b2e9b8",
+          "externalReference" : "yt67d"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4627ed18",
+          "externalReference" : "gf4t5"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "4627ed18",
+          "externalReference" : "gf4t5"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb285"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "XYZBICXXX",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
+        },
+        "meta" : {
+          "globalKey" : "2283edb5"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2006-10-05"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "4627ed18",
+        "externalKey" : "gf4t5"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABCBICXXX",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "56ERT7RHWE4"
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "ba7399be"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "yt67d",
-        "globalReference" : "9ca2e804"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "d20b7a68"
+        "globalKey" : "63b2e9b8",
+        "externalKey" : "yt67d"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "e9431741"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "3fc5b092"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "55499a0e"
+    }
+  },
+  "meta" : {
+    "globalKey" : "55499a0e"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/BasketReferenceInformation_nameOrId.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/BasketReferenceInformation_nameOrId.json
index 067d8b0d54..9e5aee3fee 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/BasketReferenceInformation_nameOrId.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/BasketReferenceInformation_nameOrId.json
@@ -1,94 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "b666430e"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "b2724407"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "b2724407"
-      }
-    },
-    "meta" : {
-      "globalKey" : "b666430e"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "tif563d",
-        "globalKey" : "8e367ee2"
-      },
-      "name" : {
-        "value" : "Morgan Stanley Capital Services"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "5e741913",
+        "externalReference" : "fyure4"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DJITRAXXUSDMS5Y",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "MSCSBIC"
+            "scheme" : "http://www.barclaysglobal.com/partners/schema/v1-1/schemes/tradeID"
+          }
         },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "7e7d2a62"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "fyure4",
-        "globalKey" : "63225693"
-      },
-      "name" : {
-        "value" : "Barclays Global Investors"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "BGIBIC"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "786ec794"
-        }
-      } ]
+        "globalKey" : "5a184390"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2004-01-24",
+      "meta" : {
+        "globalKey" : "3ea058"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "tif563d",
-          "globalReference" : "8e367ee2"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "fyure4",
-          "globalReference" : "63225693"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -98,6 +34,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2004-03-23",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -106,128 +43,182 @@
                 },
                 "meta" : {
                   "globalKey" : "eb3e6e4f"
-                },
-                "unadjustedDate" : "2004-03-23"
+                }
               },
               "meta" : {
                 "globalKey" : "eb3e6e4f"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-03-20",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ebd48b0c"
+                }
+              },
+              "meta" : {
+                "globalKey" : "ebd48b0c"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
-                  },
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/ACT.ISDA"
+                },
+                "meta" : {
+                  "globalKey" : "28d6c3e0"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "generalTerms" : {
                   "basketReferenceInformation" : {
                     "referencePool" : {
                       "referencePoolItem" : [ {
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "008HA7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                              },
-                              "value" : "008HA7"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "r65hfd",
-                              "globalKey" : "6b99b4c1"
-                            },
                             "name" : {
                               "value" : "Agrium Inc."
+                            },
+                            "meta" : {
+                              "globalKey" : "6b99b4c1",
+                              "externalKey" : "r65hfd"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "r65hfd",
-                              "globalReference" : "6b99b4c1"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "008916AB4",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                                    },
-                                    "value" : "008916AB4"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "ab7bdc95"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "6b99b4c1",
+                              "externalReference" : "r65hfd"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
                         }
                       }, {
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "8G836J",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                              },
-                              "value" : "8G836J"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "uiyn4",
-                              "globalKey" : "92cc27"
-                            },
                             "name" : {
                               "value" : "Tenet Healthcare Corporation"
+                            },
+                            "meta" : {
+                              "globalKey" : "92cc27",
+                              "externalKey" : "uiyn4"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "uiyn4",
-                              "globalReference" : "92cc27"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "88033GAT7",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                                    },
-                                    "value" : "88033GAT7"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "db5db955"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "92cc27",
+                              "externalReference" : "uiyn4"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
                         }
                       } ]
@@ -238,212 +229,221 @@
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "ac366dfb"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "gracePeriodExtension" : {
                         "applicable" : true,
                         "gracePeriod" : {
-                          "meta" : {
-                            "globalKey" : "83c"
-                          },
+                          "periodMultiplier" : 0,
                           "period" : "D",
-                          "periodMultiplier" : 0
+                          "meta" : {
+                            "globalKey" : "44"
+                          }
                         }
                       },
                       "paymentRequirement" : {
+                        "value" : 1000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "GBP"
                           }
                         },
-                        "value" : 1000000.00,
                         "meta" : {
                           "globalKey" : "48eae7c4"
                         }
                       }
                     },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "d7154083"
+                      "globalKey" : "f8d2401"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "969cb413"
-                  },
                   "obligations" : {
-                    "category" : "BOND_OR_LOAN"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
+                    "category" : "BondOrLoan"
                   },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/ACT.ISDA"
-                },
-                "meta" : {
-                  "globalKey" : "e55fc83e"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "a26d3879"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "90a9b011"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "ebd48b0c"
-                },
-                "unadjustedDate" : "2009-03-20"
+                  "globalKey" : "17244939"
+                }
               },
               "meta" : {
-                "globalKey" : "ebd48b0c"
+                "globalKey" : "fe053d19"
               }
             }
           },
           "meta" : {
-            "globalKey" : "7743b002"
+            "globalKey" : "9405e5c"
           }
         },
         "meta" : {
-          "globalKey" : "7743b002"
+          "globalKey" : "9405e5c"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3a43e344"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0060,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0060,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e38853c"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "da73ae62",
+          "externalReference" : "tif563d"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "5e741913",
+          "externalReference" : "fyure4"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea058"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "MSCSBIC",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "7e7d2a62"
+        }
+      } ],
+      "name" : {
+        "value" : "Morgan Stanley Capital Services"
       },
-      "value" : "2004-01-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "da73ae62",
+        "externalKey" : "tif563d"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BGIBIC",
           "meta" : {
-            "scheme" : "http://www.barclaysglobal.com/partners/schema/v1-1/schemes/tradeID"
-          },
-          "value" : "DJITRAXXUSDMS5Y"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
         },
-        "version" : 1
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "786ec794"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "fyure4",
-        "globalReference" : "63225693"
+      "name" : {
+        "value" : "Barclays Global Investors"
       },
       "meta" : {
-        "globalKey" : "127eb2d0"
+        "globalKey" : "5e741913",
+        "externalKey" : "fyure4"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "e9431741"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "e9431741"
+      }
+    },
+    "meta" : {
+      "globalKey" : "a1fa4c42"
+    }
+  },
+  "meta" : {
+    "globalKey" : "a1fa4c42"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/BasketReferenceInformation_nthToDefault_mthToDefault.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/BasketReferenceInformation_nthToDefault_mthToDefault.json
index 74bd719c59..5eddfc16b4 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/BasketReferenceInformation_nthToDefault_mthToDefault.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/BasketReferenceInformation_nthToDefault_mthToDefault.json
@@ -1,92 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "a9acaa5e"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "b2724407"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "b2724407"
-      }
-    },
-    "meta" : {
-      "globalKey" : "a9acaa5e"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "tif563d",
-        "globalKey" : "9c430c06"
-      },
-      "name" : {
-        "value" : "Morgan Stanley Capital Services"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "3ad6e637",
+        "externalReference" : "fyure4"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DJITRAXXUSDMS5Y",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "MSCSBIC"
+            "scheme" : "http://www.barclaysglobal.com/partners/schema/v1-1/schemes/tradeID"
+          }
         },
-        "meta" : {
-          "globalKey" : "7ab8f086"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "fyure4",
-        "globalKey" : "efd9a2d9"
-      },
-      "name" : {
-        "value" : "Barclays Global Investors"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "BGIBIC"
-        },
-        "meta" : {
-          "globalKey" : "74aa8db8"
-        }
-      } ]
+        "globalKey" : "5a184390"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2004-01-24",
+      "meta" : {
+        "globalKey" : "3ea058"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "tif563d",
-          "globalReference" : "9c430c06"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "fyure4",
-          "globalReference" : "efd9a2d9"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -96,6 +34,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2004-03-23",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -104,354 +43,415 @@
                 },
                 "meta" : {
                   "globalKey" : "eb3e6e4f"
-                },
-                "unadjustedDate" : "2004-03-23"
+                }
               },
               "meta" : {
                 "globalKey" : "eb3e6e4f"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-03-20",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ebd48b0c"
+                }
+              },
+              "meta" : {
+                "globalKey" : "ebd48b0c"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
-                  },
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/ACT.ISDA"
+                },
+                "meta" : {
+                  "globalKey" : "28d6c3e0"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "generalTerms" : {
                   "basketReferenceInformation" : {
-                    "basketId" : [ {
-                      "meta" : {
-                        "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
-                      },
-                      "value" : "BASKET089"
-                    } ],
                     "basketName" : {
+                      "value" : "CDS Basket Sample",
                       "meta" : {
                         "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
-                      },
-                      "value" : "CDS Basket Sample"
+                      }
                     },
-                    "mthToDefault" : 1,
-                    "nthToDefault" : 2,
+                    "basketId" : [ {
+                      "value" : "BASKET089",
+                      "meta" : {
+                        "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
+                      }
+                    } ],
                     "referencePool" : {
                       "referencePoolItem" : [ {
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "008HA7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                              },
-                              "value" : "008HA7"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "r65hfd",
-                              "globalKey" : "6b99b4c1"
-                            },
                             "name" : {
                               "value" : "Agrium Inc."
+                            },
+                            "meta" : {
+                              "globalKey" : "6b99b4c1",
+                              "externalKey" : "r65hfd"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "r65hfd",
-                              "globalReference" : "6b99b4c1"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "008916AB4",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                                    },
-                                    "value" : "008916AB4"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "ab7bdc95"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "6b99b4c1",
+                              "externalReference" : "r65hfd"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
                         }
                       }, {
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "8G836J",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                              },
-                              "value" : "8G836J"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "uiyn4",
-                              "globalKey" : "92cc27"
-                            },
                             "name" : {
                               "value" : "Tenet Healthcare Corporation"
+                            },
+                            "meta" : {
+                              "globalKey" : "92cc27",
+                              "externalKey" : "uiyn4"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "uiyn4",
-                              "globalReference" : "92cc27"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "88033GAT7",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                                    },
-                                    "value" : "88033GAT7"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "db5db955"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "92cc27",
+                              "externalReference" : "uiyn4"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
                         }
                       } ]
-                    }
+                    },
+                    "nthToDefault" : 2,
+                    "mthToDefault" : 1
                   }
                 },
-                "meta" : {
-                  "globalKey" : "747749c9"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "gracePeriodExtension" : {
                         "applicable" : true,
                         "gracePeriod" : {
-                          "meta" : {
-                            "globalKey" : "83c"
-                          },
+                          "periodMultiplier" : 0,
                           "period" : "D",
-                          "periodMultiplier" : 0
+                          "meta" : {
+                            "globalKey" : "44"
+                          }
                         }
                       },
                       "paymentRequirement" : {
+                        "value" : 1000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "GBP"
                           }
                         },
-                        "value" : 1000000.00,
                         "meta" : {
                           "globalKey" : "48eae7c4"
                         }
                       }
                     },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "d7154083"
+                      "globalKey" : "f8d2401"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "969cb413"
-                  },
                   "obligations" : {
-                    "category" : "BOND_OR_LOAN"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
+                    "category" : "BondOrLoan"
                   },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/ACT.ISDA"
-                },
-                "meta" : {
-                  "globalKey" : "e55fc83e"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "8fa02ac7"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "90a9b011"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "ebd48b0c"
-                },
-                "unadjustedDate" : "2009-03-20"
+                  "globalKey" : "3e702865"
+                }
               },
               "meta" : {
-                "globalKey" : "ebd48b0c"
+                "globalKey" : "da6c2885"
               }
             }
           },
           "meta" : {
-            "globalKey" : "48438476"
+            "globalKey" : "d06fdc62"
           }
         },
         "meta" : {
-          "globalKey" : "48438476"
+          "globalKey" : "d06fdc62"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3a43e344"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0060,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0060,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e38853c"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "b6d67b86",
+          "externalReference" : "tif563d"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "3ad6e637",
+          "externalReference" : "fyure4"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea058"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "MSCSBIC",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
+        },
+        "meta" : {
+          "globalKey" : "7ab8f086"
+        }
+      } ],
+      "name" : {
+        "value" : "Morgan Stanley Capital Services"
       },
-      "value" : "2004-01-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "b6d67b86",
+        "externalKey" : "tif563d"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BGIBIC",
           "meta" : {
-            "scheme" : "http://www.barclaysglobal.com/partners/schema/v1-1/schemes/tradeID"
-          },
-          "value" : "DJITRAXXUSDMS5Y"
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "74aa8db8"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "fyure4",
-        "globalReference" : "efd9a2d9"
+      "name" : {
+        "value" : "Barclays Global Investors"
       },
       "meta" : {
-        "globalKey" : "127eb2d0"
+        "globalKey" : "3ad6e637",
+        "externalKey" : "fyure4"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "e9431741"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "e9431741"
+      }
+    },
+    "meta" : {
+      "globalKey" : "7c63b160"
+    }
+  },
+  "meta" : {
+    "globalKey" : "7c63b160"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/CalculationPeriodDates_firstCompoundingPeriodEndDate.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/CalculationPeriodDates_firstCompoundingPeriodEndDate.json
index fdd74de6fa..96bb1144c9 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/CalculationPeriodDates_firstCompoundingPeriodEndDate.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/CalculationPeriodDates_firstCompoundingPeriodEndDate.json
@@ -1,174 +1,107 @@
 {
-  "meta" : {
-    "globalKey" : "73fdc314"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-              },
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "6b413360"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "bd492439"
-      }
-    },
-    "meta" : {
-      "globalKey" : "73fdc314"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "27b20a6a"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "27b20a6a",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "LCH00023444650",
           "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
-          },
-          "value" : "COUNTERPARTY"
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/trade-id"
+          }
         },
-        "meta" : {
-          "globalKey" : "27b20a6a"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "cc892602"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
-          },
-          "value" : "LCHLGB22XXX"
-        },
-        "meta" : {
-          "globalKey" : "cc892602"
-        }
-      } ]
+        "globalKey" : "72f3b0c9"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2018-01-26",
+      "meta" : {
+        "globalKey" : "3f105a"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "27b20a6a"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "cc892602"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
-          "productIdentifier" : [ {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:OIS"
-              },
-              "meta" : {
-                "globalKey" : "d75a34bb"
-              },
-              "source" : "OTHER"
-            }
-          } ],
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
+              "value" : "InterestRate",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-              },
-              "value" : "INTEREST_RATE"
+              }
             }
           }, {
             "source" : "ISDA",
             "value" : {
               "name" : {
+                "value" : "InterestRate:IRSwap:OIS",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:OIS"
+                }
               }
             }
           }, {
             "source" : "ISDA",
             "productQualifier" : "InterestRate_IRSwap_FixedFloat_OIS"
           } ],
+          "productIdentifier" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "InterestRate:IRSwap:OIS",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                }
+              },
+              "source" : "Other",
+              "meta" : {
+                "globalKey" : "d75a34bb"
+              }
+            }
+          } ],
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "159f0"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "7"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-03-12",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -177,23 +110,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ece2b504"
-                      },
-                      "unadjustedDate" : "2018-03-12"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ece2b504"
                     }
                   },
-                  "firstCompoundingPeriodEndDate" : "2018-10-12",
-                  "firstRegularPeriodStartDate" : "2018-10-07",
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates1",
-                    "globalKey" : "435a1853"
-                  },
-                  "stubPeriodType" : "SHORT_INITIAL",
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2022-10-07",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -202,34 +129,20 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "be29f4c7"
-                      },
-                      "unadjustedDate" : "2022-10-07"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "be29f4c7"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "edcf1c9d"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates1",
-                    "globalKey" : "425092f1"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -238,83 +151,101 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf23"
-                    },
-                    "period" : "D",
+                  "firstRegularPeriodStartDate" : "2018-10-07",
+                  "firstCompoundingPeriodEndDate" : "2018-10-12",
+                  "stubPeriodType" : "ShortInitial",
+                  "calculationPeriodFrequency" : {
                     "periodMultiplier" : 1,
-                    "dayType" : "BUSINESS"
-                  },
-                  "paymentFrequency" : {
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "1a40"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "7"
+                  },
+                  "meta" : {
+                    "globalKey" : "775a6dbf",
+                    "externalKey" : "fixedCalcPeriodDates1"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 1,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4abbbd"
                     },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f5f4a4b3",
+                    "externalKey" : "paymentDates1"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "bdc22653"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "159f0"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "7"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-03-12",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -323,22 +254,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ece2b504"
-                      },
-                      "unadjustedDate" : "2018-03-12"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ece2b504"
                     }
                   },
-                  "firstRegularPeriodStartDate" : "2018-10-07",
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates2",
-                    "globalKey" : "a046e9c7"
-                  },
-                  "stubPeriodType" : "SHORT_INITIAL",
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2022-10-07",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -347,34 +273,20 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "be29f4c7"
-                      },
-                      "unadjustedDate" : "2022-10-07"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "be29f4c7"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "99a12092"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates2",
-                    "globalKey" : "425092f1"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -383,51 +295,74 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf23"
-                    },
-                    "period" : "D",
+                  "firstRegularPeriodStartDate" : "2018-10-07",
+                  "stubPeriodType" : "ShortInitial",
+                  "calculationPeriodFrequency" : {
                     "periodMultiplier" : 1,
-                    "dayType" : "BUSINESS"
-                  },
-                  "paymentFrequency" : {
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "1a40"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "7"
+                  },
+                  "meta" : {
+                    "globalKey" : "7d30f5dd",
+                    "externalKey" : "floatingCalcPeriodDates2"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 1,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4abbbd"
                     },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f5f4a4b3",
+                    "externalKey" : "paymentDates2"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates2",
-                    "globalReference" : "a046e9c7"
+                    "globalReference" : "7d30f5dd",
+                    "externalReference" : "floatingCalcPeriodDates2"
                   },
+                  "resetRelativeTo" : "CalculationPeriodEndDate",
                   "fixingDates" : {
+                    "periodMultiplier" : 0,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "4032f4d2"
+                      "globalKey" : "b58ac6da"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 0,
+                    "businessDayConvention" : "PRECEDING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -436,17 +371,20 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "PRECEDING",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates2",
-                      "globalReference" : "6193de69"
+                      "globalReference" : "a2c60ccd",
+                      "externalReference" : "resetDates2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates2",
-                    "globalKey" : "6193de69"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -455,141 +393,203 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                  "meta" : {
+                    "globalKey" : "a2c60ccd",
+                    "externalKey" : "resetDates2"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "9b68909e"
                 }
               } ],
               "meta" : {
-                "globalKey" : "faa73eaf"
+                "globalKey" : "f0e93d71"
               }
             }
           },
           "meta" : {
-            "globalKey" : "741f57db"
+            "globalKey" : "20d8baef"
           }
         },
         "meta" : {
-          "globalKey" : "741f57db"
+          "globalKey" : "20d8baef"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "daa2b7f0"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0004568,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.0004568,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 34900000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "79b44610"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 34900000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 34900000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "3fbbb2b9"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "23c05191"
-            },
             "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EONIA-OIS-COMPOUND"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "rateOption-1"
                 } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EONIA-OIS-COMPOUND"
-                }
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 34900000
+            "meta" : {
+              "globalKey" : "5449e08f"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "b9759be5"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "27b20a6a",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "cc892602",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "COUNTERPARTY",
+          "meta" : {
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "27b20a6a"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3f105a"
-      },
-      "value" : "2018-01-26"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "27b20a6a",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "LCHLGB22XXX",
           "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/trade-id"
-          },
-          "value" : "LCH00023444650"
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "cc892602"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "cc892602",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+              }
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "27b20a6a"
-      },
       "meta" : {
-        "globalKey" : "4fdf96c9"
+        "globalKey" : "bd492439"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "6ffe784"
+    }
+  },
+  "meta" : {
+    "globalKey" : "6ffe784"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/CalculationPeriod_choice4.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/CalculationPeriod_choice4.json
index 3913d13851..d18176ff0e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/CalculationPeriod_choice4.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/CalculationPeriod_choice4.json
@@ -1,61 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "a3563c16"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "a3563c16"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "c96f9f72"
-      },
-      "name" : {
-        "value" : "Party A"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "70f86d60",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "TW9235",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "PARTYAUS33"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         },
-        "meta" : {
-          "globalKey" : "399a8239"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c6416b25"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "BARCGB2L"
-        },
-        "meta" : {
-          "globalKey" : "c6416b25"
-        }
-      } ]
+        "globalKey" : "ae11048a"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "1994-12-12",
+      "meta" : {
+        "globalKey" : "3e530c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "c96f9f72"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c6416b25"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -66,46 +35,40 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c89"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1995-01-16",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -114,43 +77,148 @@
                       },
                       "meta" : {
                         "globalKey" : "ea2e2b88"
-                      },
-                      "unadjustedDate" : "1995-01-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea2e2b88"
                     }
                   },
-                  "firstRegularPeriodStartDate" : "1995-06-14",
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "9c21ca90"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "DEFR"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "1ff50d"
+                            "globalKey" : "1ff50d",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365af8de"
                         }
                       },
                       "meta" : {
                         "globalKey" : "a8d53690"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "a8d53690"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "firstRegularPeriodStartDate" : "1995-06-14",
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18a9b"
+                    },
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "6d5c05e",
+                    "externalKey" : "floatingCalcPeriodDates"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "firstPaymentDate" : "1995-06-14",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "e89777b2"
+                  }
+                },
+                "resetDates" : {
+                  "calculationPeriodDatesReference" : {
+                    "globalReference" : "6d5c05e",
+                    "externalReference" : "floatingCalcPeriodDates"
+                  },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
+                  "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "eff6d356"
+                    },
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
+                      }
+                    },
+                    "dateRelativeTo" : {
+                      "globalReference" : "a5aeeeb8",
+                      "externalReference" : "resetDates"
+                    }
+                  },
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "a5aeeeb8",
+                    "externalKey" : "resetDates"
                   }
                 },
                 "cashflowRepresentation" : {
@@ -158,397 +226,294 @@
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "1995-06-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1995-06-14",
                       "adjustedStartDate" : "1995-01-16",
+                      "adjustedEndDate" : "1995-06-14",
                       "meta" : {
-                        "globalKey" : "819dfacb"
+                        "globalKey" : "a06f709f"
                       },
+                      "unadjustedEndDate" : "1995-06-15",
+                      "notionalAmount" : 50000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1995-01-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78cb135"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 50000000.00,
-                      "unadjustedEndDate" : "1995-06-15"
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "f03080fd"
+                      "globalKey" : "f01f6d1"
                     }
                   }, {
                     "adjustedPaymentDate" : "1995-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1995-12-14",
                       "adjustedStartDate" : "1995-06-14",
+                      "adjustedEndDate" : "1995-12-14",
                       "meta" : {
-                        "globalKey" : "3c46f290"
+                        "globalKey" : "7232ff90"
                       },
+                      "notionalAmount" : 50000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1995-06-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78cd7f5"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 50000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "8db85f9e"
+                      "globalKey" : "c3a46c9e"
                     }
                   }, {
                     "adjustedPaymentDate" : "1996-06-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1996-06-14",
                       "adjustedStartDate" : "1995-12-14",
+                      "adjustedEndDate" : "1996-06-14",
                       "meta" : {
-                        "globalKey" : "9c5b90b1"
+                        "globalKey" : "db5a73b1"
                       },
+                      "notionalAmount" : 40000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1995-12-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78d0675"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 40000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "aa9e843f"
+                      "globalKey" : "e99d673f"
                     }
                   }, {
                     "adjustedPaymentDate" : "1996-12-16",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1996-12-16",
                       "adjustedStartDate" : "1996-06-14",
+                      "adjustedEndDate" : "1996-12-16",
                       "meta" : {
-                        "globalKey" : "7701bbb3"
+                        "globalKey" : "468b036f"
                       },
+                      "notionalAmount" : 40000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1996-06-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78dcff5"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 40000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "14740ec3"
+                      "globalKey" : "e3fd567f"
                     }
                   }, {
                     "adjustedPaymentDate" : "1997-06-16",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1997-06-16",
                       "adjustedStartDate" : "1996-12-16",
+                      "adjustedEndDate" : "1997-06-16",
                       "meta" : {
-                        "globalKey" : "da800b12"
+                        "globalKey" : "197eee12"
                       },
+                      "notionalAmount" : 30000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1996-12-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78dfe75"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 30000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "34c3e4a2"
+                      "globalKey" : "73c2c7a2"
                     }
                   }, {
                     "adjustedPaymentDate" : "1997-12-15",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1997-12-15",
                       "adjustedStartDate" : "1997-06-16",
+                      "adjustedEndDate" : "1997-12-15",
                       "meta" : {
-                        "globalKey" : "16738451"
+                        "globalKey" : "7f90f3f3"
                       },
+                      "notionalAmount" : 30000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1997-06-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78ec7f5"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 30000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "43197060"
+                      "globalKey" : "ac36e002"
                     }
                   }, {
                     "adjustedPaymentDate" : "1998-06-15",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1998-06-15",
                       "adjustedStartDate" : "1997-12-15",
+                      "adjustedEndDate" : "1998-06-15",
                       "meta" : {
-                        "globalKey" : "74d349b4"
+                        "globalKey" : "b3d22cb4"
                       },
+                      "notionalAmount" : 20000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1997-12-11",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78ef656"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 20000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "5e4abc43"
+                      "globalKey" : "9d499f43"
                     }
                   }, {
                     "adjustedPaymentDate" : "1998-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1998-12-14",
                       "adjustedStartDate" : "1998-06-15",
+                      "adjustedEndDate" : "1998-12-14",
                       "meta" : {
-                        "globalKey" : "b0c6c2f3"
+                        "globalKey" : "19e43295"
                       },
+                      "notionalAmount" : 20000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1998-06-11",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78fbfd6"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 20000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "6ca04801"
+                      "globalKey" : "d5bdb7a3"
                     }
                   }, {
                     "adjustedPaymentDate" : "1999-06-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1999-06-14",
                       "adjustedStartDate" : "1998-12-14",
+                      "adjustedEndDate" : "1999-06-14",
                       "meta" : {
-                        "globalKey" : "f268856"
+                        "globalKey" : "4e256b56"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1998-12-10",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78fee37"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "87d193e4"
+                      "globalKey" : "c6d076e4"
                     }
                   }, {
                     "adjustedPaymentDate" : "1999-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1999-12-14",
                       "adjustedStartDate" : "1999-06-14",
+                      "adjustedEndDate" : "1999-12-14",
                       "meta" : {
-                        "globalKey" : "80003cd6"
+                        "globalKey" : "b5ec49d6"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1999-06-10",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "790b7b7"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "5f51c9e4"
+                      "globalKey" : "953dd6e4"
                     }
                   } ]
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "c57376b"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "1995-06-14",
-                  "meta" : {
-                    "globalKey" : "be36e5f8"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
-                  }
-                },
-                "resetDates" : {
-                  "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "9c21ca90"
-                  },
-                  "fixingDates" : {
-                    "meta" : {
-                      "globalKey" : "131ae8a2"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
-                      }
-                    },
-                    "businessDayConvention" : "NONE",
-                    "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "dbde664a"
-                    }
-                  },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "dbde664a"
-                  },
-                  "resetDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
-                },
-                "stubPeriod" : {
-                  "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "9c21ca90"
+                "stubPeriod" : {
+                  "calculationPeriodDatesReference" : {
+                    "globalReference" : "6d5c05e",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
                   "initialStub" : {
                     "floatingRate" : [ {
                       "floatingRateIndex" : "EUR-LIBOR-BBA",
                       "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "957"
-                        },
+                        "periodMultiplier" : 4,
                         "period" : "M",
-                        "periodMultiplier" : 4
+                        "meta" : {
+                          "globalKey" : "c9"
+                        }
                       }
                     }, {
                       "floatingRateIndex" : "EUR-LIBOR-BBA",
                       "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "958"
-                        },
+                        "periodMultiplier" : 5,
                         "period" : "M",
-                        "periodMultiplier" : 5
+                        "meta" : {
+                          "globalKey" : "e8"
+                        }
                       }
                     } ]
                   }
+                },
+                "meta" : {
+                  "globalKey" : "dd157f9f"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b8fa"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30E/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1995-01-16",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -557,44 +522,95 @@
                       },
                       "meta" : {
                         "globalKey" : "ea2e2b88"
-                      },
-                      "unadjustedDate" : "1995-01-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea2e2b88"
                     }
                   },
-                  "firstRegularPeriodStartDate" : "1995-12-14",
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "af770ad3"
-                  },
-                  "stubPeriodType" : "SHORT_INITIAL",
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "1ff50d"
+                            "globalReference" : "1ff50d",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "93c845ff"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "93c845ff"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "firstRegularPeriodStartDate" : "1995-12-14",
+                  "stubPeriodType" : "ShortInitial",
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "1794a"
+                    },
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "4d906a23",
+                    "externalKey" : "fixedCalcPeriodDates"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
+                  },
+                  "firstPaymentDate" : "1995-12-14",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "62bc2561"
                   }
                 },
                 "cashflowRepresentation" : {
@@ -602,315 +618,299 @@
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "1995-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1995-12-14",
                       "adjustedStartDate" : "1995-01-16",
+                      "adjustedEndDate" : "1995-12-14",
                       "meta" : {
-                        "globalKey" : "696aad9"
+                        "globalKey" : "ad836cc7"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 50000000.00
+                      "notionalAmount" : 50000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "ddfd088b"
+                      "globalKey" : "84e9ca79"
                     }
                   }, {
                     "adjustedPaymentDate" : "1996-12-16",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1996-12-16",
                       "adjustedStartDate" : "1995-12-14",
+                      "adjustedEndDate" : "1996-12-16",
                       "meta" : {
-                        "globalKey" : "a263a9f6"
+                        "globalKey" : "1a9c29ca"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 40000000.00
+                      "notionalAmount" : 40000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "23f8b0e6"
+                      "globalKey" : "9c3130ba"
                     }
                   }, {
                     "adjustedPaymentDate" : "1997-12-15",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1997-12-15",
                       "adjustedStartDate" : "1996-12-16",
+                      "adjustedEndDate" : "1997-12-15",
                       "meta" : {
-                        "globalKey" : "3e43103a"
+                        "globalKey" : "8a199fc6"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 30000000.00
+                      "notionalAmount" : 30000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "64e8368b"
+                      "globalKey" : "b0bec617"
                     }
                   }, {
                     "adjustedPaymentDate" : "1998-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1998-12-14",
                       "adjustedStartDate" : "1997-12-15",
+                      "adjustedEndDate" : "1998-12-14",
                       "meta" : {
-                        "globalKey" : "da226b3b"
+                        "globalKey" : "f995b8a5"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 20000000.00
+                      "notionalAmount" : 20000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "a5d7b0ed"
+                      "globalKey" : "c54afe57"
                     }
                   }, {
                     "adjustedPaymentDate" : "1999-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1999-12-14",
                       "adjustedStartDate" : "1998-12-14",
+                      "adjustedEndDate" : "1999-12-14",
                       "meta" : {
-                        "globalKey" : "76023a9b"
+                        "globalKey" : "6911d545"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 10000000.00
+                      "notionalAmount" : 10000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "e87c784d"
+                      "globalKey" : "db8c12f7"
                     }
                   } ]
                 },
-                "dayCountFraction" : {
-                  "value" : "30E/360"
-                },
                 "meta" : {
-                  "globalKey" : "fa590785"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "1995-12-14",
-                  "meta" : {
-                    "globalKey" : "2c6095e7"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "af7480b5"
                 }
               } ],
               "meta" : {
-                "globalKey" : "a37c8230"
+                "globalKey" : "a03c7e94"
               }
             }
           },
           "meta" : {
-            "globalKey" : "a37c8230"
+            "globalKey" : "a03c7e94"
           }
         },
         "meta" : {
-          "globalKey" : "a37c8230"
+          "globalKey" : "a03c7e94"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "ce4c2099"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "53c66a4c"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
-              }
-            }
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 50000000.00,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "value" : 50000000.00,
               "datedValue" : [ {
                 "date" : "1995-12-14",
+                "value" : 40000000.00,
                 "meta" : {
                   "globalKey" : "6118d22e"
-                },
-                "value" : 40000000.00
+                }
               }, {
                 "date" : "1996-12-14",
+                "value" : 30000000.00,
                 "meta" : {
                   "globalKey" : "f9389d4f"
-                },
-                "value" : 30000000.00
+                }
               }, {
                 "date" : "1997-12-14",
+                "value" : 20000000.00,
                 "meta" : {
                   "globalKey" : "91586870"
-                },
-                "value" : 20000000.00
+                }
               }, {
                 "date" : "1998-12-14",
+                "value" : 10000000.00,
                 "meta" : {
                   "globalKey" : "29783391"
-                },
-                "value" : 10000000.00
+                }
               } ]
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "5187583a"
-          },
-          "price" : [ {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-1"
+                "value" : "quantity-1"
               } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
             },
+            "meta" : {
+              "globalKey" : "2505dd46"
+            }
+          },
+          "meta" : {
+            "globalKey" : "1b0c096b"
+          }
+        }, {
+          "price" : [ {
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "value" : 0.06,
               "perUnitOf" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000.00,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "value" : 50000000.00,
               "datedValue" : [ {
                 "date" : "1995-12-14",
+                "value" : 40000000.00,
                 "meta" : {
                   "globalKey" : "6118d22e"
-                },
-                "value" : 40000000.00
+                }
               }, {
                 "date" : "1996-12-14",
+                "value" : 30000000.00,
                 "meta" : {
                   "globalKey" : "f9389d4f"
-                },
-                "value" : 30000000.00
+                }
               }, {
                 "date" : "1997-12-14",
+                "value" : 20000000.00,
                 "meta" : {
                   "globalKey" : "91586870"
-                },
-                "value" : 20000000.00
+                }
               }, {
                 "date" : "1998-12-14",
+                "value" : 10000000.00,
                 "meta" : {
                   "globalKey" : "29783391"
-                },
-                "value" : 10000000.00
+                }
+              } ]
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
               } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "df63af06"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "70f86d60",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "c6416b25",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e530c"
-      },
-      "value" : "1994-12-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "PARTYAUS33",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "TW9235"
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "399a8239"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "c96f9f72"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "38f6fe4a"
+        "globalKey" : "70f86d60",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "BARCGB2L",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
+        },
+        "meta" : {
+          "globalKey" : "c6416b25"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "c6416b25",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "b501bf0e"
+    }
+  },
+  "meta" : {
+    "globalKey" : "b501bf0e"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/CreditEvents_physicalSettlementMatrix-1.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/CreditEvents_physicalSettlementMatrix-1.json
index 863ef0a17a..ba9faf9167 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/CreditEvents_physicalSettlementMatrix-1.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/CreditEvents_physicalSettlementMatrix-1.json
@@ -1,107 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "67a36aa5"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "955bda07"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "8afb2a56"
-      }
-    },
-    "meta" : {
-      "globalKey" : "67a36aa5"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "fg4rde3",
-        "globalKey" : "a9fe6e32"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "4627ed18",
+        "externalReference" : "fg4rde3"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56ERT7RHWE4",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "XYZBICXXX"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         },
-        "meta" : {
-          "globalKey" : "2283edb5"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "f6g4h5",
-        "globalKey" : "9ca2e804"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "ABCBICXXX"
-        },
-        "meta" : {
-          "globalKey" : "ba7399be"
-        }
-      } ]
+        "globalKey" : "ab644853"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-12-01",
+      "meta" : {
+        "globalKey" : "3eb301"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "fg4rde3",
-          "globalReference" : "a9fe6e32"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "f6g4h5",
-          "globalReference" : "9ca2e804"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "fg4rde3",
-          "globalReference" : "a9fe6e32"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -109,30 +32,26 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-12-02",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
                 "meta" : {
-                  "globalKey" : "42f910b"
+                  "globalKey" : "eb82a1ba"
                 }
               },
-              "businessDayConvention" : "FOLLOWING",
               "meta" : {
-                "globalKey" : "da556d3a"
+                "globalKey" : "eb82a1ba"
               }
             },
-            "effectiveDate" : {
+            "terminationDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2010-03-21",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -140,351 +59,432 @@
                   }
                 },
                 "meta" : {
-                  "globalKey" : "eb82a1ba"
-                },
-                "unadjustedDate" : "2006-12-02"
+                  "globalKey" : "ebf296cd"
+                }
               },
               "meta" : {
-                "globalKey" : "eb82a1ba"
+                "globalKey" : "ebf296cd"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da556d3a"
               }
             },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f73"
+                    },
+                    "rollConvention" : "20"
                   },
+                  "meta" : {
+                    "globalKey" : "17f73"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2007-03-20",
+                  "lastRegularPaymentDate" : "2010-03-20",
+                  "meta" : {
+                    "globalKey" : "6bbdbe2a"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c204893e"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "927fa81e"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "be63b3c4"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 5
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : true,
+                      "notSubordinated" : false,
+                      "specifiedCurrency" : {
+                        "applicable" : false
+                      },
+                      "notSovereignLender" : false,
+                      "notDomesticCurrency" : {
+                        "applicable" : false
+                      },
+                      "notDomesticLaw" : true,
+                      "notContingent" : false,
+                      "notDomesticIssuance" : true,
                       "assignableLoan" : {
                         "applicable" : true
                       },
                       "consentRequiredLoan" : {
                         "applicable" : false
                       },
-                      "fullFaithAndCreditObLiability" : true,
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ac8"
-                        },
+                        "periodMultiplier" : 1,
                         "period" : "Y",
-                        "periodMultiplier" : 1
+                        "meta" : {
+                          "globalKey" : "78"
+                        }
                       },
                       "notBearer" : true,
-                      "notContingent" : false,
-                      "notDomesticCurrency" : {
-                        "applicable" : false
-                      },
-                      "notDomesticIssuance" : true,
-                      "notDomesticLaw" : true,
-                      "notSovereignLender" : false,
-                      "notSubordinated" : false,
-                      "specifiedCurrency" : {
-                        "applicable" : false
-                      },
-                      "transferable" : true
+                      "fullFaithAndCreditObLiability" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "2edc51fb"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 5
+                      "globalKey" : "5ac05da1"
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
-                    "allGuarantees" : false,
-                    "noReferenceObligation" : true,
                     "referenceEntity" : {
-                      "meta" : {
-                        "globalKey" : "444afa68"
-                      },
                       "name" : {
                         "value" : "CompanyDEF"
+                      },
+                      "meta" : {
+                        "globalKey" : "444afa68"
                       }
                     },
+                    "noReferenceObligation" : true,
+                    "allGuarantees" : false,
                     "referencePrice" : {
+                      "value" : 1.0000000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.0000000000,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     },
                     "securedList" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "7ef66a25"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "publicSource" : [ "Standard Public Sources" ],
-                        "specifiedNumber" : 2
+                    "failureToPay" : {
+                      "applicable" : true,
+                      "paymentRequirement" : {
+                        "value" : 500000,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "USD"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "6c32a26b"
+                        }
                       }
                     },
                     "defaultRequirement" : {
+                      "value" : 5000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 5000000,
                       "meta" : {
                         "globalKey" : "1a10e2d1"
                       }
                     },
-                    "failureToPay" : {
-                      "applicable" : true,
-                      "paymentRequirement" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "USD"
-                          }
-                        },
-                        "value" : 500000,
-                        "meta" : {
-                          "globalKey" : "6c32a26b"
-                        }
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "publicSource" : [ "Standard Public Sources" ],
+                        "specifiedNumber" : 2
                       }
                     },
                     "meta" : {
-                      "globalKey" : "8e58f8ea"
+                      "globalKey" : "be0f4df4"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "afce5854"
-                  },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY",
+                    "category" : "BorrowedMoney",
+                    "notSubordinated" : true,
+                    "notSovereignLender" : true,
+                    "notDomesticLaw" : true,
+                    "notDomesticIssuance" : true,
+                    "fullFaithAndCreditObLiability" : true,
+                    "excluded" : "true",
+                    "othReferenceEntityObligations" : "true",
                     "designatedPriority" : {
                       "value" : "FirstLienLoan"
-                    },
-                    "excluded" : "true",
-                    "fullFaithAndCreditObLiability" : true,
-                    "notDomesticIssuance" : true,
-                    "notDomesticLaw" : true,
-                    "notSovereignLender" : true,
-                    "notSubordinated" : true,
-                    "othReferenceEntityObligations" : "true"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
                     }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c47"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "20"
                   },
                   "meta" : {
-                    "globalKey" : "28c47"
+                    "globalKey" : "c0a67a2c"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "b384c8a4"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2007-03-20",
-                  "lastRegularPaymentDate" : "2010-03-20",
-                  "meta" : {
-                    "globalKey" : "6bbdc6d6"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "c781b0ef"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "1ae8979f"
+                "globalKey" : "480cb6ad"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "ebf296cd"
-                },
-                "unadjustedDate" : "2010-03-21"
-              },
-              "meta" : {
-                "globalKey" : "ebf296cd"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "924875db"
+            "globalKey" : "47928d87"
           }
         },
         "meta" : {
-          "globalKey" : "924875db"
+          "globalKey" : "47928d87"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "5a207dbd"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0115,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0115,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e9ef39e3"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "63b2e9b8",
+          "externalReference" : "f6g4h5"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4627ed18",
+          "externalReference" : "fg4rde3"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "4627ed18",
+          "externalReference" : "fg4rde3"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb301"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "XYZBICXXX",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
+        },
+        "meta" : {
+          "globalKey" : "2283edb5"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2006-12-01"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "4627ed18",
+        "externalKey" : "fg4rde3"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABCBICXXX",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "56ERT7RHWE4"
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "ba7399be"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "fg4rde3",
-        "globalReference" : "a9fe6e32"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "91bdb1d3"
+        "globalKey" : "63b2e9b8",
+        "externalKey" : "f6g4h5"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "955bda07"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "8afb2a56"
+      }
+    },
+    "meta" : {
+      "globalKey" : "e6d66ef"
+    }
+  },
+  "meta" : {
+    "globalKey" : "e6d66ef"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/CreditEvents_physicalSettlementMatrix-2.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/CreditEvents_physicalSettlementMatrix-2.json
index 1fa2db9823..a5e1a68c81 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/CreditEvents_physicalSettlementMatrix-2.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/CreditEvents_physicalSettlementMatrix-2.json
@@ -1,112 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "4ece54af"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "c92a48b8"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "1face209"
-      }
-    },
-    "meta" : {
-      "globalKey" : "4ece54af"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "fg4rde3",
-        "globalKey" : "a9fe6e32"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "4627ed18",
+        "externalReference" : "fg4rde3"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56ERT7RHWE4",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "XYZBICXXX"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         },
-        "meta" : {
-          "globalKey" : "2283edb5"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "f6g4h5",
-        "globalKey" : "9ca2e804"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "ABCBICXXX"
-        },
-        "meta" : {
-          "globalKey" : "ba7399be"
-        }
-      } ]
+        "globalKey" : "ab644853"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-12-01",
+      "meta" : {
+        "globalKey" : "3eb301"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "fg4rde3",
-          "globalReference" : "a9fe6e32"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "f6g4h5",
-          "globalReference" : "9ca2e804"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "fg4rde3",
-          "globalReference" : "a9fe6e32"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -114,30 +32,26 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-12-02",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
                 "meta" : {
-                  "globalKey" : "42f910b"
+                  "globalKey" : "eb82a1ba"
                 }
               },
-              "businessDayConvention" : "FOLLOWING",
               "meta" : {
-                "globalKey" : "da556d3a"
+                "globalKey" : "eb82a1ba"
               }
             },
-            "effectiveDate" : {
+            "terminationDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2010-03-21",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -145,317 +59,403 @@
                   }
                 },
                 "meta" : {
-                  "globalKey" : "eb82a1ba"
-                },
-                "unadjustedDate" : "2006-12-02"
+                  "globalKey" : "ebf296cd"
+                }
               },
               "meta" : {
-                "globalKey" : "eb82a1ba"
+                "globalKey" : "ebf296cd"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da556d3a"
               }
             },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f73"
+                    },
+                    "rollConvention" : "20"
                   },
+                  "meta" : {
+                    "globalKey" : "17f73"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2007-03-20",
+                  "lastRegularPaymentDate" : "2010-03-20",
+                  "meta" : {
+                    "globalKey" : "6bbdbe2a"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c204893e"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "19debe7"
                   },
-                  "settlementType" : "PHYSICAL",
                   "physicalSettlementTerms" : {
-                    "meta" : {
-                      "globalKey" : "1e"
-                    },
                     "physicalSettlementPeriod" : {
                       "maximumBusinessDays" : 30
+                    },
+                    "meta" : {
+                      "globalKey" : "1e"
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
-                    "allGuarantees" : false,
-                    "noReferenceObligation" : true,
                     "referenceEntity" : {
-                      "meta" : {
-                        "globalKey" : "444afa68"
-                      },
                       "name" : {
                         "value" : "CompanyDEF"
+                      },
+                      "meta" : {
+                        "globalKey" : "444afa68"
                       }
                     },
+                    "noReferenceObligation" : true,
+                    "allGuarantees" : false,
                     "referencePrice" : {
+                      "value" : 1.0000000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.0000000000,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     },
                     "securedList" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "d5050aee"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "publicSource" : [ "Standard Public Sources" ],
-                        "specifiedNumber" : 2
+                    "failureToPay" : {
+                      "applicable" : true,
+                      "paymentRequirement" : {
+                        "value" : 500000,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "USD"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "6c32a26b"
+                        }
                       }
                     },
                     "defaultRequirement" : {
+                      "value" : 5000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 5000000,
                       "meta" : {
                         "globalKey" : "1a10e2d1"
                       }
                     },
-                    "failureToPay" : {
-                      "applicable" : true,
-                      "paymentRequirement" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "USD"
-                          }
-                        },
-                        "value" : 500000,
-                        "meta" : {
-                          "globalKey" : "6c32a26b"
-                        }
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "publicSource" : [ "Standard Public Sources" ],
+                        "specifiedNumber" : 2
                       }
                     },
                     "meta" : {
-                      "globalKey" : "8e58f8ea"
+                      "globalKey" : "be0f4df4"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "afce5854"
-                  },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY",
+                    "category" : "BorrowedMoney",
+                    "notSubordinated" : true,
+                    "notSovereignLender" : true,
+                    "notDomesticLaw" : true,
+                    "notDomesticIssuance" : true,
+                    "fullFaithAndCreditObLiability" : true,
+                    "excluded" : "true",
+                    "othReferenceEntityObligations" : "true",
                     "designatedPriority" : {
                       "value" : "FirstLienLoan"
-                    },
-                    "excluded" : "true",
-                    "fullFaithAndCreditObLiability" : true,
-                    "notDomesticIssuance" : true,
-                    "notDomesticLaw" : true,
-                    "notSovereignLender" : true,
-                    "notSubordinated" : true,
-                    "othReferenceEntityObligations" : "true"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
                     }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c47"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "20"
                   },
                   "meta" : {
-                    "globalKey" : "28c47"
+                    "globalKey" : "c0a67a2c"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "b384c8a4"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2007-03-20",
-                  "lastRegularPaymentDate" : "2010-03-20",
-                  "meta" : {
-                    "globalKey" : "6bbdc6d6"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "2cd46a12"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "ed3d7e76"
+                "globalKey" : "f87349d0"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "ebf296cd"
-                },
-                "unadjustedDate" : "2010-03-21"
-              },
-              "meta" : {
-                "globalKey" : "ebf296cd"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "e9f41464"
+            "globalKey" : "693fbc2a"
           }
         },
         "meta" : {
-          "globalKey" : "e9f41464"
+          "globalKey" : "693fbc2a"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "5a207dbd"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0115,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0115,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e9ef39e3"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "63b2e9b8",
+          "externalReference" : "f6g4h5"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4627ed18",
+          "externalReference" : "fg4rde3"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "4627ed18",
+          "externalReference" : "fg4rde3"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb301"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "XYZBICXXX",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
+        },
+        "meta" : {
+          "globalKey" : "2283edb5"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2006-12-01"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "4627ed18",
+        "externalKey" : "fg4rde3"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABCBICXXX",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "56ERT7RHWE4"
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "ba7399be"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "fg4rde3",
-        "globalReference" : "a9fe6e32"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "91bdb1d3"
+        "globalKey" : "63b2e9b8",
+        "externalKey" : "f6g4h5"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "SettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "85b3b830"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "dc365181"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "776b7ceb"
+    }
+  },
+  "meta" : {
+    "globalKey" : "776b7ceb"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/DeliverableObligations_physicalSettlementMatrix-1.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/DeliverableObligations_physicalSettlementMatrix-1.json
index 2c04b5a1b7..015e1939d1 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/DeliverableObligations_physicalSettlementMatrix-1.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/DeliverableObligations_physicalSettlementMatrix-1.json
@@ -1,107 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "429d5efc"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "955bda07"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "8afb2a56"
-      }
-    },
-    "meta" : {
-      "globalKey" : "429d5efc"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "fg4rde3",
-        "globalKey" : "a9fe6e32"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "4627ed18",
+        "externalReference" : "fg4rde3"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56ERT7RHWE4",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "XYZBICXXX"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         },
-        "meta" : {
-          "globalKey" : "2283edb5"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "f6g4h5",
-        "globalKey" : "9ca2e804"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "ABCBICXXX"
-        },
-        "meta" : {
-          "globalKey" : "ba7399be"
-        }
-      } ]
+        "globalKey" : "ab644853"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-12-01",
+      "meta" : {
+        "globalKey" : "3eb301"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "fg4rde3",
-          "globalReference" : "a9fe6e32"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "f6g4h5",
-          "globalReference" : "9ca2e804"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "fg4rde3",
-          "globalReference" : "a9fe6e32"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -109,30 +32,26 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-12-02",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
                 "meta" : {
-                  "globalKey" : "42f910b"
+                  "globalKey" : "eb82a1ba"
                 }
               },
-              "businessDayConvention" : "FOLLOWING",
               "meta" : {
-                "globalKey" : "da556d3a"
+                "globalKey" : "eb82a1ba"
               }
             },
-            "effectiveDate" : {
+            "terminationDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2010-03-21",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -140,339 +59,420 @@
                   }
                 },
                 "meta" : {
-                  "globalKey" : "eb82a1ba"
-                },
-                "unadjustedDate" : "2006-12-02"
+                  "globalKey" : "ebf296cd"
+                }
               },
               "meta" : {
-                "globalKey" : "eb82a1ba"
+                "globalKey" : "ebf296cd"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da556d3a"
               }
             },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f73"
+                    },
+                    "rollConvention" : "20"
                   },
+                  "meta" : {
+                    "globalKey" : "17f73"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2007-03-20",
+                  "lastRegularPaymentDate" : "2010-03-20",
+                  "meta" : {
+                    "globalKey" : "6bbdbe2a"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c204893e"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "f78e7bf4"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "7cf1218a"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "maximumBusinessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
-                      "category" : "LOAN",
-                      "excluded" : "true",
+                      "category" : "Loan",
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
                       },
+                      "excluded" : "true",
                       "othReferenceEntityObligations" : "true"
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "a4720ef7"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "maximumBusinessDays" : 30
+                      "globalKey" : "29d4b48d"
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
-                    "allGuarantees" : false,
-                    "noReferenceObligation" : true,
                     "referenceEntity" : {
-                      "meta" : {
-                        "globalKey" : "444afa68"
-                      },
                       "name" : {
                         "value" : "CompanyDEF"
+                      },
+                      "meta" : {
+                        "globalKey" : "444afa68"
                       }
                     },
+                    "noReferenceObligation" : true,
+                    "allGuarantees" : false,
                     "referencePrice" : {
+                      "value" : 1.0000000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.0000000000,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     },
                     "securedList" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "ea211e6e"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "publicSource" : [ "Standard Public Sources" ],
-                        "specifiedNumber" : 2
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 5000000,
-                      "meta" : {
-                        "globalKey" : "1a10e2d1"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 500000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 500000,
                         "meta" : {
                           "globalKey" : "6c32a26b"
                         }
                       }
                     },
+                    "obligationDefault" : false,
+                    "obligationAcceleration" : true,
+                    "repudiationMoratorium" : false,
                     "governmentalIntervention" : true,
-                    "meta" : {
-                      "globalKey" : "ccb504f9"
+                    "defaultRequirement" : {
+                      "value" : 5000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "1a10e2d1"
+                      }
                     },
-                    "obligationAcceleration" : true,
-                    "obligationDefault" : false,
-                    "repudiationMoratorium" : false
-                  },
-                  "meta" : {
-                    "globalKey" : "176e1cd3"
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "publicSource" : [ "Standard Public Sources" ],
+                        "specifiedNumber" : 2
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "518f6f37"
+                    }
                   },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY",
-                    "designatedPriority" : {
-                      "value" : "FirstLienLoan"
-                    },
-                    "excluded" : "true",
-                    "notDomesticIssuance" : true,
-                    "notDomesticLaw" : false,
-                    "notSovereignLender" : true,
+                    "category" : "BorrowedMoney",
                     "notSubordinated" : true,
+                    "notSovereignLender" : true,
+                    "notDomesticLaw" : false,
+                    "notDomesticIssuance" : true,
+                    "revenueObligationLiability" : false,
+                    "excluded" : "true",
                     "othReferenceEntityObligations" : "true",
-                    "revenueObligationLiability" : false
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
+                    "designatedPriority" : {
+                      "value" : "FirstLienLoan"
                     }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c47"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "20"
                   },
                   "meta" : {
-                    "globalKey" : "28c47"
+                    "globalKey" : "24aff195"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "b384c8a4"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2007-03-20",
-                  "lastRegularPaymentDate" : "2010-03-20",
-                  "meta" : {
-                    "globalKey" : "6bbdc6d6"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "24b0d18e"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "91589af6"
+                "globalKey" : "cac4754c"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "ebf296cd"
-                },
-                "unadjustedDate" : "2010-03-21"
-              },
-              "meta" : {
-                "globalKey" : "ebf296cd"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "c2ea8de4"
+            "globalKey" : "b55ddba6"
           }
         },
         "meta" : {
-          "globalKey" : "c2ea8de4"
+          "globalKey" : "b55ddba6"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "5a207dbd"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0115,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0115,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e9ef39e3"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "63b2e9b8",
+          "externalReference" : "f6g4h5"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4627ed18",
+          "externalReference" : "fg4rde3"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "4627ed18",
+          "externalReference" : "fg4rde3"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb301"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "XYZBICXXX",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
+        },
+        "meta" : {
+          "globalKey" : "2283edb5"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2006-12-01"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "4627ed18",
+        "externalKey" : "fg4rde3"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABCBICXXX",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "56ERT7RHWE4"
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "ba7399be"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "fg4rde3",
-        "globalReference" : "a9fe6e32"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "91bdb1d3"
+        "globalKey" : "63b2e9b8",
+        "externalKey" : "f6g4h5"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "955bda07"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "8afb2a56"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "d8134f30"
+    }
+  },
+  "meta" : {
+    "globalKey" : "d8134f30"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/DeliverableObligations_physicalSettlementMatrix-2.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/DeliverableObligations_physicalSettlementMatrix-2.json
index ef1edae8c2..6b651746f8 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/DeliverableObligations_physicalSettlementMatrix-2.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/DeliverableObligations_physicalSettlementMatrix-2.json
@@ -1,112 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "56d64220"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "c92a48b8"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "1face209"
-      }
-    },
-    "meta" : {
-      "globalKey" : "56d64220"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "fg4rde3",
-        "globalKey" : "a9fe6e32"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "4627ed18",
+        "externalReference" : "fg4rde3"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56ERT7RHWE4",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "XYZBICXXX"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         },
-        "meta" : {
-          "globalKey" : "2283edb5"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "f6g4h5",
-        "globalKey" : "9ca2e804"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "ABCBICXXX"
-        },
-        "meta" : {
-          "globalKey" : "ba7399be"
-        }
-      } ]
+        "globalKey" : "ab644853"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-12-01",
+      "meta" : {
+        "globalKey" : "3eb301"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "fg4rde3",
-          "globalReference" : "a9fe6e32"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "f6g4h5",
-          "globalReference" : "9ca2e804"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "fg4rde3",
-          "globalReference" : "a9fe6e32"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -114,30 +32,26 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-12-02",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
                 "meta" : {
-                  "globalKey" : "42f910b"
+                  "globalKey" : "eb82a1ba"
                 }
               },
-              "businessDayConvention" : "FOLLOWING",
               "meta" : {
-                "globalKey" : "da556d3a"
+                "globalKey" : "eb82a1ba"
               }
             },
-            "effectiveDate" : {
+            "terminationDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2010-03-21",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -145,335 +59,421 @@
                   }
                 },
                 "meta" : {
-                  "globalKey" : "eb82a1ba"
-                },
-                "unadjustedDate" : "2006-12-02"
+                  "globalKey" : "ebf296cd"
+                }
               },
               "meta" : {
-                "globalKey" : "eb82a1ba"
+                "globalKey" : "ebf296cd"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da556d3a"
               }
             },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f73"
+                    },
+                    "rollConvention" : "20"
+                  },
+                  "meta" : {
+                    "globalKey" : "17f73"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
+                  "firstPaymentDate" : "2007-03-20",
+                  "lastRegularPaymentDate" : "2010-03-20",
+                  "meta" : {
+                    "globalKey" : "6bbdbe2a"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c204893e"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
-                    "globalKey" : "fcf893b1"
+                    "globalKey" : "825b3947"
                   },
-                  "settlementType" : "PHYSICAL",
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "maximumBusinessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
-                      "category" : "LOAN",
-                      "excluded" : "true",
+                      "category" : "Loan",
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
                       },
+                      "excluded" : "true",
                       "othReferenceEntityObligations" : "true"
                     },
                     "meta" : {
-                      "globalKey" : "acba80e8"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "maximumBusinessDays" : 30
+                      "globalKey" : "321d267e"
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
-                    "allGuarantees" : false,
-                    "noReferenceObligation" : true,
                     "referenceEntity" : {
-                      "meta" : {
-                        "globalKey" : "444afa68"
-                      },
                       "name" : {
                         "value" : "CompanyDEF"
+                      },
+                      "meta" : {
+                        "globalKey" : "444afa68"
                       }
                     },
+                    "noReferenceObligation" : true,
+                    "allGuarantees" : false,
                     "referencePrice" : {
+                      "value" : 1.0000000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.0000000000,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     },
                     "securedList" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "786bcdef"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "publicSource" : [ "Standard Public Sources" ],
-                        "specifiedNumber" : 2
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 5000000,
-                      "meta" : {
-                        "globalKey" : "1a10e2d1"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 500000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 500000,
                         "meta" : {
                           "globalKey" : "6c32a26b"
                         }
                       }
                     },
+                    "obligationDefault" : false,
+                    "obligationAcceleration" : true,
+                    "repudiationMoratorium" : false,
                     "governmentalIntervention" : true,
-                    "meta" : {
-                      "globalKey" : "ccb504f9"
+                    "defaultRequirement" : {
+                      "value" : 5000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "1a10e2d1"
+                      }
                     },
-                    "obligationAcceleration" : true,
-                    "obligationDefault" : false,
-                    "repudiationMoratorium" : false
-                  },
-                  "meta" : {
-                    "globalKey" : "176e1cd3"
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "publicSource" : [ "Standard Public Sources" ],
+                        "specifiedNumber" : 2
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "518f6f37"
+                    }
                   },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY",
-                    "designatedPriority" : {
-                      "value" : "FirstLienLoan"
-                    },
-                    "excluded" : "true",
-                    "notDomesticIssuance" : true,
-                    "notDomesticLaw" : false,
-                    "notSovereignLender" : true,
+                    "category" : "BorrowedMoney",
                     "notSubordinated" : true,
+                    "notSovereignLender" : true,
+                    "notDomesticLaw" : false,
+                    "notDomesticIssuance" : true,
+                    "revenueObligationLiability" : false,
+                    "excluded" : "true",
                     "othReferenceEntityObligations" : "true",
-                    "revenueObligationLiability" : false
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
+                    "designatedPriority" : {
+                      "value" : "FirstLienLoan"
                     }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c47"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "20"
                   },
                   "meta" : {
-                    "globalKey" : "28c47"
+                    "globalKey" : "24aff195"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "b384c8a4"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2007-03-20",
-                  "lastRegularPaymentDate" : "2010-03-20",
-                  "meta" : {
-                    "globalKey" : "6bbdc6d6"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "b2fb810f"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "e9445615"
+                "globalKey" : "d5aa611"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "ebf296cd"
-                },
-                "unadjustedDate" : "2010-03-21"
-              },
-              "meta" : {
-                "globalKey" : "ebf296cd"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "820a48ab"
+            "globalKey" : "cee6b53d"
           }
         },
         "meta" : {
-          "globalKey" : "820a48ab"
+          "globalKey" : "cee6b53d"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "5a207dbd"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0115,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0115,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e9ef39e3"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "63b2e9b8",
+          "externalReference" : "f6g4h5"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4627ed18",
+          "externalReference" : "fg4rde3"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "4627ed18",
+          "externalReference" : "fg4rde3"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb301"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "XYZBICXXX",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
+        },
+        "meta" : {
+          "globalKey" : "2283edb5"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2006-12-01"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "4627ed18",
+        "externalKey" : "fg4rde3"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABCBICXXX",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "56ERT7RHWE4"
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "ba7399be"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "fg4rde3",
-        "globalReference" : "a9fe6e32"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "91bdb1d3"
+        "globalKey" : "63b2e9b8",
+        "externalKey" : "f6g4h5"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "SettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "85b3b830"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "dc365181"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "b815d004"
+    }
+  },
+  "meta" : {
+    "globalKey" : "b815d004"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FloatingAmountEvents_mortgages.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FloatingAmountEvents_mortgages.json
index 5559710688..7970664aca 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FloatingAmountEvents_mortgages.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FloatingAmountEvents_mortgages.json
@@ -1,112 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "56b219c4"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "b2724407"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "8f4dd58"
-      }
-    },
-    "meta" : {
-      "globalKey" : "56b219c4"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "gf4t5",
-        "globalKey" : "a9fe6e32"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "63b2e9b8",
+        "externalReference" : "yt67d"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56ERT7RHWE4",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "XYZBICXXX"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         },
-        "meta" : {
-          "globalKey" : "2283edb5"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "yt67d",
-        "globalKey" : "9ca2e804"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "ABCBICXXX"
-        },
-        "meta" : {
-          "globalKey" : "ba7399be"
-        }
-      } ]
+        "globalKey" : "7c1be68"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-10-05",
+      "meta" : {
+        "globalKey" : "3eb285"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "gf4t5",
-          "globalReference" : "a9fe6e32"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "yt67d",
-          "globalReference" : "9ca2e804"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "gf4t5",
-          "globalReference" : "a9fe6e32"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -114,31 +32,38 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-10-11",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "42f910b"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "da556d3a"
+                  }
+                },
                 "meta" : {
-                  "globalKey" : "42f910b"
+                  "globalKey" : "b0cdd84f"
                 }
               },
-              "businessDayConvention" : "FOLLOWING",
               "meta" : {
-                "globalKey" : "da556d3a"
+                "globalKey" : "b0cdd84f"
               }
             },
-            "effectiveDate" : {
+            "terminationDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2035-09-25",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "GBLO"
@@ -149,67 +74,145 @@
                       "globalKey" : "42f910b"
                     }
                   },
-                  "businessDayConvention" : "FOLLOWING",
                   "meta" : {
                     "globalKey" : "da556d3a"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "b0cdd84f"
-                },
-                "unadjustedDate" : "2006-10-11"
+                  "globalKey" : "777d2cc1"
+                }
               },
               "meta" : {
-                "globalKey" : "b0cdd84f"
+                "globalKey" : "777d2cc1"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da556d3a"
               }
             },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "177d3"
+                    },
+                    "rollConvention" : "11"
                   },
+                  "meta" : {
+                    "globalKey" : "177d3"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "firstPaymentDate" : "2006-11-01",
+                  "lastRegularPaymentDate" : "2035-06-01",
+                  "meta" : {
+                    "globalKey" : "715dd58c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "b2183d36"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "c124120"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "c004ba0"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 5
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "43d51263"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 5
+                      "globalKey" : "43c31ce3"
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
-                    "allGuarantees" : true,
                     "referenceEntity" : {
-                      "meta" : {
-                        "globalKey" : "5df00e1c"
-                      },
                       "name" : {
                         "value" : "New Century Home Equity Loan Trust 2005-4"
+                      },
+                      "meta" : {
+                        "globalKey" : "5df00e1c"
                       }
                     },
                     "referenceObligation" : [ {
@@ -217,288 +220,285 @@
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "64352VNC1",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                              },
-                              "value" : "64352VNC1"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "b56573a0"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
+                              "value" : "NCHET 2005-4",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-Bloomberg-1-0"
-                              },
-                              "value" : "NCHET 2005-4"
+                              }
                             },
+                            "source" : "BBGID",
                             "meta" : {
                               "globalKey" : "1dd2314a"
-                            },
-                            "source" : "BBGID"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
                       }
                     } ],
+                    "allGuarantees" : true,
                     "referencePrice" : {
+                      "value" : 0.26,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.26,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "24df828e"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2" ]
-                    },
-                    "distressedRatingsDowngrade" : true,
-                    "failureToPayInterest" : true,
                     "failureToPayPrincipal" : true,
-                    "impliedWritedown" : true,
+                    "failureToPayInterest" : true,
+                    "distressedRatingsDowngrade" : true,
                     "maturityExtension" : true,
+                    "writedown" : true,
+                    "impliedWritedown" : true,
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2" ]
+                    },
                     "meta" : {
                       "globalKey" : "59089299"
-                    },
-                    "writedown" : true
+                    }
+                  },
+                  "obligations" : {
+                    "category" : "BondOrLoan"
                   },
                   "floatingAmountEvents" : {
-                    "additionalFixedPayments" : {
-                      "interestShortfallReimbursement" : true,
-                      "principalShortfallReimbursement" : true,
-                      "writedownReimbursement" : true
-                    },
                     "failureToPayPrincipal" : true,
-                    "floatingAmountProvisions" : {
-                      "stepUpProvision" : true
-                    },
                     "interestShortfall" : {
+                      "interestShortfallCap" : "Fixed",
                       "compounding" : false,
-                      "interestShortfallCap" : "FIXED",
                       "rateSource" : {
                         "value" : "USD-LIBOR-BBA"
                       }
                     },
-                    "writedown" : true
-                  },
-                  "meta" : {
-                    "globalKey" : "fae87d5b"
-                  },
-                  "obligations" : {
-                    "category" : "BOND_OR_LOAN"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28beb"
+                    "writedown" : true,
+                    "floatingAmountProvisions" : {
+                      "stepUpProvision" : true
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "11"
+                    "additionalFixedPayments" : {
+                      "interestShortfallReimbursement" : true,
+                      "principalShortfallReimbursement" : true,
+                      "writedownReimbursement" : true
+                    }
                   },
                   "meta" : {
-                    "globalKey" : "28beb"
+                    "globalKey" : "4808dc39"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "9efab7d8"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2006-11-01",
-                  "lastRegularPaymentDate" : "2035-06-01",
-                  "meta" : {
-                    "globalKey" : "715dde74"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "68ed0bec"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "126dfa0a"
+                "globalKey" : "7c2f5076"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "42f910b"
-                    }
-                  },
-                  "businessDayConvention" : "FOLLOWING",
-                  "meta" : {
-                    "globalKey" : "da556d3a"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "777d2cc1"
-                },
-                "unadjustedDate" : "2035-09-25"
-              },
-              "meta" : {
-                "globalKey" : "777d2cc1"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "66290df5"
+            "globalKey" : "9fa00e9f"
           }
         },
         "meta" : {
-          "globalKey" : "66290df5"
+          "globalKey" : "9fa00e9f"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a3617a4e"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.050,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.050,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 15000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 15000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "99d719c2"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c8cdcf72"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 15000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 15000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a10c1e7e"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "63b2e9b8",
+          "externalReference" : "yt67d"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4627ed18",
+          "externalReference" : "gf4t5"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "4627ed18",
+          "externalReference" : "gf4t5"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb285"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "XYZBICXXX",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
+        },
+        "meta" : {
+          "globalKey" : "2283edb5"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2006-10-05"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "4627ed18",
+        "externalKey" : "gf4t5"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABCBICXXX",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "56ERT7RHWE4"
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "ba7399be"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "yt67d",
-        "globalReference" : "9ca2e804"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "d20b7a68"
+        "globalKey" : "63b2e9b8",
+        "externalKey" : "yt67d"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "e9431741"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "3fc5b092"
+      }
+    },
+    "meta" : {
+      "globalKey" : "25b54354"
+    }
+  },
+  "meta" : {
+    "globalKey" : "25b54354"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_12.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_12.json
index 9fae356ca2..8f275bb3e8 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_12.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_12.json
@@ -1,114 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "23e8465a"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "14914b1c"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "6b13e46d"
-      }
-    },
-    "meta" : {
-      "globalKey" : "23e8465a"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37263",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
-        }
-      } ]
+        "globalKey" : "1cbdb9d7"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-11-13",
+      "meta" : {
+        "globalKey" : "3e92cd"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -116,30 +32,26 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-11-14",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
                 "meta" : {
-                  "globalKey" : "42f910b"
+                  "globalKey" : "eb09be86"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
-                "globalKey" : "97b8e49c"
+                "globalKey" : "eb09be86"
               }
             },
-            "effectiveDate" : {
+            "terminationDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2007-11-14",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -147,70 +59,149 @@
                   }
                 },
                 "meta" : {
-                  "globalKey" : "eb09be86"
-                },
-                "unadjustedDate" : "2002-11-14"
+                  "globalKey" : "eb9fe686"
+                }
               },
               "meta" : {
-                "globalKey" : "eb09be86"
+                "globalKey" : "eb9fe686"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "97b8e49c"
               }
             },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f58"
+                    },
+                    "rollConvention" : "14"
                   },
+                  "meta" : {
+                    "globalKey" : "17f58"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-02-14",
+                  "meta" : {
+                    "globalKey" : "745af55c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "cd319f03"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "10779c5"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "1a6e16dd"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
+                      "category" : "BondOrLoan",
+                      "specifiedCurrency" : {
+                        "applicable" : true
+                      },
+                      "notSovereignLender" : true,
+                      "notContingent" : true,
                       "assignableLoan" : {
                         "applicable" : true
                       },
-                      "category" : "BOND_OR_LOAN",
                       "consentRequiredLoan" : {
                         "applicable" : true
                       },
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
-                      "notContingent" : true,
-                      "notSovereignLender" : true,
-                      "specifiedCurrency" : {
-                        "applicable" : true
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
                       },
-                      "transferable" : true
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "237559c8"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 30
+                      "globalKey" : "3cdbf6e0"
                     }
                   }
                 },
@@ -218,98 +209,74 @@
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "4AB951",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "4AB951"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "546f933e"
-                      },
                       "name" : {
                         "value" : "Republic of Italy"
+                      },
+                      "meta" : {
+                        "globalKey" : "546f933e",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "546f933e"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "XS0125141316",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "XS0125141316"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "2f914ab8"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "546f933e",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : -1,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : -1,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "f08c860a"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000,
-                      "meta" : {
-                        "globalKey" : "d467e427"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 1000000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "5904ee2e"
-                    },
                     "obligationAcceleration" : true,
                     "repudiationMoratorium" : true,
                     "restructuring" : {
@@ -317,199 +284,232 @@
                       "restructuringType" : {
                         "value" : "R"
                       }
+                    },
+                    "defaultRequirement" : {
+                      "value" : 10000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "d467e427"
+                      }
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "420d5ab4"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "a28a54a3"
-                  },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c2c"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "14"
+                    "category" : "BorrowedMoney"
                   },
                   "meta" : {
-                    "globalKey" : "28c2c"
+                    "globalKey" : "6b29b7a9"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "d3873423"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-02-14",
-                  "meta" : {
-                    "globalKey" : "745afe08"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "6a04ce8c"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "948e512d"
+                "globalKey" : "ceeaa9"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "eb9fe686"
-                },
-                "unadjustedDate" : "2007-11-14"
-              },
-              "meta" : {
-                "globalKey" : "eb9fe686"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "633ddd47"
+            "globalKey" : "443a330d"
           }
         },
         "meta" : {
-          "globalKey" : "633ddd47"
+          "globalKey" : "443a330d"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "aff2c312"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0011,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0011,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 50000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "27faaf2b"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "4e659f2e"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 50000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "d75b3635"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e92cd"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2002-11-13"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37263"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "version" : 1
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af4b9457"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "52e4e05e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "a96779af"
+      }
+    },
+    "meta" : {
+      "globalKey" : "8feee690"
+    }
+  },
+  "meta" : {
+    "globalKey" : "8feee690"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_19.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_19.json
index 3f6e2ec7c5..77ddbd12c6 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_19.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_19.json
@@ -1,118 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "2a041ac2"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_SUCCESSOR_AND_CREDIT_EVENTS"
-              }
-            }, {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "94128b49"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "dc022458"
-      }
-    },
-    "meta" : {
-      "globalKey" : "2a041ac2"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37209",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
-        }
-      } ]
+        "globalKey" : "1cbdb923"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-04",
+      "meta" : {
+        "globalKey" : "3e9304"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -120,13 +32,54 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-12-05",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb0a8cfd"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "meta" : {
+                "globalKey" : "eb0a8cfd"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-12-05",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    }, {
+                      "value" : "JPTO"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "81e56a96"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "58681de7"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "28faf882"
+                }
+              },
+              "meta" : {
+                "globalKey" : "28faf882"
+              }
             },
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "GBLO"
@@ -139,370 +92,417 @@
                   "globalKey" : "81e56a96"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "58681de7"
               }
             },
-            "effectiveDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
+            "payout" : {
+              "interestRatePayout" : [ {
+                "payerReceiver" : {
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "eb0a8cfd"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2002-12-05"
-              },
-              "meta" : {
-                "globalKey" : "eb0a8cfd"
-              }
-            },
-            "payout" : {
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204c"
+                    },
+                    "rollConvention" : "5"
+                  },
+                  "meta" : {
+                    "globalKey" : "204c"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-03-05",
+                  "meta" : {
+                    "globalKey" : "7473f5c5"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c3ce76f8"
+                }
+              } ],
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "45e0d7b2"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "JPY"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "5f4774ca"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
+                      "category" : "BondOrLoan",
+                      "notSubordinated" : true,
+                      "specifiedCurrency" : {
+                        "applicable" : true
+                      },
+                      "notContingent" : true,
                       "assignableLoan" : {
                         "applicable" : true
                       },
-                      "category" : "BOND_OR_LOAN",
                       "consentRequiredLoan" : {
                         "applicable" : true
                       },
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
-                      "notContingent" : true,
-                      "notSubordinated" : true,
-                      "specifiedCurrency" : {
-                        "applicable" : true
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
                       },
-                      "transferable" : true
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "237559c8"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 30
+                      "globalKey" : "3cdbf6e0"
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
-                    "allGuarantees" : true,
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "004CC9",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "004CC9"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "e414546d"
-                      },
                       "name" : {
                         "value" : "ACOM CO., LTD."
+                      },
+                      "meta" : {
+                        "globalKey" : "e414546d",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "e414546d"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "JP310860A032",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "JP310860A032"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "b94feaa3"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "e414546d",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
+                    "allGuarantees" : true,
                     "referencePrice" : {
+                      "value" : 1,
                       "unit" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "value" : 1,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "c8898ba5"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
+                    "restructuring" : {
+                      "applicable" : true,
+                      "multipleHolderObligation" : true,
+                      "multipleCreditEventNotices" : true
+                    },
                     "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
                       "businessCenter" : "GBLO",
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
                       "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
                       }
                     },
                     "meta" : {
-                      "globalKey" : "5c2b79f"
-                    },
-                    "restructuring" : {
-                      "applicable" : true,
-                      "multipleCreditEventNotices" : true,
-                      "multipleHolderObligation" : true
+                      "globalKey" : "a12d3685"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "c875397b"
-                  },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY",
+                    "category" : "BorrowedMoney",
                     "notSubordinated" : true
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d20"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "5"
                   },
                   "meta" : {
-                    "globalKey" : "12d20"
+                    "globalKey" : "b67a88d5"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "a52eef0e"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-05",
-                  "meta" : {
-                    "globalKey" : "7473fe71"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "f6f6208b"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "fb1b3633"
+                "globalKey" : "ecc65f83"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    }, {
-                      "value" : "JPTO"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "81e56a96"
-                    }
-                  },
-                  "businessDayConvention" : "MODFOLLOWING",
-                  "meta" : {
-                    "globalKey" : "58681de7"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "28faf882"
-                },
-                "unadjustedDate" : "2007-12-05"
-              },
-              "meta" : {
-                "globalKey" : "28faf882"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "cc3cf877"
+            "globalKey" : "5eb84243"
           }
         },
         "meta" : {
-          "globalKey" : "cc3cf877"
+          "globalKey" : "5eb84243"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a7b31de6"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.007,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "value" : 0.007,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 500000000,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
-              },
-              "value" : 500000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d74a447e"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "4eb09eda"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 500000000,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
-              },
-              "value" : 500000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "11fe4b42"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9304"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2002-12-04"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37209"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "version" : 1
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af48f0a3"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditSuccessorAndCreditEvents"
+              }
+            }, {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "3f0bff2d"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "86fb983c"
+      }
+    },
+    "meta" : {
+      "globalKey" : "f72a4990"
+    }
+  },
+  "meta" : {
+    "globalKey" : "f72a4990"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_26_28.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_26_28.json
index 2bdeedb116..19b34fa4eb 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_26_28.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_26_28.json
@@ -1,114 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "c5a17f20"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "14914b1c"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "6b13e46d"
-      }
-    },
-    "meta" : {
-      "globalKey" : "442cb12b"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37205",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
-        }
-      } ]
+        "globalKey" : "1cbdb91f"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-02",
+      "meta" : {
+        "globalKey" : "3e9302"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -116,13 +32,52 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-12-03",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb0a857b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "eb0a857b"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-12-03",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "42f910b"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97b8e49c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "29255039"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "meta" : {
+                "globalKey" : "29255039"
+              }
             },
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "GBLO"
@@ -133,84 +88,66 @@
                   "globalKey" : "42f910b"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "97b8e49c"
               }
             },
-            "effectiveDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "eb0a857b"
-                },
-                "unadjustedDate" : "2002-12-03"
-              },
-              "meta" : {
-                "globalKey" : "eb0a857b"
-              }
-            },
             "payout" : {
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "5b2a6e23"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "f8354c3f"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
-                      "assignableLoan" : {
+                      "category" : "BondOrLoan",
+                      "notSubordinated" : true,
+                      "specifiedCurrency" : {
                         "applicable" : true
                       },
-                      "category" : "BOND_OR_LOAN",
-                      "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
+                      "notSovereignLender" : true,
+                      "notDomesticLaw" : true,
                       "notContingent" : true,
                       "notDomesticIssuance" : true,
-                      "notDomesticLaw" : true,
-                      "notSovereignLender" : true,
-                      "notSubordinated" : true,
-                      "specifiedCurrency" : {
+                      "assignableLoan" : {
                         "applicable" : true
                       },
-                      "transferable" : true
+                      "transferable" : true,
+                      "maximumMaturity" : {
+                        "periodMultiplier" : 30,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
+                      },
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "86788e80"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 30
+                      "globalKey" : "23836c9c"
                     }
                   }
                 },
@@ -218,98 +155,74 @@
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "8GB54M",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "8GB54M"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "5cf1ae36"
-                      },
                       "name" : {
                         "value" : "Kingdom of Thailand"
+                      },
+                      "meta" : {
+                        "globalKey" : "5cf1ae36",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "5cf1ae36"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "US88322KAC53",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "US88322KAC53"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "94d5df65"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "5cf1ae36",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : 1,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "d4955871"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000,
-                      "meta" : {
-                        "globalKey" : "d467e427"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 1000000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "5904ee2e"
-                    },
                     "obligationAcceleration" : true,
                     "repudiationMoratorium" : true,
                     "restructuring" : {
@@ -317,127 +230,214 @@
                       "restructuringType" : {
                         "value" : "R"
                       }
+                    },
+                    "defaultRequirement" : {
+                      "value" : 10000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "d467e427"
+                      }
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "420d5ab4"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "8b9137c0"
-                  },
                   "obligations" : {
-                    "category" : "BOND_OR_LOAN",
+                    "category" : "BondOrLoan",
+                    "notSovereignLender" : true,
                     "notDomesticCurrency" : {
                       "applicable" : true
                     },
-                    "notDomesticIssuance" : true,
                     "notDomesticLaw" : true,
-                    "notSovereignLender" : true
-                  }
-                } ]
-              },
-              "meta" : {
-                "globalKey" : "d4955871"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "42f910b"
-                    }
+                    "notDomesticIssuance" : true
                   },
-                  "businessDayConvention" : "MODFOLLOWING",
                   "meta" : {
-                    "globalKey" : "97b8e49c"
+                    "globalKey" : "4854c87a"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "29255039"
-                },
-                "unadjustedDate" : "2007-12-03"
+                  "globalKey" : "236adceb"
+                }
               },
               "meta" : {
-                "globalKey" : "29255039"
+                "globalKey" : "236adceb"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "6a86e451"
+            "globalKey" : "c615e99b"
           }
         },
         "meta" : {
-          "globalKey" : "6a86e451"
+          "globalKey" : "c615e99b"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "694c96e8"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 20000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 20000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "c0464618"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9302"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2002-12-02"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37205"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "version" : 1
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af48e19f"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "52e4e05e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "a96779af"
+      }
+    },
+    "meta" : {
+      "globalKey" : "fdf42411"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "48c10feb"
-    },
     "transfer" : {
       "quantity" : {
+        "value" : 20000000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
-        },
-        "value" : 20000000
+        }
       },
       "settlementDate" : {
         "unadjustedDate" : "2002-12-03"
       }
+    },
+    "meta" : {
+      "globalKey" : "48c10feb"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "4a15eefa"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-1.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-1.json
index 5fb1de7fab..f1ff720be0 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-1.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-1.json
@@ -1,114 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "c5a1a720"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "14914b1c"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "6b13e46d"
-      }
-    },
-    "meta" : {
-      "globalKey" : "442cb12b"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37205",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
-        }
-      } ]
+        "globalKey" : "1cbdb91f"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-02",
+      "meta" : {
+        "globalKey" : "3e9302"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -116,13 +32,52 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-12-03",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb0a857b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "eb0a857b"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-12-03",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "42f910b"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97b8e49c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "29255039"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "meta" : {
+                "globalKey" : "29255039"
+              }
             },
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "GBLO"
@@ -133,84 +88,66 @@
                   "globalKey" : "42f910b"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "97b8e49c"
               }
             },
-            "effectiveDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "eb0a857b"
-                },
-                "unadjustedDate" : "2002-12-03"
-              },
-              "meta" : {
-                "globalKey" : "eb0a857b"
-              }
-            },
             "payout" : {
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "5b2a6e23"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "f8354c3f"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
-                      "assignableLoan" : {
+                      "category" : "BondOrLoan",
+                      "notSubordinated" : true,
+                      "specifiedCurrency" : {
                         "applicable" : true
                       },
-                      "category" : "BOND_OR_LOAN",
-                      "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
+                      "notSovereignLender" : true,
+                      "notDomesticLaw" : true,
                       "notContingent" : true,
                       "notDomesticIssuance" : true,
-                      "notDomesticLaw" : true,
-                      "notSovereignLender" : true,
-                      "notSubordinated" : true,
-                      "specifiedCurrency" : {
+                      "assignableLoan" : {
                         "applicable" : true
                       },
-                      "transferable" : true
+                      "transferable" : true,
+                      "maximumMaturity" : {
+                        "periodMultiplier" : 30,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
+                      },
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "86788e80"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 30
+                      "globalKey" : "23836c9c"
                     }
                   }
                 },
@@ -218,98 +155,74 @@
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "8GB54M",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "8GB54M"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "5cf1ae36"
-                      },
                       "name" : {
                         "value" : "Kingdom of Thailand"
+                      },
+                      "meta" : {
+                        "globalKey" : "5cf1ae36",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "5cf1ae36"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "US88322KAC53",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "US88322KAC53"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "94d5df65"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "5cf1ae36",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : 1,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "d4955871"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000,
-                      "meta" : {
-                        "globalKey" : "d467e427"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 1000000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "5904ee2e"
-                    },
                     "obligationAcceleration" : true,
                     "repudiationMoratorium" : true,
                     "restructuring" : {
@@ -317,127 +230,214 @@
                       "restructuringType" : {
                         "value" : "R"
                       }
+                    },
+                    "defaultRequirement" : {
+                      "value" : 10000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "d467e427"
+                      }
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "420d5ab4"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "8b9137c0"
-                  },
                   "obligations" : {
-                    "category" : "BOND_OR_LOAN",
+                    "category" : "BondOrLoan",
+                    "notSovereignLender" : true,
                     "notDomesticCurrency" : {
                       "applicable" : true
                     },
-                    "notDomesticIssuance" : true,
                     "notDomesticLaw" : true,
-                    "notSovereignLender" : true
-                  }
-                } ]
-              },
-              "meta" : {
-                "globalKey" : "d4955871"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "42f910b"
-                    }
+                    "notDomesticIssuance" : true
                   },
-                  "businessDayConvention" : "MODFOLLOWING",
                   "meta" : {
-                    "globalKey" : "97b8e49c"
+                    "globalKey" : "4854c87a"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "29255039"
-                },
-                "unadjustedDate" : "2007-12-03"
+                  "globalKey" : "236adceb"
+                }
               },
               "meta" : {
-                "globalKey" : "29255039"
+                "globalKey" : "236adceb"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "6a86e451"
+            "globalKey" : "c615e99b"
           }
         },
         "meta" : {
-          "globalKey" : "6a86e451"
+          "globalKey" : "c615e99b"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "694c96e8"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 20000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 20000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "c0464618"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9302"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2002-12-02"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37205"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "version" : 1
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af48e19f"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "52e4e05e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "a96779af"
+      }
+    },
+    "meta" : {
+      "globalKey" : "fdf42411"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "48c137eb"
-    },
     "transfer" : {
       "quantity" : {
+        "value" : 20000000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
-        },
-        "value" : 20000000
+        }
       },
       "settlementDate" : {
         "unadjustedDate" : "2007-12-03"
       }
+    },
+    "meta" : {
+      "globalKey" : "48c137eb"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "4a1616fa"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-2.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-2.json
index cb6a598d85..a811d3de8a 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-2.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-2.json
@@ -1,114 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "f4b131d5"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "14914b1c"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "6b13e46d"
-      }
-    },
-    "meta" : {
-      "globalKey" : "442cb12b"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37205",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
-        }
-      } ]
+        "globalKey" : "1cbdb91f"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-02",
+      "meta" : {
+        "globalKey" : "3e9302"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -116,13 +32,52 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-12-03",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb0a857b"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "meta" : {
+                "globalKey" : "eb0a857b"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-12-03",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "42f910b"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97b8e49c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "29255039"
+                }
+              },
+              "meta" : {
+                "globalKey" : "29255039"
+              }
             },
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "GBLO"
@@ -133,84 +88,66 @@
                   "globalKey" : "42f910b"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "97b8e49c"
               }
             },
-            "effectiveDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "eb0a857b"
-                },
-                "unadjustedDate" : "2002-12-03"
-              },
-              "meta" : {
-                "globalKey" : "eb0a857b"
-              }
-            },
             "payout" : {
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "5b2a6e23"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "f8354c3f"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
-                      "assignableLoan" : {
+                      "category" : "BondOrLoan",
+                      "notSubordinated" : true,
+                      "specifiedCurrency" : {
                         "applicable" : true
                       },
-                      "category" : "BOND_OR_LOAN",
-                      "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
+                      "notSovereignLender" : true,
+                      "notDomesticLaw" : true,
                       "notContingent" : true,
                       "notDomesticIssuance" : true,
-                      "notDomesticLaw" : true,
-                      "notSovereignLender" : true,
-                      "notSubordinated" : true,
-                      "specifiedCurrency" : {
+                      "assignableLoan" : {
                         "applicable" : true
                       },
-                      "transferable" : true
+                      "transferable" : true,
+                      "maximumMaturity" : {
+                        "periodMultiplier" : 30,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
+                      },
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "86788e80"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 30
+                      "globalKey" : "23836c9c"
                     }
                   }
                 },
@@ -218,98 +155,74 @@
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "8GB54M",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "8GB54M"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "5cf1ae36"
-                      },
                       "name" : {
                         "value" : "Kingdom of Thailand"
+                      },
+                      "meta" : {
+                        "globalKey" : "5cf1ae36",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "5cf1ae36"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "US88322KAC53",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "US88322KAC53"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "94d5df65"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "5cf1ae36",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : 1,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "d4955871"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000,
-                      "meta" : {
-                        "globalKey" : "d467e427"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 1000000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "5904ee2e"
-                    },
                     "obligationAcceleration" : true,
                     "repudiationMoratorium" : true,
                     "restructuring" : {
@@ -317,145 +230,232 @@
                       "restructuringType" : {
                         "value" : "R"
                       }
+                    },
+                    "defaultRequirement" : {
+                      "value" : 10000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "d467e427"
+                      }
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "420d5ab4"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "8b9137c0"
-                  },
                   "obligations" : {
-                    "category" : "BOND_OR_LOAN",
+                    "category" : "BondOrLoan",
+                    "notSovereignLender" : true,
                     "notDomesticCurrency" : {
                       "applicable" : true
                     },
-                    "notDomesticIssuance" : true,
                     "notDomesticLaw" : true,
-                    "notSovereignLender" : true
-                  }
-                } ]
-              },
-              "meta" : {
-                "globalKey" : "d4955871"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "42f910b"
-                    }
+                    "notDomesticIssuance" : true
                   },
-                  "businessDayConvention" : "MODFOLLOWING",
                   "meta" : {
-                    "globalKey" : "97b8e49c"
+                    "globalKey" : "4854c87a"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "29255039"
-                },
-                "unadjustedDate" : "2007-12-03"
+                  "globalKey" : "236adceb"
+                }
               },
               "meta" : {
-                "globalKey" : "29255039"
+                "globalKey" : "236adceb"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "6a86e451"
+            "globalKey" : "c615e99b"
           }
         },
         "meta" : {
-          "globalKey" : "6a86e451"
+          "globalKey" : "c615e99b"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "694c96e8"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 20000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 20000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "c0464618"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9302"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2002-12-02"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37205"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "version" : 1
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af48e19f"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "52e4e05e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "a96779af"
+      }
+    },
+    "meta" : {
+      "globalKey" : "fdf42411"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "d875be60"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        }
-      },
       "quantity" : {
+        "value" : 1200,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
         },
-        "value" : 1200
+        "receiverPartyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
         "adjustedDate" : {
+          "value" : "2023-01-02",
           "meta" : {
             "globalKey" : "3f3842"
-          },
-          "value" : "2023-01-02"
+          }
         }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "55165cbc"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "ae85748b"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-3.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-3.json
index 357e510e32..29bde007a5 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-3.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-3.json
@@ -1,114 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "29eb3769"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "14914b1c"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "6b13e46d"
-      }
-    },
-    "meta" : {
-      "globalKey" : "442cb12b"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37205",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
-        }
-      } ]
+        "globalKey" : "1cbdb91f"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-02",
+      "meta" : {
+        "globalKey" : "3e9302"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -116,13 +32,52 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-12-03",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb0a857b"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "meta" : {
+                "globalKey" : "eb0a857b"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-12-03",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "42f910b"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97b8e49c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "29255039"
+                }
+              },
+              "meta" : {
+                "globalKey" : "29255039"
+              }
             },
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "GBLO"
@@ -133,84 +88,66 @@
                   "globalKey" : "42f910b"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "97b8e49c"
               }
             },
-            "effectiveDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "eb0a857b"
-                },
-                "unadjustedDate" : "2002-12-03"
-              },
-              "meta" : {
-                "globalKey" : "eb0a857b"
-              }
-            },
             "payout" : {
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "5b2a6e23"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "f8354c3f"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
-                      "assignableLoan" : {
+                      "category" : "BondOrLoan",
+                      "notSubordinated" : true,
+                      "specifiedCurrency" : {
                         "applicable" : true
                       },
-                      "category" : "BOND_OR_LOAN",
-                      "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
+                      "notSovereignLender" : true,
+                      "notDomesticLaw" : true,
                       "notContingent" : true,
                       "notDomesticIssuance" : true,
-                      "notDomesticLaw" : true,
-                      "notSovereignLender" : true,
-                      "notSubordinated" : true,
-                      "specifiedCurrency" : {
+                      "assignableLoan" : {
                         "applicable" : true
                       },
-                      "transferable" : true
+                      "transferable" : true,
+                      "maximumMaturity" : {
+                        "periodMultiplier" : 30,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
+                      },
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "86788e80"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 30
+                      "globalKey" : "23836c9c"
                     }
                   }
                 },
@@ -218,98 +155,74 @@
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "8GB54M",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "8GB54M"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "5cf1ae36"
-                      },
                       "name" : {
                         "value" : "Kingdom of Thailand"
+                      },
+                      "meta" : {
+                        "globalKey" : "5cf1ae36",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "5cf1ae36"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "US88322KAC53",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "US88322KAC53"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "94d5df65"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "5cf1ae36",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : 1,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "d4955871"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000,
-                      "meta" : {
-                        "globalKey" : "d467e427"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 1000000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "5904ee2e"
-                    },
                     "obligationAcceleration" : true,
                     "repudiationMoratorium" : true,
                     "restructuring" : {
@@ -317,140 +230,227 @@
                       "restructuringType" : {
                         "value" : "R"
                       }
+                    },
+                    "defaultRequirement" : {
+                      "value" : 10000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "d467e427"
+                      }
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "420d5ab4"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "8b9137c0"
-                  },
                   "obligations" : {
-                    "category" : "BOND_OR_LOAN",
+                    "category" : "BondOrLoan",
+                    "notSovereignLender" : true,
                     "notDomesticCurrency" : {
                       "applicable" : true
                     },
-                    "notDomesticIssuance" : true,
                     "notDomesticLaw" : true,
-                    "notSovereignLender" : true
-                  }
-                } ]
-              },
-              "meta" : {
-                "globalKey" : "d4955871"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "42f910b"
-                    }
+                    "notDomesticIssuance" : true
                   },
-                  "businessDayConvention" : "MODFOLLOWING",
                   "meta" : {
-                    "globalKey" : "97b8e49c"
+                    "globalKey" : "4854c87a"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "29255039"
-                },
-                "unadjustedDate" : "2007-12-03"
+                  "globalKey" : "236adceb"
+                }
               },
               "meta" : {
-                "globalKey" : "29255039"
+                "globalKey" : "236adceb"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "6a86e451"
+            "globalKey" : "c615e99b"
           }
         },
         "meta" : {
-          "globalKey" : "6a86e451"
+          "globalKey" : "c615e99b"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "694c96e8"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 20000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 20000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "c0464618"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9302"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2002-12-02"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37205"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "version" : 1
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af48e19f"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "52e4e05e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "a96779af"
+      }
+    },
+    "meta" : {
+      "globalKey" : "fdf42411"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "beb83c3e"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        }
-      },
       "quantity" : {
+        "value" : 1200,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
         },
-        "value" : 1200
+        "receiverPartyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
         "unadjustedDate" : "2023-01-02"
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "d62b6962"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "aa9f4b73"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_30-1.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_30-1.json
index 10f8142ff7..985653f916 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_30-1.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_30-1.json
@@ -1,114 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "e065aa30"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "14914b1c"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "6b13e46d"
-      }
-    },
-    "meta" : {
-      "globalKey" : "e065aa30"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37205",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
-        }
-      } ]
+        "globalKey" : "1cbdb91f"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-02",
+      "meta" : {
+        "globalKey" : "3e9302"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -116,13 +32,52 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-12-03",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb0a857b"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "meta" : {
+                "globalKey" : "eb0a857b"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-12-03",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "42f910b"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97b8e49c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "29255039"
+                }
+              },
+              "meta" : {
+                "globalKey" : "29255039"
+              }
             },
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "GBLO"
@@ -133,84 +88,131 @@
                   "globalKey" : "42f910b"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "97b8e49c"
               }
             },
-            "effectiveDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
+            "payout" : {
+              "interestRatePayout" : [ {
+                "payerReceiver" : {
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "eb0a857b"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2002-12-03"
-              },
-              "meta" : {
-                "globalKey" : "eb0a857b"
-              }
-            },
-            "payout" : {
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204a"
+                    },
+                    "rollConvention" : "3"
+                  },
+                  "meta" : {
+                    "globalKey" : "204a"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-03-03",
+                  "lastRegularPaymentDate" : "2007-12-03",
+                  "meta" : {
+                    "globalKey" : "9df3420a"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "d01c70b5"
+                }
+              } ],
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "5b2a6e23"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "f8354c3f"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
-                      "assignableLoan" : {
+                      "category" : "BondOrLoan",
+                      "notSubordinated" : true,
+                      "specifiedCurrency" : {
                         "applicable" : true
                       },
-                      "category" : "BOND_OR_LOAN",
-                      "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
+                      "notSovereignLender" : true,
+                      "notDomesticLaw" : true,
                       "notContingent" : true,
                       "notDomesticIssuance" : true,
-                      "notDomesticLaw" : true,
-                      "notSovereignLender" : true,
-                      "notSubordinated" : true,
-                      "specifiedCurrency" : {
+                      "assignableLoan" : {
                         "applicable" : true
                       },
-                      "transferable" : true
+                      "transferable" : true,
+                      "maximumMaturity" : {
+                        "periodMultiplier" : 30,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
+                      },
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "86788e80"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 30
+                      "globalKey" : "23836c9c"
                     }
                   }
                 },
@@ -218,98 +220,74 @@
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "8GB54M",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "8GB54M"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "5cf1ae36"
-                      },
                       "name" : {
                         "value" : "Kingdom of Thailand"
+                      },
+                      "meta" : {
+                        "globalKey" : "5cf1ae36",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "5cf1ae36"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "US88322KAC53",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "US88322KAC53"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "94d5df65"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "5cf1ae36",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : 1,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "d4955871"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000,
-                      "meta" : {
-                        "globalKey" : "d467e427"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 1000000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "5904ee2e"
-                    },
                     "obligationAcceleration" : true,
                     "repudiationMoratorium" : true,
                     "restructuring" : {
@@ -317,216 +295,238 @@
                       "restructuringType" : {
                         "value" : "R"
                       }
+                    },
+                    "defaultRequirement" : {
+                      "value" : 10000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "d467e427"
+                      }
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "420d5ab4"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "8b9137c0"
-                  },
                   "obligations" : {
-                    "category" : "BOND_OR_LOAN",
+                    "category" : "BondOrLoan",
+                    "notSovereignLender" : true,
                     "notDomesticCurrency" : {
                       "applicable" : true
                     },
-                    "notDomesticIssuance" : true,
                     "notDomesticLaw" : true,
-                    "notSovereignLender" : true
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d1e"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "3"
+                    "notDomesticIssuance" : true
                   },
                   "meta" : {
-                    "globalKey" : "12d1e"
+                    "globalKey" : "4854c87a"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "c7f17b8d"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-03",
-                  "lastRegularPaymentDate" : "2007-12-03",
-                  "meta" : {
-                    "globalKey" : "9df34ab6"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "236adceb"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "6baa83bc"
+                "globalKey" : "37f759d6"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "42f910b"
-                    }
-                  },
-                  "businessDayConvention" : "MODFOLLOWING",
-                  "meta" : {
-                    "globalKey" : "97b8e49c"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "29255039"
-                },
-                "unadjustedDate" : "2007-12-03"
-              },
-              "meta" : {
-                "globalKey" : "29255039"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "5d5bea6e"
+            "globalKey" : "1694e9b6"
           }
         },
         "meta" : {
-          "globalKey" : "5d5bea6e"
+          "globalKey" : "1694e9b6"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "eef8e284"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.012,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.012,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 20000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 20000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "694c96e8"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "f0236dfc"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 20000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 20000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "c0464618"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9302"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2002-12-02"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37205"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "version" : 1
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af48e19f"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "52e4e05e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "a96779af"
+      }
+    },
+    "meta" : {
+      "globalKey" : "f3ba90c6"
+    }
+  },
+  "meta" : {
+    "globalKey" : "f3ba90c6"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_30-2.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_30-2.json
index 8fddb0865e..3e210c2a3f 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_30-2.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_30-2.json
@@ -1,114 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "7ddd4c70"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "14914b1c"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "6b13e46d"
-      }
-    },
-    "meta" : {
-      "globalKey" : "7ddd4c70"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37205",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
-        }
-      } ]
+        "globalKey" : "1cbdb91f"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-02",
+      "meta" : {
+        "globalKey" : "3e9302"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -116,13 +32,52 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-12-03",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb0a857b"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "meta" : {
+                "globalKey" : "eb0a857b"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-12-03",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "42f910b"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97b8e49c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "29255039"
+                }
+              },
+              "meta" : {
+                "globalKey" : "29255039"
+              }
             },
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "GBLO"
@@ -133,84 +88,131 @@
                   "globalKey" : "42f910b"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "97b8e49c"
               }
             },
-            "effectiveDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
+            "payout" : {
+              "interestRatePayout" : [ {
+                "payerReceiver" : {
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "eb0a857b"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2002-12-03"
-              },
-              "meta" : {
-                "globalKey" : "eb0a857b"
-              }
-            },
-            "payout" : {
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204a"
+                    },
+                    "rollConvention" : "3"
+                  },
+                  "meta" : {
+                    "globalKey" : "204a"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-03-03",
+                  "lastRegularPaymentDate" : "2008-03-03",
+                  "meta" : {
+                    "globalKey" : "a090644a"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "d2b992f5"
+                }
+              } ],
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "5b2a6e23"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "f8354c3f"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
-                      "assignableLoan" : {
+                      "category" : "BondOrLoan",
+                      "notSubordinated" : true,
+                      "specifiedCurrency" : {
                         "applicable" : true
                       },
-                      "category" : "BOND_OR_LOAN",
-                      "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
-                        "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
+                      "notSovereignLender" : true,
+                      "notDomesticLaw" : true,
                       "notContingent" : true,
                       "notDomesticIssuance" : true,
-                      "notDomesticLaw" : true,
-                      "notSovereignLender" : true,
-                      "notSubordinated" : true,
-                      "specifiedCurrency" : {
+                      "assignableLoan" : {
                         "applicable" : true
                       },
-                      "transferable" : true
+                      "transferable" : true,
+                      "maximumMaturity" : {
+                        "periodMultiplier" : 30,
+                        "period" : "Y",
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
+                      },
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "86788e80"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 30
+                      "globalKey" : "23836c9c"
                     }
                   }
                 },
@@ -218,98 +220,74 @@
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "8GB54M",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "8GB54M"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "5cf1ae36"
-                      },
                       "name" : {
                         "value" : "Kingdom of Thailand"
+                      },
+                      "meta" : {
+                        "globalKey" : "5cf1ae36",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "5cf1ae36"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "US88322KAC53",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "US88322KAC53"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "94d5df65"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "5cf1ae36",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : 1,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "d4955871"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000,
-                      "meta" : {
-                        "globalKey" : "d467e427"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 1000000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "5904ee2e"
-                    },
                     "obligationAcceleration" : true,
                     "repudiationMoratorium" : true,
                     "restructuring" : {
@@ -317,216 +295,238 @@
                       "restructuringType" : {
                         "value" : "R"
                       }
+                    },
+                    "defaultRequirement" : {
+                      "value" : 10000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "d467e427"
+                      }
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "420d5ab4"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "8b9137c0"
-                  },
                   "obligations" : {
-                    "category" : "BOND_OR_LOAN",
+                    "category" : "BondOrLoan",
+                    "notSovereignLender" : true,
                     "notDomesticCurrency" : {
                       "applicable" : true
                     },
-                    "notDomesticIssuance" : true,
                     "notDomesticLaw" : true,
-                    "notSovereignLender" : true
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d1e"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "3"
+                    "notDomesticIssuance" : true
                   },
                   "meta" : {
-                    "globalKey" : "12d1e"
+                    "globalKey" : "4854c87a"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "f3c6314d"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-03",
-                  "lastRegularPaymentDate" : "2008-03-03",
-                  "meta" : {
-                    "globalKey" : "a0906cf6"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "236adceb"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "977f397c"
+                "globalKey" : "d14b3f96"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "42f910b"
-                    }
-                  },
-                  "businessDayConvention" : "MODFOLLOWING",
-                  "meta" : {
-                    "globalKey" : "97b8e49c"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "29255039"
-                },
-                "unadjustedDate" : "2007-12-03"
-              },
-              "meta" : {
-                "globalKey" : "29255039"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "2e18702e"
+            "globalKey" : "73ffef76"
           }
         },
         "meta" : {
-          "globalKey" : "2e18702e"
+          "globalKey" : "73ffef76"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "eef8e284"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.012,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.012,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 20000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 20000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "694c96e8"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "f0236dfc"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 20000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 20000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "c0464618"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9302"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2002-12-02"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37205"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "version" : 1
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af48e19f"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "52e4e05e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "a96779af"
+      }
+    },
+    "meta" : {
+      "globalKey" : "18db6686"
+    }
+  },
+  "meta" : {
+    "globalKey" : "18db6686"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_34.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_34.json
index 99c9c1ea45..f805237337 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_34.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_34.json
@@ -1,112 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "9ee09b61"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "b2724407"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "8f4dd58"
-      }
-    },
-    "meta" : {
-      "globalKey" : "9ee09b61"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "fg4rde3",
-        "globalKey" : "a9fe6e32"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "4627ed18",
+        "externalReference" : "fg4rde3"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56ERT7RHWE4",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "XYZBICXXX"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         },
-        "meta" : {
-          "globalKey" : "2283edb5"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "f6g4h5",
-        "globalKey" : "9ca2e804"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "ABCBICXXX"
-        },
-        "meta" : {
-          "globalKey" : "ba7399be"
-        }
-      } ]
+        "globalKey" : "ab644853"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-12-01",
+      "meta" : {
+        "globalKey" : "3eb301"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "fg4rde3",
-          "globalReference" : "a9fe6e32"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "f6g4h5",
-          "globalReference" : "9ca2e804"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "fg4rde3",
-          "globalReference" : "a9fe6e32"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -114,30 +32,26 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-12-02",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
                 "meta" : {
-                  "globalKey" : "42f910b"
+                  "globalKey" : "eb82a1ba"
                 }
               },
-              "businessDayConvention" : "FOLLOWING",
               "meta" : {
-                "globalKey" : "da556d3a"
+                "globalKey" : "eb82a1ba"
               }
             },
-            "effectiveDate" : {
+            "terminationDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2010-03-21",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -145,338 +59,424 @@
                   }
                 },
                 "meta" : {
-                  "globalKey" : "eb82a1ba"
-                },
-                "unadjustedDate" : "2006-12-02"
+                  "globalKey" : "ebf296cd"
+                }
               },
               "meta" : {
-                "globalKey" : "eb82a1ba"
+                "globalKey" : "ebf296cd"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da556d3a"
               }
             },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f73"
+                    },
+                    "rollConvention" : "20"
+                  },
+                  "meta" : {
+                    "globalKey" : "17f73"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
+                  "firstPaymentDate" : "2018-03-20",
+                  "lastRegularPaymentDate" : "2010-03-20",
+                  "meta" : {
+                    "globalKey" : "43d2162a"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "9a18e13e"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "228c9569"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "138e2661"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "maximumBusinessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
-                      "category" : "REFERENCE_OBLIGATIONS_ONLY",
+                      "category" : "ReferenceObligationsOnly",
+                      "notSubordinated" : true,
+                      "notContingent" : true,
                       "consentRequiredLoan" : {
                         "applicable" : true
                       },
-                      "excluded" : "true",
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
                       },
                       "notBearer" : true,
-                      "notContingent" : true,
-                      "notSubordinated" : true,
-                      "othReferenceEntityObligations" : "true",
-                      "transferable" : true
+                      "excluded" : "true",
+                      "othReferenceEntityObligations" : "true"
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "2be89a2c"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "maximumBusinessDays" : 30
+                      "globalKey" : "1cea2b24"
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
-                    "allGuarantees" : false,
-                    "noReferenceObligation" : true,
                     "referenceEntity" : {
-                      "meta" : {
-                        "globalKey" : "444afa68"
-                      },
                       "name" : {
                         "value" : "CompanyDEF"
+                      },
+                      "meta" : {
+                        "globalKey" : "444afa68"
                       }
                     },
+                    "noReferenceObligation" : true,
+                    "allGuarantees" : false,
                     "referencePrice" : {
+                      "value" : 1.0000000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.0000000000,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     },
                     "securedList" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "1b48e6ab"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "publicSource" : [ "Standard Public Sources" ],
-                        "specifiedNumber" : 2
+                    "failureToPay" : {
+                      "applicable" : true,
+                      "paymentRequirement" : {
+                        "value" : 500000,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "USD"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "6c32a26b"
+                        }
                       }
                     },
                     "defaultRequirement" : {
+                      "value" : 5000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 5000000,
                       "meta" : {
                         "globalKey" : "1a10e2d1"
                       }
                     },
-                    "failureToPay" : {
-                      "applicable" : true,
-                      "paymentRequirement" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "USD"
-                          }
-                        },
-                        "value" : 500000,
-                        "meta" : {
-                          "globalKey" : "6c32a26b"
-                        }
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "publicSource" : [ "Standard Public Sources" ],
+                        "specifiedNumber" : 2
                       }
                     },
                     "meta" : {
-                      "globalKey" : "84a507f9"
+                      "globalKey" : "b45b5d03"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "c0000e25"
-                  },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY",
+                    "category" : "BorrowedMoney",
+                    "notSubordinated" : true,
+                    "excluded" : "true",
+                    "othReferenceEntityObligations" : "true",
                     "designatedPriority" : {
                       "value" : "FirstLienLoan"
-                    },
-                    "excluded" : "true",
-                    "notSubordinated" : true,
-                    "othReferenceEntityObligations" : "true"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
                     }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c47"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "20"
                   },
                   "meta" : {
-                    "globalKey" : "28c47"
+                    "globalKey" : "ff84437d"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "1af170a4"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2018-03-20",
-                  "lastRegularPaymentDate" : "2010-03-20",
-                  "meta" : {
-                    "globalKey" : "43d21ed6"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "4fbd643f"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "5da7f2d9"
+                "globalKey" : "3cbf377d"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "ebf296cd"
-                },
-                "unadjustedDate" : "2010-03-21"
-              },
-              "meta" : {
-                "globalKey" : "ebf296cd"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "fd8d5b21"
+            "globalKey" : "f350b317"
           }
         },
         "meta" : {
-          "globalKey" : "fd8d5b21"
+          "globalKey" : "f350b317"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "5a207dbd"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0115,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0115,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e9ef39e3"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "63b2e9b8",
+          "externalReference" : "f6g4h5"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4627ed18",
+          "externalReference" : "fg4rde3"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "4627ed18",
+          "externalReference" : "fg4rde3"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb301"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "XYZBICXXX",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
+        },
+        "meta" : {
+          "globalKey" : "2283edb5"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2006-12-01"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "4627ed18",
+        "externalKey" : "fg4rde3"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABCBICXXX",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "56ERT7RHWE4"
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "ba7399be"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "fg4rde3",
-        "globalReference" : "a9fe6e32"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "91bdb1d3"
+        "globalKey" : "63b2e9b8",
+        "externalKey" : "f6g4h5"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "e9431741"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "3fc5b092"
+      }
+    },
+    "meta" : {
+      "globalKey" : "d0481329"
+    }
+  },
+  "meta" : {
+    "globalKey" : "d0481329"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_37.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_37.json
index 688308c67c..c0ca2a302a 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_37.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_37.json
@@ -1,92 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "e2dfa08a"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "b2724407"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "b2724407"
-      }
-    },
-    "meta" : {
-      "globalKey" : "e2dfa08a"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "tif563d",
-        "globalKey" : "9c430c06"
-      },
-      "name" : {
-        "value" : "Morgan Stanley Capital Services"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "3ad6e637",
+        "externalReference" : "fyure4"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DJITRAXXUSDMS5Y",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "MSCSBIC"
+            "scheme" : "http://www.barclaysglobal.com/partners/schema/v1-1/schemes/tradeID"
+          }
         },
-        "meta" : {
-          "globalKey" : "7ab8f086"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "fyure4",
-        "globalKey" : "efd9a2d9"
-      },
-      "name" : {
-        "value" : "Barclays Global Investors"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "BGIBIC"
-        },
-        "meta" : {
-          "globalKey" : "74aa8db8"
-        }
-      } ]
+        "globalKey" : "5a184390"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2004-01-24",
+      "meta" : {
+        "globalKey" : "3ea058"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "tif563d",
-          "globalReference" : "9c430c06"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "fyure4",
-          "globalReference" : "efd9a2d9"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -96,6 +34,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2004-03-23",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -104,169 +43,223 @@
                 },
                 "meta" : {
                   "globalKey" : "eb3e6e4f"
-                },
-                "unadjustedDate" : "2004-03-23"
+                }
               },
               "meta" : {
                 "globalKey" : "eb3e6e4f"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-03-20",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ebd48b0c"
+                }
+              },
+              "meta" : {
+                "globalKey" : "ebd48b0c"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
-                  },
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/ACT.ISDA"
+                },
+                "meta" : {
+                  "globalKey" : "28d6c3e0"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "8acaa41a"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH",
+                  "meta" : {
+                    "globalKey" : "428ca78"
+                  },
                   "cashSettlementTerms" : [ {
-                    "meta" : {
-                      "globalKey" : "c9e9e5c1"
-                    },
                     "valuationMethod" : {
-                      "minimumQuotationAmount" : {
+                      "quotationAmount" : {
+                        "value" : 40000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 50000,
                         "meta" : {
-                          "globalKey" : "c16d8791"
+                          "globalKey" : "598c5ab2"
                         }
                       },
-                      "quotationAmount" : {
+                      "minimumQuotationAmount" : {
+                        "value" : 50000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 40000,
                         "meta" : {
-                          "globalKey" : "598c5ab2"
+                          "globalKey" : "c16d8791"
                         }
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "43480c1f"
                     }
                   } ]
                 },
                 "generalTerms" : {
                   "basketReferenceInformation" : {
-                    "basketId" : [ {
-                      "meta" : {
-                        "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
-                      },
-                      "value" : "BASKET089"
-                    } ],
                     "basketName" : {
+                      "value" : "CDS Basket Sample",
                       "meta" : {
                         "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
-                      },
-                      "value" : "CDS Basket Sample"
+                      }
                     },
+                    "basketId" : [ {
+                      "value" : "BASKET089",
+                      "meta" : {
+                        "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
+                      }
+                    } ],
                     "referencePool" : {
                       "referencePoolItem" : [ {
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "008HA7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                              },
-                              "value" : "008HA7"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "r65hfd",
-                              "globalKey" : "6b99b4c1"
-                            },
                             "name" : {
                               "value" : "Agrium Inc."
+                            },
+                            "meta" : {
+                              "globalKey" : "6b99b4c1",
+                              "externalKey" : "r65hfd"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "r65hfd",
-                              "globalReference" : "6b99b4c1"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "008916AB4",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                                    },
-                                    "value" : "008916AB4"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "ab7bdc95"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "6b99b4c1",
+                              "externalReference" : "r65hfd"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
                         }
                       }, {
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "8G836J",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                              },
-                              "value" : "8G836J"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "uiyn4",
-                              "globalKey" : "92cc27"
-                            },
                             "name" : {
                               "value" : "Tenet Healthcare Corporation"
+                            },
+                            "meta" : {
+                              "globalKey" : "92cc27",
+                              "externalKey" : "uiyn4"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "uiyn4",
-                              "globalReference" : "92cc27"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "88033GAT7",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                                    },
-                                    "value" : "88033GAT7"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "db5db955"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "92cc27",
+                              "externalReference" : "uiyn4"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
                         }
                       } ]
@@ -277,212 +270,219 @@
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "15c5a99"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "gracePeriodExtension" : {
                         "applicable" : true,
                         "gracePeriod" : {
-                          "meta" : {
-                            "globalKey" : "83c"
-                          },
+                          "periodMultiplier" : 0,
                           "period" : "D",
-                          "periodMultiplier" : 0
+                          "meta" : {
+                            "globalKey" : "44"
+                          }
                         }
                       },
                       "paymentRequirement" : {
+                        "value" : 1000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "GBP"
                           }
                         },
-                        "value" : 1000000.00,
                         "meta" : {
                           "globalKey" : "48eae7c4"
                         }
                       }
                     },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "d7154083"
+                      "globalKey" : "f8d2401"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "969cb413"
-                  },
                   "obligations" : {
-                    "category" : "BOND_OR_LOAN"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
+                    "category" : "BondOrLoan"
                   },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/ACT.ISDA"
-                },
-                "meta" : {
-                  "globalKey" : "e55fc83e"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "47427797"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "90a9b011"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "ebd48b0c"
-                },
-                "unadjustedDate" : "2009-03-20"
+                  "globalKey" : "1b803879"
+                }
               },
               "meta" : {
-                "globalKey" : "ebd48b0c"
+                "globalKey" : "14bd6c59"
               }
             }
           },
           "meta" : {
-            "globalKey" : "3a57b5a4"
+            "globalKey" : "4c0ba79c"
           }
         },
         "meta" : {
-          "globalKey" : "3a57b5a4"
+          "globalKey" : "4c0ba79c"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3a43e344"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0060,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0060,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e38853c"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "b6d67b86",
+          "externalReference" : "tif563d"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "3ad6e637",
+          "externalReference" : "fyure4"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea058"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "MSCSBIC",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
+        },
+        "meta" : {
+          "globalKey" : "7ab8f086"
+        }
+      } ],
+      "name" : {
+        "value" : "Morgan Stanley Capital Services"
       },
-      "value" : "2004-01-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "b6d67b86",
+        "externalKey" : "tif563d"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BGIBIC",
           "meta" : {
-            "scheme" : "http://www.barclaysglobal.com/partners/schema/v1-1/schemes/tradeID"
-          },
-          "value" : "DJITRAXXUSDMS5Y"
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "74aa8db8"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "fyure4",
-        "globalReference" : "efd9a2d9"
+      "name" : {
+        "value" : "Barclays Global Investors"
       },
       "meta" : {
-        "globalKey" : "127eb2d0"
+        "globalKey" : "3ad6e637",
+        "externalKey" : "fyure4"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "e9431741"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "e9431741"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "e639986"
+    }
+  },
+  "meta" : {
+    "globalKey" : "e639986"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_41.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_41.json
index 00d88384cb..d8e6af87da 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_41.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_41.json
@@ -1,114 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "ce264239"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "b2724407"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "8f4dd58"
-      }
-    },
-    "meta" : {
-      "globalKey" : "ce264239"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37209",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
-        }
-      } ]
+        "globalKey" : "1cbdb923"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-04",
+      "meta" : {
+        "globalKey" : "3e9304"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -116,13 +32,54 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-12-05",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb0a8cfd"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "meta" : {
+                "globalKey" : "eb0a8cfd"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-12-05",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    }, {
+                      "value" : "JPTO"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "81e56a96"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "58681de7"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "28faf882"
+                }
+              },
+              "meta" : {
+                "globalKey" : "28faf882"
+              }
             },
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "GBLO"
@@ -135,371 +92,414 @@
                   "globalKey" : "81e56a96"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "58681de7"
               }
             },
-            "effectiveDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
+            "payout" : {
+              "interestRatePayout" : [ {
+                "payerReceiver" : {
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "eb0a8cfd"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2002-12-05"
-              },
-              "meta" : {
-                "globalKey" : "eb0a8cfd"
-              }
-            },
-            "payout" : {
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204c"
+                    },
+                    "rollConvention" : "5"
+                  },
+                  "meta" : {
+                    "globalKey" : "204c"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-03-05",
+                  "meta" : {
+                    "globalKey" : "7473f5c5"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c3ce76f8"
+                }
+              } ],
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "45e0d7b2"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "JPY"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "5f4774ca"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
+                      "category" : "BondOrLoan",
+                      "notSubordinated" : true,
+                      "specifiedCurrency" : {
+                        "applicable" : true
+                      },
+                      "notContingent" : true,
                       "assignableLoan" : {
                         "applicable" : true
                       },
-                      "category" : "BOND_OR_LOAN",
                       "consentRequiredLoan" : {
                         "applicable" : true
                       },
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
-                      "notContingent" : true,
-                      "notSubordinated" : true,
-                      "specifiedCurrency" : {
-                        "applicable" : true
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
                       },
-                      "transferable" : true
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "237559c8"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 30
+                      "globalKey" : "3cdbf6e0"
                     }
                   }
                 },
                 "generalTerms" : {
-                  "modifiedEquityDelivery" : true,
                   "referenceInformation" : {
-                    "allGuarantees" : true,
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "004CC9",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "004CC9"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "e414546d"
-                      },
                       "name" : {
                         "value" : "ACOM CO., LTD."
+                      },
+                      "meta" : {
+                        "globalKey" : "e414546d",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "e414546d"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "JP310860A032",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "JP310860A032"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "b94feaa3"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "e414546d",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
+                    "allGuarantees" : true,
                     "referencePrice" : {
+                      "value" : 1,
                       "unit" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "value" : 1,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "b5bb1876"
+                  },
+                  "modifiedEquityDelivery" : true
                 },
                 "protectionTerms" : [ {
                   "creditEvents" : {
+                    "restructuring" : {
+                      "applicable" : true,
+                      "multipleHolderObligation" : true,
+                      "multipleCreditEventNotices" : true
+                    },
                     "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
                       "businessCenter" : "GBLO",
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
                       "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
                       }
                     },
                     "meta" : {
-                      "globalKey" : "5c2b79f"
-                    },
-                    "restructuring" : {
-                      "applicable" : true,
-                      "multipleCreditEventNotices" : true,
-                      "multipleHolderObligation" : true
+                      "globalKey" : "a12d3685"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "c875397b"
-                  },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY",
+                    "category" : "BorrowedMoney",
                     "notSubordinated" : true
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d20"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "5"
                   },
                   "meta" : {
-                    "globalKey" : "12d20"
+                    "globalKey" : "b67a88d5"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "a52eef0e"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-05",
-                  "meta" : {
-                    "globalKey" : "7473fe71"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "8d45e28c"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "54ef3084"
+                "globalKey" : "517d8294"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    }, {
-                      "value" : "JPTO"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "81e56a96"
-                    }
-                  },
-                  "businessDayConvention" : "MODFOLLOWING",
-                  "meta" : {
-                    "globalKey" : "58681de7"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "28faf882"
-                },
-                "unadjustedDate" : "2007-12-05"
-              },
-              "meta" : {
-                "globalKey" : "28faf882"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "f0b3cd04"
+            "globalKey" : "87d3bf64"
           }
         },
         "meta" : {
-          "globalKey" : "f0b3cd04"
+          "globalKey" : "87d3bf64"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a7b31de6"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.007,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "value" : 0.007,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 500000000,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
-              },
-              "value" : 500000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d74a447e"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "4eb09eda"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 500000000,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
-              },
-              "value" : 500000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "11fe4b42"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9304"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2002-12-04"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37209"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "version" : 1
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af48f0a3"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "e9431741"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "3fc5b092"
+      }
+    },
+    "meta" : {
+      "globalKey" : "de3cdac5"
+    }
+  },
+  "meta" : {
+    "globalKey" : "de3cdac5"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_42.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_42.json
index dda54231d4..5187863b36 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_42.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_42.json
@@ -1,114 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "ce264239"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "b2724407"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "8f4dd58"
-      }
-    },
-    "meta" : {
-      "globalKey" : "ce264239"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37209",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
-        }
-      } ]
+        "globalKey" : "1cbdb923"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-04",
+      "meta" : {
+        "globalKey" : "3e9304"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -116,13 +32,54 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-12-05",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb0a8cfd"
+                }
+              },
+              "meta" : {
+                "globalKey" : "eb0a8cfd"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-12-05",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    }, {
+                      "value" : "JPTO"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "81e56a96"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "58681de7"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "28faf882"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "meta" : {
+                "globalKey" : "28faf882"
+              }
             },
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "GBLO"
@@ -135,371 +92,414 @@
                   "globalKey" : "81e56a96"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "58681de7"
               }
             },
-            "effectiveDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
+            "payout" : {
+              "interestRatePayout" : [ {
+                "payerReceiver" : {
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "eb0a8cfd"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2002-12-05"
-              },
-              "meta" : {
-                "globalKey" : "eb0a8cfd"
-              }
-            },
-            "payout" : {
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204c"
+                    },
+                    "rollConvention" : "5"
+                  },
+                  "meta" : {
+                    "globalKey" : "204c"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-03-05",
+                  "meta" : {
+                    "globalKey" : "7473f5c5"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c3ce76f8"
+                }
+              } ],
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "45e0d7b2"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "JPY"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "5f4774ca"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
+                      "category" : "BondOrLoan",
+                      "notSubordinated" : true,
+                      "specifiedCurrency" : {
+                        "applicable" : true
+                      },
+                      "notContingent" : true,
                       "assignableLoan" : {
                         "applicable" : true
                       },
-                      "category" : "BOND_OR_LOAN",
                       "consentRequiredLoan" : {
                         "applicable" : true
                       },
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
-                      "notContingent" : true,
-                      "notSubordinated" : true,
-                      "specifiedCurrency" : {
-                        "applicable" : true
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
                       },
-                      "transferable" : true
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "237559c8"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 30
+                      "globalKey" : "3cdbf6e0"
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
-                    "allGuarantees" : true,
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "004CC9",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "004CC9"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "e414546d"
-                      },
                       "name" : {
                         "value" : "ACOM CO., LTD."
+                      },
+                      "meta" : {
+                        "globalKey" : "e414546d",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "e414546d"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "JP310860A032",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "JP310860A032"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "b94feaa3"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "e414546d",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
+                    "allGuarantees" : true,
                     "referencePrice" : {
+                      "value" : 1,
                       "unit" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "value" : 1,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   },
                   "substitution" : true
                 },
-                "meta" : {
-                  "globalKey" : "b5bb1876"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
+                    "restructuring" : {
+                      "applicable" : true,
+                      "multipleHolderObligation" : true,
+                      "multipleCreditEventNotices" : true
+                    },
                     "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
                       "businessCenter" : "GBLO",
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
                       "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
                       }
                     },
                     "meta" : {
-                      "globalKey" : "5c2b79f"
-                    },
-                    "restructuring" : {
-                      "applicable" : true,
-                      "multipleCreditEventNotices" : true,
-                      "multipleHolderObligation" : true
+                      "globalKey" : "a12d3685"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "c875397b"
-                  },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY",
+                    "category" : "BorrowedMoney",
                     "notSubordinated" : true
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d20"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "5"
                   },
                   "meta" : {
-                    "globalKey" : "12d20"
+                    "globalKey" : "b67a88d5"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "a52eef0e"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-05",
-                  "meta" : {
-                    "globalKey" : "7473fe71"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "8d45e28c"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "54ef3084"
+                "globalKey" : "517d8294"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    }, {
-                      "value" : "JPTO"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "81e56a96"
-                    }
-                  },
-                  "businessDayConvention" : "MODFOLLOWING",
-                  "meta" : {
-                    "globalKey" : "58681de7"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "28faf882"
-                },
-                "unadjustedDate" : "2007-12-05"
-              },
-              "meta" : {
-                "globalKey" : "28faf882"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "f0b3cd04"
+            "globalKey" : "87d3bf64"
           }
         },
         "meta" : {
-          "globalKey" : "f0b3cd04"
+          "globalKey" : "87d3bf64"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a7b31de6"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.007,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "value" : 0.007,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 500000000,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
-              },
-              "value" : 500000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d74a447e"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "4eb09eda"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 500000000,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
-              },
-              "value" : 500000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "11fe4b42"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9304"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2002-12-04"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37209"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "version" : 1
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af48f0a3"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "e9431741"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "3fc5b092"
+      }
+    },
+    "meta" : {
+      "globalKey" : "de3cdac5"
+    }
+  },
+  "meta" : {
+    "globalKey" : "de3cdac5"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_44.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_44.json
index bf55ffb214..644b826d13 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_44.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_44.json
@@ -1,89 +1,31 @@
 {
-  "meta" : {
-    "globalKey" : "8834f349"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "955bda07"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "955bda07"
-      }
-    },
-    "meta" : {
-      "globalKey" : "8834f349"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "c2eb8824"
-      },
-      "name" : {
-        "value" : "Morgan Stanley Captial Services"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "c6a2653c",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DJITRAXXUSDMS5Y",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "I7331LVCZKQKX5T7XV54"
+            "scheme" : "http://www.barclaysglobal.com/partners/schema/v1-1/schemes/tradeID"
+          }
         },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "ed2a322e"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "139798fc"
-      },
-      "name" : {
-        "value" : "Barclays Global Investors"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "213800H14XVWOV87OI72"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "28e409fd"
-        }
-      } ]
+        "globalKey" : "52b9f3fd",
+        "externalKey" : "tid1"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2004-01-24",
+      "meta" : {
+        "globalKey" : "3ea058"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "c2eb8824"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "139798fc"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -93,6 +35,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2004-03-23",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -101,504 +44,561 @@
                 },
                 "meta" : {
                   "globalKey" : "eb3e6e4f"
-                },
-                "unadjustedDate" : "2004-03-23"
+                }
               },
               "meta" : {
                 "globalKey" : "eb3e6e4f"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-03-20",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ebd48b0c"
+                }
+              },
+              "meta" : {
+                "globalKey" : "ebd48b0c"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
-                  },
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/ACT.ISDA"
+                },
+                "meta" : {
+                  "globalKey" : "28d6c3e0"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "generalTerms" : {
                   "basketReferenceInformation" : {
-                    "basketId" : [ {
-                      "meta" : {
-                        "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
-                      },
-                      "value" : "BASKET089"
-                    } ],
                     "basketName" : {
+                      "value" : "CDS Basket Sample",
                       "meta" : {
                         "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
-                      },
-                      "value" : "CDS Basket Sample"
+                      }
                     },
-                    "nthToDefault" : 1,
+                    "basketId" : [ {
+                      "value" : "BASKET089",
+                      "meta" : {
+                        "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
+                      }
+                    } ],
                     "referencePool" : {
                       "referencePoolItem" : [ {
-                        "cashSettlementTermsReference" : {
-                          "externalReference" : "settlementTermsOne"
-                        },
                         "constituentWeight" : {
                           "basketPercentage" : 0.40
                         },
-                        "physicalSettlementTermsReference" : {
-                          "externalReference" : "settlementTermsOne"
-                        },
-                        "protectionTermsReference" : {
-                          "externalReference" : "protectionTermsOne",
-                          "globalReference" : "969cb413"
-                        },
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "008HA7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                              },
-                              "value" : "008HA7"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "agriumEntity",
-                              "globalKey" : "6b99b4c1"
-                            },
                             "name" : {
                               "value" : "Agrium Inc."
+                            },
+                            "meta" : {
+                              "globalKey" : "6b99b4c1",
+                              "externalKey" : "agriumEntity"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "agriumEntity",
-                              "globalReference" : "6b99b4c1"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "008916AB4",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                                    },
-                                    "value" : "008916AB4"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "ab7bdc95"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "6b99b4c1",
+                              "externalReference" : "agriumEntity"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
-                        }
-                      }, {
+                        },
+                        "protectionTermsReference" : {
+                          "globalReference" : "90a9b011",
+                          "externalReference" : "protectionTermsOne"
+                        },
                         "cashSettlementTermsReference" : {
                           "externalReference" : "settlementTermsOne"
                         },
-                        "constituentWeight" : {
-                          "openUnits" : 20
-                        },
                         "physicalSettlementTermsReference" : {
                           "externalReference" : "settlementTermsOne"
-                        },
-                        "protectionTermsReference" : {
-                          "externalReference" : "protectionTermsOne",
-                          "globalReference" : "969cb413"
+                        }
+                      }, {
+                        "constituentWeight" : {
+                          "openUnits" : 20
                         },
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "8G836J",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                              },
-                              "value" : "8G836J"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "tenetEntity",
-                              "globalKey" : "92cc27"
-                            },
                             "name" : {
                               "value" : "Tenet Healthcare Corporation"
+                            },
+                            "meta" : {
+                              "globalKey" : "92cc27",
+                              "externalKey" : "tenetEntity"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "tenetEntity",
-                              "globalReference" : "92cc27"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "88033GAT7",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                                    },
-                                    "value" : "88033GAT7"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "db5db955"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "92cc27",
+                              "externalReference" : "tenetEntity"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
-                        }
-                      }, {
+                        },
+                        "protectionTermsReference" : {
+                          "globalReference" : "90a9b011",
+                          "externalReference" : "protectionTermsOne"
+                        },
                         "cashSettlementTermsReference" : {
-                          "externalReference" : "settlementTermsTwo"
+                          "externalReference" : "settlementTermsOne"
                         },
+                        "physicalSettlementTermsReference" : {
+                          "externalReference" : "settlementTermsOne"
+                        }
+                      }, {
                         "constituentWeight" : {
                           "basketPercentage" : 0.30
                         },
-                        "physicalSettlementTermsReference" : {
-                          "externalReference" : "settlementTermsTwo"
-                        },
-                        "protectionTermsReference" : {
-                          "externalReference" : "protectionTermsTwo",
-                          "globalReference" : "14db9136"
-                        },
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "8G8KT",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                              },
-                              "value" : "8G8KT"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "telecoEntity",
-                              "globalKey" : "2c781556"
-                            },
                             "name" : {
                               "value" : "Teleco Corporation Europe"
+                            },
+                            "meta" : {
+                              "globalKey" : "2c781556",
+                              "externalKey" : "telecoEntity"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "tenetEntity",
-                              "globalReference" : "92cc27"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "88033GAT7",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                                    },
-                                    "value" : "88033GAT7"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "db5db955"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "92cc27",
+                              "externalReference" : "tenetEntity"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
+                        },
+                        "protectionTermsReference" : {
+                          "globalReference" : "71d88c7e",
+                          "externalReference" : "protectionTermsTwo"
+                        },
+                        "cashSettlementTermsReference" : {
+                          "externalReference" : "settlementTermsTwo"
+                        },
+                        "physicalSettlementTermsReference" : {
+                          "externalReference" : "settlementTermsTwo"
                         }
                       } ]
-                    }
+                    },
+                    "nthToDefault" : 1
                   }
                 },
-                "meta" : {
-                  "globalKey" : "864722f4"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "gracePeriodExtension" : {
                         "applicable" : true,
                         "gracePeriod" : {
-                          "meta" : {
-                            "globalKey" : "83c"
-                          },
+                          "periodMultiplier" : 0,
                           "period" : "D",
-                          "periodMultiplier" : 0
+                          "meta" : {
+                            "globalKey" : "44"
+                          }
                         }
                       },
                       "paymentRequirement" : {
+                        "value" : 1000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "GBP"
                           }
                         },
-                        "value" : 1000000.00,
                         "meta" : {
                           "globalKey" : "48eae7c4"
                         }
                       }
                     },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "d7154083"
+                      "globalKey" : "f8d2401"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "protectionTermsOne",
-                    "globalKey" : "969cb413"
-                  },
                   "obligations" : {
-                    "category" : "BOND_OR_LOAN"
+                    "category" : "BondOrLoan"
+                  },
+                  "meta" : {
+                    "globalKey" : "90a9b011",
+                    "externalKey" : "protectionTermsOne"
                   }
                 }, {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "gracePeriodExtension" : {
                         "applicable" : true,
                         "gracePeriod" : {
+                          "periodMultiplier" : 1,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "ea4baf23"
+                            "globalKey" : "ea4abbbd"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 1,
-                          "dayType" : "BUSINESS"
+                          "dayType" : "Business"
                         }
                       },
                       "paymentRequirement" : {
+                        "value" : 1000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "GBP"
                           }
                         },
-                        "value" : 1000000.00,
                         "meta" : {
                           "globalKey" : "48eae7c4"
                         }
                       }
                     },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "909f0a66"
+                      "globalKey" : "e5b237ae"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "protectionTermsTwo",
-                    "globalKey" : "14db9136"
-                  },
                   "obligations" : {
-                    "category" : "BOND_OR_LOAN"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
+                    "category" : "BondOrLoan"
                   },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/ACT.ISDA"
-                },
-                "meta" : {
-                  "globalKey" : "e55fc83e"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "c89eca32"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "71d88c7e",
+                    "externalKey" : "protectionTermsTwo"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "ebd48b0c"
-                },
-                "unadjustedDate" : "2009-03-20"
+                  "globalKey" : "393f21f2"
+                }
               },
               "meta" : {
-                "globalKey" : "ebd48b0c"
+                "globalKey" : "5e6a9a12"
               }
             }
           },
           "meta" : {
-            "globalKey" : "708117ab"
+            "globalKey" : "473d62af"
           }
         },
         "meta" : {
-          "globalKey" : "708117ab"
+          "globalKey" : "473d62af"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3a43e344"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0060,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0060,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e38853c"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d467a863"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-3"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 10000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-3"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "b88d63fd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "3cfd1fa4",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "c6a2653c",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea058"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "I7331LVCZKQKX5T7XV54",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "ed2a322e"
+        }
+      } ],
+      "name" : {
+        "value" : "Morgan Stanley Captial Services"
       },
-      "value" : "2004-01-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "3cfd1fa4",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "213800H14XVWOV87OI72",
           "meta" : {
-            "scheme" : "http://www.barclaysglobal.com/partners/schema/v1-1/schemes/tradeID"
-          },
-          "value" : "DJITRAXXUSDMS5Y"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "version" : 1
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "28e409fd"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "139798fc"
+      "name" : {
+        "value" : "Barclays Global Investors"
       },
       "meta" : {
-        "externalKey" : "tid1",
-        "globalKey" : "223ba1bd"
+        "globalKey" : "c6a2653c",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "955bda07"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "955bda07"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "480f74f1"
+    }
+  },
+  "meta" : {
+    "globalKey" : "480f74f1"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_14.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_14.json
index 005c14d39a..7da36c9a98 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_14.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_14.json
@@ -1,85 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "778469ce"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2003-06-06",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_2003_CREDIT_NORTH_AMERICAN"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "24983006"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "24983006"
-      }
-    },
-    "meta" : {
-      "globalKey" : "778469ce"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "xyz1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
+            "scheme" : "http://www.xyzbank.com/cd-trade-id"
+          }
         },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
-        }
-      } ]
+        "globalKey" : "bb09ada7"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-03",
+      "meta" : {
+        "globalKey" : "3e9303"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -89,249 +34,304 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-12-04",
                 "meta" : {
                   "globalKey" : "3e9304"
-                },
-                "unadjustedDate" : "2002-12-04"
+                }
               },
               "meta" : {
                 "globalKey" : "3e9304"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2000-09-06",
+                "meta" : {
+                  "globalKey" : "3e8246"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3e8246"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204d"
+                    },
+                    "rollConvention" : "6"
                   },
+                  "meta" : {
+                    "globalKey" : "204d"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-03-06",
+                  "meta" : {
+                    "globalKey" : "74746a24"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "e50faed6"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "8G836J",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "8G836J"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "92cc27"
-                      },
                       "name" : {
                         "value" : "Tenet Healthcare Corporation"
+                      },
+                      "meta" : {
+                        "globalKey" : "92cc27",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "92cc27"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "88033GAT7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                              },
-                              "value" : "88033GAT7"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "db5db955"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "92cc27",
+                        "externalReference" : "referenceEntity"
                       }
                     } ]
                   }
                 },
-                "meta" : {
-                  "globalKey" : "dbad4007"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "meta" : {
-                      "globalKey" : "4cf"
-                    },
                     "restructuring" : {
                       "applicable" : true
+                    },
+                    "meta" : {
+                      "globalKey" : "4cf"
                     }
                   },
                   "meta" : {
                     "globalKey" : "4cf"
                   }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d21"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "6"
-                  },
-                  "meta" : {
-                    "globalKey" : "12d21"
-                  }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "e0b59430"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-06",
-                  "meta" : {
-                    "globalKey" : "747472d0"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "b13cf463"
                 }
-              } ],
-              "meta" : {
-                "globalKey" : "433b8077"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3e8246"
-                },
-                "unadjustedDate" : "2000-09-06"
               },
               "meta" : {
-                "globalKey" : "3e8246"
+                "globalKey" : "54b323b9"
               }
             }
           },
           "meta" : {
-            "globalKey" : "375c1573"
+            "globalKey" : "5ba39637"
           }
         },
         "meta" : {
-          "globalKey" : "375c1573"
+          "globalKey" : "5ba39637"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "1f273178"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.01,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c5befd88"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9303"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2002-12-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.xyzbank.com/cd-trade-id"
-          },
-          "value" : "xyz1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "version" : 1
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "ea69d427"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2003-06-06",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2003CreditNorthAmerican"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "24983006"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "24983006"
+      }
+    },
+    "meta" : {
+      "globalKey" : "ee282b4a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "ee282b4a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_21_economicTermsEffectiveDate.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_21_economicTermsEffectiveDate.json
index 366017c865..04d07c166b 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_21_economicTermsEffectiveDate.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_21_economicTermsEffectiveDate.json
@@ -1,114 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "c465e494"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "14914b1c"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "6b13e46d"
-      }
-    },
-    "meta" : {
-      "globalKey" : "c465e494"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37263",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
-        }
-      } ]
+        "globalKey" : "1cbdb9d7"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-11-13",
+      "meta" : {
+        "globalKey" : "3e92cd"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -116,30 +32,26 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-11-14",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
                 "meta" : {
-                  "globalKey" : "42f910b"
+                  "globalKey" : "eb09be86"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
-                "globalKey" : "97b8e49c"
+                "globalKey" : "eb09be86"
               }
             },
-            "effectiveDate" : {
+            "terminationDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2007-11-14",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -147,70 +59,160 @@
                   }
                 },
                 "meta" : {
-                  "globalKey" : "eb09be86"
-                },
-                "unadjustedDate" : "2002-11-14"
+                  "globalKey" : "eb9fe686"
+                }
               },
               "meta" : {
-                "globalKey" : "eb09be86"
+                "globalKey" : "eb9fe686"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "97b8e49c"
               }
             },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "firstPeriodStartDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2002-11-14",
+                      "meta" : {
+                        "globalKey" : "3e92ce"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3e92ce"
+                    }
                   },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f58"
+                    },
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "c5fdfb26"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-02-14",
+                  "meta" : {
+                    "globalKey" : "745af55c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "58a9fb97"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "10779c5"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "1a6e16dd"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
+                      "category" : "BondOrLoan",
+                      "specifiedCurrency" : {
+                        "applicable" : true
+                      },
+                      "notSovereignLender" : true,
+                      "notContingent" : true,
                       "assignableLoan" : {
                         "applicable" : true
                       },
-                      "category" : "BOND_OR_LOAN",
                       "consentRequiredLoan" : {
                         "applicable" : true
                       },
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
-                      "notContingent" : true,
-                      "notSovereignLender" : true,
-                      "specifiedCurrency" : {
-                        "applicable" : true
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
                       },
-                      "transferable" : true
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "237559c8"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 30
+                      "globalKey" : "3cdbf6e0"
                     }
                   }
                 },
@@ -218,98 +220,74 @@
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "4AB951",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "4AB951"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "546f933e"
-                      },
                       "name" : {
                         "value" : "Republic of Italy"
+                      },
+                      "meta" : {
+                        "globalKey" : "546f933e",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "546f933e"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "XS0125141316",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "XS0125141316"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "2f914ab8"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "546f933e",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : -1,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : -1,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "f08c860a"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000,
-                      "meta" : {
-                        "globalKey" : "d467e427"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 1000000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "5904ee2e"
-                    },
                     "obligationAcceleration" : true,
                     "repudiationMoratorium" : true,
                     "restructuring" : {
@@ -317,210 +295,232 @@
                       "restructuringType" : {
                         "value" : "R"
                       }
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "a28a54a3"
-                  },
-                  "obligations" : {
-                    "category" : "BORROWED_MONEY"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c2c"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "14"
-                  },
-                  "firstPeriodStartDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3e92ce"
+                    "defaultRequirement" : {
+                      "value" : 10000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
                       },
-                      "unadjustedDate" : "2002-11-14"
+                      "meta" : {
+                        "globalKey" : "d467e427"
+                      }
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "3e92ce"
+                      "globalKey" : "420d5ab4"
                     }
                   },
+                  "obligations" : {
+                    "category" : "BorrowedMoney"
+                  },
                   "meta" : {
-                    "globalKey" : "28b48722"
+                    "globalKey" : "6b29b7a9"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "3d31e8fb"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-02-14",
-                  "meta" : {
-                    "globalKey" : "745afe08"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "6a04ce8c"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "17fe37b1"
+                "globalKey" : "37e39d95"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "eb9fe686"
-                },
-                "unadjustedDate" : "2007-11-14"
-              },
-              "meta" : {
-                "globalKey" : "eb9fe686"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "44af06e7"
+            "globalKey" : "93b584c1"
           }
         },
         "meta" : {
-          "globalKey" : "44af06e7"
+          "globalKey" : "93b584c1"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "aff2c312"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0011,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0011,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 50000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "27faaf2b"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "4e659f2e"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 50000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "d75b3635"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e92cd"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2002-11-13"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37263"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "version" : 1
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af4b9457"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "52e4e05e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "a96779af"
+      }
+    },
+    "meta" : {
+      "globalKey" : "f10c6312"
+    }
+  },
+  "meta" : {
+    "globalKey" : "f10c6312"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_21_payoutEffectiveDate.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_21_payoutEffectiveDate.json
index c5845f5f1d..fadaa71964 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_21_payoutEffectiveDate.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_21_payoutEffectiveDate.json
@@ -1,61 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "755b0bce"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "755b0bce"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "c96f9f72"
-      },
-      "name" : {
-        "value" : "Party A"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "70f86d60",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "TW9235",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "PARTYAUS33"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         },
-        "meta" : {
-          "globalKey" : "399a8239"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c6416b25"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "BARCGB2L"
-        },
-        "meta" : {
-          "globalKey" : "c6416b25"
-        }
-      } ]
+        "globalKey" : "ae11048a"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "1994-12-12",
+      "meta" : {
+        "globalKey" : "3e530c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "c96f9f72"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c6416b25"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -66,46 +35,40 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c89"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -114,120 +77,125 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
-                    },
-                    "meta" : {
-                      "globalKey" : "ea1a6ec6"
-                    }
-                  },
-                  "firstPeriodStartDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "NONE",
-                        "meta" : {
-                          "globalKey" : "24a738"
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "ad8abf26"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "DEFR"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "1ff50d"
+                            "globalKey" : "1ff50d",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365af8de"
                         }
                       },
                       "meta" : {
                         "globalKey" : "a8d53690"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "a8d53690"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "787df235"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa45fc6"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
+                  "firstPeriodStartDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "NONE",
+                        "meta" : {
+                          "globalKey" : "24a738"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "ea1a6ec6"
+                      }
                     },
+                    "meta" : {
+                      "globalKey" : "ea1a6ec6"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
                     "period" : "M",
-                    "periodMultiplier" : 6
+                    "meta" : {
+                      "globalKey" : "18a9b"
+                    },
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "32e8158a",
+                    "externalKey" : "floatingCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "7a04f180"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "ad8abf26"
+                    "globalReference" : "32e8158a",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "131ae8a2"
+                      "globalKey" : "eff6d356"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -236,82 +204,79 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "dbde664a"
+                      "globalReference" : "a5aeeeb8",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "dbde664a"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "a5aeeeb8",
+                    "externalKey" : "resetDates"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "db83cfc1"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b8fa"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30E/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -320,233 +285,268 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "faa5b75e"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "1ff50d"
+                            "globalReference" : "1ff50d",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "93c845ff"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "93c845ff"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30E/360"
-                },
-                "meta" : {
-                  "globalKey" : "f8158737"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa46135"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "1794a"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "9249d1f2",
+                    "externalKey" : "fixedCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "85fff0af"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "9c789d4b"
                 }
               } ],
               "meta" : {
-                "globalKey" : "d590e72c"
+                "globalKey" : "231e2bcc"
               }
             }
           },
           "meta" : {
-            "globalKey" : "d590e72c"
+            "globalKey" : "231e2bcc"
           }
         },
         "meta" : {
-          "globalKey" : "d590e72c"
+          "globalKey" : "231e2bcc"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3ce21b9b"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "53c66a4c"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-LIBOR-BBA"
-                },
-                "indexTenor" : {
+          "quantity" : [ {
+            "value" : {
+              "value" : 50000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR",
                   "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                  }
                 }
               }
-            }
-          },
-          "quantity" : [ {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                    "globalKey" : "107"
+                  }
                 }
               },
-              "value" : 50000000.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2505dd46"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "4882fcbc"
           },
+          "meta" : {
+            "globalKey" : "c0d07bed"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "value" : 0.06,
               "perUnitOf" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000.00,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
-              },
-              "value" : 50000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "c7dc9ac4"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "70f86d60",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "c6416b25",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e530c"
-      },
-      "value" : "1994-12-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "PARTYAUS33",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "TW9235"
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "399a8239"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "c96f9f72"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "38f6fe4a"
+        "globalKey" : "70f86d60",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "BARCGB2L",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
+        },
+        "meta" : {
+          "globalKey" : "c6416b25"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "c6416b25",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "4bdd8796"
+    }
+  },
+  "meta" : {
+    "globalKey" : "4bdd8796"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_29_FpML_ird_9.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_29_FpML_ird_9.json
index a73ed3343b..4556fcf17d 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_29_FpML_ird_9.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_29_FpML_ird_9.json
@@ -1,63 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "b4f07cf1"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "b4f07cf1"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "35ec6dac"
-      },
-      "name" : {
-        "value" : "Party A"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "af299bec",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56323",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300HLPEQ31HY26E57"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cb1de3c5"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "4fbfe65e"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300TJF420N3F01V87"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "4fbfe65e"
-        }
-      } ]
+        "globalKey" : "1cd977bf"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-04-25",
+      "meta" : {
+        "globalKey" : "3e8119"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "4fbfe65e"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "35ec6dac"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -68,46 +35,40 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c4e"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "27"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2000-04-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -116,20 +77,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eac74d93"
-                      },
-                      "unadjustedDate" : "2000-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eac74d93"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "21daa179"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2002-04-27",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -137,92 +95,100 @@
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "42f910b"
+                            "globalKey" : "42f910b",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b8e49c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "f4e4ef21"
-                      },
-                      "unadjustedDate" : "2002-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "f4e4ef21"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "7c430cb2"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "dd339947"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentDaysOffset" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "ea4baf9f"
+                      "globalKey" : "17f7a"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
+                    "rollConvention" : "27"
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "c239cad3",
+                    "externalKey" : "floatingCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
                     },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f571e5df"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "21daa179"
+                    "globalReference" : "c239cad3",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "131ae8a2"
+                      "globalKey" : "eff6d356"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -231,82 +197,79 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "dbde6647"
+                      "globalReference" : "6fc3cf5",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "dbde6647"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "6fc3cf5",
+                    "externalKey" : "resetDates"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "37bb4f7e"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28cab"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "27"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2000-04-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -315,230 +278,267 @@
                       },
                       "meta" : {
                         "globalKey" : "eac74d93"
-                      },
-                      "unadjustedDate" : "2000-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eac74d93"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "7115972d"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2002-04-27",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "42f910b"
+                            "globalReference" : "42f910b",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "3494f012"
-                      },
-                      "unadjustedDate" : "2002-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "3494f012"
                     }
-                  }
-                },
-                "compoundingMethod" : "FLAT",
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "4abf4935"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "dd339ab6"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentDaysOffset" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "ea4baf9f"
+                      "globalKey" : "18abd"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
+                    "rollConvention" : "27"
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "d54cd385",
+                    "externalKey" : "fixedCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
                     },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "806bb58e"
                   }
+                },
+                "compoundingMethod" : "Flat",
+                "meta" : {
+                  "globalKey" : "49ff5c4b"
                 }
               } ],
               "meta" : {
-                "globalKey" : "5a974a43"
+                "globalKey" : "6a93d90d"
               }
             }
           },
           "meta" : {
-            "globalKey" : "5a974a43"
+            "globalKey" : "6a93d90d"
           }
         },
         "meta" : {
-          "globalKey" : "5a974a43"
+          "globalKey" : "6a93d90d"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "cd6b80c9"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "53c66a4c"
+          "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "2505dd46"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "6637fc9e"
           },
+          "meta" : {
+            "globalKey" : "f5b7bf9b"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0585,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0585,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "60c79722"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4fbfe65e",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "af299bec",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8119"
-      },
-      "value" : "2000-04-25"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300HLPEQ31HY26E57",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "56323"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "version" : 1
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cb1de3c5"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "35ec6dac"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "176f783f"
+        "globalKey" : "af299bec",
+        "externalKey" : "party1"
       }
-    } ]
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300TJF420N3F01V87",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "4fbfe65e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "4fbfe65e",
+        "externalKey" : "party2"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "839fd0d9"
+    }
+  },
+  "meta" : {
+    "globalKey" : "839fd0d9"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_30.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_30.json
index 621de1517d..1b484a9d06 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_30.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_30.json
@@ -1,61 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "1629a243"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "1629a243"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "c96f9f72"
-      },
-      "name" : {
-        "value" : "Party A"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "70f86d60",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "TW9235",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "PARTYAUS33"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         },
-        "meta" : {
-          "globalKey" : "399a8239"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c6416b25"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "BARCGB2L"
-        },
-        "meta" : {
-          "globalKey" : "c6416b25"
-        }
-      } ]
+        "globalKey" : "ae11048a"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "1994-12-12",
+      "meta" : {
+        "globalKey" : "3e530c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "c96f9f72"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c6416b25"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -66,46 +35,40 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c89"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1995-01-16",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -114,43 +77,148 @@
                       },
                       "meta" : {
                         "globalKey" : "ea2e2b88"
-                      },
-                      "unadjustedDate" : "1995-01-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea2e2b88"
                     }
                   },
-                  "firstRegularPeriodStartDate" : "1995-06-14",
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "9c21ca90"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "DEFR"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "1ff50d"
+                            "globalKey" : "1ff50d",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365af8de"
                         }
                       },
                       "meta" : {
                         "globalKey" : "a8d53690"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "a8d53690"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "firstRegularPeriodStartDate" : "1995-06-14",
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18a9b"
+                    },
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "6d5c05e",
+                    "externalKey" : "floatingCalcPeriodDates"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "firstPaymentDate" : "1995-06-14",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "e89777b2"
+                  }
+                },
+                "resetDates" : {
+                  "calculationPeriodDatesReference" : {
+                    "globalReference" : "6d5c05e",
+                    "externalReference" : "floatingCalcPeriodDates"
+                  },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
+                  "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "eff6d356"
+                    },
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
+                      }
+                    },
+                    "dateRelativeTo" : {
+                      "globalReference" : "a5aeeeb8",
+                      "externalReference" : "resetDates"
+                    }
+                  },
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "a5aeeeb8",
+                    "externalKey" : "resetDates"
                   }
                 },
                 "cashflowRepresentation" : {
@@ -158,397 +226,294 @@
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "1995-06-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1995-06-14",
                       "adjustedStartDate" : "1995-01-16",
+                      "adjustedEndDate" : "1995-06-14",
                       "meta" : {
-                        "globalKey" : "701cc88d"
+                        "globalKey" : "81ca5b1d"
                       },
+                      "unadjustedStartDate" : "1995-01-17",
+                      "notionalAmount" : 50000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1995-01-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78cb135"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 50000000.00,
-                      "unadjustedStartDate" : "1995-01-17"
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "deaf4ebf"
+                      "globalKey" : "f05ce14f"
                     }
                   }, {
                     "adjustedPaymentDate" : "1995-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1995-12-14",
                       "adjustedStartDate" : "1995-06-14",
+                      "adjustedEndDate" : "1995-12-14",
                       "meta" : {
-                        "globalKey" : "3c46f290"
+                        "globalKey" : "7232ff90"
                       },
+                      "notionalAmount" : 50000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1995-06-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78cd7f5"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 50000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "8db85f9e"
+                      "globalKey" : "c3a46c9e"
                     }
                   }, {
                     "adjustedPaymentDate" : "1996-06-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1996-06-14",
                       "adjustedStartDate" : "1995-12-14",
+                      "adjustedEndDate" : "1996-06-14",
                       "meta" : {
-                        "globalKey" : "9c5b90b1"
+                        "globalKey" : "db5a73b1"
                       },
+                      "notionalAmount" : 40000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1995-12-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78d0675"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 40000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "aa9e843f"
+                      "globalKey" : "e99d673f"
                     }
                   }, {
                     "adjustedPaymentDate" : "1996-12-16",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1996-12-16",
                       "adjustedStartDate" : "1996-06-14",
+                      "adjustedEndDate" : "1996-12-16",
                       "meta" : {
-                        "globalKey" : "7701bbb3"
+                        "globalKey" : "468b036f"
                       },
+                      "notionalAmount" : 40000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1996-06-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78dcff5"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 40000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "14740ec3"
+                      "globalKey" : "e3fd567f"
                     }
                   }, {
                     "adjustedPaymentDate" : "1997-06-16",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1997-06-16",
                       "adjustedStartDate" : "1996-12-16",
+                      "adjustedEndDate" : "1997-06-16",
                       "meta" : {
-                        "globalKey" : "da800b12"
+                        "globalKey" : "197eee12"
                       },
+                      "notionalAmount" : 30000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1996-12-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78dfe75"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 30000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "34c3e4a2"
+                      "globalKey" : "73c2c7a2"
                     }
                   }, {
                     "adjustedPaymentDate" : "1997-12-15",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1997-12-15",
                       "adjustedStartDate" : "1997-06-16",
+                      "adjustedEndDate" : "1997-12-15",
                       "meta" : {
-                        "globalKey" : "16738451"
+                        "globalKey" : "7f90f3f3"
                       },
+                      "notionalAmount" : 30000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1997-06-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78ec7f5"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 30000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "43197060"
+                      "globalKey" : "ac36e002"
                     }
                   }, {
                     "adjustedPaymentDate" : "1998-06-15",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1998-06-15",
                       "adjustedStartDate" : "1997-12-15",
+                      "adjustedEndDate" : "1998-06-15",
                       "meta" : {
-                        "globalKey" : "74d349b4"
+                        "globalKey" : "b3d22cb4"
                       },
+                      "notionalAmount" : 20000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1997-12-11",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78ef656"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 20000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "5e4abc43"
+                      "globalKey" : "9d499f43"
                     }
                   }, {
                     "adjustedPaymentDate" : "1998-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1998-12-14",
                       "adjustedStartDate" : "1998-06-15",
+                      "adjustedEndDate" : "1998-12-14",
                       "meta" : {
-                        "globalKey" : "b0c6c2f3"
+                        "globalKey" : "19e43295"
                       },
+                      "notionalAmount" : 20000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1998-06-11",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78fbfd6"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 20000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "6ca04801"
+                      "globalKey" : "d5bdb7a3"
                     }
                   }, {
                     "adjustedPaymentDate" : "1999-06-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1999-06-14",
                       "adjustedStartDate" : "1998-12-14",
+                      "adjustedEndDate" : "1999-06-14",
                       "meta" : {
-                        "globalKey" : "f268856"
+                        "globalKey" : "4e256b56"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1998-12-10",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78fee37"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "87d193e4"
+                      "globalKey" : "c6d076e4"
                     }
                   }, {
                     "adjustedPaymentDate" : "1999-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1999-12-14",
                       "adjustedStartDate" : "1999-06-14",
+                      "adjustedEndDate" : "1999-12-14",
                       "meta" : {
-                        "globalKey" : "80003cd6"
+                        "globalKey" : "b5ec49d6"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1999-06-10",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "790b7b7"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "5f51c9e4"
+                      "globalKey" : "953dd6e4"
                     }
                   } ]
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "7847342d"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "1995-06-14",
-                  "meta" : {
-                    "globalKey" : "be36e5f8"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
-                  }
-                },
-                "resetDates" : {
-                  "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "9c21ca90"
-                  },
-                  "fixingDates" : {
-                    "meta" : {
-                      "globalKey" : "131ae8a2"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
-                      }
-                    },
-                    "businessDayConvention" : "NONE",
-                    "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "dbde664a"
-                    }
-                  },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "dbde664a"
-                  },
-                  "resetDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
-                },
-                "stubPeriod" : {
-                  "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "9c21ca90"
+                "stubPeriod" : {
+                  "calculationPeriodDatesReference" : {
+                    "globalReference" : "6d5c05e",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
                   "initialStub" : {
                     "floatingRate" : [ {
                       "floatingRateIndex" : "EUR-LIBOR-BBA",
                       "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "957"
-                        },
+                        "periodMultiplier" : 4,
                         "period" : "M",
-                        "periodMultiplier" : 4
+                        "meta" : {
+                          "globalKey" : "c9"
+                        }
                       }
                     }, {
                       "floatingRateIndex" : "EUR-LIBOR-BBA",
                       "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "958"
-                        },
+                        "periodMultiplier" : 5,
                         "period" : "M",
-                        "periodMultiplier" : 5
+                        "meta" : {
+                          "globalKey" : "e8"
+                        }
                       }
                     } ]
                   }
+                },
+                "meta" : {
+                  "globalKey" : "410db561"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b8fa"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30E/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1995-01-16",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -557,43 +522,94 @@
                       },
                       "meta" : {
                         "globalKey" : "ea2e2b88"
-                      },
-                      "unadjustedDate" : "1995-01-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea2e2b88"
                     }
                   },
-                  "firstRegularPeriodStartDate" : "1995-12-14",
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "a3080eae"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "1ff50d"
+                            "globalReference" : "1ff50d",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "93c845ff"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "93c845ff"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "firstRegularPeriodStartDate" : "1995-12-14",
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "1794a"
+                    },
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "41216dfe",
+                    "externalKey" : "fixedCalcPeriodDates"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
+                  },
+                  "firstPaymentDate" : "1995-12-14",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "62bc2561"
                   }
                 },
                 "cashflowRepresentation" : {
@@ -601,315 +617,299 @@
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "1995-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1995-12-14",
                       "adjustedStartDate" : "1995-01-16",
+                      "adjustedEndDate" : "1995-12-14",
                       "meta" : {
-                        "globalKey" : "696aad9"
+                        "globalKey" : "ad836cc7"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 50000000.00
+                      "notionalAmount" : 50000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "ddfd088b"
+                      "globalKey" : "84e9ca79"
                     }
                   }, {
                     "adjustedPaymentDate" : "1996-12-16",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1996-12-16",
                       "adjustedStartDate" : "1995-12-14",
+                      "adjustedEndDate" : "1996-12-16",
                       "meta" : {
-                        "globalKey" : "a263a9f6"
+                        "globalKey" : "1a9c29ca"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 40000000.00
+                      "notionalAmount" : 40000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "23f8b0e6"
+                      "globalKey" : "9c3130ba"
                     }
                   }, {
                     "adjustedPaymentDate" : "1997-12-15",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1997-12-15",
                       "adjustedStartDate" : "1996-12-16",
+                      "adjustedEndDate" : "1997-12-15",
                       "meta" : {
-                        "globalKey" : "3e43103a"
+                        "globalKey" : "8a199fc6"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 30000000.00
+                      "notionalAmount" : 30000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "64e8368b"
+                      "globalKey" : "b0bec617"
                     }
                   }, {
                     "adjustedPaymentDate" : "1998-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1998-12-14",
                       "adjustedStartDate" : "1997-12-15",
+                      "adjustedEndDate" : "1998-12-14",
                       "meta" : {
-                        "globalKey" : "da226b3b"
+                        "globalKey" : "f995b8a5"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 20000000.00
+                      "notionalAmount" : 20000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "a5d7b0ed"
+                      "globalKey" : "c54afe57"
                     }
                   }, {
                     "adjustedPaymentDate" : "1999-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1999-12-14",
                       "adjustedStartDate" : "1998-12-14",
+                      "adjustedEndDate" : "1999-12-14",
                       "meta" : {
-                        "globalKey" : "76023a9b"
+                        "globalKey" : "6911d545"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 10000000.00
+                      "notionalAmount" : 10000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "e87c784d"
+                      "globalKey" : "db8c12f7"
                     }
                   } ]
                 },
-                "dayCountFraction" : {
-                  "value" : "30E/360"
-                },
                 "meta" : {
-                  "globalKey" : "7e082468"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "1995-12-14",
-                  "meta" : {
-                    "globalKey" : "2c6095e7"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "c93056fc"
                 }
               } ],
               "meta" : {
-                "globalKey" : "b35f17db"
+                "globalKey" : "2d0477bb"
               }
             }
           },
           "meta" : {
-            "globalKey" : "b35f17db"
+            "globalKey" : "2d0477bb"
           }
         },
         "meta" : {
-          "globalKey" : "b35f17db"
+          "globalKey" : "2d0477bb"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "ce4c2099"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "53c66a4c"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
-              }
-            }
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 50000000.00,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "value" : 50000000.00,
               "datedValue" : [ {
                 "date" : "1995-12-14",
+                "value" : 40000000.00,
                 "meta" : {
                   "globalKey" : "6118d22e"
-                },
-                "value" : 40000000.00
+                }
               }, {
                 "date" : "1996-12-14",
+                "value" : 30000000.00,
                 "meta" : {
                   "globalKey" : "f9389d4f"
-                },
-                "value" : 30000000.00
+                }
               }, {
                 "date" : "1997-12-14",
+                "value" : 20000000.00,
                 "meta" : {
                   "globalKey" : "91586870"
-                },
-                "value" : 20000000.00
+                }
               }, {
                 "date" : "1998-12-14",
+                "value" : 10000000.00,
                 "meta" : {
                   "globalKey" : "29783391"
-                },
-                "value" : 10000000.00
+                }
               } ]
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "5187583a"
-          },
-          "price" : [ {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-1"
+                "value" : "quantity-1"
               } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
             },
+            "meta" : {
+              "globalKey" : "2505dd46"
+            }
+          },
+          "meta" : {
+            "globalKey" : "1b0c096b"
+          }
+        }, {
+          "price" : [ {
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "value" : 0.06,
               "perUnitOf" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000.00,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "value" : 50000000.00,
               "datedValue" : [ {
                 "date" : "1995-12-14",
+                "value" : 40000000.00,
                 "meta" : {
                   "globalKey" : "6118d22e"
-                },
-                "value" : 40000000.00
+                }
               }, {
                 "date" : "1996-12-14",
+                "value" : 30000000.00,
                 "meta" : {
                   "globalKey" : "f9389d4f"
-                },
-                "value" : 30000000.00
+                }
               }, {
                 "date" : "1997-12-14",
+                "value" : 20000000.00,
                 "meta" : {
                   "globalKey" : "91586870"
-                },
-                "value" : 20000000.00
+                }
               }, {
                 "date" : "1998-12-14",
+                "value" : 10000000.00,
                 "meta" : {
                   "globalKey" : "29783391"
-                },
-                "value" : 10000000.00
+                }
+              } ]
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
               } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "df63af06"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "70f86d60",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "c6416b25",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e530c"
-      },
-      "value" : "1994-12-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "PARTYAUS33",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "TW9235"
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "399a8239"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "c96f9f72"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "38f6fe4a"
+        "globalKey" : "70f86d60",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "BARCGB2L",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
+        },
+        "meta" : {
+          "globalKey" : "c6416b25"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "c6416b25",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "73e053b3"
+    }
+  },
+  "meta" : {
+    "globalKey" : "73e053b3"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_35_cd_31-1.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_35_cd_31-1.json
index 3f6478b63d..fd7ef82e56 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_35_cd_31-1.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_35_cd_31-1.json
@@ -1,109 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "d97aaf51"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "36fb49db"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "2c9a9a2a"
-      }
-    },
-    "meta" : {
-      "globalKey" : "d97aaf51"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37206",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
-        }
-      } ]
+        "globalKey" : "1cbdb920"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-11-29",
+      "meta" : {
+        "globalKey" : "3e92dd"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -111,13 +32,52 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-11-30",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb09fa96"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "meta" : {
+                "globalKey" : "eb09fa96"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2005-11-30",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "42f910b"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97b8e49c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "12cbe3fe"
+                }
+              },
+              "meta" : {
+                "globalKey" : "12cbe3fe"
+              }
             },
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "GBLO"
@@ -128,60 +88,107 @@
                   "globalKey" : "42f910b"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "97b8e49c"
               }
             },
-            "effectiveDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
+            "payout" : {
+              "interestRatePayout" : [ {
+                "payerReceiver" : {
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "eb09fa96"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2002-11-30"
-              },
-              "meta" : {
-                "globalKey" : "eb09fa96"
-              }
-            },
-            "payout" : {
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f92"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "17f92"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-02-28",
+                  "lastRegularPaymentDate" : "2002-02-28",
+                  "meta" : {
+                    "globalKey" : "8887452a"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "46af3d1d"
+                }
+              } ],
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "4a55c72a"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "4a55c72a"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 30
+                    },
                     "escrow" : true,
                     "meta" : {
                       "globalKey" : "120d2d"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 30
                     }
                   }
                 },
@@ -189,98 +196,74 @@
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "4B818G",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "4B818G"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "23b559bc"
-                      },
                       "name" : {
                         "value" : "Japan"
+                      },
+                      "meta" : {
+                        "globalKey" : "23b559bc",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "23b559bc"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "JP1200551248",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "JP1200551248"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "bc59fbfb"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "23b559bc",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : 1,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "21478a47"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000,
-                      "meta" : {
-                        "globalKey" : "d467e427"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 1000000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "5904ee2e"
-                    },
                     "obligationAcceleration" : true,
                     "repudiationMoratorium" : true,
                     "restructuring" : {
@@ -288,214 +271,231 @@
                       "restructuringType" : {
                         "value" : "R"
                       }
+                    },
+                    "defaultRequirement" : {
+                      "value" : 10000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "d467e427"
+                      }
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "420d5ab4"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "f87b9e23"
-                  },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY",
-                    "notDomesticIssuance" : true,
-                    "notDomesticLaw" : false,
+                    "category" : "BorrowedMoney",
+                    "notSubordinated" : true,
                     "notSovereignLender" : false,
-                    "notSubordinated" : true
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c66"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "30"
+                    "notDomesticLaw" : false,
+                    "notDomesticIssuance" : true
                   },
                   "meta" : {
-                    "globalKey" : "28c66"
+                    "globalKey" : "cd060e29"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "a1fce825"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-02-28",
-                  "lastRegularPaymentDate" : "2002-02-28",
-                  "meta" : {
-                    "globalKey" : "88874dd6"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "6ddaddf1"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "48c6603e"
+                "globalKey" : "9bdb7e34"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "42f910b"
-                    }
-                  },
-                  "businessDayConvention" : "MODFOLLOWING",
-                  "meta" : {
-                    "globalKey" : "97b8e49c"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "12cbe3fe"
-                },
-                "unadjustedDate" : "2005-11-30"
-              },
-              "meta" : {
-                "globalKey" : "12cbe3fe"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "225766fa"
+            "globalKey" : "f3b5b834"
           }
         },
         "meta" : {
-          "globalKey" : "225766fa"
+          "globalKey" : "f3b5b834"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "c3cda112"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0015,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0015,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d467e427"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "b5e6812e"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "b894a0b9"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e92dd"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2002-11-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37206"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "version" : 1
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af48e560"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "36fb49db"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "2c9a9a2a"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "57335d27"
+    }
+  },
+  "meta" : {
+    "globalKey" : "57335d27"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_35_cd_31-2.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_35_cd_31-2.json
index 19412a230c..c504b66fd6 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_35_cd_31-2.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_35_cd_31-2.json
@@ -1,109 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "9e4da751"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "36fb49db"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "2c9a9a2a"
-      }
-    },
-    "meta" : {
-      "globalKey" : "9e4da751"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37206",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
-        }
-      } ]
+        "globalKey" : "1cbdb920"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-11-29",
+      "meta" : {
+        "globalKey" : "3e92dd"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -111,13 +32,52 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-11-30",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb09fa96"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "meta" : {
+                "globalKey" : "eb09fa96"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2005-11-30",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "42f910b"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97b8e49c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "12cbe3fe"
+                }
+              },
+              "meta" : {
+                "globalKey" : "12cbe3fe"
+              }
             },
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "GBLO"
@@ -128,60 +88,107 @@
                   "globalKey" : "42f910b"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "97b8e49c"
               }
             },
-            "effectiveDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
+            "payout" : {
+              "interestRatePayout" : [ {
+                "payerReceiver" : {
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "eb09fa96"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2002-11-30"
-              },
-              "meta" : {
-                "globalKey" : "eb09fa96"
-              }
-            },
-            "payout" : {
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f92"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "17f92"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-02-28",
+                  "lastRegularPaymentDate" : "2003-02-28",
+                  "meta" : {
+                    "globalKey" : "8c2a3d2a"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "4a52351d"
+                }
+              } ],
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "4a55c72a"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "4a55c72a"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 30
+                    },
                     "escrow" : true,
                     "meta" : {
                       "globalKey" : "120d2d"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 30
                     }
                   }
                 },
@@ -189,98 +196,74 @@
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "4B818G",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "4B818G"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "23b559bc"
-                      },
                       "name" : {
                         "value" : "Japan"
+                      },
+                      "meta" : {
+                        "globalKey" : "23b559bc",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "23b559bc"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "JP1200551248",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "JP1200551248"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "bc59fbfb"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "23b559bc",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : 1,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "21478a47"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 10000000,
-                      "meta" : {
-                        "globalKey" : "d467e427"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 1000000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "5904ee2e"
-                    },
                     "obligationAcceleration" : true,
                     "repudiationMoratorium" : true,
                     "restructuring" : {
@@ -288,214 +271,231 @@
                       "restructuringType" : {
                         "value" : "R"
                       }
+                    },
+                    "defaultRequirement" : {
+                      "value" : 10000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "d467e427"
+                      }
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "420d5ab4"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "f87b9e23"
-                  },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY",
-                    "notDomesticIssuance" : true,
-                    "notDomesticLaw" : false,
+                    "category" : "BorrowedMoney",
+                    "notSubordinated" : true,
                     "notSovereignLender" : false,
-                    "notSubordinated" : true
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c66"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "30"
+                    "notDomesticLaw" : false,
+                    "notDomesticIssuance" : true
                   },
                   "meta" : {
-                    "globalKey" : "28c66"
+                    "globalKey" : "cd060e29"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "d3d6f025"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-02-28",
-                  "lastRegularPaymentDate" : "2003-02-28",
-                  "meta" : {
-                    "globalKey" : "8c2a45d6"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "6ddaddf1"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "7aa0683e"
+                "globalKey" : "d318634"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "42f910b"
-                    }
-                  },
-                  "businessDayConvention" : "MODFOLLOWING",
-                  "meta" : {
-                    "globalKey" : "97b8e49c"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "12cbe3fe"
-                },
-                "unadjustedDate" : "2005-11-30"
-              },
-              "meta" : {
-                "globalKey" : "12cbe3fe"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "71476efa"
+            "globalKey" : "3ac7c034"
           }
         },
         "meta" : {
-          "globalKey" : "71476efa"
+          "globalKey" : "3ac7c034"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "c3cda112"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0015,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0015,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d467e427"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "b5e6812e"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "b894a0b9"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e92dd"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2002-11-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37206"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "version" : 1
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af48e560"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "36fb49db"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "2c9a9a2a"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "3d885527"
+    }
+  },
+  "meta" : {
+    "globalKey" : "3d885527"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_35_cd_31.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_35_cd_31.json
index 7b62d21151..4c68198610 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_35_cd_31.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_35_cd_31.json
@@ -1,60 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "f5b5e1e5"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "f5b5e1e5"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7e15dfa1"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7e15dfa1",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "TW9235",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5299003X2Y7GWCF0KT81"
+            "scheme" : "http://www.bankA.com/swaps/trade-id"
+          }
         },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "7e15dfa1"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "695e25ab"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "529900DTJ5A7S5UCBB52"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "695e25ab"
-        }
-      } ]
+        "globalKey" : "ae11048a"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "1994-12-12",
+      "meta" : {
+        "globalKey" : "3e530c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7e15dfa1"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "695e25ab"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,46 +35,40 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "4158421"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c89"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -113,20 +77,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "d641c314"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -134,86 +95,94 @@
                             "value" : "GBLO"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "4158421"
+                            "globalKey" : "4158421",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "979ed7b2"
                         }
                       },
                       "meta" : {
                         "globalKey" : "548070e4"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "548070e4"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "7b30e304"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "1995-12-14",
-                  "lastRegularPaymentDate" : "1994-12-14",
-                  "meta" : {
-                    "globalKey" : "9ba1fe06"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "4158421"
+                        "globalReference" : "4158421",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "18a9b"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "fa9d937e",
+                    "externalKey" : "floatingCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "firstPaymentDate" : "1995-12-14",
+                  "lastRegularPaymentDate" : "1994-12-14",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "4158421",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "c6028fc0"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "d641c314"
+                    "globalReference" : "fa9d937e",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "10c06461"
+                      "globalKey" : "ed9c4f15"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -222,82 +191,79 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "e4e7b309"
+                      "globalReference" : "aeb83b77",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "e4e7b309"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "4158421"
+                        "globalReference" : "4158421",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "aeb83b77",
+                    "externalKey" : "resetDates"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eac55156"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "4158421"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b8fa"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -306,221 +272,255 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "faa5b75e"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "4158421"
+                            "globalReference" : "4158421",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "93c845ff"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "93c845ff"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "642add64"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa46135"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "4158421"
+                        "globalReference" : "4158421",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "1794a"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "9249d1f2",
+                    "externalKey" : "fixedCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "4158421",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "85fff0af"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "c56a1af8"
                 }
               } ],
               "meta" : {
-                "globalKey" : "7d95bb68"
+                "globalKey" : "21f560ce"
               }
             }
           },
           "meta" : {
-            "globalKey" : "7d95bb68"
+            "globalKey" : "21f560ce"
           }
         },
         "meta" : {
-          "globalKey" : "7d95bb68"
+          "globalKey" : "21f560ce"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3ce21b9b"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "53c66a4c"
+          "quantity" : [ {
+            "value" : {
+              "value" : 50000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 50000000
+            "meta" : {
+              "globalKey" : "2505dd46"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "4882fcbc"
           },
+          "meta" : {
+            "globalKey" : "c0d07bed"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.06,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 50000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "c7dc9ac4"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "7e15dfa1",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "695e25ab",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "5299003X2Y7GWCF0KT81",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "7e15dfa1"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e530c"
-      },
-      "value" : "1994-12-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "7e15dfa1",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "529900DTJ5A7S5UCBB52",
           "meta" : {
-            "scheme" : "http://www.bankA.com/swaps/trade-id"
-          },
-          "value" : "TW9235"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "version" : 1
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "695e25ab"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "7e15dfa1"
-      },
       "meta" : {
-        "globalKey" : "38f6fe4a"
+        "globalKey" : "695e25ab",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "ebbdcf07"
+    }
+  },
+  "meta" : {
+    "globalKey" : "ebbdcf07"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_6.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_6.json
index bbc3d8d694..ff02621329 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_6.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_6.json
@@ -1,60 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "975bc9e5"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "975bc9e5"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7e15dfa1"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7e15dfa1",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "TW9235",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5299003X2Y7GWCF0KT81"
+            "scheme" : "http://www.bankA.com/swaps/trade-id"
+          }
         },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "7e15dfa1"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "695e25ab"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "529900DTJ5A7S5UCBB52"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "695e25ab"
-        }
-      } ]
+        "globalKey" : "ae11048a"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "1994-12-12",
+      "meta" : {
+        "globalKey" : "3e530c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7e15dfa1"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "695e25ab"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,46 +35,40 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "4158421"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c89"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -113,20 +77,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "d641c314"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -134,86 +95,94 @@
                             "value" : "GBLO"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "4158421"
+                            "globalKey" : "4158421",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "979ed7b2"
                         }
                       },
                       "meta" : {
                         "globalKey" : "548070e4"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "548070e4"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "b174cb04"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "1994-12-14",
-                  "lastRegularPaymentDate" : "1996-12-14",
-                  "meta" : {
-                    "globalKey" : "d1de606"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "4158421"
+                        "globalReference" : "4158421",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "18a9b"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "fa9d937e",
+                    "externalKey" : "floatingCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "firstPaymentDate" : "1994-12-14",
+                  "lastRegularPaymentDate" : "1996-12-14",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "4158421",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "377e77c0"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "d641c314"
+                    "globalReference" : "fa9d937e",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "10c06461"
+                      "globalKey" : "ed9c4f15"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -222,82 +191,79 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "e4e7b309"
+                      "globalReference" : "aeb83b77",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "e4e7b309"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "4158421"
+                        "globalReference" : "4158421",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "aeb83b77",
+                    "externalKey" : "resetDates"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "30e33956"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "4158421"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b8fa"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -306,221 +272,255 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "faa5b75e"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "4158421"
+                            "globalReference" : "4158421",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "93c845ff"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "93c845ff"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "642add64"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa46135"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "4158421"
+                        "globalReference" : "4158421",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "1794a"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "9249d1f2",
+                    "externalKey" : "fixedCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "4158421",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "85fff0af"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "c56a1af8"
                 }
               } ],
               "meta" : {
-                "globalKey" : "7c77a368"
+                "globalKey" : "c03148ce"
               }
             }
           },
           "meta" : {
-            "globalKey" : "7c77a368"
+            "globalKey" : "c03148ce"
           }
         },
         "meta" : {
-          "globalKey" : "7c77a368"
+          "globalKey" : "c03148ce"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3ce21b9b"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "53c66a4c"
+          "quantity" : [ {
+            "value" : {
+              "value" : 50000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 50000000
+            "meta" : {
+              "globalKey" : "2505dd46"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "4882fcbc"
           },
+          "meta" : {
+            "globalKey" : "c0d07bed"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.06,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 50000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "c7dc9ac4"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "7e15dfa1",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "695e25ab",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "5299003X2Y7GWCF0KT81",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "7e15dfa1"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e530c"
-      },
-      "value" : "1994-12-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "7e15dfa1",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "529900DTJ5A7S5UCBB52",
           "meta" : {
-            "scheme" : "http://www.bankA.com/swaps/trade-id"
-          },
-          "value" : "TW9235"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "version" : 1
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "695e25ab"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "7e15dfa1"
-      },
       "meta" : {
-        "globalKey" : "38f6fe4a"
+        "globalKey" : "695e25ab",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "e23ce707"
+    }
+  },
+  "meta" : {
+    "globalKey" : "e23ce707"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_7_1.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_7_1.json
index b0a324b14c..83a964cc61 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_7_1.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_7_1.json
@@ -1,60 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "2935e40c"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "2935e40c"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "cb1de3c5"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "cb1de3c5",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56323",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300HLPEQ31HY26E57"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cb1de3c5"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "4fbfe65e"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300TJF420N3F01V87"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "4fbfe65e"
-        }
-      } ]
+        "globalKey" : "1cd977bf"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-04-25",
+      "meta" : {
+        "globalKey" : "3e8119"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "4fbfe65e"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "cb1de3c5"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,46 +35,44 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "calculationPeriodFrequency" : {
                     "meta" : {
-                      "globalKey" : "28cab"
+                      "globalKey" : "5c38cb89"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "27"
-                  },
+                    "finalRateRounding" : {
+                      "roundingDirection" : "Nearest",
+                      "precision" : 7
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2000-04-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -113,20 +81,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eac74d93"
-                      },
-                      "unadjustedDate" : "2000-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eac74d93"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "13d83b7c"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2002-04-27",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -134,97 +99,100 @@
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "42f910b"
+                            "globalKey" : "42f910b",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b8e49c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "f4e4ef21"
-                      },
-                      "unadjustedDate" : "2002-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "f4e4ef21"
                     }
-                  }
-                },
-                "compoundingMethod" : "FLAT",
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "603b59d5"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "dd339947"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentDaysOffset" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "ea4baf9f"
+                      "globalKey" : "18abd"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
+                    "rollConvention" : "27"
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "c239d616",
+                    "externalKey" : "floatingCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "979ebd17"
+                      "globalKey" : "ea4acac1"
                     },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
                     },
-                    "finalRateRounding" : {
-                      "precision" : 7,
-                      "roundingDirection" : "NEAREST"
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f571e5df"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "13d83b7c"
+                    "globalReference" : "c239d616",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "131ae8a2"
+                      "globalKey" : "eff6d356"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -233,82 +201,80 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "dbde6647"
+                      "globalReference" : "6fc3cf5",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "dbde6647"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "6fc3cf5",
+                    "externalKey" : "resetDates"
+                  }
+                },
+                "compoundingMethod" : "Flat",
+                "meta" : {
+                  "globalKey" : "8d6b6c5b"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28cab"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "27"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2000-04-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -317,229 +283,263 @@
                       },
                       "meta" : {
                         "globalKey" : "eac74d93"
-                      },
-                      "unadjustedDate" : "2000-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eac74d93"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "7115972d"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2002-04-27",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "42f910b"
+                            "globalReference" : "42f910b",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "3494f012"
-                      },
-                      "unadjustedDate" : "2002-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "3494f012"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "85dee763"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "dd339947"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentDaysOffset" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "ea4baf9f"
+                      "globalKey" : "18abd"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
+                    "rollConvention" : "27"
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "d54cd385",
+                    "externalKey" : "fixedCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
                     },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f571e5df"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "79e707fb"
                 }
               } ],
               "meta" : {
-                "globalKey" : "ecc85478"
+                "globalKey" : "8ea10d16"
               }
             }
           },
           "meta" : {
-            "globalKey" : "ecc85478"
+            "globalKey" : "8ea10d16"
           }
         },
         "meta" : {
-          "globalKey" : "ecc85478"
+          "globalKey" : "8ea10d16"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7b78abf0"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d05"
+          "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "828026c7"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "6637fc9e"
           },
+          "meta" : {
+            "globalKey" : "5332091c"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0585,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0585,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "60c79722"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4fbfe65e",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "cb1de3c5",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300HLPEQ31HY26E57",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cb1de3c5"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e8119"
-      },
-      "value" : "2000-04-25"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "cb1de3c5",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300TJF420N3F01V87",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "56323"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "version" : 1
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "4fbfe65e"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "cb1de3c5"
-      },
       "meta" : {
-        "globalKey" : "176f783f"
+        "globalKey" : "4fbfe65e",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "c4d6466c"
+    }
+  },
+  "meta" : {
+    "globalKey" : "c4d6466c"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_7_2-distinct-within-the-leg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_7_2-distinct-within-the-leg.json
index 0735d2b6fb..648d5e4045 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_7_2-distinct-within-the-leg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_7_2-distinct-within-the-leg.json
@@ -1,60 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "ead43825"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "ead43825"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "cb1de3c5"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "cb1de3c5",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56323",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300HLPEQ31HY26E57"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cb1de3c5"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "4fbfe65e"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300TJF420N3F01V87"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "4fbfe65e"
-        }
-      } ]
+        "globalKey" : "1cd977bf"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-04-25",
+      "meta" : {
+        "globalKey" : "3e8119"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "4fbfe65e"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "cb1de3c5"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,46 +35,44 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "calculationPeriodFrequency" : {
                     "meta" : {
-                      "globalKey" : "28c4e"
+                      "globalKey" : "5c38cb89"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "27"
-                  },
+                    "finalRateRounding" : {
+                      "roundingDirection" : "Nearest",
+                      "precision" : 7
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2000-04-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -113,20 +81,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eac74d93"
-                      },
-                      "unadjustedDate" : "2000-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eac74d93"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "21daa179"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2002-04-27",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -134,96 +99,100 @@
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "42f910b"
+                            "globalKey" : "42f910b",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b8e49c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "f4e4ef21"
-                      },
-                      "unadjustedDate" : "2002-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "f4e4ef21"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "14b54d4e"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "dd339ab6"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentDaysOffset" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "ea4baf9f"
+                      "globalKey" : "17f7a"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
+                    "rollConvention" : "27"
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "c239cad3",
+                    "externalKey" : "floatingCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "979ebd17"
+                      "globalKey" : "ea4acac1"
                     },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
                     },
-                    "finalRateRounding" : {
-                      "precision" : 7,
-                      "roundingDirection" : "NEAREST"
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "806bb58e"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "21daa179"
+                    "globalReference" : "c239cad3",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "131ae8a2"
+                      "globalKey" : "eff6d356"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -232,82 +201,79 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "dbde6647"
+                      "globalReference" : "6fc3cf5",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "dbde6647"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "6fc3cf5",
+                    "externalKey" : "resetDates"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "aa509d6c"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c4e"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "27"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2000-04-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -316,229 +282,263 @@
                       },
                       "meta" : {
                         "globalKey" : "eac74d93"
-                      },
-                      "unadjustedDate" : "2000-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eac74d93"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "6383586a"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2002-04-27",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "42f910b"
+                            "globalReference" : "42f910b",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "3494f012"
-                      },
-                      "unadjustedDate" : "2002-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "3494f012"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "ce7e3de9"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "dd339944"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentDaysOffset" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "ea4baf9f"
+                      "globalKey" : "17f7a"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
+                    "rollConvention" : "27"
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "d54cc842",
+                    "externalKey" : "fixedCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
                     },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "36c3cd9c"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "c93b55b5"
                 }
               } ],
               "meta" : {
-                "globalKey" : "772c72b7"
+                "globalKey" : "60895621"
               }
             }
           },
           "meta" : {
-            "globalKey" : "772c72b7"
+            "globalKey" : "60895621"
           }
         },
         "meta" : {
-          "globalKey" : "772c72b7"
+          "globalKey" : "60895621"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7b78abf0"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d05"
+          "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "828026c7"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "6637fc9e"
           },
+          "meta" : {
+            "globalKey" : "5332091c"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0585,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0585,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "60c79722"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4fbfe65e",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "cb1de3c5",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300HLPEQ31HY26E57",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cb1de3c5"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e8119"
-      },
-      "value" : "2000-04-25"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "cb1de3c5",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300TJF420N3F01V87",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "56323"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "version" : 1
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "4fbfe65e"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "cb1de3c5"
-      },
       "meta" : {
-        "globalKey" : "176f783f"
+        "globalKey" : "4fbfe65e",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "42fd919f"
+    }
+  },
+  "meta" : {
+    "globalKey" : "42fd919f"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_8.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_8.json
index 9b9864ae8a..a110d4d944 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_8.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_8.json
@@ -1,71 +1,29 @@
 {
-  "meta" : {
-    "globalKey" : "5150b66e"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2003-06-06",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_2003_CREDIT_NORTH_AMERICAN"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "24983006"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "24983006"
-      }
-    },
-    "meta" : {
-      "globalKey" : "5150b66e"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "xyz1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
+            "scheme" : "http://www.xyzbank.com/cd-trade-id"
+          }
         },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
-        }
-      } ]
+        "globalKey" : "bb09ada7"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-03",
+      "meta" : {
+        "globalKey" : "3e9303"
+      }
+    },
     "tradableProduct" : {
       "product" : {
         "contractualProduct" : {
@@ -76,249 +34,291 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-12-04",
                 "meta" : {
                   "globalKey" : "3e9304"
-                },
-                "unadjustedDate" : "2002-12-04"
+                }
               },
               "meta" : {
                 "globalKey" : "3e9304"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2010-09-06",
+                "meta" : {
+                  "globalKey" : "3ed246"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ed246"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party1",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204d"
+                    },
+                    "rollConvention" : "6"
+                  },
+                  "meta" : {
+                    "globalKey" : "204d"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
+                  "firstPaymentDate" : "2003-03-06",
+                  "meta" : {
+                    "globalKey" : "74746a24"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "37dd0f7"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party1"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "8G836J",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "8G836J"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "92cc27"
-                      },
                       "name" : {
                         "value" : "Tenet Healthcare Corporation"
+                      },
+                      "meta" : {
+                        "globalKey" : "92cc27",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "92cc27"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "88033GAT7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                              },
-                              "value" : "88033GAT7"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "db5db955"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "92cc27",
+                        "externalReference" : "referenceEntity"
                       }
                     } ]
                   }
                 },
-                "meta" : {
-                  "globalKey" : "917ba6c6"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "meta" : {
-                      "globalKey" : "4cf"
-                    },
                     "restructuring" : {
                       "applicable" : true
+                    },
+                    "meta" : {
+                      "globalKey" : "4cf"
                     }
                   },
                   "meta" : {
                     "globalKey" : "4cf"
                   }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d21"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "6"
-                  },
-                  "meta" : {
-                    "globalKey" : "12d21"
-                  }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "ff23b651"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-06",
-                  "meta" : {
-                    "globalKey" : "747472d0"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "670b5b22"
                 }
-              } ],
-              "meta" : {
-                "globalKey" : "d5097797"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ed246"
-                },
-                "unadjustedDate" : "2010-09-06"
               },
               "meta" : {
-                "globalKey" : "3ed246"
+                "globalKey" : "31c5559"
               }
             }
           },
           "meta" : {
-            "globalKey" : "a6c59a53"
+            "globalKey" : "664e77d7"
           }
         },
         "meta" : {
-          "globalKey" : "a6c59a53"
+          "globalKey" : "664e77d7"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "1f273178"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.01,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c5befd88"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9303"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2002-12-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.xyzbank.com/cd-trade-id"
-          },
-          "value" : "xyz1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "version" : 1
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "ea69d427"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2003-06-06",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2003CreditNorthAmerican"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "24983006"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "24983006"
+      }
+    },
+    "meta" : {
+      "globalKey" : "8b09876a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "8b09876a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_9_ResetDates_interestRateSwap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_9_ResetDates_interestRateSwap.json
index e2c9b5b59e..47b58d2685 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_9_ResetDates_interestRateSwap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_9_ResetDates_interestRateSwap.json
@@ -1,60 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "94bf4a9e"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "94bf4a9e"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "cb1de3c5"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "cb1de3c5",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56323",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300HLPEQ31HY26E57"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cb1de3c5"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "4fbfe65e"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300TJF420N3F01V87"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "4fbfe65e"
-        }
-      } ]
+        "globalKey" : "1cd977bf"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-04-25",
+      "meta" : {
+        "globalKey" : "3e8119"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "4fbfe65e"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "cb1de3c5"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,46 +35,44 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "calculationPeriodFrequency" : {
                     "meta" : {
-                      "globalKey" : "28c4e"
+                      "globalKey" : "5c38cb89"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "27"
-                  },
+                    "finalRateRounding" : {
+                      "roundingDirection" : "Nearest",
+                      "precision" : 7
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2000-04-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -113,20 +81,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eac74d93"
-                      },
-                      "unadjustedDate" : "2000-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eac74d93"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "21daa179"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2002-04-27",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -134,283 +99,284 @@
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "42f910b"
+                            "globalKey" : "42f910b",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b8e49c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "f4e4ef21"
-                      },
-                      "unadjustedDate" : "2002-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "f4e4ef21"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f7a"
+                    },
+                    "rollConvention" : "27"
+                  },
+                  "meta" : {
+                    "globalKey" : "c239cad3",
+                    "externalKey" : "floatingCalcPeriodDates"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
+                    },
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "f571e5df"
                   }
                 },
+                "compoundingMethod" : "Flat",
                 "cashflowRepresentation" : {
                   "cashflowsMatchParameters" : true,
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "2000-11-03",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2000-07-27",
                       "adjustedStartDate" : "2000-04-27",
+                      "adjustedEndDate" : "2000-07-27",
                       "meta" : {
-                        "globalKey" : "c3ac6219"
+                        "globalKey" : "5ea26899"
                       },
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2000-04-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "791a208"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     }, {
-                      "adjustedEndDate" : "2000-10-27",
                       "adjustedStartDate" : "2000-07-27",
+                      "adjustedEndDate" : "2000-10-27",
                       "meta" : {
-                        "globalKey" : "b7fb6159"
+                        "globalKey" : "52f167d9"
                       },
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2000-07-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "791b948"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "8b58bde3"
+                      "globalKey" : "a23c6de3"
                     }
                   }, {
                     "adjustedPaymentDate" : "2001-05-04",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2001-01-29",
                       "adjustedStartDate" : "2000-10-27",
+                      "adjustedEndDate" : "2001-01-29",
                       "meta" : {
-                        "globalKey" : "953f1c1b"
+                        "globalKey" : "d2e53357"
                       },
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2000-10-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "791d088"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     }, {
-                      "adjustedEndDate" : "2001-04-27",
                       "adjustedStartDate" : "2001-01-29",
+                      "adjustedEndDate" : "2001-04-27",
                       "meta" : {
-                        "globalKey" : "ab670c17"
+                        "globalKey" : "acbfd7db"
                       },
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2001-01-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "79282c8"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "301bace0"
+                      "globalKey" : "dd05e8"
                     }
                   }, {
                     "adjustedPaymentDate" : "2001-11-05",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2001-07-27",
                       "adjustedStartDate" : "2001-04-27",
+                      "adjustedEndDate" : "2001-07-27",
                       "meta" : {
-                        "globalKey" : "9c4c5a19"
+                        "globalKey" : "37426099"
                       },
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2001-04-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "7929a08"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     }, {
-                      "adjustedEndDate" : "2001-10-29",
                       "adjustedStartDate" : "2001-07-27",
+                      "adjustedEndDate" : "2001-10-29",
                       "meta" : {
-                        "globalKey" : "fa67cfdb"
+                        "globalKey" : "2efb1117"
                       },
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2001-07-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "792b148"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "e801f867"
+                      "globalKey" : "9882e323"
                     }
                   }, {
                     "adjustedPaymentDate" : "2002-05-06",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2002-01-29",
                       "adjustedStartDate" : "2001-10-29",
+                      "adjustedEndDate" : "2002-01-29",
                       "meta" : {
-                        "globalKey" : "7148c559"
+                        "globalKey" : "1551a1d9"
                       },
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2001-10-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "792c888"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     }, {
-                      "adjustedEndDate" : "2002-04-29",
                       "adjustedStartDate" : "2002-01-29",
+                      "adjustedEndDate" : "2002-04-29",
                       "meta" : {
-                        "globalKey" : "edd37a99"
+                        "globalKey" : "88c98119"
                       },
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2002-01-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "7937ac8"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "69caf466"
+                      "globalKey" : "badf0e66"
                     }
                   } ]
                 },
-                "compoundingMethod" : "FLAT",
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
                 "meta" : {
-                  "globalKey" : "e844d06"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "dd339947"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf9f"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "979ebd17"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "finalRateRounding" : {
-                      "precision" : 7,
-                      "roundingDirection" : "NEAREST"
-                    }
-                  }
+                  "globalKey" : "b18df2ba"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28cab"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "27"
-                  },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2000-04-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -419,42 +385,100 @@
                       },
                       "meta" : {
                         "globalKey" : "eac74d93"
-                      },
-                      "unadjustedDate" : "2000-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eac74d93"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "7115972d"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2002-04-27",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "42f910b"
+                            "globalReference" : "42f910b",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "3494f012"
-                      },
-                      "unadjustedDate" : "2002-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "3494f012"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18abd"
+                    },
+                    "rollConvention" : "27"
+                  },
+                  "meta" : {
+                    "globalKey" : "d54cd385",
+                    "externalKey" : "fixedCalcPeriodDates"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
+                    },
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "f571e5df"
                   }
                 },
                 "cashflowRepresentation" : {
@@ -462,246 +486,222 @@
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "2000-11-03",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2000-10-27",
                       "adjustedStartDate" : "2000-04-27",
+                      "adjustedEndDate" : "2000-10-27",
                       "meta" : {
-                        "globalKey" : "ac8b1251"
+                        "globalKey" : "f1cc728f"
                       },
-                      "fixedRate" : 0.0585,
-                      "notionalAmount" : 100000000
+                      "notionalAmount" : 100000000,
+                      "fixedRate" : 0.0585
                     } ],
                     "meta" : {
-                      "globalKey" : "45ced16e"
+                      "globalKey" : "8b1031ac"
                     }
                   }, {
                     "adjustedPaymentDate" : "2001-05-04",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2001-04-27",
                       "adjustedStartDate" : "2000-10-27",
+                      "adjustedEndDate" : "2001-04-27",
                       "meta" : {
-                        "globalKey" : "af851d51"
+                        "globalKey" : "f293678f"
                       },
-                      "fixedRate" : 0.0585,
-                      "notionalAmount" : 100000000
+                      "notionalAmount" : 100000000,
+                      "fixedRate" : 0.0585
                     } ],
                     "meta" : {
-                      "globalKey" : "61fdbe8d"
+                      "globalKey" : "a50c08cb"
                     }
                   }, {
                     "adjustedPaymentDate" : "2001-11-05",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2001-10-29",
                       "adjustedStartDate" : "2001-04-27",
+                      "adjustedEndDate" : "2001-10-29",
                       "meta" : {
-                        "globalKey" : "b04cfb0f"
+                        "globalKey" : "f58d7a11"
                       },
-                      "fixedRate" : 0.0585,
-                      "notionalAmount" : 100000000
+                      "notionalAmount" : 100000000,
+                      "fixedRate" : 0.0585
                     } ],
                     "meta" : {
-                      "globalKey" : "f3bf636a"
+                      "globalKey" : "38ffe26c"
                     }
                   }, {
                     "adjustedPaymentDate" : "2002-05-06",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2002-04-29",
                       "adjustedStartDate" : "2001-10-29",
+                      "adjustedEndDate" : "2002-04-29",
                       "meta" : {
-                        "globalKey" : "b3470d91"
+                        "globalKey" : "f65557cf"
                       },
-                      "fixedRate" : 0.0585,
-                      "notionalAmount" : 100000000
+                      "notionalAmount" : 100000000,
+                      "fixedRate" : 0.0585
                     } ],
                     "meta" : {
-                      "globalKey" : "fee580b"
+                      "globalKey" : "52fca249"
                     }
                   } ]
                 },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
                 "meta" : {
-                  "globalKey" : "a8a4c4c4"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "dd339947"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf9f"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "721ab9b6"
                 }
               } ],
               "meta" : {
-                "globalKey" : "120c88ca"
+                "globalKey" : "19c59570"
               }
             }
           },
           "meta" : {
-            "globalKey" : "120c88ca"
+            "globalKey" : "19c59570"
           }
         },
         "meta" : {
-          "globalKey" : "120c88ca"
+          "globalKey" : "19c59570"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7b78abf0"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d05"
+          "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "828026c7"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "6637fc9e"
           },
+          "meta" : {
+            "globalKey" : "5332091c"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0585,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0585,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "60c79722"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4fbfe65e",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "cb1de3c5",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300HLPEQ31HY26E57",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cb1de3c5"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e8119"
-      },
-      "value" : "2000-04-25"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "cb1de3c5",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300TJF420N3F01V87",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "56323"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "version" : 1
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "4fbfe65e"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "cb1de3c5"
-      },
       "meta" : {
-        "globalKey" : "176f783f"
+        "globalKey" : "4fbfe65e",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "225b9292"
+    }
+  },
+  "meta" : {
+    "globalKey" : "225b9292"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/Obligations_physicalSettlementMatrix-1.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/Obligations_physicalSettlementMatrix-1.json
index cf4da51f80..09f0c49eb3 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/Obligations_physicalSettlementMatrix-1.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/Obligations_physicalSettlementMatrix-1.json
@@ -1,107 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "cc7c22f2"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "955bda07"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "8afb2a56"
-      }
-    },
-    "meta" : {
-      "globalKey" : "cc7c22f2"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "fg4rde3",
-        "globalKey" : "a9fe6e32"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "4627ed18",
+        "externalReference" : "fg4rde3"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56ERT7RHWE4",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "XYZBICXXX"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         },
-        "meta" : {
-          "globalKey" : "2283edb5"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "f6g4h5",
-        "globalKey" : "9ca2e804"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "ABCBICXXX"
-        },
-        "meta" : {
-          "globalKey" : "ba7399be"
-        }
-      } ]
+        "globalKey" : "ab644853"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-12-01",
+      "meta" : {
+        "globalKey" : "3eb301"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "fg4rde3",
-          "globalReference" : "a9fe6e32"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "f6g4h5",
-          "globalReference" : "9ca2e804"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "fg4rde3",
-          "globalReference" : "a9fe6e32"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -109,30 +32,26 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-12-02",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
                 "meta" : {
-                  "globalKey" : "42f910b"
+                  "globalKey" : "eb82a1ba"
                 }
               },
-              "businessDayConvention" : "FOLLOWING",
               "meta" : {
-                "globalKey" : "da556d3a"
+                "globalKey" : "eb82a1ba"
               }
             },
-            "effectiveDate" : {
+            "terminationDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2010-03-21",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -140,351 +59,432 @@
                   }
                 },
                 "meta" : {
-                  "globalKey" : "eb82a1ba"
-                },
-                "unadjustedDate" : "2006-12-02"
+                  "globalKey" : "ebf296cd"
+                }
               },
               "meta" : {
-                "globalKey" : "eb82a1ba"
+                "globalKey" : "ebf296cd"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da556d3a"
               }
             },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f73"
+                    },
+                    "rollConvention" : "20"
                   },
+                  "meta" : {
+                    "globalKey" : "17f73"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2007-03-20",
+                  "lastRegularPaymentDate" : "2010-03-20",
+                  "meta" : {
+                    "globalKey" : "6bbdbe2a"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c204893e"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7a890171"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "c97c4685"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "maximumBusinessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : true,
+                      "notSubordinated" : false,
+                      "specifiedCurrency" : {
+                        "applicable" : false
+                      },
+                      "notSovereignLender" : false,
+                      "notDomesticCurrency" : {
+                        "applicable" : false
+                      },
+                      "notDomesticLaw" : true,
+                      "notContingent" : false,
+                      "notDomesticIssuance" : true,
                       "assignableLoan" : {
                         "applicable" : true
                       },
                       "consentRequiredLoan" : {
                         "applicable" : false
                       },
-                      "fullFaithAndCreditObLiability" : true,
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ac8"
-                        },
+                        "periodMultiplier" : 1,
                         "period" : "Y",
-                        "periodMultiplier" : 1
+                        "meta" : {
+                          "globalKey" : "78"
+                        }
                       },
                       "notBearer" : true,
-                      "notContingent" : false,
-                      "notDomesticCurrency" : {
-                        "applicable" : false
-                      },
-                      "notDomesticIssuance" : true,
-                      "notDomesticLaw" : true,
-                      "notSovereignLender" : false,
-                      "notSubordinated" : false,
-                      "specifiedCurrency" : {
-                        "applicable" : false
-                      },
-                      "transferable" : true
+                      "fullFaithAndCreditObLiability" : true
                     },
                     "escrow" : false,
                     "meta" : {
-                      "globalKey" : "16e5ab4e"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "maximumBusinessDays" : 30
+                      "globalKey" : "65d8f062"
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
-                    "allGuarantees" : false,
-                    "noReferenceObligation" : true,
                     "referenceEntity" : {
-                      "meta" : {
-                        "globalKey" : "444afa68"
-                      },
                       "name" : {
                         "value" : "CompanyDEF"
+                      },
+                      "meta" : {
+                        "globalKey" : "444afa68"
                       }
                     },
+                    "noReferenceObligation" : true,
+                    "allGuarantees" : false,
                     "referencePrice" : {
+                      "value" : 1.0000000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.0000000000,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     },
                     "securedList" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "14f3cab8"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "publicSource" : [ "Standard Public Sources" ],
-                        "specifiedNumber" : 2
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 5000000,
-                      "meta" : {
-                        "globalKey" : "1a10e2d1"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 500000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 500000,
                         "meta" : {
                           "globalKey" : "6c32a26b"
                         }
                       }
                     },
+                    "obligationDefault" : false,
+                    "obligationAcceleration" : false,
+                    "repudiationMoratorium" : true,
                     "governmentalIntervention" : true,
-                    "meta" : {
-                      "globalKey" : "464c7b79"
+                    "defaultRequirement" : {
+                      "value" : 5000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "1a10e2d1"
+                      }
                     },
-                    "obligationAcceleration" : false,
-                    "obligationDefault" : false,
-                    "repudiationMoratorium" : true
-                  },
-                  "meta" : {
-                    "globalKey" : "439b7194"
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "publicSource" : [ "Standard Public Sources" ],
+                        "specifiedNumber" : 2
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "2f5a2a03"
+                    }
                   },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY",
+                    "category" : "BorrowedMoney",
+                    "excluded" : "true",
+                    "othReferenceEntityObligations" : "true",
                     "designatedPriority" : {
                       "value" : "FirstLienLoan"
-                    },
-                    "excluded" : "true",
-                    "othReferenceEntityObligations" : "true"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
                     }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c47"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "20"
                   },
                   "meta" : {
-                    "globalKey" : "28c47"
+                    "globalKey" : "6f4a909e"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "b384c8a4"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2007-03-20",
-                  "lastRegularPaymentDate" : "2010-03-20",
-                  "meta" : {
-                    "globalKey" : "6bbdc6d6"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "11cf7422"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "79d160ec"
+                "globalKey" : "925a79e0"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "ebf296cd"
-                },
-                "unadjustedDate" : "2010-03-21"
-              },
-              "meta" : {
-                "globalKey" : "ebf296cd"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "c5da74ae"
+            "globalKey" : "62157f3a"
           }
         },
         "meta" : {
-          "globalKey" : "c5da74ae"
+          "globalKey" : "62157f3a"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "5a207dbd"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0115,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0115,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e9ef39e3"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "63b2e9b8",
+          "externalReference" : "f6g4h5"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4627ed18",
+          "externalReference" : "fg4rde3"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "4627ed18",
+          "externalReference" : "fg4rde3"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb301"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "XYZBICXXX",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
+        },
+        "meta" : {
+          "globalKey" : "2283edb5"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2006-12-01"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "4627ed18",
+        "externalKey" : "fg4rde3"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABCBICXXX",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "56ERT7RHWE4"
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "ba7399be"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "fg4rde3",
-        "globalReference" : "a9fe6e32"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "91bdb1d3"
+        "globalKey" : "63b2e9b8",
+        "externalKey" : "f6g4h5"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "955bda07"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "8afb2a56"
+      }
+    },
+    "meta" : {
+      "globalKey" : "4504a51c"
+    }
+  },
+  "meta" : {
+    "globalKey" : "4504a51c"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/Obligations_physicalSettlementMatrix-2.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/Obligations_physicalSettlementMatrix-2.json
index 3e68c9d69e..564d89ba08 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/Obligations_physicalSettlementMatrix-2.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/Obligations_physicalSettlementMatrix-2.json
@@ -1,112 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "b6a26425"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "c92a48b8"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "1face209"
-      }
-    },
-    "meta" : {
-      "globalKey" : "b6a26425"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "fg4rde3",
-        "globalKey" : "a9fe6e32"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "4627ed18",
+        "externalReference" : "fg4rde3"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56ERT7RHWE4",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "XYZBICXXX"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         },
-        "meta" : {
-          "globalKey" : "2283edb5"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "f6g4h5",
-        "globalKey" : "9ca2e804"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "ABCBICXXX"
-        },
-        "meta" : {
-          "globalKey" : "ba7399be"
-        }
-      } ]
+        "globalKey" : "ab644853"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-12-01",
+      "meta" : {
+        "globalKey" : "3eb301"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "fg4rde3",
-          "globalReference" : "a9fe6e32"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "f6g4h5",
-          "globalReference" : "9ca2e804"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "fg4rde3",
-          "globalReference" : "a9fe6e32"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -114,30 +32,26 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-12-02",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
                 "meta" : {
-                  "globalKey" : "42f910b"
+                  "globalKey" : "eb82a1ba"
                 }
               },
-              "businessDayConvention" : "FOLLOWING",
               "meta" : {
-                "globalKey" : "da556d3a"
+                "globalKey" : "eb82a1ba"
               }
             },
-            "effectiveDate" : {
+            "terminationDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2010-03-21",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -145,351 +59,437 @@
                   }
                 },
                 "meta" : {
-                  "globalKey" : "eb82a1ba"
-                },
-                "unadjustedDate" : "2006-12-02"
+                  "globalKey" : "ebf296cd"
+                }
               },
               "meta" : {
-                "globalKey" : "eb82a1ba"
+                "globalKey" : "ebf296cd"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da556d3a"
               }
             },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f73"
+                    },
+                    "rollConvention" : "20"
                   },
+                  "meta" : {
+                    "globalKey" : "17f73"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2007-03-20",
+                  "lastRegularPaymentDate" : "2010-03-20",
+                  "meta" : {
+                    "globalKey" : "6bbdbe2a"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c204893e"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7a890171"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "c97c4685"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "maximumBusinessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : true,
+                      "notSubordinated" : false,
+                      "specifiedCurrency" : {
+                        "applicable" : false
+                      },
+                      "notSovereignLender" : false,
+                      "notDomesticCurrency" : {
+                        "applicable" : false
+                      },
+                      "notDomesticLaw" : true,
+                      "notContingent" : false,
+                      "notDomesticIssuance" : true,
                       "assignableLoan" : {
                         "applicable" : true
                       },
                       "consentRequiredLoan" : {
                         "applicable" : false
                       },
-                      "fullFaithAndCreditObLiability" : true,
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ac8"
-                        },
+                        "periodMultiplier" : 1,
                         "period" : "Y",
-                        "periodMultiplier" : 1
+                        "meta" : {
+                          "globalKey" : "78"
+                        }
                       },
                       "notBearer" : true,
-                      "notContingent" : false,
-                      "notDomesticCurrency" : {
-                        "applicable" : false
-                      },
-                      "notDomesticIssuance" : true,
-                      "notDomesticLaw" : true,
-                      "notSovereignLender" : false,
-                      "notSubordinated" : false,
-                      "specifiedCurrency" : {
-                        "applicable" : false
-                      },
-                      "transferable" : true
+                      "fullFaithAndCreditObLiability" : true
                     },
                     "escrow" : false,
                     "meta" : {
-                      "globalKey" : "16e5ab4e"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "maximumBusinessDays" : 30
+                      "globalKey" : "65d8f062"
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
-                    "allGuarantees" : false,
-                    "noReferenceObligation" : true,
                     "referenceEntity" : {
-                      "meta" : {
-                        "globalKey" : "444afa68"
-                      },
                       "name" : {
                         "value" : "CompanyDEF"
+                      },
+                      "meta" : {
+                        "globalKey" : "444afa68"
                       }
                     },
+                    "noReferenceObligation" : true,
+                    "allGuarantees" : false,
                     "referencePrice" : {
+                      "value" : 1.0000000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.0000000000,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     },
                     "securedList" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "14f3cab8"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "publicSource" : [ "Standard Public Sources" ],
-                        "specifiedNumber" : 2
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 5000000,
-                      "meta" : {
-                        "globalKey" : "1a10e2d1"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 500000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 500000,
                         "meta" : {
                           "globalKey" : "6c32a26b"
                         }
                       }
                     },
+                    "obligationDefault" : false,
+                    "obligationAcceleration" : false,
+                    "repudiationMoratorium" : true,
                     "governmentalIntervention" : true,
-                    "meta" : {
-                      "globalKey" : "464c7b79"
+                    "defaultRequirement" : {
+                      "value" : 5000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "1a10e2d1"
+                      }
                     },
-                    "obligationAcceleration" : false,
-                    "obligationDefault" : false,
-                    "repudiationMoratorium" : true
-                  },
-                  "meta" : {
-                    "globalKey" : "439b7194"
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "publicSource" : [ "Standard Public Sources" ],
+                        "specifiedNumber" : 2
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "2f5a2a03"
+                    }
                   },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY",
+                    "category" : "BorrowedMoney",
+                    "excluded" : "true",
+                    "othReferenceEntityObligations" : "true",
                     "designatedPriority" : {
                       "value" : "FirstLienLoan"
-                    },
-                    "excluded" : "true",
-                    "othReferenceEntityObligations" : "true"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
                     }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c47"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "20"
                   },
                   "meta" : {
-                    "globalKey" : "28c47"
+                    "globalKey" : "6f4a909e"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "b384c8a4"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2007-03-20",
-                  "lastRegularPaymentDate" : "2010-03-20",
-                  "meta" : {
-                    "globalKey" : "6bbdc6d6"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "11cf7422"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "79d160ec"
+                "globalKey" : "925a79e0"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "ebf296cd"
-                },
-                "unadjustedDate" : "2010-03-21"
-              },
-              "meta" : {
-                "globalKey" : "ebf296cd"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "c5da74ae"
+            "globalKey" : "62157f3a"
           }
         },
         "meta" : {
-          "globalKey" : "c5da74ae"
+          "globalKey" : "62157f3a"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "5a207dbd"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0115,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0115,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e9ef39e3"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "63b2e9b8",
+          "externalReference" : "f6g4h5"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4627ed18",
+          "externalReference" : "fg4rde3"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "4627ed18",
+          "externalReference" : "fg4rde3"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb301"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "XYZBICXXX",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
+        },
+        "meta" : {
+          "globalKey" : "2283edb5"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2006-12-01"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "4627ed18",
+        "externalKey" : "fg4rde3"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABCBICXXX",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "56ERT7RHWE4"
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "ba7399be"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "fg4rde3",
-        "globalReference" : "a9fe6e32"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "91bdb1d3"
+        "globalKey" : "63b2e9b8",
+        "externalKey" : "f6g4h5"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "SettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "85b3b830"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "dc365181"
+      }
+    },
+    "meta" : {
+      "globalKey" : "315c98fb"
+    }
+  },
+  "meta" : {
+    "globalKey" : "315c98fb"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/PaymentDates_paymentDaysOffset.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/PaymentDates_paymentDaysOffset.json
index 0d3e94218c..85a5566209 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/PaymentDates_paymentDaysOffset.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/PaymentDates_paymentDaysOffset.json
@@ -1,60 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "2368c791"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "2368c791"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7e15dfa1"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7e15dfa1",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "TW9235",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5299003X2Y7GWCF0KT81"
+            "scheme" : "http://www.bankA.com/swaps/trade-id"
+          }
         },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "7e15dfa1"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "695e25ab"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "529900DTJ5A7S5UCBB52"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "695e25ab"
-        }
-      } ]
+        "globalKey" : "ae11048a"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "1994-12-12",
+      "meta" : {
+        "globalKey" : "3e530c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7e15dfa1"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "695e25ab"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,46 +35,40 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "4158421"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c89"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -113,20 +77,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "d641c314"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -134,93 +95,101 @@
                             "value" : "GBLO"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "4158421"
+                            "globalKey" : "4158421",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "979ed7b2"
                         }
                       },
                       "meta" : {
                         "globalKey" : "548070e4"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "548070e4"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "e3e5f844"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "1995-06-14",
-                  "lastRegularPaymentDate" : "1996-12-14",
-                  "meta" : {
-                    "globalKey" : "8b701950"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "4158421"
+                        "globalReference" : "4158421",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentDaysOffset" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "83c"
+                      "globalKey" : "18a9b"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 0
+                    "rollConvention" : "14"
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "fa9d937e",
+                    "externalKey" : "floatingCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "firstPaymentDate" : "1995-06-14",
+                  "lastRegularPaymentDate" : "1996-12-14",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 0,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "44"
+                    }
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "4158421",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e56f93b6"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "d641c314"
+                    "globalReference" : "fa9d937e",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "10c06461"
+                      "globalKey" : "ed9c4f15"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -229,82 +198,79 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "e4e7b309"
+                      "globalReference" : "aeb83b77",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "e4e7b309"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "4158421"
+                        "globalReference" : "4158421",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "aeb83b77",
+                    "externalKey" : "resetDates"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "4f44042e"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "4158421"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b8fa"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -313,221 +279,255 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "faa5b75e"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "4158421"
+                            "globalReference" : "4158421",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "93c845ff"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "93c845ff"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "642add64"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa46135"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "4158421"
+                        "globalReference" : "4158421",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "1794a"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "9249d1f2",
+                    "externalKey" : "fixedCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "4158421",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "85fff0af"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "c56a1af8"
                 }
               } ],
               "meta" : {
-                "globalKey" : "e27c40a8"
+                "globalKey" : "f72b05a6"
               }
             }
           },
           "meta" : {
-            "globalKey" : "e27c40a8"
+            "globalKey" : "f72b05a6"
           }
         },
         "meta" : {
-          "globalKey" : "e27c40a8"
+          "globalKey" : "f72b05a6"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3ce21b9b"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "53c66a4c"
+          "quantity" : [ {
+            "value" : {
+              "value" : 50000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 50000000
+            "meta" : {
+              "globalKey" : "2505dd46"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "4882fcbc"
           },
+          "meta" : {
+            "globalKey" : "c0d07bed"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.06,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 50000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "c7dc9ac4"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "7e15dfa1",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "695e25ab",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "5299003X2Y7GWCF0KT81",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "7e15dfa1"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e530c"
-      },
-      "value" : "1994-12-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "7e15dfa1",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "529900DTJ5A7S5UCBB52",
           "meta" : {
-            "scheme" : "http://www.bankA.com/swaps/trade-id"
-          },
-          "value" : "TW9235"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "version" : 1
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "695e25ab"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "7e15dfa1"
-      },
       "meta" : {
-        "globalKey" : "38f6fe4a"
+        "globalKey" : "695e25ab",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "3bc1b103"
+    }
+  },
+  "meta" : {
+    "globalKey" : "3bc1b103"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/Tranche_dataRules.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/Tranche_dataRules.json
index e0bef41da2..c6184ceca6 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/Tranche_dataRules.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/Tranche_dataRules.json
@@ -1,87 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "80e1e210"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "955bda07"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "955bda07"
-      }
-    },
-    "meta" : {
-      "globalKey" : "80e1e210"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "tif563d",
-        "globalKey" : "9c430c06"
-      },
-      "name" : {
-        "value" : "Morgan Stanley Capital Services"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "3ad6e637",
+        "externalReference" : "fyure4"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DJITRAXXUSDMS5Y",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "MSCSBIC"
+            "scheme" : "http://www.barclaysglobal.com/partners/schema/v1-1/schemes/tradeID"
+          }
         },
-        "meta" : {
-          "globalKey" : "7ab8f086"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "fyure4",
-        "globalKey" : "efd9a2d9"
-      },
-      "name" : {
-        "value" : "Barclays Global Investors"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "BGIBIC"
-        },
-        "meta" : {
-          "globalKey" : "74aa8db8"
-        }
-      } ]
+        "globalKey" : "5a184390"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2004-01-24",
+      "meta" : {
+        "globalKey" : "3ea058"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "tif563d",
-          "globalReference" : "9c430c06"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "fyure4",
-          "globalReference" : "efd9a2d9"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -91,6 +34,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2004-03-23",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -99,140 +43,194 @@
                 },
                 "meta" : {
                   "globalKey" : "eb3e6e4f"
-                },
-                "unadjustedDate" : "2004-03-23"
+                }
               },
               "meta" : {
                 "globalKey" : "eb3e6e4f"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-03-20",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ebd48b0c"
+                }
+              },
+              "meta" : {
+                "globalKey" : "ebd48b0c"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
-                  },
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/ACT.ISDA"
+                },
+                "meta" : {
+                  "globalKey" : "28d6c3e0"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "generalTerms" : {
                   "basketReferenceInformation" : {
-                    "basketId" : [ {
-                      "meta" : {
-                        "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
-                      },
-                      "value" : "BASKET089"
-                    } ],
                     "basketName" : {
+                      "value" : "CDS Basket Sample",
                       "meta" : {
                         "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
-                      },
-                      "value" : "CDS Basket Sample"
+                      }
                     },
+                    "basketId" : [ {
+                      "value" : "BASKET089",
+                      "meta" : {
+                        "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
+                      }
+                    } ],
                     "referencePool" : {
                       "referencePoolItem" : [ {
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "008HA7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                              },
-                              "value" : "008HA7"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "r65hfd",
-                              "globalKey" : "6b99b4c1"
-                            },
                             "name" : {
                               "value" : "Agrium Inc."
+                            },
+                            "meta" : {
+                              "globalKey" : "6b99b4c1",
+                              "externalKey" : "r65hfd"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "r65hfd",
-                              "globalReference" : "6b99b4c1"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "008916AB4",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                                    },
-                                    "value" : "008916AB4"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "ab7bdc95"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "6b99b4c1",
+                              "externalReference" : "r65hfd"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
                         }
                       }, {
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "8G836J",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                              },
-                              "value" : "8G836J"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "uiyn4",
-                              "globalKey" : "92cc27"
-                            },
                             "name" : {
                               "value" : "Tenet Healthcare Corporation"
+                            },
+                            "meta" : {
+                              "globalKey" : "92cc27",
+                              "externalKey" : "uiyn4"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "uiyn4",
-                              "globalReference" : "92cc27"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "88033GAT7",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                                    },
-                                    "value" : "88033GAT7"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "db5db955"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "92cc27",
+                              "externalReference" : "uiyn4"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
                         }
                       } ]
@@ -243,212 +241,214 @@
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "7a1e4e9f"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "gracePeriodExtension" : {
                         "applicable" : true,
                         "gracePeriod" : {
-                          "meta" : {
-                            "globalKey" : "83c"
-                          },
+                          "periodMultiplier" : 0,
                           "period" : "D",
-                          "periodMultiplier" : 0
+                          "meta" : {
+                            "globalKey" : "44"
+                          }
                         }
                       },
                       "paymentRequirement" : {
+                        "value" : 1000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "GBP"
                           }
                         },
-                        "value" : 1000000.00,
                         "meta" : {
                           "globalKey" : "48eae7c4"
                         }
                       }
                     },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "d7154083"
+                      "globalKey" : "f8d2401"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "969cb413"
-                  },
                   "obligations" : {
-                    "category" : "BOND_OR_LOAN"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
+                    "category" : "BondOrLoan"
                   },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/ACT.ISDA"
-                },
-                "meta" : {
-                  "globalKey" : "e55fc83e"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "fa7f9c1d"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "90a9b011"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "ebd48b0c"
-                },
-                "unadjustedDate" : "2009-03-20"
+                  "globalKey" : "d518a89d"
+                }
               },
               "meta" : {
-                "globalKey" : "ebd48b0c"
+                "globalKey" : "b89cac7d"
               }
             }
           },
           "meta" : {
-            "globalKey" : "352735e"
+            "globalKey" : "830f7440"
           }
         },
         "meta" : {
-          "globalKey" : "352735e"
+          "globalKey" : "830f7440"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3a43e344"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0060,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0060,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e38853c"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "b6d67b86",
+          "externalReference" : "tif563d"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "3ad6e637",
+          "externalReference" : "fyure4"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea058"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "MSCSBIC",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
+        },
+        "meta" : {
+          "globalKey" : "7ab8f086"
+        }
+      } ],
+      "name" : {
+        "value" : "Morgan Stanley Capital Services"
       },
-      "value" : "2004-01-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "b6d67b86",
+        "externalKey" : "tif563d"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BGIBIC",
           "meta" : {
-            "scheme" : "http://www.barclaysglobal.com/partners/schema/v1-1/schemes/tradeID"
-          },
-          "value" : "DJITRAXXUSDMS5Y"
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "74aa8db8"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "fyure4",
-        "globalReference" : "efd9a2d9"
+      "name" : {
+        "value" : "Barclays Global Investors"
       },
       "meta" : {
-        "globalKey" : "127eb2d0"
+        "globalKey" : "3ad6e637",
+        "externalKey" : "fyure4"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "955bda07"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "955bda07"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "c1272586"
+    }
+  },
+  "meta" : {
+    "globalKey" : "c1272586"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-cleared-alpha-trade-CFTC-SEC-and-canada.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-cleared-alpha-trade-CFTC-SEC-and-canada.json
index 556073e54d..083b6bd0cb 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-cleared-alpha-trade-CFTC-SEC-and-canada.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-cleared-alpha-trade-CFTC-SEC-and-canada.json
@@ -1,96 +1,451 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "BANKX0001"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "3ce1279d"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.bankx.com/msg_id"
-      },
-      "value" : "BANKX0001"
-    },
-    "sentBy" : {
-      "value" : "BANKX"
-    },
-    "sentTo" : [ {
-      "value" : "SDR01"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "75570423"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "2002-01-05",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster"
+                }
+              },
+              "vintage" : 1992
+            },
+            "meta" : {
+              "globalKey" : "4f2097d4"
+            }
+          }, {
+            "agreementDate" : "2002-01-07",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "ISDA2003CreditNorthAmerican"
+                }
+              }
+            },
+            "meta" : {
+              "globalKey" : "5d7949e5"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "CreditSupportAgreement"
+              }
+            },
+            "meta" : {
+              "globalKey" : "984ae6d0"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix"
+                  },
+                  "matrixTerm" : {
+                    "value" : "StandardNorthAmericanCorporate"
+                  }
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "9ed2f955"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Other",
+                "otherAgreement" : "Custom Legal Agreement"
+              }
+            },
+            "meta" : {
+              "globalKey" : "98e1dbe8"
+            }
+          } ]
+        }
+      },
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "6f7b4237"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "b272a45d"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "contactInformation" : {
-                  "address" : [ {
-                    "city" : "New York",
-                    "country" : {
-                      "value" : "US"
-                    },
-                    "postalCode" : "10017",
-                    "state" : "NY",
-                    "street" : [ "123 Park Avenue" ]
-                  } ]
-                },
-                "meta" : {
-                  "externalKey" : "branch1",
-                  "globalKey" : "69aea9de"
-                },
-                "name" : "New York Office"
-              }, {
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "FCHUXIINML",
                 "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
+                }
+              },
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "12345678901234567890123456789012",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
+                }
               } ],
-              "contactInformation" : {
-                "email" : [ "swap_trading@bankx.com" ]
+              "meta" : {
+                "globalKey" : "ce80645"
+              },
+              "identifierType" : "UniqueTransactionIdentifier"
+            }, {
+              "issuer" : {
+                "value" : "1031234567",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                }
               },
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "12345678901234567890123456789011",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
+                }
+              } ],
               "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "b8d57157"
+                "globalKey" : "671d1c67"
               },
-              "name" : {
-                "value" : "Bank X"
+              "identifierType" : "UniqueTransactionIdentifier"
+            } ],
+            "tradeDate" : {
+              "value" : "2011-02-12",
+              "meta" : {
+                "globalKey" : "3ed88c"
+              }
+            },
+            "tradableProduct" : {
+              "product" : {
+                "contractualProduct" : {
+                  "productTaxonomy" : [ {
+                    "primaryAssetClass" : {
+                      "value" : "Credit"
+                    }
+                  }, {
+                    "source" : "Other",
+                    "value" : {
+                      "name" : {
+                        "value" : "SecurityBasedSwap",
+                        "meta" : {
+                          "scheme" : "http://www.fpml.org/coding-scheme/sec-product-category"
+                        }
+                      }
+                    }
+                  }, {
+                    "source" : "Other",
+                    "value" : {
+                      "name" : {
+                        "value" : "Credi Default Swap",
+                        "meta" : {
+                          "scheme" : "http://www.theice.com/coding-scheme/product-name"
+                        }
+                      }
+                    }
+                  }, {
+                    "source" : "Other",
+                    "value" : {
+                      "name" : {
+                        "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
+                      }
+                    }
+                  }, {
+                    "source" : "ISDA",
+                    "productQualifier" : "CreditDefaultSwap_SingleName"
+                  } ],
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "X123",
+                        "meta" : {
+                          "scheme" : "http://www.theice.com/coding-scheme/product-id"
+                        }
+                      },
+                      "source" : "Other",
+                      "meta" : {
+                        "globalKey" : "e6a349ca"
+                      }
+                    }
+                  } ],
+                  "economicTerms" : {
+                    "effectiveDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2009-03-26",
+                        "meta" : {
+                          "globalKey" : "3ec8da"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ec8da"
+                      }
+                    },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2014-06-20",
+                        "meta" : {
+                          "globalKey" : "3ef194"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ef194"
+                      }
+                    },
+                    "payout" : {
+                      "interestRatePayout" : [ {
+                        "payerReceiver" : {
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
+                        },
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        },
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "calculationPeriodDates" : {
+                          "firstPeriodStartDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2009-03-20",
+                              "meta" : {
+                                "globalKey" : "3ec8d4"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3ec8d4"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
+                          "meta" : {
+                            "globalKey" : "bf47be47"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "firstPaymentDate" : "2009-06-20",
+                          "meta" : {
+                            "globalKey" : "8aa3de96"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "eff49770"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        },
+                        "generalTerms" : {
+                          "referenceInformation" : {
+                            "referenceEntity" : {
+                              "entityId" : [ {
+                                "value" : "8G836J",
+                                "meta" : {
+                                  "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
+                                }
+                              } ],
+                              "name" : {
+                                "value" : "TENET HEALTHCARE CORPORATION"
+                              },
+                              "meta" : {
+                                "globalKey" : "54140007",
+                                "externalKey" : "referenceEntity"
+                              }
+                            },
+                            "referenceObligation" : [ {
+                              "security" : {
+                                "productIdentifier" : [ {
+                                  "value" : {
+                                    "identifier" : {
+                                      "value" : "8G836JAF2",
+                                      "meta" : {
+                                        "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair-1-0"
+                                      }
+                                    },
+                                    "source" : "Other",
+                                    "meta" : {
+                                      "globalKey" : "1165f83f"
+                                    }
+                                  }
+                                } ],
+                                "securityType" : "Debt"
+                              }
+                            } ]
+                          }
+                        },
+                        "transactedPrice" : {
+                          "marketFixedRate" : 0.02
+                        },
+                        "meta" : {
+                          "globalKey" : "2fa76fbc"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "a7b3d32c"
+                      }
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "7d14851a"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "7d14851a"
+                }
               },
+              "tradeLot" : [ {
+                "priceQuantity" : [ {
+                  "price" : [ {
+                    "value" : {
+                      "value" : 0.01,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "perUnitOf" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "c5befd88"
+                  }
+                }, {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 5000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "280b774f"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "d0b9c5dd",
+                  "externalReference" : "party2"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "81c9b405",
+                  "externalReference" : "party1"
+                }
+              } ]
+            },
+            "party" : [ {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "5493001RKR55V4X61F71",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "5493001RKR55V4X61F71"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "d0f863bc"
                 }
               } ],
-              "person" : [ {
-                "firstName" : "person",
-                "meta" : {
-                  "externalKey" : "broker",
-                  "globalKey" : "140b1888"
+              "name" : {
+                "value" : "Bank X"
+              },
+              "businessUnit" : [ {
+                "name" : "New York Office",
+                "contactInformation" : {
+                  "address" : [ {
+                    "street" : [ "123 Park Avenue" ],
+                    "city" : "New York",
+                    "state" : "NY",
+                    "country" : {
+                      "value" : "US"
+                    },
+                    "postalCode" : "10017"
+                  } ]
                 },
+                "meta" : {
+                  "globalKey" : "e15b99b0",
+                  "externalKey" : "branch1"
+                }
+              }, {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
                 "personId" : [ {
                   "value" : {
                     "identifier" : {
@@ -100,13 +455,13 @@
                       "globalKey" : "32d9e6bd"
                     }
                   }
-                } ]
-              }, {
+                } ],
                 "firstName" : "person",
                 "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "140b242b"
-                },
+                  "globalKey" : "140b1888",
+                  "externalKey" : "broker"
+                }
+              }, {
                 "personId" : [ {
                   "value" : {
                     "identifier" : {
@@ -116,676 +471,321 @@
                       "globalKey" : "32d9f260"
                     }
                   }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_parent",
-                "globalKey" : "956c45f9"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B47"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f9"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_affiliate1",
-                "globalKey" : "956c45fa"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B48"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45fa"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_affiliate2",
-                "globalKey" : "956c45fb"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B49"
-                },
-                "identifierType" : "LEI",
+                } ],
+                "firstName" : "person",
                 "meta" : {
-                  "globalKey" : "956c45fb"
+                  "globalKey" : "140b242b",
+                  "externalKey" : "trader"
                 }
-              } ]
-            }, {
+              } ],
               "contactInformation" : {
-                "email" : [ "investments@banky.com" ]
-              },
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "573ad49d"
-              },
-              "name" : {
-                "value" : "Bank Y"
+                "email" : [ "swap_trading@bankx.com" ]
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B46"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f8"
-                }
-              } ]
-            }, {
               "meta" : {
-                "externalKey" : "party2_parent",
-                "globalKey" : "956c45f9"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B47"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f9"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2_affiliate1",
-                "globalKey" : "956c45fa"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B48"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45fa"
-                }
-              } ]
+                "globalKey" : "81c9b405",
+                "externalKey" : "party1"
+              }
             }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
-              },
-              "name" : {
-                "value" : "Up&Atem"
-              },
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B47",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "8ffabe4b"
+                  "globalKey" : "956c45f9"
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "executing_agent",
-                "globalKey" : "49e97697"
-              },
-              "name" : {
-                "value" : "XYZ Bank"
-              },
+                "globalKey" : "956c45f9",
+                "externalKey" : "party1_parent"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B48",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND22"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "e213e774"
+                  "globalKey" : "956c45fa"
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "venue",
-                "globalKey" : "6ebddc37"
-              },
-              "name" : {
-                "value" : "SEFCo LLC"
-              },
+                "globalKey" : "956c45fa",
+                "externalKey" : "party1_affiliate1"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B49",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND11"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "e213e754"
+                  "globalKey" : "956c45fb"
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
-              },
+                "globalKey" : "956c45fb",
+                "externalKey" : "party1_affiliate2"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B46",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "e213e7d7"
+                  "globalKey" : "956c45f8"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "original_sdr",
-                "globalKey" : "9b321c78"
-              },
+              } ],
               "name" : {
-                "value" : "WorldWide Trade Repository"
+                "value" : "Bank Y"
               },
+              "contactInformation" : {
+                "email" : [ "investments@banky.com" ]
+              },
+              "meta" : {
+                "globalKey" : "d0b9c5dd",
+                "externalKey" : "party2"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B47",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "e213e7d7"
+                  "globalKey" : "956c45f9"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "b8d57157"
-              },
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "573ad49d"
-              },
-              "role" : "REPORTING_PARTY"
-            } ],
-            "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "573ad49d"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "b8d57157"
-                },
-                "role" : "PARTY_2"
               } ],
-              "product" : {
-                "contractualProduct" : {
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "meta" : {
-                          "scheme" : "http://www.theice.com/coding-scheme/product-id"
-                        },
-                        "value" : "X123"
-                      },
-                      "meta" : {
-                        "globalKey" : "e6a349ca"
-                      },
-                      "source" : "OTHER"
-                    }
-                  } ],
-                  "productTaxonomy" : [ {
-                    "primaryAssetClass" : {
-                      "value" : "CREDIT"
-                    }
-                  }, {
-                    "source" : "OTHER",
-                    "value" : {
-                      "name" : {
-                        "meta" : {
-                          "scheme" : "http://www.fpml.org/coding-scheme/sec-product-category"
-                        },
-                        "value" : "SecurityBasedSwap"
-                      }
-                    }
-                  }, {
-                    "source" : "OTHER",
-                    "value" : {
-                      "name" : {
-                        "meta" : {
-                          "scheme" : "http://www.theice.com/coding-scheme/product-name"
-                        },
-                        "value" : "Credi Default Swap"
-                      }
-                    }
-                  }, {
-                    "source" : "OTHER",
-                    "value" : {
-                      "name" : {
-                        "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
-                      }
-                    }
-                  }, {
-                    "source" : "ISDA",
-                    "productQualifier" : "CreditDefaultSwap_SingleName"
-                  } ],
-                  "economicTerms" : {
-                    "effectiveDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3ec8da"
-                        },
-                        "unadjustedDate" : "2009-03-26"
-                      },
-                      "meta" : {
-                        "globalKey" : "3ec8da"
-                      }
-                    },
-                    "payout" : {
-                      "creditDefaultPayout" : {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "generalTerms" : {
-                          "referenceInformation" : {
-                            "referenceEntity" : {
-                              "entityId" : [ {
-                                "meta" : {
-                                  "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                                },
-                                "value" : "8G836J"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "referenceEntity",
-                                "globalKey" : "54140007"
-                              },
-                              "name" : {
-                                "value" : "TENET HEALTHCARE CORPORATION"
-                              }
-                            },
-                            "referenceObligation" : [ {
-                              "security" : {
-                                "productIdentifier" : [ {
-                                  "value" : {
-                                    "identifier" : {
-                                      "meta" : {
-                                        "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair-1-0"
-                                      },
-                                      "value" : "8G836JAF2"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "1165f83f"
-                                    },
-                                    "source" : "OTHER"
-                                  }
-                                } ],
-                                "securityType" : "DEBT"
-                              }
-                            } ]
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "2fa76fbc"
-                        },
-                        "transactedPrice" : {
-                          "marketFixedRate" : 0.02
-                        }
-                      },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
-                          "firstPeriodStartDate" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3ec8d4"
-                              },
-                              "unadjustedDate" : "2009-03-20"
-                            },
-                            "meta" : {
-                              "globalKey" : "3ec8d4"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "28c1032d"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "6afbe26c"
-                        },
-                        "paymentDates" : {
-                          "firstPaymentDate" : "2009-06-20",
-                          "meta" : {
-                            "globalKey" : "8aa3e742"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "1fd4e030"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3ef194"
-                        },
-                        "unadjustedDate" : "2014-06-20"
-                      },
-                      "meta" : {
-                        "globalKey" : "3ef194"
-                      }
-                    }
-                  },
+              "meta" : {
+                "globalKey" : "956c45f9",
+                "externalKey" : "party2_parent"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B48",
                   "meta" : {
-                    "globalKey" : "2569d882"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "2569d882"
+                  "globalKey" : "956c45fa"
                 }
-              },
-              "tradeLot" : [ {
-                "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "1f273178"
-                  },
-                  "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 0.01,
-                      "perUnitOf" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "1a10e2d1"
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 5000000
-                    }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
+              } ],
               "meta" : {
-                "globalKey" : "3ed88c"
-              },
-              "value" : "2011-02-12"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+                "globalKey" : "956c45fa",
+                "externalKey" : "party2_affiliate1"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "12345678901234567890123456789012"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "8ffabe4b"
                 }
               } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
-                },
-                "value" : "FCHUXIINML"
+              "name" : {
+                "value" : "Up&Atem"
               },
               "meta" : {
-                "globalKey" : "1551a427"
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND22",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e774"
+                }
+              } ],
+              "name" : {
+                "value" : "XYZ Bank"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
+              "meta" : {
+                "globalKey" : "61a07317",
+                "externalKey" : "executing_agent"
+              }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300IB5Q45JGNPND11",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "12345678901234567890123456789011"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e754"
                 }
               } ],
-              "issuer" : {
+              "name" : {
+                "value" : "SEFCo LLC"
+              },
+              "meta" : {
+                "globalKey" : "ae0d40b7",
+                "externalKey" : "venue"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
+              },
+              "meta" : {
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "1031234567"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "WorldWide Trade Repository"
               },
               "meta" : {
-                "globalKey" : "f6e8a927"
+                "globalKey" : "4ba4fb38",
+                "externalKey" : "original_sdr"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "d0b9c5dd",
+                "externalReference" : "party2"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
+              "role" : "ReportingParty",
+              "ownershipPartyReference" : {
+                "globalReference" : "81c9b405",
+                "externalReference" : "party1"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "3cc4897f"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "c11af7da"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "b8d57157"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "573ad49d"
-                }
-              },
               "quantity" : {
+                "value" : 1000,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "81c9b405",
+                  "externalReference" : "party1"
                 },
-                "value" : 1000
+                "receiverPartyReference" : {
+                  "globalReference" : "d0b9c5dd",
+                  "externalReference" : "party2"
+                }
               },
               "settlementDate" : {
+                "unadjustedDate" : "2009-03-28",
                 "adjustedDate" : {
+                  "value" : "2009-03-30",
                   "meta" : {
                     "globalKey" : "3ec8de"
-                  },
-                  "value" : "2009-03-30"
-                },
-                "unadjustedDate" : "2009-03-28"
-              },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
-              }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "2002-01-05",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "value" : "ISDA_MASTER"
+                  }
                 }
               },
-              "vintage" : 1992
-            },
-            "meta" : {
-              "globalKey" : "4f2097d4"
-            }
-          }, {
-            "agreementDate" : "2002-01-07",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "ISDA_2003_CREDIT_NORTH_AMERICAN"
-                }
-              }
-            },
-            "meta" : {
-              "globalKey" : "5d7949e5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CREDIT_SUPPORT_AGREEMENT"
-              }
-            },
-            "meta" : {
-              "globalKey" : "984ae6d0"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "value" : "STANDARD_NORTH_AMERICAN_CORPORATE"
-                  },
-                  "matrixType" : {
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-                  }
-                } ]
-              }
-            },
-            "meta" : {
-              "globalKey" : "80f11ad5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "OTHER",
-                "otherAgreement" : "Custom Legal Agreement"
+              "transferExpression" : {
+                "priceTransfer" : "Upfront"
               }
             },
             "meta" : {
-              "globalKey" : "98e1dbe8"
+              "globalKey" : "ebfa433a"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "cd1eeb9"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "BANKX0001",
+      "meta" : {
+        "scheme" : "http://www.bankx.com/msg_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "BANKX"
+    },
+    "sentTo" : [ {
+      "value" : "SDR01"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2011-02-12T12:42:16Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2011-02-12T12:20:47Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "BANKX0001"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "3ce1279d"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "f6ef25ff"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex51-execution-advice-trade-initiation-C01-00.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex51-execution-advice-trade-initiation-C01-00.json
index 84e8390da4..3d8b095229 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex51-execution-advice-trade-initiation-C01-00.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex51-execution-advice-trade-initiation-C01-00.json
@@ -1,153 +1,57 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "IM/5"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "22560a"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.imgr.com/schemes/message-id"
-      },
-      "value" : "IM/5"
-    },
-    "sentBy" : {
-      "value" : "IMGRUS6S"
-    },
-    "sentTo" : [ {
-      "value" : "CUSTUS3T"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "a1fa544e"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "2009-05-22",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "ISDA2003StandardCreditNorthAmerican"
+                }
+              }
+            },
+            "meta" : {
+              "globalKey" : "e0202540"
+            }
+          } ]
+        }
+      },
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "28b56eef"
-          },
           "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "_fund",
-                "globalReference" : "7233a0bd"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "29bfd33d",
+                "externalReference" : "_fund"
               },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.imgr.com/schemes/account-id"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CONTR2345",
+                  "meta" : {
+                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+                  }
                 },
-                "value" : "FUND100"
-              },
+                "version" : 1
+              } ],
               "meta" : {
-                "externalKey" : "_FUNDACCT",
-                "globalKey" : "628d73b0"
+                "globalKey" : "e60a7d47"
               }
-            }, {
-              "accountBeneficiary" : {
-                "externalReference" : "_cust",
-                "globalReference" : "6f1f29ef"
-              },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.custodian.com/account-id"
-                },
-                "value" : "98765"
-              },
+            } ],
+            "tradeDate" : {
+              "value" : "2009-06-08",
               "meta" : {
-                "externalKey" : "_CUSTACCT",
-                "globalKey" : "54440069"
+                "globalKey" : "3ec988"
               }
-            } ],
-            "meta" : {
-              "globalKey" : "fe1f54f8"
             },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "_fund",
-                "globalKey" : "7233a0bd"
-              },
-              "name" : {
-                "value" : "INVEST MGR"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "959800NKRMZ8NEKQ0A23"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "696247f0"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_broker",
-                "globalKey" : "9627fd8c"
-              },
-              "name" : {
-                "value" : "BROKER 33"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300E4CDNNLJRBKF36"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "ea328105"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_cust",
-                "globalKey" : "6f1f29ef"
-              },
-              "name" : {
-                "value" : "Custodian"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300FNRNXH6KYKUK07"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "aefc2f21"
-                }
-              } ]
-            } ],
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "7233a0bd"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "9627fd8c"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
                         "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
@@ -160,326 +64,422 @@
                   "economicTerms" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2009-06-09",
                         "meta" : {
                           "globalKey" : "3ec989"
-                        },
-                        "unadjustedDate" : "2009-06-09"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "3ec989"
                       }
                     },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2012-06-20",
+                        "meta" : {
+                          "globalKey" : "3ee194"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ee194"
+                      }
+                    },
                     "payout" : {
-                      "creditDefaultPayout" : {
+                      "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
                           "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
+                          }
+                        },
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "calculationPeriodDates" : {
+                          "firstPeriodStartDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2009-03-20",
+                              "meta" : {
+                                "globalKey" : "3ec8d4"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3ec8d4"
+                            }
                           },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
+                          "meta" : {
+                            "globalKey" : "bf47be47"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "firstPaymentDate" : "2009-06-20",
+                          "meta" : {
+                            "globalKey" : "8aa3de96"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "eff49770"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
                         "generalTerms" : {
                           "referenceInformation" : {
                             "referenceEntity" : {
                               "entityId" : [ {
+                                "value" : "0E69A8",
                                 "meta" : {
                                   "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                                },
-                                "value" : "0E69A8"
+                                }
                               } ],
-                              "meta" : {
-                                "globalKey" : "717c0b9e"
-                              },
                               "name" : {
                                 "value" : "0E69A8"
+                              },
+                              "meta" : {
+                                "globalKey" : "717c0b9e"
                               }
                             },
                             "referenceObligation" : [ {
-                              "primaryObligor" : {
-                                "entityId" : [ {
-                                  "meta" : {
-                                    "scheme" : "http://www.imgr.com/schemes/entity-id"
-                                  },
-                                  "value" : "ARW"
-                                } ],
-                                "meta" : {
-                                  "globalKey" : "3bb830c"
-                                },
-                                "name" : {
-                                  "value" : "ARW"
-                                }
-                              },
                               "security" : {
                                 "productIdentifier" : [ {
                                   "value" : {
                                     "identifier" : {
+                                      "value" : "US042735AL41",
                                       "meta" : {
                                         "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                                      },
-                                      "value" : "US042735AL41"
+                                      }
                                     },
+                                    "source" : "ISIN",
                                     "meta" : {
                                       "globalKey" : "42958b00"
-                                    },
-                                    "source" : "ISIN"
+                                    }
+                                  }
+                                } ],
+                                "securityType" : "Debt"
+                              },
+                              "primaryObligor" : {
+                                "entityId" : [ {
+                                  "value" : "ARW",
+                                  "meta" : {
+                                    "scheme" : "http://www.imgr.com/schemes/entity-id"
                                   }
                                 } ],
-                                "securityType" : "DEBT"
+                                "name" : {
+                                  "value" : "ARW"
+                                },
+                                "meta" : {
+                                  "globalKey" : "3bb830c"
+                                }
                               }
                             } ]
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "110ba297"
-                        },
                         "protectionTerms" : [ {
                           "creditEvents" : {
-                            "meta" : {
-                              "globalKey" : "4cf"
-                            },
                             "restructuring" : {
                               "applicable" : true
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "4cf"
-                          }
-                        } ]
-                      },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
-                          "firstPeriodStartDate" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3ec8d4"
-                              },
-                              "unadjustedDate" : "2009-03-20"
                             },
                             "meta" : {
-                              "globalKey" : "3ec8d4"
+                              "globalKey" : "4cf"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "28c1032d"
+                            "globalKey" : "4cf"
                           }
-                        },
+                        } ],
                         "meta" : {
-                          "globalKey" : "6afbe26c"
-                        },
-                        "paymentDates" : {
-                          "firstPaymentDate" : "2009-06-20",
-                          "meta" : {
-                            "globalKey" : "8aa3e742"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                          "globalKey" : "2779e5e9"
                         }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "f7ca9435"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3ee194"
-                        },
-                        "unadjustedDate" : "2012-06-20"
                       },
                       "meta" : {
-                        "globalKey" : "3ee194"
+                        "globalKey" : "50cbc479"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "50da6c70"
+                    "globalKey" : "25fb0996"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "50da6c70"
+                  "globalKey" : "25fb0996"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "478ae7c4"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.023,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.023,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "51c414ad"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a9d210bc"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 70000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 70000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "e6be80f3"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "29bfd33d",
+                  "externalReference" : "_fund"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "7e552bcc",
+                  "externalReference" : "_broker"
+                }
               } ]
             },
-            "tradeDate" : {
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "959800NKRMZ8NEKQ0A23",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "696247f0"
+                }
+              } ],
+              "name" : {
+                "value" : "INVEST MGR"
+              },
               "meta" : {
-                "globalKey" : "3ec988"
+                "globalKey" : "29bfd33d",
+                "externalKey" : "_fund"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300E4CDNNLJRBKF36",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "ea328105"
+                }
+              } ],
+              "name" : {
+                "value" : "BROKER 33"
               },
-              "value" : "2009-06-08"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+              "meta" : {
+                "globalKey" : "7e552bcc",
+                "externalKey" : "_broker"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300FNRNXH6KYKUK07",
                   "meta" : {
-                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-                  },
-                  "value" : "CONTR2345"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "version" : 1
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "aefc2f21"
+                }
               } ],
-              "issuerReference" : {
-                "externalReference" : "_fund",
-                "globalReference" : "7233a0bd"
+              "name" : {
+                "value" : "Custodian"
               },
               "meta" : {
-                "globalKey" : "ecb29287"
+                "globalKey" : "b8297caf",
+                "externalKey" : "_cust"
               }
-            } ]
+            } ],
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "FUND100",
+                "meta" : {
+                  "scheme" : "http://www.imgr.com/schemes/account-id"
+                }
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "29bfd33d",
+                "externalReference" : "_fund"
+              },
+              "meta" : {
+                "globalKey" : "a2ddb9b0",
+                "externalKey" : "_FUNDACCT"
+              }
+            }, {
+              "accountNumber" : {
+                "value" : "98765",
+                "meta" : {
+                  "scheme" : "http://www.custodian.com/account-id"
+                }
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "b8297caf",
+                "externalReference" : "_cust"
+              },
+              "meta" : {
+                "globalKey" : "2f5c7329",
+                "externalKey" : "_CUSTACCT"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "13d646e2"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "c16a2bf7"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "7233a0bd"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "9627fd8c"
-                }
-              },
               "quantity" : {
+                "value" : 387300.00,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "29bfd33d",
+                  "externalReference" : "_fund"
                 },
-                "value" : 387300.00
+                "receiverPartyReference" : {
+                  "globalReference" : "7e552bcc",
+                  "externalReference" : "_broker"
+                }
               },
               "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
-              }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "2009-05-22",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "ISDA_2003_STANDARD_CREDIT_NORTH_AMERICAN"
-                }
+                "priceTransfer" : "Upfront"
               }
             },
             "meta" : {
-              "globalKey" : "e0202540"
+              "globalKey" : "5580d145"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "4d9864a7"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "IM/5",
+      "meta" : {
+        "scheme" : "http://www.imgr.com/schemes/message-id"
+      }
+    },
+    "sentBy" : {
+      "value" : "IMGRUS6S"
+    },
+    "sentTo" : [ {
+      "value" : "CUSTUS3T"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2009-06-08T10:03:09-08:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "IM/5"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "22560a"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "cb259a8e"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex52-execution-advice-trade-partial-novation-C02-00.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex52-execution-advice-trade-partial-novation-C02-00.json
index 0b8178002a..3a3ef0ab35 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex52-execution-advice-trade-partial-novation-C02-00.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex52-execution-advice-trade-partial-novation-C02-00.json
@@ -1,193 +1,145 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "IM/6"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "22560b"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.imgr.com/schemes/message-id"
-      },
-      "value" : "IM/6"
-    },
-    "sentBy" : {
-      "value" : "IMGRUS6S"
-    },
-    "sentTo" : [ {
-      "value" : "CUSTUS3T"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "2673ffb9"
-  },
   "proposedEvent" : {
+    "intent" : "Novation",
     "eventDate" : "2009-06-16",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "ff2c8800"
-          },
-          "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "_fund",
-                "globalReference" : "7233a0bd"
-              },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.imgr.com/schemes/account-id"
-                },
-                "value" : "FUND100"
-              },
-              "meta" : {
-                "externalKey" : "_FUNDACCT",
-                "globalKey" : "628d73b0"
-              }
-            }, {
-              "accountBeneficiary" : {
-                "externalReference" : "_cust",
-                "globalReference" : "6f1f29ef"
+      "primitiveInstruction" : {
+        "split" : {
+          "breakdown" : [ {
+            "partyChange" : {
+              "counterparty" : {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "a69bc63f",
+                  "externalReference" : "_broker2"
+                }
               },
-              "accountNumber" : {
+              "tradeId" : [ {
+                "assignedIdentifier" : [ {
+                  "identifier" : {
+                    "value" : "CONTR2345",
+                    "meta" : {
+                      "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+                    }
+                  },
+                  "version" : 2
+                } ],
                 "meta" : {
-                  "scheme" : "http://www.custodian.com/account-id"
-                },
-                "value" : "98765"
-              },
-              "meta" : {
-                "externalKey" : "_CUSTACCT",
-                "globalKey" : "54440069"
-              }
-            } ],
-            "contractDetails" : {
-              "documentation" : [ {
-                "agreementDate" : "2009-05-22",
-                "legalAgreementIdentification" : {
-                  "agreementName" : {
-                    "agreementType" : "MASTER_CONFIRMATION",
-                    "masterConfirmationType" : {
-                      "value" : "ISDA_2003_STANDARD_CREDIT_NORTH_AMERICAN"
+                  "globalKey" : "8e7e1764"
+                }
+              } ]
+            },
+            "quantityChange" : {
+              "change" : [ {
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 20000000.00,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
                     }
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "e0202540"
+                  "globalKey" : "694c96e8"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "e0202540"
-              }
-            },
-            "meta" : {
-              "globalKey" : "857a2fc9"
+              "direction" : "Replace"
             },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "_fund",
-                "globalKey" : "7233a0bd"
-              },
-              "name" : {
-                "value" : "INVEST MGR"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            "transfer" : {
+              "transferState" : [ {
+                "transfer" : {
+                  "quantity" : {
+                    "value" : 38555.00,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
+                    }
                   },
-                  "value" : "959800NKRMZ8NEKQ0A23"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "696247f0"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_broker",
-                "globalKey" : "9627fd8c"
-              },
-              "name" : {
-                "value" : "BROKER 33"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  "payerReceiver" : {
+                    "payerPartyReference" : {
+                      "globalReference" : "a69bc63f",
+                      "externalReference" : "_broker2"
+                    },
+                    "receiverPartyReference" : {
+                      "globalReference" : "29bfd33d",
+                      "externalReference" : "_fund"
+                    }
+                  },
+                  "settlementDate" : {
+                    "adjustedDate" : {
+                      "value" : "2009-08-16",
+                      "meta" : {
+                        "globalKey" : "3eca10"
+                      }
+                    }
                   },
-                  "value" : "549300E4CDNNLJRBKF36"
+                  "transferExpression" : {
+                    "priceTransfer" : "Novation"
+                  }
                 },
-                "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "ea328105"
+                  "globalKey" : "deb94178",
+                  "externalKey" : "NOVATION_FEE"
                 }
               } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_broker2",
-                "globalKey" : "c3b3523f"
-              },
-              "name" : {
-                "value" : "BROKER 53"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300L7VWW3G1702646"
-                },
-                "identifierType" : "LEI",
+            }
+          }, {
+            "quantityChange" : {
+              "change" : [ {
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 20000000.00,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
+                    }
+                  }
+                } ],
                 "meta" : {
-                  "globalKey" : "1454247a"
+                  "globalKey" : "694c96e8"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_cust",
-                "globalKey" : "6f1f29ef"
-              },
-              "name" : {
-                "value" : "Custodian"
+              } ],
+              "direction" : "Decrease"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "29bfd33d",
+                "externalReference" : "_fund"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "CONTR2345",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300FNRNXH6KYKUK07"
+                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+                  }
                 },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "aefc2f21"
-                }
-              } ]
+                "version" : 1
+              } ],
+              "meta" : {
+                "globalKey" : "e60a7d47"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2009-06-08",
+              "meta" : {
+                "globalKey" : "3ec988"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "7233a0bd"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "9627fd8c"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
                         "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
@@ -200,413 +152,461 @@
                   "economicTerms" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2009-06-09",
                         "meta" : {
                           "globalKey" : "3ec989"
-                        },
-                        "unadjustedDate" : "2009-06-09"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "3ec989"
                       }
                     },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2012-06-20",
+                        "meta" : {
+                          "globalKey" : "3ee194"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ee194"
+                      }
+                    },
                     "payout" : {
-                      "creditDefaultPayout" : {
+                      "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
-                        "generalTerms" : {
-                          "referenceInformation" : {
-                            "referenceEntity" : {
-                              "entityId" : [ {
-                                "meta" : {
-                                  "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                                },
-                                "value" : "0E69A8"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "717c0b9e"
-                              },
-                              "name" : {
-                                "value" : "0E69A8"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "referenceObligation" : [ {
-                              "primaryObligor" : {
-                                "entityId" : [ {
-                                  "meta" : {
-                                    "scheme" : "http://www.imgr.com/schemes/entity-id"
-                                  },
-                                  "value" : "ARW"
-                                } ],
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "calculationPeriodDates" : {
+                          "firstPeriodStartDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2009-03-20",
+                              "meta" : {
+                                "globalKey" : "3ec8d4"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3ec8d4"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
+                          "meta" : {
+                            "globalKey" : "bf47be47"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "firstPaymentDate" : "2009-06-20",
+                          "meta" : {
+                            "globalKey" : "8aa3de96"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "eff49770"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
+                          }
+                        },
+                        "generalTerms" : {
+                          "referenceInformation" : {
+                            "referenceEntity" : {
+                              "entityId" : [ {
+                                "value" : "0E69A8",
                                 "meta" : {
-                                  "globalKey" : "3bb830c"
-                                },
-                                "name" : {
-                                  "value" : "ARW"
+                                  "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
                                 }
+                              } ],
+                              "name" : {
+                                "value" : "0E69A8"
                               },
+                              "meta" : {
+                                "globalKey" : "717c0b9e"
+                              }
+                            },
+                            "referenceObligation" : [ {
                               "security" : {
                                 "productIdentifier" : [ {
                                   "value" : {
                                     "identifier" : {
+                                      "value" : "US042735AL41",
                                       "meta" : {
                                         "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                                      },
-                                      "value" : "US042735AL41"
+                                      }
                                     },
+                                    "source" : "ISIN",
                                     "meta" : {
                                       "globalKey" : "42958b00"
-                                    },
-                                    "source" : "ISIN"
+                                    }
+                                  }
+                                } ],
+                                "securityType" : "Debt"
+                              },
+                              "primaryObligor" : {
+                                "entityId" : [ {
+                                  "value" : "ARW",
+                                  "meta" : {
+                                    "scheme" : "http://www.imgr.com/schemes/entity-id"
                                   }
                                 } ],
-                                "securityType" : "DEBT"
+                                "name" : {
+                                  "value" : "ARW"
+                                },
+                                "meta" : {
+                                  "globalKey" : "3bb830c"
+                                }
                               }
                             } ]
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "110ba297"
-                        },
                         "protectionTerms" : [ {
                           "creditEvents" : {
-                            "meta" : {
-                              "globalKey" : "4cf"
-                            },
                             "restructuring" : {
                               "applicable" : true
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "4cf"
-                          }
-                        } ]
-                      },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
-                          "firstPeriodStartDate" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3ec8d4"
-                              },
-                              "unadjustedDate" : "2009-03-20"
                             },
                             "meta" : {
-                              "globalKey" : "3ec8d4"
+                              "globalKey" : "4cf"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "28c1032d"
+                            "globalKey" : "4cf"
                           }
-                        },
+                        } ],
                         "meta" : {
-                          "globalKey" : "6afbe26c"
-                        },
-                        "paymentDates" : {
-                          "firstPaymentDate" : "2009-06-20",
-                          "meta" : {
-                            "globalKey" : "8aa3e742"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                          "globalKey" : "2779e5e9"
                         }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "f7ca9435"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3ee194"
-                        },
-                        "unadjustedDate" : "2012-06-20"
                       },
                       "meta" : {
-                        "globalKey" : "3ee194"
+                        "globalKey" : "50cbc479"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "50da6c70"
+                    "globalKey" : "25fb0996"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "50da6c70"
+                  "globalKey" : "25fb0996"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "478ae7c4"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.023,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.023,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "51c414ad"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a9d210bc"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 70000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 70000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "e6be80f3"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "29bfd33d",
+                  "externalReference" : "_fund"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "7e552bcc",
+                  "externalReference" : "_broker"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ec988"
-              },
-              "value" : "2009-06-08"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "959800NKRMZ8NEKQ0A23",
                   "meta" : {
-                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-                  },
-                  "value" : "CONTR2345"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "version" : 1
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "696247f0"
+                }
               } ],
-              "issuerReference" : {
-                "externalReference" : "_fund",
-                "globalReference" : "7233a0bd"
+              "name" : {
+                "value" : "INVEST MGR"
               },
               "meta" : {
-                "globalKey" : "ecb29287"
+                "globalKey" : "29bfd33d",
+                "externalKey" : "_fund"
               }
-            } ]
-          },
-          "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "c16a2bf7"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "7233a0bd"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300E4CDNNLJRBKF36",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "receiverPartyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "9627fd8c"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "ea328105"
                 }
+              } ],
+              "name" : {
+                "value" : "BROKER 33"
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
+              "meta" : {
+                "globalKey" : "7e552bcc",
+                "externalKey" : "_broker"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300L7VWW3G1702646",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
-                "value" : 387300.00
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "1454247a"
+                }
+              } ],
+              "name" : {
+                "value" : "BROKER 53"
               },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
+              "meta" : {
+                "globalKey" : "a69bc63f",
+                "externalKey" : "_broker2"
               }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "split" : {
-          "breakdown" : [ {
-            "partyChange" : {
-              "counterparty" : {
-                "partyReference" : {
-                  "externalReference" : "_broker2",
-                  "globalReference" : "c3b3523f"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300FNRNXH6KYKUK07",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "role" : "PARTY_1"
-              },
-              "tradeId" : [ {
-                "assignedIdentifier" : [ {
-                  "identifier" : {
-                    "meta" : {
-                      "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-                    },
-                    "value" : "CONTR2345"
-                  },
-                  "version" : 2
-                } ],
+                "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "8e7e1764"
+                  "globalKey" : "aefc2f21"
                 }
-              } ]
-            },
-            "quantityChange" : {
-              "change" : [ {
-                "meta" : {
-                  "globalKey" : "694c96e8"
-                },
-                "quantity" : [ {
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 20000000.00
+              } ],
+              "name" : {
+                "value" : "Custodian"
+              },
+              "meta" : {
+                "globalKey" : "b8297caf",
+                "externalKey" : "_cust"
+              }
+            } ],
+            "contractDetails" : {
+              "documentation" : [ {
+                "agreementDate" : "2009-05-22",
+                "legalAgreementIdentification" : {
+                  "agreementName" : {
+                    "agreementType" : "MasterConfirmation",
+                    "masterConfirmationType" : {
+                      "value" : "ISDA2003StandardCreditNorthAmerican"
+                    }
                   }
-                } ]
+                },
+                "meta" : {
+                  "globalKey" : "e0202540"
+                }
               } ],
-              "direction" : "REPLACE"
+              "meta" : {
+                "globalKey" : "e0202540"
+              }
             },
-            "transfer" : {
-              "transferState" : [ {
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "FUND100",
                 "meta" : {
-                  "externalKey" : "NOVATION_FEE",
-                  "globalKey" : "28987888"
-                },
-                "transfer" : {
-                  "payerReceiver" : {
-                    "payerPartyReference" : {
-                      "externalReference" : "_broker2",
-                      "globalReference" : "c3b3523f"
-                    },
-                    "receiverPartyReference" : {
-                      "externalReference" : "_fund",
-                      "globalReference" : "7233a0bd"
-                    }
-                  },
-                  "quantity" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 38555.00
-                  },
-                  "settlementDate" : {
-                    "adjustedDate" : {
-                      "meta" : {
-                        "globalKey" : "3eca10"
-                      },
-                      "value" : "2009-08-16"
-                    }
-                  },
-                  "transferExpression" : {
-                    "priceTransfer" : "NOVATION"
-                  }
+                  "scheme" : "http://www.imgr.com/schemes/account-id"
                 }
-              } ]
-            }
-          }, {
-            "quantityChange" : {
-              "change" : [ {
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "29bfd33d",
+                "externalReference" : "_fund"
+              },
+              "meta" : {
+                "globalKey" : "a2ddb9b0",
+                "externalKey" : "_FUNDACCT"
+              }
+            }, {
+              "accountNumber" : {
+                "value" : "98765",
                 "meta" : {
-                  "globalKey" : "694c96e8"
-                },
-                "quantity" : [ {
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 20000000.00
+                  "scheme" : "http://www.custodian.com/account-id"
+                }
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "b8297caf",
+                "externalReference" : "_cust"
+              },
+              "meta" : {
+                "globalKey" : "2f5c7329",
+                "externalKey" : "_CUSTACCT"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "36ac34df"
+            }
+          },
+          "transferHistory" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 387300.00,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
                   }
-                } ]
-              } ],
-              "direction" : "DECREASE"
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "29bfd33d",
+                  "externalReference" : "_fund"
+                },
+                "receiverPartyReference" : {
+                  "globalReference" : "7e552bcc",
+                  "externalReference" : "_broker"
+                }
+              },
+              "transferExpression" : {
+                "priceTransfer" : "Upfront"
+              }
+            },
+            "meta" : {
+              "globalKey" : "5580d145"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "46e393e4"
+          }
         }
       }
-    } ],
-    "intent" : "NOVATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "IM/6",
+      "meta" : {
+        "scheme" : "http://www.imgr.com/schemes/message-id"
+      }
+    },
+    "sentBy" : {
+      "value" : "IMGRUS6S"
+    },
+    "sentTo" : [ {
+      "value" : "CUSTUS3T"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2009-06-15T13:03:09-08:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "IM/6"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "22560b"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "bfb99595"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex53-execution-advice-trade-partial-novation-correction-C02-10.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex53-execution-advice-trade-partial-novation-correction-C02-10.json
index 6c0c423942..e09ae7e955 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex53-execution-advice-trade-partial-novation-correction-C02-10.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex53-execution-advice-trade-partial-novation-correction-C02-10.json
@@ -1,193 +1,145 @@
 {
-  "action" : "CORRECT",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "IM/7"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "22560c"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.imgr.com/schemes/message-id"
-      },
-      "value" : "IM/7"
-    },
-    "sentBy" : {
-      "value" : "IMGRUS6S"
-    },
-    "sentTo" : [ {
-      "value" : "CUSTUS3T"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "28e3313d"
-  },
   "proposedEvent" : {
+    "intent" : "Novation",
     "eventDate" : "2009-06-16",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "ff2c8800"
-          },
-          "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "_fund",
-                "globalReference" : "7233a0bd"
-              },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.imgr.com/schemes/account-id"
-                },
-                "value" : "FUND100"
-              },
-              "meta" : {
-                "externalKey" : "_FUNDACCT",
-                "globalKey" : "628d73b0"
-              }
-            }, {
-              "accountBeneficiary" : {
-                "externalReference" : "_cust",
-                "globalReference" : "6f1f29ef"
+      "primitiveInstruction" : {
+        "split" : {
+          "breakdown" : [ {
+            "partyChange" : {
+              "counterparty" : {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "a69bc63f",
+                  "externalReference" : "_broker2"
+                }
               },
-              "accountNumber" : {
+              "tradeId" : [ {
+                "assignedIdentifier" : [ {
+                  "identifier" : {
+                    "value" : "CONTR2345",
+                    "meta" : {
+                      "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+                    }
+                  },
+                  "version" : 3
+                } ],
                 "meta" : {
-                  "scheme" : "http://www.custodian.com/account-id"
-                },
-                "value" : "98765"
-              },
-              "meta" : {
-                "externalKey" : "_CUSTACCT",
-                "globalKey" : "54440069"
-              }
-            } ],
-            "contractDetails" : {
-              "documentation" : [ {
-                "agreementDate" : "2009-05-22",
-                "legalAgreementIdentification" : {
-                  "agreementName" : {
-                    "agreementType" : "MASTER_CONFIRMATION",
-                    "masterConfirmationType" : {
-                      "value" : "ISDA_2003_STANDARD_CREDIT_NORTH_AMERICAN"
+                  "globalKey" : "8e7e1b25"
+                }
+              } ]
+            },
+            "quantityChange" : {
+              "change" : [ {
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 25000000.00,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
                     }
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "e0202540"
+                  "globalKey" : "2ebbcc83"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "e0202540"
-              }
-            },
-            "meta" : {
-              "globalKey" : "857a2fc9"
+              "direction" : "Replace"
             },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "_fund",
-                "globalKey" : "7233a0bd"
-              },
-              "name" : {
-                "value" : "INVEST MGR"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            "transfer" : {
+              "transferState" : [ {
+                "transfer" : {
+                  "quantity" : {
+                    "value" : 53555.00,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
+                    }
                   },
-                  "value" : "959800NKRMZ8NEKQ0A23"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "696247f0"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_broker",
-                "globalKey" : "9627fd8c"
-              },
-              "name" : {
-                "value" : "BROKER 33"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  "payerReceiver" : {
+                    "payerPartyReference" : {
+                      "globalReference" : "a69bc63f",
+                      "externalReference" : "_broker2"
+                    },
+                    "receiverPartyReference" : {
+                      "globalReference" : "29bfd33d",
+                      "externalReference" : "_fund"
+                    }
+                  },
+                  "settlementDate" : {
+                    "adjustedDate" : {
+                      "value" : "2009-08-16",
+                      "meta" : {
+                        "globalKey" : "3eca10"
+                      }
+                    }
                   },
-                  "value" : "549300E4CDNNLJRBKF36"
+                  "transferExpression" : {
+                    "priceTransfer" : "Novation"
+                  }
                 },
-                "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "ea328105"
+                  "globalKey" : "e093e9f1",
+                  "externalKey" : "NOVATION_FEE"
                 }
               } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_broker2",
-                "globalKey" : "c3b3523f"
-              },
-              "name" : {
-                "value" : "BROKER 53"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300L7VWW3G1702646"
-                },
-                "identifierType" : "LEI",
+            }
+          }, {
+            "quantityChange" : {
+              "change" : [ {
+                "quantity" : [ {
+                  "value" : {
+                    "value" : 25000000.00,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
+                    }
+                  }
+                } ],
                 "meta" : {
-                  "globalKey" : "1454247a"
+                  "globalKey" : "2ebbcc83"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_cust",
-                "globalKey" : "6f1f29ef"
-              },
-              "name" : {
-                "value" : "Custodian"
+              } ],
+              "direction" : "Decrease"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "29bfd33d",
+                "externalReference" : "_fund"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "CONTR2345",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300FNRNXH6KYKUK07"
+                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+                  }
                 },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "aefc2f21"
-                }
-              } ]
+                "version" : 1
+              } ],
+              "meta" : {
+                "globalKey" : "e60a7d47"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2009-06-08",
+              "meta" : {
+                "globalKey" : "3ec988"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "7233a0bd"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "9627fd8c"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
                         "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
@@ -200,413 +152,461 @@
                   "economicTerms" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2009-06-09",
                         "meta" : {
                           "globalKey" : "3ec989"
-                        },
-                        "unadjustedDate" : "2009-06-09"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "3ec989"
                       }
                     },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2012-06-20",
+                        "meta" : {
+                          "globalKey" : "3ee194"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ee194"
+                      }
+                    },
                     "payout" : {
-                      "creditDefaultPayout" : {
+                      "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
-                        "generalTerms" : {
-                          "referenceInformation" : {
-                            "referenceEntity" : {
-                              "entityId" : [ {
-                                "meta" : {
-                                  "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                                },
-                                "value" : "0E69A8"
-                              } ],
-                              "meta" : {
-                                "globalKey" : "717c0b9e"
-                              },
-                              "name" : {
-                                "value" : "0E69A8"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "referenceObligation" : [ {
-                              "primaryObligor" : {
-                                "entityId" : [ {
-                                  "meta" : {
-                                    "scheme" : "http://www.imgr.com/schemes/entity-id"
-                                  },
-                                  "value" : "ARW"
-                                } ],
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "calculationPeriodDates" : {
+                          "firstPeriodStartDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2009-03-20",
+                              "meta" : {
+                                "globalKey" : "3ec8d4"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3ec8d4"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
+                          "meta" : {
+                            "globalKey" : "bf47be47"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "firstPaymentDate" : "2009-06-20",
+                          "meta" : {
+                            "globalKey" : "8aa3de96"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "eff49770"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
+                          }
+                        },
+                        "generalTerms" : {
+                          "referenceInformation" : {
+                            "referenceEntity" : {
+                              "entityId" : [ {
+                                "value" : "0E69A8",
                                 "meta" : {
-                                  "globalKey" : "3bb830c"
-                                },
-                                "name" : {
-                                  "value" : "ARW"
+                                  "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
                                 }
+                              } ],
+                              "name" : {
+                                "value" : "0E69A8"
                               },
+                              "meta" : {
+                                "globalKey" : "717c0b9e"
+                              }
+                            },
+                            "referenceObligation" : [ {
                               "security" : {
                                 "productIdentifier" : [ {
                                   "value" : {
                                     "identifier" : {
+                                      "value" : "US042735AL41",
                                       "meta" : {
                                         "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                                      },
-                                      "value" : "US042735AL41"
+                                      }
                                     },
+                                    "source" : "ISIN",
                                     "meta" : {
                                       "globalKey" : "42958b00"
-                                    },
-                                    "source" : "ISIN"
+                                    }
+                                  }
+                                } ],
+                                "securityType" : "Debt"
+                              },
+                              "primaryObligor" : {
+                                "entityId" : [ {
+                                  "value" : "ARW",
+                                  "meta" : {
+                                    "scheme" : "http://www.imgr.com/schemes/entity-id"
                                   }
                                 } ],
-                                "securityType" : "DEBT"
+                                "name" : {
+                                  "value" : "ARW"
+                                },
+                                "meta" : {
+                                  "globalKey" : "3bb830c"
+                                }
                               }
                             } ]
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "110ba297"
-                        },
                         "protectionTerms" : [ {
                           "creditEvents" : {
-                            "meta" : {
-                              "globalKey" : "4cf"
-                            },
                             "restructuring" : {
                               "applicable" : true
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "4cf"
-                          }
-                        } ]
-                      },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
-                          "firstPeriodStartDate" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3ec8d4"
-                              },
-                              "unadjustedDate" : "2009-03-20"
                             },
                             "meta" : {
-                              "globalKey" : "3ec8d4"
+                              "globalKey" : "4cf"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "28c1032d"
+                            "globalKey" : "4cf"
                           }
-                        },
+                        } ],
                         "meta" : {
-                          "globalKey" : "6afbe26c"
-                        },
-                        "paymentDates" : {
-                          "firstPaymentDate" : "2009-06-20",
-                          "meta" : {
-                            "globalKey" : "8aa3e742"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                          "globalKey" : "2779e5e9"
                         }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "f7ca9435"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3ee194"
-                        },
-                        "unadjustedDate" : "2012-06-20"
                       },
                       "meta" : {
-                        "globalKey" : "3ee194"
+                        "globalKey" : "50cbc479"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "50da6c70"
+                    "globalKey" : "25fb0996"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "50da6c70"
+                  "globalKey" : "25fb0996"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "478ae7c4"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.023,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.023,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "51c414ad"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a9d210bc"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 70000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 70000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "e6be80f3"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "29bfd33d",
+                  "externalReference" : "_fund"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "7e552bcc",
+                  "externalReference" : "_broker"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ec988"
-              },
-              "value" : "2009-06-08"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "959800NKRMZ8NEKQ0A23",
                   "meta" : {
-                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-                  },
-                  "value" : "CONTR2345"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "version" : 1
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "696247f0"
+                }
               } ],
-              "issuerReference" : {
-                "externalReference" : "_fund",
-                "globalReference" : "7233a0bd"
+              "name" : {
+                "value" : "INVEST MGR"
               },
               "meta" : {
-                "globalKey" : "ecb29287"
+                "globalKey" : "29bfd33d",
+                "externalKey" : "_fund"
               }
-            } ]
-          },
-          "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "c16a2bf7"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "7233a0bd"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300E4CDNNLJRBKF36",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "receiverPartyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "9627fd8c"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "ea328105"
                 }
+              } ],
+              "name" : {
+                "value" : "BROKER 33"
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
+              "meta" : {
+                "globalKey" : "7e552bcc",
+                "externalKey" : "_broker"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300L7VWW3G1702646",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
-                "value" : 387300.00
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "1454247a"
+                }
+              } ],
+              "name" : {
+                "value" : "BROKER 53"
               },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
+              "meta" : {
+                "globalKey" : "a69bc63f",
+                "externalKey" : "_broker2"
               }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "split" : {
-          "breakdown" : [ {
-            "partyChange" : {
-              "counterparty" : {
-                "partyReference" : {
-                  "externalReference" : "_broker2",
-                  "globalReference" : "c3b3523f"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300FNRNXH6KYKUK07",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "role" : "PARTY_1"
-              },
-              "tradeId" : [ {
-                "assignedIdentifier" : [ {
-                  "identifier" : {
-                    "meta" : {
-                      "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-                    },
-                    "value" : "CONTR2345"
-                  },
-                  "version" : 3
-                } ],
+                "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "8e7e1b25"
+                  "globalKey" : "aefc2f21"
                 }
-              } ]
-            },
-            "quantityChange" : {
-              "change" : [ {
-                "meta" : {
-                  "globalKey" : "2ebbcc83"
-                },
-                "quantity" : [ {
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 25000000.00
+              } ],
+              "name" : {
+                "value" : "Custodian"
+              },
+              "meta" : {
+                "globalKey" : "b8297caf",
+                "externalKey" : "_cust"
+              }
+            } ],
+            "contractDetails" : {
+              "documentation" : [ {
+                "agreementDate" : "2009-05-22",
+                "legalAgreementIdentification" : {
+                  "agreementName" : {
+                    "agreementType" : "MasterConfirmation",
+                    "masterConfirmationType" : {
+                      "value" : "ISDA2003StandardCreditNorthAmerican"
+                    }
                   }
-                } ]
+                },
+                "meta" : {
+                  "globalKey" : "e0202540"
+                }
               } ],
-              "direction" : "REPLACE"
+              "meta" : {
+                "globalKey" : "e0202540"
+              }
             },
-            "transfer" : {
-              "transferState" : [ {
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "FUND100",
                 "meta" : {
-                  "externalKey" : "NOVATION_FEE",
-                  "globalKey" : "8cf2a86f"
-                },
-                "transfer" : {
-                  "payerReceiver" : {
-                    "payerPartyReference" : {
-                      "externalReference" : "_broker2",
-                      "globalReference" : "c3b3523f"
-                    },
-                    "receiverPartyReference" : {
-                      "externalReference" : "_fund",
-                      "globalReference" : "7233a0bd"
-                    }
-                  },
-                  "quantity" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 53555.00
-                  },
-                  "settlementDate" : {
-                    "adjustedDate" : {
-                      "meta" : {
-                        "globalKey" : "3eca10"
-                      },
-                      "value" : "2009-08-16"
-                    }
-                  },
-                  "transferExpression" : {
-                    "priceTransfer" : "NOVATION"
-                  }
+                  "scheme" : "http://www.imgr.com/schemes/account-id"
                 }
-              } ]
-            }
-          }, {
-            "quantityChange" : {
-              "change" : [ {
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "29bfd33d",
+                "externalReference" : "_fund"
+              },
+              "meta" : {
+                "globalKey" : "a2ddb9b0",
+                "externalKey" : "_FUNDACCT"
+              }
+            }, {
+              "accountNumber" : {
+                "value" : "98765",
                 "meta" : {
-                  "globalKey" : "2ebbcc83"
-                },
-                "quantity" : [ {
-                  "value" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 25000000.00
+                  "scheme" : "http://www.custodian.com/account-id"
+                }
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "b8297caf",
+                "externalReference" : "_cust"
+              },
+              "meta" : {
+                "globalKey" : "2f5c7329",
+                "externalKey" : "_CUSTACCT"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "36ac34df"
+            }
+          },
+          "transferHistory" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 387300.00,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
                   }
-                } ]
-              } ],
-              "direction" : "DECREASE"
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "29bfd33d",
+                  "externalReference" : "_fund"
+                },
+                "receiverPartyReference" : {
+                  "globalReference" : "7e552bcc",
+                  "externalReference" : "_broker"
+                }
+              },
+              "transferExpression" : {
+                "priceTransfer" : "Upfront"
+              }
+            },
+            "meta" : {
+              "globalKey" : "5580d145"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "46e393e4"
+          }
         }
       }
-    } ],
-    "intent" : "NOVATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "IM/7",
+      "meta" : {
+        "scheme" : "http://www.imgr.com/schemes/message-id"
+      }
+    },
+    "sentBy" : {
+      "value" : "IMGRUS6S"
+    },
+    "sentTo" : [ {
+      "value" : "CUSTUS3T"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2009-06-15T13:15:09-08:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "IM/7"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "22560c"
+    }
+  } ],
+  "action" : "Correct",
+  "meta" : {
+    "globalKey" : "d55571ab"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex58-execution-advice-trade-initiation-F01-00.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex58-execution-advice-trade-initiation-F01-00.json
index eab588edf8..dbf0a666b7 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex58-execution-advice-trade-initiation-F01-00.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex58-execution-advice-trade-initiation-F01-00.json
@@ -1,153 +1,57 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "IM/60"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "4286b85"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.imgr.com/schemes/message-id"
-      },
-      "value" : "IM/60"
-    },
-    "sentBy" : {
-      "value" : "IMGRUS6S"
-    },
-    "sentTo" : [ {
-      "value" : "CUSTUS3T"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "f4642c84"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "2009-05-22",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "DJ.CDX.NA"
+                }
+              }
+            },
+            "meta" : {
+              "globalKey" : "d51d2790"
+            }
+          } ]
+        }
+      },
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "fe3e8d3e"
-          },
           "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "_fund",
-                "globalReference" : "7233a0bd"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "29bfd33d",
+                "externalReference" : "_fund"
               },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.imgr.com/schemes/account-id"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "CONTR3456",
+                  "meta" : {
+                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+                  }
                 },
-                "value" : "FUND100"
-              },
+                "version" : 1
+              } ],
               "meta" : {
-                "externalKey" : "_FUNDACCT",
-                "globalKey" : "628d73b0"
+                "globalKey" : "e60af587"
               }
-            }, {
-              "accountBeneficiary" : {
-                "externalReference" : "_cust",
-                "globalReference" : "6f1f29ef"
-              },
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://www.custodian.com/account-id"
-                },
-                "value" : "98765"
-              },
+            } ],
+            "tradeDate" : {
+              "value" : "2009-09-01",
               "meta" : {
-                "externalKey" : "_CUSTACCT",
-                "globalKey" : "54440069"
+                "globalKey" : "3eca41"
               }
-            } ],
-            "meta" : {
-              "globalKey" : "16ff1987"
             },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "_fund",
-                "globalKey" : "7233a0bd"
-              },
-              "name" : {
-                "value" : "INVEST MGR"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "959800NKRMZ8NEKQ0A23"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "696247f0"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_broker",
-                "globalKey" : "9627fd8c"
-              },
-              "name" : {
-                "value" : "BROKER 33"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300E4CDNNLJRBKF36"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "ea328105"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "_cust",
-                "globalKey" : "6f1f29ef"
-              },
-              "name" : {
-                "value" : "Custodian"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300FNRNXH6KYKUK07"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "aefc2f21"
-                }
-              } ]
-            } ],
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "7233a0bd"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "9627fd8c"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
                         "value" : "Credit:Index:CDX:CDXIG"
@@ -160,294 +64,390 @@
                   "economicTerms" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2009-09-01",
                         "meta" : {
                           "globalKey" : "3eca41"
-                        },
-                        "unadjustedDate" : "2009-09-01"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "3eca41"
                       }
                     },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2012-06-20",
+                        "meta" : {
+                          "globalKey" : "3ee194"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ee194"
+                      }
+                    },
                     "payout" : {
-                      "creditDefaultPayout" : {
+                      "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
-                        "generalTerms" : {
-                          "indexReferenceInformation" : {
-                            "indexId" : [ {
-                              "meta" : {
-                                "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-1-0"
-                              },
-                              "value" : "2I65B3BA0"
-                            } ],
-                            "indexName" : {
-                              "value" : "CDX-NAIGHVOLS10.5Y"
-                            },
-                            "excludedReferenceEntity" : [ {
-                              "referenceEntity" : {
-                                "entityId" : [ {
-                                  "meta" : {
-                                    "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-1-0"
-                                  },
-                                  "value" : "ABC1234567"
-                                } ],
-                                "meta" : {
-                                  "globalKey" : "e883dbb2"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
                                 }
                               }
-                            } ],
-                            "indexAnnexDate" : "2007-03-06",
-                            "indexAnnexVersion" : 2,
-                            "indexSeries" : 10,
+                            },
                             "meta" : {
-                              "globalKey" : "c29f01e4"
-                            }
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "8d0acb25"
-                        }
-                      },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "calculationAmount",
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
+                              "globalKey" : "0"
                             }
                           }
                         },
                         "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
                           "firstPeriodStartDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2009-06-20",
                               "meta" : {
                                 "globalKey" : "3ec994"
-                              },
-                              "unadjustedDate" : "2009-06-20"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "3ec994"
                             }
                           },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
                           "meta" : {
-                            "globalKey" : "28c103ed"
+                            "globalKey" : "c9d95f07"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "4afb93ec"
-                        },
                         "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
                           "firstPaymentDate" : "2009-09-20",
                           "meta" : {
-                            "globalKey" : "8afb2e82"
+                            "globalKey" : "8afb25d6"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "2760b5f0"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "calculationAmount"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
+                        "generalTerms" : {
+                          "indexReferenceInformation" : {
+                            "indexName" : {
+                              "value" : "CDX-NAIGHVOLS10.5Y"
                             },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
+                            "indexId" : [ {
+                              "value" : "2I65B3BA0",
+                              "meta" : {
+                                "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-1-0"
+                              }
+                            } ],
+                            "indexSeries" : 10,
+                            "indexAnnexVersion" : 2,
+                            "indexAnnexDate" : "2007-03-06",
+                            "excludedReferenceEntity" : [ {
+                              "referenceEntity" : {
+                                "entityId" : [ {
+                                  "value" : "ABC1234567",
+                                  "meta" : {
+                                    "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-1-0"
+                                  }
+                                } ],
+                                "meta" : {
+                                  "globalKey" : "e883dbb2"
                                 }
                               }
+                            } ],
+                            "meta" : {
+                              "globalKey" : "16d002e4"
                             }
                           }
-                        }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "a481a1e7"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3ee194"
                         },
-                        "unadjustedDate" : "2012-06-20"
+                        "meta" : {
+                          "globalKey" : "e13bcc25"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "3ee194"
+                        "globalKey" : "3774e615"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "ca9d5613"
+                    "globalKey" : "b4fe576f"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "ca9d5613"
+                  "globalKey" : "b4fe576f"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "478ae7c4"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.023,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.023,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "51c414ad"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a9d210bc"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 70000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 70000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "e6be80f3"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "29bfd33d",
+                  "externalReference" : "_fund"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "7e552bcc",
+                  "externalReference" : "_broker"
+                }
               } ]
             },
-            "tradeDate" : {
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "959800NKRMZ8NEKQ0A23",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "696247f0"
+                }
+              } ],
+              "name" : {
+                "value" : "INVEST MGR"
+              },
               "meta" : {
-                "globalKey" : "3eca41"
+                "globalKey" : "29bfd33d",
+                "externalKey" : "_fund"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300E4CDNNLJRBKF36",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "ea328105"
+                }
+              } ],
+              "name" : {
+                "value" : "BROKER 33"
               },
-              "value" : "2009-09-01"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+              "meta" : {
+                "globalKey" : "7e552bcc",
+                "externalKey" : "_broker"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300FNRNXH6KYKUK07",
                   "meta" : {
-                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-                  },
-                  "value" : "CONTR3456"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "version" : 1
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "aefc2f21"
+                }
               } ],
-              "issuerReference" : {
-                "externalReference" : "_fund",
-                "globalReference" : "7233a0bd"
+              "name" : {
+                "value" : "Custodian"
+              },
+              "meta" : {
+                "globalKey" : "b8297caf",
+                "externalKey" : "_cust"
+              }
+            } ],
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "FUND100",
+                "meta" : {
+                  "scheme" : "http://www.imgr.com/schemes/account-id"
+                }
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "29bfd33d",
+                "externalReference" : "_fund"
               },
               "meta" : {
-                "globalKey" : "ee75fac7"
+                "globalKey" : "a2ddb9b0",
+                "externalKey" : "_FUNDACCT"
               }
-            } ]
+            }, {
+              "accountNumber" : {
+                "value" : "98765",
+                "meta" : {
+                  "scheme" : "http://www.custodian.com/account-id"
+                }
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "b8297caf",
+                "externalReference" : "_cust"
+              },
+              "meta" : {
+                "globalKey" : "2f5c7329",
+                "externalKey" : "_CUSTACCT"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "194c794d"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "c16a2bf7"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "_fund",
-                  "globalReference" : "7233a0bd"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "_broker",
-                  "globalReference" : "9627fd8c"
-                }
-              },
               "quantity" : {
+                "value" : 387300.00,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "29bfd33d",
+                  "externalReference" : "_fund"
                 },
-                "value" : 387300.00
+                "receiverPartyReference" : {
+                  "globalReference" : "7e552bcc",
+                  "externalReference" : "_broker"
+                }
               },
               "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
-              }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "2009-05-22",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "DJ.CDX.NA"
-                }
+                "priceTransfer" : "Upfront"
               }
             },
             "meta" : {
-              "globalKey" : "d51d2790"
+              "globalKey" : "5580d145"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "f6047fd2"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "IM/60",
+      "meta" : {
+        "scheme" : "http://www.imgr.com/schemes/message-id"
+      }
+    },
+    "sentBy" : {
+      "value" : "IMGRUS6S"
+    },
+    "sentTo" : [ {
+      "value" : "CUSTUS3T"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2009-09-01T10:03:09-08:00",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "IM/60"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "4286b85"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "a7ce4158"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex63-execution-advice-trade-initiation.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex63-execution-advice-trade-initiation.json
index 2eddc30c2c..fef1ccf69a 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex63-execution-advice-trade-initiation.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex63-execution-advice-trade-initiation.json
@@ -1,169 +1,35 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "0482588"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "4713c937"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.amag.com/coding-scheme/message-id"
-      },
-      "value" : "0482588"
-    },
-    "sentBy" : {
-      "value" : "AMAGGB22XXX"
-    },
-    "sentTo" : [ {
-      "value" : "CCSTUS6S"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "f289e2ff"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "9aa75c17"
-          },
           "trade" : {
-            "account" : [ {
-              "accountBeneficiary" : {
-                "externalReference" : "SKY",
-                "globalReference" : "836533e"
-              },
-              "accountName" : {
-                "value" : "SkyAccount"
-              },
-              "accountNumber" : {
-                "value" : "1234"
-              },
-              "meta" : {
-                "externalKey" : "AMAGINTAC1",
-                "globalKey" : "e70f7faf"
-              }
-            }, {
-              "accountBeneficiary" : {
-                "externalReference" : "SKY",
-                "globalReference" : "836533e"
-              },
-              "accountName" : {
-                "value" : "Sky General Account"
-              },
-              "accountNumber" : {
-                "value" : "47896325"
-              },
-              "meta" : {
-                "externalKey" : "CSTGEN478",
-                "globalKey" : "ced6891b"
-              }
-            } ],
-            "meta" : {
-              "globalKey" : "9aa75c17"
-            },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "AMAG",
-                "globalKey" : "949fb7a6"
-              },
-              "name" : {
-                "value" : "International Bank Asset Management"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "969500T86SHG919ON888"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "3f13bd61"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "SKY",
-                "globalKey" : "836533e"
-              },
-              "name" : {
-                "value" : "Sky Limited"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300HTD3SZJWA5TS80"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "ff8c3b63"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "CST",
-                "globalKey" : "7e692bf1"
-              },
-              "name" : {
-                "value" : "Standards Slav. Int'l"
+            "tradeIdentifier" : [ {
+              "issuerReference" : {
+                "globalReference" : "2c792bfe",
+                "externalReference" : "SKY"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "IRS2",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300FL0LHI0TEZ8V48"
+                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
+                  }
                 },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "3db89a47"
-                }
-              } ]
-            }, {
+                "version" : 1
+              } ],
               "meta" : {
-                "externalKey" : "FIRST",
-                "globalKey" : "43aba2b3"
-              },
-              "name" : {
-                "value" : "First International Bank, MozartStrasse, Frankfurt"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300E0S1LZYZ9QNX81"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "13e8a01c"
-                }
-              } ]
+                "globalKey" : "aba9496a"
+              }
             } ],
+            "tradeDate" : {
+              "value" : "2007-07-27",
+              "meta" : {
+                "globalKey" : "3eb9db"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "SKY",
-                  "globalReference" : "836533e"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "FIRST",
-                  "globalReference" : "43aba2b3"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -174,77 +40,70 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "BCT1",
-                                "globalReference" : "99ecd50c"
-                              },
-                              "meta" : {
-                                "globalKey" : "1f065e"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "365a0a2f"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28cc3"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "30"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2007-07-30",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "BCT1",
-                                    "globalReference" : "99ecd50c"
+                                    "globalReference" : "99ecd50c",
+                                    "externalReference" : "BCT1"
                                   },
                                   "meta" : {
                                     "globalKey" : "1f065e"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "365a0a2f"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "d83acb11"
-                              },
-                              "unadjustedDate" : "2007-07-30"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "d83acb11"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "CALC1",
-                            "globalKey" : "42858c42"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2037-07-30",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
@@ -254,401 +113,542 @@
                                     "value" : "JPTO"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "BCT1",
-                                    "globalKey" : "99ecd50c"
+                                    "globalKey" : "99ecd50c",
+                                    "externalKey" : "BCT1"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "706f885d"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "9a6e183f"
-                              },
-                              "unadjustedDate" : "2037-07-30"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "9a6e183f"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
-                        "meta" : {
-                          "globalKey" : "aa6dba61"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "8ff37aa4"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "BCT1",
-                                "globalReference" : "99ecd50c"
+                                "globalReference" : "99ecd50c",
+                                "externalReference" : "BCT1"
                               },
                               "meta" : {
                                 "globalKey" : "1f065e"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "365a0a2f"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "959"
+                              "globalKey" : "18ad5"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 6
+                            "rollConvention" : "30"
+                          },
+                          "meta" : {
+                            "globalKey" : "b4c01db4",
+                            "externalKey" : "CALC1"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "99ecd50c",
+                                "externalReference" : "BCT1"
+                              },
+                              "meta" : {
+                                "globalKey" : "1f065e"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "365a0a2f"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "8f10f362"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "985e3ed1"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "BCT1",
-                                "globalReference" : "99ecd50c"
-                              },
-                              "meta" : {
-                                "globalKey" : "1f065e"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "365a0a2f"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c66"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "30"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/365.FIXED"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2007-07-30",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "FOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "BCT1",
-                                    "globalReference" : "99ecd50c"
+                                    "globalReference" : "99ecd50c",
+                                    "externalReference" : "BCT1"
                                   },
                                   "meta" : {
                                     "globalKey" : "1f065e"
                                   }
                                 },
-                                "businessDayConvention" : "FOLLOWING",
                                 "meta" : {
                                   "globalKey" : "211c224d"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "c2fce32f"
-                              },
-                              "unadjustedDate" : "2007-07-30"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "c2fce32f"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "CALC2",
-                            "globalKey" : "e5693c55"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2037-07-30",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "BCT1",
-                                    "globalReference" : "99ecd50c"
+                                    "globalReference" : "99ecd50c",
+                                    "externalReference" : "BCT1"
                                   },
                                   "meta" : {
                                     "globalKey" : "1f065e"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "365a0a2f"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "634fdb11"
-                              },
-                              "unadjustedDate" : "2037-07-30"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "634fdb11"
                             }
-                          }
-                        },
-                        "compoundingMethod" : "FLAT",
-                        "dayCountFraction" : {
-                          "value" : "ACT/365.FIXED"
-                        },
-                        "meta" : {
-                          "globalKey" : "ac606ac8"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "8ff37c13"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "BCT1",
-                                "globalReference" : "99ecd50c"
+                                "globalReference" : "99ecd50c",
+                                "externalReference" : "BCT1"
                               },
                               "meta" : {
                                 "globalKey" : "1f065e"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "365a0a2f"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "ac8"
+                              "globalKey" : "17f92"
                             },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
+                            "rollConvention" : "30"
+                          },
+                          "meta" : {
+                            "globalKey" : "81e1e301",
+                            "externalKey" : "CALC2"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "99ecd50c",
+                                "externalReference" : "BCT1"
+                              },
+                              "meta" : {
+                                "globalKey" : "1f065e"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "365a0a2f"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "9b0bf291"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "CALC2",
-                            "globalReference" : "e5693c55"
+                            "globalReference" : "81e1e301",
+                            "externalReference" : "CALC2"
                           },
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "c705a064"
+                              "globalKey" : "536cd230"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
                             "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "RES2",
-                              "globalReference" : "f807970e"
+                              "globalReference" : "cda103d8",
+                              "externalReference" : "RES2"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "RES2",
-                            "globalKey" : "f807970e"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "BCT1",
-                                "globalReference" : "99ecd50c"
+                                "globalReference" : "99ecd50c",
+                                "externalReference" : "BCT1"
                               },
                               "meta" : {
                                 "globalKey" : "1f065e"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "365a0a2f"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "cda103d8",
+                            "externalKey" : "RES2"
                           }
+                        },
+                        "compoundingMethod" : "Flat",
+                        "meta" : {
+                          "globalKey" : "9eebc47c"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "c7e5e847"
+                        "globalKey" : "1ef1ef8b"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "c7e5e847"
+                    "globalKey" : "1ef1ef8b"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "c7e5e847"
+                  "globalKey" : "1ef1ef8b"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "a8099f56"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0987,
                       "unit" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "value" : 0.0987,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 12300000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "JPY"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "592a4b6a"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 12300000000,
                       "unit" : {
                         "currency" : {
                           "value" : "JPY"
                         }
-                      },
-                      "value" : 12300000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "e376a5a2"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "94cf67df"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "JPY-BBSF-Bloomberg-15:00"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "956"
-                          },
+                          "periodMultiplier" : 3,
                           "period" : "M",
-                          "periodMultiplier" : 3
+                          "meta" : {
+                            "globalKey" : "aa"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "JPY"
-                        }
-                      },
-                      "value" : 12300000000
+                    "meta" : {
+                      "globalKey" : "51c872d"
                     }
-                  } ]
+                  },
+                  "meta" : {
+                    "globalKey" : "7ce2984e"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "2c792bfe",
+                  "externalReference" : "SKY"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "1a22ef33",
+                  "externalReference" : "FIRST"
+                }
               } ]
             },
-            "tradeDate" : {
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "969500T86SHG919ON888",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "3f13bd61"
+                }
+              } ],
+              "name" : {
+                "value" : "International Bank Asset Management"
+              },
               "meta" : {
-                "globalKey" : "3eb9db"
+                "globalKey" : "315fcde6",
+                "externalKey" : "AMAG"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300HTD3SZJWA5TS80",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "ff8c3b63"
+                }
+              } ],
+              "name" : {
+                "value" : "Sky Limited"
               },
-              "value" : "2007-07-27"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+              "meta" : {
+                "globalKey" : "2c792bfe",
+                "externalKey" : "SKY"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300FL0LHI0TEZ8V48",
                   "meta" : {
-                    "scheme" : "http://www.swift.com/coding-scheme/contract-id"
-                  },
-                  "value" : "IRS2"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "version" : 1
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "3db89a47"
+                }
               } ],
-              "issuerReference" : {
-                "externalReference" : "SKY",
-                "globalReference" : "836533e"
+              "name" : {
+                "value" : "Standards Slav. Int'l"
+              },
+              "meta" : {
+                "globalKey" : "963b1b31",
+                "externalKey" : "CST"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300E0S1LZYZ9QNX81",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "13e8a01c"
+                }
+              } ],
+              "name" : {
+                "value" : "First International Bank, MozartStrasse, Frankfurt"
               },
               "meta" : {
-                "globalKey" : "814b1baa"
+                "globalKey" : "1a22ef33",
+                "externalKey" : "FIRST"
               }
-            } ]
+            } ],
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "1234"
+              },
+              "accountName" : {
+                "value" : "SkyAccount"
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "2c792bfe",
+                "externalReference" : "SKY"
+              },
+              "meta" : {
+                "globalKey" : "cc67f72f",
+                "externalKey" : "AMAGINTAC1"
+              }
+            }, {
+              "accountNumber" : {
+                "value" : "47896325"
+              },
+              "accountName" : {
+                "value" : "Sky General Account"
+              },
+              "accountBeneficiary" : {
+                "globalReference" : "2c792bfe",
+                "externalReference" : "SKY"
+              },
+              "meta" : {
+                "globalKey" : "15710f9b",
+                "externalKey" : "CSTGEN478"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "a33292f9"
+            }
+          },
+          "meta" : {
+            "globalKey" : "a33292f9"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "0482588",
+      "meta" : {
+        "scheme" : "http://www.amag.com/coding-scheme/message-id"
+      }
+    },
+    "sentBy" : {
+      "value" : "AMAGGB22XXX"
+    },
+    "sentTo" : [ {
+      "value" : "CCSTUS6S"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2007-07-27T10:02:00Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
-  } ]
+    "qualification" : "eventCreationDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "0482588"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "4713c937"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "d21953b9"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-alpha-trade-CFTC-SEC-and-canada.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-alpha-trade-CFTC-SEC-and-canada.json
index a4d571c362..9f0c34e1aa 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-alpha-trade-CFTC-SEC-and-canada.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-alpha-trade-CFTC-SEC-and-canada.json
@@ -1,96 +1,451 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "BANKX0001"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "3ce1279d"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.bankx.com/msg_id"
-      },
-      "value" : "BANKX0001"
-    },
-    "sentBy" : {
-      "value" : "BANKX"
-    },
-    "sentTo" : [ {
-      "value" : "SDR01"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "613a6dad"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "2002-01-05",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster"
+                }
+              },
+              "vintage" : 1992
+            },
+            "meta" : {
+              "globalKey" : "4f2097d4"
+            }
+          }, {
+            "agreementDate" : "2002-01-07",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "ISDA2003CreditNorthAmerican"
+                }
+              }
+            },
+            "meta" : {
+              "globalKey" : "5d7949e5"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "CreditSupportAgreement"
+              }
+            },
+            "meta" : {
+              "globalKey" : "984ae6d0"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix"
+                  },
+                  "matrixTerm" : {
+                    "value" : "StandardNorthAmericanCorporate"
+                  }
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "9ed2f955"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Other",
+                "otherAgreement" : "Custom Legal Agreement"
+              }
+            },
+            "meta" : {
+              "globalKey" : "98e1dbe8"
+            }
+          } ]
+        }
+      },
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "571d1896"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "b27318bc"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "contactInformation" : {
-                  "address" : [ {
-                    "city" : "New York",
-                    "country" : {
-                      "value" : "US"
-                    },
-                    "postalCode" : "10017",
-                    "state" : "NY",
-                    "street" : [ "123 Park Avenue" ]
-                  } ]
-                },
-                "meta" : {
-                  "externalKey" : "branch1",
-                  "globalKey" : "69aea9de"
-                },
-                "name" : "New York Office"
-              }, {
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "FCHUXIINML",
                 "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
+                }
+              },
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "12345678901234567890123456789012",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
+                }
               } ],
-              "contactInformation" : {
-                "email" : [ "swap_trading@bankx.com" ]
+              "meta" : {
+                "globalKey" : "ce80645"
+              },
+              "identifierType" : "UniqueTransactionIdentifier"
+            }, {
+              "issuer" : {
+                "value" : "1031234567",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                }
               },
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "12345678901234567890123456789012",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
+                }
+              } ],
               "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "b8d57157"
+                "globalKey" : "671d1c86"
               },
-              "name" : {
-                "value" : "Bank X"
+              "identifierType" : "UniqueTransactionIdentifier"
+            } ],
+            "tradeDate" : {
+              "value" : "2011-02-12",
+              "meta" : {
+                "globalKey" : "3ed88c"
+              }
+            },
+            "tradableProduct" : {
+              "product" : {
+                "contractualProduct" : {
+                  "productTaxonomy" : [ {
+                    "primaryAssetClass" : {
+                      "value" : "Credit"
+                    }
+                  }, {
+                    "source" : "Other",
+                    "value" : {
+                      "name" : {
+                        "value" : "SecurityBasedSwap",
+                        "meta" : {
+                          "scheme" : "http://www.fpml.org/coding-scheme/sec-product-category"
+                        }
+                      }
+                    }
+                  }, {
+                    "source" : "Other",
+                    "value" : {
+                      "name" : {
+                        "value" : "Credi Default Swap",
+                        "meta" : {
+                          "scheme" : "http://www.theice.com/coding-scheme/product-name"
+                        }
+                      }
+                    }
+                  }, {
+                    "source" : "Other",
+                    "value" : {
+                      "name" : {
+                        "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
+                      }
+                    }
+                  }, {
+                    "source" : "ISDA",
+                    "productQualifier" : "CreditDefaultSwap_SingleName"
+                  } ],
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "X123",
+                        "meta" : {
+                          "scheme" : "http://www.theice.com/coding-scheme/product-id"
+                        }
+                      },
+                      "source" : "Other",
+                      "meta" : {
+                        "globalKey" : "e6a349ca"
+                      }
+                    }
+                  } ],
+                  "economicTerms" : {
+                    "effectiveDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2009-03-26",
+                        "meta" : {
+                          "globalKey" : "3ec8da"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ec8da"
+                      }
+                    },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2014-06-20",
+                        "meta" : {
+                          "globalKey" : "3ef194"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ef194"
+                      }
+                    },
+                    "payout" : {
+                      "interestRatePayout" : [ {
+                        "payerReceiver" : {
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
+                        },
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        },
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "calculationPeriodDates" : {
+                          "firstPeriodStartDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2009-03-20",
+                              "meta" : {
+                                "globalKey" : "3ec8d4"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3ec8d4"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
+                          "meta" : {
+                            "globalKey" : "bf47be47"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "firstPaymentDate" : "2009-06-20",
+                          "meta" : {
+                            "globalKey" : "8aa3de96"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "eff49770"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        },
+                        "generalTerms" : {
+                          "referenceInformation" : {
+                            "referenceEntity" : {
+                              "entityId" : [ {
+                                "value" : "8G836J",
+                                "meta" : {
+                                  "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
+                                }
+                              } ],
+                              "name" : {
+                                "value" : "TENET HEALTHCARE CORPORATION"
+                              },
+                              "meta" : {
+                                "globalKey" : "54140007",
+                                "externalKey" : "referenceEntity"
+                              }
+                            },
+                            "referenceObligation" : [ {
+                              "security" : {
+                                "productIdentifier" : [ {
+                                  "value" : {
+                                    "identifier" : {
+                                      "value" : "8G836JAF2",
+                                      "meta" : {
+                                        "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair-1-0"
+                                      }
+                                    },
+                                    "source" : "Other",
+                                    "meta" : {
+                                      "globalKey" : "1165f83f"
+                                    }
+                                  }
+                                } ],
+                                "securityType" : "Debt"
+                              }
+                            } ]
+                          }
+                        },
+                        "transactedPrice" : {
+                          "marketFixedRate" : 0.02
+                        },
+                        "meta" : {
+                          "globalKey" : "2fa76fbc"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "a7b3d32c"
+                      }
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "7d14851a"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "7d14851a"
+                }
               },
+              "tradeLot" : [ {
+                "priceQuantity" : [ {
+                  "price" : [ {
+                    "value" : {
+                      "value" : 0.01,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "perUnitOf" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "c5befd88"
+                  }
+                }, {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 5000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "280b774f"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "d0b9c5dd",
+                  "externalReference" : "party2"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "81c9b405",
+                  "externalReference" : "party1"
+                }
+              } ]
+            },
+            "party" : [ {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "5493001RKR55V4X61F71",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "5493001RKR55V4X61F71"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "d0f863bc"
                 }
               } ],
-              "person" : [ {
-                "firstName" : "person",
-                "meta" : {
-                  "externalKey" : "broker",
-                  "globalKey" : "140b1888"
+              "name" : {
+                "value" : "Bank X"
+              },
+              "businessUnit" : [ {
+                "name" : "New York Office",
+                "contactInformation" : {
+                  "address" : [ {
+                    "street" : [ "123 Park Avenue" ],
+                    "city" : "New York",
+                    "state" : "NY",
+                    "country" : {
+                      "value" : "US"
+                    },
+                    "postalCode" : "10017"
+                  } ]
                 },
+                "meta" : {
+                  "globalKey" : "e15b99b0",
+                  "externalKey" : "branch1"
+                }
+              }, {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
                 "personId" : [ {
                   "value" : {
                     "identifier" : {
@@ -100,13 +455,13 @@
                       "globalKey" : "32d9e6bd"
                     }
                   }
-                } ]
-              }, {
+                } ],
                 "firstName" : "person",
                 "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "140b242b"
-                },
+                  "globalKey" : "140b1888",
+                  "externalKey" : "broker"
+                }
+              }, {
                 "personId" : [ {
                   "value" : {
                     "identifier" : {
@@ -116,676 +471,321 @@
                       "globalKey" : "32d9f260"
                     }
                   }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_parent",
-                "globalKey" : "956c45f9"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B47"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f9"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_affiliate1",
-                "globalKey" : "956c45fa"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B48"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45fa"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_affiliate2",
-                "globalKey" : "956c45fb"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B49"
-                },
-                "identifierType" : "LEI",
+                } ],
+                "firstName" : "person",
                 "meta" : {
-                  "globalKey" : "956c45fb"
+                  "globalKey" : "140b242b",
+                  "externalKey" : "trader"
                 }
-              } ]
-            }, {
+              } ],
               "contactInformation" : {
-                "email" : [ "investments@banky.com" ]
-              },
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "573ad49d"
-              },
-              "name" : {
-                "value" : "Bank Y"
+                "email" : [ "swap_trading@bankx.com" ]
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B46"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f8"
-                }
-              } ]
-            }, {
               "meta" : {
-                "externalKey" : "party2_parent",
-                "globalKey" : "956c45f9"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B47"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f9"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2_affiliate1",
-                "globalKey" : "956c45fa"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B48"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45fa"
-                }
-              } ]
+                "globalKey" : "81c9b405",
+                "externalKey" : "party1"
+              }
             }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
-              },
-              "name" : {
-                "value" : "Up&Atem"
-              },
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B47",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "8ffabe4b"
+                  "globalKey" : "956c45f9"
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "executing_agent",
-                "globalKey" : "49e97697"
-              },
-              "name" : {
-                "value" : "XYZ Bank"
-              },
+                "globalKey" : "956c45f9",
+                "externalKey" : "party1_parent"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B48",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND22"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "e213e774"
+                  "globalKey" : "956c45fa"
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "venue",
-                "globalKey" : "6ebddc37"
-              },
-              "name" : {
-                "value" : "SEFCo LLC"
-              },
+                "globalKey" : "956c45fa",
+                "externalKey" : "party1_affiliate1"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B49",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND11"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "e213e754"
+                  "globalKey" : "956c45fb"
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
-              },
+                "globalKey" : "956c45fb",
+                "externalKey" : "party1_affiliate2"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B46",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "e213e7d7"
+                  "globalKey" : "956c45f8"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "original_sdr",
-                "globalKey" : "9b321c78"
-              },
+              } ],
               "name" : {
-                "value" : "WorldWide Trade Repository"
+                "value" : "Bank Y"
               },
+              "contactInformation" : {
+                "email" : [ "investments@banky.com" ]
+              },
+              "meta" : {
+                "globalKey" : "d0b9c5dd",
+                "externalKey" : "party2"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B47",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "e213e7d7"
+                  "globalKey" : "956c45f9"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "b8d57157"
-              },
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "573ad49d"
-              },
-              "role" : "REPORTING_PARTY"
-            } ],
-            "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "573ad49d"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "b8d57157"
-                },
-                "role" : "PARTY_2"
               } ],
-              "product" : {
-                "contractualProduct" : {
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "meta" : {
-                          "scheme" : "http://www.theice.com/coding-scheme/product-id"
-                        },
-                        "value" : "X123"
-                      },
-                      "meta" : {
-                        "globalKey" : "e6a349ca"
-                      },
-                      "source" : "OTHER"
-                    }
-                  } ],
-                  "productTaxonomy" : [ {
-                    "primaryAssetClass" : {
-                      "value" : "CREDIT"
-                    }
-                  }, {
-                    "source" : "OTHER",
-                    "value" : {
-                      "name" : {
-                        "meta" : {
-                          "scheme" : "http://www.fpml.org/coding-scheme/sec-product-category"
-                        },
-                        "value" : "SecurityBasedSwap"
-                      }
-                    }
-                  }, {
-                    "source" : "OTHER",
-                    "value" : {
-                      "name" : {
-                        "meta" : {
-                          "scheme" : "http://www.theice.com/coding-scheme/product-name"
-                        },
-                        "value" : "Credi Default Swap"
-                      }
-                    }
-                  }, {
-                    "source" : "OTHER",
-                    "value" : {
-                      "name" : {
-                        "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
-                      }
-                    }
-                  }, {
-                    "source" : "ISDA",
-                    "productQualifier" : "CreditDefaultSwap_SingleName"
-                  } ],
-                  "economicTerms" : {
-                    "effectiveDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3ec8da"
-                        },
-                        "unadjustedDate" : "2009-03-26"
-                      },
-                      "meta" : {
-                        "globalKey" : "3ec8da"
-                      }
-                    },
-                    "payout" : {
-                      "creditDefaultPayout" : {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "generalTerms" : {
-                          "referenceInformation" : {
-                            "referenceEntity" : {
-                              "entityId" : [ {
-                                "meta" : {
-                                  "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                                },
-                                "value" : "8G836J"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "referenceEntity",
-                                "globalKey" : "54140007"
-                              },
-                              "name" : {
-                                "value" : "TENET HEALTHCARE CORPORATION"
-                              }
-                            },
-                            "referenceObligation" : [ {
-                              "security" : {
-                                "productIdentifier" : [ {
-                                  "value" : {
-                                    "identifier" : {
-                                      "meta" : {
-                                        "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair-1-0"
-                                      },
-                                      "value" : "8G836JAF2"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "1165f83f"
-                                    },
-                                    "source" : "OTHER"
-                                  }
-                                } ],
-                                "securityType" : "DEBT"
-                              }
-                            } ]
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "2fa76fbc"
-                        },
-                        "transactedPrice" : {
-                          "marketFixedRate" : 0.02
-                        }
-                      },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
-                          "firstPeriodStartDate" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3ec8d4"
-                              },
-                              "unadjustedDate" : "2009-03-20"
-                            },
-                            "meta" : {
-                              "globalKey" : "3ec8d4"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "28c1032d"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "6afbe26c"
-                        },
-                        "paymentDates" : {
-                          "firstPaymentDate" : "2009-06-20",
-                          "meta" : {
-                            "globalKey" : "8aa3e742"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "1fd4e030"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3ef194"
-                        },
-                        "unadjustedDate" : "2014-06-20"
-                      },
-                      "meta" : {
-                        "globalKey" : "3ef194"
-                      }
-                    }
-                  },
+              "meta" : {
+                "globalKey" : "956c45f9",
+                "externalKey" : "party2_parent"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B48",
                   "meta" : {
-                    "globalKey" : "2569d882"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "2569d882"
+                  "globalKey" : "956c45fa"
                 }
-              },
-              "tradeLot" : [ {
-                "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "1f273178"
-                  },
-                  "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 0.01,
-                      "perUnitOf" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "1a10e2d1"
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 5000000
-                    }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
+              } ],
               "meta" : {
-                "globalKey" : "3ed88c"
-              },
-              "value" : "2011-02-12"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+                "globalKey" : "956c45fa",
+                "externalKey" : "party2_affiliate1"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "12345678901234567890123456789012"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "8ffabe4b"
                 }
               } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
-                },
-                "value" : "FCHUXIINML"
+              "name" : {
+                "value" : "Up&Atem"
               },
               "meta" : {
-                "globalKey" : "1551a427"
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND22",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e774"
+                }
+              } ],
+              "name" : {
+                "value" : "XYZ Bank"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
+              "meta" : {
+                "globalKey" : "61a07317",
+                "externalKey" : "executing_agent"
+              }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300IB5Q45JGNPND11",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "12345678901234567890123456789012"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e754"
                 }
               } ],
-              "issuer" : {
+              "name" : {
+                "value" : "SEFCo LLC"
+              },
+              "meta" : {
+                "globalKey" : "ae0d40b7",
+                "externalKey" : "venue"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
+              },
+              "meta" : {
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "1031234567"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "WorldWide Trade Repository"
               },
               "meta" : {
-                "globalKey" : "f6e91d86"
+                "globalKey" : "4ba4fb38",
+                "externalKey" : "original_sdr"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "d0b9c5dd",
+                "externalReference" : "party2"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
+              "role" : "ReportingParty",
+              "ownershipPartyReference" : {
+                "globalReference" : "81c9b405",
+                "externalReference" : "party1"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "6024749e"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "c11af7da"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "b8d57157"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "573ad49d"
-                }
-              },
               "quantity" : {
+                "value" : 1000,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "81c9b405",
+                  "externalReference" : "party1"
                 },
-                "value" : 1000
+                "receiverPartyReference" : {
+                  "globalReference" : "d0b9c5dd",
+                  "externalReference" : "party2"
+                }
               },
               "settlementDate" : {
+                "unadjustedDate" : "2009-03-28",
                 "adjustedDate" : {
+                  "value" : "2009-03-30",
                   "meta" : {
                     "globalKey" : "3ec8de"
-                  },
-                  "value" : "2009-03-30"
-                },
-                "unadjustedDate" : "2009-03-28"
-              },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
-              }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "2002-01-05",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "value" : "ISDA_MASTER"
+                  }
                 }
               },
-              "vintage" : 1992
-            },
-            "meta" : {
-              "globalKey" : "4f2097d4"
-            }
-          }, {
-            "agreementDate" : "2002-01-07",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "ISDA_2003_CREDIT_NORTH_AMERICAN"
-                }
-              }
-            },
-            "meta" : {
-              "globalKey" : "5d7949e5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CREDIT_SUPPORT_AGREEMENT"
-              }
-            },
-            "meta" : {
-              "globalKey" : "984ae6d0"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "value" : "STANDARD_NORTH_AMERICAN_CORPORATE"
-                  },
-                  "matrixType" : {
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-                  }
-                } ]
-              }
-            },
-            "meta" : {
-              "globalKey" : "80f11ad5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "OTHER",
-                "otherAgreement" : "Custom Legal Agreement"
+              "transferExpression" : {
+                "priceTransfer" : "Upfront"
               }
             },
             "meta" : {
-              "globalKey" : "98e1dbe8"
+              "globalKey" : "ebfa433a"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "458dbbd8"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "BANKX0001",
+      "meta" : {
+        "scheme" : "http://www.bankx.com/msg_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "BANKX"
+    },
+    "sentTo" : [ {
+      "value" : "SDR01"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2011-02-12T12:21:16Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2011-02-12T12:20:47Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "BANKX0001"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "3ce1279d"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "c12f7389"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-beta-trade-CFTC-SEC-and-canada.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-beta-trade-CFTC-SEC-and-canada.json
index 3696e4a558..77fd7c94dd 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-beta-trade-CFTC-SEC-and-canada.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-beta-trade-CFTC-SEC-and-canada.json
@@ -1,342 +1,154 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "BANKX0001"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "3ce1279d"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.bankx.com/msg_id"
-      },
-      "value" : "BANKX0001"
-    },
-    "sentBy" : {
-      "value" : "BANKX"
-    },
-    "sentTo" : [ {
-      "value" : "SDR01"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "7e3fbc1a"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "e6718a6a"
-          },
-          "trade" : {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "2002-01-05",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster"
+                }
+              },
+              "vintage" : 1992
+            },
+            "meta" : {
+              "globalKey" : "4f2097d4"
+            }
+          }, {
+            "agreementDate" : "2002-01-07",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "ISDA2003CreditNorthAmerican"
+                }
+              }
+            },
             "meta" : {
-              "globalKey" : "160a00c"
+              "globalKey" : "5d7949e5"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "CreditSupportAgreement"
+              }
             },
-            "party" : [ {
-              "businessUnit" : [ {
-                "contactInformation" : {
-                  "address" : [ {
-                    "city" : "New York",
-                    "country" : {
-                      "value" : "US"
-                    },
-                    "postalCode" : "10017",
-                    "state" : "NY",
-                    "street" : [ "123 Park Avenue" ]
-                  } ]
-                },
-                "meta" : {
-                  "externalKey" : "branch1",
-                  "globalKey" : "69aea9de"
-                },
-                "name" : "New York Office"
-              }, {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "contactInformation" : {
-                "email" : [ "swap_trading@bankx.com" ]
-              },
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "b8d57157"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            "meta" : {
+              "globalKey" : "984ae6d0"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix"
                   },
-                  "value" : "5493001RKR55V4X61F71"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "d0f863bc"
-                }
-              } ],
-              "person" : [ {
-                "firstName" : "person",
-                "meta" : {
-                  "externalKey" : "broker",
-                  "globalKey" : "140b1888"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "person123"
-                    },
-                    "meta" : {
-                      "globalKey" : "32d9e6bd"
-                    }
-                  }
-                } ]
-              }, {
-                "firstName" : "person",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "140b242b"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "person456"
-                    },
-                    "meta" : {
-                      "globalKey" : "32d9f260"
-                    }
+                  "matrixTerm" : {
+                    "value" : "StandardNorthAmericanCorporate"
                   }
                 } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_parent",
-                "globalKey" : "956c45f9"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B47"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f9"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_affiliate1",
-                "globalKey" : "956c45fa"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B48"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45fa"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_affiliate2",
-                "globalKey" : "956c45fb"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B49"
-                },
-                "identifierType" : "LEI",
+              }
+            },
+            "meta" : {
+              "globalKey" : "9ed2f955"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Other",
+                "otherAgreement" : "Custom Legal Agreement"
+              }
+            },
+            "meta" : {
+              "globalKey" : "98e1dbe8"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "FCHUXIINML",
                 "meta" : {
-                  "globalKey" : "956c45fb"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
-              },
-              "name" : {
-                "value" : "Up&Atem"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "12345678901234567890123456789012",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "executing_agent",
-                "globalKey" : "49e97697"
-              },
-              "name" : {
-                "value" : "XYZ Bank"
+                "globalKey" : "ce80645"
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND22"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e774"
-                }
-              } ]
+              "identifierType" : "UniqueTransactionIdentifier"
             }, {
-              "meta" : {
-                "externalKey" : "venue",
-                "globalKey" : "6ebddc37"
-              },
-              "name" : {
-                "value" : "SEFCo LLC"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND11"
-                },
-                "identifierType" : "LEI",
+              "issuer" : {
+                "value" : "1031234567",
                 "meta" : {
-                  "globalKey" : "e213e754"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "12345678901234567890123456789012",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "original_sdr",
-                "globalKey" : "9b321c78"
-              },
-              "name" : {
-                "value" : "WorldWide Trade Repository"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
-                }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "b8d57157"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing-svc",
-                "globalReference" : "611719a0"
+                "globalKey" : "671d1c86"
               },
-              "role" : "CLEARING_ORGANIZATION"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2011-02-12",
+              "meta" : {
+                "globalKey" : "3ed88c"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "clearing-svc",
-                  "globalReference" : "611719a0"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "b8d57157"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "meta" : {
-                          "scheme" : "http://www.theice.com/coding-scheme/product-id"
-                        },
-                        "value" : "X123"
-                      },
-                      "meta" : {
-                        "globalKey" : "e6a349ca"
-                      },
-                      "source" : "OTHER"
-                    }
-                  } ],
                   "productTaxonomy" : [ {
                     "primaryAssetClass" : {
-                      "value" : "CREDIT"
+                      "value" : "Credit"
                     }
                   }, {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
+                        "value" : "SecurityBasedSwap",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/sec-product-category"
-                        },
-                        "value" : "SecurityBasedSwap"
+                        }
                       }
                     }
                   }, {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
+                        "value" : "Credi Default Swap",
                         "meta" : {
                           "scheme" : "http://www.theice.com/coding-scheme/product-name"
-                        },
-                        "value" : "Credi Default Swap"
+                        }
                       }
                     }
                   }, {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
                         "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
@@ -346,50 +158,147 @@
                     "source" : "ISDA",
                     "productQualifier" : "CreditDefaultSwap_SingleName"
                   } ],
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "X123",
+                        "meta" : {
+                          "scheme" : "http://www.theice.com/coding-scheme/product-id"
+                        }
+                      },
+                      "source" : "Other",
+                      "meta" : {
+                        "globalKey" : "e6a349ca"
+                      }
+                    }
+                  } ],
                   "economicTerms" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2009-03-26",
                         "meta" : {
                           "globalKey" : "3ec8da"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ec8da"
+                      }
+                    },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2014-06-20",
+                        "meta" : {
+                          "globalKey" : "3ef194"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ef194"
+                      }
+                    },
+                    "payout" : {
+                      "interestRatePayout" : [ {
+                        "payerReceiver" : {
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
+                        },
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        },
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "calculationPeriodDates" : {
+                          "firstPeriodStartDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2009-03-20",
+                              "meta" : {
+                                "globalKey" : "3ec8d4"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3ec8d4"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
+                          "meta" : {
+                            "globalKey" : "bf47be47"
+                          }
                         },
-                        "unadjustedDate" : "2009-03-26"
-                      },
-                      "meta" : {
-                        "globalKey" : "3ec8da"
-                      }
-                    },
-                    "payout" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "firstPaymentDate" : "2009-06-20",
+                          "meta" : {
+                            "globalKey" : "8aa3de96"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "eff49770"
+                        }
+                      } ],
                       "creditDefaultPayout" : {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "generalTerms" : {
                           "referenceInformation" : {
                             "referenceEntity" : {
                               "entityId" : [ {
+                                "value" : "8G836J",
                                 "meta" : {
                                   "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                                },
-                                "value" : "8G836J"
+                                }
                               } ],
-                              "meta" : {
-                                "externalKey" : "referenceEntity",
-                                "globalKey" : "54140007"
-                              },
                               "name" : {
                                 "value" : "TENET HEALTHCARE CORPORATION"
+                              },
+                              "meta" : {
+                                "globalKey" : "54140007",
+                                "externalKey" : "referenceEntity"
                               }
                             },
                             "referenceObligation" : [ {
@@ -397,338 +306,429 @@
                                 "productIdentifier" : [ {
                                   "value" : {
                                     "identifier" : {
+                                      "value" : "8G836JAF2",
                                       "meta" : {
                                         "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair-1-0"
-                                      },
-                                      "value" : "8G836JAF2"
+                                      }
                                     },
+                                    "source" : "Other",
                                     "meta" : {
                                       "globalKey" : "1165f83f"
-                                    },
-                                    "source" : "OTHER"
+                                    }
                                   }
                                 } ],
-                                "securityType" : "DEBT"
+                                "securityType" : "Debt"
                               }
                             } ]
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "2fa76fbc"
-                        },
                         "transactedPrice" : {
                           "marketFixedRate" : 0.02
-                        }
-                      },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
-                          "firstPeriodStartDate" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3ec8d4"
-                              },
-                              "unadjustedDate" : "2009-03-20"
-                            },
-                            "meta" : {
-                              "globalKey" : "3ec8d4"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "28c1032d"
-                          }
                         },
                         "meta" : {
-                          "globalKey" : "6afbe26c"
-                        },
-                        "paymentDates" : {
-                          "firstPaymentDate" : "2009-06-20",
-                          "meta" : {
-                            "globalKey" : "8aa3e742"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                          "globalKey" : "2fa76fbc"
                         }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "1fd4e030"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3ef194"
-                        },
-                        "unadjustedDate" : "2014-06-20"
                       },
                       "meta" : {
-                        "globalKey" : "3ef194"
+                        "globalKey" : "a7b3d32c"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "2569d882"
+                    "globalKey" : "7d14851a"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "7d14851a"
+                }
+              },
+              "tradeLot" : [ {
+                "priceQuantity" : [ {
+                  "price" : [ {
+                    "value" : {
+                      "value" : 0.01,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "perUnitOf" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "c5befd88"
+                  }
+                }, {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 5000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "280b774f"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "f6a6cc60",
+                  "externalReference" : "clearing-svc"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "81c9b405",
+                  "externalReference" : "party1"
+                }
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "5493001RKR55V4X61F71",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "d0f863bc"
+                }
+              } ],
+              "name" : {
+                "value" : "Bank X"
+              },
+              "businessUnit" : [ {
+                "name" : "New York Office",
+                "contactInformation" : {
+                  "address" : [ {
+                    "street" : [ "123 Park Avenue" ],
+                    "city" : "New York",
+                    "state" : "NY",
+                    "country" : {
+                      "value" : "US"
+                    },
+                    "postalCode" : "10017"
+                  } ]
+                },
+                "meta" : {
+                  "globalKey" : "e15b99b0",
+                  "externalKey" : "branch1"
+                }
+              }, {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "person123"
+                    },
+                    "meta" : {
+                      "globalKey" : "32d9e6bd"
+                    }
+                  }
+                } ],
+                "firstName" : "person",
+                "meta" : {
+                  "globalKey" : "140b1888",
+                  "externalKey" : "broker"
+                }
+              }, {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "person456"
+                    },
+                    "meta" : {
+                      "globalKey" : "32d9f260"
+                    }
+                  }
+                } ],
+                "firstName" : "person",
+                "meta" : {
+                  "globalKey" : "140b242b",
+                  "externalKey" : "trader"
+                }
+              } ],
+              "contactInformation" : {
+                "email" : [ "swap_trading@bankx.com" ]
+              },
+              "meta" : {
+                "globalKey" : "81c9b405",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B47",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45f9"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "956c45f9",
+                "externalKey" : "party1_parent"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B48",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45fa"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "956c45fa",
+                "externalKey" : "party1_affiliate1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B49",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "2569d882"
+                  "globalKey" : "956c45fb"
                 }
-              },
-              "tradeLot" : [ {
-                "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "1f273178"
-                  },
-                  "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 0.01,
-                      "perUnitOf" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "1a10e2d1"
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 5000000
-                    }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
+              } ],
               "meta" : {
-                "globalKey" : "3ed88c"
-              },
-              "value" : "2011-02-12"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+                "globalKey" : "956c45fb",
+                "externalKey" : "party1_affiliate2"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "12345678901234567890123456789012"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "8ffabe4b"
                 }
               } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
-                },
-                "value" : "FCHUXIINML"
+              "name" : {
+                "value" : "Up&Atem"
               },
               "meta" : {
-                "globalKey" : "1551a427"
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND22",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e774"
+                }
+              } ],
+              "name" : {
+                "value" : "XYZ Bank"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
+              "meta" : {
+                "globalKey" : "61a07317",
+                "externalKey" : "executing_agent"
+              }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300IB5Q45JGNPND11",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "12345678901234567890123456789012"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e754"
                 }
               } ],
-              "issuer" : {
+              "name" : {
+                "value" : "SEFCo LLC"
+              },
+              "meta" : {
+                "globalKey" : "ae0d40b7",
+                "externalKey" : "venue"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
+              },
+              "meta" : {
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "1031234567"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "WorldWide Trade Repository"
               },
               "meta" : {
-                "globalKey" : "f6e91d86"
+                "globalKey" : "4ba4fb38",
+                "externalKey" : "original_sdr"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "f6a6cc60",
+                "externalReference" : "clearing-svc"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
+              "role" : "ClearingOrganization",
+              "ownershipPartyReference" : {
+                "globalReference" : "81c9b405",
+                "externalReference" : "party1"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "c33ae5be"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "b25a825e"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "b8d57157"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "clearing-svc",
-                  "globalReference" : "611719a0"
-                }
-              },
               "quantity" : {
+                "value" : 1000,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "81c9b405",
+                  "externalReference" : "party1"
                 },
-                "value" : 1000
+                "receiverPartyReference" : {
+                  "globalReference" : "f6a6cc60",
+                  "externalReference" : "clearing-svc"
+                }
               },
               "settlementDate" : {
+                "unadjustedDate" : "2009-03-28",
                 "adjustedDate" : {
+                  "value" : "2009-03-30",
                   "meta" : {
                     "globalKey" : "3ec8de"
-                  },
-                  "value" : "2009-03-30"
-                },
-                "unadjustedDate" : "2009-03-28"
-              },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
-              }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "2002-01-05",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "value" : "ISDA_MASTER"
+                  }
                 }
               },
-              "vintage" : 1992
-            },
-            "meta" : {
-              "globalKey" : "4f2097d4"
-            }
-          }, {
-            "agreementDate" : "2002-01-07",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "ISDA_2003_CREDIT_NORTH_AMERICAN"
-                }
-              }
-            },
-            "meta" : {
-              "globalKey" : "5d7949e5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CREDIT_SUPPORT_AGREEMENT"
-              }
-            },
-            "meta" : {
-              "globalKey" : "984ae6d0"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "value" : "STANDARD_NORTH_AMERICAN_CORPORATE"
-                  },
-                  "matrixType" : {
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-                  }
-                } ]
-              }
-            },
-            "meta" : {
-              "globalKey" : "80f11ad5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "OTHER",
-                "otherAgreement" : "Custom Legal Agreement"
+              "transferExpression" : {
+                "priceTransfer" : "Upfront"
               }
             },
             "meta" : {
-              "globalKey" : "98e1dbe8"
+              "globalKey" : "65073636"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "45eadff4"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "BANKX0001",
+      "meta" : {
+        "scheme" : "http://www.bankx.com/msg_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "BANKX"
+    },
+    "sentTo" : [ {
+      "value" : "SDR01"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2011-02-12T16:42:16Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2011-02-04T16:20:47Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "BANKX0001"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "3ce1279d"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "f9c229ce"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-trade-CFTC-SEC-and-canada.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-trade-CFTC-SEC-and-canada.json
index 8c0a8d2fbb..a9a4bc9678 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-trade-CFTC-SEC-and-canada.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-trade-CFTC-SEC-and-canada.json
@@ -1,96 +1,451 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "BANKX0001"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "3ce1279d"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.bankx.com/msg_id"
-      },
-      "value" : "BANKX0001"
-    },
-    "sentBy" : {
-      "value" : "BANKX"
-    },
-    "sentTo" : [ {
-      "value" : "SDR01"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "95ccb362"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "2002-01-05",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster"
+                }
+              },
+              "vintage" : 1992
+            },
+            "meta" : {
+              "globalKey" : "4f2097d4"
+            }
+          }, {
+            "agreementDate" : "2002-01-07",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "ISDA2003CreditNorthAmerican"
+                }
+              }
+            },
+            "meta" : {
+              "globalKey" : "5d7949e5"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "CreditSupportAgreement"
+              }
+            },
+            "meta" : {
+              "globalKey" : "984ae6d0"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix"
+                  },
+                  "matrixTerm" : {
+                    "value" : "StandardNorthAmericanCorporate"
+                  }
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "9ed2f955"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Other",
+                "otherAgreement" : "Custom Legal Agreement"
+              }
+            },
+            "meta" : {
+              "globalKey" : "98e1dbe8"
+            }
+          } ]
+        }
+      },
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "571d1896"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "b27318bc"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "contactInformation" : {
-                  "address" : [ {
-                    "city" : "New York",
-                    "country" : {
-                      "value" : "US"
-                    },
-                    "postalCode" : "10017",
-                    "state" : "NY",
-                    "street" : [ "123 Park Avenue" ]
-                  } ]
-                },
-                "meta" : {
-                  "externalKey" : "branch1",
-                  "globalKey" : "69aea9de"
-                },
-                "name" : "New York Office"
-              }, {
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "FCHUXIINML",
                 "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
+                }
+              },
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "12345678901234567890123456789012",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
+                }
               } ],
-              "contactInformation" : {
-                "email" : [ "swap_trading@bankx.com" ]
+              "meta" : {
+                "globalKey" : "ce80645"
+              },
+              "identifierType" : "UniqueTransactionIdentifier"
+            }, {
+              "issuer" : {
+                "value" : "1031234567",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                }
               },
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "12345678901234567890123456789012",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
+                }
+              } ],
               "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "b8d57157"
+                "globalKey" : "671d1c86"
               },
-              "name" : {
-                "value" : "Bank X"
+              "identifierType" : "UniqueTransactionIdentifier"
+            } ],
+            "tradeDate" : {
+              "value" : "2011-02-12",
+              "meta" : {
+                "globalKey" : "3ed88c"
+              }
+            },
+            "tradableProduct" : {
+              "product" : {
+                "contractualProduct" : {
+                  "productTaxonomy" : [ {
+                    "primaryAssetClass" : {
+                      "value" : "Credit"
+                    }
+                  }, {
+                    "source" : "Other",
+                    "value" : {
+                      "name" : {
+                        "value" : "SecurityBasedSwap",
+                        "meta" : {
+                          "scheme" : "http://www.fpml.org/coding-scheme/sec-product-category"
+                        }
+                      }
+                    }
+                  }, {
+                    "source" : "Other",
+                    "value" : {
+                      "name" : {
+                        "value" : "Credi Default Swap",
+                        "meta" : {
+                          "scheme" : "http://www.theice.com/coding-scheme/product-name"
+                        }
+                      }
+                    }
+                  }, {
+                    "source" : "Other",
+                    "value" : {
+                      "name" : {
+                        "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
+                      }
+                    }
+                  }, {
+                    "source" : "ISDA",
+                    "productQualifier" : "CreditDefaultSwap_SingleName"
+                  } ],
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "X123",
+                        "meta" : {
+                          "scheme" : "http://www.theice.com/coding-scheme/product-id"
+                        }
+                      },
+                      "source" : "Other",
+                      "meta" : {
+                        "globalKey" : "e6a349ca"
+                      }
+                    }
+                  } ],
+                  "economicTerms" : {
+                    "effectiveDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2009-03-26",
+                        "meta" : {
+                          "globalKey" : "3ec8da"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ec8da"
+                      }
+                    },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2014-06-20",
+                        "meta" : {
+                          "globalKey" : "3ef194"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ef194"
+                      }
+                    },
+                    "payout" : {
+                      "interestRatePayout" : [ {
+                        "payerReceiver" : {
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
+                        },
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        },
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
+                        },
+                        "calculationPeriodDates" : {
+                          "firstPeriodStartDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2009-03-20",
+                              "meta" : {
+                                "globalKey" : "3ec8d4"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3ec8d4"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
+                          "meta" : {
+                            "globalKey" : "bf47be47"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "firstPaymentDate" : "2009-06-20",
+                          "meta" : {
+                            "globalKey" : "8aa3de96"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "eff49770"
+                        }
+                      } ],
+                      "creditDefaultPayout" : {
+                        "payerReceiver" : {
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
+                        },
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        },
+                        "generalTerms" : {
+                          "referenceInformation" : {
+                            "referenceEntity" : {
+                              "entityId" : [ {
+                                "value" : "8G836J",
+                                "meta" : {
+                                  "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
+                                }
+                              } ],
+                              "name" : {
+                                "value" : "TENET HEALTHCARE CORPORATION"
+                              },
+                              "meta" : {
+                                "globalKey" : "54140007",
+                                "externalKey" : "referenceEntity"
+                              }
+                            },
+                            "referenceObligation" : [ {
+                              "security" : {
+                                "productIdentifier" : [ {
+                                  "value" : {
+                                    "identifier" : {
+                                      "value" : "8G836JAF2",
+                                      "meta" : {
+                                        "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair-1-0"
+                                      }
+                                    },
+                                    "source" : "Other",
+                                    "meta" : {
+                                      "globalKey" : "1165f83f"
+                                    }
+                                  }
+                                } ],
+                                "securityType" : "Debt"
+                              }
+                            } ]
+                          }
+                        },
+                        "transactedPrice" : {
+                          "marketFixedRate" : 0.02
+                        },
+                        "meta" : {
+                          "globalKey" : "2fa76fbc"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "a7b3d32c"
+                      }
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "7d14851a"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "7d14851a"
+                }
               },
+              "tradeLot" : [ {
+                "priceQuantity" : [ {
+                  "price" : [ {
+                    "value" : {
+                      "value" : 0.01,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "perUnitOf" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "c5befd88"
+                  }
+                }, {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 5000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "280b774f"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "d0b9c5dd",
+                  "externalReference" : "party2"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "81c9b405",
+                  "externalReference" : "party1"
+                }
+              } ]
+            },
+            "party" : [ {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "5493001RKR55V4X61F71",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "5493001RKR55V4X61F71"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
                   "globalKey" : "d0f863bc"
                 }
               } ],
-              "person" : [ {
-                "firstName" : "person",
-                "meta" : {
-                  "externalKey" : "broker",
-                  "globalKey" : "140b1888"
+              "name" : {
+                "value" : "Bank X"
+              },
+              "businessUnit" : [ {
+                "name" : "New York Office",
+                "contactInformation" : {
+                  "address" : [ {
+                    "street" : [ "123 Park Avenue" ],
+                    "city" : "New York",
+                    "state" : "NY",
+                    "country" : {
+                      "value" : "US"
+                    },
+                    "postalCode" : "10017"
+                  } ]
                 },
+                "meta" : {
+                  "globalKey" : "e15b99b0",
+                  "externalKey" : "branch1"
+                }
+              }, {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
                 "personId" : [ {
                   "value" : {
                     "identifier" : {
@@ -100,13 +455,13 @@
                       "globalKey" : "32d9e6bd"
                     }
                   }
-                } ]
-              }, {
+                } ],
                 "firstName" : "person",
                 "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "140b242b"
-                },
+                  "globalKey" : "140b1888",
+                  "externalKey" : "broker"
+                }
+              }, {
                 "personId" : [ {
                   "value" : {
                     "identifier" : {
@@ -116,676 +471,321 @@
                       "globalKey" : "32d9f260"
                     }
                   }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_parent",
-                "globalKey" : "956c45f9"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B47"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f9"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_affiliate1",
-                "globalKey" : "956c45fa"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B48"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45fa"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party1_affiliate2",
-                "globalKey" : "956c45fb"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B49"
-                },
-                "identifierType" : "LEI",
+                } ],
+                "firstName" : "person",
                 "meta" : {
-                  "globalKey" : "956c45fb"
+                  "globalKey" : "140b242b",
+                  "externalKey" : "trader"
                 }
-              } ]
-            }, {
+              } ],
               "contactInformation" : {
-                "email" : [ "investments@banky.com" ]
-              },
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "573ad49d"
-              },
-              "name" : {
-                "value" : "Bank Y"
+                "email" : [ "swap_trading@bankx.com" ]
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B46"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f8"
-                }
-              } ]
-            }, {
               "meta" : {
-                "externalKey" : "party2_parent",
-                "globalKey" : "956c45f9"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B47"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f9"
-                }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2_affiliate1",
-                "globalKey" : "956c45fa"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B48"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45fa"
-                }
-              } ]
+                "globalKey" : "81c9b405",
+                "externalKey" : "party1"
+              }
             }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
-              },
-              "name" : {
-                "value" : "Up&Atem"
-              },
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B47",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "8ffabe4b"
+                  "globalKey" : "956c45f9"
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "executing_agent",
-                "globalKey" : "49e97697"
-              },
-              "name" : {
-                "value" : "XYZ Bank"
-              },
+                "globalKey" : "956c45f9",
+                "externalKey" : "party1_parent"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B48",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND22"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "e213e774"
+                  "globalKey" : "956c45fa"
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "venue",
-                "globalKey" : "6ebddc37"
-              },
-              "name" : {
-                "value" : "SEFCo LLC"
-              },
+                "globalKey" : "956c45fa",
+                "externalKey" : "party1_affiliate1"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B49",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND11"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "e213e754"
+                  "globalKey" : "956c45fb"
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
-              },
+                "globalKey" : "956c45fb",
+                "externalKey" : "party1_affiliate2"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B46",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "e213e7d7"
+                  "globalKey" : "956c45f8"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "original_sdr",
-                "globalKey" : "9b321c78"
-              },
+              } ],
               "name" : {
-                "value" : "WorldWide Trade Repository"
+                "value" : "Bank Y"
               },
+              "contactInformation" : {
+                "email" : [ "investments@banky.com" ]
+              },
+              "meta" : {
+                "globalKey" : "d0b9c5dd",
+                "externalKey" : "party2"
+              }
+            }, {
               "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B47",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
+                  }
                 },
                 "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "e213e7d7"
+                  "globalKey" : "956c45f9"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "b8d57157"
-              },
-              "partyReference" : {
-                "externalReference" : "party2",
-                "globalReference" : "573ad49d"
-              },
-              "role" : "REPORTING_PARTY"
-            } ],
-            "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "573ad49d"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "b8d57157"
-                },
-                "role" : "PARTY_2"
               } ],
-              "product" : {
-                "contractualProduct" : {
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "meta" : {
-                          "scheme" : "http://www.theice.com/coding-scheme/product-id"
-                        },
-                        "value" : "X123"
-                      },
-                      "meta" : {
-                        "globalKey" : "e6a349ca"
-                      },
-                      "source" : "OTHER"
-                    }
-                  } ],
-                  "productTaxonomy" : [ {
-                    "primaryAssetClass" : {
-                      "value" : "CREDIT"
-                    }
-                  }, {
-                    "source" : "OTHER",
-                    "value" : {
-                      "name" : {
-                        "meta" : {
-                          "scheme" : "http://www.fpml.org/coding-scheme/sec-product-category"
-                        },
-                        "value" : "SecurityBasedSwap"
-                      }
-                    }
-                  }, {
-                    "source" : "OTHER",
-                    "value" : {
-                      "name" : {
-                        "meta" : {
-                          "scheme" : "http://www.theice.com/coding-scheme/product-name"
-                        },
-                        "value" : "Credi Default Swap"
-                      }
-                    }
-                  }, {
-                    "source" : "OTHER",
-                    "value" : {
-                      "name" : {
-                        "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
-                      }
-                    }
-                  }, {
-                    "source" : "ISDA",
-                    "productQualifier" : "CreditDefaultSwap_SingleName"
-                  } ],
-                  "economicTerms" : {
-                    "effectiveDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3ec8da"
-                        },
-                        "unadjustedDate" : "2009-03-26"
-                      },
-                      "meta" : {
-                        "globalKey" : "3ec8da"
-                      }
-                    },
-                    "payout" : {
-                      "creditDefaultPayout" : {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "generalTerms" : {
-                          "referenceInformation" : {
-                            "referenceEntity" : {
-                              "entityId" : [ {
-                                "meta" : {
-                                  "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                                },
-                                "value" : "8G836J"
-                              } ],
-                              "meta" : {
-                                "externalKey" : "referenceEntity",
-                                "globalKey" : "54140007"
-                              },
-                              "name" : {
-                                "value" : "TENET HEALTHCARE CORPORATION"
-                              }
-                            },
-                            "referenceObligation" : [ {
-                              "security" : {
-                                "productIdentifier" : [ {
-                                  "value" : {
-                                    "identifier" : {
-                                      "meta" : {
-                                        "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair-1-0"
-                                      },
-                                      "value" : "8G836JAF2"
-                                    },
-                                    "meta" : {
-                                      "globalKey" : "1165f83f"
-                                    },
-                                    "source" : "OTHER"
-                                  }
-                                } ],
-                                "securityType" : "DEBT"
-                              }
-                            } ]
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "2fa76fbc"
-                        },
-                        "transactedPrice" : {
-                          "marketFixedRate" : 0.02
-                        }
-                      },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
-                          "firstPeriodStartDate" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3ec8d4"
-                              },
-                              "unadjustedDate" : "2009-03-20"
-                            },
-                            "meta" : {
-                              "globalKey" : "3ec8d4"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "28c1032d"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "6afbe26c"
-                        },
-                        "paymentDates" : {
-                          "firstPaymentDate" : "2009-06-20",
-                          "meta" : {
-                            "globalKey" : "8aa3e742"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "1fd4e030"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3ef194"
-                        },
-                        "unadjustedDate" : "2014-06-20"
-                      },
-                      "meta" : {
-                        "globalKey" : "3ef194"
-                      }
-                    }
-                  },
+              "meta" : {
+                "globalKey" : "956c45f9",
+                "externalKey" : "party2_parent"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B48",
                   "meta" : {
-                    "globalKey" : "2569d882"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "2569d882"
+                  "globalKey" : "956c45fa"
                 }
-              },
-              "tradeLot" : [ {
-                "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "1f273178"
-                  },
-                  "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 0.01,
-                      "perUnitOf" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "1a10e2d1"
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 5000000
-                    }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
+              } ],
               "meta" : {
-                "globalKey" : "3ed88c"
-              },
-              "value" : "2011-02-12"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+                "globalKey" : "956c45fa",
+                "externalKey" : "party2_affiliate1"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "12345678901234567890123456789012"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "8ffabe4b"
                 }
               } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
-                },
-                "value" : "FCHUXIINML"
+              "name" : {
+                "value" : "Up&Atem"
               },
               "meta" : {
-                "globalKey" : "1551a427"
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND22",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e774"
+                }
+              } ],
+              "name" : {
+                "value" : "XYZ Bank"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
+              "meta" : {
+                "globalKey" : "61a07317",
+                "externalKey" : "executing_agent"
+              }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300IB5Q45JGNPND11",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "12345678901234567890123456789012"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e754"
                 }
               } ],
-              "issuer" : {
+              "name" : {
+                "value" : "SEFCo LLC"
+              },
+              "meta" : {
+                "globalKey" : "ae0d40b7",
+                "externalKey" : "venue"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
+              },
+              "meta" : {
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "1031234567"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "WorldWide Trade Repository"
               },
               "meta" : {
-                "globalKey" : "f6e91d86"
+                "globalKey" : "4ba4fb38",
+                "externalKey" : "original_sdr"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "d0b9c5dd",
+                "externalReference" : "party2"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
+              "role" : "ReportingParty",
+              "ownershipPartyReference" : {
+                "globalReference" : "81c9b405",
+                "externalReference" : "party1"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "6024749e"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "c11af7da"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "b8d57157"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "573ad49d"
-                }
-              },
               "quantity" : {
+                "value" : 1000,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "81c9b405",
+                  "externalReference" : "party1"
                 },
-                "value" : 1000
+                "receiverPartyReference" : {
+                  "globalReference" : "d0b9c5dd",
+                  "externalReference" : "party2"
+                }
               },
               "settlementDate" : {
+                "unadjustedDate" : "2009-03-28",
                 "adjustedDate" : {
+                  "value" : "2009-03-30",
                   "meta" : {
                     "globalKey" : "3ec8de"
-                  },
-                  "value" : "2009-03-30"
-                },
-                "unadjustedDate" : "2009-03-28"
-              },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
-              }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "2002-01-05",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "value" : "ISDA_MASTER"
+                  }
                 }
               },
-              "vintage" : 1992
-            },
-            "meta" : {
-              "globalKey" : "4f2097d4"
-            }
-          }, {
-            "agreementDate" : "2002-01-07",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "ISDA_2003_CREDIT_NORTH_AMERICAN"
-                }
-              }
-            },
-            "meta" : {
-              "globalKey" : "5d7949e5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CREDIT_SUPPORT_AGREEMENT"
-              }
-            },
-            "meta" : {
-              "globalKey" : "984ae6d0"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "value" : "STANDARD_NORTH_AMERICAN_CORPORATE"
-                  },
-                  "matrixType" : {
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-                  }
-                } ]
-              }
-            },
-            "meta" : {
-              "globalKey" : "80f11ad5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "OTHER",
-                "otherAgreement" : "Custom Legal Agreement"
+              "transferExpression" : {
+                "priceTransfer" : "Upfront"
               }
             },
             "meta" : {
-              "globalKey" : "98e1dbe8"
+              "globalKey" : "ebfa433a"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "458dbbd8"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "BANKX0001",
+      "meta" : {
+        "scheme" : "http://www.bankx.com/msg_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "BANKX"
+    },
+    "sentTo" : [ {
+      "value" : "SDR01"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2011-03-04T16:42:16Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2011-02-04T16:20:47Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "BANKX0001"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "3ce1279d"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "330dd6be"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-trade-CFTC-clearing.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-trade-CFTC-clearing.json
index a5c48d6ec2..a5eb7c2fce 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-trade-CFTC-clearing.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-trade-CFTC-clearing.json
@@ -1,297 +1,123 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "BANKX0001"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "3ce1279d"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.bankx.com/msg_id"
-      },
-      "value" : "BANKX0001"
-    },
-    "sentBy" : {
-      "value" : "BANKX"
-    },
-    "sentTo" : [ {
-      "value" : "SDR01"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "cf216aec"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "6ac4f91d"
-          },
-          "trade" : {
-            "account" : [ {
-              "accountNumber" : {
-                "meta" : {
-                  "scheme" : "http://bankx.com/accountId"
-                },
-                "value" : "123"
-              },
-              "meta" : {
-                "externalKey" : "client-account",
-                "globalKey" : "c7753bbe"
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "2002-01-05",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterAgreement",
+                "masterAgreementType" : {
+                  "value" : "ISDAMaster"
+                }
               },
-              "servicingParty" : {
-                "externalReference" : "party2",
-                "globalReference" : "11ff226e"
+              "vintage" : 1992
+            },
+            "meta" : {
+              "globalKey" : "4f2097d4"
+            }
+          }, {
+            "agreementDate" : "2002-01-07",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "ISDA2003CreditNorthAmerican"
+                }
               }
-            } ],
+            },
             "meta" : {
-              "globalKey" : "49e2e743"
+              "globalKey" : "5d7949e5"
+            }
+          }, {
+            "agreementDate" : "2015-01-04",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "CreditSupportAgreement"
+              }
             },
-            "party" : [ {
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+            "meta" : {
+              "globalKey" : "984ae6d0"
+            }
+          }, {
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "Confirmation",
+                "contractualMatrix" : [ {
+                  "matrixType" : {
+                    "value" : "CreditDerivativesPhysicalSettlementMatrix"
                   },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
-                }
-              } ]
-            }, {
-              "businessUnit" : [ {
-                "contactInformation" : {
-                  "address" : [ {
-                    "city" : "New York",
-                    "country" : {
-                      "value" : "US"
-                    },
-                    "postalCode" : "10017",
-                    "state" : "NY",
-                    "street" : [ "123 Park Avenue" ]
-                  } ]
-                },
-                "meta" : {
-                  "externalKey" : "branch1",
-                  "globalKey" : "69aea9de"
-                },
-                "name" : "New York Office"
-              }, {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "contactInformation" : {
-                "address" : [ {
-                  "country" : {
-                    "value" : "GB"
+                  "matrixTerm" : {
+                    "value" : "StandardNorthAmericanCorporate"
                   }
                 } ]
-              },
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "11ff226e"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "5493001RKR55V4X61F71"
-                },
-                "identifierType" : "LEI",
+              }
+            },
+            "meta" : {
+              "globalKey" : "9ed2f955"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "FCHUXIINML",
                 "meta" : {
-                  "globalKey" : "d0f863bc"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
                 }
-              } ],
-              "person" : [ {
-                "firstName" : "person",
-                "meta" : {
-                  "externalKey" : "broker",
-                  "globalKey" : "140b1888"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "person123"
-                    },
-                    "meta" : {
-                      "globalKey" : "32d9e6bd"
-                    }
-                  }
-                } ]
-              }, {
-                "firstName" : "person",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "140b242b"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "person456"
-                    },
-                    "meta" : {
-                      "globalKey" : "32d9f260"
-                    }
-                  }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
               },
-              "name" : {
-                "value" : "Up&Atem"
-              },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "12345678901234567890123456789012",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "executing_agent",
-                "globalKey" : "49e97697"
+                "globalKey" : "ce80645"
               },
-              "name" : {
-                "value" : "XYZ Bank"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND22"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e774"
-                }
-              } ]
+              "identifierType" : "UniqueTransactionIdentifier"
             }, {
-              "meta" : {
-                "externalKey" : "venue",
-                "globalKey" : "6ebddc37"
-              },
-              "name" : {
-                "value" : "SEFCo LLC"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND11"
-                },
-                "identifierType" : "LEI",
+              "issuer" : {
+                "value" : "1031234567",
                 "meta" : {
-                  "globalKey" : "e213e754"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "12345678901234567890123456789012",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "original_sdr",
-                "globalKey" : "9b321c78"
+                "globalKey" : "671d1c86"
               },
-              "name" : {
-                "value" : "WorldWide Trade Repository"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
-                }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "611719a0"
-              },
-              "partyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "611719a0"
-              },
-              "role" : "CLEARING_ORGANIZATION"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2011-02-12",
+              "meta" : {
+                "globalKey" : "3ed88c"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "11ff226e"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "611719a0"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
                     "primaryAssetClass" : {
-                      "value" : "CREDIT"
+                      "value" : "Credit"
                     }
                   }, {
-                    "source" : "OTHER",
+                    "source" : "Other",
                     "value" : {
                       "name" : {
                         "value" : "Credit:SingleName:Corporate:StandardNorthAmericanCorporate"
@@ -304,47 +130,130 @@
                   "economicTerms" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2009-03-26",
                         "meta" : {
                           "globalKey" : "3ec8da"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ec8da"
+                      }
+                    },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2014-06-20",
+                        "meta" : {
+                          "globalKey" : "3ef194"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3ef194"
+                      }
+                    },
+                    "payout" : {
+                      "interestRatePayout" : [ {
+                        "payerReceiver" : {
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
+                        },
+                        "priceQuantity" : {
+                          "quantitySchedule" : {
+                            "address" : {
+                              "scope" : "DOCUMENT",
+                              "value" : "quantity-1"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
+                          }
+                        },
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
+                          }
                         },
-                        "unadjustedDate" : "2009-03-26"
-                      },
-                      "meta" : {
-                        "globalKey" : "3ec8da"
-                      }
-                    },
-                    "payout" : {
+                        "calculationPeriodDates" : {
+                          "firstPeriodStartDate" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2009-03-20",
+                              "meta" : {
+                                "globalKey" : "3ec8d4"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3ec8d4"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            },
+                            "rollConvention" : "20"
+                          },
+                          "meta" : {
+                            "globalKey" : "bf47be47"
+                          }
+                        },
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "firstPaymentDate" : "2009-06-20",
+                          "meta" : {
+                            "globalKey" : "8aa3de96"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "eff49770"
+                        }
+                      } ],
                       "creditDefaultPayout" : {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
                         "generalTerms" : {
                           "referenceInformation" : {
                             "referenceEntity" : {
                               "entityId" : [ {
+                                "value" : "8G836J",
                                 "meta" : {
                                   "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                                },
-                                "value" : "8G836J"
+                                }
                               } ],
-                              "meta" : {
-                                "externalKey" : "referenceEntity",
-                                "globalKey" : "54140007"
-                              },
                               "name" : {
                                 "value" : "TENET HEALTHCARE CORPORATION"
+                              },
+                              "meta" : {
+                                "globalKey" : "54140007",
+                                "externalKey" : "referenceEntity"
                               }
                             },
                             "referenceObligation" : [ {
@@ -352,333 +261,424 @@
                                 "productIdentifier" : [ {
                                   "value" : {
                                     "identifier" : {
+                                      "value" : "8G836JAF2",
                                       "meta" : {
                                         "scheme" : "http://www.fpml.org/spec/2003/instrument-id-RED-pair-1-0"
-                                      },
-                                      "value" : "8G836JAF2"
+                                      }
                                     },
+                                    "source" : "Other",
                                     "meta" : {
                                       "globalKey" : "1165f83f"
-                                    },
-                                    "source" : "OTHER"
+                                    }
                                   }
                                 } ],
-                                "securityType" : "DEBT"
+                                "securityType" : "Debt"
                               }
                             } ]
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "2fa76fbc"
-                        },
                         "transactedPrice" : {
                           "marketFixedRate" : 0.02
-                        }
-                      },
-                      "interestRatePayout" : [ {
-                        "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
-                        },
-                        "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
-                          "quantitySchedule" : {
-                            "address" : {
-                              "scope" : "DOCUMENT",
-                              "value" : "quantity-1"
-                            }
-                          }
-                        },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c47"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "20"
-                          },
-                          "firstPeriodStartDate" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3ec8d4"
-                              },
-                              "unadjustedDate" : "2009-03-20"
-                            },
-                            "meta" : {
-                              "globalKey" : "3ec8d4"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "28c1032d"
-                          }
                         },
                         "meta" : {
-                          "globalKey" : "6afbe26c"
-                        },
-                        "paymentDates" : {
-                          "firstPaymentDate" : "2009-06-20",
-                          "meta" : {
-                            "globalKey" : "8aa3e742"
-                          },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          }
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                          "globalKey" : "2fa76fbc"
                         }
-                      } ],
+                      },
                       "meta" : {
-                        "globalKey" : "1fd4e030"
+                        "globalKey" : "a7b3d32c"
                       }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3ef194"
-                        },
-                        "unadjustedDate" : "2014-06-20"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "cd310a25"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "cd310a25"
+                }
+              },
+              "tradeLot" : [ {
+                "priceQuantity" : [ {
+                  "price" : [ {
+                    "value" : {
+                      "value" : 0.01,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
                       },
-                      "meta" : {
-                        "globalKey" : "3ef194"
+                      "perUnitOf" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "c5befd88"
+                  }
+                }, {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 5000000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
                       }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "280b774f"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "10df2e5c",
+                  "externalReference" : "party2"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "f6a6cc60",
+                  "externalReference" : "party1"
+                }
+              } ]
+            },
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
+              },
+              "meta" : {
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "5493001RKR55V4X61F71",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "d0f863bc"
+                }
+              } ],
+              "name" : {
+                "value" : "Bank X"
+              },
+              "businessUnit" : [ {
+                "name" : "New York Office",
+                "contactInformation" : {
+                  "address" : [ {
+                    "street" : [ "123 Park Avenue" ],
+                    "city" : "New York",
+                    "state" : "NY",
+                    "country" : {
+                      "value" : "US"
+                    },
+                    "postalCode" : "10017"
+                  } ]
+                },
+                "meta" : {
+                  "globalKey" : "e15b99b0",
+                  "externalKey" : "branch1"
+                }
+              }, {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "person123"
+                    },
+                    "meta" : {
+                      "globalKey" : "32d9e6bd"
+                    }
+                  }
+                } ],
+                "firstName" : "person",
+                "meta" : {
+                  "globalKey" : "140b1888",
+                  "externalKey" : "broker"
+                }
+              }, {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "person456"
+                    },
+                    "meta" : {
+                      "globalKey" : "32d9f260"
                     }
-                  },
+                  }
+                } ],
+                "firstName" : "person",
+                "meta" : {
+                  "globalKey" : "140b242b",
+                  "externalKey" : "trader"
+                }
+              } ],
+              "contactInformation" : {
+                "address" : [ {
+                  "country" : {
+                    "value" : "GB"
+                  }
+                } ]
+              },
+              "meta" : {
+                "globalKey" : "10df2e5c",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
                   "meta" : {
-                    "globalKey" : "940736c9"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "globalKey" : "940736c9"
+                  "globalKey" : "8ffabe4b"
                 }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
               },
-              "tradeLot" : [ {
-                "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "1f273178"
-                  },
-                  "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 0.01,
-                      "perUnitOf" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "1a10e2d1"
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 5000000
-                    }
-                  } ]
-                } ]
-              } ]
-            },
-            "tradeDate" : {
               "meta" : {
-                "globalKey" : "3ed88c"
-              },
-              "value" : "2011-02-12"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300IB5Q45JGNPND22",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "12345678901234567890123456789012"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e774"
                 }
               } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
-                },
-                "value" : "FCHUXIINML"
+              "name" : {
+                "value" : "XYZ Bank"
               },
               "meta" : {
-                "globalKey" : "1551a427"
-              },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
+                "globalKey" : "61a07317",
+                "externalKey" : "executing_agent"
+              }
             }, {
-              "assignedIdentifier" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "549300IB5Q45JGNPND11",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "12345678901234567890123456789012"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e754"
                 }
               } ],
-              "issuer" : {
+              "name" : {
+                "value" : "SEFCo LLC"
+              },
+              "meta" : {
+                "globalKey" : "ae0d40b7",
+                "externalKey" : "venue"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
+              },
+              "meta" : {
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "1031234567"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "WorldWide Trade Repository"
               },
               "meta" : {
-                "globalKey" : "f6e91d86"
+                "globalKey" : "4ba4fb38",
+                "externalKey" : "original_sdr"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "f6a6cc60",
+                "externalReference" : "party1"
+              },
+              "role" : "ClearingOrganization",
+              "ownershipPartyReference" : {
+                "globalReference" : "f6a6cc60",
+                "externalReference" : "party1"
+              }
+            } ],
+            "account" : [ {
+              "accountNumber" : {
+                "value" : "123",
+                "meta" : {
+                  "scheme" : "http://bankx.com/accountId"
+                }
+              },
+              "servicingParty" : {
+                "globalReference" : "10df2e5c",
+                "externalReference" : "party2"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
+              "meta" : {
+                "globalKey" : "c7753bbe",
+                "externalKey" : "client-account"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "4ae7df8f"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "c11af7da"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "611719a0"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "11ff226e"
-                }
-              },
               "quantity" : {
+                "value" : 1000,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "f6a6cc60",
+                  "externalReference" : "party1"
                 },
-                "value" : 1000
+                "receiverPartyReference" : {
+                  "globalReference" : "10df2e5c",
+                  "externalReference" : "party2"
+                }
               },
               "settlementDate" : {
+                "unadjustedDate" : "2009-03-28",
                 "adjustedDate" : {
+                  "value" : "2009-03-30",
                   "meta" : {
                     "globalKey" : "3ec8de"
-                  },
-                  "value" : "2009-03-30"
-                },
-                "unadjustedDate" : "2009-03-28"
-              },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
-              }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "2002-01-05",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_AGREEMENT",
-                "masterAgreementType" : {
-                  "value" : "ISDA_MASTER"
+                  }
                 }
               },
-              "vintage" : 1992
-            },
-            "meta" : {
-              "globalKey" : "4f2097d4"
-            }
-          }, {
-            "agreementDate" : "2002-01-07",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "ISDA_2003_CREDIT_NORTH_AMERICAN"
-                }
-              }
-            },
-            "meta" : {
-              "globalKey" : "5d7949e5"
-            }
-          }, {
-            "agreementDate" : "2015-01-04",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CREDIT_SUPPORT_AGREEMENT"
-              }
-            },
-            "meta" : {
-              "globalKey" : "984ae6d0"
-            }
-          }, {
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "CONFIRMATION",
-                "contractualMatrix" : [ {
-                  "matrixTerm" : {
-                    "value" : "STANDARD_NORTH_AMERICAN_CORPORATE"
-                  },
-                  "matrixType" : {
-                    "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-                  }
-                } ]
+              "transferExpression" : {
+                "priceTransfer" : "Upfront"
               }
             },
             "meta" : {
-              "globalKey" : "80f11ad5"
+              "globalKey" : "ebfa433a"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "902724c9"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "BANKX0001",
+      "meta" : {
+        "scheme" : "http://www.bankx.com/msg_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "BANKX"
+    },
+    "sentTo" : [ {
+      "value" : "SDR01"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2011-03-04T16:42:16Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2011-02-04T16:20:47Z",
-    "qualification" : "EXECUTION_DATE_TIME"
+    "qualification" : "executionDateTime"
   }, {
     "dateTime" : "2011-02-04T16:20:52Z",
-    "qualification" : "CLEARING_RECEIPT_DATE_TIME"
+    "qualification" : "clearingReceiptDateTime"
   }, {
     "dateTime" : "2011-02-04T16:21:27Z",
-    "qualification" : "CLEARING_DATE_TIME"
-  } ]
+    "qualification" : "clearingDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "BANKX0001"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "3ce1279d"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "a8c65d56"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-partial-termination-xccy-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-partial-termination-xccy-swap.json
index 5436c4b17b..1003a8078e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-partial-termination-xccy-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-partial-termination-xccy-swap.json
@@ -1,175 +1,192 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "SEF005"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "918f1d81"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.bankx.com/msg_id"
-      },
-      "value" : "SEF005"
-    },
-    "sentBy" : {
-      "value" : "BANKX"
-    },
-    "sentTo" : [ {
-      "value" : "SDR01"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "675071de"
-  },
   "proposedEvent" : {
-    "effectiveDate" : "2011-06-03",
     "eventDate" : "2011-06-01",
+    "effectiveDate" : "2011-06-03",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "cd80cbde"
-          },
-          "trade" : {
+      "primitiveInstruction" : {
+        "quantityChange" : {
+          "change" : [ {
+            "quantity" : [ {
+              "value" : {
+                "value" : 4000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
+              }
+            } ],
             "meta" : {
-              "globalKey" : "cd80cbde"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
+              "globalKey" : "9326c48e"
+            }
+          }, {
+            "quantity" : [ {
+              "value" : {
+                "value" : 400000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "JPY"
+                  }
+                }
+              },
               "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "59bab2e9"
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "237b44c1"
+            }
+          } ],
+          "direction" : "Replace"
+        },
+        "transfer" : {
+          "transferState" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 6000000.00,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
-              "name" : {
-                "value" : "Bank X"
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "619cff8d",
+                  "externalReference" : "party2"
+                },
+                "receiverPartyReference" : {
+                  "globalReference" : "117b5169",
+                  "externalReference" : "party1"
+                }
               },
-              "partyId" : [ {
-                "identifier" : {
+              "settlementDate" : {
+                "adjustedDate" : {
+                  "value" : "2011-06-03",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "5493001RKR55V4X61F71"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "d0f863bc"
+                    "globalKey" : "3ed983"
+                  }
                 }
-              } ],
-              "person" : [ {
-                "firstName" : "jjone",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "b793baa7"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "jjones"
-                    },
-                    "meta" : {
-                      "globalKey" : "baeb8c0d"
-                    }
+              },
+              "transferExpression" : {
+                "priceTransfer" : "Upfront"
+              }
+            },
+            "meta" : {
+              "globalKey" : "19784bc7"
+            }
+          }, {
+            "transfer" : {
+              "quantity" : {
+                "value" : 600000000.00,
+                "unit" : {
+                  "currency" : {
+                    "value" : "JPY"
                   }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "b8c6cb0d"
+                }
               },
-              "name" : {
-                "value" : "Bank Y"
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "117b5169",
+                  "externalReference" : "party1"
+                },
+                "receiverPartyReference" : {
+                  "globalReference" : "619cff8d",
+                  "externalReference" : "party2"
+                }
               },
-              "partyId" : [ {
-                "identifier" : {
+              "settlementDate" : {
+                "adjustedDate" : {
+                  "value" : "2011-06-03",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B46"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f8"
+                    "globalKey" : "3ed983"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
               },
-              "name" : {
-                "value" : "Up&Atem"
+              "transferExpression" : {
+                "priceTransfer" : "Upfront"
+              }
+            },
+            "meta" : {
+              "globalKey" : "cf5b4074"
+            }
+          }, {
+            "transfer" : {
+              "quantity" : {
+                "value" : 12345.00,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "619cff8d",
+                  "externalReference" : "party2"
                 },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
+                "receiverPartyReference" : {
+                  "globalReference" : "117b5169",
+                  "externalReference" : "party1"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
               },
-              "partyId" : [ {
-                "identifier" : {
+              "settlementDate" : {
+                "adjustedDate" : {
+                  "value" : "2011-06-03",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
+                    "globalKey" : "3ed983"
+                  }
+                }
+              },
+              "transferExpression" : {
+                "priceTransfer" : "Termination"
+              }
+            },
+            "meta" : {
+              "globalKey" : "8f4173c0"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "1031234567",
                 "meta" : {
-                  "globalKey" : "e213e7d7"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "59bab2e9"
               },
-              "partyReference" : {
-                "externalReference" : "clearing-svc",
-                "globalReference" : "611719a0"
+              "assignedIdentifier" : [ {
+                "identifier" : {
+                  "value" : "712345678901234567890123456789013",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "88f03f4e"
               },
-              "role" : "CLEARING_ORGANIZATION"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2011-02-12",
+              "meta" : {
+                "globalKey" : "3ed88c"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "59bab2e9"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "b8c6cb0d"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -180,55 +197,49 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "notl1",
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "notl1"
                           }
                         },
                         "principalPayment" : {
-                          "finalPayment" : true,
                           "initialPayment" : true,
+                          "finalPayment" : true,
                           "intermediatePayment" : false,
                           "meta" : {
                             "globalKey" : "12a6f5"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "814e2ae6"
-                              },
-                              "meta" : {
-                                "globalKey" : "eb13047c"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "214e084d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28c89"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "14"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2011-02-06",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -237,20 +248,17 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec0f763e"
-                              },
-                              "unadjustedDate" : "2011-02-06"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec0f763e"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "f51d3619"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2015-02-06",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "GBLO"
@@ -260,84 +268,92 @@
                                     "value" : "USNY"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "primaryBusinessCenters",
-                                    "globalKey" : "814e2ae6"
+                                    "globalKey" : "814e2ae6",
+                                    "externalKey" : "primaryBusinessCenters"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "57d0de37"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "c15a1c71"
-                              },
-                              "unadjustedDate" : "2015-02-06"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "c15a1c71"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "74805f75"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4fa45fc6"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "814e2ae6"
+                                "globalReference" : "814e2ae6",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "959"
+                              "globalKey" : "18a9b"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 6
+                            "rollConvention" : "14"
+                          },
+                          "meta" : {
+                            "globalKey" : "fbb27399",
+                            "externalKey" : "floatingCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "814e2ae6",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "eb13047c"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "214e084d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "7a04f180"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "f51d3619"
+                            "globalReference" : "fbb27399",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "131ae8a2"
+                              "globalKey" : "eff6d356"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -346,91 +362,88 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "resetDates",
-                              "globalReference" : "dbde664a"
+                              "globalReference" : "a5aeeeb8",
+                              "externalReference" : "resetDates"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "resetDates",
-                            "globalKey" : "dbde664a"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "107"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "814e2ae6"
+                                "globalReference" : "814e2ae6",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "959"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "meta" : {
+                            "globalKey" : "a5aeeeb8",
+                            "externalKey" : "resetDates"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "8ba517dd"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "externalKey" : "notl2",
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0",
+                            "externalKey" : "notl2"
                           }
                         },
                         "principalPayment" : {
-                          "finalPayment" : true,
                           "initialPayment" : true,
+                          "finalPayment" : true,
                           "intermediatePayment" : false,
                           "meta" : {
                             "globalKey" : "12a6f5"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "814e2ae6"
-                              },
-                              "meta" : {
-                                "globalKey" : "eb13047c"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "214e084d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "2b8fa"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "14"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30E/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2011-02-06",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -439,388 +452,375 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec0f763e"
-                              },
-                              "unadjustedDate" : "2011-02-06"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec0f763e"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "162f145e"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2011-02-06",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "primaryBusinessCenters",
-                                    "globalReference" : "814e2ae6"
+                                    "globalReference" : "814e2ae6",
+                                    "externalReference" : "primaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "eb13047c"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "214e084d"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "133f9387"
-                              },
-                              "unadjustedDate" : "2011-02-06"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "133f9387"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "30E/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "dbb168ec"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4fa46135"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "814e2ae6"
+                                "globalReference" : "814e2ae6",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
                             "meta" : {
-                              "globalKey" : "ac8"
+                              "globalKey" : "1794a"
                             },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
+                            "rollConvention" : "14"
+                          },
+                          "meta" : {
+                            "globalKey" : "ef914f2",
+                            "externalKey" : "fixedCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                              "globalKey" : "78"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "814e2ae6",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "eb13047c"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "214e084d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "85fff0af"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "c9daff00"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "753703a1"
+                        "globalKey" : "20a2dc1d"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "753703a1"
+                    "globalKey" : "20a2dc1d"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "753703a1"
+                  "globalKey" : "20a2dc1d"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "cf003e1f"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d08"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-LIBOR-BBA"
-                        },
-                        "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6
-                        }
-                      }
-                    }
-                  },
                   "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 10000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 10000000.00
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "26516b87"
-                  },
-                  "price" : [ {
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "price-1"
+                        "value" : "quantity-1"
                       } ]
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-LIBOR-BBA"
+                        },
+                        "indexTenor" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
                     },
+                    "meta" : {
+                      "globalKey" : "8280320a"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "a0325171"
+                  }
+                }, {
+                  "price" : [ {
                     "value" : {
+                      "value" : 0.06,
                       "unit" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "value" : 0.06,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 1000000000.00,
                       "unit" : {
                         "currency" : {
                           "value" : "JPY"
                         }
-                      },
-                      "value" : 1000000000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "a3dc0559"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "117b5169",
+                  "externalReference" : "party1"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "619cff8d",
+                  "externalReference" : "party2"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ed88c"
-              },
-              "value" : "2011-02-12"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "5493001RKR55V4X61F71",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "712345678901234567890123456789013"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "d0f863bc"
                 }
               } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-                },
-                "value" : "1031234567"
-              },
-              "meta" : {
-                "globalKey" : "f07eae4e"
-              },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
-          }
-        }
-      },
-      "primitiveInstruction" : {
-        "quantityChange" : {
-          "change" : [ {
-            "meta" : {
-              "globalKey" : "25c771b2"
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
-                } ]
+              "name" : {
+                "value" : "Bank X"
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
+              "businessUnit" : [ {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "jjones"
+                    },
+                    "meta" : {
+                      "globalKey" : "baeb8c0d"
+                    }
                   }
-                },
-                "value" : 4000000
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "cf989f1f"
-            },
-            "quantity" : [ {
+                } ],
+                "firstName" : "jjone",
+                "meta" : {
+                  "globalKey" : "b793baa7",
+                  "externalKey" : "trader"
+                }
+              } ],
               "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
-                } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "JPY"
-                  }
-                },
-                "value" : 400000000
+                "globalKey" : "117b5169",
+                "externalKey" : "party1"
               }
-            } ]
-          } ],
-          "direction" : "REPLACE"
-        },
-        "transfer" : {
-          "transferState" : [ {
-            "meta" : {
-              "globalKey" : "67775475"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "b8c6cb0d"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "59bab2e9"
-                }
-              },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B46",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
-                "value" : 6000000.00
-              },
-              "settlementDate" : {
-                "adjustedDate" : {
-                  "meta" : {
-                    "globalKey" : "3ed983"
-                  },
-                  "value" : "2011-06-03"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45f8"
                 }
+              } ],
+              "name" : {
+                "value" : "Bank Y"
               },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
+              "meta" : {
+                "globalKey" : "619cff8d",
+                "externalKey" : "party2"
               }
-            }
-          }, {
-            "meta" : {
-              "globalKey" : "abd17a8"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "59bab2e9"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "b8c6cb0d"
-                }
-              },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "JPY"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
-                "value" : 600000000.00
-              },
-              "settlementDate" : {
-                "adjustedDate" : {
-                  "meta" : {
-                    "globalKey" : "3ed983"
-                  },
-                  "value" : "2011-06-03"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "8ffabe4b"
                 }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
               },
-              "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
+              "meta" : {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
               }
-            }
-          }, {
-            "meta" : {
-              "globalKey" : "79cfc7c8"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "b8c6cb0d"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "59bab2e9"
-                }
-              },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
-                "value" : 12345.00
-              },
-              "settlementDate" : {
-                "adjustedDate" : {
-                  "meta" : {
-                    "globalKey" : "3ed983"
-                  },
-                  "value" : "2011-06-03"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
                 }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
               },
-              "transferExpression" : {
-                "priceTransfer" : "TERMINATION"
+              "meta" : {
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "f6a6cc60",
+                "externalReference" : "clearing-svc"
+              },
+              "role" : "ClearingOrganization",
+              "ownershipPartyReference" : {
+                "globalReference" : "117b5169",
+                "externalReference" : "party1"
               }
+            } ],
+            "meta" : {
+              "globalKey" : "1cdc4c76"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "1cdc4c76"
+          }
         }
       }
     } ]
   },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "SEF005",
+      "meta" : {
+        "scheme" : "http://www.bankx.com/msg_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "BANKX"
+    },
+    "sentTo" : [ {
+      "value" : "SDR01"
+    } ]
+  },
   "timestamp" : [ {
     "dateTime" : "2011-06-01T10:13:07Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2011-06-01T10:12:34Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "SEF005"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "918f1d81"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "736582fc"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-partial-termination-xccy.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-partial-termination-xccy.json
index 016af87490..2ab27aee95 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-partial-termination-xccy.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-partial-termination-xccy.json
@@ -1,195 +1,122 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "SEF005"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "918f1d81"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.bankx.com/msg_id"
-      },
-      "value" : "SEF005"
-    },
-    "sentBy" : {
-      "value" : "BANKX"
-    },
-    "sentTo" : [ {
-      "value" : "SDR01"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "8fc05529"
-  },
   "proposedEvent" : {
-    "effectiveDate" : "2011-06-03",
     "eventDate" : "2011-06-01",
+    "effectiveDate" : "2011-06-03",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "79b14d14"
-          },
-          "trade" : {
-            "meta" : {
-              "globalKey" : "79b14d14"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "59bab2e9"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "5493001RKR55V4X61F71"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "d0f863bc"
-                }
-              } ],
-              "person" : [ {
-                "firstName" : "jjone",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "b793baa7"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "jjones"
-                    },
-                    "meta" : {
-                      "globalKey" : "baeb8c0d"
-                    }
+      "primitiveInstruction" : {
+        "quantityChange" : {
+          "change" : [ {
+            "quantity" : [ {
+              "value" : {
+                "value" : 15000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "EUR"
                   }
-                } ]
-              } ]
-            }, {
+                }
+              },
               "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "b8c6cb0d"
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-2"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "a104e1c2"
+            }
+          }, {
+            "quantity" : [ {
+              "value" : {
+                "value" : 13500000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
-              "name" : {
-                "value" : "Bank Y"
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "3cb1ee97"
+            }
+          } ],
+          "direction" : "Replace"
+        },
+        "transfer" : {
+          "transferState" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 12345.00,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B46"
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "117b5169",
+                  "externalReference" : "party1"
                 },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f8"
+                "receiverPartyReference" : {
+                  "globalReference" : "619cff8d",
+                  "externalReference" : "party2"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party3",
-                "globalKey" : "79745f87"
-              },
-              "name" : {
-                "value" : "Bank Z"
               },
-              "partyId" : [ {
-                "identifier" : {
+              "settlementDate" : {
+                "adjustedDate" : {
+                  "value" : "2011-06-03",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300ZFFF6TMXQVF884"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "560bc2f1"
+                    "globalKey" : "3ed983"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
-              },
-              "name" : {
-                "value" : "Up&Atem"
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
+              "transferExpression" : {
+                "priceTransfer" : "Termination"
+              }
+            },
+            "meta" : {
+              "globalKey" : "8d8d0f80"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "1031234567",
                 "meta" : {
-                  "globalKey" : "8ffabe4b"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
               },
-              "name" : {
-                "value" : "ClearItAll"
-              },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "712345678901234567890123456789012",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "59bab2e9"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing-svc",
-                "globalReference" : "611719a0"
+              } ],
+              "meta" : {
+                "globalKey" : "88f03f2f"
               },
-              "role" : "CLEARING_ORGANIZATION"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2011-02-12",
+              "meta" : {
+                "globalKey" : "3ed88c"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "b8c6cb0d"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "59bab2e9"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -200,35 +127,32 @@
                     "payout" : {
                       "forwardPayout" : [ {
                         "settlementTerms" : {
-                          "meta" : {
-                            "globalKey" : "3e8b15"
-                          },
                           "settlementDate" : {
+                            "valueDate" : "2001-12-21",
                             "meta" : {
                               "globalKey" : "3e8b15"
-                            },
-                            "valueDate" : "2001-12-21"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "3e8b15"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "90c7297"
-                        },
                         "underlier" : {
                           "foreignExchange" : {
                             "exchangedCurrency1" : {
                               "payerReceiver" : {
-                                "payer" : "PARTY_1",
-                                "receiver" : "PARTY_2"
+                                "payer" : "Party1",
+                                "receiver" : "Party2"
                               },
                               "priceQuantity" : {
-                                "meta" : {
-                                  "globalKey" : "0"
-                                },
                                 "quantitySchedule" : {
                                   "address" : {
                                     "scope" : "DOCUMENT",
                                     "value" : "quantity-1"
                                   }
+                                },
+                                "meta" : {
+                                  "globalKey" : "0"
                                 }
                               },
                               "meta" : {
@@ -237,18 +161,18 @@
                             },
                             "exchangedCurrency2" : {
                               "payerReceiver" : {
-                                "payer" : "PARTY_2",
-                                "receiver" : "PARTY_1"
+                                "payer" : "Party2",
+                                "receiver" : "Party1"
                               },
                               "priceQuantity" : {
-                                "meta" : {
-                                  "globalKey" : "0"
-                                },
                                 "quantitySchedule" : {
                                   "address" : {
                                     "scope" : "DOCUMENT",
                                     "value" : "quantity-2"
                                   }
+                                },
+                                "meta" : {
+                                  "globalKey" : "0"
                                 }
                               },
                               "meta" : {
@@ -259,6 +183,9 @@
                           "meta" : {
                             "globalKey" : "c086df02"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "90c7297"
                         }
                       } ],
                       "meta" : {
@@ -276,185 +203,258 @@
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "42938e34"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.9,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.9,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "priceType" : "EXCHANGE_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "ExchangeRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 20000000,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
-                      },
-                      "value" : 20000000
-                    }
-                  }, {
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  }, {
                     "value" : {
+                      "value" : 18000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 18000000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "fde384c"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "619cff8d",
+                  "externalReference" : "party2"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "117b5169",
+                  "externalReference" : "party1"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ed88c"
-              },
-              "value" : "2011-02-12"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "5493001RKR55V4X61F71",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "712345678901234567890123456789012"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "d0f863bc"
                 }
               } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-                },
-                "value" : "1031234567"
-              },
-              "meta" : {
-                "globalKey" : "f07e39ef"
-              },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
-          }
-        }
-      },
-      "primitiveInstruction" : {
-        "quantityChange" : {
-          "change" : [ {
-            "meta" : {
-              "globalKey" : "99d6ddfe"
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-2"
-                } ]
+              "name" : {
+                "value" : "Bank X"
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "EUR"
+              "businessUnit" : [ {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "jjones"
+                    },
+                    "meta" : {
+                      "globalKey" : "baeb8c0d"
+                    }
                   }
-                },
-                "value" : 15000000
-              }
-            } ]
-          }, {
-            "meta" : {
-              "globalKey" : "969a6289"
-            },
-            "quantity" : [ {
+                } ],
+                "firstName" : "jjone",
+                "meta" : {
+                  "globalKey" : "b793baa7",
+                  "externalKey" : "trader"
+                }
+              } ],
               "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
-                } ]
-              },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
+                "globalKey" : "117b5169",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B46",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
-                "value" : 13500000
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45f8"
+                }
+              } ],
+              "name" : {
+                "value" : "Bank Y"
+              },
+              "meta" : {
+                "globalKey" : "619cff8d",
+                "externalKey" : "party2"
               }
-            } ]
-          } ],
-          "direction" : "REPLACE"
-        },
-        "transfer" : {
-          "transferState" : [ {
-            "meta" : {
-              "globalKey" : "792f8408"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "59bab2e9"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300ZFFF6TMXQVF884",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "receiverPartyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "b8c6cb0d"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "560bc2f1"
                 }
+              } ],
+              "name" : {
+                "value" : "Bank Z"
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
+              "meta" : {
+                "globalKey" : "78512247",
+                "externalKey" : "party3"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
-                "value" : 12345.00
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "8ffabe4b"
+                }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
               },
-              "settlementDate" : {
-                "adjustedDate" : {
+              "meta" : {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
                   "meta" : {
-                    "globalKey" : "3ed983"
-                  },
-                  "value" : "2011-06-03"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
                 }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
               },
-              "transferExpression" : {
-                "priceTransfer" : "TERMINATION"
+              "meta" : {
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
               }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "f6a6cc60",
+                "externalReference" : "clearing-svc"
+              },
+              "role" : "ClearingOrganization",
+              "ownershipPartyReference" : {
+                "globalReference" : "117b5169",
+                "externalReference" : "party1"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "97125cc2"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "97125cc2"
+          }
         }
       }
     } ]
   },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "SEF005",
+      "meta" : {
+        "scheme" : "http://www.bankx.com/msg_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "BANKX"
+    },
+    "sentTo" : [ {
+      "value" : "SDR01"
+    } ]
+  },
   "timestamp" : [ {
     "dateTime" : "2011-06-01T10:13:07Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2011-06-01T10:12:34Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "SEF005"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "918f1d81"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "5f71a0a9"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-partial-termination.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-partial-termination.json
index 15f69f3873..fc9ae407e8 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-partial-termination.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-partial-termination.json
@@ -1,250 +1,171 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "SEF005"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "918f1d81"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.bankx.com/msg_id"
-      },
-      "value" : "SEF005"
-    },
-    "sentBy" : {
-      "value" : "BANKX"
-    },
-    "sentTo" : [ {
-      "value" : "SDR01"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "f156724c"
-  },
   "proposedEvent" : {
-    "effectiveDate" : "2011-06-03",
     "eventDate" : "2011-06-01",
+    "effectiveDate" : "2011-06-03",
     "instruction" : [ {
-      "before" : {
-        "value" : {
-          "meta" : {
-            "globalKey" : "c25adb57"
-          },
-          "trade" : {
-            "meta" : {
-              "globalKey" : "c25adb57"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "59bab2e9"
+      "primitiveInstruction" : {
+        "quantityChange" : {
+          "change" : [ {
+            "quantity" : [ {
+              "value" : {
+                "value" : 5000000,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
-              "name" : {
-                "value" : "Bank X"
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "quantity-1"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "280b774f"
+            }
+          } ],
+          "direction" : "Replace"
+        },
+        "transfer" : {
+          "transferState" : [ {
+            "transfer" : {
+              "quantity" : {
+                "value" : 12345.00,
+                "unit" : {
+                  "currency" : {
+                    "value" : "USD"
+                  }
+                }
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "5493001RKR55V4X61F71"
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "117b5169",
+                  "externalReference" : "party1"
                 },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "d0f863bc"
+                "receiverPartyReference" : {
+                  "globalReference" : "619cff8d",
+                  "externalReference" : "party2"
                 }
-              } ],
-              "person" : [ {
-                "firstName" : "jjone",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "b793baa7"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "jjones"
-                    },
-                    "meta" : {
-                      "globalKey" : "baeb8c0d"
-                    }
-                  }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "b8c6cb0d"
-              },
-              "name" : {
-                "value" : "Bank Y"
               },
-              "partyId" : [ {
-                "identifier" : {
+              "settlementDate" : {
+                "adjustedDate" : {
+                  "value" : "2011-06-03",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300O5MFEP1XJ40B46"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "956c45f8"
+                    "globalKey" : "3ed983"
+                  }
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
-              },
-              "name" : {
-                "value" : "Up&Atem"
               },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
+              "transferExpression" : {
+                "priceTransfer" : "Termination"
+              }
+            },
+            "meta" : {
+              "globalKey" : "8d8d0f80"
+            }
+          } ]
+        }
+      },
+      "before" : {
+        "value" : {
+          "trade" : {
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "1031234567",
                 "meta" : {
-                  "globalKey" : "8ffabe4b"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "712345678901234567890123456789012",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "59bab2e9"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing-svc",
-                "globalReference" : "611719a0"
+              } ],
+              "meta" : {
+                "globalKey" : "88f03f2f"
               },
-              "role" : "CLEARING_ORGANIZATION"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2011-02-12",
+              "meta" : {
+                "globalKey" : "3ed88c"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "59bab2e9"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "b8c6cb0d"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
-                  "productIdentifier" : [ {
-                    "value" : {
-                      "identifier" : {
-                        "value" : "SWI-ST-USD-IRS"
-                      },
-                      "meta" : {
-                        "globalKey" : "cc86674f"
-                      },
-                      "source" : "OTHER"
-                    }
-                  } ],
                   "productTaxonomy" : [ {
                     "primaryAssetClass" : {
-                      "value" : "INTEREST_RATE"
+                      "value" : "InterestRate"
                     }
                   }, {
                     "source" : "ISDA",
                     "value" : {
                       "name" : {
+                        "value" : "InterestRate:IRSwap:FixedFloat",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                        },
-                        "value" : "InterestRate:IRSwap:FixedFloat"
+                        }
                       }
                     }
                   }, {
                     "source" : "ISDA",
                     "productQualifier" : "InterestRate_IRSwap_FixedFloat"
                   } ],
+                  "productIdentifier" : [ {
+                    "value" : {
+                      "identifier" : {
+                        "value" : "SWI-ST-USD-IRS"
+                      },
+                      "source" : "Other",
+                      "meta" : {
+                        "globalKey" : "cc86674f"
+                      }
+                    }
+                  } ],
                   "economicTerms" : {
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "4fc9cca"
-                              },
-                              "meta" : {
-                                "globalKey" : "eb13047c"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "214e084d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d23"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "8"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2011-02-08",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -253,20 +174,17 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec0f7dc0"
-                              },
-                              "unadjustedDate" : "2011-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec0f7dc0"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "32470fa3"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2016-02-08",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
@@ -274,84 +192,92 @@
                                     "value" : "USLA"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "primaryBusinessCenters",
-                                    "globalKey" : "4fc9cca"
+                                    "globalKey" : "4fc9cca",
+                                    "externalKey" : "primaryBusinessCenters"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "9885f05b"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "d306c6d3"
-                              },
-                              "unadjustedDate" : "2016-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "d306c6d3"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "b110bb4e"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4fa45fc3"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "4fc9cca"
+                                "globalReference" : "4fc9cca",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "956"
+                              "globalKey" : "204f"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                            "rollConvention" : "8"
+                          },
+                          "meta" : {
+                            "globalKey" : "7ba59ae9",
+                            "externalKey" : "floatingCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "4fc9cca",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "eb13047c"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "214e084d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "db523fbd"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "32470fa3"
+                            "globalReference" : "7ba59ae9",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "131ae8a2"
+                              "globalKey" : "eff6d356"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -360,82 +286,79 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "resetDates",
-                              "globalReference" : "dbde6647"
+                              "globalReference" : "6fc3cf5",
+                              "externalReference" : "resetDates"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "resetDates",
-                            "globalKey" : "dbde6647"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "4fc9cca"
+                                "globalReference" : "4fc9cca",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "meta" : {
+                            "globalKey" : "6fc3cf5",
+                            "externalKey" : "resetDates"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "9164ce3c"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "4fc9cca"
-                              },
-                              "meta" : {
-                                "globalKey" : "eb13047c"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "214e084d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d80"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "8"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30E/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2011-02-08",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -444,310 +367,387 @@
                               },
                               "meta" : {
                                 "globalKey" : "ec0f7dc0"
-                              },
-                              "unadjustedDate" : "2011-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ec0f7dc0"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "ab709858"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2016-02-08",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "primaryBusinessCenters",
-                                    "globalReference" : "4fc9cca"
+                                    "globalReference" : "4fc9cca",
+                                    "externalReference" : "primaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "eb13047c"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "214e084d"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "58821cc5"
-                              },
-                              "unadjustedDate" : "2016-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "58821cc5"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "30E/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "43fa7ecc"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4fa45fc6"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "4fc9cca"
+                                "globalReference" : "4fc9cca",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "959"
+                              "globalKey" : "2b92"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 6
+                            "rollConvention" : "8"
+                          },
+                          "meta" : {
+                            "globalKey" : "da8c707a",
+                            "externalKey" : "fixedCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "4fc9cca",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "eb13047c"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "214e084d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "7a04f180"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "2e11b2a4"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "46e1389a"
+                        "globalKey" : "24eaf5e0"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "23519f07"
+                    "globalKey" : "8f55b995"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "23519f07"
+                  "globalKey" : "8f55b995"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "aaeec36f"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-LIBOR-BBA"
-                        },
-                        "indexTenor" : {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 7500000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD",
                           "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                          }
                         }
                       }
-                    }
-                  },
-                  "quantity" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-LIBOR-BBA"
+                        },
+                        "indexTenor" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                            "globalKey" : "aa"
+                          }
                         }
                       },
-                      "value" : 7500000.00
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "4b440bfb"
                   },
+                  "meta" : {
+                    "globalKey" : "90ac0ddb"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0253,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "value" : 0.0253,
                       "perUnitOf" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 7500000.00,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
-                      },
-                      "value" : 7500000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "1d3d7365"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "117b5169",
+                  "externalReference" : "party1"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "619cff8d",
+                  "externalReference" : "party2"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3ed88c"
-              },
-              "value" : "2011-02-12"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "5493001RKR55V4X61F71",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "712345678901234567890123456789012"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "d0f863bc"
                 }
               } ],
-              "issuer" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
-                },
-                "value" : "1031234567"
-              },
-              "meta" : {
-                "globalKey" : "f07e39ef"
-              },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
-          }
-        }
-      },
-      "primitiveInstruction" : {
-        "quantityChange" : {
-          "change" : [ {
-            "meta" : {
-              "globalKey" : "1a10e2d1"
-            },
-            "quantity" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "quantity-1"
-                } ]
+              "name" : {
+                "value" : "Bank X"
               },
-              "value" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
+              "businessUnit" : [ {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "jjones"
+                    },
+                    "meta" : {
+                      "globalKey" : "baeb8c0d"
+                    }
                   }
-                },
-                "value" : 5000000
+                } ],
+                "firstName" : "jjone",
+                "meta" : {
+                  "globalKey" : "b793baa7",
+                  "externalKey" : "trader"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "117b5169",
+                "externalKey" : "party1"
               }
-            } ]
-          } ],
-          "direction" : "REPLACE"
-        },
-        "transfer" : {
-          "transferState" : [ {
-            "meta" : {
-              "globalKey" : "792f8408"
-            },
-            "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "59bab2e9"
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300O5MFEP1XJ40B46",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "receiverPartyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "b8c6cb0d"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "956c45f8"
                 }
+              } ],
+              "name" : {
+                "value" : "Bank Y"
               },
-              "quantity" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "USD"
+              "meta" : {
+                "globalKey" : "619cff8d",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
                   }
                 },
-                "value" : 12345.00
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "8ffabe4b"
+                }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
               },
-              "settlementDate" : {
-                "adjustedDate" : {
+              "meta" : {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
                   "meta" : {
-                    "globalKey" : "3ed983"
-                  },
-                  "value" : "2011-06-03"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
                 }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
               },
-              "transferExpression" : {
-                "priceTransfer" : "TERMINATION"
+              "meta" : {
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
               }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "f6a6cc60",
+                "externalReference" : "clearing-svc"
+              },
+              "role" : "ClearingOrganization",
+              "ownershipPartyReference" : {
+                "globalReference" : "117b5169",
+                "externalReference" : "party1"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "87641ddb"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "87641ddb"
+          }
         }
       }
     } ]
   },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "SEF005",
+      "meta" : {
+        "scheme" : "http://www.bankx.com/msg_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "BANKX"
+    },
+    "sentTo" : [ {
+      "value" : "SDR01"
+    } ]
+  },
   "timestamp" : [ {
     "dateTime" : "2011-06-01T10:13:07Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2011-06-01T10:12:34Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "SEF005"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "918f1d81"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "decdcde0"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex01-gas-swap-daily-delivery-prices-last.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex01-gas-swap-daily-delivery-prices-last.json
index 34eb55ea35..d1ef39b9b4 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex01-gas-swap-daily-delivery-prices-last.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex01-gas-swap-daily-delivery-prices-last.json
@@ -1,96 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "2fd3899b"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "a977e59e"
         }
       } ],
       "meta" : {
-        "globalKey" : "fb7fd677"
+        "globalKey" : "9598cc47"
       }
-    },
-    "meta" : {
-      "globalKey" : "2fd3899b"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.PartyB.com/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-06-01",
+      "meta" : {
+        "globalKey" : "3eb181"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -100,70 +49,104 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2006-07-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25a4ce2c"
-                },
-                "unadjustedDate" : "2006-07-01"
+                }
               },
               "meta" : {
                 "globalKey" : "25a4ce2c"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-07-31",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "25a53eca"
+                }
+              },
+              "meta" : {
+                "globalKey" : "25a53eca"
+              }
+            },
             "payout" : {
               "commodityPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
+                },
+                "pricingDates" : {
+                  "parametricDates" : {
+                    "dayType" : "Business",
+                    "dayDistribution" : "Last",
+                    "businessCenters" : {
+                      "commodityBusinessCalendar" : [ {
+                        "value" : "NYMEX-NATURAL-GAS"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "acc66859"
+                      }
+                    }
+                  }
                 },
                 "calculationPeriodDates" : {
                   "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
                     "meta" : {
-                      "externalKey" : "floatingLegCalculationPeriods",
-                      "globalKey" : "12601"
+                      "globalKey" : "11e9",
+                      "externalKey" : "floatingLegCalculationPeriods"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 1,
                     "balanceOfFirstPeriod" : false
                   },
                   "meta" : {
-                    "globalKey" : "12601"
+                    "globalKey" : "11e9"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "528b7cbe"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "6b379f36"
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
+                    },
+                    "dayType" : "Business"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -172,32 +155,12 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "meta" : {
                       "globalKey" : "a98752b1"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf9f"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
-                  }
-                },
-                "pricingDates" : {
-                  "parametricDates" : {
-                    "businessCenters" : {
-                      "commodityBusinessCalendar" : [ {
-                        "value" : "NYMEX-NATURAL-GAS"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "acc66859"
-                      }
-                    },
-                    "dayDistribution" : "LAST",
-                    "dayType" : "BUSINESS"
+                  "meta" : {
+                    "globalKey" : "ff6175f6"
                   }
                 },
                 "underlier" : {
@@ -210,41 +173,39 @@
                   "meta" : {
                     "globalKey" : "0"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "202d7348"
                 }
               } ],
               "fixedPricePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "fixedPrice" : {
-                  "price" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    }
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "e17aca77"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "6b379f36"
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
+                    },
+                    "dayType" : "Business"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -253,231 +214,270 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "meta" : {
                       "globalKey" : "a98752b1"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf9f"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "241ca179"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
                   "meta" : {
-                    "globalKey" : "3a4b88ab"
+                    "globalKey" : "ff6175f6"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "25a53eca"
+                "fixedPrice" : {
+                  "price" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2006-07-31"
-              },
+                "meta" : {
+                  "globalKey" : "6310740b"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "25a53eca"
+                "globalKey" : "d41ef9c3"
               }
             }
           },
           "meta" : {
-            "globalKey" : "3c13fb1d"
+            "globalKey" : "2efb24e5"
           }
         },
         "meta" : {
-          "globalKey" : "3c13fb1d"
+          "globalKey" : "2efb24e5"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "22f7394d"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 6.295,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 6.295,
-              "cashPrice" : {
-                "cashPriceType" : "FEE"
-              },
               "perUnitOf" : {
                 "capacityUnit" : "USMMBTU"
               },
-              "priceType" : "CASH_PRICE"
+              "priceType" : "CashPrice",
+              "cashPrice" : {
+                "cashPriceType" : "Fee"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 2500.0,
+              "unit" : {
+                "capacityUnit" : "USMMBTU"
+              },
+              "frequency" : {
+                "periodMultiplier" : 1,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "63"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
+            }
+          }, {
+            "value" : {
+              "value" : 77500.0,
+              "unit" : {
+                "capacityUnit" : "USMMBTU"
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-3"
+              } ]
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "70ac5839"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 2500.0,
               "unit" : {
                 "capacityUnit" : "USMMBTU"
               },
-              "value" : 2500.0,
               "frequency" : {
-                "meta" : {
-                  "globalKey" : "83d"
-                },
+                "periodMultiplier" : 1,
                 "period" : "D",
-                "periodMultiplier" : 1
+                "meta" : {
+                  "globalKey" : "63"
+                }
               }
-            }
-          }, {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-3"
+                "value" : "quantity-4"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 77500.0,
               "unit" : {
                 "capacityUnit" : "USMMBTU"
-              },
-              "value" : 77500.0
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "ed57726c"
-          },
+          } ],
           "observable" : {
             "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-1"
-                } ]
-              },
               "value" : {
                 "productIdentifier" : [ {
                   "value" : {
                     "identifier" : {
+                      "value" : "NATURAL GAS-HENRY HUB-NYMEX",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/commodity-reference-price-1-0"
-                      },
-                      "value" : "NATURAL GAS-HENRY HUB-NYMEX"
+                      }
                     },
+                    "source" : "ISDACRP",
                     "meta" : {
                       "globalKey" : "8ac8d504"
-                    },
-                    "source" : "ISDACRP"
+                    }
                   }
                 } ],
+                "priceQuoteType" : "Settlement",
                 "deliveryDateReference" : {
                   "deliveryNearby" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 1,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
                   }
-                },
-                "priceQuoteType" : "SETTLEMENT"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-1"
+                } ]
               }
             },
             "meta" : {
-              "globalKey" : "dd976f79"
+              "globalKey" : "d5556b8f"
             }
           },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-4"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "USMMBTU"
-              },
-              "value" : 2500.0,
-              "frequency" : {
-                "meta" : {
-                  "globalKey" : "83d"
-                },
-                "period" : "D",
-                "periodMultiplier" : 1
-              }
-            }
-          }, {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "USMMBTU"
-              },
-              "value" : 77500.0
-            }
-          } ]
+          "meta" : {
+            "globalKey" : "d84be710"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb181"
-      },
-      "value" : "2006-06-01"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "a977e59e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fb7fd677"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "cc9674c5"
+    }
+  },
+  "meta" : {
+    "globalKey" : "cc9674c5"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex02-gas-swap-prices-first-day.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex02-gas-swap-prices-first-day.json
index b5de110a86..ac1b933b59 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex02-gas-swap-prices-first-day.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex02-gas-swap-prices-first-day.json
@@ -1,96 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "dc802b5b"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "a977e59e"
         }
       } ],
       "meta" : {
-        "globalKey" : "fb7fd677"
+        "globalKey" : "9598cc47"
       }
-    },
-    "meta" : {
-      "globalKey" : "dc802b5b"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.PartyB.com/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-06-26",
+      "meta" : {
+        "globalKey" : "3eb19a"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -100,70 +49,96 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2006-09-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25a6aeac"
-                },
-                "unadjustedDate" : "2006-09-01"
+                }
               },
               "meta" : {
                 "globalKey" : "25a6aeac"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-09-30",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "25a71b89"
+                }
+              },
+              "meta" : {
+                "globalKey" : "25a71b89"
+              }
+            },
             "payout" : {
               "commodityPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
+                },
+                "pricingDates" : {
+                  "parametricDates" : {
+                    "dayType" : "Business",
+                    "dayDistribution" : "First"
+                  }
                 },
                 "calculationPeriodDates" : {
                   "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
                     "meta" : {
-                      "externalKey" : "floatingLegCalculationPeriods",
-                      "globalKey" : "12601"
+                      "globalKey" : "11e9",
+                      "externalKey" : "floatingLegCalculationPeriods"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 1,
                     "balanceOfFirstPeriod" : false
                   },
                   "meta" : {
-                    "globalKey" : "12601"
+                    "globalKey" : "11e9"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "fcdabdfc"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "b6c0107d"
+                  "payRelativeTo" : "CalculationPeriodStartDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
+                    },
+                    "dayType" : "Business"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_START_DATE",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -172,24 +147,12 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "meta" : {
                       "globalKey" : "a98752b1"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf9f"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
-                  }
-                },
-                "pricingDates" : {
-                  "parametricDates" : {
-                    "dayDistribution" : "FIRST",
-                    "dayType" : "BUSINESS"
+                  "meta" : {
+                    "globalKey" : "4ae9e73d"
                   }
                 },
                 "underlier" : {
@@ -202,41 +165,39 @@
                   "meta" : {
                     "globalKey" : "0"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "9b729984"
                 }
               } ],
               "fixedPricePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "fixedPrice" : {
-                  "price" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    }
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "2d033bbe"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "b6c0107d"
+                  "payRelativeTo" : "CalculationPeriodStartDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
+                    },
+                    "dayType" : "Business"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_START_DATE",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -245,222 +206,261 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "meta" : {
                       "globalKey" : "a98752b1"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf9f"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "72f4b542"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
                   "meta" : {
-                    "globalKey" : "3a4b88ab"
+                    "globalKey" : "4ae9e73d"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "25a71b89"
+                "fixedPrice" : {
+                  "price" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2006-09-30"
-              },
+                "meta" : {
+                  "globalKey" : "88962ba4"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "25a71b89"
+                "globalKey" : "8ac14aa0"
               }
             }
           },
           "meta" : {
-            "globalKey" : "99e845b"
+            "globalKey" : "baecf4fd"
           }
         },
         "meta" : {
-          "globalKey" : "99e845b"
+          "globalKey" : "baecf4fd"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "36edbf67"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 5.55,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 5.55,
-              "cashPrice" : {
-                "cashPriceType" : "FEE"
-              },
               "perUnitOf" : {
                 "capacityUnit" : "USMMBTU"
               },
-              "priceType" : "CASH_PRICE"
+              "priceType" : "CashPrice",
+              "cashPrice" : {
+                "cashPriceType" : "Fee"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 5000.0,
+              "unit" : {
+                "capacityUnit" : "USMMBTU"
+              },
+              "frequency" : {
+                "periodMultiplier" : 1,
+                "period" : "C",
+                "meta" : {
+                  "globalKey" : "62"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
+            }
+          }, {
+            "value" : {
+              "value" : 5000.0,
+              "unit" : {
+                "capacityUnit" : "USMMBTU"
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-3"
+              } ]
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e8186fd"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000.0,
               "unit" : {
                 "capacityUnit" : "USMMBTU"
               },
-              "value" : 5000.0,
               "frequency" : {
-                "meta" : {
-                  "globalKey" : "81e"
-                },
+                "periodMultiplier" : 1,
                 "period" : "C",
-                "periodMultiplier" : 1
+                "meta" : {
+                  "globalKey" : "62"
+                }
               }
-            }
-          }, {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-3"
+                "value" : "quantity-4"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 5000.0,
               "unit" : {
                 "capacityUnit" : "USMMBTU"
-              },
-              "value" : 5000.0
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "9a857474"
-          },
+          } ],
           "observable" : {
             "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-1"
-                } ]
-              },
               "value" : {
                 "productIdentifier" : [ {
                   "value" : {
                     "identifier" : {
+                      "value" : "NATURAL GAS-AECO C/NIT (US$/USMMBTU)-CANADIAN GAS REPORTER",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/commodity-reference-price-1-0"
-                      },
-                      "value" : "NATURAL GAS-AECO C/NIT (US$/USMMBTU)-CANADIAN GAS REPORTER"
+                      }
                     },
+                    "source" : "ISDACRP",
                     "meta" : {
                       "globalKey" : "fedb31af"
-                    },
-                    "source" : "ISDACRP"
+                    }
                   }
                 } ],
-                "priceQuoteType" : "MEAN_OF_HIGH_AND_LOW"
+                "priceQuoteType" : "MeanOfHighAndLow"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-1"
+                } ]
               }
             },
             "meta" : {
-              "globalKey" : "bfe0ec2e"
+              "globalKey" : "3c3c9992"
             }
           },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-4"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "USMMBTU"
-              },
-              "value" : 5000.0,
-              "frequency" : {
-                "meta" : {
-                  "globalKey" : "81e"
-                },
-                "period" : "C",
-                "periodMultiplier" : 1
-              }
-            }
-          }, {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "USMMBTU"
-              },
-              "value" : 5000.0
-            }
-          } ]
+          "meta" : {
+            "globalKey" : "b6519634"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb19a"
-      },
-      "value" : "2006-06-26"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "a977e59e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fb7fd677"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "86c819db"
+    }
+  },
+  "meta" : {
+    "globalKey" : "86c819db"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex03-gas-swap-prices-last-three-days.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex03-gas-swap-prices-last-three-days.json
index 48d5ad1589..71a1b51411 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex03-gas-swap-prices-last-three-days.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex03-gas-swap-prices-last-three-days.json
@@ -1,96 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "9a06b51"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "a977e59e"
         }
       } ],
       "meta" : {
-        "globalKey" : "fb7fd677"
+        "globalKey" : "9598cc47"
       }
-    },
-    "meta" : {
-      "globalKey" : "9a06b51"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.PartyB.com/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-08-24",
+      "meta" : {
+        "globalKey" : "3eb218"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -100,76 +49,110 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-01-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25f944ac"
-                },
-                "unadjustedDate" : "2009-01-01"
+                }
               },
               "meta" : {
                 "globalKey" : "25f944ac"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-12-31",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "2604080a"
+                }
+              },
+              "meta" : {
+                "globalKey" : "2604080a"
+              }
+            },
             "payout" : {
               "commodityPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "averagingFeature" : {
                   "averagingMethod" : {
-                    "calculationMethod" : "ARITHMETIC",
-                    "isWeighted" : false
+                    "isWeighted" : false,
+                    "calculationMethod" : "Arithmetic"
+                  }
+                },
+                "pricingDates" : {
+                  "parametricDates" : {
+                    "dayType" : "Business",
+                    "dayDistribution" : "Last",
+                    "businessCenters" : {
+                      "commodityBusinessCalendar" : [ {
+                        "value" : "NYMEX-NATURAL-GAS"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "acc66859"
+                      }
+                    }
                   }
                 },
                 "calculationPeriodDates" : {
                   "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
                     "meta" : {
-                      "externalKey" : "floatingLegCalculationPeriods",
-                      "globalKey" : "12601"
+                      "globalKey" : "11e9",
+                      "externalKey" : "floatingLegCalculationPeriods"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 1,
                     "balanceOfFirstPeriod" : false
                   },
                   "meta" : {
-                    "globalKey" : "12601"
+                    "globalKey" : "11e9"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "d920a529"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "6b379f36"
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
+                    },
+                    "dayType" : "Business"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -178,32 +161,12 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "meta" : {
                       "globalKey" : "a98752b1"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf9f"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
-                  }
-                },
-                "pricingDates" : {
-                  "parametricDates" : {
-                    "businessCenters" : {
-                      "commodityBusinessCalendar" : [ {
-                        "value" : "NYMEX-NATURAL-GAS"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "acc66859"
-                      }
-                    },
-                    "dayDistribution" : "LAST",
-                    "dayType" : "BUSINESS"
+                  "meta" : {
+                    "globalKey" : "ff6175f6"
                   }
                 },
                 "underlier" : {
@@ -216,41 +179,39 @@
                   "meta" : {
                     "globalKey" : "0"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "7edce2bd"
                 }
               } ],
               "fixedPricePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "fixedPrice" : {
-                  "price" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    }
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "e17aca77"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "6b379f36"
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
+                    },
+                    "dayType" : "Business"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -259,231 +220,270 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "meta" : {
                       "globalKey" : "a98752b1"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf9f"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "ee75fc6e"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
                   "meta" : {
-                    "globalKey" : "3a4b88ab"
+                    "globalKey" : "ff6175f6"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "2604080a"
+                "fixedPrice" : {
+                  "price" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2009-12-31"
-              },
+                "meta" : {
+                  "globalKey" : "6310740b"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "2604080a"
+                "globalKey" : "e107c2ee"
               }
             }
           },
           "meta" : {
-            "globalKey" : "1c3bb08"
+            "globalKey" : "4d5d1250"
           }
         },
         "meta" : {
-          "globalKey" : "1c3bb08"
+          "globalKey" : "4d5d1250"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "48999e79"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 9.64,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 9.64,
-              "cashPrice" : {
-                "cashPriceType" : "FEE"
-              },
               "perUnitOf" : {
                 "capacityUnit" : "USMMBTU"
               },
-              "priceType" : "CASH_PRICE"
+              "priceType" : "CashPrice",
+              "cashPrice" : {
+                "cashPriceType" : "Fee"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 5000.0,
+              "unit" : {
+                "capacityUnit" : "USMMBTU"
+              },
+              "frequency" : {
+                "periodMultiplier" : 1,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "63"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
+            }
+          }, {
+            "value" : {
+              "value" : 1825000.0,
+              "unit" : {
+                "capacityUnit" : "USMMBTU"
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-3"
+              } ]
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "ff56988d"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000.0,
               "unit" : {
                 "capacityUnit" : "USMMBTU"
               },
-              "value" : 5000.0,
               "frequency" : {
-                "meta" : {
-                  "globalKey" : "83d"
-                },
+                "periodMultiplier" : 1,
                 "period" : "D",
-                "periodMultiplier" : 1
+                "meta" : {
+                  "globalKey" : "63"
+                }
               }
-            }
-          }, {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-3"
+                "value" : "quantity-4"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 182500.0,
               "unit" : {
                 "capacityUnit" : "USMMBTU"
-              },
-              "value" : 1825000.0
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "f8d94599"
-          },
+          } ],
           "observable" : {
             "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-1"
-                } ]
-              },
               "value" : {
                 "productIdentifier" : [ {
                   "value" : {
                     "identifier" : {
+                      "value" : "NATURAL GAS-HENRY HUB-NYMEX",
                       "meta" : {
                         "scheme" : "http://www.partyA.com/instrumentId/commodity-reference-price"
-                      },
-                      "value" : "NATURAL GAS-HENRY HUB-NYMEX"
+                      }
                     },
+                    "source" : "ISDACRP",
                     "meta" : {
                       "globalKey" : "8ac8d504"
-                    },
-                    "source" : "ISDACRP"
+                    }
                   }
                 } ],
+                "priceQuoteType" : "Settlement",
                 "deliveryDateReference" : {
                   "deliveryNearby" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 1,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
                   }
-                },
-                "priceQuoteType" : "SETTLEMENT"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-1"
+                } ]
               }
             },
             "meta" : {
-              "globalKey" : "dd976f79"
+              "globalKey" : "d5556b8f"
             }
           },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-4"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "USMMBTU"
-              },
-              "value" : 5000.0,
-              "frequency" : {
-                "meta" : {
-                  "globalKey" : "83d"
-                },
-                "period" : "D",
-                "periodMultiplier" : 1
-              }
-            }
-          }, {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "USMMBTU"
-              },
-              "value" : 182500.0
-            }
-          } ]
+          "meta" : {
+            "globalKey" : "1b2db443"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb218"
-      },
-      "value" : "2006-08-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "a977e59e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fb7fd677"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "d6faf2b1"
+    }
+  },
+  "meta" : {
+    "globalKey" : "d6faf2b1"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex04-electricity-swap-hourly-off-peak.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex04-electricity-swap-hourly-off-peak.json
index 782ef18bca..4ded9e68c8 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex04-electricity-swap-hourly-off-peak.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex04-electricity-swap-hourly-off-peak.json
@@ -1,96 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "88a120df"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "a977e59e"
         }
       } ],
       "meta" : {
-        "globalKey" : "fb7fd677"
+        "globalKey" : "9598cc47"
       }
-    },
-    "meta" : {
-      "globalKey" : "88a120df"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.PartyB.com/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-07-28",
+      "meta" : {
+        "globalKey" : "3eb1dc"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -100,76 +49,110 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-01-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25f944ac"
-                },
-                "unadjustedDate" : "2009-01-01"
+                }
               },
               "meta" : {
                 "globalKey" : "25f944ac"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-12-31",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "2604080a"
+                }
+              },
+              "meta" : {
+                "globalKey" : "2604080a"
+              }
+            },
             "payout" : {
               "commodityPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "averagingFeature" : {
                   "averagingMethod" : {
-                    "calculationMethod" : "ARITHMETIC",
-                    "isWeighted" : true
+                    "isWeighted" : true,
+                    "calculationMethod" : "Arithmetic"
+                  }
+                },
+                "pricingDates" : {
+                  "parametricDates" : {
+                    "dayType" : "Business",
+                    "dayDistribution" : "All",
+                    "businessCenters" : {
+                      "commodityBusinessCalendar" : [ {
+                        "value" : "DowJonesPower"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "e1cbae2a"
+                      }
+                    }
                   }
                 },
                 "calculationPeriodDates" : {
                   "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
                     "meta" : {
-                      "externalKey" : "floatingLegCalculationPeriods",
-                      "globalKey" : "12601"
+                      "globalKey" : "11e9",
+                      "externalKey" : "floatingLegCalculationPeriods"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 1,
                     "balanceOfFirstPeriod" : false
                   },
                   "meta" : {
-                    "globalKey" : "12601"
+                    "globalKey" : "11e9"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "a75ef367"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "6b379f36"
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
+                    },
+                    "dayType" : "Business"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -178,32 +161,12 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "meta" : {
                       "globalKey" : "a98752b1"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf9f"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
-                  }
-                },
-                "pricingDates" : {
-                  "parametricDates" : {
-                    "businessCenters" : {
-                      "commodityBusinessCalendar" : [ {
-                        "value" : "DOW_JONES_POWER"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "e1cbae2a"
-                      }
-                    },
-                    "dayDistribution" : "ALL",
-                    "dayType" : "BUSINESS"
+                  "meta" : {
+                    "globalKey" : "ff6175f6"
                   }
                 },
                 "underlier" : {
@@ -216,41 +179,39 @@
                   "meta" : {
                     "globalKey" : "0"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "3385b5bd"
                 }
               } ],
               "fixedPricePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "fixedPrice" : {
-                  "price" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    }
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "e17aca77"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "6b379f36"
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
+                    },
+                    "dayType" : "Business"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -259,222 +220,261 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "meta" : {
                       "globalKey" : "a98752b1"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf9f"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "b23231f0"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
                   "meta" : {
-                    "globalKey" : "3a4b88ab"
+                    "globalKey" : "ff6175f6"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "2604080a"
+                "fixedPrice" : {
+                  "price" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2009-12-31"
-              },
+                "meta" : {
+                  "globalKey" : "6310740b"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "2604080a"
+                "globalKey" : "4ebf4fee"
               }
             }
           },
           "meta" : {
-            "globalKey" : "8236a6c6"
+            "globalKey" : "bb149f50"
           }
         },
         "meta" : {
-          "globalKey" : "8236a6c6"
+          "globalKey" : "bb149f50"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "35ff2195"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 120.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 120.0,
-              "cashPrice" : {
-                "cashPriceType" : "FEE"
-              },
               "perUnitOf" : {
                 "capacityUnit" : "MWH"
               },
-              "priceType" : "CASH_PRICE"
+              "priceType" : "CashPrice",
+              "cashPrice" : {
+                "cashPriceType" : "Fee"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 17.0,
+              "unit" : {
+                "capacityUnit" : "MWH"
+              },
+              "frequency" : {
+                "periodMultiplier" : 1,
+                "period" : "C",
+                "meta" : {
+                  "globalKey" : "62"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
+            }
+          }, {
+            "value" : {
+              "value" : 83776.0,
+              "unit" : {
+                "capacityUnit" : "MWH"
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-3"
+              } ]
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "bd9884f"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 17.0,
               "unit" : {
                 "capacityUnit" : "MWH"
               },
-              "value" : 17.0,
               "frequency" : {
-                "meta" : {
-                  "globalKey" : "81e"
-                },
+                "periodMultiplier" : 1,
                 "period" : "C",
-                "periodMultiplier" : 1
+                "meta" : {
+                  "globalKey" : "62"
+                }
               }
-            }
-          }, {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-3"
+                "value" : "quantity-4"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 83776.0,
               "unit" : {
                 "capacityUnit" : "MWH"
-              },
-              "value" : 83776.0
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "db0af1c1"
-          },
+          } ],
           "observable" : {
             "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-1"
-                } ]
-              },
               "value" : {
                 "productIdentifier" : [ {
                   "value" : {
                     "identifier" : {
+                      "value" : "ELECTRICITY-MID-COLUMBIA FIRM (ON-PEAK)-DOW JONES POWER",
                       "meta" : {
                         "scheme" : "http://www.partyA.com/instrumentId/commodity-reference-price"
-                      },
-                      "value" : "ELECTRICITY-MID-COLUMBIA FIRM (ON-PEAK)-DOW JONES POWER"
+                      }
                     },
+                    "source" : "ISDACRP",
                     "meta" : {
                       "globalKey" : "7dbe4bf4"
-                    },
-                    "source" : "ISDACRP"
+                    }
                   }
                 } ],
-                "priceQuoteType" : "INDEX"
+                "priceQuoteType" : "Index"
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-1"
+                } ]
               }
             },
             "meta" : {
-              "globalKey" : "3e34633e"
+              "globalKey" : "88580482"
             }
           },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-4"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "MWH"
-              },
-              "value" : 17.0,
-              "frequency" : {
-                "meta" : {
-                  "globalKey" : "81e"
-                },
-                "period" : "C",
-                "periodMultiplier" : 1
-              }
-            }
-          }, {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "MWH"
-              },
-              "value" : 83776.0
-            }
-          } ]
+          "meta" : {
+            "globalKey" : "a885ea7"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb1dc"
-      },
-      "value" : "2006-07-28"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "a977e59e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fb7fd677"
+      }
+    },
+    "meta" : {
+      "globalKey" : "6067da8f"
+    }
+  },
+  "meta" : {
+    "globalKey" : "6067da8f"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex05-gas-v-electricity-spark-spread.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex05-gas-v-electricity-spark-spread.json
index a0099304cf..66ce153167 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex05-gas-v-electricity-spark-spread.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex05-gas-v-electricity-spark-spread.json
@@ -1,96 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "40537266"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "a977e59e"
         }
       } ],
       "meta" : {
-        "globalKey" : "fb7fd677"
+        "globalKey" : "9598cc47"
       }
-    },
-    "meta" : {
-      "globalKey" : "40537266"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.PartyB.com/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2008-06-11",
+      "meta" : {
+        "globalKey" : "3ec18b"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -100,59 +49,62 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2008-07-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25e0de2c"
-                },
-                "unadjustedDate" : "2008-07-01"
+                }
               },
               "meta" : {
                 "globalKey" : "25e0de2c"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2008-07-31",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "25e14eca"
+                }
+              },
+              "meta" : {
+                "globalKey" : "25e14eca"
+              }
+            },
             "payout" : {
               "commodityPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "externalKey" : "floatingLeg1CalculationPeriods",
-                      "globalKey" : "12601"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1,
-                    "balanceOfFirstPeriod" : false
-                  },
                   "meta" : {
-                    "globalKey" : "12601"
+                    "globalKey" : "7610bbd9"
                   }
                 },
                 "commodityPriceReturnTerms" : {
@@ -165,31 +117,10 @@
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "283bb41e"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "fc3af724"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessDayConvention" : "NOT_APPLICABLE",
-                    "meta" : {
-                      "globalKey" : "3a4b88ab"
-                    }
-                  },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf9f"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
-                  }
-                },
                 "pricingDates" : {
                   "parametricDates" : {
+                    "dayType" : "Business",
+                    "dayDistribution" : "Last",
                     "businessCenters" : {
                       "commodityBusinessCalendar" : [ {
                         "value" : "NYMEX-NATURAL-GAS"
@@ -197,9 +128,41 @@
                       "meta" : {
                         "globalKey" : "acc66859"
                       }
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "11e9",
+                      "externalKey" : "floatingLeg1CalculationPeriods"
                     },
-                    "dayDistribution" : "LAST",
-                    "dayType" : "BUSINESS"
+                    "balanceOfFirstPeriod" : false
+                  },
+                  "meta" : {
+                    "globalKey" : "11e9"
+                  }
+                },
+                "paymentDates" : {
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
+                    },
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "NotApplicable",
+                    "meta" : {
+                      "globalKey" : "3a4b88ab"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "2c4cb386"
                   }
                 },
                 "underlier" : {
@@ -212,67 +175,67 @@
                   "meta" : {
                     "globalKey" : "0"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "324c917c"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "averagingFeature" : {
                   "averagingMethod" : {
-                    "calculationMethod" : "ARITHMETIC",
-                    "isWeighted" : false
+                    "isWeighted" : false,
+                    "calculationMethod" : "Arithmetic"
                   }
                 },
                 "commodityPriceReturnTerms" : {
                   "conversionFactor" : 0.4913
                 },
-                "meta" : {
-                  "globalKey" : "12ccdca8"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "fc3af724"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessDayConvention" : "NOT_APPLICABLE",
-                    "meta" : {
-                      "globalKey" : "3a4b88ab"
-                    }
-                  },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf9f"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
-                  }
-                },
                 "pricingDates" : {
                   "parametricDates" : {
+                    "dayType" : "Calendar",
+                    "dayDistribution" : "All",
                     "businessCenters" : {
                       "commodityBusinessCalendar" : [ {
-                        "value" : "DOW_JONES_POWER"
+                        "value" : "DowJonesPower"
                       } ],
                       "meta" : {
                         "globalKey" : "e1cbae2a"
                       }
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
                     },
-                    "dayDistribution" : "ALL",
-                    "dayType" : "CALENDAR"
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "NotApplicable",
+                    "meta" : {
+                      "globalKey" : "3a4b88ab"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "2c4cb386"
                   }
                 },
                 "underlier" : {
@@ -285,246 +248,283 @@
                   "meta" : {
                     "globalKey" : "0"
                   }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "ce8f8746"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
-                  "meta" : {
-                    "globalKey" : "3a4b88ab"
-                  }
                 },
                 "meta" : {
-                  "globalKey" : "25e14eca"
-                },
-                "unadjustedDate" : "2008-07-31"
-              },
+                  "globalKey" : "e6788d6e"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "25e14eca"
+                "globalKey" : "3f85fbea"
               }
             }
           },
           "meta" : {
-            "globalKey" : "fcb7aa98"
+            "globalKey" : "fbf53708"
           }
         },
         "meta" : {
-          "globalKey" : "fcb7aa98"
+          "globalKey" : "fbf53708"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "48be9c16"
-          },
-          "observable" : {
-            "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-1"
-                } ]
-              },
-              "value" : {
-                "productIdentifier" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/commodity-reference-price"
-                      },
-                      "value" : "NATURAL GAS-HENRY HUB-NYMEX"
-                    },
-                    "meta" : {
-                      "globalKey" : "8ac8d504"
-                    },
-                    "source" : "ISDACRP"
-                  }
-                } ],
-                "deliveryDateReference" : {
-                  "deliveryNearby" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1
-                  }
-                },
-                "priceQuoteType" : "SETTLEMENT"
-              }
-            },
-            "meta" : {
-              "globalKey" : "dd976f79"
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : -1.45,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : -1.45,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "capacityUnit" : "USMMBTU"
               },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "AssetPrice",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 15000.0,
               "unit" : {
                 "capacityUnit" : "USMMBTU"
               },
-              "value" : 15000.0,
               "frequency" : {
-                "meta" : {
-                  "globalKey" : "83d"
-                },
+                "periodMultiplier" : 1,
                 "period" : "D",
-                "periodMultiplier" : 1
+                "meta" : {
+                  "globalKey" : "63"
+                }
               }
-            }
-          }, {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-3"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 465000.0,
               "unit" : {
                 "capacityUnit" : "USMMBTU"
-              },
-              "value" : 465000.0
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-3"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "9bf0936d"
-          },
+          } ],
           "observable" : {
             "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-2"
-                } ]
-              },
               "value" : {
                 "productIdentifier" : [ {
                   "value" : {
                     "identifier" : {
+                      "value" : "NATURAL GAS-HENRY HUB-NYMEX",
                       "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/commodity-reference-price-1-0"
-                      },
-                      "value" : "ELECTRICITY-MID-COLUMBIA FIRM (ON-PEAK)-DOW JONES POWER"
+                        "scheme" : "http://www.fpml.org/coding-scheme/commodity-reference-price"
+                      }
                     },
+                    "source" : "ISDACRP",
                     "meta" : {
-                      "globalKey" : "7dbe4bf4"
-                    },
-                    "source" : "ISDACRP"
+                      "globalKey" : "8ac8d504"
+                    }
                   }
                 } ],
-                "priceQuoteType" : "MEAN_OF_HIGH_AND_LOW"
+                "priceQuoteType" : "Settlement",
+                "deliveryDateReference" : {
+                  "deliveryNearby" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-1"
+                } ]
               }
             },
             "meta" : {
-              "globalKey" : "1d611a89"
+              "globalKey" : "d5556b8f"
             }
           },
+          "meta" : {
+            "globalKey" : "fe1a6766"
+          }
+        }, {
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-4"
-              } ]
-            },
             "value" : {
+              "value" : 15000.0,
               "unit" : {
                 "capacityUnit" : "USMMBTU"
               },
-              "value" : 15000.0,
               "frequency" : {
-                "meta" : {
-                  "globalKey" : "83d"
-                },
+                "periodMultiplier" : 1,
                 "period" : "D",
-                "periodMultiplier" : 1
+                "meta" : {
+                  "globalKey" : "63"
+                }
               }
-            }
-          }, {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-4"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 465000.0,
               "unit" : {
                 "capacityUnit" : "USMMBTU"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "commodity" : {
+              "value" : {
+                "productIdentifier" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "ELECTRICITY-MID-COLUMBIA FIRM (ON-PEAK)-DOW JONES POWER",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/commodity-reference-price-1-0"
+                      }
+                    },
+                    "source" : "ISDACRP",
+                    "meta" : {
+                      "globalKey" : "7dbe4bf4"
+                    }
+                  }
+                } ],
+                "priceQuoteType" : "MeanOfHighAndLow"
               },
-              "value" : 465000.0
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-2"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "8ec23697"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "f17b87e7"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec18b"
-      },
-      "value" : "2008-06-11"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "a977e59e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fb7fd677"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "f5f5216c"
+    }
+  },
+  "meta" : {
+    "globalKey" : "f5f5216c"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex06-gas-call-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex06-gas-call-option.json
index 0b6b66d4e3..8b464571d3 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex06-gas-call-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex06-gas-call-option.json
@@ -1,96 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "6bd2fa14"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "a977e59e"
         }
       } ],
       "meta" : {
-        "globalKey" : "fb7fd677"
+        "globalKey" : "9598cc47"
       }
-    },
-    "meta" : {
-      "globalKey" : "d01886b2"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2004-05-17",
+      "meta" : {
+        "globalKey" : "3ea151"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -100,91 +49,83 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2004-07-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "2568be2c"
-                },
-                "unadjustedDate" : "2004-07-01"
+                }
               },
               "meta" : {
                 "globalKey" : "2568be2c"
               }
             },
             "payout" : {
-              "meta" : {
-                "globalKey" : "b9e75436"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "80e4d980"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 5,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "5f4eeb79"
+                          "globalKey" : "5f333497"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 5,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
                         "businessDayConvention" : "NONE"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "5f4eeb79"
+                      "globalKey" : "5f333497"
                     }
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "80c9229e"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    },
-                    "followUpConfirmation" : false
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2004-07-31",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "25692eca"
-                          },
-                          "unadjustedDate" : "2004-07-31"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "25692eca"
@@ -197,39 +138,55 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 2.7,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 2.7,
                       "perUnitOf" : {
                         "capacityUnit" : "USMMBTU"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
+                    },
+                    "followUpConfirmation" : false
                   }
                 },
-                "meta" : {
-                  "globalKey" : "b9e75436"
+                "underlier" : {
+                  "commodity" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "commodity-1"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
                 },
                 "observationTerms" : {
                   "calculationPeriodDates" : {
                     "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "M",
                       "meta" : {
-                        "externalKey" : "CalculationPeriods",
-                        "globalKey" : "12601"
+                        "globalKey" : "11e9",
+                        "externalKey" : "CalculationPeriods"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 1,
                       "balanceOfFirstPeriod" : false
                     },
                     "meta" : {
-                      "globalKey" : "12601"
+                      "globalKey" : "11e9"
                     }
                   },
                   "observationDates" : {
                     "parametricDates" : {
+                      "dayType" : "ScheduledTradingDay",
+                      "dayDistribution" : "Penultimate",
                       "businessCenters" : {
                         "commodityBusinessCalendar" : [ {
                           "value" : "NYMEX-NATURAL-GAS"
@@ -237,190 +194,233 @@
                         "meta" : {
                           "globalKey" : "acc66859"
                         }
-                      },
-                      "dayDistribution" : "PENULTIMATE",
-                      "dayType" : "SCHEDULED_TRADING_DAY"
+                      }
                     }
                   }
                 },
-                "optionType" : "CALL",
-                "underlier" : {
-                  "commodity" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "commodity-1"
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "0"
-                  }
+                "meta" : {
+                  "globalKey" : "7a621460"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "7a621460"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "db6f9e62"
+            "globalKey" : "9bea5e8c"
           }
         },
         "meta" : {
-          "globalKey" : "db6f9e62"
+          "globalKey" : "9bea5e8c"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "4bde1d05"
-          },
+          "quantity" : [ {
+            "value" : {
+              "value" : 1700000,
+              "unit" : {
+                "capacityUnit" : "USMMBTU"
+              },
+              "frequency" : {
+                "period" : "T",
+                "meta" : {
+                  "globalKey" : "54"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          }, {
+            "value" : {
+              "value" : 1700000,
+              "unit" : {
+                "capacityUnit" : "USMMBTU"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
           "observable" : {
             "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-1"
-                } ]
-              },
               "value" : {
                 "productIdentifier" : [ {
                   "value" : {
                     "identifier" : {
+                      "value" : "NATURAL GAS-HENRY HUB-NYMEX",
                       "meta" : {
                         "scheme" : "http://www.partyA.com/instrumentId/commodity-reference-price"
-                      },
-                      "value" : "NATURAL GAS-HENRY HUB-NYMEX"
+                      }
                     },
+                    "source" : "ISDACRP",
                     "meta" : {
                       "globalKey" : "8ac8d504"
-                    },
-                    "source" : "ISDACRP"
+                    }
                   }
                 } ],
+                "priceQuoteType" : "Settlement",
                 "deliveryDateReference" : {
                   "deliveryNearby" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 1,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
                   }
-                },
-                "priceQuoteType" : "SETTLEMENT"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-1"
+                } ]
               }
             },
             "meta" : {
-              "globalKey" : "dd976f79"
+              "globalKey" : "d5556b8f"
             }
           },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "USMMBTU"
-              },
-              "value" : 1700000,
-              "frequency" : {
-                "meta" : {
-                  "globalKey" : "54"
-                },
-                "period" : "T"
-              }
-            }
-          }, {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "USMMBTU"
-              },
-              "value" : 1700000
-            }
-          } ]
+          "meta" : {
+            "globalKey" : "d1e2f4c3"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea151"
-      },
-      "value" : "2004-05-17"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "a977e59e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fb7fd677"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "e8b45404"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "4217fbe2"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        }
-      },
       "quantity" : {
+        "value" : 350000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
         },
-        "value" : 350000
+        "receiverPartyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2004-05-19",
         "dateAdjustments" : {
-          "businessDayConvention" : "NOT_APPLICABLE",
+          "businessDayConvention" : "NotApplicable",
           "meta" : {
             "globalKey" : "3a4b88ab"
           }
-        },
-        "unadjustedDate" : "2004-05-19"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "65d9d0e8"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "284aabec"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex07-gas-put-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex07-gas-put-option.json
index 28b264e8a1..fa30b3ec6c 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex07-gas-put-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex07-gas-put-option.json
@@ -1,96 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "4b4d73af"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "a977e59e"
         }
       } ],
       "meta" : {
-        "globalKey" : "fb7fd677"
+        "globalKey" : "9598cc47"
       }
-    },
-    "meta" : {
-      "globalKey" : "1b699083"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2007-04-10",
+      "meta" : {
+        "globalKey" : "3eb90a"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -100,85 +49,83 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2007-06-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25c1e5ec"
-                },
-                "unadjustedDate" : "2007-06-01"
+                }
               },
               "meta" : {
                 "globalKey" : "25c1e5ec"
               }
             },
             "payout" : {
-              "meta" : {
-                "globalKey" : "7cf15ec7"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "80e4d980"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 5,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "5f4eeb79"
+                          "globalKey" : "5f333497"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 5,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
                         "businessDayConvention" : "NONE"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "5f4eeb79"
+                      "globalKey" : "5f333497"
                     }
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "80c9229e"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Put",
                 "exerciseTerms" : {
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2007-06-30",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "25c252c9"
-                          },
-                          "unadjustedDate" : "2007-06-30"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "25c252c9"
@@ -191,39 +138,49 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 6.6,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 6.6,
                       "perUnitOf" : {
                         "capacityUnit" : "USMMBTU"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "7cf15ec7"
+                "underlier" : {
+                  "commodity" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "commodity-1"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
                 },
                 "observationTerms" : {
                   "calculationPeriodDates" : {
                     "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "M",
                       "meta" : {
-                        "externalKey" : "CalculationPeriods",
-                        "globalKey" : "12601"
+                        "globalKey" : "11e9",
+                        "externalKey" : "CalculationPeriods"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 1,
                       "balanceOfFirstPeriod" : false
                     },
                     "meta" : {
-                      "globalKey" : "12601"
+                      "globalKey" : "11e9"
                     }
                   },
                   "observationDates" : {
                     "parametricDates" : {
+                      "dayType" : "ScheduledTradingDay",
+                      "dayDistribution" : "Penultimate",
                       "businessCenters" : {
                         "commodityBusinessCalendar" : [ {
                           "value" : "NYMEX-NATURAL-GAS"
@@ -231,190 +188,233 @@
                         "meta" : {
                           "globalKey" : "acc66859"
                         }
-                      },
-                      "dayDistribution" : "PENULTIMATE",
-                      "dayType" : "SCHEDULED_TRADING_DAY"
+                      }
                     }
                   }
                 },
-                "optionType" : "PUT",
-                "underlier" : {
-                  "commodity" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "commodity-1"
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "0"
-                  }
+                "meta" : {
+                  "globalKey" : "8d74ecf1"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "8d74ecf1"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "a71666b3"
+            "globalKey" : "b799f4dd"
           }
         },
         "meta" : {
-          "globalKey" : "a71666b3"
+          "globalKey" : "b799f4dd"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "c864eec5"
-          },
+          "quantity" : [ {
+            "value" : {
+              "value" : 1500000,
+              "unit" : {
+                "capacityUnit" : "USMMBTU"
+              },
+              "frequency" : {
+                "period" : "T",
+                "meta" : {
+                  "globalKey" : "54"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          }, {
+            "value" : {
+              "value" : 1500000,
+              "unit" : {
+                "capacityUnit" : "USMMBTU"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
           "observable" : {
             "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-1"
-                } ]
-              },
               "value" : {
                 "productIdentifier" : [ {
                   "value" : {
                     "identifier" : {
+                      "value" : "NATURAL GAS-HENRY HUB-NYMEX",
                       "meta" : {
                         "scheme" : "http://www.partyA.com/instrumentId/commodity-reference-price"
-                      },
-                      "value" : "NATURAL GAS-HENRY HUB-NYMEX"
+                      }
                     },
+                    "source" : "ISDACRP",
                     "meta" : {
                       "globalKey" : "8ac8d504"
-                    },
-                    "source" : "ISDACRP"
+                    }
                   }
                 } ],
+                "priceQuoteType" : "Settlement",
                 "deliveryDateReference" : {
                   "deliveryNearby" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 1,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
                   }
-                },
-                "priceQuoteType" : "SETTLEMENT"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-1"
+                } ]
               }
             },
             "meta" : {
-              "globalKey" : "dd976f79"
+              "globalKey" : "d5556b8f"
             }
           },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "USMMBTU"
-              },
-              "value" : 1500000,
-              "frequency" : {
-                "meta" : {
-                  "globalKey" : "54"
-                },
-                "period" : "T"
-              }
-            }
-          }, {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "USMMBTU"
-              },
-              "value" : 1500000
-            }
-          } ]
+          "meta" : {
+            "globalKey" : "3c266b03"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb90a"
-      },
-      "value" : "2007-04-10"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "a977e59e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fb7fd677"
+      }
+    },
+    "meta" : {
+      "globalKey" : "6756e913"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "c2f7ddec"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        }
-      },
       "quantity" : {
+        "value" : 32000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
         },
-        "value" : 32000
+        "receiverPartyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2007-04-12",
         "dateAdjustments" : {
-          "businessDayConvention" : "NOT_APPLICABLE",
+          "businessDayConvention" : "NotApplicable",
           "meta" : {
             "globalKey" : "3a4b88ab"
           }
-        },
-        "unadjustedDate" : "2007-04-12"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "7cb6aff0"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "512a9a43"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex08-oil-call-option-strip.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex08-oil-call-option-strip.json
index 2e6dbfb606..d93e46511d 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex08-oil-call-option-strip.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex08-oil-call-option-strip.json
@@ -1,96 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "a96abbc"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "a977e59e"
         }
       } ],
       "meta" : {
-        "globalKey" : "fb7fd677"
+        "globalKey" : "9598cc47"
       }
-    },
-    "meta" : {
-      "globalKey" : "80adf080"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2008-02-05",
+      "meta" : {
+        "globalKey" : "3ec085"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -100,117 +49,115 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2008-08-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25e1ce6c"
-                },
-                "unadjustedDate" : "2008-08-01"
+                }
               },
               "meta" : {
                 "globalKey" : "25e1ce6c"
               }
             },
             "payout" : {
-              "meta" : {
-                "globalKey" : "b2fff585"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "80e4d980"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 5,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "5f4eeb79"
+                          "globalKey" : "5f333497"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 5,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
                         "businessDayConvention" : "NONE"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "5f4eeb79"
+                      "globalKey" : "5f333497"
                     }
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "80c9229e"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2008-08-30",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "25e23b49"
-                          },
-                          "unadjustedDate" : "2008-08-30"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "25e23b49"
                         }
                       }, {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2008-09-30",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "25e32b89"
-                          },
-                          "unadjustedDate" : "2008-09-30"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "25e32b89"
                         }
                       }, {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2008-10-31",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "25e41f8a"
-                          },
-                          "unadjustedDate" : "2008-10-31"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "25e41f8a"
@@ -223,230 +170,283 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 1120,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1120,
                       "perUnitOf" : {
                         "capacityUnit" : "MT"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "b2fff585"
+                "underlier" : {
+                  "commodity" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "commodity-1"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
                 },
                 "observationTerms" : {
                   "calculationPeriodDates" : {
                     "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "M",
                       "meta" : {
-                        "externalKey" : "CalculationPeriods",
-                        "globalKey" : "12601"
+                        "globalKey" : "11e9",
+                        "externalKey" : "CalculationPeriods"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 1,
                       "balanceOfFirstPeriod" : false
                     },
                     "meta" : {
-                      "globalKey" : "12601"
+                      "globalKey" : "11e9"
                     }
                   },
                   "observationDates" : {
                     "parametricDates" : {
-                      "dayDistribution" : "ALL",
-                      "dayType" : "BUSINESS"
+                      "dayType" : "Business",
+                      "dayDistribution" : "All"
                     }
                   }
                 },
-                "optionType" : "CALL",
-                "underlier" : {
-                  "commodity" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "commodity-1"
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "0"
-                  }
+                "meta" : {
+                  "globalKey" : "6254d82d"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "6254d82d"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "c3bf3399"
+            "globalKey" : "73141641"
           }
         },
         "meta" : {
-          "globalKey" : "c3bf3399"
+          "globalKey" : "73141641"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "21eb470"
-          },
+          "quantity" : [ {
+            "value" : {
+              "value" : 10000,
+              "unit" : {
+                "capacityUnit" : "MT"
+              },
+              "frequency" : {
+                "periodMultiplier" : 1,
+                "period" : "C",
+                "meta" : {
+                  "globalKey" : "62"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          }, {
+            "value" : {
+              "value" : 30000,
+              "unit" : {
+                "capacityUnit" : "MT"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
           "observable" : {
             "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-1"
-                } ]
-              },
               "value" : {
                 "productIdentifier" : [ {
                   "value" : {
                     "identifier" : {
+                      "value" : "GAS OIL-IPE",
                       "meta" : {
                         "scheme" : "http://www.partyA.com/instrumentId/commodity-reference-price"
-                      },
-                      "value" : "GAS OIL-IPE"
+                      }
                     },
+                    "source" : "ISDACRP",
                     "meta" : {
                       "globalKey" : "a9ba09b6"
-                    },
-                    "source" : "ISDACRP"
+                    }
                   }
                 } ],
+                "priceQuoteType" : "Settlement",
                 "deliveryDateReference" : {
-                  "deliveryDateRollConvention" : {
+                  "deliveryNearby" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "83d"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 1
+                      "globalKey" : "6c"
+                    }
                   },
-                  "deliveryNearby" : {
+                  "deliveryDateRollConvention" : {
+                    "periodMultiplier" : 1,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "954"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1
+                      "globalKey" : "63"
+                    }
                   }
-                },
-                "priceQuoteType" : "SETTLEMENT"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-1"
+                } ]
               }
             },
             "meta" : {
-              "globalKey" : "7548ca64"
+              "globalKey" : "c5a9b59c"
             }
           },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "MT"
-              },
-              "value" : 10000,
-              "frequency" : {
-                "meta" : {
-                  "globalKey" : "81e"
-                },
-                "period" : "C",
-                "periodMultiplier" : 1
-              }
-            }
-          }, {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "MT"
-              },
-              "value" : 30000
-            }
-          } ]
+          "meta" : {
+            "globalKey" : "22a0172c"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec085"
-      },
-      "value" : "2008-02-05"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "a977e59e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fb7fd677"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "9abb4108"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "ea53db3c"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        }
-      },
       "quantity" : {
+        "value" : 400000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
         },
-        "value" : 400000
+        "receiverPartyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2008-02-07",
         "dateAdjustments" : {
-          "businessDayConvention" : "NOT_APPLICABLE",
+          "businessDayConvention" : "NotApplicable",
           "meta" : {
             "globalKey" : "3a4b88ab"
           }
-        },
-        "unadjustedDate" : "2008-02-07"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "dd23b6"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "32fd32be"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex09-oil-put-option-american.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex09-oil-put-option-american.json
index 561fe3ccb1..44ace3208b 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex09-oil-put-option-american.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex09-oil-put-option-american.json
@@ -1,94 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "db4c21a9"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "7766c429",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "163476",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "a977e59e"
         }
       } ],
       "meta" : {
-        "globalKey" : "fb7fd677"
+        "globalKey" : "ec3028aa"
       }
-    },
-    "meta" : {
-      "globalKey" : "3e37f030"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "3e4ef71f"
-      },
-      "name" : {
-        "value" : "Rusty"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "ABC6"
-        },
-        "meta" : {
-          "globalKey" : "1e8c34"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "a9725448"
-      },
-      "name" : {
-        "value" : "SwapsWire Ltd (LE)"
+      "issuerReference" : {
+        "globalReference" : "d53e12f6",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "163476",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "ABC1"
-        },
-        "meta" : {
-          "globalKey" : "1e8c2f"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ec309d09"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2008-10-27",
+      "meta" : {
+        "globalKey" : "3ec29b"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "3e4ef71f"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "a9725448"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -96,45 +47,38 @@
             "productQualifier" : "Commodity_Option"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentPartyEnum" : "AS_SPECIFIED_IN_MASTER_AGREEMENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "40920172"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "d961ecf"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 5,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "4cb56076"
+                          "globalKey" : "60481a18"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 5,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -143,44 +87,40 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "exerciseDate",
-                          "globalReference" : "40c8c131"
+                          "globalReference" : "40c8c131",
+                          "externalReference" : "exerciseDate"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "4cb56076"
+                      "globalKey" : "60481a18"
                     }
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "2128d871"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Put",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    },
-                    "followUpConfirmation" : false
-                  },
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2008-10-27",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "25e41086"
-                          },
-                          "unadjustedDate" : "2008-10-27"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "25e41086"
@@ -188,47 +128,49 @@
                       },
                       "expirationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2009-01-12",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "25f96df7"
-                          },
-                          "unadjustedDate" : "2009-01-12"
+                          }
                         },
                         "meta" : {
-                          "externalKey" : "expirationDate",
-                          "globalKey" : "25f96df7"
+                          "globalKey" : "25f96df7",
+                          "externalKey" : "expirationDate"
                         }
                       },
                       "meta" : {
-                        "externalKey" : "exerciseDate",
-                        "globalKey" : "40c8c131"
+                        "globalKey" : "40c8c131",
+                        "externalKey" : "exerciseDate"
                       }
                     }
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 78.0,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 78.0,
                       "perUnitOf" : {
                         "capacityUnit" : "BBL"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
+                    },
+                    "followUpConfirmation" : false
                   }
                 },
-                "meta" : {
-                  "globalKey" : "40920172"
-                },
-                "optionType" : "PUT",
                 "underlier" : {
                   "commodity" : {
                     "address" : {
@@ -239,181 +181,239 @@
                   "meta" : {
                     "globalKey" : "0"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "36aeaa48"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "36aeaa48"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentPartyEnum" : "AsSpecifiedInMasterAgreement"
             }
           },
           "meta" : {
-            "globalKey" : "b1011ea7"
+            "globalKey" : "b4b40ff3"
           }
         },
         "meta" : {
-          "globalKey" : "b1011ea7"
+          "globalKey" : "b4b40ff3"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "17fd2e66"
-          },
+          "quantity" : [ {
+            "value" : {
+              "value" : 12000,
+              "unit" : {
+                "capacityUnit" : "BBL"
+              },
+              "frequency" : {
+                "periodMultiplier" : 1,
+                "period" : "C",
+                "meta" : {
+                  "globalKey" : "62"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          }, {
+            "value" : {
+              "value" : 12000,
+              "unit" : {
+                "capacityUnit" : "BBL"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
           "observable" : {
             "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-1"
-                } ]
-              },
               "value" : {
                 "productIdentifier" : [ {
                   "value" : {
                     "identifier" : {
+                      "value" : "OIL-BRENT-IPE",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/commodity-reference-price-1-0"
-                      },
-                      "value" : "OIL-BRENT-IPE"
+                      }
                     },
+                    "source" : "ISDACRP",
                     "meta" : {
                       "globalKey" : "b1f5e60b"
-                    },
-                    "source" : "ISDACRP"
+                    }
                   }
                 } ],
+                "priceQuoteType" : "Settlement",
                 "deliveryDateReference" : {
-                  "deliveryDateRollConvention" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf23"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 1,
-                    "dayType" : "BUSINESS"
-                  },
                   "deliveryNearby" : {
+                    "period" : "M",
                     "meta" : {
                       "globalKey" : "4d"
+                    }
+                  },
+                  "deliveryDateRollConvention" : {
+                    "periodMultiplier" : 1,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4abbbd"
                     },
-                    "period" : "M"
+                    "dayType" : "Business"
                   }
-                },
-                "priceQuoteType" : "SETTLEMENT"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-1"
+                } ]
               }
             },
             "meta" : {
-              "globalKey" : "9eff3872"
+              "globalKey" : "e5e7d634"
             }
           },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "BBL"
-              },
-              "value" : 12000,
-              "frequency" : {
-                "meta" : {
-                  "globalKey" : "81e"
-                },
-                "period" : "C",
-                "periodMultiplier" : 1
-              }
-            }
-          }, {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "BBL"
-              },
-              "value" : 12000
-            }
-          } ]
+          "meta" : {
+            "globalKey" : "a41e5488"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "7766c429",
+          "externalReference" : "partyA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "d53e12f6",
+          "externalReference" : "partyB"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec29b"
-      },
-      "value" : "2008-10-27"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABC6",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "163476"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "1e8c34"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "3e4ef71f"
+      "name" : {
+        "value" : "Rusty"
       },
       "meta" : {
-        "globalKey" : "29531180"
+        "globalKey" : "7766c429",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABC1",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "163476"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "1e8c2f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "a9725448"
+      "name" : {
+        "value" : "SwapsWire Ltd (LE)"
       },
       "meta" : {
-        "globalKey" : "29531181"
+        "globalKey" : "d53e12f6",
+        "externalKey" : "partyB"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "a977e59e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fb7fd677"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "4690408c"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "d13ddd79"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "3e4ef71f"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "a9725448"
-        }
-      },
       "quantity" : {
+        "value" : 72000.0,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "7766c429",
+          "externalReference" : "partyA"
         },
-        "value" : 72000.0
+        "receiverPartyReference" : {
+          "globalReference" : "d53e12f6",
+          "externalReference" : "partyB"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2008-10-29",
         "dateAdjustments" : {
-          "businessDayConvention" : "NOT_APPLICABLE",
+          "businessDayConvention" : "NotApplicable",
           "meta" : {
             "globalKey" : "3a4b88ab"
           }
-        },
-        "unadjustedDate" : "2008-10-29"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "3a2f1005"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "e5cc591"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex27-wti-put-option-asian-listedoption-date.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex27-wti-put-option-asian-listedoption-date.json
index 7f01d21970..8f817070e8 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex27-wti-put-option-asian-listedoption-date.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex27-wti-put-option-asian-listedoption-date.json
@@ -1,106 +1,55 @@
 {
-  "meta" : {
-    "globalKey" : "732626e3"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "a977e59e"
         }
       } ],
       "meta" : {
-        "globalKey" : "fb7fd677"
+        "globalKey" : "9598cc47"
       }
-    },
-    "meta" : {
-      "globalKey" : "46ac68b7"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2007-04-10",
+      "meta" : {
+        "globalKey" : "3eb90a"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "CommodityOption",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-type-simple"
-                },
-                "value" : "CommodityOption"
+                }
               }
             }
           }, {
@@ -110,85 +59,83 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2007-06-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25c1e5ec"
-                },
-                "unadjustedDate" : "2007-06-01"
+                }
               },
               "meta" : {
                 "globalKey" : "25c1e5ec"
               }
             },
             "payout" : {
-              "meta" : {
-                "globalKey" : "dd66435e"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "80e4d980"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 5,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "5f4eeb79"
+                          "globalKey" : "5f333497"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 5,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
                         "businessDayConvention" : "NONE"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "5f4eeb79"
+                      "globalKey" : "5f333497"
                     }
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "80c9229e"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Put",
                 "exerciseTerms" : {
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2007-06-30",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "25c252c9"
-                          },
-                          "unadjustedDate" : "2007-06-30"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "25c252c9"
@@ -201,39 +148,49 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 88,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 88,
                       "perUnitOf" : {
                         "capacityUnit" : "BBL"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "dd66435e"
+                "underlier" : {
+                  "commodity" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "commodity-1"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
                 },
                 "observationTerms" : {
                   "calculationPeriodDates" : {
                     "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "M",
                       "meta" : {
-                        "externalKey" : "CalculationPeriods",
-                        "globalKey" : "12601"
+                        "globalKey" : "11e9",
+                        "externalKey" : "CalculationPeriods"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 1,
                       "balanceOfFirstPeriod" : false
                     },
                     "meta" : {
-                      "globalKey" : "12601"
+                      "globalKey" : "11e9"
                     }
                   },
                   "observationDates" : {
                     "parametricDates" : {
+                      "dayType" : "Business",
+                      "dayDistribution" : "All",
                       "businessCenters" : {
                         "commodityBusinessCalendar" : [ {
                           "value" : "NYMEX-OIL"
@@ -241,191 +198,234 @@
                         "meta" : {
                           "globalKey" : "ae251688"
                         }
-                      },
-                      "dayDistribution" : "ALL",
-                      "dayType" : "BUSINESS"
+                      }
                     }
                   }
                 },
-                "optionType" : "PUT",
-                "underlier" : {
-                  "commodity" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "commodity-1"
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "0"
-                  }
+                "meta" : {
+                  "globalKey" : "22589e46"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "22589e46"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "3f6719bc"
+            "globalKey" : "845974a4"
           }
         },
         "meta" : {
-          "globalKey" : "3f6719bc"
+          "globalKey" : "845974a4"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "c6e30928"
-          },
+          "quantity" : [ {
+            "value" : {
+              "value" : 15000,
+              "unit" : {
+                "capacityUnit" : "BBL"
+              },
+              "frequency" : {
+                "periodMultiplier" : 1,
+                "period" : "C",
+                "meta" : {
+                  "globalKey" : "62"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          }, {
+            "value" : {
+              "value" : 15000,
+              "unit" : {
+                "capacityUnit" : "BBL"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
           "observable" : {
             "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-1"
-                } ]
-              },
               "value" : {
                 "productIdentifier" : [ {
                   "value" : {
                     "identifier" : {
+                      "value" : "OIL-WTI-NYMEX",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/commodity-reference-price-1-0"
-                      },
-                      "value" : "OIL-WTI-NYMEX"
+                      }
                     },
+                    "source" : "ISDACRP",
                     "meta" : {
                       "globalKey" : "465ddc73"
-                    },
-                    "source" : "ISDACRP"
+                    }
                   }
                 } ],
+                "priceQuoteType" : "Settlement",
                 "deliveryDateReference" : {
                   "deliveryNearby" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 1,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
                   }
-                },
-                "priceQuoteType" : "SETTLEMENT"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-1"
+                } ]
               }
             },
             "meta" : {
-              "globalKey" : "c678b56a"
+              "globalKey" : "89ce3be"
             }
           },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "BBL"
-              },
-              "value" : 15000,
-              "frequency" : {
-                "meta" : {
-                  "globalKey" : "81e"
-                },
-                "period" : "C",
-                "periodMultiplier" : 1
-              }
-            }
-          }, {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "BBL"
-              },
-              "value" : 15000
-            }
-          } ]
+          "meta" : {
+            "globalKey" : "cd75b3f0"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb90a"
-      },
-      "value" : "2007-04-10"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "a977e59e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fb7fd677"
+      }
+    },
+    "meta" : {
+      "globalKey" : "83bfb2a7"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "c2f7ddec"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        }
-      },
       "quantity" : {
+        "value" : 32000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
         },
-        "value" : 32000
+        "receiverPartyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2007-04-12",
         "dateAdjustments" : {
-          "businessDayConvention" : "NOT_APPLICABLE",
+          "businessDayConvention" : "NotApplicable",
           "meta" : {
             "globalKey" : "3a4b88ab"
           }
-        },
-        "unadjustedDate" : "2007-04-12"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "7cb6aff0"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "d0d3a6d7"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex28-gas-swap-daily-delivery-prices-option-last.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex28-gas-swap-daily-delivery-prices-option-last.json
index 08cfa46d6a..cc26f87710 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex28-gas-swap-daily-delivery-prices-option-last.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex28-gas-swap-daily-delivery-prices-option-last.json
@@ -1,106 +1,55 @@
 {
-  "meta" : {
-    "globalKey" : "899846db"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "a977e59e"
         }
       } ],
       "meta" : {
-        "globalKey" : "fb7fd677"
+        "globalKey" : "9598cc47"
       }
-    },
-    "meta" : {
-      "globalKey" : "899846db"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.PartyB.com/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-06-01",
+      "meta" : {
+        "globalKey" : "3eb181"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "CommoditySwap",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-type-simple"
-                },
-                "value" : "CommoditySwap"
+                }
               }
             }
           }, {
@@ -110,70 +59,104 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2006-07-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25a4ce2c"
-                },
-                "unadjustedDate" : "2006-07-01"
+                }
               },
               "meta" : {
                 "globalKey" : "25a4ce2c"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-07-31",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "25a53eca"
+                }
+              },
+              "meta" : {
+                "globalKey" : "25a53eca"
+              }
+            },
             "payout" : {
               "commodityPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
+                },
+                "pricingDates" : {
+                  "parametricDates" : {
+                    "dayType" : "Business",
+                    "dayDistribution" : "Last",
+                    "businessCenters" : {
+                      "commodityBusinessCalendar" : [ {
+                        "value" : "NYMEX-NATURAL-GAS"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "acc66859"
+                      }
+                    }
+                  }
                 },
                 "calculationPeriodDates" : {
                   "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
                     "meta" : {
-                      "externalKey" : "floatingLegCalculationPeriods",
-                      "globalKey" : "12601"
+                      "globalKey" : "11e9",
+                      "externalKey" : "floatingLegCalculationPeriods"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 1,
                     "balanceOfFirstPeriod" : false
                   },
                   "meta" : {
-                    "globalKey" : "12601"
+                    "globalKey" : "11e9"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "528b7cbe"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "6b379f36"
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
+                    },
+                    "dayType" : "Business"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -182,32 +165,12 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "meta" : {
                       "globalKey" : "a98752b1"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf9f"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
-                  }
-                },
-                "pricingDates" : {
-                  "parametricDates" : {
-                    "businessCenters" : {
-                      "commodityBusinessCalendar" : [ {
-                        "value" : "NYMEX-NATURAL-GAS"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "acc66859"
-                      }
-                    },
-                    "dayDistribution" : "LAST",
-                    "dayType" : "BUSINESS"
+                  "meta" : {
+                    "globalKey" : "ff6175f6"
                   }
                 },
                 "underlier" : {
@@ -220,41 +183,39 @@
                   "meta" : {
                     "globalKey" : "0"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "202d7348"
                 }
               } ],
               "fixedPricePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "fixedPrice" : {
-                  "price" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    }
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "e17aca77"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "6b379f36"
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
+                    },
+                    "dayType" : "Business"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -263,231 +224,270 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "meta" : {
                       "globalKey" : "a98752b1"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf9f"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "241ca179"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
                   "meta" : {
-                    "globalKey" : "3a4b88ab"
+                    "globalKey" : "ff6175f6"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "25a53eca"
+                "fixedPrice" : {
+                  "price" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2006-07-31"
-              },
+                "meta" : {
+                  "globalKey" : "6310740b"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "25a53eca"
+                "globalKey" : "d41ef9c3"
               }
             }
           },
           "meta" : {
-            "globalKey" : "e221d06d"
+            "globalKey" : "d508fa35"
           }
         },
         "meta" : {
-          "globalKey" : "e221d06d"
+          "globalKey" : "d508fa35"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "22f7394d"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 6.295,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 6.295,
-              "cashPrice" : {
-                "cashPriceType" : "FEE"
-              },
               "perUnitOf" : {
                 "capacityUnit" : "USMMBTU"
               },
-              "priceType" : "CASH_PRICE"
+              "priceType" : "CashPrice",
+              "cashPrice" : {
+                "cashPriceType" : "Fee"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 2500.0,
+              "unit" : {
+                "capacityUnit" : "USMMBTU"
+              },
+              "frequency" : {
+                "periodMultiplier" : 1,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "63"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
+            }
+          }, {
+            "value" : {
+              "value" : 77500.0,
+              "unit" : {
+                "capacityUnit" : "USMMBTU"
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-3"
+              } ]
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "70ac5839"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 2500.0,
               "unit" : {
                 "capacityUnit" : "USMMBTU"
               },
-              "value" : 2500.0,
               "frequency" : {
-                "meta" : {
-                  "globalKey" : "83d"
-                },
+                "periodMultiplier" : 1,
                 "period" : "D",
-                "periodMultiplier" : 1
+                "meta" : {
+                  "globalKey" : "63"
+                }
               }
-            }
-          }, {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-3"
+                "value" : "quantity-4"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 77500.0,
               "unit" : {
                 "capacityUnit" : "USMMBTU"
-              },
-              "value" : 77500.0
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "ed57726c"
-          },
+          } ],
           "observable" : {
             "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-1"
-                } ]
-              },
               "value" : {
                 "productIdentifier" : [ {
                   "value" : {
                     "identifier" : {
+                      "value" : "NATURAL GAS-HENRY HUB-NYMEX",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/commodity-reference-price-1-0"
-                      },
-                      "value" : "NATURAL GAS-HENRY HUB-NYMEX"
+                      }
                     },
+                    "source" : "ISDACRP",
                     "meta" : {
                       "globalKey" : "8ac8d504"
-                    },
-                    "source" : "ISDACRP"
+                    }
                   }
                 } ],
+                "priceQuoteType" : "Settlement",
                 "deliveryDateReference" : {
                   "deliveryNearby" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 1,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
                   }
-                },
-                "priceQuoteType" : "SETTLEMENT"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-1"
+                } ]
               }
             },
             "meta" : {
-              "globalKey" : "dd976f79"
+              "globalKey" : "d5556b8f"
             }
           },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-4"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "USMMBTU"
-              },
-              "value" : 2500.0,
-              "frequency" : {
-                "meta" : {
-                  "globalKey" : "83d"
-                },
-                "period" : "D",
-                "periodMultiplier" : 1
-              }
-            }
-          }, {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "USMMBTU"
-              },
-              "value" : 77500.0
-            }
-          } ]
+          "meta" : {
+            "globalKey" : "d84be710"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb181"
-      },
-      "value" : "2006-06-01"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "a977e59e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fb7fd677"
+      }
+    },
+    "meta" : {
+      "globalKey" : "b506cc73"
+    }
+  },
+  "meta" : {
+    "globalKey" : "b506cc73"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex39-basket-option-confirmation.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex39-basket-option-confirmation.json
index c5610cfabb..8518ab67df 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex39-basket-option-confirmation.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex39-basket-option-confirmation.json
@@ -1,128 +1,128 @@
 {
-  "meta" : {
-    "globalKey" : "e28e495d"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "e4803fed"
-    },
-    "party" : [ {
-      "contactInformation" : {
-        "address" : [ {
-          "country" : {
-            "value" : "US"
-          }
-        } ]
-      },
-      "meta" : {
-        "externalKey" : "PartyA",
-        "globalKey" : "3c0bac94"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "8fe8c094",
+        "externalReference" : "PartyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "ABCD1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "95980020140005196564"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "a66e20f6"
+            "scheme" : "http://www.PartyA.com/com-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "PartyB",
-        "globalKey" : "37ee66b8"
+        "globalKey" : "86a58769"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "37ee66b8",
+        "externalReference" : "PartyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "EFGH2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300XQFX97CITUR430"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "37ee66b8"
+            "scheme" : "http://www.PartyB.com/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "cfd508"
+      }
     } ],
     "tradeDate" : {
+      "value" : "2013-04-01",
       "meta" : {
         "globalKey" : "3ee901"
-      },
-      "value" : "2013-04-01"
+      }
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "95980020140005196564",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "ABCD1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "a66e20f6"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "PartyA",
-        "globalReference" : "3c0bac94"
+      "contactInformation" : {
+        "address" : [ {
+          "country" : {
+            "value" : "US"
+          }
+        } ]
       },
       "meta" : {
-        "globalKey" : "61e700bf"
+        "globalKey" : "8fe8c094",
+        "externalKey" : "PartyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300XQFX97CITUR430",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "EFGH2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "37ee66b8"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "PartyB",
-        "globalReference" : "37ee66b8"
-      },
       "meta" : {
-        "globalKey" : "f8ff8a00"
+        "globalKey" : "37ee66b8",
+        "externalKey" : "PartyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "b5172a4b"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "c9434ab0"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "PartyA",
-          "globalReference" : "3c0bac94"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "PartyB",
-          "globalReference" : "37ee66b8"
-        }
-      },
       "quantity" : {
+        "value" : 1000000.00,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "8fe8c094",
+          "externalReference" : "PartyA"
         },
-        "value" : 1000000.00
+        "receiverPartyReference" : {
+          "globalReference" : "37ee66b8",
+          "externalReference" : "PartyB"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2013-01-03",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2013-01-03"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "7da88134"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "eff3cebf"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex41-oil-asian-barrier-option-strip.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex41-oil-asian-barrier-option-strip.json
index 02c81da32d..620abb0f21 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex41-oil-asian-barrier-option-strip.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex41-oil-asian-barrier-option-strip.json
@@ -1,75 +1,38 @@
 {
-  "meta" : {
-    "globalKey" : "3ed1bf20"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "7fad4be0"
-    },
-    "party" : [ {
-      "contactInformation" : {
-        "address" : [ {
-          "country" : {
-            "value" : "US"
-          }
-        } ]
-      },
-      "meta" : {
-        "externalKey" : "PartyA",
-        "globalKey" : "3c0bac94"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "8fe8c094",
+        "externalReference" : "PartyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UVXY54321",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "95980020140005196564"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "a66e20f6"
+            "scheme" : "http://www.PartyA.com/com-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "PartyB",
-        "globalKey" : "37ee66b8"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300XQFX97CITUR430"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "37ee66b8"
-        }
-      } ]
+        "globalKey" : "f758c676"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2012-11-15",
+      "meta" : {
+        "globalKey" : "3ee2cf",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "PartyB",
-          "globalReference" : "37ee66b8"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "PartyA",
-          "globalReference" : "3c0bac94"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
-              "value" : "COMMODITY"
+              "value" : "Commodity"
             }
           }, {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Commodity:Energy:Oil:Option:Cash"
@@ -82,6 +45,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2013-01-01",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -90,114 +54,123 @@
                 },
                 "meta" : {
                   "globalKey" : "ec4a8339"
-                },
-                "unadjustedDate" : "2013-01-01"
+                }
               },
               "meta" : {
                 "globalKey" : "ec4a8339"
               }
             },
-            "payout" : {
-              "meta" : {
-                "globalKey" : "6574ce7f"
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2013-03-30",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ec4cd096"
+                }
               },
+              "meta" : {
+                "globalKey" : "ec4cd096"
+              }
+            },
+            "payout" : {
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "80e4d980"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 5,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "5f4eeb79"
+                          "globalKey" : "5f333497"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 5,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
                         "businessDayConvention" : "NONE"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "5f4eeb79"
+                      "globalKey" : "5f333497"
                     }
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "80c9229e"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2013-01-31",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "2671d54a"
-                          },
-                          "unadjustedDate" : "2013-01-31"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "2671d54a"
                         }
                       }, {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2013-02-28",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "2672ba47"
-                          },
-                          "unadjustedDate" : "2013-02-28"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "2672ba47"
                         }
                       }, {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2013-03-31",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "2673b5ca"
-                          },
-                          "unadjustedDate" : "2013-03-31"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "2673b5ca"
@@ -207,201 +180,223 @@
                         "globalKey" : "f676dfdb"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
+                    }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "6574ce7f"
+                "underlier" : {
+                  "commodity" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "commodity-1"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
                 },
                 "observationTerms" : {
                   "calculationPeriodDates" : {
                     "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "Y",
                       "meta" : {
-                        "externalKey" : "CalculationPeriodsSchedule",
-                        "globalKey" : "1530d"
+                        "globalKey" : "135d",
+                        "externalKey" : "CalculationPeriodsSchedule"
                       },
-                      "period" : "Y",
-                      "periodMultiplier" : 1,
                       "balanceOfFirstPeriod" : false
                     },
                     "meta" : {
-                      "globalKey" : "1530d"
+                      "globalKey" : "135d"
                     }
                   },
                   "observationDates" : {
                     "parametricDates" : {
-                      "dayDistribution" : "LAST",
-                      "dayType" : "BUSINESS"
-                    }
-                  }
-                },
-                "optionType" : "CALL",
-                "underlier" : {
-                  "commodity" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "commodity-1"
+                      "dayType" : "Business",
+                      "dayDistribution" : "Last"
                     }
-                  },
-                  "meta" : {
-                    "globalKey" : "0"
-                  }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "ec4cd096"
-                },
-                "unadjustedDate" : "2013-03-30"
-              },
+                  "globalKey" : "5755f4bf"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "ec4cd096"
+                "globalKey" : "5755f4bf"
               }
             }
           },
           "meta" : {
-            "globalKey" : "f8d00a98"
+            "globalKey" : "eff7270a"
           }
         },
         "meta" : {
-          "globalKey" : "f8d00a98"
+          "globalKey" : "eff7270a"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "d82faee0"
-          },
-          "observable" : {
-            "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-1"
-                } ]
+          "quantity" : [ {
+            "value" : {
+              "value" : 10000,
+              "unit" : {
+                "capacityUnit" : "BBL"
               },
-              "value" : {
-                "productIdentifier" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/commodity-reference-price-3-0"
-                      },
-                      "value" : "OIL-BRENT-IPE"
-                    },
-                    "meta" : {
-                      "globalKey" : "b1f5e60b"
-                    },
-                    "source" : "ISDACRP"
-                  }
-                } ],
-                "priceQuoteType" : "SETTLEMENT"
+              "frequency" : {
+                "periodMultiplier" : 1,
+                "period" : "C",
+                "meta" : {
+                  "globalKey" : "62"
+                }
               }
             },
-            "meta" : {
-              "globalKey" : "ae17507e"
-            }
-          },
-          "quantity" : [ {
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 30000,
               "unit" : {
                 "capacityUnit" : "BBL"
-              },
-              "value" : 10000,
-              "frequency" : {
-                "meta" : {
-                  "globalKey" : "81e"
-                },
-                "period" : "C",
-                "periodMultiplier" : 1
               }
-            }
-          }, {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "BBL"
+            }
+          } ],
+          "observable" : {
+            "commodity" : {
+              "value" : {
+                "productIdentifier" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "OIL-BRENT-IPE",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/commodity-reference-price-3-0"
+                      }
+                    },
+                    "source" : "ISDACRP",
+                    "meta" : {
+                      "globalKey" : "b1f5e60b"
+                    }
+                  }
+                } ],
+                "priceQuoteType" : "Settlement"
               },
-              "value" : 30000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "14d2bf42"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "f6d065a8"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "37ee66b8",
+          "externalReference" : "PartyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "8fe8c094",
+          "externalReference" : "PartyA"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3ee2cf"
-      },
-      "value" : "2012-11-15"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "95980020140005196564",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "UVXY54321"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "a66e20f6"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "PartyA",
-        "globalReference" : "3c0bac94"
+      "contactInformation" : {
+        "address" : [ {
+          "country" : {
+            "value" : "US"
+          }
+        } ]
       },
       "meta" : {
-        "globalKey" : "72c6b08c"
+        "globalKey" : "8fe8c094",
+        "externalKey" : "PartyA"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300XQFX97CITUR430",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "37ee66b8"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "37ee66b8",
+        "externalKey" : "PartyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "967913e0"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "685bef00"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "PartyB",
-          "globalReference" : "37ee66b8"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "PartyA",
-          "globalReference" : "3c0bac94"
-        }
-      },
       "quantity" : {
+        "value" : 30000.00,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "37ee66b8",
+          "externalReference" : "PartyB"
         },
-        "value" : 30000.00
+        "receiverPartyReference" : {
+          "globalReference" : "8fe8c094",
+          "externalReference" : "PartyA"
+        }
       },
       "settlementDate" : {
         "relativeDate" : {
+          "periodMultiplier" : 2,
+          "period" : "D",
           "meta" : {
-            "globalKey" : "d5304345"
+            "globalKey" : "63993681"
           },
-          "period" : "D",
-          "periodMultiplier" : 2,
-          "dayType" : "BUSINESS",
+          "dayType" : "Business",
+          "businessDayConvention" : "NONE",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "USNY"
@@ -410,16 +405,21 @@
               "globalKey" : "27e4e9"
             }
           },
-          "businessDayConvention" : "NONE",
           "dateRelativeTo" : {
-            "externalReference" : "TradeDate",
-            "globalReference" : "3ee2cf"
+            "globalReference" : "3ee2cf",
+            "externalReference" : "TradeDate"
           }
         }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "c5c48f74"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "f8bf9794"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex46-simple-financial-put-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex46-simple-financial-put-option.json
index d3f46d6066..67fda3a6c0 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex46-simple-financial-put-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/commodity/com-ex46-simple-financial-put-option.json
@@ -1,106 +1,29 @@
 {
-  "meta" : {
-    "globalKey" : "75dc4875"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2010-11-10",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "ed4086fd"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "76841099"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "a84a22fc"
-      }
-    },
-    "meta" : {
-      "globalKey" : "30f8234b"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "4631cb97"
-      },
-      "name" : {
-        "value" : "Bank A"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "35df9397",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "GHJK0987",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5299000NIGT14YW8ZD26"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "24297a9a"
+            "scheme" : "http://www.PartyA.com/com-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "cdb1079a"
-      },
-      "name" : {
-        "value" : "Energy Co."
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "969500QCC36R89FI3U25"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "2770ccf0"
-        }
-      } ]
+        "globalKey" : "c8340faf"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2012-04-10",
+      "meta" : {
+        "globalKey" : "3ee10a"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "4631cb97"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "cdb1079a"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "4631cb97"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -108,139 +31,161 @@
             "productQualifier" : "Commodity_Option"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2012-09-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "265adeac"
-                },
-                "unadjustedDate" : "2012-09-01"
+                }
               },
               "meta" : {
                 "globalKey" : "265adeac"
               }
             },
-            "payout" : {
-              "meta" : {
-                "globalKey" : "c0566637"
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2012-09-30",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "265b4b89"
+                }
               },
+              "meta" : {
+                "globalKey" : "265b4b89"
+              }
+            },
+            "payout" : {
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7b032817"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 5,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "596d3a10"
+                          "globalKey" : "5951832e"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 5,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
                         "businessDayConvention" : "MODFOLLOWING"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "596d3a10"
+                      "globalKey" : "5951832e"
                     }
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7ae77135"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Put",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
-                        "meta" : {
-                          "globalKey" : "998ba0a3"
-                        },
                         "relativeDate" : {
+                          "periodMultiplier" : 0,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "998ba0a3"
+                            "globalKey" : "95ec4b9b"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 0,
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                          "businessDayConvention" : "NotApplicable",
                           "dateRelativeTo" : {
                             "externalReference" : "PricingDate"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "95ec4b9b"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "998ba0a3"
+                        "globalKey" : "95ec4b9b"
                       }
                     }
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 1.9500,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.9500,
                       "perUnitOf" : {
                         "capacityUnit" : "USMMBTU"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
+                    }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "c0566637"
+                "underlier" : {
+                  "commodity" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "commodity-1"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
                 },
                 "observationTerms" : {
                   "calculationPeriodDates" : {
                     "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "M",
                       "meta" : {
-                        "externalKey" : "CalculationPeriods",
-                        "globalKey" : "12601"
+                        "globalKey" : "11e9",
+                        "externalKey" : "CalculationPeriods"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 1,
                       "balanceOfFirstPeriod" : false
                     },
                     "meta" : {
-                      "globalKey" : "12601"
+                      "globalKey" : "11e9"
                     }
                   },
                   "observationDates" : {
                     "parametricDates" : {
+                      "dayType" : "Business",
+                      "dayDistribution" : "Last",
                       "businessCenters" : {
                         "commodityBusinessCalendar" : [ {
                           "value" : "GAS-DAILY-PRICE-GUIDE"
@@ -248,183 +193,238 @@
                         "meta" : {
                           "globalKey" : "3c9a52fa"
                         }
-                      },
-                      "dayDistribution" : "LAST",
-                      "dayType" : "BUSINESS"
-                    }
-                  }
-                },
-                "optionType" : "PUT",
-                "underlier" : {
-                  "commodity" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "commodity-1"
+                      }
                     }
-                  },
-                  "meta" : {
-                    "globalKey" : "0"
-                  }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
-                  "meta" : {
-                    "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "265b4b89"
-                },
-                "unadjustedDate" : "2012-09-30"
-              },
+                  "globalKey" : "b0600439"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "265b4b89"
+                "globalKey" : "b0600439"
               }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "a2fa3034"
+            "globalKey" : "bb2cec66"
           }
         },
         "meta" : {
-          "globalKey" : "a2fa3034"
+          "globalKey" : "bb2cec66"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7bc49032"
-          },
-          "observable" : {
-            "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-1"
-                } ]
+          "quantity" : [ {
+            "value" : {
+              "value" : 10000,
+              "unit" : {
+                "capacityUnit" : "USMMBTU"
               },
-              "value" : {
-                "productIdentifier" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "meta" : {
-                        "scheme" : "http://www.partyA.com/instrumentId/commodity-reference-price"
-                      },
-                      "value" : "NATURAL GAS-LOUISIANA (HENRY HUB)-GAS DAILY"
-                    },
-                    "meta" : {
-                      "globalKey" : "b5d477df"
-                    },
-                    "source" : "ISDACRP"
-                  }
-                } ],
-                "priceQuoteType" : "MID"
+              "frequency" : {
+                "periodMultiplier" : 1,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "63"
+                }
               }
             },
-            "meta" : {
-              "globalKey" : "4bbae29"
-            }
-          },
-          "quantity" : [ {
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 300000,
               "unit" : {
                 "capacityUnit" : "USMMBTU"
-              },
-              "value" : 10000,
-              "frequency" : {
-                "meta" : {
-                  "globalKey" : "83d"
-                },
-                "period" : "D",
-                "periodMultiplier" : 1
               }
-            }
-          }, {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "USMMBTU"
+            }
+          } ],
+          "observable" : {
+            "commodity" : {
+              "value" : {
+                "productIdentifier" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "NATURAL GAS-LOUISIANA (HENRY HUB)-GAS DAILY",
+                      "meta" : {
+                        "scheme" : "http://www.partyA.com/instrumentId/commodity-reference-price"
+                      }
+                    },
+                    "source" : "ISDACRP",
+                    "meta" : {
+                      "globalKey" : "b5d477df"
+                    }
+                  }
+                } ],
+                "priceQuoteType" : "Mid"
               },
-              "value" : 300000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "92ba16f7"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "641ae2c2"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "dc7d709a",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "35df9397",
+          "externalReference" : "partyA"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "35df9397",
+          "externalReference" : "partyA"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee10a"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "5299000NIGT14YW8ZD26",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "24297a9a"
+        }
+      } ],
+      "name" : {
+        "value" : "Bank A"
       },
-      "value" : "2012-04-10"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "35df9397",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "969500QCC36R89FI3U25",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "GHJK0987"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "2770ccf0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "4631cb97"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "13f94b45"
+        "globalKey" : "dc7d709a",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2010-11-10",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed4086fd"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "76841099"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "a84a22fc"
+      }
+    },
+    "meta" : {
+      "globalKey" : "2cf309fd"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "69c41ea"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "cdb1079a"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "4631cb97"
-        }
-      },
       "quantity" : {
+        "value" : 40500.00,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "dc7d709a",
+          "externalReference" : "partyB"
         },
-        "value" : 40500.00
+        "receiverPartyReference" : {
+          "globalReference" : "35df9397",
+          "externalReference" : "partyA"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2012-04-12",
         "dateAdjustments" : {
           "businessDayConvention" : "FOLLOWING",
           "meta" : {
             "globalKey" : "d3bf0271"
           }
-        },
-        "unadjustedDate" : "2012-04-12"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "f2151f7e"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "271a843b"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex01-correlation-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex01-correlation-swap.json
index 42e8027176..057cf7d03a 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex01-correlation-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex01-correlation-swap.json
@@ -1,101 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "2cebf68a"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "kom722"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "6234",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/coding-scheme/trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
       "meta" : {
-        "globalKey" : "92c7c587"
+        "globalKey" : "ea0f3ecf"
       }
-    },
-    "meta" : {
-      "globalKey" : "2cebf68a"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "kom722",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "kow029",
-        "globalKey" : "33f59568"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "kow029"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "6569",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/coding-scheme/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ef1edd3e"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2007-01-05",
+      "meta" : {
+        "globalKey" : "3eb845"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "kom722",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "kom722",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "kow029",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -103,42 +47,35 @@
             "productQualifier" : "EquitySwap_ParameterReturnCorrelation_Basket"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "7005ccd2"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "ec508fc9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "c2ab5116"
+                          "globalKey" : "51144452"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -147,37 +84,35 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "vd903",
-                          "globalReference" : "2603dafe"
+                          "globalReference" : "2603dafe",
+                          "externalReference" : "vd903"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "c2ab5116"
+                      "globalKey" : "51144452"
                     }
                   },
-                  "settlementType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "7005ccd2"
+                  "meta" : {
+                    "globalKey" : "7ab98305"
+                  }
                 },
                 "observationTerms" : {
                   "observationDates" : {
                     "periodicSchedule" : {
                       "startDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2007-01-05",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "25bd43b0"
-                          },
-                          "unadjustedDate" : "2007-01-05"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "25bd43b0"
@@ -186,121 +121,125 @@
                     }
                   }
                 },
-                "returnTerms" : {
-                  "correlationReturnTerms" : {
-                    "dividendApplicability" : {
-                      "allDividends" : false
-                    },
-                    "expectedN" : 120,
-                    "boundedCorrelation" : {
-                      "lowerBound" : {
-                        "number" : 0.35123
+                "valuationDates" : {
+                  "valuationDatesFinal" : {
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2009-12-19",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "2603dafe"
+                        }
                       },
-                      "upperBound" : {
-                        "number" : 0.85123
+                      "meta" : {
+                        "globalKey" : "2603dafe",
+                        "externalKey" : "vd903"
                       }
                     },
-                    "correlationStrikePrice" : {
-                      "value" : 0.60123,
-                      "priceType" : "CORRELATION"
-                    },
-                    "numberOfDataSeries" : 1
+                    "meta" : {
+                      "globalKey" : "2603dafe"
+                    }
                   }
                 },
                 "underlier" : {
                   "basket" : {
                     "basketConstituent" : [ {
-                      "meta" : {
-                        "globalKey" : "a316326"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "IBM.N",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                              },
-                              "value" : "IBM.N"
+                              }
                             },
+                            "source" : "Other",
                             "meta" : {
                               "globalKey" : "ea9e6624"
-                            },
-                            "source" : "OTHER"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
                               "value" : "International Business Machines Common Share"
                             },
+                            "source" : "Name",
                             "meta" : {
                               "globalKey" : "22f76b5b"
-                            },
-                            "source" : "NAME"
+                            }
                           }
                         } ],
-                        "securityType" : "EQUITY"
+                        "securityType" : "Equity"
+                      },
+                      "meta" : {
+                        "globalKey" : "a316326"
                       }
                     }, {
-                      "meta" : {
-                        "globalKey" : "ef45fab9"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "MSFT.O",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                              },
-                              "value" : "MSFT.O"
+                              }
                             },
+                            "source" : "Other",
                             "meta" : {
                               "globalKey" : "6e9264c5"
-                            },
-                            "source" : "OTHER"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
                               "value" : "Microsoft Common Share"
                             },
+                            "source" : "Name",
                             "meta" : {
                               "globalKey" : "47564f47"
-                            },
-                            "source" : "NAME"
+                            }
                           }
                         } ],
-                        "securityType" : "EQUITY"
+                        "securityType" : "Equity"
+                      },
+                      "meta" : {
+                        "globalKey" : "ef45fab9"
                       }
                     }, {
-                      "meta" : {
-                        "globalKey" : "5b336f8"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "B.N",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                              },
-                              "value" : "B.N"
+                              }
                             },
+                            "source" : "Other",
                             "meta" : {
                               "globalKey" : "e67b8892"
-                            },
-                            "source" : "OTHER"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
                               "value" : "Barnes and Noble Common Share"
                             },
+                            "source" : "Name",
                             "meta" : {
                               "globalKey" : "ba5899db"
-                            },
-                            "source" : "NAME"
+                            }
                           }
                         } ],
-                        "securityType" : "EQUITY"
+                        "securityType" : "Equity"
+                      },
+                      "meta" : {
+                        "globalKey" : "5b336f8"
                       }
                     } ]
                   },
@@ -308,104 +247,165 @@
                     "globalKey" : "9aa5b557"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "meta" : {
-                      "globalKey" : "2603dafe"
+                "returnTerms" : {
+                  "correlationReturnTerms" : {
+                    "dividendApplicability" : {
+                      "allDividends" : false
                     },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "2603dafe"
-                        },
-                        "unadjustedDate" : "2009-12-19"
+                    "expectedN" : 120,
+                    "correlationStrikePrice" : {
+                      "value" : 0.60123,
+                      "priceType" : "Correlation"
+                    },
+                    "boundedCorrelation" : {
+                      "lowerBound" : {
+                        "number" : 0.35123
                       },
-                      "meta" : {
-                        "externalKey" : "vd903",
-                        "globalKey" : "2603dafe"
+                      "upperBound" : {
+                        "number" : 0.85123
                       }
-                    }
+                    },
+                    "numberOfDataSeries" : 1
                   }
+                },
+                "meta" : {
+                  "globalKey" : "17e70742"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "17e70742"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "7b60b53c"
+            "globalKey" : "68e27ac"
           }
         },
         "meta" : {
-          "globalKey" : "7b60b53c"
+          "globalKey" : "68e27ac"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "4b0fa4c4"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 350000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 350000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "16e4f3bc"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "kom722"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "kow029"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "kom722"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb845"
-      },
-      "value" : "2007-01-05"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/coding-scheme/trade-id"
-          },
-          "value" : "6234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "kom722",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "1be3576b"
+        "globalKey" : "33f59567",
+        "externalKey" : "kom722"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/coding-scheme/trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "kow029"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "6569"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "kow029",
-        "globalReference" : "33f59568"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "1c137f46"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "d47ae5f8"
+    }
+  },
+  "meta" : {
+    "globalKey" : "d47ae5f8"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex02-correlation-swap-confirmation.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex02-correlation-swap-confirmation.json
index 2195c31e11..e7cdda640e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex02-correlation-swap-confirmation.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex02-correlation-swap-confirmation.json
@@ -1,124 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "1500fe48"
-  },
   "trade" : {
-    "account" : [ {
-      "accountNumber" : {
-        "meta" : {
-          "scheme" : "http://www.partyA.com/coding-scheme/account-id"
-        },
-        "value" : "4345334"
-      },
-      "meta" : {
-        "externalKey" : "gh4903-uw2992",
-        "globalKey" : "a173333d"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "83102f24",
+        "externalReference" : "gh4903"
       },
-      "servicingParty" : {
-        "externalReference" : "gh4903",
-        "globalReference" : "3d50b0ca"
-      }
-    } ],
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "6234",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/coding-scheme/trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "governingLaw" : {
-        "value" : "USNY"
-      },
       "meta" : {
-        "globalKey" : "92ce63ac"
+        "globalKey" : "fde00dd4"
       }
-    },
-    "meta" : {
-      "globalKey" : "1500fe48"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "ab9560",
-        "globalKey" : "21c23a5b"
-      },
-      "name" : {
-        "value" : "Client"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "959800NKRMZ8NEKQ0A23"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "696247f0"
-        }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "gh4903",
-        "globalKey" : "3d50b0ca"
-      },
-      "name" : {
-        "value" : "Bank A"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     } ],
+    "tradeDate" : {
+      "value" : "2007-05-01",
+      "meta" : {
+        "globalKey" : "3eb941",
+        "externalKey" : "td9202"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "gh4903",
-          "globalReference" : "3d50b0ca"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "ab9560",
-          "globalReference" : "21c23a5b"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "gh4903",
-          "globalReference" : "3d50b0ca"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -126,56 +32,52 @@
             "productQualifier" : "EquitySwap_ParameterReturnCorrelation_Basket"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "extraordinaryEvents" : {
-              "failureToDeliver" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "CALCULATION_AGENT",
-                "shareForOther" : "CALCULATION_AGENT",
-                "shareForShare" : "CALCULATION_AGENT"
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "538ca0c6"
+                },
+                "businessDayConvention" : "NONE",
+                "dateRelativeTo" : {
+                  "globalReference" : "235d2240",
+                  "externalReference" : "sd2344"
+                }
               },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "tenderOfferEvents" : {
-                "shareForCombined" : "CALCULATION_AGENT",
-                "shareForOther" : "CALCULATION_AGENT",
-                "shareForShare" : "CALCULATION_AGENT"
+              "meta" : {
+                "globalKey" : "538ca0c6"
               }
             },
             "payout" : {
-              "meta" : {
-                "globalKey" : "3c1f7973"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "92362b95"
-                  },
+                  "settlementType" : "Cash",
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "6890ece2"
+                          "globalKey" : "235d2240"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -184,38 +86,36 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "vs8292",
-                          "globalReference" : "eb9b0479"
+                          "globalReference" : "eb9b0479",
+                          "externalReference" : "vs8292"
                         }
                       }
                     },
                     "meta" : {
-                      "externalKey" : "sd2344",
-                      "globalKey" : "6890ece2"
+                      "globalKey" : "235d2240",
+                      "externalKey" : "sd2344"
                     }
                   },
-                  "settlementType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "3c1f7973"
+                  "meta" : {
+                    "globalKey" : "4d0260f3"
+                  }
                 },
                 "observationTerms" : {
                   "observationDates" : {
                     "periodicSchedule" : {
                       "startDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2007-01-05",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "25bd43b0"
-                          },
-                          "unadjustedDate" : "2007-01-05"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "25bd43b0"
@@ -224,91 +124,95 @@
                     }
                   }
                 },
-                "returnTerms" : {
-                  "correlationReturnTerms" : {
-                    "dividendApplicability" : {
-                      "allDividends" : false
-                    },
-                    "expectedN" : 30,
-                    "boundedCorrelation" : {
-                      "lowerBound" : {
-                        "number" : 0.35123
+                "valuationDates" : {
+                  "valuationDatesFinal" : {
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2007-06-01",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NONE",
+                          "meta" : {
+                            "globalKey" : "24a738"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "eb9b0479"
+                        }
                       },
-                      "upperBound" : {
-                        "number" : 0.85123
+                      "meta" : {
+                        "globalKey" : "eb9b0479",
+                        "externalKey" : "vs8292"
                       }
                     },
-                    "correlationStrikePrice" : {
-                      "value" : 0.60123,
-                      "priceType" : "CORRELATION"
-                    },
-                    "numberOfDataSeries" : 1
+                    "meta" : {
+                      "globalKey" : "eb9b0479"
+                    }
                   }
                 },
                 "underlier" : {
                   "basket" : {
                     "basketConstituent" : [ {
-                      "meta" : {
-                        "globalKey" : "a22467e2"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "IBM.N",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "IBM.N"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "85699343"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "EQUITY"
+                        "securityType" : "Equity"
+                      },
+                      "meta" : {
+                        "globalKey" : "a22467e2"
                       }
                     }, {
-                      "meta" : {
-                        "globalKey" : "9cb03d61"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "MSFT.O",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "MSFT.O"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "95d91e4"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "EQUITY"
+                        "securityType" : "Equity"
+                      },
+                      "meta" : {
+                        "globalKey" : "9cb03d61"
                       }
                     }, {
-                      "meta" : {
-                        "globalKey" : "21eb9334"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "B.N",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "B.N"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "8146b5b1"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "EQUITY"
+                        "securityType" : "Equity"
+                      },
+                      "meta" : {
+                        "globalKey" : "21eb9334"
                       }
                     } ]
                   },
@@ -316,106 +220,202 @@
                     "globalKey" : "91d6ab15"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "meta" : {
-                      "globalKey" : "eb9b0479"
+                "returnTerms" : {
+                  "correlationReturnTerms" : {
+                    "dividendApplicability" : {
+                      "allDividends" : false
                     },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NONE",
-                          "meta" : {
-                            "globalKey" : "24a738"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "eb9b0479"
-                        },
-                        "unadjustedDate" : "2007-06-01"
+                    "expectedN" : 30,
+                    "correlationStrikePrice" : {
+                      "value" : 0.60123,
+                      "priceType" : "Correlation"
+                    },
+                    "boundedCorrelation" : {
+                      "lowerBound" : {
+                        "number" : 0.35123
                       },
-                      "meta" : {
-                        "externalKey" : "vs8292",
-                        "globalKey" : "eb9b0479"
+                      "upperBound" : {
+                        "number" : 0.85123
                       }
-                    }
+                    },
+                    "numberOfDataSeries" : 1
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "meta" : {
-                "globalKey" : "572bf5ce"
-              },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "572bf5ce"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NONE",
-                "dateRelativeTo" : {
-                  "externalReference" : "sd2344",
-                  "globalReference" : "6890ece2"
+                "meta" : {
+                  "globalKey" : "81d478fb"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "81d478fb"
               }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "CalculationAgent",
+                "shareForOther" : "CalculationAgent",
+                "shareForCombined" : "CalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "CalculationAgent",
+                "shareForOther" : "CalculationAgent",
+                "shareForCombined" : "CalculationAgent"
+              },
+              "failureToDeliver" : true,
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "c952e2a2"
+            "globalKey" : "f1b6fee6"
           }
         },
         "meta" : {
-          "globalKey" : "c952e2a2"
+          "globalKey" : "f1b6fee6"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "4b0fa4c4"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 350000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 350000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "16e4f3bc"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "1267ebdb",
+          "externalReference" : "ab9560"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "83102f24",
+          "externalReference" : "gh4903"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "83102f24",
+          "externalReference" : "gh4903"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "td9202",
-        "globalKey" : "3eb941"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "959800NKRMZ8NEKQ0A23",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "696247f0"
+        }
+      } ],
+      "name" : {
+        "value" : "Client"
       },
-      "value" : "2007-05-01"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "1267ebdb",
+        "externalKey" : "ab9560"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/coding-scheme/trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
+      "name" : {
+        "value" : "Bank A"
+      },
+      "meta" : {
+        "globalKey" : "83102f24",
+        "externalKey" : "gh4903"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "6234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "gh4903",
-        "globalReference" : "3d50b0ca"
+      "governingLaw" : {
+        "value" : "USNY"
       },
       "meta" : {
-        "globalKey" : "14936e86"
+        "globalKey" : "92ce63ac"
       }
-    } ]
+    },
+    "account" : [ {
+      "accountNumber" : {
+        "value" : "4345334",
+        "meta" : {
+          "scheme" : "http://www.partyA.com/coding-scheme/account-id"
+        }
+      },
+      "servicingParty" : {
+        "globalReference" : "83102f24",
+        "externalReference" : "gh4903"
+      },
+      "meta" : {
+        "globalKey" : "a173333d",
+        "externalKey" : "gh4903-uw2992"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "b2a87458"
+    }
+  },
+  "meta" : {
+    "globalKey" : "b2a87458"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex03-correlation-swap-confirmation.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex03-correlation-swap-confirmation.json
index cb25b92214..2e9f8d3085 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex03-correlation-swap-confirmation.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex03-correlation-swap-confirmation.json
@@ -1,130 +1,29 @@
 {
-  "meta" : {
-    "globalKey" : "b55762ca"
-  },
   "trade" : {
-    "account" : [ {
-      "accountNumber" : {
-        "meta" : {
-          "scheme" : "http://www.partyA.com/coding-scheme/account-id"
-        },
-        "value" : "4345334"
-      },
-      "meta" : {
-        "externalKey" : "gh4903-uw2992",
-        "globalKey" : "a173333d"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "83102f24",
+        "externalReference" : "gh4903"
       },
-      "servicingParty" : {
-        "externalReference" : "gh4903",
-        "globalReference" : "3d50b0ca"
-      }
-    } ],
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "6234",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/coding-scheme/trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "governingLaw" : {
-        "value" : "USNY"
-      },
       "meta" : {
-        "globalKey" : "92ce63ac"
+        "globalKey" : "fde00dd4"
       }
-    },
-    "meta" : {
-      "globalKey" : "b55762ca"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "ab9560",
-        "globalKey" : "21c23a5b"
-      },
-      "name" : {
-        "value" : "Client"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "959800NKRMZ8NEKQ0A23"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "696247f0"
-        }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "gh4903",
-        "globalKey" : "3d50b0ca"
-      },
-      "name" : {
-        "value" : "Bank A"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     } ],
+    "tradeDate" : {
+      "value" : "2005-11-07",
+      "meta" : {
+        "globalKey" : "3eaac7"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "gh4903",
-          "globalReference" : "3d50b0ca"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "ab9560",
-          "globalReference" : "21c23a5b"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "ab9560",
-          "globalReference" : "21c23a5b"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "gh4903",
-          "globalReference" : "3d50b0ca"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -132,70 +31,52 @@
             "productQualifier" : "EquitySwap_ParameterReturnCorrelation_Basket"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : false,
-                "hedgingDisruption" : false,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : false
-              },
-              "mergerEvents" : {
-                "shareForCombined" : "ALTERNATIVE_OBLIGATION",
-                "shareForOther" : "ALTERNATIVE_OBLIGATION",
-                "shareForShare" : "ALTERNATIVE_OBLIGATION"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "538ca0c6"
+                },
+                "businessDayConvention" : "NONE",
+                "dateRelativeTo" : {
+                  "globalReference" : "82e2774",
+                  "externalReference" : "sd2344"
+                }
               },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "ALTERNATIVE_OBLIGATION",
-                "shareForOther" : "ALTERNATIVE_OBLIGATION",
-                "shareForShare" : "ALTERNATIVE_OBLIGATION"
+              "meta" : {
+                "globalKey" : "538ca0c6"
               }
             },
             "payout" : {
-              "meta" : {
-                "globalKey" : "127b9cdb"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "770730c9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "4d61f216"
+                          "globalKey" : "82e2774"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -204,38 +85,36 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "vs8292",
-                          "globalReference" : "258bafbb"
+                          "globalReference" : "258bafbb",
+                          "externalReference" : "vs8292"
                         }
                       }
                     },
                     "meta" : {
-                      "externalKey" : "sd2344",
-                      "globalKey" : "4d61f216"
+                      "globalKey" : "82e2774",
+                      "externalKey" : "sd2344"
                     }
                   },
-                  "settlementType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "127b9cdb"
+                  "meta" : {
+                    "globalKey" : "31d36627"
+                  }
                 },
                 "observationTerms" : {
                   "observationDates" : {
                     "periodicSchedule" : {
                       "startDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2005-01-31",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "2581954a"
-                          },
-                          "unadjustedDate" : "2005-01-31"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "2581954a"
@@ -244,118 +123,125 @@
                     }
                   }
                 },
-                "returnTerms" : {
-                  "correlationReturnTerms" : {
-                    "expectedN" : 30,
-                    "boundedCorrelation" : {
-                      "lowerBound" : {
-                        "number" : 0.35123
+                "valuationDates" : {
+                  "valuationDatesFinal" : {
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2005-12-16",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "258bafbb"
+                        }
                       },
-                      "upperBound" : {
-                        "number" : 0.85123
+                      "meta" : {
+                        "globalKey" : "258bafbb",
+                        "externalKey" : "vs8292"
                       }
                     },
-                    "correlationStrikePrice" : {
-                      "value" : 0.60123,
-                      "priceType" : "CORRELATION"
-                    },
-                    "numberOfDataSeries" : 1
+                    "meta" : {
+                      "globalKey" : "258bafbb"
+                    }
                   }
                 },
                 "underlier" : {
                   "basket" : {
                     "basketConstituent" : [ {
-                      "meta" : {
-                        "globalKey" : "4ef8186e"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "IBM.N",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "IBM.N"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "85699343"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
                               "value" : "ABN AMRO HOLDING NV"
                             },
+                            "source" : "Name",
                             "meta" : {
                               "globalKey" : "323f6774"
-                            },
-                            "source" : "NAME"
+                            }
                           }
                         } ],
-                        "securityType" : "EQUITY"
+                        "securityType" : "Equity"
+                      },
+                      "meta" : {
+                        "globalKey" : "4ef8186e"
                       }
                     }, {
-                      "meta" : {
-                        "globalKey" : "246480d0"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "MSFT.O",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "MSFT.O"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "95d91e4"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
                               "value" : "AEGON NV"
                             },
+                            "source" : "Name",
                             "meta" : {
                               "globalKey" : "a8b1a4b1"
-                            },
-                            "source" : "NAME"
+                            }
                           }
                         } ],
-                        "securityType" : "EQUITY"
+                        "securityType" : "Equity"
+                      },
+                      "meta" : {
+                        "globalKey" : "246480d0"
                       }
                     }, {
-                      "meta" : {
-                        "globalKey" : "1e641a16"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "B.N",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "B.N"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "8146b5b1"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
                               "value" : "AIR LIQUIDE"
                             },
+                            "source" : "Name",
                             "meta" : {
                               "globalKey" : "af6e555e"
-                            },
-                            "source" : "NAME"
+                            }
                           }
                         } ],
-                        "securityType" : "EQUITY"
+                        "securityType" : "Equity"
+                      },
+                      "meta" : {
+                        "globalKey" : "1e641a16"
                       }
                     } ]
                   },
@@ -363,105 +249,219 @@
                     "globalKey" : "556f1154"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "meta" : {
-                      "globalKey" : "258bafbb"
+                "returnTerms" : {
+                  "correlationReturnTerms" : {
+                    "expectedN" : 30,
+                    "correlationStrikePrice" : {
+                      "value" : 0.60123,
+                      "priceType" : "Correlation"
                     },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "258bafbb"
-                        },
-                        "unadjustedDate" : "2005-12-16"
+                    "boundedCorrelation" : {
+                      "lowerBound" : {
+                        "number" : 0.35123
                       },
-                      "meta" : {
-                        "externalKey" : "vs8292",
-                        "globalKey" : "258bafbb"
+                      "upperBound" : {
+                        "number" : 0.85123
                       }
-                    }
+                    },
+                    "numberOfDataSeries" : 1
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "meta" : {
-                "globalKey" : "572bf5ce"
-              },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "572bf5ce"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NONE",
-                "dateRelativeTo" : {
-                  "externalReference" : "sd2344",
-                  "globalReference" : "4d61f216"
+                "meta" : {
+                  "globalKey" : "ca8416d"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "ca8416d"
               }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "AlternativeObligation",
+                "shareForOther" : "AlternativeObligation",
+                "shareForCombined" : "AlternativeObligation"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "AlternativeObligation",
+                "shareForOther" : "AlternativeObligation",
+                "shareForCombined" : "AlternativeObligation"
+              },
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : false,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : false,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : false,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "e35d3382"
+            "globalKey" : "a88f7232"
           }
         },
         "meta" : {
-          "globalKey" : "e35d3382"
+          "globalKey" : "a88f7232"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "99d6ddfe"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 15000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 15000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a104e1c2"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "1267ebdb",
+          "externalReference" : "ab9560"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "83102f24",
+          "externalReference" : "gh4903"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "83102f24",
+          "externalReference" : "gh4903"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "1267ebdb",
+          "externalReference" : "ab9560"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eaac7"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "959800NKRMZ8NEKQ0A23",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "696247f0"
+        }
+      } ],
+      "name" : {
+        "value" : "Client"
       },
-      "value" : "2005-11-07"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "1267ebdb",
+        "externalKey" : "ab9560"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/coding-scheme/trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
+      "name" : {
+        "value" : "Bank A"
+      },
+      "meta" : {
+        "globalKey" : "83102f24",
+        "externalKey" : "gh4903"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "6234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "gh4903",
-        "globalReference" : "3d50b0ca"
+      "governingLaw" : {
+        "value" : "USNY"
       },
       "meta" : {
-        "globalKey" : "14936e86"
+        "globalKey" : "92ce63ac"
       }
-    } ]
+    },
+    "account" : [ {
+      "accountNumber" : {
+        "value" : "4345334",
+        "meta" : {
+          "scheme" : "http://www.partyA.com/coding-scheme/account-id"
+        }
+      },
+      "servicingParty" : {
+        "globalReference" : "83102f24",
+        "externalReference" : "gh4903"
+      },
+      "meta" : {
+        "globalKey" : "a173333d",
+        "externalKey" : "gh4903-uw2992"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "7cfd1452"
+    }
+  },
+  "meta" : {
+    "globalKey" : "7cfd1452"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex04-correlation-swap-confirmation.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex04-correlation-swap-confirmation.json
index 301a5c6335..bde9124d31 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex04-correlation-swap-confirmation.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex04-correlation-swap-confirmation.json
@@ -1,124 +1,29 @@
 {
-  "meta" : {
-    "globalKey" : "f0110e67"
-  },
   "trade" : {
-    "account" : [ {
-      "accountNumber" : {
-        "meta" : {
-          "scheme" : "http://www.partyA.com/coding-scheme/account-id"
-        },
-        "value" : "4345334"
-      },
-      "meta" : {
-        "externalKey" : "gh4903-uw2992",
-        "globalKey" : "a173333d"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "83102f24",
+        "externalReference" : "gh4903"
       },
-      "servicingParty" : {
-        "externalReference" : "gh4903",
-        "globalReference" : "3d50b0ca"
-      }
-    } ],
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "6234",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/coding-scheme/trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "governingLaw" : {
-        "value" : "USNY"
-      },
       "meta" : {
-        "globalKey" : "92ce63ac"
+        "globalKey" : "fde00dd4"
       }
-    },
-    "meta" : {
-      "globalKey" : "f0110e67"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "ab9560",
-        "globalKey" : "21c23a5b"
-      },
-      "name" : {
-        "value" : "Client"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "959800NKRMZ8NEKQ0A23"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "696247f0"
-        }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "gh4903",
-        "globalKey" : "3d50b0ca"
-      },
-      "name" : {
-        "value" : "Bank A"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     } ],
+    "tradeDate" : {
+      "value" : "2006-11-07",
+      "meta" : {
+        "globalKey" : "3eb2c7"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "gh4903",
-          "globalReference" : "3d50b0ca"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "ab9560",
-          "globalReference" : "21c23a5b"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "gh4903",
-          "globalReference" : "3d50b0ca"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -126,61 +31,52 @@
             "productQualifier" : "EquitySwap_ParameterReturnCorrelation_Basket"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "extraordinaryEvents" : {
-              "failureToDeliver" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "CALCULATION_AGENT",
-                "shareForOther" : "CALCULATION_AGENT",
-                "shareForShare" : "CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "538ca0c6"
+                },
+                "businessDayConvention" : "NONE",
+                "dateRelativeTo" : {
+                  "globalReference" : "75ac6e3",
+                  "externalReference" : "sd2344"
+                }
               },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
+              "meta" : {
+                "globalKey" : "538ca0c6"
               }
             },
             "payout" : {
-              "meta" : {
-                "globalKey" : "13d4a3f1"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7633d038"
-                  },
+                  "settlementType" : "Cash",
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "4c8e9185"
+                          "globalKey" : "75ac6e3"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -189,38 +85,36 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "vd8290",
-                          "globalReference" : "25c21a7a"
+                          "globalReference" : "25c21a7a",
+                          "externalReference" : "vd8290"
                         }
                       }
                     },
                     "meta" : {
-                      "externalKey" : "sd2344",
-                      "globalKey" : "4c8e9185"
+                      "globalKey" : "75ac6e3",
+                      "externalKey" : "sd2344"
                     }
                   },
-                  "settlementType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "13d4a3f1"
+                  "meta" : {
+                    "globalKey" : "31000596"
+                  }
                 },
                 "observationTerms" : {
                   "observationDates" : {
                     "periodicSchedule" : {
                       "startDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-11-07",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "25a8a5b2"
-                          },
-                          "unadjustedDate" : "2006-11-07"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "25a8a5b2"
@@ -229,118 +123,125 @@
                     }
                   }
                 },
-                "returnTerms" : {
-                  "correlationReturnTerms" : {
-                    "expectedN" : 30,
-                    "boundedCorrelation" : {
-                      "lowerBound" : {
-                        "number" : 0.35123
+                "valuationDates" : {
+                  "valuationDatesFinal" : {
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2007-06-15",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "25c21a7a"
+                        }
                       },
-                      "upperBound" : {
-                        "number" : 0.85123
+                      "meta" : {
+                        "globalKey" : "25c21a7a",
+                        "externalKey" : "vd8290"
                       }
                     },
-                    "correlationStrikePrice" : {
-                      "value" : 0.60123,
-                      "priceType" : "CORRELATION"
-                    },
-                    "numberOfDataSeries" : 1
+                    "meta" : {
+                      "globalKey" : "25c21a7a"
+                    }
                   }
                 },
                 "underlier" : {
                   "basket" : {
                     "basketConstituent" : [ {
-                      "meta" : {
-                        "globalKey" : "4ef8186e"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "IBM.N",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "IBM.N"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "85699343"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
                               "value" : "ABN AMRO HOLDING NV"
                             },
+                            "source" : "Name",
                             "meta" : {
                               "globalKey" : "323f6774"
-                            },
-                            "source" : "NAME"
+                            }
                           }
                         } ],
-                        "securityType" : "EQUITY"
+                        "securityType" : "Equity"
+                      },
+                      "meta" : {
+                        "globalKey" : "4ef8186e"
                       }
                     }, {
-                      "meta" : {
-                        "globalKey" : "246480d0"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "MSFT.O",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "MSFT.O"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "95d91e4"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
                               "value" : "AEGON NV"
                             },
+                            "source" : "Name",
                             "meta" : {
                               "globalKey" : "a8b1a4b1"
-                            },
-                            "source" : "NAME"
+                            }
                           }
                         } ],
-                        "securityType" : "EQUITY"
+                        "securityType" : "Equity"
+                      },
+                      "meta" : {
+                        "globalKey" : "246480d0"
                       }
                     }, {
-                      "meta" : {
-                        "globalKey" : "1e641a16"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "B.N",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "B.N"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "8146b5b1"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
                               "value" : "AIR LIQUIDE"
                             },
+                            "source" : "Name",
                             "meta" : {
                               "globalKey" : "af6e555e"
-                            },
-                            "source" : "NAME"
+                            }
                           }
                         } ],
-                        "securityType" : "EQUITY"
+                        "securityType" : "Equity"
+                      },
+                      "meta" : {
+                        "globalKey" : "1e641a16"
                       }
                     } ]
                   },
@@ -348,105 +249,204 @@
                     "globalKey" : "556f1154"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "meta" : {
-                      "globalKey" : "25c21a7a"
+                "returnTerms" : {
+                  "correlationReturnTerms" : {
+                    "expectedN" : 30,
+                    "correlationStrikePrice" : {
+                      "value" : 0.60123,
+                      "priceType" : "Correlation"
                     },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "25c21a7a"
-                        },
-                        "unadjustedDate" : "2007-06-15"
+                    "boundedCorrelation" : {
+                      "lowerBound" : {
+                        "number" : 0.35123
                       },
-                      "meta" : {
-                        "externalKey" : "vd8290",
-                        "globalKey" : "25c21a7a"
+                      "upperBound" : {
+                        "number" : 0.85123
                       }
-                    }
+                    },
+                    "numberOfDataSeries" : 1
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "meta" : {
-                "globalKey" : "572bf5ce"
-              },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "572bf5ce"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NONE",
-                "dateRelativeTo" : {
-                  "externalReference" : "sd2344",
-                  "globalReference" : "4c8e9185"
+                "meta" : {
+                  "globalKey" : "a0462c65"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "a0462c65"
               }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "CalculationAgent",
+                "shareForOther" : "CalculationAgent",
+                "shareForCombined" : "CalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "failureToDeliver" : true,
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "16655d1d"
+            "globalKey" : "ef7b1369"
           }
         },
         "meta" : {
-          "globalKey" : "16655d1d"
+          "globalKey" : "ef7b1369"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "99d6ddfe"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 15000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 15000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a104e1c2"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "1267ebdb",
+          "externalReference" : "ab9560"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "83102f24",
+          "externalReference" : "gh4903"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "83102f24",
+          "externalReference" : "gh4903"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb2c7"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "959800NKRMZ8NEKQ0A23",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "696247f0"
+        }
+      } ],
+      "name" : {
+        "value" : "Client"
       },
-      "value" : "2006-11-07"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "1267ebdb",
+        "externalKey" : "ab9560"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/coding-scheme/trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
+      "name" : {
+        "value" : "Bank A"
+      },
+      "meta" : {
+        "globalKey" : "83102f24",
+        "externalKey" : "gh4903"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "6234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "gh4903",
-        "globalReference" : "3d50b0ca"
+      "governingLaw" : {
+        "value" : "USNY"
+      },
+      "meta" : {
+        "globalKey" : "92ce63ac"
+      }
+    },
+    "account" : [ {
+      "accountNumber" : {
+        "value" : "4345334",
+        "meta" : {
+          "scheme" : "http://www.partyA.com/coding-scheme/account-id"
+        }
+      },
+      "servicingParty" : {
+        "globalReference" : "83102f24",
+        "externalReference" : "gh4903"
       },
       "meta" : {
-        "globalKey" : "14936e86"
+        "globalKey" : "a173333d",
+        "externalKey" : "gh4903-uw2992"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "f9b45213"
+    }
+  },
+  "meta" : {
+    "globalKey" : "f9b45213"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex01-long-asia-corp-fixreg-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex01-long-asia-corp-fixreg-versioned.json
index 0623436444..bf5fb2f63b 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex01-long-asia-corp-fixreg-versioned.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex01-long-asia-corp-fixreg-versioned.json
@@ -1,118 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "e98291cf"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_SUCCESSOR_AND_CREDIT_EVENTS"
-              }
-            }, {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "94128b49"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "dc022458"
-      }
-    },
-    "meta" : {
-      "globalKey" : "e98291cf"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "f845ge",
-        "globalKey" : "8e1db6b4"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "69c51ff4",
+        "externalReference" : "f845ge"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "RTD3ERTF37209",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "XYZBICXXX"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "26482791"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "rsf765",
-        "globalKey" : "21f24e14"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "ABCBICXXX"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "be37d39a"
-        }
-      } ]
+        "globalKey" : "bd11f339"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-04",
+      "meta" : {
+        "globalKey" : "3e9304"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "f845ge",
-          "globalReference" : "8e1db6b4"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "f845ge",
-          "globalReference" : "8e1db6b4"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "rsf765",
-          "globalReference" : "21f24e14"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -120,13 +32,54 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-12-05",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb0a8cfd"
+                }
+              },
+              "meta" : {
+                "globalKey" : "eb0a8cfd"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-12-05",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    }, {
+                      "value" : "JPTO"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "81e56a96"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "58681de7"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "28faf882"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "meta" : {
+                "globalKey" : "28faf882"
+              }
             },
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "GBLO"
@@ -139,84 +92,130 @@
                   "globalKey" : "81e56a96"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "58681de7"
               }
             },
-            "effectiveDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
+            "payout" : {
+              "interestRatePayout" : [ {
+                "payerReceiver" : {
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "eb0a8cfd"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2002-12-05"
-              },
-              "meta" : {
-                "globalKey" : "eb0a8cfd"
-              }
-            },
-            "payout" : {
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204c"
+                    },
+                    "rollConvention" : "5"
+                  },
+                  "meta" : {
+                    "globalKey" : "204c"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-03-05",
+                  "meta" : {
+                    "globalKey" : "7473f5c5"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c3ce76f8"
+                }
+              } ],
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "45e0d7b2"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "JPY"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "5f4774ca"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
+                      "category" : "BondOrLoan",
+                      "notSubordinated" : true,
+                      "specifiedCurrency" : {
+                        "applicable" : true
+                      },
+                      "notContingent" : true,
                       "assignableLoan" : {
                         "applicable" : true
                       },
-                      "category" : "BOND_OR_LOAN",
                       "consentRequiredLoan" : {
                         "applicable" : true
                       },
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
-                      "notContingent" : true,
-                      "notSubordinated" : true,
-                      "specifiedCurrency" : {
-                        "applicable" : true
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
                       },
-                      "transferable" : true
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "237559c8"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 30
+                      "globalKey" : "3cdbf6e0"
                     }
                   }
                 },
@@ -224,310 +223,311 @@
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "004CC9",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "004CC9"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "fhjgt43",
-                        "globalKey" : "e414546d"
-                      },
                       "name" : {
                         "value" : "ACOM CO., LTD."
+                      },
+                      "meta" : {
+                        "globalKey" : "e414546d",
+                        "externalKey" : "fhjgt43"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "fhjgt43",
-                        "globalReference" : "e414546d"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "JP310860A032",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "JP310860A032"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "b94feaa3"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "e414546d",
+                        "externalReference" : "fhjgt43"
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : 1.0,
                       "unit" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "value" : 1.0,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "7e351080"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "JPY"
-                        }
-                      },
-                      "value" : 1000000000.0,
-                      "meta" : {
-                        "globalKey" : "57e64854"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 100000000.0,
                         "unit" : {
                           "currency" : {
                             "value" : "JPY"
                           }
                         },
-                        "value" : 100000000.0,
                         "meta" : {
                           "globalKey" : "b883af02"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "28728bbd"
-                    },
                     "restructuring" : {
                       "applicable" : true,
                       "restructuringType" : {
                         "value" : "R"
                       }
+                    },
+                    "defaultRequirement" : {
+                      "value" : 1000000000.0,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "JPY"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "57e64854"
+                      }
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "8f38683"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "53d2889d"
-                  },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY",
+                    "category" : "BorrowedMoney",
                     "notSubordinated" : true
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d20"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "5"
                   },
                   "meta" : {
-                    "globalKey" : "12d20"
+                    "globalKey" : "15515017"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "a52eef0e"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-05",
-                  "meta" : {
-                    "globalKey" : "7473fe71"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "5f5a496a"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "d2b6bf8e"
+                "globalKey" : "21af7f72"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    }, {
-                      "value" : "JPTO"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "81e56a96"
-                    }
-                  },
-                  "businessDayConvention" : "MODFOLLOWING",
-                  "meta" : {
-                    "globalKey" : "58681de7"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "28faf882"
-                },
-                "unadjustedDate" : "2007-12-05"
-              },
-              "meta" : {
-                "globalKey" : "28faf882"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "351d378e"
+            "globalKey" : "e161c342"
           }
         },
         "meta" : {
-          "globalKey" : "351d378e"
+          "globalKey" : "e161c342"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a7b31de6"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.007,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "value" : 0.007,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 500000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
-              },
-              "value" : 500000000.0
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d74a447e"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "4eb09eda"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 500000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
-              },
-              "value" : 500000000.0
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "11fe4b42"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "69c51ff4",
+          "externalReference" : "f845ge"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "87501c94",
+          "externalReference" : "rsf765"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "69c51ff4",
+          "externalReference" : "f845ge"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9304"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "XYZBICXXX",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "26482791"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2002-12-04"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "69c51ff4",
+        "externalKey" : "f845ge"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABCBICXXX",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "RTD3ERTF37209"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
         },
-        "version" : 1
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "be37d39a"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "f845ge",
-        "globalReference" : "8e1db6b4"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "d34a91b9"
+        "globalKey" : "87501c94",
+        "externalKey" : "rsf765"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditSuccessorAndCreditEvents"
+              }
+            }, {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "3f0bff2d"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "86fb983c"
+      }
+    },
+    "meta" : {
+      "globalKey" : "fad793d5"
+    }
+  },
+  "meta" : {
+    "globalKey" : "fad793d5"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex02-2003-short-asia-corp-fixreg-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex02-2003-short-asia-corp-fixreg-versioned.json
index 2473e3a939..056332e82f 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex02-2003-short-asia-corp-fixreg-versioned.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex02-2003-short-asia-corp-fixreg-versioned.json
@@ -1,85 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "fc15e0a5"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2003-06-06",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_2003_CREDIT_JAPAN"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "d7d4c772"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "d7d4c772"
-      }
-    },
-    "meta" : {
-      "globalKey" : "fc15e0a5"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "trg6836",
-        "globalKey" : "8e1db6b4"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "69c51ff4",
+        "externalReference" : "trg6836"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56ERT7RHWE4",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "XYZBICXXX"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "26482791"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "zgr5867g",
-        "globalKey" : "21f24e14"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "ABCBICXXX"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "be37d39a"
-        }
-      } ]
+        "globalKey" : "132f4c6e"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-04",
+      "meta" : {
+        "globalKey" : "3e9304"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "zgr5867g",
-          "globalReference" : "21f24e14"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "trg6836",
-          "globalReference" : "8e1db6b4"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -87,37 +32,104 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "JPTO"
-              }
-            },
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-12-05",
                 "meta" : {
                   "globalKey" : "3e9305"
-                },
-                "unadjustedDate" : "2002-12-05"
+                }
               },
               "meta" : {
                 "globalKey" : "3e9305"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-12-05",
+                "meta" : {
+                  "globalKey" : "3ebb05"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ebb05"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204c"
+                    },
+                    "rollConvention" : "5"
                   },
+                  "meta" : {
+                    "globalKey" : "204c"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-03-05",
+                  "meta" : {
+                    "globalKey" : "7473f5c5"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "e35a61d8"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "generalTerms" : {
@@ -126,221 +138,209 @@
                       "entityId" : [ {
                         "value" : "008FAQ"
                       } ],
-                      "meta" : {
-                        "externalKey" : "uy6758",
-                        "globalKey" : "7abf9ebb"
-                      },
                       "name" : {
                         "value" : "Aiful Corporation"
+                      },
+                      "meta" : {
+                        "globalKey" : "7abf9ebb",
+                        "externalKey" : "uy6758"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "uy6758",
-                        "globalReference" : "7abf9ebb"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "JP310504B117",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                              },
-                              "value" : "JP310504B117"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "1098fb11"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "7abf9ebb",
+                        "externalReference" : "uy6758"
                       }
                     } ]
                   }
                 },
-                "meta" : {
-                  "externalKey" : "cd1236",
-                  "globalKey" : "455a9fc7"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : false,
-                    "governmentalIntervention" : true,
-                    "meta" : {
-                      "globalKey" : "cd0a24b1"
-                    },
-                    "obligationAcceleration" : true,
                     "obligationDefault" : false,
+                    "obligationAcceleration" : true,
                     "repudiationMoratorium" : true,
                     "restructuring" : {
                       "applicable" : true,
                       "multipleHolderObligation" : true
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "cd0a24b1"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d20"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "5"
+                    "governmentalIntervention" : true,
+                    "meta" : {
+                      "globalKey" : "a1afb31"
+                    }
                   },
                   "meta" : {
-                    "globalKey" : "12d20"
+                    "globalKey" : "a1afb31"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "178ae9ee"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-05",
-                  "meta" : {
-                    "globalKey" : "7473fe71"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "6de5ce57",
+                  "externalKey" : "cd1236"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "2c8dc5f5"
+                "globalKey" : "5582d02f"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ebb05"
-                },
-                "unadjustedDate" : "2007-12-05"
-              },
-              "meta" : {
-                "globalKey" : "3ebb05"
+            "calculationAgent" : {
+              "calculationAgentBusinessCenter" : {
+                "value" : "JPTO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "67e77714"
+            "globalKey" : "8f17cd92"
           }
         },
         "meta" : {
-          "globalKey" : "67e77714"
+          "globalKey" : "8f17cd92"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "74ab6b98"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.007,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "value" : 0.007,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d74a447e"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "20c20768"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 500000000,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
-              },
-              "value" : 500000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "11fe4b42"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "87501c94",
+          "externalReference" : "zgr5867g"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "69c51ff4",
+          "externalReference" : "trg6836"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9304"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "XYZBICXXX",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "26482791"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2002-12-04"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "69c51ff4",
+        "externalKey" : "trg6836"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABCBICXXX",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "56ERT7RHWE4"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
         },
-        "version" : 1
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "be37d39a"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "trg6836",
-        "globalReference" : "8e1db6b4"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "8bccfb6e"
+        "globalKey" : "87501c94",
+        "externalKey" : "zgr5867g"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2003-06-06",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2003CreditJapan"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "d7d4c772"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "d7d4c772"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "ef9bcae5"
+    }
+  },
+  "meta" : {
+    "globalKey" : "ef9bcae5"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex16-short-us-corp-fixreg-recovery-factor-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex16-short-us-corp-fixreg-recovery-factor-versioned.json
index 9940a0ecf0..5a24bb7e68 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex16-short-us-corp-fixreg-recovery-factor-versioned.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex16-short-us-corp-fixreg-recovery-factor-versioned.json
@@ -1,99 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "26b147c4"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2001-01-04",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_1999_CREDIT"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "4933bf66"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "65d82653"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "96bc4139"
-      }
-    },
-    "meta" : {
-      "globalKey" : "26b147c4"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "rt4563",
-        "globalKey" : "8e1db6b4"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "69c51ff4",
+        "externalReference" : "rt4563"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "IRG858TH30",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "XYZBICXXX"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "26482791"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "u6789r",
-        "globalKey" : "21f24e14"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "ABCBICXXX"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "be37d39a"
-        }
-      } ]
+        "globalKey" : "4a6ceb2f"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-03",
+      "meta" : {
+        "globalKey" : "3e9303"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "u6789r",
-          "globalReference" : "21f24e14"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "rt4563",
-          "globalReference" : "8e1db6b4"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -103,264 +34,333 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-12-04",
                 "meta" : {
                   "globalKey" : "3e9304"
-                },
-                "unadjustedDate" : "2002-12-04"
+                }
               },
               "meta" : {
                 "globalKey" : "3e9304"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-09-06",
+                "meta" : {
+                  "globalKey" : "3eba46"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3eba46"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204d"
+                    },
+                    "rollConvention" : "6"
+                  },
+                  "meta" : {
+                    "globalKey" : "204d"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
+                  "firstPaymentDate" : "2003-03-06",
+                  "meta" : {
+                    "globalKey" : "74746a24"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "e50faed6"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Cash",
                   "meta" : {
                     "globalKey" : "76102c6b"
                   },
-                  "settlementType" : "CASH",
                   "cashSettlementTerms" : [ {
+                    "recoveryFactor" : 0.60,
                     "meta" : {
                       "globalKey" : "b9f8"
-                    },
-                    "recoveryFactor" : 0.60
+                    }
                   } ]
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "8G836J",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "8G836J"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "tyr34",
-                        "globalKey" : "92cc27"
-                      },
                       "name" : {
                         "value" : "Tenet Healthcare Corporation"
+                      },
+                      "meta" : {
+                        "globalKey" : "92cc27",
+                        "externalKey" : "tyr34"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "tyr34",
-                        "globalReference" : "92cc27"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "88033GAT7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                              },
-                              "value" : "88033GAT7"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "db5db955"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "92cc27",
+                        "externalReference" : "tyr34"
                       }
                     } ]
                   }
                 },
-                "meta" : {
-                  "globalKey" : "17201891"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "meta" : {
-                      "globalKey" : "4741344"
-                    },
                     "restructuring" : {
                       "applicable" : true,
                       "restructuringType" : {
-                        "value" : "MOD_R"
+                        "value" : "ModR"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "4741344"
                     }
                   },
                   "meta" : {
                     "globalKey" : "4741344"
                   }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d21"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "6"
-                  },
-                  "meta" : {
-                    "globalKey" : "12d21"
-                  }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "e0b59430"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-06",
-                  "meta" : {
-                    "globalKey" : "747472d0"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "6350472d"
                 }
-              } ],
-              "meta" : {
-                "globalKey" : "e6810a81"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3eba46"
-                },
-                "unadjustedDate" : "2007-09-06"
               },
               "meta" : {
-                "globalKey" : "3eba46"
+                "globalKey" : "207f1e03"
               }
             }
           },
           "meta" : {
-            "globalKey" : "bae7bc29"
+            "globalKey" : "24e80201"
           }
         },
         "meta" : {
-          "globalKey" : "bae7bc29"
+          "globalKey" : "24e80201"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "1f273178"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.01,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c5befd88"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "87501c94",
+          "externalReference" : "u6789r"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "69c51ff4",
+          "externalReference" : "rt4563"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9303"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "XYZBICXXX",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "26482791"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2002-12-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "69c51ff4",
+        "externalKey" : "rt4563"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABCBICXXX",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "IRG858TH30"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
         },
-        "version" : 1
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "be37d39a"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "rt4563",
-        "globalReference" : "8e1db6b4"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "82b28b6f"
+        "globalKey" : "87501c94",
+        "externalKey" : "u6789r"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2001-01-04",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA1999Credit"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "4933bf66"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "65d82653"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "96bc4139"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "7ae46d76"
+    }
+  },
+  "meta" : {
+    "globalKey" : "7ae46d76"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-indamt-ex01-short-us-corp-fixreg-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-indamt-ex01-short-us-corp-fixreg-versioned.json
index dcd46c0491..6f907428de 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-indamt-ex01-short-us-corp-fixreg-versioned.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-indamt-ex01-short-us-corp-fixreg-versioned.json
@@ -1,111 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "8b388ba4"
-  },
   "trade" : {
-    "collateral" : {
-      "independentAmount" : {
-        "payerPartyReference" : {
-          "externalReference" : "nf4f5",
-          "globalReference" : "21f24e14"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "koy4rt1",
-          "globalReference" : "8e1db6b4"
-        },
-        "paymentDetail" : [ {
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "69c51ff4",
+        "externalReference" : "koy4rt1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "xyz1234",
           "meta" : {
-            "globalKey" : "b30a47c0"
-          },
-          "paymentRule" : {
-            "percentageRule" : {
-              "notionalAmountReference" : {
-                "externalReference" : "notional",
-                "globalReference" : "0"
-              },
-              "paymentPercent" : 0.02
-            }
-          }
-        } ]
-      }
-    },
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2003-06-06",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_2003_CREDIT_NORTH_AMERICAN"
-            }
+            "scheme" : "http://www.xyzbank.com/cd-trade-id"
           }
         },
-        "meta" : {
-          "globalKey" : "24983006"
-        }
+        "version" : 1
       } ],
       "meta" : {
-        "globalKey" : "24983006"
+        "globalKey" : "4de3cbac"
       }
-    },
-    "meta" : {
-      "globalKey" : "8b388ba4"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "koy4rt1",
-        "globalKey" : "8e1db6b4"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "XYZBICXXX"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "26482791"
-        }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "nf4f5",
-        "globalKey" : "21f24e14"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "ABCBICXXX"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "be37d39a"
-        }
-      } ]
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-03",
+      "meta" : {
+        "globalKey" : "3e9303"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "nf4f5",
-          "globalReference" : "21f24e14"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "koy4rt1",
-          "globalReference" : "8e1db6b4"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -115,260 +34,341 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-12-04",
                 "meta" : {
                   "globalKey" : "3e9304"
-                },
-                "unadjustedDate" : "2002-12-04"
+                }
               },
               "meta" : {
                 "globalKey" : "3e9304"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-09-06",
+                "meta" : {
+                  "globalKey" : "3eba46"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3eba46"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "externalKey" : "notional",
-                    "globalKey" : "0"
+                    "globalKey" : "0",
+                    "externalKey" : "notional"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204d"
+                    },
+                    "rollConvention" : "6"
                   },
+                  "meta" : {
+                    "globalKey" : "204d"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-03-06",
+                  "meta" : {
+                    "globalKey" : "74746a24"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "e50faed6"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "notional"
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "8G836J",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "8G836J"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "jg45d",
-                        "globalKey" : "92cc27"
-                      },
                       "name" : {
                         "value" : "Tenet Healthcare Corporation"
+                      },
+                      "meta" : {
+                        "globalKey" : "92cc27",
+                        "externalKey" : "jg45d"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "jg45d",
-                        "globalReference" : "92cc27"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "88033GAT7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                              },
-                              "value" : "88033GAT7"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "db5db955"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "92cc27",
+                        "externalReference" : "jg45d"
                       }
                     } ]
                   }
                 },
-                "meta" : {
-                  "globalKey" : "27e0e246"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : false,
-                    "governmentalIntervention" : true,
-                    "meta" : {
-                      "globalKey" : "b775c2a6"
-                    },
-                    "obligationAcceleration" : true,
                     "obligationDefault" : false,
+                    "obligationAcceleration" : true,
                     "repudiationMoratorium" : true,
                     "restructuring" : {
                       "applicable" : true,
-                      "multipleHolderObligation" : true,
                       "restructuringType" : {
-                        "value" : "MOD_R"
-                      }
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "b775c2a6"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "notional",
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d21"
+                        "value" : "ModR"
+                      },
+                      "multipleHolderObligation" : true
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "6"
+                    "governmentalIntervention" : true,
+                    "meta" : {
+                      "globalKey" : "f3aaf926"
+                    }
                   },
                   "meta" : {
-                    "globalKey" : "12d21"
+                    "globalKey" : "f3aaf926"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "e0b59430"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-06",
-                  "meta" : {
-                    "globalKey" : "747472d0"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "39e21d52"
                 }
-              } ],
-              "meta" : {
-                "globalKey" : "7778b0f6"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3eba46"
-                },
-                "unadjustedDate" : "2007-09-06"
               },
               "meta" : {
-                "globalKey" : "3eba46"
+                "globalKey" : "66b696a8"
               }
             }
           },
           "meta" : {
-            "globalKey" : "cbf19494"
+            "globalKey" : "f4767326"
           }
         },
         "meta" : {
-          "globalKey" : "cbf19494"
+          "globalKey" : "f4767326"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "1f273178"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.01,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c5befd88"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "87501c94",
+          "externalReference" : "nf4f5"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "69c51ff4",
+          "externalReference" : "koy4rt1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9303"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "XYZBICXXX",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "26482791"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2002-12-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "69c51ff4",
+        "externalKey" : "koy4rt1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABCBICXXX",
           "meta" : {
-            "scheme" : "http://www.xyzbank.com/cd-trade-id"
-          },
-          "value" : "xyz1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
         },
-        "version" : 1
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "be37d39a"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "koy4rt1",
-        "globalReference" : "8e1db6b4"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "625bcac"
+        "globalKey" : "87501c94",
+        "externalKey" : "nf4f5"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2003-06-06",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2003CreditNorthAmerican"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "24983006"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "24983006"
+      }
+    },
+    "collateral" : {
+      "independentAmount" : {
+        "payerPartyReference" : {
+          "globalReference" : "87501c94",
+          "externalReference" : "nf4f5"
+        },
+        "receiverPartyReference" : {
+          "globalReference" : "69c51ff4",
+          "externalReference" : "koy4rt1"
+        },
+        "paymentDetail" : [ {
+          "paymentRule" : {
+            "percentageRule" : {
+              "paymentPercent" : 0.02,
+              "notionalAmountReference" : {
+                "globalReference" : "0",
+                "externalReference" : "notional"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "b30a47c0"
+          }
+        } ]
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "d3f3849c"
+    }
+  },
+  "meta" : {
+    "globalKey" : "d3f3849c"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-swaption-usi.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-swaption-usi.json
index 0e6f394bb0..4ba9cfb12d 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-swaption-usi.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-swaption-usi.json
@@ -1,101 +1,33 @@
 {
-  "meta" : {
-    "globalKey" : "ccca53c6"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "1997-11-05",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "95729254"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2003_CREDIT"
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "1031234567",
         "meta" : {
-          "globalKey" : "521d2d0f"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "99e5143b"
-      }
-    },
-    "meta" : {
-      "globalKey" : "50137a6a"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "aot89re",
-        "globalKey" : "37b9cf43"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "Party A"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "37b9cf43"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/usi"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "t76heo4",
-        "globalKey" : "37b9cf44"
+        "globalKey" : "af42d69a"
       },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "Party B"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "37b9cf44"
-        }
-      } ]
+      "identifierType" : "UniqueSwapIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2006-06-27",
+      "meta" : {
+        "globalKey" : "3eb19b",
+        "externalKey" : "t56r3w"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "aot89re",
-          "globalReference" : "37b9cf43"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "aot89re",
-          "globalReference" : "37b9cf43"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "t76heo4",
-          "globalReference" : "37b9cf44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -103,55 +35,52 @@
             "productQualifier" : "CreditDefaultSwaption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "f40f7894"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "0",
+                    "externalReference" : "tk5n56"
+                  },
                   "meta" : {
                     "globalKey" : "cbefb631"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "tk5n56",
-                    "globalReference" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "f3b1d0d7"
-                  },
-                  "settlementType" : "PHYSICAL"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
-                "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "fallbackExercise" : false
+                "optionType" : "Put",
+                "feature" : {
+                  "knock" : {
+                    "knockOut" : {
+                      "trigger" : {
+                        "creditEventsReference" : {
+                          "globalReference" : "ae8d548",
+                          "externalReference" : "c67efw"
+                        }
+                      }
                     }
-                  },
+                  }
+                },
+                "exerciseTerms" : {
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "USNY"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-09-20",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -162,54 +91,48 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da556d3a"
                             }
                           },
                           "meta" : {
                             "globalKey" : "5f6d3466"
-                          },
-                          "unadjustedDate" : "2006-09-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "5f6d3466"
                         }
                       } ],
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "USNY"
+                        }
+                      },
                       "expirationTime" : {
+                        "hourMinuteTime" : "11:00:00",
                         "businessCenter" : {
                           "value" : "USNY"
-                        },
-                        "hourMinuteTime" : "11:00:00"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "25cd1f3"
+                        "globalKey" : "579df6f3"
                       }
                     }
                   },
                   "strike" : {
                     "strikeReference" : {
-                      "externalReference" : "yu67d",
-                      "globalReference" : "0"
-                    }
-                  }
-                },
-                "feature" : {
-                  "knock" : {
-                    "knockOut" : {
-                      "trigger" : {
-                        "creditEventsReference" : {
-                          "externalReference" : "c67efw",
-                          "globalReference" : "987dca68"
-                        }
-                      }
+                      "globalReference" : "0",
+                      "externalReference" : "yu67d"
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "fallbackExercise" : false
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "f40f7894"
-                },
-                "optionType" : "PUT",
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -217,24 +140,26 @@
                       "productQualifier" : "CreditDefaultSwap_SingleName"
                     } ],
                     "economicTerms" : {
-                      "dateAdjustments" : {
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "GBLO"
-                          }, {
-                            "value" : "USNY"
-                          } ],
+                      "effectiveDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2006-09-21",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
                           "meta" : {
-                            "globalKey" : "42f910b"
+                            "globalKey" : "eb80184d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
-                          "globalKey" : "da556d3a"
+                          "globalKey" : "eb80184d"
                         }
                       },
-                      "effectiveDate" : {
+                      "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2011-09-21",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -242,425 +167,495 @@
                             }
                           },
                           "meta" : {
-                            "globalKey" : "eb80184d"
-                          },
-                          "unadjustedDate" : "2006-09-21"
+                            "globalKey" : "ec16404d"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "eb80184d"
+                          "globalKey" : "ec16404d"
+                        }
+                      },
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "GBLO"
+                          }, {
+                            "value" : "USNY"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "42f910b"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "da556d3a"
                         }
                       },
                       "payout" : {
-                        "creditDefaultPayout" : {
+                        "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "priceQuantity" : {
+                            "quantitySchedule" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "quantity-1"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "tk5n56",
                               "globalKey" : "0"
+                            }
+                          },
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "0",
+                                "externalKey" : "yu67d"
+                              }
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "17f73"
+                              },
+                              "rollConvention" : "20"
+                            },
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            }
+                          },
+                          "paymentDates" : {
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "aa"
+                              }
                             },
+                            "firstPaymentDate" : "2006-12-20",
+                            "lastRegularPaymentDate" : "2011-09-20",
+                            "meta" : {
+                              "globalKey" : "1f081eea"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "754ee9fe"
+                          }
+                        } ],
+                        "creditDefaultPayout" : {
+                          "payerReceiver" : {
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
+                          },
+                          "priceQuantity" : {
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0",
+                              "externalKey" : "tk5n56"
                             }
                           },
                           "settlementTerms" : {
-                            "meta" : {
-                              "globalKey" : "95c61b49"
-                            },
+                            "settlementType" : "Physical",
                             "settlementCurrency" : {
                               "value" : "USD"
                             },
-                            "settlementType" : "PHYSICAL",
+                            "meta" : {
+                              "globalKey" : "9cb94537"
+                            },
                             "physicalSettlementTerms" : {
+                              "physicalSettlementPeriod" : {
+                                "maximumBusinessDays" : 30
+                              },
                               "deliverableObligations" : {
                                 "accruedInterest" : false,
+                                "category" : "BondOrLoan",
+                                "notSubordinated" : true,
+                                "specifiedCurrency" : {
+                                  "applicable" : true,
+                                  "currency" : {
+                                    "value" : "USD"
+                                  }
+                                },
+                                "notContingent" : true,
                                 "assignableLoan" : {
                                   "applicable" : true
                                 },
-                                "category" : "BOND_OR_LOAN",
                                 "consentRequiredLoan" : {
                                   "applicable" : true
                                 },
-                                "excluded" : "true",
+                                "transferable" : true,
                                 "maximumMaturity" : {
-                                  "meta" : {
-                                    "globalKey" : "ae5"
-                                  },
+                                  "periodMultiplier" : 30,
                                   "period" : "Y",
-                                  "periodMultiplier" : 30
+                                  "meta" : {
+                                    "globalKey" : "3fb"
+                                  }
                                 },
                                 "notBearer" : true,
-                                "notContingent" : true,
-                                "notSubordinated" : true,
-                                "othReferenceEntityObligations" : "true",
-                                "specifiedCurrency" : {
-                                  "applicable" : true,
-                                  "currency" : {
-                                    "value" : "USD"
-                                  }
-                                },
-                                "transferable" : true
+                                "excluded" : "true",
+                                "othReferenceEntityObligations" : "true"
                               },
                               "escrow" : true,
                               "meta" : {
-                                "globalKey" : "e6e41cc"
-                              },
-                              "physicalSettlementPeriod" : {
-                                "maximumBusinessDays" : 30
+                                "globalKey" : "15616bba"
                               }
                             }
                           },
                           "generalTerms" : {
                             "referenceInformation" : {
-                              "allGuarantees" : false,
                               "referenceEntity" : {
-                                "meta" : {
-                                  "globalKey" : "457308e"
-                                },
                                 "name" : {
                                   "value" : "Entity1"
+                                },
+                                "meta" : {
+                                  "globalKey" : "457308e"
                                 }
                               },
                               "referenceObligation" : [ {
-                                "primaryObligor" : {
-                                  "meta" : {
-                                    "globalKey" : "457308e"
-                                  },
-                                  "name" : {
-                                    "value" : "Entity1"
-                                  }
-                                },
                                 "security" : {
                                   "productIdentifier" : [ {
                                     "value" : {
                                       "identifier" : {
+                                        "value" : "ExampleCUSIP1",
                                         "meta" : {
                                           "scheme" : "CUSIP"
-                                        },
-                                        "value" : "ExampleCUSIP1"
+                                        }
                                       },
+                                      "source" : "CUSIP",
                                       "meta" : {
                                         "globalKey" : "c772c8fb"
-                                      },
-                                      "source" : "CUSIP"
+                                      }
                                     }
                                   } ],
-                                  "securityType" : "DEBT"
+                                  "securityType" : "Debt"
+                                },
+                                "primaryObligor" : {
+                                  "name" : {
+                                    "value" : "Entity1"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "457308e"
+                                  }
                                 }
                               } ],
+                              "allGuarantees" : false,
                               "referencePrice" : {
+                                "value" : 1.0000000000,
                                 "unit" : {
                                   "currency" : {
                                     "value" : "USD"
                                   }
                                 },
-                                "value" : 1.0000000000,
                                 "perUnitOf" : {
                                   "currency" : {
                                     "value" : "USD"
                                   }
                                 },
-                                "priceType" : "ASSET_PRICE"
+                                "priceType" : "AssetPrice"
                               }
                             }
                           },
-                          "meta" : {
-                            "globalKey" : "725d7b5"
-                          },
                           "protectionTerms" : [ {
                             "creditEvents" : {
                               "bankruptcy" : true,
-                              "creditEventNotice" : {
-                                "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                                "publiclyAvailableInformation" : {
-                                  "publicSource" : [ "Standard Public Sources" ],
-                                  "specifiedNumber" : 2
-                                }
-                              },
-                              "defaultRequirement" : {
-                                "unit" : {
-                                  "currency" : {
-                                    "value" : "USD"
-                                  }
-                                },
-                                "value" : 10000000,
-                                "meta" : {
-                                  "globalKey" : "d467e427"
-                                }
-                              },
                               "failureToPay" : {
                                 "applicable" : true,
                                 "paymentRequirement" : {
+                                  "value" : 1000000,
                                   "unit" : {
                                     "currency" : {
                                       "value" : "USD"
                                     }
                                   },
-                                  "value" : 1000000,
                                   "meta" : {
                                     "globalKey" : "48eb1e55"
                                   }
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "c67efw",
-                                "globalKey" : "987dca68"
-                              },
                               "restructuring" : {
                                 "applicable" : true,
-                                "multipleHolderObligation" : true,
                                 "restructuringType" : {
-                                  "value" : "MOD_R"
+                                  "value" : "ModR"
+                                },
+                                "multipleHolderObligation" : true
+                              },
+                              "defaultRequirement" : {
+                                "value" : 10000000,
+                                "unit" : {
+                                  "currency" : {
+                                    "value" : "USD"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "d467e427"
                                 }
+                              },
+                              "creditEventNotice" : {
+                                "notifyingParty" : [ "Party2", "Party1" ],
+                                "publiclyAvailableInformation" : {
+                                  "publicSource" : [ "Standard Public Sources" ],
+                                  "specifiedNumber" : 2
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "ae8d548",
+                                "externalKey" : "c67efw"
                               }
                             },
-                            "meta" : {
-                              "globalKey" : "12f298dd"
-                            },
                             "obligations" : {
-                              "category" : "BORROWED_MONEY",
+                              "category" : "BorrowedMoney",
                               "excluded" : "true",
                               "othReferenceEntityObligations" : "true"
-                            }
-                          } ]
-                        },
-                        "interestRatePayout" : [ {
-                          "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
-                          },
-                          "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "quantitySchedule" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "quantity-1"
-                              }
-                            }
-                          },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "28c47"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 3,
-                              "rollConvention" : "20"
                             },
                             "meta" : {
-                              "globalKey" : "28c47"
+                              "globalKey" : "f11d33bd"
                             }
-                          },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
+                          } ],
                           "meta" : {
-                            "globalKey" : "eff5afe4"
-                          },
-                          "paymentDates" : {
-                            "firstPaymentDate" : "2006-12-20",
-                            "lastRegularPaymentDate" : "2011-09-20",
-                            "meta" : {
-                              "globalKey" : "1f082796"
-                            },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "956"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 3
-                            }
-                          },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "externalKey" : "yu67d",
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
-                              }
-                            }
+                            "globalKey" : "a4f04517"
                           }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "ae392b4f"
-                        }
-                      },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "ec16404d"
-                          },
-                          "unadjustedDate" : "2011-09-21"
                         },
                         "meta" : {
-                          "globalKey" : "ec16404d"
+                          "globalKey" : "4bcae4d9"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "6b4ca231"
+                      "globalKey" : "bb934c7f"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "6b4ca231"
+                    "globalKey" : "bb934c7f"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "629fe39a"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "629fe39a"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "c2444b6a"
+            "globalKey" : "86814e04"
           }
         },
         "meta" : {
-          "globalKey" : "c2444b6a"
+          "globalKey" : "86814e04"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "92a37f9f"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.085,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.085,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d467e427"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c1cc7441"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "b894a0b9"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "37b9cf43",
+          "externalReference" : "aot89re"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "37b9cf44",
+          "externalReference" : "t76heo4"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "37b9cf43",
+          "externalReference" : "aot89re"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "37b9cf43"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "t56r3w",
-        "globalKey" : "3eb19b"
-      },
-      "value" : "2006-06-27"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "37b9cf43",
+        "externalKey" : "aot89re"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/usi"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "37b9cf44"
         }
       } ],
-      "issuer" : {
+      "meta" : {
+        "globalKey" : "37b9cf44",
+        "externalKey" : "t76heo4"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "1997-11-05",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
+          "globalKey" : "95729254"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2003Credit"
+            } ]
+          }
         },
-        "value" : "1031234567"
-      },
+        "meta" : {
+          "globalKey" : "521d2d0f"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "81c425a"
-      },
-      "identifierType" : "UNIQUE_SWAP_IDENTIFIER"
-    } ]
+        "globalKey" : "99e5143b"
+      }
+    },
+    "meta" : {
+      "globalKey" : "23c695b2"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "3cad0070"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "aot89re",
-          "globalReference" : "37b9cf43"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "t76heo4",
-          "globalReference" : "37b9cf44"
-        }
-      },
       "quantity" : {
+        "value" : 65000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "37b9cf43",
+          "externalReference" : "aot89re"
         },
-        "value" : 65000
+        "receiverPartyReference" : {
+          "globalReference" : "37b9cf44",
+          "externalReference" : "t76heo4"
+        }
       },
       "settlementDate" : {
         "relativeDate" : {
+          "periodMultiplier" : 3,
+          "period" : "D",
           "meta" : {
-            "globalKey" : "ba6aab1f"
+            "globalKey" : "f2ff00fd"
           },
-          "period" : "D",
-          "periodMultiplier" : 3,
-          "dayType" : "BUSINESS",
+          "dayType" : "Business",
+          "businessDayConvention" : "NONE",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "USNY"
@@ -671,16 +666,21 @@
               "globalKey" : "4f5ffd5"
             }
           },
-          "businessDayConvention" : "NONE",
           "dateRelativeTo" : {
-            "externalReference" : "t56r3w",
-            "globalReference" : "3eb19b"
+            "globalReference" : "3eb19b",
+            "externalReference" : "t56r3w"
           }
         }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "6bc49a9a"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "36e005a8"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-swaption-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-swaption-uti.json
index 8a8963de2f..30b46ac86a 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-swaption-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-swaption-uti.json
@@ -1,107 +1,33 @@
 {
-  "meta" : {
-    "globalKey" : "ee63c873"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "1997-11-05",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "95729254"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2003_CREDIT"
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "521d2d0f"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "99e5143b"
-      }
-    },
-    "meta" : {
-      "globalKey" : "16045fe5"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
-      },
-      "name" : {
-        "value" : "Party A"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56323",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
-      },
-      "name" : {
-        "value" : "Party B"
+        "globalKey" : "c6afb4da"
       },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2006-12-05",
+      "meta" : {
+        "globalKey" : "3eb305",
+        "externalKey" : "ruytof"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -109,55 +35,52 @@
             "productQualifier" : "CreditDefaultSwaption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "48c784ee"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "0",
+                    "externalReference" : "nft4rt"
+                  },
                   "meta" : {
                     "globalKey" : "c187fe3a"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "nft4rt",
-                    "globalReference" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "f3b1d0d7"
-                  },
-                  "settlementType" : "PHYSICAL"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
-                "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "fallbackExercise" : false
+                "optionType" : "Call",
+                "feature" : {
+                  "knock" : {
+                    "knockOut" : {
+                      "trigger" : {
+                        "creditEventsReference" : {
+                          "globalReference" : "1333467d",
+                          "externalReference" : "oif5t"
+                        }
+                      }
                     }
-                  },
+                  }
+                },
+                "exerciseTerms" : {
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2007-03-05",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -168,54 +91,48 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da556d3a"
                             }
                           },
                           "meta" : {
                             "globalKey" : "80df3cd5"
-                          },
-                          "unadjustedDate" : "2007-03-05"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "80df3cd5"
                         }
                       } ],
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      },
                       "expirationTime" : {
+                        "hourMinuteTime" : "16:00:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "16:00:00"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "ab29442b"
+                        "globalKey" : "991d57eb"
                       }
                     }
                   },
                   "strike" : {
                     "strikeReference" : {
-                      "externalReference" : "fty64w",
-                      "globalReference" : "0"
-                    }
-                  }
-                },
-                "feature" : {
-                  "knock" : {
-                    "knockOut" : {
-                      "trigger" : {
-                        "creditEventsReference" : {
-                          "externalReference" : "oif5t",
-                          "globalReference" : "acc58dfd"
-                        }
-                      }
+                      "globalReference" : "0",
+                      "externalReference" : "fty64w"
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "fallbackExercise" : false
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "48c784ee"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -225,6 +142,7 @@
                     "economicTerms" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-03-06",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -233,389 +151,466 @@
                           },
                           "meta" : {
                             "globalKey" : "eb7a3e7e"
-                          },
-                          "unadjustedDate" : "2006-03-06"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eb7a3e7e"
                         }
                       },
+                      "terminationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2012-03-21",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ec2ea6cd"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "ec2ea6cd"
+                        }
+                      },
                       "payout" : {
-                        "creditDefaultPayout" : {
+                        "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
+                            "quantitySchedule" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "quantity-1"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "nft4rt",
                               "globalKey" : "0"
+                            }
+                          },
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "0",
+                                "externalKey" : "fty64w"
+                              }
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "17f73"
+                              },
+                              "rollConvention" : "20"
+                            },
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            }
+                          },
+                          "paymentDates" : {
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "aa"
+                              }
                             },
+                            "firstPaymentDate" : "2007-03-20",
+                            "lastRegularPaymentDate" : "2012-03-20",
+                            "meta" : {
+                              "globalKey" : "7303ae2a"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "c031f99c"
+                          }
+                        } ],
+                        "creditDefaultPayout" : {
+                          "payerReceiver" : {
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
+                          },
+                          "priceQuantity" : {
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0",
+                              "externalKey" : "nft4rt"
                             }
                           },
                           "settlementTerms" : {
+                            "settlementType" : "Physical",
                             "meta" : {
-                              "globalKey" : "91ae6106"
+                              "globalKey" : "1a8bef8a"
                             },
-                            "settlementType" : "PHYSICAL",
                             "physicalSettlementTerms" : {
+                              "physicalSettlementPeriod" : {
+                                "maximumBusinessDays" : 30
+                              },
                               "deliverableObligations" : {
                                 "accruedInterest" : false,
-                                "category" : "BOND"
+                                "category" : "Bond"
                               },
                               "escrow" : true,
                               "meta" : {
-                                "globalKey" : "abed81bd"
-                              },
-                              "physicalSettlementPeriod" : {
-                                "maximumBusinessDays" : 30
+                                "globalKey" : "34cb1041"
                               }
                             }
                           },
                           "generalTerms" : {
                             "referenceInformation" : {
-                              "allGuarantees" : true,
                               "referenceEntity" : {
-                                "meta" : {
-                                  "globalKey" : "4573090"
-                                },
                                 "name" : {
                                   "value" : "Entity3"
+                                },
+                                "meta" : {
+                                  "globalKey" : "4573090"
                                 }
                               },
                               "referenceObligation" : [ {
-                                "primaryObligor" : {
-                                  "meta" : {
-                                    "globalKey" : "4573090"
-                                  },
-                                  "name" : {
-                                    "value" : "Entity3"
-                                  }
-                                },
                                 "security" : {
                                   "productIdentifier" : [ {
                                     "value" : {
                                       "identifier" : {
+                                        "value" : "ExampleCUSIP2",
                                         "meta" : {
                                           "scheme" : "CUSIP"
-                                        },
-                                        "value" : "ExampleCUSIP2"
+                                        }
                                       },
+                                      "source" : "CUSIP",
                                       "meta" : {
                                         "globalKey" : "c772c8fc"
-                                      },
-                                      "source" : "CUSIP"
+                                      }
                                     }
                                   } ],
-                                  "securityType" : "DEBT"
+                                  "securityType" : "Debt"
+                                },
+                                "primaryObligor" : {
+                                  "name" : {
+                                    "value" : "Entity3"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "4573090"
+                                  }
                                 }
                               } ],
+                              "allGuarantees" : true,
                               "referencePrice" : {
+                                "value" : 1.0000000000,
                                 "unit" : {
                                   "currency" : {
                                     "value" : "USD"
                                   }
                                 },
-                                "value" : 1.0000000000,
                                 "perUnitOf" : {
                                   "currency" : {
                                     "value" : "USD"
                                   }
                                 },
-                                "priceType" : "ASSET_PRICE"
+                                "priceType" : "AssetPrice"
                               }
                             }
                           },
-                          "meta" : {
-                            "globalKey" : "a4f0ea20"
-                          },
                           "protectionTerms" : [ {
                             "creditEvents" : {
-                              "creditEventNotice" : {
-                                "notifyingParty" : [ "PARTY_1", "PARTY_2" ],
-                                "publiclyAvailableInformation" : {
-                                  "publicSource" : [ "Standard Public Sources" ],
-                                  "specifiedNumber" : 2
-                                }
-                              },
-                              "defaultRequirement" : {
-                                "unit" : {
-                                  "currency" : {
-                                    "value" : "USD"
-                                  }
-                                },
-                                "value" : 1000000,
-                                "meta" : {
-                                  "globalKey" : "48eb1e55"
-                                }
-                              },
                               "failureToPay" : {
                                 "applicable" : true,
                                 "paymentRequirement" : {
+                                  "value" : 1000000,
                                   "unit" : {
                                     "currency" : {
                                       "value" : "USD"
                                     }
                                   },
-                                  "value" : 1000000,
                                   "meta" : {
                                     "globalKey" : "48eb1e55"
                                   }
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "oif5t",
-                                "globalKey" : "acc58dfd"
-                              },
                               "restructuring" : {
                                 "applicable" : true
+                              },
+                              "defaultRequirement" : {
+                                "value" : 1000000,
+                                "unit" : {
+                                  "currency" : {
+                                    "value" : "USD"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "48eb1e55"
+                                }
+                              },
+                              "creditEventNotice" : {
+                                "notifyingParty" : [ "Party1", "Party2" ],
+                                "publiclyAvailableInformation" : {
+                                  "publicSource" : [ "Standard Public Sources" ],
+                                  "specifiedNumber" : 2
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "1333467d",
+                                "externalKey" : "oif5t"
                               }
                             },
-                            "meta" : {
-                              "globalKey" : "91b93580"
-                            },
                             "obligations" : {
-                              "category" : "BOND"
-                            }
-                          } ]
-                        },
-                        "interestRatePayout" : [ {
-                          "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
-                          },
-                          "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "quantitySchedule" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "quantity-1"
-                              }
-                            }
-                          },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "28c47"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 3,
-                              "rollConvention" : "20"
+                              "category" : "Bond"
                             },
                             "meta" : {
-                              "globalKey" : "28c47"
+                              "globalKey" : "139ace00"
                             }
-                          },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
+                          } ],
                           "meta" : {
-                            "globalKey" : "e205902"
-                          },
-                          "paymentDates" : {
-                            "firstPaymentDate" : "2007-03-20",
-                            "lastRegularPaymentDate" : "2012-03-20",
-                            "meta" : {
-                              "globalKey" : "7303b6d6"
-                            },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "956"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 3
-                            }
-                          },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "externalKey" : "fty64w",
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
-                              }
-                            }
+                            "globalKey" : "7f60c0d2"
                           }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "ec7d02e2"
-                        }
-                      },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "ec2ea6cd"
-                          },
-                          "unadjustedDate" : "2012-03-21"
                         },
                         "meta" : {
-                          "globalKey" : "ec2ea6cd"
+                          "globalKey" : "d3f7da6e"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "a523b3ed"
+                      "globalKey" : "64f8643d"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "a523b3ed"
+                    "globalKey" : "64f8643d"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "fdb38476"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "fdb38476"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "f5cd2fc4"
+            "globalKey" : "ab3027e0"
           }
         },
         "meta" : {
-          "globalKey" : "f5cd2fc4"
+          "globalKey" : "ab3027e0"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "f3a3e2c9"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0186,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0186,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "80d87657"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "ruytof",
-        "globalKey" : "3eb305"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
+        }
+      } ],
+      "name" : {
+        "value" : "Party A"
       },
-      "value" : "2006-12-05"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "56323"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
         }
       } ],
-      "issuer" : {
+      "name" : {
+        "value" : "Party B"
+      },
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "1997-11-05",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "globalKey" : "95729254"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2003Credit"
+            } ]
+          }
         },
-        "value" : "54930084UKLVMY22DS16"
-      },
+        "meta" : {
+          "globalKey" : "521d2d0f"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "c8903fd0"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+        "globalKey" : "99e5143b"
+      }
+    },
+    "meta" : {
+      "globalKey" : "197deda7"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "aa2fef78"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        }
-      },
       "quantity" : {
+        "value" : 300000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
         },
-        "value" : 300000
+        "receiverPartyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
         "relativeDate" : {
+          "periodMultiplier" : 3,
+          "period" : "D",
           "meta" : {
-            "globalKey" : "baa55db3"
+            "globalKey" : "f339b391"
           },
-          "period" : "D",
-          "periodMultiplier" : 3,
-          "dayType" : "BUSINESS",
+          "dayType" : "Business",
+          "businessDayConvention" : "NONE",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "USNY"
@@ -626,16 +621,21 @@
               "globalKey" : "4f5ffd5"
             }
           },
-          "businessDayConvention" : "NONE",
           "dateRelativeTo" : {
-            "externalReference" : "ruytof",
-            "globalReference" : "3eb305"
+            "globalReference" : "3eb305",
+            "externalReference" : "ruytof"
           }
         }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "328c7d3a"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "af1e3f33"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex01-cdx-seniority-Senior.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex01-cdx-seniority-Senior.json
index 296244dbb6..7a872a35fe 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex01-cdx-seniority-Senior.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex01-cdx-seniority-Senior.json
@@ -1,85 +1,32 @@
 {
-  "meta" : {
-    "globalKey" : "c4839461"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2004-10-18",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "DJ.CDX.NA"
-            }
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "1031234567",
         "meta" : {
-          "globalKey" : "ae7fb3d4"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "ae7fb3d4"
-      }
-    },
-    "meta" : {
-      "globalKey" : "7a514a6f"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
       },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56323",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
-      },
-      "name" : {
-        "value" : "Party B"
+        "globalKey" : "1ecdb5a5"
       },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2005-01-24",
+      "meta" : {
+        "globalKey" : "3ea858"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -89,214 +36,267 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2004-03-23",
                 "meta" : {
                   "globalKey" : "3ea0d7"
-                },
-                "unadjustedDate" : "2004-03-23"
+                }
               },
               "meta" : {
                 "globalKey" : "3ea0d7"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-03-20",
+                "meta" : {
+                  "globalKey" : "3ec8d4"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ec8d4"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "generalTerms" : {
-                  "indexReferenceInformation" : {
-                    "indexName" : {
-                      "value" : "Dow Jones CDX NA IG.2"
-                    },
-                    "indexAnnexDate" : "2004-07-06",
-                    "indexAnnexSource" : {
-                      "value" : "PUBLISHER"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
                     },
-                    "indexSeries" : 2,
                     "meta" : {
-                      "globalKey" : "2caad3f9"
-                    },
-                    "seniority" : "SENIOR_SEC"
+                      "globalKey" : "0"
+                    }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "8f2765ba"
+                  "globalKey" : "5a5ff79f"
                 }
-              },
-              "interestRatePayout" : [ {
+              } ],
+              "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "5a5ff79f"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
+                "generalTerms" : {
+                  "indexReferenceInformation" : {
+                    "indexName" : {
+                      "value" : "Dow Jones CDX NA IG.2"
                     },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
+                    "indexSeries" : 2,
+                    "indexAnnexDate" : "2004-07-06",
+                    "indexAnnexSource" : {
+                      "value" : "Publisher"
+                    },
+                    "seniority" : "SeniorSec",
+                    "meta" : {
+                      "globalKey" : "c658bf1"
                     }
                   }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "8c0b0359"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ec8d4"
                 },
-                "unadjustedDate" : "2009-03-20"
+                "meta" : {
+                  "globalKey" : "6ee21db2"
+                }
               },
               "meta" : {
-                "globalKey" : "3ec8d4"
+                "globalKey" : "39ccd311"
               }
             }
           },
           "meta" : {
-            "globalKey" : "d2250cf2"
+            "globalKey" : "99030dd4"
           }
         },
         "meta" : {
-          "globalKey" : "d2250cf2"
+          "globalKey" : "99030dd4"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "56a5905f"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0060,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0060,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "7e0c7b81"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea858"
-      },
-      "value" : "2005-01-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "56323"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
-        },
-        "value" : "1031234567"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "84d7eae5"
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
+        }
+      } ],
+      "name" : {
+        "value" : "Party B"
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2004-10-18",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "DJ.CDX.NA"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "ae7fb3d4"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "ae7fb3d4"
+      }
+    },
+    "meta" : {
+      "globalKey" : "b7990cf1"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "c918b832"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        }
-      },
       "quantity" : {
+        "value" : 16000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
         },
-        "value" : 16000
+        "receiverPartyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "30a89faa"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "90bb2db"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex01-cdx-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex01-cdx-uti.json
index b1f140c13a..1fb644fe0f 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex01-cdx-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex01-cdx-uti.json
@@ -1,85 +1,32 @@
 {
-  "meta" : {
-    "globalKey" : "87671075"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2004-10-18",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "DJ.CDX.NA"
-            }
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "1031234567",
         "meta" : {
-          "globalKey" : "ae7fb3d4"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "ae7fb3d4"
-      }
-    },
-    "meta" : {
-      "globalKey" : "97beb983"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
       },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56323",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
+        "globalKey" : "1ecdb5a5"
       },
-      "name" : {
-        "value" : "Party B"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2005-01-24",
+      "meta" : {
+        "globalKey" : "3ea858"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -89,213 +36,266 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2004-03-23",
                 "meta" : {
                   "globalKey" : "3ea0d7"
-                },
-                "unadjustedDate" : "2004-03-23"
+                }
               },
               "meta" : {
                 "globalKey" : "3ea0d7"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-03-20",
+                "meta" : {
+                  "globalKey" : "3ec8d4"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ec8d4"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "generalTerms" : {
-                  "indexReferenceInformation" : {
-                    "indexName" : {
-                      "value" : "Dow Jones CDX NA IG.2"
-                    },
-                    "indexAnnexDate" : "2004-07-06",
-                    "indexAnnexSource" : {
-                      "value" : "PUBLISHER"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
                     },
-                    "indexSeries" : 2,
                     "meta" : {
-                      "globalKey" : "92a91d81"
+                      "globalKey" : "0"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "c762cfa0"
+                  "globalKey" : "5a5ff79f"
                 }
-              },
-              "interestRatePayout" : [ {
+              } ],
+              "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "5a5ff79f"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
+                "generalTerms" : {
+                  "indexReferenceInformation" : {
+                    "indexName" : {
+                      "value" : "Dow Jones CDX NA IG.2"
                     },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
+                    "indexSeries" : 2,
+                    "indexAnnexDate" : "2004-07-06",
+                    "indexAnnexSource" : {
+                      "value" : "Publisher"
+                    },
+                    "meta" : {
+                      "globalKey" : "53b8689"
                     }
                   }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "a049273f"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ec8d4"
                 },
-                "unadjustedDate" : "2009-03-20"
+                "meta" : {
+                  "globalKey" : "39f538a8"
+                }
               },
               "meta" : {
-                "globalKey" : "3ec8d4"
+                "globalKey" : "383edb69"
               }
             }
           },
           "meta" : {
-            "globalKey" : "2427143e"
+            "globalKey" : "9c4bc46"
           }
         },
         "meta" : {
-          "globalKey" : "2427143e"
+          "globalKey" : "9c4bc46"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "56a5905f"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0060,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0060,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "7e0c7b81"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea858"
-      },
-      "value" : "2005-01-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "56323"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
-        },
-        "value" : "1031234567"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "84d7eae5"
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
+        }
+      } ],
+      "name" : {
+        "value" : "Party B"
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2004-10-18",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "DJ.CDX.NA"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "ae7fb3d4"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "ae7fb3d4"
+      }
+    },
+    "meta" : {
+      "globalKey" : "72e19255"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "c918b832"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        }
-      },
       "quantity" : {
+        "value" : 16000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
         },
-        "value" : 16000
+        "receiverPartyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "30a89faa"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "7e3cf93f"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex02-cdx-seniority-Subordinate.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex02-cdx-seniority-Subordinate.json
index 0b37da0285..70869871ba 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex02-cdx-seniority-Subordinate.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex02-cdx-seniority-Subordinate.json
@@ -1,85 +1,32 @@
 {
-  "meta" : {
-    "globalKey" : "e73466d0"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2004-10-18",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "DJ.CDX.NA"
-            }
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "1031234567",
         "meta" : {
-          "globalKey" : "ae7fb3d4"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "ae7fb3d4"
-      }
-    },
-    "meta" : {
-      "globalKey" : "a4587b1e"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
       },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56323",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
-      },
-      "name" : {
-        "value" : "Party B"
+        "globalKey" : "1ecdb5a5"
       },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2005-01-24",
+      "meta" : {
+        "globalKey" : "3ea858"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -89,214 +36,267 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2004-03-23",
                 "meta" : {
                   "globalKey" : "3ea0d7"
-                },
-                "unadjustedDate" : "2004-03-23"
+                }
               },
               "meta" : {
                 "globalKey" : "3ea0d7"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-03-20",
+                "meta" : {
+                  "globalKey" : "3ec8d4"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ec8d4"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "generalTerms" : {
-                  "indexReferenceInformation" : {
-                    "indexName" : {
-                      "value" : "Dow Jones CDX NA IG.2"
-                    },
-                    "indexAnnexDate" : "2004-07-06",
-                    "indexAnnexSource" : {
-                      "value" : "PUBLISHER"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
                     },
-                    "indexSeries" : 2,
                     "meta" : {
-                      "globalKey" : "c4537e2a"
-                    },
-                    "seniority" : "SUB_TIER_1"
+                      "globalKey" : "0"
+                    }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "26d00feb"
+                  "globalKey" : "5a5ff79f"
                 }
-              },
-              "interestRatePayout" : [ {
+              } ],
+              "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "5a5ff79f"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
+                "generalTerms" : {
+                  "indexReferenceInformation" : {
+                    "indexName" : {
+                      "value" : "Dow Jones CDX NA IG.2"
                     },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
+                    "indexSeries" : 2,
+                    "indexAnnexDate" : "2004-07-06",
+                    "indexAnnexSource" : {
+                      "value" : "Publisher"
+                    },
+                    "seniority" : "SubTier1",
+                    "meta" : {
+                      "globalKey" : "a40e3622"
                     }
                   }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "ce82ec8a"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ec8d4"
                 },
-                "unadjustedDate" : "2009-03-20"
+                "meta" : {
+                  "globalKey" : "68ac7e3"
+                }
               },
               "meta" : {
-                "globalKey" : "3ec8d4"
+                "globalKey" : "d1757d42"
               }
             }
           },
           "meta" : {
-            "globalKey" : "d24eca21"
+            "globalKey" : "30abb805"
           }
         },
         "meta" : {
-          "globalKey" : "d24eca21"
+          "globalKey" : "30abb805"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "56a5905f"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0060,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0060,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "7e0c7b81"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea858"
-      },
-      "value" : "2005-01-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "56323"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
-        },
-        "value" : "1031234567"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "84d7eae5"
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
+        }
+      } ],
+      "name" : {
+        "value" : "Party B"
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2004-10-18",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "DJ.CDX.NA"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "ae7fb3d4"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "ae7fb3d4"
+      }
+    },
+    "meta" : {
+      "globalKey" : "abe9af20"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "c918b832"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        }
-      },
       "quantity" : {
+        "value" : 16000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
         },
-        "value" : 16000
+        "receiverPartyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "30a89faa"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "89e156ca"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex02-iTraxx-usi.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex02-iTraxx-usi.json
index 9bd7411e6b..45d48defee 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex02-iTraxx-usi.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex02-iTraxx-usi.json
@@ -1,85 +1,32 @@
 {
-  "meta" : {
-    "globalKey" : "5fa7ffd2"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2004-10-11",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "DJ.iTraxx.Europe"
-            }
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "d51e174"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "d51e174"
-      }
-    },
-    "meta" : {
-      "globalKey" : "b34fb685"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "yuhge34",
-        "globalKey" : "fde8b071"
-      },
-      "name" : {
-        "value" : "New Bank, New York"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56323",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "NEWBANKLDNBICXXX"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "48d985f2"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/usi"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "z45rdfg",
-        "globalKey" : "19a7a9a5"
+        "globalKey" : "df285a49"
       },
-      "name" : {
-        "value" : "Massive Bank, New York"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "MASSIVELDNBICXXX"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "7a10616a"
-        }
-      } ]
+      "identifierType" : "UniqueSwapIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2004-11-03",
+      "meta" : {
+        "globalKey" : "3ea2c3"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "z45rdfg",
-          "globalReference" : "19a7a9a5"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "yuhge34",
-          "globalReference" : "fde8b071"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -87,21 +34,32 @@
             "productQualifier" : "CreditDefaultSwap_Index"
           } ],
           "economicTerms" : {
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2010-03-20",
+                "meta" : {
+                  "globalKey" : "3ed0d4"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ed0d4"
+              }
+            },
             "payout" : {
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "generalTerms" : {
@@ -109,128 +67,170 @@
                     "indexName" : {
                       "value" : "Dow Jones iTraxx Europe Consumers Series 2 Version 1"
                     },
+                    "indexSeries" : 2,
+                    "indexAnnexVersion" : 1,
                     "excludedReferenceEntity" : [ {
                       "referenceEntity" : {
-                        "meta" : {
-                          "globalKey" : "43886e95"
-                        },
                         "name" : {
                           "value" : "TESCO PLC"
+                        },
+                        "meta" : {
+                          "globalKey" : "43886e95"
                         }
                       }
                     } ],
-                    "indexAnnexVersion" : 1,
-                    "indexSeries" : 2,
                     "meta" : {
-                      "globalKey" : "ac767880"
+                      "globalKey" : "ae1d399e"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "998c1edf"
+                  "globalKey" : "9b32dffd"
                 }
               },
               "meta" : {
-                "globalKey" : "998c1edf"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ed0d4"
-                },
-                "unadjustedDate" : "2010-03-20"
-              },
-              "meta" : {
-                "globalKey" : "3ed0d4"
+                "globalKey" : "9b32dffd"
               }
             }
           },
           "meta" : {
-            "globalKey" : "793b5195"
+            "globalKey" : "307d88d1"
           }
         },
         "meta" : {
-          "globalKey" : "793b5195"
+          "globalKey" : "307d88d1"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e9604ca5",
+          "externalReference" : "z45rdfg"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "429e1371",
+          "externalReference" : "yuhge34"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea2c3"
-      },
-      "value" : "2004-11-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "NEWBANKLDNBICXXX",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/usi"
-          },
-          "value" : "56323"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "48d985f2"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "54930084UKLVMY22DS16"
+      "name" : {
+        "value" : "New Bank, New York"
       },
       "meta" : {
-        "globalKey" : "e108e53f"
+        "globalKey" : "429e1371",
+        "externalKey" : "yuhge34"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "MASSIVELDNBICXXX",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "7a10616a"
+        }
+      } ],
+      "name" : {
+        "value" : "Massive Bank, New York"
       },
-      "identifierType" : "UNIQUE_SWAP_IDENTIFIER"
-    } ]
+      "meta" : {
+        "globalKey" : "e9604ca5",
+        "externalKey" : "z45rdfg"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2004-10-11",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "DJ.iTraxx.Europe"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "d51e174"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "d51e174"
+      }
+    },
+    "meta" : {
+      "globalKey" : "3a520d1d"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "7610960d"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "yuhge34",
-          "globalReference" : "fde8b071"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "z45rdfg",
-          "globalReference" : "19a7a9a5"
-        }
-      },
       "quantity" : {
+        "value" : 17000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "429e1371",
+          "externalReference" : "yuhge34"
         },
-        "value" : 17000
+        "receiverPartyReference" : {
+          "globalReference" : "e9604ca5",
+          "externalReference" : "z45rdfg"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "808d52f"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "1d1b2b8c"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex03-cdx-seniority-Other.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex03-cdx-seniority-Other.json
index 1c975bfffa..c07b8c6587 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex03-cdx-seniority-Other.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex03-cdx-seniority-Other.json
@@ -1,85 +1,32 @@
 {
-  "meta" : {
-    "globalKey" : "b398a753"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2004-10-18",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "DJ.CDX.NA"
-            }
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "1031234567",
         "meta" : {
-          "globalKey" : "ae7fb3d4"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "ae7fb3d4"
-      }
-    },
-    "meta" : {
-      "globalKey" : "178c8ce1"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
       },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56323",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
-      },
-      "name" : {
-        "value" : "Party B"
+        "globalKey" : "1ecdb5a5"
       },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2005-01-24",
+      "meta" : {
+        "globalKey" : "3ea858"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -89,214 +36,267 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2004-03-23",
                 "meta" : {
                   "globalKey" : "3ea0d7"
-                },
-                "unadjustedDate" : "2004-03-23"
+                }
               },
               "meta" : {
                 "globalKey" : "3ea0d7"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-03-20",
+                "meta" : {
+                  "globalKey" : "3ec8d4"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ec8d4"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "generalTerms" : {
-                  "indexReferenceInformation" : {
-                    "indexName" : {
-                      "value" : "Dow Jones CDX NA IG.2"
-                    },
-                    "indexAnnexDate" : "2004-07-06",
-                    "indexAnnexSource" : {
-                      "value" : "PUBLISHER"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
                     },
-                    "indexSeries" : 2,
                     "meta" : {
-                      "globalKey" : "15fa45c7"
-                    },
-                    "seniority" : "OTHER"
+                      "globalKey" : "0"
+                    }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "7876d788"
+                  "globalKey" : "5a5ff79f"
                 }
-              },
-              "interestRatePayout" : [ {
+              } ],
+              "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "5a5ff79f"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
+                "generalTerms" : {
+                  "indexReferenceInformation" : {
+                    "indexName" : {
+                      "value" : "Dow Jones CDX NA IG.2"
                     },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
+                    "indexSeries" : 2,
+                    "indexAnnexDate" : "2004-07-06",
+                    "indexAnnexSource" : {
+                      "value" : "Publisher"
+                    },
+                    "seniority" : "Other",
+                    "meta" : {
+                      "globalKey" : "f5b4fdbf"
                     }
                   }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "3a6ac727"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ec8d4"
                 },
-                "unadjustedDate" : "2009-03-20"
+                "meta" : {
+                  "globalKey" : "58318f80"
+                }
               },
               "meta" : {
-                "globalKey" : "3ec8d4"
+                "globalKey" : "231c44df"
               }
             }
           },
           "meta" : {
-            "globalKey" : "ec680e64"
+            "globalKey" : "82527fa2"
           }
         },
         "meta" : {
-          "globalKey" : "ec680e64"
+          "globalKey" : "82527fa2"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "56a5905f"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0060,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0060,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "7e0c7b81"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea858"
-      },
-      "value" : "2005-01-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "56323"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
-        },
-        "value" : "1031234567"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "84d7eae5"
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
+        }
+      } ],
+      "name" : {
+        "value" : "Party B"
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2004-10-18",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "DJ.CDX.NA"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "ae7fb3d4"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "ae7fb3d4"
+      }
+    },
+    "meta" : {
+      "globalKey" : "525a3463"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "c918b832"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        }
-      },
       "quantity" : {
+        "value" : 16000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
         },
-        "value" : 16000
+        "receiverPartyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "30a89faa"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "aef1eacd"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex03-iTraxx-contractual-supplement-account-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex03-iTraxx-contractual-supplement-account-versioned.json
index 590af003dd..2695189029 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex03-iTraxx-contractual-supplement-account-versioned.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex03-iTraxx-contractual-supplement-account-versioned.json
@@ -1,135 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "4d43bf4c"
-  },
   "trade" : {
-    "account" : [ {
-      "accountNumber" : {
-        "meta" : {
-          "scheme" : "http://www.partyA/accountId"
-        },
-        "value" : "12345PartyA"
-      },
-      "meta" : {
-        "externalKey" : "t7653d",
-        "globalKey" : "73a72432"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "4a4f8a7c",
+        "externalReference" : "g56bw4"
       },
-      "servicingParty" : {
-        "externalReference" : "ruytb",
-        "globalReference" : "8aa478ba"
-      }
-    }, {
-      "accountNumber" : {
-        "meta" : {
-          "scheme" : "http://partyB/accountId"
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "ITRAXX1234",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         },
-        "value" : "67899PartyB"
-      },
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "uyr3fdf",
-        "globalKey" : "edf1876a"
-      },
-      "servicingParty" : {
-        "externalReference" : "g56bw4",
-        "globalReference" : "bf98cb7c"
+        "globalKey" : "925bccd4"
       }
     } ],
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2000-01-01",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "17d39ad0"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/contractual-supplement"
-                },
-                "value" : "I_TRAXX_EUROPE_DEALER"
-              },
-              "publicationDate" : "2005-09-19"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "848aea2c"
-        }
-      } ],
+    "tradeDate" : {
+      "value" : "2005-11-03",
       "meta" : {
-        "globalKey" : "654a855c"
+        "globalKey" : "3eaac3"
       }
     },
-    "meta" : {
-      "globalKey" : "283e3a01"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "ruytb",
-        "globalKey" : "8aa478ba"
-      },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "PARTYABICXXX"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "1fd5eed3"
-        }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "g56bw4",
-        "globalKey" : "bf98cb7c"
-      },
-      "name" : {
-        "value" : "Party B"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "PARTYBBICXXX"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "54bc2a14"
-        }
-      } ]
-    } ],
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "ruytb",
-          "globalReference" : "8aa478ba"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "g56bw4",
-          "globalReference" : "bf98cb7c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -137,21 +32,32 @@
             "productQualifier" : "CreditDefaultSwap_Index"
           } ],
           "economicTerms" : {
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2010-03-20",
+                "meta" : {
+                  "globalKey" : "3ed0d4"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ed0d4"
+              }
+            },
             "payout" : {
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "generalTerms" : {
@@ -159,130 +65,224 @@
                     "indexName" : {
                       "value" : "Dow Jones iTraxx Europe Consumers Series 2 Version 1"
                     },
+                    "indexSeries" : 2,
+                    "indexAnnexVersion" : 1,
+                    "indexAnnexDate" : "2005-11-01",
+                    "indexAnnexSource" : {
+                      "value" : "Publisher"
+                    },
                     "excludedReferenceEntity" : [ {
                       "referenceEntity" : {
-                        "meta" : {
-                          "globalKey" : "43886e95"
-                        },
                         "name" : {
                           "value" : "TESCO PLC"
+                        },
+                        "meta" : {
+                          "globalKey" : "43886e95"
                         }
                       }
                     } ],
-                    "indexAnnexDate" : "2005-11-01",
-                    "indexAnnexSource" : {
-                      "value" : "PUBLISHER"
-                    },
-                    "indexAnnexVersion" : 1,
-                    "indexSeries" : 2,
                     "meta" : {
-                      "globalKey" : "d58c2dc9"
+                      "globalKey" : "aba314c9"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "9ff7f70a"
+                  "globalKey" : "760ede0a"
                 }
               },
               "meta" : {
-                "globalKey" : "9ff7f70a"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ed0d4"
-                },
-                "unadjustedDate" : "2010-03-20"
-              },
-              "meta" : {
-                "globalKey" : "3ed0d4"
+                "globalKey" : "760ede0a"
               }
             }
           },
           "meta" : {
-            "globalKey" : "b934058a"
+            "globalKey" : "b14394b6"
           }
         },
         "meta" : {
-          "globalKey" : "b934058a"
+          "globalKey" : "b14394b6"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "2ebb90bf"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8b68721"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "b60b1b7a",
+          "externalReference" : "ruytb"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4a4f8a7c",
+          "externalReference" : "g56bw4"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eaac3"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "PARTYABICXXX",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "1fd5eed3"
+        }
+      } ],
+      "name" : {
+        "value" : "Party A"
       },
-      "value" : "2005-11-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "b60b1b7a",
+        "externalKey" : "ruytb"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "PARTYBBICXXX",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "54bc2a14"
+        }
+      } ],
+      "name" : {
+        "value" : "Party B"
+      },
+      "meta" : {
+        "globalKey" : "4a4f8a7c",
+        "externalKey" : "g56bw4"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2000-01-01",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "ITRAXX1234"
+          "vintage" : 1992
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "17d39ad0"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "iTraxxEuropeDealer",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/contractual-supplement"
+                }
+              },
+              "publicationDate" : "2005-09-19"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "848aea2c"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "g56bw4",
-        "globalReference" : "bf98cb7c"
+      "meta" : {
+        "globalKey" : "654a855c"
+      }
+    },
+    "account" : [ {
+      "accountNumber" : {
+        "value" : "12345PartyA",
+        "meta" : {
+          "scheme" : "http://www.partyA/accountId"
+        }
+      },
+      "servicingParty" : {
+        "globalReference" : "b60b1b7a",
+        "externalReference" : "ruytb"
+      },
+      "meta" : {
+        "globalKey" : "73a72432",
+        "externalKey" : "t7653d"
+      }
+    }, {
+      "accountNumber" : {
+        "value" : "67899PartyB",
+        "meta" : {
+          "scheme" : "http://partyB/accountId"
+        }
+      },
+      "servicingParty" : {
+        "globalReference" : "4a4f8a7c",
+        "externalReference" : "g56bw4"
       },
       "meta" : {
-        "globalKey" : "df712d14"
+        "globalKey" : "edf1876a",
+        "externalKey" : "uyr3fdf"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "702c5757"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "59979b0b"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "g56bw4",
-          "globalReference" : "bf98cb7c"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "ruytb",
-          "globalReference" : "8aa478ba"
-        }
-      },
       "quantity" : {
+        "value" : 17000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "4a4f8a7c",
+          "externalReference" : "g56bw4"
         },
-        "value" : 17000
+        "receiverPartyReference" : {
+          "globalReference" : "b60b1b7a",
+          "externalReference" : "ruytb"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "94562971"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "622f5c88"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex04-iBoxx-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex04-iBoxx-uti.json
index ecc591b48b..2c8d24a051 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex04-iBoxx-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdindex-ex04-iBoxx-uti.json
@@ -1,87 +1,32 @@
 {
-  "meta" : {
-    "globalKey" : "37a53fb"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "6b413360"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "6b413360"
-      }
-    },
-    "meta" : {
-      "globalKey" : "9038b3c9"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
       },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56323",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
+        "globalKey" : "c6afb4da"
       },
-      "name" : {
-        "value" : "Party B"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2005-01-24",
+      "meta" : {
+        "globalKey" : "3ea858"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -91,76 +36,45 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2014-03-23",
                 "meta" : {
                   "globalKey" : "3ef0d7"
-                },
-                "unadjustedDate" : "2014-03-23"
+                }
               },
               "meta" : {
                 "globalKey" : "3ef0d7"
               }
             },
-            "payout" : {
-              "creditDefaultPayout" : {
-                "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
-                    }
-                  }
-                },
-                "generalTerms" : {
-                  "indexReferenceInformation" : {
-                    "indexId" : [ {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
-                      },
-                      "value" : "DE0006301161"
-                    } ],
-                    "indexName" : {
-                      "value" : "iBoxx EUR Corporates"
-                    },
-                    "meta" : {
-                      "globalKey" : "3f94f315"
-                    }
-                  }
-                },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2019-03-20",
                 "meta" : {
-                  "globalKey" : "1902a0f4"
+                  "globalKey" : "3f18d4"
                 }
               },
+              "meta" : {
+                "globalKey" : "3f18d4"
+              }
+            },
+            "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "2c4ccb73"
-                },
                 "rateSpecification" : {
                   "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "174d4182"
-                    },
                     "rateOption" : {
                       "address" : {
                         "scope" : "DOCUMENT",
@@ -175,208 +89,294 @@
                         }
                       }
                     },
+                    "meta" : {
+                      "globalKey" : "174d4182"
+                    },
                     "initialRate" : {
+                      "value" : 0.025,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.025,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
                     }
                   }
                 },
                 "resetDates" : {
+                  "initialFixingDate" : {
+                    "initialFixingDate" : "2014-03-23"
+                  },
                   "finalFixingDate" : {
+                    "unadjustedDate" : "2019-03-20",
                     "dateAdjustments" : {
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "meta" : {
                         "globalKey" : "3a4b88ab"
                       }
                     },
                     "meta" : {
                       "globalKey" : "2727bc7f"
-                    },
-                    "unadjustedDate" : "2019-03-20"
-                  },
-                  "initialFixingDate" : {
-                    "initialFixingDate" : "2014-03-23"
+                    }
                   },
                   "meta" : {
-                    "globalKey" : "fc698996"
+                    "globalKey" : "1a4469d6"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "4a27abb3"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "d78d067"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3f18d4"
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
                 },
-                "unadjustedDate" : "2019-03-20"
+                "generalTerms" : {
+                  "indexReferenceInformation" : {
+                    "indexName" : {
+                      "value" : "iBoxx EUR Corporates"
+                    },
+                    "indexId" : [ {
+                      "value" : "DE0006301161",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "8b0e5955"
+                    }
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "647c0734"
+                }
               },
               "meta" : {
-                "globalKey" : "3f18d4"
+                "globalKey" : "16a21da1"
               }
             }
           },
           "meta" : {
-            "globalKey" : "507b7656"
+            "globalKey" : "b828b7be"
           }
         },
         "meta" : {
-          "globalKey" : "507b7656"
+          "globalKey" : "b828b7be"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "8be2eb38"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "b67ad2b1"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
-                  },
-                  "value" : "USD-LIBOR-BBA"
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.02,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.02,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 1000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 1000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
             },
+            "meta" : {
+              "globalKey" : "18df836f"
+            }
+          },
+          "meta" : {
+            "globalKey" : "bd6e2aee"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea858"
-      },
-      "value" : "2005-01-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "56323"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "54930084UKLVMY22DS16"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "c8903fd0"
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
+        }
+      } ],
+      "name" : {
+        "value" : "Party B"
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "6b413360"
+      }
+    },
+    "meta" : {
+      "globalKey" : "4f193d37"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "3cb073f2"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        }
-      },
       "quantity" : {
+        "value" : 16000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
         },
-        "value" : 16000
+        "receiverPartyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "309a8bea"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "3668dce1"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdm-cds-mortgage-CMBS-single-payment-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdm-cds-mortgage-CMBS-single-payment-versioned.json
index 963d8358cf..f83ad33cb7 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdm-cds-mortgage-CMBS-single-payment-versioned.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdm-cds-mortgage-CMBS-single-payment-versioned.json
@@ -1,114 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "6dc08edd"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "b2724407"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "8f4dd58"
-      }
-    },
-    "meta" : {
-      "globalKey" : "c7ff3389"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "trg6836",
-        "globalKey" : "8e1db6b4"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "69c51ff4",
+        "externalReference" : "trg6836"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56ERT7RHWE4",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "XYZBICXXX"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "26482791"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "zx456j",
-        "globalKey" : "21f24e14"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "ABCBICXXX"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "be37d39a"
-        }
-      } ]
+        "globalKey" : "132f4c6e"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-11-14",
+      "meta" : {
+        "globalKey" : "3eb2ce"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "trg6836",
-          "globalReference" : "8e1db6b4"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "trg6836",
-          "globalReference" : "8e1db6b4"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "zx456j",
-          "globalReference" : "21f24e14"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -116,31 +32,11 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
-                "meta" : {
-                  "globalKey" : "42f910b"
-                }
-              },
-              "businessDayConvention" : "FOLLOWING",
-              "meta" : {
-                "globalKey" : "da556d3a"
-              }
-            },
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2006-11-17",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "GBLO"
@@ -151,241 +47,345 @@
                       "globalKey" : "42f910b"
                     }
                   },
-                  "businessDayConvention" : "FOLLOWING",
                   "meta" : {
                     "globalKey" : "da556d3a"
                   }
                 },
                 "meta" : {
                   "globalKey" : "18601d49"
-                },
-                "unadjustedDate" : "2006-11-17"
+                }
               },
               "meta" : {
                 "globalKey" : "18601d49"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2046-07-12",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "f02f5604"
+                }
+              },
+              "meta" : {
+                "globalKey" : "f02f5604"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da556d3a"
+              }
+            },
             "payout" : {
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "32319a6b"
                   },
-                  "settlementType" : "PHYSICAL",
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 5
+                    },
                     "escrow" : true,
                     "meta" : {
                       "globalKey" : "120d14"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 5
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
-                    "allGuarantees" : false,
                     "referenceEntity" : {
-                      "meta" : {
-                        "globalKey" : "65eff19"
-                      },
                       "name" : {
                         "value" : "MERRILL LYNCH/COUNTRYWIDE COMM, 2006-3"
+                      },
+                      "meta" : {
+                        "globalKey" : "65eff19"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligor" : {
-                        "meta" : {
-                          "globalKey" : "65eff19"
-                        },
-                        "name" : {
-                          "value" : "MERRILL LYNCH/COUNTRYWIDE COMM, 2006-3"
-                        }
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "60687VAQ8",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                              },
-                              "value" : "60687VAQ8"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "b9f84235"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
+                              "value" : "MLCFC 2006-3",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-Bloomberg-1-0"
-                              },
-                              "value" : "MLCFC 2006-3"
+                              }
                             },
+                            "source" : "BBGID",
                             "meta" : {
                               "globalKey" : "3b0c170b"
-                            },
-                            "source" : "BBGID"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligor" : {
+                        "name" : {
+                          "value" : "MERRILL LYNCH/COUNTRYWIDE COMM, 2006-3"
+                        },
+                        "meta" : {
+                          "globalKey" : "65eff19"
+                        }
                       }
-                    } ]
+                    } ],
+                    "allGuarantees" : false
                   }
                 },
-                "meta" : {
-                  "globalKey" : "3ceda255"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "distressedRatingsDowngrade" : true,
-                    "failureToPayInterest" : false,
                     "failureToPayPrincipal" : true,
-                    "impliedWritedown" : true,
+                    "failureToPayInterest" : false,
+                    "distressedRatingsDowngrade" : true,
                     "maturityExtension" : false,
+                    "writedown" : true,
+                    "impliedWritedown" : true,
                     "meta" : {
-                      "globalKey" : "7af77360"
-                    },
-                    "writedown" : true
+                      "globalKey" : "7af7892c"
+                    }
                   },
                   "floatingAmountEvents" : {
-                    "additionalFixedPayments" : {
-                      "interestShortfallReimbursement" : true,
-                      "principalShortfallReimbursement" : true,
-                      "writedownReimbursement" : true
-                    },
                     "failureToPayPrincipal" : true,
-                    "floatingAmountProvisions" : {
-                      "wacCapInterestProvision" : true
-                    },
-                    "impliedWritedown" : false,
                     "interestShortfall" : {
+                      "interestShortfallCap" : "Fixed",
                       "compounding" : true,
-                      "interestShortfallCap" : "FIXED",
                       "rateSource" : {
                         "value" : "USD-LIBOR-BBA"
                       }
                     },
-                    "writedown" : true
+                    "writedown" : true,
+                    "impliedWritedown" : false,
+                    "floatingAmountProvisions" : {
+                      "wacCapInterestProvision" : true
+                    },
+                    "additionalFixedPayments" : {
+                      "interestShortfallReimbursement" : true,
+                      "principalShortfallReimbursement" : true,
+                      "writedownReimbursement" : true
+                    }
                   },
                   "meta" : {
-                    "globalKey" : "192279ef"
+                    "globalKey" : "e7c92269"
                   }
-                } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "caa8d495"
+                }
               },
               "meta" : {
-                "globalKey" : "3ceda255"
+                "globalKey" : "caa8d495"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "f02f5604"
-                },
-                "unadjustedDate" : "2046-07-12"
-              },
-              "meta" : {
-                "globalKey" : "f02f5604"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "eed523df"
+            "globalKey" : "1320db49"
           }
         },
         "meta" : {
-          "globalKey" : "eed523df"
+          "globalKey" : "1320db49"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "99d719c2"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 15000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 15000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a10c1e7e"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "69c51ff4",
+          "externalReference" : "trg6836"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "87501c94",
+          "externalReference" : "zx456j"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "69c51ff4",
+          "externalReference" : "trg6836"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb2ce"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "XYZBICXXX",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "26482791"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2006-11-14"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "69c51ff4",
+        "externalKey" : "trg6836"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABCBICXXX",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "56ERT7RHWE4"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
         },
-        "version" : 1
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "be37d39a"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "trg6836",
-        "globalReference" : "8e1db6b4"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "8bccfb6e"
+        "globalKey" : "87501c94",
+        "externalKey" : "zx456j"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "e9431741"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "3fc5b092"
+      }
+    },
+    "meta" : {
+      "globalKey" : "727a91fb"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "externalKey" : "iey785",
-      "globalKey" : "4a08d846"
-    },
     "transfer" : {
       "quantity" : {
+        "value" : 148000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
-        },
-        "value" : 148000
+        }
       },
       "settlementDate" : {
         "unadjustedDate" : "2006-12-27"
       }
+    },
+    "meta" : {
+      "globalKey" : "4a08d846",
+      "externalKey" : "iey785"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "1de350ab"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdm-cds-ref-ob-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdm-cds-ref-ob-versioned.json
index af3f6ad41d..1894635f86 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdm-cds-ref-ob-versioned.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdm-cds-ref-ob-versioned.json
@@ -1,248 +1,301 @@
 {
-  "meta" : {
-    "globalKey" : "e3f386bf"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "65d82653"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "65d82653"
-      }
-    },
-    "meta" : {
-      "globalKey" : "e3f386bf"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "g4789",
-        "globalKey" : "be6e0943"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "be6e0943",
+        "externalReference" : "g4789"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56ERT7RHWE4",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "894500DM8LVOSCMP9T34"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "be6e0943"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "xdf45",
-        "globalKey" : "a639fcda"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "549300JZDC6K840D7F79"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "a639fcda"
-        }
-      } ]
+        "globalKey" : "d6e3d9cb"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2018-10-02",
+      "meta" : {
+        "globalKey" : "3f1282",
+        "externalKey" : "tradeDate"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "g4789",
-          "globalReference" : "be6e0943"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "xdf45",
-          "globalReference" : "a639fcda"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
-          "productIdentifier" : [ {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.dtcc.com/coding-scheme/external/GTR-Product-Id"
-                },
-                "value" : "Credit_SingleName_Corporate_StandardEuropeanCorporate"
-              },
-              "meta" : {
-                "globalKey" : "54ff24a9"
-              },
-              "source" : "OTHER"
-            }
-          }, {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.dtcc.com/coding-scheme/external/underlying-id/ISIN"
-                },
-                "value" : "USP7807HAV70"
-              },
-              "meta" : {
-                "globalKey" : "8d6bb14b"
-              },
-              "source" : "ISIN"
-            }
-          } ],
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
-              "value" : "CREDIT"
+              "value" : "Credit"
             }
           }, {
             "source" : "CFI",
             "value" : {
               "name" : {
+                "value" : "SCUCCX",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/external/product-classification/iso10962"
-                },
-                "value" : "SCUCCX"
+                }
               }
             }
           }, {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "SNDB",
                 "meta" : {
                   "scheme" : "http://www.dtcc.com/coding-scheme/external/product-classification/emir-seniority"
-                },
-                "value" : "SNDB"
+                }
               }
             }
           }, {
             "source" : "EMIR",
             "value" : {
               "name" : {
+                "value" : "SW",
                 "meta" : {
                   "scheme" : "http://www.dtcc.com/coding-scheme/external/product-classification/emir-contract-type"
-                },
-                "value" : "SW"
+                }
               }
             }
           }, {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "Untranched",
                 "meta" : {
                   "scheme" : "http://www.dtcc.com/coding-scheme/external/product-classification/emir-tranched-product"
-                },
-                "value" : "Untranched"
+                }
               }
             }
           }, {
             "source" : "ISDA",
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
-          "economicTerms" : {
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "EUTA"
-                } ],
+          "productIdentifier" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "Credit_SingleName_Corporate_StandardEuropeanCorporate",
                 "meta" : {
-                  "globalKey" : "428533f"
+                  "scheme" : "http://www.dtcc.com/coding-scheme/external/GTR-Product-Id"
                 }
               },
-              "businessDayConvention" : "FOLLOWING",
+              "source" : "Other",
               "meta" : {
-                "globalKey" : "da4e2f6e"
+                "globalKey" : "54ff24a9"
               }
-            },
+            }
+          }, {
+            "value" : {
+              "identifier" : {
+                "value" : "USP7807HAV70",
+                "meta" : {
+                  "scheme" : "http://www.dtcc.com/coding-scheme/external/underlying-id/ISIN"
+                }
+              },
+              "source" : "ISIN",
+              "meta" : {
+                "globalKey" : "8d6bb14b"
+              }
+            }
+          } ],
+          "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2018-10-04",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
                   "businessCenters" : {
                     "businessCentersReference" : {
-                      "externalReference" : "e789456",
-                      "globalReference" : "428533f"
+                      "globalReference" : "428533f",
+                      "externalReference" : "e789456"
                     },
                     "meta" : {
                       "globalKey" : "3fdfc202"
                     }
                   },
-                  "businessDayConvention" : "NONE",
                   "meta" : {
                     "globalKey" : "e93f2fca"
                   }
                 },
                 "meta" : {
                   "globalKey" : "d0db0fc6"
-                },
-                "unadjustedDate" : "2018-10-04"
+                }
               },
               "meta" : {
                 "globalKey" : "d0db0fc6"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2022-12-20",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "EUTA"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "428533f",
+                      "externalKey" : "e789456"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "d3636f07"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "d7cc5d73"
+                }
+              },
+              "meta" : {
+                "globalKey" : "d7cc5d73"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "EUTA"
+                } ],
+                "meta" : {
+                  "globalKey" : "428533f"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da4e2f6e"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "firstPeriodStartDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2018-09-20",
+                      "meta" : {
+                        "globalKey" : "3f1254"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3f1254"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "abb5ddd6"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
+                  "firstPaymentDate" : "2018-12-20",
+                  "meta" : {
+                    "globalKey" : "ac0d2516"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "7bf04b3f"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "PWF87O",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                        },
-                        "value" : "PWF87O"
+                        }
                       }, {
+                        "value" : "Identifier:549300YWR8TN1OFD4P06",
                         "meta" : {
                           "scheme" : "http://www.dtcc.com/coding-scheme/external/emir-reference-entity"
-                        },
-                        "value" : "Identifier:549300YWR8TN1OFD4P06"
+                        }
                       } ],
-                      "meta" : {
-                        "globalKey" : "4ac1c48e"
-                      },
                       "name" : {
+                        "value" : "Petróleos de Venezuela, S.A.",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-name-RED"
-                        },
-                        "value" : "Petróleos de Venezuela, S.A."
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "4ac1c48e"
                       }
                     },
                     "referenceObligation" : [ {
@@ -250,275 +303,222 @@
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "USP7807HAM71",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
-                              },
-                              "value" : "USP7807HAM71"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "8d6b8f83"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
+                              "value" : "P7807HAM7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP"
-                              },
-                              "value" : "P7807HAM7"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "fc331643"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : 0.486,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "value" : 0.486,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "c8027fd5"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : false,
                     "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2" ]
+                      "notifyingParty" : [ "Party2" ]
                     },
                     "meta" : {
                       "globalKey" : "fb9ab88e"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "7bb68af4"
-                  },
                   "obligations" : {
-                    "category" : "PAYMENT"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "firstPeriodStartDate" : {
-                    "adjustableDate" : {
-                      "meta" : {
-                        "globalKey" : "3f1254"
-                      },
-                      "unadjustedDate" : "2018-09-20"
-                    },
-                    "meta" : {
-                      "globalKey" : "3f1254"
-                    }
+                    "category" : "Payment"
                   },
                   "meta" : {
-                    "globalKey" : "47d813e"
+                    "globalKey" : "7bb68af4"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "3fccacfb"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2018-12-20",
-                  "meta" : {
-                    "globalKey" : "ac0d2dc2"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "c8027fd5"
                 }
-              } ],
-              "meta" : {
-                "globalKey" : "909a6f10"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "EUTA"
-                    } ],
-                    "meta" : {
-                      "externalKey" : "e789456",
-                      "globalKey" : "428533f"
-                    }
-                  },
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "d3636f07"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "d7cc5d73"
-                },
-                "unadjustedDate" : "2022-12-20"
               },
               "meta" : {
-                "globalKey" : "d7cc5d73"
+                "globalKey" : "445caab6"
               }
             }
           },
           "meta" : {
-            "globalKey" : "4d28badd"
+            "globalKey" : "c5620499"
           }
         },
         "meta" : {
-          "globalKey" : "4d28badd"
+          "globalKey" : "c5620499"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a82a58a1"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.01,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 1000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 1000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "48eae291"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "5d20bb7f"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 1000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 1000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "d4716f8f"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "be6e0943",
+          "externalReference" : "g4789"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a639fcda",
+          "externalReference" : "xdf45"
+        }
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "894500DM8LVOSCMP9T34",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "be6e0943"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "tradeDate",
-        "globalKey" : "3f1282"
-      },
-      "value" : "2018-10-02"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "be6e0943",
+        "externalKey" : "g4789"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300JZDC6K840D7F79",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "56ERT7RHWE4"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
         },
-        "version" : 1
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "a639fcda"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "a639fcda",
+        "externalKey" : "xdf45"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "65d82653"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "g4789",
-        "globalReference" : "be6e0943"
-      },
       "meta" : {
-        "globalKey" : "d0f0bf4b"
+        "globalKey" : "65d82653"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "341b02f5"
+    }
+  },
+  "meta" : {
+    "globalKey" : "341b02f5"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-ELCDS-ReferenceObligation-collateral-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-ELCDS-ReferenceObligation-collateral-versioned.json
index d5e3e2a075..3f60bd7711 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-ELCDS-ReferenceObligation-collateral-versioned.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-ELCDS-ReferenceObligation-collateral-versioned.json
@@ -1,131 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "4c4c4671"
-  },
   "trade" : {
-    "collateral" : {
-      "independentAmount" : {
-        "payerPartyReference" : {
-          "externalReference" : "fhgtd3",
-          "globalReference" : "8e102e2c"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "e54t5",
-          "globalReference" : "8e102e2b"
-        },
-        "paymentDetail" : [ {
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "8e102e2b",
+        "externalReference" : "e54t5"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "TW9236",
           "meta" : {
-            "globalKey" : "5a68dca8"
-          },
-          "paymentRule" : {
-            "percentageRule" : {
-              "notionalAmountReference" : {
-                "externalReference" : "gu5gh",
-                "globalReference" : "0"
-              },
-              "paymentPercent" : 0.02
-            }
-          }
-        } ]
-      }
-    },
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2007-12-12",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "33d1515b"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "STANDARD_LCDS"
-              },
-              "publicationDate" : "2007-12-12"
-            } ]
+            "scheme" : "TradeRefNbr"
           }
         },
-        "meta" : {
-          "globalKey" : "61ad567"
-        }
+        "version" : 1
       } ],
       "meta" : {
-        "globalKey" : "b2867102"
+        "globalKey" : "1c7ae485"
       }
-    },
-    "meta" : {
-      "globalKey" : "4c4c4671"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "e54t5",
-        "globalKey" : "8e102e2b"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "DTCC"
-          },
-          "value" : "Party1"
-        },
-        "meta" : {
-          "globalKey" : "8e102e2b"
-        }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "fhgtd3",
-        "globalKey" : "8e102e2c"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "DTCC"
-          },
-          "value" : "Party2"
-        },
-        "meta" : {
-          "globalKey" : "8e102e2c"
-        }
-      } ]
     } ],
+    "tradeDate" : {
+      "value" : "2007-10-31",
+      "meta" : {
+        "globalKey" : "3eba9f"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "e54t5",
-          "globalReference" : "8e102e2b"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "e54t5",
-          "globalReference" : "8e102e2b"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "fhgtd3",
-          "globalReference" : "8e102e2c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -133,67 +32,143 @@
             "productQualifier" : "CreditDefaultSwap_Loan"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2007-11-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25c6972c"
-                },
-                "unadjustedDate" : "2007-11-01"
+                }
               },
               "meta" : {
                 "globalKey" : "25c6972c"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2010-06-17",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "261c39fc"
+                }
+              },
+              "meta" : {
+                "globalKey" : "261c39fc"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "gu5gh"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f78"
+                    },
+                    "rollConvention" : "25"
+                  },
                   "meta" : {
-                    "externalKey" : "gu5gh",
-                    "globalKey" : "0"
+                    "globalKey" : "17f78"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
+                  "firstPaymentDate" : "2007-12-20",
+                  "meta" : {
+                    "globalKey" : "840c7d16"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "330a257d"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "gu5gh"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "BLMBERGID",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-Bloomberg"
-                        },
-                        "value" : "BLMBERGID"
+                        }
                       } ],
-                      "meta" : {
-                        "globalKey" : "5fb7a8be"
-                      },
                       "name" : {
                         "value" : "CompanyDEF"
+                      },
+                      "meta" : {
+                        "globalKey" : "5fb7a8be"
                       }
                     },
                     "referenceObligation" : [ {
@@ -201,266 +176,291 @@
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "64352VNC1",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP"
-                              },
-                              "value" : "64352VNC1"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "b56573a0"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
+                              "value" : "ISIN00000000",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
-                              },
-                              "value" : "ISIN00000000"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "88e600de"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
+                              "value" : "BLMBERGID",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-Bloomberg"
-                              },
-                              "value" : "BLMBERGID"
+                              }
                             },
+                            "source" : "BBGID",
                             "meta" : {
                               "globalKey" : "86561eb8"
-                            },
-                            "source" : "BBGID"
+                            }
                           }
                         } ],
                         "borrower" : [ {
-                          "meta" : {
-                            "globalKey" : "238916a4"
-                          },
                           "name" : {
                             "value" : "BorrowerName1"
+                          },
+                          "meta" : {
+                            "globalKey" : "238916a4"
                           }
                         }, {
-                          "meta" : {
-                            "globalKey" : "238916a5"
-                          },
                           "name" : {
                             "value" : "BorrowerName2"
+                          },
+                          "meta" : {
+                            "globalKey" : "238916a5"
                           }
                         } ],
-                        "creditAgreementDate" : "2005-11-04",
                         "facilityType" : {
+                          "value" : "RevolvingLoan",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/facility-type"
-                          },
-                          "value" : "RevolvingLoan"
-                        }
+                          }
+                        },
+                        "creditAgreementDate" : "2005-11-04"
                       }
                     } ],
                     "securedList" : false
                   }
                 },
-                "meta" : {
-                  "globalKey" : "c2099f00"
-                },
                 "protectionTerms" : [ {
-                  "meta" : {
-                    "globalKey" : "80d42974"
-                  },
                   "obligations" : {
-                    "cashSettlementOnly" : true,
-                    "category" : "LOAN",
-                    "continuity" : true,
-                    "deliveryOfCommitments" : true,
+                    "category" : "Loan",
+                    "fullFaithAndCreditObLiability" : true,
                     "designatedPriority" : {
+                      "value" : "FirstLienLoan",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/lien"
-                      },
-                      "value" : "FirstLienLoan"
-                    },
-                    "fullFaithAndCreditObLiability" : true
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "gu5gh",
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c4c"
+                      }
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "25"
+                    "cashSettlementOnly" : true,
+                    "deliveryOfCommitments" : true,
+                    "continuity" : true
                   },
                   "meta" : {
-                    "globalKey" : "28c4c"
+                    "globalKey" : "153c5056"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "4e6b4829"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2007-12-20",
-                  "meta" : {
-                    "globalKey" : "840c85c2"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "5671c5e2"
                 }
-              } ],
-              "meta" : {
-                "globalKey" : "d2eb2729"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
-                  "meta" : {
-                    "globalKey" : "3a4b88ab"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "261c39fc"
-                },
-                "unadjustedDate" : "2010-06-17"
               },
               "meta" : {
-                "globalKey" : "261c39fc"
+                "globalKey" : "69cc16df"
               }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "6f5611f5"
+            "globalKey" : "37401fb9"
           }
         },
         "meta" : {
-          "globalKey" : "6f5611f5"
+          "globalKey" : "37401fb9"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "b34678c3"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.013,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
               },
-              "value" : 0.013,
               "perUnitOf" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d467e427"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "b5889f9d"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
-              },
-              "value" : 10000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "b894a0b9"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "8e102e2b",
+          "externalReference" : "e54t5"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "8e102e2c",
+          "externalReference" : "fhgtd3"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "8e102e2b",
+          "externalReference" : "e54t5"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party1",
+          "meta" : {
+            "scheme" : "DTCC"
+          }
+        },
+        "meta" : {
+          "globalKey" : "8e102e2b"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3eba9f"
-      },
-      "value" : "2007-10-31"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "8e102e2b",
+        "externalKey" : "e54t5"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party2",
           "meta" : {
-            "scheme" : "TradeRefNbr"
+            "scheme" : "DTCC"
+          }
+        },
+        "meta" : {
+          "globalKey" : "8e102e2c"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "8e102e2c",
+        "externalKey" : "fhgtd3"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2007-12-12",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "TW9236"
+          "vintage" : 1992
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "33d1515b"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "StandardLCDS"
+              },
+              "publicationDate" : "2007-12-12"
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ac4d8fbf"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "e54t5",
-        "globalReference" : "8e102e2b"
-      },
       "meta" : {
-        "globalKey" : "79f3ef05"
+        "globalKey" : "58b92b5a"
+      }
+    },
+    "collateral" : {
+      "independentAmount" : {
+        "payerPartyReference" : {
+          "globalReference" : "8e102e2c",
+          "externalReference" : "fhgtd3"
+        },
+        "receiverPartyReference" : {
+          "globalReference" : "8e102e2b",
+          "externalReference" : "e54t5"
+        },
+        "paymentDetail" : [ {
+          "paymentRule" : {
+            "percentageRule" : {
+              "paymentPercent" : 0.02,
+              "notionalAmountReference" : {
+                "globalReference" : "0",
+                "externalReference" : "gu5gh"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "5a68dca8"
+          }
+        } ]
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "84149a57"
+    }
+  },
+  "meta" : {
+    "globalKey" : "84149a57"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-basket-tranche-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-basket-tranche-versioned.json
index 700f614727..f6355605b8 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-basket-tranche-versioned.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-basket-tranche-versioned.json
@@ -1,94 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "754deecd"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "b2724407"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "b2724407"
-      }
-    },
-    "meta" : {
-      "globalKey" : "754deecd"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "tif563d",
-        "globalKey" : "8e367ee2"
-      },
-      "name" : {
-        "value" : "Morgan Stanley Capital Services"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "5e741913",
+        "externalReference" : "fyure4"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DJITRAXXUSDMS5Y",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "MSCSBIC"
+            "scheme" : "http://www.barclaysglobal.com/partners/schema/v1-1/schemes/tradeID"
+          }
         },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "7e7d2a62"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "fyure4",
-        "globalKey" : "63225693"
-      },
-      "name" : {
-        "value" : "Barclays Global Investors"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "BGIBIC"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "786ec794"
-        }
-      } ]
+        "globalKey" : "5a184390"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2004-01-24",
+      "meta" : {
+        "globalKey" : "3ea058"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "tif563d",
-          "globalReference" : "8e367ee2"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "fyure4",
-          "globalReference" : "63225693"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -98,6 +34,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2004-03-23",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -106,140 +43,194 @@
                 },
                 "meta" : {
                   "globalKey" : "eb3e6e4f"
-                },
-                "unadjustedDate" : "2004-03-23"
+                }
               },
               "meta" : {
                 "globalKey" : "eb3e6e4f"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-03-20",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ebd48b0c"
+                }
+              },
+              "meta" : {
+                "globalKey" : "ebd48b0c"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
-                  },
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/ACT.ISDA"
+                },
+                "meta" : {
+                  "globalKey" : "28d6c3e0"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "generalTerms" : {
                   "basketReferenceInformation" : {
-                    "basketId" : [ {
-                      "meta" : {
-                        "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
-                      },
-                      "value" : "BASKET089"
-                    } ],
                     "basketName" : {
+                      "value" : "CDS Basket Sample",
                       "meta" : {
                         "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
-                      },
-                      "value" : "CDS Basket Sample"
+                      }
                     },
+                    "basketId" : [ {
+                      "value" : "BASKET089",
+                      "meta" : {
+                        "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
+                      }
+                    } ],
                     "referencePool" : {
                       "referencePoolItem" : [ {
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "008HA7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                              },
-                              "value" : "008HA7"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "r65hfd",
-                              "globalKey" : "6b99b4c1"
-                            },
                             "name" : {
                               "value" : "Agrium Inc."
+                            },
+                            "meta" : {
+                              "globalKey" : "6b99b4c1",
+                              "externalKey" : "r65hfd"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "r65hfd",
-                              "globalReference" : "6b99b4c1"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "008916AB4",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                                    },
-                                    "value" : "008916AB4"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "ab7bdc95"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "6b99b4c1",
+                              "externalReference" : "r65hfd"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
                         }
                       }, {
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "8G836J",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                              },
-                              "value" : "8G836J"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "uiyn4",
-                              "globalKey" : "92cc27"
-                            },
                             "name" : {
                               "value" : "Tenet Healthcare Corporation"
+                            },
+                            "meta" : {
+                              "globalKey" : "92cc27",
+                              "externalKey" : "uiyn4"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "uiyn4",
-                              "globalReference" : "92cc27"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "88033GAT7",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                                    },
-                                    "value" : "88033GAT7"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "db5db955"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "92cc27",
+                              "externalReference" : "uiyn4"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
                         }
                       } ]
@@ -250,212 +241,221 @@
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "27508f7a"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "gracePeriodExtension" : {
                         "applicable" : true,
                         "gracePeriod" : {
-                          "meta" : {
-                            "globalKey" : "83c"
-                          },
+                          "periodMultiplier" : 0,
                           "period" : "D",
-                          "periodMultiplier" : 0
+                          "meta" : {
+                            "globalKey" : "44"
+                          }
                         }
                       },
                       "paymentRequirement" : {
+                        "value" : 1000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "GBP"
                           }
                         },
-                        "value" : 1000000.00,
                         "meta" : {
                           "globalKey" : "48eae7c4"
                         }
                       }
                     },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "d7154083"
+                      "globalKey" : "f8d2401"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "969cb413"
-                  },
                   "obligations" : {
-                    "category" : "BOND_OR_LOAN"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
+                    "category" : "BondOrLoan"
                   },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/ACT.ISDA"
-                },
-                "meta" : {
-                  "globalKey" : "e55fc83e"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "dd86c738"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "90a9b011"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "ebd48b0c"
-                },
-                "unadjustedDate" : "2009-03-20"
+                  "globalKey" : "824ae978"
+                }
               },
               "meta" : {
-                "globalKey" : "ebd48b0c"
+                "globalKey" : "65ceed58"
               }
             }
           },
           "meta" : {
-            "globalKey" : "7b210123"
+            "globalKey" : "3041b51b"
           }
         },
         "meta" : {
-          "globalKey" : "7b210123"
+          "globalKey" : "3041b51b"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3a43e344"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0060,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0060,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e38853c"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "da73ae62",
+          "externalReference" : "tif563d"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "5e741913",
+          "externalReference" : "fyure4"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea058"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "MSCSBIC",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "7e7d2a62"
+        }
+      } ],
+      "name" : {
+        "value" : "Morgan Stanley Capital Services"
       },
-      "value" : "2004-01-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "da73ae62",
+        "externalKey" : "tif563d"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BGIBIC",
           "meta" : {
-            "scheme" : "http://www.barclaysglobal.com/partners/schema/v1-1/schemes/tradeID"
-          },
-          "value" : "DJITRAXXUSDMS5Y"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
         },
-        "version" : 1
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "786ec794"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "fyure4",
-        "globalReference" : "63225693"
+      "name" : {
+        "value" : "Barclays Global Investors"
       },
       "meta" : {
-        "globalKey" : "127eb2d0"
+        "globalKey" : "5e741913",
+        "externalKey" : "fyure4"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "e9431741"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "e9431741"
+      }
+    },
+    "meta" : {
+      "globalKey" : "8b9fd1a3"
+    }
+  },
+  "meta" : {
+    "globalKey" : "8b9fd1a3"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-basket-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-basket-uti.json
index 6a1328d106..abc15cf3c8 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-basket-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-basket-uti.json
@@ -1,94 +1,32 @@
 {
-  "meta" : {
-    "globalKey" : "294da5bb"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "b2724407"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "b2724407"
-      }
-    },
-    "meta" : {
-      "globalKey" : "294da5bb"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
       },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56323",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
+        "globalKey" : "c6afb4da"
       },
-      "name" : {
-        "value" : "Party B"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2004-01-24",
+      "meta" : {
+        "globalKey" : "3ea058"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -98,6 +36,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2004-03-23",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -106,100 +45,153 @@
                 },
                 "meta" : {
                   "globalKey" : "eb3e6e4f"
-                },
-                "unadjustedDate" : "2004-03-23"
+                }
               },
               "meta" : {
                 "globalKey" : "eb3e6e4f"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-03-20",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ebd48b0c"
+                }
+              },
+              "meta" : {
+                "globalKey" : "ebd48b0c"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
-                  },
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/ACT.ISDA"
+                },
+                "meta" : {
+                  "globalKey" : "28d6c3e0"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "generalTerms" : {
                   "basketReferenceInformation" : {
-                    "basketId" : [ {
-                      "meta" : {
-                        "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
-                      },
-                      "value" : "BASKET089"
-                    } ],
                     "basketName" : {
+                      "value" : "CDS Basket Sample",
                       "meta" : {
                         "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
-                      },
-                      "value" : "CDS Basket Sample"
+                      }
                     },
-                    "nthToDefault" : 1,
+                    "basketId" : [ {
+                      "value" : "BASKET089",
+                      "meta" : {
+                        "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
+                      }
+                    } ],
                     "referencePool" : {
                       "referencePoolItem" : [ {
                         "constituentWeight" : {
                           "basketPercentage" : 0.60
                         },
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "008HA7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                              },
-                              "value" : "008HA7"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "agriumEntity",
-                              "globalKey" : "6b99b4c1"
-                            },
                             "name" : {
                               "value" : "Agrium Inc."
+                            },
+                            "meta" : {
+                              "globalKey" : "6b99b4c1",
+                              "externalKey" : "agriumEntity"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "agriumEntity",
-                              "globalReference" : "6b99b4c1"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "008916AB4",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP"
-                                    },
-                                    "value" : "008916AB4"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "ab7bdc95"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "6b99b4c1",
+                              "externalReference" : "agriumEntity"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
                         }
                       }, {
@@ -207,261 +199,269 @@
                           "basketPercentage" : 0.40
                         },
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "8G836J",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2003/entity-id-RED-1-0"
-                              },
-                              "value" : "8G836J"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "tenetEntity",
-                              "globalKey" : "92cc27"
-                            },
                             "name" : {
                               "value" : "Tenet Healthcare Corporation"
+                            },
+                            "meta" : {
+                              "globalKey" : "92cc27",
+                              "externalKey" : "tenetEntity"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "tenetEntity",
-                              "globalReference" : "92cc27"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "88033GAT7",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP"
-                                    },
-                                    "value" : "88033GAT7"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "db5db955"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "92cc27",
+                              "externalReference" : "tenetEntity"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
                         }
                       } ]
-                    }
+                    },
+                    "nthToDefault" : 1
                   }
                 },
-                "meta" : {
-                  "externalKey" : "c789456",
-                  "globalKey" : "4bb2c8d2"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "gracePeriodExtension" : {
                         "applicable" : true,
                         "gracePeriod" : {
-                          "meta" : {
-                            "globalKey" : "83c"
-                          },
+                          "periodMultiplier" : 0,
                           "period" : "D",
-                          "periodMultiplier" : 0
+                          "meta" : {
+                            "globalKey" : "44"
+                          }
                         }
                       },
                       "paymentRequirement" : {
+                        "value" : 1000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "GBP"
                           }
                         },
-                        "value" : 1000000.00,
                         "meta" : {
                           "globalKey" : "48eae7c4"
                         }
                       }
                     },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "d7154083"
+                      "globalKey" : "f8d2401"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "969cb413"
-                  },
                   "obligations" : {
-                    "category" : "BOND_OR_LOAN"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
+                    "category" : "BondOrLoan"
                   },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/ACT.ISDA"
-                },
-                "meta" : {
-                  "globalKey" : "e55fc83e"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "89d33290"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "90a9b011"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "ebd48b0c"
-                },
-                "unadjustedDate" : "2009-03-20"
+                  "globalKey" : "dc275962",
+                  "externalKey" : "c789456"
+                }
               },
               "meta" : {
-                "globalKey" : "ebd48b0c"
+                "globalKey" : "eeb9e542"
               }
             }
           },
           "meta" : {
-            "globalKey" : "114950b"
+            "globalKey" : "e799c845"
           }
         },
         "meta" : {
-          "globalKey" : "114950b"
+          "globalKey" : "e799c845"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3a43e344"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0060,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0060,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e38853c"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea058"
-      },
-      "value" : "2004-01-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "56323"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "54930084UKLVMY22DS16"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "c8903fd0"
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
+        }
+      } ],
+      "name" : {
+        "value" : "Party B"
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "e9431741"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "e9431741"
+      }
+    },
+    "meta" : {
+      "globalKey" : "6028d703"
+    }
+  },
+  "meta" : {
+    "globalKey" : "6028d703"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-index-tranche.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-index-tranche.json
index b6bb126c6e..fea67ec3eb 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-index-tranche.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-index-tranche.json
@@ -1,77 +1,39 @@
 {
-  "meta" : {
-    "globalKey" : "7f1f0751"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2004-10-11",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "DJ.iTraxx.Europe"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "ITRAXX1234",
+          "meta" : {
+            "scheme" : "http://www.newbank.com/trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "d51e174"
         }
       } ],
       "meta" : {
-        "globalKey" : "d51e174"
+        "globalKey" : "348f2a71"
       }
-    },
-    "meta" : {
-      "globalKey" : "28acc2a2"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234B6",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.massivebank.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ebf0fa6a"
+      }
     } ],
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -79,21 +41,32 @@
             "productQualifier" : "CreditDefaultSwap_IndexTranche"
           } ],
           "economicTerms" : {
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2010-03-20",
+                "meta" : {
+                  "globalKey" : "3ed0d4"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ed0d4"
+              }
+            },
             "payout" : {
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "generalTerms" : {
@@ -101,134 +74,161 @@
                     "indexName" : {
                       "value" : "Dow Jones iTraxx Europe Consumers Series 2 Version 1"
                     },
-                    "indexAnnexVersion" : 1,
                     "indexSeries" : 2,
-                    "meta" : {
-                      "globalKey" : "c458fec4"
+                    "indexAnnexVersion" : 1,
+                    "tranche" : {
+                      "attachmentPoint" : 0.03,
+                      "exhaustionPoint" : 0.07
                     },
                     "settledEntityMatrix" : {
                       "matrixSource" : {
-                        "value" : "NOT_APPLICABLE"
+                        "value" : "NotApplicable"
                       }
                     },
-                    "tranche" : {
-                      "attachmentPoint" : 0.03,
-                      "exhaustionPoint" : 0.07
+                    "meta" : {
+                      "globalKey" : "df8f82d0"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "c29e8963"
+                  "globalKey" : "ddd50d6f"
                 }
               },
               "meta" : {
-                "globalKey" : "c29e8963"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ed0d4"
-                },
-                "unadjustedDate" : "2010-03-20"
-              },
-              "meta" : {
-                "globalKey" : "3ed0d4"
+                "globalKey" : "ddd50d6f"
               }
             }
           },
           "meta" : {
-            "globalKey" : "f54a891"
+            "globalKey" : "4b18d143"
           }
         },
         "meta" : {
-          "globalKey" : "f54a891"
+          "globalKey" : "4b18d143"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.newbank.com/trade-id"
-          },
-          "value" : "ITRAXX1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "f1464767"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.massivebank.com/trade-id"
-          },
-          "value" : "1234B6"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "55bf2482"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2004-10-11",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "DJ.iTraxx.Europe"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "d51e174"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "d51e174"
+      }
+    },
+    "meta" : {
+      "globalKey" : "fd2385a8"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "d014882f"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        }
-      },
       "quantity" : {
+        "value" : 17000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         },
-        "value" : 17000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "a4ba95cd"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "5ecf1575"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-loan-ReferenceObligation-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-loan-ReferenceObligation-uti.json
index 6779cb9af0..31c7a293f2 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-loan-ReferenceObligation-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-loan-ReferenceObligation-uti.json
@@ -1,114 +1,32 @@
 {
-  "meta" : {
-    "globalKey" : "62c5292f"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "b2724407"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "8f4dd58"
-      }
-    },
-    "meta" : {
-      "globalKey" : "62c5292f"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
-      },
-      "name" : {
-        "value" : "Party A"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56323",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
+        "globalKey" : "c6afb4da"
       },
-      "name" : {
-        "value" : "Party B"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2006-10-26",
+      "meta" : {
+        "globalKey" : "3eb29a"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -116,30 +34,26 @@
             "productQualifier" : "CreditDefaultSwap_Loan"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-10-27",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
                 "meta" : {
-                  "globalKey" : "42f910b"
+                  "globalKey" : "eb811f13"
                 }
               },
-              "businessDayConvention" : "FOLLOWING",
               "meta" : {
-                "globalKey" : "da556d3a"
+                "globalKey" : "eb811f13"
               }
             },
-            "effectiveDate" : {
+            "terminationDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2010-06-27",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -147,74 +61,153 @@
                   }
                 },
                 "meta" : {
-                  "globalKey" : "eb811f13"
-                },
-                "unadjustedDate" : "2006-10-27"
+                  "globalKey" : "ebf57e13"
+                }
               },
               "meta" : {
-                "globalKey" : "eb811f13"
+                "globalKey" : "ebf57e13"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da556d3a"
               }
             },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f73"
+                    },
+                    "rollConvention" : "20"
                   },
+                  "meta" : {
+                    "globalKey" : "17f73"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2006-12-20",
+                  "lastRegularPaymentDate" : "2010-06-20",
+                  "meta" : {
+                    "globalKey" : "1b0ddfaa"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "7154aabe"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
-                    "globalKey" : "9e09e9e0"
+                    "globalKey" : "2cbcd158"
                   },
-                  "settlementType" : "PHYSICAL",
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "maximumBusinessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
-                      "category" : "LOAN",
+                      "category" : "Loan",
+                      "notSubordinated" : true,
+                      "notContingent" : true,
                       "consentRequiredLoan" : {
                         "applicable" : true
                       },
-                      "excluded" : "true",
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
                       },
                       "notBearer" : true,
-                      "notContingent" : true,
-                      "notSubordinated" : true,
-                      "othReferenceEntityObligations" : "true",
-                      "transferable" : true
+                      "excluded" : "true",
+                      "othReferenceEntityObligations" : "true"
                     },
                     "meta" : {
-                      "globalKey" : "3b5cd1d7"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "maximumBusinessDays" : 30
+                      "globalKey" : "ca0fb94f"
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
-                    "allGuarantees" : false,
                     "referenceEntity" : {
-                      "meta" : {
-                        "globalKey" : "444aeec5"
-                      },
                       "name" : {
                         "value" : "CompanyABC"
+                      },
+                      "meta" : {
+                        "globalKey" : "444aeec5"
                       }
                     },
                     "referenceObligation" : [ {
@@ -222,296 +215,303 @@
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "23490234",
                               "meta" : {
                                 "scheme" : "http://www.partyA.com/coding-scheme/instrument-id"
-                              },
-                              "value" : "23490234"
+                              }
                             },
+                            "source" : "Other",
                             "meta" : {
                               "globalKey" : "1648ec59"
-                            },
-                            "source" : "OTHER"
+                            }
                           }
                         } ],
-                        "creditAgreementDate" : "2005-11-04",
-                        "facilityType" : {
-                          "value" : "RevolvingLoan"
-                        },
                         "lien" : {
                           "value" : "FirstLienLoan"
                         },
+                        "facilityType" : {
+                          "value" : "RevolvingLoan"
+                        },
+                        "creditAgreementDate" : "2005-11-04",
                         "tranche" : {
                           "value" : "LN190325"
                         }
                       },
                       "primaryObligor" : {
-                        "meta" : {
-                          "globalKey" : "444aeec5"
-                        },
                         "name" : {
                           "value" : "CompanyABC"
+                        },
+                        "meta" : {
+                          "globalKey" : "444aeec5"
                         }
                       }
                     } ],
+                    "allGuarantees" : false,
                     "referencePrice" : {
+                      "value" : 1.0000000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.0000000000,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     },
                     "securedList" : false
                   }
                 },
-                "meta" : {
-                  "globalKey" : "96178c70"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_1", "PARTY_2" ],
-                      "publiclyAvailableInformation" : {
-                        "publicSource" : [ "Standard Public Sources" ],
-                        "specifiedNumber" : 2
+                    "failureToPay" : {
+                      "applicable" : true,
+                      "paymentRequirement" : {
+                        "value" : 1000000,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "USD"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "48eb1e55"
+                        }
                       }
                     },
                     "defaultRequirement" : {
+                      "value" : 10000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 10000000,
                       "meta" : {
                         "globalKey" : "d467e427"
                       }
                     },
-                    "failureToPay" : {
-                      "applicable" : true,
-                      "paymentRequirement" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "USD"
-                          }
-                        },
-                        "value" : 1000000,
-                        "meta" : {
-                          "globalKey" : "48eb1e55"
-                        }
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party1", "Party2" ],
+                      "publiclyAvailableInformation" : {
+                        "publicSource" : [ "Standard Public Sources" ],
+                        "specifiedNumber" : 2
                       }
                     },
                     "meta" : {
-                      "globalKey" : "fee075ab"
+                      "globalKey" : "a015b08d"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "78113433"
-                  },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY",
+                    "category" : "BorrowedMoney",
+                    "notSubordinated" : true,
+                    "excluded" : "true",
+                    "othReferenceEntityObligations" : "true",
                     "designatedPriority" : {
                       "value" : "FirstLienLoan"
-                    },
-                    "excluded" : "true",
-                    "notSubordinated" : true,
-                    "othReferenceEntityObligations" : "true"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
                     }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c47"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "20"
                   },
                   "meta" : {
-                    "globalKey" : "28c47"
+                    "globalKey" : "4f78c0b3"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "116f3724"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2006-12-20",
-                  "lastRegularPaymentDate" : "2010-06-20",
-                  "meta" : {
-                    "globalKey" : "1b0de856"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "d77b59f8"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "fc48d0b4"
+                "globalKey" : "a69461fa"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "ebf57e13"
-                },
-                "unadjustedDate" : "2010-06-27"
-              },
-              "meta" : {
-                "globalKey" : "ebf57e13"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "5ac452cb"
+            "globalKey" : "c6a6ab3"
           }
         },
         "meta" : {
-          "globalKey" : "5ac452cb"
+          "globalKey" : "c6a6ab3"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "b3ef9a04"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.013,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.013,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d467e427"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "ca03a67c"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "b894a0b9"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb29a"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
+        }
+      } ],
+      "name" : {
+        "value" : "Party A"
       },
-      "value" : "2006-10-26"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "56323"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
         }
       } ],
-      "issuer" : {
+      "name" : {
+        "value" : "Party B"
+      },
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
         },
-        "value" : "54930084UKLVMY22DS16"
-      },
+        "meta" : {
+          "globalKey" : "e9431741"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "c8903fd0"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+        "globalKey" : "3fc5b092"
+      }
+    },
+    "meta" : {
+      "globalKey" : "87212821"
+    }
+  },
+  "meta" : {
+    "globalKey" : "87212821"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-loan-SecuredList-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-loan-SecuredList-uti.json
index f1356fc5ae..a3c054bba6 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-loan-SecuredList-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-loan-SecuredList-uti.json
@@ -1,114 +1,32 @@
 {
-  "meta" : {
-    "globalKey" : "28e57f41"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "b2724407"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "8f4dd58"
-      }
-    },
-    "meta" : {
-      "globalKey" : "28e57f41"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
       },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
-      },
-      "name" : {
-        "value" : "Party B"
+        "globalKey" : "3eac3060"
       },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2006-12-01",
+      "meta" : {
+        "globalKey" : "3eb301"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -116,30 +34,26 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-12-02",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
                 "meta" : {
-                  "globalKey" : "42f910b"
+                  "globalKey" : "eb82a1ba"
                 }
               },
-              "businessDayConvention" : "FOLLOWING",
               "meta" : {
-                "globalKey" : "da556d3a"
+                "globalKey" : "eb82a1ba"
               }
             },
-            "effectiveDate" : {
+            "terminationDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2010-03-21",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -147,336 +61,422 @@
                   }
                 },
                 "meta" : {
-                  "globalKey" : "eb82a1ba"
-                },
-                "unadjustedDate" : "2006-12-02"
+                  "globalKey" : "ebf296cd"
+                }
               },
               "meta" : {
-                "globalKey" : "eb82a1ba"
+                "globalKey" : "ebf296cd"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da556d3a"
               }
             },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f73"
+                    },
+                    "rollConvention" : "20"
+                  },
+                  "meta" : {
+                    "globalKey" : "17f73"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
+                  "firstPaymentDate" : "2007-03-20",
+                  "lastRegularPaymentDate" : "2010-03-20",
+                  "meta" : {
+                    "globalKey" : "6bbdbe2a"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c204893e"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
-                    "globalKey" : "9e09e9e0"
+                    "globalKey" : "2cbcd158"
                   },
-                  "settlementType" : "PHYSICAL",
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "maximumBusinessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
-                      "category" : "LOAN",
+                      "category" : "Loan",
+                      "notSubordinated" : true,
+                      "notContingent" : true,
                       "consentRequiredLoan" : {
                         "applicable" : true
                       },
-                      "excluded" : "true",
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
                       },
                       "notBearer" : true,
-                      "notContingent" : true,
-                      "notSubordinated" : true,
-                      "othReferenceEntityObligations" : "true",
-                      "transferable" : true
+                      "excluded" : "true",
+                      "othReferenceEntityObligations" : "true"
                     },
                     "meta" : {
-                      "globalKey" : "3b5cd1d7"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "maximumBusinessDays" : 30
+                      "globalKey" : "ca0fb94f"
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
-                    "allGuarantees" : false,
-                    "noReferenceObligation" : true,
                     "referenceEntity" : {
-                      "meta" : {
-                        "globalKey" : "444afa68"
-                      },
                       "name" : {
                         "value" : "CompanyDEF"
+                      },
+                      "meta" : {
+                        "globalKey" : "444afa68"
                       }
                     },
+                    "noReferenceObligation" : true,
+                    "allGuarantees" : false,
                     "referencePrice" : {
+                      "value" : 1.0000000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.0000000000,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     },
                     "securedList" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "a75b0232"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "publicSource" : [ "Standard Public Sources" ],
-                        "specifiedNumber" : 2
+                    "failureToPay" : {
+                      "applicable" : true,
+                      "paymentRequirement" : {
+                        "value" : 500000,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "USD"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "6c32a26b"
+                        }
                       }
                     },
                     "defaultRequirement" : {
+                      "value" : 5000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 5000000,
                       "meta" : {
                         "globalKey" : "1a10e2d1"
                       }
                     },
-                    "failureToPay" : {
-                      "applicable" : true,
-                      "paymentRequirement" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "USD"
-                          }
-                        },
-                        "value" : 500000,
-                        "meta" : {
-                          "globalKey" : "6c32a26b"
-                        }
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "publicSource" : [ "Standard Public Sources" ],
+                        "specifiedNumber" : 2
                       }
                     },
                     "meta" : {
-                      "globalKey" : "84a507f9"
+                      "globalKey" : "b45b5d03"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "c0000e25"
-                  },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY",
+                    "category" : "BorrowedMoney",
+                    "notSubordinated" : true,
+                    "excluded" : "true",
+                    "othReferenceEntityObligations" : "true",
                     "designatedPriority" : {
                       "value" : "FirstLienLoan"
-                    },
-                    "excluded" : "true",
-                    "notSubordinated" : true,
-                    "othReferenceEntityObligations" : "true"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
                     }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c47"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "20"
                   },
                   "meta" : {
-                    "globalKey" : "28c47"
+                    "globalKey" : "ff84437d"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "b384c8a4"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2007-03-20",
-                  "lastRegularPaymentDate" : "2010-03-20",
-                  "meta" : {
-                    "globalKey" : "6bbdc6d6"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "2f18b946"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "149d79b2"
+                "globalKey" : "9a136c8"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "ebf296cd"
-                },
-                "unadjustedDate" : "2010-03-21"
-              },
-              "meta" : {
-                "globalKey" : "ebf296cd"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "6db077ee"
+            "globalKey" : "6bbf54b4"
           }
         },
         "meta" : {
-          "globalKey" : "6db077ee"
+          "globalKey" : "6bbf54b4"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "5a207dbd"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0115,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0115,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e9ef39e3"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb301"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
+        }
+      } ],
+      "name" : {
+        "value" : "Party A"
       },
-      "value" : "2006-12-01"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
         }
       } ],
-      "issuer" : {
+      "name" : {
+        "value" : "Party B"
+      },
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
         },
-        "value" : "54930084UKLVMY22DS16"
-      },
+        "meta" : {
+          "globalKey" : "e9431741"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "335bf1d6"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+        "globalKey" : "3fc5b092"
+      }
+    },
+    "meta" : {
+      "globalKey" : "9552c4f7"
+    }
+  },
+  "meta" : {
+    "globalKey" : "9552c4f7"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-mortgage-RMBS-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-mortgage-RMBS-versioned.json
index 28845ab34d..f33c64cab6 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-mortgage-RMBS-versioned.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-mortgage-RMBS-versioned.json
@@ -1,114 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "1cb00d98"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "b2724407"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "8f4dd58"
-      }
-    },
-    "meta" : {
-      "globalKey" : "1cb00d98"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "gf4t5",
-        "globalKey" : "8e1db6b4"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "87501c94",
+        "externalReference" : "yt67d"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56ERT7RHWE4",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "XYZBICXXX"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "26482791"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "yt67d",
-        "globalKey" : "21f24e14"
-      },
-      "name" : {
-        "value" : "ABC Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "ABCBICXXX"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "be37d39a"
-        }
-      } ]
+        "globalKey" : "7c1be68"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-10-05",
+      "meta" : {
+        "globalKey" : "3eb285"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "gf4t5",
-          "globalReference" : "8e1db6b4"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "yt67d",
-          "globalReference" : "21f24e14"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "gf4t5",
-          "globalReference" : "8e1db6b4"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -116,31 +32,38 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-10-11",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "42f910b"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "da556d3a"
+                  }
+                },
                 "meta" : {
-                  "globalKey" : "42f910b"
+                  "globalKey" : "b0cdd84f"
                 }
               },
-              "businessDayConvention" : "FOLLOWING",
               "meta" : {
-                "globalKey" : "da556d3a"
+                "globalKey" : "b0cdd84f"
               }
             },
-            "effectiveDate" : {
+            "terminationDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2035-09-25",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "GBLO"
@@ -151,60 +74,136 @@
                       "globalKey" : "42f910b"
                     }
                   },
-                  "businessDayConvention" : "FOLLOWING",
                   "meta" : {
                     "globalKey" : "da556d3a"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "b0cdd84f"
-                },
-                "unadjustedDate" : "2006-10-11"
+                  "globalKey" : "777d2cc1"
+                }
               },
               "meta" : {
-                "globalKey" : "b0cdd84f"
+                "globalKey" : "777d2cc1"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da556d3a"
               }
             },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "177d3"
+                    },
+                    "rollConvention" : "11"
                   },
+                  "meta" : {
+                    "globalKey" : "177d3"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "firstPaymentDate" : "2006-11-01",
+                  "lastRegularPaymentDate" : "2035-06-01",
+                  "meta" : {
+                    "globalKey" : "715dd58c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3e124220"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "32319a6b"
                   },
-                  "settlementType" : "PHYSICAL",
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 5
+                    },
                     "escrow" : true,
                     "meta" : {
                       "globalKey" : "120d14"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 5
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
                     "referenceEntity" : {
-                      "meta" : {
-                        "globalKey" : "5df00e1c"
-                      },
                       "name" : {
                         "value" : "New Century Home Equity Loan Trust 2005-4"
+                      },
+                      "meta" : {
+                        "globalKey" : "5df00e1c"
                       }
                     },
                     "referenceObligation" : [ {
@@ -212,266 +211,267 @@
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "64352VNC1",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP-1-0"
-                              },
-                              "value" : "64352VNC1"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "b56573a0"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
+                              "value" : "NCHET 2005-4",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-Bloomberg-1-0"
-                              },
-                              "value" : "NCHET 2005-4"
+                              }
                             },
+                            "source" : "BBGID",
                             "meta" : {
                               "globalKey" : "1dd2314a"
-                            },
-                            "source" : "BBGID"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
                       }
                     } ]
                   }
                 },
-                "meta" : {
-                  "globalKey" : "631463ac"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "distressedRatingsDowngrade" : true,
-                    "failureToPayInterest" : true,
                     "failureToPayPrincipal" : true,
-                    "impliedWritedown" : false,
+                    "failureToPayInterest" : true,
+                    "distressedRatingsDowngrade" : true,
                     "maturityExtension" : false,
+                    "writedown" : true,
+                    "impliedWritedown" : false,
                     "meta" : {
-                      "globalKey" : "7aa2fce0"
-                    },
-                    "writedown" : true
+                      "globalKey" : "7aa2fc2c"
+                    }
                   },
                   "floatingAmountEvents" : {
-                    "additionalFixedPayments" : {
-                      "interestShortfallReimbursement" : true,
-                      "principalShortfallReimbursement" : true,
-                      "writedownReimbursement" : true
-                    },
                     "failureToPayPrincipal" : true,
-                    "floatingAmountProvisions" : {
-                      "stepUpProvision" : true
-                    },
-                    "impliedWritedown" : true,
                     "interestShortfall" : {
+                      "interestShortfallCap" : "Fixed",
                       "compounding" : false,
-                      "interestShortfallCap" : "FIXED",
                       "rateSource" : {
                         "value" : "USD-LIBOR-BBA"
                       }
                     },
-                    "writedown" : true
-                  },
-                  "meta" : {
-                    "globalKey" : "afb353a3"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28beb"
+                    "writedown" : true,
+                    "impliedWritedown" : true,
+                    "floatingAmountProvisions" : {
+                      "stepUpProvision" : true
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "11"
+                    "additionalFixedPayments" : {
+                      "interestShortfallReimbursement" : true,
+                      "principalShortfallReimbursement" : true,
+                      "writedownReimbursement" : true
+                    }
                   },
                   "meta" : {
-                    "globalKey" : "28beb"
+                    "globalKey" : "eda0935"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "8edc2882"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2006-11-01",
-                  "lastRegularPaymentDate" : "2035-06-01",
-                  "meta" : {
-                    "globalKey" : "715dde74"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "c23b193e"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "41eaed56"
+                "globalKey" : "44668b5e"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "42f910b"
-                    }
-                  },
-                  "businessDayConvention" : "FOLLOWING",
-                  "meta" : {
-                    "globalKey" : "da556d3a"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "777d2cc1"
-                },
-                "unadjustedDate" : "2035-09-25"
-              },
-              "meta" : {
-                "globalKey" : "777d2cc1"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "717e172d"
+            "globalKey" : "3400d9b"
           }
         },
         "meta" : {
-          "globalKey" : "717e172d"
+          "globalKey" : "3400d9b"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a3617a4e"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.050,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.050,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 15000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 15000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "99d719c2"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c8cdcf72"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 15000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 15000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a10c1e7e"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "87501c94",
+          "externalReference" : "yt67d"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "69c51ff4",
+          "externalReference" : "gf4t5"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "69c51ff4",
+          "externalReference" : "gf4t5"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb285"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "XYZBICXXX",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "26482791"
+        }
+      } ],
+      "name" : {
+        "value" : "XYZ Bank"
       },
-      "value" : "2006-10-05"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "69c51ff4",
+        "externalKey" : "gf4t5"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABCBICXXX",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "56ERT7RHWE4"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
         },
-        "version" : 1
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "be37d39a"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "yt67d",
-        "globalReference" : "21f24e14"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "d20b7a68"
+        "globalKey" : "87501c94",
+        "externalKey" : "yt67d"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "e9431741"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "3fc5b092"
+      }
+    },
+    "meta" : {
+      "globalKey" : "490f78e8"
+    }
+  },
+  "meta" : {
+    "globalKey" : "490f78e8"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdx-index-option-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdx-index-option-uti.json
index 064f39a57b..980eefbb0d 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdx-index-option-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdx-index-option-uti.json
@@ -1,113 +1,33 @@
 {
-  "meta" : {
-    "globalKey" : "a8315709"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "1997-11-05",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "95729254"
-        }
-      }, {
-        "agreementDate" : "2004-09-20",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "DJ.CDX.NA"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "44b33d52"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2003_CREDIT"
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "521d2d0f"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "c96c85a9"
-      }
-    },
-    "meta" : {
-      "globalKey" : "98b4e61e"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
-      },
-      "name" : {
-        "value" : "Party A"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
-      },
-      "name" : {
-        "value" : "Party B"
+        "globalKey" : "3eac3060"
       },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2006-01-16",
+      "meta" : {
+        "globalKey" : "3eb050",
+        "externalKey" : "TRADEDATE"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -116,106 +36,100 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "efc1bac4"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "0",
+                    "externalReference" : "f756f"
+                  },
                   "meta" : {
                     "globalKey" : "5b72bb4"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "f756f",
-                    "globalReference" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "f3b1d0d7"
-                  },
-                  "settlementType" : "PHYSICAL"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Payer",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "fallbackExercise" : false
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "USNY"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-08-20",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "25a605bf"
-                          },
-                          "unadjustedDate" : "2006-08-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "25a605bf"
                         }
                       } ],
-                      "expirationTime" : {
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
                         "businessCenter" : {
                           "value" : "USNY"
-                        },
-                        "hourMinuteTime" : "11:00:00"
+                        }
                       },
-                      "meta" : {
-                        "globalKey" : "5970e7c8"
+                      "expirationTime" : {
+                        "hourMinuteTime" : "11:00:00",
+                        "businessCenter" : {
+                          "value" : "USNY"
+                        }
                       },
                       "partialExercise" : {
-                        "integralMultipleAmount" : 1,
-                        "minimumNotionalAmount" : 1,
                         "notionaReference" : {
-                          "externalReference" : "f756f",
-                          "globalReference" : "0"
-                        }
+                          "globalReference" : "0",
+                          "externalReference" : "f756f"
+                        },
+                        "integralMultipleAmount" : 1,
+                        "minimumNotionalAmount" : 1
+                      },
+                      "meta" : {
+                        "globalKey" : "fba17a08"
                       }
                     }
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 0.0225,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.0225,
-                      "arithmeticOperator" : "ADD",
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate",
+                      "arithmeticOperator" : "Add"
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "fallbackExercise" : false
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "efc1bac4"
-                },
-                "optionType" : "PAYER",
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -225,277 +139,358 @@
                     "economicTerms" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-03-21",
                           "meta" : {
                             "globalKey" : "3eb0d5"
-                          },
-                          "unadjustedDate" : "2006-03-21"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "3eb0d5"
                         }
                       },
+                      "terminationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2011-06-20",
+                          "meta" : {
+                            "globalKey" : "3ed994"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "3ed994"
+                        }
+                      },
                       "payout" : {
-                        "creditDefaultPayout" : {
+                        "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "externalKey" : "f756f",
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
-                                "value" : "quantity-2"
+                                "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "generalTerms" : {
-                            "indexReferenceInformation" : {
-                              "indexName" : {
-                                "value" : "Dow Jones CDX NA IG.2"
-                              },
-                              "indexAnnexDate" : "2005-07-06",
-                              "indexAnnexSource" : {
-                                "value" : "PUBLISHER"
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
+                                }
                               },
-                              "indexSeries" : 2,
                               "meta" : {
-                                "globalKey" : "964c1581"
+                                "globalKey" : "0"
                               }
                             }
                           },
-                          "meta" : {
-                            "globalKey" : "6ba10942"
-                          }
-                        },
-                        "interestRatePayout" : [ {
-                          "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
-                          },
-                          "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "quantitySchedule" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "quantity-1"
-                              }
-                            }
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
                           },
                           "calculationPeriodDates" : {
                             "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
                               "meta" : {
-                                "globalKey" : "28c47"
+                                "globalKey" : "17f73"
                               },
-                              "period" : "M",
-                              "periodMultiplier" : 3,
                               "rollConvention" : "20"
                             },
                             "meta" : {
-                              "globalKey" : "28c47"
+                              "globalKey" : "17f73"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "bbc10042"
-                          },
                           "paymentDates" : {
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "aa"
+                              }
+                            },
                             "firstPaymentDate" : "2006-06-20",
                             "lastRegularPaymentDate" : "2011-03-20",
                             "meta" : {
-                              "globalKey" : "9365796"
+                              "globalKey" : "9364eea"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "56649a5c"
+                          }
+                        } ],
+                        "creditDefaultPayout" : {
+                          "payerReceiver" : {
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
+                          },
+                          "priceQuantity" : {
+                            "quantitySchedule" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "quantity-2"
+                              }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "956"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 3
+                            "meta" : {
+                              "globalKey" : "0",
+                              "externalKey" : "f756f"
                             }
                           },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
+                          "generalTerms" : {
+                            "indexReferenceInformation" : {
+                              "indexName" : {
+                                "value" : "Dow Jones CDX NA IG.2"
                               },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
+                              "indexSeries" : 2,
+                              "indexAnnexDate" : "2005-07-06",
+                              "indexAnnexSource" : {
+                                "value" : "Publisher"
+                              },
+                              "meta" : {
+                                "globalKey" : "5598e89"
                               }
                             }
-                          }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "f0c9b440"
-                        }
-                      },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "meta" : {
-                            "globalKey" : "3ed994"
                           },
-                          "unadjustedDate" : "2011-06-20"
+                          "meta" : {
+                            "globalKey" : "daae824a"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "3ed994"
+                          "globalKey" : "9dc89d6e"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "8a4e2669"
+                      "globalKey" : "d9a8246f"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "8a4e2669"
+                    "globalKey" : "d9a8246f"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "3e10967a"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "3e10967a"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "efc1bac4"
+            "globalKey" : "3e10967a"
           }
         },
         "meta" : {
-          "globalKey" : "efc1bac4"
+          "globalKey" : "3e10967a"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "22a6e28e"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.019,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.019,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 50000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "27faaf2b"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "32356f32"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 50000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "d75b3635"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TRADEDATE",
-        "globalKey" : "3eb050"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
+        }
+      } ],
+      "name" : {
+        "value" : "Party A"
       },
-      "value" : "2006-01-16"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
         }
       } ],
-      "issuer" : {
+      "name" : {
+        "value" : "Party B"
+      },
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "1997-11-05",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "globalKey" : "95729254"
+        }
+      }, {
+        "agreementDate" : "2004-09-20",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "DJ.CDX.NA"
+            }
+          }
         },
-        "value" : "54930084UKLVMY22DS16"
-      },
+        "meta" : {
+          "globalKey" : "44b33d52"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2003Credit"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "521d2d0f"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "335bf1d6"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+        "globalKey" : "c96c85a9"
+      }
+    },
+    "meta" : {
+      "globalKey" : "e2a73db8"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "c471fe7"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        }
-      },
       "quantity" : {
+        "value" : 45000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
         },
-        "value" : 45000
+        "receiverPartyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
         "relativeDate" : {
+          "periodMultiplier" : 3,
+          "period" : "D",
           "meta" : {
-            "globalKey" : "c47305b0"
+            "globalKey" : "fd075b8e"
           },
-          "period" : "D",
-          "periodMultiplier" : 3,
-          "dayType" : "BUSINESS",
+          "dayType" : "Business",
+          "businessDayConvention" : "NONE",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "USNY"
@@ -506,16 +501,21 @@
               "globalKey" : "4f5ffd5"
             }
           },
-          "businessDayConvention" : "NONE",
           "dateRelativeTo" : {
-            "externalReference" : "TRADEDATE",
-            "globalReference" : "3eb050"
+            "globalReference" : "3eb050",
+            "externalReference" : "TRADEDATE"
           }
         }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "a67f0585"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "3876f4cd"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/itraxx-index-option-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/itraxx-index-option-uti.json
index 41821870fb..866b6bde1e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/itraxx-index-option-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/itraxx-index-option-uti.json
@@ -1,93 +1,33 @@
 {
-  "meta" : {
-    "globalKey" : "9d974098"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualMatrix" : [ {
-              "matrixType" : {
-                "value" : "CREDIT_DERIVATIVES_PHYSICAL_SETTLEMENT_MATRIX"
-              }
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "65d82653"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "65d82653"
-      }
-    },
-    "meta" : {
-      "globalKey" : "2d2df0dd"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
       },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
+        "globalKey" : "3eac3060"
       },
-      "name" : {
-        "value" : "Party B"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2006-01-16",
+      "meta" : {
+        "globalKey" : "3eb050",
+        "externalKey" : "d4536d"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -95,55 +35,40 @@
             "productQualifier" : "CreditDefaultSwaption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "1ea5dc35"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "0",
+                    "externalReference" : "NOTIONAL"
+                  },
                   "meta" : {
                     "globalKey" : "8d28d340"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "NOTIONAL",
-                    "globalReference" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "f3b1d0d7"
-                  },
-                  "settlementType" : "PHYSICAL"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Receiver",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "fallbackExercise" : false
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-12-20",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -152,53 +77,59 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "211e638d"
                             }
                           },
                           "meta" : {
                             "globalKey" : "2d387cf9"
-                          },
-                          "unadjustedDate" : "2006-12-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "2d387cf9"
                         }
                       } ],
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      },
                       "expirationTime" : {
+                        "hourMinuteTime" : "16:00:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "16:00:00"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "40b9738f"
+                        "globalKey" : "d1d6340f"
                       }
                     }
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 0.004,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "value" : 0.004,
-                      "arithmeticOperator" : "ADD",
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate",
+                      "arithmeticOperator" : "Add"
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "fallbackExercise" : false
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "1ea5dc35"
-                },
-                "optionType" : "RECEIVER",
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -206,14 +137,9 @@
                       "productQualifier" : "CreditDefaultSwap_Index"
                     } ],
                     "economicTerms" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "NONE",
-                        "meta" : {
-                          "globalKey" : "24a738"
-                        }
-                      },
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-03-20",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -222,67 +148,154 @@
                           },
                           "meta" : {
                             "globalKey" : "eb7a730c"
-                          },
-                          "unadjustedDate" : "2006-03-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eb7a730c"
                         }
                       },
+                      "terminationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2011-06-20",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ec136bcc"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "ec136bcc"
+                        }
+                      },
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "NONE",
+                        "meta" : {
+                          "globalKey" : "24a738"
+                        }
+                      },
                       "payout" : {
-                        "creditDefaultPayout" : {
+                        "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "priceQuantity" : {
+                            "quantitySchedule" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "quantity-1"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "NOTIONAL",
                               "globalKey" : "0"
+                            }
+                          },
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "0"
+                              }
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "17f73"
+                              },
+                              "rollConvention" : "20"
+                            },
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            }
+                          },
+                          "paymentDates" : {
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "aa"
+                              }
                             },
+                            "firstPaymentDate" : "2007-03-20",
+                            "lastRegularPaymentDate" : "2011-03-20",
+                            "meta" : {
+                              "globalKey" : "6f60b62a"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "c5a7813e"
+                          }
+                        } ],
+                        "creditDefaultPayout" : {
+                          "payerReceiver" : {
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
+                          },
+                          "priceQuantity" : {
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0",
+                              "externalKey" : "NOTIONAL"
                             }
                           },
                           "settlementTerms" : {
-                            "meta" : {
-                              "globalKey" : "a817b2b6"
-                            },
+                            "settlementType" : "Physical",
                             "settlementCurrency" : {
                               "value" : "USD"
                             },
-                            "settlementType" : "PHYSICAL",
+                            "meta" : {
+                              "globalKey" : "338d24c"
+                            },
                             "physicalSettlementTerms" : {
+                              "physicalSettlementPeriod" : {
+                                "maximumBusinessDays" : 30
+                              },
                               "deliverableObligations" : {
                                 "accruedInterest" : false,
+                                "category" : "BondOrLoan",
+                                "notSubordinated" : true,
+                                "notContingent" : true,
                                 "assignableLoan" : {
                                   "applicable" : true
                                 },
-                                "category" : "BOND_OR_LOAN",
                                 "consentRequiredLoan" : {
                                   "applicable" : true
                                 },
+                                "transferable" : true,
                                 "maximumMaturity" : {
-                                  "meta" : {
-                                    "globalKey" : "ae5"
-                                  },
+                                  "periodMultiplier" : 30,
                                   "period" : "Y",
-                                  "periodMultiplier" : 30
+                                  "meta" : {
+                                    "globalKey" : "3fb"
+                                  }
                                 },
-                                "notBearer" : true,
-                                "notContingent" : true,
-                                "notSubordinated" : true,
-                                "transferable" : true
+                                "notBearer" : true
                               },
                               "escrow" : true,
                               "meta" : {
-                                "globalKey" : "b173b779"
-                              },
-                              "physicalSettlementPeriod" : {
-                                "maximumBusinessDays" : 30
+                                "globalKey" : "c94d70f"
                               }
                             }
                           },
@@ -291,307 +304,294 @@
                               "indexName" : {
                                 "value" : "Dow Jones iTraxx Europe Consumers Series 2 Version 1"
                               },
+                              "indexSeries" : 2,
+                              "indexAnnexVersion" : 1,
+                              "indexAnnexDate" : "2006-11-01",
+                              "indexAnnexSource" : {
+                                "value" : "Publisher"
+                              },
                               "excludedReferenceEntity" : [ {
                                 "referenceEntity" : {
-                                  "meta" : {
-                                    "globalKey" : "43886e95"
-                                  },
                                   "name" : {
                                     "value" : "TESCO PLC"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "43886e95"
                                   }
                                 }
                               } ],
-                              "indexAnnexDate" : "2006-11-01",
-                              "indexAnnexSource" : {
-                                "value" : "PUBLISHER"
-                              },
-                              "indexAnnexVersion" : 1,
-                              "indexSeries" : 2,
                               "meta" : {
-                                "globalKey" : "f90435c9"
+                                "globalKey" : "dd7d1cc9"
                               }
                             }
                           },
-                          "meta" : {
-                            "globalKey" : "2f8ebc7a"
-                          },
                           "protectionTerms" : [ {
                             "creditEvents" : {
                               "bankruptcy" : true,
-                              "creditEventNotice" : {
-                                "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                                "publiclyAvailableInformation" : {
-                                  "publicSource" : [ "Standard" ],
-                                  "specifiedNumber" : 2
-                                }
-                              },
                               "failureToPay" : {
                                 "applicable" : true,
                                 "paymentRequirement" : {
+                                  "value" : 1000000,
                                   "unit" : {
                                     "currency" : {
                                       "value" : "USD"
                                     }
                                   },
-                                  "value" : 1000000,
                                   "meta" : {
                                     "globalKey" : "48eb1e55"
                                   }
                                 }
                               },
+                              "creditEventNotice" : {
+                                "notifyingParty" : [ "Party2", "Party1" ],
+                                "publiclyAvailableInformation" : {
+                                  "publicSource" : [ "Standard" ],
+                                  "specifiedNumber" : 2
+                                }
+                              },
                               "meta" : {
-                                "globalKey" : "469a7a71"
+                                "globalKey" : "a7a0f33d"
                               }
                             },
-                            "meta" : {
-                              "globalKey" : "80eddc26"
-                            },
                             "obligations" : {
-                              "category" : "BORROWED_MONEY"
-                            }
-                          } ]
-                        },
-                        "interestRatePayout" : [ {
-                          "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
-                          },
-                          "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "quantitySchedule" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "quantity-1"
-                              }
-                            }
-                          },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "28c47"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 3,
-                              "rollConvention" : "20"
+                              "category" : "BorrowedMoney"
                             },
                             "meta" : {
-                              "globalKey" : "28c47"
+                              "globalKey" : "ba3951f2"
                             }
-                          },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
+                          } ],
                           "meta" : {
-                            "globalKey" : "e55ed0a4"
-                          },
-                          "paymentDates" : {
-                            "firstPaymentDate" : "2007-03-20",
-                            "lastRegularPaymentDate" : "2011-03-20",
-                            "meta" : {
-                              "globalKey" : "6f60bed6"
-                            },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "956"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 3
-                            }
-                          },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
-                              }
-                            }
+                            "globalKey" : "247c6f0"
                           }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "eb58846a"
-                        }
-                      },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "ec136bcc"
-                          },
-                          "unadjustedDate" : "2011-06-20"
                         },
                         "meta" : {
-                          "globalKey" : "ec136bcc"
+                          "globalKey" : "c1639eae"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "939774e"
+                      "globalKey" : "8e068626"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "939774e"
+                    "globalKey" : "8e068626"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "b7150a9d"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "b7150a9d"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "31ae620b"
+            "globalKey" : "9248c047"
           }
         },
         "meta" : {
-          "globalKey" : "31ae620b"
+          "globalKey" : "9248c047"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "bda0c0bc"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.004,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.004,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 250000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 250000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "a8acbff5"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "f67756c4"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 250000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 250000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "6ceb3eab"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "d4536d",
-        "globalKey" : "3eb050"
-      },
-      "value" : "2006-01-16"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "54930084UKLVMY22DS16"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "335bf1d6"
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
+        }
+      } ],
+      "name" : {
+        "value" : "Party B"
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "CreditDerivativesPhysicalSettlementMatrix"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "65d82653"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "65d82653"
+      }
+    },
+    "meta" : {
+      "globalKey" : "6ac3e4c9"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "b3ac037b"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        }
-      },
       "quantity" : {
+        "value" : 600000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
         },
-        "value" : 600000
+        "receiverPartyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
         "relativeDate" : {
+          "periodMultiplier" : 3,
+          "period" : "D",
           "meta" : {
-            "globalKey" : "74c00493"
+            "globalKey" : "968fbf5"
           },
-          "period" : "D",
-          "periodMultiplier" : 3,
-          "dayType" : "BUSINESS",
+          "dayType" : "Business",
           "businessDayConvention" : "NONE",
           "dateRelativeTo" : {
-            "externalReference" : "d4536d",
-            "globalReference" : "3eb050"
+            "globalReference" : "3eb050",
+            "externalReference" : "d4536d"
           }
         }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "543afedb"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "682d36e4"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex01-dividend-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex01-dividend-swap.json
index e6643ff57a..4accc0ef37 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex01-dividend-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex01-dividend-swap.json
@@ -1,58 +1,46 @@
 {
-  "meta" : {
-    "globalKey" : "791633b9"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "791633b9"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "kom722",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "kom722"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1734",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/eqs-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "kow029",
-        "globalKey" : "33f59568"
+        "globalKey" : "ea0d0bb9"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "kow029"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "5648",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/eqs-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ef1e6c61"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-07-19",
+      "meta" : {
+        "globalKey" : "3e91d3",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "kow029",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "kom722",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,33 +51,30 @@
             "payout" : {
               "fixedPricePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "eca76b5e"
-                  },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "eca76b5e"
+                          "globalKey" : "815062c0"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CALENDAR",
+                        "dayType" : "Calendar",
                         "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
                           "externalReference" : "e1"
@@ -97,51 +82,51 @@
                       }
                     },
                     "meta" : {
-                      "globalKey" : "eca76b5e"
+                      "globalKey" : "815062c0"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "815062c0"
                   }
                 },
                 "fixedPrice" : {
                   "price" : {
                     "value" : {
                       "value" : 0.045,
-                      "priceType" : "DIVIDEND"
+                      "priceType" : "Dividend"
                     }
                   }
                 },
                 "meta" : {
-                  "externalKey" : "d1",
-                  "globalKey" : "922d2ebf"
+                  "globalKey" : "cac1849d",
+                  "externalKey" : "d1"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "eca76b5f"
-                  },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "eca76b5f"
+                          "globalKey" : "815062c1"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CALENDAR",
+                        "dayType" : "Calendar",
                         "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
                           "externalReference" : "e2"
@@ -149,53 +134,68 @@
                       }
                     },
                     "meta" : {
-                      "globalKey" : "eca76b5f"
+                      "globalKey" : "815062c1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "815062c1"
                   }
                 },
                 "fixedPrice" : {
                   "price" : {
                     "value" : {
                       "value" : 0.045,
-                      "priceType" : "DIVIDEND"
+                      "priceType" : "Dividend"
                     }
                   }
                 },
                 "meta" : {
-                  "externalKey" : "d2",
-                  "globalKey" : "93e2075e"
+                  "globalKey" : "cc765d3c",
+                  "externalKey" : "d2"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "58861166"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
-                "meta" : {
-                  "globalKey" : "cb7fb6a7"
+                "underlier" : {
+                  "index" : {
+                    "productIdentifier" : [ {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-1"
+                      }
+                    }, {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-2"
+                      }
+                    } ]
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
                 },
                 "returnTerms" : {
                   "dividendReturnTerms" : {
@@ -204,7 +204,38 @@
                       "nonCashRatio" : 1.0
                     } ],
                     "dividendPeriod" : [ {
+                      "startDate" : {
+                        "dividendDate" : {
+                          "value" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2010-12-20",
+                              "meta" : {
+                                "globalKey" : "3ed314"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3ed314"
+                            }
+                          }
+                        }
+                      },
+                      "endDate" : {
+                        "dividendDate" : {
+                          "value" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2011-12-19",
+                              "meta" : {
+                                "globalKey" : "3edb13"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3edb13"
+                            }
+                          }
+                        }
+                      },
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -213,7 +244,6 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
@@ -221,57 +251,58 @@
                       "dividendPaymentDate" : {
                         "dividendDate" : {
                           "value" : {
-                            "meta" : {
-                              "externalKey" : "p1",
-                              "globalKey" : "eca76b5e"
-                            },
                             "relativeDate" : {
+                              "periodMultiplier" : 3,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "eca76b5e"
+                                "globalKey" : "815062c0"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 3,
-                              "dayType" : "CALENDAR",
+                              "dayType" : "Calendar",
                               "businessDayConvention" : "FOLLOWING",
                               "dateRelativeTo" : {
                                 "externalReference" : "e1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "815062c0",
+                              "externalKey" : "p1"
                             }
                           }
                         }
-                      },
-                      "endDate" : {
+                      }
+                    }, {
+                      "startDate" : {
                         "dividendDate" : {
                           "value" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2011-12-20",
                               "meta" : {
-                                "globalKey" : "3edb13"
-                              },
-                              "unadjustedDate" : "2011-12-19"
+                                "globalKey" : "3edb14"
+                              }
                             },
                             "meta" : {
-                              "globalKey" : "3edb13"
+                              "globalKey" : "3edb14"
                             }
                           }
                         }
                       },
-                      "startDate" : {
+                      "endDate" : {
                         "dividendDate" : {
                           "value" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2012-12-19",
                               "meta" : {
-                                "globalKey" : "3ed314"
-                              },
-                              "unadjustedDate" : "2010-12-20"
+                                "globalKey" : "3ee313"
+                              }
                             },
                             "meta" : {
-                              "globalKey" : "3ed314"
+                              "globalKey" : "3ee313"
                             }
                           }
                         }
-                      }
-                    }, {
+                      },
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -280,7 +311,6 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
@@ -288,51 +318,21 @@
                       "dividendPaymentDate" : {
                         "dividendDate" : {
                           "value" : {
-                            "meta" : {
-                              "externalKey" : "p2",
-                              "globalKey" : "eca76b5f"
-                            },
                             "relativeDate" : {
+                              "periodMultiplier" : 3,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "eca76b5f"
+                                "globalKey" : "815062c1"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 3,
-                              "dayType" : "CALENDAR",
+                              "dayType" : "Calendar",
                               "businessDayConvention" : "FOLLOWING",
                               "dateRelativeTo" : {
                                 "externalReference" : "e2"
                               }
-                            }
-                          }
-                        }
-                      },
-                      "endDate" : {
-                        "dividendDate" : {
-                          "value" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3ee313"
-                              },
-                              "unadjustedDate" : "2012-12-19"
                             },
                             "meta" : {
-                              "globalKey" : "3ee313"
-                            }
-                          }
-                        }
-                      },
-                      "startDate" : {
-                        "dividendDate" : {
-                          "value" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3edb14"
-                              },
-                              "unadjustedDate" : "2011-12-20"
-                            },
-                            "meta" : {
-                              "globalKey" : "3edb14"
+                              "globalKey" : "815062c1",
+                              "externalKey" : "p2"
                             }
                           }
                         }
@@ -340,172 +340,172 @@
                     } ]
                   }
                 },
-                "underlier" : {
-                  "index" : {
-                    "productIdentifier" : [ {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-1"
-                      }
-                    }, {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-2"
-                      }
-                    } ]
-                  },
-                  "meta" : {
-                    "globalKey" : "0"
-                  }
+                "meta" : {
+                  "globalKey" : "277f0a67"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "c6fb8c66"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "58861166"
+            "globalKey" : "c6fb8c66"
           }
         },
         "meta" : {
-          "globalKey" : "58861166"
+          "globalKey" : "c6fb8c66"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "f976d66d"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "2a77a29d"
+          "quantity" : [ {
+            "value" : {
+              "value" : 1000,
+              "unit" : {
+                "financialUnit" : "IndexUnit"
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : ".FCHI",
                   "meta" : {
                     "scheme" : "http://example.com/instrumentId"
-                  },
-                  "value" : ".FCHI"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "e9239a9c"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "France CAC 40 Index"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "136fbb9"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
-            } ]
-          },
-          "quantity" : [ {
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "INDEX_UNIT"
-              },
-              "value" : 1000
+              "globalKey" : "247cb103"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "9a26c1e8"
           },
+          "meta" : {
+            "globalKey" : "36901293"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 50000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-3"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 56000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 50000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 56000
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "aab17b18"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "kow029"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "kom722"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e91d3"
-      },
-      "value" : "2002-07-19"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/eqs-trade-id"
-          },
-          "value" : "1734"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "kom722",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "13a191d5"
+        "globalKey" : "33f59567",
+        "externalKey" : "kom722"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/eqs-trade-id"
-          },
-          "value" : "5648"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "kow029",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "1a6bd1a9"
+        "globalKey" : "33f59568",
+        "externalKey" : "kow029"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "4995b8f5"
+    }
+  },
+  "meta" : {
+    "globalKey" : "4995b8f5"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex02-dividend-swap-collateral.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex02-dividend-swap-collateral.json
index 45b8534174..09b9bb04e4 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex02-dividend-swap-collateral.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex02-dividend-swap-collateral.json
@@ -1,133 +1,46 @@
 {
-  "meta" : {
-    "globalKey" : "4882ceb6"
-  },
   "trade" : {
-    "collateral" : {
-      "independentAmount" : {
-        "payerPartyReference" : {
-          "externalReference" : "kow029",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "kom722",
-          "globalReference" : "33f59567"
-        },
-        "paymentDetail" : [ {
-          "meta" : {
-            "globalKey" : "eb02b3a"
-          },
-          "paymentAmount" : {
-            "unit" : {
-              "currency" : {
-                "value" : "USD"
-              }
-            },
-            "value" : 25000,
-            "meta" : {
-              "globalKey" : "92492939"
-            }
-          },
-          "paymentDate" : {
-            "meta" : {
-              "globalKey" : "e3c67693"
-            },
-            "relativeDate" : {
-              "meta" : {
-                "globalKey" : "e3c67693"
-              },
-              "period" : "D",
-              "periodMultiplier" : 0,
-              "businessDayConvention" : "FOLLOWING",
-              "dateRelativeTo" : {
-                "externalReference" : "s1"
-              }
-            }
-          }
-        }, {
-          "meta" : {
-            "globalKey" : "b4498817"
-          },
-          "paymentAmount" : {
-            "unit" : {
-              "currency" : {
-                "value" : "USD"
-              }
-            },
-            "value" : 28000,
-            "meta" : {
-              "globalKey" : "30fbdafc"
-            }
-          },
-          "paymentDate" : {
-            "meta" : {
-              "globalKey" : "e3c67693"
-            },
-            "relativeDate" : {
-              "meta" : {
-                "globalKey" : "e3c67693"
-              },
-              "period" : "D",
-              "periodMultiplier" : 0,
-              "businessDayConvention" : "FOLLOWING",
-              "dateRelativeTo" : {
-                "externalReference" : "s1"
-              }
-            }
-          }
-        } ]
-      }
-    },
-    "meta" : {
-      "globalKey" : "4882ceb6"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "kom722",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "kom722"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1734",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/eqs-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "kow029",
-        "globalKey" : "33f59568"
+        "globalKey" : "ea0d0bb9"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "kow029"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "5648",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/eqs-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ef1e6c61"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-07-19",
+      "meta" : {
+        "globalKey" : "3e91d3",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "kow029",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "kom722",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -138,33 +51,30 @@
             "payout" : {
               "fixedPricePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "eca76b5e"
-                  },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "eca76b5e"
+                          "globalKey" : "815062c0"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CALENDAR",
+                        "dayType" : "Calendar",
                         "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
                           "externalReference" : "e1"
@@ -172,51 +82,51 @@
                       }
                     },
                     "meta" : {
-                      "globalKey" : "eca76b5e"
+                      "globalKey" : "815062c0"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "815062c0"
                   }
                 },
                 "fixedPrice" : {
                   "price" : {
                     "value" : {
                       "value" : 0.045,
-                      "priceType" : "DIVIDEND"
+                      "priceType" : "Dividend"
                     }
                   }
                 },
                 "meta" : {
-                  "externalKey" : "d1",
-                  "globalKey" : "922d2ebf"
+                  "globalKey" : "cac1849d",
+                  "externalKey" : "d1"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "eca76b5f"
-                  },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "eca76b5f"
+                          "globalKey" : "815062c1"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CALENDAR",
+                        "dayType" : "Calendar",
                         "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
                           "externalReference" : "e2"
@@ -224,53 +134,68 @@
                       }
                     },
                     "meta" : {
-                      "globalKey" : "eca76b5f"
+                      "globalKey" : "815062c1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "815062c1"
                   }
                 },
                 "fixedPrice" : {
                   "price" : {
                     "value" : {
                       "value" : 0.045,
-                      "priceType" : "DIVIDEND"
+                      "priceType" : "Dividend"
                     }
                   }
                 },
                 "meta" : {
-                  "externalKey" : "d2",
-                  "globalKey" : "93e2075e"
+                  "globalKey" : "cc765d3c",
+                  "externalKey" : "d2"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "58861166"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
-                "meta" : {
-                  "globalKey" : "cb7fb6a7"
+                "underlier" : {
+                  "index" : {
+                    "productIdentifier" : [ {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-1"
+                      }
+                    }, {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-2"
+                      }
+                    } ]
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
                 },
                 "returnTerms" : {
                   "dividendReturnTerms" : {
@@ -279,7 +204,38 @@
                       "nonCashRatio" : 1.0
                     } ],
                     "dividendPeriod" : [ {
+                      "startDate" : {
+                        "dividendDate" : {
+                          "value" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2010-12-20",
+                              "meta" : {
+                                "globalKey" : "3ed314"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3ed314"
+                            }
+                          }
+                        }
+                      },
+                      "endDate" : {
+                        "dividendDate" : {
+                          "value" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2011-12-19",
+                              "meta" : {
+                                "globalKey" : "3edb13"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3edb13"
+                            }
+                          }
+                        }
+                      },
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -288,7 +244,6 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
@@ -296,57 +251,58 @@
                       "dividendPaymentDate" : {
                         "dividendDate" : {
                           "value" : {
-                            "meta" : {
-                              "externalKey" : "p1",
-                              "globalKey" : "eca76b5e"
-                            },
                             "relativeDate" : {
+                              "periodMultiplier" : 3,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "eca76b5e"
+                                "globalKey" : "815062c0"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 3,
-                              "dayType" : "CALENDAR",
+                              "dayType" : "Calendar",
                               "businessDayConvention" : "FOLLOWING",
                               "dateRelativeTo" : {
                                 "externalReference" : "e1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "815062c0",
+                              "externalKey" : "p1"
                             }
                           }
                         }
-                      },
-                      "endDate" : {
+                      }
+                    }, {
+                      "startDate" : {
                         "dividendDate" : {
                           "value" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2011-12-20",
                               "meta" : {
-                                "globalKey" : "3edb13"
-                              },
-                              "unadjustedDate" : "2011-12-19"
+                                "globalKey" : "3edb14"
+                              }
                             },
                             "meta" : {
-                              "globalKey" : "3edb13"
+                              "globalKey" : "3edb14"
                             }
                           }
                         }
                       },
-                      "startDate" : {
+                      "endDate" : {
                         "dividendDate" : {
                           "value" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2012-12-19",
                               "meta" : {
-                                "globalKey" : "3ed314"
-                              },
-                              "unadjustedDate" : "2010-12-20"
+                                "globalKey" : "3ee313"
+                              }
                             },
                             "meta" : {
-                              "globalKey" : "3ed314"
+                              "globalKey" : "3ee313"
                             }
                           }
                         }
-                      }
-                    }, {
+                      },
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -355,7 +311,6 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
@@ -363,51 +318,21 @@
                       "dividendPaymentDate" : {
                         "dividendDate" : {
                           "value" : {
-                            "meta" : {
-                              "externalKey" : "p2",
-                              "globalKey" : "eca76b5f"
-                            },
                             "relativeDate" : {
+                              "periodMultiplier" : 3,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "eca76b5f"
+                                "globalKey" : "815062c1"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 3,
-                              "dayType" : "CALENDAR",
+                              "dayType" : "Calendar",
                               "businessDayConvention" : "FOLLOWING",
                               "dateRelativeTo" : {
                                 "externalReference" : "e2"
                               }
-                            }
-                          }
-                        }
-                      },
-                      "endDate" : {
-                        "dividendDate" : {
-                          "value" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3ee313"
-                              },
-                              "unadjustedDate" : "2012-12-19"
-                            },
-                            "meta" : {
-                              "globalKey" : "3ee313"
-                            }
-                          }
-                        }
-                      },
-                      "startDate" : {
-                        "dividendDate" : {
-                          "value" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3edb14"
-                              },
-                              "unadjustedDate" : "2011-12-20"
                             },
                             "meta" : {
-                              "globalKey" : "3edb14"
+                              "globalKey" : "815062c1",
+                              "externalKey" : "p2"
                             }
                           }
                         }
@@ -415,172 +340,247 @@
                     } ]
                   }
                 },
-                "underlier" : {
-                  "index" : {
-                    "productIdentifier" : [ {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-1"
-                      }
-                    }, {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-2"
-                      }
-                    } ]
-                  },
-                  "meta" : {
-                    "globalKey" : "0"
-                  }
+                "meta" : {
+                  "globalKey" : "277f0a67"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "c6fb8c66"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "58861166"
+            "globalKey" : "c6fb8c66"
           }
         },
         "meta" : {
-          "globalKey" : "58861166"
+          "globalKey" : "c6fb8c66"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "f976d66d"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "2a77a29d"
+          "quantity" : [ {
+            "value" : {
+              "value" : 1000,
+              "unit" : {
+                "financialUnit" : "IndexUnit"
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : ".FCHI",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4-1/instrumentId"
-                  },
-                  "value" : ".FCHI"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "e9239a9c"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "France CAC 40 Index"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "136fbb9"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
-            } ]
-          },
-          "quantity" : [ {
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "INDEX_UNIT"
-              },
-              "value" : 1000
+              "globalKey" : "247cb103"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "9a26c1e8"
           },
+          "meta" : {
+            "globalKey" : "36901293"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 50000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-3"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 56000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 50000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 56000
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "aab17b18"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "kow029"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "kom722"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e91d3"
-      },
-      "value" : "2002-07-19"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/eqs-trade-id"
-          },
-          "value" : "1734"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "kom722",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "13a191d5"
+        "globalKey" : "33f59567",
+        "externalKey" : "kom722"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/eqs-trade-id"
-          },
-          "value" : "5648"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "kow029",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "1a6bd1a9"
+        "globalKey" : "33f59568",
+        "externalKey" : "kow029"
+      }
+    } ],
+    "collateral" : {
+      "independentAmount" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "kow029"
+        },
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "kom722"
+        },
+        "paymentDetail" : [ {
+          "paymentDate" : {
+            "relativeDate" : {
+              "periodMultiplier" : 0,
+              "period" : "D",
+              "meta" : {
+                "globalKey" : "e027218b"
+              },
+              "businessDayConvention" : "FOLLOWING",
+              "dateRelativeTo" : {
+                "externalReference" : "s1"
+              }
+            },
+            "meta" : {
+              "globalKey" : "e027218b"
+            }
+          },
+          "paymentAmount" : {
+            "value" : 25000,
+            "unit" : {
+              "currency" : {
+                "value" : "USD"
+              }
+            },
+            "meta" : {
+              "globalKey" : "92492939"
+            }
+          },
+          "meta" : {
+            "globalKey" : "efa0468e"
+          }
+        }, {
+          "paymentDate" : {
+            "relativeDate" : {
+              "periodMultiplier" : 0,
+              "period" : "D",
+              "meta" : {
+                "globalKey" : "e027218b"
+              },
+              "businessDayConvention" : "FOLLOWING",
+              "dateRelativeTo" : {
+                "externalReference" : "s1"
+              }
+            },
+            "meta" : {
+              "globalKey" : "e027218b"
+            }
+          },
+          "paymentAmount" : {
+            "value" : 28000,
+            "unit" : {
+              "currency" : {
+                "value" : "USD"
+              }
+            },
+            "meta" : {
+              "globalKey" : "30fbdafc"
+            }
+          },
+          "meta" : {
+            "globalKey" : "8e52f851"
+          }
+        } ]
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "6f6e05e6"
+    }
+  },
+  "meta" : {
+    "globalKey" : "6f6e05e6"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex03-dividend-swap-short-form-japanese-underlyer.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex03-dividend-swap-short-form-japanese-underlyer.json
index c7d70f64e7..ad72af1415 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex03-dividend-swap-short-form-japanese-underlyer.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex03-dividend-swap-short-form-japanese-underlyer.json
@@ -1,58 +1,46 @@
 {
-  "meta" : {
-    "globalKey" : "6747fb72"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "6747fb72"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "kom722",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "kom722"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1734",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/eqs-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "kow029",
-        "globalKey" : "33f59568"
+        "globalKey" : "ea0d0bb9"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "kow029"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "5648",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/eqs-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ef1e6c61"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-07-19",
+      "meta" : {
+        "globalKey" : "3e91d3",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "kow029",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "kom722",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,33 +51,30 @@
             "payout" : {
               "fixedPricePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "eca76b5e"
-                  },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "eca76b5e"
+                          "globalKey" : "815062c0"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CALENDAR",
+                        "dayType" : "Calendar",
                         "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
                           "externalReference" : "e1"
@@ -97,51 +82,51 @@
                       }
                     },
                     "meta" : {
-                      "globalKey" : "eca76b5e"
+                      "globalKey" : "815062c0"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "815062c0"
                   }
                 },
                 "fixedPrice" : {
                   "price" : {
                     "value" : {
                       "value" : 0.045,
-                      "priceType" : "DIVIDEND"
+                      "priceType" : "Dividend"
                     }
                   }
                 },
                 "meta" : {
-                  "externalKey" : "d1",
-                  "globalKey" : "922d2ebf"
+                  "globalKey" : "cac1849d",
+                  "externalKey" : "d1"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "eca76b5f"
-                  },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "eca76b5f"
+                          "globalKey" : "815062c1"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CALENDAR",
+                        "dayType" : "Calendar",
                         "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
                           "externalReference" : "e2"
@@ -149,58 +134,106 @@
                       }
                     },
                     "meta" : {
-                      "globalKey" : "eca76b5f"
+                      "globalKey" : "815062c1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "815062c1"
                   }
                 },
                 "fixedPrice" : {
                   "price" : {
                     "value" : {
                       "value" : 0.045,
-                      "priceType" : "DIVIDEND"
+                      "priceType" : "Dividend"
                     }
                   }
                 },
                 "meta" : {
-                  "externalKey" : "d2",
-                  "globalKey" : "93e2075e"
+                  "globalKey" : "cc765d3c",
+                  "externalKey" : "d2"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "46edad6a"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "76109246"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "JPY"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "76109246"
+                  }
                 },
-                "meta" : {
-                  "globalKey" : "acdebe09"
+                "underlier" : {
+                  "index" : {
+                    "productIdentifier" : [ {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-1"
+                      }
+                    }, {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-2"
+                      }
+                    } ]
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
                 },
                 "returnTerms" : {
                   "dividendReturnTerms" : {
+                    "specialDividends" : false,
+                    "materialDividend" : false,
                     "dividendPeriod" : [ {
+                      "startDate" : {
+                        "dividendDate" : {
+                          "value" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2010-12-20",
+                              "meta" : {
+                                "globalKey" : "3ed314"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3ed314"
+                            }
+                          }
+                        }
+                      },
+                      "endDate" : {
+                        "dividendDate" : {
+                          "value" : {
+                            "adjustableDate" : {
+                              "unadjustedDate" : "2011-12-19",
+                              "meta" : {
+                                "globalKey" : "3edb13"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "3edb13"
+                            }
+                          }
+                        }
+                      },
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "JPTO"
@@ -209,7 +242,6 @@
                             "globalKey" : "22da41"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211ff630"
                         }
@@ -217,74 +249,75 @@
                       "dividendPaymentDate" : {
                         "dividendDate" : {
                           "value" : {
-                            "meta" : {
-                              "externalKey" : "p1",
-                              "globalKey" : "eca76b5e"
-                            },
                             "relativeDate" : {
+                              "periodMultiplier" : 3,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "eca76b5e"
+                                "globalKey" : "815062c0"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 3,
-                              "dayType" : "CALENDAR",
+                              "dayType" : "Calendar",
                               "businessDayConvention" : "FOLLOWING",
                               "dateRelativeTo" : {
                                 "externalReference" : "e1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "815062c0",
+                              "externalKey" : "p1"
                             }
                           }
                         }
                       },
                       "dividendValuationDate" : {
-                        "meta" : {
-                          "globalKey" : "eca76b5e"
-                        },
                         "relativeDate" : {
+                          "periodMultiplier" : 3,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "eca76b5e"
+                            "globalKey" : "815062c0"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 3,
-                          "dayType" : "CALENDAR",
+                          "dayType" : "Calendar",
                           "businessDayConvention" : "FOLLOWING",
                           "dateRelativeTo" : {
                             "externalReference" : "e1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "815062c0"
                         }
-                      },
-                      "endDate" : {
+                      }
+                    }, {
+                      "startDate" : {
                         "dividendDate" : {
                           "value" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2011-12-20",
                               "meta" : {
-                                "globalKey" : "3edb13"
-                              },
-                              "unadjustedDate" : "2011-12-19"
+                                "globalKey" : "3edb14"
+                              }
                             },
                             "meta" : {
-                              "globalKey" : "3edb13"
+                              "globalKey" : "3edb14"
                             }
                           }
                         }
                       },
-                      "startDate" : {
+                      "endDate" : {
                         "dividendDate" : {
                           "value" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2012-12-19",
                               "meta" : {
-                                "globalKey" : "3ed314"
-                              },
-                              "unadjustedDate" : "2010-12-20"
+                                "globalKey" : "3ee313"
+                              }
                             },
                             "meta" : {
-                              "globalKey" : "3ed314"
+                              "globalKey" : "3ee313"
                             }
                           }
                         }
-                      }
-                    }, {
+                      },
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "JPTO"
@@ -293,7 +326,6 @@
                             "globalKey" : "22da41"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211ff630"
                         }
@@ -301,243 +333,211 @@
                       "dividendPaymentDate" : {
                         "dividendDate" : {
                           "value" : {
-                            "meta" : {
-                              "externalKey" : "p2",
-                              "globalKey" : "eca76b5f"
-                            },
                             "relativeDate" : {
+                              "periodMultiplier" : 3,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "eca76b5f"
+                                "globalKey" : "815062c1"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : 3,
-                              "dayType" : "CALENDAR",
+                              "dayType" : "Calendar",
                               "businessDayConvention" : "FOLLOWING",
                               "dateRelativeTo" : {
                                 "externalReference" : "e2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "815062c1",
+                              "externalKey" : "p2"
                             }
                           }
                         }
                       },
                       "dividendValuationDate" : {
-                        "meta" : {
-                          "globalKey" : "eca76b5f"
-                        },
                         "relativeDate" : {
+                          "periodMultiplier" : 3,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "eca76b5f"
+                            "globalKey" : "815062c1"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 3,
-                          "dayType" : "CALENDAR",
+                          "dayType" : "Calendar",
                           "businessDayConvention" : "FOLLOWING",
                           "dateRelativeTo" : {
                             "externalReference" : "e2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "815062c1"
                         }
-                      },
-                      "endDate" : {
-                        "dividendDate" : {
-                          "value" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3ee313"
-                              },
-                              "unadjustedDate" : "2012-12-19"
-                            },
-                            "meta" : {
-                              "globalKey" : "3ee313"
-                            }
-                          }
-                        }
-                      },
-                      "startDate" : {
-                        "dividendDate" : {
-                          "value" : {
-                            "adjustableDate" : {
-                              "meta" : {
-                                "globalKey" : "3edb14"
-                              },
-                              "unadjustedDate" : "2011-12-20"
-                            },
-                            "meta" : {
-                              "globalKey" : "3edb14"
-                            }
-                          }
-                        }
-                      }
-                    } ],
-                    "materialDividend" : false,
-                    "specialDividends" : false
-                  }
-                },
-                "underlier" : {
-                  "index" : {
-                    "productIdentifier" : [ {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-1"
-                      }
-                    }, {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-2"
                       }
                     } ]
-                  },
-                  "meta" : {
-                    "globalKey" : "0"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "b1d3e189"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "dbf141aa"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "46edad6a"
+            "globalKey" : "dbf141aa"
           }
         },
         "meta" : {
-          "globalKey" : "46edad6a"
+          "globalKey" : "dbf141aa"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "e4ca4a9c"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "a5c5a60c"
+          "quantity" : [ {
+            "value" : {
+              "value" : 1000,
+              "unit" : {
+                "financialUnit" : "IndexUnit"
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : ".N225",
                   "meta" : {
                     "scheme" : "http://example.com/instrumentId"
-                  },
-                  "value" : ".N225"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "e926fb05"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "NIKKEI 225 INDEX"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "6e3f85f1"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
-            } ]
-          },
-          "quantity" : [ {
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "INDEX_UNIT"
-              },
-              "value" : 1000
+              "globalKey" : "12ef1b74"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "5a752902"
           },
+          "meta" : {
+            "globalKey" : "25027d04"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 50000,
+              "unit" : {
+                "currency" : {
+                  "value" : "JPY"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-3"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 56000,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
-              },
-              "value" : 50000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "JPY"
-                }
-              },
-              "value" : 56000
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "f42ff73e"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "kow029"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "kom722"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e91d3"
-      },
-      "value" : "2002-07-19"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/eqs-trade-id"
-          },
-          "value" : "1734"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "kom722",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "13a191d5"
+        "globalKey" : "33f59567",
+        "externalKey" : "kom722"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/eqs-trade-id"
-          },
-          "value" : "5648"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "kow029",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "1a6bd1a9"
+        "globalKey" : "33f59568",
+        "externalKey" : "kow029"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "d3dcaa0"
+    }
+  },
+  "meta" : {
+    "globalKey" : "d3dcaa0"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex04-dividend-swap-option-transaction-supplement.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex04-dividend-swap-option-transaction-supplement.json
index d003d5e5a5..6aa8155435 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex04-dividend-swap-option-transaction-supplement.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex04-dividend-swap-option-transaction-supplement.json
@@ -1,64 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "8f9984d7"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "b56ade26"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "a9725448"
-      },
-      "name" : {
-        "value" : "SwapsWire Ltd (LE)"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "d53e12f6",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "166555",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "ABC1"
-        },
-        "meta" : {
-          "globalKey" : "1e8c2f"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "3e4ef71f"
-      },
-      "name" : {
-        "value" : "Rusty"
+        "globalKey" : "ec318949"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "7766c429",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "166555",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "ABC6"
-        },
-        "meta" : {
-          "globalKey" : "1e8c34"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ec31fda8"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-01-27",
+      "meta" : {
+        "globalKey" : "3ec85b"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "a9725448"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "3e4ef71f"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -67,47 +48,40 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "f3ae1c45"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2015-03-20",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "26af9c7f"
-                          },
-                          "unadjustedDate" : "2015-03-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "26af9c7f"
@@ -118,12 +92,13 @@
                         "globalKey" : "e4555d13"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
+                    }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "f3ae1c45"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -134,33 +109,30 @@
                       "payout" : {
                         "fixedPricePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-3"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
                           "settlementTerms" : {
-                            "meta" : {
-                              "globalKey" : "eca76b5e"
-                            },
                             "settlementDate" : {
                               "adjustableOrRelativeDate" : {
                                 "relativeDate" : {
+                                  "periodMultiplier" : 3,
+                                  "period" : "D",
                                   "meta" : {
-                                    "globalKey" : "eca76b5e"
+                                    "globalKey" : "815062c0"
                                   },
-                                  "period" : "D",
-                                  "periodMultiplier" : 3,
-                                  "dayType" : "CALENDAR",
+                                  "dayType" : "Calendar",
                                   "businessDayConvention" : "FOLLOWING",
                                   "dateRelativeTo" : {
                                     "externalReference" : "e1"
@@ -168,51 +140,51 @@
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "eca76b5e"
+                                "globalKey" : "815062c0"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "815062c0"
                             }
                           },
                           "fixedPrice" : {
                             "price" : {
                               "value" : {
                                 "value" : 0.045,
-                                "priceType" : "DIVIDEND"
+                                "priceType" : "Dividend"
                               }
                             }
                           },
                           "meta" : {
-                            "externalKey" : "d1",
-                            "globalKey" : "61532dd"
+                            "globalKey" : "3ea988bb",
+                            "externalKey" : "d1"
                           }
                         }, {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
                           "settlementTerms" : {
-                            "meta" : {
-                              "globalKey" : "eca76b5f"
-                            },
                             "settlementDate" : {
                               "adjustableOrRelativeDate" : {
                                 "relativeDate" : {
+                                  "periodMultiplier" : 3,
+                                  "period" : "D",
                                   "meta" : {
-                                    "globalKey" : "eca76b5f"
+                                    "globalKey" : "815062c1"
                                   },
-                                  "period" : "D",
-                                  "periodMultiplier" : 3,
-                                  "dayType" : "CALENDAR",
+                                  "dayType" : "Calendar",
                                   "businessDayConvention" : "FOLLOWING",
                                   "dateRelativeTo" : {
                                     "externalReference" : "e2"
@@ -220,53 +192,68 @@
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "eca76b5f"
+                                "globalKey" : "815062c1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "815062c1"
                             }
                           },
                           "fixedPrice" : {
                             "price" : {
                               "value" : {
                                 "value" : 0.045,
-                                "priceType" : "DIVIDEND"
+                                "priceType" : "Dividend"
                               }
                             }
                           },
                           "meta" : {
-                            "externalKey" : "d2",
-                            "globalKey" : "7ca0b7c"
+                            "globalKey" : "405e615a",
+                            "externalKey" : "d2"
                           }
                         } ],
-                        "meta" : {
-                          "globalKey" : "a3eb0088"
-                        },
                         "performancePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
                           "settlementTerms" : {
-                            "meta" : {
-                              "globalKey" : "7610bbd9"
-                            },
+                            "settlementType" : "Cash",
                             "settlementCurrency" : {
                               "value" : "USD"
                             },
-                            "settlementType" : "CASH"
+                            "meta" : {
+                              "globalKey" : "7610bbd9"
+                            }
                           },
-                          "meta" : {
-                            "globalKey" : "af0fa689"
+                          "underlier" : {
+                            "index" : {
+                              "productIdentifier" : [ {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "productIdentifier-1"
+                                }
+                              }, {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "productIdentifier-2"
+                                }
+                              } ]
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
                           },
                           "returnTerms" : {
                             "dividendReturnTerms" : {
@@ -275,7 +262,38 @@
                                 "nonCashRatio" : 1.0
                               } ],
                               "dividendPeriod" : [ {
+                                "startDate" : {
+                                  "dividendDate" : {
+                                    "value" : {
+                                      "adjustableDate" : {
+                                        "unadjustedDate" : "2010-12-20",
+                                        "meta" : {
+                                          "globalKey" : "3ed314"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "3ed314"
+                                      }
+                                    }
+                                  }
+                                },
+                                "endDate" : {
+                                  "dividendDate" : {
+                                    "value" : {
+                                      "adjustableDate" : {
+                                        "unadjustedDate" : "2011-12-19",
+                                        "meta" : {
+                                          "globalKey" : "3edb13"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "3edb13"
+                                      }
+                                    }
+                                  }
+                                },
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "FOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
@@ -284,7 +302,6 @@
                                       "globalKey" : "20a71d"
                                     }
                                   },
-                                  "businessDayConvention" : "FOLLOWING",
                                   "meta" : {
                                     "globalKey" : "211dc30c"
                                   }
@@ -292,57 +309,58 @@
                                 "dividendPaymentDate" : {
                                   "dividendDate" : {
                                     "value" : {
-                                      "meta" : {
-                                        "externalKey" : "p1",
-                                        "globalKey" : "eca76b5e"
-                                      },
                                       "relativeDate" : {
+                                        "periodMultiplier" : 3,
+                                        "period" : "D",
                                         "meta" : {
-                                          "globalKey" : "eca76b5e"
+                                          "globalKey" : "815062c0"
                                         },
-                                        "period" : "D",
-                                        "periodMultiplier" : 3,
-                                        "dayType" : "CALENDAR",
+                                        "dayType" : "Calendar",
                                         "businessDayConvention" : "FOLLOWING",
                                         "dateRelativeTo" : {
                                           "externalReference" : "e1"
                                         }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "815062c0",
+                                        "externalKey" : "p1"
                                       }
                                     }
                                   }
-                                },
-                                "endDate" : {
+                                }
+                              }, {
+                                "startDate" : {
                                   "dividendDate" : {
                                     "value" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2011-12-20",
                                         "meta" : {
-                                          "globalKey" : "3edb13"
-                                        },
-                                        "unadjustedDate" : "2011-12-19"
+                                          "globalKey" : "3edb14"
+                                        }
                                       },
                                       "meta" : {
-                                        "globalKey" : "3edb13"
+                                        "globalKey" : "3edb14"
                                       }
                                     }
                                   }
                                 },
-                                "startDate" : {
+                                "endDate" : {
                                   "dividendDate" : {
                                     "value" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2012-12-19",
                                         "meta" : {
-                                          "globalKey" : "3ed314"
-                                        },
-                                        "unadjustedDate" : "2010-12-20"
+                                          "globalKey" : "3ee313"
+                                        }
                                       },
                                       "meta" : {
-                                        "globalKey" : "3ed314"
+                                        "globalKey" : "3ee313"
                                       }
                                     }
                                   }
-                                }
-                              }, {
+                                },
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "FOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
@@ -351,7 +369,6 @@
                                       "globalKey" : "20a71d"
                                     }
                                   },
-                                  "businessDayConvention" : "FOLLOWING",
                                   "meta" : {
                                     "globalKey" : "211dc30c"
                                   }
@@ -359,51 +376,21 @@
                                 "dividendPaymentDate" : {
                                   "dividendDate" : {
                                     "value" : {
-                                      "meta" : {
-                                        "externalKey" : "p2",
-                                        "globalKey" : "eca76b5f"
-                                      },
                                       "relativeDate" : {
+                                        "periodMultiplier" : 3,
+                                        "period" : "D",
                                         "meta" : {
-                                          "globalKey" : "eca76b5f"
+                                          "globalKey" : "815062c1"
                                         },
-                                        "period" : "D",
-                                        "periodMultiplier" : 3,
-                                        "dayType" : "CALENDAR",
+                                        "dayType" : "Calendar",
                                         "businessDayConvention" : "FOLLOWING",
                                         "dateRelativeTo" : {
                                           "externalReference" : "e2"
                                         }
-                                      }
-                                    }
-                                  }
-                                },
-                                "endDate" : {
-                                  "dividendDate" : {
-                                    "value" : {
-                                      "adjustableDate" : {
-                                        "meta" : {
-                                          "globalKey" : "3ee313"
-                                        },
-                                        "unadjustedDate" : "2012-12-19"
-                                      },
-                                      "meta" : {
-                                        "globalKey" : "3ee313"
-                                      }
-                                    }
-                                  }
-                                },
-                                "startDate" : {
-                                  "dividendDate" : {
-                                    "value" : {
-                                      "adjustableDate" : {
-                                        "meta" : {
-                                          "globalKey" : "3edb14"
-                                        },
-                                        "unadjustedDate" : "2011-12-20"
                                       },
                                       "meta" : {
-                                        "globalKey" : "3edb14"
+                                        "globalKey" : "815062c1",
+                                        "externalKey" : "p2"
                                       }
                                     }
                                   }
@@ -411,219 +398,232 @@
                               } ]
                             }
                           },
-                          "underlier" : {
-                            "index" : {
-                              "productIdentifier" : [ {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "productIdentifier-1"
-                                }
-                              }, {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "productIdentifier-2"
-                                }
-                              } ]
-                            },
-                            "meta" : {
-                              "globalKey" : "0"
-                            }
+                          "meta" : {
+                            "globalKey" : "b0efa49"
                           }
-                        } ]
+                        } ],
+                        "meta" : {
+                          "globalKey" : "12607b88"
+                        }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "a3eb0088"
+                      "globalKey" : "12607b88"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "a3eb0088"
+                    "globalKey" : "12607b88"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "9c50333f"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "9c50333f"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "f3ae1c45"
+            "globalKey" : "9c50333f"
           }
         },
         "meta" : {
-          "globalKey" : "f3ae1c45"
+          "globalKey" : "9c50333f"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "f976d66d"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "2a77a29d"
+          "quantity" : [ {
+            "value" : {
+              "value" : 1000,
+              "unit" : {
+                "financialUnit" : "IndexUnit"
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : ".FCHI",
                   "meta" : {
                     "scheme" : "http://example.com/instrumentId"
-                  },
-                  "value" : ".FCHI"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "e9239a9c"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "France CAC 40 Index"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "136fbb9"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
-            } ]
-          },
-          "quantity" : [ {
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "INDEX_UNIT"
-              },
-              "value" : 1000
+              "globalKey" : "247cb103"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "9a26c1e8"
           },
+          "meta" : {
+            "globalKey" : "36901293"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 50000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-3"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 56000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 50000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 56000
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "aab17b18"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "d53e12f6",
+          "externalReference" : "partyA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "7766c429",
+          "externalReference" : "partyB"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec85b"
-      },
-      "value" : "2009-01-27"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABC1",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "166555"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "1e8c2f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "a9725448"
+      "name" : {
+        "value" : "SwapsWire Ltd (LE)"
       },
       "meta" : {
-        "globalKey" : "2e7ec65f"
+        "globalKey" : "d53e12f6",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABC6",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "166555"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "1e8c34"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "3e4ef71f"
+      "name" : {
+        "value" : "Rusty"
       },
       "meta" : {
-        "globalKey" : "2e7ec660"
+        "globalKey" : "7766c429",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "6ec1eb60"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "589fa431"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "a9725448"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "3e4ef71f"
-        }
-      },
       "quantity" : {
+        "value" : 1500000,
         "unit" : {
           "currency" : {
             "value" : "GBP"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "d53e12f6",
+          "externalReference" : "partyA"
         },
-        "value" : 1500000
+        "receiverPartyReference" : {
+          "globalReference" : "7766c429",
+          "externalReference" : "partyB"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2009-01-29",
         "dateAdjustments" : {
-          "businessDayConvention" : "NOT_APPLICABLE",
+          "businessDayConvention" : "NotApplicable",
           "meta" : {
             "globalKey" : "3a4b88ab"
           }
-        },
-        "unadjustedDate" : "2009-01-29"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "ebb16fcd"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "13d3432d"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex05-dividend-swap-option-gs-example.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex05-dividend-swap-option-gs-example.json
index 19409f40a0..e17e1cdb94 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex05-dividend-swap-option-gs-example.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex05-dividend-swap-option-gs-example.json
@@ -1,65 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "bb7a937"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "42513c39"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "b4958dec"
-      },
-      "name" : {
-        "value" : "Counterparty Inc."
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "3815f38",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "166555",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "CPTY"
-        },
-        "meta" : {
-          "globalKey" : "1fabb2"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "bce1062a"
-      },
-      "name" : {
-        "value" : "Goldman Sachs International"
+        "globalKey" : "ec318949"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "22d869aa",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "166555",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "S81F8KH474EY7PUWI149"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "261ae4a2"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ec31fda8"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2012-01-27",
+      "meta" : {
+        "globalKey" : "3ee05b"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "b4958dec"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "bce1062a"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -68,47 +48,40 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "33658b75"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "76108015"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "76108015"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2015-03-20",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "26af9c7f"
-                          },
-                          "unadjustedDate" : "2015-03-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "26af9c7f"
@@ -119,20 +92,13 @@
                         "globalKey" : "e4555d13"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
+                    }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "33658b75"
-                },
-                "observationTerms" : {
-                  "pricingTime" : {
-                    "businessCenter" : {
-                      "value" : "EUTA"
-                    },
-                    "hourMinuteTime" : "10:00:00"
-                  }
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -143,33 +109,30 @@
                       "payout" : {
                         "fixedPricePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
                           "settlementTerms" : {
-                            "meta" : {
-                              "globalKey" : "eca76b5e"
-                            },
                             "settlementDate" : {
                               "adjustableOrRelativeDate" : {
                                 "relativeDate" : {
+                                  "periodMultiplier" : 3,
+                                  "period" : "D",
                                   "meta" : {
-                                    "globalKey" : "eca76b5e"
+                                    "globalKey" : "815062c0"
                                   },
-                                  "period" : "D",
-                                  "periodMultiplier" : 3,
-                                  "dayType" : "CALENDAR",
+                                  "dayType" : "Calendar",
                                   "businessDayConvention" : "FOLLOWING",
                                   "dateRelativeTo" : {
                                     "externalReference" : "e1"
@@ -177,51 +140,51 @@
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "eca76b5e"
+                                "globalKey" : "815062c0"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "815062c0"
                             }
                           },
                           "fixedPrice" : {
                             "price" : {
                               "value" : {
                                 "value" : 0.045,
-                                "priceType" : "DIVIDEND"
+                                "priceType" : "Dividend"
                               }
                             }
                           },
                           "meta" : {
-                            "externalKey" : "d1",
-                            "globalKey" : "922d2ebf"
+                            "globalKey" : "cac1849d",
+                            "externalKey" : "d1"
                           }
                         }, {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
                           "settlementTerms" : {
-                            "meta" : {
-                              "globalKey" : "eca76b5f"
-                            },
                             "settlementDate" : {
                               "adjustableOrRelativeDate" : {
                                 "relativeDate" : {
+                                  "periodMultiplier" : 3,
+                                  "period" : "D",
                                   "meta" : {
-                                    "globalKey" : "eca76b5f"
+                                    "globalKey" : "815062c1"
                                   },
-                                  "period" : "D",
-                                  "periodMultiplier" : 3,
-                                  "dayType" : "CALENDAR",
+                                  "dayType" : "Calendar",
                                   "businessDayConvention" : "FOLLOWING",
                                   "dateRelativeTo" : {
                                     "externalReference" : "e2"
@@ -229,47 +192,46 @@
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "eca76b5f"
+                                "globalKey" : "815062c1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "815062c1"
                             }
                           },
                           "fixedPrice" : {
                             "price" : {
                               "value" : {
                                 "value" : 0.045,
-                                "priceType" : "DIVIDEND"
+                                "priceType" : "Dividend"
                               }
                             }
                           },
                           "meta" : {
-                            "externalKey" : "d2",
-                            "globalKey" : "93e2075e"
+                            "globalKey" : "cc765d3c",
+                            "externalKey" : "d2"
                           }
                         } ],
-                        "meta" : {
-                          "globalKey" : "20fca256"
-                        },
                         "performancePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "settlementTerms" : {
-                            "meta" : {
-                              "globalKey" : "e840f4b"
-                            },
+                            "settlementType" : "Cash",
                             "settlementCurrency" : {
                               "value" : "EUR"
                             },
                             "settlementDate" : {
                               "adjustableOrRelativeDate" : {
                                 "relativeDate" : {
+                                  "periodMultiplier" : 2,
+                                  "period" : "D",
                                   "meta" : {
-                                    "globalKey" : "1c7406b6"
+                                    "globalKey" : "aadcf9f2"
                                   },
-                                  "period" : "D",
-                                  "periodMultiplier" : 2,
-                                  "dayType" : "BUSINESS",
+                                  "dayType" : "Business",
+                                  "businessDayConvention" : "NONE",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
@@ -278,20 +240,36 @@
                                       "globalKey" : "20a71d"
                                     }
                                   },
-                                  "businessDayConvention" : "NONE",
                                   "dateRelativeTo" : {
                                     "externalReference" : "valuationDate"
                                   }
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "1c7406b6"
+                                "globalKey" : "aadcf9f2"
                               }
                             },
-                            "settlementType" : "CASH"
+                            "meta" : {
+                              "globalKey" : "9ced0287"
+                            }
                           },
-                          "meta" : {
-                            "globalKey" : "bc14da75"
+                          "underlier" : {
+                            "index" : {
+                              "productIdentifier" : [ {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "productIdentifier-1"
+                                }
+                              }, {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "productIdentifier-2"
+                                }
+                              } ]
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
                           },
                           "returnTerms" : {
                             "dividendReturnTerms" : {
@@ -300,7 +278,38 @@
                                 "nonCashRatio" : 1.0
                               } ],
                               "dividendPeriod" : [ {
+                                "startDate" : {
+                                  "dividendDate" : {
+                                    "value" : {
+                                      "adjustableDate" : {
+                                        "unadjustedDate" : "2015-12-20",
+                                        "meta" : {
+                                          "globalKey" : "3efb14"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "3efb14"
+                                      }
+                                    }
+                                  }
+                                },
+                                "endDate" : {
+                                  "dividendDate" : {
+                                    "value" : {
+                                      "adjustableDate" : {
+                                        "unadjustedDate" : "2016-03-19",
+                                        "meta" : {
+                                          "globalKey" : "3f00d3"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "3f00d3"
+                                      }
+                                    }
+                                  }
+                                },
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "FOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
@@ -309,7 +318,6 @@
                                       "globalKey" : "20a71d"
                                     }
                                   },
-                                  "businessDayConvention" : "FOLLOWING",
                                   "meta" : {
                                     "globalKey" : "211dc30c"
                                   }
@@ -317,33 +325,34 @@
                                 "dividendPaymentDate" : {
                                   "dividendDate" : {
                                     "value" : {
-                                      "meta" : {
-                                        "externalKey" : "p1",
-                                        "globalKey" : "eca76b5e"
-                                      },
                                       "relativeDate" : {
+                                        "periodMultiplier" : 3,
+                                        "period" : "D",
                                         "meta" : {
-                                          "globalKey" : "eca76b5e"
+                                          "globalKey" : "815062c0"
                                         },
-                                        "period" : "D",
-                                        "periodMultiplier" : 3,
-                                        "dayType" : "CALENDAR",
+                                        "dayType" : "Calendar",
                                         "businessDayConvention" : "FOLLOWING",
                                         "dateRelativeTo" : {
                                           "externalReference" : "e1"
                                         }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "815062c0",
+                                        "externalKey" : "p1"
                                       }
                                     }
                                   }
-                                },
-                                "endDate" : {
+                                }
+                              }, {
+                                "startDate" : {
                                   "dividendDate" : {
                                     "value" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2016-03-19",
                                         "meta" : {
                                           "globalKey" : "3f00d3"
-                                        },
-                                        "unadjustedDate" : "2016-03-19"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "3f00d3"
@@ -351,23 +360,23 @@
                                     }
                                   }
                                 },
-                                "startDate" : {
+                                "endDate" : {
                                   "dividendDate" : {
                                     "value" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2016-06-20",
                                         "meta" : {
-                                          "globalKey" : "3efb14"
-                                        },
-                                        "unadjustedDate" : "2015-12-20"
+                                          "globalKey" : "3f0194"
+                                        }
                                       },
                                       "meta" : {
-                                        "globalKey" : "3efb14"
+                                        "globalKey" : "3f0194"
                                       }
                                     }
                                   }
-                                }
-                              }, {
+                                },
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "FOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
@@ -376,7 +385,6 @@
                                       "globalKey" : "20a71d"
                                     }
                                   },
-                                  "businessDayConvention" : "FOLLOWING",
                                   "meta" : {
                                     "globalKey" : "211dc30c"
                                   }
@@ -384,51 +392,21 @@
                                 "dividendPaymentDate" : {
                                   "dividendDate" : {
                                     "value" : {
-                                      "meta" : {
-                                        "externalKey" : "p2",
-                                        "globalKey" : "eca76b5f"
-                                      },
                                       "relativeDate" : {
+                                        "periodMultiplier" : 3,
+                                        "period" : "D",
                                         "meta" : {
-                                          "globalKey" : "eca76b5f"
+                                          "globalKey" : "815062c1"
                                         },
-                                        "period" : "D",
-                                        "periodMultiplier" : 3,
-                                        "dayType" : "CALENDAR",
+                                        "dayType" : "Calendar",
                                         "businessDayConvention" : "FOLLOWING",
                                         "dateRelativeTo" : {
                                           "externalReference" : "e2"
                                         }
-                                      }
-                                    }
-                                  }
-                                },
-                                "endDate" : {
-                                  "dividendDate" : {
-                                    "value" : {
-                                      "adjustableDate" : {
-                                        "meta" : {
-                                          "globalKey" : "3f0194"
-                                        },
-                                        "unadjustedDate" : "2016-06-20"
                                       },
                                       "meta" : {
-                                        "globalKey" : "3f0194"
-                                      }
-                                    }
-                                  }
-                                },
-                                "startDate" : {
-                                  "dividendDate" : {
-                                    "value" : {
-                                      "adjustableDate" : {
-                                        "meta" : {
-                                          "globalKey" : "3f00d3"
-                                        },
-                                        "unadjustedDate" : "2016-03-19"
-                                      },
-                                      "meta" : {
-                                        "globalKey" : "3f00d3"
+                                        "globalKey" : "815062c1",
+                                        "externalKey" : "p2"
                                       }
                                     }
                                   }
@@ -436,205 +414,227 @@
                               } ]
                             }
                           },
-                          "underlier" : {
-                            "index" : {
-                              "productIdentifier" : [ {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "productIdentifier-1"
-                                }
-                              }, {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "productIdentifier-2"
-                                }
-                              } ]
-                            },
-                            "meta" : {
-                              "globalKey" : "0"
-                            }
+                          "meta" : {
+                            "globalKey" : "6c794b9"
                           }
-                        } ]
+                        } ],
+                        "meta" : {
+                          "globalKey" : "50142d5a"
+                        }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "20fca256"
+                      "globalKey" : "50142d5a"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "20fca256"
+                    "globalKey" : "50142d5a"
+                  }
+                },
+                "observationTerms" : {
+                  "pricingTime" : {
+                    "hourMinuteTime" : "10:00:00",
+                    "businessCenter" : {
+                      "value" : "EUTA"
+                    }
                   }
+                },
+                "meta" : {
+                  "globalKey" : "62d5d73"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "62d5d73"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "33658b75"
+            "globalKey" : "62d5d73"
           }
         },
         "meta" : {
-          "globalKey" : "33658b75"
+          "globalKey" : "62d5d73"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "fae71577"
-          },
           "observable" : {
-            "meta" : {
-              "globalKey" : "fae71577"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : ".STOX50E",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/spec/2002/instrument-id-Bloomberg-1-0"
-                  },
-                  "value" : ".STOX50E"
+                  }
                 },
+                "source" : "BBGID",
                 "meta" : {
                   "globalKey" : "7cfa3bb4"
-                },
-                "source" : "BBGID"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "STOXX 50 Euro"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "8a8c20ab"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "61fb9969"
+            }
+          },
+          "meta" : {
+            "globalKey" : "61fb9969"
           }
         }, {
-          "meta" : {
-            "globalKey" : "a392d60"
-          },
           "quantity" : [ {
+            "value" : {
+              "value" : 50000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 56000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 50000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 56000
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "3cec7ea0"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "3815f38",
+          "externalReference" : "partyA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "22d869aa",
+          "externalReference" : "partyB"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee05b"
-      },
-      "value" : "2012-01-27"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "CPTY",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "166555"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "1fabb2"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "b4958dec"
+      "name" : {
+        "value" : "Counterparty Inc."
       },
       "meta" : {
-        "globalKey" : "2e7ec65f"
+        "globalKey" : "3815f38",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "S81F8KH474EY7PUWI149",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "166555"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "261ae4a2"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "bce1062a"
+      "name" : {
+        "value" : "Goldman Sachs International"
       },
       "meta" : {
-        "globalKey" : "2e7ec660"
+        "globalKey" : "22d869aa",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "acae7243"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "a1cda93e"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "b4958dec"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "bce1062a"
-        }
-      },
       "quantity" : {
+        "value" : 1500000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "3815f38",
+          "externalReference" : "partyA"
         },
-        "value" : 1500000
+        "receiverPartyReference" : {
+          "globalReference" : "22d869aa",
+          "externalReference" : "partyB"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2012-01-29",
         "dateAdjustments" : {
-          "businessDayConvention" : "NOT_APPLICABLE",
+          "businessDayConvention" : "NotApplicable",
           "meta" : {
             "globalKey" : "3a4b88ab"
           }
-        },
-        "unadjustedDate" : "2012-01-29"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "3d46bae0"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "d944263"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex06-dividend-swap-option-pred-clearing.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex06-dividend-swap-option-pred-clearing.json
index 3e3e1ef02a..a67fafe122 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex06-dividend-swap-option-pred-clearing.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/dividend-swaps/div-ex06-dividend-swap-option-pred-clearing.json
@@ -1,91 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "ca2106da"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "611acc9c"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "b4958dec"
-      },
-      "name" : {
-        "value" : "Counterparty Inc."
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "3815f38",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "166555",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "CPTY"
-        },
-        "meta" : {
-          "globalKey" : "1fabb2"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "3eab9664"
-      },
-      "name" : {
-        "value" : "Goldman Sachs International"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "GS"
-        },
-        "meta" : {
-          "globalKey" : "8ec"
-        }
-      } ]
+        "globalKey" : "ec318949"
+      }
     }, {
-      "meta" : {
-        "externalKey" : "clearing-svc",
-        "globalKey" : "b2687a98"
-      },
-      "name" : {
-        "value" : "ClearItAll Corp"
+      "issuerReference" : {
+        "globalReference" : "1805a374",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "166555",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300IB5Q45JGNPND58"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e213e7d7"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ec31fda8"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2012-01-27",
+      "meta" : {
+        "globalKey" : "3ee05b"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "clearing-svc",
-          "globalReference" : "b2687a98"
-        } ],
-        "role" : "PREDETERMINED_CLEARING_ORGANIZATION_PARTY"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "b4958dec"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "3eab9664"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -94,54 +48,47 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "662726d7"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "a7504715"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "CASH",
+                  "meta" : {
+                    "globalKey" : "a7504715"
+                  },
                   "physicalSettlementTerms" : {
                     "clearedPhysicalSettlement" : true,
+                    "predeterminedClearingOrganizationParty" : "PredeterminedClearingOrganizationParty",
                     "meta" : {
                       "globalKey" : "5d273b4a"
-                    },
-                    "predeterminedClearingOrganizationParty" : "PREDETERMINED_CLEARING_ORGANIZATION_PARTY"
+                    }
                   }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2015-03-20",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "26af9c7f"
-                          },
-                          "unadjustedDate" : "2015-03-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "26af9c7f"
@@ -152,20 +99,13 @@
                         "globalKey" : "e4555d13"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
+                    }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "662726d7"
-                },
-                "observationTerms" : {
-                  "pricingTime" : {
-                    "businessCenter" : {
-                      "value" : "EUTA"
-                    },
-                    "hourMinuteTime" : "10:00:00"
-                  }
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -176,33 +116,30 @@
                       "payout" : {
                         "fixedPricePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
                           "settlementTerms" : {
-                            "meta" : {
-                              "globalKey" : "eca76b5e"
-                            },
                             "settlementDate" : {
                               "adjustableOrRelativeDate" : {
                                 "relativeDate" : {
+                                  "periodMultiplier" : 3,
+                                  "period" : "D",
                                   "meta" : {
-                                    "globalKey" : "eca76b5e"
+                                    "globalKey" : "815062c0"
                                   },
-                                  "period" : "D",
-                                  "periodMultiplier" : 3,
-                                  "dayType" : "CALENDAR",
+                                  "dayType" : "Calendar",
                                   "businessDayConvention" : "FOLLOWING",
                                   "dateRelativeTo" : {
                                     "externalReference" : "e1"
@@ -210,51 +147,51 @@
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "eca76b5e"
+                                "globalKey" : "815062c0"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "815062c0"
                             }
                           },
                           "fixedPrice" : {
                             "price" : {
                               "value" : {
                                 "value" : 0.045,
-                                "priceType" : "DIVIDEND"
+                                "priceType" : "Dividend"
                               }
                             }
                           },
                           "meta" : {
-                            "externalKey" : "d1",
-                            "globalKey" : "922d2ebf"
+                            "globalKey" : "cac1849d",
+                            "externalKey" : "d1"
                           }
                         }, {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
                           "settlementTerms" : {
-                            "meta" : {
-                              "globalKey" : "eca76b5f"
-                            },
                             "settlementDate" : {
                               "adjustableOrRelativeDate" : {
                                 "relativeDate" : {
+                                  "periodMultiplier" : 3,
+                                  "period" : "D",
                                   "meta" : {
-                                    "globalKey" : "eca76b5f"
+                                    "globalKey" : "815062c1"
                                   },
-                                  "period" : "D",
-                                  "periodMultiplier" : 3,
-                                  "dayType" : "CALENDAR",
+                                  "dayType" : "Calendar",
                                   "businessDayConvention" : "FOLLOWING",
                                   "dateRelativeTo" : {
                                     "externalReference" : "e2"
@@ -262,47 +199,46 @@
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "eca76b5f"
+                                "globalKey" : "815062c1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "815062c1"
                             }
                           },
                           "fixedPrice" : {
                             "price" : {
                               "value" : {
                                 "value" : 0.045,
-                                "priceType" : "DIVIDEND"
+                                "priceType" : "Dividend"
                               }
                             }
                           },
                           "meta" : {
-                            "externalKey" : "d2",
-                            "globalKey" : "93e2075e"
+                            "globalKey" : "cc765d3c",
+                            "externalKey" : "d2"
                           }
                         } ],
-                        "meta" : {
-                          "globalKey" : "20fca256"
-                        },
                         "performancePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "settlementTerms" : {
-                            "meta" : {
-                              "globalKey" : "e840f4b"
-                            },
+                            "settlementType" : "Cash",
                             "settlementCurrency" : {
                               "value" : "EUR"
                             },
                             "settlementDate" : {
                               "adjustableOrRelativeDate" : {
                                 "relativeDate" : {
+                                  "periodMultiplier" : 2,
+                                  "period" : "D",
                                   "meta" : {
-                                    "globalKey" : "1c7406b6"
+                                    "globalKey" : "aadcf9f2"
                                   },
-                                  "period" : "D",
-                                  "periodMultiplier" : 2,
-                                  "dayType" : "BUSINESS",
+                                  "dayType" : "Business",
+                                  "businessDayConvention" : "NONE",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
@@ -311,20 +247,36 @@
                                       "globalKey" : "20a71d"
                                     }
                                   },
-                                  "businessDayConvention" : "NONE",
                                   "dateRelativeTo" : {
                                     "externalReference" : "valuationDate"
                                   }
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "1c7406b6"
+                                "globalKey" : "aadcf9f2"
                               }
                             },
-                            "settlementType" : "CASH"
+                            "meta" : {
+                              "globalKey" : "9ced0287"
+                            }
                           },
-                          "meta" : {
-                            "globalKey" : "bc14da75"
+                          "underlier" : {
+                            "index" : {
+                              "productIdentifier" : [ {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "productIdentifier-1"
+                                }
+                              }, {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "productIdentifier-2"
+                                }
+                              } ]
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
+                            }
                           },
                           "returnTerms" : {
                             "dividendReturnTerms" : {
@@ -333,7 +285,38 @@
                                 "nonCashRatio" : 1.0
                               } ],
                               "dividendPeriod" : [ {
+                                "startDate" : {
+                                  "dividendDate" : {
+                                    "value" : {
+                                      "adjustableDate" : {
+                                        "unadjustedDate" : "2015-12-20",
+                                        "meta" : {
+                                          "globalKey" : "3efb14"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "3efb14"
+                                      }
+                                    }
+                                  }
+                                },
+                                "endDate" : {
+                                  "dividendDate" : {
+                                    "value" : {
+                                      "adjustableDate" : {
+                                        "unadjustedDate" : "2016-03-19",
+                                        "meta" : {
+                                          "globalKey" : "3f00d3"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "3f00d3"
+                                      }
+                                    }
+                                  }
+                                },
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "FOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
@@ -342,7 +325,6 @@
                                       "globalKey" : "20a71d"
                                     }
                                   },
-                                  "businessDayConvention" : "FOLLOWING",
                                   "meta" : {
                                     "globalKey" : "211dc30c"
                                   }
@@ -350,33 +332,34 @@
                                 "dividendPaymentDate" : {
                                   "dividendDate" : {
                                     "value" : {
-                                      "meta" : {
-                                        "externalKey" : "p1",
-                                        "globalKey" : "eca76b5e"
-                                      },
                                       "relativeDate" : {
+                                        "periodMultiplier" : 3,
+                                        "period" : "D",
                                         "meta" : {
-                                          "globalKey" : "eca76b5e"
+                                          "globalKey" : "815062c0"
                                         },
-                                        "period" : "D",
-                                        "periodMultiplier" : 3,
-                                        "dayType" : "CALENDAR",
+                                        "dayType" : "Calendar",
                                         "businessDayConvention" : "FOLLOWING",
                                         "dateRelativeTo" : {
                                           "externalReference" : "e1"
                                         }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "815062c0",
+                                        "externalKey" : "p1"
                                       }
                                     }
                                   }
-                                },
-                                "endDate" : {
+                                }
+                              }, {
+                                "startDate" : {
                                   "dividendDate" : {
                                     "value" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2016-03-19",
                                         "meta" : {
                                           "globalKey" : "3f00d3"
-                                        },
-                                        "unadjustedDate" : "2016-03-19"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "3f00d3"
@@ -384,23 +367,23 @@
                                     }
                                   }
                                 },
-                                "startDate" : {
+                                "endDate" : {
                                   "dividendDate" : {
                                     "value" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2016-06-20",
                                         "meta" : {
-                                          "globalKey" : "3efb14"
-                                        },
-                                        "unadjustedDate" : "2015-12-20"
+                                          "globalKey" : "3f0194"
+                                        }
                                       },
                                       "meta" : {
-                                        "globalKey" : "3efb14"
+                                        "globalKey" : "3f0194"
                                       }
                                     }
                                   }
-                                }
-                              }, {
+                                },
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "FOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
@@ -409,7 +392,6 @@
                                       "globalKey" : "20a71d"
                                     }
                                   },
-                                  "businessDayConvention" : "FOLLOWING",
                                   "meta" : {
                                     "globalKey" : "211dc30c"
                                   }
@@ -417,51 +399,21 @@
                                 "dividendPaymentDate" : {
                                   "dividendDate" : {
                                     "value" : {
-                                      "meta" : {
-                                        "externalKey" : "p2",
-                                        "globalKey" : "eca76b5f"
-                                      },
                                       "relativeDate" : {
+                                        "periodMultiplier" : 3,
+                                        "period" : "D",
                                         "meta" : {
-                                          "globalKey" : "eca76b5f"
+                                          "globalKey" : "815062c1"
                                         },
-                                        "period" : "D",
-                                        "periodMultiplier" : 3,
-                                        "dayType" : "CALENDAR",
+                                        "dayType" : "Calendar",
                                         "businessDayConvention" : "FOLLOWING",
                                         "dateRelativeTo" : {
                                           "externalReference" : "e2"
                                         }
-                                      }
-                                    }
-                                  }
-                                },
-                                "endDate" : {
-                                  "dividendDate" : {
-                                    "value" : {
-                                      "adjustableDate" : {
-                                        "meta" : {
-                                          "globalKey" : "3f0194"
-                                        },
-                                        "unadjustedDate" : "2016-06-20"
                                       },
                                       "meta" : {
-                                        "globalKey" : "3f0194"
-                                      }
-                                    }
-                                  }
-                                },
-                                "startDate" : {
-                                  "dividendDate" : {
-                                    "value" : {
-                                      "adjustableDate" : {
-                                        "meta" : {
-                                          "globalKey" : "3f00d3"
-                                        },
-                                        "unadjustedDate" : "2016-03-19"
-                                      },
-                                      "meta" : {
-                                        "globalKey" : "3f00d3"
+                                        "globalKey" : "815062c1",
+                                        "externalKey" : "p2"
                                       }
                                     }
                                   }
@@ -469,205 +421,253 @@
                               } ]
                             }
                           },
-                          "underlier" : {
-                            "index" : {
-                              "productIdentifier" : [ {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "productIdentifier-1"
-                                }
-                              }, {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "productIdentifier-2"
-                                }
-                              } ]
-                            },
-                            "meta" : {
-                              "globalKey" : "0"
-                            }
+                          "meta" : {
+                            "globalKey" : "6c794b9"
                           }
-                        } ]
+                        } ],
+                        "meta" : {
+                          "globalKey" : "50142d5a"
+                        }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "20fca256"
+                      "globalKey" : "50142d5a"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "20fca256"
+                    "globalKey" : "50142d5a"
+                  }
+                },
+                "observationTerms" : {
+                  "pricingTime" : {
+                    "hourMinuteTime" : "10:00:00",
+                    "businessCenter" : {
+                      "value" : "EUTA"
+                    }
                   }
+                },
+                "meta" : {
+                  "globalKey" : "38eef8d5"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "38eef8d5"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "662726d7"
+            "globalKey" : "38eef8d5"
           }
         },
         "meta" : {
-          "globalKey" : "662726d7"
+          "globalKey" : "38eef8d5"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "fae71577"
-          },
           "observable" : {
-            "meta" : {
-              "globalKey" : "fae71577"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : ".STOX50E",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/spec/2002/instrument-id-Bloomberg-1-0"
-                  },
-                  "value" : ".STOX50E"
+                  }
                 },
+                "source" : "BBGID",
                 "meta" : {
                   "globalKey" : "7cfa3bb4"
-                },
-                "source" : "BBGID"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "STOXX 50 Euro"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "8a8c20ab"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "61fb9969"
+            }
+          },
+          "meta" : {
+            "globalKey" : "61fb9969"
           }
         }, {
-          "meta" : {
-            "globalKey" : "a392d60"
-          },
           "quantity" : [ {
+            "value" : {
+              "value" : 50000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 56000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 50000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 56000
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "3cec7ea0"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "3815f38",
+          "externalReference" : "partyA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "1805a374",
+          "externalReference" : "partyB"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "PredeterminedClearingOrganizationParty",
+        "partyReference" : [ {
+          "globalReference" : "fff6958",
+          "externalReference" : "clearing-svc"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee05b"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "CPTY",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "1fabb2"
+        }
+      } ],
+      "name" : {
+        "value" : "Counterparty Inc."
       },
-      "value" : "2012-01-27"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "3815f38",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "GS",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "166555"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "8ec"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "b4958dec"
+      "name" : {
+        "value" : "Goldman Sachs International"
       },
       "meta" : {
-        "globalKey" : "2e7ec65f"
+        "globalKey" : "1805a374",
+        "externalKey" : "partyB"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300IB5Q45JGNPND58",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "166555"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e213e7d7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "3eab9664"
+      "name" : {
+        "value" : "ClearItAll Corp"
       },
       "meta" : {
-        "globalKey" : "2e7ec660"
+        "globalKey" : "fff6958",
+        "externalKey" : "clearing-svc"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "65e8aa14"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "a1cda93e"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "b4958dec"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "3eab9664"
-        }
-      },
       "quantity" : {
+        "value" : 1500000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "3815f38",
+          "externalReference" : "partyA"
         },
-        "value" : 1500000
+        "receiverPartyReference" : {
+          "globalReference" : "1805a374",
+          "externalReference" : "partyB"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2012-01-29",
         "dateAdjustments" : {
-          "businessDayConvention" : "NOT_APPLICABLE",
+          "businessDayConvention" : "NotApplicable",
           "meta" : {
             "globalKey" : "3a4b88ab"
           }
-        },
-        "unadjustedDate" : "2012-01-29"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "3d46bae0"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "2f6887f4"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqd-ex01-american-call-stock-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqd-ex01-american-call-stock-long-form.json
index c94f9bb580..a9509cf4ad 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqd-ex01-american-call-stock-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqd-ex01-american-call-stock-long-form.json
@@ -1,109 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "8ac99cdc"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "2092c901"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "6234330c"
-      }
-    },
-    "meta" : {
-      "globalKey" : "80f92be8"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "95918657"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-07-13",
+      "meta" : {
+        "globalKey" : "3e89cd",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Option:PriceReturnBasicPerformance:SingleName"
@@ -114,81 +39,43 @@
             "productQualifier" : "EquityOption_PriceReturnBasicPerformance_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
-              },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              }
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "1f6affff"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "4790ef7b"
-                  },
+                  "settlementType" : "Election",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "ELECTION"
+                  "meta" : {
+                    "globalKey" : "4790ef7b"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-07-13",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -197,8 +84,7 @@
                           },
                           "meta" : {
                             "globalKey" : "eae7f1c5"
-                          },
-                          "unadjustedDate" : "2001-07-13"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eae7f1c5"
@@ -206,6 +92,7 @@
                       },
                       "expirationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2005-09-27",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -214,53 +101,50 @@
                           },
                           "meta" : {
                             "globalKey" : "eb6226d3"
-                          },
-                          "unadjustedDate" : "2005-09-27"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eb6226d3"
                         }
                       },
-                      "expirationTimeType" : "CLOSE",
                       "latestExerciseTime" : {
+                        "hourMinuteTime" : "17:15:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "17:15:00"
-                      },
-                      "meta" : {
-                        "globalKey" : "260f119e"
+                        }
                       },
+                      "expirationTimeType" : "Close",
                       "multipleExercise" : {
                         "integralMultipleAmount" : 1,
                         "minimumNumberOfOptions" : 1,
                         "maximumNumberOfOptions" : 150000
+                      },
+                      "meta" : {
+                        "globalKey" : "260f119e"
                       }
                     }
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 32.00,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "value" : 32.00,
                       "perUnitOf" : {
-                        "financialUnit" : "SHARE"
+                        "financialUnit" : "Share"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
+                    }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "1f6affff"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -273,149 +157,265 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "9876f5ef"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "9876f5ef"
+              }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "b94c9d1"
+            "globalKey" : "b1dc3b51"
           }
         },
         "meta" : {
-          "globalKey" : "b94c9d1"
+          "globalKey" : "b1dc3b51"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "23fc586c"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "87c27b06"
+          "quantity" : [ {
+            "value" : {
+              "value" : 150000,
+              "unit" : {
+                "financialUnit" : "Contract"
+              },
+              "multiplier" : {
+                "value" : 1.00,
+                "unit" : {
+                  "financialUnit" : "Share"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "STM-FP",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : "STM-FP"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "78e02f1b"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "STMicroelectronics N.V. ordinary shares"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "12ca7141"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "CONTRACT"
+                }
               },
-              "value" : 150000,
-              "multiplier" : {
-                "unit" : {
-                  "financialUnit" : "SHARE"
-                },
-                "value" : 1.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "708ce5ba"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "10bcc820"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e89cd"
-      },
-      "value" : "2001-07-13"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "2092c901"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "6234330c"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "5c52b112"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "f53c9af4"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 405000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "value" : 405000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-07-17",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-07-17"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "805c5fcc"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "6fbfb05e"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqd-ex04-european-call-index-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqd-ex04-european-call-index-long-form.json
index fd8a1592ee..94ac35cbdd 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqd-ex04-european-call-index-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqd-ex04-european-call-index-long-form.json
@@ -1,109 +1,33 @@
 {
-  "meta" : {
-    "globalKey" : "853af91c"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "6b41335a"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "baf16b25"
-      }
-    },
-    "meta" : {
-      "globalKey" : "c51819da"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyB.com/eqd-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "9591fab6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-09-04",
+      "meta" : {
+        "globalKey" : "3e8a44"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Option:PriceReturnBasicPerformance:SingleIndex"
@@ -114,68 +38,37 @@
             "productQualifier" : "EquityOption_PriceReturnBasicPerformance_Index"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "indexAdjustmentEvents" : {
-                "indexCancellation" : "CANCELLATION_AND_PAYMENT",
-                "indexDisruption" : "CALCULATION_AGENT_ADJUSTMENT",
-                "indexModification" : "CALCULATION_AGENT_ADJUSTMENT"
-              },
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "indexDisclaimer" : true,
-                "nonReliance" : true
-              }
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "c9d386b6"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "a55e2c43"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "CHF"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "994a10b7"
+                          "globalKey" : "2c4c46fb"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
                         "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
                           "externalReference" : "valuation"
@@ -183,25 +76,24 @@
                       }
                     },
                     "meta" : {
-                      "globalKey" : "994a10b7"
+                      "globalKey" : "2c4c46fb"
                     }
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "38606287"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2004-12-19",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -210,8 +102,7 @@
                           },
                           "meta" : {
                             "globalKey" : "eb46d18b"
-                          },
-                          "unadjustedDate" : "2004-12-19"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eb46d18b"
@@ -225,23 +116,24 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 8700,
                       "unit" : {
                         "currency" : {
                           "value" : "CHF"
                         }
                       },
-                      "value" : 8700,
                       "perUnitOf" : {
-                        "financialUnit" : "INDEX_UNIT"
+                        "financialUnit" : "IndexUnit"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
+                    }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "c9d386b6"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "index" : {
                     "productIdentifier" : [ {
@@ -259,146 +151,254 @@
                   "meta" : {
                     "globalKey" : "0"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "5a4ea8dc"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "5a4ea8dc"
+              }
+            },
+            "extraordinaryEvents" : {
+              "indexAdjustmentEvents" : {
+                "indexModification" : "CalculationAgentAdjustment",
+                "indexCancellation" : "CancellationAndPayment",
+                "indexDisruption" : "CalculationAgentAdjustment"
+              },
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "indexDisclaimer" : true,
+                "additionalAcknowledgements" : true
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "18d34d8d"
+            "globalKey" : "7505acf5"
           }
         },
         "meta" : {
-          "globalKey" : "18d34d8d"
+          "globalKey" : "7505acf5"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "8b69ee51"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "cf29f49a"
+          "quantity" : [ {
+            "value" : {
+              "value" : 2500,
+              "unit" : {
+                "financialUnit" : "Contract"
+              },
+              "multiplier" : {
+                "value" : 1.00,
+                "unit" : {
+                  "financialUnit" : "IndexUnit"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : ".SSMI",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : ".SSMI"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "e929c01a"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "Swiss Market Index"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "97ddb474"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "CONTRACT"
+                }
               },
-              "value" : 2500,
-              "multiplier" : {
-                "unit" : {
-                  "financialUnit" : "INDEX_UNIT"
-                },
-                "value" : 1.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "16149ea6"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "ae56649d"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e8a44"
-      },
-      "value" : "2001-09-04"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/eqd-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "6b41335a"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "1b2141ce"
+        "globalKey" : "baf16b25"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "eeff9c6"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "f7fe1c2"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 300000,
         "unit" : {
           "currency" : {
             "value" : "CHF"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "value" : 300000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-09-06",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-09-06"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "8b9b3488"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "27a688ce"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex01-single-underlyer-execution-long-form-other-party.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex01-single-underlyer-execution-long-form-other-party.json
index feb0c8dda8..c6f5bbe1a7 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex01-single-underlyer-execution-long-form-other-party.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex01-single-underlyer-execution-long-form-other-party.json
@@ -1,134 +1,50 @@
 {
-  "meta" : {
-    "globalKey" : "5125b2db"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "6234",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/eqs-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
       "meta" : {
-        "globalKey" : "92c7c587"
+        "globalKey" : "9593cc32"
       }
-    },
-    "meta" : {
-      "globalKey" : "5125b2db"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "6569",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/eqs-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party3",
-        "globalKey" : "33f59569"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party C"
-        },
-        "meta" : {
-          "globalKey" : "33f59569"
-        }
-      } ]
+        "globalKey" : "95944c36"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-09-24",
+      "meta" : {
+        "globalKey" : "3e8a58",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "EXECUTION",
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party3",
-          "globalReference" : "33f59569"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party3",
-          "globalReference" : "33f59569"
-        } ],
-        "role" : "EXTRAORDINARY_DIVIDENDS_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party3",
-          "globalReference" : "33f59569"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleName"
@@ -139,313 +55,305 @@
             "productQualifier" : "EquitySwap_TotalReturnBasicPerformance_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
-              "meta" : {
-                "externalKey" : "EffectiveDate",
-                "globalKey" : "6a2df5e0"
-              },
               "relativeDate" : {
+                "periodMultiplier" : 3,
+                "period" : "D",
                 "meta" : {
-                  "globalKey" : "6a2df5e0"
+                  "globalKey" : "fed6ed42"
                 },
-                "period" : "D",
-                "periodMultiplier" : 3,
-                "dayType" : "EXCHANGE_BUSINESS",
-                "businessDayConvention" : "NOT_APPLICABLE",
+                "dayType" : "ExchangeBusiness",
+                "businessDayConvention" : "NotApplicable",
                 "dateRelativeTo" : {
-                  "externalReference" : "TradeDate",
-                  "globalReference" : "3e8a58"
+                  "globalReference" : "3e8a58",
+                  "externalReference" : "TradeDate"
                 }
+              },
+              "meta" : {
+                "globalKey" : "fed6ed42",
+                "externalKey" : "EffectiveDate"
               }
             },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "edf02740"
+                },
+                "businessDayConvention" : "NotApplicable",
+                "dateRelativeTo" : {
+                  "globalReference" : "bb917ef4",
+                  "externalReference" : "FinalEquityPaymentDate"
+                }
               },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
+              "meta" : {
+                "globalKey" : "edf02740",
+                "externalKey" : "TerminationDate"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "607b91fd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "EquityNotionalAmount",
-                    "globalReference" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "EquityNotionalAmount"
+                  },
+                  "meta" : {
+                    "globalKey" : "607b91fd"
+                  }
+                },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "globalKey" : "6a2df5e0"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 3,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "6a2df5e0"
+                        "globalKey" : "fed6ed42"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 3,
-                      "dayType" : "EXCHANGE_BUSINESS",
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "dayType" : "ExchangeBusiness",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "TradeDate",
-                        "globalReference" : "3e8a58"
+                        "globalReference" : "3e8a58",
+                        "externalReference" : "TradeDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "fed6ed42"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "InterestLegPeriodDates",
-                    "globalKey" : "8fbb2a68"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "globalKey" : "f18f7c48"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "f18f7c48"
+                        "globalKey" : "edf02740"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "FinalEquityPaymentDate",
-                        "globalReference" : "ad48d812"
+                        "globalReference" : "bb917ef4",
+                        "externalReference" : "FinalEquityPaymentDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "edf02740"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f0f22bbe",
+                    "externalKey" : "InterestLegPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "f5120739"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "9b9d36de"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "9b9d36de"
-                      },
                       "relativeDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "9b9d36de"
+                          "globalKey" : "97fde1d6"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "dateRelativeTo" : {
-                          "externalReference" : "EquityPaymentDate",
-                          "globalReference" : "48d79a64"
+                          "globalReference" : "56b8bd08",
+                          "externalReference" : "EquityPaymentDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "97fde1d6"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97fde1d6"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "InterestLegPeriodDates",
-                    "globalReference" : "8fbb2a68"
+                    "globalReference" : "f0f22bbe",
+                    "externalReference" : "InterestLegPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "9e9ada33"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "92fd2d87"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "daf6cbc2"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "EquityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "EquityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "4841e309"
-                },
-                "paymentDates" : {
                   "meta" : {
-                    "externalKey" : "EquityPaymentDate",
-                    "globalKey" : "48d79a64"
-                  },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "externalKey" : "FinalEquityPaymentDate",
-                        "globalKey" : "ad48d812"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "ad48d812"
+                    "globalKey" : "7610bbd9"
+                  }
+                },
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "adjustableDates" : {
+                        "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ],
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessCentersReference" : {
-                          "externalReference" : "PrimaryBusinessCenter",
-                          "globalReference" : "27e4e9"
+                        "meta" : {
+                          "globalKey" : "e80e5233"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "e80e5233",
+                        "externalKey" : "InterimValuationDate"
+                      }
+                    },
+                    "valuationTimeType" : "Close",
+                    "meta" : {
+                      "globalKey" : "374dddc6"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2002-09-24",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
                         },
-                        "businessDayConvention" : "FOLLOWING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "FinalValuationDate",
-                          "globalReference" : "252ee503"
+                        "meta" : {
+                          "globalKey" : "252ee503"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "252ee503",
+                        "externalKey" : "FinalValuationDate"
                       }
                     },
+                    "meta" : {
+                      "globalKey" : "96fa6685"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "externalKey" : "InterimEquityPaymentDate",
-                        "globalKey" : "2519d1b6"
-                      },
                       "relativeDates" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "2519d1b6"
+                          "globalKey" : "dfe60714"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "PrimaryBusinessCenter",
-                            "globalKey" : "27e4e9"
+                            "globalKey" : "27e4e9",
+                            "externalKey" : "PrimaryBusinessCenter"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "InterimValuationDate",
-                          "globalReference" : "e80e5233"
+                          "globalReference" : "e80e5233",
+                          "externalReference" : "InterimValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "dfe60714",
+                        "externalKey" : "InterimEquityPaymentDate"
                       }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendCurrency" : {
-                      "determinationMethod" : "DIVIDEND_CURRENCY"
-                    },
-                    "dividendEntitlement" : "EX_DATE",
-                    "dividendPayoutRatio" : [ {
-                      "totalRatio" : 1
                     } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "EQUITY_PAYMENT_DATE"
-                        }
-                      },
-                      "endDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "TerminationDate",
-                          "globalReference" : "f18f7c48"
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "bb917ef4"
+                        },
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "PrimaryBusinessCenter"
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "252ee503",
+                          "externalReference" : "FinalValuationDate"
                         }
                       },
-                      "startDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "TradeDate",
-                          "globalReference" : "3e8a58"
-                        }
+                      "meta" : {
+                        "globalKey" : "bb917ef4",
+                        "externalKey" : "FinalEquityPaymentDate"
                       }
-                    } ],
-                    "dividendReinvestment" : false,
-                    "excessDividendAmount" : "RECORD_AMOUNT",
-                    "extraordinaryDividendsParty" : "EXTRAORDINARY_DIVIDENDS_PARTY"
+                    }
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                  "meta" : {
+                    "globalKey" : "56b8bd08",
+                    "externalKey" : "EquityPaymentDate"
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -458,278 +366,370 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
-                    "meta" : {
-                      "globalKey" : "96fa6685"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "252ee503"
-                        },
-                        "unadjustedDate" : "2002-09-24"
-                      },
-                      "meta" : {
-                        "externalKey" : "FinalValuationDate",
-                        "globalKey" : "252ee503"
-                      }
-                    }
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
                   },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "374dddc6"
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 1
+                    } ],
+                    "dividendReinvestment" : false,
+                    "dividendEntitlement" : "ExDate",
+                    "extraordinaryDividendsParty" : "ExtraordinaryDividendsParty",
+                    "excessDividendAmount" : "RecordAmount",
+                    "dividendCurrency" : {
+                      "determinationMethod" : "DividendCurrency"
                     },
-                    "valuationDates" : {
-                      "adjustableDates" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "e80e5233"
-                        },
-                        "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ]
+                    "dividendPeriod" : [ {
+                      "startDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "3e8a58",
+                          "externalReference" : "TradeDate"
+                        }
                       },
-                      "meta" : {
-                        "externalKey" : "InterimValuationDate",
-                        "globalKey" : "e80e5233"
+                      "endDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "edf02740",
+                          "externalReference" : "TerminationDate"
+                        }
+                      },
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "EquityPaymentDate"
+                        }
                       }
-                    },
-                    "valuationTimeType" : "CLOSE"
+                    } ]
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "meta" : {
-                "externalKey" : "TerminationDate",
-                "globalKey" : "f18f7c48"
-              },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "f18f7c48"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NOT_APPLICABLE",
-                "dateRelativeTo" : {
-                  "externalReference" : "FinalEquityPaymentDate",
-                  "globalReference" : "ad48d812"
+                "meta" : {
+                  "globalKey" : "8595f65f"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "dd006266"
               }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "e8c8379a"
+            "globalKey" : "ece94628"
           }
         },
         "meta" : {
-          "globalKey" : "e8c8379a"
+          "globalKey" : "ece94628"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "417e440b"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "26bb033f"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.abc.com/instrumentId"
-                  },
-                  "value" : "SHPGY.O"
-                },
-                "meta" : {
-                  "globalKey" : "8c85a05e"
-                },
-                "source" : "OTHER"
-              }
-            }, {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
-                },
-                "meta" : {
-                  "globalKey" : "5518dd"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 37.44,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 37.44,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "AssetPrice"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 760400,
               "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 760400
-            }
-          }, {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 28469376,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 28469376
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "7dd9ec3"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d03"
-            },
-            "rateOption" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "SHPGY.O",
+                  "meta" : {
+                    "scheme" : "http://www.abc.com/instrumentId"
+                  }
+                },
+                "source" : "Other",
+                "meta" : {
+                  "globalKey" : "8c85a05e"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-LIBOR-BBA"
+                "identifier" : {
+                  "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
                 },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 1
+                "source" : "Name",
+                "meta" : {
+                  "globalKey" : "5518dd"
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "b0a564a1"
             }
           },
+          "meta" : {
+            "globalKey" : "b4fad14b"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
             "value" : {
+              "value" : 0.0020,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0020,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 1,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "82801f45"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "95c8caad"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59569",
+          "externalReference" : "party3"
         } ]
-      } ]
+      }, {
+        "role" : "ExtraordinaryDividendsParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59569",
+          "externalReference" : "party3"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59569",
+          "externalReference" : "party3"
+        } ]
+      } ],
+      "adjustment" : "Execution"
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e8a58"
-      },
-      "value" : "2001-09-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyA.com/eqs-trade-id"
-          },
-          "value" : "6234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "23a97ce8"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party C",
           "meta" : {
-            "scheme" : "http://www.partyB.com/eqs-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59569"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59569",
+        "externalKey" : "party3"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "6569"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "23d5334e"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "e1d7d593"
+    }
+  },
+  "meta" : {
+    "globalKey" : "e1d7d593"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex01-single-underlyer-execution-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex01-single-underlyer-execution-long-form.json
index 9f8fe5d481..85882a6fba 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex01-single-underlyer-execution-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex01-single-underlyer-execution-long-form.json
@@ -1,118 +1,50 @@
 {
-  "meta" : {
-    "globalKey" : "50a0c404"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "6234",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/eqs-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
       "meta" : {
-        "globalKey" : "92c7c587"
+        "globalKey" : "9593cc32"
       }
-    },
-    "meta" : {
-      "globalKey" : "50a0c404"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "6569",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/eqs-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "95944c36"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-09-24",
+      "meta" : {
+        "globalKey" : "3e8a58",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "EXECUTION",
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "EXTRAORDINARY_DIVIDENDS_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleName"
@@ -123,313 +55,305 @@
             "productQualifier" : "EquitySwap_TotalReturnBasicPerformance_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
-              "meta" : {
-                "externalKey" : "EffectiveDate",
-                "globalKey" : "6a2df5e0"
-              },
               "relativeDate" : {
+                "periodMultiplier" : 3,
+                "period" : "D",
                 "meta" : {
-                  "globalKey" : "6a2df5e0"
+                  "globalKey" : "fed6ed42"
                 },
-                "period" : "D",
-                "periodMultiplier" : 3,
-                "dayType" : "EXCHANGE_BUSINESS",
-                "businessDayConvention" : "NOT_APPLICABLE",
+                "dayType" : "ExchangeBusiness",
+                "businessDayConvention" : "NotApplicable",
                 "dateRelativeTo" : {
-                  "externalReference" : "TradeDate",
-                  "globalReference" : "3e8a58"
+                  "globalReference" : "3e8a58",
+                  "externalReference" : "TradeDate"
                 }
+              },
+              "meta" : {
+                "globalKey" : "fed6ed42",
+                "externalKey" : "EffectiveDate"
               }
             },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "edf02740"
+                },
+                "businessDayConvention" : "NotApplicable",
+                "dateRelativeTo" : {
+                  "globalReference" : "bb917ef4",
+                  "externalReference" : "FinalEquityPaymentDate"
+                }
               },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
+              "meta" : {
+                "globalKey" : "edf02740",
+                "externalKey" : "TerminationDate"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "607b91fd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "EquityNotionalAmount",
-                    "globalReference" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "EquityNotionalAmount"
+                  },
+                  "meta" : {
+                    "globalKey" : "607b91fd"
+                  }
+                },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "globalKey" : "6a2df5e0"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 3,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "6a2df5e0"
+                        "globalKey" : "fed6ed42"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 3,
-                      "dayType" : "EXCHANGE_BUSINESS",
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "dayType" : "ExchangeBusiness",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "TradeDate",
-                        "globalReference" : "3e8a58"
+                        "globalReference" : "3e8a58",
+                        "externalReference" : "TradeDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "fed6ed42"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "InterestLegPeriodDates",
-                    "globalKey" : "8fbb2a68"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "globalKey" : "f18f7c48"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "f18f7c48"
+                        "globalKey" : "edf02740"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "FinalEquityPaymentDate",
-                        "globalReference" : "ad48d812"
+                        "globalReference" : "bb917ef4",
+                        "externalReference" : "FinalEquityPaymentDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "edf02740"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f0f22bbe",
+                    "externalKey" : "InterestLegPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "f5120739"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "9b9d36de"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "9b9d36de"
-                      },
                       "relativeDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "9b9d36de"
+                          "globalKey" : "97fde1d6"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "dateRelativeTo" : {
-                          "externalReference" : "EquityPaymentDate",
-                          "globalReference" : "48d79a64"
+                          "globalReference" : "56b8bd08",
+                          "externalReference" : "EquityPaymentDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "97fde1d6"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97fde1d6"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "InterestLegPeriodDates",
-                    "globalReference" : "8fbb2a68"
+                    "globalReference" : "f0f22bbe",
+                    "externalReference" : "InterestLegPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "9e9ada33"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "92fd2d87"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "daf6cbc2"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "EquityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "EquityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "4841e309"
-                },
-                "paymentDates" : {
                   "meta" : {
-                    "externalKey" : "EquityPaymentDate",
-                    "globalKey" : "48d79a64"
-                  },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "externalKey" : "FinalEquityPaymentDate",
-                        "globalKey" : "ad48d812"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "ad48d812"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessCentersReference" : {
-                          "externalReference" : "PrimaryBusinessCenter",
-                          "globalReference" : "27e4e9"
+                    "globalKey" : "7610bbd9"
+                  }
+                },
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "adjustableDates" : {
+                        "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ],
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
                         },
-                        "businessDayConvention" : "FOLLOWING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "FinalValuationDate",
-                          "globalReference" : "252ee503"
+                        "meta" : {
+                          "globalKey" : "e80e5233"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "e80e5233",
+                        "externalKey" : "InterimValuationDate"
                       }
                     },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "externalKey" : "InterimEquityPaymentDate",
-                        "globalKey" : "2519d1b6"
-                      },
+                    "valuationTimeType" : "Close",
+                    "meta" : {
+                      "globalKey" : "374dddc6"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2002-09-24",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "252ee503"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "252ee503",
+                        "externalKey" : "FinalValuationDate"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "96fa6685"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
                       "relativeDates" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "2519d1b6"
+                          "globalKey" : "dfe60714"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "PrimaryBusinessCenter",
-                            "globalKey" : "27e4e9"
+                            "globalKey" : "27e4e9",
+                            "externalKey" : "PrimaryBusinessCenter"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "InterimValuationDate",
-                          "globalReference" : "e80e5233"
+                          "globalReference" : "e80e5233",
+                          "externalReference" : "InterimValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "dfe60714",
+                        "externalKey" : "InterimEquityPaymentDate"
                       }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendCurrency" : {
-                      "determinationMethod" : "DIVIDEND_CURRENCY"
-                    },
-                    "dividendEntitlement" : "EX_DATE",
-                    "dividendPayoutRatio" : [ {
-                      "totalRatio" : 1
                     } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "EQUITY_PAYMENT_DATE"
-                        }
-                      },
-                      "endDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "TerminationDate",
-                          "globalReference" : "f18f7c48"
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "bb917ef4"
+                        },
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "PrimaryBusinessCenter"
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "252ee503",
+                          "externalReference" : "FinalValuationDate"
                         }
                       },
-                      "startDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "TradeDate",
-                          "globalReference" : "3e8a58"
-                        }
+                      "meta" : {
+                        "globalKey" : "bb917ef4",
+                        "externalKey" : "FinalEquityPaymentDate"
                       }
-                    } ],
-                    "dividendReinvestment" : false,
-                    "excessDividendAmount" : "RECORD_AMOUNT",
-                    "extraordinaryDividendsParty" : "EXTRAORDINARY_DIVIDENDS_PARTY"
+                    }
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                  "meta" : {
+                    "globalKey" : "56b8bd08",
+                    "externalKey" : "EquityPaymentDate"
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -442,278 +366,354 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
-                    "meta" : {
-                      "globalKey" : "96fa6685"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "252ee503"
-                        },
-                        "unadjustedDate" : "2002-09-24"
-                      },
-                      "meta" : {
-                        "externalKey" : "FinalValuationDate",
-                        "globalKey" : "252ee503"
-                      }
-                    }
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
                   },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "374dddc6"
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 1
+                    } ],
+                    "dividendReinvestment" : false,
+                    "dividendEntitlement" : "ExDate",
+                    "extraordinaryDividendsParty" : "ExtraordinaryDividendsParty",
+                    "excessDividendAmount" : "RecordAmount",
+                    "dividendCurrency" : {
+                      "determinationMethod" : "DividendCurrency"
                     },
-                    "valuationDates" : {
-                      "adjustableDates" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "e80e5233"
-                        },
-                        "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ]
+                    "dividendPeriod" : [ {
+                      "startDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "3e8a58",
+                          "externalReference" : "TradeDate"
+                        }
                       },
-                      "meta" : {
-                        "externalKey" : "InterimValuationDate",
-                        "globalKey" : "e80e5233"
+                      "endDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "edf02740",
+                          "externalReference" : "TerminationDate"
+                        }
+                      },
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "EquityPaymentDate"
+                        }
                       }
-                    },
-                    "valuationTimeType" : "CLOSE"
+                    } ]
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "meta" : {
-                "externalKey" : "TerminationDate",
-                "globalKey" : "f18f7c48"
-              },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "f18f7c48"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NOT_APPLICABLE",
-                "dateRelativeTo" : {
-                  "externalReference" : "FinalEquityPaymentDate",
-                  "globalReference" : "ad48d812"
+                "meta" : {
+                  "globalKey" : "8595f65f"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "dd006266"
               }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "e8c8379a"
+            "globalKey" : "ece94628"
           }
         },
         "meta" : {
-          "globalKey" : "e8c8379a"
+          "globalKey" : "ece94628"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "417e440b"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "26bb033f"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.abc.com/instrumentId"
-                  },
-                  "value" : "SHPGY.O"
-                },
-                "meta" : {
-                  "globalKey" : "8c85a05e"
-                },
-                "source" : "OTHER"
-              }
-            }, {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
-                },
-                "meta" : {
-                  "globalKey" : "5518dd"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 37.44,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 37.44,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "AssetPrice"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 760400,
               "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 760400
-            }
-          }, {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 28469376,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 28469376
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "7dd9ec3"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d03"
-            },
-            "rateOption" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "SHPGY.O",
+                  "meta" : {
+                    "scheme" : "http://www.abc.com/instrumentId"
+                  }
+                },
+                "source" : "Other",
+                "meta" : {
+                  "globalKey" : "8c85a05e"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-LIBOR-BBA"
+                "identifier" : {
+                  "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
                 },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 1
+                "source" : "Name",
+                "meta" : {
+                  "globalKey" : "5518dd"
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "b0a564a1"
             }
           },
+          "meta" : {
+            "globalKey" : "b4fad14b"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
             "value" : {
+              "value" : 0.0020,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0020,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
             }
-          } ]
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 1,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "82801f45"
+            }
+          },
+          "meta" : {
+            "globalKey" : "95c8caad"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e8a58"
-      },
-      "value" : "2001-09-24"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "ExtraordinaryDividendsParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      } ],
+      "adjustment" : "Execution"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/eqs-trade-id"
-          },
-          "value" : "6234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "23a97ce8"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/eqs-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "6569"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "23d5334e"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "215e4a0a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "215e4a0a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex06-single-index-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex06-single-index-long-form.json
index 813fd86882..98a5c14d06 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex06-single-index-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex06-single-index-long-form.json
@@ -1,112 +1,50 @@
 {
-  "meta" : {
-    "globalKey" : "e7f16c81"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1734",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/eqs-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
       "meta" : {
-        "globalKey" : "92c7c587"
+        "globalKey" : "9591991c"
       }
-    },
-    "meta" : {
-      "globalKey" : "e7f16c81"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "5648",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/eqs-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9593db59"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-07-19",
+      "meta" : {
+        "globalKey" : "3e91d3",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleIndex"
@@ -117,249 +55,256 @@
             "productQualifier" : "EquitySwap_PriceReturnBasicPerformance_Index"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
-              "meta" : {
-                "externalKey" : "EffectiveDate",
-                "globalKey" : "6a2df5e0"
-              },
               "relativeDate" : {
+                "periodMultiplier" : 3,
+                "period" : "D",
                 "meta" : {
-                  "globalKey" : "6a2df5e0"
+                  "globalKey" : "fed6ed42"
                 },
-                "period" : "D",
-                "periodMultiplier" : 3,
-                "dayType" : "EXCHANGE_BUSINESS",
-                "businessDayConvention" : "NOT_APPLICABLE",
+                "dayType" : "ExchangeBusiness",
+                "businessDayConvention" : "NotApplicable",
                 "dateRelativeTo" : {
-                  "externalReference" : "TradeDate",
-                  "globalReference" : "3e91d3"
+                  "globalReference" : "3e91d3",
+                  "externalReference" : "TradeDate"
                 }
+              },
+              "meta" : {
+                "globalKey" : "fed6ed42",
+                "externalKey" : "EffectiveDate"
               }
             },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "indexAdjustmentEvents" : {
-                "indexCancellation" : "CANCELLATION_AND_PAYMENT",
-                "indexDisruption" : "CALCULATION_AGENT_ADJUSTMENT",
-                "indexModification" : "CALCULATION_AGENT_ADJUSTMENT"
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "edf02740"
+                },
+                "businessDayConvention" : "NotApplicable",
+                "dateRelativeTo" : {
+                  "globalReference" : "bb917ef4",
+                  "externalReference" : "FinalEquityPaymentDate"
+                }
               },
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "indexDisclaimer" : true,
-                "nonReliance" : true
+              "meta" : {
+                "globalKey" : "edf02740",
+                "externalKey" : "TerminationDate"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "607b91fd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "EquityNotionalAmount",
-                    "globalReference" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "EquityNotionalAmount"
+                  },
+                  "meta" : {
+                    "globalKey" : "607b91fd"
+                  }
+                },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "globalKey" : "6a2df5e0"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 3,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "6a2df5e0"
+                        "globalKey" : "fed6ed42"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 3,
-                      "dayType" : "EXCHANGE_BUSINESS",
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "dayType" : "ExchangeBusiness",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "TradeDate",
-                        "globalReference" : "3e91d3"
+                        "globalReference" : "3e91d3",
+                        "externalReference" : "TradeDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "fed6ed42"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "InterestLegPeriodDates",
-                    "globalKey" : "8fbb2a68"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "globalKey" : "f18f7c48"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "f18f7c48"
+                        "globalKey" : "edf02740"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "FinalEquityPaymentDate",
-                        "globalReference" : "ad48d812"
+                        "globalReference" : "bb917ef4",
+                        "externalReference" : "FinalEquityPaymentDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "edf02740"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f0f22bbe",
+                    "externalKey" : "InterestLegPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "f5120739"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "9b9d36de"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "9b9d36de"
-                      },
                       "relativeDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "9b9d36de"
+                          "globalKey" : "97fde1d6"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "dateRelativeTo" : {
-                          "externalReference" : "EquityPaymentDate",
-                          "globalReference" : "fe9d6c44"
+                          "globalReference" : "94f84ae8",
+                          "externalReference" : "EquityPaymentDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "97fde1d6"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97fde1d6"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "InterestLegPeriodDates",
-                    "globalReference" : "8fbb2a68"
+                    "globalReference" : "f0f22bbe",
+                    "externalReference" : "InterestLegPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "9e9ada33"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "92fd2d87"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "7052978"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "EquityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "EquityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "76108015"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "3b5f4b7f"
-                },
-                "paymentDates" : {
                   "meta" : {
-                    "externalKey" : "EquityPaymentDate",
-                    "globalKey" : "fe9d6c44"
-                  },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "externalKey" : "FinalEquityPaymentDate",
-                        "globalKey" : "ad48d812"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "ad48d812"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessCentersReference" : {
-                          "externalReference" : "PrimaryBusinessCenter",
-                          "globalReference" : "41619c9"
+                    "globalKey" : "76108015"
+                  }
+                },
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "adjustableDates" : {
+                        "unadjustedDate" : [ "2002-10-21", "2004-01-20", "2004-04-22" ],
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
                         },
-                        "businessDayConvention" : "FOLLOWING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "FinalValuationDate",
-                          "globalReference" : "25690940"
+                        "meta" : {
+                          "globalKey" : "60230b82"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "60230b82",
+                        "externalKey" : "InterimValuationDate"
                       }
                     },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "externalKey" : "InterimEquityPaymentDate",
-                        "globalKey" : "d32f1716"
-                      },
-                      "relativeDates" : {
-                        "meta" : {
-                          "globalKey" : "d32f1716"
-                        },
-                        "period" : "D",
+                    "valuationTimeType" : "Close",
+                    "meta" : {
+                      "globalKey" : "abc4da15"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2004-07-21",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "25690940"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "25690940",
+                        "externalKey" : "FinalValuationDate"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "97348ac2"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
+                      "relativeDates" : {
                         "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "bc36cf4"
+                        },
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -367,22 +312,47 @@
                             "value" : "HKHK"
                           } ],
                           "meta" : {
-                            "externalKey" : "PrimaryBusinessCenter",
-                            "globalKey" : "41619c9"
+                            "globalKey" : "41619c9",
+                            "externalKey" : "PrimaryBusinessCenter"
                           }
                         },
+                        "dateRelativeTo" : {
+                          "globalReference" : "60230b82",
+                          "externalReference" : "InterimValuationDate"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "bc36cf4",
+                        "externalKey" : "InterimEquityPaymentDate"
+                      }
+                    } ],
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "bb917ef4"
+                        },
+                        "dayType" : "CurrencyBusiness",
                         "businessDayConvention" : "FOLLOWING",
+                        "businessCentersReference" : {
+                          "globalReference" : "41619c9",
+                          "externalReference" : "PrimaryBusinessCenter"
+                        },
                         "dateRelativeTo" : {
-                          "externalReference" : "InterimValuationDate",
-                          "globalReference" : "60230b82"
+                          "globalReference" : "25690940",
+                          "externalReference" : "FinalValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "bb917ef4",
+                        "externalKey" : "FinalEquityPaymentDate"
                       }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "priceReturnTerms" : {
-                    "returnType" : "PRICE"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "94f84ae8",
+                    "externalKey" : "EquityPaymentDate"
                   }
                 },
                 "underlier" : {
@@ -403,262 +373,292 @@
                     "globalKey" : "0"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
-                    "meta" : {
-                      "globalKey" : "97348ac2"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "25690940"
-                        },
-                        "unadjustedDate" : "2004-07-21"
-                      },
-                      "meta" : {
-                        "externalKey" : "FinalValuationDate",
-                        "globalKey" : "25690940"
-                      }
-                    }
-                  },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "abc4da15"
-                    },
-                    "valuationDates" : {
-                      "adjustableDates" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "60230b82"
-                        },
-                        "unadjustedDate" : [ "2002-10-21", "2004-01-20", "2004-04-22" ]
-                      },
-                      "meta" : {
-                        "externalKey" : "InterimValuationDate",
-                        "globalKey" : "60230b82"
-                      }
-                    },
-                    "valuationTimeType" : "CLOSE"
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Price"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "71da68d1"
                 }
-              } ]
-            },
-            "terminationDate" : {
+              } ],
               "meta" : {
-                "externalKey" : "TerminationDate",
-                "globalKey" : "f18f7c48"
+                "globalKey" : "a3744f98"
+              }
+            },
+            "extraordinaryEvents" : {
+              "indexAdjustmentEvents" : {
+                "indexModification" : "CalculationAgentAdjustment",
+                "indexCancellation" : "CancellationAndPayment",
+                "indexDisruption" : "CalculationAgentAdjustment"
               },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "f18f7c48"
-                },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NOT_APPLICABLE",
-                "dateRelativeTo" : {
-                  "externalReference" : "FinalEquityPaymentDate",
-                  "globalReference" : "ad48d812"
-                }
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "indexDisclaimer" : true,
+                "additionalAcknowledgements" : true
               }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "a001589b"
+            "globalKey" : "a9a425a7"
           }
         },
         "meta" : {
-          "globalKey" : "a001589b"
+          "globalKey" : "a9a425a7"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "97d7155c"
-          },
-          "observable" : {
+          "price" : [ {
+            "value" : {
+              "value" : 5591987.41,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              },
+              "perUnitOf" : {
+                "financialUnit" : "Share"
+              },
+              "priceType" : "AssetPrice"
+            },
             "meta" : {
-              "globalKey" : "2a77a29d"
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 5591987.41,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : ".FCHI",
                   "meta" : {
                     "scheme" : "http://www.example.com/instrumentId"
-                  },
-                  "value" : ".FCHI"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "e9239a9c"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "France CAC 40 Index"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "136fbb9"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "247cb103"
+            }
           },
+          "meta" : {
+            "globalKey" : "adf9eb9c"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0050,
               "unit" : {
                 "currency" : {
-                  "value" : "EUR"
+                  "value" : "USD"
                 }
               },
-              "value" : 5591987.41,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "currency" : {
+                  "value" : "USD"
+                }
               },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-2"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 5591987.41
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "66d6e451"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e0e"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Telerate"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 0.0050,
-              "arithmeticOperator" : "ADD",
-              "perUnitOf" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "priceType" : "INTEREST_RATE"
+            "meta" : {
+              "globalKey" : "2bba16de"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "a801e789"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e91d3"
-      },
-      "value" : "2002-07-19"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/eqs-trade-id"
-          },
-          "value" : "1734"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "1b67b752"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/eqs-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "5648"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "222d85b1"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "6c093b63"
+    }
+  },
+  "meta" : {
+    "globalKey" : "6c093b63"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex09-compounding-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex09-compounding-swap.json
index f73f1e4cbe..b963b579e1 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex09-compounding-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex09-compounding-swap.json
@@ -1,104 +1,29 @@
 {
-  "meta" : {
-    "globalKey" : "fc959e48"
-  },
   "trade" : {
-    "collateral" : {
-      "independentAmount" : {
-        "payerPartyReference" : {
-          "externalReference" : "BankA",
-          "globalReference" : "3cfd165"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "BankB",
-          "globalReference" : "3cfd166"
-        },
-        "paymentDetail" : [ {
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "3cfd166",
+        "externalReference" : "BankB"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "TRADEABC",
           "meta" : {
-            "globalKey" : "a93dc25d"
-          },
-          "paymentRule" : {
-            "percentageRule" : {
-              "notionalAmountReference" : {
-                "externalReference" : "equityNotionalAmount",
-                "globalReference" : "4cf"
-              },
-              "paymentPercent" : 0.02
-            }
-          }
-        } ]
-      }
-    },
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2002-06-20",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "EQUITY_AMERICAS"
-            }
+            "scheme" : "TradeRefNbr"
           }
-        },
-        "meta" : {
-          "globalKey" : "d2d845bd"
         }
       } ],
       "meta" : {
-        "globalKey" : "d2d845bd"
+        "globalKey" : "f6c3958"
       }
-    },
-    "meta" : {
-      "globalKey" : "fc959e48"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "BankB",
-        "globalKey" : "3cfd166"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "DTCC"
-          },
-          "value" : "BankB"
-        },
-        "meta" : {
-          "globalKey" : "3cfd166"
-        }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "BankA",
-        "globalKey" : "3cfd165"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "DTCC"
-          },
-          "value" : "BankA"
-        },
-        "meta" : {
-          "globalKey" : "3cfd165"
-        }
-      } ]
     } ],
+    "tradeDate" : {
+      "value" : "2008-01-01",
+      "meta" : {
+        "globalKey" : "3ec041"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "BankA",
-          "globalReference" : "3cfd165"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "BankB",
-          "globalReference" : "3cfd166"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -108,6 +33,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2008-01-01",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -116,218 +42,255 @@
                 },
                 "meta" : {
                   "globalKey" : "ebb45b39"
+                }
+              },
+              "meta" : {
+                "globalKey" : "ebb45b39",
+                "externalKey" : "equityEffectiveDate"
+              }
+            },
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "ea96b216"
                 },
-                "unadjustedDate" : "2008-01-01"
+                "businessDayConvention" : "NONE",
+                "dateRelativeTo" : {
+                  "globalReference" : "7e0a5d94",
+                  "externalReference" : "finalCashSettlementPaymentDate"
+                }
               },
               "meta" : {
-                "externalKey" : "equityEffectiveDate",
-                "globalKey" : "ebb45b39"
+                "globalKey" : "ea96b216"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "54b65ddd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "equityNotionalAmount",
-                    "globalReference" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "equityNotionalAmount"
+                  },
+                  "meta" : {
+                    "globalKey" : "54b65ddd"
                   }
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0",
+                      "externalKey" : "floatingRateCalculation"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "globalKey" : "49d4d2ac"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "49d4d2ac"
+                        "globalKey" : "46357da4"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
                       "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "equityEffectiveDate",
-                        "globalReference" : "ebb45b39"
+                        "globalReference" : "ebb45b39",
+                        "externalReference" : "equityEffectiveDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "46357da4"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalculationPeriodDates",
-                    "globalKey" : "2ffb1af2"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "globalKey" : "ee36071e"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "ee36071e"
+                        "globalKey" : "ea96b216"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
                       "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "finalCashSettlementPaymentDate",
-                        "globalReference" : "e9616632"
+                        "globalReference" : "7e0a5d94",
+                        "externalReference" : "finalCashSettlementPaymentDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "ea96b216"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "adeb53f2",
+                    "externalKey" : "floatingCalculationPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "ba63673e"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "25f944ac"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
                       "adjustableDates" : {
+                        "unadjustedDate" : [ "2009-01-01" ],
                         "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
                             "globalKey" : "3a4b88ab"
                           }
                         },
                         "meta" : {
                           "globalKey" : "25f944ac"
-                        },
-                        "unadjustedDate" : [ "2009-01-01" ]
+                        }
                       },
                       "meta" : {
                         "globalKey" : "25f944ac"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "externalKey" : "floatingRateCalculation",
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "25f944ac"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalculationPeriodDates",
-                    "globalReference" : "2ffb1af2"
+                    "globalReference" : "adeb53f2",
+                    "externalReference" : "floatingCalculationPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "c446e854"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c831edf2"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "bd66f61"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "equityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "equityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "14966"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
+                  },
+                  "meta" : {
+                    "globalKey" : "14966"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "23caf5a3"
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "adjustableDates" : {
+                        "unadjustedDate" : [ "2009-01-01" ],
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "25f944ac"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "25f944ac"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "f85ffd21",
+                      "externalKey" : "equityValuationDates"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "ValuationTime",
+                    "meta" : {
+                      "globalKey" : "524b126b"
+                    }
+                  }
                 },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "CashSettlementPaymentDate",
-                    "globalKey" : "1b5a7a64"
-                  },
                   "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "externalKey" : "finalCashSettlementPaymentDate",
-                        "globalKey" : "e9616632"
-                      },
-                      "relativeDate" : {
+                    "interimPaymentDates" : [ {
+                      "relativeDates" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "e9616632"
+                          "globalKey" : "7e0a5d94"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
                         "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "equityValuationDates",
-                          "globalReference" : "f85ffd21"
+                          "globalReference" : "f85ffd21",
+                          "externalReference" : "equityValuationDates"
                         }
-                      }
-                    },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "e9616632"
                       },
-                      "relativeDates" : {
+                      "meta" : {
+                        "globalKey" : "7e0a5d94"
+                      }
+                    } ],
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "e9616632"
+                          "globalKey" : "7e0a5d94"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
                         "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "equityValuationDates",
-                          "globalReference" : "f85ffd21"
+                          "globalReference" : "f85ffd21",
+                          "externalReference" : "equityValuationDates"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "7e0a5d94",
+                        "externalKey" : "finalCashSettlementPaymentDate"
                       }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "priceReturnTerms" : {
-                    "returnType" : "PRICE"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "e5f7e728",
+                    "externalKey" : "CashSettlementPaymentDate"
                   }
                 },
                 "underlier" : {
@@ -343,219 +306,256 @@
                     "globalKey" : "0"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "524b126b"
-                    }
-                  },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "externalKey" : "equityValuationDates",
-                      "globalKey" : "f85ffd21"
-                    },
-                    "valuationDates" : {
-                      "adjustableDates" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "25f944ac"
-                        },
-                        "unadjustedDate" : [ "2009-01-01" ]
-                      },
-                      "meta" : {
-                        "globalKey" : "25f944ac"
-                      }
-                    }
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Price"
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "meta" : {
-                "globalKey" : "ee36071e"
-              },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "ee36071e"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NONE",
-                "dateRelativeTo" : {
-                  "externalReference" : "finalCashSettlementPaymentDate",
-                  "globalReference" : "e9616632"
+                "meta" : {
+                  "globalKey" : "9591ebd"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "4fad7e2f"
               }
             },
             "terminationProvision" : {
               "earlyTerminationProvision" : {
-                "meta" : {
-                  "globalKey" : "4d5"
-                },
                 "optionalEarlyTermination" : {
                   "mutualEarlyTermination" : false
+                },
+                "meta" : {
+                  "globalKey" : "4d5"
                 }
               }
             }
           },
           "meta" : {
-            "globalKey" : "dac9aab"
+            "globalKey" : "a16a8ee7"
           }
         },
         "meta" : {
-          "globalKey" : "dac9aab"
+          "globalKey" : "a16a8ee7"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "9b07a418"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "4bbdc99"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.abc.com/instrument-id-Reuters-RIC-1-0"
-                  },
-                  "value" : ".SPX"
-                },
-                "meta" : {
-                  "globalKey" : "4bbdc99"
-                },
-                "source" : "RIC"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 100,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 100,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "AssetPrice"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 1000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 1000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "a0a1dcce"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d03"
-            },
-            "rateOption" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : ".SPX",
+                  "meta" : {
+                    "scheme" : "http://www.abc.com/instrument-id-Reuters-RIC-1-0"
+                  }
+                },
+                "source" : "RIC",
+                "meta" : {
+                  "globalKey" : "4bbdc99"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 1
-                }
               }
+            } ],
+            "meta" : {
+              "globalKey" : "92bfb687"
             }
           },
+          "meta" : {
+            "globalKey" : "e2577118"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.01,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 1,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "82801f45"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "d2ab36f8"
+          }
         } ]
-      } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "3cfd165",
+          "externalReference" : "BankA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "3cfd166",
+          "externalReference" : "BankB"
+        }
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "BankB",
+          "meta" : {
+            "scheme" : "DTCC"
+          }
+        },
+        "meta" : {
+          "globalKey" : "3cfd166"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3ec041"
-      },
-      "value" : "2008-01-01"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "3cfd166",
+        "externalKey" : "BankB"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BankA",
           "meta" : {
-            "scheme" : "TradeRefNbr"
-          },
-          "value" : "TRADEABC"
+            "scheme" : "DTCC"
+          }
+        },
+        "meta" : {
+          "globalKey" : "3cfd165"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "3cfd165",
+        "externalKey" : "BankA"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2002-06-20",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "EquityAmericas"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "d2d845bd"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "BankB",
-        "globalReference" : "3cfd166"
-      },
       "meta" : {
-        "globalKey" : "9099f664"
+        "globalKey" : "d2d845bd"
       }
-    } ]
+    },
+    "collateral" : {
+      "independentAmount" : {
+        "payerPartyReference" : {
+          "globalReference" : "3cfd165",
+          "externalReference" : "BankA"
+        },
+        "receiverPartyReference" : {
+          "globalReference" : "3cfd166",
+          "externalReference" : "BankB"
+        },
+        "paymentDetail" : [ {
+          "paymentRule" : {
+            "percentageRule" : {
+              "paymentPercent" : 0.02,
+              "notionalAmountReference" : {
+                "globalReference" : "4cf",
+                "externalReference" : "equityNotionalAmount"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "a93dc25d"
+          }
+        } ]
+      }
+    },
+    "meta" : {
+      "globalKey" : "ee98bba2"
+    }
+  },
+  "meta" : {
+    "globalKey" : "ee98bba2"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex10-short-form-interestLeg-driving-schedule-dates.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex10-short-form-interestLeg-driving-schedule-dates.json
index c49342797b..ed68d0e11e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex10-short-form-interestLeg-driving-schedule-dates.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex10-short-form-interestLeg-driving-schedule-dates.json
@@ -1,65 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "158afaae"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "158afaae"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "92ad50c7"
-      },
-      "name" : {
-        "value" : "SWL"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "72ad7ed7",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "124897",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "ABC1"
-        },
-        "meta" : {
-          "globalKey" : "1e8c2f"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "90c3bd21"
-      },
-      "name" : {
-        "value" : "RST"
+        "globalKey" : "ebf10858"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "72ad8d67",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "124897",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "ABC6"
-        },
-        "meta" : {
-          "globalKey" : "1e8c34"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ebf17cb7"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2008-06-02",
+      "meta" : {
+        "globalKey" : "3ec182"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "92ad50c7"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "90c3bd21"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -69,46 +49,81 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2008-06-02",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25dff1ad"
-                },
-                "unadjustedDate" : "2008-06-02"
+                }
               },
               "meta" : {
                 "globalKey" : "25dff1ad"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2008-06-04",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "25dff92f"
+                }
+              },
+              "meta" : {
+                "globalKey" : "25dff92f"
+              }
+            },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "54b65ddd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "equityNotionalAmount",
-                    "globalReference" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "equityNotionalAmount"
+                  },
+                  "meta" : {
+                    "globalKey" : "54b65ddd"
+                  }
+                },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2008-06-04",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -117,27 +132,23 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e56d3bea"
-                      },
-                      "unadjustedDate" : "2008-06-04"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e56d3bea"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "interestCalcPeriodDates",
-                    "globalKey" : "c1e5d4"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-06-04",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -146,63 +157,32 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "8c3233ea"
-                      },
-                      "unadjustedDate" : "2009-06-04"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "8c3233ea"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "c1e5d4",
+                    "externalKey" : "interestCalcPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "8babeed0"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "interestLegPaymentDates",
-                    "globalKey" : "ada4adb9"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "ada4adb9"
-                      },
                       "periodicDates" : {
-                        "periodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "EUTA"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "20a71d"
-                            }
-                          },
-                          "businessDayConvention" : "MODFOLLOWING",
-                          "meta" : {
-                            "globalKey" : "365baaee"
-                          }
-                        },
-                        "periodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12ce1"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "4"
-                        },
                         "startDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2008-06-04",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
@@ -211,102 +191,158 @@
                                   "globalKey" : "20a71d"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
                             "meta" : {
                               "globalKey" : "e56d3bea"
-                            },
-                            "unadjustedDate" : "2008-06-04"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "e56d3bea"
                           }
+                        },
+                        "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "18c9"
+                          },
+                          "rollConvention" : "4"
+                        },
+                        "periodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "EUTA"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "20a71d"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "365baaee"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "9f0f331b"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "9f0f331b",
+                    "externalKey" : "interestLegPaymentDates"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "interestCalcPeriodDates",
-                    "globalReference" : "c1e5d4"
-                  },
-                  "meta" : {
-                    "globalKey" : "8325fc0f"
+                    "globalReference" : "c1e5d4",
+                    "externalReference" : "interestCalcPeriodDates"
                   },
                   "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 1,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "8325f327"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "e0f9bfca"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "51706dc"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "equityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "equityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "10da2"
-                  },
                   "settlementCurrency" : {
                     "value" : "EUR"
+                  },
+                  "meta" : {
+                    "globalKey" : "10da2"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "4dc5c80c"
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "relativeDates" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "3c7152e0"
+                        },
+                        "businessDayConvention" : "PRECEDING",
+                        "dateRelativeTo" : {
+                          "globalReference" : "9f0f331b",
+                          "externalReference" : "interestLegPaymentDates"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3c7152e0",
+                        "externalKey" : "interimValuationDate"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "100bc215"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2009-06-02",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "25fdf9ad"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "25fdf9ad",
+                        "externalKey" : "finalValuationDate"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "97c97b2f"
+                    }
+                  }
                 },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "99224396"
-                  },
                   "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "globalKey" : "815a0f35"
-                      },
-                      "relativeDate" : {
+                    "interimPaymentDates" : [ {
+                      "relativeDates" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "815a0f35"
+                          "globalKey" : "24ad6927"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -315,24 +351,24 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "finalValuationDate",
-                          "globalReference" : "25fdf9ad"
+                          "globalReference" : "3c7152e0",
+                          "externalReference" : "interimValuationDate"
                         }
-                      }
-                    },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "964475eb"
                       },
-                      "relativeDates" : {
+                      "meta" : {
+                        "globalKey" : "24ad6927"
+                      }
+                    } ],
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "964475eb"
+                          "globalKey" : "fc30271"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -341,24 +377,21 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "interimValuationDate",
-                          "globalReference" : "402bee2c"
+                          "globalReference" : "25fdf9ad",
+                          "externalReference" : "finalValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "fc30271"
                       }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "priceReturnTerms" : {
-                    "returnType" : "PRICE"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "35da2aea"
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -376,258 +409,225 @@
                         "value" : "productIdentifier-3"
                       }
                     } ],
-                    "securityType" : "EQUITY"
-                  }
-                },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
-                    "meta" : {
-                      "globalKey" : "97c97b2f"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "25fdf9ad"
-                        },
-                        "unadjustedDate" : "2009-06-02"
-                      },
-                      "meta" : {
-                        "externalKey" : "finalValuationDate",
-                        "globalKey" : "25fdf9ad"
-                      }
-                    }
+                    "securityType" : "Equity"
                   },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "13c65d61"
-                    },
-                    "valuationDates" : {
-                      "meta" : {
-                        "externalKey" : "interimValuationDate",
-                        "globalKey" : "402bee2c"
-                      },
-                      "relativeDates" : {
-                        "meta" : {
-                          "globalKey" : "402bee2c"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "businessDayConvention" : "PRECEDING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "interestLegPaymentDates",
-                          "globalReference" : "ada4adb9"
-                        }
-                      }
-                    }
-                  }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
                   "meta" : {
-                    "globalKey" : "3a4b88ab"
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "25dff92f"
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Price"
+                  }
                 },
-                "unadjustedDate" : "2008-06-04"
-              },
+                "meta" : {
+                  "globalKey" : "ba8b1074"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "25dff92f"
+                "globalKey" : "760aea3e"
               }
             }
           },
           "meta" : {
-            "globalKey" : "3cf30446"
+            "globalKey" : "d0f359e0"
           }
         },
         "meta" : {
-          "globalKey" : "3cf30446"
+          "globalKey" : "d0f359e0"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "affa401e"
-          },
           "observable" : {
-            "meta" : {
-              "globalKey" : "affa401e"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Reuters"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
+                  "periodMultiplier" : 1,
                   "period" : "M",
-                  "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
+            },
+            "meta" : {
+              "globalKey" : "4f4caf8a"
             }
+          },
+          "meta" : {
+            "globalKey" : "4f4caf8a"
           }
         }, {
-          "meta" : {
-            "globalKey" : "17939a42"
-          },
-          "observable" : {
+          "price" : [ {
+            "value" : {
+              "value" : 10.0,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              },
+              "perUnitOf" : {
+                "financialUnit" : "Share"
+              },
+              "priceType" : "AssetPrice"
+            },
             "meta" : {
-              "globalKey" : "6e42230d"
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 300000.0,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "NL0000009322",
                   "meta" : {
                     "scheme" : "http://www.abc.com/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "NL0000009322"
+                  }
                 },
+                "source" : "ISIN",
                 "meta" : {
                   "globalKey" : "61f06d27"
-                },
-                "source" : "ISIN"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
+                  "value" : "PHGe.AS",
                   "meta" : {
                     "scheme" : "http://www.abc.com/instrument-id-Reuters-RIC-1-0"
-                  },
-                  "value" : "PHGe.AS"
+                  }
                 },
+                "source" : "RIC",
                 "meta" : {
                   "globalKey" : "b8c4616"
-                },
-                "source" : "RIC"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-3"
+                  "value" : "productIdentifier-2"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "PHILIPS BUY BACK ORD"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "c4a4a2fc"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
                 }
               },
-              "value" : 10.0,
-              "perUnitOf" : {
-                "financialUnit" : "SHARE"
-              },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-3"
+                } ]
+              }
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 300000.0
+              "globalKey" : "5a023e93"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "3d9a72c2"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec182"
-      },
-      "value" : "2008-06-02"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "72ad7ed7",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "72ad8d67",
+          "externalReference" : "party2"
+        }
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABC1",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id"
-          },
-          "value" : "124897"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "1e8c2f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "92ad50c7"
+      "name" : {
+        "value" : "SWL"
       },
       "meta" : {
-        "globalKey" : "57a8478e"
+        "globalKey" : "72ad7ed7",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABC6",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id"
-          },
-          "value" : "124897"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "1e8c34"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "90c3bd21"
+      "name" : {
+        "value" : "RST"
       },
       "meta" : {
-        "globalKey" : "57a8478f"
+        "globalKey" : "72ad8d67",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "7a587922"
+    }
+  },
+  "meta" : {
+    "globalKey" : "7a587922"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex11-on-european-single-stock-underlyer-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex11-on-european-single-stock-underlyer-short-form.json
index 705030c339..452fb6686e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex11-on-european-single-stock-underlyer-short-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex11-on-european-single-stock-underlyer-short-form.json
@@ -1,104 +1,50 @@
 {
-  "meta" : {
-    "globalKey" : "4b110a05"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2007-09-24",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_2007_EQUITY_EUROPEAN"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "62998f41"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "6234",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/eqs-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "2092c901"
         }
       } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
       "meta" : {
-        "globalKey" : "9ea9c924"
+        "globalKey" : "9593cc32"
       }
-    },
-    "meta" : {
-      "globalKey" : "4b110a05"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "6569",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/eqs-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "95944c36"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2007-09-24",
+      "meta" : {
+        "globalKey" : "3eba58",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "EXECUTION",
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleName"
@@ -109,266 +55,304 @@
             "productQualifier" : "EquitySwap_TotalReturnBasicPerformance_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
-              "meta" : {
-                "externalKey" : "EffectiveDate",
-                "globalKey" : "6a2df5e0"
-              },
               "relativeDate" : {
+                "periodMultiplier" : 3,
+                "period" : "D",
                 "meta" : {
-                  "globalKey" : "6a2df5e0"
+                  "globalKey" : "fed6ed42"
                 },
+                "dayType" : "ExchangeBusiness",
+                "businessDayConvention" : "NotApplicable",
+                "dateRelativeTo" : {
+                  "globalReference" : "3eba58",
+                  "externalReference" : "TradeDate"
+                }
+              },
+              "meta" : {
+                "globalKey" : "fed6ed42",
+                "externalKey" : "EffectiveDate"
+              }
+            },
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
                 "period" : "D",
-                "periodMultiplier" : 3,
-                "dayType" : "EXCHANGE_BUSINESS",
-                "businessDayConvention" : "NOT_APPLICABLE",
+                "meta" : {
+                  "globalKey" : "edf02740"
+                },
+                "businessDayConvention" : "NotApplicable",
                 "dateRelativeTo" : {
-                  "externalReference" : "TradeDate",
-                  "globalReference" : "3eba58"
+                  "globalReference" : "bb917ef4",
+                  "externalReference" : "FinalEquityPaymentDate"
                 }
+              },
+              "meta" : {
+                "globalKey" : "edf02740",
+                "externalKey" : "TerminationDate"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "607b91fd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "EquityNotionalAmount",
-                    "globalReference" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "EquityNotionalAmount"
+                  },
+                  "meta" : {
+                    "globalKey" : "607b91fd"
+                  }
+                },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "globalKey" : "6a2df5e0"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 3,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "6a2df5e0"
+                        "globalKey" : "fed6ed42"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 3,
-                      "dayType" : "EXCHANGE_BUSINESS",
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "dayType" : "ExchangeBusiness",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "TradeDate",
-                        "globalReference" : "3eba58"
+                        "globalReference" : "3eba58",
+                        "externalReference" : "TradeDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "fed6ed42"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "InterestLegPeriodDates",
-                    "globalKey" : "8fbb2a68"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "globalKey" : "f18f7c48"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "f18f7c48"
+                        "globalKey" : "edf02740"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "FinalEquityPaymentDate",
-                        "globalReference" : "ad48d812"
+                        "globalReference" : "bb917ef4",
+                        "externalReference" : "FinalEquityPaymentDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "edf02740"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f0f22bbe",
+                    "externalKey" : "InterestLegPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "f5120739"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "9b9d36de"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "9b9d36de"
-                      },
                       "relativeDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "9b9d36de"
+                          "globalKey" : "97fde1d6"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "dateRelativeTo" : {
-                          "externalReference" : "EquityPaymentDate",
-                          "globalReference" : "2da89f98"
+                          "globalReference" : "e03bd13c",
+                          "externalReference" : "EquityPaymentDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "97fde1d6"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97fde1d6"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "InterestLegPeriodDates",
-                    "globalReference" : "8fbb2a68"
+                    "globalReference" : "f0f22bbe",
+                    "externalReference" : "InterestLegPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "9e9ada33"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "92fd2d87"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "e900d1ac"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "EquityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "EquityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "10da2"
-                  },
                   "settlementCurrency" : {
                     "value" : "EUR"
+                  },
+                  "meta" : {
+                    "globalKey" : "10da2"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "bfdb80c5"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "EquityPaymentDate",
-                    "globalKey" : "2da89f98"
-                  },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "externalKey" : "FinalEquityPaymentDate",
-                        "globalKey" : "ad48d812"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "ad48d812"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessCentersReference" : {
-                          "externalReference" : "PrimaryBusinessCenter",
-                          "globalReference" : "20a71d"
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "adjustableDates" : {
+                        "unadjustedDate" : [ "2007-10-12", "2007-11-13", "2007-12-12", "2008-01-14", "2008-02-12", "2008-03-12", "2008-04-12", "2008-05-13", "2008-06-12", "2008-07-12", "2008-08-12" ],
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
                         },
-                        "businessDayConvention" : "FOLLOWING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "FinalValuationDate",
-                          "globalReference" : "25e31503"
+                        "meta" : {
+                          "globalKey" : "4ae48233"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "4ae48233",
+                        "externalKey" : "InterimValuationDate"
                       }
                     },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "externalKey" : "InterimEquityPaymentDate",
-                        "globalKey" : "9ead6ea"
-                      },
-                      "relativeDates" : {
-                        "meta" : {
-                          "globalKey" : "9ead6ea"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "EUTA"
-                          } ],
+                    "valuationTimeType" : "Close",
+                    "meta" : {
+                      "globalKey" : "9a240dc6"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2008-09-24",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
-                            "externalKey" : "PrimaryBusinessCenter",
-                            "globalKey" : "20a71d"
+                            "globalKey" : "3a4b88ab"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "InterimValuationDate",
-                          "globalReference" : "4ae48233"
+                        "meta" : {
+                          "globalKey" : "25e31503"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "25e31503",
+                        "externalKey" : "FinalValuationDate"
                       }
-                    } ]
+                    },
+                    "meta" : {
+                      "globalKey" : "97ae9685"
+                    }
                   }
                 },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendPayoutRatio" : [ {
-                      "cashRatio" : 0.01,
-                      "totalRatio" : 1
-                    } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "EQUITY_PAYMENT_DATE"
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
+                      "relativeDates" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "c4b70c48"
+                        },
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "EUTA"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "20a71d",
+                            "externalKey" : "PrimaryBusinessCenter"
+                          }
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "4ae48233",
+                          "externalReference" : "InterimValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "c4b70c48",
+                        "externalKey" : "InterimEquityPaymentDate"
                       }
                     } ],
-                    "firstOrSecondPeriod" : "FIRST_PERIOD"
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "bb917ef4"
+                        },
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
+                        "businessCentersReference" : {
+                          "globalReference" : "20a71d",
+                          "externalReference" : "PrimaryBusinessCenter"
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "25e31503",
+                          "externalReference" : "FinalValuationDate"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "bb917ef4",
+                        "externalKey" : "FinalEquityPaymentDate"
+                      }
+                    }
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                  "meta" : {
+                    "globalKey" : "e03bd13c",
+                    "externalKey" : "EquityPaymentDate"
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -381,278 +365,294 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
-                    "meta" : {
-                      "globalKey" : "97ae9685"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "25e31503"
-                        },
-                        "unadjustedDate" : "2008-09-24"
-                      },
-                      "meta" : {
-                        "externalKey" : "FinalValuationDate",
-                        "globalKey" : "25e31503"
-                      }
-                    }
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
                   },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "9a240dc6"
-                    },
-                    "valuationDates" : {
-                      "adjustableDates" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "4ae48233"
-                        },
-                        "unadjustedDate" : [ "2007-10-12", "2007-11-13", "2007-12-12", "2008-01-14", "2008-02-12", "2008-03-12", "2008-04-12", "2008-05-13", "2008-06-12", "2008-07-12", "2008-08-12" ]
-                      },
-                      "meta" : {
-                        "externalKey" : "InterimValuationDate",
-                        "globalKey" : "4ae48233"
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 1,
+                      "cashRatio" : 0.01
+                    } ],
+                    "firstOrSecondPeriod" : "FirstPeriod",
+                    "dividendPeriod" : [ {
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "EquityPaymentDate"
+                        }
                       }
-                    },
-                    "valuationTimeType" : "CLOSE"
+                    } ]
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "meta" : {
-                "externalKey" : "TerminationDate",
-                "globalKey" : "f18f7c48"
-              },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "f18f7c48"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NOT_APPLICABLE",
-                "dateRelativeTo" : {
-                  "externalReference" : "FinalEquityPaymentDate",
-                  "globalReference" : "ad48d812"
+                "meta" : {
+                  "globalKey" : "538bee17"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "28cc070"
               }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "c667a152"
+            "globalKey" : "ca5d4848"
           }
         },
         "meta" : {
-          "globalKey" : "c667a152"
+          "globalKey" : "ca5d4848"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "1292f651"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "19405131"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.abc.com/instrumentId"
-                  },
-                  "value" : "NOK1V.HE"
-                },
-                "meta" : {
-                  "globalKey" : "62f843cc"
-                },
-                "source" : "OTHER"
-              }
-            }, {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "value" : "Nokya Oyj"
-                },
-                "meta" : {
-                  "globalKey" : "b06a157d"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 37.44,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 37.44,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "AssetPrice"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 760400,
               "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 760400
-            }
-          }, {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 28469376,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 28469376
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d0a0cfcc"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e0c"
-            },
-            "rateOption" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "NOK1V.HE",
+                  "meta" : {
+                    "scheme" : "http://www.abc.com/instrumentId"
+                  }
+                },
+                "source" : "Other",
+                "meta" : {
+                  "globalKey" : "62f843cc"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EURIBOR-Telerate"
+                "identifier" : {
+                  "value" : "Nokya Oyj"
                 },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 1
+                "source" : "Name",
+                "meta" : {
+                  "globalKey" : "b06a157d"
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "ec9d4ef"
             }
           },
+          "meta" : {
+            "globalKey" : "d44a011"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
             "value" : {
+              "value" : 0.0020,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.0020,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EURIBOR-Telerate"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 1,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2bba0f5c"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "38e72044"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3eba58"
-      },
-      "value" : "2007-09-24"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      } ],
+      "adjustment" : "Execution"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/eqs-trade-id"
-          },
-          "value" : "6234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "23a97ce8"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/eqs-trade-id"
-          },
-          "value" : "6569"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2007-09-24",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2007EquityEuropean"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "62998f41"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "2092c901"
+        }
+      } ],
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "23d5334e"
+        "globalKey" : "9ea9c924"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "d3d1f751"
+    }
+  },
+  "meta" : {
+    "globalKey" : "d3d1f751"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex12-on-european-index-underlyer-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex12-on-european-index-underlyer-short-form.json
index 43d1e61713..6b577dc726 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex12-on-european-index-underlyer-short-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex12-on-european-index-underlyer-short-form.json
@@ -1,84 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "fcfa1970"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2009-01-01",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_2007_EQUITY_EUROPEAN"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "4666b900",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1147071",
+          "meta" : {
+            "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
           }
-        },
-        "meta" : {
-          "globalKey" : "1f32caf8"
         }
       } ],
       "meta" : {
-        "globalKey" : "1f32caf8"
+        "globalKey" : "c27138c"
       }
-    },
-    "meta" : {
-      "globalKey" : "fcfa1970"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "f5d99210"
-      },
-      "name" : {
-        "value" : "Party 1234 Ltd"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "PARTY1234"
-        },
-        "meta" : {
-          "globalKey" : "3ba25808"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "b2a7210"
-      },
-      "name" : {
-        "value" : "Party 5678 Ltd"
+      "issuerReference" : {
+        "globalReference" : "c79dbb00",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1147071",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "PARTY5678"
-        },
-        "meta" : {
-          "globalKey" : "3ba43908"
+            "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "c2787eb"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-01-19",
+      "meta" : {
+        "globalKey" : "3ec853"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "f5d99210"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "b2a7210"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -88,7 +49,9 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-01-19",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "DEFR"
@@ -97,40 +60,89 @@
                       "globalKey" : "1ff50d"
                     }
                   },
-                  "businessDayConvention" : "FOLLOWING",
                   "meta" : {
                     "globalKey" : "211d10fc"
                   }
                 },
                 "meta" : {
                   "globalKey" : "6e7d8489"
+                }
+              },
+              "meta" : {
+                "globalKey" : "6e7d8489",
+                "externalKey" : "equityEffectiveDate"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-03-19",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "DEFR"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "1ff50d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "211d10fc"
+                  }
                 },
-                "unadjustedDate" : "2009-01-19"
+                "meta" : {
+                  "globalKey" : "48e9d409"
+                }
               },
               "meta" : {
-                "externalKey" : "equityEffectiveDate",
-                "globalKey" : "6e7d8489"
+                "globalKey" : "48e9d409"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "equityNotionalAmount"
+                  },
                   "meta" : {
                     "globalKey" : "54b65ddd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "equityNotionalAmount",
-                    "globalReference" : "4cf"
                   }
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-01-21",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -139,28 +151,24 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "71e7e7d7"
-                      },
-                      "unadjustedDate" : "2009-01-21"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "interestEffectiveDate",
-                      "globalKey" : "71e7e7d7"
+                      "globalKey" : "71e7e7d7",
+                      "externalKey" : "interestEffectiveDate"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "interestCalcPeriodDates",
-                    "globalKey" : "3048096c"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-03-23",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -169,132 +177,108 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "4fbde895"
-                      },
-                      "unadjustedDate" : "2009-03-23"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "interestTerminationDate",
-                      "globalKey" : "4fbde895"
+                      "globalKey" : "4fbde895",
+                      "externalKey" : "interestTerminationDate"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "3048096c",
+                    "externalKey" : "interestCalcPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "8eb3683c"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "interestLegPaymentDates",
-                    "globalKey" : "b6b78bb2"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "b6b78bb2"
-                      },
                       "periodicDates" : {
-                        "endDate" : {
-                          "meta" : {
-                            "globalKey" : "97eae877"
-                          },
+                        "startDate" : {
                           "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "97eae877"
+                              "globalKey" : "df205212"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "dateRelativeTo" : {
-                              "externalReference" : "interestTerminationDate",
-                              "globalReference" : "4fbde895"
+                              "globalReference" : "71e7e7d7",
+                              "externalReference" : "interestEffectiveDate"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "df205212"
                           }
                         },
-                        "periodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "EUTA"
-                            } ],
+                        "endDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "20a71d"
+                              "globalKey" : "944b936f"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "4fbde895",
+                              "externalReference" : "interestTerminationDate"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
-                            "globalKey" : "211dc30c"
+                            "globalKey" : "944b936f"
                           }
                         },
                         "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "28bf3"
+                            "globalKey" : "177db"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
                           "rollConvention" : "19"
                         },
-                        "startDate" : {
-                          "meta" : {
-                            "globalKey" : "e2bfa71a"
-                          },
-                          "relativeDate" : {
+                        "periodDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "EUTA"
+                            } ],
                             "meta" : {
-                              "globalKey" : "e2bfa71a"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "interestEffectiveDate",
-                              "globalReference" : "71e7e7d7"
+                              "globalKey" : "20a71d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "211dc30c"
                           }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "5c33c394"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "5c33c394",
+                    "externalKey" : "interestLegPaymentDates"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "interestCalcPeriodDates",
-                    "globalReference" : "3048096c"
+                    "globalReference" : "3048096c",
+                    "externalReference" : "interestCalcPeriodDates"
                   },
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "36741a11"
+                      "globalKey" : "135004c5"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "CURRENCY_BUSINESS",
+                    "dayType" : "CurrencyBusiness",
+                    "businessDayConvention" : "PRECEDING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -303,99 +287,169 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "PRECEDING",
                     "dateRelativeTo" : {
-                      "externalReference" : "interestLegPaymentDates",
-                      "globalReference" : "b6b78bb2"
+                      "globalReference" : "5c33c394",
+                      "externalReference" : "interestLegPaymentDates"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "5dd36e9e"
-                  },
                   "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 1,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "f9c90e82"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "d7b4424e"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "a0be6872"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "equityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "equityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "10da2"
-                  },
                   "settlementCurrency" : {
                     "value" : "EUR"
+                  },
+                  "meta" : {
+                    "globalKey" : "10da2"
                   }
                 },
-                "meta" : {
-                  "externalKey" : "returnLeg",
-                  "globalKey" : "8d30d436"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "99224396"
-                  },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "globalKey" : "815a0f35"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "815a0f35"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "EUTA"
-                          } ],
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "periodicDates" : {
+                        "startDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "9229ce57"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "6e7d8489",
+                              "externalReference" : "equityEffectiveDate"
+                            }
+                          },
                           "meta" : {
-                            "globalKey" : "20a71d"
+                            "globalKey" : "9229ce57"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "finalValuationDate",
-                          "globalReference" : "48e9d409"
+                        "endDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "b635d2a0"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "48e9d409",
+                              "externalReference" : "finalValuationDate"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "b635d2a0"
+                          }
+                        },
+                        "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "177db"
+                          },
+                          "rollConvention" : "19"
+                        },
+                        "periodDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "DEFR"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "1ff50d"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "211d10fc"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "1cc8abb8",
+                        "externalKey" : "interimValuationDate"
                       }
                     },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "964475eb"
+                    "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                    "meta" : {
+                      "globalKey" : "105dba0f"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2009-03-19",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "DEFR"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "1ff50d"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "211d10fc"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "48e9d409"
+                        }
                       },
+                      "meta" : {
+                        "globalKey" : "48e9d409",
+                        "externalKey" : "finalValuationDate"
+                      }
+                    },
+                    "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                    "meta" : {
+                      "globalKey" : "1e864b5f"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
                       "relativeDates" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "964475eb"
+                          "globalKey" : "24ad6927"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -404,33 +458,44 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "interimValuationDate",
-                          "globalReference" : "b5ba6138"
+                          "globalReference" : "1cc8abb8",
+                          "externalReference" : "interimValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "24ad6927"
                       }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendPayoutRatio" : [ {
-                      "cashRatio" : 1,
-                      "nonCashRatio" : 1,
-                      "totalRatio" : 1
                     } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "CASH_SETTLEMENT_PAYMENT_DATE"
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "fc30271"
+                        },
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "EUTA"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "20a71d"
+                          }
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "48e9d409",
+                          "externalReference" : "finalValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "fc30271"
                       }
-                    } ],
-                    "firstOrSecondPeriod" : "SECOND_PERIOD"
+                    }
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                  "meta" : {
+                    "globalKey" : "35da2aea"
                   }
                 },
                 "underlier" : {
@@ -451,336 +516,271 @@
                     "globalKey" : "0"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
-                    "meta" : {
-                      "globalKey" : "1e864b5f"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "DEFR"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "1ff50d"
-                            }
-                          },
-                          "businessDayConvention" : "FOLLOWING",
-                          "meta" : {
-                            "globalKey" : "211d10fc"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "48e9d409"
-                        },
-                        "unadjustedDate" : "2009-03-19"
-                      },
-                      "meta" : {
-                        "externalKey" : "finalValuationDate",
-                        "globalKey" : "48e9d409"
-                      }
-                    },
-                    "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
                   },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "a94f6f8f"
-                    },
-                    "valuationDates" : {
-                      "meta" : {
-                        "externalKey" : "interimValuationDate",
-                        "globalKey" : "b5ba6138"
-                      },
-                      "periodicDates" : {
-                        "endDate" : {
-                          "meta" : {
-                            "globalKey" : "b9d527a8"
-                          },
-                          "relativeDate" : {
-                            "meta" : {
-                              "globalKey" : "b9d527a8"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "finalValuationDate",
-                              "globalReference" : "48e9d409"
-                            }
-                          }
-                        },
-                        "periodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "DEFR"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "1ff50d"
-                            }
-                          },
-                          "businessDayConvention" : "FOLLOWING",
-                          "meta" : {
-                            "globalKey" : "211d10fc"
-                          }
-                        },
-                        "periodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "28bf3"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "19"
-                        },
-                        "startDate" : {
-                          "meta" : {
-                            "globalKey" : "95c9235f"
-                          },
-                          "relativeDate" : {
-                            "meta" : {
-                              "globalKey" : "95c9235f"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "equityEffectiveDate",
-                              "globalReference" : "6e7d8489"
-                            }
-                          }
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 1,
+                      "cashRatio" : 1,
+                      "nonCashRatio" : 1
+                    } ],
+                    "firstOrSecondPeriod" : "SecondPeriod",
+                    "dividendPeriod" : [ {
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "CashSettlementPaymentDate"
                         }
                       }
-                    },
-                    "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
-                  }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "DEFR"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "1ff50d"
-                    }
-                  },
-                  "businessDayConvention" : "FOLLOWING",
-                  "meta" : {
-                    "globalKey" : "211d10fc"
+                    } ]
                   }
                 },
                 "meta" : {
-                  "globalKey" : "48e9d409"
-                },
-                "unadjustedDate" : "2009-03-19"
-              },
+                  "globalKey" : "18839304",
+                  "externalKey" : "returnLeg"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "48e9d409"
+                "globalKey" : "755fdb52"
               }
             }
           },
           "meta" : {
-            "globalKey" : "2bf9a412"
+            "globalKey" : "eaf5f600"
           }
         },
         "meta" : {
-          "globalKey" : "2bf9a412"
+          "globalKey" : "eaf5f600"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a822a61e"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "affa401e"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EURIBOR-Reuters"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 1
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0001234,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.0001234,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "c3f90ce8"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "9cba2463"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
+            "rateOption" : {
               "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/instrument-id"
-                  },
-                  "value" : ".GDAXI"
-                },
-                "meta" : {
-                  "globalKey" : "3901e477"
+                "floatingRateIndex" : {
+                  "value" : "EUR-EURIBOR-Reuters"
                 },
-                "source" : "OTHER"
-              }
-            }, {
+                "indexTenor" : {
+                  "periodMultiplier" : 1,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "rateOption-1"
                 } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "value" : "GERMAN SE XETRA DAX INDEX"
-                },
-                "meta" : {
-                  "globalKey" : "811cd67a"
-                },
-                "source" : "NAME"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "4f4caf8a"
+            }
           },
+          "meta" : {
+            "globalKey" : "79106fb2"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
             "value" : {
+              "value" : 100,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 100,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
+              "priceType" : "AssetPrice"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000,
+              "unit" : {
+                "financialUnit" : "IndexUnit"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "INDEX_UNIT"
-              },
-              "value" : 100000
             }
           }, {
+            "value" : {
+              "value" : 10000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : ".GDAXI",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/instrument-id"
+                  }
+                },
+                "source" : "Other",
+                "meta" : {
+                  "globalKey" : "3901e477"
                 }
               },
-              "value" : 10000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
+              }
+            }, {
+              "value" : {
+                "identifier" : {
+                  "value" : "GERMAN SE XETRA DAX INDEX"
+                },
+                "source" : "Name",
+                "meta" : {
+                  "globalKey" : "811cd67a"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "fa8a67fd"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "9e17d168"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec853"
-      },
-      "value" : "2009-01-19"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4666b900",
+          "externalReference" : "partyA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "c79dbb00",
+          "externalReference" : "partyB"
+        }
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "PARTY1234",
           "meta" : {
-            "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
-          },
-          "value" : "1147071"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "3ba25808"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "f5d99210"
+      "name" : {
+        "value" : "Party 1234 Ltd"
       },
       "meta" : {
-        "globalKey" : "273acbe2"
+        "globalKey" : "4666b900",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "PARTY5678",
           "meta" : {
-            "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
-          },
-          "value" : "1147071"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "3ba43908"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "b2a7210"
+      "name" : {
+        "value" : "Party 5678 Ltd"
       },
       "meta" : {
-        "globalKey" : "273acbe3"
+        "globalKey" : "c79dbb00",
+        "externalKey" : "partyB"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2009-01-01",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2007EquityEuropean"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "1f32caf8"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "1f32caf8"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "9d019ed0"
+    }
+  },
+  "meta" : {
+    "globalKey" : "9d019ed0"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex13-pan-asia-interdealer-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex13-pan-asia-interdealer-share-swap-short-form.json
index 47e2f15dcc..f8c0ceb7a4 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex13-pan-asia-interdealer-share-swap-short-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex13-pan-asia-interdealer-share-swap-short-form.json
@@ -1,107 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "9f25ffa5"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2009-09-01",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationAnnexType" : {
-              "value" : "ISDA_2009_SHARE_SWAP_PAN_ASIA"
-            },
-            "masterConfirmationType" : {
-              "value" : "ISDA_2009_EQUITY_PAN_ASIA"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "657a51cd",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "299442",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "345df4f"
         }
       } ],
       "meta" : {
-        "globalKey" : "345df4f"
+        "globalKey" : "ee0abbb5"
       }
-    },
-    "meta" : {
-      "globalKey" : "9f25ffa5"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "df32ec33"
-      },
-      "name" : {
-        "value" : "A.N.Example"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "PartyABIC1"
-        },
-        "meta" : {
-          "globalKey" : "91a7b390"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "1649c7b3"
-      },
-      "name" : {
-        "value" : "A.N.Other.Example"
+      "issuerReference" : {
+        "globalReference" : "af987d91",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "299442",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "PartyBBIC2"
-        },
-        "meta" : {
-          "globalKey" : "91b5cb12"
+            "scheme" : "http://www.partyB.com/trade-id-1-0"
+          }
         }
-      } ]
-    } ],
-    "partyRole" : [ {
-      "partyReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "1649c7b3"
-      },
-      "role" : "DETERMINING_PARTY"
-    }, {
-      "partyReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "1649c7b3"
-      },
-      "role" : "HEDGING_PARTY"
+      } ],
+      "meta" : {
+        "globalKey" : "ee0b3014"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-09-01",
+      "meta" : {
+        "globalKey" : "3eca41"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "1649c7b3"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "1649c7b3"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "df32ec33"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -109,11 +47,9 @@
             "productQualifier" : "EquitySwap_TotalReturnBasicPerformance_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-09-01",
                 "dateAdjustments" : {
                   "businessDayConvention" : "FOLLOWING",
                   "meta" : {
@@ -122,33 +58,75 @@
                 },
                 "meta" : {
                   "globalKey" : "bf744072"
+                }
+              },
+              "meta" : {
+                "globalKey" : "bf744072",
+                "externalKey" : "equityEffectiveDate"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2010-03-02",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
+                  "meta" : {
+                    "globalKey" : "d3bf0271"
+                  }
                 },
-                "unadjustedDate" : "2009-09-01"
+                "meta" : {
+                  "globalKey" : "bf8caab3"
+                }
               },
               "meta" : {
-                "externalKey" : "equityEffectiveDate",
-                "globalKey" : "bf744072"
+                "globalKey" : "bf8caab3"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "0",
+                    "externalReference" : "equityNotionalAmount"
+                  },
                   "meta" : {
                     "globalKey" : "54b65ddd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "equityNotionalAmount",
-                    "globalReference" : "0"
                   }
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-09-03",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -157,28 +135,24 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "212500d8"
                         }
                       },
                       "meta" : {
                         "globalKey" : "bce92875"
-                      },
-                      "unadjustedDate" : "2009-09-03"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "interestEffectiveDate",
-                      "globalKey" : "bce92875"
+                      "globalKey" : "bce92875",
+                      "externalKey" : "interestEffectiveDate"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "interestCalcPeriodDates",
-                    "globalKey" : "ea5ee09"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2010-03-04",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -187,132 +161,108 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "212500d8"
                         }
                       },
                       "meta" : {
                         "globalKey" : "d61e0a94"
-                      },
-                      "unadjustedDate" : "2010-03-04"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "interestTerminationDate",
-                      "globalKey" : "d61e0a94"
+                      "globalKey" : "d61e0a94",
+                      "externalKey" : "interestTerminationDate"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "ea5ee09",
+                    "externalKey" : "interestCalcPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "488058ef"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "interestLegPaymentDates",
-                    "globalKey" : "7049871b"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "7049871b"
-                      },
                       "periodicDates" : {
-                        "endDate" : {
-                          "meta" : {
-                            "globalKey" : "97eae877"
-                          },
+                        "startDate" : {
                           "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "97eae877"
+                              "globalKey" : "df205212"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "dateRelativeTo" : {
-                              "externalReference" : "interestTerminationDate",
-                              "globalReference" : "d61e0a94"
+                              "globalReference" : "bce92875",
+                              "externalReference" : "interestEffectiveDate"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "df205212"
                           }
                         },
-                        "periodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "USNY"
-                            } ],
+                        "endDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "27e4e9"
+                              "globalKey" : "944b936f"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "d61e0a94",
+                              "externalReference" : "interestTerminationDate"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
-                            "globalKey" : "212500d8"
+                            "globalKey" : "944b936f"
                           }
                         },
                         "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "12cde"
+                            "globalKey" : "18c6"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
                           "rollConvention" : "1"
                         },
-                        "startDate" : {
-                          "meta" : {
-                            "globalKey" : "e2bfa71a"
-                          },
-                          "relativeDate" : {
+                        "periodDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "USNY"
+                            } ],
                             "meta" : {
-                              "globalKey" : "e2bfa71a"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "interestEffectiveDate",
-                              "globalReference" : "bce92875"
+                              "globalKey" : "27e4e9"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "212500d8"
                           }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "43633b55"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "43633b55",
+                    "externalKey" : "interestLegPaymentDates"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "interestCalcPeriodDates",
-                    "globalReference" : "ea5ee09"
+                    "globalReference" : "ea5ee09",
+                    "externalReference" : "interestCalcPeriodDates"
                   },
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "38ce9e52"
+                      "globalKey" : "15aa8906"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "CURRENCY_BUSINESS",
+                    "dayType" : "CurrencyBusiness",
+                    "businessDayConvention" : "PRECEDING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -321,101 +271,152 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "PRECEDING",
                     "dateRelativeTo" : {
-                      "externalReference" : "interestLegPaymentDates",
-                      "globalReference" : "7049871b"
+                      "globalReference" : "43633b55",
+                      "externalReference" : "interestLegPaymentDates"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "4157f6bd"
-                  },
                   "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 1,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "dd4d96a1"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "ed02db71"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "85043038"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "equityNotionalAmount",
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "equityNotionalAmount"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "14966"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
+                  },
+                  "meta" : {
+                    "globalKey" : "14966"
                   }
                 },
-                "fxFeature" : [ {
-                  "crossCurrency" : {
-                    "fixingTime" : {
-                      "businessCenter" : {
-                        "value" : "KRSE"
-                      },
-                      "hourMinuteTime" : "14:45:00"
-                    },
-                    "fxSpotRateSource" : {
-                      "primarySource" : {
-                        "sourcePage" : {
-                          "meta" : {
-                            "scheme" : "http://www.example.com/rate-source-page-1-0"
-                          },
-                          "value" : "KRW="
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "AsSpecifiedInMasterConfirmation",
+                    "valuationDates" : {
+                      "periodicDates" : {
+                        "startDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "9229ce57"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "bf744072",
+                              "externalReference" : "equityEffectiveDate"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "9229ce57"
+                          }
                         },
-                        "sourceProvider" : {
-                          "value" : "REUTERS"
+                        "endDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "b635d2a0"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "bf8caab3",
+                              "externalReference" : "finalValuationDate"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "b635d2a0"
+                          }
+                        },
+                        "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "18c6"
+                          },
+                          "rollConvention" : "1"
+                        },
+                        "periodDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "meta" : {
+                            "globalKey" : "d3bf0271"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "6e25d360",
+                        "externalKey" : "interimValuationDate"
                       }
+                    },
+                    "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                    "meta" : {
+                      "globalKey" : "aa864de0"
                     }
                   },
-                  "referenceCurrency" : {
-                    "meta" : {
-                      "globalKey" : "123d0"
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2010-03-02",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "meta" : {
+                            "globalKey" : "d3bf0271"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "bf8caab3"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "bf8caab3",
+                        "externalKey" : "finalValuationDate"
+                      }
                     },
-                    "value" : "KRW"
+                    "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                    "meta" : {
+                      "globalKey" : "d2c5631d"
+                    }
                   }
-                } ],
-                "meta" : {
-                  "externalKey" : "returnLeg",
-                  "globalKey" : "a9bc7bc9"
                 },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "d71cc16"
-                  },
                   "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "globalKey" : "9c890a01"
-                      },
-                      "relativeDate" : {
+                    "interimPaymentDates" : [ {
+                      "relativeDates" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "9c890a01"
+                          "globalKey" : "3fdc63f3"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -424,24 +425,24 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "finalValuationDate",
-                          "globalReference" : "bf8caab3"
+                          "globalReference" : "6e25d360",
+                          "externalReference" : "interimValuationDate"
                         }
-                      }
-                    },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "b17370b7"
                       },
-                      "relativeDates" : {
+                      "meta" : {
+                        "globalKey" : "3fdc63f3"
+                      }
+                    } ],
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "b17370b7"
+                          "globalKey" : "2af1fd3d"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -450,37 +451,21 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "interimValuationDate",
-                          "globalReference" : "aec7a708"
-                        }
-                      }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendPayoutRatio" : [ {
-                      "totalRatio" : 1
-                    } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "SHARE_PAYMENT"
+                          "globalReference" : "bf8caab3",
+                          "externalReference" : "finalValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "2af1fd3d"
                       }
-                    } ],
-                    "firstOrSecondPeriod" : "SECOND_PERIOD"
+                    }
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                  "meta" : {
+                    "globalKey" : "aa29b36a"
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -498,334 +483,349 @@
                         "value" : "productIdentifier-3"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
+                "fxFeature" : [ {
+                  "referenceCurrency" : {
+                    "value" : "KRW",
                     "meta" : {
-                      "globalKey" : "d2c5631d"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "FOLLOWING",
-                          "meta" : {
-                            "globalKey" : "d3bf0271"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "bf8caab3"
-                        },
-                        "unadjustedDate" : "2010-03-02"
-                      },
-                      "meta" : {
-                        "externalKey" : "finalValuationDate",
-                        "globalKey" : "bf8caab3"
-                      }
-                    },
-                    "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
+                      "globalKey" : "123d0"
+                    }
                   },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION",
-                    "meta" : {
-                      "globalKey" : "eb282188"
-                    },
-                    "valuationDates" : {
-                      "meta" : {
-                        "externalKey" : "interimValuationDate",
-                        "globalKey" : "aec7a708"
-                      },
-                      "periodicDates" : {
-                        "endDate" : {
-                          "meta" : {
-                            "globalKey" : "b9d527a8"
-                          },
-                          "relativeDate" : {
-                            "meta" : {
-                              "globalKey" : "b9d527a8"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "finalValuationDate",
-                              "globalReference" : "bf8caab3"
-                            }
-                          }
-                        },
-                        "periodDatesAdjustments" : {
-                          "businessDayConvention" : "FOLLOWING",
-                          "meta" : {
-                            "globalKey" : "d3bf0271"
-                          }
-                        },
-                        "periodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12cde"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "1"
+                  "crossCurrency" : {
+                    "fxSpotRateSource" : {
+                      "primarySource" : {
+                        "sourceProvider" : {
+                          "value" : "Reuters"
                         },
-                        "startDate" : {
+                        "sourcePage" : {
+                          "value" : "KRW=",
                           "meta" : {
-                            "globalKey" : "95c9235f"
-                          },
-                          "relativeDate" : {
-                            "meta" : {
-                              "globalKey" : "95c9235f"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "equityEffectiveDate",
-                              "globalReference" : "bf744072"
-                            }
+                            "scheme" : "http://www.example.com/rate-source-page-1-0"
                           }
                         }
                       }
                     },
-                    "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
+                    "fixingTime" : {
+                      "hourMinuteTime" : "14:45:00",
+                      "businessCenter" : {
+                        "value" : "KRSE"
+                      }
+                    }
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "FOLLOWING",
-                  "meta" : {
-                    "globalKey" : "d3bf0271"
+                } ],
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
+                  },
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 1
+                    } ],
+                    "firstOrSecondPeriod" : "SecondPeriod",
+                    "dividendPeriod" : [ {
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "SharePayment"
+                        }
+                      }
+                    } ]
                   }
                 },
                 "meta" : {
-                  "globalKey" : "bf8caab3"
-                },
-                "unadjustedDate" : "2010-03-02"
-              },
+                  "globalKey" : "e0ea5c69",
+                  "externalKey" : "returnLeg"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "bf8caab3"
+                "globalKey" : "ffb28c5a"
               }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "e0f7fd43"
+            "globalKey" : "bcfa3623"
           }
         },
         "meta" : {
-          "globalKey" : "e0f7fd43"
+          "globalKey" : "bcfa3623"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "c31177f"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d03"
+          "price" : [ {
+            "value" : {
+              "value" : 0,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              },
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
+                  "periodMultiplier" : 1,
                   "period" : "M",
-                  "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
+            },
+            "meta" : {
+              "globalKey" : "82801f45"
             }
           },
+          "meta" : {
+            "globalKey" : "1a198869"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 5,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
+                "financialUnit" : "Share"
+              },
+              "priceType" : "AssetPrice"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 60000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          }, {
+            "value" : {
+              "value" : 300000,
+              "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "priceType" : "INTEREST_RATE"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "55a119ae"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "c962ce8"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "005430.KS",
                   "meta" : {
                     "scheme" : "http://www.example.com/instrument-id-Reuters-RIC-1-0"
-                  },
-                  "value" : "005430.KS"
+                  }
                 },
+                "source" : "RIC",
                 "meta" : {
                   "globalKey" : "9afe6746"
-                },
-                "source" : "RIC"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
+                  "value" : "KR7005430004",
                   "meta" : {
                     "scheme" : "http://www.example.com/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "KR7005430004"
+                  }
                 },
+                "source" : "ISIN",
                 "meta" : {
                   "globalKey" : "85b273d7"
-                },
-                "source" : "ISIN"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-3"
+                  "value" : "productIdentifier-2"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "KOREA AIR SVC ORDINARY"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "f6e44a99"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
                 }
               },
-              "value" : 5,
-              "perUnitOf" : {
-                "financialUnit" : "SHARE"
-              },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 60000
-            }
-          }, {
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-3"
+                } ]
+              }
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 300000
+              "globalKey" : "862f7018"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "c73b14ae"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eca41"
-      },
-      "value" : "2009-09-01"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "af987d91",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "657a51cd",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "af987d91",
+          "externalReference" : "party2"
+        } ]
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "PartyABIC1",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id-1-0"
-          },
-          "value" : "299442"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "91a7b390"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "df32ec33"
+      "name" : {
+        "value" : "A.N.Example"
       },
       "meta" : {
-        "globalKey" : "3a2297ab"
+        "globalKey" : "657a51cd",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "PartyBBIC2",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id-1-0"
-          },
-          "value" : "299442"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "91b5cb12"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "1649c7b3"
+      "name" : {
+        "value" : "A.N.Other.Example"
       },
       "meta" : {
-        "globalKey" : "3a2297ac"
+        "globalKey" : "af987d91",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "partyRole" : [ {
+      "partyReference" : {
+        "globalReference" : "af987d91",
+        "externalReference" : "party2"
+      },
+      "role" : "DeterminingParty"
+    }, {
+      "partyReference" : {
+        "globalReference" : "af987d91",
+        "externalReference" : "party2"
+      },
+      "role" : "HedgingParty"
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2009-09-01",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2009EquityPanAsia"
+            },
+            "masterConfirmationAnnexType" : {
+              "value" : "ISDA2009ShareSwapPanAsia"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "fc5033cf"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fc5033cf"
+      }
+    },
+    "meta" : {
+      "globalKey" : "f52af311"
+    }
+  },
+  "meta" : {
+    "globalKey" : "f52af311"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex14-european-interdealer-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex14-european-interdealer-share-swap-short-form.json
index 0c54667b2c..71266feacc 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex14-european-interdealer-share-swap-short-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex14-european-interdealer-share-swap-short-form.json
@@ -1,94 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "e0f0dfdc"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2009-09-01",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationAnnexType" : {
-              "value" : "ISDA_2009_EQUITY_EUROPEAN_INTERDEALER_SS"
-            },
-            "masterConfirmationType" : {
-              "value" : "ISDA_2009_EQUITY_EUROPEAN_INTERDEALER"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "2f1783b5",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1558488",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "81f44b30"
         }
       } ],
       "meta" : {
-        "globalKey" : "81f44b30"
+        "globalKey" : "13091112"
       }
-    },
-    "meta" : {
-      "globalKey" : "e0f0dfdc"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "988417b5"
-      },
-      "name" : {
-        "value" : "AAA Bank This is a test for agent language"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "SWAP1234"
-        },
-        "meta" : {
-          "globalKey" : "1ba91055"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "b879ae2e"
-      },
-      "name" : {
-        "value" : "Mega Bank Ltd"
+      "issuerReference" : {
+        "globalReference" : "60beee7a",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1558488",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "MEGA1234"
-        },
-        "meta" : {
-          "globalKey" : "fd9b8bb4"
+            "scheme" : "http://www.partyB.com/trade-id-1-0"
+          }
         }
-      } ]
-    } ],
-    "partyRole" : [ {
-      "partyReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "b879ae2e"
-      },
-      "role" : "HEDGING_PARTY"
+      } ],
+      "meta" : {
+        "globalKey" : "13098571"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-09-09",
+      "meta" : {
+        "globalKey" : "3eca49"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "b879ae2e"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "988417b5"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -98,6 +49,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-09-09",
                 "dateAdjustments" : {
                   "businessDayConvention" : "FOLLOWING",
                   "meta" : {
@@ -106,33 +58,75 @@
                 },
                 "meta" : {
                   "globalKey" : "bf745e7a"
+                }
+              },
+              "meta" : {
+                "globalKey" : "bf745e7a",
+                "externalKey" : "equityEffectiveDate"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-12-09",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
+                  "meta" : {
+                    "globalKey" : "d3bf0271"
+                  }
                 },
-                "unadjustedDate" : "2009-09-09"
+                "meta" : {
+                  "globalKey" : "bf772f3a"
+                }
               },
               "meta" : {
-                "externalKey" : "equityEffectiveDate",
-                "globalKey" : "bf745e7a"
+                "globalKey" : "bf772f3a"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "equityNotionalAmount"
+                  },
                   "meta" : {
                     "globalKey" : "54b65ddd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "equityNotionalAmount",
-                    "globalReference" : "4cf"
                   }
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-09-11",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -141,28 +135,24 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "ca88afa1"
-                      },
-                      "unadjustedDate" : "2009-09-11"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "interestEffectiveDate",
-                      "globalKey" : "ca88afa1"
+                      "globalKey" : "ca88afa1",
+                      "externalKey" : "interestEffectiveDate"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "interestCalcPeriodDates",
-                    "globalKey" : "db9ea582"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-12-11",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -171,132 +161,108 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "122b26e1"
-                      },
-                      "unadjustedDate" : "2009-12-11"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "interestTerminationDate",
-                      "globalKey" : "122b26e1"
+                      "globalKey" : "122b26e1",
+                      "externalKey" : "interestTerminationDate"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "db9ea582",
+                    "externalKey" : "interestCalcPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "b69ec785"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "interestLegPaymentDates",
-                    "globalKey" : "b3c2835f"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "b3c2835f"
-                      },
                       "periodicDates" : {
-                        "endDate" : {
-                          "meta" : {
-                            "globalKey" : "97eae877"
-                          },
+                        "startDate" : {
                           "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "97eae877"
+                              "globalKey" : "df205212"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "dateRelativeTo" : {
-                              "externalReference" : "interestTerminationDate",
-                              "globalReference" : "122b26e1"
+                              "globalReference" : "ca88afa1",
+                              "externalReference" : "interestEffectiveDate"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "df205212"
                           }
                         },
-                        "periodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "EUTA"
-                            } ],
+                        "endDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "20a71d"
+                              "globalKey" : "944b936f"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "122b26e1",
+                              "externalReference" : "interestTerminationDate"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
-                            "globalKey" : "211dc30c"
+                            "globalKey" : "944b936f"
                           }
                         },
                         "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "12ce6"
+                            "globalKey" : "18ce"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
                           "rollConvention" : "9"
                         },
-                        "startDate" : {
-                          "meta" : {
-                            "globalKey" : "e2bfa71a"
-                          },
-                          "relativeDate" : {
+                        "periodDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "EUTA"
+                            } ],
                             "meta" : {
-                              "globalKey" : "e2bfa71a"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "interestEffectiveDate",
-                              "globalReference" : "ca88afa1"
+                              "globalKey" : "20a71d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "211dc30c"
                           }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "5102c281"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "5102c281",
+                    "externalKey" : "interestLegPaymentDates"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "interestCalcPeriodDates",
-                    "globalReference" : "db9ea582"
+                    "globalReference" : "db9ea582",
+                    "externalReference" : "interestCalcPeriodDates"
                   },
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "36741a11"
+                      "globalKey" : "135004c5"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "CURRENCY_BUSINESS",
+                    "dayType" : "CurrencyBusiness",
+                    "businessDayConvention" : "PRECEDING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -305,99 +271,153 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "PRECEDING",
                     "dateRelativeTo" : {
-                      "externalReference" : "interestLegPaymentDates",
-                      "globalReference" : "b3c2835f"
+                      "globalReference" : "5102c281",
+                      "externalReference" : "interestLegPaymentDates"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "5dd36e9e"
-                  },
                   "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 1,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "f9c90e82"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "537ab965"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "3a1dd1bf"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "equityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "equityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "10da2"
-                  },
                   "settlementCurrency" : {
                     "value" : "EUR"
+                  },
+                  "meta" : {
+                    "globalKey" : "10da2"
                   }
                 },
-                "meta" : {
-                  "externalKey" : "returnLeg",
-                  "globalKey" : "d252b13a"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "99224396"
-                  },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "globalKey" : "815a0f35"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "815a0f35"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "EUTA"
-                          } ],
-                          "meta" : {
-                            "globalKey" : "20a71d"
-                          }
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "periodicDates" : {
+                        "startDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "9229ce57"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "bf745e7a",
+                              "externalReference" : "equityEffectiveDate"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "9229ce57"
+                          }
                         },
-                        "businessDayConvention" : "FOLLOWING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "finalValuationDate",
-                          "globalReference" : "bf772f3a"
+                        "endDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "b635d2a0"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "bf772f3a",
+                              "externalReference" : "finalValuationDate"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "b635d2a0"
+                          }
+                        },
+                        "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "18ce"
+                          },
+                          "rollConvention" : "9"
+                        },
+                        "periodDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "meta" : {
+                            "globalKey" : "d3bf0271"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "6e25f168",
+                        "externalKey" : "interimValuationDate"
                       }
                     },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "964475eb"
+                    "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                    "meta" : {
+                      "globalKey" : "2a105a71"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2009-12-09",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "meta" : {
+                            "globalKey" : "d3bf0271"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "bf772f3a"
+                        }
                       },
+                      "meta" : {
+                        "globalKey" : "bf772f3a",
+                        "externalKey" : "finalValuationDate"
+                      }
+                    },
+                    "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                    "meta" : {
+                      "globalKey" : "d2afe7a4"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
                       "relativeDates" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "964475eb"
+                          "globalKey" : "24ad6927"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -406,46 +426,47 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "interimValuationDate",
-                          "globalReference" : "edd10e00"
+                          "globalReference" : "6e25f168",
+                          "externalReference" : "interimValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "24ad6927"
                       }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendComposition" : "EQUITY_AMOUNT_RECEIVER_ELECTION",
-                    "dividendCurrency" : {
-                      "currencyReference" : {
-                        "externalReference" : "equityIssuerPaymentCurrency"
-                      }
-                    },
-                    "dividendPayoutRatio" : [ {
-                      "cashRatio" : 1,
-                      "nonCashRatio" : 1,
-                      "totalRatio" : 1
                     } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "CASH_SETTLEMENT_PAYMENT_DATE"
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "fc30271"
+                        },
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "EUTA"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "20a71d"
+                          }
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "bf772f3a",
+                          "externalReference" : "finalValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "fc30271"
                       }
-                    } ],
-                    "firstOrSecondPeriod" : "SECOND_PERIOD",
-                    "nonCashDividendTreatment" : "POTENTIAL_ADJUSTMENT_EVENT"
+                    }
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                  "meta" : {
+                    "globalKey" : "35da2aea"
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -463,334 +484,313 @@
                         "value" : "productIdentifier-3"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
-                    "meta" : {
-                      "globalKey" : "d2afe7a4"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "FOLLOWING",
-                          "meta" : {
-                            "globalKey" : "d3bf0271"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "bf772f3a"
-                        },
-                        "unadjustedDate" : "2009-12-09"
-                      },
-                      "meta" : {
-                        "externalKey" : "finalValuationDate",
-                        "globalKey" : "bf772f3a"
-                      }
-                    },
-                    "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
                   },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "a9bb7709"
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 1,
+                      "cashRatio" : 1,
+                      "nonCashRatio" : 1
+                    } ],
+                    "firstOrSecondPeriod" : "SecondPeriod",
+                    "dividendCurrency" : {
+                      "currencyReference" : {
+                        "externalReference" : "equityIssuerPaymentCurrency"
+                      }
                     },
-                    "valuationDates" : {
-                      "meta" : {
-                        "externalKey" : "interimValuationDate",
-                        "globalKey" : "edd10e00"
-                      },
-                      "periodicDates" : {
-                        "endDate" : {
-                          "meta" : {
-                            "globalKey" : "b9d527a8"
-                          },
-                          "relativeDate" : {
-                            "meta" : {
-                              "globalKey" : "b9d527a8"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "finalValuationDate",
-                              "globalReference" : "bf772f3a"
-                            }
-                          }
-                        },
-                        "periodDatesAdjustments" : {
-                          "businessDayConvention" : "FOLLOWING",
-                          "meta" : {
-                            "globalKey" : "d3bf0271"
-                          }
-                        },
-                        "periodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12ce6"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "9"
-                        },
-                        "startDate" : {
-                          "meta" : {
-                            "globalKey" : "95c9235f"
-                          },
-                          "relativeDate" : {
-                            "meta" : {
-                              "globalKey" : "95c9235f"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "equityEffectiveDate",
-                              "globalReference" : "bf745e7a"
-                            }
-                          }
+                    "nonCashDividendTreatment" : "PotentialAdjustmentEvent",
+                    "dividendComposition" : "EquityAmountReceiverElection",
+                    "dividendPeriod" : [ {
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "CashSettlementPaymentDate"
                         }
                       }
-                    },
-                    "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
-                  }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "FOLLOWING",
-                  "meta" : {
-                    "globalKey" : "d3bf0271"
+                    } ]
                   }
                 },
                 "meta" : {
-                  "globalKey" : "bf772f3a"
-                },
-                "unadjustedDate" : "2009-12-09"
-              },
+                  "globalKey" : "839931e8",
+                  "externalKey" : "returnLeg"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "bf772f3a"
+                "globalKey" : "4681a44d"
               }
             }
           },
           "meta" : {
-            "globalKey" : "e34bafd5"
+            "globalKey" : "4da2774d"
           }
         },
         "meta" : {
-          "globalKey" : "e34bafd5"
+          "globalKey" : "4da2774d"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "8b695f9a"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "affa401e"
+          "price" : [ {
+            "value" : {
+              "value" : 0,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              },
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Reuters"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
+                  "periodMultiplier" : 1,
                   "period" : "M",
-                  "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
+            },
+            "meta" : {
+              "globalKey" : "4f4caf8a"
             }
           },
+          "meta" : {
+            "globalKey" : "e0ca7e2e"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 10,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
+                "financialUnit" : "Share"
+              },
+              "priceType" : "AssetPrice"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 100000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          }, {
+            "value" : {
+              "value" : 1000000,
+              "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "priceType" : "INTEREST_RATE"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "b93f6441"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "ed6378f8"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "BMWG.DE",
                   "meta" : {
                     "scheme" : "http://www.example.com/instrument-id-Reuters-RIC-1-0"
-                  },
-                  "value" : "BMWG.DE"
+                  }
                 },
+                "source" : "RIC",
                 "meta" : {
                   "globalKey" : "305118e0"
-                },
-                "source" : "RIC"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
+                  "value" : "DE0005190003",
                   "meta" : {
                     "scheme" : "http://www.example.com/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "DE0005190003"
+                  }
                 },
+                "source" : "ISIN",
                 "meta" : {
                   "globalKey" : "d6dc5c0"
-                },
-                "source" : "ISIN"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-3"
+                  "value" : "productIdentifier-2"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "BMW ORD"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "b46c25d8"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
                 }
               },
-              "value" : 10,
-              "perUnitOf" : {
-                "financialUnit" : "SHARE"
-              },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 100000
-            }
-          }, {
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-3"
+                } ]
+              }
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 1000000
+              "globalKey" : "bf0ba608"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "fc5fc3c1"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eca49"
-      },
-      "value" : "2009-09-09"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "60beee7a",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "2f1783b5",
+          "externalReference" : "partyA"
+        }
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "SWAP1234",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id-1-0"
-          },
-          "value" : "1558488"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "1ba91055"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "988417b5"
+      "name" : {
+        "value" : "AAA Bank This is a test for agent language"
       },
       "meta" : {
-        "globalKey" : "fd937fe8"
+        "globalKey" : "2f1783b5",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "MEGA1234",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id-1-0"
-          },
-          "value" : "1558488"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "fd9b8bb4"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "b879ae2e"
+      "name" : {
+        "value" : "Mega Bank Ltd"
+      },
+      "meta" : {
+        "globalKey" : "60beee7a",
+        "externalKey" : "partyB"
+      }
+    } ],
+    "partyRole" : [ {
+      "partyReference" : {
+        "globalReference" : "60beee7a",
+        "externalReference" : "partyB"
       },
+      "role" : "HedgingParty"
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2009-09-01",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2009EquityEuropeanInterdealer"
+            },
+            "masterConfirmationAnnexType" : {
+              "value" : "ISDA2009EquityEuropeanInterdealerSS"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "3e010f70"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "fd937fe9"
+        "globalKey" : "3e010f70"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "ca7aa52"
+    }
+  },
+  "meta" : {
+    "globalKey" : "ca7aa52"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex01-fx-spot.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex01-fx-spot.json
index 897b8f70e6..8332691f8f 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex01-fx-spot.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex01-fx-spot.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "b5fc967f"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "b5fc967f"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "ff8d4b3e"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "ff8d4b3e",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "CITI123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5493000SCC07UI6DB380"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "ff8d4b3e"
+            "scheme" : "http://www.citi.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "695e25ab"
+        "globalKey" : "ef0f690c"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "695e25ab",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "BARC987",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "529900DTJ5A7S5UCBB52"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "695e25ab"
+            "scheme" : "http://www.barclays.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ac6412bc"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-10-23",
+      "meta" : {
+        "globalKey" : "3e8a97"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "695e25ab"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ff8d4b3e"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,35 +50,32 @@
             "payout" : {
               "forwardPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e8a99"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2001-10-25",
                     "meta" : {
                       "globalKey" : "3e8a99"
-                    },
-                    "valueDate" : "2001-10-25"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e8a99"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "81954c1b"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -102,18 +84,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -124,6 +106,9 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "81954c1b"
                 }
               } ],
               "meta" : {
@@ -141,103 +126,118 @@
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "879662ff"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 1.48,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 1.48,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 10000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 14800000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 14800000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "6b35fce1"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "695e25ab",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "ff8d4b3e",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8a97"
-      },
-      "value" : "2001-10-23"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "5493000SCC07UI6DB380",
           "meta" : {
-            "scheme" : "http://www.citi.com/fx/trade-id"
-          },
-          "value" : "CITI123"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "ff8d4b3e"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "ff8d4b3e"
-      },
       "meta" : {
-        "globalKey" : "cb14b42"
+        "globalKey" : "ff8d4b3e",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "529900DTJ5A7S5UCBB52",
           "meta" : {
-            "scheme" : "http://www.barclays.com/fx/trade-id"
-          },
-          "value" : "BARC987"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "695e25ab"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "695e25ab"
-      },
       "meta" : {
-        "globalKey" : "c5cd7054"
+        "globalKey" : "695e25ab",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "43f9b6bf"
+    }
+  },
+  "meta" : {
+    "globalKey" : "43f9b6bf"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex02-spot-cross-w-side-rates.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex02-spot-cross-w-side-rates.json
index 676a82d691..f96ea651a6 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex02-spot-cross-w-side-rates.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex02-spot-cross-w-side-rates.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "3775f4d1"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "3775f4d1"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "618c3061"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "618c3061",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "PARTYA345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.partyA.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "d502ec04"
+        "globalKey" : "d1241fee"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "d502ec04",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "CSFB9842",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "391200ZGI3FROE0WYF22"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "d502ec04"
+            "scheme" : "http://www.csfb.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "673ef37d"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-10-23",
+      "meta" : {
+        "globalKey" : "3e8a97"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "d502ec04"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "618c3061"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,56 +50,32 @@
             "payout" : {
               "forwardPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e8a99"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2001-10-25",
                     "meta" : {
                       "globalKey" : "3e8a99"
-                    },
-                    "valueDate" : "2001-10-25"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e8a99"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "9cf3fd80"
-                },
                 "underlier" : {
                   "foreignExchange" : {
-                    "exchangeRate" : {
-                      "crossRate" : [ {
-                        "currency1" : {
-                          "value" : "GBP"
-                        },
-                        "currency2" : {
-                          "value" : "USD"
-                        },
-                        "quoteBasis" : "CURRENCY_2_PER_CURRENCY_1",
-                        "rate" : 1.4800
-                      }, {
-                        "currency1" : {
-                          "value" : "USD"
-                        },
-                        "currency2" : {
-                          "value" : "EUR"
-                        },
-                        "quoteBasis" : "CURRENCY_1_PER_CURRENCY_2",
-                        "rate" : 0.9325
-                      } ]
-                    },
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -123,142 +84,181 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
                         "globalKey" : "b14144c1"
                       }
+                    },
+                    "exchangeRate" : {
+                      "crossRate" : [ {
+                        "currency1" : {
+                          "value" : "GBP"
+                        },
+                        "currency2" : {
+                          "value" : "USD"
+                        },
+                        "quoteBasis" : "Currency2PerCurrency1",
+                        "rate" : 1.4800
+                      }, {
+                        "currency1" : {
+                          "value" : "USD"
+                        },
+                        "currency2" : {
+                          "value" : "EUR"
+                        },
+                        "quoteBasis" : "Currency1PerCurrency2",
+                        "rate" : 0.9325
+                      } ]
                     }
                   },
                   "meta" : {
-                    "globalKey" : "390b5fb9"
+                    "globalKey" : "6f57a635"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "d34043fc"
                 }
               } ],
               "meta" : {
-                "globalKey" : "9cf3fd80"
+                "globalKey" : "d34043fc"
               }
             }
           },
           "meta" : {
-            "globalKey" : "9cf3fd80"
+            "globalKey" : "d34043fc"
           }
         },
         "meta" : {
-          "globalKey" : "9cf3fd80"
+          "globalKey" : "d34043fc"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "dce56ae5"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.630068,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.630068,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 10000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 6300680,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 6300680
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "bfc7f1bb"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "d502ec04",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "618c3061",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8a97"
-      },
-      "value" : "2001-10-23"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.partyA.com/fx/trade-id"
-          },
-          "value" : "PARTYA345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "618c3061"
-      },
       "meta" : {
-        "globalKey" : "bc73d1a4"
+        "globalKey" : "618c3061",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "391200ZGI3FROE0WYF22",
           "meta" : {
-            "scheme" : "http://www.csfb.com/fx/trade-id"
-          },
-          "value" : "CSFB9842"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "d502ec04"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "d502ec04"
-      },
       "meta" : {
-        "globalKey" : "357324d5"
+        "globalKey" : "d502ec04",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "e22def35"
+    }
+  },
+  "meta" : {
+    "globalKey" : "e22def35"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex03-fx-fwd.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex03-fx-fwd.json
index 489cfbeb54..342000d18b 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex03-fx-fwd.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex03-fx-fwd.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "cb068fe4"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "cb068fe4"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "cff0a7d6"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "cff0a7d6",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "ABN1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFXS5XCH7N0Y05NIXW11"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cff0a7d6"
+            "scheme" : "http://www.abn-amro.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "e05045d7"
+        "globalKey" : "78f19424"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "e05045d7",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DB5678",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "213800QILIUD4ROSUO03"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e05045d7"
+            "scheme" : "http://www.db.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "d3f7534"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-11-19",
+      "meta" : {
+        "globalKey" : "3e8ad3"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "cff0a7d6"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,35 +50,32 @@
             "payout" : {
               "forwardPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e8b15"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2001-12-21",
                     "meta" : {
                       "globalKey" : "3e8b15"
-                    },
-                    "valueDate" : "2001-12-21"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e8b15"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "90c7297"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -102,18 +84,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -124,6 +106,9 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "90c7297"
                 }
               } ],
               "meta" : {
@@ -141,109 +126,124 @@
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "1cc815e8"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.9175,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.9175,
-              "composite" : {
-                "arithmeticOperator" : "ADD",
-                "baseValue" : 0.9130,
-                "operand" : 0.0045,
-                "operandType" : "FORWARD_POINT"
-              },
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate",
+              "composite" : {
+                "baseValue" : 0.9130,
+                "operand" : 0.0045,
+                "arithmeticOperator" : "Add",
+                "operandType" : "ForwardPoint"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 10000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 9175000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 9175000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "2ab23d92"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "cff0a7d6",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8ad3"
-      },
-      "value" : "2001-11-19"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFXS5XCH7N0Y05NIXW11",
           "meta" : {
-            "scheme" : "http://www.abn-amro.com/fx/trade-id"
-          },
-          "value" : "ABN1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cff0a7d6"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "cff0a7d6"
-      },
       "meta" : {
-        "globalKey" : "a6b5105a"
+        "globalKey" : "cff0a7d6",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "213800QILIUD4ROSUO03",
           "meta" : {
-            "scheme" : "http://www.db.com/fx/trade-id"
-          },
-          "value" : "DB5678"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e05045d7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "e05045d7"
-      },
       "meta" : {
-        "globalKey" : "5d5a14cc"
+        "globalKey" : "e05045d7",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "31e6fa46"
+    }
+  },
+  "meta" : {
+    "globalKey" : "31e6fa46"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex04-fx-fwd-w-settlement.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex04-fx-fwd-w-settlement.json
index f82578f8c4..d36de5076c 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex04-fx-fwd-w-settlement.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex04-fx-fwd-w-settlement.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "e292a24f"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "e292a24f"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "ff8d4b3e"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "ff8d4b3e",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "FWD123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5493000SCC07UI6DB380"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "ff8d4b3e"
+            "scheme" : "http://www.citi.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "1006f88d"
+        "globalKey" : "11d75dd4"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "1006f88d",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "FXD2002987",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFM8T61CT2L1QCEMIK50"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "1006f88d"
+            "scheme" : "http://www.ubsw.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9a8224ba"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-11-12",
+      "meta" : {
+        "globalKey" : "3e8acc"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "1006f88d"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ff8d4b3e"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,35 +50,32 @@
             "payout" : {
               "forwardPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e9101"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2002-04-01",
                     "meta" : {
                       "globalKey" : "3e9101"
-                    },
-                    "valueDate" : "2002-04-01"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e9101"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "78f6f683"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -102,18 +84,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -124,6 +106,9 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "78f6f683"
                 }
               } ],
               "meta" : {
@@ -141,103 +126,118 @@
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "b6d6c79f"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 1.4643,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 1.4643,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 10000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 14643000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 14643000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "24022c41"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "1006f88d",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "ff8d4b3e",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8acc"
-      },
-      "value" : "2001-11-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "5493000SCC07UI6DB380",
           "meta" : {
-            "scheme" : "http://www.citi.com/fx/trade-id"
-          },
-          "value" : "FWD123"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "ff8d4b3e"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "ff8d4b3e"
-      },
       "meta" : {
-        "globalKey" : "9d4f2e0a"
+        "globalKey" : "ff8d4b3e",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFM8T61CT2L1QCEMIK50",
           "meta" : {
-            "scheme" : "http://www.ubsw.com/fx/trade-id"
-          },
-          "value" : "FXD2002987"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "1006f88d"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "1006f88d"
-      },
       "meta" : {
-        "globalKey" : "a4aefad2"
+        "globalKey" : "1006f88d",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "c70b344f"
+    }
+  },
+  "meta" : {
+    "globalKey" : "c70b344f"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex05-fx-fwd-w-ssi.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex05-fx-fwd-w-ssi.json
index 489cfbeb54..342000d18b 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex05-fx-fwd-w-ssi.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex05-fx-fwd-w-ssi.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "cb068fe4"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "cb068fe4"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "cff0a7d6"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "cff0a7d6",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "ABN1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFXS5XCH7N0Y05NIXW11"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cff0a7d6"
+            "scheme" : "http://www.abn-amro.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "e05045d7"
+        "globalKey" : "78f19424"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "e05045d7",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DB5678",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "213800QILIUD4ROSUO03"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e05045d7"
+            "scheme" : "http://www.db.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "d3f7534"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-11-19",
+      "meta" : {
+        "globalKey" : "3e8ad3"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "cff0a7d6"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,35 +50,32 @@
             "payout" : {
               "forwardPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e8b15"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2001-12-21",
                     "meta" : {
                       "globalKey" : "3e8b15"
-                    },
-                    "valueDate" : "2001-12-21"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e8b15"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "90c7297"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -102,18 +84,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -124,6 +106,9 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "90c7297"
                 }
               } ],
               "meta" : {
@@ -141,109 +126,124 @@
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "1cc815e8"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.9175,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.9175,
-              "composite" : {
-                "arithmeticOperator" : "ADD",
-                "baseValue" : 0.9130,
-                "operand" : 0.0045,
-                "operandType" : "FORWARD_POINT"
-              },
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate",
+              "composite" : {
+                "baseValue" : 0.9130,
+                "operand" : 0.0045,
+                "arithmeticOperator" : "Add",
+                "operandType" : "ForwardPoint"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 10000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 9175000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 9175000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "2ab23d92"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "cff0a7d6",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8ad3"
-      },
-      "value" : "2001-11-19"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFXS5XCH7N0Y05NIXW11",
           "meta" : {
-            "scheme" : "http://www.abn-amro.com/fx/trade-id"
-          },
-          "value" : "ABN1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cff0a7d6"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "cff0a7d6"
-      },
       "meta" : {
-        "globalKey" : "a6b5105a"
+        "globalKey" : "cff0a7d6",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "213800QILIUD4ROSUO03",
           "meta" : {
-            "scheme" : "http://www.db.com/fx/trade-id"
-          },
-          "value" : "DB5678"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e05045d7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "e05045d7"
-      },
       "meta" : {
-        "globalKey" : "5d5a14cc"
+        "globalKey" : "e05045d7",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "31e6fa46"
+    }
+  },
+  "meta" : {
+    "globalKey" : "31e6fa46"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex06-fx-fwd-w-splits.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex06-fx-fwd-w-splits.json
index 34bfb6e456..32f1b39610 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex06-fx-fwd-w-splits.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex06-fx-fwd-w-splits.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "fef8f6b9"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "fef8f6b9"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "e05045d7"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "e05045d7",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "FX048VS",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "213800QILIUD4ROSUO03"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e05045d7"
+            "scheme" : "http://www.db.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "cff0a7d6"
+        "globalKey" : "a55610f4"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "cff0a7d6",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "USABC023",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFXS5XCH7N0Y05NIXW11"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cff0a7d6"
+            "scheme" : "http://www.abn.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ac904d81"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-11-12",
+      "meta" : {
+        "globalKey" : "3e8acc"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "e05045d7"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "cff0a7d6"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,35 +50,32 @@
             "payout" : {
               "forwardPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e908e"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2002-02-14",
                     "meta" : {
                       "globalKey" : "3e908e"
-                    },
-                    "valueDate" : "2002-02-14"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e908e"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "541b0a90"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -102,18 +84,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -124,6 +106,9 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "541b0a90"
                 }
               } ],
               "meta" : {
@@ -141,103 +126,118 @@
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "8d74754f"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 1.1072,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 1.1072,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 13000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 13000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 14393600,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 14393600
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "211a3491"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "cff0a7d6",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8acc"
-      },
-      "value" : "2001-11-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "213800QILIUD4ROSUO03",
           "meta" : {
-            "scheme" : "http://www.db.com/fx/trade-id"
-          },
-          "value" : "FX048VS"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e05045d7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "e05045d7"
-      },
       "meta" : {
-        "globalKey" : "4bed992a"
+        "globalKey" : "e05045d7",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFXS5XCH7N0Y05NIXW11",
           "meta" : {
-            "scheme" : "http://www.abn.com/fx/trade-id"
-          },
-          "value" : "USABC023"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cff0a7d6"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "cff0a7d6"
-      },
       "meta" : {
-        "globalKey" : "6bd60dd9"
+        "globalKey" : "cff0a7d6",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "e3dce81d"
+    }
+  },
+  "meta" : {
+    "globalKey" : "e3dce81d"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex07-non-deliverable-forward.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex07-non-deliverable-forward.json
index d28bdd50a1..717b0c647c 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex07-non-deliverable-forward.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex07-non-deliverable-forward.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "c0ad9da3"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "c0ad9da3"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "618c3061"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "618c3061",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "PARTYA345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.partyA.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "d502ec04"
+        "globalKey" : "d1241fee"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "d502ec04",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "CSFB9842",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "391200ZGI3FROE0WYF22"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "d502ec04"
+            "scheme" : "http://www.csfb.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "673ef37d"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-01-09",
+      "meta" : {
+        "globalKey" : "3e9049"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "d502ec04"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "618c3061"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,22 +50,39 @@
             "payout" : {
               "forwardPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "ca3b0270"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
                   "settlementDate" : {
+                    "valueDate" : "2002-04-11",
                     "meta" : {
                       "globalKey" : "3e910b"
-                    },
-                    "valueDate" : "2002-04-11"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "90021356"
                   },
-                  "settlementType" : "CASH",
                   "cashSettlementTerms" : [ {
-                    "meta" : {
-                      "globalKey" : "8ebf28cc"
+                    "valuationMethod" : {
+                      "valuationSource" : {
+                        "quotedCurrencyPair" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "currencyPair-1"
+                          }
+                        },
+                        "informationSource" : {
+                          "primarySource" : {
+                            "sourceProvider" : {
+                              "value" : "Reuters"
+                            },
+                            "sourcePage" : {
+                              "value" : "RBIB"
+                            }
+                          }
+                        }
+                      }
                     },
                     "valuationDate" : {
                       "fxFixingDate" : {
@@ -89,10 +91,10 @@
                         },
                         "fxFixingDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2002-04-09",
                             "meta" : {
                               "globalKey" : "3e9109"
-                            },
-                            "unadjustedDate" : "2002-04-09"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "3e9109"
@@ -100,53 +102,33 @@
                         }
                       }
                     },
-                    "valuationMethod" : {
-                      "valuationSource" : {
-                        "informationSource" : {
-                          "primarySource" : {
-                            "sourcePage" : {
-                              "value" : "RBIB"
-                            },
-                            "sourceProvider" : {
-                              "value" : "REUTERS"
-                            }
-                          }
-                        },
-                        "quotedCurrencyPair" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "currencyPair-1"
-                          }
-                        }
-                      }
-                    },
                     "valuationTime" : {
+                      "hourMinuteTime" : "14:30:00",
                       "businessCenter" : {
                         "value" : "INMU"
-                      },
-                      "hourMinuteTime" : "14:30:00"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "548639b2"
                     }
                   } ]
                 },
-                "meta" : {
-                  "globalKey" : "69a1b972"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -155,18 +137,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -177,148 +159,166 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "3708a158"
                 }
               } ],
               "meta" : {
-                "globalKey" : "69a1b972"
+                "globalKey" : "3708a158"
               }
             }
           },
           "meta" : {
-            "globalKey" : "69a1b972"
+            "globalKey" : "3708a158"
           }
         },
         "meta" : {
-          "globalKey" : "69a1b972"
+          "globalKey" : "3708a158"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "c1c8ede9"
-          },
-          "observable" : {
-            "currencyPair" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "currencyPair-1"
-                } ]
-              },
-              "value" : {
-                "currency1" : {
-                  "value" : "USD"
-                },
-                "currency2" : {
-                  "value" : "INR"
-                },
-                "quoteBasis" : "CURRENCY_2_PER_CURRENCY_1"
-              }
-            },
-            "meta" : {
-              "globalKey" : "bf219d3"
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 43.40,
               "unit" : {
                 "currency" : {
                   "value" : "INR"
                 }
               },
-              "value" : 43.40,
-              "composite" : {
-                "arithmeticOperator" : "ADD",
-                "baseValue" : 43.35,
-                "operand" : 0.05,
-                "operandType" : "FORWARD_POINT"
-              },
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate",
+              "composite" : {
+                "baseValue" : 43.35,
+                "operand" : 0.05,
+                "arithmeticOperator" : "Add",
+                "operandType" : "ForwardPoint"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 434000000,
               "unit" : {
                 "currency" : {
                   "value" : "INR"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "currencyPair" : {
+              "value" : {
+                "currency1" : {
+                  "value" : "USD"
+                },
+                "currency2" : {
+                  "value" : "INR"
+                },
+                "quoteBasis" : "Currency2PerCurrency1"
               },
-              "value" : 434000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "currencyPair-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "7251208d"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "871a4e21"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "d502ec04",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "618c3061",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9049"
-      },
-      "value" : "2002-01-09"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.partyA.com/fx/trade-id"
-          },
-          "value" : "PARTYA345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "618c3061"
-      },
       "meta" : {
-        "globalKey" : "bc73d1a4"
+        "globalKey" : "618c3061",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "391200ZGI3FROE0WYF22",
           "meta" : {
-            "scheme" : "http://www.csfb.com/fx/trade-id"
-          },
-          "value" : "CSFB9842"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "d502ec04"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "d502ec04"
-      },
       "meta" : {
-        "globalKey" : "357324d5"
+        "globalKey" : "d502ec04",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "3a3a6dbf"
+    }
+  },
+  "meta" : {
+    "globalKey" : "3a3a6dbf"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex08-fx-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex08-fx-swap.json
index bdfdca624c..2df95161c9 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex08-fx-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex08-fx-swap.json
@@ -1,70 +1,55 @@
 {
-  "meta" : {
-    "globalKey" : "72038680"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "72038680"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "618c3061"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "618c3061",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "PARTYAUS33",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "e05045d7"
+        "globalKey" : "cf15004e"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "e05045d7",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DEUTDEFF",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "213800QILIUD4ROSUO03"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e05045d7"
+            "scheme" : "http://www.db.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "5246e55"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-01-23",
+      "meta" : {
+        "globalKey" : "3e9057"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "618c3061"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "FxSwap",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-type-simple"
-                },
-                "value" : "FxSwap"
+                }
               }
             }
           }, {
@@ -75,35 +60,32 @@
             "payout" : {
               "forwardPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e9059"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2002-01-25",
                     "meta" : {
                       "globalKey" : "3e9059"
-                    },
-                    "valueDate" : "2002-01-25"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e9059"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "f2fab1db"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -112,18 +94,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -134,38 +116,38 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "f2fab1db"
                 }
               }, {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e9099"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2002-02-25",
                     "meta" : {
                       "globalKey" : "3e9099"
-                    },
-                    "valueDate" : "2002-02-25"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e9099"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "c6b74017"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-4"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -174,18 +156,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-3"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -196,6 +178,9 @@
                   "meta" : {
                     "globalKey" : "f381ccfe"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "c6b74017"
                 }
               } ],
               "meta" : {
@@ -213,160 +198,175 @@
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "879662ff"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 1.48,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 1.48,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 10000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 14800000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 14800000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2fc7841f"
-          },
-          "price" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "6b35fce1"
+          }
+        }, {
+          "price" : [ {
             "value" : {
+              "value" : 1.5,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 1.5,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-4"
+                "value" : "price-2"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 10000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-3"
+                "value" : "quantity-4"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 15000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 15000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-3"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "c928ffc1"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "618c3061",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9057"
-      },
-      "value" : "2002-01-23"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "PARTYAUS33"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "618c3061"
-      },
       "meta" : {
-        "globalKey" : "1ae1a04"
+        "globalKey" : "618c3061",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "213800QILIUD4ROSUO03",
           "meta" : {
-            "scheme" : "http://www.db.com/swaps/trade-id"
-          },
-          "value" : "DEUTDEFF"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e05045d7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "e05045d7"
-      },
       "meta" : {
-        "globalKey" : "efe549ad"
+        "globalKey" : "e05045d7",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "a80b13a0"
+    }
+  },
+  "meta" : {
+    "globalKey" : "a80b13a0"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex09-euro-opt.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex09-euro-opt.json
index e8346c75f6..af3bef3c97 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex09-euro-opt.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex09-euro-opt.json
@@ -1,76 +1,55 @@
 {
-  "meta" : {
-    "globalKey" : "7a07c14c"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "23916eec"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyX",
-        "globalKey" : "cc5aba48"
-      },
-      "name" : {
-        "value" : "Party A"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "63373188",
+        "externalReference" : "partyX"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "IBFXO-0123456789",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-2-0"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyY",
-        "globalKey" : "ccc85952"
-      },
-      "name" : {
-        "value" : "ABN Amro"
+        "globalKey" : "bce1f9fc"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "20e9d9d2",
+        "externalReference" : "partyY"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "IBFXO-0123456789",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFXS5XCH7N0Y05NIXW11"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cff0a7d6"
+            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-2-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "bce26e5b"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-01-04",
+      "meta" : {
+        "globalKey" : "3e9044"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyX",
-          "globalReference" : "cc5aba48"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyY",
-          "globalReference" : "ccc85952"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "Delta-Put-FX-Option",
                 "meta" : {
                   "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/product-type-1-0"
-                },
-                "value" : "Delta-Put-FX-Option"
+                }
               }
             }
           }, {
@@ -79,28 +58,25 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "cd06d732"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e9186"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2002-06-06",
                     "meta" : {
                       "globalKey" : "3e9186"
-                    },
-                    "valueDate" : "2002-06-06"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e9186"
                   }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
                   "optionStyle" : {
@@ -108,10 +84,10 @@
                       "expirationDate" : [ {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2002-06-04",
                             "meta" : {
                               "globalKey" : "3e9184"
-                            },
-                            "value" : "2002-06-04"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -122,10 +98,10 @@
                         }
                       } ],
                       "expirationTime" : {
+                        "hourMinuteTime" : "14:00:00",
                         "businessCenter" : {
                           "value" : "USNY"
-                        },
-                        "hourMinuteTime" : "14:00:00"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "87bcb53f"
@@ -134,40 +110,37 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 0.4920,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.4920,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "AUD"
                         }
                       },
-                      "priceType" : "EXCHANGE_RATE"
+                      "priceType" : "ExchangeRate"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "cd06d732"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -176,18 +149,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -198,8 +171,14 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "cd06d732"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "cd06d732"
+              }
             }
           },
           "meta" : {
@@ -212,118 +191,139 @@
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3b8ff95e"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
             "value" : {
+              "value" : 75000000,
               "unit" : {
                 "currency" : {
                   "value" : "AUD"
                 }
-              },
-              "value" : 75000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 36900000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 36900000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "366f3262"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "63373188",
+          "externalReference" : "partyX"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "20e9d9d2",
+          "externalReference" : "partyY"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9044"
-      },
-      "value" : "2002-01-04"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-2-0"
-          },
-          "value" : "IBFXO-0123456789"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyX",
-        "globalReference" : "cc5aba48"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "6d966020"
+        "globalKey" : "63373188",
+        "externalKey" : "partyX"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFXS5XCH7N0Y05NIXW11",
           "meta" : {
-            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-2-0"
-          },
-          "value" : "IBFXO-0123456789"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cff0a7d6"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyY",
-        "globalReference" : "ccc85952"
+      "name" : {
+        "value" : "ABN Amro"
       },
       "meta" : {
-        "globalKey" : "6d966021"
+        "globalKey" : "20e9d9d2",
+        "externalKey" : "partyY"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "b3f1c064"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "e9a3b560"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyX",
-          "globalReference" : "cc5aba48"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyY",
-          "globalReference" : "ccc85952"
-        }
-      },
       "quantity" : {
+        "value" : 36900,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "63373188",
+          "externalReference" : "partyX"
         },
-        "value" : 36900
+        "receiverPartyReference" : {
+          "globalReference" : "20e9d9d2",
+          "externalReference" : "partyY"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-12-06",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-12-06"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "a34a46aa"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "bcda360e"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex10-amer-opt.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex10-amer-opt.json
index 7c71fcd0ad..19567418d0 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex10-amer-opt.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex10-amer-opt.json
@@ -1,76 +1,55 @@
 {
-  "meta" : {
-    "globalKey" : "e955730f"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "7b572ca1"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "9afed11c"
-      },
-      "name" : {
-        "value" : "PARTYA"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "bb7fd25c",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123456789",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://partyA.com/trades"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "ccc85952"
-      },
-      "name" : {
-        "value" : "ABN Amro"
+        "globalKey" : "262c8e4a"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "20e9d9d2",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "ABN1789",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFXS5XCH7N0Y05NIXW11"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cff0a7d6"
+            "scheme" : "http://adnamro.com/trade-ids"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "78f21be8"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-12-04",
+      "meta" : {
+        "globalKey" : "3e8b04"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "9afed11c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ccc85952"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "FxOption",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-type-simple"
-                },
-                "value" : "FxOption"
+                }
               }
             }
           }, {
@@ -79,35 +58,34 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "4d820386"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e9186"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2002-06-06",
                     "meta" : {
                       "globalKey" : "3e9186"
-                    },
-                    "valueDate" : "2002-06-06"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e9186"
                   }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-12-04",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USNY"
@@ -116,15 +94,13 @@
                                 "globalKey" : "27e4e9"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "212500d8"
                             }
                           },
                           "meta" : {
                             "globalKey" : "d018b854"
-                          },
-                          "unadjustedDate" : "2001-12-04"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "d018b854"
@@ -133,10 +109,10 @@
                       "expirationDate" : {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2002-06-04",
                             "meta" : {
                               "globalKey" : "3e9184"
-                            },
-                            "value" : "2002-06-04"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -147,10 +123,10 @@
                         }
                       },
                       "expirationTime" : {
+                        "hourMinuteTime" : "14:00:00",
                         "businessCenter" : {
                           "value" : "USNY"
-                        },
-                        "hourMinuteTime" : "14:00:00"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "bbf6de93"
@@ -159,40 +135,37 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 0.4920,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.4920,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "AUD"
                         }
                       },
-                      "priceType" : "EXCHANGE_RATE"
+                      "priceType" : "ExchangeRate"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "4d820386"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -201,18 +174,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -223,8 +196,14 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "4d820386"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "4d820386"
+              }
             }
           },
           "meta" : {
@@ -237,118 +216,139 @@
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3b8ff95e"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
             "value" : {
+              "value" : 75000000,
               "unit" : {
                 "currency" : {
                   "value" : "AUD"
                 }
-              },
-              "value" : 75000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 36900000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 36900000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "366f3262"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "bb7fd25c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "20e9d9d2",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8b04"
-      },
-      "value" : "2001-12-04"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://partyA.com/trades"
-          },
-          "value" : "123456789"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "9afed11c"
+      "name" : {
+        "value" : "PARTYA"
       },
       "meta" : {
-        "globalKey" : "f11a1900"
+        "globalKey" : "bb7fd25c",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFXS5XCH7N0Y05NIXW11",
           "meta" : {
-            "scheme" : "http://adnamro.com/trade-ids"
-          },
-          "value" : "ABN1789"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cff0a7d6"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "ccc85952"
+      "name" : {
+        "value" : "ABN Amro"
       },
       "meta" : {
-        "globalKey" : "a6fdde80"
+        "globalKey" : "20e9d9d2",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "206c523"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "54c9ccae"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "9afed11c"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ccc85952"
-        }
-      },
       "quantity" : {
+        "value" : 36900,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "bb7fd25c",
+          "externalReference" : "party1"
         },
-        "value" : 36900
+        "receiverPartyReference" : {
+          "globalReference" : "20e9d9d2",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-12-06",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-12-06"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "fdca569c"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "5d538ff"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex11-non-deliverable-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex11-non-deliverable-option.json
index 81955b73ec..815b292f25 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex11-non-deliverable-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex11-non-deliverable-option.json
@@ -1,70 +1,49 @@
 {
-  "meta" : {
-    "globalKey" : "66382d29"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "3e8a49be"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "9afed11c"
-      },
-      "name" : {
-        "value" : "PARTYA"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "bb7fd25c",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "IBFXO-0123456789",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-2-0"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "ccc85952"
-      },
-      "name" : {
-        "value" : "ABN Amro"
+        "globalKey" : "bcd03f83"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "20e9d9d2",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "IBFXO-0123456789",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFXS5XCH7N0Y05NIXW11"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cff0a7d6"
+            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-2-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "bcd0b3e2"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-01-15",
+      "meta" : {
+        "globalKey" : "3e884f"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "9afed11c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ccc85952"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "ForeignExchange:NDO"
@@ -76,30 +55,44 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "224a465c"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "f1100698"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
                   "settlementDate" : {
+                    "valueDate" : "2001-04-11",
                     "meta" : {
                       "globalKey" : "3e890b"
-                    },
-                    "valueDate" : "2001-04-11"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "6a218948"
                   },
                   "cashSettlementTerms" : [ {
-                    "meta" : {
-                      "globalKey" : "a73aefe7"
+                    "valuationMethod" : {
+                      "valuationSource" : {
+                        "quotedCurrencyPair" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "currencyPair-1"
+                          }
+                        },
+                        "informationSource" : {
+                          "primarySource" : {
+                            "sourceProvider" : {
+                              "value" : "Reuters"
+                            },
+                            "sourcePage" : {
+                              "value" : "VEB01"
+                            }
+                          }
+                        }
+                      }
                     },
                     "valuationDate" : {
                       "fxFixingDate" : {
@@ -108,10 +101,10 @@
                         },
                         "fxFixingDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2001-04-09",
                             "meta" : {
                               "globalKey" : "3e8909"
-                            },
-                            "unadjustedDate" : "2001-04-09"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "3e8909"
@@ -119,37 +112,20 @@
                         }
                       }
                     },
-                    "valuationMethod" : {
-                      "valuationSource" : {
-                        "informationSource" : {
-                          "primarySource" : {
-                            "sourcePage" : {
-                              "value" : "VEB01"
-                            },
-                            "sourceProvider" : {
-                              "value" : "REUTERS"
-                            }
-                          }
-                        },
-                        "quotedCurrencyPair" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "currencyPair-1"
-                          }
-                        }
-                      }
-                    },
                     "valuationTime" : {
+                      "hourMinuteTime" : "17:00:00",
                       "businessCenter" : {
                         "value" : "VECA"
-                      },
-                      "hourMinuteTime" : "17:00:00"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "204c7297"
                     }
                   } ]
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
                   "optionStyle" : {
@@ -157,10 +133,10 @@
                       "expirationDate" : [ {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2001-04-09",
                             "meta" : {
                               "globalKey" : "3e8909"
-                            },
-                            "value" : "2001-04-09"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -171,10 +147,10 @@
                         }
                       } ],
                       "expirationTime" : {
+                        "hourMinuteTime" : "10:00:00",
                         "businessCenter" : {
                           "value" : "USNY"
-                        },
-                        "hourMinuteTime" : "10:00:00"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "f3490a66"
@@ -183,40 +159,37 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 1.15,
                       "unit" : {
                         "currency" : {
                           "value" : "VEB"
                         }
                       },
-                      "value" : 1.15,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "EXCHANGE_RATE"
+                      "priceType" : "ExchangeRate"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "224a465c"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -225,18 +198,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -247,154 +220,181 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "dd7f1d0c"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "dd7f1d0c"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "69539036"
+            "globalKey" : "248866e6"
           }
         },
         "meta" : {
-          "globalKey" : "69539036"
+          "globalKey" : "248866e6"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "21691ec7"
-          },
-          "observable" : {
-            "currencyPair" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "currencyPair-1"
-                } ]
-              },
-              "value" : {
-                "currency1" : {
+          "quantity" : [ {
+            "value" : {
+              "value" : 17250000,
+              "unit" : {
+                "currency" : {
                   "value" : "VEB"
-                },
-                "currency2" : {
-                  "value" : "USD"
-                },
-                "quoteBasis" : "CURRENCY_1_PER_CURRENCY_2"
+                }
               }
             },
-            "meta" : {
-              "globalKey" : "24663b5b"
-            }
-          },
-          "quantity" : [ {
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 15000000,
               "unit" : {
                 "currency" : {
-                  "value" : "VEB"
+                  "value" : "USD"
                 }
-              },
-              "value" : 17250000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
+            }
+          } ],
+          "observable" : {
+            "currencyPair" : {
+              "value" : {
+                "currency1" : {
+                  "value" : "VEB"
+                },
+                "currency2" : {
                   "value" : "USD"
-                }
+                },
+                "quoteBasis" : "Currency1PerCurrency2"
               },
-              "value" : 15000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "currencyPair-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "68613005"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "33f327b1"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "bb7fd25c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "20e9d9d2",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e884f"
-      },
-      "value" : "2001-01-15"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-2-0"
-          },
-          "value" : "IBFXO-0123456789"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "9afed11c"
+      "name" : {
+        "value" : "PARTYA"
       },
       "meta" : {
-        "globalKey" : "6d965ff9"
+        "globalKey" : "bb7fd25c",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFXS5XCH7N0Y05NIXW11",
           "meta" : {
-            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-2-0"
-          },
-          "value" : "IBFXO-0123456789"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cff0a7d6"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "ccc85952"
+      "name" : {
+        "value" : "ABN Amro"
       },
       "meta" : {
-        "globalKey" : "6d965ffa"
+        "globalKey" : "20e9d9d2",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "308dada"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "bbd996eb"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "9afed11c"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ccc85952"
-        }
-      },
       "quantity" : {
+        "value" : 372750,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "bb7fd25c",
+          "externalReference" : "party1"
         },
-        "value" : 372750
+        "receiverPartyReference" : {
+          "globalReference" : "20e9d9d2",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-01-17",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-01-17"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "e7ca0335"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "73279b8f"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex12-fx-barrier-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex12-fx-barrier-option.json
index 08331161d1..80e9332f44 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex12-fx-barrier-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex12-fx-barrier-option.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "e9cb9a"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "6bd4f765"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "618c3061"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "618c3061",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "PARTYAUS33",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "e05045d7"
+        "globalKey" : "cf15004e"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "e05045d7",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DEUTDEFF",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "213800QILIUD4ROSUO03"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e05045d7"
+            "scheme" : "http://www.db.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "5246e55"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-08-16",
+      "meta" : {
+        "globalKey" : "3e8a10"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "618c3061"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,28 +48,25 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "35667840"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e9088"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2002-02-08",
                     "meta" : {
                       "globalKey" : "3e9088"
-                    },
-                    "valueDate" : "2002-02-08"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e9088"
                   }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
                   "optionStyle" : {
@@ -92,10 +74,10 @@
                       "expirationDate" : [ {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2002-02-06",
                             "meta" : {
                               "globalKey" : "3e9086"
-                            },
-                            "value" : "2002-02-06"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -106,10 +88,10 @@
                         }
                       } ],
                       "expirationTime" : {
+                        "hourMinuteTime" : "10:00:00",
                         "businessCenter" : {
                           "value" : "USNY"
-                        },
-                        "hourMinuteTime" : "10:00:00"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "f3490a66"
@@ -118,43 +100,40 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 0.9,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.9,
-                      "composite" : {
-                        "baseValue" : 0.8935
-                      },
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "priceType" : "EXCHANGE_RATE"
+                      "priceType" : "ExchangeRate",
+                      "composite" : {
+                        "baseValue" : 0.8935
+                      }
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "35667840"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -163,18 +142,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -185,132 +164,153 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "958be4a2"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "958be4a2"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "35667840"
+            "globalKey" : "958be4a2"
           }
         },
         "meta" : {
-          "globalKey" : "35667840"
+          "globalKey" : "958be4a2"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "b81d9e84"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
             "value" : {
+              "value" : 4500000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 4500000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "4b9631fc"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "618c3061",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8a10"
-      },
-      "value" : "2001-08-16"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "PARTYAUS33"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "618c3061"
-      },
       "meta" : {
-        "globalKey" : "1ae1a04"
+        "globalKey" : "618c3061",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "213800QILIUD4ROSUO03",
           "meta" : {
-            "scheme" : "http://www.db.com/swaps/trade-id"
-          },
-          "value" : "DEUTDEFF"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e05045d7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "e05045d7"
-      },
       "meta" : {
-        "globalKey" : "efe549ad"
+        "globalKey" : "e05045d7",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "d9ed9d1d"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "d98c0375"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "618c3061"
-        }
-      },
       "quantity" : {
+        "value" : 45000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
         },
-        "value" : 45000
+        "receiverPartyReference" : {
+          "globalReference" : "618c3061",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-11-06",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-11-06"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "8cc25bb5"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "6fafcb92"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex20-avg-rate-option-parametric.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex20-avg-rate-option-parametric.json
index f4c9d657dd..4d36614444 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex20-avg-rate-option-parametric.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex20-avg-rate-option-parametric.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "201b3f50"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "14aadbc1"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "618c3061"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "618c3061",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "PA-12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.partyA.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "e05045d7"
+        "globalKey" : "c9e1a36c"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "e05045d7",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DB-98765",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "213800QILIUD4ROSUO03"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e05045d7"
+            "scheme" : "http://www.db.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "20adbe1c"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-08-16",
+      "meta" : {
+        "globalKey" : "3e8a10"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "618c3061"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,28 +48,25 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "d03e3150"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e8b04"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2001-12-04",
                     "meta" : {
                       "globalKey" : "3e8b04"
-                    },
-                    "valueDate" : "2001-12-04"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e8b04"
                   }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
                   "optionStyle" : {
@@ -92,10 +74,10 @@
                       "expirationDate" : [ {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2001-11-30",
                             "meta" : {
                               "globalKey" : "3e8ade"
-                            },
-                            "value" : "2001-11-30"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -106,10 +88,10 @@
                         }
                       } ],
                       "expirationTime" : {
+                        "hourMinuteTime" : "12:30:00",
                         "businessCenter" : {
                           "value" : "MXMC"
-                        },
-                        "hourMinuteTime" : "12:30:00"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "300dc62e"
@@ -118,92 +100,37 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 9.82,
                       "unit" : {
                         "currency" : {
                           "value" : "MXN"
                         }
                       },
-                      "value" : 9.82,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "EXCHANGE_RATE"
-                    }
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "d03e3150"
-                },
-                "observationTerms" : {
-                  "informationSource" : {
-                    "primarySource" : {
-                      "sourcePage" : {
-                        "value" : "BNBX"
-                      },
-                      "sourceProvider" : {
-                        "value" : "REUTERS"
-                      }
-                    }
-                  },
-                  "observationDates" : {
-                    "periodicSchedule" : {
-                      "endDate" : {
-                        "adjustableDate" : {
-                          "meta" : {
-                            "globalKey" : "3e8ade"
-                          },
-                          "unadjustedDate" : "2001-11-30"
-                        },
-                        "meta" : {
-                          "globalKey" : "3e8ade"
-                        }
-                      },
-                      "periodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "25e2ab"
-                        },
-                        "period" : "T",
-                        "periodMultiplier" : 1,
-                        "rollConvention" : "NONE"
-                      },
-                      "startDate" : {
-                        "adjustableDate" : {
-                          "meta" : {
-                            "globalKey" : "3e8ac1"
-                          },
-                          "unadjustedDate" : "2001-11-01"
-                        },
-                        "meta" : {
-                          "globalKey" : "3e8ac1"
-                        }
-                      }
+                      "priceType" : "ExchangeRate"
                     }
-                  },
-                  "pricingTime" : {
-                    "businessCenter" : {
-                      "value" : "MXMC"
-                    },
-                    "hourMinuteTime" : "18:00:00"
                   }
                 },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -212,18 +139,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -234,132 +161,205 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "observationTerms" : {
+                  "pricingTime" : {
+                    "hourMinuteTime" : "18:00:00",
+                    "businessCenter" : {
+                      "value" : "MXMC"
+                    }
+                  },
+                  "informationSource" : {
+                    "primarySource" : {
+                      "sourceProvider" : {
+                        "value" : "Reuters"
+                      },
+                      "sourcePage" : {
+                        "value" : "BNBX"
+                      }
+                    }
+                  },
+                  "observationDates" : {
+                    "periodicSchedule" : {
+                      "startDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2001-11-01",
+                          "meta" : {
+                            "globalKey" : "3e8ac1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "3e8ac1"
+                        }
+                      },
+                      "endDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2001-11-30",
+                          "meta" : {
+                            "globalKey" : "3e8ade"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "3e8ade"
+                        }
+                      },
+                      "periodFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "T",
+                        "meta" : {
+                          "globalKey" : "24b525"
+                        },
+                        "rollConvention" : "NONE"
+                      }
+                    }
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "25242416"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "25242416"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "d03e3150"
+            "globalKey" : "25242416"
           }
         },
         "meta" : {
-          "globalKey" : "d03e3150"
+          "globalKey" : "25242416"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "4cd5bb17"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
             "value" : {
+              "value" : 5750000,
               "unit" : {
                 "currency" : {
                   "value" : "MXN"
                 }
-              },
-              "value" : 5750000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 585539.71,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 585539.71
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "4de1a7c9"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "618c3061",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8a10"
-      },
-      "value" : "2001-08-16"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.partyA.com/fx/trade-id"
-          },
-          "value" : "PA-12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "618c3061"
-      },
       "meta" : {
-        "globalKey" : "7bde6da2"
+        "globalKey" : "618c3061",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "213800QILIUD4ROSUO03",
           "meta" : {
-            "scheme" : "http://www.db.com/fx/trade-id"
-          },
-          "value" : "DB-98765"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e05045d7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "e05045d7"
-      },
       "meta" : {
-        "globalKey" : "4e59c3b4"
+        "globalKey" : "e05045d7",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "1a38d4e7"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "52dd71cf"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "618c3061"
-        }
-      },
       "quantity" : {
+        "value" : 1750,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
         },
-        "value" : 1750
+        "receiverPartyReference" : {
+          "globalReference" : "618c3061",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-08-18",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-08-18"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "4674d8b3"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "f05ee1da"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex22-avg-rate-option-specific.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex22-avg-rate-option-specific.json
index 4cb0d3ca6c..37c027deeb 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex22-avg-rate-option-specific.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex22-avg-rate-option-specific.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "d3b88b69"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "ce21e41a"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "38cb9fc3"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "38cb9fc3",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "CH-23948",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "7H6GLXDRUGQFU57RNE97"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "38cb9fc3"
+            "scheme" : "http://www.chase.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "e05045d7"
+        "globalKey" : "f5cc9d49"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "e05045d7",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DB-89080",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "213800QILIUD4ROSUO03"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e05045d7"
+            "scheme" : "http://www.db.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "20a000ec"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2010-08-16",
+      "meta" : {
+        "globalKey" : "3ed210"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "38cb9fc3"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,28 +48,25 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "a3f92825"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3ed304"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2010-12-04",
                     "meta" : {
                       "globalKey" : "3ed304"
-                    },
-                    "valueDate" : "2010-12-04"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3ed304"
                   }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
                   "optionStyle" : {
@@ -92,10 +74,10 @@
                       "expirationDate" : [ {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2010-11-30",
                             "meta" : {
                               "globalKey" : "3ed2de"
-                            },
-                            "value" : "2010-11-30"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -106,10 +88,10 @@
                         }
                       } ],
                       "expirationTime" : {
+                        "hourMinuteTime" : "12:30:00",
                         "businessCenter" : {
                           "value" : "MXMC"
-                        },
-                        "hourMinuteTime" : "12:30:00"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "300dc62e"
@@ -118,32 +100,82 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 12.40,
                       "unit" : {
                         "currency" : {
                           "value" : "MXN"
                         }
                       },
-                      "value" : 12.40,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "EXCHANGE_RATE"
+                      "priceType" : "ExchangeRate"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "a3f92825"
+                "underlier" : {
+                  "foreignExchange" : {
+                    "exchangedCurrency1" : {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "priceQuantity" : {
+                        "quantitySchedule" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "quantity-2"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "b141411f"
+                      }
+                    },
+                    "exchangedCurrency2" : {
+                      "payerReceiver" : {
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
+                      },
+                      "priceQuantity" : {
+                        "quantitySchedule" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "quantity-1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "b14144c1"
+                      }
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "c086df02"
+                  }
                 },
                 "observationTerms" : {
+                  "pricingTime" : {
+                    "hourMinuteTime" : "18:00:00",
+                    "businessCenter" : {
+                      "value" : "MXMC"
+                    }
+                  },
                   "informationSource" : {
                     "primarySource" : {
+                      "sourceProvider" : {
+                        "value" : "Reuters"
+                      },
                       "sourcePage" : {
                         "value" : "BNBX"
-                      },
-                      "sourceProvider" : {
-                        "value" : "REUTERS"
                       }
                     }
                   },
@@ -151,340 +183,308 @@
                     "observationSchedule" : {
                       "observationDate" : [ {
                         "adjustedDate" : "2010-11-01",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b8590"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-02",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b85af"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-03",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b85ce"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-04",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b85ed"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-05",
+                        "weight" : 3,
                         "meta" : {
                           "globalKey" : "79b860e"
-                        },
-                        "weight" : 3
+                        }
                       }, {
                         "adjustedDate" : "2010-11-08",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b8669"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-09",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b8688"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-10",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b86a7"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-11",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b86c6"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-12",
+                        "weight" : 3,
                         "meta" : {
                           "globalKey" : "79b86e7"
-                        },
-                        "weight" : 3
+                        }
                       }, {
                         "adjustedDate" : "2010-11-15",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b8742"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-16",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b8761"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-17",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b8780"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-18",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b879f"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-19",
+                        "weight" : 3,
                         "meta" : {
                           "globalKey" : "79b87c0"
-                        },
-                        "weight" : 3
+                        }
                       }, {
                         "adjustedDate" : "2010-11-22",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b881b"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-23",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b883a"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-24",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b8859"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-25",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b8878"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-26",
+                        "weight" : 3,
                         "meta" : {
                           "globalKey" : "79b8899"
-                        },
-                        "weight" : 3
+                        }
                       }, {
                         "adjustedDate" : "2010-11-29",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b88f4"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-30",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b8913"
-                        },
-                        "weight" : 1
+                        }
                       } ]
                     }
-                  },
-                  "pricingTime" : {
-                    "businessCenter" : {
-                      "value" : "MXMC"
-                    },
-                    "hourMinuteTime" : "18:00:00"
                   }
                 },
-                "underlier" : {
-                  "foreignExchange" : {
-                    "exchangedCurrency1" : {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
-                      },
-                      "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "quantitySchedule" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "quantity-2"
-                          }
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "b141411f"
-                      }
-                    },
-                    "exchangedCurrency2" : {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
-                      },
-                      "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "quantitySchedule" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "quantity-1"
-                          }
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "b14144c1"
-                      }
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "c086df02"
-                  }
+                "meta" : {
+                  "globalKey" : "4ae0ab61"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "4ae0ab61"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "a3f92825"
+            "globalKey" : "4ae0ab61"
           }
         },
         "meta" : {
-          "globalKey" : "a3f92825"
+          "globalKey" : "4ae0ab61"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "43d0bd20"
-          },
-          "observable" : {
-            "currencyPair" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "currencyPair-1"
-                } ]
-              },
-              "value" : {
-                "currency1" : {
+          "quantity" : [ {
+            "value" : {
+              "value" : 5750000,
+              "unit" : {
+                "currency" : {
                   "value" : "MXN"
-                },
-                "currency2" : {
-                  "value" : "USD"
-                },
-                "quoteBasis" : "CURRENCY_1_PER_CURRENCY_2"
+                }
               }
             },
-            "meta" : {
-              "globalKey" : "23f037eb"
-            }
-          },
-          "quantity" : [ {
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 463709.68,
               "unit" : {
                 "currency" : {
-                  "value" : "MXN"
+                  "value" : "USD"
                 }
-              },
-              "value" : 5750000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
+            }
+          } ],
+          "observable" : {
+            "currencyPair" : {
+              "value" : {
+                "currency1" : {
+                  "value" : "MXN"
+                },
+                "currency2" : {
                   "value" : "USD"
-                }
+                },
+                "quoteBasis" : "Currency1PerCurrency2"
               },
-              "value" : 463709.68
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "currencyPair-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "5a16c575"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "81a3b3aa"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "38cb9fc3",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ed210"
-      },
-      "value" : "2010-08-16"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "7H6GLXDRUGQFU57RNE97",
           "meta" : {
-            "scheme" : "http://www.chase.com/fx/trade-id"
-          },
-          "value" : "CH-23948"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "38cb9fc3"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "38cb9fc3"
-      },
       "meta" : {
-        "globalKey" : "58f2643f"
+        "globalKey" : "38cb9fc3",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "213800QILIUD4ROSUO03",
           "meta" : {
-            "scheme" : "http://www.db.com/fx/trade-id"
-          },
-          "value" : "DB-89080"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e05045d7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "e05045d7"
-      },
       "meta" : {
-        "globalKey" : "1ac69284"
+        "globalKey" : "e05045d7",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "7fe08ac6"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "4979b9cf"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "38cb9fc3"
-        }
-      },
       "quantity" : {
+        "value" : 1750,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
         },
-        "value" : 1750
+        "receiverPartyReference" : {
+          "globalReference" : "38cb9fc3",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2010-08-18",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2010-08-18"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "3d1120b3"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "6f6ac5f9"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex28-non-deliverable-w-disruption.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex28-non-deliverable-w-disruption.json
index 410bbbdb33..0899b91d28 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex28-non-deliverable-w-disruption.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/fx/fx-ex28-non-deliverable-w-disruption.json
@@ -1,58 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "9a53abdf"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "9a53abdf"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "d26b18a8"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "d26b18a8",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345678",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "HSBCGB01"
-        },
-        "meta" : {
-          "globalKey" : "d26b18a8"
+            "scheme" : "urn:hsbc:trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "733fed68"
+        "globalKey" : "26887e99"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "733fed68",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "AZ5678901",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "BNPPGB01"
-        },
-        "meta" : {
-          "globalKey" : "733fed68"
+            "scheme" : "run:bnpp/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "12f63b93"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2013-04-01",
+      "meta" : {
+        "globalKey" : "3ee901"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "733fed68"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "d26b18a8"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,22 +50,28 @@
             "payout" : {
               "forwardPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "63a40815"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
                   "settlementDate" : {
+                    "valueDate" : "2013-10-01",
                     "meta" : {
                       "globalKey" : "3eea81"
-                    },
-                    "valueDate" : "2013-10-01"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "78df60d7"
                   },
-                  "settlementType" : "CASH",
                   "cashSettlementTerms" : [ {
-                    "meta" : {
-                      "globalKey" : "9a6d21ef"
+                    "valuationMethod" : {
+                      "valuationSource" : {
+                        "settlementRateOption" : {
+                          "settlementRateOption" : {
+                            "value" : "BRL.PTAX/BRL09"
+                          }
+                        }
+                      }
                     },
                     "valuationDate" : {
                       "fxFixingDate" : {
@@ -87,6 +80,7 @@
                         },
                         "fxFixingDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2013-09-29",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -95,8 +89,7 @@
                             },
                             "meta" : {
                               "globalKey" : "ec526e55"
-                            },
-                            "unadjustedDate" : "2013-09-29"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ec526e55"
@@ -104,36 +97,27 @@
                         }
                       }
                     },
-                    "valuationMethod" : {
-                      "valuationSource" : {
-                        "settlementRateOption" : {
-                          "settlementRateOption" : {
-                            "value" : "BRL.PTAX/BRL09"
-                          }
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "afa87ab1"
                     }
                   } ]
                 },
-                "meta" : {
-                  "globalKey" : "fedbde62"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -142,18 +126,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -161,136 +145,152 @@
                       }
                     },
                     "tenorPeriod" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
+                      "periodMultiplier" : 6,
                       "period" : "M",
-                      "periodMultiplier" : 6
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "8f19b317"
+                    "globalKey" : "8f19aac5"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "810fa10e"
                 }
               } ],
               "meta" : {
-                "globalKey" : "fedbde62"
+                "globalKey" : "810fa10e"
               }
             }
           },
           "meta" : {
-            "globalKey" : "fedbde62"
+            "globalKey" : "810fa10e"
           }
         },
         "meta" : {
-          "globalKey" : "fedbde62"
+          "globalKey" : "810fa10e"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "ce6b2c41"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.7690,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.7690,
-              "composite" : {
-                "arithmeticOperator" : "ADD",
-                "baseValue" : 0.7645,
-                "operand" : 0.0045,
-                "operandType" : "FORWARD_POINT"
-              },
               "perUnitOf" : {
                 "currency" : {
                   "value" : "BRL"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate",
+              "composite" : {
+                "baseValue" : 0.7645,
+                "operand" : 0.0045,
+                "arithmeticOperator" : "Add",
+                "operandType" : "ForwardPoint"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 3000000,
               "unit" : {
                 "currency" : {
                   "value" : "BRL"
                 }
-              },
-              "value" : 3000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 2307000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 2307000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "1143e58d"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "733fed68",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "d26b18a8",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee901"
-      },
-      "value" : "2013-04-01"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "HSBCGB01",
           "meta" : {
-            "scheme" : "urn:hsbc:trade-id"
-          },
-          "value" : "12345678"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "d26b18a8"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "d26b18a8"
-      },
       "meta" : {
-        "globalKey" : "4a3b318f"
+        "globalKey" : "d26b18a8",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BNPPGB01",
           "meta" : {
-            "scheme" : "run:bnpp/trade-id"
-          },
-          "value" : "AZ5678901"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "733fed68"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "733fed68"
-      },
       "meta" : {
-        "globalKey" : "d078bf6b"
+        "globalKey" : "733fed68",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "f86fd835"
+    }
+  },
+  "meta" : {
+    "globalKey" : "f86fd835"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex01-yoy.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex01-yoy.json
index ba20c69e87..4c10db12b7 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex01-yoy.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex01-yoy.json
@@ -1,96 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "3e3cb24e"
-  },
   "trade" : {
-    "account" : [ {
-      "accountBeneficiary" : {
-        "externalReference" : "party1",
-        "globalReference" : "2ca0033"
-      },
-      "accountName" : {
-        "value" : "PRIMARY_ACCOUNT"
-      },
-      "accountNumber" : {
-        "value" : "PRIM_450"
-      },
-      "meta" : {
-        "externalKey" : "primaryAct1",
-        "globalKey" : "b222fdf1"
-      }
-    }, {
-      "accountBeneficiary" : {
-        "externalReference" : "party2",
-        "globalReference" : "312ceee"
-      },
-      "accountName" : {
-        "value" : "CROSS_ACCOUNT"
-      },
-      "accountNumber" : {
-        "value" : "CROSS_560"
-      },
-      "meta" : {
-        "externalKey" : "crossAct1",
-        "globalKey" : "3070a28a"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "2d1dc400"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "2ca0033"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "2ca0033",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "E2000098N10184",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "12345"
-        },
-        "meta" : {
-          "globalKey" : "2ca0033"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "312ceee"
+        "globalKey" : "3e06abe1"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "312ceee",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "67890"
-        },
-        "meta" : {
-          "globalKey" : "312ceee"
+            "scheme" : "http://www.barclays.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9591fab6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2003-11-15",
+      "meta" : {
+        "globalKey" : "3e9acf"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "2ca0033"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "312ceee"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "2ca0033"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -98,52 +47,47 @@
             "productQualifier" : "InterestRate_InflationSwap_FixedFloat_YearOn_Year"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b915"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "20"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2003-11-20",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -152,27 +96,23 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e0f0b49a"
-                      },
-                      "unadjustedDate" : "2003-11-20"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e0f0b49a"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "N104F4",
-                    "globalKey" : "9ba2e637"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2007-11-20",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -181,33 +121,20 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "7c04949a"
-                      },
-                      "unadjustedDate" : "2007-11-20"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "7c04949a"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "c15d090c"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4d64aef4"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -216,76 +143,114 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "17965"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "20"
+                  },
+                  "meta" : {
+                    "globalKey" : "1b71c89f",
+                    "externalKey" : "N104F4"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "9b0d9350"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "739c45a"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "inflationRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
-                    }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c47"
+                      "globalKey" : "371abac6"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "20"
-                  },
+                    "inflationLag" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "indexSource" : {
+                      "value" : "CPURNSA",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/inflation-index-source-1-0"
+                      }
+                    },
+                    "mainPublication" : {
+                      "value" : "BLS",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/inflation-main-publication-1-0"
+                      }
+                    },
+                    "interpolationMethod" : {
+                      "value" : "LinearZeroYield"
+                    },
+                    "fallbackBondApplicable" : true
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "1/1"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2003-11-20",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -294,27 +259,23 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e0f0b49a"
-                      },
-                      "unadjustedDate" : "2003-11-20"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e0f0b49a"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "N101C1",
-                    "globalKey" : "80ca1569"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2007-11-20",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -323,34 +284,20 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "7c04949a"
-                      },
-                      "unadjustedDate" : "2007-11-20"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "7c04949a"
                     }
-                  }
-                },
-                "compoundingMethod" : "NONE",
-                "dayCountFraction" : {
-                  "value" : "1/1"
-                },
-                "meta" : {
-                  "globalKey" : "f82456e6"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4d64aef4"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -359,221 +306,270 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "17f73"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "20"
+                  },
+                  "meta" : {
+                    "globalKey" : "1b71cead",
+                    "externalKey" : "N101C1"
                   }
                 },
-                "rateSpecification" : {
-                  "inflationRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "6728d4ce"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "fallbackBondApplicable" : true,
-                    "indexSource" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/inflation-index-source-1-0"
-                      },
-                      "value" : "CPURNSA"
-                    },
-                    "inflationLag" : {
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
                       "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    },
-                    "interpolationMethod" : {
-                      "value" : "LINEAR_ZERO_YIELD"
+                        "globalKey" : "20a71d"
+                      }
                     },
-                    "mainPublication" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/inflation-main-publication-1-0"
-                      },
-                      "value" : "BLS"
+                    "meta" : {
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "9b0d9350"
                   }
+                },
+                "compoundingMethod" : "None",
+                "meta" : {
+                  "globalKey" : "201c7bbe"
                 }
               } ],
               "meta" : {
-                "globalKey" : "299d105a"
+                "globalKey" : "b14f5a24"
               }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "6510a430"
+            "globalKey" : "e72d4a0e"
           }
         },
         "meta" : {
-          "globalKey" : "6510a430"
+          "globalKey" : "e72d4a0e"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a82a58a1"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.01,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 1000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "5d20bb7f"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 1000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 1000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "e37d195b"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "fd217876"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "inflationRateIndex" : {
+                  "value" : "USA-CPI-U",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/inflation-index-description-2-0"
-                  },
-                  "value" : "USA-CPI-U"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 1000000
+            "meta" : {
+              "globalKey" : "a70d964a"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "30ade99"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "312ceee",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "2ca0033",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "2ca0033",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9acf"
-      },
-      "value" : "2003-11-15"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "E2000098N10184"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "2ca0033"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "2ca0033"
-      },
       "meta" : {
-        "globalKey" : "7ae32cd7"
+        "globalKey" : "2ca0033",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "67890",
           "meta" : {
-            "scheme" : "http://www.barclays.com/swaps/trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "312ceee"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "312ceee"
+      "meta" : {
+        "globalKey" : "312ceee",
+        "externalKey" : "party2"
+      }
+    } ],
+    "account" : [ {
+      "accountNumber" : {
+        "value" : "PRIM_450"
+      },
+      "accountName" : {
+        "value" : "PRIMARY_ACCOUNT"
+      },
+      "accountBeneficiary" : {
+        "globalReference" : "2ca0033",
+        "externalReference" : "party1"
+      },
+      "meta" : {
+        "globalKey" : "7695b071",
+        "externalKey" : "primaryAct1"
+      }
+    }, {
+      "accountNumber" : {
+        "value" : "CROSS_560"
+      },
+      "accountName" : {
+        "value" : "CROSS_ACCOUNT"
+      },
+      "accountBeneficiary" : {
+        "globalReference" : "312ceee",
+        "externalReference" : "party2"
       },
       "meta" : {
-        "globalKey" : "1b2141ce"
+        "globalKey" : "dc8b808a",
+        "externalKey" : "crossAct1"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "917a99fe"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "c457f64e"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "2ca0033"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "312ceee"
-        }
-      },
       "quantity" : {
+        "value" : 10000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "2ca0033",
+          "externalReference" : "party1"
         },
-        "value" : 10000
+        "receiverPartyReference" : {
+          "globalReference" : "312ceee",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2003-11-20",
         "dateAdjustments" : {
+          "businessDayConvention" : "MODFOLLOWING",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "EUTA"
@@ -582,16 +578,20 @@
               "globalKey" : "20a71d"
             }
           },
-          "businessDayConvention" : "MODFOLLOWING",
           "meta" : {
             "globalKey" : "365baaee"
           }
-        },
-        "unadjustedDate" : "2003-11-20"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "e8015582"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "4bff8644"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex02-yoy-bond-reference.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex02-yoy-bond-reference.json
index 88080625d0..0511b4cf80 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex02-yoy-bond-reference.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex02-yoy-bond-reference.json
@@ -1,96 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "82c238b8"
-  },
   "trade" : {
-    "account" : [ {
-      "accountBeneficiary" : {
-        "externalReference" : "party1",
-        "globalReference" : "2ca0033"
-      },
-      "accountName" : {
-        "value" : "PRIMARY_ACCOUNT"
-      },
-      "accountNumber" : {
-        "value" : "PRIM_450"
-      },
-      "meta" : {
-        "externalKey" : "primaryAct1",
-        "globalKey" : "b222fdf1"
-      }
-    }, {
-      "accountBeneficiary" : {
-        "externalReference" : "party2",
-        "globalReference" : "312ceee"
-      },
-      "accountName" : {
-        "value" : "CROSS_ACCOUNT"
-      },
-      "accountNumber" : {
-        "value" : "CROSS_560"
-      },
-      "meta" : {
-        "externalKey" : "crossAct1",
-        "globalKey" : "3070a28a"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "a409cf56"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "2ca0033"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "2ca0033",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "E2000098N10184",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "12345"
-        },
-        "meta" : {
-          "globalKey" : "2ca0033"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "312ceee"
+        "globalKey" : "3e06abe1"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "312ceee",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "67890"
-        },
-        "meta" : {
-          "globalKey" : "312ceee"
+            "scheme" : "http://www.barclays.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9591fab6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2003-11-15",
+      "meta" : {
+        "globalKey" : "3e9acf"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "2ca0033"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "312ceee"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "2ca0033"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -98,67 +47,47 @@
             "productQualifier" : "InterestRate_InflationSwap_FixedFloat_YearOn_Year"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
-                  }
-                },
-                "bondReference" : {
-                  "bond" : {
-                    "identifier" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
-                      },
-                      "value" : "XS0125141316"
-                    },
-                    "meta" : {
-                      "globalKey" : "2f914ab8"
-                    },
-                    "source" : "ISIN"
                   },
-                  "conditionPrecedentBond" : true
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b915"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "20"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2003-11-20",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -167,23 +96,23 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e0f0b49a"
-                      },
-                      "unadjustedDate" : "2003-11-20"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e0f0b49a"
                     }
                   },
-                  "firstPeriodStartDate" : {
+                  "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2007-11-20",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -192,27 +121,37 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "d349efa2"
-                      },
-                      "unadjustedDate" : "2003-11-12"
+                        "globalKey" : "7c04949a"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "d349efa2"
+                      "globalKey" : "7c04949a"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "N104F4",
-                    "globalKey" : "e3f326d9"
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
+                    }
                   },
-                  "terminationDate" : {
+                  "firstPeriodStartDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2003-11-12",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -221,34 +160,43 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "7c04949a"
-                      },
-                      "unadjustedDate" : "2007-11-20"
+                        "globalKey" : "d349efa2"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "7c04949a"
+                      "globalKey" : "d349efa2"
                     }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "17965"
+                    },
+                    "rollConvention" : "20"
+                  },
+                  "meta" : {
+                    "globalKey" : "98d93d41",
+                    "externalKey" : "N104F4"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "48204f89"
-                },
                 "paymentDates" : {
-                  "firstPaymentDate" : "2004-11-20",
-                  "meta" : {
-                    "globalKey" : "794dfaa0"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "firstPaymentDate" : "2004-11-20",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -257,76 +205,93 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "c6f6defc"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                "bondReference" : {
+                  "bond" : {
+                    "identifier" : {
+                      "value" : "XS0125141316",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN-1-0"
                       }
+                    },
+                    "source" : "ISIN",
+                    "meta" : {
+                      "globalKey" : "2f914ab8"
                     }
-                  }
+                  },
+                  "conditionPrecedentBond" : true
+                },
+                "meta" : {
+                  "globalKey" : "30e65057"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "inflationRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
-                    }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c47"
+                      "globalKey" : "371abac6"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "20"
-                  },
+                    "inflationLag" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "indexSource" : {
+                      "value" : "CPURNSA",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/inflation-index-source-1-0"
+                      }
+                    },
+                    "mainPublication" : {
+                      "value" : "BLS",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/inflation-main-publication-1-0"
+                      }
+                    },
+                    "interpolationMethod" : {
+                      "value" : "LinearZeroYield"
+                    },
+                    "fallbackBondApplicable" : true
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "1/1"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2003-11-20",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -335,23 +300,23 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e0f0b49a"
-                      },
-                      "unadjustedDate" : "2003-11-20"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e0f0b49a"
                     }
                   },
-                  "firstPeriodStartDate" : {
+                  "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2007-11-20",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -360,27 +325,37 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "d349efa2"
-                      },
-                      "unadjustedDate" : "2003-11-12"
+                        "globalKey" : "7c04949a"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "d349efa2"
+                      "globalKey" : "7c04949a"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "N101C1",
-                    "globalKey" : "37d9040b"
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
+                    }
                   },
-                  "terminationDate" : {
+                  "firstPeriodStartDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2003-11-12",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -389,35 +364,43 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "7c04949a"
-                      },
-                      "unadjustedDate" : "2007-11-20"
+                        "globalKey" : "d349efa2"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "7c04949a"
+                      "globalKey" : "d349efa2"
                     }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f73"
+                    },
+                    "rollConvention" : "20"
+                  },
+                  "meta" : {
+                    "globalKey" : "98d9434f",
+                    "externalKey" : "N101C1"
                   }
                 },
-                "compoundingMethod" : "NONE",
-                "dayCountFraction" : {
-                  "value" : "1/1"
-                },
-                "meta" : {
-                  "globalKey" : "4ac1a853"
-                },
                 "paymentDates" : {
-                  "firstPaymentDate" : "2004-11-20",
-                  "meta" : {
-                    "globalKey" : "794dfaa0"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "firstPaymentDate" : "2004-11-20",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -426,67 +409,27 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
-                  }
-                },
-                "rateSpecification" : {
-                  "inflationRate" : {
-                    "meta" : {
-                      "globalKey" : "6728d4ce"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "fallbackBondApplicable" : true,
-                    "indexSource" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/inflation-index-source-1-0"
-                      },
-                      "value" : "CPURNSA"
-                    },
-                    "inflationLag" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    },
-                    "interpolationMethod" : {
-                      "value" : "LINEAR_ZERO_YIELD"
-                    },
-                    "mainPublication" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/inflation-main-publication-1-0"
-                      },
-                      "value" : "BLS"
-                    }
+                  "meta" : {
+                    "globalKey" : "c6f6defc"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "N101C1",
-                    "globalReference" : "37d9040b"
+                    "globalReference" : "98d9434f",
+                    "externalReference" : "N101C1"
                   },
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "10c06461"
+                      "globalKey" : "ed9c4f15"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -495,17 +438,20 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "8acc6cbb"
+                      "globalReference" : "cd37984b",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "8acc6cbb"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -514,192 +460,242 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "cd37984b",
+                    "externalKey" : "resetDates"
                   }
+                },
+                "compoundingMethod" : "None",
+                "meta" : {
+                  "globalKey" : "68e18c5f"
                 }
               } ],
               "meta" : {
-                "globalKey" : "5d7d606a"
+                "globalKey" : "225ae068"
               }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "512d1054"
+            "globalKey" : "43704f52"
           }
         },
         "meta" : {
-          "globalKey" : "512d1054"
+          "globalKey" : "43704f52"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "5f56c9e1"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.01,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 1,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "8b82723f"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 1,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 1
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "527520d3"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "fd49f13e"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "ac8"
-                  },
-                  "period" : "Y",
-                  "periodMultiplier" : 1
-                },
                 "inflationRateIndex" : {
+                  "value" : "USA-CPI-U",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/inflation-index-description-2-0"
-                  },
-                  "value" : "USA-CPI-U"
+                  }
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 1,
+                  "period" : "Y",
+                  "meta" : {
+                    "globalKey" : "78"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 1
+            "meta" : {
+              "globalKey" : "26245bfe"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "ea25de8f"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "312ceee",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "2ca0033",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "2ca0033",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9acf"
-      },
-      "value" : "2003-11-15"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "E2000098N10184"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "2ca0033"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "2ca0033"
-      },
       "meta" : {
-        "globalKey" : "7ae32cd7"
+        "globalKey" : "2ca0033",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "67890",
           "meta" : {
-            "scheme" : "http://www.barclays.com/swaps/trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "312ceee"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "312ceee"
+      "meta" : {
+        "globalKey" : "312ceee",
+        "externalKey" : "party2"
+      }
+    } ],
+    "account" : [ {
+      "accountNumber" : {
+        "value" : "PRIM_450"
+      },
+      "accountName" : {
+        "value" : "PRIMARY_ACCOUNT"
+      },
+      "accountBeneficiary" : {
+        "globalReference" : "2ca0033",
+        "externalReference" : "party1"
+      },
+      "meta" : {
+        "globalKey" : "7695b071",
+        "externalKey" : "primaryAct1"
+      }
+    }, {
+      "accountNumber" : {
+        "value" : "CROSS_560"
+      },
+      "accountName" : {
+        "value" : "CROSS_ACCOUNT"
+      },
+      "accountBeneficiary" : {
+        "globalReference" : "312ceee",
+        "externalReference" : "party2"
       },
       "meta" : {
-        "globalKey" : "1b2141ce"
+        "globalKey" : "dc8b808a",
+        "externalKey" : "crossAct1"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "826fa9b2"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "c457f64e"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "2ca0033"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "312ceee"
-        }
-      },
       "quantity" : {
+        "value" : 10000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "2ca0033",
+          "externalReference" : "party1"
         },
-        "value" : 10000
+        "receiverPartyReference" : {
+          "globalReference" : "312ceee",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2003-11-20",
         "dateAdjustments" : {
+          "businessDayConvention" : "MODFOLLOWING",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "EUTA"
@@ -708,16 +704,20 @@
               "globalKey" : "20a71d"
             }
           },
-          "businessDayConvention" : "MODFOLLOWING",
           "meta" : {
             "globalKey" : "365baaee"
           }
-        },
-        "unadjustedDate" : "2003-11-20"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "e8015582"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "62210f10"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex03-yoy-initial-level.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex03-yoy-initial-level.json
index af1deb244a..12d14526f7 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex03-yoy-initial-level.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex03-yoy-initial-level.json
@@ -1,96 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "bf59a17d"
-  },
   "trade" : {
-    "account" : [ {
-      "accountBeneficiary" : {
-        "externalReference" : "party1",
-        "globalReference" : "2ca0033"
-      },
-      "accountName" : {
-        "value" : "PRIMARY_ACCOUNT"
-      },
-      "accountNumber" : {
-        "value" : "PRIM_450"
-      },
-      "meta" : {
-        "externalKey" : "primaryAct1",
-        "globalKey" : "b222fdf1"
-      }
-    }, {
-      "accountBeneficiary" : {
-        "externalReference" : "party2",
-        "globalReference" : "312ceee"
-      },
-      "accountName" : {
-        "value" : "CROSS_ACCOUNT"
-      },
-      "accountNumber" : {
-        "value" : "CROSS_560"
-      },
-      "meta" : {
-        "externalKey" : "crossAct1",
-        "globalKey" : "3070a28a"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "1ccd571"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "2ca0033"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "2ca0033",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "E2000098N10184",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "12345"
-        },
-        "meta" : {
-          "globalKey" : "2ca0033"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "312ceee"
+        "globalKey" : "3e06abe1"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "312ceee",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "67890"
-        },
-        "meta" : {
-          "globalKey" : "312ceee"
+            "scheme" : "http://www.barclays.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9591fab6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2003-11-15",
+      "meta" : {
+        "globalKey" : "3e9acf"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "2ca0033"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "312ceee"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "2ca0033"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -98,52 +47,47 @@
             "productQualifier" : "InterestRate_InflationSwap_FixedFloat_YearOn_Year"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b915"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "20"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2003-11-20",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -152,23 +96,23 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e0f0b49a"
-                      },
-                      "unadjustedDate" : "2003-11-20"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e0f0b49a"
                     }
                   },
-                  "firstPeriodStartDate" : {
+                  "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2007-11-20",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -177,27 +121,37 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "d349efa2"
-                      },
-                      "unadjustedDate" : "2003-11-12"
+                        "globalKey" : "7c04949a"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "d349efa2"
+                      "globalKey" : "7c04949a"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "N104F4",
-                    "globalKey" : "e3f326d9"
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
+                    }
                   },
-                  "terminationDate" : {
+                  "firstPeriodStartDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2003-11-12",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -206,34 +160,43 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "7c04949a"
-                      },
-                      "unadjustedDate" : "2007-11-20"
+                        "globalKey" : "d349efa2"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "7c04949a"
+                      "globalKey" : "d349efa2"
                     }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "17965"
+                    },
+                    "rollConvention" : "20"
+                  },
+                  "meta" : {
+                    "globalKey" : "98d93d41",
+                    "externalKey" : "N104F4"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "e1a27282"
-                },
                 "paymentDates" : {
-                  "firstPaymentDate" : "2004-11-20",
-                  "meta" : {
-                    "globalKey" : "794dfaa0"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "firstPaymentDate" : "2004-11-20",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -242,76 +205,79 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "c6f6defc"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                "meta" : {
+                  "globalKey" : "d1ec7c50"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "inflationRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "365baaee"
-                    }
-                  },
-                  "calculationPeriodFrequency" : {
                     "meta" : {
-                      "globalKey" : "28c47"
+                      "globalKey" : "fe968de0"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "20"
-                  },
+                    "inflationLag" : {
+                      "periodMultiplier" : 3,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "aa"
+                      }
+                    },
+                    "indexSource" : {
+                      "value" : "CPURNSA",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/inflation-index-source-1-0"
+                      }
+                    },
+                    "mainPublication" : {
+                      "value" : "BLS",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/inflation-main-publication-1-0"
+                      }
+                    },
+                    "interpolationMethod" : {
+                      "value" : "LinearZeroYield"
+                    },
+                    "initialIndexLevel" : 0.0190,
+                    "fallbackBondApplicable" : true
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "1/1"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2003-11-20",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -320,23 +286,23 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e0f0b49a"
-                      },
-                      "unadjustedDate" : "2003-11-20"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e0f0b49a"
                     }
                   },
-                  "firstPeriodStartDate" : {
+                  "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2007-11-20",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -345,27 +311,37 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "d349efa2"
-                      },
-                      "unadjustedDate" : "2003-11-12"
+                        "globalKey" : "7c04949a"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "d349efa2"
+                      "globalKey" : "7c04949a"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "N101C1",
-                    "globalKey" : "37d9040b"
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
+                    }
                   },
-                  "terminationDate" : {
+                  "firstPeriodStartDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2003-11-12",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -374,35 +350,43 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "7c04949a"
-                      },
-                      "unadjustedDate" : "2007-11-20"
+                        "globalKey" : "d349efa2"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "7c04949a"
+                      "globalKey" : "d349efa2"
                     }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f73"
+                    },
+                    "rollConvention" : "20"
+                  },
+                  "meta" : {
+                    "globalKey" : "98d9434f",
+                    "externalKey" : "N101C1"
                   }
                 },
-                "compoundingMethod" : "NONE",
-                "dayCountFraction" : {
-                  "value" : "1/1"
-                },
-                "meta" : {
-                  "globalKey" : "f408c8a3"
-                },
                 "paymentDates" : {
-                  "firstPaymentDate" : "2004-11-20",
-                  "meta" : {
-                    "globalKey" : "794dfaa0"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "firstPaymentDate" : "2004-11-20",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -411,68 +395,27 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
-                  }
-                },
-                "rateSpecification" : {
-                  "inflationRate" : {
-                    "meta" : {
-                      "globalKey" : "3c49d072"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "fallbackBondApplicable" : true,
-                    "indexSource" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/inflation-index-source-1-0"
-                      },
-                      "value" : "CPURNSA"
-                    },
-                    "inflationLag" : {
-                      "meta" : {
-                        "globalKey" : "956"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 3
-                    },
-                    "initialIndexLevel" : 0.0190,
-                    "interpolationMethod" : {
-                      "value" : "LINEAR_ZERO_YIELD"
-                    },
-                    "mainPublication" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/inflation-main-publication-1-0"
-                      },
-                      "value" : "BLS"
-                    }
+                  "meta" : {
+                    "globalKey" : "c6f6defc"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "N101C1",
-                    "globalReference" : "37d9040b"
+                    "globalReference" : "98d9434f",
+                    "externalReference" : "N101C1"
                   },
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "10c06461"
+                      "globalKey" : "ed9c4f15"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -481,17 +424,20 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "8acc6cbb"
+                      "globalReference" : "cd37984b",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "8acc6cbb"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -500,192 +446,242 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "cd37984b",
+                    "externalKey" : "resetDates"
                   }
+                },
+                "compoundingMethod" : "None",
+                "meta" : {
+                  "globalKey" : "146f9c2b"
                 }
               } ],
               "meta" : {
-                "globalKey" : "46707da5"
+                "globalKey" : "3ec7c7b"
               }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "5979037b"
+            "globalKey" : "70b32a5"
           }
         },
         "meta" : {
-          "globalKey" : "5979037b"
+          "globalKey" : "70b32a5"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "5f56c9e1"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.01,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 1,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "8b82723f"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 1,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 1
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "527520d3"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "fd49f13e"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "ac8"
-                  },
-                  "period" : "Y",
-                  "periodMultiplier" : 1
-                },
                 "inflationRateIndex" : {
+                  "value" : "USA-CPI-U",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/inflation-index-description-2-0"
-                  },
-                  "value" : "USA-CPI-U"
+                  }
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 1,
+                  "period" : "Y",
+                  "meta" : {
+                    "globalKey" : "78"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 1
+            "meta" : {
+              "globalKey" : "26245bfe"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "ea25de8f"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "312ceee",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "2ca0033",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "2ca0033",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9acf"
-      },
-      "value" : "2003-11-15"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "E2000098N10184"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "2ca0033"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "2ca0033"
-      },
       "meta" : {
-        "globalKey" : "7ae32cd7"
+        "globalKey" : "2ca0033",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "67890",
           "meta" : {
-            "scheme" : "http://www.barclays.com/swaps/trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "312ceee"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "312ceee"
+      "meta" : {
+        "globalKey" : "312ceee",
+        "externalKey" : "party2"
+      }
+    } ],
+    "account" : [ {
+      "accountNumber" : {
+        "value" : "PRIM_450"
+      },
+      "accountName" : {
+        "value" : "PRIMARY_ACCOUNT"
+      },
+      "accountBeneficiary" : {
+        "globalReference" : "2ca0033",
+        "externalReference" : "party1"
       },
       "meta" : {
-        "globalKey" : "1b2141ce"
+        "globalKey" : "7695b071",
+        "externalKey" : "primaryAct1"
       }
-    } ]
+    }, {
+      "accountNumber" : {
+        "value" : "CROSS_560"
+      },
+      "accountName" : {
+        "value" : "CROSS_ACCOUNT"
+      },
+      "accountBeneficiary" : {
+        "globalReference" : "312ceee",
+        "externalReference" : "party2"
+      },
+      "meta" : {
+        "globalKey" : "dc8b808a",
+        "externalKey" : "crossAct1"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "76b52dc9"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "c457f64e"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "2ca0033"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "312ceee"
-        }
-      },
       "quantity" : {
+        "value" : 10000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "2ca0033",
+          "externalReference" : "party1"
         },
-        "value" : 10000
+        "receiverPartyReference" : {
+          "globalReference" : "312ceee",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2003-11-20",
         "dateAdjustments" : {
+          "businessDayConvention" : "MODFOLLOWING",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "EUTA"
@@ -694,16 +690,20 @@
               "globalKey" : "20a71d"
             }
           },
-          "businessDayConvention" : "MODFOLLOWING",
           "meta" : {
             "globalKey" : "365baaee"
           }
-        },
-        "unadjustedDate" : "2003-11-20"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "e8015582"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "4539cf59"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex04-yoy-interp.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex04-yoy-interp.json
index d7919d1a50..065d882b44 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex04-yoy-interp.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex04-yoy-interp.json
@@ -1,89 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "3250edf"
-  },
   "trade" : {
-    "account" : [ {
-      "accountBeneficiary" : {
-        "externalReference" : "party1",
-        "globalReference" : "2ca0033"
-      },
-      "accountName" : {
-        "value" : "PRIMARY_ACCOUNT"
-      },
-      "accountNumber" : {
-        "value" : "PRIM_450"
-      },
-      "meta" : {
-        "externalKey" : "primaryAct1",
-        "globalKey" : "b222fdf1"
-      }
-    }, {
-      "accountBeneficiary" : {
-        "externalReference" : "party2",
-        "globalReference" : "312ceee"
-      },
-      "accountName" : {
-        "value" : "CROSS_ACCOUNT"
-      },
-      "accountNumber" : {
-        "value" : "CROSS_560"
-      },
-      "meta" : {
-        "externalKey" : "crossAct1",
-        "globalKey" : "3070a28a"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "3250edf"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "2ca0033"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "2ca0033",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "E2000098N10184",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "12345"
-        },
-        "meta" : {
-          "globalKey" : "2ca0033"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "312ceee"
+        "globalKey" : "3e06abe1"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "312ceee",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "67890"
-        },
-        "meta" : {
-          "globalKey" : "312ceee"
+            "scheme" : "http://www.barclays.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9591fab6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2003-11-15",
+      "meta" : {
+        "globalKey" : "3e9acf"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "312ceee"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "2ca0033"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -94,46 +50,44 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b915"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "20"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2003-11-20",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -142,23 +96,23 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e0f0b49a"
-                      },
-                      "unadjustedDate" : "2003-11-20"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e0f0b49a"
                     }
                   },
-                  "firstPeriodStartDate" : {
+                  "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2007-11-20",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -167,27 +121,37 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "d349efa2"
-                      },
-                      "unadjustedDate" : "2003-11-12"
+                        "globalKey" : "7c04949a"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "d349efa2"
+                      "globalKey" : "7c04949a"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "N104F4",
-                    "globalKey" : "e3f326d9"
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
+                    }
                   },
-                  "terminationDate" : {
+                  "firstPeriodStartDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2003-11-12",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -196,34 +160,43 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "7c04949a"
-                      },
-                      "unadjustedDate" : "2007-11-20"
+                        "globalKey" : "d349efa2"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "7c04949a"
+                      "globalKey" : "d349efa2"
                     }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "17965"
+                    },
+                    "rollConvention" : "20"
+                  },
+                  "meta" : {
+                    "globalKey" : "98d93d41",
+                    "externalKey" : "N104F4"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "e1a27282"
-                },
                 "paymentDates" : {
-                  "firstPaymentDate" : "2004-11-20",
-                  "meta" : {
-                    "globalKey" : "794dfaa0"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "firstPaymentDate" : "2004-11-20",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -232,76 +205,78 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "c6f6defc"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                "meta" : {
+                  "globalKey" : "d1ec7c50"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "inflationRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "365baaee"
-                    }
-                  },
-                  "calculationPeriodFrequency" : {
                     "meta" : {
-                      "globalKey" : "28c47"
+                      "globalKey" : "78e66b15"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "20"
-                  },
+                    "inflationLag" : {
+                      "periodMultiplier" : 2,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "8b"
+                      }
+                    },
+                    "indexSource" : {
+                      "value" : "UKRPI",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/inflation-index-source-1-0"
+                      }
+                    },
+                    "mainPublication" : {
+                      "value" : "ONS",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/inflation-main-publication-1-0"
+                      }
+                    },
+                    "interpolationMethod" : {
+                      "value" : "LinearZeroYield"
+                    },
+                    "fallbackBondApplicable" : true
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "1/1"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2003-11-20",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -310,23 +285,23 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e0f0b49a"
-                      },
-                      "unadjustedDate" : "2003-11-20"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e0f0b49a"
                     }
                   },
-                  "firstPeriodStartDate" : {
+                  "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2007-11-20",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -335,27 +310,37 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "d349efa2"
-                      },
-                      "unadjustedDate" : "2003-11-12"
+                        "globalKey" : "7c04949a"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "d349efa2"
+                      "globalKey" : "7c04949a"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "N101C1",
-                    "globalKey" : "37d9040b"
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
+                    }
                   },
-                  "terminationDate" : {
+                  "firstPeriodStartDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2003-11-12",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -364,35 +349,43 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "7c04949a"
-                      },
-                      "unadjustedDate" : "2007-11-20"
+                        "globalKey" : "d349efa2"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "7c04949a"
+                      "globalKey" : "d349efa2"
                     }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f73"
+                    },
+                    "rollConvention" : "20"
+                  },
+                  "meta" : {
+                    "globalKey" : "98d9434f",
+                    "externalKey" : "N101C1"
                   }
                 },
-                "compoundingMethod" : "NONE",
-                "dayCountFraction" : {
-                  "value" : "1/1"
-                },
-                "meta" : {
-                  "globalKey" : "8782d2ec"
-                },
                 "paymentDates" : {
-                  "firstPaymentDate" : "2004-11-20",
-                  "meta" : {
-                    "globalKey" : "794dfaa0"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "firstPaymentDate" : "2004-11-20",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -401,67 +394,27 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
-                  }
-                },
-                "rateSpecification" : {
-                  "inflationRate" : {
-                    "meta" : {
-                      "globalKey" : "23e1c95"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "fallbackBondApplicable" : true,
-                    "indexSource" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/inflation-index-source-1-0"
-                      },
-                      "value" : "UKRPI"
-                    },
-                    "inflationLag" : {
-                      "meta" : {
-                        "globalKey" : "955"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 2
-                    },
-                    "interpolationMethod" : {
-                      "value" : "LINEAR_ZERO_YIELD"
-                    },
-                    "mainPublication" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/inflation-main-publication-1-0"
-                      },
-                      "value" : "ONS"
-                    }
+                  "meta" : {
+                    "globalKey" : "c6f6defc"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "N101C1",
-                    "globalReference" : "37d9040b"
+                    "globalReference" : "98d9434f",
+                    "externalReference" : "N101C1"
                   },
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "10c06461"
+                      "globalKey" : "ed9c4f15"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -470,17 +423,20 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "8acc6cbb"
+                      "globalReference" : "cd37984b",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "8acc6cbb"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -489,165 +445,209 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "cd37984b",
+                    "externalKey" : "resetDates"
                   }
+                },
+                "compoundingMethod" : "None",
+                "meta" : {
+                  "globalKey" : "8000852e"
                 }
               } ],
               "meta" : {
-                "globalKey" : "9aaf75aa"
+                "globalKey" : "983e5ade"
               }
             }
           },
           "meta" : {
-            "globalKey" : "9aaf75aa"
+            "globalKey" : "983e5ade"
           }
         },
         "meta" : {
-          "globalKey" : "9aaf75aa"
+          "globalKey" : "983e5ade"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "5f56c9e1"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.01,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 1,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "8b82723f"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 1,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 1
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "9f6c9327"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "9581b56a"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "ac8"
-                  },
-                  "period" : "Y",
-                  "periodMultiplier" : 1
-                },
                 "inflationRateIndex" : {
+                  "value" : "UK-RPI",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/inflation-index-description-2-0"
-                  },
-                  "value" : "UK-RPI"
+                  }
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 1,
+                  "period" : "Y",
+                  "meta" : {
+                    "globalKey" : "78"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 1
+            "meta" : {
+              "globalKey" : "97462a2a"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "5b47acbb"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "312ceee",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "2ca0033",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9acf"
-      },
-      "value" : "2003-11-15"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "E2000098N10184"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "2ca0033"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "2ca0033"
-      },
       "meta" : {
-        "globalKey" : "7ae32cd7"
+        "globalKey" : "2ca0033",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "67890",
           "meta" : {
-            "scheme" : "http://www.barclays.com/swaps/trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "312ceee"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "312ceee"
+      "meta" : {
+        "globalKey" : "312ceee",
+        "externalKey" : "party2"
+      }
+    } ],
+    "account" : [ {
+      "accountNumber" : {
+        "value" : "PRIM_450"
+      },
+      "accountName" : {
+        "value" : "PRIMARY_ACCOUNT"
+      },
+      "accountBeneficiary" : {
+        "globalReference" : "2ca0033",
+        "externalReference" : "party1"
       },
       "meta" : {
-        "globalKey" : "1b2141ce"
+        "globalKey" : "7695b071",
+        "externalKey" : "primaryAct1"
       }
-    } ]
+    }, {
+      "accountNumber" : {
+        "value" : "CROSS_560"
+      },
+      "accountName" : {
+        "value" : "CROSS_ACCOUNT"
+      },
+      "accountBeneficiary" : {
+        "globalReference" : "312ceee",
+        "externalReference" : "party2"
+      },
+      "meta" : {
+        "globalKey" : "dc8b808a",
+        "externalKey" : "crossAct1"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "7b68df9d"
+    }
+  },
+  "meta" : {
+    "globalKey" : "7b68df9d"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex05-zc.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex05-zc.json
index e03e7225c0..f237a5045e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex05-zc.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex05-zc.json
@@ -1,135 +1,89 @@
 {
-  "meta" : {
-    "globalKey" : "2926aca7"
-  },
   "trade" : {
-    "account" : [ {
-      "accountBeneficiary" : {
-        "externalReference" : "party1",
-        "globalReference" : "2ca0033"
-      },
-      "accountName" : {
-        "value" : "PRIMARY_ACCOUNT"
-      },
-      "accountNumber" : {
-        "value" : "PRIM_450"
-      },
-      "meta" : {
-        "externalKey" : "primaryAct1",
-        "globalKey" : "b222fdf1"
-      }
-    }, {
-      "accountBeneficiary" : {
-        "externalReference" : "party2",
-        "globalReference" : "312ceee"
-      },
-      "accountName" : {
-        "value" : "CROSS_ACCOUNT"
-      },
-      "accountNumber" : {
-        "value" : "CROSS_560"
-      },
-      "meta" : {
-        "externalKey" : "crossAct1",
-        "globalKey" : "3070a28a"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "2926aca7"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "2ca0033"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "2ca0033",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "E2000098N10184",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "12345"
-        },
-        "meta" : {
-          "globalKey" : "2ca0033"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "312ceee"
+        "globalKey" : "3e06abe1"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "312ceee",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "67890"
-        },
-        "meta" : {
-          "globalKey" : "312ceee"
+            "scheme" : "http://www.barclays.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9591fab6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2005-02-20",
+      "meta" : {
+        "globalKey" : "3ea894"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "2ca0033"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "312ceee"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365c4b6f"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b917"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "22"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "1/1"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2005-02-22",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -138,23 +92,23 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365c4b6f"
                         }
                       },
                       "meta" : {
                         "globalKey" : "5afd9099"
-                      },
-                      "unadjustedDate" : "2005-02-22"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "5afd9099"
                     }
                   },
-                  "firstPeriodStartDate" : {
+                  "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2035-02-22",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -163,27 +117,37 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365c4b6f"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "5793df5b"
-                      },
-                      "unadjustedDate" : "2005-02-20"
+                        "globalKey" : "e612a099"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "5793df5b"
+                      "globalKey" : "e612a099"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "N10434",
-                    "globalKey" : "d6feb693"
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "365c4b6f"
+                    }
                   },
-                  "terminationDate" : {
+                  "firstPeriodStartDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2005-02-20",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -192,33 +156,42 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365c4b6f"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "e612a099"
-                      },
-                      "unadjustedDate" : "2035-02-22"
+                        "globalKey" : "5793df5b"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "e612a099"
+                      "globalKey" : "5793df5b"
                     }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "17967"
+                    },
+                    "rollConvention" : "22"
+                  },
+                  "meta" : {
+                    "globalKey" : "c99c723f",
+                    "externalKey" : "N10434"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "1/1"
-                },
-                "meta" : {
-                  "globalKey" : "4feaf47a"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "965ab2f0"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 30,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "3fb"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -227,68 +200,78 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ae5"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 30
+                  "meta" : {
+                    "globalKey" : "9922ea2e"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                "meta" : {
+                  "globalKey" : "d9ef0352"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessDayConvention" : "NONE",
-                    "meta" : {
-                      "globalKey" : "24a738"
-                    }
-                  },
-                  "calculationPeriodFrequency" : {
+                "rateSpecification" : {
+                  "inflationRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "25f8f3"
+                      "globalKey" : "78e66b15"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 30,
-                    "rollConvention" : "NONE"
-                  },
+                    "inflationLag" : {
+                      "periodMultiplier" : 2,
+                      "period" : "M",
+                      "meta" : {
+                        "globalKey" : "8b"
+                      }
+                    },
+                    "indexSource" : {
+                      "value" : "UKRPI",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/inflation-index-source-1-0"
+                      }
+                    },
+                    "mainPublication" : {
+                      "value" : "ONS",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/inflation-main-publication-1-0"
+                      }
+                    },
+                    "interpolationMethod" : {
+                      "value" : "LinearZeroYield"
+                    },
+                    "fallbackBondApplicable" : true
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "1/1"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2005-02-22",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -297,27 +280,23 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "5afcf018"
-                      },
-                      "unadjustedDate" : "2005-02-22"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "5afcf018"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "N10277",
-                    "globalKey" : "d9bde65b"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2035-02-22",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -326,34 +305,48 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e6120018"
-                      },
-                      "unadjustedDate" : "2035-02-22"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e6120018"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
+                    "meta" : {
+                      "globalKey" : "24a738"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 30,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "25229d"
+                    },
+                    "rollConvention" : "NONE"
+                  },
+                  "meta" : {
+                    "globalKey" : "9b05e205",
+                    "externalKey" : "N10277"
                   }
                 },
-                "compoundingMethod" : "NONE",
-                "dayCountFraction" : {
-                  "value" : "1/1"
-                },
-                "meta" : {
-                  "globalKey" : "22042fee"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4d64af11"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 30,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "3fb"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -362,194 +355,201 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ae5"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 30
+                  "meta" : {
+                    "globalKey" : "992249ad"
                   }
                 },
-                "rateSpecification" : {
-                  "inflationRate" : {
-                    "meta" : {
-                      "globalKey" : "23e1c95"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "fallbackBondApplicable" : true,
-                    "indexSource" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/inflation-index-source-1-0"
-                      },
-                      "value" : "UKRPI"
-                    },
-                    "inflationLag" : {
-                      "meta" : {
-                        "globalKey" : "955"
-                      },
-                      "period" : "M",
-                      "periodMultiplier" : 2
-                    },
-                    "interpolationMethod" : {
-                      "value" : "LINEAR_ZERO_YIELD"
-                    },
-                    "mainPublication" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/inflation-main-publication-1-0"
-                      },
-                      "value" : "ONS"
-                    }
-                  }
+                "compoundingMethod" : "None",
+                "meta" : {
+                  "globalKey" : "e259b862"
                 }
               } ],
               "meta" : {
-                "globalKey" : "7015bb68"
+                "globalKey" : "dfaa16b4"
               }
             }
           },
           "meta" : {
-            "globalKey" : "7015bb68"
+            "globalKey" : "dfaa16b4"
           }
         },
         "meta" : {
-          "globalKey" : "7015bb68"
+          "globalKey" : "dfaa16b4"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "c085762e"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "value" : 0.01,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 1000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "50294f92"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 1000000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 1000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "307490e2"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "95593ca2"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "inflationRateIndex" : {
+                  "value" : "UK-RPI",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/inflation-index-description-2-0"
-                  },
-                  "value" : "UK-RPI"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 1000000
+            "meta" : {
+              "globalKey" : "15ce579e"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "8987eb5a"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "2ca0033",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "312ceee",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea894"
-      },
-      "value" : "2005-02-20"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "E2000098N10184"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "2ca0033"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "2ca0033"
-      },
       "meta" : {
-        "globalKey" : "7ae32cd7"
+        "globalKey" : "2ca0033",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "67890",
           "meta" : {
-            "scheme" : "http://www.barclays.com/swaps/trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "312ceee"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "312ceee"
+      "meta" : {
+        "globalKey" : "312ceee",
+        "externalKey" : "party2"
+      }
+    } ],
+    "account" : [ {
+      "accountNumber" : {
+        "value" : "PRIM_450"
+      },
+      "accountName" : {
+        "value" : "PRIMARY_ACCOUNT"
+      },
+      "accountBeneficiary" : {
+        "globalReference" : "2ca0033",
+        "externalReference" : "party1"
+      },
+      "meta" : {
+        "globalKey" : "7695b071",
+        "externalKey" : "primaryAct1"
+      }
+    }, {
+      "accountNumber" : {
+        "value" : "CROSS_560"
+      },
+      "accountName" : {
+        "value" : "CROSS_ACCOUNT"
+      },
+      "accountBeneficiary" : {
+        "globalReference" : "312ceee",
+        "externalReference" : "party2"
       },
       "meta" : {
-        "globalKey" : "1b2141ce"
+        "globalKey" : "dc8b808a",
+        "externalKey" : "crossAct1"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "a59f1d69"
+    }
+  },
+  "meta" : {
+    "globalKey" : "a59f1d69"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/CAD-Long-Initial-Stub-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/CAD-Long-Initial-Stub-versioned.json
index 4d4d675213..4e6fc042a2 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/CAD-Long-Initial-Stub-versioned.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/CAD-Long-Initial-Stub-versioned.json
@@ -1,175 +1,107 @@
 {
-  "meta" : {
-    "globalKey" : "d306ca4f"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-              },
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "6b413360"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "bd492439"
-      }
-    },
-    "meta" : {
-      "globalKey" : "d306ca4f"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "27b20a6a"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "cc892602",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "LCH00023323008",
           "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
-          },
-          "value" : "COUNTERPARTY"
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/trade-id"
+          }
         },
-        "meta" : {
-          "globalKey" : "27b20a6a"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "cc892602"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
-          },
-          "value" : "LCHLGB22XXX"
-        },
-        "meta" : {
-          "globalKey" : "cc892602"
-        }
-      } ]
+        "globalKey" : "71303531"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2017-12-18",
+      "meta" : {
+        "globalKey" : "3f0b12"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "27b20a6a"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "cc892602"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
-          "productIdentifier" : [ {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:Basis"
-              },
-              "meta" : {
-                "globalKey" : "1d6b2aa0"
-              },
-              "source" : "OTHER"
-            }
-          } ],
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
+              "value" : "InterestRate",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-              },
-              "value" : "INTEREST_RATE"
+              }
             }
           }, {
             "source" : "ISDA",
             "value" : {
               "name" : {
+                "value" : "InterestRate:IRSwap:Basis",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:Basis"
+                }
               }
             }
           }, {
             "source" : "ISDA",
             "productQualifier" : "InterestRate_IRSwap_Basis"
           } ],
+          "productIdentifier" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "InterestRate:IRSwap:Basis",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                }
+              },
+              "source" : "Other",
+              "meta" : {
+                "globalKey" : "1d6b2aa0"
+              }
+            }
+          } ],
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "CATO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "1f7359"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-2"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365a772a"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "80f3fcc7"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "IMMCAD"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2020-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "CATO"
@@ -178,29 +110,23 @@
                             "globalKey" : "1f7359"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365a772a"
                         }
                       },
                       "meta" : {
                         "globalKey" : "56fd0cdc"
-                      },
-                      "unadjustedDate" : "2020-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "56fd0cdc"
                     }
                   },
-                  "firstRegularPeriodStartDate" : "2021-03-15",
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates1",
-                    "globalKey" : "bbe81c92"
-                  },
-                  "stubPeriodType" : "LONG_INITIAL",
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2022-12-19",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "CATO"
@@ -209,34 +135,20 @@
                             "globalKey" : "1f7359"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365a772a"
                         }
                       },
                       "meta" : {
                         "globalKey" : "ad0f37f7"
-                      },
-                      "unadjustedDate" : "2022-12-19"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ad0f37f7"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "1405b24d"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates1",
-                    "globalKey" : "c17da7c6"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "CATO"
@@ -245,43 +157,66 @@
                         "globalKey" : "1f7359"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365a772a"
                     }
                   },
-                  "paymentFrequency" : {
+                  "firstRegularPeriodStartDate" : "2021-03-15",
+                  "stubPeriodType" : "LongInitial",
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "80f2eff3"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "rollConvention" : "IMMCAD"
+                  },
+                  "meta" : {
+                    "globalKey" : "ccdefd78",
+                    "externalKey" : "floatingCalcPeriodDates1"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-2"
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "CATO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "1f7359"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365a772a"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f05eae9a",
+                    "externalKey" : "paymentDates1"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates1",
-                    "globalReference" : "bbe81c92"
+                    "globalReference" : "ccdefd78",
+                    "externalReference" : "floatingCalcPeriodDates1"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : 0,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "3bafa20d"
+                      "globalKey" : "b1077415"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 0,
+                    "businessDayConvention" : "PRECEDING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "CATO"
@@ -290,17 +225,20 @@
                         "globalKey" : "1f7359"
                       }
                     },
-                    "businessDayConvention" : "PRECEDING",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates1",
-                      "globalReference" : "fb3cfbde"
+                      "globalReference" : "1da74cba",
+                      "externalReference" : "resetDates1"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates1",
-                    "globalKey" : "fb3cfbde"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "CATO"
@@ -309,62 +247,64 @@
                         "globalKey" : "1f7359"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365a772a"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "1da74cba",
+                    "externalKey" : "resetDates1"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "2a575d2f"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "CATO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "1f7359"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365a772a"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "80f3fc89"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "IMMCAD"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2020-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "CATO"
@@ -373,29 +313,23 @@
                             "globalKey" : "1f7359"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365a772a"
                         }
                       },
                       "meta" : {
                         "globalKey" : "56fd0cdc"
-                      },
-                      "unadjustedDate" : "2020-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "56fd0cdc"
                     }
                   },
-                  "firstRegularPeriodStartDate" : "2021-01-18",
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates2",
-                    "globalKey" : "362f2a17"
-                  },
-                  "stubPeriodType" : "LONG_INITIAL",
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2022-12-19",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "CATO"
@@ -404,36 +338,20 @@
                             "globalKey" : "1f7359"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365a772a"
                         }
                       },
                       "meta" : {
                         "globalKey" : "ad0f37f7"
-                      },
-                      "unadjustedDate" : "2022-12-19"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ad0f37f7"
                     }
-                  }
-                },
-                "compoundingMethod" : "FLAT",
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "1532a8a"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2021-03-15",
-                  "meta" : {
-                    "externalKey" : "paymentDates2",
-                    "globalKey" : "992df7d7"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "CATO"
@@ -442,51 +360,67 @@
                         "globalKey" : "1f7359"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365a772a"
                     }
                   },
-                  "paymentFrequency" : {
+                  "firstRegularPeriodStartDate" : "2021-01-18",
+                  "stubPeriodType" : "LongInitial",
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "80f2e871"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "rollConvention" : "IMMCAD"
+                  },
+                  "meta" : {
+                    "globalKey" : "d049c7b9",
+                    "externalKey" : "floatingCalcPeriodDates2"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2021-03-15",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "CATO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "1f7359"
                       }
                     },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "365a772a"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "c80efeab",
+                    "externalKey" : "paymentDates2"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates2",
-                    "globalReference" : "362f2a17"
+                    "globalReference" : "d049c7b9",
+                    "externalReference" : "floatingCalcPeriodDates2"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : 0,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "3bafa20e"
+                      "globalKey" : "b1077416"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 0,
+                    "businessDayConvention" : "PRECEDING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "CATO"
@@ -495,17 +429,20 @@
                         "globalKey" : "1f7359"
                       }
                     },
-                    "businessDayConvention" : "PRECEDING",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates2",
-                      "globalReference" : "54134cfc"
+                      "globalReference" : "cb12758",
+                      "externalReference" : "resetDates2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates2",
-                    "globalKey" : "54134cfc"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "CATO"
@@ -514,174 +451,237 @@
                         "globalKey" : "1f7359"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365a772a"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "cb12758",
+                    "externalKey" : "resetDates2"
+                  }
+                },
+                "compoundingMethod" : "Flat",
+                "meta" : {
+                  "globalKey" : "d760bde8"
                 }
               } ],
               "meta" : {
-                "globalKey" : "4c604717"
+                "globalKey" : "19c43d7"
               }
             }
           },
           "meta" : {
-            "globalKey" : "198353b9"
+            "globalKey" : "93d7c335"
           }
         },
         "meta" : {
-          "globalKey" : "198353b9"
+          "globalKey" : "93d7c335"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "e1baed04"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "76074b0b"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-2"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "CAD-BA-CDOR"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 3
+          "quantity" : [ {
+            "value" : {
+              "value" : 634000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "CAD"
                 }
               }
-            }
-          },
-          "quantity" : [ {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "CAD"
-                }
-              },
-              "value" : 634000000
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "76391948"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "76074b09"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "CAD-BA-CDOR"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-2"
+                } ]
               }
+            },
+            "meta" : {
+              "globalKey" : "4ae10981"
             }
           },
+          "meta" : {
+            "globalKey" : "30cdb530"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.00121,
               "unit" : {
                 "currency" : {
                   "value" : "CAD"
                 }
               },
-              "value" : 0.00121,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "CAD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 634000000,
               "unit" : {
                 "currency" : {
                   "value" : "CAD"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "CAD-BA-CDOR"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 1,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
+                }
               },
-              "value" : 634000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "4ae101ff"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "35350988"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "27b20a6a",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "cc892602",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "COUNTERPARTY",
+          "meta" : {
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "27b20a6a"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3f0b12"
-      },
-      "value" : "2017-12-18"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "27b20a6a",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "LCHLGB22XXX",
           "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/trade-id"
-          },
-          "value" : "LCH00023323008"
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "cc892602"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "cc892602"
-      },
       "meta" : {
-        "globalKey" : "7c2665f1"
+        "globalKey" : "cc892602",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+              }
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "bd492439"
+      }
+    },
+    "meta" : {
+      "globalKey" : "163d6e2b"
+    }
+  },
+  "meta" : {
+    "globalKey" : "163d6e2b"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Long-Final-Stub-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Long-Final-Stub-uti.json
index 6b5ecab087..137ba7c593 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Long-Final-Stub-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Long-Final-Stub-uti.json
@@ -1,119 +1,49 @@
 {
-  "meta" : {
-    "globalKey" : "1b54f085"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-              },
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "6b413360"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "bd492439"
-      }
-    },
-    "meta" : {
-      "globalKey" : "1b54f085"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
-      },
-      "name" : {
-        "value" : "Party A"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
+        "globalKey" : "3eac3060"
       },
-      "name" : {
-        "value" : "Party B"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2016-01-15",
+      "meta" : {
+        "globalKey" : "3f004f"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
+              "value" : "InterestRate",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-              },
-              "value" : "INTEREST_RATE"
+              }
             }
           }, {
             "source" : "ISDA",
             "value" : {
               "name" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
+                }
               }
             }
           }, {
@@ -124,45 +54,42 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b8fe"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "18"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2007-01-18",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -171,22 +98,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eb96930a"
-                      },
-                      "unadjustedDate" : "2007-01-18"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eb96930a"
                     }
                   },
-                  "lastRegularPeriodEndDate" : "2036-01-18",
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates1",
-                    "globalKey" : "af701b1a"
-                  },
-                  "stubPeriodType" : "LONG_FINAL",
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2037-01-19",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -195,34 +117,20 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "c1473e7b"
-                      },
-                      "unadjustedDate" : "2037-01-19"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "c1473e7b"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "32c10d02"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates1",
-                    "globalKey" : "4d64aef4"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -231,84 +139,101 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
+                  "lastRegularPeriodEndDate" : "2036-01-18",
+                  "stubPeriodType" : "LongFinal",
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "1794e"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "18"
+                  },
+                  "meta" : {
+                    "globalKey" : "87b34c58",
+                    "externalKey" : "fixedCalcPeriodDates1"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "9b0d9350",
+                    "externalKey" : "paymentDates1"
                   }
                 },
                 "stubPeriod" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "fixedCalcPeriodDates1",
-                    "globalReference" : "af701b1a"
+                    "globalReference" : "87b34c58",
+                    "externalReference" : "fixedCalcPeriodDates1"
                   },
                   "finalStub" : {
                     "stubRate" : 0.04357
                   }
+                },
+                "meta" : {
+                  "globalKey" : "607453cc"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c8d"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "18"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2007-01-18",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -317,22 +242,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eb96930a"
-                      },
-                      "unadjustedDate" : "2007-01-18"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eb96930a"
                     }
                   },
-                  "lastRegularPeriodEndDate" : "2036-07-18",
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates2",
-                    "globalKey" : "e039166b"
-                  },
-                  "stubPeriodType" : "LONG_FINAL",
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2037-01-19",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -341,34 +261,20 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "c1473e7b"
-                      },
-                      "unadjustedDate" : "2037-01-19"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "c1473e7b"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "3ab6319d"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates2",
-                    "globalKey" : "4d64ad85"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -377,44 +283,67 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
+                  "lastRegularPeriodEndDate" : "2036-07-18",
+                  "stubPeriodType" : "LongFinal",
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "18a9f"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "18"
+                  },
+                  "meta" : {
+                    "globalKey" : "8a09ac29",
+                    "externalKey" : "floatingCalcPeriodDates2"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "8f129421",
+                    "externalKey" : "paymentDates2"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates2",
-                    "globalReference" : "e039166b"
+                    "globalReference" : "8a09ac29",
+                    "externalReference" : "floatingCalcPeriodDates2"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2d80ce67"
+                      "globalKey" : "a5cb91b"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -423,17 +352,20 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates2",
-                      "globalReference" : "f2c7588e"
+                      "globalReference" : "d3e535de",
+                      "externalReference" : "resetDates2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates2",
-                    "globalKey" : "f2c7588e"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -442,177 +374,245 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "d3e535de",
+                    "externalKey" : "resetDates2"
+                  }
                 },
                 "stubPeriod" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates2",
-                    "globalReference" : "e039166b"
+                    "globalReference" : "8a09ac29",
+                    "externalReference" : "floatingCalcPeriodDates2"
                   },
                   "finalStub" : {
                     "floatingRate" : [ {
                       "floatingRateIndex" : "EUR-EURIBOR-Reuters",
                       "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "959"
-                        },
+                        "periodMultiplier" : 6,
                         "period" : "M",
-                        "periodMultiplier" : 6
+                        "meta" : {
+                          "globalKey" : "107"
+                        }
                       }
                     }, {
                       "floatingRateIndex" : "EUR-EURIBOR-Reuters",
                       "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "95c"
-                        },
+                        "periodMultiplier" : 9,
                         "period" : "M",
-                        "periodMultiplier" : 9
+                        "meta" : {
+                          "globalKey" : "164"
+                        }
                       }
                     } ]
                   }
+                },
+                "meta" : {
+                  "globalKey" : "5f15da7d"
                 }
               } ],
               "meta" : {
-                "globalKey" : "ade8505b"
+                "globalKey" : "f01e5531"
               }
             }
           },
           "meta" : {
-            "globalKey" : "f04d273f"
+            "globalKey" : "32832c15"
           }
         },
         "meta" : {
-          "globalKey" : "f04d273f"
+          "globalKey" : "32832c15"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7cd76408"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.04357,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.04357,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 20000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "1e151cf8"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 20000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 20000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2b133da1"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "affa4023"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Reuters"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 20000000
+            "meta" : {
+              "globalKey" : "4f4cc24f"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "c54c8073"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3f004f"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
+        }
+      } ],
+      "name" : {
+        "value" : "Party A"
       },
-      "value" : "2016-01-15"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
         }
       } ],
-      "issuer" : {
+      "name" : {
+        "value" : "Party B"
+      },
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+              }
+            }
+          }
+        },
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
         },
-        "value" : "54930084UKLVMY22DS16"
-      },
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "335bf1d6"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+        "globalKey" : "bd492439"
+      }
+    },
+    "meta" : {
+      "globalKey" : "7e7f40b1"
+    }
+  },
+  "meta" : {
+    "globalKey" : "7e7f40b1"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-OIS-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-OIS-uti.json
index 5c88e63798..baedf85091 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-OIS-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-OIS-uti.json
@@ -1,182 +1,109 @@
 {
-  "meta" : {
-    "globalKey" : "1958a419"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-              },
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "6b413360"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "bd492439"
-      }
-    },
-    "meta" : {
-      "globalKey" : "1958a419"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
-      },
-      "name" : {
-        "value" : "Party A"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
+        "globalKey" : "3eac3060"
       },
-      "name" : {
-        "value" : "Party B"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2018-01-26",
+      "meta" : {
+        "globalKey" : "3f105a"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
-          "productIdentifier" : [ {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:OIS"
-              },
-              "meta" : {
-                "globalKey" : "d75a34bb"
-              },
-              "source" : "OTHER"
-            }
-          } ],
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
+              "value" : "InterestRate",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-              },
-              "value" : "INTEREST_RATE"
+              }
             }
           }, {
             "source" : "ISDA",
             "value" : {
               "name" : {
+                "value" : "InterestRate:IRSwap:OIS",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:OIS"
+                }
               }
             }
           }, {
             "source" : "ISDA",
             "productQualifier" : "InterestRate_IRSwap_FixedFloat_OIS"
           } ],
+          "productIdentifier" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "InterestRate:IRSwap:OIS",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                }
+              },
+              "source" : "Other",
+              "meta" : {
+                "globalKey" : "d75a34bb"
+              }
+            }
+          } ],
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "159f0"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "7"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-03-12",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -185,22 +112,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ece2b504"
-                      },
-                      "unadjustedDate" : "2018-03-12"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ece2b504"
                     }
                   },
-                  "firstRegularPeriodStartDate" : "2018-10-07",
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates1",
-                    "globalKey" : "a046e9c7"
-                  },
-                  "stubPeriodType" : "SHORT_INITIAL",
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2022-10-07",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -209,34 +131,20 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "be29f4c7"
-                      },
-                      "unadjustedDate" : "2022-10-07"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "be29f4c7"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "30889807"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates1",
-                    "globalKey" : "425092f1"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -245,83 +153,100 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf23"
-                    },
-                    "period" : "D",
+                  "firstRegularPeriodStartDate" : "2018-10-07",
+                  "stubPeriodType" : "ShortInitial",
+                  "calculationPeriodFrequency" : {
                     "periodMultiplier" : 1,
-                    "dayType" : "BUSINESS"
-                  },
-                  "paymentFrequency" : {
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "1a40"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "7"
+                  },
+                  "meta" : {
+                    "globalKey" : "7d30f5dd",
+                    "externalKey" : "fixedCalcPeriodDates1"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 1,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4abbbd"
                     },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f5f4a4b3",
+                    "externalKey" : "paymentDates1"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "5db33d8f"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "159f0"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "7"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-03-12",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -330,22 +255,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ece2b504"
-                      },
-                      "unadjustedDate" : "2018-03-12"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ece2b504"
                     }
                   },
-                  "firstRegularPeriodStartDate" : "2018-10-07",
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates2",
-                    "globalKey" : "a046e9c7"
-                  },
-                  "stubPeriodType" : "SHORT_INITIAL",
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2022-10-07",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -354,34 +274,20 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "be29f4c7"
-                      },
-                      "unadjustedDate" : "2022-10-07"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "be29f4c7"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "99a12092"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates2",
-                    "globalKey" : "425092f1"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -390,51 +296,74 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf23"
-                    },
-                    "period" : "D",
+                  "firstRegularPeriodStartDate" : "2018-10-07",
+                  "stubPeriodType" : "ShortInitial",
+                  "calculationPeriodFrequency" : {
                     "periodMultiplier" : 1,
-                    "dayType" : "BUSINESS"
-                  },
-                  "paymentFrequency" : {
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "1a40"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "7"
+                  },
+                  "meta" : {
+                    "globalKey" : "7d30f5dd",
+                    "externalKey" : "floatingCalcPeriodDates2"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 1,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4abbbd"
                     },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f5f4a4b3",
+                    "externalKey" : "paymentDates2"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates2",
-                    "globalReference" : "a046e9c7"
+                    "globalReference" : "7d30f5dd",
+                    "externalReference" : "floatingCalcPeriodDates2"
                   },
+                  "resetRelativeTo" : "CalculationPeriodEndDate",
                   "fixingDates" : {
+                    "periodMultiplier" : 0,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "4032f4d2"
+                      "globalKey" : "b58ac6da"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 0,
+                    "businessDayConvention" : "PRECEDING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -443,17 +372,20 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "PRECEDING",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates2",
-                      "globalReference" : "6193de69"
+                      "globalReference" : "a2c60ccd",
+                      "externalReference" : "resetDates2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates2",
-                    "globalKey" : "6193de69"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -462,143 +394,211 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                  "meta" : {
+                    "globalKey" : "a2c60ccd",
+                    "externalKey" : "resetDates2"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "9b68909e"
                 }
               } ],
               "meta" : {
-                "globalKey" : "c98a519"
+                "globalKey" : "b5c76ad"
               }
             }
           },
           "meta" : {
-            "globalKey" : "8c62b66d"
+            "globalKey" : "ce8516f"
           }
         },
         "meta" : {
-          "globalKey" : "8c62b66d"
+          "globalKey" : "ce8516f"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "daa2b7f0"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0004568,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.0004568,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 34900000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "79b44610"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 34900000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 34900000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "3fbbb2b9"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "23c05191"
-            },
             "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EONIA-OIS-COMPOUND"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "rateOption-1"
                 } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EONIA-OIS-COMPOUND"
-                }
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 34900000
+            "meta" : {
+              "globalKey" : "5449e08f"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "b9759be5"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3f105a"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
+        }
+      } ],
+      "name" : {
+        "value" : "Party A"
       },
-      "value" : "2018-01-26"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
         }
       } ],
-      "issuer" : {
+      "name" : {
+        "value" : "Party B"
+      },
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+              }
+            }
+          }
+        },
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
         },
-        "value" : "54930084UKLVMY22DS16"
-      },
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "335bf1d6"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+        "globalKey" : "bd492439"
+      }
+    },
+    "meta" : {
+      "globalKey" : "d35372e3"
+    }
+  },
+  "meta" : {
+    "globalKey" : "d35372e3"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Vanilla-account.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Vanilla-account.json
index acf451a47e..c4d568bb63 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Vanilla-account.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Vanilla-account.json
@@ -1,215 +1,109 @@
 {
-  "meta" : {
-    "globalKey" : "c3435afb"
-  },
   "trade" : {
-    "account" : [ {
-      "accountBeneficiary" : {
-        "externalReference" : "p1",
-        "globalReference" : "7cec034c"
-      },
-      "accountNumber" : {
-        "value" : "p1-account-a"
-      },
-      "meta" : {
-        "externalKey" : "p1-acc",
-        "globalKey" : "c7b66577"
-      },
-      "partyReference" : {
-        "externalReference" : "p1",
-        "globalReference" : "7cec034c"
-      }
-    }, {
-      "accountBeneficiary" : {
-        "externalReference" : "p2",
-        "globalReference" : "490e5f44"
-      },
-      "accountNumber" : {
-        "value" : "p2-account-a"
-      },
-      "meta" : {
-        "externalKey" : "p2-acc",
-        "globalKey" : "b647837a"
-      },
-      "partyReference" : {
-        "externalReference" : "p2",
-        "globalReference" : "490e5f44"
-      }
-    } ],
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-              },
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "6b413360"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "bd492439"
-      }
-    },
-    "meta" : {
-      "globalKey" : "c3435afb"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "p1",
-        "globalKey" : "7cec034c"
-      },
-      "name" : {
-        "value" : "Party A"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "p2",
-        "globalKey" : "490e5f44"
+        "globalKey" : "3eac3060"
       },
-      "name" : {
-        "value" : "Party B"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2018-01-29",
+      "meta" : {
+        "globalKey" : "3f105d"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "p1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "p2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
-          "productIdentifier" : [ {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
-              },
-              "meta" : {
-                "globalKey" : "95f4ea06"
-              },
-              "source" : "OTHER"
-            }
-          } ],
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
+              "value" : "InterestRate",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-              },
-              "value" : "INTEREST_RATE"
+              }
             }
           }, {
             "source" : "ISDA",
             "value" : {
               "name" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
+                }
               }
             }
           }, {
             "source" : "ISDA",
             "productQualifier" : "InterestRate_IRSwap_FixedFloat"
           } ],
+          "productIdentifier" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                }
+              },
+              "source" : "Other",
+              "meta" : {
+                "globalKey" : "95f4ea06"
+              }
+            }
+          } ],
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "159ef"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "6"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2015-03-06",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -218,20 +112,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ec88867e"
-                      },
-                      "unadjustedDate" : "2015-03-06"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec88867e"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates1",
-                    "globalKey" : "b22e67a9"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2025-03-06",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -240,34 +131,20 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "b448ede8"
-                      },
-                      "unadjustedDate" : "2025-03-06"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "b448ede8"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "21fd5978"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates1",
-                    "globalKey" : "4d64aef4"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -276,75 +153,90 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "1a3f"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "6"
+                  },
+                  "meta" : {
+                    "globalKey" : "c7325a87",
+                    "externalKey" : "fixedCalcPeriodDates1"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "9b0d9350",
+                    "externalKey" : "paymentDates1"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "fff015cc"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d7e"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "6"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2015-03-06",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -353,20 +245,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ec88867e"
-                      },
-                      "unadjustedDate" : "2015-03-06"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec88867e"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates2",
-                    "globalKey" : "e0a1147a"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2025-03-06",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -375,34 +264,20 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "b448ede8"
-                      },
-                      "unadjustedDate" : "2025-03-06"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "b448ede8"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "2cd2a60c"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates2",
-                    "globalKey" : "4d64ad85"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -411,44 +286,65 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "2b90"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "6"
+                  },
+                  "meta" : {
+                    "globalKey" : "c7326bd8",
+                    "externalKey" : "floatingCalcPeriodDates2"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "8f129421",
+                    "externalKey" : "paymentDates2"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates2",
-                    "globalReference" : "e0a1147a"
+                    "globalReference" : "c7326bd8",
+                    "externalReference" : "floatingCalcPeriodDates2"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2d80ce67"
+                      "globalKey" : "a5cb91b"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -457,17 +353,20 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates2",
-                      "globalReference" : "f2c7588e"
+                      "globalReference" : "d3e535de",
+                      "externalReference" : "resetDates2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates2",
-                    "globalKey" : "f2c7588e"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -476,150 +375,251 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "d3e535de",
+                    "externalKey" : "resetDates2"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "b44140d6"
                 }
               } ],
               "meta" : {
-                "globalKey" : "b707fd94"
+                "globalKey" : "20f1a18a"
               }
             }
           },
           "meta" : {
-            "globalKey" : "3f6d94ea"
+            "globalKey" : "cd7d0128"
           }
         },
         "meta" : {
-          "globalKey" : "3f6d94ea"
+          "globalKey" : "cd7d0128"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "27a2ef6f"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.006982,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.006982,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 10000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "ccbafe71"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 10000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "962e8ae0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "affa4023"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Reuters"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 10000000
+            "meta" : {
+              "globalKey" : "4f4cc24f"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "b8b38af2"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "p1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "p2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3f105d"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
+        }
+      } ],
+      "name" : {
+        "value" : "Party A"
       },
-      "value" : "2018-01-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "349a498c",
+        "externalKey" : "p1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
         }
       } ],
-      "issuer" : {
+      "name" : {
+        "value" : "Party B"
+      },
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "p2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+              }
+            }
+          }
+        },
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
         },
-        "value" : "54930084UKLVMY22DS16"
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "bd492439"
+      }
+    },
+    "account" : [ {
+      "partyReference" : {
+        "globalReference" : "349a498c",
+        "externalReference" : "p1"
+      },
+      "accountNumber" : {
+        "value" : "p1-account-a"
+      },
+      "accountBeneficiary" : {
+        "globalReference" : "349a498c",
+        "externalReference" : "p1"
       },
       "meta" : {
-        "globalKey" : "335bf1d6"
+        "globalKey" : "c7b66577",
+        "externalKey" : "p1-acc"
+      }
+    }, {
+      "partyReference" : {
+        "globalReference" : "4caf4c44",
+        "externalReference" : "p2"
+      },
+      "accountNumber" : {
+        "value" : "p2-account-a"
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+      "accountBeneficiary" : {
+        "globalReference" : "4caf4c44",
+        "externalReference" : "p2"
+      },
+      "meta" : {
+        "globalKey" : "b647837a",
+        "externalKey" : "p2-acc"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "ab1a903d"
+    }
+  },
+  "meta" : {
+    "globalKey" : "ab1a903d"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Vanilla-extended-party-roles-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Vanilla-extended-party-roles-versioned.json
index eb2c4a1715..8e26fee5f8 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Vanilla-extended-party-roles-versioned.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Vanilla-extended-party-roles-versioned.json
@@ -1,241 +1,107 @@
 {
-  "meta" : {
-    "globalKey" : "2536733d"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-              },
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "6b413360"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "bd492439"
-      }
-    },
-    "meta" : {
-      "globalKey" : "2536733d"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "27b20a6a"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
-          },
-          "value" : "COUNTERPARTY"
-        },
-        "meta" : {
-          "globalKey" : "27b20a6a"
-        }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "cc892602"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "cc892602",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "LCH00023323008",
           "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
-          },
-          "value" : "LCHLGB22XXX"
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/trade-id"
+          }
         },
-        "meta" : {
-          "globalKey" : "cc892602"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party3",
-        "globalKey" : "75486bd9"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
-          },
-          "value" : "BROKER"
-        },
-        "meta" : {
-          "globalKey" : "75486bd9"
-        }
-      } ]
-    } ],
-    "partyRole" : [ {
-      "ownershipPartyReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "cc892602"
-      },
-      "partyReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "27b20a6a"
-      },
-      "role" : "COUNTERPARTY"
-    }, {
-      "partyReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "cc892602"
-      },
-      "role" : "DETERMINING_PARTY"
-    }, {
-      "partyReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "cc892602"
-      },
-      "role" : "BARRIER_DETERMINATION_AGENT"
-    }, {
-      "partyReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "27b20a6a"
-      },
-      "role" : "HEDGING_PARTY"
-    }, {
-      "partyReference" : {
-        "externalReference" : "party3",
-        "globalReference" : "75486bd9"
-      },
-      "role" : "ARRANGING_BROKER"
+        "globalKey" : "71303531"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2017-12-18",
+      "meta" : {
+        "globalKey" : "3f0b12"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "27b20a6a"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "27b20a6a"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "cc892602"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
-          "productIdentifier" : [ {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
-              },
-              "meta" : {
-                "globalKey" : "95f4ea06"
-              },
-              "source" : "OTHER"
-            }
-          } ],
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
+              "value" : "InterestRate",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-              },
-              "value" : "INTEREST_RATE"
+              }
             }
           }, {
             "source" : "ISDA",
             "value" : {
               "name" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
+                }
               }
             }
           }, {
             "source" : "ISDA",
             "productQualifier" : "InterestRate_IRSwap_FixedFloat"
           } ],
-          "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
+          "productIdentifier" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/business-center"
-                },
-                "value" : "EUTA"
+                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
+              "source" : "Other",
+              "meta" : {
+                "globalKey" : "95f4ea06"
+              }
+            }
+          } ],
+          "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "159ef"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "6"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2015-03-06",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -244,20 +110,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ec88867e"
-                      },
-                      "unadjustedDate" : "2015-03-06"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec88867e"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates1",
-                    "globalKey" : "b22e67a9"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2025-03-06",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -266,34 +129,20 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "b448ede8"
-                      },
-                      "unadjustedDate" : "2025-03-06"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "b448ede8"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "21fd5978"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates1",
-                    "globalKey" : "4d64aef4"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -302,75 +151,90 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "1a3f"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "6"
+                  },
+                  "meta" : {
+                    "globalKey" : "c7325a87",
+                    "externalKey" : "fixedCalcPeriodDates1"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "9b0d9350",
+                    "externalKey" : "paymentDates1"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "fff015cc"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d7e"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "6"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2015-03-06",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -379,20 +243,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ec88867e"
-                      },
-                      "unadjustedDate" : "2015-03-06"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec88867e"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates2",
-                    "globalKey" : "e0a1147a"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2025-03-06",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -401,34 +262,20 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "b448ede8"
-                      },
-                      "unadjustedDate" : "2025-03-06"
+                      }
                     },
-                    "meta" : {
-                      "globalKey" : "b448ede8"
-                    }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "2cd2a60c"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates2",
-                    "globalKey" : "4d64ad85"
+                    "meta" : {
+                      "globalKey" : "b448ede8"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -437,44 +284,65 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "2b90"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "6"
+                  },
+                  "meta" : {
+                    "globalKey" : "c7326bd8",
+                    "externalKey" : "floatingCalcPeriodDates2"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "8f129421",
+                    "externalKey" : "paymentDates2"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates2",
-                    "globalReference" : "e0a1147a"
+                    "globalReference" : "c7326bd8",
+                    "externalReference" : "floatingCalcPeriodDates2"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2d80ce67"
+                      "globalKey" : "a5cb91b"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -483,17 +351,20 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates2",
-                      "globalReference" : "f2c7588e"
+                      "globalReference" : "d3e535de",
+                      "externalReference" : "resetDates2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates2",
-                    "globalKey" : "f2c7588e"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -502,148 +373,277 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "d3e535de",
+                    "externalKey" : "resetDates2"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "b44140d6"
                 }
               } ],
               "meta" : {
-                "globalKey" : "b707fd94"
+                "globalKey" : "20f1a18a"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "EUTA",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/business-center"
+                }
               }
             }
           },
           "meta" : {
-            "globalKey" : "525f50f1"
+            "globalKey" : "405e2aaf"
           }
         },
         "meta" : {
-          "globalKey" : "525f50f1"
+          "globalKey" : "405e2aaf"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "27a2ef6f"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.006982,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.006982,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 10000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "ccbafe71"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 10000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "962e8ae0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "affa4023"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Reuters"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 10000000
+            "meta" : {
+              "globalKey" : "4f4cc24f"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "b8b38af2"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "27b20a6a",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "cc892602",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "27b20a6a",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "COUNTERPARTY",
+          "meta" : {
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "27b20a6a"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3f0b12"
-      },
-      "value" : "2017-12-18"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "27b20a6a",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "LCHLGB22XXX",
           "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/trade-id"
-          },
-          "value" : "LCH00023323008"
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "cc892602"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "cc892602"
+      "meta" : {
+        "globalKey" : "cc892602",
+        "externalKey" : "party2"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "BROKER",
+          "meta" : {
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "75486bd9"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "75486bd9",
+        "externalKey" : "party3"
+      }
+    } ],
+    "partyRole" : [ {
+      "partyReference" : {
+        "globalReference" : "27b20a6a",
+        "externalReference" : "party1"
       },
+      "role" : "Counterparty",
+      "ownershipPartyReference" : {
+        "globalReference" : "cc892602",
+        "externalReference" : "party2"
+      }
+    }, {
+      "partyReference" : {
+        "globalReference" : "cc892602",
+        "externalReference" : "party2"
+      },
+      "role" : "DeterminingParty"
+    }, {
+      "partyReference" : {
+        "globalReference" : "cc892602",
+        "externalReference" : "party2"
+      },
+      "role" : "BarrierDeterminationAgent"
+    }, {
+      "partyReference" : {
+        "globalReference" : "27b20a6a",
+        "externalReference" : "party1"
+      },
+      "role" : "HedgingParty"
+    }, {
+      "partyReference" : {
+        "globalReference" : "75486bd9",
+        "externalReference" : "party3"
+      },
+      "role" : "ArrangingBroker"
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+              }
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "7c2665f1"
+        "globalKey" : "bd492439"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "3f9b6e29"
+    }
+  },
+  "meta" : {
+    "globalKey" : "3f9b6e29"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Vanilla-multiple-accounts.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Vanilla-multiple-accounts.json
index 44602a6ff2..5fcd1343e0 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Vanilla-multiple-accounts.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Vanilla-multiple-accounts.json
@@ -1,231 +1,109 @@
 {
-  "meta" : {
-    "globalKey" : "29e440f3"
-  },
   "trade" : {
-    "account" : [ {
-      "accountBeneficiary" : {
-        "externalReference" : "p1",
-        "globalReference" : "7cec034c"
-      },
-      "accountNumber" : {
-        "value" : "p1-account-a"
-      },
-      "meta" : {
-        "externalKey" : "p1-a1",
-        "globalKey" : "c7b66577"
-      },
-      "partyReference" : {
-        "externalReference" : "p1",
-        "globalReference" : "7cec034c"
-      }
-    }, {
-      "accountBeneficiary" : {
-        "externalReference" : "p1",
-        "globalReference" : "7cec034c"
-      },
-      "accountNumber" : {
-        "value" : "p1-account-b"
-      },
-      "meta" : {
-        "externalKey" : "p1-a2",
-        "globalKey" : "c7b66938"
-      },
-      "partyReference" : {
-        "externalReference" : "p1",
-        "globalReference" : "7cec034c"
-      }
-    }, {
-      "accountBeneficiary" : {
-        "externalReference" : "p2",
-        "globalReference" : "490e5f44"
-      },
-      "accountNumber" : {
-        "value" : "p2-account-a"
-      },
-      "meta" : {
-        "externalKey" : "p2-a1",
-        "globalKey" : "b647837a"
-      },
-      "partyReference" : {
-        "externalReference" : "p2",
-        "globalReference" : "490e5f44"
-      }
-    } ],
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-              },
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "6b413360"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "bd492439"
-      }
-    },
-    "meta" : {
-      "globalKey" : "29e440f3"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "p1",
-        "globalKey" : "7cec034c"
       },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "p2",
-        "globalKey" : "490e5f44"
-      },
-      "name" : {
-        "value" : "Party B"
+        "globalKey" : "3eac3060"
       },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2018-01-29",
+      "meta" : {
+        "globalKey" : "3f105d"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "p1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "p2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
-          "productIdentifier" : [ {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
-              },
-              "meta" : {
-                "globalKey" : "95f4ea06"
-              },
-              "source" : "OTHER"
-            }
-          } ],
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
+              "value" : "InterestRate",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-              },
-              "value" : "INTEREST_RATE"
+              }
             }
           }, {
             "source" : "ISDA",
             "value" : {
               "name" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
+                }
               }
             }
           }, {
             "source" : "ISDA",
             "productQualifier" : "InterestRate_IRSwap_FixedFloat"
           } ],
+          "productIdentifier" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                }
+              },
+              "source" : "Other",
+              "meta" : {
+                "globalKey" : "95f4ea06"
+              }
+            }
+          } ],
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "159ef"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "6"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2015-03-06",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -234,20 +112,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ec88867e"
-                      },
-                      "unadjustedDate" : "2015-03-06"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec88867e"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates1",
-                    "globalKey" : "b22e67a9"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2025-03-06",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -256,34 +131,20 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "b448ede8"
-                      },
-                      "unadjustedDate" : "2025-03-06"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "b448ede8"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "21fd5978"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates1",
-                    "globalKey" : "4d64aef4"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -292,75 +153,90 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "1a3f"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "6"
+                  },
+                  "meta" : {
+                    "globalKey" : "c7325a87",
+                    "externalKey" : "fixedCalcPeriodDates1"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "9b0d9350",
+                    "externalKey" : "paymentDates1"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "fff015cc"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d7e"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "6"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2015-03-06",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -369,20 +245,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ec88867e"
-                      },
-                      "unadjustedDate" : "2015-03-06"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec88867e"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates2",
-                    "globalKey" : "e0a1147a"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2025-03-06",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -391,34 +264,56 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "b448ede8"
-                      },
-                      "unadjustedDate" : "2025-03-06"
+                        "globalKey" : "b448ede8"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "b448ede8"
+                    }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "b448ede8"
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "2b90"
+                    },
+                    "rollConvention" : "6"
+                  },
+                  "meta" : {
+                    "globalKey" : "c7326bd8",
+                    "externalKey" : "floatingCalcPeriodDates2"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "2cd2a60c"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates2",
-                    "globalKey" : "4d64ad85"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -427,44 +322,29 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "8f129421",
+                    "externalKey" : "paymentDates2"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates2",
-                    "globalReference" : "e0a1147a"
+                    "globalReference" : "c7326bd8",
+                    "externalReference" : "floatingCalcPeriodDates2"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2d80ce67"
+                      "globalKey" : "a5cb91b"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -473,17 +353,20 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates2",
-                      "globalReference" : "f2c7588e"
+                      "globalReference" : "d3e535de",
+                      "externalReference" : "resetDates2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates2",
-                    "globalKey" : "f2c7588e"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -492,150 +375,267 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "d3e535de",
+                    "externalKey" : "resetDates2"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "b44140d6"
                 }
               } ],
               "meta" : {
-                "globalKey" : "b707fd94"
+                "globalKey" : "20f1a18a"
               }
             }
           },
           "meta" : {
-            "globalKey" : "3f6d94ea"
+            "globalKey" : "cd7d0128"
           }
         },
         "meta" : {
-          "globalKey" : "3f6d94ea"
+          "globalKey" : "cd7d0128"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "27a2ef6f"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.006982,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.006982,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 10000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "ccbafe71"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 10000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "962e8ae0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "affa4023"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Reuters"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 10000000
+            "meta" : {
+              "globalKey" : "4f4cc24f"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "b8b38af2"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "p1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "p2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3f105d"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
+        }
+      } ],
+      "name" : {
+        "value" : "Party A"
       },
-      "value" : "2018-01-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "349a498c",
+        "externalKey" : "p1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
         }
       } ],
-      "issuer" : {
+      "name" : {
+        "value" : "Party B"
+      },
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "p2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+              }
+            }
+          }
+        },
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
         },
-        "value" : "54930084UKLVMY22DS16"
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "bd492439"
+      }
+    },
+    "account" : [ {
+      "partyReference" : {
+        "globalReference" : "349a498c",
+        "externalReference" : "p1"
+      },
+      "accountNumber" : {
+        "value" : "p1-account-a"
+      },
+      "accountBeneficiary" : {
+        "globalReference" : "349a498c",
+        "externalReference" : "p1"
+      },
+      "meta" : {
+        "globalKey" : "c7b66577",
+        "externalKey" : "p1-a1"
+      }
+    }, {
+      "partyReference" : {
+        "globalReference" : "349a498c",
+        "externalReference" : "p1"
+      },
+      "accountNumber" : {
+        "value" : "p1-account-b"
+      },
+      "accountBeneficiary" : {
+        "globalReference" : "349a498c",
+        "externalReference" : "p1"
       },
       "meta" : {
-        "globalKey" : "335bf1d6"
+        "globalKey" : "c7b66938",
+        "externalKey" : "p1-a2"
+      }
+    }, {
+      "partyReference" : {
+        "globalReference" : "4caf4c44",
+        "externalReference" : "p2"
+      },
+      "accountNumber" : {
+        "value" : "p2-account-a"
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+      "accountBeneficiary" : {
+        "globalReference" : "4caf4c44",
+        "externalReference" : "p2"
+      },
+      "meta" : {
+        "globalKey" : "b647837a",
+        "externalKey" : "p2-a1"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "9d153b9d"
+    }
+  },
+  "meta" : {
+    "globalKey" : "9d153b9d"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Vanilla-party-roles-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Vanilla-party-roles-versioned.json
index 34431b6de7..8ca9e43658 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Vanilla-party-roles-versioned.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Vanilla-party-roles-versioned.json
@@ -1,231 +1,107 @@
 {
-  "meta" : {
-    "globalKey" : "3007459e"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-              },
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "6b413360"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "bd492439"
-      }
-    },
-    "meta" : {
-      "globalKey" : "3007459e"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "27b20a6a"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
-          },
-          "value" : "COUNTERPARTY"
-        },
-        "meta" : {
-          "globalKey" : "27b20a6a"
-        }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "cc892602"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "cc892602",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "LCH00023323008",
           "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
-          },
-          "value" : "LCHLGB22XXX"
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/trade-id"
+          }
         },
-        "meta" : {
-          "globalKey" : "cc892602"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party3",
-        "globalKey" : "75486bd9"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
-          },
-          "value" : "BROKER"
-        },
-        "meta" : {
-          "globalKey" : "75486bd9"
-        }
-      } ]
-    } ],
-    "partyRole" : [ {
-      "partyReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "cc892602"
-      },
-      "role" : "DETERMINING_PARTY"
-    }, {
-      "partyReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "cc892602"
-      },
-      "role" : "BARRIER_DETERMINATION_AGENT"
-    }, {
-      "partyReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "27b20a6a"
-      },
-      "role" : "HEDGING_PARTY"
-    }, {
-      "partyReference" : {
-        "externalReference" : "party3",
-        "globalReference" : "75486bd9"
-      },
-      "role" : "ARRANGING_BROKER"
+        "globalKey" : "71303531"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2017-12-18",
+      "meta" : {
+        "globalKey" : "3f0b12"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "27b20a6a"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "27b20a6a"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "cc892602"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
-          "productIdentifier" : [ {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
-              },
-              "meta" : {
-                "globalKey" : "95f4ea06"
-              },
-              "source" : "OTHER"
-            }
-          } ],
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
+              "value" : "InterestRate",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-              },
-              "value" : "INTEREST_RATE"
+              }
             }
           }, {
             "source" : "ISDA",
             "value" : {
               "name" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
+                }
               }
             }
           }, {
             "source" : "ISDA",
             "productQualifier" : "InterestRate_IRSwap_FixedFloat"
           } ],
-          "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
+          "productIdentifier" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/business-center"
-                },
-                "value" : "EUTA"
+                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
+              "source" : "Other",
+              "meta" : {
+                "globalKey" : "95f4ea06"
+              }
+            }
+          } ],
+          "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "159ef"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "6"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2015-03-06",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -234,20 +110,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ec88867e"
-                      },
-                      "unadjustedDate" : "2015-03-06"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec88867e"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates1",
-                    "globalKey" : "b22e67a9"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2025-03-06",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -256,34 +129,20 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "b448ede8"
-                      },
-                      "unadjustedDate" : "2025-03-06"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "b448ede8"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "21fd5978"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates1",
-                    "globalKey" : "4d64aef4"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -292,75 +151,90 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "1a3f"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "6"
+                  },
+                  "meta" : {
+                    "globalKey" : "c7325a87",
+                    "externalKey" : "fixedCalcPeriodDates1"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "9b0d9350",
+                    "externalKey" : "paymentDates1"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "fff015cc"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d7e"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "6"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2015-03-06",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -369,20 +243,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ec88867e"
-                      },
-                      "unadjustedDate" : "2015-03-06"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec88867e"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates2",
-                    "globalKey" : "e0a1147a"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2025-03-06",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -391,34 +262,56 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "b448ede8"
-                      },
-                      "unadjustedDate" : "2025-03-06"
+                        "globalKey" : "b448ede8"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "b448ede8"
+                    }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "b448ede8"
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "2b90"
+                    },
+                    "rollConvention" : "6"
+                  },
+                  "meta" : {
+                    "globalKey" : "c7326bd8",
+                    "externalKey" : "floatingCalcPeriodDates2"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "2cd2a60c"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates2",
-                    "globalKey" : "4d64ad85"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -427,44 +320,29 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "8f129421",
+                    "externalKey" : "paymentDates2"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates2",
-                    "globalReference" : "e0a1147a"
+                    "globalReference" : "c7326bd8",
+                    "externalReference" : "floatingCalcPeriodDates2"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2d80ce67"
+                      "globalKey" : "a5cb91b"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -473,17 +351,20 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates2",
-                      "globalReference" : "f2c7588e"
+                      "globalReference" : "d3e535de",
+                      "externalReference" : "resetDates2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates2",
-                    "globalKey" : "f2c7588e"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -492,148 +373,267 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "d3e535de",
+                    "externalKey" : "resetDates2"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "b44140d6"
                 }
               } ],
               "meta" : {
-                "globalKey" : "b707fd94"
+                "globalKey" : "20f1a18a"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "EUTA",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/business-center"
+                }
               }
             }
           },
           "meta" : {
-            "globalKey" : "525f50f1"
+            "globalKey" : "405e2aaf"
           }
         },
         "meta" : {
-          "globalKey" : "525f50f1"
+          "globalKey" : "405e2aaf"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "27a2ef6f"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.006982,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.006982,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 10000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "ccbafe71"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 10000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "962e8ae0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "affa4023"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Reuters"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 10000000
+            "meta" : {
+              "globalKey" : "4f4cc24f"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "b8b38af2"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "27b20a6a",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "cc892602",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "27b20a6a",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "COUNTERPARTY",
+          "meta" : {
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "27b20a6a"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3f0b12"
-      },
-      "value" : "2017-12-18"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "27b20a6a",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "LCHLGB22XXX",
           "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/trade-id"
-          },
-          "value" : "LCH00023323008"
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "cc892602"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "cc892602"
+      "meta" : {
+        "globalKey" : "cc892602",
+        "externalKey" : "party2"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "BROKER",
+          "meta" : {
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "75486bd9"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "75486bd9",
+        "externalKey" : "party3"
+      }
+    } ],
+    "partyRole" : [ {
+      "partyReference" : {
+        "globalReference" : "cc892602",
+        "externalReference" : "party2"
+      },
+      "role" : "DeterminingParty"
+    }, {
+      "partyReference" : {
+        "globalReference" : "cc892602",
+        "externalReference" : "party2"
       },
+      "role" : "BarrierDeterminationAgent"
+    }, {
+      "partyReference" : {
+        "globalReference" : "27b20a6a",
+        "externalReference" : "party1"
+      },
+      "role" : "HedgingParty"
+    }, {
+      "partyReference" : {
+        "globalReference" : "75486bd9",
+        "externalReference" : "party3"
+      },
+      "role" : "ArrangingBroker"
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+              }
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "7c2665f1"
+        "globalKey" : "bd492439"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "3a3c740a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "3a3c740a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Vanilla-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Vanilla-uti.json
index 2e7f0c9005..cbf38d421b 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Vanilla-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-Vanilla-uti.json
@@ -1,182 +1,109 @@
 {
-  "meta" : {
-    "globalKey" : "28a5248a"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-              },
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "6b413360"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "bd492439"
-      }
-    },
-    "meta" : {
-      "globalKey" : "28a5248a"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
       },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
-      },
-      "name" : {
-        "value" : "Party B"
+        "globalKey" : "3eac3060"
       },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2018-01-29",
+      "meta" : {
+        "globalKey" : "3f105d"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
-          "productIdentifier" : [ {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
-              },
-              "meta" : {
-                "globalKey" : "95f4ea06"
-              },
-              "source" : "OTHER"
-            }
-          } ],
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
+              "value" : "InterestRate",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-              },
-              "value" : "INTEREST_RATE"
+              }
             }
           }, {
             "source" : "ISDA",
             "value" : {
               "name" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
+                }
               }
             }
           }, {
             "source" : "ISDA",
             "productQualifier" : "InterestRate_IRSwap_FixedFloat"
           } ],
+          "productIdentifier" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                }
+              },
+              "source" : "Other",
+              "meta" : {
+                "globalKey" : "95f4ea06"
+              }
+            }
+          } ],
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "159ef"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "6"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2015-03-06",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -185,20 +112,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ec88867e"
-                      },
-                      "unadjustedDate" : "2015-03-06"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec88867e"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates1",
-                    "globalKey" : "b22e67a9"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2025-03-06",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -207,34 +131,20 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "b448ede8"
-                      },
-                      "unadjustedDate" : "2025-03-06"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "b448ede8"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "21fd5978"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates1",
-                    "globalKey" : "4d64aef4"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -243,75 +153,90 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "1a3f"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "6"
+                  },
+                  "meta" : {
+                    "globalKey" : "c7325a87",
+                    "externalKey" : "fixedCalcPeriodDates1"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "9b0d9350",
+                    "externalKey" : "paymentDates1"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "fff015cc"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d7e"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "6"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2015-03-06",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -320,20 +245,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ec88867e"
-                      },
-                      "unadjustedDate" : "2015-03-06"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec88867e"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates2",
-                    "globalKey" : "e0a1147a"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2025-03-06",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -342,34 +264,20 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "b448ede8"
-                      },
-                      "unadjustedDate" : "2025-03-06"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "b448ede8"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "2cd2a60c"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates2",
-                    "globalKey" : "4d64ad85"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -378,44 +286,65 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "2b90"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "6"
+                  },
+                  "meta" : {
+                    "globalKey" : "c7326bd8",
+                    "externalKey" : "floatingCalcPeriodDates2"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "8f129421",
+                    "externalKey" : "paymentDates2"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates2",
-                    "globalReference" : "e0a1147a"
+                    "globalReference" : "c7326bd8",
+                    "externalReference" : "floatingCalcPeriodDates2"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2d80ce67"
+                      "globalKey" : "a5cb91b"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -424,17 +353,20 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates2",
-                      "globalReference" : "f2c7588e"
+                      "globalReference" : "d3e535de",
+                      "externalReference" : "resetDates2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates2",
-                    "globalKey" : "f2c7588e"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -443,150 +375,218 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "d3e535de",
+                    "externalKey" : "resetDates2"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "b44140d6"
                 }
               } ],
               "meta" : {
-                "globalKey" : "b707fd94"
+                "globalKey" : "20f1a18a"
               }
             }
           },
           "meta" : {
-            "globalKey" : "3f6d94ea"
+            "globalKey" : "cd7d0128"
           }
         },
         "meta" : {
-          "globalKey" : "3f6d94ea"
+          "globalKey" : "cd7d0128"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "27a2ef6f"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.006982,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.006982,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 10000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "ccbafe71"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 10000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "962e8ae0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "affa4023"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Reuters"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 10000000
+            "meta" : {
+              "globalKey" : "4f4cc24f"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "b8b38af2"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3f105d"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
+        }
+      } ],
+      "name" : {
+        "value" : "Party A"
       },
-      "value" : "2018-01-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
         }
       } ],
-      "issuer" : {
+      "name" : {
+        "value" : "Party B"
+      },
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+              }
+            }
+          }
+        },
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
         },
-        "value" : "54930084UKLVMY22DS16"
-      },
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "335bf1d6"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+        "globalKey" : "bd492439"
+      }
+    },
+    "meta" : {
+      "globalKey" : "6af105cc"
+    }
+  },
+  "meta" : {
+    "globalKey" : "6af105cc"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-vanilla-reconciliation-partyA-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-vanilla-reconciliation-partyA-uti.json
index 6d969542af..72f8a2bff7 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-vanilla-reconciliation-partyA-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-vanilla-reconciliation-partyA-uti.json
@@ -1,66 +1,32 @@
 {
-  "meta" : {
-    "globalKey" : "bb6c5d7b"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "bb6c5d7b"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
-      },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "121d7965"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
       },
-      "name" : {
-        "value" : "Party B"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "3eac3060"
+      },
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "1994-12-12",
+      "meta" : {
+        "globalKey" : "3e530c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -71,46 +37,40 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c89"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -119,103 +79,108 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "3e2554c0"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "DEFR"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "1ff50d"
+                            "globalKey" : "1ff50d",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365af8de"
                         }
                       },
                       "meta" : {
                         "globalKey" : "a8d53690"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "a8d53690"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "97763931"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa45fc6"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "18a9b"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "a26405d2",
+                    "externalKey" : "floatingCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "7a04f180"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "3e2554c0"
+                    "globalReference" : "a26405d2",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "131ae8a2"
+                      "globalKey" : "eff6d356"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -224,82 +189,79 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "dbde664a"
+                      "globalReference" : "a5aeeeb8",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "dbde664a"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "a5aeeeb8",
+                    "externalKey" : "resetDates"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "2e03d8ab"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b8fa"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30E/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -308,235 +270,273 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "faa5b75e"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "1ff50d"
+                            "globalReference" : "1ff50d",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "93c845ff"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "93c845ff"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30E/360"
-                },
-                "meta" : {
-                  "globalKey" : "f8158737"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa46135"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "1794a"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "9249d1f2",
+                    "externalKey" : "fixedCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "85fff0af"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "9c789d4b"
                 }
               } ],
               "meta" : {
-                "globalKey" : "4f3ab328"
+                "globalKey" : "eee37036"
               }
             }
           },
           "meta" : {
-            "globalKey" : "4f3ab328"
+            "globalKey" : "eee37036"
           }
         },
         "meta" : {
-          "globalKey" : "4f3ab328"
+          "globalKey" : "eee37036"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7e340358"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "53c66a4c"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-LIBOR-BBA"
-                },
-                "indexTenor" : {
+          "quantity" : [ {
+            "value" : {
+              "value" : 20000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR",
                   "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                  }
                 }
               }
-            }
-          },
-          "quantity" : [ {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                    "globalKey" : "107"
+                  }
                 }
               },
-              "value" : 20000000.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2505dd46"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "89d4e479"
           },
+          "meta" : {
+            "globalKey" : "9b059b6a"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "value" : 0.06,
               "perUnitOf" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 20000000.00,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
-              },
-              "value" : 20000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "b0c7aaa7"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e530c"
-      },
-      "value" : "1994-12-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "54930084UKLVMY22DS16"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "335bf1d6"
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
+        }
+      } ],
+      "name" : {
+        "value" : "Party B"
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "b2ac20ad"
+    }
+  },
+  "meta" : {
+    "globalKey" : "b2ac20ad"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-vanilla-reconciliation-partyB-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-vanilla-reconciliation-partyB-uti.json
index aaa303d3de..3c6fe130b2 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-vanilla-reconciliation-partyB-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-vanilla-reconciliation-partyB-uti.json
@@ -1,66 +1,32 @@
 {
-  "meta" : {
-    "globalKey" : "8418ef83"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "8418ef83"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party3",
-        "globalKey" : "7cec034c"
-      },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "121d7965"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "party4",
-        "globalKey" : "490e5f44"
       },
-      "name" : {
-        "value" : "Party B"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "3eac3060"
+      },
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "1994-12-12",
+      "meta" : {
+        "globalKey" : "3e530c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party3",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party4",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -71,46 +37,40 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "fooBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "f6b0a538"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "2ceba909"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c89"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -119,103 +79,108 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fooFloatingCalcPeriodDates",
-                    "globalKey" : "c89dc384"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "DEFR"
                           } ],
                           "meta" : {
-                            "externalKey" : "fooBusinessCenters",
-                            "globalKey" : "1ff50d"
+                            "globalKey" : "1ff50d",
+                            "externalKey" : "fooBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365af8de"
                         }
                       },
                       "meta" : {
                         "globalKey" : "a8d53690"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "a8d53690"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "530c2bd"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "bf8358a"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "fooBusinessCenters",
-                        "globalReference" : "1ff50d"
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "fooBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "f6b0a538"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "2ceba909"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "18a9b"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "708ae88e",
+                    "externalKey" : "fooFloatingCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "fooBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "f6b0a538"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "2ceba909"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "85a2923c"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "fooFloatingCalcPeriodDates",
-                    "globalReference" : "c89dc384"
+                    "globalReference" : "708ae88e",
+                    "externalReference" : "fooFloatingCalcPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "77519208"
+                      "globalKey" : "542d7cbc"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -224,82 +189,79 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "fooResetDates",
-                      "globalReference" : "5961c94e"
+                      "globalReference" : "727c1cb4",
+                      "externalReference" : "fooResetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fooResetDates",
-                    "globalKey" : "5961c94e"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "fooBusinessCenters",
-                        "globalReference" : "1ff50d"
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "fooBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "f6b0a538"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "2ceba909"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "727c1cb4",
+                    "externalKey" : "fooResetDates"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "d370251f"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "fooBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "f6b0a538"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "2ceba909"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b8fa"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30E/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -308,235 +270,273 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fooFixedCalcPeriodDates",
-                    "globalKey" : "90bbc6de"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "fooBusinessCenters",
-                            "globalReference" : "1ff50d"
+                            "globalReference" : "1ff50d",
+                            "externalReference" : "fooBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "f6b0a538"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "2ceba909"
                         }
                       },
                       "meta" : {
                         "globalKey" : "9f65e6bb"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "9f65e6bb"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30E/360"
-                },
-                "meta" : {
-                  "globalKey" : "e827ab73"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "bf836f9"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "fooBusinessCenters",
-                        "globalReference" : "1ff50d"
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "fooBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "f6b0a538"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "2ceba909"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "1794a"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "62162772",
+                    "externalKey" : "fooFixedCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "fooBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "f6b0a538"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "2ceba909"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "919d916b"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "8a95b387"
                 }
               } ],
               "meta" : {
-                "globalKey" : "4894b1f0"
+                "globalKey" : "49f401e6"
               }
             }
           },
           "meta" : {
-            "globalKey" : "4894b1f0"
+            "globalKey" : "49f401e6"
           }
         },
         "meta" : {
-          "globalKey" : "4894b1f0"
+          "globalKey" : "49f401e6"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7e340358"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "53c66a4c"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-LIBOR-BBA"
-                },
-                "indexTenor" : {
+          "quantity" : [ {
+            "value" : {
+              "value" : 20000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR",
                   "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
+                    "scheme" : "fooCurrencyScheme"
+                  }
                 }
               }
-            }
-          },
-          "quantity" : [ {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
                   "meta" : {
-                    "scheme" : "fooCurrencyScheme"
-                  },
-                  "value" : "EUR"
+                    "globalKey" : "107"
+                  }
                 }
               },
-              "value" : 20000000.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2505dd46"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "89d4e479"
           },
+          "meta" : {
+            "globalKey" : "9b059b6a"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "fooCurrencyScheme"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "value" : 0.06,
               "perUnitOf" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "fooCurrencyScheme"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 20000000.00,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "fooCurrencyScheme"
-                  },
-                  "value" : "EUR"
+                  }
                 }
-              },
-              "value" : 20000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "b0c7aaa7"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party3"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party4"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e530c"
-      },
-      "value" : "1994-12-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "54930084UKLVMY22DS16"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "335bf1d6"
+        "globalKey" : "349a498c",
+        "externalKey" : "party3"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
+        }
+      } ],
+      "name" : {
+        "value" : "Party B"
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party4"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "b34359bd"
+    }
+  },
+  "meta" : {
+    "globalKey" : "b34359bd"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-variable-notional-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-variable-notional-uti.json
index 845e522e22..932f1b18d0 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-variable-notional-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/EUR-variable-notional-uti.json
@@ -1,182 +1,109 @@
 {
-  "meta" : {
-    "globalKey" : "b1c3873b"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-              },
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "6b413360"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "bd492439"
-      }
-    },
-    "meta" : {
-      "globalKey" : "b1c3873b"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
       },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
-      },
-      "name" : {
-        "value" : "Party B"
+        "globalKey" : "3eac3060"
       },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2018-01-30",
+      "meta" : {
+        "globalKey" : "3f105e"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
-          "productIdentifier" : [ {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
-              },
-              "meta" : {
-                "globalKey" : "95f4ea06"
-              },
-              "source" : "OTHER"
-            }
-          } ],
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
+              "value" : "InterestRate",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-              },
-              "value" : "INTEREST_RATE"
+              }
             }
           }, {
             "source" : "ISDA",
             "value" : {
               "name" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
+                }
               }
             }
           }, {
             "source" : "ISDA",
             "productQualifier" : "InterestRate_IRSwap_FixedFloat"
           } ],
+          "productIdentifier" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                }
+              },
+              "source" : "Other",
+              "meta" : {
+                "globalKey" : "95f4ea06"
+              }
+            }
+          } ],
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "159eb"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "2"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2012-09-02",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -185,20 +112,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ec3400fa"
-                      },
-                      "unadjustedDate" : "2012-09-02"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec3400fa"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates1",
-                    "globalKey" : "40733ad"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2020-09-02",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -207,34 +131,20 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "fae1a1ec"
-                      },
-                      "unadjustedDate" : "2020-09-02"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "fae1a1ec"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "a83a84f4"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates1",
-                    "globalKey" : "4d64aef4"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -243,75 +153,98 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "1a3b"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "2"
+                  },
+                  "meta" : {
+                    "globalKey" : "886b3803",
+                    "externalKey" : "fixedCalcPeriodDates1"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "9b0d9350",
+                    "externalKey" : "paymentDates1"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "283f4848"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d7a"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "2"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2012-09-02",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -320,20 +253,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ec3400fa"
-                      },
-                      "unadjustedDate" : "2012-09-02"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec3400fa"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates2",
-                    "globalKey" : "3279e07e"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2020-09-02",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -342,34 +272,20 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "fae1a1ec"
-                      },
-                      "unadjustedDate" : "2020-09-02"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "fae1a1ec"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "e7fdd8ee"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates2",
-                    "globalKey" : "4d64ad85"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -378,52 +294,65 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "2b8c"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "2"
+                  },
+                  "meta" : {
+                    "globalKey" : "886b4954",
+                    "externalKey" : "floatingCalcPeriodDates2"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
                       }
                     },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "8f129421",
+                    "externalKey" : "paymentDates2"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates2",
-                    "globalReference" : "3279e07e"
+                    "globalReference" : "886b4954",
+                    "externalReference" : "floatingCalcPeriodDates2"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "df3eae89"
+                      "globalKey" : "f4cabc3d"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -434,17 +363,20 @@
                         "globalKey" : "428533f"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates2",
-                      "globalReference" : "3b1d87b0"
+                      "globalReference" : "188800",
+                      "externalReference" : "resetDates2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates2",
-                    "globalKey" : "3b1d87b0"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -453,465 +385,533 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "188800",
+                    "externalKey" : "resetDates2"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "4019c996"
                 }
               } ],
               "meta" : {
-                "globalKey" : "d1f150e2"
+                "globalKey" : "15d1dfde"
               }
             }
           },
           "meta" : {
-            "globalKey" : "783771cc"
+            "globalKey" : "44ddf380"
           }
         },
         "meta" : {
-          "globalKey" : "783771cc"
+          "globalKey" : "44ddf380"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "39d080c2"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.06779467,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.06779467,
               "datedValue" : [ {
                 "date" : "2012-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5771b3"
-                },
-                "value" : 0.025
+                }
               }, {
                 "date" : "2013-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5869b3"
-                },
-                "value" : 0.025
+                }
               }, {
                 "date" : "2014-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5961b3"
-                },
-                "value" : 0.025
+                }
               }, {
                 "date" : "2015-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5a59b3"
-                },
-                "value" : 0.025
+                }
               }, {
                 "date" : "2016-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5b51b3"
-                },
-                "value" : 0.025
+                }
               }, {
                 "date" : "2017-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5c49b3"
-                },
-                "value" : 0.025
+                }
               }, {
                 "date" : "2018-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5d41b3"
-                },
-                "value" : 0.025
+                }
               }, {
                 "date" : "2019-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5e39b3"
-                },
-                "value" : 0.025
+                }
               } ],
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 1000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 1000000,
               "datedValue" : [ {
                 "date" : "2012-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "79e23ef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2013-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "79f1bef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2014-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a013ef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2015-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a10bef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2016-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a203ef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2017-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a2fbef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2018-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a3f3ef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2019-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a4ebef"
-                },
-                "value" : 100
+                }
               } ]
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "4acd376e"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "53c66a4c"
             },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
-              }
-            }
-          },
-          "price" : [ {
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "3f977e"
+          }
+        }, {
+          "price" : [ {
             "value" : {
+              "value" : 0,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0,
               "datedValue" : [ {
                 "date" : "2012-09-02",
+                "value" : 0.00025,
                 "meta" : {
                   "globalKey" : "44026333"
-                },
-                "value" : 0.00025
+                }
               }, {
                 "date" : "2013-03-02",
+                "value" : 0.00025,
                 "meta" : {
                   "globalKey" : "44032cb3"
-                },
-                "value" : 0.00025
+                }
               }, {
                 "date" : "2013-09-02",
+                "value" : 0.00023,
                 "meta" : {
                   "globalKey" : "44035b31"
-                },
-                "value" : 0.00023
+                }
               }, {
                 "date" : "2014-03-02",
+                "value" : 0.00023,
                 "meta" : {
                   "globalKey" : "440424b1"
-                },
-                "value" : 0.00023
+                }
               }, {
                 "date" : "2014-09-02",
+                "value" : 0.00023,
                 "meta" : {
                   "globalKey" : "44045331"
-                },
-                "value" : 0.00023
+                }
               }, {
                 "date" : "2015-03-02",
+                "value" : 0.00023,
                 "meta" : {
                   "globalKey" : "44051cb1"
-                },
-                "value" : 0.00023
+                }
               }, {
                 "date" : "2015-09-02",
+                "value" : 0.00021,
                 "meta" : {
                   "globalKey" : "44054b2f"
-                },
-                "value" : 0.00021
+                }
               }, {
                 "date" : "2016-03-02",
+                "value" : 0.00021,
                 "meta" : {
                   "globalKey" : "440614af"
-                },
-                "value" : 0.00021
+                }
               }, {
                 "date" : "2016-09-02",
+                "value" : 0.00015,
                 "meta" : {
                   "globalKey" : "44064314"
-                },
-                "value" : 0.00015
+                }
               }, {
                 "date" : "2017-03-02",
+                "value" : 0.00015,
                 "meta" : {
                   "globalKey" : "44070c94"
-                },
-                "value" : 0.00015
+                }
               }, {
                 "date" : "2017-09-02",
+                "value" : 0.00013,
                 "meta" : {
                   "globalKey" : "44073b12"
-                },
-                "value" : 0.00013
+                }
               }, {
                 "date" : "2018-03-02",
+                "value" : 0.00013,
                 "meta" : {
                   "globalKey" : "44080492"
-                },
-                "value" : 0.00013
+                }
               }, {
                 "date" : "2018-09-02",
+                "value" : 0.00012,
                 "meta" : {
                   "globalKey" : "44083311"
-                },
-                "value" : 0.00012
+                }
               }, {
                 "date" : "2019-03-02",
+                "value" : 0.00012,
                 "meta" : {
                   "globalKey" : "4408fc91"
-                },
-                "value" : 0.00012
+                }
               }, {
                 "date" : "2019-09-02",
+                "value" : 0.00012,
                 "meta" : {
                   "globalKey" : "44092b11"
-                },
-                "value" : 0.00012
+                }
               }, {
                 "date" : "2020-03-02",
+                "value" : 0,
                 "meta" : {
                   "globalKey" : "7a4f7ae"
-                },
-                "value" : 0
+                }
               } ],
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-2"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 1000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 1000000,
               "datedValue" : [ {
                 "date" : "2012-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "79e23ef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2013-03-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "79eed6f"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2013-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "79f1bef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2014-03-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "79fe56f"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2014-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a013ef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2015-03-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a0dd6f"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2015-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a10bef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2016-03-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a1d56f"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2016-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a203ef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2017-03-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a2cd6f"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2017-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a2fbef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2018-03-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a3c56f"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2018-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a3f3ef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2019-03-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a4bd6f"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2019-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a4ebef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2020-03-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a5b56f"
-                },
-                "value" : 100
+                }
               } ]
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2505dd46"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "f94a3fd8"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3f105e"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
+        }
+      } ],
+      "name" : {
+        "value" : "Party A"
       },
-      "value" : "2018-01-30"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
         }
       } ],
-      "issuer" : {
+      "name" : {
+        "value" : "Party B"
+      },
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+              }
+            }
+          }
+        },
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
         },
-        "value" : "54930084UKLVMY22DS16"
-      },
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "335bf1d6"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+        "globalKey" : "bd492439"
+      }
+    },
+    "meta" : {
+      "globalKey" : "d41339f3"
+    }
+  },
+  "meta" : {
+    "globalKey" : "d41339f3"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/GBP-OIS-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/GBP-OIS-uti.json
index 8da792776f..c5705427e7 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/GBP-OIS-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/GBP-OIS-uti.json
@@ -1,182 +1,109 @@
 {
-  "meta" : {
-    "globalKey" : "d4a7e946"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-              },
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "6b413360"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "bd492439"
-      }
-    },
-    "meta" : {
-      "globalKey" : "4d382da1"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
-      },
-      "name" : {
-        "value" : "Party A"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
+        "globalKey" : "3eac3060"
       },
-      "name" : {
-        "value" : "Party B"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2018-04-24",
+      "meta" : {
+        "globalKey" : "3f1118"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
-          "productIdentifier" : [ {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:OIS"
-              },
-              "meta" : {
-                "globalKey" : "d75a34bb"
-              },
-              "source" : "OTHER"
-            }
-          } ],
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
+              "value" : "InterestRate",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-              },
-              "value" : "INTEREST_RATE"
+              }
             }
           }, {
             "source" : "ISDA",
             "value" : {
               "name" : {
+                "value" : "InterestRate:IRSwap:OIS",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:OIS"
+                }
               }
             }
           }, {
             "source" : "ISDA",
             "productQualifier" : "InterestRate_IRSwap_FixedFloat_OIS"
           } ],
+          "productIdentifier" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "InterestRate:IRSwap:OIS",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                }
+              },
+              "source" : "Other",
+              "meta" : {
+                "globalKey" : "d75a34bb"
+              }
+            }
+          } ],
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365c4b6f"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b8f9"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "13"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-04-13",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -185,20 +112,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ece3a905"
-                      },
-                      "unadjustedDate" : "2018-04-13"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ece3a905"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates1",
-                    "globalKey" : "23da2a9f"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2019-04-13",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -207,34 +131,20 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365c4b6f"
                         }
                       },
                       "meta" : {
                         "globalKey" : "44d3d282"
-                      },
-                      "unadjustedDate" : "2019-04-13"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "44d3d282"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "2ee20873"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates1",
-                    "globalKey" : "965ab2d3"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -243,75 +153,90 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "17949"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "13"
+                  },
+                  "meta" : {
+                    "globalKey" : "ce9d3691",
+                    "externalKey" : "fixedCalcPeriodDates1"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365c4b6f"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "9b0e33d1",
+                    "externalKey" : "paymentDates1"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "e8e2b6c7"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365c4b6f"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b8f9"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "13"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-04-13",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -320,20 +245,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ece3a905"
-                      },
-                      "unadjustedDate" : "2018-04-13"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ece3a905"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates2",
-                    "globalKey" : "23da2a9f"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2019-04-13",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -342,34 +264,20 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365c4b6f"
                         }
                       },
                       "meta" : {
                         "globalKey" : "44d3d282"
-                      },
-                      "unadjustedDate" : "2019-04-13"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "44d3d282"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "b036bb9e"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates2",
-                    "globalKey" : "965ab2d3"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -378,43 +286,64 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "17949"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "13"
+                  },
+                  "meta" : {
+                    "globalKey" : "ce9d3691",
+                    "externalKey" : "floatingCalcPeriodDates2"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365c4b6f"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "9b0e33d1",
+                    "externalKey" : "paymentDates2"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates2",
-                    "globalReference" : "23da2a9f"
+                    "globalReference" : "ce9d3691",
+                    "externalReference" : "floatingCalcPeriodDates2"
                   },
+                  "resetRelativeTo" : "CalculationPeriodEndDate",
                   "fixingDates" : {
+                    "periodMultiplier" : 0,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "428d7913"
+                      "globalKey" : "b7e54b1b"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 0,
+                    "businessDayConvention" : "PRECEDING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -423,17 +352,20 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "PRECEDING",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates2",
-                      "globalReference" : "a1809589"
+                      "globalReference" : "99bd608f",
+                      "externalReference" : "resetDates2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates2",
-                    "globalKey" : "a1809589"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -442,170 +374,234 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                  "meta" : {
+                    "globalKey" : "99bd608f",
+                    "externalKey" : "resetDates2"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "64f85e28"
                 }
               } ],
               "meta" : {
-                "globalKey" : "5332cd1"
+                "globalKey" : "6af062af"
               }
             }
           },
           "meta" : {
-            "globalKey" : "992d9c25"
+            "globalKey" : "bd6cd071"
           }
         },
         "meta" : {
-          "globalKey" : "992d9c25"
+          "globalKey" : "bd6cd071"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3ca59d0"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.002875,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "value" : 0.002875,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 750000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "7580e030"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 750000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 750000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "34ca2dd9"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "dfe916ea"
-            },
             "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "GBP-SONIA-COMPOUND"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "rateOption-1"
                 } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "GBP-SONIA-COMPOUND"
-                }
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 750000000.00
+            "meta" : {
+              "globalKey" : "1d39c656"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "22184cf3"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3f1118"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
+        }
+      } ],
+      "name" : {
+        "value" : "Party A"
       },
-      "value" : "2018-04-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
         }
       } ],
-      "issuer" : {
+      "name" : {
+        "value" : "Party B"
+      },
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+              }
+            }
+          }
+        },
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
         },
-        "value" : "54930084UKLVMY22DS16"
-      },
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "335bf1d6"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+        "globalKey" : "bd492439"
+      }
+    },
+    "meta" : {
+      "globalKey" : "fabc2373"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "12f79847"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        }
-      },
       "quantity" : {
+        "value" : 708000,
         "unit" : {
           "currency" : {
             "value" : "GBP"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
         },
-        "value" : 708000
+        "receiverPartyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2017-05-09",
         "dateAdjustments" : {
+          "businessDayConvention" : "MODFOLLOWING",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "GBLO"
@@ -614,16 +610,20 @@
               "globalKey" : "21479e"
             }
           },
-          "businessDayConvention" : "MODFOLLOWING",
           "meta" : {
             "globalKey" : "365c4b6f"
           }
-        },
-        "unadjustedDate" : "2017-05-09"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "24407c01"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "2d9b0e6e"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/GBP-VNS-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/GBP-VNS-uti.json
index 38c7bcf0b8..9ceb05e3c0 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/GBP-VNS-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/GBP-VNS-uti.json
@@ -1,182 +1,109 @@
 {
-  "meta" : {
-    "globalKey" : "2f3cc9aa"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-              },
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "6b413360"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "bd492439"
-      }
-    },
-    "meta" : {
-      "globalKey" : "2f3cc9aa"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
       },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
-      },
-      "name" : {
-        "value" : "Party B"
+        "globalKey" : "3eac3060"
       },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2018-01-30",
+      "meta" : {
+        "globalKey" : "3f105e"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
-          "productIdentifier" : [ {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
-              },
-              "meta" : {
-                "globalKey" : "95f4ea06"
-              },
-              "source" : "OTHER"
-            }
-          } ],
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
+              "value" : "InterestRate",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-              },
-              "value" : "INTEREST_RATE"
+              }
             }
           }, {
             "source" : "ISDA",
             "value" : {
               "name" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
+                }
               }
             }
           }, {
             "source" : "ISDA",
             "productQualifier" : "InterestRate_IRSwap_FixedFloat"
           } ],
+          "productIdentifier" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                }
+              },
+              "source" : "Other",
+              "meta" : {
+                "globalKey" : "95f4ea06"
+              }
+            }
+          } ],
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365c4b6f"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "159eb"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "2"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2012-09-02",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -185,20 +112,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ec3400fa"
-                      },
-                      "unadjustedDate" : "2012-09-02"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec3400fa"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates1",
-                    "globalKey" : "3ede25cd"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2020-09-02",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -207,34 +131,20 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365c4b6f"
                         }
                       },
                       "meta" : {
                         "globalKey" : "fae2426d"
-                      },
-                      "unadjustedDate" : "2020-09-02"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "fae2426d"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "49a98a95"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates1",
-                    "globalKey" : "965ab2d3"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -243,75 +153,98 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "1a3b"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "2"
+                  },
+                  "meta" : {
+                    "globalKey" : "5deb10a3",
+                    "externalKey" : "fixedCalcPeriodDates1"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365c4b6f"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "9b0e33d1",
+                    "externalKey" : "paymentDates1"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "70c17969"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365c4b6f"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d7a"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "2"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2012-09-02",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -320,20 +253,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ec3400fa"
-                      },
-                      "unadjustedDate" : "2012-09-02"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec3400fa"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates2",
-                    "globalKey" : "6d50d29e"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2020-09-02",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -342,34 +272,20 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365c4b6f"
                         }
                       },
                       "meta" : {
                         "globalKey" : "fae2426d"
-                      },
-                      "unadjustedDate" : "2020-09-02"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "fae2426d"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "dabcb90"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates2",
-                    "globalKey" : "965ab164"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -378,51 +294,64 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "2b8c"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "2"
+                  },
+                  "meta" : {
+                    "globalKey" : "5deb21f4",
+                    "externalKey" : "floatingCalcPeriodDates2"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
                       }
                     },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "365c4b6f"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "8f1334a2",
+                    "externalKey" : "paymentDates2"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates2",
-                    "globalReference" : "6d50d29e"
+                    "globalReference" : "5deb21f4",
+                    "externalReference" : "floatingCalcPeriodDates2"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : 0,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "5f967367"
+                      "globalKey" : "d4ee456f"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 0,
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -431,17 +360,20 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates2",
-                      "globalReference" : "7140bef5"
+                      "globalReference" : "5d828c3b",
+                      "externalReference" : "resetDates2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates2",
-                    "globalKey" : "7140bef5"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -450,465 +382,533 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "5d828c3b",
+                    "externalKey" : "resetDates2"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "74f03afe"
                 }
               } ],
               "meta" : {
-                "globalKey" : "d70425b"
+                "globalKey" : "a0ae3875"
               }
             }
           },
           "meta" : {
-            "globalKey" : "95d5d9b1"
+            "globalKey" : "4d399813"
           }
         },
         "meta" : {
-          "globalKey" : "95d5d9b1"
+          "globalKey" : "4d399813"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "359d2a40"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.07131517,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "value" : 0.07131517,
               "datedValue" : [ {
                 "date" : "2012-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5771b3"
-                },
-                "value" : 0.025
+                }
               }, {
                 "date" : "2013-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5869b3"
-                },
-                "value" : 0.025
+                }
               }, {
                 "date" : "2014-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5961b3"
-                },
-                "value" : 0.025
+                }
               }, {
                 "date" : "2015-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5a59b3"
-                },
-                "value" : 0.025
+                }
               }, {
                 "date" : "2016-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5b51b3"
-                },
-                "value" : 0.025
+                }
               }, {
                 "date" : "2017-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5c49b3"
-                },
-                "value" : 0.025
+                }
               }, {
                 "date" : "2018-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5d41b3"
-                },
-                "value" : 0.025
+                }
               }, {
                 "date" : "2019-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5e39b3"
-                },
-                "value" : 0.025
+                }
               } ],
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 1000000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "value" : 1000000,
               "datedValue" : [ {
                 "date" : "2012-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "79e23ef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2013-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "79f1bef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2014-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a013ef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2015-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a10bef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2016-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a203ef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2017-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a2fbef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2018-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a3f3ef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2019-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a4ebef"
-                },
-                "value" : 100
+                }
               } ]
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "5cf7c9f4"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "a7e5aff9"
             },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "GBP-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
-              }
-            }
-          },
-          "price" : [ {
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "7e081dc0"
+          }
+        }, {
+          "price" : [ {
             "value" : {
+              "value" : 0,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "value" : 0,
               "datedValue" : [ {
                 "date" : "2012-09-02",
+                "value" : 0.00025,
                 "meta" : {
                   "globalKey" : "44026333"
-                },
-                "value" : 0.00025
+                }
               }, {
                 "date" : "2013-03-02",
+                "value" : 0.00025,
                 "meta" : {
                   "globalKey" : "44032cb3"
-                },
-                "value" : 0.00025
+                }
               }, {
                 "date" : "2013-09-02",
+                "value" : 0.00023,
                 "meta" : {
                   "globalKey" : "44035b31"
-                },
-                "value" : 0.00023
+                }
               }, {
                 "date" : "2014-03-02",
+                "value" : 0.00023,
                 "meta" : {
                   "globalKey" : "440424b1"
-                },
-                "value" : 0.00023
+                }
               }, {
                 "date" : "2014-09-02",
+                "value" : 0.00023,
                 "meta" : {
                   "globalKey" : "44045331"
-                },
-                "value" : 0.00023
+                }
               }, {
                 "date" : "2015-03-02",
+                "value" : 0.00023,
                 "meta" : {
                   "globalKey" : "44051cb1"
-                },
-                "value" : 0.00023
+                }
               }, {
                 "date" : "2015-09-02",
+                "value" : 0.00021,
                 "meta" : {
                   "globalKey" : "44054b2f"
-                },
-                "value" : 0.00021
+                }
               }, {
                 "date" : "2016-03-02",
+                "value" : 0.00021,
                 "meta" : {
                   "globalKey" : "440614af"
-                },
-                "value" : 0.00021
+                }
               }, {
                 "date" : "2016-09-02",
+                "value" : 0.00015,
                 "meta" : {
                   "globalKey" : "44064314"
-                },
-                "value" : 0.00015
+                }
               }, {
                 "date" : "2017-03-02",
+                "value" : 0.00015,
                 "meta" : {
                   "globalKey" : "44070c94"
-                },
-                "value" : 0.00015
+                }
               }, {
                 "date" : "2017-09-02",
+                "value" : 0.00013,
                 "meta" : {
                   "globalKey" : "44073b12"
-                },
-                "value" : 0.00013
+                }
               }, {
                 "date" : "2018-03-02",
+                "value" : 0.00013,
                 "meta" : {
                   "globalKey" : "44080492"
-                },
-                "value" : 0.00013
+                }
               }, {
                 "date" : "2018-09-02",
+                "value" : 0.00012,
                 "meta" : {
                   "globalKey" : "44083311"
-                },
-                "value" : 0.00012
+                }
               }, {
                 "date" : "2019-03-02",
+                "value" : 0.00012,
                 "meta" : {
                   "globalKey" : "4408fc91"
-                },
-                "value" : 0.00012
+                }
               }, {
                 "date" : "2019-09-02",
+                "value" : 0.00012,
                 "meta" : {
                   "globalKey" : "44092b11"
-                },
-                "value" : 0.00012
+                }
               }, {
                 "date" : "2020-03-02",
+                "value" : 0,
                 "meta" : {
                   "globalKey" : "7a4f7ae"
-                },
-                "value" : 0
+                }
               } ],
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-2"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 1000000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "value" : 1000000,
               "datedValue" : [ {
                 "date" : "2012-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "79e23ef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2013-03-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "79eed6f"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2013-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "79f1bef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2014-03-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "79fe56f"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2014-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a013ef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2015-03-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a0dd6f"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2015-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a10bef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2016-03-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a1d56f"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2016-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a203ef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2017-03-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a2cd6f"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2017-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a2fbef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2018-03-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a3c56f"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2018-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a3f3ef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2019-03-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a4bd6f"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2019-09-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a4ebef"
-                },
-                "value" : 100
+                }
               }, {
                 "date" : "2020-03-02",
+                "value" : 100,
                 "meta" : {
                   "globalKey" : "7a5b56f"
-                },
-                "value" : 100
+                }
               } ]
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "GBP-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "54cf4d39"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "73a2215e"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3f105e"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
+        }
+      } ],
+      "name" : {
+        "value" : "Party A"
       },
-      "value" : "2018-01-30"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
         }
       } ],
-      "issuer" : {
+      "name" : {
+        "value" : "Party B"
+      },
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+              }
+            }
+          }
+        },
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
         },
-        "value" : "54930084UKLVMY22DS16"
-      },
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "335bf1d6"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+        "globalKey" : "bd492439"
+      }
+    },
+    "meta" : {
+      "globalKey" : "f5d0367e"
+    }
+  },
+  "meta" : {
+    "globalKey" : "f5d0367e"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/GBP-Vanilla-person-roles-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/GBP-Vanilla-person-roles-uti.json
index 75c6ff2517..35434bc68a 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/GBP-Vanilla-person-roles-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/GBP-Vanilla-person-roles-uti.json
@@ -1,190 +1,109 @@
 {
-  "meta" : {
-    "globalKey" : "ae7ac264"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-              },
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "6b413360"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "bd492439"
-      }
-    },
-    "meta" : {
-      "globalKey" : "ae7ac264"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "515b8a83"
       },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
       } ],
-      "person" : [ {
-        "firstName" : "John",
-        "meta" : {
-          "externalKey" : "person1",
-          "globalKey" : "447e14f"
-        },
-        "surname" : "Doe"
-      } ]
-    }, {
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
+        "globalKey" : "3eac3060"
       },
-      "name" : {
-        "value" : "Party B"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2017-12-18",
+      "meta" : {
+        "globalKey" : "3f0b12"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "515b8a83"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
-          "productIdentifier" : [ {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
-              },
-              "meta" : {
-                "globalKey" : "95f4ea06"
-              },
-              "source" : "OTHER"
-            }
-          } ],
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
+              "value" : "InterestRate",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-              },
-              "value" : "INTEREST_RATE"
+              }
             }
           }, {
             "source" : "ISDA",
             "value" : {
               "name" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
+                }
               }
             }
           }, {
             "source" : "ISDA",
             "productQualifier" : "InterestRate_IRSwap_FixedFloat"
           } ],
+          "productIdentifier" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                }
+              },
+              "source" : "Other",
+              "meta" : {
+                "globalKey" : "95f4ea06"
+              }
+            }
+          } ],
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365c4b6f"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c8a"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "15"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2017-12-15",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -193,20 +112,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eccd2a87"
-                      },
-                      "unadjustedDate" : "2017-12-15"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eccd2a87"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates1",
-                    "globalKey" : "8e47596e"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2047-12-15",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -215,34 +131,20 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365c4b6f"
                         }
                       },
                       "meta" : {
                         "globalKey" : "ef79e1c0"
-                      },
-                      "unadjustedDate" : "2047-12-15"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ef79e1c0"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "96fead93"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates1",
-                    "globalKey" : "965ab164"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -251,75 +153,90 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "18a9c"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "15"
+                  },
+                  "meta" : {
+                    "globalKey" : "3a5ef124",
+                    "externalKey" : "fixedCalcPeriodDates1"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365c4b6f"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "8f1334a2",
+                    "externalKey" : "paymentDates1"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "f49b966b"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365c4b6f"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c8a"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "15"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2017-12-15",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -328,20 +245,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eccd2a87"
-                      },
-                      "unadjustedDate" : "2017-12-15"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eccd2a87"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates2",
-                    "globalKey" : "8e47596e"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2047-12-15",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -350,34 +264,20 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365c4b6f"
                         }
                       },
                       "meta" : {
                         "globalKey" : "ef79e1c0"
-                      },
-                      "unadjustedDate" : "2047-12-15"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ef79e1c0"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "db8a53d6"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates2",
-                    "globalKey" : "965ab164"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -386,43 +286,64 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "18a9c"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "15"
+                  },
+                  "meta" : {
+                    "globalKey" : "3a5ef124",
+                    "externalKey" : "floatingCalcPeriodDates2"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365c4b6f"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "8f1334a2",
+                    "externalKey" : "paymentDates2"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates2",
-                    "globalReference" : "8e47596e"
+                    "globalReference" : "3a5ef124",
+                    "externalReference" : "floatingCalcPeriodDates2"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : 0,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "428d7913"
+                      "globalKey" : "b7e54b1b"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 0,
+                    "businessDayConvention" : "PRECEDING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -431,17 +352,20 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "PRECEDING",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates2",
-                      "globalReference" : "615d58a1"
+                      "globalReference" : "4d9f25e7",
+                      "externalReference" : "resetDates2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates2",
-                    "globalKey" : "615d58a1"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -450,150 +374,226 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "4d9f25e7",
+                    "externalKey" : "resetDates2"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "bb5e325c"
                 }
               } ],
               "meta" : {
-                "globalKey" : "1d13229"
+                "globalKey" : "a7338f87"
               }
             }
           },
           "meta" : {
-            "globalKey" : "69505813"
+            "globalKey" : "d60ec429"
           }
         },
         "meta" : {
-          "globalKey" : "69505813"
+          "globalKey" : "d60ec429"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "c2c813eb"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.014048,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "value" : 0.014048,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 4352000,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "963a6975"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 4352000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 4352000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "e7f2f4e8"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "a7e5aff9"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "GBP-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 4352000
+            "meta" : {
+              "globalKey" : "54cf4d39"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "f5b01efa"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "72dc9c43",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3f0b12"
-      },
-      "value" : "2017-12-18"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
         }
       } ],
-      "issuer" : {
+      "name" : {
+        "value" : "Party A"
+      },
+      "person" : [ {
+        "firstName" : "John",
+        "surname" : "Doe",
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "globalKey" : "447e14f",
+          "externalKey" : "person1"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "72dc9c43",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "value" : "54930084UKLVMY22DS16"
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
+        }
+      } ],
+      "name" : {
+        "value" : "Party B"
       },
       "meta" : {
-        "globalKey" : "335bf1d6"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+              }
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "bd492439"
+      }
+    },
+    "meta" : {
+      "globalKey" : "cdeec198"
+    }
+  },
+  "meta" : {
+    "globalKey" : "cdeec198"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/GBP-Vanilla-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/GBP-Vanilla-uti.json
index dceb8a0e56..4aaf2cab12 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/GBP-Vanilla-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/GBP-Vanilla-uti.json
@@ -1,182 +1,109 @@
 {
-  "meta" : {
-    "globalKey" : "3b2965ff"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-              },
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "6b413360"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "bd492439"
-      }
-    },
-    "meta" : {
-      "globalKey" : "3b2965ff"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
       },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
-      },
-      "name" : {
-        "value" : "Party B"
+        "globalKey" : "3eac3060"
       },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2018-01-29",
+      "meta" : {
+        "globalKey" : "3f105d"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
-          "productIdentifier" : [ {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
-              },
-              "meta" : {
-                "globalKey" : "95f4ea06"
-              },
-              "source" : "OTHER"
-            }
-          } ],
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
+              "value" : "InterestRate",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-              },
-              "value" : "INTEREST_RATE"
+              }
             }
           }, {
             "source" : "ISDA",
             "value" : {
               "name" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
+                }
               }
             }
           }, {
             "source" : "ISDA",
             "productQualifier" : "InterestRate_IRSwap_FixedFloat"
           } ],
+          "productIdentifier" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                }
+              },
+              "source" : "Other",
+              "meta" : {
+                "globalKey" : "95f4ea06"
+              }
+            }
+          } ],
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365c4b6f"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c8a"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "15"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2017-12-15",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -185,20 +112,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eccd2a87"
-                      },
-                      "unadjustedDate" : "2017-12-15"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eccd2a87"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates1",
-                    "globalKey" : "8e47596e"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2047-12-15",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -207,34 +131,20 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365c4b6f"
                         }
                       },
                       "meta" : {
                         "globalKey" : "ef79e1c0"
-                      },
-                      "unadjustedDate" : "2047-12-15"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ef79e1c0"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "96fead93"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates1",
-                    "globalKey" : "965ab164"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -243,75 +153,90 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "18a9c"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "15"
+                  },
+                  "meta" : {
+                    "globalKey" : "3a5ef124",
+                    "externalKey" : "fixedCalcPeriodDates1"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365c4b6f"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "8f1334a2",
+                    "externalKey" : "paymentDates1"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "f49b966b"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365c4b6f"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c8a"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "15"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2017-12-15",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -320,20 +245,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eccd2a87"
-                      },
-                      "unadjustedDate" : "2017-12-15"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eccd2a87"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates2",
-                    "globalKey" : "8e47596e"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2047-12-15",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -342,34 +264,20 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365c4b6f"
                         }
                       },
                       "meta" : {
                         "globalKey" : "ef79e1c0"
-                      },
-                      "unadjustedDate" : "2047-12-15"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ef79e1c0"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "db8a53d6"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates2",
-                    "globalKey" : "965ab164"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -378,43 +286,64 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "18a9c"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "15"
+                  },
+                  "meta" : {
+                    "globalKey" : "3a5ef124",
+                    "externalKey" : "floatingCalcPeriodDates2"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365c4b6f"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "8f1334a2",
+                    "externalKey" : "paymentDates2"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates2",
-                    "globalReference" : "8e47596e"
+                    "globalReference" : "3a5ef124",
+                    "externalReference" : "floatingCalcPeriodDates2"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : 0,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "428d7913"
+                      "globalKey" : "b7e54b1b"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 0,
+                    "businessDayConvention" : "PRECEDING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -423,17 +352,20 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "PRECEDING",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates2",
-                      "globalReference" : "615d58a1"
+                      "globalReference" : "4d9f25e7",
+                      "externalReference" : "resetDates2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates2",
-                    "globalKey" : "615d58a1"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -442,150 +374,218 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "4d9f25e7",
+                    "externalKey" : "resetDates2"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "bb5e325c"
                 }
               } ],
               "meta" : {
-                "globalKey" : "1d13229"
+                "globalKey" : "a7338f87"
               }
             }
           },
           "meta" : {
-            "globalKey" : "69505813"
+            "globalKey" : "d60ec429"
           }
         },
         "meta" : {
-          "globalKey" : "69505813"
+          "globalKey" : "d60ec429"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "c2c813eb"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.014048,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "value" : 0.014048,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 4352000,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "963a6975"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 4352000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 4352000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "e7f2f4e8"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "a7e5aff9"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "GBP-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 4352000
+            "meta" : {
+              "globalKey" : "54cf4d39"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "f5b01efa"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3f105d"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
+        }
+      } ],
+      "name" : {
+        "value" : "Party A"
       },
-      "value" : "2018-01-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
         }
       } ],
-      "issuer" : {
+      "name" : {
+        "value" : "Party B"
+      },
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+              }
+            }
+          }
+        },
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
         },
-        "value" : "54930084UKLVMY22DS16"
-      },
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "335bf1d6"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+        "globalKey" : "bd492439"
+      }
+    },
+    "meta" : {
+      "globalKey" : "ddc132e3"
+    }
+  },
+  "meta" : {
+    "globalKey" : "ddc132e3"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/NDS-CNY-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/NDS-CNY-uti.json
index 07a3273610..486d10aa88 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/NDS-CNY-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/NDS-CNY-uti.json
@@ -1,176 +1,113 @@
 {
-  "meta" : {
-    "globalKey" : "b4080094"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-              },
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "6b413360"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "bd492439"
-      }
-    },
-    "meta" : {
-      "globalKey" : "b4080094"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
       },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
+        "globalKey" : "3eac3060"
       },
-      "name" : {
-        "value" : "Party B"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2018-03-27",
+      "meta" : {
+        "globalKey" : "3f10db"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
-          "productIdentifier" : [ {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
-              },
-              "meta" : {
-                "globalKey" : "95f4ea06"
-              },
-              "source" : "OTHER"
-            }
-          } ],
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
+              "value" : "InterestRate",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-              },
-              "value" : "INTEREST_RATE"
+              }
             }
           }, {
             "source" : "ISDA",
             "value" : {
               "name" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
+                }
               }
             }
           }, {
             "source" : "ISDA",
             "productQualifier" : "InterestRate_IRSwap_FixedFloat"
           } ],
+          "productIdentifier" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                }
+              },
+              "source" : "Other",
+              "meta" : {
+                "globalKey" : "95f4ea06"
+              }
+            }
+          } ],
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "f649984a"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
+                  "meta" : {
+                    "globalKey" : "d8f881c8"
+                  },
                   "cashSettlementTerms" : [ {
-                    "meta" : {
-                      "globalKey" : "5dd4fde4"
+                    "valuationMethod" : {
+                      "valuationSource" : {
+                        "settlementRateOption" : {
+                          "settlementRateOption" : {
+                            "value" : "CNY.SAEC/CNY01"
+                          }
+                        }
+                      }
                     },
                     "valuationDate" : {
                       "fxFixingDate" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "24fecc89"
+                          "globalKey" : "c0f47555"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "CNBE"
@@ -181,53 +118,41 @@
                             "globalKey" : "3fc80bb"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeToPaymentDates" : {
                           "paymentDatesReference" : [ {
-                            "externalReference" : "paymentDates1",
-                            "globalReference" : "2d2890e4"
+                            "globalReference" : "e159efbc",
+                            "externalReference" : "paymentDates1"
                           } ]
                         }
                       }
                     },
-                    "valuationMethod" : {
-                      "valuationSource" : {
-                        "settlementRateOption" : {
-                          "settlementRateOption" : {
-                            "value" : "CNY.SAEC/CNY01"
-                          }
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "4083e762"
                     }
                   } ]
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "CNBE"
-                      }, {
-                        "value" : "USNY"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "3fc80bb"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "9785d44c"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c2d"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "15"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-05-15",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -236,20 +161,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ece4a0c7"
-                      },
-                      "unadjustedDate" : "2018-05-15"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ece4a0c7"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates1",
-                    "globalKey" : "d54e4c8b"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2019-05-15",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "CNBE"
@@ -260,34 +182,20 @@
                             "globalKey" : "3fc80bb"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "9785d44c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "ae45741d"
-                      },
-                      "unadjustedDate" : "2019-05-15"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ae45741d"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "79033082"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates1",
-                    "globalKey" : "2d2890e4"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "CNBE"
@@ -298,69 +206,98 @@
                         "globalKey" : "3fc80bb"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "9785d44c"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "17f59"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "rollConvention" : "15"
+                  },
+                  "meta" : {
+                    "globalKey" : "6f898701",
+                    "externalKey" : "fixedCalcPeriodDates1"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "CNBE"
+                      }, {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "3fc80bb"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "9785d44c"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e159efbc",
+                    "externalKey" : "paymentDates1"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "ce5050cc"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "f7fe70e9"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
+                  "meta" : {
+                    "globalKey" : "d8f881c9"
+                  },
                   "cashSettlementTerms" : [ {
-                    "meta" : {
-                      "globalKey" : "5f89d683"
+                    "valuationMethod" : {
+                      "valuationSource" : {
+                        "settlementRateOption" : {
+                          "settlementRateOption" : {
+                            "value" : "CNY.SAEC/CNY01"
+                          }
+                        }
+                      }
                     },
                     "valuationDate" : {
                       "fxFixingDate" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "24fecc8a"
+                          "globalKey" : "c0f47556"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "CNBE"
@@ -371,53 +308,39 @@
                             "globalKey" : "3fc80bb"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeToPaymentDates" : {
                           "paymentDatesReference" : [ {
-                            "externalReference" : "paymentDates2",
-                            "globalReference" : "d092ef75"
+                            "globalReference" : "84c44e4d",
+                            "externalReference" : "paymentDates2"
                           } ]
                         }
                       }
                     },
-                    "valuationMethod" : {
-                      "valuationSource" : {
-                        "settlementRateOption" : {
-                          "settlementRateOption" : {
-                            "value" : "CNY.SAEC/CNY01"
-                          }
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "4083e763"
                     }
                   } ]
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "CNBE"
-                      }, {
-                        "value" : "USNY"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "3fc80bb"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "9785d44c"
-                    }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "26ae0"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 7,
-                    "rollConvention" : "15"
-                  },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-05-15",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -426,20 +349,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ece4a0c7"
-                      },
-                      "unadjustedDate" : "2018-05-15"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ece4a0c7"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates2",
-                    "globalKey" : "2ed4d178"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2019-05-15",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "CNBE"
@@ -450,36 +370,20 @@
                             "globalKey" : "3fc80bb"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "9785d44c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "ae45741d"
-                      },
-                      "unadjustedDate" : "2019-05-15"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ae45741d"
                     }
-                  }
-                },
-                "compoundingMethod" : "FLAT",
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "547750fe"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2018-08-15",
-                  "meta" : {
-                    "externalKey" : "paymentDates2",
-                    "globalKey" : "d092ef75"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "CNBE"
@@ -490,44 +394,68 @@
                         "globalKey" : "3fc80bb"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "9785d44c"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 7,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "18d46"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "rollConvention" : "15"
+                  },
+                  "meta" : {
+                    "globalKey" : "6f8994ee",
+                    "externalKey" : "floatingCalcPeriodDates2"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2018-08-15",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "CNBE"
+                      }, {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "3fc80bb"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "9785d44c"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "84c44e4d",
+                    "externalKey" : "paymentDates2"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates2",
-                    "globalReference" : "2ed4d178"
+                    "globalReference" : "6f8994ee",
+                    "externalReference" : "floatingCalcPeriodDates2"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -1,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "918d85d7"
+                      "globalKey" : "9accb2ad"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -1,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "CNBE"
@@ -536,17 +464,20 @@
                         "globalKey" : "1fa1ee"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates2",
-                      "globalReference" : "696ec80a"
+                      "globalReference" : "542ce978",
+                      "externalReference" : "resetDates2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates2",
-                    "globalKey" : "696ec80a"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 7,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "11d"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "CNBE"
@@ -557,150 +488,219 @@
                         "globalKey" : "3fc80bb"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "9785d44c"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "843"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 7
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "542ce978",
+                    "externalKey" : "resetDates2"
+                  }
+                },
+                "compoundingMethod" : "Flat",
+                "meta" : {
+                  "globalKey" : "bec41c22"
                 }
               } ],
               "meta" : {
-                "globalKey" : "fe42e980"
+                "globalKey" : "1351dcee"
               }
             }
           },
           "meta" : {
-            "globalKey" : "2d20ae56"
+            "globalKey" : "23449c0c"
           }
         },
         "meta" : {
-          "globalKey" : "2d20ae56"
+          "globalKey" : "23449c0c"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a1f069a8"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0339,
               "unit" : {
                 "currency" : {
                   "value" : "CNY"
                 }
               },
-              "value" : 0.0339,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "CNY"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 28000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "CNY"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "9c1ccb58"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 28000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "CNY"
                 }
-              },
-              "value" : 28000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "b9d79e09"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "e52fd4df"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "CNY-CNREPOFIX=CFXS-Reuters"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "a8a"
-                  },
+                  "periodMultiplier" : 1,
                   "period" : "W",
-                  "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "76"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "CNY"
-                }
-              },
-              "value" : 28000000.00
+            "meta" : {
+              "globalKey" : "c0c98e95"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "7337505d"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3f10db"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
+        }
+      } ],
+      "name" : {
+        "value" : "Party A"
       },
-      "value" : "2018-03-27"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
         }
       } ],
-      "issuer" : {
+      "name" : {
+        "value" : "Party B"
+      },
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+              }
+            }
+          }
+        },
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
         },
-        "value" : "54930084UKLVMY22DS16"
-      },
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "335bf1d6"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+        "globalKey" : "bd492439"
+      }
+    },
+    "meta" : {
+      "globalKey" : "288a6f1e"
+    }
+  },
+  "meta" : {
+    "globalKey" : "288a6f1e"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/NDS-INR-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/NDS-INR-uti.json
index f20a87ec58..dfdb37bb0f 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/NDS-INR-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/NDS-INR-uti.json
@@ -1,176 +1,113 @@
 {
-  "meta" : {
-    "globalKey" : "d7625d56"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-              },
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "6b413360"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "bd492439"
-      }
-    },
-    "meta" : {
-      "globalKey" : "d7625d56"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
       },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
+        "globalKey" : "3eac3060"
       },
-      "name" : {
-        "value" : "Party B"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2018-03-27",
+      "meta" : {
+        "globalKey" : "3f10db"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
-          "productIdentifier" : [ {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:OIS"
-              },
-              "meta" : {
-                "globalKey" : "d75a34bb"
-              },
-              "source" : "OTHER"
-            }
-          } ],
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
+              "value" : "InterestRate",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-              },
-              "value" : "INTEREST_RATE"
+              }
             }
           }, {
             "source" : "ISDA",
             "value" : {
               "name" : {
+                "value" : "InterestRate:IRSwap:OIS",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:OIS"
+                }
               }
             }
           }, {
             "source" : "ISDA",
             "productQualifier" : "InterestRate_IRSwap_FixedFloat_OIS"
           } ],
+          "productIdentifier" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "InterestRate:IRSwap:OIS",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                }
+              },
+              "source" : "Other",
+              "meta" : {
+                "globalKey" : "d75a34bb"
+              }
+            }
+          } ],
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "580b9c88"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
+                  "meta" : {
+                    "globalKey" : "ece27424"
+                  },
                   "cashSettlementTerms" : [ {
-                    "meta" : {
-                      "globalKey" : "bf970222"
+                    "valuationMethod" : {
+                      "valuationSource" : {
+                        "settlementRateOption" : {
+                          "settlementRateOption" : {
+                            "value" : "INR.RBIB/INR01"
+                          }
+                        }
+                      }
                     },
                     "valuationDate" : {
                       "fxFixingDate" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "a7eca0a8"
+                          "globalKey" : "43e24974"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "INMU"
@@ -181,53 +118,41 @@
                             "globalKey" : "45138fc"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeToPaymentDates" : {
                           "paymentDatesReference" : [ {
-                            "externalReference" : "paymentDates1",
-                            "globalReference" : "b0166503"
+                            "globalReference" : "e1aea7fd",
+                            "externalReference" : "paymentDates1"
                           } ]
                         }
                       }
                     },
-                    "valuationMethod" : {
-                      "valuationSource" : {
-                        "settlementRateOption" : {
-                          "settlementRateOption" : {
-                            "value" : "INR.RBIB/INR01"
-                          }
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "546dd9be"
                     }
                   } ]
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "INMU"
-                      }, {
-                        "value" : "USNY"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "45138fc"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "97da8c8d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d1c"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "1"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-06-01",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -236,20 +161,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ece55c79"
-                      },
-                      "unadjustedDate" : "2018-06-01"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ece55c79"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates1",
-                    "globalKey" : "76790edc"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2026-06-01",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "INMU"
@@ -260,34 +182,20 @@
                             "globalKey" : "45138fc"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97da8c8d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "3a65b7ec"
-                      },
-                      "unadjustedDate" : "2026-06-01"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "3a65b7ec"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "67b81d10"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates1",
-                    "globalKey" : "b0166503"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "INMU"
@@ -298,69 +206,98 @@
                         "globalKey" : "45138fc"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "97da8c8d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "2048"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "rollConvention" : "1"
+                  },
+                  "meta" : {
+                    "globalKey" : "d96f5410",
+                    "externalKey" : "fixedCalcPeriodDates1"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "INMU"
+                      }, {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "45138fc"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "97da8c8d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e1aea7fd",
+                    "externalKey" : "paymentDates1"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "92f98ff8"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "59c07527"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
+                  "meta" : {
+                    "globalKey" : "ece27425"
+                  },
                   "cashSettlementTerms" : [ {
-                    "meta" : {
-                      "globalKey" : "c14bdac1"
+                    "valuationMethod" : {
+                      "valuationSource" : {
+                        "settlementRateOption" : {
+                          "settlementRateOption" : {
+                            "value" : "INR.RBIB/INR01"
+                          }
+                        }
+                      }
                     },
                     "valuationDate" : {
                       "fxFixingDate" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "a7eca0a9"
+                          "globalKey" : "43e24975"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "INMU"
@@ -371,53 +308,39 @@
                             "globalKey" : "45138fc"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeToPaymentDates" : {
                           "paymentDatesReference" : [ {
-                            "externalReference" : "paymentDates2",
-                            "globalReference" : "b0166503"
+                            "globalReference" : "e1aea7fd",
+                            "externalReference" : "paymentDates2"
                           } ]
                         }
                       }
                     },
-                    "valuationMethod" : {
-                      "valuationSource" : {
-                        "settlementRateOption" : {
-                          "settlementRateOption" : {
-                            "value" : "INR.RBIB/INR01"
-                          }
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "546dd9bf"
                     }
                   } ]
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "INMU"
-                      }, {
-                        "value" : "USNY"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "45138fc"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "97da8c8d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d1c"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "1"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-06-01",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -426,20 +349,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ece55c79"
-                      },
-                      "unadjustedDate" : "2018-06-01"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ece55c79"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates2",
-                    "globalKey" : "76790edc"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2026-06-01",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "INMU"
@@ -450,34 +370,20 @@
                             "globalKey" : "45138fc"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97da8c8d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "3a65b7ec"
-                      },
-                      "unadjustedDate" : "2026-06-01"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "3a65b7ec"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "eac2e789"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates2",
-                    "globalKey" : "b0166503"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "INMU"
@@ -488,43 +394,66 @@
                         "globalKey" : "45138fc"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "97da8c8d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "2048"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "rollConvention" : "1"
+                  },
+                  "meta" : {
+                    "globalKey" : "d96f5410",
+                    "externalKey" : "floatingCalcPeriodDates2"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "INMU"
+                      }, {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "45138fc"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "97da8c8d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e1aea7fd",
+                    "externalKey" : "paymentDates2"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates2",
-                    "globalReference" : "76790edc"
+                    "globalReference" : "d96f5410",
+                    "externalReference" : "floatingCalcPeriodDates2"
                   },
+                  "resetRelativeTo" : "CalculationPeriodEndDate",
                   "fixingDates" : {
+                    "periodMultiplier" : 0,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "63a9c996"
+                      "globalKey" : "d9019b9e"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 0,
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "INMU"
@@ -533,17 +462,20 @@
                         "globalKey" : "225d8d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates2",
-                      "globalReference" : "a04e3afc"
+                      "globalReference" : "84565fe",
+                      "externalReference" : "resetDates2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates2",
-                    "globalKey" : "a04e3afc"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "INMU"
@@ -554,143 +486,211 @@
                         "globalKey" : "45138fc"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "97da8c8d"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                  "meta" : {
+                    "globalKey" : "84565fe",
+                    "externalKey" : "resetDates2"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "d6010a8f"
                 }
               } ],
               "meta" : {
-                "globalKey" : "bfe72479"
+                "globalKey" : "58afdd97"
               }
             }
           },
           "meta" : {
-            "globalKey" : "c011bdcd"
+            "globalKey" : "cba66c59"
           }
         },
         "meta" : {
-          "globalKey" : "c011bdcd"
+          "globalKey" : "cba66c59"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "649f4b9"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0699,
               "unit" : {
                 "currency" : {
                   "value" : "INR"
                 }
               },
-              "value" : 0.0699,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "INR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 135000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "INR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c2f4a267"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 135000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "INR"
                 }
-              },
-              "value" : 135000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "6c43fce5"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "61c6a255"
-            },
             "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "INR-FBIL-MIBOR-OIS-COMPOUND"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "rateOption-1"
                 } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "INR-FBIL-MIBOR-OIS-COMPOUND"
-                }
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "INR"
-                }
-              },
-              "value" : 135000000.00
+            "meta" : {
+              "globalKey" : "d70da84b"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "bfa5e631"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3f10db"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
+        }
+      } ],
+      "name" : {
+        "value" : "Party A"
       },
-      "value" : "2018-03-27"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
         }
       } ],
-      "issuer" : {
+      "name" : {
+        "value" : "Party B"
+      },
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+              }
+            }
+          }
+        },
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
         },
-        "value" : "54930084UKLVMY22DS16"
-      },
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "335bf1d6"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+        "globalKey" : "bd492439"
+      }
+    },
+    "meta" : {
+      "globalKey" : "50d80ec4"
+    }
+  },
+  "meta" : {
+    "globalKey" : "50d80ec4"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/NDS-KRW-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/NDS-KRW-uti.json
index c754088338..7b8d164948 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/NDS-KRW-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/NDS-KRW-uti.json
@@ -1,176 +1,113 @@
 {
-  "meta" : {
-    "globalKey" : "442d54ec"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-              },
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "6b413360"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "bd492439"
-      }
-    },
-    "meta" : {
-      "globalKey" : "442d54ec"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
-      },
-      "name" : {
-        "value" : "Party A"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
+        "globalKey" : "3eac3060"
       },
-      "name" : {
-        "value" : "Party B"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2018-03-27",
+      "meta" : {
+        "globalKey" : "3f10db"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
-          "productIdentifier" : [ {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
-              },
-              "meta" : {
-                "globalKey" : "95f4ea06"
-              },
-              "source" : "OTHER"
-            }
-          } ],
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
+              "value" : "InterestRate",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-              },
-              "value" : "INTEREST_RATE"
+              }
             }
           }, {
             "source" : "ISDA",
             "value" : {
               "name" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
+                }
               }
             }
           }, {
             "source" : "ISDA",
             "productQualifier" : "InterestRate_IRSwap_FixedFloat"
           } ],
+          "productIdentifier" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                }
+              },
+              "source" : "Other",
+              "meta" : {
+                "globalKey" : "95f4ea06"
+              }
+            }
+          } ],
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "5e7660c5"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
+                  "meta" : {
+                    "globalKey" : "f83701b9"
+                  },
                   "cashSettlementTerms" : [ {
-                    "meta" : {
-                      "globalKey" : "c601c65f"
+                    "valuationMethod" : {
+                      "valuationSource" : {
+                        "settlementRateOption" : {
+                          "settlementRateOption" : {
+                            "value" : "KRW.KFTC18/KRW02"
+                          }
+                        }
+                      }
                     },
                     "valuationDate" : {
                       "fxFixingDate" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "7e714ef4"
+                          "globalKey" : "1a66f7c0"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -181,53 +118,41 @@
                             "globalKey" : "4f80e30"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeToPaymentDates" : {
                           "paymentDatesReference" : [ {
-                            "externalReference" : "paymentDates1",
-                            "globalReference" : "869b134f"
+                            "globalReference" : "e2557d31",
+                            "externalReference" : "paymentDates1"
                           } ]
                         }
                       }
                     },
-                    "valuationMethod" : {
-                      "valuationSource" : {
-                        "settlementRateOption" : {
-                          "settlementRateOption" : {
-                            "value" : "KRW.KFTC18/KRW02"
-                          }
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "5fc26753"
                     }
                   } ]
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "KRSE"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "4f80e30"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "988161c1"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c47"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "20"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2017-11-20",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -236,20 +161,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eccc4d0c"
-                      },
-                      "unadjustedDate" : "2017-11-20"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eccc4d0c"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates1",
-                    "globalKey" : "4b598ff1"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2024-11-20",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -260,34 +182,20 @@
                             "globalKey" : "4f80e30"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "988161c1"
                         }
                       },
                       "meta" : {
                         "globalKey" : "b76d086d"
-                      },
-                      "unadjustedDate" : "2024-11-20"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "b76d086d"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "c89b838c"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates1",
-                    "globalKey" : "869b134f"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -298,69 +206,98 @@
                         "globalKey" : "4f80e30"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "988161c1"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "17f73"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "rollConvention" : "20"
+                  },
+                  "meta" : {
+                    "globalKey" : "c9e60c9b",
+                    "externalKey" : "fixedCalcPeriodDates1"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "KRSE"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "4f80e30"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "988161c1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e2557d31",
+                    "externalKey" : "paymentDates1"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "18ede74c"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "602b3964"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
+                  "meta" : {
+                    "globalKey" : "f83701ba"
+                  },
                   "cashSettlementTerms" : [ {
-                    "meta" : {
-                      "globalKey" : "c7b69efe"
+                    "valuationMethod" : {
+                      "valuationSource" : {
+                        "settlementRateOption" : {
+                          "settlementRateOption" : {
+                            "value" : "KRW.KFTC18/KRW02"
+                          }
+                        }
+                      }
                     },
                     "valuationDate" : {
                       "fxFixingDate" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "7e714ef5"
+                          "globalKey" : "1a66f7c1"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -371,53 +308,39 @@
                             "globalKey" : "4f80e30"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeToPaymentDates" : {
                           "paymentDatesReference" : [ {
-                            "externalReference" : "paymentDates2",
-                            "globalReference" : "869b134f"
+                            "globalReference" : "e2557d31",
+                            "externalReference" : "paymentDates2"
                           } ]
                         }
                       }
                     },
-                    "valuationMethod" : {
-                      "valuationSource" : {
-                        "settlementRateOption" : {
-                          "settlementRateOption" : {
-                            "value" : "KRW.KFTC18/KRW02"
-                          }
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "5fc26754"
                     }
                   } ]
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "KRSE"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "4f80e30"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "988161c1"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c47"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "20"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2017-11-20",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -426,20 +349,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eccc4d0c"
-                      },
-                      "unadjustedDate" : "2017-11-20"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eccc4d0c"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates2",
-                    "globalKey" : "4b598ff1"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2024-11-20",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -450,34 +370,20 @@
                             "globalKey" : "4f80e30"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "988161c1"
                         }
                       },
                       "meta" : {
                         "globalKey" : "b76d086d"
-                      },
-                      "unadjustedDate" : "2024-11-20"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "b76d086d"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "3a243a2a"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates2",
-                    "globalKey" : "869b134f"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -488,44 +394,67 @@
                         "globalKey" : "4f80e30"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "988161c1"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "17f73"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "rollConvention" : "20"
+                  },
+                  "meta" : {
+                    "globalKey" : "c9e60c9b",
+                    "externalKey" : "floatingCalcPeriodDates2"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "KRSE"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "4f80e30"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "988161c1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e2557d31",
+                    "externalKey" : "paymentDates2"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates2",
-                    "globalReference" : "4b598ff1"
+                    "globalReference" : "c9e60c9b",
+                    "externalReference" : "floatingCalcPeriodDates2"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -1,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "9f746322"
+                      "globalKey" : "a8b38ff8"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -1,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "KRSE"
@@ -534,17 +463,20 @@
                         "globalKey" : "2355f9"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates2",
-                      "globalReference" : "36984713"
+                      "globalReference" : "1eb84a4b",
+                      "externalReference" : "resetDates2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates2",
-                    "globalKey" : "36984713"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -555,150 +487,218 @@
                         "globalKey" : "4f80e30"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "988161c1"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "1eb84a4b",
+                    "externalKey" : "resetDates2"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3ec37664"
                 }
               } ],
               "meta" : {
-                "globalKey" : "e2cba0b6"
+                "globalKey" : "2bc630b0"
               }
             }
           },
           "meta" : {
-            "globalKey" : "c2e0a30c"
+            "globalKey" : "b8fa1f4e"
           }
         },
         "meta" : {
-          "globalKey" : "c2e0a30c"
+          "globalKey" : "b8fa1f4e"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "ba714197"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0226,
               "unit" : {
                 "currency" : {
                   "value" : "KRW"
                 }
               },
-              "value" : 0.0226,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "KRW"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 20000000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "KRW"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "93b6f149"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 20000000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "KRW"
                 }
-              },
-              "value" : 20000000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "97772ff8"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5d862026"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "KRW-CD-KSDA-Bloomberg"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "KRW"
-                }
-              },
-              "value" : 20000000000.00
+            "meta" : {
+              "globalKey" : "533cd7c6"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "732d0124"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3f10db"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
+        }
+      } ],
+      "name" : {
+        "value" : "Party A"
       },
-      "value" : "2018-03-27"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
         }
       } ],
-      "issuer" : {
+      "name" : {
+        "value" : "Party B"
+      },
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+              }
+            }
+          }
+        },
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
         },
-        "value" : "54930084UKLVMY22DS16"
-      },
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "335bf1d6"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+        "globalKey" : "bd492439"
+      }
+    },
+    "meta" : {
+      "globalKey" : "50bf18a8"
+    }
+  },
+  "meta" : {
+    "globalKey" : "50bf18a8"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/USD-Long-Final-Stub-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/USD-Long-Final-Stub-uti.json
index b914ef3e50..dc9c98dae6 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/USD-Long-Final-Stub-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/USD-Long-Final-Stub-uti.json
@@ -1,184 +1,109 @@
 {
-  "meta" : {
-    "globalKey" : "dd13e9fe"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-              },
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "6b413360"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "bd492439"
-      }
-    },
-    "meta" : {
-      "globalKey" : "dd13e9fe"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
       },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
+        "globalKey" : "3eac3060"
       },
-      "name" : {
-        "value" : "Party B"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2018-01-26",
+      "meta" : {
+        "globalKey" : "3f105a"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
-          "productIdentifier" : [ {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
-              },
-              "meta" : {
-                "globalKey" : "95f4ea06"
-              },
-              "source" : "OTHER"
-            }
-          } ],
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
+              "value" : "InterestRate",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-              },
-              "value" : "INTEREST_RATE"
+              }
             }
           }, {
             "source" : "ISDA",
             "value" : {
               "name" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
+                }
               }
             }
           }, {
             "source" : "ISDA",
             "productQualifier" : "InterestRate_IRSwap_FixedFloat"
           } ],
+          "productIdentifier" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                }
+              },
+              "source" : "Other",
+              "meta" : {
+                "globalKey" : "95f4ea06"
+              }
+            }
+          } ],
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "42f910b"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "97b8e49c"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c89"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2016-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -187,22 +112,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ecaf1ec6"
-                      },
-                      "unadjustedDate" : "2016-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ecaf1ec6"
                     }
                   },
-                  "lastRegularPeriodEndDate" : "2019-06-14",
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates1",
-                    "globalKey" : "59a00ed2"
-                  },
-                  "stubPeriodType" : "LONG_FINAL",
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2019-12-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -213,34 +133,20 @@
                             "globalKey" : "42f910b"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b8e49c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e068378c"
-                      },
-                      "unadjustedDate" : "2019-12-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e068378c"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "bda574ac"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates1",
-                    "globalKey" : "637fde97"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -251,77 +157,94 @@
                         "globalKey" : "42f910b"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "97b8e49c"
                     }
                   },
-                  "paymentFrequency" : {
+                  "lastRegularPeriodEndDate" : "2019-06-14",
+                  "stubPeriodType" : "LongFinal",
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "18a9b"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "e3ff9cea",
+                    "externalKey" : "fixedCalcPeriodDates1"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "42f910b"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "97b8e49c"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "9e5a4d0f",
+                    "externalKey" : "paymentDates1"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "d210baae"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "42f910b"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "97b8e49c"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c2c"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2016-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -330,20 +253,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ecaf1ec6"
-                      },
-                      "unadjustedDate" : "2016-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ecaf1ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates2",
-                    "globalKey" : "a1256b0a"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2019-12-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -354,34 +274,20 @@
                             "globalKey" : "42f910b"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b8e49c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e068378c"
-                      },
-                      "unadjustedDate" : "2019-12-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e068378c"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "35b2397b"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates2",
-                    "globalKey" : "637fde94"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -392,44 +298,67 @@
                         "globalKey" : "42f910b"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "97b8e49c"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "17f58"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "1d8287e2",
+                    "externalKey" : "floatingCalcPeriodDates2"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "42f910b"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "97b8e49c"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e18d000c",
+                    "externalKey" : "paymentDates2"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates2",
-                    "globalReference" : "a1256b0a"
+                    "globalReference" : "1d8287e2",
+                    "externalReference" : "floatingCalcPeriodDates2"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2fdb52a8"
+                      "globalKey" : "cb73d5c"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -438,17 +367,20 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates2",
-                      "globalReference" : "4efad25e"
+                      "globalReference" : "50550d8a",
+                      "externalReference" : "resetDates2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates2",
-                    "globalKey" : "4efad25e"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -459,150 +391,218 @@
                         "globalKey" : "42f910b"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "97b8e49c"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "50550d8a",
+                    "externalKey" : "resetDates2"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "4fade337"
                 }
               } ],
               "meta" : {
-                "globalKey" : "d093cb4f"
+                "globalKey" : "61ced8c9"
               }
             }
           },
           "meta" : {
-            "globalKey" : "39fbf6a5"
+            "globalKey" : "6a933c67"
           }
         },
         "meta" : {
-          "globalKey" : "39fbf6a5"
+          "globalKey" : "6a933c67"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "894f8dec"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.015,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.015,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 900000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "a0a22f94"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 900000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 900000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "b905d6e8"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d05"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 900000000
+            "meta" : {
+              "globalKey" : "828026c7"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "875fde14"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3f105a"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
+        }
+      } ],
+      "name" : {
+        "value" : "Party A"
       },
-      "value" : "2018-01-26"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
         }
       } ],
-      "issuer" : {
+      "name" : {
+        "value" : "Party B"
+      },
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+              }
+            }
+          }
+        },
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
         },
-        "value" : "54930084UKLVMY22DS16"
-      },
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "335bf1d6"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+        "globalKey" : "bd492439"
+      }
+    },
+    "meta" : {
+      "globalKey" : "13612e88"
+    }
+  },
+  "meta" : {
+    "globalKey" : "13612e88"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/USD-OIS-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/USD-OIS-uti.json
index a2688bf257..0c3c46289b 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/USD-OIS-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/USD-OIS-uti.json
@@ -1,167 +1,109 @@
 {
-  "meta" : {
-    "globalKey" : "90811547"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "6b413360"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "6b413360"
-      }
-    },
-    "meta" : {
-      "globalKey" : "2050ca49"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
       },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
-      },
-      "name" : {
-        "value" : "Party B"
+        "globalKey" : "3eac3060"
       },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2018-01-26",
+      "meta" : {
+        "globalKey" : "3f105a"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
-          "productIdentifier" : [ {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:OIS"
-              },
-              "meta" : {
-                "globalKey" : "d75a34bb"
-              },
-              "source" : "OTHER"
-            }
-          } ],
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
+              "value" : "InterestRate",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-              },
-              "value" : "INTEREST_RATE"
+              }
             }
           }, {
             "source" : "ISDA",
             "value" : {
               "name" : {
+                "value" : "InterestRate:IRSwap:OIS",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:OIS"
+                }
               }
             }
           }, {
             "source" : "ISDA",
             "productQualifier" : "InterestRate_IRSwap_FixedFloat_OIS"
           } ],
+          "productIdentifier" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "InterestRate:IRSwap:OIS",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                }
+              },
+              "source" : "Other",
+              "meta" : {
+                "globalKey" : "d75a34bb"
+              }
+            }
+          } ],
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "USNY"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "27e4e9"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "3662e8ba"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "25b1b"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "EOM"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2017-10-04",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -170,22 +112,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eccb20bc"
-                      },
-                      "unadjustedDate" : "2017-10-04"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eccb20bc"
                     }
                   },
-                  "firstRegularPeriodStartDate" : "2018-06-30",
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates1",
-                    "globalKey" : "b21c5206"
-                  },
-                  "stubPeriodType" : "SHORT_INITIAL",
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2019-06-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -194,34 +131,20 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "3662e8ba"
                         }
                       },
                       "meta" : {
                         "globalKey" : "3c4921dc"
-                      },
-                      "unadjustedDate" : "2019-06-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "3c4921dc"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "92bab7c1"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates1",
-                    "globalKey" : "eb988f26"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -230,92 +153,109 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "3662e8ba"
                     }
                   },
-                  "paymentDaysOffset" : {
+                  "firstRegularPeriodStartDate" : "2018-06-30",
+                  "stubPeriodType" : "ShortInitial",
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ea4baf42"
+                      "globalKey" : "11b6b"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 2,
-                    "dayType" : "BUSINESS"
+                    "rollConvention" : "EOM"
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "22419bb0",
+                    "externalKey" : "fixedCalcPeriodDates1"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 2,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4abf7e"
                     },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "27e4e9"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "3662e8ba"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "5ddd0f5e",
+                    "externalKey" : "paymentDates1"
                   }
                 },
                 "stubPeriod" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "fixedCalcPeriodDates1",
-                    "globalReference" : "b21c5206"
+                    "globalReference" : "22419bb0",
+                    "externalReference" : "fixedCalcPeriodDates1"
                   },
                   "initialStub" : {
                     "stubRate" : 0.0150239
                   }
+                },
+                "meta" : {
+                  "globalKey" : "e4e06847"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "USNY"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "27e4e9"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "3662e8ba"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "25b1b"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "EOM"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2017-10-04",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -324,22 +264,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eccb20bc"
-                      },
-                      "unadjustedDate" : "2017-10-04"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eccb20bc"
                     }
                   },
-                  "firstRegularPeriodStartDate" : "2018-06-30",
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates2",
-                    "globalKey" : "b21c5206"
-                  },
-                  "stubPeriodType" : "SHORT_INITIAL",
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2019-06-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -348,34 +283,20 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "3662e8ba"
                         }
                       },
                       "meta" : {
                         "globalKey" : "3c4921dc"
-                      },
-                      "unadjustedDate" : "2019-06-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "3c4921dc"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "4b01e51e"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates2",
-                    "globalKey" : "eb988f26"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -384,51 +305,74 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "3662e8ba"
                     }
                   },
-                  "paymentDaysOffset" : {
+                  "firstRegularPeriodStartDate" : "2018-06-30",
+                  "stubPeriodType" : "ShortInitial",
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ea4baf42"
+                      "globalKey" : "11b6b"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 2,
-                    "dayType" : "BUSINESS"
+                    "rollConvention" : "EOM"
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "22419bb0",
+                    "externalKey" : "floatingCalcPeriodDates2"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 2,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4abf7e"
                     },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "27e4e9"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "3662e8ba"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "5ddd0f5e",
+                    "externalKey" : "paymentDates2"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates2",
-                    "globalReference" : "b21c5206"
+                    "globalReference" : "22419bb0",
+                    "externalReference" : "floatingCalcPeriodDates2"
                   },
+                  "resetRelativeTo" : "CalculationPeriodEndDate",
                   "fixingDates" : {
+                    "periodMultiplier" : 0,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "5b61ef9e"
+                      "globalKey" : "d0b9c1a6"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 0,
+                    "businessDayConvention" : "PRECEDING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -437,17 +381,20 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "PRECEDING",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates2",
-                      "globalReference" : "b461abe9"
+                      "globalReference" : "aaeab965",
+                      "externalReference" : "resetDates2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates2",
-                    "globalKey" : "b461abe9"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -456,170 +403,219 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "3662e8ba"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                  "meta" : {
+                    "globalKey" : "aaeab965",
+                    "externalKey" : "resetDates2"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "479f6cb8"
                 }
               } ],
               "meta" : {
-                "globalKey" : "5cce4c5f"
+                "globalKey" : "cc6aa17f"
               }
             }
           },
           "meta" : {
-            "globalKey" : "bcfdef8b"
+            "globalKey" : "55432ffd"
           }
         },
         "meta" : {
-          "globalKey" : "bcfdef8b"
+          "globalKey" : "55432ffd"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "4cdea9ef"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0150239,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0150239,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 860000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "4ef693f1"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 860000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 860000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d20e13f"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "35d60749"
-            },
             "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-Federal Funds-H.15-OIS-COMPOUND"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "rateOption-1"
                 } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-Federal Funds-H.15-OIS-COMPOUND"
-                }
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 860000
+            "meta" : {
+              "globalKey" : "84eae1d7"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "5d5d82f"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3f105a"
-      },
-      "value" : "2018-01-26"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "54930084UKLVMY22DS16"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "335bf1d6"
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
+        }
+      } ],
+      "name" : {
+        "value" : "Party B"
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "6b413360"
+      }
+    },
+    "meta" : {
+      "globalKey" : "989d1293"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "7d6d67f0"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        }
-      },
       "quantity" : {
+        "value" : 1242.71,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
         },
-        "value" : 1242.71
+        "receiverPartyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2017-07-18",
         "dateAdjustments" : {
+          "businessDayConvention" : "MODFOLLOWING",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "USNY"
@@ -628,16 +624,20 @@
               "globalKey" : "27e4e9"
             }
           },
-          "businessDayConvention" : "MODFOLLOWING",
           "meta" : {
             "globalKey" : "3662e8ba"
           }
-        },
-        "unadjustedDate" : "2017-07-18"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "427b747c"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "c3e7cbc9"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/USD-VNS-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/USD-VNS-uti.json
index 64dc44b27f..b829726768 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/USD-VNS-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/USD-VNS-uti.json
@@ -1,182 +1,109 @@
 {
-  "meta" : {
-    "globalKey" : "aa55682c"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-              },
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "6b413360"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "bd492439"
-      }
-    },
-    "meta" : {
-      "globalKey" : "aa55682c"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
       },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
-      },
-      "name" : {
-        "value" : "Party B"
+        "globalKey" : "3eac3060"
       },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2018-01-30",
+      "meta" : {
+        "globalKey" : "3f105e"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
-          "productIdentifier" : [ {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
-              },
-              "meta" : {
-                "globalKey" : "95f4ea06"
-              },
-              "source" : "OTHER"
-            }
-          } ],
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
+              "value" : "InterestRate",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-              },
-              "value" : "INTEREST_RATE"
+              }
             }
           }, {
             "source" : "ISDA",
             "value" : {
               "name" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
+                }
               }
             }
           }, {
             "source" : "ISDA",
             "productQualifier" : "InterestRate_IRSwap_FixedFloat"
           } ],
+          "productIdentifier" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                }
+              },
+              "source" : "Other",
+              "meta" : {
+                "globalKey" : "95f4ea06"
+              }
+            }
+          } ],
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "USNY"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "27e4e9"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "3662e8ba"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "159eb"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "2"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2012-09-02",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -185,20 +112,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ec3400fa"
-                      },
-                      "unadjustedDate" : "2012-09-02"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec3400fa"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates1",
-                    "globalKey" : "9a09052d"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2020-09-02",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -207,34 +131,20 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "3662e8ba"
                         }
                       },
                       "meta" : {
                         "globalKey" : "fae8dfb8"
-                      },
-                      "unadjustedDate" : "2020-09-02"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "fae8dfb8"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "b1883840"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates1",
-                    "globalKey" : "98150da8"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -243,75 +153,98 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "3662e8ba"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "1a3b"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "2"
+                  },
+                  "meta" : {
+                    "globalKey" : "d61a3783",
+                    "externalKey" : "fixedCalcPeriodDates1"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "27e4e9"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "3662e8ba"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "9b14d11c",
+                    "externalKey" : "paymentDates1"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "f4dc2594"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "USNY"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "27e4e9"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "3662e8ba"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d7a"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "2"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2012-09-02",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -320,20 +253,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ec3400fa"
-                      },
-                      "unadjustedDate" : "2012-09-02"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec3400fa"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates2",
-                    "globalKey" : "c87bb1fe"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2020-09-02",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -342,34 +272,20 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "3662e8ba"
                         }
                       },
                       "meta" : {
                         "globalKey" : "fae8dfb8"
-                      },
-                      "unadjustedDate" : "2020-09-02"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "fae8dfb8"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "217ce58d"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates2",
-                    "globalKey" : "98150c39"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -378,52 +294,65 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "3662e8ba"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "2b8c"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "2"
+                  },
+                  "meta" : {
+                    "globalKey" : "d61a48d4",
+                    "externalKey" : "floatingCalcPeriodDates2"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "27e4e9"
                       }
                     },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "3662e8ba"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "8f19d1ed",
+                    "externalKey" : "paymentDates2"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates2",
-                    "globalReference" : "c87bb1fe"
+                    "globalReference" : "d61a48d4",
+                    "externalReference" : "floatingCalcPeriodDates2"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2fdb52a8"
+                      "globalKey" : "cb73d5c"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -432,17 +361,20 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates2",
-                      "globalReference" : "346e6a83"
+                      "globalReference" : "cae326eb",
+                      "externalReference" : "resetDates2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates2",
-                    "globalKey" : "346e6a83"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -451,465 +383,533 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "3662e8ba"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "cae326eb",
+                    "externalKey" : "resetDates2"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "abf6724d"
                 }
               } ],
               "meta" : {
-                "globalKey" : "e5231dcd"
+                "globalKey" : "5fdbf7e1"
               }
             }
           },
           "meta" : {
-            "globalKey" : "69707137"
+            "globalKey" : "44bc8c03"
           }
         },
         "meta" : {
-          "globalKey" : "69707137"
+          "globalKey" : "44bc8c03"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "9569c254"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01333417,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.01333417,
               "datedValue" : [ {
                 "date" : "2012-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5771b3"
-                },
-                "value" : 0.025
+                }
               }, {
                 "date" : "2013-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5869b3"
-                },
-                "value" : 0.025
+                }
               }, {
                 "date" : "2014-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5961b3"
-                },
-                "value" : 0.025
+                }
               }, {
                 "date" : "2015-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5a59b3"
-                },
-                "value" : 0.025
+                }
               }, {
                 "date" : "2016-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5b51b3"
-                },
-                "value" : 0.025
+                }
               }, {
                 "date" : "2017-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5c49b3"
-                },
-                "value" : 0.025
+                }
               }, {
                 "date" : "2018-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5d41b3"
-                },
-                "value" : 0.025
+                }
               }, {
                 "date" : "2019-09-02",
+                "value" : 0.025,
                 "meta" : {
                   "globalKey" : "a5e39b3"
-                },
-                "value" : 0.025
+                }
               } ],
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 1000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 1000000,
               "datedValue" : [ {
                 "date" : "2012-09-02",
+                "value" : 5500,
                 "meta" : {
                   "globalKey" : "7b64a9e"
-                },
-                "value" : 5500
+                }
               }, {
                 "date" : "2013-09-02",
+                "value" : 5000,
                 "meta" : {
                   "globalKey" : "7b72fd9"
-                },
-                "value" : 5000
+                }
               }, {
                 "date" : "2014-09-02",
+                "value" : 4500,
                 "meta" : {
                   "globalKey" : "7b7c63f"
-                },
-                "value" : 4500
+                }
               }, {
                 "date" : "2015-09-02",
+                "value" : 4000,
                 "meta" : {
                   "globalKey" : "7b8ab7a"
-                },
-                "value" : 4000
+                }
               }, {
                 "date" : "2016-09-02",
+                "value" : 3500,
                 "meta" : {
                   "globalKey" : "7b941e0"
-                },
-                "value" : 3500
+                }
               }, {
                 "date" : "2017-09-02",
+                "value" : 3000,
                 "meta" : {
                   "globalKey" : "7ba271b"
-                },
-                "value" : 3000
+                }
               }, {
                 "date" : "2018-09-02",
+                "value" : 2500,
                 "meta" : {
                   "globalKey" : "7babd81"
-                },
-                "value" : 2500
+                }
               }, {
                 "date" : "2019-09-02",
+                "value" : 2000,
                 "meta" : {
                   "globalKey" : "7bba2bc"
-                },
-                "value" : 2000
+                }
               } ]
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "dd067956"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d08"
             },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
-              }
-            }
-          },
-          "price" : [ {
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "17ce882c"
+          }
+        }, {
+          "price" : [ {
             "value" : {
+              "value" : 0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0,
               "datedValue" : [ {
                 "date" : "2012-09-02",
+                "value" : 0.00025,
                 "meta" : {
                   "globalKey" : "44026333"
-                },
-                "value" : 0.00025
+                }
               }, {
                 "date" : "2013-03-02",
+                "value" : 0.00025,
                 "meta" : {
                   "globalKey" : "44032cb3"
-                },
-                "value" : 0.00025
+                }
               }, {
                 "date" : "2013-09-02",
+                "value" : 0.00023,
                 "meta" : {
                   "globalKey" : "44035b31"
-                },
-                "value" : 0.00023
+                }
               }, {
                 "date" : "2014-03-02",
+                "value" : 0.00023,
                 "meta" : {
                   "globalKey" : "440424b1"
-                },
-                "value" : 0.00023
+                }
               }, {
                 "date" : "2014-09-02",
+                "value" : 0.00023,
                 "meta" : {
                   "globalKey" : "44045331"
-                },
-                "value" : 0.00023
+                }
               }, {
                 "date" : "2015-03-02",
+                "value" : 0.00023,
                 "meta" : {
                   "globalKey" : "44051cb1"
-                },
-                "value" : 0.00023
+                }
               }, {
                 "date" : "2015-09-02",
+                "value" : 0.00021,
                 "meta" : {
                   "globalKey" : "44054b2f"
-                },
-                "value" : 0.00021
+                }
               }, {
                 "date" : "2016-03-02",
+                "value" : 0.00021,
                 "meta" : {
                   "globalKey" : "440614af"
-                },
-                "value" : 0.00021
+                }
               }, {
                 "date" : "2016-09-02",
+                "value" : 0.00015,
                 "meta" : {
                   "globalKey" : "44064314"
-                },
-                "value" : 0.00015
+                }
               }, {
                 "date" : "2017-03-02",
+                "value" : 0.00015,
                 "meta" : {
                   "globalKey" : "44070c94"
-                },
-                "value" : 0.00015
+                }
               }, {
                 "date" : "2017-09-02",
+                "value" : 0.00013,
                 "meta" : {
                   "globalKey" : "44073b12"
-                },
-                "value" : 0.00013
+                }
               }, {
                 "date" : "2018-03-02",
+                "value" : 0.00013,
                 "meta" : {
                   "globalKey" : "44080492"
-                },
-                "value" : 0.00013
+                }
               }, {
                 "date" : "2018-09-02",
+                "value" : 0.00012,
                 "meta" : {
                   "globalKey" : "44083311"
-                },
-                "value" : 0.00012
+                }
               }, {
                 "date" : "2019-03-02",
+                "value" : 0.00012,
                 "meta" : {
                   "globalKey" : "4408fc91"
-                },
-                "value" : 0.00012
+                }
               }, {
                 "date" : "2019-09-02",
+                "value" : 0.00012,
                 "meta" : {
                   "globalKey" : "44092b11"
-                },
-                "value" : 0.00012
+                }
               }, {
                 "date" : "2020-03-02",
+                "value" : 0,
                 "meta" : {
                   "globalKey" : "7a4f7ae"
-                },
-                "value" : 0
+                }
               } ],
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-2"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 1000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 1000000,
               "datedValue" : [ {
                 "date" : "2012-09-02",
+                "value" : 5500,
                 "meta" : {
                   "globalKey" : "7b64a9e"
-                },
-                "value" : 5500
+                }
               }, {
                 "date" : "2013-03-02",
+                "value" : 5500,
                 "meta" : {
                   "globalKey" : "7b7141e"
-                },
-                "value" : 5500
+                }
               }, {
                 "date" : "2013-09-02",
+                "value" : 5000,
                 "meta" : {
                   "globalKey" : "7b72fd9"
-                },
-                "value" : 5000
+                }
               }, {
                 "date" : "2014-03-02",
+                "value" : 5000,
                 "meta" : {
                   "globalKey" : "7b7f959"
-                },
-                "value" : 5000
+                }
               }, {
                 "date" : "2014-09-02",
+                "value" : 5000,
                 "meta" : {
                   "globalKey" : "7b827d9"
-                },
-                "value" : 5000
+                }
               }, {
                 "date" : "2015-03-02",
+                "value" : 5000,
                 "meta" : {
                   "globalKey" : "7b8f159"
-                },
-                "value" : 5000
+                }
               }, {
                 "date" : "2015-09-02",
+                "value" : 4500,
                 "meta" : {
                   "globalKey" : "7b8be3f"
-                },
-                "value" : 4500
+                }
               }, {
                 "date" : "2016-03-02",
+                "value" : 4500,
                 "meta" : {
                   "globalKey" : "7b987bf"
-                },
-                "value" : 4500
+                }
               }, {
                 "date" : "2016-09-02",
+                "value" : 3500,
                 "meta" : {
                   "globalKey" : "7b941e0"
-                },
-                "value" : 3500
+                }
               }, {
                 "date" : "2017-03-02",
+                "value" : 3500,
                 "meta" : {
                   "globalKey" : "7ba0b60"
-                },
-                "value" : 3500
+                }
               }, {
                 "date" : "2017-09-02",
+                "value" : 2500,
                 "meta" : {
                   "globalKey" : "7b9c581"
-                },
-                "value" : 2500
+                }
               }, {
                 "date" : "2018-03-02",
+                "value" : 2500,
                 "meta" : {
                   "globalKey" : "7ba8f01"
-                },
-                "value" : 2500
+                }
               }, {
                 "date" : "2018-09-02",
+                "value" : 2000,
                 "meta" : {
                   "globalKey" : "7baaabc"
-                },
-                "value" : 2000
+                }
               }, {
                 "date" : "2019-03-02",
+                "value" : 2000,
                 "meta" : {
                   "globalKey" : "7bb743c"
-                },
-                "value" : 2000
+                }
               }, {
                 "date" : "2019-09-02",
+                "value" : 2000,
                 "meta" : {
                   "globalKey" : "7bba2bc"
-                },
-                "value" : 2000
+                }
               }, {
                 "date" : "2020-03-02",
+                "value" : 2000,
                 "meta" : {
                   "globalKey" : "7bc6c3c"
-                },
-                "value" : 2000
+                }
               } ]
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "8280320a"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "af477dc0"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3f105e"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
+        }
+      } ],
+      "name" : {
+        "value" : "Party A"
       },
-      "value" : "2018-01-30"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
         }
       } ],
-      "issuer" : {
+      "name" : {
+        "value" : "Party B"
+      },
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+              }
+            }
+          }
+        },
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
         },
-        "value" : "54930084UKLVMY22DS16"
-      },
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "335bf1d6"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+        "globalKey" : "bd492439"
+      }
+    },
+    "meta" : {
+      "globalKey" : "554eefa0"
+    }
+  },
+  "meta" : {
+    "globalKey" : "554eefa0"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/USD-Vanilla-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/USD-Vanilla-swap.json
index 6dd1869c2e..330d7ce6ce 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/USD-Vanilla-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/USD-Vanilla-swap.json
@@ -1,155 +1,46 @@
 {
-  "meta" : {
-    "globalKey" : "95f0e889"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "95f0e889"
-    },
-    "party" : [ {
-      "businessUnit" : [ {
-        "meta" : {
-          "externalKey" : "desk1",
-          "globalKey" : "5c10b72e"
-        },
-        "name" : "NY Swaps Desk"
-      } ],
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "59bab2e9"
-      },
-      "name" : {
-        "value" : "Bank X"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5493001RKR55V4X61F71"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "d0f863bc"
-        }
-      } ],
-      "person" : [ {
-        "firstName" : "jjone",
-        "meta" : {
-          "externalKey" : "trader",
-          "globalKey" : "b793baa7"
-        },
-        "personId" : [ {
-          "value" : {
-            "identifier" : {
-              "value" : "jjones"
-            },
-            "meta" : {
-              "globalKey" : "baeb8c0d"
-            }
-          }
-        } ]
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "b8c6cb0d"
-      },
-      "name" : {
-        "value" : "Bank Y"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300O5MFEP1XJ40B46"
-        },
-        "identifierType" : "LEI",
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "1031234567",
         "meta" : {
-          "globalKey" : "956c45f8"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "broker1",
-        "globalKey" : "ed0cc6d1"
       },
-      "name" : {
-        "value" : "Up&Atem"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "712345678901234567890123456789012",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300OL8KL0WCQ34V31"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "8ffabe4b"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "clearing-svc",
-        "globalKey" : "611719a0"
-      },
-      "name" : {
-        "value" : "ClearItAll"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300IB5Q45JGNPND58"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e213e7d7"
-        }
-      } ]
-    } ],
-    "partyRole" : [ {
-      "ownershipPartyReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "59bab2e9"
-      },
-      "partyReference" : {
-        "externalReference" : "clearing-svc",
-        "globalReference" : "611719a0"
+        "globalKey" : "88f03f2f"
       },
-      "role" : "CLEARING_ORGANIZATION"
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2011-02-12",
+      "meta" : {
+        "globalKey" : "3ed88c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "59bab2e9"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "b8c6cb0d"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
-              "value" : "INTEREST_RATE"
+              "value" : "InterestRate"
             }
           }, {
             "source" : "ISDA",
             "value" : {
               "name" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
+                }
               }
             }
           }, {
@@ -160,46 +51,40 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "27e4e9"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d23"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "8"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2011-02-08",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -208,103 +93,108 @@
                       },
                       "meta" : {
                         "globalKey" : "ec0f7dc0"
-                      },
-                      "unadjustedDate" : "2011-02-08"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec0f7dc0"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "b2f33a02"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2016-02-08",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "27e4e9"
+                            "globalKey" : "27e4e9",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "3662e8ba"
                         }
                       },
                       "meta" : {
                         "globalKey" : "6d96fd32"
-                      },
-                      "unadjustedDate" : "2016-02-08"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "6d96fd32"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "ea93e6d"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa45fc3"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "27e4e9"
+                        "globalReference" : "27e4e9",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "204f"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "rollConvention" : "8"
+                  },
+                  "meta" : {
+                    "globalKey" : "8238af6a",
+                    "externalKey" : "floatingCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "27e4e9",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "db523fbd"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "b2f33a02"
+                    "globalReference" : "8238af6a",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "131ae8a2"
+                      "globalKey" : "eff6d356"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -313,82 +203,79 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "dbde6647"
+                      "globalReference" : "6fc3cf5",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "dbde6647"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "27e4e9"
+                        "globalReference" : "27e4e9",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "6fc3cf5",
+                    "externalKey" : "resetDates"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c669c2fd"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "27e4e9"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d80"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "8"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30E/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2011-02-08",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -397,235 +284,348 @@
                       },
                       "meta" : {
                         "globalKey" : "ec0f7dc0"
-                      },
-                      "unadjustedDate" : "2011-02-08"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec0f7dc0"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "ab709858"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2016-02-08",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "27e4e9"
+                            "globalReference" : "27e4e9",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "58821cc5"
-                      },
-                      "unadjustedDate" : "2016-02-08"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "58821cc5"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30E/360"
-                },
-                "meta" : {
-                  "globalKey" : "43fa7ecc"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa45fc6"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "27e4e9"
+                        "globalReference" : "27e4e9",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "2b92"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "8"
+                  },
+                  "meta" : {
+                    "globalKey" : "da8c707a",
+                    "externalKey" : "fixedCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "27e4e9",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "7a04f180"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "2e11b2a4"
                 }
               } ],
               "meta" : {
-                "globalKey" : "651264f9"
+                "globalKey" : "8d36961"
               }
             }
           },
           "meta" : {
-            "globalKey" : "50547e95"
+            "globalKey" : "f41582fd"
           }
         },
         "meta" : {
-          "globalKey" : "50547e95"
+          "globalKey" : "f41582fd"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "975cb782"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d05"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-LIBOR-BBA"
-                },
-                "indexTenor" : {
+          "quantity" : [ {
+            "value" : {
+              "value" : 10000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD",
                   "meta" : {
-                    "globalKey" : "956"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 3
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                  }
                 }
               }
-            }
-          },
-          "quantity" : [ {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 3,
+                  "period" : "M",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+                    "globalKey" : "aa"
+                  }
                 }
               },
-              "value" : 10000000.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "828026c7"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "37b2000e"
           },
+          "meta" : {
+            "globalKey" : "a032462e"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0253,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
               },
-              "value" : 0.0253,
               "perUnitOf" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000.00,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
-              },
-              "value" : 10000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "be8e01b2"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "117b5169",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "619cff8d",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ed88c"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "5493001RKR55V4X61F71",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "d0f863bc"
+        }
+      } ],
+      "name" : {
+        "value" : "Bank X"
       },
-      "value" : "2011-02-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "businessUnit" : [ {
+        "name" : "NY Swaps Desk",
+        "meta" : {
+          "globalKey" : "5c10b72e",
+          "externalKey" : "desk1"
+        }
+      } ],
+      "person" : [ {
+        "personId" : [ {
+          "value" : {
+            "identifier" : {
+              "value" : "jjones"
+            },
+            "meta" : {
+              "globalKey" : "baeb8c0d"
+            }
+          }
+        } ],
+        "firstName" : "jjone",
+        "meta" : {
+          "globalKey" : "b793baa7",
+          "externalKey" : "trader"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "117b5169",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300O5MFEP1XJ40B46",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-          },
-          "value" : "712345678901234567890123456789012"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "956c45f8"
         }
       } ],
-      "issuer" : {
+      "name" : {
+        "value" : "Bank Y"
+      },
+      "meta" : {
+        "globalKey" : "619cff8d",
+        "externalKey" : "party2"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300OL8KL0WCQ34V31",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+          "globalKey" : "8ffabe4b"
+        }
+      } ],
+      "name" : {
+        "value" : "Up&Atem"
+      },
+      "meta" : {
+        "globalKey" : "ce0b9311",
+        "externalKey" : "broker1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300IB5Q45JGNPND58",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
         },
-        "value" : "1031234567"
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e213e7d7"
+        }
+      } ],
+      "name" : {
+        "value" : "ClearItAll"
       },
       "meta" : {
-        "globalKey" : "f07e39ef"
+        "globalKey" : "f6a6cc60",
+        "externalKey" : "clearing-svc"
+      }
+    } ],
+    "partyRole" : [ {
+      "partyReference" : {
+        "globalReference" : "f6a6cc60",
+        "externalReference" : "clearing-svc"
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+      "role" : "ClearingOrganization",
+      "ownershipPartyReference" : {
+        "globalReference" : "117b5169",
+        "externalReference" : "party1"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "5f7140a1"
+    }
+  },
+  "meta" : {
+    "globalKey" : "5f7140a1"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/USD-Vanilla-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/USD-Vanilla-uti.json
index e56090011c..cb56651804 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/USD-Vanilla-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/USD-Vanilla-uti.json
@@ -1,182 +1,109 @@
 {
-  "meta" : {
-    "globalKey" : "bf42835e"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-              },
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
-          }
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "6b413360"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ],
-      "meta" : {
-        "globalKey" : "bd492439"
-      }
-    },
-    "meta" : {
-      "globalKey" : "bf42835e"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
       },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
-      },
-      "name" : {
-        "value" : "Party B"
+        "globalKey" : "3eac3060"
       },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
-        }
-      } ]
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2018-02-22",
+      "meta" : {
+        "globalKey" : "3f1096"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
-          "productIdentifier" : [ {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
-              },
-              "meta" : {
-                "globalKey" : "95f4ea06"
-              },
-              "source" : "OTHER"
-            }
-          } ],
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
+              "value" : "InterestRate",
               "meta" : {
                 "scheme" : "http://www.fpml.org/coding-scheme/asset-class-simple"
-              },
-              "value" : "INTEREST_RATE"
+              }
             }
           }, {
             "source" : "ISDA",
             "value" : {
               "name" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                },
-                "value" : "InterestRate:IRSwap:FixedFloat"
+                }
               }
             }
           }, {
             "source" : "ISDA",
             "productQualifier" : "InterestRate_IRSwap_FixedFloat"
           } ],
+          "productIdentifier" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "InterestRate:IRSwap:FixedFloat",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
+                }
+              },
+              "source" : "Other",
+              "meta" : {
+                "globalKey" : "95f4ea06"
+              }
+            }
+          } ],
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "USNY"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "27e4e9"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "3662e8ba"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d7d"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "5"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-03-05",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -185,20 +112,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ece29abd"
-                      },
-                      "unadjustedDate" : "2018-03-05"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ece29abd"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates1",
-                    "globalKey" : "bc7798fb"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2027-03-05",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -207,34 +131,20 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "3662e8ba"
                         }
                       },
                       "meta" : {
                         "globalKey" : "254315"
-                      },
-                      "unadjustedDate" : "2027-03-05"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "254315"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "ea7afa81"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates1",
-                    "globalKey" : "98150c39"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -243,75 +153,90 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "3662e8ba"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "2b8f"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "5"
+                  },
+                  "meta" : {
+                    "globalKey" : "b62122b7",
+                    "externalKey" : "fixedCalcPeriodDates1"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "27e4e9"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "3662e8ba"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "8f19d1ed",
+                    "externalKey" : "paymentDates1"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "27f2a099"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "USNY"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "27e4e9"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "3662e8ba"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d7d"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "5"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-03-05",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -320,20 +245,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ece29abd"
-                      },
-                      "unadjustedDate" : "2018-03-05"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ece29abd"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates2",
-                    "globalKey" : "bc7798fb"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2027-03-05",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -342,34 +264,20 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "3662e8ba"
                         }
                       },
                       "meta" : {
                         "globalKey" : "254315"
-                      },
-                      "unadjustedDate" : "2027-03-05"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "254315"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "f0dc52b6"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates2",
-                    "globalKey" : "98150c39"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -378,44 +286,65 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "3662e8ba"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "2b8f"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "5"
+                  },
+                  "meta" : {
+                    "globalKey" : "b62122b7",
+                    "externalKey" : "floatingCalcPeriodDates2"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "27e4e9"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "3662e8ba"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "8f19d1ed",
+                    "externalKey" : "paymentDates2"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates2",
-                    "globalReference" : "bc7798fb"
+                    "globalReference" : "b62122b7",
+                    "externalReference" : "floatingCalcPeriodDates2"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2fdb52a8"
+                      "globalKey" : "cb73d5c"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -424,17 +353,20 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates2",
-                      "globalReference" : "346e6a83"
+                      "globalReference" : "cae326eb",
+                      "externalReference" : "resetDates2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates2",
-                    "globalKey" : "346e6a83"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -443,150 +375,218 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "3662e8ba"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "cae326eb",
+                    "externalKey" : "resetDates2"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "8294498e"
                 }
               } ],
               "meta" : {
-                "globalKey" : "bcd0c15"
+                "globalKey" : "4ec8f9d5"
               }
             }
           },
           "meta" : {
-            "globalKey" : "9432a36b"
+            "globalKey" : "fb545973"
           }
         },
         "meta" : {
-          "globalKey" : "9432a36b"
+          "globalKey" : "fb545973"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "bda6db54"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0296,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0296,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 525000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "f7348f2c"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 525000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 525000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "c11b6326"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d08"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 525000000
+            "meta" : {
+              "globalKey" : "8280320a"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "ca419b8"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3f1096"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
+        }
+      } ],
+      "name" : {
+        "value" : "Party A"
       },
-      "value" : "2018-02-22"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
         }
       } ],
-      "issuer" : {
+      "name" : {
+        "value" : "Party B"
+      },
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+              }
+            }
+          }
+        },
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
         },
-        "value" : "54930084UKLVMY22DS16"
-      },
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "335bf1d6"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+        "globalKey" : "bd492439"
+      }
+    },
+    "meta" : {
+      "globalKey" : "a6f44ad8"
+    }
+  },
+  "meta" : {
+    "globalKey" : "a6f44ad8"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/bond-option-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/bond-option-uti.json
index c44d9d8048..43200b84c4 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/bond-option-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/bond-option-uti.json
@@ -1,73 +1,33 @@
 {
-  "meta" : {
-    "globalKey" : "441e2eb4"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "d13a68b"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
-      },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "121d7965"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
       },
-      "name" : {
-        "value" : "Party B"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "3eac3060"
+      },
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2006-05-10",
+      "meta" : {
+        "globalKey" : "3eb14a",
+        "externalKey" : "TRADEDATE"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -75,39 +35,33 @@
             "productQualifier" : "InterestRate_Option_DebtOption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "a9049674"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "35f85f44"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "JPY"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
+                      "unadjustedDate" : "2006-06-22",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "JPTO"
@@ -116,48 +70,32 @@
                             "globalKey" : "22da41"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211ff630"
                         }
-                      },
-                      "unadjustedDate" : "2006-06-22"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "a15ed25a"
                     }
                   },
-                  "settlementType" : "PHYSICAL"
+                  "meta" : {
+                    "globalKey" : "35f85f44"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "limitedRightToConfirm" : false,
-                    "manualExercise" : {
-                      "exerciseNotice" : {
-                        "businessCenter" : {
-                          "value" : "JPTO"
-                        },
-                        "exerciseNoticeGiver" : "BUYER"
-                      }
-                    },
-                    "splitTicket" : false
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "JPTO"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-06-19",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "JPTO"
@@ -166,62 +104,72 @@
                                 "globalKey" : "22da41"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "211ff630"
                             }
                           },
                           "meta" : {
                             "globalKey" : "9c40487d"
-                          },
-                          "unadjustedDate" : "2006-06-19"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "9c40487d"
                         }
                       } ],
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "JPTO"
+                        }
+                      },
                       "expirationTime" : {
+                        "hourMinuteTime" : "14:30:00",
                         "businessCenter" : {
                           "value" : "JPTO"
-                        },
-                        "hourMinuteTime" : "14:30:00"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "4e21c36f"
+                        "globalKey" : "d363f4ef"
                       }
                     }
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 99.7,
                       "unit" : {
                         "currency" : {
+                          "value" : "JPY",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "JPY"
+                          }
                         }
                       },
-                      "value" : 99.7,
                       "perUnitOf" : {
                         "currency" : {
+                          "value" : "JPY",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "JPY"
+                          }
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "exerciseNotice" : {
+                        "exerciseNoticeGiver" : "Buyer",
+                        "businessCenter" : {
+                          "value" : "JPTO"
+                        }
+                      }
+                    },
+                    "followUpConfirmation" : true,
+                    "limitedRightToConfirm" : false,
+                    "splitTicket" : false
                   }
                 },
-                "meta" : {
-                  "globalKey" : "a9049674"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "1ff493"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -229,152 +177,200 @@
                         "value" : "productIdentifier-1"
                       }
                     } ],
-                    "securityType" : "DEBT"
+                    "securityType" : "Debt"
+                  },
+                  "meta" : {
+                    "globalKey" : "1ff493"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "9eb735d8"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "9eb735d8"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "6f89384a"
+            "globalKey" : "1a0d08c2"
           }
         },
         "meta" : {
-          "globalKey" : "6f89384a"
+          "globalKey" : "1a0d08c2"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "bfb5991c"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "c772c8fb"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "CUSIP"
-                  },
-                  "value" : "ExampleCUSIP1"
-                },
-                "meta" : {
-                  "globalKey" : "c772c8fb"
-                },
-                "source" : "CUSIP"
-              }
-            } ]
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 10000000000,
               "unit" : {
                 "currency" : {
+                  "value" : "JPY",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "JPY"
+                  }
                 }
-              },
-              "value" : 10000000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 1,
               "unit" : {
-                "financialUnit" : "CONTRACT"
+                "financialUnit" : "Contract"
               },
-              "value" : 1,
               "multiplier" : {
+                "value" : 10000000000,
                 "unit" : {
                   "currency" : {
+                    "value" : "JPY",
                     "meta" : {
                       "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                    },
-                    "value" : "JPY"
+                    }
+                  }
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "ExampleCUSIP1",
+                  "meta" : {
+                    "scheme" : "CUSIP"
                   }
                 },
-                "value" : 10000000000
+                "source" : "CUSIP",
+                "meta" : {
+                  "globalKey" : "c772c8fb"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "26e65665"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "7aeade46"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TRADEDATE",
-        "globalKey" : "3eb14a"
-      },
-      "value" : "2006-05-10"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "54930084UKLVMY22DS16"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "335bf1d6"
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
+        }
+      } ],
+      "name" : {
+        "value" : "Party B"
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "43d6488b"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "95b1c05f"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        }
-      },
       "quantity" : {
+        "value" : 25000000,
         "unit" : {
           "currency" : {
+            "value" : "JPY",
             "meta" : {
               "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-            },
-            "value" : "JPY"
+            }
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
         },
-        "value" : 25000000
+        "receiverPartyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2006-05-15",
         "dateAdjustments" : {
+          "businessDayConvention" : "FOLLOWING",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "JPTO"
@@ -383,16 +379,20 @@
               "globalKey" : "22da41"
             }
           },
-          "businessDayConvention" : "FOLLOWING",
           "meta" : {
             "globalKey" : "211ff630"
           }
-        },
-        "unadjustedDate" : "2006-05-15"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "71c62fb1"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "b6c93c06"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/cb-option-usi.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/cb-option-usi.json
index 50a595fd0a..bc256dbeb4 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/cb-option-usi.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/cb-option-usi.json
@@ -1,67 +1,33 @@
 {
-  "meta" : {
-    "globalKey" : "73c8a1a2"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "73c8a1a2"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "jhf45s",
-        "globalKey" : "37b9cf43"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "Party A"
-        },
-        "identifierType" : "BIC",
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "1031234567",
         "meta" : {
-          "globalKey" : "37b9cf43"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "fdkhjbgr",
-        "globalKey" : "37b9cf44"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "Party B"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "37b9cf44"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/usi"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "af42d69a"
+      },
+      "identifierType" : "UniqueSwapIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2006-01-16",
+      "meta" : {
+        "globalKey" : "3eb050",
+        "externalKey" : "uyrt76w4"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "jhf45s",
-          "globalReference" : "37b9cf43"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "fdkhjbgr",
-          "globalReference" : "37b9cf44"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "jhf45s",
-          "globalReference" : "37b9cf43"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -69,45 +35,38 @@
             "productQualifier" : "InterestRate_Option_DebtOption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "ad502fe1"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "89cd951"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "CHF"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 8,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "b46707b9"
+                          "globalKey" : "1003a5c1"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 8,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -118,42 +77,33 @@
                             "globalKey" : "4273a82"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "f746f",
-                          "globalReference" : "2d9f6860"
+                          "globalReference" : "2aac48a0",
+                          "externalReference" : "f746f"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "b46707b9"
+                      "globalKey" : "1003a5c1"
                     }
                   },
-                  "settlementType" : "PHYSICAL"
+                  "meta" : {
+                    "globalKey" : "64397759"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "limitedRightToConfirm" : false,
-                    "manualExercise" : {
-                      "exerciseNotice" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "exerciseNoticeGiver" : "SELLER"
-                      }
-                    },
-                    "splitTicket" : true
-                  },
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-01-19",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -164,29 +114,23 @@
                                 "globalKey" : "4273a82"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da4d16b1"
                             }
                           },
                           "meta" : {
                             "globalKey" : "3529f2fe"
-                          },
-                          "unadjustedDate" : "2006-01-19"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "3529f2fe"
                         }
                       },
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2010-08-05",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -197,69 +141,79 @@
                                 "globalKey" : "4273a82"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da4d16b1"
                             }
                           },
                           "meta" : {
                             "globalKey" : "7683e50c"
-                          },
-                          "unadjustedDate" : "2010-08-05"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "7683e50c"
                         }
                       },
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      },
                       "expirationTime" : {
+                        "hourMinuteTime" : "16:00:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "16:00:00"
+                        }
                       },
                       "meta" : {
-                        "externalKey" : "f746f",
-                        "globalKey" : "2d9f6860"
+                        "globalKey" : "2aac48a0",
+                        "externalKey" : "f746f"
                       }
                     }
                   },
                   "strike" : {
                     "referenceSwapCurve" : {
-                      "makeWholeAmount" : {
+                      "swapUnwindValue" : {
                         "floatingRateIndex" : "EUR-LIBOR-BBA",
-                        "side" : "BID",
-                        "spread" : 85,
-                        "earlyCallDate" : {
+                        "indexTenor" : {
+                          "periodMultiplier" : 6,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "3eb1d3"
-                          },
-                          "value" : "2006-07-19"
+                            "globalKey" : "107"
+                          }
                         },
-                        "interpolationMethod" : "LINEAR_ZERO_YIELD"
+                        "spread" : 85,
+                        "side" : "Bid"
                       },
-                      "swapUnwindValue" : {
+                      "makeWholeAmount" : {
                         "floatingRateIndex" : "EUR-LIBOR-BBA",
-                        "indexTenor" : {
+                        "spread" : 85,
+                        "side" : "Bid",
+                        "interpolationMethod" : "LinearZeroYield",
+                        "earlyCallDate" : {
+                          "value" : "2006-07-19",
                           "meta" : {
-                            "globalKey" : "959"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 6
-                        },
-                        "side" : "BID",
-                        "spread" : 85
+                            "globalKey" : "3eb1d3"
+                          }
+                        }
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "exerciseNotice" : {
+                        "exerciseNoticeGiver" : "Seller",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      }
+                    },
+                    "followUpConfirmation" : true,
+                    "limitedRightToConfirm" : false,
+                    "splitTicket" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "ad502fe1"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "1ff493"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -267,101 +221,147 @@
                         "value" : "productIdentifier-1"
                       }
                     } ],
-                    "securityType" : "DEBT"
+                    "securityType" : "Debt"
+                  },
+                  "meta" : {
+                    "globalKey" : "1ff493"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "dd19d82b"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "dd19d82b"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "2fac2d37"
+            "globalKey" : "4a506255"
           }
         },
         "meta" : {
-          "globalKey" : "2fac2d37"
+          "globalKey" : "4a506255"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "1baa5fa7"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "847bd747"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "ISIN"
-                  },
-                  "value" : "ExampleISIN1"
-                },
-                "meta" : {
-                  "globalKey" : "847bd747"
-                },
-                "source" : "ISIN"
-              }
-            } ]
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 1,
               "unit" : {
-                "financialUnit" : "CONTRACT"
+                "financialUnit" : "Contract"
               },
-              "value" : 1,
               "multiplier" : {
+                "value" : 1100000,
                 "unit" : {
                   "currency" : {
                     "value" : "CHF"
                   }
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "ExampleISIN1",
+                  "meta" : {
+                    "scheme" : "ISIN"
+                  }
                 },
-                "value" : 1100000
+                "source" : "ISIN",
+                "meta" : {
+                  "globalKey" : "847bd747"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "aff1199"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "d5ed9ce7"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "37b9cf44",
+          "externalReference" : "fdkhjbgr"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "37b9cf43",
+          "externalReference" : "jhf45s"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "37b9cf43",
+          "externalReference" : "jhf45s"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "uyrt76w4",
-        "globalKey" : "3eb050"
-      },
-      "value" : "2006-01-16"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/usi"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "37b9cf43"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
+      "meta" : {
+        "globalKey" : "37b9cf43",
+        "externalKey" : "jhf45s"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party B",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
         },
-        "value" : "1031234567"
-      },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "37b9cf44"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "81c425a"
-      },
-      "identifierType" : "UNIQUE_SWAP_IDENTIFIER"
-    } ]
+        "globalKey" : "37b9cf44",
+        "externalKey" : "fdkhjbgr"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "ac9d4a2a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "ac9d4a2a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/cdm-xccy-swap-after-usi-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/cdm-xccy-swap-after-usi-uti.json
index 9aa42121ae..3cca47cb9c 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/cdm-xccy-swap-after-usi-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/cdm-xccy-swap-after-usi-uti.json
@@ -1,150 +1,127 @@
 {
-  "meta" : {
-    "globalKey" : "389248a7"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "f91ded71"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
-      },
-      "name" : {
-        "value" : "Party A"
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+        }
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DRTY123456",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
+        "globalKey" : "717b78f7"
       },
-      "name" : {
-        "value" : "Party B"
+      "identifierType" : "UniqueTransactionIdentifier"
+    }, {
+      "issuer" : {
+        "value" : "1031234567",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
+        }
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/usi"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "af42d69a"
+      },
+      "identifierType" : "UniqueSwapIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2018-03-19",
+      "meta" : {
+        "globalKey" : "3f10d3",
+        "externalKey" : "tradeDate"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
-          "productIdentifier" : [ {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.dtcc.com/coding-scheme/external/GTR-Product-Id"
-                },
-                "value" : "InterestRate:CrossCurrency:Basis"
-              },
-              "meta" : {
-                "globalKey" : "b0bf3e75"
-              },
-              "source" : "OTHER"
-            }
-          } ],
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
-              "value" : "INTEREST_RATE"
+              "value" : "InterestRate"
             }
           }, {
             "source" : "CFI",
             "value" : {
               "name" : {
+                "value" : "SRAXCC",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/external/product-classification/iso10962"
-                },
-                "value" : "SRAXCC"
+                }
               }
             }
           }, {
             "source" : "EMIR",
             "value" : {
               "name" : {
+                "value" : "SW",
                 "meta" : {
                   "scheme" : "http://www.dtcc.com/coding-scheme/external/product-classification/emir-contract-type"
-                },
-                "value" : "SW"
+                }
               }
             }
           }, {
             "source" : "ISDA",
             "productQualifier" : "InterestRate_CrossCurrency_Basis"
           } ],
+          "productIdentifier" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "InterestRate:CrossCurrency:Basis",
+                "meta" : {
+                  "scheme" : "http://www.dtcc.com/coding-scheme/external/GTR-Product-Id"
+                }
+              },
+              "source" : "Other",
+              "meta" : {
+                "globalKey" : "b0bf3e75"
+              }
+            }
+          } ],
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "658381c3"
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
+                  "quantityReference" : {
+                    "globalReference" : "0",
+                    "externalReference" : "fixed_notional_schedule"
                   },
                   "quantityMultiplier" : {
                     "fxLinkedNotionalSchedule" : {
-                      "fixingTime" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "11:00:00"
-                      },
-                      "fxSpotRateSource" : {
-                        "primarySource" : {
-                          "sourcePage" : {
-                            "value" : "WM Company LDN 11am Mid"
-                          },
-                          "sourcePageHeading" : "USD/EUR",
-                          "sourceProvider" : {
-                            "value" : "TELERATE"
-                          }
-                        }
-                      },
                       "varyingNotionalCurrency" : {
                         "value" : "USD"
                       },
                       "varyingNotionalFixingDates" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "937e4a3"
+                          "globalKey" : "97a0d7df"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -153,19 +130,36 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "tradeDate",
-                          "globalReference" : "3f10d3"
+                          "globalReference" : "3f10d3",
+                          "externalReference" : "tradeDate"
+                        }
+                      },
+                      "fxSpotRateSource" : {
+                        "primarySource" : {
+                          "sourceProvider" : {
+                            "value" : "Telerate"
+                          },
+                          "sourcePage" : {
+                            "value" : "WM Company LDN 11am Mid"
+                          },
+                          "sourcePageHeading" : "USD/EUR"
+                        }
+                      },
+                      "fixingTime" : {
+                        "hourMinuteTime" : "11:00:00",
+                        "businessCenter" : {
+                          "value" : "GBLO"
                         }
                       },
                       "varyingNotionalInterimExchangePaymentDates" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "937e4a3"
+                          "globalKey" : "97a0d7df"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -174,71 +168,63 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "tradeDate",
-                          "globalReference" : "3f10d3"
+                          "globalReference" : "3f10d3",
+                          "externalReference" : "tradeDate"
                         }
                       }
                     }
                   },
-                  "quantityReference" : {
-                    "externalReference" : "fixed_notional_schedule",
-                    "globalReference" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
+                  "meta" : {
+                    "globalKey" : "c2caef9f"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : false,
                   "initialPayment" : false,
+                  "finalPayment" : false,
                   "intermediatePayment" : true,
                   "meta" : {
                     "globalKey" : "12be2f"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "14966"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
+                  },
+                  "meta" : {
+                    "globalKey" : "14966"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "81e33772"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-2"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "5865eac3"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c48"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "21"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-03-21",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -251,33 +237,23 @@
                             "globalKey" : "81e33772"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "5865eac3"
                         }
                       },
                       "meta" : {
                         "globalKey" : "733f98e"
-                      },
-                      "unadjustedDate" : "2018-03-21"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "733f98e"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "d0e5304",
-                    "globalKey" : "40e712a7"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
-                      "adjustedDate" : {
-                        "meta" : {
-                          "globalKey" : "3f38d5"
-                        },
-                        "value" : "2023-03-21"
-                      },
+                      "unadjustedDate" : "2023-03-21",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -290,38 +266,26 @@
                             "globalKey" : "81e33772"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "5865eac3"
                         }
                       },
+                      "adjustedDate" : {
+                        "value" : "2023-03-21",
+                        "meta" : {
+                          "globalKey" : "3f38d5"
+                        }
+                      },
                       "meta" : {
                         "globalKey" : "80e0d18e"
-                      },
-                      "unadjustedDate" : "2023-03-21"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "80e0d18e"
                     }
-                  }
-                },
-                "cashflowRepresentation" : {
-                  "cashflowsMatchParameters" : false
-                },
-                "compoundingMethod" : "NONE",
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "6965de00"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2018-06-21",
-                  "meta" : {
-                    "globalKey" : "b7434d18"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -334,52 +298,69 @@
                         "globalKey" : "81e33772"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "5865eac3"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "17f74"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "rollConvention" : "21"
+                  },
+                  "meta" : {
+                    "globalKey" : "a071381b",
+                    "externalKey" : "d0e5304"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-2"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2018-06-21",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "81e33772"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "5865eac3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "4c3bd2be"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "d0e5304",
-                    "globalReference" : "40e712a7"
+                    "globalReference" : "a071381b",
+                    "externalReference" : "d0e5304"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "7a0be842"
+                      "globalKey" : "56e7d2f6"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -388,17 +369,20 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "d0e5651",
-                      "globalReference" : "3c25fa77"
+                      "globalReference" : "359bc2a9",
+                      "externalReference" : "d0e5651"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "d0e5651",
-                    "globalKey" : "3c25fa77"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -407,147 +391,149 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "359bc2a9",
+                    "externalKey" : "d0e5651"
+                  }
+                },
+                "compoundingMethod" : "None",
+                "cashflowRepresentation" : {
+                  "cashflowsMatchParameters" : false
+                },
+                "meta" : {
+                  "globalKey" : "7d73d82"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "fixed_notional_schedule",
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "fixed_notional_schedule"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : true,
                   "initialPayment" : true,
+                  "finalPayment" : true,
                   "intermediatePayment" : true,
-                  "meta" : {
-                    "globalKey" : "747c1b93"
-                  },
                   "principalPaymentSchedule" : {
-                    "finalPrincipalPayment" : {
-                      "meta" : {
-                        "globalKey" : "37cbd860"
+                    "initialPrincipalPayment" : {
+                      "principalPaymentDate" : {
+                        "adjustedDate" : {
+                          "value" : "2018-03-21",
+                          "meta" : {
+                            "globalKey" : "3f10d5"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
                       },
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "principalAmount" : {
+                        "value" : 1400.00,
                         "unit" : {
                           "currency" : {
                             "value" : "EUR"
                           }
                         },
-                        "value" : 1400.00,
                         "meta" : {
                           "globalKey" : "7b889f5f"
                         }
                       },
+                      "meta" : {
+                        "globalKey" : "39f638fe"
+                      }
+                    },
+                    "finalPrincipalPayment" : {
                       "principalPaymentDate" : {
                         "adjustedDate" : {
+                          "value" : "2023-03-21",
                           "meta" : {
                             "globalKey" : "3f38d5"
-                          },
-                          "value" : "2023-03-21"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "0"
                         }
-                      }
-                    },
-                    "initialPrincipalPayment" : {
-                      "meta" : {
-                        "globalKey" : "4d0e6c2"
                       },
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "principalAmount" : {
+                        "value" : 1400.00,
                         "unit" : {
                           "currency" : {
                             "value" : "EUR"
                           }
                         },
-                        "value" : 1400.00,
                         "meta" : {
                           "globalKey" : "7b889f5f"
                         }
                       },
-                      "principalPaymentDate" : {
-                        "adjustedDate" : {
-                          "meta" : {
-                            "globalKey" : "3f10d5"
-                          },
-                          "value" : "2018-03-21"
-                        },
-                        "meta" : {
-                          "globalKey" : "0"
-                        }
+                      "meta" : {
+                        "globalKey" : "6d279ba0"
                       }
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "5aab838f"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "10da2"
-                  },
                   "settlementCurrency" : {
                     "value" : "EUR"
+                  },
+                  "meta" : {
+                    "globalKey" : "10da2"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "81e33772"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "5865eac3"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c48"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "21"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-03-21",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -560,33 +546,23 @@
                             "globalKey" : "81e33772"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "5865eac3"
                         }
                       },
                       "meta" : {
                         "globalKey" : "733f98e"
-                      },
-                      "unadjustedDate" : "2018-03-21"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "733f98e"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "d0e6023",
-                    "globalKey" : "40e712a7"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
-                      "adjustedDate" : {
-                        "meta" : {
-                          "globalKey" : "3f38d5"
-                        },
-                        "value" : "2023-03-21"
-                      },
+                      "unadjustedDate" : "2023-03-21",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -599,38 +575,26 @@
                             "globalKey" : "81e33772"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "5865eac3"
                         }
                       },
+                      "adjustedDate" : {
+                        "value" : "2023-03-21",
+                        "meta" : {
+                          "globalKey" : "3f38d5"
+                        }
+                      },
                       "meta" : {
                         "globalKey" : "80e0d18e"
-                      },
-                      "unadjustedDate" : "2023-03-21"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "80e0d18e"
                     }
-                  }
-                },
-                "cashflowRepresentation" : {
-                  "cashflowsMatchParameters" : false
-                },
-                "compoundingMethod" : "NONE",
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "8c9fc8ff"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2018-06-21",
-                  "meta" : {
-                    "globalKey" : "b7434d18"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -643,52 +607,69 @@
                         "globalKey" : "81e33772"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "5865eac3"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "17f74"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "rollConvention" : "21"
+                  },
+                  "meta" : {
+                    "globalKey" : "a071381b",
+                    "externalKey" : "d0e6023"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2018-06-21",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "81e33772"
                       }
                     },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "5865eac3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "4c3bd2be"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "d0e6023",
-                    "globalReference" : "40e712a7"
+                    "globalReference" : "a071381b",
+                    "externalReference" : "d0e6023"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "77b1cd44"
+                      "globalKey" : "548db7f8"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -697,17 +678,20 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "d0e6369",
-                      "globalReference" : "3dfddeb3"
+                      "globalReference" : "80690a43",
+                      "externalReference" : "d0e6369"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "d0e6369",
-                    "globalKey" : "3dfddeb3"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -716,262 +700,278 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "80690a43",
+                    "externalKey" : "d0e6369"
+                  }
+                },
+                "compoundingMethod" : "None",
+                "cashflowRepresentation" : {
+                  "cashflowsMatchParameters" : false
+                },
+                "meta" : {
+                  "globalKey" : "38597d7f"
                 }
               } ],
               "meta" : {
-                "globalKey" : "44e92aff"
+                "globalKey" : "ec9094bd"
               }
             }
           },
           "meta" : {
-            "globalKey" : "2e757162"
+            "globalKey" : "6ec177a"
           }
         },
         "meta" : {
-          "globalKey" : "2e757162"
+          "globalKey" : "6ec177a"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "fe8da185"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d05"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-2"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
-                  },
-                  "value" : "USD-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 3
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 1726.62,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 1726.62
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "16825d59"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e0e"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
-                  },
-                  "value" : "EUR-EURIBOR-Telerate"
+                  }
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-2"
+                } ]
               }
+            },
+            "meta" : {
+              "globalKey" : "828026c7"
             }
           },
+          "meta" : {
+            "globalKey" : "9869dec9"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
             "value" : {
+              "value" : -0.0045,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : -0.0045,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-2"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 1400,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EURIBOR-Telerate",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
+                  }
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 3,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
+                }
               },
-              "value" : 1400
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2bba16de"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "ae6f5a1d"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "tradeDate",
-        "globalKey" : "3f10d3"
-      },
-      "value" : "2018-03-19"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "DRTY123456"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "54930084UKLVMY22DS16"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "ef7b70ad"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/usi"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
-        },
-        "value" : "1031234567"
+      "name" : {
+        "value" : "Party B"
       },
       "meta" : {
-        "globalKey" : "81c425a"
-      },
-      "identifierType" : "UNIQUE_SWAP_IDENTIFIER"
-    } ]
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "4f00e52f"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "externalKey" : "SDB123-AB5.EUR.20180209.0",
-      "globalKey" : "9384e638"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        }
-      },
       "quantity" : {
+        "value" : 5.00,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
         },
-        "value" : 5.00
+        "receiverPartyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
         "adjustedDate" : {
+          "value" : "2018-02-09",
           "meta" : {
             "globalKey" : "3f1089"
-          },
-          "value" : "2018-02-09"
+          }
         }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "26fe0be4",
+      "externalKey" : "SDB123-AB5.EUR.20180209.0"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "dd3e42d5"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/cdm-xccy-swap-before-usi-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/cdm-xccy-swap-before-usi-uti.json
index 9eb7a4080c..af6e00cb07 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/cdm-xccy-swap-before-usi-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/cdm-xccy-swap-before-usi-uti.json
@@ -1,150 +1,127 @@
 {
-  "meta" : {
-    "globalKey" : "33de6a23"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "33de6a23"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
-      },
-      "name" : {
-        "value" : "Party A"
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "1031234567",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
+        }
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DRTY123456",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/usi"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
+        "globalKey" : "e2121f31"
       },
-      "name" : {
-        "value" : "Party B"
+      "identifierType" : "UniqueSwapIdentifier"
+    }, {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+        }
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "3eac3060"
+      },
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2018-03-19",
+      "meta" : {
+        "globalKey" : "3f10d3",
+        "externalKey" : "tradeDate"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
-          "productIdentifier" : [ {
-            "value" : {
-              "identifier" : {
-                "meta" : {
-                  "scheme" : "http://www.dtcc.com/coding-scheme/external/GTR-Product-Id"
-                },
-                "value" : "InterestRate:CrossCurrency:Basis"
-              },
-              "meta" : {
-                "globalKey" : "b0bf3e75"
-              },
-              "source" : "OTHER"
-            }
-          } ],
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
-              "value" : "INTEREST_RATE"
+              "value" : "InterestRate"
             }
           }, {
             "source" : "CFI",
             "value" : {
               "name" : {
+                "value" : "SRAXCC",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/external/product-classification/iso10962"
-                },
-                "value" : "SRAXCC"
+                }
               }
             }
           }, {
             "source" : "EMIR",
             "value" : {
               "name" : {
+                "value" : "SW",
                 "meta" : {
                   "scheme" : "http://www.dtcc.com/coding-scheme/external/product-classification/emir-contract-type"
-                },
-                "value" : "SW"
+                }
               }
             }
           }, {
             "source" : "ISDA",
             "productQualifier" : "InterestRate_CrossCurrency_Basis"
           } ],
+          "productIdentifier" : [ {
+            "value" : {
+              "identifier" : {
+                "value" : "InterestRate:CrossCurrency:Basis",
+                "meta" : {
+                  "scheme" : "http://www.dtcc.com/coding-scheme/external/GTR-Product-Id"
+                }
+              },
+              "source" : "Other",
+              "meta" : {
+                "globalKey" : "b0bf3e75"
+              }
+            }
+          } ],
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "658381c3"
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
+                  "quantityReference" : {
+                    "globalReference" : "0",
+                    "externalReference" : "fixed_notional_schedule"
                   },
                   "quantityMultiplier" : {
                     "fxLinkedNotionalSchedule" : {
-                      "fixingTime" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "11:00:00"
-                      },
-                      "fxSpotRateSource" : {
-                        "primarySource" : {
-                          "sourcePage" : {
-                            "value" : "WM Company LDN 11am Mid"
-                          },
-                          "sourcePageHeading" : "USD/EUR",
-                          "sourceProvider" : {
-                            "value" : "TELERATE"
-                          }
-                        }
-                      },
                       "varyingNotionalCurrency" : {
                         "value" : "USD"
                       },
                       "varyingNotionalFixingDates" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "937e4a3"
+                          "globalKey" : "97a0d7df"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -153,19 +130,36 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "tradeDate",
-                          "globalReference" : "3f10d3"
+                          "globalReference" : "3f10d3",
+                          "externalReference" : "tradeDate"
+                        }
+                      },
+                      "fxSpotRateSource" : {
+                        "primarySource" : {
+                          "sourceProvider" : {
+                            "value" : "Telerate"
+                          },
+                          "sourcePage" : {
+                            "value" : "WM Company LDN 11am Mid"
+                          },
+                          "sourcePageHeading" : "USD/EUR"
+                        }
+                      },
+                      "fixingTime" : {
+                        "hourMinuteTime" : "11:00:00",
+                        "businessCenter" : {
+                          "value" : "GBLO"
                         }
                       },
                       "varyingNotionalInterimExchangePaymentDates" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "937e4a3"
+                          "globalKey" : "97a0d7df"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -174,71 +168,55 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "tradeDate",
-                          "globalReference" : "3f10d3"
+                          "globalReference" : "3f10d3",
+                          "externalReference" : "tradeDate"
                         }
                       }
                     }
                   },
-                  "quantityReference" : {
-                    "externalReference" : "fixed_notional_schedule",
-                    "globalReference" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
+                  "meta" : {
+                    "globalKey" : "c2caef9f"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : false,
                   "initialPayment" : false,
+                  "finalPayment" : false,
                   "intermediatePayment" : true,
                   "meta" : {
                     "globalKey" : "12be2f"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "14966"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
+                  },
+                  "meta" : {
+                    "globalKey" : "14966"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "81e33772"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-2"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "5865eac3"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c48"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "21"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-03-21",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -251,33 +229,23 @@
                             "globalKey" : "81e33772"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "5865eac3"
                         }
                       },
                       "meta" : {
                         "globalKey" : "733f98e"
-                      },
-                      "unadjustedDate" : "2018-03-21"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "733f98e"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "d0e5285",
-                    "globalKey" : "40e712a7"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
-                      "adjustedDate" : {
-                        "meta" : {
-                          "globalKey" : "3f38d5"
-                        },
-                        "value" : "2023-03-21"
-                      },
+                      "unadjustedDate" : "2023-03-21",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -290,38 +258,26 @@
                             "globalKey" : "81e33772"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "5865eac3"
                         }
                       },
+                      "adjustedDate" : {
+                        "value" : "2023-03-21",
+                        "meta" : {
+                          "globalKey" : "3f38d5"
+                        }
+                      },
                       "meta" : {
                         "globalKey" : "80e0d18e"
-                      },
-                      "unadjustedDate" : "2023-03-21"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "80e0d18e"
                     }
-                  }
-                },
-                "cashflowRepresentation" : {
-                  "cashflowsMatchParameters" : false
-                },
-                "compoundingMethod" : "NONE",
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "94d8adc9"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2018-06-21",
-                  "meta" : {
-                    "globalKey" : "b7434d18"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -334,63 +290,69 @@
                         "globalKey" : "81e33772"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "5865eac3"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "17f74"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "rollConvention" : "21"
+                  },
+                  "meta" : {
+                    "globalKey" : "a071381b",
+                    "externalKey" : "d0e5285"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-2"
-                      }
+                      "globalKey" : "aa"
                     }
-                  }
-                },
-                "resetDates" : {
-                  "calculationPeriodDatesReference" : {
-                    "externalReference" : "d0e5285",
-                    "globalReference" : "40e712a7"
                   },
-                  "fixingDates" : {
-                    "meta" : {
-                      "globalKey" : "7a0be805"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                  "firstPaymentDate" : "2018-06-21",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
-                      } ],
+                      }, {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "EUTA"
+                      } ],
                       "meta" : {
-                        "globalKey" : "21479e"
+                        "globalKey" : "81e33772"
                       }
                     },
-                    "businessDayConvention" : "NONE",
-                    "dateRelativeTo" : {
-                      "externalReference" : "d0e5632",
-                      "globalReference" : "e5f7a672"
+                    "meta" : {
+                      "globalKey" : "5865eac3"
                     }
                   },
                   "meta" : {
-                    "externalKey" : "d0e5632",
-                    "globalKey" : "e5f7a672"
+                    "globalKey" : "4c3bd2be"
+                  }
+                },
+                "resetDates" : {
+                  "calculationPeriodDatesReference" : {
+                    "globalReference" : "a071381b",
+                    "externalReference" : "d0e5285"
                   },
-                  "resetDatesAdjustments" : {
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
+                  "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "56e7d2b9"
+                    },
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -399,147 +361,171 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "365c4b6f"
+                    "dateRelativeTo" : {
+                      "globalReference" : "df6d6ea4",
+                      "externalReference" : "d0e5632"
                     }
                   },
                   "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
+                      }
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "meta" : {
+                      "globalKey" : "365c4b6f"
+                    }
                   },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "df6d6ea4",
+                    "externalKey" : "d0e5632"
+                  }
+                },
+                "compoundingMethod" : "None",
+                "cashflowRepresentation" : {
+                  "cashflowsMatchParameters" : false
+                },
+                "meta" : {
+                  "globalKey" : "3ac114db"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "fixed_notional_schedule",
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "fixed_notional_schedule"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : true,
                   "initialPayment" : true,
+                  "finalPayment" : true,
                   "intermediatePayment" : true,
-                  "meta" : {
-                    "globalKey" : "effdde8d"
-                  },
                   "principalPaymentSchedule" : {
-                    "finalPrincipalPayment" : {
-                      "meta" : {
-                        "globalKey" : "aa2089fd"
+                    "initialPrincipalPayment" : {
+                      "principalPaymentDate" : {
+                        "adjustedDate" : {
+                          "value" : "2018-03-21",
+                          "meta" : {
+                            "globalKey" : "3f10d5"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
                       },
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "principalAmount" : {
+                        "value" : 1650,
                         "unit" : {
                           "currency" : {
                             "value" : "EUR"
                           }
                         },
-                        "value" : 1650,
                         "meta" : {
                           "globalKey" : "7f38c622"
                         }
                       },
+                      "meta" : {
+                        "globalKey" : "3da65fc1"
+                      }
+                    },
+                    "finalPrincipalPayment" : {
                       "principalPaymentDate" : {
                         "adjustedDate" : {
+                          "value" : "2023-03-21",
                           "meta" : {
                             "globalKey" : "3f38d5"
-                          },
-                          "value" : "2023-03-21"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "0"
                         }
-                      }
-                    },
-                    "initialPrincipalPayment" : {
-                      "meta" : {
-                        "globalKey" : "7725985f"
                       },
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "principalAmount" : {
+                        "value" : 1650,
                         "unit" : {
                           "currency" : {
                             "value" : "EUR"
                           }
                         },
-                        "value" : 1650,
                         "meta" : {
                           "globalKey" : "7f38c622"
                         }
                       },
-                      "principalPaymentDate" : {
-                        "adjustedDate" : {
-                          "meta" : {
-                            "globalKey" : "3f10d5"
-                          },
-                          "value" : "2018-03-21"
-                        },
-                        "meta" : {
-                          "globalKey" : "0"
-                        }
+                      "meta" : {
+                        "globalKey" : "70d7c263"
                       }
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e2c87955"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "10da2"
-                  },
                   "settlementCurrency" : {
                     "value" : "EUR"
+                  },
+                  "meta" : {
+                    "globalKey" : "10da2"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "81e33772"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "5865eac3"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c48"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "21"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-03-21",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -552,33 +538,23 @@
                             "globalKey" : "81e33772"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "5865eac3"
                         }
                       },
                       "meta" : {
                         "globalKey" : "733f98e"
-                      },
-                      "unadjustedDate" : "2018-03-21"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "733f98e"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "d0e6004",
-                    "globalKey" : "40e712a7"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
-                      "adjustedDate" : {
-                        "meta" : {
-                          "globalKey" : "3f38d5"
-                        },
-                        "value" : "2023-03-21"
-                      },
+                      "unadjustedDate" : "2023-03-21",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -591,38 +567,26 @@
                             "globalKey" : "81e33772"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "5865eac3"
                         }
                       },
+                      "adjustedDate" : {
+                        "value" : "2023-03-21",
+                        "meta" : {
+                          "globalKey" : "3f38d5"
+                        }
+                      },
                       "meta" : {
                         "globalKey" : "80e0d18e"
-                      },
-                      "unadjustedDate" : "2023-03-21"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "80e0d18e"
                     }
-                  }
-                },
-                "cashflowRepresentation" : {
-                  "cashflowsMatchParameters" : false
-                },
-                "compoundingMethod" : "NONE",
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "98104154"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2018-06-21",
-                  "meta" : {
-                    "globalKey" : "b7434d18"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -635,52 +599,69 @@
                         "globalKey" : "81e33772"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "5865eac3"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "17f74"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "rollConvention" : "21"
+                  },
+                  "meta" : {
+                    "globalKey" : "a071381b",
+                    "externalKey" : "d0e6004"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2018-06-21",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "81e33772"
                       }
                     },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "5865eac3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "4c3bd2be"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "d0e6004",
-                    "globalReference" : "40e712a7"
+                    "globalReference" : "a071381b",
+                    "externalReference" : "d0e6004"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "77b1cd1c"
+                      "globalKey" : "548db7d0"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -689,17 +670,20 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "d0e6350",
-                      "globalReference" : "11b33b8e"
+                      "globalReference" : "541e671e",
+                      "externalReference" : "d0e6350"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "d0e6350",
-                    "globalKey" : "11b33b8e"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -708,202 +692,218 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "541e671e",
+                    "externalKey" : "d0e6350"
+                  }
+                },
+                "compoundingMethod" : "None",
+                "cashflowRepresentation" : {
+                  "cashflowsMatchParameters" : false
+                },
+                "meta" : {
+                  "globalKey" : "1f419ce0"
                 }
               } ],
               "meta" : {
-                "globalKey" : "30d370eb"
+                "globalKey" : "4e7f7025"
               }
             }
           },
           "meta" : {
-            "globalKey" : "d5435228"
+            "globalKey" : "d37a21c8"
           }
         },
         "meta" : {
-          "globalKey" : "d5435228"
+          "globalKey" : "d37a21c8"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "87d3e96"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d05"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-2"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
-                  },
-                  "value" : "USD-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 3
+          "quantity" : [ {
+            "value" : {
+              "value" : 2034.95,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
                 }
               }
-            }
-          },
-          "quantity" : [ {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 2034.95
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a32841c"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e0e"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
-                  },
-                  "value" : "EUR-EURIBOR-Telerate"
+                  }
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-2"
+                } ]
               }
+            },
+            "meta" : {
+              "globalKey" : "828026c7"
             }
           },
+          "meta" : {
+            "globalKey" : "65740442"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : -0.0045,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : -0.0045,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 1650,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EURIBOR-Telerate",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
+                  }
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 3,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
+                }
               },
-              "value" : 1650
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2bba16de"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "32dc2920"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "tradeDate",
-        "globalKey" : "3f10d3"
-      },
-      "value" : "2018-03-19"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/usi"
-          },
-          "value" : "DRTY123456"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
-        },
-        "value" : "1031234567"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "c43bc131"
-      },
-      "identifierType" : "UNIQUE_SWAP_IDENTIFIER"
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "54930084UKLVMY22DS16"
+      "name" : {
+        "value" : "Party B"
       },
       "meta" : {
-        "globalKey" : "335bf1d6"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "37f10bdb"
+    }
+  },
+  "meta" : {
+    "globalKey" : "37f10bdb"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex01-vanilla-swap-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex01-vanilla-swap-versioned.json
index 6478021f54..765cdbdece 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex01-vanilla-swap-versioned.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex01-vanilla-swap-versioned.json
@@ -1,63 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "9077923b"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "9077923b"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "a82d45fc"
-      },
-      "name" : {
-        "value" : "Party A"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "ca05a501",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "SW2000",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "PARTYAUS33"
+            "scheme" : "http://www.barclays.com/swaps/trade-id"
+          }
         },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "3d5ebc15"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "ca05a501"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "BARCGB2L"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "ca05a501"
-        }
-      } ]
+        "globalKey" : "ac670cef"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "1994-12-12",
+      "meta" : {
+        "globalKey" : "3e530c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "a82d45fc"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ca05a501"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -68,46 +35,40 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c89"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -116,103 +77,108 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "3e2554c0"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "DEFR"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "1ff50d"
+                            "globalKey" : "1ff50d",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365af8de"
                         }
                       },
                       "meta" : {
                         "globalKey" : "a8d53690"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "a8d53690"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "97763931"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa45fc6"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "18a9b"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "a26405d2",
+                    "externalKey" : "floatingCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "7a04f180"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "3e2554c0"
+                    "globalReference" : "a26405d2",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "131ae8a2"
+                      "globalKey" : "eff6d356"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -221,82 +187,79 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "dbde664a"
+                      "globalReference" : "a5aeeeb8",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "dbde664a"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "a5aeeeb8",
+                    "externalKey" : "resetDates"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "2e03d8ab"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b8fa"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30E/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -305,233 +268,270 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "faa5b75e"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "1ff50d"
+                            "globalReference" : "1ff50d",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "93c845ff"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "93c845ff"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30E/360"
-                },
-                "meta" : {
-                  "globalKey" : "f8158737"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa46135"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "1794a"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "9249d1f2",
+                    "externalKey" : "fixedCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "85fff0af"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "9c789d4b"
                 }
               } ],
               "meta" : {
-                "globalKey" : "4f3ab328"
+                "globalKey" : "eee37036"
               }
             }
           },
           "meta" : {
-            "globalKey" : "4f3ab328"
+            "globalKey" : "eee37036"
           }
         },
         "meta" : {
-          "globalKey" : "4f3ab328"
+          "globalKey" : "eee37036"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3ce21b9b"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "53c66a4c"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-LIBOR-BBA"
-                },
-                "indexTenor" : {
+          "quantity" : [ {
+            "value" : {
+              "value" : 50000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR",
                   "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                  }
                 }
               }
-            }
-          },
-          "quantity" : [ {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                    "globalKey" : "107"
+                  }
                 }
               },
-              "value" : 50000000.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2505dd46"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "4882fcbc"
           },
+          "meta" : {
+            "globalKey" : "c0d07bed"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "value" : 0.06,
               "perUnitOf" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000.00,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
-              },
-              "value" : 50000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "c7dc9ac4"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "9495a03c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "ca05a501",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e530c"
-      },
-      "value" : "1994-12-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "PARTYAUS33",
           "meta" : {
-            "scheme" : "http://www.barclays.com/swaps/trade-id"
-          },
-          "value" : "SW2000"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
         },
-        "version" : 1
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "3d5ebc15"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "ca05a501"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "c506462f"
+        "globalKey" : "9495a03c",
+        "externalKey" : "party1"
       }
-    } ]
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "BARCGB2L",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "ca05a501"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "ca05a501",
+        "externalKey" : "party2"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "ab0648b"
+    }
+  },
+  "meta" : {
+    "globalKey" : "ab0648b"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex02-stub-amort-swap-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex02-stub-amort-swap-versioned.json
index 2a7adbf676..e445bf79c2 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex02-stub-amort-swap-versioned.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex02-stub-amort-swap-versioned.json
@@ -1,63 +1,46 @@
 {
-  "meta" : {
-    "globalKey" : "6a9e6664"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "6a9e6664"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "a82d45fc"
-      },
-      "name" : {
-        "value" : "Party A"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "9495a03c",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "TW9235",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "PARTYAUS33"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "3d5ebc15"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "ca05a501"
+        "globalKey" : "29b63a53"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "ca05a501",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "SW2000",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "BARCGB2L"
+            "scheme" : "http://www.barclays.com/swaps/trade-id"
+          }
         },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "ca05a501"
-        }
-      } ]
+        "version" : 1
+      } ],
+      "meta" : {
+        "globalKey" : "ac670cef"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "1994-12-12",
+      "meta" : {
+        "globalKey" : "3e530c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "a82d45fc"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ca05a501"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -68,46 +51,40 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c89"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1995-01-16",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -116,43 +93,148 @@
                       },
                       "meta" : {
                         "globalKey" : "ea2e2b88"
-                      },
-                      "unadjustedDate" : "1995-01-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea2e2b88"
                     }
                   },
-                  "firstRegularPeriodStartDate" : "1995-06-14",
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "9c21ca90"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "DEFR"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "1ff50d"
+                            "globalKey" : "1ff50d",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365af8de"
                         }
                       },
                       "meta" : {
                         "globalKey" : "a8d53690"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "a8d53690"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "firstRegularPeriodStartDate" : "1995-06-14",
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18a9b"
+                    },
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "6d5c05e",
+                    "externalKey" : "floatingCalcPeriodDates"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "firstPaymentDate" : "1995-06-14",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "e89777b2"
+                  }
+                },
+                "resetDates" : {
+                  "calculationPeriodDatesReference" : {
+                    "globalReference" : "6d5c05e",
+                    "externalReference" : "floatingCalcPeriodDates"
+                  },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
+                  "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "eff6d356"
+                    },
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
+                      }
+                    },
+                    "dateRelativeTo" : {
+                      "globalReference" : "a5aeeeb8",
+                      "externalReference" : "resetDates"
+                    }
+                  },
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "a5aeeeb8",
+                    "externalKey" : "resetDates"
                   }
                 },
                 "cashflowRepresentation" : {
@@ -160,396 +242,293 @@
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "1995-06-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1995-06-14",
                       "adjustedStartDate" : "1995-01-16",
+                      "adjustedEndDate" : "1995-06-14",
                       "meta" : {
-                        "globalKey" : "c448d4ce"
+                        "globalKey" : "2cf04f92"
                       },
+                      "notionalAmount" : 50000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1995-01-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78cb135"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 50000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "af13c05c"
+                      "globalKey" : "17bb3b20"
                     }
                   }, {
                     "adjustedPaymentDate" : "1995-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1995-12-14",
                       "adjustedStartDate" : "1995-06-14",
+                      "adjustedEndDate" : "1995-12-14",
                       "meta" : {
-                        "globalKey" : "3c46f290"
+                        "globalKey" : "7232ff90"
                       },
+                      "notionalAmount" : 50000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1995-06-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78cd7f5"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 50000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "8db85f9e"
+                      "globalKey" : "c3a46c9e"
                     }
                   }, {
                     "adjustedPaymentDate" : "1996-06-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1996-06-14",
                       "adjustedStartDate" : "1995-12-14",
+                      "adjustedEndDate" : "1996-06-14",
                       "meta" : {
-                        "globalKey" : "9c5b90b1"
+                        "globalKey" : "db5a73b1"
                       },
+                      "notionalAmount" : 40000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1995-12-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78d0675"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 40000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "aa9e843f"
+                      "globalKey" : "e99d673f"
                     }
                   }, {
                     "adjustedPaymentDate" : "1996-12-16",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1996-12-16",
                       "adjustedStartDate" : "1996-06-14",
+                      "adjustedEndDate" : "1996-12-16",
                       "meta" : {
-                        "globalKey" : "7701bbb3"
+                        "globalKey" : "468b036f"
                       },
+                      "notionalAmount" : 40000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1996-06-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78dcff5"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 40000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "14740ec3"
+                      "globalKey" : "e3fd567f"
                     }
                   }, {
                     "adjustedPaymentDate" : "1997-06-16",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1997-06-16",
                       "adjustedStartDate" : "1996-12-16",
+                      "adjustedEndDate" : "1997-06-16",
                       "meta" : {
-                        "globalKey" : "da800b12"
+                        "globalKey" : "197eee12"
                       },
+                      "notionalAmount" : 30000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1996-12-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78dfe75"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 30000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "34c3e4a2"
+                      "globalKey" : "73c2c7a2"
                     }
                   }, {
                     "adjustedPaymentDate" : "1997-12-15",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1997-12-15",
                       "adjustedStartDate" : "1997-06-16",
+                      "adjustedEndDate" : "1997-12-15",
                       "meta" : {
-                        "globalKey" : "16738451"
+                        "globalKey" : "7f90f3f3"
                       },
+                      "notionalAmount" : 30000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1997-06-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78ec7f5"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 30000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "43197060"
+                      "globalKey" : "ac36e002"
                     }
                   }, {
                     "adjustedPaymentDate" : "1998-06-15",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1998-06-15",
                       "adjustedStartDate" : "1997-12-15",
+                      "adjustedEndDate" : "1998-06-15",
                       "meta" : {
-                        "globalKey" : "74d349b4"
+                        "globalKey" : "b3d22cb4"
                       },
+                      "notionalAmount" : 20000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1997-12-11",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78ef656"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 20000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "5e4abc43"
+                      "globalKey" : "9d499f43"
                     }
                   }, {
                     "adjustedPaymentDate" : "1998-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1998-12-14",
                       "adjustedStartDate" : "1998-06-15",
+                      "adjustedEndDate" : "1998-12-14",
                       "meta" : {
-                        "globalKey" : "b0c6c2f3"
+                        "globalKey" : "19e43295"
                       },
+                      "notionalAmount" : 20000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1998-06-11",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78fbfd6"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 20000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "6ca04801"
+                      "globalKey" : "d5bdb7a3"
                     }
                   }, {
                     "adjustedPaymentDate" : "1999-06-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1999-06-14",
                       "adjustedStartDate" : "1998-12-14",
+                      "adjustedEndDate" : "1999-06-14",
                       "meta" : {
-                        "globalKey" : "f268856"
+                        "globalKey" : "4e256b56"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1998-12-10",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78fee37"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "87d193e4"
+                      "globalKey" : "c6d076e4"
                     }
                   }, {
                     "adjustedPaymentDate" : "1999-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1999-12-14",
                       "adjustedStartDate" : "1999-06-14",
+                      "adjustedEndDate" : "1999-12-14",
                       "meta" : {
-                        "globalKey" : "80003cd6"
+                        "globalKey" : "b5ec49d6"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1999-06-10",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "790b7b7"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "5f51c9e4"
+                      "globalKey" : "953dd6e4"
                     }
                   } ]
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "8e9e1c0e"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "1995-06-14",
-                  "meta" : {
-                    "globalKey" : "be36e5f8"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
-                  }
-                },
-                "resetDates" : {
-                  "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "9c21ca90"
-                  },
-                  "fixingDates" : {
-                    "meta" : {
-                      "globalKey" : "131ae8a2"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
-                      }
-                    },
-                    "businessDayConvention" : "NONE",
-                    "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "dbde664a"
-                    }
-                  },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "dbde664a"
-                  },
-                  "resetDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
-                },
                 "stubPeriod" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "9c21ca90"
+                    "globalReference" : "6d5c05e",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
                   "initialStub" : {
                     "floatingRate" : [ {
                       "floatingRateIndex" : "EUR-LIBOR-BBA",
                       "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "957"
-                        },
+                        "periodMultiplier" : 4,
                         "period" : "M",
-                        "periodMultiplier" : 4
+                        "meta" : {
+                          "globalKey" : "c9"
+                        }
                       }
                     }, {
                       "floatingRateIndex" : "EUR-LIBOR-BBA",
                       "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "958"
-                        },
+                        "periodMultiplier" : 5,
                         "period" : "M",
-                        "periodMultiplier" : 5
+                        "meta" : {
+                          "globalKey" : "e8"
+                        }
                       }
                     } ]
                   }
+                },
+                "meta" : {
+                  "globalKey" : "6a276c68"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b8fa"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30E/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1995-01-16",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -558,43 +537,94 @@
                       },
                       "meta" : {
                         "globalKey" : "ea2e2b88"
-                      },
-                      "unadjustedDate" : "1995-01-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea2e2b88"
                     }
                   },
-                  "firstRegularPeriodStartDate" : "1995-12-14",
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "a3080eae"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "1ff50d"
+                            "globalReference" : "1ff50d",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "93c845ff"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "93c845ff"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "firstRegularPeriodStartDate" : "1995-12-14",
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "1794a"
+                    },
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "41216dfe",
+                    "externalKey" : "fixedCalcPeriodDates"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
+                  },
+                  "firstPaymentDate" : "1995-12-14",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "62bc2561"
                   }
                 },
                 "cashflowRepresentation" : {
@@ -602,331 +632,301 @@
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "1995-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1995-12-14",
                       "adjustedStartDate" : "1995-01-16",
+                      "adjustedEndDate" : "1995-12-14",
                       "meta" : {
-                        "globalKey" : "696aad9"
+                        "globalKey" : "ad836cc7"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 50000000.00
+                      "notionalAmount" : 50000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "ddfd088b"
+                      "globalKey" : "84e9ca79"
                     }
                   }, {
                     "adjustedPaymentDate" : "1996-12-16",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1996-12-16",
                       "adjustedStartDate" : "1995-12-14",
+                      "adjustedEndDate" : "1996-12-16",
                       "meta" : {
-                        "globalKey" : "a263a9f6"
+                        "globalKey" : "1a9c29ca"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 40000000.00
+                      "notionalAmount" : 40000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "23f8b0e6"
+                      "globalKey" : "9c3130ba"
                     }
                   }, {
                     "adjustedPaymentDate" : "1997-12-15",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1997-12-15",
                       "adjustedStartDate" : "1996-12-16",
+                      "adjustedEndDate" : "1997-12-15",
                       "meta" : {
-                        "globalKey" : "3e43103a"
+                        "globalKey" : "8a199fc6"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 30000000.00
+                      "notionalAmount" : 30000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "64e8368b"
+                      "globalKey" : "b0bec617"
                     }
                   }, {
                     "adjustedPaymentDate" : "1998-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1998-12-14",
                       "adjustedStartDate" : "1997-12-15",
+                      "adjustedEndDate" : "1998-12-14",
                       "meta" : {
-                        "globalKey" : "da226b3b"
+                        "globalKey" : "f995b8a5"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 20000000.00
+                      "notionalAmount" : 20000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "a5d7b0ed"
+                      "globalKey" : "c54afe57"
                     }
                   }, {
                     "adjustedPaymentDate" : "1999-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1999-12-14",
                       "adjustedStartDate" : "1998-12-14",
+                      "adjustedEndDate" : "1999-12-14",
                       "meta" : {
-                        "globalKey" : "76023a9b"
+                        "globalKey" : "6911d545"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 10000000.00
+                      "notionalAmount" : 10000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "e87c784d"
+                      "globalKey" : "db8c12f7"
                     }
                   } ]
                 },
-                "dayCountFraction" : {
-                  "value" : "30E/360"
-                },
                 "meta" : {
-                  "globalKey" : "7e082468"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "1995-12-14",
-                  "meta" : {
-                    "globalKey" : "2c6095e7"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "c93056fc"
                 }
               } ],
               "meta" : {
-                "globalKey" : "2479561a"
+                "globalKey" : "9ac18794"
               }
             }
           },
           "meta" : {
-            "globalKey" : "2479561a"
+            "globalKey" : "9ac18794"
           }
         },
         "meta" : {
-          "globalKey" : "2479561a"
+          "globalKey" : "9ac18794"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "ce4c2099"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "53c66a4c"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
-              }
-            }
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 50000000.00,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "value" : 50000000.00,
               "datedValue" : [ {
                 "date" : "1995-12-14",
+                "value" : 40000000.00,
                 "meta" : {
                   "globalKey" : "6118d22e"
-                },
-                "value" : 40000000.00
+                }
               }, {
                 "date" : "1996-12-14",
+                "value" : 30000000.00,
                 "meta" : {
                   "globalKey" : "f9389d4f"
-                },
-                "value" : 30000000.00
+                }
               }, {
                 "date" : "1997-12-14",
+                "value" : 20000000.00,
                 "meta" : {
                   "globalKey" : "91586870"
-                },
-                "value" : 20000000.00
+                }
               }, {
                 "date" : "1998-12-14",
+                "value" : 10000000.00,
                 "meta" : {
                   "globalKey" : "29783391"
-                },
-                "value" : 10000000.00
+                }
               } ]
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "5187583a"
-          },
-          "price" : [ {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-1"
+                "value" : "quantity-1"
               } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
             },
+            "meta" : {
+              "globalKey" : "2505dd46"
+            }
+          },
+          "meta" : {
+            "globalKey" : "1b0c096b"
+          }
+        }, {
+          "price" : [ {
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "value" : 0.06,
               "perUnitOf" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000.00,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "value" : 50000000.00,
               "datedValue" : [ {
                 "date" : "1995-12-14",
+                "value" : 40000000.00,
                 "meta" : {
                   "globalKey" : "6118d22e"
-                },
-                "value" : 40000000.00
+                }
               }, {
                 "date" : "1996-12-14",
+                "value" : 30000000.00,
                 "meta" : {
                   "globalKey" : "f9389d4f"
-                },
-                "value" : 30000000.00
+                }
               }, {
                 "date" : "1997-12-14",
+                "value" : 20000000.00,
                 "meta" : {
                   "globalKey" : "91586870"
-                },
-                "value" : 20000000.00
+                }
               }, {
                 "date" : "1998-12-14",
+                "value" : 10000000.00,
                 "meta" : {
                   "globalKey" : "29783391"
-                },
-                "value" : 10000000.00
+                }
+              } ]
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
               } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "df63af06"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "9495a03c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "ca05a501",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e530c"
-      },
-      "value" : "1994-12-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "PARTYAUS33",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "TW9235"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "3d5ebc15"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "a82d45fc"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "38e8e6c9"
+        "globalKey" : "9495a03c",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BARCGB2L",
           "meta" : {
-            "scheme" : "http://www.barclays.com/swaps/trade-id"
-          },
-          "value" : "SW2000"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
         },
-        "version" : 1
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "ca05a501"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "ca05a501"
-      },
       "meta" : {
-        "globalKey" : "c506462f"
+        "globalKey" : "ca05a501",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "105d9e3e"
+    }
+  },
+  "meta" : {
+    "globalKey" : "105d9e3e"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex03-compound-swap-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex03-compound-swap-versioned.json
index 477818eba8..b25ae4fe06 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex03-compound-swap-versioned.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex03-compound-swap-versioned.json
@@ -1,60 +1,31 @@
 {
-  "meta" : {
-    "globalKey" : "e00ebd9"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "e00ebd9"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "91d46817"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "caae6d7f",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56323",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "PartyA"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "91d46817"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "caae6d7f"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "MSLNGB2XSWP"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "caae6d7f"
-        }
-      } ]
+        "globalKey" : "1ce78f40",
+        "externalKey" : "tr2345"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-04-25",
+      "meta" : {
+        "globalKey" : "3e8119"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "caae6d7f"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "91d46817"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,46 +36,44 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "calculationPeriodFrequency" : {
                     "meta" : {
-                      "globalKey" : "28c4e"
+                      "globalKey" : "5c38cb89"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "27"
-                  },
+                    "finalRateRounding" : {
+                      "roundingDirection" : "Nearest",
+                      "precision" : 7
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2000-04-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -113,20 +82,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eac74d93"
-                      },
-                      "unadjustedDate" : "2000-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eac74d93"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "21daa179"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2002-04-27",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -134,381 +100,440 @@
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "42f910b"
+                            "globalKey" : "42f910b",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b8e49c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "f4e4ef21"
-                      },
-                      "unadjustedDate" : "2002-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "f4e4ef21"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f7a"
+                    },
+                    "rollConvention" : "27"
+                  },
+                  "meta" : {
+                    "globalKey" : "c239cad3",
+                    "externalKey" : "floatingCalcPeriodDates"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
+                    },
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "f571e5df"
+                  }
+                },
+                "resetDates" : {
+                  "calculationPeriodDatesReference" : {
+                    "globalReference" : "c239cad3",
+                    "externalReference" : "floatingCalcPeriodDates"
+                  },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
+                  "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "eff6d356"
+                    },
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
+                      }
+                    },
+                    "dateRelativeTo" : {
+                      "globalReference" : "6fc3cf5",
+                      "externalReference" : "resetDates"
+                    }
+                  },
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "6fc3cf5",
+                    "externalKey" : "resetDates"
                   }
                 },
+                "compoundingMethod" : "Flat",
                 "cashflowRepresentation" : {
                   "cashflowsMatchParameters" : true,
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "2000-11-03",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2000-07-27",
                       "adjustedStartDate" : "2000-04-27",
+                      "adjustedEndDate" : "2000-07-27",
                       "meta" : {
-                        "globalKey" : "c3ac6219"
+                        "globalKey" : "5ea26899"
                       },
+                      "notionalAmount" : 100000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2000-04-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "791a208"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000.00
+                      }
                     }, {
-                      "adjustedEndDate" : "2000-10-27",
                       "adjustedStartDate" : "2000-07-27",
+                      "adjustedEndDate" : "2000-10-27",
                       "meta" : {
-                        "globalKey" : "b7fb6159"
+                        "globalKey" : "52f167d9"
                       },
+                      "notionalAmount" : 100000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2000-07-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "791b948"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "8b58bde3"
+                      "globalKey" : "a23c6de3"
                     }
                   }, {
                     "adjustedPaymentDate" : "2001-05-04",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2001-01-29",
                       "adjustedStartDate" : "2000-10-27",
+                      "adjustedEndDate" : "2001-01-29",
                       "meta" : {
-                        "globalKey" : "953f1c1b"
+                        "globalKey" : "d2e53357"
                       },
+                      "notionalAmount" : 100000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2000-10-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "791d088"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000.00
+                      }
                     }, {
-                      "adjustedEndDate" : "2001-04-27",
                       "adjustedStartDate" : "2001-01-29",
+                      "adjustedEndDate" : "2001-04-27",
                       "meta" : {
-                        "globalKey" : "ab670c17"
+                        "globalKey" : "acbfd7db"
                       },
+                      "notionalAmount" : 100000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2001-01-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "79282c8"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "301bace0"
+                      "globalKey" : "dd05e8"
                     }
                   }, {
                     "adjustedPaymentDate" : "2001-11-05",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2001-07-27",
                       "adjustedStartDate" : "2001-04-27",
+                      "adjustedEndDate" : "2001-07-27",
                       "meta" : {
-                        "globalKey" : "9c4c5a19"
+                        "globalKey" : "37426099"
                       },
+                      "notionalAmount" : 100000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2001-04-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "7929a08"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000.00
+                      }
                     }, {
-                      "adjustedEndDate" : "2001-10-29",
                       "adjustedStartDate" : "2001-07-27",
+                      "adjustedEndDate" : "2001-10-29",
                       "meta" : {
-                        "globalKey" : "fa67cfdb"
+                        "globalKey" : "2efb1117"
                       },
+                      "notionalAmount" : 100000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2001-07-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "792b148"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "e801f867"
+                      "globalKey" : "9882e323"
                     }
                   }, {
                     "adjustedPaymentDate" : "2002-05-06",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2002-01-29",
                       "adjustedStartDate" : "2001-10-29",
+                      "adjustedEndDate" : "2002-01-29",
                       "meta" : {
-                        "globalKey" : "7148c559"
+                        "globalKey" : "1551a1d9"
                       },
+                      "notionalAmount" : 100000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2001-10-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "792c888"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000.00
+                      }
                     }, {
-                      "adjustedEndDate" : "2002-04-29",
                       "adjustedStartDate" : "2002-01-29",
+                      "adjustedEndDate" : "2002-04-29",
                       "meta" : {
-                        "globalKey" : "edd37a99"
+                        "globalKey" : "88c98119"
                       },
+                      "notionalAmount" : 100000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2002-01-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "7937ac8"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "69caf466"
+                      "globalKey" : "badf0e66"
                     }
                   } ]
                 },
-                "compoundingMethod" : "FLAT",
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
                 "meta" : {
-                  "globalKey" : "17a48acd"
+                  "globalKey" : "65578d2f"
+                }
+              }, {
+                "payerReceiver" : {
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "dd339947"
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf9f"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "979ebd17"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "finalRateRounding" : {
-                      "precision" : 7,
-                      "roundingDirection" : "NEAREST"
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   }
                 },
-                "resetDates" : {
-                  "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "21daa179"
-                  },
-                  "fixingDates" : {
-                    "meta" : {
-                      "globalKey" : "131ae8a2"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
+                  "effectiveDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2000-04-27",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "NONE",
+                        "meta" : {
+                          "globalKey" : "24a738"
+                        }
+                      },
                       "meta" : {
-                        "globalKey" : "21479e"
+                        "globalKey" : "eac74d93"
                       }
                     },
-                    "businessDayConvention" : "NONE",
-                    "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "dbde6647"
+                    "meta" : {
+                      "globalKey" : "eac74d93"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "dbde6647"
-                  },
-                  "resetDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2002-04-27",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "42f910b",
+                            "externalReference" : "primaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "eb13047c"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "214e084d"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "eb13047c"
+                        "globalKey" : "3494f012"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "3494f012"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
-                }
-              }, {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
                   "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
                   "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "28cab"
+                      "globalKey" : "18abd"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
                     "rollConvention" : "27"
                   },
-                  "effectiveDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "NONE",
-                        "meta" : {
-                          "globalKey" : "24a738"
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "eac74d93"
-                      },
-                      "unadjustedDate" : "2000-04-27"
-                    },
+                  "meta" : {
+                    "globalKey" : "d54cd385",
+                    "externalKey" : "fixedCalcPeriodDates"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "eac74d93"
+                      "globalKey" : "107"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "7115972d"
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
+                    },
+                    "dayType" : "Business"
                   },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "42f910b"
-                          },
-                          "meta" : {
-                            "globalKey" : "eb13047c"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "214e084d"
-                        }
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
-                        "globalKey" : "3494f012"
-                      },
-                      "unadjustedDate" : "2002-04-27"
+                        "globalKey" : "eb13047c"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "3494f012"
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f571e5df"
                   }
                 },
                 "cashflowRepresentation" : {
@@ -516,247 +541,222 @@
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "2000-11-03",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2000-10-27",
                       "adjustedStartDate" : "2000-04-27",
+                      "adjustedEndDate" : "2000-10-27",
                       "meta" : {
-                        "globalKey" : "ac8b1251"
+                        "globalKey" : "f1cc728f"
                       },
-                      "fixedRate" : 0.0585,
-                      "notionalAmount" : 100000000.00
+                      "notionalAmount" : 100000000.00,
+                      "fixedRate" : 0.0585
                     } ],
                     "meta" : {
-                      "globalKey" : "45ced16e"
+                      "globalKey" : "8b1031ac"
                     }
                   }, {
                     "adjustedPaymentDate" : "2001-05-04",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2001-04-27",
                       "adjustedStartDate" : "2000-10-27",
+                      "adjustedEndDate" : "2001-04-27",
                       "meta" : {
-                        "globalKey" : "af851d51"
+                        "globalKey" : "f293678f"
                       },
-                      "fixedRate" : 0.0585,
-                      "notionalAmount" : 100000000.00
+                      "notionalAmount" : 100000000.00,
+                      "fixedRate" : 0.0585
                     } ],
                     "meta" : {
-                      "globalKey" : "61fdbe8d"
+                      "globalKey" : "a50c08cb"
                     }
                   }, {
                     "adjustedPaymentDate" : "2001-11-05",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2001-10-29",
                       "adjustedStartDate" : "2001-04-27",
+                      "adjustedEndDate" : "2001-10-29",
                       "meta" : {
-                        "globalKey" : "b04cfb0f"
+                        "globalKey" : "f58d7a11"
                       },
-                      "fixedRate" : 0.0585,
-                      "notionalAmount" : 100000000.00
+                      "notionalAmount" : 100000000.00,
+                      "fixedRate" : 0.0585
                     } ],
                     "meta" : {
-                      "globalKey" : "f3bf636a"
+                      "globalKey" : "38ffe26c"
                     }
                   }, {
                     "adjustedPaymentDate" : "2002-05-06",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2002-04-29",
                       "adjustedStartDate" : "2001-10-29",
+                      "adjustedEndDate" : "2002-04-29",
                       "meta" : {
-                        "globalKey" : "b3470d91"
+                        "globalKey" : "f65557cf"
                       },
-                      "fixedRate" : 0.0585,
-                      "notionalAmount" : 100000000.00
+                      "notionalAmount" : 100000000.00,
+                      "fixedRate" : 0.0585
                     } ],
                     "meta" : {
-                      "globalKey" : "fee580b"
+                      "globalKey" : "52fca249"
                     }
                   } ]
                 },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
                 "meta" : {
-                  "globalKey" : "a8a4c4c4"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "dd339947"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf9f"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "721ab9b6"
                 }
               } ],
               "meta" : {
-                "globalKey" : "3fd59c11"
+                "globalKey" : "36880065"
               }
             }
           },
           "meta" : {
-            "globalKey" : "3fd59c11"
+            "globalKey" : "36880065"
           }
         },
         "meta" : {
-          "globalKey" : "3fd59c11"
+          "globalKey" : "36880065"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7b78abf0"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d05"
+          "quantity" : [ {
+            "value" : {
+              "value" : 100000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 100000000.00
+            "meta" : {
+              "globalKey" : "828026c7"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "6637fc9e"
           },
+          "meta" : {
+            "globalKey" : "5332091c"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0585,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0585,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 100000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "60c79722"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "caae6d7f",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "91d46817",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "PartyA",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "91d46817"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e8119"
-      },
-      "value" : "2000-04-25"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "91d46817",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "MSLNGB2XSWP",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "56323"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
         },
-        "version" : 1
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "caae6d7f"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "caae6d7f"
-      },
       "meta" : {
-        "externalKey" : "tr2345",
-        "globalKey" : "176f7840"
+        "globalKey" : "caae6d7f",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "49a27fcf"
+    }
+  },
+  "meta" : {
+    "globalKey" : "49a27fcf"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex04-arrears-stepup-fee-swap-usi-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex04-arrears-stepup-fee-swap-usi-uti.json
index 0f036866c0..7ebdfcebbd 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex04-arrears-stepup-fee-swap-usi-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex04-arrears-stepup-fee-swap-usi-uti.json
@@ -1,66 +1,51 @@
 {
-  "meta" : {
-    "globalKey" : "7b986f27"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "5edc3c36"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
-      },
-      "name" : {
-        "value" : "Party A"
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "1031234567",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
+        }
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56323",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
+        "globalKey" : "1ecdb5a5"
       },
-      "name" : {
-        "value" : "Party B"
+      "identifierType" : "UniqueTransactionIdentifier"
+    }, {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+        }
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56323",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/usi"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "df285a49"
+      },
+      "identifierType" : "UniqueSwapIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2000-04-25",
+      "meta" : {
+        "globalKey" : "3e8119"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -71,46 +56,40 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c4e"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "27"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2000-04-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -119,20 +98,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eac74d93"
-                      },
-                      "unadjustedDate" : "2000-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eac74d93"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "21daa179"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2002-04-27",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -140,84 +116,92 @@
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "42f910b"
+                            "globalKey" : "42f910b",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b8e49c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "f4e4ef21"
-                      },
-                      "unadjustedDate" : "2002-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "f4e4ef21"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "d47ecdcb"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa45fc3"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "17f7a"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "rollConvention" : "27"
+                  },
+                  "meta" : {
+                    "globalKey" : "c239cad3",
+                    "externalKey" : "floatingCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "db523fbd"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "21daa179"
+                    "globalReference" : "c239cad3",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodEndDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "131ae8a2"
+                      "globalKey" : "eff6d356"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -226,73 +210,79 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "a02299ee"
+                      "globalReference" : "cb40709c",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "a02299ee"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                  "meta" : {
+                    "globalKey" : "cb40709c",
+                    "externalKey" : "resetDates"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eef309cd"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessDayConvention" : "NONE",
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "24a738"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28cab"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "27"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2000-04-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -301,295 +291,305 @@
                       },
                       "meta" : {
                         "globalKey" : "eac74d93"
-                      },
-                      "unadjustedDate" : "2000-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eac74d93"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "d4794ba2"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2002-04-27",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "42f910b"
+                            "globalReference" : "42f910b",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "3494f012"
-                      },
-                      "unadjustedDate" : "2002-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "3494f012"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
+                    "meta" : {
+                      "globalKey" : "24a738"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18abd"
+                    },
+                    "rollConvention" : "27"
+                  },
+                  "meta" : {
+                    "globalKey" : "225b80da",
+                    "externalKey" : "fixedCalcPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "722df40d"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa45fc6"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "7a04f180"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                "meta" : {
+                  "globalKey" : "5b9d5263"
                 }
               } ],
               "meta" : {
-                "globalKey" : "ba9087e2"
+                "globalKey" : "21bc0bf6"
               }
             }
           },
           "meta" : {
-            "globalKey" : "ba9087e2"
+            "globalKey" : "21bc0bf6"
           }
         },
         "meta" : {
-          "globalKey" : "ba9087e2"
+          "globalKey" : "21bc0bf6"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7b78abf0"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d05"
+          "quantity" : [ {
+            "value" : {
+              "value" : 100000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 100000000.00
+            "meta" : {
+              "globalKey" : "828026c7"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "7adea1b0"
           },
+          "meta" : {
+            "globalKey" : "5332091c"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.06,
               "datedValue" : [ {
                 "date" : "2001-04-27",
+                "value" : 0.065,
                 "meta" : {
                   "globalKey" : "a4ca676"
-                },
-                "value" : 0.065
+                }
               } ],
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 100000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "e0f59450"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8119"
-      },
-      "value" : "2000-04-25"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "56323"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
-        },
-        "value" : "1031234567"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "84d7eae5"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/usi"
-          },
-          "value" : "56323"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "54930084UKLVMY22DS16"
+      "name" : {
+        "value" : "Party B"
       },
       "meta" : {
-        "globalKey" : "e108e53f"
-      },
-      "identifierType" : "UNIQUE_SWAP_IDENTIFIER"
-    } ]
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "d3064bcc"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "101cd9d"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        }
-      },
       "quantity" : {
+        "value" : 15000.00,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
         },
-        "value" : 15000.00
+        "receiverPartyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2000-04-27",
         "dateAdjustments" : {
+          "businessDayConvention" : "MODFOLLOWING",
           "businessCenters" : {
             "businessCentersReference" : {
-              "externalReference" : "primaryBusinessCenters",
-              "globalReference" : "42f910b"
+              "globalReference" : "42f910b",
+              "externalReference" : "primaryBusinessCenters"
             },
             "meta" : {
               "globalKey" : "eb13047c"
             }
           },
-          "businessDayConvention" : "MODFOLLOWING",
           "meta" : {
             "globalKey" : "214e084d"
           }
-        },
-        "unadjustedDate" : "2000-04-27"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "8095f783"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "4d8d4337"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex05-long-stub-swap-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex05-long-stub-swap-uti.json
index 1cd8be79a8..bd254d4265 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex05-long-stub-swap-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex05-long-stub-swap-uti.json
@@ -1,66 +1,32 @@
 {
-  "meta" : {
-    "globalKey" : "84df6f3f"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "84df6f3f"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
-      },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "121d7965"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
       },
-      "name" : {
-        "value" : "Party B"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "3eac3060"
+      },
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2000-04-03",
+      "meta" : {
+        "globalKey" : "3e8103"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -71,46 +37,48 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "20a71d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
-                      "globalKey" : "c10206b"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d7d"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "5"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2000-04-05",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -119,131 +87,128 @@
                       },
                       "meta" : {
                         "globalKey" : "eac6fafd"
-                      },
-                      "unadjustedDate" : "2000-04-05"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eac6fafd"
                     }
                   },
-                  "firstPeriodStartDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "NONE",
-                        "meta" : {
-                          "globalKey" : "24a738"
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "eac60abd"
-                      },
-                      "unadjustedDate" : "2000-03-05"
-                    },
-                    "meta" : {
-                      "globalKey" : "eac60abd"
-                    }
-                  },
-                  "firstRegularPeriodStartDate" : "2000-10-05",
-                  "lastRegularPeriodEndDate" : "2004-10-05",
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "dc5b058f"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2005-01-05",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "20a71d"
+                            "globalKey" : "20a71d",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "bb867de7"
-                      },
-                      "unadjustedDate" : "2005-01-05"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "bb867de7"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "dff3d312"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2000-10-05",
-                  "meta" : {
-                    "globalKey" : "fbb46e03"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
                       "globalKey" : "c10206b"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
+                  "firstPeriodStartDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2000-03-05",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "NONE",
+                        "meta" : {
+                          "globalKey" : "24a738"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "eac60abd"
+                      }
                     },
+                    "meta" : {
+                      "globalKey" : "eac60abd"
+                    }
+                  },
+                  "firstRegularPeriodStartDate" : "2000-10-05",
+                  "lastRegularPeriodEndDate" : "2004-10-05",
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
                     "period" : "M",
-                    "periodMultiplier" : 6
+                    "meta" : {
+                      "globalKey" : "2b8f"
+                    },
+                    "rollConvention" : "5"
+                  },
+                  "meta" : {
+                    "globalKey" : "fc57005",
+                    "externalKey" : "floatingCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "firstPaymentDate" : "2000-10-05",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "20a71d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
                     },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "c10206b"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "ffe28cb9"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "dc5b058f"
+                    "globalReference" : "fc57005",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "10c06461"
+                      "globalKey" : "ed9c4f15"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -252,103 +217,100 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "f5dc3e2b"
+                      "globalReference" : "997a5395",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "f5dc3e2b"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
                       "globalKey" : "c10206b"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "997a5395",
+                    "externalKey" : "resetDates"
+                  }
                 },
                 "stubPeriod" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "dc5b058f"
+                    "globalReference" : "fc57005",
+                    "externalReference" : "floatingCalcPeriodDates"
+                  },
+                  "initialStub" : {
+                    "stubRate" : 0.05125
                   },
                   "finalStub" : {
                     "floatingRate" : [ {
                       "floatingRateIndex" : "EUR-EURIBOR-Telerate",
                       "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
+                        "periodMultiplier" : 3,
                         "period" : "M",
-                        "periodMultiplier" : 3
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
                       }
                     } ]
-                  },
-                  "initialStub" : {
-                    "stubRate" : 0.05125
                   }
+                },
+                "meta" : {
+                  "globalKey" : "280c6b54"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "20a71d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
-                      "globalKey" : "c10206b"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "159ee"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "5"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2000-04-05",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -357,266 +319,304 @@
                       },
                       "meta" : {
                         "globalKey" : "eac6fafd"
-                      },
-                      "unadjustedDate" : "2000-04-05"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eac6fafd"
                     }
                   },
-                  "firstPeriodStartDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "NONE",
-                        "meta" : {
-                          "globalKey" : "24a738"
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "eac60abd"
-                      },
-                      "unadjustedDate" : "2000-03-05"
-                    },
-                    "meta" : {
-                      "globalKey" : "eac60abd"
-                    }
-                  },
-                  "firstRegularPeriodStartDate" : "2000-10-05",
-                  "lastRegularPeriodEndDate" : "2004-10-05",
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "d84fb51f"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2005-01-05",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "20a71d"
+                            "globalReference" : "20a71d",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "c10206b"
                         }
                       },
                       "meta" : {
                         "globalKey" : "a678db46"
-                      },
-                      "unadjustedDate" : "2005-01-05"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "a678db46"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "e1e3b658"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2000-10-05",
-                  "meta" : {
-                    "globalKey" : "fbb46f72"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
                       "globalKey" : "c10206b"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
+                  "firstPeriodStartDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2000-03-05",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "NONE",
+                        "meta" : {
+                          "globalKey" : "24a738"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "eac60abd"
+                      }
                     },
+                    "meta" : {
+                      "globalKey" : "eac60abd"
+                    }
+                  },
+                  "firstRegularPeriodStartDate" : "2000-10-05",
+                  "lastRegularPeriodEndDate" : "2004-10-05",
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
                     "period" : "Y",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "1a3e"
+                    },
+                    "rollConvention" : "5"
+                  },
+                  "meta" : {
+                    "globalKey" : "f93d69d3",
+                    "externalKey" : "fixedCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
+                      "globalKey" : "78"
+                    }
+                  },
+                  "firstPaymentDate" : "2000-10-05",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "20a71d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "c10206b"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "bdd8be8"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "4efba80c"
                 }
               } ],
               "meta" : {
-                "globalKey" : "a864e0ea"
+                "globalKey" : "2b1d1660"
               }
             }
           },
           "meta" : {
-            "globalKey" : "a864e0ea"
+            "globalKey" : "2b1d1660"
           }
         },
         "meta" : {
-          "globalKey" : "a864e0ea"
+          "globalKey" : "2b1d1660"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "d1e27334"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EURIBOR-Telerate"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.001,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.001,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 75000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 75000000.00
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "389ebddb"
-          },
-          "price" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-2"
+                "value" : "quantity-1"
               } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EURIBOR-Telerate"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
             },
+            "meta" : {
+              "globalKey" : "2bba2221"
+            }
+          },
+          "meta" : {
+            "globalKey" : "d218229e"
+          }
+        }, {
+          "price" : [ {
             "value" : {
+              "value" : 0.0525,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.0525,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-2"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 75000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 75000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "db38fd85"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8103"
-      },
-      "value" : "2000-04-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "54930084UKLVMY22DS16"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "335bf1d6"
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
+        }
+      } ],
+      "name" : {
+        "value" : "Party B"
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "989983d5"
+    }
+  },
+  "meta" : {
+    "globalKey" : "989983d5"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex06-xccy-swap-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex06-xccy-swap-uti.json
index 59578bff47..f543396d46 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex06-xccy-swap-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex06-xccy-swap-uti.json
@@ -1,66 +1,32 @@
 {
-  "meta" : {
-    "globalKey" : "5838fd9d"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "5838fd9d"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
-      },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "121d7965"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
       },
-      "name" : {
-        "value" : "Party B"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "3eac3060"
+      },
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "1994-12-12",
+      "meta" : {
+        "globalKey" : "3e530c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -71,118 +37,112 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : true,
                   "initialPayment" : true,
+                  "finalPayment" : true,
                   "intermediatePayment" : false,
-                  "meta" : {
-                    "globalKey" : "6322b3d"
-                  },
                   "principalPaymentSchedule" : {
-                    "finalPrincipalPayment" : {
-                      "meta" : {
-                        "globalKey" : "c7da3afa"
+                    "initialPrincipalPayment" : {
+                      "principalPaymentDate" : {
+                        "adjustedDate" : {
+                          "value" : "1994-12-14",
+                          "meta" : {
+                            "globalKey" : "3e530e"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
                       },
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "principalAmount" : {
+                        "value" : 10000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 10000000.00,
                         "meta" : {
                           "globalKey" : "d467e427"
                         }
                       },
+                      "meta" : {
+                        "globalKey" : "c606e068"
+                      }
+                    },
+                    "finalPrincipalPayment" : {
                       "principalPaymentDate" : {
                         "adjustedDate" : {
+                          "value" : "1999-12-14",
                           "meta" : {
                             "globalKey" : "3e7b0e"
-                          },
-                          "value" : "1999-12-14"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "0"
                         }
-                      }
-                    },
-                    "initialPrincipalPayment" : {
-                      "meta" : {
-                        "globalKey" : "fad52c98"
                       },
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "principalAmount" : {
+                        "value" : 10000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 10000000.00,
                         "meta" : {
                           "globalKey" : "d467e427"
                         }
                       },
-                      "principalPaymentDate" : {
-                        "adjustedDate" : {
-                          "meta" : {
-                            "globalKey" : "3e530e"
-                          },
-                          "value" : "1994-12-14"
-                        },
-                        "meta" : {
-                          "globalKey" : "0"
-                        }
+                      "meta" : {
+                        "globalKey" : "92d57dc6"
                       }
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "36d9b059"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "814e2ae6"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c89"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -191,20 +151,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "79667919"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -214,23 +171,130 @@
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "814e2ae6"
+                            "globalKey" : "814e2ae6",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "57d0de37"
                         }
                       },
                       "meta" : {
                         "globalKey" : "62b0f2e9"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "62b0f2e9"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "814e2ae6",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18a9b"
+                    },
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "72249099",
+                    "externalKey" : "floatingCalcPeriodDates"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "814e2ae6",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "7a04f180"
+                  }
+                },
+                "resetDates" : {
+                  "calculationPeriodDatesReference" : {
+                    "globalReference" : "72249099",
+                    "externalReference" : "floatingCalcPeriodDates"
+                  },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
+                  "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "eff6d356"
+                    },
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
+                      }
+                    },
+                    "dateRelativeTo" : {
+                      "globalReference" : "a5aeeeb8",
+                      "externalReference" : "resetDates"
+                    }
+                  },
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "814e2ae6",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "a5aeeeb8",
+                    "externalKey" : "resetDates"
                   }
                 },
                 "cashflowRepresentation" : {
@@ -238,440 +302,338 @@
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "1995-06-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1995-06-14",
                       "adjustedStartDate" : "1994-12-14",
+                      "adjustedEndDate" : "1995-06-14",
                       "meta" : {
-                        "globalKey" : "aca6a894"
+                        "globalKey" : "eba58b94"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1994-12-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78c0e75"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "97719422"
+                      "globalKey" : "d6707722"
                     }
                   }, {
                     "adjustedPaymentDate" : "1995-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1995-12-14",
                       "adjustedStartDate" : "1995-06-14",
+                      "adjustedEndDate" : "1995-12-14",
                       "meta" : {
-                        "globalKey" : "1d805d14"
+                        "globalKey" : "536c6a14"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1995-06-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78cd7f5"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "6ef1ca22"
+                      "globalKey" : "a4ddd722"
                     }
                   }, {
                     "adjustedPaymentDate" : "1996-06-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1996-06-14",
                       "adjustedStartDate" : "1995-12-14",
+                      "adjustedEndDate" : "1996-06-14",
                       "meta" : {
-                        "globalKey" : "8546a094"
+                        "globalKey" : "c4458394"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1995-12-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78d0675"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "93899422"
+                      "globalKey" : "d2887722"
                     }
                   }, {
                     "adjustedPaymentDate" : "1996-12-16",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1996-12-16",
                       "adjustedStartDate" : "1996-06-14",
+                      "adjustedEndDate" : "1996-12-16",
                       "meta" : {
-                        "globalKey" : "5feccb96"
+                        "globalKey" : "2f761352"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1996-06-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78dcff5"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "fd5f1ea6"
+                      "globalKey" : "cce86662"
                     }
                   }, {
                     "adjustedPaymentDate" : "1997-06-16",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1997-06-16",
                       "adjustedStartDate" : "1996-12-16",
+                      "adjustedEndDate" : "1997-06-16",
                       "meta" : {
-                        "globalKey" : "cb1cc054"
+                        "globalKey" : "a1ba354"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1996-12-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78dfe75"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "256099e4"
+                      "globalKey" : "645f7ce4"
                     }
                   }, {
                     "adjustedPaymentDate" : "1997-12-15",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1997-12-15",
                       "adjustedStartDate" : "1997-06-16",
+                      "adjustedEndDate" : "1997-12-15",
                       "meta" : {
-                        "globalKey" : "7103993"
+                        "globalKey" : "702da935"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1997-06-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78ec7f5"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "33b625a2"
+                      "globalKey" : "9cd39544"
                     }
                   }, {
                     "adjustedPaymentDate" : "1998-06-15",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1998-06-15",
                       "adjustedStartDate" : "1997-12-15",
+                      "adjustedEndDate" : "1998-06-15",
                       "meta" : {
-                        "globalKey" : "6d21a455"
+                        "globalKey" : "ac208755"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1997-12-11",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78ef656"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "569916e4"
+                      "globalKey" : "9597f9e4"
                     }
                   }, {
                     "adjustedPaymentDate" : "1998-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1998-12-14",
                       "adjustedStartDate" : "1998-06-15",
+                      "adjustedEndDate" : "1998-12-14",
                       "meta" : {
-                        "globalKey" : "a9151d94"
+                        "globalKey" : "12328d36"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1998-06-11",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78fbfd6"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "64eea2a2"
+                      "globalKey" : "ce0c1244"
                     }
                   }, {
                     "adjustedPaymentDate" : "1999-06-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1999-06-14",
                       "adjustedStartDate" : "1998-12-14",
+                      "adjustedEndDate" : "1999-06-14",
                       "meta" : {
-                        "globalKey" : "f268856"
+                        "globalKey" : "4e256b56"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1998-12-10",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78fee37"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "87d193e4"
+                      "globalKey" : "c6d076e4"
                     }
                   }, {
                     "adjustedPaymentDate" : "1999-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1999-12-14",
                       "adjustedStartDate" : "1999-06-14",
+                      "adjustedEndDate" : "1999-12-14",
                       "meta" : {
-                        "globalKey" : "80003cd6"
+                        "globalKey" : "b5ec49d6"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1999-06-10",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "790b7b7"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "5f51c9e4"
+                      "globalKey" : "953dd6e4"
                     }
                   } ]
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
                 "meta" : {
-                  "globalKey" : "5c6f2ada"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa45fc6"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "814e2ae6"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
-                  }
-                },
-                "resetDates" : {
-                  "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "79667919"
-                  },
-                  "fixingDates" : {
-                    "meta" : {
-                      "globalKey" : "131ae8a2"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
-                      }
-                    },
-                    "businessDayConvention" : "NONE",
-                    "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "dbde664a"
-                    }
-                  },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "dbde664a"
-                  },
-                  "resetDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "814e2ae6"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "globalKey" : "530a32a6"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : true,
                   "initialPayment" : true,
+                  "finalPayment" : true,
                   "intermediatePayment" : false,
-                  "meta" : {
-                    "globalKey" : "f4028ce3"
-                  },
                   "principalPaymentSchedule" : {
-                    "finalPrincipalPayment" : {
-                      "meta" : {
-                        "globalKey" : "e7234e0b"
+                    "initialPrincipalPayment" : {
+                      "principalPaymentDate" : {
+                        "adjustedDate" : {
+                          "value" : "1994-12-14",
+                          "meta" : {
+                            "globalKey" : "3e530e"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
                       },
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "principalAmount" : {
+                        "value" : 1000000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "JPY"
                           }
                         },
-                        "value" : 1000000000.00,
                         "meta" : {
                           "globalKey" : "57e64854"
                         }
                       },
+                      "meta" : {
+                        "globalKey" : "1653e1f3"
+                      }
+                    },
+                    "finalPrincipalPayment" : {
                       "principalPaymentDate" : {
                         "adjustedDate" : {
+                          "value" : "1999-12-14",
                           "meta" : {
                             "globalKey" : "3e7b0e"
-                          },
-                          "value" : "1999-12-14"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "0"
                         }
-                      }
-                    },
-                    "initialPrincipalPayment" : {
-                      "meta" : {
-                        "globalKey" : "b4285c6d"
                       },
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "principalAmount" : {
+                        "value" : 1000000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "JPY"
                           }
                         },
-                        "value" : 1000000000.00,
                         "meta" : {
                           "globalKey" : "57e64854"
                         }
                       },
-                      "principalPaymentDate" : {
-                        "adjustedDate" : {
-                          "meta" : {
-                            "globalKey" : "3e530e"
-                          },
-                          "value" : "1994-12-14"
-                        },
-                        "meta" : {
-                          "globalKey" : "0"
-                        }
+                      "meta" : {
+                        "globalKey" : "49854495"
                       }
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "be7646f3"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "814e2ae6"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b8fa"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30E/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -680,42 +642,92 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "faa5b75e"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "814e2ae6"
+                            "globalReference" : "814e2ae6",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "93c845ff"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "93c845ff"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "814e2ae6",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "1794a"
+                    },
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "9249d1f2",
+                    "externalKey" : "fixedCalcPeriodDates"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "814e2ae6",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "85fff0af"
                   }
                 },
                 "cashflowRepresentation" : {
@@ -723,254 +735,242 @@
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "1995-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1995-12-14",
                       "adjustedStartDate" : "1994-12-14",
+                      "adjustedEndDate" : "1995-12-14",
                       "meta" : {
-                        "globalKey" : "8e0084db"
+                        "globalKey" : "1354d305"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 1000000000.00
+                      "notionalAmount" : 1000000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "6566e28d"
+                      "globalKey" : "eabb30b7"
                     }
                   }, {
                     "adjustedPaymentDate" : "1996-12-16",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1996-12-16",
                       "adjustedStartDate" : "1995-12-14",
+                      "adjustedEndDate" : "1996-12-16",
                       "meta" : {
-                        "globalKey" : "91c26d99"
+                        "globalKey" : "1715da87"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 1000000000.00
+                      "notionalAmount" : 1000000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "13577489"
+                      "globalKey" : "98aae177"
                     }
                   }, {
                     "adjustedPaymentDate" : "1997-12-15",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1997-12-15",
                       "adjustedStartDate" : "1996-12-16",
+                      "adjustedEndDate" : "1997-12-15",
                       "meta" : {
-                        "globalKey" : "958300bc"
+                        "globalKey" : "1ad7bf84"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 1000000000.00
+                      "notionalAmount" : 1000000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "bc28270d"
+                      "globalKey" : "417ce5d5"
                     }
                   }, {
                     "adjustedPaymentDate" : "1998-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1998-12-14",
                       "adjustedStartDate" : "1997-12-15",
+                      "adjustedEndDate" : "1998-12-14",
                       "meta" : {
-                        "globalKey" : "9943889c"
+                        "globalKey" : "1e984764"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 1000000000.00
+                      "notionalAmount" : 1000000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "64f8ce4e"
+                      "globalKey" : "ea4d8d16"
                     }
                   }, {
                     "adjustedPaymentDate" : "1999-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1999-12-14",
                       "adjustedStartDate" : "1998-12-14",
+                      "adjustedEndDate" : "1999-12-14",
                       "meta" : {
-                        "globalKey" : "9d0484db"
+                        "globalKey" : "2258d305"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 1000000000.00
+                      "notionalAmount" : 1000000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "f7ec28d"
+                      "globalKey" : "94d310b7"
                     }
                   } ]
                 },
-                "dayCountFraction" : {
-                  "value" : "30E/360"
-                },
                 "meta" : {
-                  "globalKey" : "326733c1"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa46135"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "814e2ae6"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "92c15245"
                 }
               } ],
               "meta" : {
-                "globalKey" : "7e152c9b"
+                "globalKey" : "b9536eb"
               }
             }
           },
           "meta" : {
-            "globalKey" : "7e152c9b"
+            "globalKey" : "b9536eb"
           }
         },
         "meta" : {
-          "globalKey" : "7e152c9b"
+          "globalKey" : "b9536eb"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "cf003e1f"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d08"
+          "quantity" : [ {
+            "value" : {
+              "value" : 10000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 10000000.00
+            "meta" : {
+              "globalKey" : "8280320a"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "26516b87"
           },
+          "meta" : {
+            "globalKey" : "a0325171"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "value" : 0.06,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 1000000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
-              },
-              "value" : 1000000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a3dc0559"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e530c"
-      },
-      "value" : "1994-12-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "54930084UKLVMY22DS16"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "335bf1d6"
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
+        }
+      } ],
+      "name" : {
+        "value" : "Party B"
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "f3f17dd1"
+    }
+  },
+  "meta" : {
+    "globalKey" : "f3f17dd1"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex07-ois-swap-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex07-ois-swap-uti.json
index 671a85043a..a3a77acd94 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex07-ois-swap-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex07-ois-swap-uti.json
@@ -1,73 +1,32 @@
 {
-  "meta" : {
-    "globalKey" : "eb70bac"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "eb70bac"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
-      },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "121d7965"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
-      },
-      "name" : {
-        "value" : "Party B"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "3eac3060"
+      },
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2001-01-25",
+      "meta" : {
+        "globalKey" : "3e8859"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -75,52 +34,43 @@
             "productQualifier" : "InterestRate_IRSwap_FixedFloat_OIS"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "20a71d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "25e2ab"
-                    },
-                    "period" : "T",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "NONE"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-01-29",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -129,110 +79,115 @@
                       },
                       "meta" : {
                         "globalKey" : "eae28c55"
-                      },
-                      "unadjustedDate" : "2001-01-29"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae28c55"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "9919b9ce"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-04-29",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "20a71d"
+                            "globalKey" : "20a71d",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "a6474bf1"
-                      },
-                      "unadjustedDate" : "2001-04-29"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "a6474bf1"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "886a9443"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "dcfb3c17"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf23"
-                    },
-                    "period" : "D",
+                  "calculationPeriodFrequency" : {
                     "periodMultiplier" : 1,
-                    "dayType" : "BUSINESS"
-                  },
-                  "paymentFrequency" : {
+                    "period" : "T",
                     "meta" : {
-                      "globalKey" : "a2d"
+                      "globalKey" : "24b525"
                     },
-                    "period" : "T",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "NONE"
+                  },
+                  "meta" : {
+                    "globalKey" : "37c36a6c",
+                    "externalKey" : "floatingCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
                     "meta" : {
-                      "globalKey" : "0"
+                      "globalKey" : "73"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 1,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4abbbd"
                     },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "20a71d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "1b77cc77"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "9919b9ce"
+                    "globalReference" : "37c36a6c",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodEndDate",
                   "fixingDates" : {
+                    "periodMultiplier" : 0,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "23728acc"
+                      "globalKey" : "98ca5cd4"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 0,
+                    "businessDayConvention" : "PRECEDING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -241,82 +196,79 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "PRECEDING",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "b44a57c9"
+                      "globalReference" : "d5a6f6cb",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "b44a57c9"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
+                    "meta" : {
+                      "globalKey" : "73"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "a2d"
-                    },
-                    "period" : "T",
-                    "periodMultiplier" : 1
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                  "meta" : {
+                    "globalKey" : "d5a6f6cb",
+                    "externalKey" : "resetDates"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c4dd9e87"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "20a71d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "25e2ab"
-                    },
-                    "period" : "T",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "NONE"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-01-29",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -325,216 +277,264 @@
                       },
                       "meta" : {
                         "globalKey" : "eae28c55"
-                      },
-                      "unadjustedDate" : "2001-01-29"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae28c55"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "840c172d"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-04-29",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "20a71d"
+                            "globalReference" : "20a71d",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "9139a950"
-                      },
-                      "unadjustedDate" : "2001-04-29"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "9139a950"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "239597a"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa4609a"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
                     "meta" : {
-                      "globalKey" : "a2d"
+                      "globalKey" : "24b525"
                     },
-                    "period" : "T",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "NONE"
+                  },
+                  "meta" : {
+                    "globalKey" : "d26aa7ed",
+                    "externalKey" : "fixedCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "73"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "20a71d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "7d77b594"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "a422f862"
                 }
               } ],
               "meta" : {
-                "globalKey" : "3a4ae9fd"
+                "globalKey" : "4c9c7e29"
               }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "8fb047d3"
+            "globalKey" : "e3c180d3"
           }
         },
         "meta" : {
-          "globalKey" : "8fb047d3"
+          "globalKey" : "e3c180d3"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "f2809620"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "23c05191"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EONIA-OIS-COMPOUND"
+          "quantity" : [ {
+            "value" : {
+              "value" : 100000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
                 }
               }
-            }
-          },
-          "quantity" : [ {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EONIA-OIS-COMPOUND"
                 }
               },
-              "value" : 100000000.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "5449e08f"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "27beb430"
           },
+          "meta" : {
+            "globalKey" : "9894669e"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.051,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.051,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 100000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "d017d1d0"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8859"
-      },
-      "value" : "2001-01-25"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "54930084UKLVMY22DS16"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "335bf1d6"
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
+        }
+      } ],
+      "name" : {
+        "value" : "Party B"
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "5e72f648"
+    }
+  },
+  "meta" : {
+    "globalKey" : "5e72f648"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex08-fra-no-discounting.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex08-fra-no-discounting.json
index 7f57c239f3..3b073e54cd 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex08-fra-no-discounting.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex08-fra-no-discounting.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "ff52db32"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "ff52db32"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "e1284e85"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "e1284e85",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "MB87623",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "TR24TWEY5RVRQV65HD49"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e1284e85"
+            "scheme" : "http://www.hsbc.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "cff0a7d6"
+        "globalKey" : "f2891f38"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "cff0a7d6",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "AA9876",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFXS5XCH7N0Y05NIXW11"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cff0a7d6"
+            "scheme" : "http://www.abnamro.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "814acd2"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "1991-05-14",
+      "meta" : {
+        "globalKey" : "3e394e"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "e1284e85"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "cff0a7d6"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,48 +50,63 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
                       "adjustedDate" : {
+                        "value" : "1991-07-17",
                         "meta" : {
                           "globalKey" : "3e39d1"
-                        },
-                        "value" : "1991-07-17"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "0"
                       }
                     },
                     "meta" : {
-                      "externalKey" : "resetDate",
-                      "globalKey" : "0"
+                      "globalKey" : "0",
+                      "externalKey" : "resetDate"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
                       "adjustedDate" : {
+                        "value" : "1992-01-17",
                         "meta" : {
                           "globalKey" : "3e4051"
-                        },
-                        "value" : "1992-01-17"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "0"
@@ -115,16 +115,15 @@
                     "meta" : {
                       "globalKey" : "0"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "2a5e9c3"
-                },
                 "paymentDate" : {
+                  "unadjustedDate" : "1991-07-17",
                   "dateAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "CHZU"
@@ -133,75 +132,74 @@
                         "globalKey" : "1f8e60"
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
                       "globalKey" : "211caa4f"
                     }
                   },
                   "meta" : {
                     "globalKey" : "407eeb1e"
-                  },
-                  "unadjustedDate" : "1991-07-17"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
                   }
+                },
+                "meta" : {
+                  "globalKey" : "cd144bf"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
                       "adjustedDate" : {
+                        "value" : "1991-07-17",
                         "meta" : {
                           "globalKey" : "3e39d1"
-                        },
-                        "value" : "1991-07-17"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "0"
                       }
                     },
                     "meta" : {
-                      "externalKey" : "resetDate",
-                      "globalKey" : "0"
+                      "globalKey" : "0",
+                      "externalKey" : "resetDate"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
                       "adjustedDate" : {
+                        "value" : "1992-01-17",
                         "meta" : {
                           "globalKey" : "3e4051"
-                        },
-                        "value" : "1992-01-17"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "0"
@@ -210,16 +208,15 @@
                     "meta" : {
                       "globalKey" : "0"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "11ccd0ea"
-                },
                 "paymentDate" : {
+                  "unadjustedDate" : "1991-07-17",
                   "dateAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "CHZU"
@@ -228,37 +225,23 @@
                         "globalKey" : "1f8e60"
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
                       "globalKey" : "211caa4f"
                     }
                   },
                   "meta" : {
                     "globalKey" : "407eeb1e"
-                  },
-                  "unadjustedDate" : "1991-07-17"
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
                   }
                 },
                 "resetDates" : {
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "f12537c9"
+                      "globalKey" : "ce01227d"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -267,159 +250,176 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDate",
-                      "globalReference" : "0"
+                      "globalReference" : "0",
+                      "externalReference" : "resetDate"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "f12537c9"
+                    "globalKey" : "ce01227d"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "54401e5e"
                 }
               } ],
               "meta" : {
-                "globalKey" : "a16a6ec7"
+                "globalKey" : "5a4601bf"
               }
             }
           },
           "meta" : {
-            "globalKey" : "a16a6ec7"
+            "globalKey" : "5a4601bf"
           }
         },
         "meta" : {
-          "globalKey" : "a16a6ec7"
+          "globalKey" : "5a4601bf"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "103bf473"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.04,
               "unit" : {
                 "currency" : {
                   "value" : "CHF"
                 }
               },
-              "value" : 0.04,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "CHF"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 25000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "CHF"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "f74299ed"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "CHF"
                 }
-              },
-              "value" : 25000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "434a0131"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "6a18d5cd"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "CHF-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "CHF"
-                }
-              },
-              "value" : 25000000.00
+            "meta" : {
+              "globalKey" : "d900e1e5"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "9965fc03"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e1284e85",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "cff0a7d6",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e394e"
-      },
-      "value" : "1991-05-14"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "TR24TWEY5RVRQV65HD49",
           "meta" : {
-            "scheme" : "http://www.hsbc.com/swaps/trade-id"
-          },
-          "value" : "MB87623"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e1284e85"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "e1284e85"
-      },
       "meta" : {
-        "globalKey" : "1896266e"
+        "globalKey" : "e1284e85",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFXS5XCH7N0Y05NIXW11",
           "meta" : {
-            "scheme" : "http://www.abnamro.com/swaps/trade-id"
-          },
-          "value" : "AA9876"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cff0a7d6"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "cff0a7d6"
-      },
       "meta" : {
-        "globalKey" : "f7bfdcea"
+        "globalKey" : "cff0a7d6",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "3439d3a8"
+    }
+  },
+  "meta" : {
+    "globalKey" : "3439d3a8"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex08-fra.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex08-fra.json
index 82e5b2e9be..bdf29f5177 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex08-fra.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex08-fra.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "cc6bc912"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "cc6bc912"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "e1284e85"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "e1284e85",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "MB87623",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "TR24TWEY5RVRQV65HD49"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e1284e85"
+            "scheme" : "http://www.hsbc.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "cff0a7d6"
+        "globalKey" : "f2891f38"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "cff0a7d6",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "AA9876",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFXS5XCH7N0Y05NIXW11"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cff0a7d6"
+            "scheme" : "http://www.abnamro.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "814acd2"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "1991-05-14",
+      "meta" : {
+        "globalKey" : "3e394e"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "e1284e85"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "cff0a7d6"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,48 +50,63 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
                       "adjustedDate" : {
+                        "value" : "1991-07-17",
                         "meta" : {
                           "globalKey" : "3e39d1"
-                        },
-                        "value" : "1991-07-17"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "0"
                       }
                     },
                     "meta" : {
-                      "externalKey" : "resetDate",
-                      "globalKey" : "0"
+                      "globalKey" : "0",
+                      "externalKey" : "resetDate"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
                       "adjustedDate" : {
+                        "value" : "1992-01-17",
                         "meta" : {
                           "globalKey" : "3e4051"
-                        },
-                        "value" : "1992-01-17"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "0"
@@ -115,19 +115,15 @@
                     "meta" : {
                       "globalKey" : "0"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "discountingMethod" : {
-                  "discountingType" : "FRA"
-                },
-                "meta" : {
-                  "globalKey" : "4af42838"
-                },
                 "paymentDate" : {
+                  "unadjustedDate" : "1991-07-17",
                   "dateAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "CHZU"
@@ -136,75 +132,77 @@
                         "globalKey" : "1f8e60"
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
                       "globalKey" : "211caa4f"
                     }
                   },
                   "meta" : {
                     "globalKey" : "407eeb1e"
-                  },
-                  "unadjustedDate" : "1991-07-17"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
                   }
+                },
+                "discountingMethod" : {
+                  "discountingType" : "FRA"
+                },
+                "meta" : {
+                  "globalKey" : "1d9421f4"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
                       "adjustedDate" : {
+                        "value" : "1991-07-17",
                         "meta" : {
                           "globalKey" : "3e39d1"
-                        },
-                        "value" : "1991-07-17"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "0"
                       }
                     },
                     "meta" : {
-                      "externalKey" : "resetDate",
-                      "globalKey" : "0"
+                      "globalKey" : "0",
+                      "externalKey" : "resetDate"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
                       "adjustedDate" : {
+                        "value" : "1992-01-17",
                         "meta" : {
                           "globalKey" : "3e4051"
-                        },
-                        "value" : "1992-01-17"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "0"
@@ -213,19 +211,15 @@
                     "meta" : {
                       "globalKey" : "0"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "discountingMethod" : {
-                  "discountingType" : "FRA"
-                },
-                "meta" : {
-                  "globalKey" : "dc55f19f"
-                },
                 "paymentDate" : {
+                  "unadjustedDate" : "1991-07-17",
                   "dateAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "CHZU"
@@ -234,37 +228,23 @@
                         "globalKey" : "1f8e60"
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
                       "globalKey" : "211caa4f"
                     }
                   },
                   "meta" : {
                     "globalKey" : "407eeb1e"
-                  },
-                  "unadjustedDate" : "1991-07-17"
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
                   }
                 },
                 "resetDates" : {
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "f12537c9"
+                      "globalKey" : "ce01227d"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -273,159 +253,179 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDate",
-                      "globalReference" : "0"
+                      "globalReference" : "0",
+                      "externalReference" : "resetDate"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "f12537c9"
+                    "globalKey" : "ce01227d"
                   }
+                },
+                "discountingMethod" : {
+                  "discountingType" : "FRA"
+                },
+                "meta" : {
+                  "globalKey" : "44b30fd3"
                 }
               } ],
               "meta" : {
-                "globalKey" : "1579b067"
+                "globalKey" : "842dfc5f"
               }
             }
           },
           "meta" : {
-            "globalKey" : "1579b067"
+            "globalKey" : "842dfc5f"
           }
         },
         "meta" : {
-          "globalKey" : "1579b067"
+          "globalKey" : "842dfc5f"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "103bf473"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.04,
               "unit" : {
                 "currency" : {
                   "value" : "CHF"
                 }
               },
-              "value" : 0.04,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "CHF"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 25000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "CHF"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "f74299ed"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "CHF"
                 }
-              },
-              "value" : 25000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "434a0131"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "6a18d5cd"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "CHF-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "CHF"
-                }
-              },
-              "value" : 25000000.00
+            "meta" : {
+              "globalKey" : "d900e1e5"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "9965fc03"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e1284e85",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "cff0a7d6",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e394e"
-      },
-      "value" : "1991-05-14"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "TR24TWEY5RVRQV65HD49",
           "meta" : {
-            "scheme" : "http://www.hsbc.com/swaps/trade-id"
-          },
-          "value" : "MB87623"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e1284e85"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "e1284e85"
-      },
       "meta" : {
-        "globalKey" : "1896266e"
+        "globalKey" : "e1284e85",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFXS5XCH7N0Y05NIXW11",
           "meta" : {
-            "scheme" : "http://www.abnamro.com/swaps/trade-id"
-          },
-          "value" : "AA9876"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cff0a7d6"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "cff0a7d6"
-      },
       "meta" : {
-        "globalKey" : "f7bfdcea"
+        "globalKey" : "cff0a7d6",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "661fc808"
+    }
+  },
+  "meta" : {
+    "globalKey" : "661fc808"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex09-euro-swaption-explicit-physical-exercise.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex09-euro-swaption-explicit-physical-exercise.json
index 48ec10216a..4b6b453e53 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex09-euro-swaption-explicit-physical-exercise.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex09-euro-swaption-explicit-physical-exercise.json
@@ -1,67 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "429d7fff"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "eee7a07a"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "d4813763"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "d4813763",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "party A"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "d4813763"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "d4813764"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "party B"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "d4813764"
-        }
-      } ]
+        "globalKey" : "19d6067e"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-08-30",
+      "meta" : {
+        "globalKey" : "3e821e"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "d4813764"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "d4813763"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "d4813764"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -69,17 +32,11 @@
             "productQualifier" : "InterestRate_Option_Swaption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "fe35f088"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
                   "meta" : {
@@ -93,32 +50,17 @@
                   }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "exerciseNotice" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "exerciseNoticeGiver" : "SELLER"
-                      }
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "BEBR"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-08-28",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
@@ -129,35 +71,47 @@
                                 "globalKey" : "4158421"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da3b6050"
                             }
                           },
                           "meta" : {
                             "globalKey" : "770e7eb4"
-                          },
-                          "unadjustedDate" : "2001-08-28"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "770e7eb4"
                         }
                       } ],
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "BEBR"
+                        }
+                      },
                       "expirationTime" : {
+                        "hourMinuteTime" : "11:00:00",
                         "businessCenter" : {
                           "value" : "BEBR"
-                        },
-                        "hourMinuteTime" : "11:00:00"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "70973195"
+                        "globalKey" : "83fbdc15"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "exerciseNotice" : {
+                        "exerciseNoticeGiver" : "Seller",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      }
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "fe35f088"
-                },
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -168,46 +122,42 @@
                       "payout" : {
                         "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters0",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e1"
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb2"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "2b934"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "30/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -216,135 +166,133 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates0",
-                              "globalKey" : "d530b040"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters0",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters0"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters0"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e1"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb2"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "17984"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6a5a890",
+                              "externalKey" : "CalcPeriodDates0"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "30/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "6e2bf001"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64aef4"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "78"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "ac8"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1
+                            "meta" : {
+                              "globalKey" : "9b0d9350"
                             }
                           },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "86242c95"
                           }
                         }, {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters1",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e2"
+                          "rateSpecification" : {
+                            "floatingRate" : {
+                              "rateOption" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "rateOption-1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb3"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "28cc3"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -353,312 +301,360 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates1",
-                              "globalKey" : "c8353f30"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters1",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters1"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters1"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e2"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb3"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "18ad5"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6b3d162",
+                              "externalKey" : "CalcPeriodDates1"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "9ec5a1dd"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64ad85"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters1",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            }
-                          },
-                          "rateSpecification" : {
-                            "floatingRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateOption" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "rateOption-1"
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "8f129421"
                             }
                           },
                           "resetDates" : {
                             "calculationPeriodDatesReference" : {
-                              "externalReference" : "CalcPeriodDates1",
-                              "globalReference" : "c8353f30"
+                              "globalReference" : "d6b3d162",
+                              "externalReference" : "CalcPeriodDates1"
                             },
+                            "resetRelativeTo" : "CalculationPeriodStartDate",
                             "fixingDates" : {
+                              "periodMultiplier" : -2,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "2d80ce65"
+                                "globalKey" : "a5cb919"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : -2,
-                              "dayType" : "BUSINESS",
+                              "dayType" : "Business",
+                              "businessDayConvention" : "NONE",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "fixingBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "fixingBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "NONE",
                               "dateRelativeTo" : {
-                                "externalReference" : "resetDates0",
-                                "globalReference" : "3522cca9"
+                                "globalReference" : "dbaefb1",
+                                "externalReference" : "resetDates0"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "resetDates0",
-                              "globalKey" : "3522cca9"
+                            "resetFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
                             "resetDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "paymentBusinessCenters1",
-                                  "globalReference" : "20a71d"
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "paymentBusinessCenters1"
                                 },
                                 "meta" : {
                                   "globalKey" : "e30c2739"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "19472b0a"
                               }
                             },
-                            "resetFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            },
-                            "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                            "meta" : {
+                              "globalKey" : "dbaefb1",
+                              "externalKey" : "resetDates0"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ad0fb833"
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "893cb5bc"
+                          "globalKey" : "2d8d4cfe"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "893cb5bc"
+                      "globalKey" : "2d8d4cfe"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "893cb5bc"
+                    "globalKey" : "2d8d4cfe"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "e6c88954"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "e6c88954"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "c4b94df2"
+            "globalKey" : "a3176d3e"
           }
         },
         "meta" : {
-          "globalKey" : "c4b94df2"
+          "globalKey" : "a3176d3e"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7f30bbe5"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.05,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.05,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "66e6c0bb"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "65d139a0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Telerate"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "4820adb2"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "d4813763",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "d4813764",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "d4813764",
+          "externalReference" : "party2"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "d4813763"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e821e"
-      },
-      "value" : "2000-08-30"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "d4813763",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "party B",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
         },
-        "version" : 1
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "d4813764"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "d4813763"
-      },
       "meta" : {
-        "globalKey" : "c783533e"
+        "globalKey" : "d4813764",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "c6647810"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "5ac63039"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "d4813763"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "d4813764"
-        }
-      },
       "quantity" : {
+        "value" : 100000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "d4813763",
+          "externalReference" : "party1"
         },
-        "value" : 100000
+        "receiverPartyReference" : {
+          "globalReference" : "d4813764",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2000-08-30",
         "dateAdjustments" : {
+          "businessDayConvention" : "FOLLOWING",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "EUTA"
@@ -667,16 +663,20 @@
               "globalKey" : "20a71d"
             }
           },
-          "businessDayConvention" : "FOLLOWING",
           "meta" : {
             "globalKey" : "211dc30c"
           }
-        },
-        "unadjustedDate" : "2000-08-30"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "dc25c051"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "d417f241"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex09-euro-swaption-explicit-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex09-euro-swaption-explicit-versioned.json
index 98ee0cf281..6758619dc1 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex09-euro-swaption-explicit-versioned.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex09-euro-swaption-explicit-versioned.json
@@ -1,67 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "67818022"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "81947077"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "d4813763"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "d4813763",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "party A"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "d4813763"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "d4813764"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "party B"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "d4813764"
-        }
-      } ]
+        "globalKey" : "19d6067e"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-08-30",
+      "meta" : {
+        "globalKey" : "3e821e"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "d4813764"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "d4813763"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "d4813764"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -69,45 +32,24 @@
             "productQualifier" : "InterestRate_Option_Swaption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "bdf2ac17"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "exerciseNotice" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "exerciseNoticeGiver" : "SELLER"
-                      }
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "BEBR"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-08-28",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
@@ -118,35 +60,47 @@
                                 "globalKey" : "4158421"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da3b6050"
                             }
                           },
                           "meta" : {
                             "globalKey" : "770e7eb4"
-                          },
-                          "unadjustedDate" : "2001-08-28"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "770e7eb4"
                         }
                       } ],
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "BEBR"
+                        }
+                      },
                       "expirationTime" : {
+                        "hourMinuteTime" : "11:00:00",
                         "businessCenter" : {
                           "value" : "BEBR"
-                        },
-                        "hourMinuteTime" : "11:00:00"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "70973195"
+                        "globalKey" : "83fbdc15"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "exerciseNotice" : {
+                        "exerciseNoticeGiver" : "Seller",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      }
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "bdf2ac17"
-                },
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -157,46 +111,42 @@
                       "payout" : {
                         "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters0",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e1"
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb2"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "2b934"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "30/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -205,135 +155,133 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates0",
-                              "globalKey" : "d530b040"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters0",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters0"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters0"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e1"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb2"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "17984"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6a5a890",
+                              "externalKey" : "CalcPeriodDates0"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "30/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "6e2bf001"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64aef4"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "78"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "ac8"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1
+                            "meta" : {
+                              "globalKey" : "9b0d9350"
                             }
                           },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "86242c95"
                           }
                         }, {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters1",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e2"
+                          "rateSpecification" : {
+                            "floatingRate" : {
+                              "rateOption" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "rateOption-1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb3"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "28cc3"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -342,312 +290,360 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates1",
-                              "globalKey" : "c8353f30"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters1",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters1"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters1"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e2"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb3"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "18ad5"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6b3d162",
+                              "externalKey" : "CalcPeriodDates1"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "9ec5a1dd"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64ad85"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters1",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            }
-                          },
-                          "rateSpecification" : {
-                            "floatingRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateOption" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "rateOption-1"
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "8f129421"
                             }
                           },
                           "resetDates" : {
                             "calculationPeriodDatesReference" : {
-                              "externalReference" : "CalcPeriodDates1",
-                              "globalReference" : "c8353f30"
+                              "globalReference" : "d6b3d162",
+                              "externalReference" : "CalcPeriodDates1"
                             },
+                            "resetRelativeTo" : "CalculationPeriodStartDate",
                             "fixingDates" : {
+                              "periodMultiplier" : -2,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "2d80ce65"
+                                "globalKey" : "a5cb919"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : -2,
-                              "dayType" : "BUSINESS",
+                              "dayType" : "Business",
+                              "businessDayConvention" : "NONE",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "fixingBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "fixingBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "NONE",
                               "dateRelativeTo" : {
-                                "externalReference" : "resetDates0",
-                                "globalReference" : "3522cca9"
+                                "globalReference" : "dbaefb1",
+                                "externalReference" : "resetDates0"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "resetDates0",
-                              "globalKey" : "3522cca9"
+                            "resetFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
                             "resetDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "paymentBusinessCenters1",
-                                  "globalReference" : "20a71d"
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "paymentBusinessCenters1"
                                 },
                                 "meta" : {
                                   "globalKey" : "e30c2739"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "19472b0a"
                               }
                             },
-                            "resetFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            },
-                            "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                            "meta" : {
+                              "globalKey" : "dbaefb1",
+                              "externalKey" : "resetDates0"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ad0fb833"
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "893cb5bc"
+                          "globalKey" : "2d8d4cfe"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "893cb5bc"
+                      "globalKey" : "2d8d4cfe"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "893cb5bc"
+                    "globalKey" : "2d8d4cfe"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "a68544e3"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "a68544e3"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "6af856ed"
+            "globalKey" : "6693810d"
           }
         },
         "meta" : {
-          "globalKey" : "6af856ed"
+          "globalKey" : "6693810d"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7f30bbe5"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.05,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.05,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "66e6c0bb"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "65d139a0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Telerate"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "4820adb2"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "d4813763",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "d4813764",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "d4813764",
+          "externalReference" : "party2"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "d4813763"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e821e"
-      },
-      "value" : "2000-08-30"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "d4813763",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "party B",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
         },
-        "version" : 1
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "d4813764"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "d4813763"
-      },
       "meta" : {
-        "globalKey" : "c783533e"
+        "globalKey" : "d4813764",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "d7d6a69d"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "5ac63039"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "d4813763"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "d4813764"
-        }
-      },
       "quantity" : {
+        "value" : 100000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "d4813763",
+          "externalReference" : "party1"
         },
-        "value" : 100000
+        "receiverPartyReference" : {
+          "globalReference" : "d4813764",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2000-08-30",
         "dateAdjustments" : {
+          "businessDayConvention" : "FOLLOWING",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "EUTA"
@@ -656,16 +652,20 @@
               "globalKey" : "20a71d"
             }
           },
-          "businessDayConvention" : "FOLLOWING",
           "meta" : {
             "globalKey" : "211dc30c"
           }
-        },
-        "unadjustedDate" : "2000-08-30"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "dc25c051"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "9d164dd4"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex10-euro-swaption-relative-usi.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex10-euro-swaption-relative-usi.json
index 05701ba12b..a3cdb06132 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex10-euro-swaption-relative-usi.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex10-euro-swaption-relative-usi.json
@@ -1,65 +1,32 @@
 {
-  "meta" : {
-    "globalKey" : "867762a0"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "b9183b39"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "1031234567",
         "meta" : {
-          "globalKey" : "33f59567"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/usi"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "af42d69a"
+      },
+      "identifierType" : "UniqueSwapIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2000-08-30",
+      "meta" : {
+        "globalKey" : "3e821e"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -67,45 +34,24 @@
             "productQualifier" : "InterestRate_Option_Swaption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "66603c51"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "exerciseNotice" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "exerciseNoticeGiver" : "SELLER"
-                      }
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "BEBR"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-08-28",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
@@ -116,41 +62,27 @@
                                 "globalKey" : "4158421"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da3b6050"
                             }
                           },
                           "meta" : {
                             "globalKey" : "770e7eb4"
-                          },
-                          "unadjustedDate" : "2001-08-28"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "770e7eb4"
                         }
                       } ],
-                      "expirationTime" : {
-                        "businessCenter" : {
-                          "value" : "BEBR"
-                        },
-                        "hourMinuteTime" : "11:00:00"
-                      },
-                      "meta" : {
-                        "externalKey" : "europeanExercise0",
-                        "globalKey" : "9cfb157b"
-                      },
                       "relevantUnderlyingDate" : {
-                        "meta" : {
-                          "globalKey" : "6e5a630"
-                        },
                         "relativeDates" : {
+                          "periodMultiplier" : 2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "6e5a630"
+                            "globalKey" : "954e996c"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -159,19 +91,45 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "europeanExercise0",
-                            "globalReference" : "9cfb157b"
+                            "globalReference" : "4e313b99",
+                            "externalReference" : "europeanExercise0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "954e996c"
+                        }
+                      },
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "BEBR"
                         }
+                      },
+                      "expirationTime" : {
+                        "hourMinuteTime" : "11:00:00",
+                        "businessCenter" : {
+                          "value" : "BEBR"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "4e313b99",
+                        "externalKey" : "europeanExercise0"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "exerciseNotice" : {
+                        "exerciseNoticeGiver" : "Seller",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      }
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "66603c51"
-                },
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -182,46 +140,42 @@
                       "payout" : {
                         "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters0",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e1"
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb2"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "2b934"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "30/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -230,135 +184,133 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates0",
-                              "globalKey" : "d530b040"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters0",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters0"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters0"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e1"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb2"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "17984"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6a5a890",
+                              "externalKey" : "CalcPeriodDates0"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "30/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "6e2bf001"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64aef4"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "78"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "ac8"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1
+                            "meta" : {
+                              "globalKey" : "9b0d9350"
                             }
                           },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "86242c95"
                           }
                         }, {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters1",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e2"
+                          "rateSpecification" : {
+                            "floatingRate" : {
+                              "rateOption" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "rateOption-1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb3"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "28cc3"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -367,314 +319,358 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates1",
-                              "globalKey" : "c8353f30"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters1",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters1"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters1"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e2"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb3"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "18ad5"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6b3d162",
+                              "externalKey" : "CalcPeriodDates1"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "9ec5a1dd"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64ad85"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters1",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            }
-                          },
-                          "rateSpecification" : {
-                            "floatingRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateOption" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "rateOption-1"
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "8f129421"
                             }
                           },
                           "resetDates" : {
                             "calculationPeriodDatesReference" : {
-                              "externalReference" : "CalcPeriodDates1",
-                              "globalReference" : "c8353f30"
+                              "globalReference" : "d6b3d162",
+                              "externalReference" : "CalcPeriodDates1"
                             },
+                            "resetRelativeTo" : "CalculationPeriodStartDate",
                             "fixingDates" : {
+                              "periodMultiplier" : -2,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "2d80ce65"
+                                "globalKey" : "a5cb919"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : -2,
-                              "dayType" : "BUSINESS",
+                              "dayType" : "Business",
+                              "businessDayConvention" : "NONE",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "fixingBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "fixingBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "NONE",
                               "dateRelativeTo" : {
-                                "externalReference" : "resetDates0",
-                                "globalReference" : "3522cca9"
+                                "globalReference" : "dbaefb1",
+                                "externalReference" : "resetDates0"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "resetDates0",
-                              "globalKey" : "3522cca9"
+                            "resetFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
                             "resetDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "paymentBusinessCenters1",
-                                  "globalReference" : "20a71d"
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "paymentBusinessCenters1"
                                 },
                                 "meta" : {
                                   "globalKey" : "e30c2739"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "19472b0a"
                               }
                             },
-                            "resetFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            },
-                            "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                            "meta" : {
+                              "globalKey" : "dbaefb1",
+                              "externalKey" : "resetDates0"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ad0fb833"
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "893cb5bc"
+                          "globalKey" : "2d8d4cfe"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "893cb5bc"
+                      "globalKey" : "2d8d4cfe"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "893cb5bc"
+                    "globalKey" : "2d8d4cfe"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "7bdd602b"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "7bdd602b"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "3a8c8fbb"
+            "globalKey" : "4651ea55"
           }
         },
         "meta" : {
-          "globalKey" : "3a8c8fbb"
+          "globalKey" : "4651ea55"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7f30bbe5"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.05,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.05,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "66e6c0bb"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "65d139a0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Telerate"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "4820adb2"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e821e"
-      },
-      "value" : "2000-08-30"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/usi"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
+      "meta" : {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party B",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
         },
-        "value" : "1031234567"
-      },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "81c425a"
-      },
-      "identifierType" : "UNIQUE_SWAP_IDENTIFIER"
-    } ]
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "b77badd7"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "5ac63039"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        }
-      },
       "quantity" : {
+        "value" : 100000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         },
-        "value" : 100000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2000-08-30",
         "dateAdjustments" : {
+          "businessDayConvention" : "FOLLOWING",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "EUTA"
@@ -683,16 +679,20 @@
               "globalKey" : "20a71d"
             }
           },
-          "businessDayConvention" : "FOLLOWING",
           "meta" : {
             "globalKey" : "211dc30c"
           }
-        },
-        "unadjustedDate" : "2000-08-30"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "dc25c051"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "88f7eeda"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex11-euro-swaption-partial-auto-ex.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex11-euro-swaption-partial-auto-ex.json
index 48bbd39f39..3e9ba797a5 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex11-euro-swaption-partial-auto-ex.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex11-euro-swaption-partial-auto-ex.json
@@ -1,65 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "5851d128"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "1e7cc7b1"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "957b3c47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "957bb0a6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-08-30",
+      "meta" : {
+        "globalKey" : "3e821e"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -67,40 +47,24 @@
             "productQualifier" : "InterestRate_Option_Swaption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "35d68628"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "thresholdRate" : 0.0002
-                    },
-                    "followUpConfirmation" : true
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-08-28",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
@@ -111,43 +75,50 @@
                                 "globalKey" : "4158421"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da3b6050"
                             }
                           },
                           "meta" : {
                             "globalKey" : "770e7eb4"
-                          },
-                          "unadjustedDate" : "2001-08-28"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "770e7eb4"
                         }
                       } ],
-                      "expirationTime" : {
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "11:00:00"
+                        }
                       },
-                      "meta" : {
-                        "globalKey" : "b1df3e41"
+                      "expirationTime" : {
+                        "hourMinuteTime" : "11:00:00",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
                       },
                       "partialExercise" : {
-                        "integralMultipleAmount" : 10000000,
-                        "minimumNotionalAmount" : 50000000,
                         "notionaReference" : {
-                          "externalReference" : "notional0",
-                          "globalReference" : "0"
-                        }
+                          "globalReference" : "0",
+                          "externalReference" : "notional0"
+                        },
+                        "integralMultipleAmount" : 10000000,
+                        "minimumNotionalAmount" : 50000000
+                      },
+                      "meta" : {
+                        "globalKey" : "ee531a01"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "thresholdRate" : 0.0002
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "35d68628"
-                },
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -158,47 +129,43 @@
                       "payout" : {
                         "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "externalKey" : "notional0",
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0",
+                              "externalKey" : "notional0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters0",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e1"
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb2"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "2b934"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "30/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -207,136 +174,134 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates0",
-                              "globalKey" : "d530b040"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters0",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters0"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters0"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e1"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb2"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "17984"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6a5a890",
+                              "externalKey" : "CalcPeriodDates0"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "30/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "6e2bf001"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64aef4"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "78"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "ac8"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1
+                            "meta" : {
+                              "globalKey" : "9b0d9350"
                             }
                           },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "86242c95"
                           }
                         }, {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "externalKey" : "notional1",
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0",
+                              "externalKey" : "notional1"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters1",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e2"
+                          "rateSpecification" : {
+                            "floatingRate" : {
+                              "rateOption" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "rateOption-1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb3"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "28cc3"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -345,327 +310,358 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates1",
-                              "globalKey" : "c8353f30"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters1",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters1"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters1"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e2"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb3"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "18ad5"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6b3d162",
+                              "externalKey" : "CalcPeriodDates1"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "9ec5a1dd"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64ad85"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters1",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            }
-                          },
-                          "rateSpecification" : {
-                            "floatingRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateOption" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "rateOption-1"
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "8f129421"
                             }
                           },
                           "resetDates" : {
                             "calculationPeriodDatesReference" : {
-                              "externalReference" : "CalcPeriodDates1",
-                              "globalReference" : "c8353f30"
+                              "globalReference" : "d6b3d162",
+                              "externalReference" : "CalcPeriodDates1"
                             },
+                            "resetRelativeTo" : "CalculationPeriodStartDate",
                             "fixingDates" : {
+                              "periodMultiplier" : -2,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "2d80ce65"
+                                "globalKey" : "a5cb919"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : -2,
-                              "dayType" : "BUSINESS",
+                              "dayType" : "Business",
+                              "businessDayConvention" : "NONE",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "fixingBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "fixingBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "NONE",
                               "dateRelativeTo" : {
-                                "externalReference" : "resetDates0",
-                                "globalReference" : "3522cca9"
+                                "globalReference" : "dbaefb1",
+                                "externalReference" : "resetDates0"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "resetDates0",
-                              "globalKey" : "3522cca9"
+                            "resetFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
                             "resetDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "paymentBusinessCenters1",
-                                  "globalReference" : "20a71d"
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "paymentBusinessCenters1"
                                 },
                                 "meta" : {
                                   "globalKey" : "e30c2739"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "19472b0a"
                               }
                             },
-                            "resetFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            },
-                            "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                            "meta" : {
+                              "globalKey" : "dbaefb1",
+                              "externalKey" : "resetDates0"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ad0fb833"
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "893cb5bc"
+                          "globalKey" : "2d8d4cfe"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "893cb5bc"
+                      "globalKey" : "2d8d4cfe"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "893cb5bc"
+                    "globalKey" : "2d8d4cfe"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "7e0f452c"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "7e0f452c"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "b81cd37e"
+            "globalKey" : "839e9316"
           }
         },
         "meta" : {
-          "globalKey" : "b81cd37e"
+          "globalKey" : "839e9316"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7f30bbe5"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.05,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.05,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "66e6c0bb"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "65d139a0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Telerate"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "4820adb2"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e821e"
-      },
-      "value" : "2000-08-30"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c7753bbd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c7753bbe"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "d163a7cf"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "5ac63039"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        }
-      },
       "quantity" : {
+        "value" : 100000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         },
-        "value" : 100000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2000-08-30",
         "dateAdjustments" : {
+          "businessDayConvention" : "FOLLOWING",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "EUTA"
@@ -674,16 +670,20 @@
               "globalKey" : "20a71d"
             }
           },
-          "businessDayConvention" : "FOLLOWING",
           "meta" : {
             "globalKey" : "211dc30c"
           }
-        },
-        "unadjustedDate" : "2000-08-30"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "dc25c051"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "d9825fe2"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex12-euro-swaption-straddle-cash-other-party.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex12-euro-swaption-straddle-cash-other-party.json
index 7b64fd1562..815053ef3e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex12-euro-swaption-straddle-cash-other-party.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex12-euro-swaption-straddle-cash-other-party.json
@@ -1,90 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "a69e7488"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "a0c4c851"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "d4813763"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "party A"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "d4813763"
-        }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "d4813764"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "d4813763",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "FRG78TR45E",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "party B"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "d4813764"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party3",
-        "globalKey" : "d4813765"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "party C"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "d4813765"
-        }
-      } ]
+        "globalKey" : "f5151b56"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-08-30",
+      "meta" : {
+        "globalKey" : "3e821e"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party3",
-          "globalReference" : "d4813765"
-        } ],
-        "role" : "EXERCISE_NOTICE_RECEIVER_PARTY_MANUAL"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "d4813764"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "d4813763"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "d4813764"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -92,31 +32,23 @@
             "productQualifier" : "InterestRate_Option_Swaption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "62cbc746"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "74ea67a"
-                  },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "6e5a630"
+                          "globalKey" : "954e996c"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -125,39 +57,22 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "europeanExercise0",
-                          "globalReference" : "1795a9eb"
+                          "globalReference" : "fd97762b",
+                          "externalReference" : "europeanExercise0"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "6e5a630"
+                      "globalKey" : "954e996c"
                     }
                   },
+                  "meta" : {
+                    "globalKey" : "940abbfa"
+                  },
                   "cashSettlementTerms" : [ {
-                    "cashSettlementMethod" : "PAR_YIELD_CURVE_UNADJUSTED_METHOD",
-                    "meta" : {
-                      "externalKey" : "cashSettlement0",
-                      "globalKey" : "d909f84a"
-                    },
-                    "valuationDate" : {
-                      "valuationDate" : {
-                        "meta" : {
-                          "globalKey" : "7e857845"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "europeanExercise0",
-                          "globalReference" : "1795a9eb"
-                        }
-                      }
-                    },
+                    "cashSettlementMethod" : "ParYieldCurveUnadjustedMethod",
                     "valuationMethod" : {
-                      "quotationMethod" : "MID",
                       "valuationSource" : {
                         "informationSource" : {
                           "primarySource" : {
@@ -166,44 +81,48 @@
                             }
                           }
                         }
+                      },
+                      "quotationMethod" : "Mid"
+                    },
+                    "valuationDate" : {
+                      "valuationDate" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "7ae6233d"
+                        },
+                        "businessDayConvention" : "NONE",
+                        "dateRelativeTo" : {
+                          "globalReference" : "fd97762b",
+                          "externalReference" : "europeanExercise0"
+                        }
                       }
                     },
                     "valuationTime" : {
+                      "hourMinuteTime" : "11:00:00",
                       "businessCenter" : {
                         "value" : "BEBR"
-                      },
-                      "hourMinuteTime" : "11:00:00"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "f67b108e",
+                      "externalKey" : "cashSettlement0"
                     }
                   } ]
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Straddle",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "exerciseNotice" : {
-                        "businessCenter" : {
-                          "value" : "BEBR"
-                        },
-                        "exerciseNoticeGiver" : "BUYER",
-                        "exerciseNoticeReceiver" : "EXERCISE_NOTICE_RECEIVER_PARTY_MANUAL"
-                      }
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-08-28",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
@@ -214,37 +133,49 @@
                                 "globalKey" : "4158421"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da3b6050"
                             }
                           },
                           "meta" : {
                             "globalKey" : "770e7eb4"
-                          },
-                          "unadjustedDate" : "2001-08-28"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "770e7eb4"
                         }
                       } ],
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      },
                       "expirationTime" : {
+                        "hourMinuteTime" : "11:00:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "11:00:00"
+                        }
                       },
                       "meta" : {
-                        "externalKey" : "europeanExercise0",
-                        "globalKey" : "1795a9eb"
+                        "globalKey" : "fd97762b",
+                        "externalKey" : "europeanExercise0"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "exerciseNotice" : {
+                        "exerciseNoticeGiver" : "Buyer",
+                        "exerciseNoticeReceiver" : "ExerciseNoticeReceiverPartyManual",
+                        "businessCenter" : {
+                          "value" : "BEBR"
+                        }
+                      }
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "62cbc746"
-                },
-                "optionType" : "STRADDLE",
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -255,46 +186,42 @@
                       "payout" : {
                         "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters0",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e1"
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb2"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "2b934"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "30/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -303,135 +230,133 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates0",
-                              "globalKey" : "d530b040"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters0",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters0"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters0"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e1"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb2"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "17984"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6a5a890",
+                              "externalKey" : "CalcPeriodDates0"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "30/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "6e2bf001"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64aef4"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "78"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "ac8"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1
+                            "meta" : {
+                              "globalKey" : "9b0d9350"
                             }
                           },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "86242c95"
                           }
                         }, {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters1",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e2"
+                          "rateSpecification" : {
+                            "floatingRate" : {
+                              "rateOption" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "rateOption-1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb3"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "28cc3"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -440,312 +365,383 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates1",
-                              "globalKey" : "c8353f30"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters1",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters1"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters1"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e2"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb3"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "18ad5"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6b3d162",
+                              "externalKey" : "CalcPeriodDates1"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "9ec5a1dd"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64ad85"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters1",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            }
-                          },
-                          "rateSpecification" : {
-                            "floatingRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateOption" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "rateOption-1"
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "8f129421"
                             }
                           },
                           "resetDates" : {
                             "calculationPeriodDatesReference" : {
-                              "externalReference" : "CalcPeriodDates1",
-                              "globalReference" : "c8353f30"
+                              "globalReference" : "d6b3d162",
+                              "externalReference" : "CalcPeriodDates1"
                             },
+                            "resetRelativeTo" : "CalculationPeriodStartDate",
                             "fixingDates" : {
+                              "periodMultiplier" : -2,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "2d80ce65"
+                                "globalKey" : "a5cb919"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : -2,
-                              "dayType" : "BUSINESS",
+                              "dayType" : "Business",
+                              "businessDayConvention" : "NONE",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "fixingBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "fixingBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "NONE",
                               "dateRelativeTo" : {
-                                "externalReference" : "resetDates0",
-                                "globalReference" : "3522cca9"
+                                "globalReference" : "dbaefb1",
+                                "externalReference" : "resetDates0"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "resetDates0",
-                              "globalKey" : "3522cca9"
+                            "resetFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
                             "resetDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "paymentBusinessCenters1",
-                                  "globalReference" : "20a71d"
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "paymentBusinessCenters1"
                                 },
                                 "meta" : {
                                   "globalKey" : "e30c2739"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "19472b0a"
                               }
                             },
-                            "resetFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            },
-                            "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                            "meta" : {
+                              "globalKey" : "dbaefb1",
+                              "externalKey" : "resetDates0"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ad0fb833"
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "893cb5bc"
+                          "globalKey" : "2d8d4cfe"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "893cb5bc"
+                      "globalKey" : "2d8d4cfe"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "893cb5bc"
+                    "globalKey" : "2d8d4cfe"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "1e1fafc8"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "1e1fafc8"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "d7eefcb0"
+            "globalKey" : "613ec6b2"
           }
         },
         "meta" : {
-          "globalKey" : "d7eefcb0"
+          "globalKey" : "613ec6b2"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7f30bbe5"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.05,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.05,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "66e6c0bb"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "65d139a0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Telerate"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "4820adb2"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "d4813763",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "d4813764",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "ExerciseNoticeReceiverPartyManual",
+        "partyReference" : [ {
+          "globalReference" : "d4813765",
+          "externalReference" : "party3"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "d4813764",
+          "externalReference" : "party2"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "d4813763"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e821e"
-      },
-      "value" : "2000-08-30"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "d4813763",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "party B",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "FRG78TR45E"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
         },
-        "version" : 1
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "d4813764"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "d4813763"
-      },
       "meta" : {
-        "globalKey" : "cf509216"
+        "globalKey" : "d4813764",
+        "externalKey" : "party2"
       }
-    } ]
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "party C",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "d4813765"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "d4813765",
+        "externalKey" : "party3"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "188e27ab"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "5ac63039"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "d4813763"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "d4813764"
-        }
-      },
       "quantity" : {
+        "value" : 100000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "d4813763",
+          "externalReference" : "party1"
         },
-        "value" : 100000
+        "receiverPartyReference" : {
+          "globalReference" : "d4813764",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2000-08-30",
         "dateAdjustments" : {
+          "businessDayConvention" : "FOLLOWING",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "EUTA"
@@ -754,16 +750,20 @@
               "globalKey" : "20a71d"
             }
           },
-          "businessDayConvention" : "FOLLOWING",
           "meta" : {
             "globalKey" : "211dc30c"
           }
-        },
-        "unadjustedDate" : "2000-08-30"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "dc25c051"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "8319a186"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex12-euro-swaption-straddle-cash.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex12-euro-swaption-straddle-cash.json
index 87fa073596..25b38376e0 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex12-euro-swaption-straddle-cash.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex12-euro-swaption-straddle-cash.json
@@ -1,67 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "45c96bfa"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "ac9dcd9f"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "d4813763"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "d4813763",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "FRG78TR45E",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "party A"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "d4813763"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "d4813764"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "party B"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "d4813764"
-        }
-      } ]
+        "globalKey" : "f5151b56"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-08-30",
+      "meta" : {
+        "globalKey" : "3e821e"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "d4813764"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "d4813763"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "d4813764"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -69,31 +32,23 @@
             "productQualifier" : "InterestRate_Option_Swaption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "71c61427"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "74ea67a"
-                  },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "6e5a630"
+                          "globalKey" : "954e996c"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -102,39 +57,22 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "europeanExercise0",
-                          "globalReference" : "1795a9eb"
+                          "globalReference" : "fd97762b",
+                          "externalReference" : "europeanExercise0"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "6e5a630"
+                      "globalKey" : "954e996c"
                     }
                   },
+                  "meta" : {
+                    "globalKey" : "940abbfa"
+                  },
                   "cashSettlementTerms" : [ {
-                    "cashSettlementMethod" : "PAR_YIELD_CURVE_UNADJUSTED_METHOD",
-                    "meta" : {
-                      "externalKey" : "cashSettlement0",
-                      "globalKey" : "d909f84a"
-                    },
-                    "valuationDate" : {
-                      "valuationDate" : {
-                        "meta" : {
-                          "globalKey" : "7e857845"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "europeanExercise0",
-                          "globalReference" : "1795a9eb"
-                        }
-                      }
-                    },
+                    "cashSettlementMethod" : "ParYieldCurveUnadjustedMethod",
                     "valuationMethod" : {
-                      "quotationMethod" : "MID",
                       "valuationSource" : {
                         "informationSource" : {
                           "primarySource" : {
@@ -143,43 +81,48 @@
                             }
                           }
                         }
+                      },
+                      "quotationMethod" : "Mid"
+                    },
+                    "valuationDate" : {
+                      "valuationDate" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "7ae6233d"
+                        },
+                        "businessDayConvention" : "NONE",
+                        "dateRelativeTo" : {
+                          "globalReference" : "fd97762b",
+                          "externalReference" : "europeanExercise0"
+                        }
                       }
                     },
                     "valuationTime" : {
+                      "hourMinuteTime" : "11:00:00",
                       "businessCenter" : {
                         "value" : "BEBR"
-                      },
-                      "hourMinuteTime" : "11:00:00"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "f67b108e",
+                      "externalKey" : "cashSettlement0"
                     }
                   } ]
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Straddle",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "exerciseNotice" : {
-                        "businessCenter" : {
-                          "value" : "BEBR"
-                        },
-                        "exerciseNoticeGiver" : "BUYER"
-                      }
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-08-28",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
@@ -190,37 +133,48 @@
                                 "globalKey" : "4158421"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da3b6050"
                             }
                           },
                           "meta" : {
                             "globalKey" : "770e7eb4"
-                          },
-                          "unadjustedDate" : "2001-08-28"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "770e7eb4"
                         }
                       } ],
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      },
                       "expirationTime" : {
+                        "hourMinuteTime" : "11:00:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "11:00:00"
+                        }
                       },
                       "meta" : {
-                        "externalKey" : "europeanExercise0",
-                        "globalKey" : "1795a9eb"
+                        "globalKey" : "fd97762b",
+                        "externalKey" : "europeanExercise0"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "exerciseNotice" : {
+                        "exerciseNoticeGiver" : "Buyer",
+                        "businessCenter" : {
+                          "value" : "BEBR"
+                        }
+                      }
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "71c61427"
-                },
-                "optionType" : "STRADDLE",
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -231,46 +185,42 @@
                       "payout" : {
                         "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters0",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e1"
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb2"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "2b934"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "30/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -279,135 +229,133 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates0",
-                              "globalKey" : "d530b040"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters0",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters0"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters0"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e1"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb2"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "17984"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6a5a890",
+                              "externalKey" : "CalcPeriodDates0"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "30/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "6e2bf001"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64aef4"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "78"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "ac8"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1
+                            "meta" : {
+                              "globalKey" : "9b0d9350"
                             }
                           },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "86242c95"
                           }
                         }, {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters1",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e2"
+                          "rateSpecification" : {
+                            "floatingRate" : {
+                              "rateOption" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "rateOption-1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb3"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "28cc3"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -416,312 +364,360 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates1",
-                              "globalKey" : "c8353f30"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters1",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters1"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters1"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e2"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb3"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "18ad5"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6b3d162",
+                              "externalKey" : "CalcPeriodDates1"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "9ec5a1dd"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64ad85"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters1",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            }
-                          },
-                          "rateSpecification" : {
-                            "floatingRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateOption" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "rateOption-1"
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "8f129421"
                             }
                           },
                           "resetDates" : {
                             "calculationPeriodDatesReference" : {
-                              "externalReference" : "CalcPeriodDates1",
-                              "globalReference" : "c8353f30"
+                              "globalReference" : "d6b3d162",
+                              "externalReference" : "CalcPeriodDates1"
                             },
+                            "resetRelativeTo" : "CalculationPeriodStartDate",
                             "fixingDates" : {
+                              "periodMultiplier" : -2,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "2d80ce65"
+                                "globalKey" : "a5cb919"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : -2,
-                              "dayType" : "BUSINESS",
+                              "dayType" : "Business",
+                              "businessDayConvention" : "NONE",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "fixingBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "fixingBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "NONE",
                               "dateRelativeTo" : {
-                                "externalReference" : "resetDates0",
-                                "globalReference" : "3522cca9"
+                                "globalReference" : "dbaefb1",
+                                "externalReference" : "resetDates0"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "resetDates0",
-                              "globalKey" : "3522cca9"
+                            "resetFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
                             "resetDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "paymentBusinessCenters1",
-                                  "globalReference" : "20a71d"
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "paymentBusinessCenters1"
                                 },
                                 "meta" : {
                                   "globalKey" : "e30c2739"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "19472b0a"
                               }
                             },
-                            "resetFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            },
-                            "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                            "meta" : {
+                              "globalKey" : "dbaefb1",
+                              "externalKey" : "resetDates0"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ad0fb833"
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "893cb5bc"
+                          "globalKey" : "2d8d4cfe"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "893cb5bc"
+                      "globalKey" : "2d8d4cfe"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "893cb5bc"
+                    "globalKey" : "2d8d4cfe"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "395cbd9f"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "395cbd9f"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "8611897d"
+            "globalKey" : "a16fbac9"
           }
         },
         "meta" : {
-          "globalKey" : "8611897d"
+          "globalKey" : "a16fbac9"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7f30bbe5"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.05,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.05,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "66e6c0bb"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "65d139a0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Telerate"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "4820adb2"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "d4813763",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "d4813764",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "d4813764",
+          "externalReference" : "party2"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "d4813763"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e821e"
-      },
-      "value" : "2000-08-30"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "d4813763",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "party B",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "FRG78TR45E"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
         },
-        "version" : 1
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "d4813764"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "d4813763"
-      },
       "meta" : {
-        "globalKey" : "cf509216"
+        "globalKey" : "d4813764",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "48ff8ab9"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "5ac63039"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "d4813763"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "d4813764"
-        }
-      },
       "quantity" : {
+        "value" : 100000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "d4813763",
+          "externalReference" : "party1"
         },
-        "value" : 100000
+        "receiverPartyReference" : {
+          "globalReference" : "d4813764",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2000-08-30",
         "dateAdjustments" : {
+          "businessDayConvention" : "FOLLOWING",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "EUTA"
@@ -730,16 +726,20 @@
               "globalKey" : "20a71d"
             }
           },
-          "businessDayConvention" : "FOLLOWING",
           "meta" : {
             "globalKey" : "211dc30c"
           }
-        },
-        "unadjustedDate" : "2000-08-30"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "dc25c051"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "c5c45338"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex13-euro-swaption-cash-with-cfs.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex13-euro-swaption-cash-with-cfs.json
index 34432f59fe..c8eb407b28 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex13-euro-swaption-cash-with-cfs.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex13-euro-swaption-cash-with-cfs.json
@@ -1,65 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "4dec8805"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "a9ace0b4"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "957b3c47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "957bb0a6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-08-30",
+      "meta" : {
+        "globalKey" : "3e821e"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -67,31 +47,23 @@
             "productQualifier" : "InterestRate_Option_Swaption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "27a29105"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "75041c4"
-                  },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "6e5a630"
+                          "globalKey" : "954e996c"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -100,39 +72,22 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "europeanExercise0",
-                          "globalReference" : "d38d46bd"
+                          "globalReference" : "ecfef6b9",
+                          "externalReference" : "europeanExercise0"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "6e5a630"
+                      "globalKey" : "954e996c"
                     }
                   },
+                  "meta" : {
+                    "globalKey" : "940c5744"
+                  },
                   "cashSettlementTerms" : [ {
-                    "cashSettlementMethod" : "PAR_YIELD_CURVE_UNADJUSTED_METHOD",
-                    "meta" : {
-                      "externalKey" : "cashSettlement0",
-                      "globalKey" : "d90b9394"
-                    },
-                    "valuationDate" : {
-                      "valuationDate" : {
-                        "meta" : {
-                          "globalKey" : "7e857845"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "europeanExercise0",
-                          "globalReference" : "d38d46bd"
-                        }
-                      }
-                    },
+                    "cashSettlementMethod" : "ParYieldCurveUnadjustedMethod",
                     "valuationMethod" : {
-                      "quotationMethod" : "MID",
                       "valuationSource" : {
                         "informationSource" : {
                           "primarySource" : {
@@ -141,72 +96,48 @@
                             }
                           }
                         }
+                      },
+                      "quotationMethod" : "Mid"
+                    },
+                    "valuationDate" : {
+                      "valuationDate" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "7ae6233d"
+                        },
+                        "businessDayConvention" : "NONE",
+                        "dateRelativeTo" : {
+                          "globalReference" : "ecfef6b9",
+                          "externalReference" : "europeanExercise0"
+                        }
                       }
                     },
                     "valuationTime" : {
+                      "hourMinuteTime" : "11:00:00",
                       "businessCenter" : {
                         "value" : "EUTA"
-                      },
-                      "hourMinuteTime" : "11:00:00"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "f67cabd8",
+                      "externalKey" : "cashSettlement0"
                     }
                   } ]
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Straddle",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "exerciseNotice" : {
-                        "businessCenter" : {
-                          "value" : "BEBR"
-                        },
-                        "exerciseNoticeGiver" : "BUYER"
-                      }
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
-                      "exerciseFee" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2",
-                        "feeAmount" : 100000,
-                        "feePaymentDate" : {
-                          "meta" : {
-                            "globalKey" : "d2cddbaa"
-                          },
-                          "period" : "D",
-                          "periodMultiplier" : 0,
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "EUTA"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "20a71d"
-                            }
-                          },
-                          "businessDayConvention" : "NONE",
-                          "dateRelativeTo" : {
-                            "externalReference" : "europeanExercise0",
-                            "globalReference" : "d38d46bd"
-                          }
-                        },
-                        "notionalReference" : {
-                          "externalReference" : "notional0",
-                          "globalReference" : "0"
-                        }
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-08-28",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
@@ -217,37 +148,77 @@
                                 "globalKey" : "4158421"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da3b6050"
                             }
                           },
                           "meta" : {
                             "globalKey" : "770e7eb4"
-                          },
-                          "unadjustedDate" : "2001-08-28"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "770e7eb4"
                         }
                       } ],
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      },
                       "expirationTime" : {
+                        "hourMinuteTime" : "11:00:00",
                         "businessCenter" : {
                           "value" : "GBLO"
+                        }
+                      },
+                      "exerciseFee" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2",
+                        "notionalReference" : {
+                          "globalReference" : "0",
+                          "externalReference" : "notional0"
                         },
-                        "hourMinuteTime" : "11:00:00"
+                        "feeAmount" : 100000,
+                        "feePaymentDate" : {
+                          "periodMultiplier" : 0,
+                          "period" : "D",
+                          "meta" : {
+                            "globalKey" : "4825adb2"
+                          },
+                          "businessDayConvention" : "NONE",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "EUTA"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "20a71d"
+                            }
+                          },
+                          "dateRelativeTo" : {
+                            "globalReference" : "ecfef6b9",
+                            "externalReference" : "europeanExercise0"
+                          }
+                        }
                       },
                       "meta" : {
-                        "externalKey" : "europeanExercise0",
-                        "globalKey" : "d38d46bd"
+                        "globalKey" : "ecfef6b9",
+                        "externalKey" : "europeanExercise0"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "exerciseNotice" : {
+                        "exerciseNoticeGiver" : "Buyer",
+                        "businessCenter" : {
+                          "value" : "BEBR"
+                        }
+                      }
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "27a29105"
-                },
-                "optionType" : "STRADDLE",
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -258,47 +229,43 @@
                       "payout" : {
                         "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "externalKey" : "notional0",
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0",
+                              "externalKey" : "notional0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters0",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e1"
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb2"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "2b934"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "30/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -307,42 +274,92 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates0",
-                              "globalKey" : "d530b040"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters0",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters0"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters0"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e1"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb2"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "17984"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6a5a890",
+                              "externalKey" : "CalcPeriodDates0"
+                            }
+                          },
+                          "paymentDates" : {
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "78"
+                              }
+                            },
+                            "payRelativeTo" : "CalculationPeriodEndDate",
+                            "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCenter" : [ {
+                                  "value" : "EUTA"
+                                } ],
+                                "meta" : {
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters0"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "365baaee"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "9b0d9350"
                             }
                           },
                           "cashflowRepresentation" : {
@@ -350,166 +367,114 @@
                             "paymentCalculationPeriod" : [ {
                               "adjustedPaymentDate" : "2002-08-20",
                               "calculationPeriod" : [ {
-                                "adjustedEndDate" : "2002-08-30",
                                 "adjustedStartDate" : "2001-08-30",
+                                "adjustedEndDate" : "2002-08-30",
                                 "meta" : {
-                                  "globalKey" : "7a0caece"
+                                  "globalKey" : "a1ae6f32"
                                 },
-                                "fixedRate" : 0.05,
-                                "notionalAmount" : 100000000
+                                "notionalAmount" : 100000000,
+                                "fixedRate" : 0.05
                               } ],
                               "meta" : {
-                                "globalKey" : "363a493a"
+                                "globalKey" : "5ddc099e"
                               }
                             }, {
                               "adjustedPaymentDate" : "2003-08-29",
                               "calculationPeriod" : [ {
-                                "adjustedEndDate" : "2003-08-29",
                                 "adjustedStartDate" : "2002-08-28",
+                                "adjustedEndDate" : "2003-08-29",
                                 "meta" : {
-                                  "globalKey" : "7dcd32ed"
+                                  "globalKey" : "a56e82b3"
                                 },
-                                "fixedRate" : 0.05,
-                                "notionalAmount" : 100000000
+                                "notionalAmount" : 100000000,
+                                "fixedRate" : 0.05
                               } ],
                               "meta" : {
-                                "globalKey" : "f01b62f0"
+                                "globalKey" : "17bcb2b6"
                               }
                             }, {
                               "adjustedPaymentDate" : "2004-08-30",
                               "calculationPeriod" : [ {
-                                "adjustedEndDate" : "2005-08-30",
                                 "adjustedStartDate" : "2003-08-29",
+                                "adjustedEndDate" : "2005-08-30",
                                 "meta" : {
-                                  "globalKey" : "8531a30d"
+                                  "globalKey" : "a94e02d3"
                                 },
-                                "fixedRate" : 0.05,
-                                "notionalAmount" : 100000000
+                                "notionalAmount" : 100000000,
+                                "fixedRate" : 0.05
                               } ],
                               "meta" : {
-                                "globalKey" : "9ff9a3af"
+                                "globalKey" : "c4160375"
                               }
                             }, {
                               "adjustedPaymentDate" : "2005-08-30",
                               "calculationPeriod" : [ {
-                                "adjustedEndDate" : "2005-08-30",
                                 "adjustedStartDate" : "2004-08-30",
+                                "adjustedEndDate" : "2005-08-30",
                                 "meta" : {
-                                  "globalKey" : "854faece"
+                                  "globalKey" : "acf16f32"
                                 },
-                                "fixedRate" : 0.05,
-                                "notionalAmount" : 100000000
+                                "notionalAmount" : 100000000,
+                                "fixedRate" : 0.05
                               } ],
                               "meta" : {
-                                "globalKey" : "46dca770"
+                                "globalKey" : "6e7e67d4"
                               }
                             }, {
                               "adjustedPaymentDate" : "2006-08-30",
                               "calculationPeriod" : [ {
-                                "adjustedEndDate" : "2006-08-30",
                                 "adjustedStartDate" : "2005-08-30",
+                                "adjustedEndDate" : "2006-08-30",
                                 "meta" : {
-                                  "globalKey" : "8910aece"
+                                  "globalKey" : "b0b26f32"
                                 },
-                                "fixedRate" : 0.05,
-                                "notionalAmount" : 100000000
+                                "notionalAmount" : 100000000,
+                                "fixedRate" : 0.05
                               } ],
                               "meta" : {
-                                "globalKey" : "f1629f70"
+                                "globalKey" : "19045fd4"
                               }
                             } ]
                           },
-                          "dayCountFraction" : {
-                            "value" : "30/360"
-                          },
                           "meta" : {
-                            "globalKey" : "8a3bd3d9"
-                          },
-                          "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64aef4"
-                            },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                            "paymentDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCenter" : [ {
-                                  "value" : "EUTA"
-                                } ],
-                                "meta" : {
-                                  "externalKey" : "paymentBusinessCenters0",
-                                  "globalKey" : "20a71d"
-                                }
-                              },
-                              "businessDayConvention" : "MODFOLLOWING",
-                              "meta" : {
-                                "globalKey" : "365baaee"
-                              }
-                            },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "ac8"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1
-                            }
-                          },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
-                              }
-                            }
+                            "globalKey" : "3620e2cd"
                           }
                         }, {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters1",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e2"
+                          "rateSpecification" : {
+                            "floatingRate" : {
+                              "rateOption" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "rateOption-1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb3"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "28cc3"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -518,42 +483,147 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates1",
-                              "globalKey" : "c8353f30"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters1",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters1"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters1"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e2"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb3"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "18ad5"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6b3d162",
+                              "externalKey" : "CalcPeriodDates1"
+                            }
+                          },
+                          "paymentDates" : {
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
+                            },
+                            "payRelativeTo" : "CalculationPeriodEndDate",
+                            "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCenter" : [ {
+                                  "value" : "EUTA"
+                                } ],
+                                "meta" : {
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters1"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "365baaee"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "8f129421"
+                            }
+                          },
+                          "resetDates" : {
+                            "calculationPeriodDatesReference" : {
+                              "globalReference" : "d6b3d162",
+                              "externalReference" : "CalcPeriodDates1"
+                            },
+                            "resetRelativeTo" : "CalculationPeriodStartDate",
+                            "fixingDates" : {
+                              "periodMultiplier" : -2,
+                              "period" : "D",
+                              "meta" : {
+                                "globalKey" : "a5cb919"
+                              },
+                              "dayType" : "Business",
+                              "businessDayConvention" : "NONE",
+                              "businessCenters" : {
+                                "businessCenter" : [ {
+                                  "value" : "EUTA"
+                                } ],
+                                "meta" : {
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "fixingBusinessCenters0"
+                                }
+                              },
+                              "dateRelativeTo" : {
+                                "globalReference" : "dbaefb1",
+                                "externalReference" : "resetDates0"
+                              }
+                            },
+                            "resetFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
+                            },
+                            "resetDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "paymentBusinessCenters1"
+                                },
+                                "meta" : {
+                                  "globalKey" : "e30c2739"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "19472b0a"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "dbaefb1",
+                              "externalKey" : "resetDates0"
                             }
                           },
                           "cashflowRepresentation" : {
@@ -561,508 +631,434 @@
                             "paymentCalculationPeriod" : [ {
                               "adjustedPaymentDate" : "2002-02-28",
                               "calculationPeriod" : [ {
-                                "adjustedEndDate" : "2002-02-28",
                                 "adjustedStartDate" : "2001-08-30",
+                                "adjustedEndDate" : "2002-02-28",
                                 "meta" : {
-                                  "globalKey" : "9d39d454"
+                                  "globalKey" : "429b7c98"
                                 },
+                                "notionalAmount" : 100000000,
                                 "floatingRateDefinition" : {
                                   "rateObservation" : [ {
                                     "adjustedFixingDate" : "2001-08-28",
+                                    "observationWeight" : 1,
                                     "meta" : {
                                       "globalKey" : "792b965"
-                                    },
-                                    "observationWeight" : 1
+                                    }
                                   } ]
-                                },
-                                "notionalAmount" : 100000000
+                                }
                               } ],
                               "meta" : {
-                                "globalKey" : "579c08f0"
+                                "globalKey" : "fcfdb134"
                               }
                             }, {
                               "adjustedPaymentDate" : "2002-08-30",
                               "calculationPeriod" : [ {
-                                "adjustedEndDate" : "2002-08-30",
                                 "adjustedStartDate" : "2002-02-28",
+                                "adjustedEndDate" : "2002-08-30",
                                 "meta" : {
-                                  "globalKey" : "74764dda"
+                                  "globalKey" : "43ff9596"
                                 },
+                                "notionalAmount" : 100000000,
                                 "floatingRateDefinition" : {
                                   "rateObservation" : [ {
                                     "adjustedFixingDate" : "2002-02-26",
+                                    "observationWeight" : 1,
                                     "meta" : {
                                       "globalKey" : "79382a7"
-                                    },
-                                    "observationWeight" : 1
+                                    }
                                   } ]
-                                },
-                                "notionalAmount" : 100000000
+                                }
                               } ],
                               "meta" : {
-                                "globalKey" : "be07e1f8"
+                                "globalKey" : "8d9129b4"
                               }
                             }, {
                               "adjustedPaymentDate" : "2003-02-28",
                               "calculationPeriod" : [ {
-                                "adjustedEndDate" : "2003-02-28",
                                 "adjustedStartDate" : "2002-08-30",
+                                "adjustedEndDate" : "2003-02-28",
                                 "meta" : {
-                                  "globalKey" : "75d9cc54"
+                                  "globalKey" : "1b3b7498"
                                 },
+                                "notionalAmount" : 100000000,
                                 "floatingRateDefinition" : {
                                   "rateObservation" : [ {
                                     "adjustedFixingDate" : "2002-08-28",
+                                    "observationWeight" : 1,
                                     "meta" : {
                                       "globalKey" : "793b165"
-                                    },
-                                    "observationWeight" : 1
+                                    }
                                   } ]
-                                },
-                                "notionalAmount" : 100000000
+                                }
                               } ],
                               "meta" : {
-                                "globalKey" : "53b408f0"
+                                "globalKey" : "f915b134"
                               }
                             }, {
                               "adjustedPaymentDate" : "2003-08-29",
                               "calculationPeriod" : [ {
-                                "adjustedEndDate" : "2003-08-29",
                                 "adjustedStartDate" : "2003-02-28",
+                                "adjustedEndDate" : "2003-08-29",
                                 "meta" : {
-                                  "globalKey" : "18300a99"
+                                  "globalKey" : "1aeab4f7"
                                 },
+                                "notionalAmount" : 100000000,
                                 "floatingRateDefinition" : {
                                   "rateObservation" : [ {
                                     "adjustedFixingDate" : "2003-02-26",
+                                    "observationWeight" : 1,
                                     "meta" : {
                                       "globalKey" : "7947aa7"
-                                    },
-                                    "observationWeight" : 1
+                                    }
                                   } ]
-                                },
-                                "notionalAmount" : 100000000
+                                }
                               } ],
                               "meta" : {
-                                "globalKey" : "f0f537b6"
+                                "globalKey" : "f3afe214"
                               }
                             }, {
                               "adjustedPaymentDate" : "2004-02-27",
                               "calculationPeriod" : [ {
-                                "adjustedEndDate" : "2004-02-27",
                                 "adjustedStartDate" : "2003-08-29",
+                                "adjustedEndDate" : "2004-02-27",
                                 "meta" : {
-                                  "globalKey" : "17deb055"
+                                  "globalKey" : "bd405899"
                                 },
+                                "notionalAmount" : 100000000,
                                 "floatingRateDefinition" : {
                                   "rateObservation" : [ {
                                     "adjustedFixingDate" : "2003-08-27",
+                                    "observationWeight" : 1,
                                     "meta" : {
                                       "globalKey" : "794a946"
-                                    },
-                                    "observationWeight" : 1
+                                    }
                                   } ]
-                                },
-                                "notionalAmount" : 100000000
+                                }
                               } ],
                               "meta" : {
-                                "globalKey" : "84ec85f0"
+                                "globalKey" : "2a4e2e34"
                               }
                             }, {
                               "adjustedPaymentDate" : "2004-08-30",
                               "calculationPeriod" : [ {
-                                "adjustedEndDate" : "2005-08-30",
                                 "adjustedStartDate" : "2004-02-27",
+                                "adjustedEndDate" : "2005-08-30",
                                 "meta" : {
-                                  "globalKey" : "55db6d1c"
+                                  "globalKey" : "671e4236"
                                 },
+                                "notionalAmount" : 100000000,
                                 "floatingRateDefinition" : {
                                   "rateObservation" : [ {
                                     "adjustedFixingDate" : "2004-02-25",
+                                    "observationWeight" : 1,
                                     "meta" : {
                                       "globalKey" : "7957288"
-                                    },
-                                    "observationWeight" : 1
+                                    }
                                   } ]
-                                },
-                                "notionalAmount" : 100000000
+                                }
                               } ],
                               "meta" : {
-                                "globalKey" : "e65d113a"
+                                "globalKey" : "f79fe654"
                               }
                             }, {
                               "adjustedPaymentDate" : "2005-02-28",
                               "calculationPeriod" : [ {
-                                "adjustedEndDate" : "2005-02-28",
                                 "adjustedStartDate" : "2004-08-30",
+                                "adjustedEndDate" : "2005-02-28",
                                 "meta" : {
-                                  "globalKey" : "2719bc35"
+                                  "globalKey" : "cc7b6479"
                                 },
+                                "notionalAmount" : 100000000,
                                 "floatingRateDefinition" : {
                                   "rateObservation" : [ {
                                     "adjustedFixingDate" : "2004-08-27",
+                                    "observationWeight" : 1,
                                     "meta" : {
                                       "globalKey" : "795a146"
-                                    },
-                                    "observationWeight" : 1
+                                    }
                                   } ]
-                                },
-                                "notionalAmount" : 100000000
+                                }
                               } ],
                               "meta" : {
-                                "globalKey" : "4be408d1"
+                                "globalKey" : "f145b115"
                               }
                             }, {
                               "adjustedPaymentDate" : "2005-08-30",
                               "calculationPeriod" : [ {
-                                "adjustedEndDate" : "2005-08-30",
                                 "adjustedStartDate" : "2005-02-28",
+                                "adjustedEndDate" : "2005-08-30",
                                 "meta" : {
-                                  "globalKey" : "fe56359c"
+                                  "globalKey" : "cddf7d58"
                                 },
+                                "notionalAmount" : 100000000,
                                 "floatingRateDefinition" : {
                                   "rateObservation" : [ {
                                     "adjustedFixingDate" : "2005-02-24",
+                                    "observationWeight" : 1,
                                     "meta" : {
                                       "globalKey" : "7966a69"
-                                    },
-                                    "observationWeight" : 1
+                                    }
                                   } ]
-                                },
-                                "notionalAmount" : 100000000
+                                }
                               } ],
                               "meta" : {
-                                "globalKey" : "b24fe1ba"
+                                "globalKey" : "81d92976"
                               }
                             }, {
                               "adjustedPaymentDate" : "2006-02-28",
                               "calculationPeriod" : [ {
-                                "adjustedEndDate" : "2006-02-28",
                                 "adjustedStartDate" : "2005-08-30",
+                                "adjustedEndDate" : "2006-02-28",
                                 "meta" : {
-                                  "globalKey" : "ffb9b416"
+                                  "globalKey" : "a51b5c5a"
                                 },
+                                "notionalAmount" : 100000000,
                                 "floatingRateDefinition" : {
                                   "rateObservation" : [ {
                                     "adjustedFixingDate" : "2005-08-26",
+                                    "observationWeight" : 1,
                                     "meta" : {
                                       "globalKey" : "7969927"
-                                    },
-                                    "observationWeight" : 1
+                                    }
                                   } ]
-                                },
-                                "notionalAmount" : 100000000
+                                }
                               } ],
                               "meta" : {
-                                "globalKey" : "47fc08b2"
+                                "globalKey" : "ed5db0f6"
                               }
                             }, {
                               "adjustedPaymentDate" : "2006-08-30",
                               "calculationPeriod" : [ {
-                                "adjustedEndDate" : "2006-08-30",
                                 "adjustedStartDate" : "2006-02-28",
+                                "adjustedEndDate" : "2006-08-30",
                                 "meta" : {
-                                  "globalKey" : "d6f62d9c"
+                                  "globalKey" : "a67f7558"
                                 },
+                                "notionalAmount" : 100000000,
                                 "floatingRateDefinition" : {
                                   "rateObservation" : [ {
                                     "adjustedFixingDate" : "2006-02-24",
+                                    "observationWeight" : 1,
                                     "meta" : {
                                       "globalKey" : "7976269"
-                                    },
-                                    "observationWeight" : 1
+                                    }
                                   } ]
-                                },
-                                "notionalAmount" : 100000000
+                                }
                               } ],
                               "meta" : {
-                                "globalKey" : "ae67e1ba"
+                                "globalKey" : "7df12976"
                               }
                             } ]
                           },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
                           "meta" : {
-                            "globalKey" : "40779895"
-                          },
-                          "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64ad85"
-                            },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                            "paymentDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCenter" : [ {
-                                  "value" : "EUTA"
-                                } ],
-                                "meta" : {
-                                  "externalKey" : "paymentBusinessCenters1",
-                                  "globalKey" : "20a71d"
-                                }
-                              },
-                              "businessDayConvention" : "MODFOLLOWING",
-                              "meta" : {
-                                "globalKey" : "365baaee"
-                              }
-                            },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            }
-                          },
-                          "rateSpecification" : {
-                            "floatingRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateOption" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "rateOption-1"
-                                }
-                              }
-                            }
-                          },
-                          "resetDates" : {
-                            "calculationPeriodDatesReference" : {
-                              "externalReference" : "CalcPeriodDates1",
-                              "globalReference" : "c8353f30"
-                            },
-                            "fixingDates" : {
-                              "meta" : {
-                                "globalKey" : "2d80ce65"
-                              },
-                              "period" : "D",
-                              "periodMultiplier" : -2,
-                              "dayType" : "BUSINESS",
-                              "businessCenters" : {
-                                "businessCenter" : [ {
-                                  "value" : "EUTA"
-                                } ],
-                                "meta" : {
-                                  "externalKey" : "fixingBusinessCenters0",
-                                  "globalKey" : "20a71d"
-                                }
-                              },
-                              "businessDayConvention" : "NONE",
-                              "dateRelativeTo" : {
-                                "externalReference" : "resetDates0",
-                                "globalReference" : "3522cca9"
-                              }
-                            },
-                            "meta" : {
-                              "externalKey" : "resetDates0",
-                              "globalKey" : "3522cca9"
-                            },
-                            "resetDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "paymentBusinessCenters1",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "e30c2739"
-                                }
-                              },
-                              "businessDayConvention" : "MODFOLLOWING",
-                              "meta" : {
-                                "globalKey" : "19472b0a"
-                              }
-                            },
-                            "resetFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            },
-                            "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                            "globalKey" : "f8019b43"
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "f2b6f85c"
+                          "globalKey" : "4a53496"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "f2b6f85c"
+                      "globalKey" : "4a53496"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "f2b6f85c"
+                    "globalKey" : "4a53496"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "2faf27f7"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "2faf27f7"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "d15e06db"
+            "globalKey" : "4cd0ef21"
           }
         },
         "meta" : {
-          "globalKey" : "d15e06db"
+          "globalKey" : "4cd0ef21"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7f30bbe5"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.05,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.05,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "66e6c0bb"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "65d139a0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Telerate"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "4820adb2"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e821e"
-      },
-      "value" : "2000-08-30"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c7753bbd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c7753bbe"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "dce37d64"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "5ac63039"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        }
-      },
       "quantity" : {
+        "value" : 100000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         },
-        "value" : 100000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2000-08-30",
         "dateAdjustments" : {
+          "businessDayConvention" : "FOLLOWING",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "EUTA"
@@ -1071,16 +1067,20 @@
               "globalKey" : "20a71d"
             }
           },
-          "businessDayConvention" : "FOLLOWING",
           "meta" : {
             "globalKey" : "211dc30c"
           }
-        },
-        "unadjustedDate" : "2000-08-30"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "dc25c051"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "d37f496d"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex14-berm-swaption.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex14-berm-swaption.json
index 362a732759..2e98e9d1f5 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex14-berm-swaption.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex14-berm-swaption.json
@@ -1,65 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "4b191c38"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "47cab2a1"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "957b3c47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "957bb0a6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-08-30",
+      "meta" : {
+        "globalKey" : "3e821e"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -67,39 +47,24 @@
             "productQualifier" : "InterestRate_Option_Swaption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "6ce88df2"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "exerciseNotice" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "exerciseNoticeGiver" : "SELLER"
-                      }
-                    }
-                  },
                   "optionStyle" : {
                     "bermudaExercise" : {
                       "bermudaExerciseDates" : {
                         "adjustableDates" : {
+                          "unadjustedDate" : [ "2000-12-28", "2001-04-28", "2001-08-28" ],
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
@@ -110,47 +75,27 @@
                                 "globalKey" : "4158421"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da3b6050"
                             }
                           },
                           "meta" : {
                             "globalKey" : "e29d6834"
-                          },
-                          "unadjustedDate" : [ "2000-12-28", "2001-04-28", "2001-08-28" ]
+                          }
                         },
                         "meta" : {
                           "globalKey" : "e29d6834"
                         }
                       },
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "BEBR"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
-                      "expirationTime" : {
-                        "businessCenter" : {
-                          "value" : "BEBR"
-                        },
-                        "hourMinuteTime" : "11:00:00"
-                      },
-                      "meta" : {
-                        "externalKey" : "bermudaExercise0",
-                        "globalKey" : "4e0fd1fa"
-                      },
                       "relevantUnderlyingDate" : {
-                        "meta" : {
-                          "globalKey" : "2eca9d6f"
-                        },
                         "relativeDates" : {
+                          "periodMultiplier" : 2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "2eca9d6f"
+                            "globalKey" : "c6c3b1ab"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -161,19 +106,45 @@
                               "globalKey" : "4158421"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "bermudaExercise0",
-                            "globalReference" : "4e0fd1fa"
+                            "globalReference" : "32e3a858",
+                            "externalReference" : "bermudaExercise0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "c6c3b1ab"
+                        }
+                      },
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "BEBR"
                         }
+                      },
+                      "expirationTime" : {
+                        "hourMinuteTime" : "11:00:00",
+                        "businessCenter" : {
+                          "value" : "BEBR"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "32e3a858",
+                        "externalKey" : "bermudaExercise0"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "exerciseNotice" : {
+                        "exerciseNoticeGiver" : "Seller",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      }
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "6ce88df2"
-                },
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -184,46 +155,42 @@
                       "payout" : {
                         "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters0",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e1"
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb2"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "2b934"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "30/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -232,135 +199,133 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates0",
-                              "globalKey" : "d530b040"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters0",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters0"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters0"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e1"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb2"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "17984"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6a5a890",
+                              "externalKey" : "CalcPeriodDates0"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "30/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "6e2bf001"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64aef4"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "78"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "ac8"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1
+                            "meta" : {
+                              "globalKey" : "9b0d9350"
                             }
                           },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "86242c95"
                           }
                         }, {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters1",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e2"
+                          "rateSpecification" : {
+                            "floatingRate" : {
+                              "rateOption" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "rateOption-1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb3"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "28cc3"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -369,327 +334,358 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates1",
-                              "globalKey" : "c8353f30"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters1",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters1"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters1"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e2"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb3"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "18ad5"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6b3d162",
+                              "externalKey" : "CalcPeriodDates1"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "9ec5a1dd"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64ad85"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters1",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            }
-                          },
-                          "rateSpecification" : {
-                            "floatingRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateOption" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "rateOption-1"
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "8f129421"
                             }
                           },
                           "resetDates" : {
                             "calculationPeriodDatesReference" : {
-                              "externalReference" : "CalcPeriodDates1",
-                              "globalReference" : "c8353f30"
+                              "globalReference" : "d6b3d162",
+                              "externalReference" : "CalcPeriodDates1"
                             },
+                            "resetRelativeTo" : "CalculationPeriodStartDate",
                             "fixingDates" : {
+                              "periodMultiplier" : -2,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "2d80ce65"
+                                "globalKey" : "a5cb919"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : -2,
-                              "dayType" : "BUSINESS",
+                              "dayType" : "Business",
+                              "businessDayConvention" : "NONE",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "fixingBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "fixingBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "NONE",
                               "dateRelativeTo" : {
-                                "externalReference" : "resetDates0",
-                                "globalReference" : "3522cca9"
+                                "globalReference" : "dbaefb1",
+                                "externalReference" : "resetDates0"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "resetDates0",
-                              "globalKey" : "3522cca9"
+                            "resetFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
                             "resetDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "paymentBusinessCenters1",
-                                  "globalReference" : "20a71d"
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "paymentBusinessCenters1"
                                 },
                                 "meta" : {
                                   "globalKey" : "e30c2739"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "19472b0a"
                               }
                             },
-                            "resetFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            },
-                            "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                            "meta" : {
+                              "globalKey" : "dbaefb1",
+                              "externalKey" : "resetDates0"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ad0fb833"
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "893cb5bc"
+                          "globalKey" : "2d8d4cfe"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "893cb5bc"
+                      "globalKey" : "2d8d4cfe"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "893cb5bc"
+                    "globalKey" : "2d8d4cfe"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "8f2e1eaa"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "8f2e1eaa"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "e2891c5c"
+            "globalKey" : "c86d0514"
           }
         },
         "meta" : {
-          "globalKey" : "e2891c5c"
+          "globalKey" : "c86d0514"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7f30bbe5"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.05,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.05,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "66e6c0bb"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "65d139a0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Telerate"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "4820adb2"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e821e"
-      },
-      "value" : "2000-08-30"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c7753bbd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c7753bbe"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "16e42f73"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "5ac63039"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        }
-      },
       "quantity" : {
+        "value" : 100000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         },
-        "value" : 100000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2000-08-30",
         "dateAdjustments" : {
+          "businessDayConvention" : "FOLLOWING",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "EUTA"
@@ -698,16 +694,20 @@
               "globalKey" : "20a71d"
             }
           },
-          "businessDayConvention" : "FOLLOWING",
           "meta" : {
             "globalKey" : "211dc30c"
           }
-        },
-        "unadjustedDate" : "2000-08-30"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "dc25c051"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "b717c6be"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex15-amer-swaption.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex15-amer-swaption.json
index b3ed9cf6d6..84810786ba 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex15-amer-swaption.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex15-amer-swaption.json
@@ -1,65 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "c74fedc9"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "de18e870"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "957b3c47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "957bb0a6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-08-30",
+      "meta" : {
+        "globalKey" : "3e821e"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -67,39 +47,24 @@
             "productQualifier" : "InterestRate_Option_Swaption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "68d6dcc3"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "exerciseNotice" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "exerciseNoticeGiver" : "SELLER"
-                      }
-                    }
-                  },
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2000-08-30",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
@@ -110,29 +75,23 @@
                                 "globalKey" : "4158421"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da3b6050"
                             }
                           },
                           "meta" : {
                             "globalKey" : "3d69e072"
-                          },
-                          "unadjustedDate" : "2000-08-30"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "3d69e072"
                         }
                       },
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "EUTA"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2002-08-30",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
@@ -143,47 +102,27 @@
                                 "globalKey" : "4158421"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da3b6050"
                             }
                           },
                           "meta" : {
                             "globalKey" : "5037d072"
-                          },
-                          "unadjustedDate" : "2002-08-30"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "5037d072"
                         }
                       },
-                      "expirationTime" : {
-                        "businessCenter" : {
-                          "value" : "EUTA"
-                        },
-                        "hourMinuteTime" : "11:00:00"
-                      },
-                      "latestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "EUTA"
-                        },
-                        "hourMinuteTime" : "11:00:00"
-                      },
-                      "meta" : {
-                        "externalKey" : "americanExercise0",
-                        "globalKey" : "9b4d2749"
-                      },
                       "relevantUnderlyingDate" : {
-                        "meta" : {
-                          "globalKey" : "d4ef3003"
-                        },
                         "relativeDates" : {
+                          "periodMultiplier" : 2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "d4ef3003"
+                            "globalKey" : "6ce8443f"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -194,19 +133,51 @@
                               "globalKey" : "4158421"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "americanExercise0",
-                            "globalReference" : "9b4d2749"
+                            "globalReference" : "77fb1671",
+                            "externalReference" : "americanExercise0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "6ce8443f"
+                        }
+                      },
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "EUTA"
+                        }
+                      },
+                      "latestExerciseTime" : {
+                        "hourMinuteTime" : "11:00:00",
+                        "businessCenter" : {
+                          "value" : "EUTA"
                         }
+                      },
+                      "expirationTime" : {
+                        "hourMinuteTime" : "11:00:00",
+                        "businessCenter" : {
+                          "value" : "EUTA"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "77fb1671",
+                        "externalKey" : "americanExercise0"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "exerciseNotice" : {
+                        "exerciseNoticeGiver" : "Seller",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      }
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "68d6dcc3"
-                },
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -217,46 +188,42 @@
                       "payout" : {
                         "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters0",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e1"
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb2"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "2b934"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "30/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -265,135 +232,133 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates0",
-                              "globalKey" : "d530b040"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters0",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters0"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters0"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e1"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb2"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "17984"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6a5a890",
+                              "externalKey" : "CalcPeriodDates0"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "30/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "6e2bf001"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64aef4"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "78"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "ac8"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1
+                            "meta" : {
+                              "globalKey" : "9b0d9350"
                             }
                           },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "86242c95"
                           }
                         }, {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters1",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e2"
+                          "rateSpecification" : {
+                            "floatingRate" : {
+                              "rateOption" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "rateOption-1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb3"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "28cc3"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -402,327 +367,358 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates1",
-                              "globalKey" : "c8353f30"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters1",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters1"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters1"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e2"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb3"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "18ad5"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6b3d162",
+                              "externalKey" : "CalcPeriodDates1"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "9ec5a1dd"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64ad85"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters1",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            }
-                          },
-                          "rateSpecification" : {
-                            "floatingRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateOption" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "rateOption-1"
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "8f129421"
                             }
                           },
                           "resetDates" : {
                             "calculationPeriodDatesReference" : {
-                              "externalReference" : "CalcPeriodDates1",
-                              "globalReference" : "c8353f30"
+                              "globalReference" : "d6b3d162",
+                              "externalReference" : "CalcPeriodDates1"
                             },
+                            "resetRelativeTo" : "CalculationPeriodStartDate",
                             "fixingDates" : {
+                              "periodMultiplier" : -2,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "2d80ce65"
+                                "globalKey" : "a5cb919"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : -2,
-                              "dayType" : "BUSINESS",
+                              "dayType" : "Business",
+                              "businessDayConvention" : "NONE",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "fixingBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "fixingBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "NONE",
                               "dateRelativeTo" : {
-                                "externalReference" : "resetDates0",
-                                "globalReference" : "3522cca9"
+                                "globalReference" : "dbaefb1",
+                                "externalReference" : "resetDates0"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "resetDates0",
-                              "globalKey" : "3522cca9"
+                            "resetFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
                             "resetDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "paymentBusinessCenters1",
-                                  "globalReference" : "20a71d"
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "paymentBusinessCenters1"
                                 },
                                 "meta" : {
                                   "globalKey" : "e30c2739"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "19472b0a"
                               }
                             },
-                            "resetFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            },
-                            "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                            "meta" : {
+                              "globalKey" : "dbaefb1",
+                              "externalKey" : "resetDates0"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ad0fb833"
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "893cb5bc"
+                          "globalKey" : "2d8d4cfe"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "893cb5bc"
+                      "globalKey" : "2d8d4cfe"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "893cb5bc"
+                    "globalKey" : "2d8d4cfe"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "47b4a503"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "47b4a503"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "de531c2d"
+            "globalKey" : "796b592d"
           }
         },
         "meta" : {
-          "globalKey" : "de531c2d"
+          "globalKey" : "796b592d"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7f30bbe5"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.05,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.05,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "66e6c0bb"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "65d139a0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Telerate"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "4820adb2"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e821e"
-      },
-      "value" : "2000-08-30"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c7753bbd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c7753bbe"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "7d52f3fa"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "5ac63039"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        }
-      },
       "quantity" : {
+        "value" : 100000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         },
-        "value" : 100000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2000-08-30",
         "dateAdjustments" : {
+          "businessDayConvention" : "FOLLOWING",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "EUTA"
@@ -731,16 +727,20 @@
               "globalKey" : "20a71d"
             }
           },
-          "businessDayConvention" : "FOLLOWING",
           "meta" : {
             "globalKey" : "211dc30c"
           }
-        },
-        "unadjustedDate" : "2000-08-30"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "dc25c051"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "94d0ec97"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex16-mand-term-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex16-mand-term-swap.json
index f843db6533..7f629e98bf 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex16-mand-term-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex16-mand-term-swap.json
@@ -1,65 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "30801f79"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "30801f79"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "957b3c47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "957bb0a6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-04-29",
+      "meta" : {
+        "globalKey" : "3e891d"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_MANDATORY_EARLY_TERMINATION"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -70,46 +50,42 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters0",
-                        "globalReference" : "20a71d"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e1"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "985d6cb2"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b934"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-08-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -118,135 +94,133 @@
                       },
                       "meta" : {
                         "globalKey" : "eae921d6"
-                      },
-                      "unadjustedDate" : "2001-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae921d6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates0",
-                    "globalKey" : "d530b040"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-08-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters0",
-                            "globalKey" : "20a71d"
+                            "globalKey" : "20a71d",
+                            "externalKey" : "accrualBusinessCenters0"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "9ead9b90"
-                      },
-                      "unadjustedDate" : "2006-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "9ead9b90"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "20a71d",
+                        "externalReference" : "accrualBusinessCenters0"
+                      },
+                      "meta" : {
+                        "globalKey" : "622268e1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "985d6cb2"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "17984"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "d6a5a890",
+                    "externalKey" : "CalcPeriodDates0"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "6e2bf001"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4d64aef4"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters0",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "20a71d",
+                        "externalKey" : "paymentBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "9b0d9350"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                "meta" : {
+                  "globalKey" : "86242c95"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters1",
-                        "globalReference" : "20a71d"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e2"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "985d6cb3"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28cc3"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-08-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -255,178 +229,206 @@
                       },
                       "meta" : {
                         "globalKey" : "eae921d6"
-                      },
-                      "unadjustedDate" : "2001-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae921d6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates1",
-                    "globalKey" : "c8353f30"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-08-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters1",
-                            "globalKey" : "20a71d"
+                            "globalKey" : "20a71d",
+                            "externalKey" : "accrualBusinessCenters1"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "9ead9b90"
-                      },
-                      "unadjustedDate" : "2006-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "9ead9b90"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "20a71d",
+                        "externalReference" : "accrualBusinessCenters1"
+                      },
+                      "meta" : {
+                        "globalKey" : "622268e2"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "985d6cb3"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18ad5"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "d6b3d162",
+                    "externalKey" : "CalcPeriodDates1"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "9ec5a1dd"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4d64ad85"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters1",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "20a71d",
+                        "externalKey" : "paymentBusinessCenters1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "8f129421"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "CalcPeriodDates1",
-                    "globalReference" : "c8353f30"
+                    "globalReference" : "d6b3d162",
+                    "externalReference" : "CalcPeriodDates1"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2d80ce65"
+                      "globalKey" : "a5cb919"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "fixingBusinessCenters0",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "20a71d",
+                        "externalKey" : "fixingBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates0",
-                      "globalReference" : "3522cca9"
+                      "globalReference" : "dbaefb1",
+                      "externalReference" : "resetDates0"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates0",
-                    "globalKey" : "3522cca9"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "paymentBusinessCenters1",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "paymentBusinessCenters1"
                       },
                       "meta" : {
                         "globalKey" : "e30c2739"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "19472b0a"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "dbaefb1",
+                    "externalKey" : "resetDates0"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ad0fb833"
                 }
               } ],
               "meta" : {
-                "globalKey" : "893cb5bc"
+                "globalKey" : "2d8d4cfe"
               }
             },
             "terminationProvision" : {
               "earlyTerminationProvision" : {
                 "mandatoryEarlyTermination" : {
+                  "mandatoryEarlyTerminationDate" : {
+                    "unadjustedDate" : "2001-08-30",
+                    "dateAdjustments" : {
+                      "businessDayConvention" : "FOLLOWING",
+                      "businessCenters" : {
+                        "businessCenter" : [ {
+                          "value" : "GBLO"
+                        }, {
+                          "value" : "EUTA"
+                        } ],
+                        "meta" : {
+                          "globalKey" : "428533f"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "da4e2f6e"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "46e3a790"
+                    }
+                  },
                   "calculationAgent" : {
-                    "calculationAgentParty" : "CALCULATION_AGENT_MANDATORY_EARLY_TERMINATION"
+                    "calculationAgentParty" : "CalculationAgentMandatoryEarlyTermination"
                   },
                   "cashSettlement" : {
-                    "meta" : {
-                      "globalKey" : "8b6cfe8f"
-                    },
                     "settlementCurrency" : {
                       "value" : "EUR"
                     },
+                    "meta" : {
+                      "globalKey" : "83f4e833"
+                    },
                     "cashSettlementTerms" : [ {
-                      "cashSettlementMethod" : "CASH_PRICE_METHOD",
-                      "meta" : {
-                        "externalKey" : "cashSettlement0",
-                        "globalKey" : "e5b3d2f1"
+                      "cashSettlementMethod" : "CashPriceMethod",
+                      "valuationMethod" : {
+                        "quotationMethod" : "Mid"
                       },
                       "valuationDate" : {
                         "valuationDate" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "66e10d5"
+                            "globalKey" : "1bfa1e89"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -437,192 +439,190 @@
                               "globalKey" : "428533f"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
                             "externalReference" : "mandatoryEarlyTerminationDate0"
                           }
                         }
                       },
-                      "valuationMethod" : {
-                        "quotationMethod" : "MID"
-                      },
                       "valuationTime" : {
+                        "hourMinuteTime" : "11:00:00",
                         "businessCenter" : {
                           "value" : "BEBR"
-                        },
-                        "hourMinuteTime" : "11:00:00"
-                      }
-                    } ]
-                  },
-                  "mandatoryEarlyTerminationDate" : {
-                    "dateAdjustments" : {
-                      "businessCenters" : {
-                        "businessCenter" : [ {
-                          "value" : "GBLO"
-                        }, {
-                          "value" : "EUTA"
-                        } ],
-                        "meta" : {
-                          "globalKey" : "428533f"
                         }
                       },
-                      "businessDayConvention" : "FOLLOWING",
                       "meta" : {
-                        "globalKey" : "da4e2f6e"
+                        "globalKey" : "de3bbc95",
+                        "externalKey" : "cashSettlement0"
                       }
-                    },
-                    "meta" : {
-                      "globalKey" : "46e3a790"
-                    },
-                    "unadjustedDate" : "2001-08-30"
+                    } ]
                   },
                   "meta" : {
-                    "globalKey" : "a8551faf"
+                    "globalKey" : "88965635"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "a8551faf"
+                  "globalKey" : "88965635"
                 }
               }
             }
           },
           "meta" : {
-            "globalKey" : "b017a86b"
+            "globalKey" : "dcbff4b3"
           }
         },
         "meta" : {
-          "globalKey" : "b017a86b"
+          "globalKey" : "dcbff4b3"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7f30bbe5"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.05,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.05,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "66e6c0bb"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "65d139a0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Telerate"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "4820adb2"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentMandatoryEarlyTermination",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e891d"
-      },
-      "value" : "2001-04-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c7753bbd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c7753bbe"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "92c1617b"
+    }
+  },
+  "meta" : {
+    "globalKey" : "92c1617b"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex17-opt-euro-term-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex17-opt-euro-term-swap.json
index 6f7324d0b8..a55a8b0c3b 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex17-opt-euro-term-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex17-opt-euro-term-swap.json
@@ -1,58 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "53dd21e2"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "53dd21e2"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "957b3c47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "957bb0a6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-04-29",
+      "meta" : {
+        "globalKey" : "3e891d"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,46 +50,42 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters0",
-                        "globalReference" : "20a71d"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e1"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "985d6cb2"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b934"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-08-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -111,135 +94,133 @@
                       },
                       "meta" : {
                         "globalKey" : "eae921d6"
-                      },
-                      "unadjustedDate" : "2001-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae921d6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates0",
-                    "globalKey" : "d530b040"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-08-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters0",
-                            "globalKey" : "20a71d"
+                            "globalKey" : "20a71d",
+                            "externalKey" : "accrualBusinessCenters0"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "9ead9b90"
-                      },
-                      "unadjustedDate" : "2006-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "9ead9b90"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "20a71d",
+                        "externalReference" : "accrualBusinessCenters0"
+                      },
+                      "meta" : {
+                        "globalKey" : "622268e1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "985d6cb2"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "17984"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "d6a5a890",
+                    "externalKey" : "CalcPeriodDates0"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "6e2bf001"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4d64aef4"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters0",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "20a71d",
+                        "externalKey" : "paymentBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "9b0d9350"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                "meta" : {
+                  "globalKey" : "86242c95"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters1",
-                        "globalReference" : "20a71d"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e2"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "985d6cb3"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28cc3"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-08-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -248,170 +229,223 @@
                       },
                       "meta" : {
                         "globalKey" : "eae921d6"
-                      },
-                      "unadjustedDate" : "2001-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae921d6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates1",
-                    "globalKey" : "c8353f30"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-08-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters1",
-                            "globalKey" : "20a71d"
+                            "globalKey" : "20a71d",
+                            "externalKey" : "accrualBusinessCenters1"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "9ead9b90"
-                      },
-                      "unadjustedDate" : "2006-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "9ead9b90"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "20a71d",
+                        "externalReference" : "accrualBusinessCenters1"
+                      },
+                      "meta" : {
+                        "globalKey" : "622268e2"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "985d6cb3"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18ad5"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "d6b3d162",
+                    "externalKey" : "CalcPeriodDates1"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "9ec5a1dd"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4d64ad85"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters1",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "20a71d",
+                        "externalKey" : "paymentBusinessCenters1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "8f129421"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "CalcPeriodDates1",
-                    "globalReference" : "c8353f30"
+                    "globalReference" : "d6b3d162",
+                    "externalReference" : "CalcPeriodDates1"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2d80ce65"
+                      "globalKey" : "a5cb919"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "fixingBusinessCenters0",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "20a71d",
+                        "externalKey" : "fixingBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates0",
-                      "globalReference" : "3522cca9"
+                      "globalReference" : "dbaefb1",
+                      "externalReference" : "resetDates0"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates0",
-                    "globalKey" : "3522cca9"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "paymentBusinessCenters1",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "paymentBusinessCenters1"
                       },
                       "meta" : {
                         "globalKey" : "e30c2739"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "19472b0a"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "dbaefb1",
+                    "externalKey" : "resetDates0"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ad0fb833"
                 }
               } ],
               "meta" : {
-                "globalKey" : "893cb5bc"
+                "globalKey" : "2d8d4cfe"
               }
             },
             "terminationProvision" : {
               "earlyTerminationProvision" : {
-                "meta" : {
-                  "globalKey" : "1054a99f"
-                },
                 "optionalEarlyTermination" : {
+                  "europeanExercise" : {
+                    "expirationDate" : [ {
+                      "relativeDate" : {
+                        "periodMultiplier" : -5,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "ff947ba6"
+                        },
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "EUTA"
+                          }, {
+                            "value" : "GBLO"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "4158421"
+                          }
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "46e3a790",
+                          "externalReference" : "cashSettlementPayment0"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "ff947ba6"
+                      }
+                    } ],
+                    "earliestExerciseTime" : {
+                      "hourMinuteTime" : "09:00:00",
+                      "businessCenter" : {
+                        "value" : "BEBR"
+                      }
+                    },
+                    "expirationTime" : {
+                      "hourMinuteTime" : "11:00:00",
+                      "businessCenter" : {
+                        "value" : "BEBR"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3d76c707"
+                    }
+                  },
+                  "exerciseNotice" : [ {
+                    "businessCenter" : {
+                      "value" : "GBLO"
+                    }
+                  } ],
+                  "followUpConfirmation" : true,
                   "calculationAgent" : {
-                    "calculationAgentPartyEnum" : "NON_EXERCISING_PARTY"
+                    "calculationAgentPartyEnum" : "NonExercisingParty"
                   },
                   "cashSettlement" : {
-                    "meta" : {
-                      "globalKey" : "3d901fd"
-                    },
                     "settlementCurrency" : {
                       "value" : "EUR"
                     },
                     "settlementDate" : {
                       "adjustableDates" : {
+                        "unadjustedDate" : [ "2001-08-30" ],
                         "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -422,34 +456,36 @@
                               "globalKey" : "428533f"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "da4e2f6e"
                           }
                         },
                         "meta" : {
                           "globalKey" : "46e3a790"
-                        },
-                        "unadjustedDate" : [ "2001-08-30" ]
+                        }
                       },
                       "meta" : {
-                        "externalKey" : "cashSettlementPayment0",
-                        "globalKey" : "46e3a790"
+                        "globalKey" : "46e3a790",
+                        "externalKey" : "cashSettlementPayment0"
                       }
                     },
+                    "meta" : {
+                      "globalKey" : "d89a7321"
+                    },
                     "cashSettlementTerms" : [ {
-                      "cashSettlementMethod" : "CASH_PRICE_METHOD",
-                      "meta" : {
-                        "globalKey" : "453f916f"
+                      "cashSettlementMethod" : "CashPriceMethod",
+                      "valuationMethod" : {
+                        "quotationMethod" : "Mid"
                       },
                       "valuationDate" : {
                         "valuationDate" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "ef5205d3"
+                            "globalKey" : "4de1387"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -460,216 +496,180 @@
                               "globalKey" : "428533f"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "cashSettlementPayment0",
-                            "globalReference" : "46e3a790"
+                            "globalReference" : "46e3a790",
+                            "externalReference" : "cashSettlementPayment0"
                           }
                         }
                       },
-                      "valuationMethod" : {
-                        "quotationMethod" : "MID"
-                      },
                       "valuationTime" : {
+                        "hourMinuteTime" : "11:00:00",
                         "businessCenter" : {
                           "value" : "BEBR"
-                        },
-                        "hourMinuteTime" : "11:00:00"
-                      }
-                    } ]
-                  },
-                  "europeanExercise" : {
-                    "earliestExerciseTime" : {
-                      "businessCenter" : {
-                        "value" : "BEBR"
+                        }
                       },
-                      "hourMinuteTime" : "09:00:00"
-                    },
-                    "expirationDate" : [ {
                       "meta" : {
-                        "globalKey" : "cbda32d8"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "cbda32d8"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : -5,
-                        "dayType" : "BUSINESS",
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "EUTA"
-                          }, {
-                            "value" : "GBLO"
-                          } ],
-                          "meta" : {
-                            "globalKey" : "4158421"
-                          }
-                        },
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "cashSettlementPayment0",
-                          "globalReference" : "46e3a790"
-                        }
+                        "globalKey" : "1a010293"
                       }
-                    } ],
-                    "expirationTime" : {
-                      "businessCenter" : {
-                        "value" : "BEBR"
-                      },
-                      "hourMinuteTime" : "11:00:00"
-                    },
-                    "meta" : {
-                      "globalKey" : "fb596365"
-                    }
-                  },
-                  "exerciseNotice" : [ {
-                    "businessCenter" : {
-                      "value" : "GBLO"
-                    }
-                  } ],
-                  "followUpConfirmation" : true
+                    } ]
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "b65e2ed7"
                 }
               }
             }
           },
           "meta" : {
-            "globalKey" : "24be8b63"
+            "globalKey" : "9a037199"
           }
         },
         "meta" : {
-          "globalKey" : "24be8b63"
+          "globalKey" : "9a037199"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7f30bbe5"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.05,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.05,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "66e6c0bb"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "65d139a0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Telerate"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "4820adb2"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e891d"
-      },
-      "value" : "2001-04-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c7753bbd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c7753bbe"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "23858576"
+    }
+  },
+  "meta" : {
+    "globalKey" : "23858576"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex18-opt-berm-term-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex18-opt-berm-term-swap.json
index 4cbf13afc0..df37a6eb5e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex18-opt-berm-term-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex18-opt-berm-term-swap.json
@@ -1,58 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "c5d1ce1a"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "c5d1ce1a"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "957b3c47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "957bb0a6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-04-29",
+      "meta" : {
+        "globalKey" : "3e891d"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,46 +50,42 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters0",
-                        "globalReference" : "20a71d"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e1"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "985d6cb2"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b934"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-08-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -111,42 +94,92 @@
                       },
                       "meta" : {
                         "globalKey" : "eae921d6"
-                      },
-                      "unadjustedDate" : "2001-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae921d6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates0",
-                    "globalKey" : "d530b040"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-08-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters0",
-                            "globalKey" : "20a71d"
+                            "globalKey" : "20a71d",
+                            "externalKey" : "accrualBusinessCenters0"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "9ead9b90"
-                      },
-                      "unadjustedDate" : "2006-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "9ead9b90"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "20a71d",
+                        "externalReference" : "accrualBusinessCenters0"
+                      },
+                      "meta" : {
+                        "globalKey" : "622268e1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "985d6cb2"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "17984"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "d6a5a890",
+                    "externalKey" : "CalcPeriodDates0"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d",
+                        "externalKey" : "paymentBusinessCenters0"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "9b0d9350"
                   }
                 },
                 "cashflowRepresentation" : {
@@ -154,166 +187,114 @@
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "2002-08-20",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2002-08-30",
                       "adjustedStartDate" : "2001-08-30",
+                      "adjustedEndDate" : "2002-08-30",
                       "meta" : {
-                        "globalKey" : "7a0caece"
+                        "globalKey" : "a1ae6f32"
                       },
-                      "fixedRate" : 0.05,
-                      "notionalAmount" : 100000000
+                      "notionalAmount" : 100000000,
+                      "fixedRate" : 0.05
                     } ],
                     "meta" : {
-                      "globalKey" : "363a493a"
+                      "globalKey" : "5ddc099e"
                     }
                   }, {
                     "adjustedPaymentDate" : "2003-08-29",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2003-08-29",
                       "adjustedStartDate" : "2002-08-28",
+                      "adjustedEndDate" : "2003-08-29",
                       "meta" : {
-                        "globalKey" : "7dcd32ed"
+                        "globalKey" : "a56e82b3"
                       },
-                      "fixedRate" : 0.05,
-                      "notionalAmount" : 100000000
+                      "notionalAmount" : 100000000,
+                      "fixedRate" : 0.05
                     } ],
                     "meta" : {
-                      "globalKey" : "f01b62f0"
+                      "globalKey" : "17bcb2b6"
                     }
                   }, {
                     "adjustedPaymentDate" : "2004-08-30",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2005-08-30",
                       "adjustedStartDate" : "2003-08-29",
+                      "adjustedEndDate" : "2005-08-30",
                       "meta" : {
-                        "globalKey" : "8531a30d"
+                        "globalKey" : "a94e02d3"
                       },
-                      "fixedRate" : 0.05,
-                      "notionalAmount" : 100000000
+                      "notionalAmount" : 100000000,
+                      "fixedRate" : 0.05
                     } ],
                     "meta" : {
-                      "globalKey" : "9ff9a3af"
+                      "globalKey" : "c4160375"
                     }
                   }, {
                     "adjustedPaymentDate" : "2005-08-30",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2005-08-30",
                       "adjustedStartDate" : "2004-08-30",
+                      "adjustedEndDate" : "2005-08-30",
                       "meta" : {
-                        "globalKey" : "854faece"
+                        "globalKey" : "acf16f32"
                       },
-                      "fixedRate" : 0.05,
-                      "notionalAmount" : 100000000
+                      "notionalAmount" : 100000000,
+                      "fixedRate" : 0.05
                     } ],
                     "meta" : {
-                      "globalKey" : "46dca770"
+                      "globalKey" : "6e7e67d4"
                     }
                   }, {
                     "adjustedPaymentDate" : "2006-08-30",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2006-08-30",
                       "adjustedStartDate" : "2005-08-30",
+                      "adjustedEndDate" : "2006-08-30",
                       "meta" : {
-                        "globalKey" : "8910aece"
+                        "globalKey" : "b0b26f32"
                       },
-                      "fixedRate" : 0.05,
-                      "notionalAmount" : 100000000
+                      "notionalAmount" : 100000000,
+                      "fixedRate" : 0.05
                     } ],
                     "meta" : {
-                      "globalKey" : "f1629f70"
+                      "globalKey" : "19045fd4"
                     }
                   } ]
                 },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
                 "meta" : {
-                  "globalKey" : "8a3bd3d9"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4d64aef4"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "externalKey" : "paymentBusinessCenters0",
-                        "globalKey" : "20a71d"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "365baaee"
-                    }
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "3620e2cd"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters1",
-                        "globalReference" : "20a71d"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e2"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "985d6cb3"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28cc3"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-08-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -322,42 +303,147 @@
                       },
                       "meta" : {
                         "globalKey" : "eae921d6"
-                      },
-                      "unadjustedDate" : "2001-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae921d6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates1",
-                    "globalKey" : "c8353f30"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-08-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters1",
-                            "globalKey" : "20a71d"
+                            "globalKey" : "20a71d",
+                            "externalKey" : "accrualBusinessCenters1"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "9ead9b90"
-                      },
-                      "unadjustedDate" : "2006-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "9ead9b90"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "20a71d",
+                        "externalReference" : "accrualBusinessCenters1"
+                      },
+                      "meta" : {
+                        "globalKey" : "622268e2"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "985d6cb3"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18ad5"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "d6b3d162",
+                    "externalKey" : "CalcPeriodDates1"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d",
+                        "externalKey" : "paymentBusinessCenters1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "8f129421"
+                  }
+                },
+                "resetDates" : {
+                  "calculationPeriodDatesReference" : {
+                    "globalReference" : "d6b3d162",
+                    "externalReference" : "CalcPeriodDates1"
+                  },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
+                  "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "a5cb919"
+                    },
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d",
+                        "externalKey" : "fixingBusinessCenters0"
+                      }
+                    },
+                    "dateRelativeTo" : {
+                      "globalReference" : "dbaefb1",
+                      "externalReference" : "resetDates0"
+                    }
+                  },
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "20a71d",
+                        "externalReference" : "paymentBusinessCenters1"
+                      },
+                      "meta" : {
+                        "globalKey" : "e30c2739"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "19472b0a"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "dbaefb1",
+                    "externalKey" : "resetDates0"
                   }
                 },
                 "cashflowRepresentation" : {
@@ -365,350 +451,246 @@
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "2002-02-28",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2002-02-28",
                       "adjustedStartDate" : "2001-08-30",
+                      "adjustedEndDate" : "2002-02-28",
                       "meta" : {
-                        "globalKey" : "9d39d454"
+                        "globalKey" : "429b7c98"
                       },
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2001-08-28",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "792b965"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "579c08f0"
+                      "globalKey" : "fcfdb134"
                     }
                   }, {
                     "adjustedPaymentDate" : "2002-08-30",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2002-08-30",
                       "adjustedStartDate" : "2002-02-28",
+                      "adjustedEndDate" : "2002-08-30",
                       "meta" : {
-                        "globalKey" : "74764dda"
+                        "globalKey" : "43ff9596"
                       },
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2002-02-26",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "79382a7"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "be07e1f8"
+                      "globalKey" : "8d9129b4"
                     }
                   }, {
                     "adjustedPaymentDate" : "2003-02-28",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2003-02-28",
                       "adjustedStartDate" : "2002-08-30",
+                      "adjustedEndDate" : "2003-02-28",
                       "meta" : {
-                        "globalKey" : "75d9cc54"
+                        "globalKey" : "1b3b7498"
                       },
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2002-08-28",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "793b165"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "53b408f0"
+                      "globalKey" : "f915b134"
                     }
                   }, {
                     "adjustedPaymentDate" : "2003-08-29",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2003-08-29",
                       "adjustedStartDate" : "2003-02-28",
+                      "adjustedEndDate" : "2003-08-29",
                       "meta" : {
-                        "globalKey" : "18300a99"
+                        "globalKey" : "1aeab4f7"
                       },
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2003-02-26",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "7947aa7"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "f0f537b6"
+                      "globalKey" : "f3afe214"
                     }
                   }, {
                     "adjustedPaymentDate" : "2004-02-27",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2004-02-27",
                       "adjustedStartDate" : "2003-08-29",
+                      "adjustedEndDate" : "2004-02-27",
                       "meta" : {
-                        "globalKey" : "17deb055"
+                        "globalKey" : "bd405899"
                       },
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2003-08-27",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "794a946"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "84ec85f0"
+                      "globalKey" : "2a4e2e34"
                     }
                   }, {
                     "adjustedPaymentDate" : "2004-08-30",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2005-08-30",
                       "adjustedStartDate" : "2004-02-27",
+                      "adjustedEndDate" : "2005-08-30",
                       "meta" : {
-                        "globalKey" : "55db6d1c"
+                        "globalKey" : "671e4236"
                       },
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2004-02-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "7957288"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "e65d113a"
+                      "globalKey" : "f79fe654"
                     }
                   }, {
                     "adjustedPaymentDate" : "2005-02-28",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2005-02-28",
                       "adjustedStartDate" : "2004-08-30",
+                      "adjustedEndDate" : "2005-02-28",
                       "meta" : {
-                        "globalKey" : "2719bc35"
+                        "globalKey" : "cc7b6479"
                       },
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2004-08-27",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "795a146"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "4be408d1"
+                      "globalKey" : "f145b115"
                     }
                   }, {
                     "adjustedPaymentDate" : "2005-08-30",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2005-08-30",
                       "adjustedStartDate" : "2005-02-28",
+                      "adjustedEndDate" : "2005-08-30",
                       "meta" : {
-                        "globalKey" : "fe56359c"
+                        "globalKey" : "cddf7d58"
                       },
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2005-02-24",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "7966a69"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "b24fe1ba"
+                      "globalKey" : "81d92976"
                     }
                   }, {
                     "adjustedPaymentDate" : "2006-02-28",
-                    "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2006-02-28",
-                      "adjustedStartDate" : "2005-08-30",
-                      "meta" : {
-                        "globalKey" : "ffb9b416"
-                      },
-                      "floatingRateDefinition" : {
-                        "rateObservation" : [ {
-                          "adjustedFixingDate" : "2005-08-26",
-                          "meta" : {
-                            "globalKey" : "7969927"
-                          },
-                          "observationWeight" : 1
-                        } ]
-                      },
-                      "notionalAmount" : 100000000
-                    } ],
-                    "meta" : {
-                      "globalKey" : "47fc08b2"
-                    }
-                  }, {
-                    "adjustedPaymentDate" : "2006-08-30",
-                    "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2006-08-30",
-                      "adjustedStartDate" : "2006-02-28",
-                      "meta" : {
-                        "globalKey" : "d6f62d9c"
-                      },
-                      "floatingRateDefinition" : {
-                        "rateObservation" : [ {
-                          "adjustedFixingDate" : "2006-02-24",
-                          "meta" : {
-                            "globalKey" : "7976269"
-                          },
-                          "observationWeight" : 1
-                        } ]
-                      },
-                      "notionalAmount" : 100000000
-                    } ],
-                    "meta" : {
-                      "globalKey" : "ae67e1ba"
-                    }
-                  } ]
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "40779895"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4d64ad85"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "externalKey" : "paymentBusinessCenters1",
-                        "globalKey" : "20a71d"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "365baaee"
-                    }
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
-                  }
-                },
-                "resetDates" : {
-                  "calculationPeriodDatesReference" : {
-                    "externalReference" : "CalcPeriodDates1",
-                    "globalReference" : "c8353f30"
-                  },
-                  "fixingDates" : {
-                    "meta" : {
-                      "globalKey" : "2d80ce65"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
+                    "calculationPeriod" : [ {
+                      "adjustedStartDate" : "2005-08-30",
+                      "adjustedEndDate" : "2006-02-28",
                       "meta" : {
-                        "externalKey" : "fixingBusinessCenters0",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "a51b5c5a"
+                      },
+                      "notionalAmount" : 100000000,
+                      "floatingRateDefinition" : {
+                        "rateObservation" : [ {
+                          "adjustedFixingDate" : "2005-08-26",
+                          "observationWeight" : 1,
+                          "meta" : {
+                            "globalKey" : "7969927"
+                          }
+                        } ]
                       }
-                    },
-                    "businessDayConvention" : "NONE",
-                    "dateRelativeTo" : {
-                      "externalReference" : "resetDates0",
-                      "globalReference" : "3522cca9"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "ed5db0f6"
                     }
-                  },
-                  "meta" : {
-                    "externalKey" : "resetDates0",
-                    "globalKey" : "3522cca9"
-                  },
-                  "resetDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "paymentBusinessCenters1",
-                        "globalReference" : "20a71d"
-                      },
+                  }, {
+                    "adjustedPaymentDate" : "2006-08-30",
+                    "calculationPeriod" : [ {
+                      "adjustedStartDate" : "2006-02-28",
+                      "adjustedEndDate" : "2006-08-30",
                       "meta" : {
-                        "globalKey" : "e30c2739"
+                        "globalKey" : "a67f7558"
+                      },
+                      "notionalAmount" : 100000000,
+                      "floatingRateDefinition" : {
+                        "rateObservation" : [ {
+                          "adjustedFixingDate" : "2006-02-24",
+                          "observationWeight" : 1,
+                          "meta" : {
+                            "globalKey" : "7976269"
+                          }
+                        } ]
                       }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
+                    } ],
                     "meta" : {
-                      "globalKey" : "19472b0a"
+                      "globalKey" : "7df12976"
                     }
-                  },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  } ]
+                },
+                "meta" : {
+                  "globalKey" : "f8019b43"
                 }
               } ],
               "meta" : {
-                "globalKey" : "f2b6f85c"
+                "globalKey" : "4a53496"
               }
             },
             "terminationProvision" : {
               "earlyTerminationProvision" : {
-                "meta" : {
-                  "globalKey" : "78fcc58f"
-                },
                 "optionalEarlyTermination" : {
                   "bermudaExercise" : {
                     "bermudaExerciseDates" : {
-                      "meta" : {
-                        "globalKey" : "cbda32d8"
-                      },
                       "relativeDates" : {
+                        "periodMultiplier" : -5,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "cbda32d8"
+                          "globalKey" : "ff947ba6"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : -5,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -719,60 +701,67 @@
                             "globalKey" : "4158421"
                           }
                         },
+                        "dateRelativeTo" : {
+                          "globalReference" : "d0222bae",
+                          "externalReference" : "cashSettlementPayment0"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "ff947ba6"
+                      }
+                    },
+                    "relevantUnderlyingDate" : {
+                      "relativeDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "5119563a"
+                        },
                         "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "cashSettlementPayment0",
-                          "globalReference" : "d0222bae"
+                          "globalReference" : "d0222bae",
+                          "externalReference" : "cashSettlementPayment0"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "5119563a"
                       }
                     },
                     "earliestExerciseTime" : {
+                      "hourMinuteTime" : "09:00:00",
                       "businessCenter" : {
                         "value" : "BEBR"
-                      },
-                      "hourMinuteTime" : "09:00:00"
+                      }
                     },
                     "expirationTime" : {
+                      "hourMinuteTime" : "11:00:00",
                       "businessCenter" : {
                         "value" : "BEBR"
-                      },
-                      "hourMinuteTime" : "11:00:00"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "BermudaExercise0",
-                      "globalKey" : "dcbefce9"
-                    },
-                    "relevantUnderlyingDate" : {
-                      "meta" : {
-                        "globalKey" : "54b8ab42"
-                      },
-                      "relativeDates" : {
-                        "meta" : {
-                          "globalKey" : "54b8ab42"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "cashSettlementPayment0",
-                          "globalReference" : "d0222bae"
-                        }
-                      }
+                      "globalKey" : "892dd135",
+                      "externalKey" : "BermudaExercise0"
                     }
                   },
+                  "exerciseNotice" : [ {
+                    "businessCenter" : {
+                      "value" : "GBLO"
+                    }
+                  } ],
+                  "followUpConfirmation" : true,
                   "calculationAgent" : {
-                    "calculationAgentPartyEnum" : "NON_EXERCISING_PARTY"
+                    "calculationAgentPartyEnum" : "NonExercisingParty"
                   },
                   "cashSettlement" : {
-                    "meta" : {
-                      "globalKey" : "76aebf6d"
-                    },
                     "settlementCurrency" : {
                       "value" : "EUR"
                     },
                     "settlementDate" : {
                       "adjustableDates" : {
+                        "unadjustedDate" : [ "2003-08-30", "2004-08-30" ],
                         "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -783,34 +772,36 @@
                               "globalKey" : "428533f"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "da4e2f6e"
                           }
                         },
                         "meta" : {
                           "globalKey" : "d0222bae"
-                        },
-                        "unadjustedDate" : [ "2003-08-30", "2004-08-30" ]
+                        }
                       },
                       "meta" : {
-                        "externalKey" : "cashSettlementPayment0",
-                        "globalKey" : "d0222bae"
+                        "globalKey" : "d0222bae",
+                        "externalKey" : "cashSettlementPayment0"
                       }
                     },
+                    "meta" : {
+                      "globalKey" : "4b703091"
+                    },
                     "cashSettlementTerms" : [ {
-                      "cashSettlementMethod" : "CASH_PRICE_METHOD",
-                      "meta" : {
-                        "globalKey" : "45412cb9"
+                      "cashSettlementMethod" : "CashPriceMethod",
+                      "valuationMethod" : {
+                        "quotationMethod" : "Mid"
                       },
                       "valuationDate" : {
                         "valuationDate" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "ef5205d3"
+                            "globalKey" : "4de1387"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -821,190 +812,199 @@
                               "globalKey" : "428533f"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "cashSettlementPayment0",
-                            "globalReference" : "d0222bae"
+                            "globalReference" : "d0222bae",
+                            "externalReference" : "cashSettlementPayment0"
                           }
                         }
                       },
-                      "valuationMethod" : {
-                        "quotationMethod" : "MID"
-                      },
                       "valuationTime" : {
+                        "hourMinuteTime" : "11:00:00",
                         "businessCenter" : {
                           "value" : "EUTA"
-                        },
-                        "hourMinuteTime" : "11:00:00"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "1a029ddd"
                       }
                     } ]
                   },
-                  "exerciseNotice" : [ {
-                    "businessCenter" : {
-                      "value" : "GBLO"
-                    }
-                  } ],
-                  "followUpConfirmation" : true,
                   "optionalEarlyTerminationAdjustedDates" : {
                     "earlyTerminationEvent" : [ {
-                      "adjustedCashSettlementPaymentDate" : "2003-09-01",
-                      "adjustedCashSettlementValuationDate" : "2003-08-28",
-                      "adjustedEarlyTerminationDate" : "2003-09-01",
                       "adjustedExerciseDate" : "2003-08-25",
+                      "adjustedEarlyTerminationDate" : "2003-09-01",
+                      "adjustedCashSettlementValuationDate" : "2003-08-28",
+                      "adjustedCashSettlementPaymentDate" : "2003-09-01",
                       "meta" : {
-                        "globalKey" : "67f47d33"
+                        "globalKey" : "67e2d4ed"
                       }
                     }, {
-                      "adjustedCashSettlementPaymentDate" : "2004-08-30",
-                      "adjustedCashSettlementValuationDate" : "2004-08-26",
-                      "adjustedEarlyTerminationDate" : "2004-08-30",
                       "adjustedExerciseDate" : "2004-08-23",
+                      "adjustedEarlyTerminationDate" : "2004-08-30",
+                      "adjustedCashSettlementValuationDate" : "2004-08-26",
+                      "adjustedCashSettlementPaymentDate" : "2004-08-30",
                       "meta" : {
-                        "globalKey" : "6ba68875"
+                        "globalKey" : "6ba3686b"
                       }
                     } ]
                   }
+                },
+                "meta" : {
+                  "globalKey" : "60756a2d"
                 }
               }
             }
           },
           "meta" : {
-            "globalKey" : "67bf17eb"
+            "globalKey" : "c360c7c3"
           }
         },
         "meta" : {
-          "globalKey" : "67bf17eb"
+          "globalKey" : "c360c7c3"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7f30bbe5"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.05,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.05,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "66e6c0bb"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "65d139a0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Telerate"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "4820adb2"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e891d"
-      },
-      "value" : "2001-04-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c7753bbd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c7753bbe"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "a1cb5d4c"
+    }
+  },
+  "meta" : {
+    "globalKey" : "a1cb5d4c"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex19-opt-amer-term-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex19-opt-amer-term-swap.json
index d2680280c5..8d92a4e4e6 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex19-opt-amer-term-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex19-opt-amer-term-swap.json
@@ -1,65 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "ae5d5601"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "ae5d5601"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "957b3c47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "957bb0a6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-04-29",
+      "meta" : {
+        "globalKey" : "3e891d"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        } ],
-        "role" : "CALCULATION_AGENT_OPTIONAL_EARLY_TERMINATION"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -70,46 +50,42 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters0",
-                        "globalReference" : "20a71d"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e1"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "985d6cb2"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b934"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-08-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -118,135 +94,133 @@
                       },
                       "meta" : {
                         "globalKey" : "eae921d6"
-                      },
-                      "unadjustedDate" : "2001-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae921d6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates0",
-                    "globalKey" : "17098840"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2011-08-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters0",
-                            "globalKey" : "20a71d"
+                            "globalKey" : "20a71d",
+                            "externalKey" : "accrualBusinessCenters0"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e0867390"
-                      },
-                      "unadjustedDate" : "2011-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e0867390"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "20a71d",
+                        "externalReference" : "accrualBusinessCenters0"
+                      },
+                      "meta" : {
+                        "globalKey" : "622268e1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "985d6cb2"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "17984"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "1f3fd090",
+                    "externalKey" : "CalcPeriodDates0"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "54881801"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4d64aef4"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters0",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "20a71d",
+                        "externalKey" : "paymentBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "9b0d9350"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                "meta" : {
+                  "globalKey" : "122c5495"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters1",
-                        "globalReference" : "20a71d"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e2"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "985d6cb3"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28cc3"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-08-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -255,169 +229,170 @@
                       },
                       "meta" : {
                         "globalKey" : "eae921d6"
-                      },
-                      "unadjustedDate" : "2001-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae921d6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates1",
-                    "globalKey" : "a0e1730"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2011-08-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters1",
-                            "globalKey" : "20a71d"
+                            "globalKey" : "20a71d",
+                            "externalKey" : "accrualBusinessCenters1"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e0867390"
-                      },
-                      "unadjustedDate" : "2011-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e0867390"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "20a71d",
+                        "externalReference" : "accrualBusinessCenters1"
+                      },
+                      "meta" : {
+                        "globalKey" : "622268e2"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "985d6cb3"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18ad5"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "1f4df962",
+                    "externalKey" : "CalcPeriodDates1"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "6f1279dd"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4d64ad85"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters1",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "20a71d",
+                        "externalKey" : "paymentBusinessCenters1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "8f129421"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "CalcPeriodDates1",
-                    "globalReference" : "a0e1730"
+                    "globalReference" : "1f4df962",
+                    "externalReference" : "CalcPeriodDates1"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2d80ce65"
+                      "globalKey" : "a5cb919"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "fixingBusinessCenters0",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "20a71d",
+                        "externalKey" : "fixingBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates0",
-                      "globalReference" : "3522cca9"
+                      "globalReference" : "dbaefb1",
+                      "externalReference" : "resetDates0"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates0",
-                    "globalKey" : "3522cca9"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "paymentBusinessCenters1",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "paymentBusinessCenters1"
                       },
                       "meta" : {
                         "globalKey" : "e30c2739"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "19472b0a"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "dbaefb1",
+                    "externalKey" : "resetDates0"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c309e033"
                 }
               } ],
               "meta" : {
-                "globalKey" : "404865bc"
+                "globalKey" : "7f1a4cfe"
               }
             },
             "terminationProvision" : {
               "earlyTerminationProvision" : {
-                "meta" : {
-                  "globalKey" : "982c9b9b"
-                },
                 "optionalEarlyTermination" : {
                   "americanExercise" : {
                     "commencementDate" : {
-                      "meta" : {
-                        "globalKey" : "5f09f14"
-                      },
                       "relativeDate" : {
+                        "periodMultiplier" : -5,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "5f09f14"
+                          "globalKey" : "5da2c362"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : -5,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -426,30 +401,24 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "cashSettlementPayment0",
-                          "globalReference" : "1e907b2e"
+                          "globalReference" : "e8cfcb2e",
+                          "externalReference" : "cashSettlementPayment0"
                         }
-                      }
-                    },
-                    "earliestExerciseTime" : {
-                      "businessCenter" : {
-                        "value" : "EUTA"
                       },
-                      "hourMinuteTime" : "09:00:00"
+                      "meta" : {
+                        "globalKey" : "5da2c362"
+                      }
                     },
                     "expirationDate" : {
-                      "meta" : {
-                        "globalKey" : "5f09f14"
-                      },
                       "relativeDate" : {
+                        "periodMultiplier" : -5,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "5f09f14"
+                          "globalKey" : "5da2c362"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : -5,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -458,60 +427,72 @@
                             "globalKey" : "20a71d"
                           }
                         },
+                        "dateRelativeTo" : {
+                          "globalReference" : "e8cfcb2e",
+                          "externalReference" : "cashSettlementPayment0"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "5da2c362"
+                      }
+                    },
+                    "relevantUnderlyingDate" : {
+                      "relativeDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "5119563a"
+                        },
                         "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "cashSettlementPayment0",
-                          "globalReference" : "1e907b2e"
+                          "globalReference" : "e8cfcb2e",
+                          "externalReference" : "cashSettlementPayment0"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "5119563a"
                       }
                     },
-                    "expirationTime" : {
+                    "earliestExerciseTime" : {
+                      "hourMinuteTime" : "09:00:00",
                       "businessCenter" : {
                         "value" : "EUTA"
-                      },
-                      "hourMinuteTime" : "11:00:00"
+                      }
                     },
                     "latestExerciseTime" : {
+                      "hourMinuteTime" : "11:00:00",
                       "businessCenter" : {
                         "value" : "EUTA"
-                      },
-                      "hourMinuteTime" : "11:00:00"
-                    },
-                    "meta" : {
-                      "globalKey" : "d54e6d94"
+                      }
                     },
-                    "relevantUnderlyingDate" : {
-                      "meta" : {
-                        "globalKey" : "54b8ab42"
-                      },
-                      "relativeDates" : {
-                        "meta" : {
-                          "globalKey" : "54b8ab42"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "cashSettlementPayment0",
-                          "globalReference" : "1e907b2e"
-                        }
+                    "expirationTime" : {
+                      "hourMinuteTime" : "11:00:00",
+                      "businessCenter" : {
+                        "value" : "EUTA"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "244c3310"
                     }
                   },
+                  "exerciseNotice" : [ {
+                    "businessCenter" : {
+                      "value" : "GBLO"
+                    }
+                  } ],
+                  "followUpConfirmation" : true,
                   "calculationAgent" : {
-                    "calculationAgentParty" : "CALCULATION_AGENT_OPTIONAL_EARLY_TERMINATION"
+                    "calculationAgentParty" : "CalculationAgentOptionalEarlyTermination"
                   },
                   "cashSettlement" : {
-                    "meta" : {
-                      "globalKey" : "9a3ad907"
-                    },
                     "settlementCurrency" : {
                       "value" : "EUR"
                     },
                     "settlementDate" : {
                       "businessDateRange" : {
-                        "endDate" : "2006-08-30",
                         "startDate" : "2001-08-30",
+                        "endDate" : "2006-08-30",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -521,27 +502,30 @@
                           "meta" : {
                             "globalKey" : "428533f"
                           }
-                        },
-                        "businessDayConvention" : "FOLLOWING"
+                        }
                       },
                       "meta" : {
-                        "externalKey" : "cashSettlementPayment0",
-                        "globalKey" : "1e907b2e"
+                        "globalKey" : "e8cfcb2e",
+                        "externalKey" : "cashSettlementPayment0"
                       }
                     },
+                    "meta" : {
+                      "globalKey" : "373decab"
+                    },
                     "cashSettlementTerms" : [ {
-                      "cashSettlementMethod" : "CASH_PRICE_METHOD",
-                      "meta" : {
-                        "globalKey" : "a41c0157"
+                      "cashSettlementMethod" : "CashPriceMethod",
+                      "valuationMethod" : {
+                        "quotationMethod" : "Mid"
                       },
                       "valuationDate" : {
                         "valuationDate" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "3d9425b1"
+                            "globalKey" : "1a701065"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -550,171 +534,187 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "cashSettlementPayment0",
-                            "globalReference" : "1e907b2e"
+                            "globalReference" : "e8cfcb2e",
+                            "externalReference" : "cashSettlementPayment0"
                           }
                         }
                       },
-                      "valuationMethod" : {
-                        "quotationMethod" : "MID"
-                      },
                       "valuationTime" : {
+                        "hourMinuteTime" : "11:00:00",
                         "businessCenter" : {
                           "value" : "EUTA"
-                        },
-                        "hourMinuteTime" : "11:00:00"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "f6c064fb"
                       }
                     } ]
-                  },
-                  "exerciseNotice" : [ {
-                    "businessCenter" : {
-                      "value" : "GBLO"
-                    }
-                  } ],
-                  "followUpConfirmation" : true
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "65d16443"
                 }
               }
             }
           },
           "meta" : {
-            "globalKey" : "82a9645f"
+            "globalKey" : "5bdb3a85"
           }
         },
         "meta" : {
-          "globalKey" : "82a9645f"
+          "globalKey" : "5bdb3a85"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7f30bbe5"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.05,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.05,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "66e6c0bb"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "65d139a0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Telerate"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "4820adb2"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentOptionalEarlyTermination",
+        "partyReference" : [ {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e891d"
-      },
-      "value" : "2001-04-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c7753bbd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c7753bbe"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "855525cf"
+    }
+  },
+  "meta" : {
+    "globalKey" : "855525cf"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex20-euro-cancel-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex20-euro-cancel-swap.json
index b56e0c725b..f71455aa47 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex20-euro-cancel-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex20-euro-cancel-swap.json
@@ -1,58 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "fe76801"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "fe76801"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "957b3c47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "957bb0a6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-04-29",
+      "meta" : {
+        "globalKey" : "3e891d"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,46 +50,42 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters0",
-                        "globalReference" : "20a71d"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e1"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "985d6cb2"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b934"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-08-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -111,135 +94,133 @@
                       },
                       "meta" : {
                         "globalKey" : "eae921d6"
-                      },
-                      "unadjustedDate" : "2001-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae921d6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates0",
-                    "globalKey" : "17098840"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2011-08-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters0",
-                            "globalKey" : "20a71d"
+                            "globalKey" : "20a71d",
+                            "externalKey" : "accrualBusinessCenters0"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e0867390"
-                      },
-                      "unadjustedDate" : "2011-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e0867390"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "20a71d",
+                        "externalReference" : "accrualBusinessCenters0"
+                      },
+                      "meta" : {
+                        "globalKey" : "622268e1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "985d6cb2"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "17984"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "1f3fd090",
+                    "externalKey" : "CalcPeriodDates0"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "54881801"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4d64aef4"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters0",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "20a71d",
+                        "externalKey" : "paymentBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "9b0d9350"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                "meta" : {
+                  "globalKey" : "122c5495"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters1",
-                        "globalReference" : "20a71d"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e2"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "985d6cb3"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28cc3"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-08-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -248,165 +229,167 @@
                       },
                       "meta" : {
                         "globalKey" : "eae921d6"
-                      },
-                      "unadjustedDate" : "2001-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae921d6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates1",
-                    "globalKey" : "a0e1730"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2011-08-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters1",
-                            "globalKey" : "20a71d"
+                            "globalKey" : "20a71d",
+                            "externalKey" : "accrualBusinessCenters1"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e0867390"
-                      },
-                      "unadjustedDate" : "2011-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e0867390"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "20a71d",
+                        "externalReference" : "accrualBusinessCenters1"
+                      },
+                      "meta" : {
+                        "globalKey" : "622268e2"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "985d6cb3"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18ad5"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "1f4df962",
+                    "externalKey" : "CalcPeriodDates1"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "6f1279dd"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4d64ad85"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters1",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "20a71d",
+                        "externalKey" : "paymentBusinessCenters1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "8f129421"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "CalcPeriodDates1",
-                    "globalReference" : "a0e1730"
+                    "globalReference" : "1f4df962",
+                    "externalReference" : "CalcPeriodDates1"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2d80ce65"
+                      "globalKey" : "a5cb919"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "fixingBusinessCenters0",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "20a71d",
+                        "externalKey" : "fixingBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates0",
-                      "globalReference" : "3522cca9"
+                      "globalReference" : "dbaefb1",
+                      "externalReference" : "resetDates0"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates0",
-                    "globalKey" : "3522cca9"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "paymentBusinessCenters1",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "paymentBusinessCenters1"
                       },
                       "meta" : {
                         "globalKey" : "e30c2739"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "19472b0a"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "dbaefb1",
+                    "externalKey" : "resetDates0"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c309e033"
                 }
               } ],
               "meta" : {
-                "globalKey" : "404865bc"
+                "globalKey" : "7f1a4cfe"
               }
             },
             "terminationProvision" : {
               "cancelableProvision" : {
-                "buyer" : "PARTY_2",
-                "seller" : "PARTY_1",
+                "buyer" : "Party2",
+                "seller" : "Party1",
                 "europeanExercise" : {
-                  "earliestExerciseTime" : {
-                    "businessCenter" : {
-                      "value" : "BEBR"
-                    },
-                    "hourMinuteTime" : "09:00:00"
-                  },
                   "expirationDate" : [ {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-08-15",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -417,32 +400,23 @@
                             "globalKey" : "428533f"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "da4e2f6e"
                         }
                       },
                       "meta" : {
                         "globalKey" : "5fb4de7f"
-                      },
-                      "unadjustedDate" : "2006-08-15"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "5fb4de7f"
                     }
                   } ],
-                  "expirationTime" : {
-                    "businessCenter" : {
-                      "value" : "BEBR"
-                    },
-                    "hourMinuteTime" : "11:00:00"
-                  },
-                  "meta" : {
-                    "globalKey" : "b910878e"
-                  },
                   "relevantUnderlyingDate" : {
                     "adjustableDates" : {
+                      "unadjustedDate" : [ "2006-08-30" ],
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -451,19 +425,32 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "896fb3ae"
-                      },
-                      "unadjustedDate" : [ "2006-08-30" ]
+                      }
                     },
                     "meta" : {
                       "globalKey" : "896fb3ae"
                     }
+                  },
+                  "earliestExerciseTime" : {
+                    "hourMinuteTime" : "09:00:00",
+                    "businessCenter" : {
+                      "value" : "BEBR"
+                    }
+                  },
+                  "expirationTime" : {
+                    "hourMinuteTime" : "11:00:00",
+                    "businessCenter" : {
+                      "value" : "BEBR"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "213b778e"
                   }
                 },
                 "exerciseNotice" : {
@@ -476,142 +463,155 @@
             }
           },
           "meta" : {
-            "globalKey" : "29efba4"
+            "globalKey" : "2b074d22"
           }
         },
         "meta" : {
-          "globalKey" : "29efba4"
+          "globalKey" : "2b074d22"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7f30bbe5"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.05,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.05,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "66e6c0bb"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "65d139a0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Telerate"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "4820adb2"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e891d"
-      },
-      "value" : "2001-04-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c7753bbd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c7753bbe"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "5f59a5cd"
+    }
+  },
+  "meta" : {
+    "globalKey" : "5f59a5cd"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex21-euro-extend-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex21-euro-extend-swap.json
index ba526acd7c..cb4f85b5f9 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex21-euro-extend-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex21-euro-extend-swap.json
@@ -1,58 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "56787be3"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "56787be3"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "957b3c47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "957bb0a6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-04-29",
+      "meta" : {
+        "globalKey" : "3e891d"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,46 +50,42 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters0",
-                        "globalReference" : "20a71d"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e1"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "985d6cb2"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b934"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-08-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -111,135 +94,133 @@
                       },
                       "meta" : {
                         "globalKey" : "eae921d6"
-                      },
-                      "unadjustedDate" : "2001-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae921d6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates0",
-                    "globalKey" : "d530b040"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-08-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters0",
-                            "globalKey" : "20a71d"
+                            "globalKey" : "20a71d",
+                            "externalKey" : "accrualBusinessCenters0"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "9ead9b90"
-                      },
-                      "unadjustedDate" : "2006-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "9ead9b90"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "20a71d",
+                        "externalReference" : "accrualBusinessCenters0"
+                      },
+                      "meta" : {
+                        "globalKey" : "622268e1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "985d6cb2"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "17984"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "d6a5a890",
+                    "externalKey" : "CalcPeriodDates0"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "6e2bf001"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4d64aef4"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters0",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "20a71d",
+                        "externalKey" : "paymentBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "9b0d9350"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                "meta" : {
+                  "globalKey" : "86242c95"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters1",
-                        "globalReference" : "20a71d"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e2"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "985d6cb3"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28cc3"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-08-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -248,165 +229,167 @@
                       },
                       "meta" : {
                         "globalKey" : "eae921d6"
-                      },
-                      "unadjustedDate" : "2001-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae921d6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates1",
-                    "globalKey" : "c8353f30"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-08-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters1",
-                            "globalKey" : "20a71d"
+                            "globalKey" : "20a71d",
+                            "externalKey" : "accrualBusinessCenters1"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "9ead9b90"
-                      },
-                      "unadjustedDate" : "2006-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "9ead9b90"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "20a71d",
+                        "externalReference" : "accrualBusinessCenters1"
+                      },
+                      "meta" : {
+                        "globalKey" : "622268e2"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "985d6cb3"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18ad5"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "d6b3d162",
+                    "externalKey" : "CalcPeriodDates1"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "9ec5a1dd"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4d64ad85"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters1",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "20a71d",
+                        "externalKey" : "paymentBusinessCenters1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365baaee"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "8f129421"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "CalcPeriodDates1",
-                    "globalReference" : "c8353f30"
+                    "globalReference" : "d6b3d162",
+                    "externalReference" : "CalcPeriodDates1"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2d80ce65"
+                      "globalKey" : "a5cb919"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "fixingBusinessCenters0",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "20a71d",
+                        "externalKey" : "fixingBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates0",
-                      "globalReference" : "3522cca9"
+                      "globalReference" : "dbaefb1",
+                      "externalReference" : "resetDates0"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates0",
-                    "globalKey" : "3522cca9"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "paymentBusinessCenters1",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "paymentBusinessCenters1"
                       },
                       "meta" : {
                         "globalKey" : "e30c2739"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "19472b0a"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "dbaefb1",
+                    "externalKey" : "resetDates0"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ad0fb833"
                 }
               } ],
               "meta" : {
-                "globalKey" : "893cb5bc"
+                "globalKey" : "2d8d4cfe"
               }
             },
             "terminationProvision" : {
               "extendibleProvision" : {
-                "buyer" : "PARTY_1",
-                "seller" : "PARTY_2",
+                "buyer" : "Party1",
+                "seller" : "Party2",
                 "europeanExercise" : {
-                  "earliestExerciseTime" : {
-                    "businessCenter" : {
-                      "value" : "BEBR"
-                    },
-                    "hourMinuteTime" : "09:00:00"
-                  },
                   "expirationDate" : [ {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-08-15",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -417,32 +400,23 @@
                             "globalKey" : "428533f"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "da4e2f6e"
                         }
                       },
                       "meta" : {
                         "globalKey" : "5fb4de7f"
-                      },
-                      "unadjustedDate" : "2006-08-15"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "5fb4de7f"
                     }
                   } ],
-                  "expirationTime" : {
-                    "businessCenter" : {
-                      "value" : "BEBR"
-                    },
-                    "hourMinuteTime" : "11:00:00"
-                  },
-                  "meta" : {
-                    "globalKey" : "fae95f8e"
-                  },
                   "relevantUnderlyingDate" : {
                     "adjustableDates" : {
+                      "unadjustedDate" : [ "2011-08-30" ],
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -451,19 +425,32 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "cb488bae"
-                      },
-                      "unadjustedDate" : [ "2011-08-30" ]
+                      }
                     },
                     "meta" : {
                       "globalKey" : "cb488bae"
                     }
+                  },
+                  "earliestExerciseTime" : {
+                    "hourMinuteTime" : "09:00:00",
+                    "businessCenter" : {
+                      "value" : "BEBR"
+                    }
+                  },
+                  "expirationTime" : {
+                    "hourMinuteTime" : "11:00:00",
+                    "businessCenter" : {
+                      "value" : "BEBR"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "c8bc4f8e"
                   }
                 },
                 "exerciseNotice" : {
@@ -476,142 +463,155 @@
             }
           },
           "meta" : {
-            "globalKey" : "f2795782"
+            "globalKey" : "a4bcf900"
           }
         },
         "meta" : {
-          "globalKey" : "f2795782"
+          "globalKey" : "a4bcf900"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7f30bbe5"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.05,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.05,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "66e6c0bb"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "65d139a0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Telerate"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "4820adb2"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e891d"
-      },
-      "value" : "2001-04-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c7753bbd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c7753bbe"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "e30a8af"
+    }
+  },
+  "meta" : {
+    "globalKey" : "e30a8af"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex22-cap-with-spread.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex22-cap-with-spread.json
index 93691c9684..ac5b254cb1 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex22-cap-with-spread.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex22-cap-with-spread.json
@@ -1,58 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "874c229a"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "874c229a"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "FRG78TR45E",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "f5151b56"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-04-29",
+      "meta" : {
+        "globalKey" : "3e891d"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,46 +35,58 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters0",
-                        "globalReference" : "428533f"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e1"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "capRateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      },
+                      "buyer" : "Receiver",
+                      "seller" : "Payer"
+                    },
                     "meta" : {
-                      "globalKey" : "985d6cb2"
+                      "globalKey" : "d44f9f26"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28cc3"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-06-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -111,20 +95,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eae74156"
-                      },
-                      "unadjustedDate" : "2001-06-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae74156"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates0",
-                    "globalKey" : "ffbbac33"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-06-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -132,37 +113,61 @@
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters0",
-                            "globalKey" : "428533f"
+                            "globalKey" : "428533f",
+                            "externalKey" : "accrualBusinessCenters0"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b1a6d0"
                         }
                       },
                       "meta" : {
                         "globalKey" : "42b38772"
-                      },
-                      "unadjustedDate" : "2006-06-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "42b38772"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "428533f",
+                        "externalReference" : "accrualBusinessCenters0"
+                      },
+                      "meta" : {
+                        "globalKey" : "622268e1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "985d6cb2"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18ad5"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "e5232a3f",
+                    "externalKey" : "CalcPeriodDates0"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "eddf13f1"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "18cf7fe3"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -170,240 +175,235 @@
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters0",
-                        "globalKey" : "428533f"
+                        "globalKey" : "428533f",
+                        "externalKey" : "paymentBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "97b1a6d0"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "capRateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      },
-                      "buyer" : "RECEIVER",
-                      "seller" : "PAYER"
-                    },
-                    "meta" : {
-                      "globalKey" : "b5a4459a"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "9e530f43"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "CalcPeriodDates0",
-                    "globalReference" : "ffbbac33"
+                    "globalReference" : "e5232a3f",
+                    "externalReference" : "CalcPeriodDates0"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2d80ce65"
+                      "globalKey" : "a5cb919"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "resetBusinessCenters0",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "20a71d",
+                        "externalKey" : "resetBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates0",
-                      "globalReference" : "366e4ca0"
+                      "globalReference" : "92a4c738",
+                      "externalReference" : "resetDates0"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates0",
-                    "globalKey" : "366e4ca0"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "resetBusinessCenters0",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "resetBusinessCenters0"
                       },
                       "meta" : {
                         "globalKey" : "35a06081"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "6bdb6452"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "92a4c738",
+                    "externalKey" : "resetDates0"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "1e4718f5"
                 }
               } ],
               "meta" : {
-                "globalKey" : "eddf13f1"
+                "globalKey" : "1e4718f5"
               }
             }
           },
           "meta" : {
-            "globalKey" : "eddf13f1"
+            "globalKey" : "1e4718f5"
           }
         },
         "meta" : {
-          "globalKey" : "eddf13f1"
+          "globalKey" : "1e4718f5"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a6d8acaa"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EURIBOR-Telerate"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.12,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.12,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          }, {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.06,
-              "arithmeticOperator" : "MIN",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Min"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-2"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EURIBOR-Telerate"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
+                }
               },
-              "value" : 100000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "ca14b27e"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e891d"
-      },
-      "value" : "2001-04-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "FRG78TR45E"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "cf509216"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "1abc6ca0"
+    }
+  },
+  "meta" : {
+    "globalKey" : "1abc6ca0"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex22-cap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex22-cap.json
index f91562986b..57ea798333 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex22-cap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex22-cap.json
@@ -1,58 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "105637c2"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "105637c2"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "FRG78TR45E",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "f5151b56"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-04-29",
+      "meta" : {
+        "globalKey" : "3e891d"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,46 +35,50 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters0",
-                        "globalReference" : "428533f"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e1"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
+                    "capRateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      },
+                      "buyer" : "Receiver",
+                      "seller" : "Payer"
+                    },
                     "meta" : {
-                      "globalKey" : "985d6cb2"
+                      "globalKey" : "d44f9f26"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28cc3"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-06-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -111,20 +87,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eae74156"
-                      },
-                      "unadjustedDate" : "2001-06-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae74156"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates0",
-                    "globalKey" : "ffbbac33"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-06-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -132,37 +105,61 @@
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters0",
-                            "globalKey" : "428533f"
+                            "globalKey" : "428533f",
+                            "externalKey" : "accrualBusinessCenters0"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b1a6d0"
                         }
                       },
                       "meta" : {
                         "globalKey" : "42b38772"
-                      },
-                      "unadjustedDate" : "2006-06-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "42b38772"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "428533f",
+                        "externalReference" : "accrualBusinessCenters0"
+                      },
+                      "meta" : {
+                        "globalKey" : "622268e1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "985d6cb2"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18ad5"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "e5232a3f",
+                    "externalKey" : "CalcPeriodDates0"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "130ed72f"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "18cf7fe3"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -170,235 +167,238 @@
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters0",
-                        "globalKey" : "428533f"
+                        "globalKey" : "428533f",
+                        "externalKey" : "paymentBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "97b1a6d0"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "capRateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      },
-                      "buyer" : "RECEIVER",
-                      "seller" : "PAYER"
-                    },
-                    "meta" : {
-                      "globalKey" : "d44f9f26"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "9e530f43"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "CalcPeriodDates0",
-                    "globalReference" : "ffbbac33"
+                    "globalReference" : "e5232a3f",
+                    "externalReference" : "CalcPeriodDates0"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2d80ce65"
+                      "globalKey" : "a5cb919"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "resetBusinessCenters0",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "20a71d",
+                        "externalKey" : "resetBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates0",
-                      "globalReference" : "366e4ca0"
+                      "globalReference" : "92a4c738",
+                      "externalReference" : "resetDates0"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates0",
-                    "globalKey" : "366e4ca0"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "resetBusinessCenters0",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "resetBusinessCenters0"
                       },
                       "meta" : {
                         "globalKey" : "35a06081"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "6bdb6452"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "92a4c738",
+                    "externalKey" : "resetDates0"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "169d67d3"
                 }
               } ],
               "meta" : {
-                "globalKey" : "130ed72f"
+                "globalKey" : "169d67d3"
               }
             }
           },
           "meta" : {
-            "globalKey" : "130ed72f"
+            "globalKey" : "169d67d3"
           }
         },
         "meta" : {
-          "globalKey" : "130ed72f"
+          "globalKey" : "169d67d3"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a79dc826"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EURIBOR-Telerate"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.06,
               "datedValue" : [ {
                 "date" : "2002-06-30",
+                "value" : 0.0625,
                 "meta" : {
                   "globalKey" : "5c1b1be9"
-                },
-                "value" : 0.0625
+                }
               }, {
                 "date" : "2003-06-30",
+                "value" : 0.065,
                 "meta" : {
                   "globalKey" : "a4ea653"
-                },
-                "value" : 0.065
+                }
               }, {
                 "date" : "2004-06-30",
+                "value" : 0.0675,
                 "meta" : {
                   "globalKey" : "5c1d0c84"
-                },
-                "value" : 0.0675
+                }
               }, {
                 "date" : "2005-06-30",
+                "value" : 0.07,
                 "meta" : {
                   "globalKey" : "7ad0ea7"
-                },
-                "value" : 0.07
+                }
               } ],
-              "arithmeticOperator" : "MIN",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Min"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EURIBOR-Telerate"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
+                }
               },
-              "value" : 100000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "be72bfd2"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e891d"
-      },
-      "value" : "2001-04-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "FRG78TR45E"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "cf509216"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "e5a41a3e"
+    }
+  },
+  "meta" : {
+    "globalKey" : "e5a41a3e"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex23-floor-with-spread.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex23-floor-with-spread.json
index 9ad2b61894..297200c67b 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex23-floor-with-spread.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex23-floor-with-spread.json
@@ -1,58 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "be820eaa"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "be820eaa"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "FRG78TR45E",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "f5151b56"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-04-29",
+      "meta" : {
+        "globalKey" : "3e891d"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,46 +35,58 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters0",
-                        "globalReference" : "428533f"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e1"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "floorRateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      },
+                      "buyer" : "Receiver",
+                      "seller" : "Payer"
+                    },
                     "meta" : {
-                      "globalKey" : "985d6cb2"
+                      "globalKey" : "d44f9f26"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28cc3"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-06-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -111,20 +95,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eae74156"
-                      },
-                      "unadjustedDate" : "2001-06-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae74156"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates0",
-                    "globalKey" : "ffbbac33"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-06-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -132,37 +113,61 @@
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters0",
-                            "globalKey" : "428533f"
+                            "globalKey" : "428533f",
+                            "externalKey" : "accrualBusinessCenters0"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b1a6d0"
                         }
                       },
                       "meta" : {
                         "globalKey" : "42b38772"
-                      },
-                      "unadjustedDate" : "2006-06-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "42b38772"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "428533f",
+                        "externalReference" : "accrualBusinessCenters0"
+                      },
+                      "meta" : {
+                        "globalKey" : "622268e1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "985d6cb2"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18ad5"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "e5232a3f",
+                    "externalKey" : "CalcPeriodDates0"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "eddf13f1"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "18cf7fe3"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -170,240 +175,235 @@
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters0",
-                        "globalKey" : "428533f"
+                        "globalKey" : "428533f",
+                        "externalKey" : "paymentBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "97b1a6d0"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "floorRateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      },
-                      "buyer" : "RECEIVER",
-                      "seller" : "PAYER"
-                    },
-                    "meta" : {
-                      "globalKey" : "b5a4459a"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "9e530f43"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "CalcPeriodDates0",
-                    "globalReference" : "ffbbac33"
+                    "globalReference" : "e5232a3f",
+                    "externalReference" : "CalcPeriodDates0"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2d80ce65"
+                      "globalKey" : "a5cb919"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "resetBusinessCenters0",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "20a71d",
+                        "externalKey" : "resetBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates0",
-                      "globalReference" : "366e4ca0"
+                      "globalReference" : "92a4c738",
+                      "externalReference" : "resetDates0"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates0",
-                    "globalKey" : "366e4ca0"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "resetBusinessCenters0",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "resetBusinessCenters0"
                       },
                       "meta" : {
                         "globalKey" : "35a06081"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "6bdb6452"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "92a4c738",
+                    "externalKey" : "resetDates0"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "1e4718f5"
                 }
               } ],
               "meta" : {
-                "globalKey" : "eddf13f1"
+                "globalKey" : "1e4718f5"
               }
             }
           },
           "meta" : {
-            "globalKey" : "eddf13f1"
+            "globalKey" : "1e4718f5"
           }
         },
         "meta" : {
-          "globalKey" : "eddf13f1"
+          "globalKey" : "1e4718f5"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "bc8d329a"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EURIBOR-Telerate"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.12,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.12,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          }, {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 0.04,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.04,
-              "arithmeticOperator" : "MAX",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Max"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-2"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EURIBOR-Telerate"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
+                }
               },
-              "value" : 100000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "102dce52"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e891d"
-      },
-      "value" : "2001-04-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "FRG78TR45E"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "cf509216"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "c5eb6074"
+    }
+  },
+  "meta" : {
+    "globalKey" : "c5eb6074"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex23-floor.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex23-floor.json
index c17d2ac22f..d53719eba6 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex23-floor.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex23-floor.json
@@ -1,58 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "5cf46396"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "5cf46396"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "FRG78TR45E",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "f5151b56"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-04-29",
+      "meta" : {
+        "globalKey" : "3e891d"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,46 +35,50 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters0",
-                        "globalReference" : "428533f"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e1"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
+                    "floorRateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      },
+                      "buyer" : "Receiver",
+                      "seller" : "Payer"
+                    },
                     "meta" : {
-                      "globalKey" : "985d6cb2"
+                      "globalKey" : "d44f9f26"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28cc3"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-06-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -111,20 +87,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eae74156"
-                      },
-                      "unadjustedDate" : "2001-06-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae74156"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates0",
-                    "globalKey" : "ffbbac33"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-06-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -132,37 +105,61 @@
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters0",
-                            "globalKey" : "428533f"
+                            "globalKey" : "428533f",
+                            "externalKey" : "accrualBusinessCenters0"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b1a6d0"
                         }
                       },
                       "meta" : {
                         "globalKey" : "42b38772"
-                      },
-                      "unadjustedDate" : "2006-06-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "42b38772"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "428533f",
+                        "externalReference" : "accrualBusinessCenters0"
+                      },
+                      "meta" : {
+                        "globalKey" : "622268e1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "985d6cb2"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18ad5"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "e5232a3f",
+                    "externalKey" : "CalcPeriodDates0"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "130ed72f"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "18cf7fe3"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -170,235 +167,238 @@
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters0",
-                        "globalKey" : "428533f"
+                        "globalKey" : "428533f",
+                        "externalKey" : "paymentBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "97b1a6d0"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "floorRateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      },
-                      "buyer" : "RECEIVER",
-                      "seller" : "PAYER"
-                    },
-                    "meta" : {
-                      "globalKey" : "d44f9f26"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "9e530f43"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "CalcPeriodDates0",
-                    "globalReference" : "ffbbac33"
+                    "globalReference" : "e5232a3f",
+                    "externalReference" : "CalcPeriodDates0"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2d80ce65"
+                      "globalKey" : "a5cb919"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "resetBusinessCenters0",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "20a71d",
+                        "externalKey" : "resetBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates0",
-                      "globalReference" : "366e4ca0"
+                      "globalReference" : "92a4c738",
+                      "externalReference" : "resetDates0"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates0",
-                    "globalKey" : "366e4ca0"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "resetBusinessCenters0",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "resetBusinessCenters0"
                       },
                       "meta" : {
                         "globalKey" : "35a06081"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "6bdb6452"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "92a4c738",
+                    "externalKey" : "resetDates0"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "169d67d3"
                 }
               } ],
               "meta" : {
-                "globalKey" : "130ed72f"
+                "globalKey" : "169d67d3"
               }
             }
           },
           "meta" : {
-            "globalKey" : "130ed72f"
+            "globalKey" : "169d67d3"
           }
         },
         "meta" : {
-          "globalKey" : "130ed72f"
+          "globalKey" : "169d67d3"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7e2482d2"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EURIBOR-Telerate"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.04,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.04,
               "datedValue" : [ {
                 "date" : "2002-06-30",
+                "value" : 0.0425,
                 "meta" : {
                   "globalKey" : "5c1b1467"
-                },
-                "value" : 0.0425
+                }
               }, {
                 "date" : "2003-06-30",
+                "value" : 0.045,
                 "meta" : {
                   "globalKey" : "a4ea615"
-                },
-                "value" : 0.045
+                }
               }, {
                 "date" : "2004-06-30",
+                "value" : 0.0475,
                 "meta" : {
                   "globalKey" : "5c1d0502"
-                },
-                "value" : 0.0475
+                }
               }, {
                 "date" : "2005-06-30",
+                "value" : 0.05,
                 "meta" : {
                   "globalKey" : "7ad0ea5"
-                },
-                "value" : 0.05
+                }
               } ],
-              "arithmeticOperator" : "MAX",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Max"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EURIBOR-Telerate"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
+                }
               },
-              "value" : 100000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "33205562"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e891d"
-      },
-      "value" : "2001-04-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "FRG78TR45E"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "cf509216"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "9e148fce"
+    }
+  },
+  "meta" : {
+    "globalKey" : "9e148fce"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex24-collar.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex24-collar.json
index bb8ca5e59f..84de1d69a8 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex24-collar.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex24-collar.json
@@ -1,58 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "5c4f5540"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "5c4f5540"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "FRG78TR45E",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "f5151b56"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-04-29",
+      "meta" : {
+        "globalKey" : "3e891d"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,46 +35,60 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters0",
-                        "globalReference" : "428533f"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e1"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
+                    "capRateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      },
+                      "buyer" : "Receiver",
+                      "seller" : "Payer"
+                    },
+                    "floorRateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      },
+                      "buyer" : "Payer",
+                      "seller" : "Receiver"
+                    },
                     "meta" : {
-                      "globalKey" : "985d6cb2"
+                      "globalKey" : "685c4c74"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28cc3"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-06-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -111,20 +97,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eae74156"
-                      },
-                      "unadjustedDate" : "2001-06-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae74156"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates0",
-                    "globalKey" : "ffbbac33"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-06-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -132,37 +115,61 @@
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters0",
-                            "globalKey" : "428533f"
+                            "globalKey" : "428533f",
+                            "externalKey" : "accrualBusinessCenters0"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b1a6d0"
                         }
                       },
                       "meta" : {
                         "globalKey" : "42b38772"
-                      },
-                      "unadjustedDate" : "2006-06-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "42b38772"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "428533f",
+                        "externalReference" : "accrualBusinessCenters0"
+                      },
+                      "meta" : {
+                        "globalKey" : "622268e1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "985d6cb2"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18ad5"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "e5232a3f",
+                    "externalKey" : "CalcPeriodDates0"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "14aba98b"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "18cf7fe3"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -170,292 +177,285 @@
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters0",
-                        "globalKey" : "428533f"
+                        "globalKey" : "428533f",
+                        "externalKey" : "paymentBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "97b1a6d0"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "capRateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      },
-                      "buyer" : "RECEIVER",
-                      "seller" : "PAYER"
-                    },
-                    "floorRateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      },
-                      "buyer" : "PAYER",
-                      "seller" : "RECEIVER"
-                    },
-                    "meta" : {
-                      "globalKey" : "685c4c74"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "9e530f43"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "CalcPeriodDates0",
-                    "globalReference" : "ffbbac33"
+                    "globalReference" : "e5232a3f",
+                    "externalReference" : "CalcPeriodDates0"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2d80ce65"
+                      "globalKey" : "a5cb919"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "resetBusinessCenters0",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "20a71d",
+                        "externalKey" : "resetBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates0",
-                      "globalReference" : "366e4ca0"
+                      "globalReference" : "92a4c738",
+                      "externalReference" : "resetDates0"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates0",
-                    "globalKey" : "366e4ca0"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "resetBusinessCenters0",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "resetBusinessCenters0"
                       },
                       "meta" : {
                         "globalKey" : "35a06081"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "6bdb6452"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "92a4c738",
+                    "externalKey" : "resetDates0"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "53bdf227"
                 }
               } ],
               "meta" : {
-                "globalKey" : "14aba98b"
+                "globalKey" : "53bdf227"
               }
             }
           },
           "meta" : {
-            "globalKey" : "14aba98b"
+            "globalKey" : "53bdf227"
           }
         },
         "meta" : {
-          "globalKey" : "14aba98b"
+          "globalKey" : "53bdf227"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "d9dfe38c"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EURIBOR-Telerate"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.06,
               "datedValue" : [ {
                 "date" : "2002-06-30",
+                "value" : 0.0625,
                 "meta" : {
                   "globalKey" : "5c1b1be9"
-                },
-                "value" : 0.0625
+                }
               }, {
                 "date" : "2003-06-30",
+                "value" : 0.065,
                 "meta" : {
                   "globalKey" : "a4ea653"
-                },
-                "value" : 0.065
+                }
               }, {
                 "date" : "2004-06-30",
+                "value" : 0.0675,
                 "meta" : {
                   "globalKey" : "5c1d0c84"
-                },
-                "value" : 0.0675
+                }
               }, {
                 "date" : "2005-06-30",
+                "value" : 0.07,
                 "meta" : {
                   "globalKey" : "7ad0ea7"
-                },
-                "value" : 0.07
+                }
               } ],
-              "arithmeticOperator" : "MIN",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          }, {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Min"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-1"
+                "value" : "price-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 0.04,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.04,
               "datedValue" : [ {
                 "date" : "2002-06-30",
+                "value" : 0.0425,
                 "meta" : {
                   "globalKey" : "5c1b1467"
-                },
-                "value" : 0.0425
+                }
               }, {
                 "date" : "2003-06-30",
+                "value" : 0.045,
                 "meta" : {
                   "globalKey" : "a4ea615"
-                },
-                "value" : 0.045
+                }
               }, {
                 "date" : "2004-06-30",
+                "value" : 0.0475,
                 "meta" : {
                   "globalKey" : "5c1d0502"
-                },
-                "value" : 0.0475
+                }
               }, {
                 "date" : "2005-06-30",
+                "value" : 0.05,
                 "meta" : {
                   "globalKey" : "7ad0ea5"
-                },
-                "value" : 0.05
+                }
               } ],
-              "arithmeticOperator" : "MAX",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Max"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EURIBOR-Telerate"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
+                }
               },
-              "value" : 100000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "5ccbdf42"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e891d"
-      },
-      "value" : "2001-04-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "FRG78TR45E"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "cf509216"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "1156e8f4"
+    }
+  },
+  "meta" : {
+    "globalKey" : "1156e8f4"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex25-fxnotional-swap-usi-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex25-fxnotional-swap-usi-uti.json
index bd84b6e2a8..39d5af6ab5 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex25-fxnotional-swap-usi-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex25-fxnotional-swap-usi-uti.json
@@ -1,66 +1,51 @@
 {
-  "meta" : {
-    "globalKey" : "e00af332"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "e00af332"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
-      },
-      "name" : {
-        "value" : "Party A"
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "1031234567",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
+        }
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56323",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "121d7965"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
+        "globalKey" : "1ecdb5a5"
       },
-      "name" : {
-        "value" : "Party B"
+      "identifierType" : "UniqueTransactionIdentifier"
+    }, {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+        }
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56323",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/usi"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "df285a49"
+      },
+      "identifierType" : "UniqueSwapIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2001-01-09",
+      "meta" : {
+        "globalKey" : "3e8849"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -71,58 +56,51 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "notionalScheduleJPY",
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "notionalScheduleJPY"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : true,
                   "initialPayment" : true,
+                  "finalPayment" : true,
                   "intermediatePayment" : true,
                   "meta" : {
                     "globalKey" : "12a6ef"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "JPTO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "81e56a96"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "58681de7"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c86"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "11"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-01-11",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -131,20 +109,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eb7870c3"
-                      },
-                      "unadjustedDate" : "2006-01-11"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eb7870c3"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "30a986f2"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2011-01-11",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -157,33 +132,20 @@
                             "globalKey" : "81e56a96"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "58681de7"
                         }
                       },
                       "meta" : {
                         "globalKey" : "46e069fc"
-                      },
-                      "unadjustedDate" : "2011-01-11"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "46e069fc"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "a7e26236"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "e8a5aeec"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -196,68 +158,80 @@
                         "globalKey" : "81e56a96"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "58681de7"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "18a98"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "11"
+                  },
+                  "meta" : {
+                    "globalKey" : "a55eed20",
+                    "externalKey" : "fixedCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "JPTO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "81e56a96"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "58681de7"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "3c51359a"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "836f0e8e"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "98907a10"
+                  "quantityReference" : {
+                    "globalReference" : "0",
+                    "externalReference" : "notionalScheduleJPY"
                   },
                   "quantityMultiplier" : {
                     "fxLinkedNotionalSchedule" : {
-                      "fixingTime" : {
-                        "businessCenter" : {
-                          "value" : "JPTO"
-                        },
-                        "hourMinuteTime" : "17:00:00"
-                      },
-                      "fxSpotRateSource" : {
-                        "primarySource" : {
-                          "sourceProvider" : {
-                            "value" : "BANK_OF_JAPAN"
-                          }
-                        }
-                      },
                       "varyingNotionalCurrency" : {
                         "value" : "USD"
                       },
                       "varyingNotionalFixingDates" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "da0eae22"
+                          "globalKey" : "ef9abbd6"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -268,68 +242,70 @@
                             "globalKey" : "4f79278"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "floatingResetDates",
-                          "globalReference" : "58bd1f13"
+                          "globalReference" : "d2280a35",
+                          "externalReference" : "floatingResetDates"
+                        }
+                      },
+                      "fxSpotRateSource" : {
+                        "primarySource" : {
+                          "sourceProvider" : {
+                            "value" : "BankOfJapan"
+                          }
+                        }
+                      },
+                      "fixingTime" : {
+                        "hourMinuteTime" : "17:00:00",
+                        "businessCenter" : {
+                          "value" : "JPTO"
                         }
                       },
                       "varyingNotionalInterimExchangePaymentDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "6713b2c1"
+                          "globalKey" : "63745db9"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
                         "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "floatingPaymentDates",
-                          "globalReference" : "e8a5aee9"
+                          "globalReference" : "7da31d57",
+                          "externalReference" : "floatingPaymentDates"
                         }
                       }
                     }
                   },
-                  "quantityReference" : {
-                    "externalReference" : "notionalScheduleJPY",
-                    "globalReference" : "0"
+                  "meta" : {
+                    "globalKey" : "905d4f7c"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : true,
                   "initialPayment" : true,
+                  "finalPayment" : true,
                   "intermediatePayment" : true,
                   "meta" : {
                     "globalKey" : "12a6ef"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "JPTO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "81e56a96"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "58681de7"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c29"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "11"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-01-11",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -338,20 +314,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eb7870c3"
-                      },
-                      "unadjustedDate" : "2006-01-11"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eb7870c3"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "c7aa61af"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2011-01-11",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -364,34 +337,20 @@
                             "globalKey" : "81e56a96"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "58681de7"
                         }
                       },
                       "meta" : {
                         "globalKey" : "46e069fc"
-                      },
-                      "unadjustedDate" : "2011-01-11"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "46e069fc"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "e898554b"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "floatingPaymentDates",
-                    "globalKey" : "e8a5aee9"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -404,44 +363,69 @@
                         "globalKey" : "81e56a96"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "58681de7"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "17f55"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "rollConvention" : "11"
+                  },
+                  "meta" : {
+                    "globalKey" : "a55ee1dd",
+                    "externalKey" : "floatingCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "JPTO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "81e56a96"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "58681de7"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "7da31d57",
+                    "externalKey" : "floatingPaymentDates"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "c7aa61af"
+                    "globalReference" : "a55ee1dd",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "20aefd48"
+                      "globalKey" : "fd8ae7fc"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -450,17 +434,20 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "floatingResetDates",
-                      "globalReference" : "58bd1f13"
+                      "globalReference" : "d2280a35",
+                      "externalReference" : "floatingResetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingResetDates",
-                    "globalKey" : "58bd1f13"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -473,168 +460,181 @@
                         "globalKey" : "81e56a96"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "58681de7"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "d2280a35",
+                    "externalKey" : "floatingResetDates"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "b98f609d"
                 }
               } ],
               "meta" : {
-                "globalKey" : "9b49f355"
+                "globalKey" : "f3e8a34f"
               }
             }
           },
           "meta" : {
-            "globalKey" : "9b49f355"
+            "globalKey" : "f3e8a34f"
           }
         },
         "meta" : {
-          "globalKey" : "9b49f355"
+          "globalKey" : "f3e8a34f"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "65085842"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "value" : 0.01,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 1000000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "JPY"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "3c02affe"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
               "unit" : {
                 "currency" : {
-                  "value" : "JPY"
+                  "value" : "USD"
                 }
-              },
-              "value" : 1000000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "f5c71eab"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d05"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              }
+            "meta" : {
+              "globalKey" : "828026c7"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "bf5968ad"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8849"
-      },
-      "value" : "2001-01-09"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "56323"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
-        },
-        "value" : "1031234567"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "84d7eae5"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/usi"
-          },
-          "value" : "56323"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "54930084UKLVMY22DS16"
+      "name" : {
+        "value" : "Party B"
       },
       "meta" : {
-        "globalKey" : "e108e53f"
-      },
-      "identifierType" : "UNIQUE_SWAP_IDENTIFIER"
-    } ]
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "518f73fc"
+    }
+  },
+  "meta" : {
+    "globalKey" : "518f73fc"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex26-fxnotional-swap-with-cfs.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex26-fxnotional-swap-with-cfs.json
index a5908d92bd..ff976d61ab 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex26-fxnotional-swap-with-cfs.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex26-fxnotional-swap-with-cfs.json
@@ -1,58 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "7fe9763d"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "7fe9763d"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http:/www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "957b3c47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http:/www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "957bb0a6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-01-09",
+      "meta" : {
+        "globalKey" : "3e8849"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,58 +50,51 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "notionalScheduleJPY",
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "notionalScheduleJPY"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : true,
                   "initialPayment" : true,
+                  "finalPayment" : true,
                   "intermediatePayment" : true,
                   "meta" : {
                     "globalKey" : "12a6ef"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "JPTO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "81e56a96"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "58681de7"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c86"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "11"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-01-11",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -123,20 +103,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eb7870c3"
-                      },
-                      "unadjustedDate" : "2006-01-11"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eb7870c3"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "30a986f2"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2011-01-11",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -149,19 +126,78 @@
                             "globalKey" : "81e56a96"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "58681de7"
                         }
                       },
                       "meta" : {
                         "globalKey" : "46e069fc"
-                      },
-                      "unadjustedDate" : "2011-01-11"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "46e069fc"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "JPTO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "81e56a96"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "58681de7"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18a98"
+                    },
+                    "rollConvention" : "11"
+                  },
+                  "meta" : {
+                    "globalKey" : "a55eed20",
+                    "externalKey" : "fixedCalcPeriodDates"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "JPTO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "81e56a96"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "58681de7"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3c51359a"
                   }
                 },
                 "cashflowRepresentation" : {
@@ -169,231 +205,171 @@
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "2006-07-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2006-07-11",
                       "adjustedStartDate" : "2006-01-11",
+                      "adjustedEndDate" : "2006-07-11",
                       "meta" : {
-                        "globalKey" : "b6cc5a60"
+                        "globalKey" : "3efcac20"
                       },
-                      "fixedRate" : 0.01,
-                      "notionalAmount" : 1000000000
+                      "notionalAmount" : 1000000000,
+                      "fixedRate" : 0.01
                     } ],
                     "meta" : {
-                      "globalKey" : "917c0f75"
+                      "globalKey" : "19ac6135"
                     }
                   }, {
                     "adjustedPaymentDate" : "2003-01-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2007-01-11",
                       "adjustedStartDate" : "2006-07-11",
+                      "adjustedEndDate" : "2007-01-11",
                       "meta" : {
-                        "globalKey" : "8bfc2d72"
+                        "globalKey" : "b446db4e"
                       },
-                      "fixedRate" : 0.01,
-                      "notionalAmount" : 100000000
+                      "notionalAmount" : 100000000,
+                      "fixedRate" : 0.01
                     } ],
                     "meta" : {
-                      "globalKey" : "e3180c07"
+                      "globalKey" : "b62b9e3"
                     }
                   }, {
                     "adjustedPaymentDate" : "2007-07-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2007-07-11",
                       "adjustedStartDate" : "2007-01-11",
+                      "adjustedEndDate" : "2007-07-11",
                       "meta" : {
-                        "globalKey" : "ba8d5a60"
+                        "globalKey" : "42bdac20"
                       },
-                      "fixedRate" : 0.01,
-                      "notionalAmount" : 1000000000
+                      "notionalAmount" : 1000000000,
+                      "fixedRate" : 0.01
                     } ],
                     "meta" : {
-                      "globalKey" : "3c020775"
+                      "globalKey" : "c4325935"
                     }
                   }, {
                     "adjustedPaymentDate" : "2008-01-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2008-01-11",
                       "adjustedStartDate" : "2007-07-11",
+                      "adjustedEndDate" : "2008-01-11",
                       "meta" : {
-                        "globalKey" : "8fbd2d72"
+                        "globalKey" : "b807db4e"
                       },
-                      "fixedRate" : 0.01,
-                      "notionalAmount" : 100000000
+                      "notionalAmount" : 100000000,
+                      "fixedRate" : 0.01
                     } ],
                     "meta" : {
-                      "globalKey" : "28b1e407"
+                      "globalKey" : "50fc91e3"
                     }
                   }, {
                     "adjustedPaymentDate" : "2008-07-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2008-07-11",
                       "adjustedStartDate" : "2008-01-11",
+                      "adjustedEndDate" : "2008-07-11",
                       "meta" : {
-                        "globalKey" : "be4e5a60"
+                        "globalKey" : "467eac20"
                       },
-                      "fixedRate" : 0.01,
-                      "notionalAmount" : 1000000000
+                      "notionalAmount" : 1000000000,
+                      "fixedRate" : 0.01
                     } ],
                     "meta" : {
-                      "globalKey" : "e687ff75"
+                      "globalKey" : "6eb85135"
                     }
                   }, {
                     "adjustedPaymentDate" : "2009-01-13",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2009-01-13",
                       "adjustedStartDate" : "2008-07-11",
+                      "adjustedEndDate" : "2009-01-13",
                       "meta" : {
-                        "globalKey" : "937f1630"
+                        "globalKey" : "bbc8e2d0"
                       },
-                      "fixedRate" : 0.01,
-                      "notionalAmount" : 100000000
+                      "notionalAmount" : 100000000,
+                      "fixedRate" : 0.01
                     } ],
                     "meta" : {
-                      "globalKey" : "d6a27603"
+                      "globalKey" : "feec42a3"
                     }
                   }, {
                     "adjustedPaymentDate" : "2009-07-13",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2009-07-13",
                       "adjustedStartDate" : "2009-01-13",
+                      "adjustedEndDate" : "2009-07-13",
                       "meta" : {
-                        "globalKey" : "c2104aa0"
+                        "globalKey" : "4a409c60"
                       },
-                      "fixedRate" : 0.01,
-                      "notionalAmount" : 1000000000
+                      "notionalAmount" : 1000000000,
+                      "fixedRate" : 0.01
                     } ],
                     "meta" : {
-                      "globalKey" : "947898f3"
+                      "globalKey" : "1ca8eab3"
                     }
                   }, {
                     "adjustedPaymentDate" : "2010-01-12",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2010-01-12",
                       "adjustedStartDate" : "2009-07-13",
+                      "adjustedEndDate" : "2010-01-12",
                       "meta" : {
-                        "globalKey" : "973fa953"
+                        "globalKey" : "bf8ac7cd"
                       },
-                      "fixedRate" : 0.01,
-                      "notionalAmount" : 100000000
+                      "notionalAmount" : 100000000,
+                      "fixedRate" : 0.01
                     } ],
                     "meta" : {
-                      "globalKey" : "7f732887"
+                      "globalKey" : "a7be4701"
                     }
                   }, {
                     "adjustedPaymentDate" : "2010-07-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2010-07-11",
                       "adjustedStartDate" : "2010-01-12",
+                      "adjustedEndDate" : "2010-07-11",
                       "meta" : {
-                        "globalKey" : "c5d05e21"
+                        "globalKey" : "4e01207f"
                       },
-                      "fixedRate" : 0.01,
-                      "notionalAmount" : 1000000000
+                      "notionalAmount" : 1000000000,
+                      "fixedRate" : 0.01
                     } ],
                     "meta" : {
-                      "globalKey" : "3b93f336"
+                      "globalKey" : "c3c4b594"
                     }
                   }, {
                     "adjustedPaymentDate" : "2011-01-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2011-01-11",
                       "adjustedStartDate" : "2010-07-11",
+                      "adjustedEndDate" : "2011-01-11",
                       "meta" : {
-                        "globalKey" : "9b002d72"
+                        "globalKey" : "c34adb4e"
                       },
-                      "fixedRate" : 0.01,
-                      "notionalAmount" : 100000000
+                      "notionalAmount" : 100000000,
+                      "fixedRate" : 0.01
                     } ],
                     "meta" : {
-                      "globalKey" : "2843cc07"
+                      "globalKey" : "508e79e3"
                     }
                   } ]
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
                 "meta" : {
-                  "globalKey" : "b478c6c0"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "e8a5aeec"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "JPTO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "81e56a96"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "58681de7"
-                    }
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "ee97ead0"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "98907a10"
+                  "quantityReference" : {
+                    "globalReference" : "0",
+                    "externalReference" : "notionalScheduleJPY"
                   },
                   "quantityMultiplier" : {
                     "fxLinkedNotionalSchedule" : {
-                      "fixingTime" : {
-                        "businessCenter" : {
-                          "value" : "JPTO"
-                        },
-                        "hourMinuteTime" : "17:00:00"
-                      },
-                      "fxSpotRateSource" : {
-                        "primarySource" : {
-                          "sourceProvider" : {
-                            "value" : "BANK_OF_JAPAN"
-                          }
-                        }
-                      },
                       "varyingNotionalCurrency" : {
                         "value" : "USD"
                       },
                       "varyingNotionalFixingDates" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "da0eae22"
+                          "globalKey" : "ef9abbd6"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -404,68 +380,70 @@
                             "globalKey" : "4f79278"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "floatingResetDates",
-                          "globalReference" : "58bd1f13"
+                          "globalReference" : "d2280a35",
+                          "externalReference" : "floatingResetDates"
+                        }
+                      },
+                      "fxSpotRateSource" : {
+                        "primarySource" : {
+                          "sourceProvider" : {
+                            "value" : "BankOfJapan"
+                          }
+                        }
+                      },
+                      "fixingTime" : {
+                        "hourMinuteTime" : "17:00:00",
+                        "businessCenter" : {
+                          "value" : "JPTO"
                         }
                       },
                       "varyingNotionalInterimExchangePaymentDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "6713b2c1"
+                          "globalKey" : "63745db9"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
                         "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "floatingPaymentDates",
-                          "globalReference" : "e8a5aee9"
+                          "globalReference" : "7da31d57",
+                          "externalReference" : "floatingPaymentDates"
                         }
                       }
                     }
                   },
-                  "quantityReference" : {
-                    "externalReference" : "notionalScheduleJPY",
-                    "globalReference" : "0"
+                  "meta" : {
+                    "globalKey" : "905d4f7c"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : true,
                   "initialPayment" : true,
+                  "finalPayment" : true,
                   "intermediatePayment" : true,
                   "meta" : {
                     "globalKey" : "12a6ef"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "JPTO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "81e56a96"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "58681de7"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c29"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "11"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-01-11",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -474,20 +452,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eb7870c3"
-                      },
-                      "unadjustedDate" : "2006-01-11"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eb7870c3"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "c7aa61af"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2011-01-11",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -500,19 +475,136 @@
                             "globalKey" : "81e56a96"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "58681de7"
                         }
                       },
                       "meta" : {
                         "globalKey" : "46e069fc"
-                      },
-                      "unadjustedDate" : "2011-01-11"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "46e069fc"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "JPTO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "81e56a96"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "58681de7"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f55"
+                    },
+                    "rollConvention" : "11"
+                  },
+                  "meta" : {
+                    "globalKey" : "a55ee1dd",
+                    "externalKey" : "floatingCalcPeriodDates"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "JPTO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "81e56a96"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "58681de7"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "7da31d57",
+                    "externalKey" : "floatingPaymentDates"
+                  }
+                },
+                "resetDates" : {
+                  "calculationPeriodDatesReference" : {
+                    "globalReference" : "a55ee1dd",
+                    "externalReference" : "floatingCalcPeriodDates"
+                  },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
+                  "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "fd8ae7fc"
+                    },
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
+                      }
+                    },
+                    "dateRelativeTo" : {
+                      "globalReference" : "d2280a35",
+                      "externalReference" : "floatingResetDates"
+                    }
+                  },
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "JPTO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "81e56a96"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "58681de7"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "d2280a35",
+                    "externalKey" : "floatingResetDates"
                   }
                 },
                 "cashflowRepresentation" : {
@@ -520,735 +612,643 @@
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "2006-04-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2006-04-11",
                       "adjustedStartDate" : "2006-01-11",
+                      "adjustedEndDate" : "2006-04-11",
                       "meta" : {
-                        "globalKey" : "a6065bc1"
+                        "globalKey" : "5770aec1"
+                      },
+                      "fxLinkedNotionalAmount" : {
+                        "adjustedFxSpotFixingDate" : "2006-01-09"
                       },
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2006-01-09",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "79758d8"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "fxLinkedNotionalAmount" : {
-                        "adjustedFxSpotFixingDate" : "2006-01-09"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "51e6a716"
+                      "globalKey" : "350fa16"
                     }
                   }, {
                     "adjustedPaymentDate" : "2006-07-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2006-07-11",
                       "adjustedStartDate" : "2006-04-11",
+                      "adjustedEndDate" : "2006-07-11",
                       "meta" : {
-                        "globalKey" : "3bead301"
+                        "globalKey" : "f7744f81"
+                      },
+                      "fxLinkedNotionalAmount" : {
+                        "adjustedFxSpotFixingDate" : "2006-04-07"
                       },
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2006-04-07",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "7976fda"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "fxLinkedNotionalAmount" : {
-                        "adjustedFxSpotFixingDate" : "2006-04-07"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "1edff596"
+                      "globalKey" : "da697216"
                     }
                   }, {
                     "adjustedPaymentDate" : "2006-10-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2006-04-11",
                       "adjustedStartDate" : "2006-07-11",
+                      "adjustedEndDate" : "2006-04-11",
                       "meta" : {
-                        "globalKey" : "ce481"
+                        "globalKey" : "3e3b3e01"
+                      },
+                      "fxLinkedNotionalAmount" : {
+                        "adjustedFxSpotFixingDate" : "2006-07-07"
                       },
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2006-07-07",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "797871a"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "fxLinkedNotionalAmount" : {
-                        "adjustedFxSpotFixingDate" : "2006-07-07"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "1a16de56"
+                      "globalKey" : "584537d6"
                     }
                   }, {
                     "adjustedPaymentDate" : "2007-01-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2007-01-11",
                       "adjustedStartDate" : "2006-10-11",
+                      "adjustedEndDate" : "2007-01-11",
                       "meta" : {
-                        "globalKey" : "cd96d6c1"
+                        "globalKey" : "b6f863c1"
+                      },
+                      "fxLinkedNotionalAmount" : {
+                        "adjustedFxSpotFixingDate" : "2006-10-09"
                       },
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2006-10-09",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "7979e98"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "fxLinkedNotionalAmount" : {
-                        "adjustedFxSpotFixingDate" : "2006-10-09"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "8deb42d6"
+                      "globalKey" : "774ccfd6"
                     }
                   }, {
                     "adjustedPaymentDate" : "2007-04-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2007-04-11",
                       "adjustedStartDate" : "2007-01-11",
+                      "adjustedEndDate" : "2007-04-11",
                       "meta" : {
-                        "globalKey" : "e4ea5bc1"
+                        "globalKey" : "36eaec1"
+                      },
+                      "fxLinkedNotionalAmount" : {
+                        "adjustedFxSpotFixingDate" : "2007-01-09"
                       },
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2007-01-09",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "79850d8"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "fxLinkedNotionalAmount" : {
-                        "adjustedFxSpotFixingDate" : "2007-01-09"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "dc539f16"
+                      "globalKey" : "fad7f216"
                     }
                   }, {
                     "adjustedPaymentDate" : "2007-07-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2007-07-11",
                       "adjustedStartDate" : "2007-04-11",
+                      "adjustedEndDate" : "2007-07-11",
                       "meta" : {
-                        "globalKey" : "7aced301"
+                        "globalKey" : "a3724f81"
+                      },
+                      "fxLinkedNotionalAmount" : {
+                        "adjustedFxSpotFixingDate" : "2007-04-07"
                       },
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2007-04-07",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "79867da"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "fxLinkedNotionalAmount" : {
-                        "adjustedFxSpotFixingDate" : "2007-04-07"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "a94ced96"
+                      "globalKey" : "d1f06a16"
                     }
                   }, {
                     "adjustedPaymentDate" : "2007-10-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2007-04-11",
                       "adjustedStartDate" : "2007-07-11",
+                      "adjustedEndDate" : "2007-04-11",
                       "meta" : {
-                        "globalKey" : "3ef0e481"
+                        "globalKey" : "ea393e01"
+                      },
+                      "fxLinkedNotionalAmount" : {
+                        "adjustedFxSpotFixingDate" : "2007-07-07"
                       },
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2007-07-07",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "7987f1a"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "fxLinkedNotionalAmount" : {
-                        "adjustedFxSpotFixingDate" : "2007-07-07"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "a483d656"
+                      "globalKey" : "4fcc2fd6"
                     }
                   }, {
                     "adjustedPaymentDate" : "2008-01-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2008-01-11",
                       "adjustedStartDate" : "2007-10-11",
+                      "adjustedEndDate" : "2008-01-11",
                       "meta" : {
-                        "globalKey" : "c7ad6c1"
+                        "globalKey" : "62f663c1"
+                      },
+                      "fxLinkedNotionalAmount" : {
+                        "adjustedFxSpotFixingDate" : "2007-10-09"
                       },
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2007-10-09",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "7989698"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "fxLinkedNotionalAmount" : {
-                        "adjustedFxSpotFixingDate" : "2007-10-09"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "18583ad6"
+                      "globalKey" : "6ed3c7d6"
                     }
                   }, {
                     "adjustedPaymentDate" : "2008-04-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2008-04-11",
                       "adjustedStartDate" : "2008-01-11",
+                      "adjustedEndDate" : "2008-04-11",
                       "meta" : {
-                        "globalKey" : "23ce5bc1"
+                        "globalKey" : "af6caec1"
+                      },
+                      "fxLinkedNotionalAmount" : {
+                        "adjustedFxSpotFixingDate" : "2008-01-09"
                       },
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2008-01-09",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "79948d8"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "fxLinkedNotionalAmount" : {
-                        "adjustedFxSpotFixingDate" : "2008-01-09"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "66c09716"
+                      "globalKey" : "f25eea16"
                     }
                   }, {
                     "adjustedPaymentDate" : "2008-07-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2008-07-11",
                       "adjustedStartDate" : "2008-04-11",
+                      "adjustedEndDate" : "2008-07-11",
                       "meta" : {
-                        "globalKey" : "b9b2d301"
+                        "globalKey" : "4f704f81"
+                      },
+                      "fxLinkedNotionalAmount" : {
+                        "adjustedFxSpotFixingDate" : "2008-04-07"
                       },
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2008-04-07",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "7995fda"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "fxLinkedNotionalAmount" : {
-                        "adjustedFxSpotFixingDate" : "2008-04-07"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "33b9e596"
+                      "globalKey" : "c9776216"
                     }
                   }, {
                     "adjustedPaymentDate" : "2008-10-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2008-04-11",
                       "adjustedStartDate" : "2008-07-11",
+                      "adjustedEndDate" : "2008-04-11",
                       "meta" : {
-                        "globalKey" : "7dd4e481"
+                        "globalKey" : "96373e01"
+                      },
+                      "fxLinkedNotionalAmount" : {
+                        "adjustedFxSpotFixingDate" : "2008-07-07"
                       },
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2008-07-07",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "799771a"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "fxLinkedNotionalAmount" : {
-                        "adjustedFxSpotFixingDate" : "2008-07-07"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "2ef0ce56"
+                      "globalKey" : "475327d6"
                     }
                   }, {
                     "adjustedPaymentDate" : "2009-01-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2009-01-11",
                       "adjustedStartDate" : "2008-10-11",
+                      "adjustedEndDate" : "2009-01-11",
                       "meta" : {
-                        "globalKey" : "4b5ed6c1"
+                        "globalKey" : "ef463c1"
+                      },
+                      "fxLinkedNotionalAmount" : {
+                        "adjustedFxSpotFixingDate" : "2008-10-09"
                       },
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2008-10-09",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "7998e98"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "fxLinkedNotionalAmount" : {
-                        "adjustedFxSpotFixingDate" : "2008-10-09"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "a2c532d6"
+                      "globalKey" : "665abfd6"
                     }
                   }, {
                     "adjustedPaymentDate" : "2009-04-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2009-04-11",
                       "adjustedStartDate" : "2009-01-11",
+                      "adjustedEndDate" : "2009-04-11",
                       "meta" : {
-                        "globalKey" : "62b25bc1"
+                        "globalKey" : "5b6aaec1"
+                      },
+                      "fxLinkedNotionalAmount" : {
+                        "adjustedFxSpotFixingDate" : "2009-01-09"
                       },
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2009-01-09",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "79a40d8"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "fxLinkedNotionalAmount" : {
-                        "adjustedFxSpotFixingDate" : "2009-01-09"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "f12d8f16"
+                      "globalKey" : "e9e5e216"
                     }
                   }, {
                     "adjustedPaymentDate" : "2009-07-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2009-07-11",
                       "adjustedStartDate" : "2009-04-11",
+                      "adjustedEndDate" : "2009-07-11",
                       "meta" : {
-                        "globalKey" : "f896d301"
+                        "globalKey" : "fb6e4f81"
+                      },
+                      "fxLinkedNotionalAmount" : {
+                        "adjustedFxSpotFixingDate" : "2009-04-07"
                       },
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2009-04-07",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "79a57da"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "fxLinkedNotionalAmount" : {
-                        "adjustedFxSpotFixingDate" : "2009-04-07"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "be26dd96"
+                      "globalKey" : "c0fe5a16"
                     }
                   }, {
                     "adjustedPaymentDate" : "2009-10-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2009-04-11",
                       "adjustedStartDate" : "2009-07-11",
+                      "adjustedEndDate" : "2009-04-11",
                       "meta" : {
-                        "globalKey" : "bcb8e481"
+                        "globalKey" : "42353e01"
+                      },
+                      "fxLinkedNotionalAmount" : {
+                        "adjustedFxSpotFixingDate" : "2009-07-07"
                       },
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2009-07-07",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "79a6f1a"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "fxLinkedNotionalAmount" : {
-                        "adjustedFxSpotFixingDate" : "2009-07-07"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "b95dc656"
+                      "globalKey" : "3eda1fd6"
                     }
                   }, {
                     "adjustedPaymentDate" : "2010-01-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2010-01-11",
                       "adjustedStartDate" : "2009-10-11",
+                      "adjustedEndDate" : "2010-01-11",
                       "meta" : {
-                        "globalKey" : "8a42d6c1"
+                        "globalKey" : "baf263c1"
+                      },
+                      "fxLinkedNotionalAmount" : {
+                        "adjustedFxSpotFixingDate" : "2009-10-09"
                       },
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2009-10-09",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "79a8698"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "fxLinkedNotionalAmount" : {
-                        "adjustedFxSpotFixingDate" : "2009-10-09"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "2d322ad6"
+                      "globalKey" : "5de1b7d6"
                     }
                   }, {
                     "adjustedPaymentDate" : "2010-04-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2010-04-11",
                       "adjustedStartDate" : "2010-01-11",
+                      "adjustedEndDate" : "2010-04-11",
                       "meta" : {
-                        "globalKey" : "a1965bc1"
+                        "globalKey" : "768aec1"
+                      },
+                      "fxLinkedNotionalAmount" : {
+                        "adjustedFxSpotFixingDate" : "2010-01-09"
                       },
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2010-01-09",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "79b38d8"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "fxLinkedNotionalAmount" : {
-                        "adjustedFxSpotFixingDate" : "2010-01-09"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "7b9a8716"
+                      "globalKey" : "e16cda16"
                     }
                   }, {
                     "adjustedPaymentDate" : "2010-07-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2010-07-11",
                       "adjustedStartDate" : "2010-04-11",
+                      "adjustedEndDate" : "2010-07-11",
                       "meta" : {
-                        "globalKey" : "377ad301"
+                        "globalKey" : "a76c4f81"
+                      },
+                      "fxLinkedNotionalAmount" : {
+                        "adjustedFxSpotFixingDate" : "2010-04-07"
                       },
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2010-04-07",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "79b4fda"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "fxLinkedNotionalAmount" : {
-                        "adjustedFxSpotFixingDate" : "2010-04-07"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "4893d596"
+                      "globalKey" : "b8855216"
                     }
                   }, {
                     "adjustedPaymentDate" : "2010-10-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2010-04-11",
                       "adjustedStartDate" : "2010-07-11",
+                      "adjustedEndDate" : "2010-04-11",
                       "meta" : {
-                        "globalKey" : "fb9ce481"
+                        "globalKey" : "ee333e01"
+                      },
+                      "fxLinkedNotionalAmount" : {
+                        "adjustedFxSpotFixingDate" : "2010-07-07"
                       },
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2010-07-07",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "79b671a"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "fxLinkedNotionalAmount" : {
-                        "adjustedFxSpotFixingDate" : "2010-07-07"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "43cabe56"
+                      "globalKey" : "366117d6"
                     }
                   }, {
                     "adjustedPaymentDate" : "2011-01-11",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2011-01-11",
                       "adjustedStartDate" : "2010-10-11",
+                      "adjustedEndDate" : "2011-01-11",
                       "meta" : {
-                        "globalKey" : "c926d6c1"
+                        "globalKey" : "66f063c1"
+                      },
+                      "fxLinkedNotionalAmount" : {
+                        "adjustedFxSpotFixingDate" : "2010-10-09"
                       },
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2010-10-09",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "79b7e98"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "fxLinkedNotionalAmount" : {
-                        "adjustedFxSpotFixingDate" : "2010-10-09"
                       }
                     } ],
                     "meta" : {
-                      "globalKey" : "b79f22d6"
+                      "globalKey" : "5568afd6"
                     }
                   } ]
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
                 "meta" : {
-                  "globalKey" : "33eb9f12"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "floatingPaymentDates",
-                    "globalKey" : "e8a5aee9"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "JPTO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "81e56a96"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "58681de7"
-                    }
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
-                  }
-                },
-                "resetDates" : {
-                  "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "c7aa61af"
-                  },
-                  "fixingDates" : {
-                    "meta" : {
-                      "globalKey" : "20aefd48"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
-                      }
-                    },
-                    "businessDayConvention" : "NONE",
-                    "dateRelativeTo" : {
-                      "externalReference" : "floatingResetDates",
-                      "globalReference" : "58bd1f13"
-                    }
-                  },
-                  "meta" : {
-                    "externalKey" : "floatingResetDates",
-                    "globalKey" : "58bd1f13"
-                  },
-                  "resetDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "JPTO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "81e56a96"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "58681de7"
-                    }
-                  },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "globalKey" : "1eea1264"
                 }
               } ],
               "meta" : {
-                "globalKey" : "6ef3052"
+                "globalKey" : "ac13a194"
               }
             }
           },
           "meta" : {
-            "globalKey" : "6ef3052"
+            "globalKey" : "ac13a194"
           }
         },
         "meta" : {
-          "globalKey" : "6ef3052"
+          "globalKey" : "ac13a194"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "65085842"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "value" : 0.01,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 1000000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "JPY"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "3c02affe"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
               "unit" : {
                 "currency" : {
-                  "value" : "JPY"
+                  "value" : "USD"
                 }
-              },
-              "value" : 1000000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "f5c71eab"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d05"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              }
+            "meta" : {
+              "globalKey" : "828026c7"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "bf5968ad"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8849"
-      },
-      "value" : "2001-01-09"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http:/www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c7753bbd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http:/www.partyB.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c7753bbe"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "5e1c34e3"
+    }
+  },
+  "meta" : {
+    "globalKey" : "5e1c34e3"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex27-inverse-floater.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex27-inverse-floater.json
index 17813340d7..439f305166 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex27-inverse-floater.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex27-inverse-floater.json
@@ -1,58 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "8b1987da"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "8b1987da"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "957b3c47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "957bb0a6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-04-29",
+      "meta" : {
+        "globalKey" : "3e891d"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,46 +50,56 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters0",
-                        "globalReference" : "27e4e9"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e1"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "985d6cb2"
-                    }
-                  },
-                  "calculationPeriodFrequency" : {
                     "meta" : {
-                      "globalKey" : "28c66"
+                      "globalKey" : "0"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "30"
-                  },
+                    "floatingRateMultiplierSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-08-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -111,204 +108,190 @@
                       },
                       "meta" : {
                         "globalKey" : "eae921d6"
-                      },
-                      "unadjustedDate" : "2001-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae921d6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates0",
-                    "globalKey" : "f6185c1a"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-08-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters0",
-                            "globalKey" : "27e4e9"
+                            "globalKey" : "27e4e9",
+                            "externalKey" : "accrualBusinessCenters0"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "3662e8ba"
                         }
                       },
                       "meta" : {
                         "globalKey" : "9eb4d95c"
-                      },
-                      "unadjustedDate" : "2006-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "9eb4d95c"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "6449694f"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "98150c36"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "USNY"
-                      } ],
+                      "businessCentersReference" : {
+                        "globalReference" : "27e4e9",
+                        "externalReference" : "accrualBusinessCenters0"
+                      },
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters0",
-                        "globalKey" : "27e4e9"
+                        "globalKey" : "622268e1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "3662e8ba"
+                      "globalKey" : "985d6cb2"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "17f92"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "18f93652",
+                    "externalKey" : "CalcPeriodDates0"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "27e4e9",
+                        "externalKey" : "paymentBusinessCenters0"
                       }
                     },
-                    "floatingRateMultiplierSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "3662e8ba"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f067202a"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "CalcPeriodDates0",
-                    "globalReference" : "f6185c1a"
+                    "globalReference" : "18f93652",
+                    "externalReference" : "CalcPeriodDates0"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2fdb52a6"
+                      "globalKey" : "cb73d5a"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
                       } ],
                       "meta" : {
-                        "externalKey" : "resetBusinessCenters0",
-                        "globalKey" : "21479e"
+                        "globalKey" : "21479e",
+                        "externalKey" : "resetBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates0",
-                      "globalReference" : "2d64ffde"
+                      "globalReference" : "eae8c8b6",
+                      "externalReference" : "resetDates0"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates0",
-                    "globalKey" : "2d64ffde"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "resetBusinessCenters0",
-                        "globalReference" : "21479e"
+                        "globalReference" : "21479e",
+                        "externalReference" : "resetBusinessCenters0"
                       },
                       "meta" : {
                         "globalKey" : "35a06081"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "6bdb6452"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "eae8c8b6",
+                    "externalKey" : "resetDates0"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "955a7a13"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters1",
-                        "globalReference" : "27e4e9"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e2"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-3"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "985d6cb3"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28cc3"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-08-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -317,281 +300,298 @@
                       },
                       "meta" : {
                         "globalKey" : "eae921d6"
-                      },
-                      "unadjustedDate" : "2001-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae921d6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates1",
-                    "globalKey" : "c83c7cfc"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-08-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters1",
-                            "globalKey" : "27e4e9"
+                            "globalKey" : "27e4e9",
+                            "externalKey" : "accrualBusinessCenters1"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "3662e8ba"
                         }
                       },
                       "meta" : {
                         "globalKey" : "9eb4d95c"
-                      },
-                      "unadjustedDate" : "2006-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "9eb4d95c"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "27e4e9",
+                        "externalReference" : "accrualBusinessCenters1"
+                      },
+                      "meta" : {
+                        "globalKey" : "622268e2"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "985d6cb3"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18ad5"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "19075916",
+                    "externalKey" : "CalcPeriodDates1"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "5ee5ae82"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "98150c39"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
                       } ],
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters1",
-                        "globalKey" : "27e4e9"
+                        "globalKey" : "27e4e9",
+                        "externalKey" : "paymentBusinessCenters1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "3662e8ba"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "8f19d1ed"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-3"
-                        }
-                      }
-                    }
-                  }
+                "meta" : {
+                  "globalKey" : "576de65a"
                 }
               } ],
               "meta" : {
-                "globalKey" : "ed8d0511"
+                "globalKey" : "ceeb18ad"
               }
             }
           },
           "meta" : {
-            "globalKey" : "ed8d0511"
+            "globalKey" : "ceeb18ad"
           }
         },
         "meta" : {
-          "globalKey" : "ed8d0511"
+          "globalKey" : "ceeb18ad"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "75b65278"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d05"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 3
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.085,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.085,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          }, {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : -1.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : -1.0,
-              "arithmeticOperator" : "MULTIPLY",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Multiply"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-2"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 100000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "f077fc91"
-          },
-          "price" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-3"
+                "value" : "quantity-1"
               } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 3,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
             },
+            "meta" : {
+              "globalKey" : "828026c7"
+            }
+          },
+          "meta" : {
+            "globalKey" : "2377f8a"
+          }
+        }, {
+          "price" : [ {
             "value" : {
+              "value" : 0.045,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.045,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-3"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "1e87958f"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e891d"
-      },
-      "value" : "2001-04-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c7753bbd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c7753bbe"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "6e6301f0"
+    }
+  },
+  "meta" : {
+    "globalKey" : "6e6301f0"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex28-bullet-payments.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex28-bullet-payments.json
index 9b31d3abd7..8e05716f80 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex28-bullet-payments.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex28-bullet-payments.json
@@ -1,97 +1,80 @@
 {
-  "meta" : {
-    "globalKey" : "4a013ffb"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "4a013ffb"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "957b3c47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "957bb0a6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-04-29",
+      "meta" : {
+        "globalKey" : "3e891d"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "buyerSeller" : {
-            "buyer" : "PARTY_1",
-            "seller" : "PARTY_2"
-          },
-          "meta" : {
-            "globalKey" : "a9fd60f9"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 15000.00,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 15000.00,
-              "cashPrice" : {
-                "cashPriceType" : "FEE"
-              },
               "perUnitOf" : {
-                "financialUnit" : "CONTRACTUAL_PRODUCT"
+                "financialUnit" : "ContractualProduct"
               },
-              "priceType" : "CASH_PRICE"
+              "priceType" : "CashPrice",
+              "cashPrice" : {
+                "cashPriceType" : "Fee"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
+          "buyerSeller" : {
+            "buyer" : "Party1",
+            "seller" : "Party2"
+          },
           "settlementTerms" : {
-            "meta" : {
-              "globalKey" : "d45f9e61"
-            },
             "settlementDate" : {
               "adjustableOrRelativeDate" : {
+                "unadjustedDate" : "2001-07-27",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "GBLO"
@@ -99,63 +82,80 @@
                       "value" : "USNY"
                     } ],
                     "meta" : {
-                      "externalKey" : "businessCenters0",
-                      "globalKey" : "42f910b"
+                      "globalKey" : "42f910b",
+                      "externalKey" : "businessCenters0"
                     }
                   },
-                  "businessDayConvention" : "MODFOLLOWING",
                   "meta" : {
                     "globalKey" : "97b8e49c"
                   }
-                },
-                "unadjustedDate" : "2001-07-27"
+                }
               },
               "meta" : {
                 "globalKey" : "d45f9e61"
               }
+            },
+            "meta" : {
+              "globalKey" : "d45f9e61"
             }
+          },
+          "meta" : {
+            "globalKey" : "2c0718f9"
           }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e891d"
-      },
-      "value" : "2001-04-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c7753bbd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c7753bbe"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "7fd91a1d"
+    }
+  },
+  "meta" : {
+    "globalKey" : "7fd91a1d"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex29-non-deliverable-settlement-swap-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex29-non-deliverable-settlement-swap-uti.json
index 1d37fb101e..46375925d3 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex29-non-deliverable-settlement-swap-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex29-non-deliverable-settlement-swap-uti.json
@@ -1,66 +1,32 @@
 {
-  "meta" : {
-    "globalKey" : "85f78a20"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "85f78a20"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
-      },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "121d7965"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
-      },
-      "name" : {
-        "value" : "Party B"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "3eac3060"
+      },
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "1994-12-12",
+      "meta" : {
+        "globalKey" : "3e530c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -71,77 +37,84 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "E2000098notional-0-LTAA0200000096.1",
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "E2000098notional-0-LTAA0200000096.1"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : true,
                   "initialPayment" : false,
+                  "finalPayment" : true,
                   "intermediatePayment" : false,
-                  "meta" : {
-                    "externalKey" : "PrincipalExchanges",
-                    "globalKey" : "37d866f0"
-                  },
                   "principalPaymentSchedule" : {
                     "initialPrincipalPayment" : {
-                      "meta" : {
-                        "globalKey" : "3df6cdc1"
+                      "principalPaymentDate" : {
+                        "unadjustedDate" : "2007-12-16",
+                        "meta" : {
+                          "globalKey" : "3ebb10"
+                        }
                       },
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "principalAmount" : {
+                        "value" : 26415000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 26415000000.00,
                         "meta" : {
                           "globalKey" : "96e17152"
                         }
                       },
-                      "principalPaymentDate" : {
-                        "meta" : {
-                          "globalKey" : "3ebb10"
-                        },
-                        "unadjustedDate" : "2007-12-16"
+                      "meta" : {
+                        "globalKey" : "78e9b601"
                       }
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "42bd12fc",
+                    "externalKey" : "PrincipalExchanges"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "be054707"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
+                  "meta" : {
+                    "globalKey" : "165184af"
+                  },
                   "cashSettlementTerms" : [ {
-                    "meta" : {
-                      "globalKey" : "2590aca1"
+                    "valuationMethod" : {
+                      "valuationSource" : {
+                        "settlementRateOption" : {
+                          "settlementRateOption" : {
+                            "value" : "KRW.KFTC18/KRW02"
+                          }
+                        }
+                      }
                     },
                     "valuationDate" : {
                       "fxFixingDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "d1580772"
+                          "globalKey" : "38817ab6"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -152,54 +125,43 @@
                             "globalKey" : "4f5ffd5"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "dateRelativeToPaymentDates" : {
                           "paymentDatesReference" : [ {
-                            "externalReference" : "PaymentDatesID",
-                            "globalReference" : "9756838d"
+                            "globalReference" : "9f20bbd9",
+                            "externalReference" : "PaymentDatesID"
                           } ]
                         }
                       }
                     },
-                    "valuationMethod" : {
-                      "valuationSource" : {
-                        "settlementRateOption" : {
-                          "settlementRateOption" : {
-                            "value" : "KRW.KFTC18/KRW02"
-                          }
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "7ddcea49"
                     }
                   } ]
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "4f5ffd5"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "987f5366"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c8b"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "16"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2004-12-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -210,27 +172,23 @@
                             "globalKey" : "4f5ffd5"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "987f5366"
                         }
                       },
                       "meta" : {
                         "globalKey" : "54261e56"
-                      },
-                      "unadjustedDate" : "2004-12-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "54261e56"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "E2000098N10184",
-                    "globalKey" : "a6ce8b9d"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2007-12-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -241,37 +199,20 @@
                             "globalKey" : "4f5ffd5"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "987f5366"
                         }
                       },
                       "meta" : {
                         "globalKey" : "705b0656"
-                      },
-                      "unadjustedDate" : "2007-12-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "705b0656"
                     }
-                  }
-                },
-                "cashflowRepresentation" : {
-                  "cashflowsMatchParameters" : false
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "aae93a69"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "PaymentDatesID",
-                    "globalKey" : "9756838d"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -282,79 +223,113 @@
                         "globalKey" : "4f5ffd5"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "987f5366"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "18a9d"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "16"
+                  },
+                  "meta" : {
+                    "globalKey" : "acf4d657",
+                    "externalKey" : "E2000098N10184"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "4f5ffd5"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "987f5366"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "9f20bbd9",
+                    "externalKey" : "PaymentDatesID"
                   }
+                },
+                "cashflowRepresentation" : {
+                  "cashflowsMatchParameters" : false
+                },
+                "meta" : {
+                  "globalKey" : "83043cb1"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "E2000098notional-1-LTAA0200000096.1",
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "E2000098notional-1-LTAA0200000096.1"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "4f5ffd5"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "987f5366"
-                    }
-                  },
-                  "calculationPeriodFrequency" : {
                     "meta" : {
-                      "globalKey" : "28c8b"
+                      "globalKey" : "c8507cd0"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "16"
-                  },
+                    "rateTreatment" : "MoneyMarketYield",
+                    "initialRate" : {
+                      "value" : 0.01650000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "perUnitOf" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "priceType" : "InterestRate"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2004-12-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -365,27 +340,23 @@
                             "globalKey" : "4f5ffd5"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "987f5366"
                         }
                       },
                       "meta" : {
                         "globalKey" : "54261e56"
-                      },
-                      "unadjustedDate" : "2004-12-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "54261e56"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "E2000098N10AC8",
-                    "globalKey" : "a6ce8b9d"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2007-12-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -396,33 +367,20 @@
                             "globalKey" : "4f5ffd5"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "987f5366"
                         }
                       },
                       "meta" : {
                         "globalKey" : "705b0656"
-                      },
-                      "unadjustedDate" : "2007-12-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "705b0656"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "6b0e65da"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "9756838d"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -433,59 +391,66 @@
                         "globalKey" : "4f5ffd5"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "987f5366"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "18a9d"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "16"
+                  },
+                  "meta" : {
+                    "globalKey" : "acf4d657",
+                    "externalKey" : "E2000098N10AC8"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "c8507cd0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "4f5ffd5"
                       }
                     },
-                    "rateTreatment" : "MONEY_MARKET_YIELD",
-                    "initialRate" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 0.01650000,
-                      "perUnitOf" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "priceType" : "INTEREST_RATE"
+                    "meta" : {
+                      "globalKey" : "987f5366"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "9f20bbd9"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "E2000098N10AC8",
-                    "globalReference" : "a6ce8b9d"
+                    "globalReference" : "acf4d657",
+                    "externalReference" : "E2000098N10AC8"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "21186cd0"
+                      "globalKey" : "fdf45784"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -494,17 +459,20 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "E2000098N10DDE",
-                      "globalReference" : "cd3b0b7f"
+                      "globalReference" : "c6b0d3b1",
+                      "externalReference" : "E2000098N10DDE"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "E2000098N10DDE",
-                    "globalKey" : "cd3b0b7f"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -513,150 +481,182 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "c6b0d3b1",
+                    "externalKey" : "E2000098N10DDE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c24897d2"
                 }
               } ],
               "meta" : {
-                "globalKey" : "c03f89c3"
+                "globalKey" : "f6e8a03"
               }
             }
           },
           "meta" : {
-            "globalKey" : "c03f89c3"
+            "globalKey" : "f6e8a03"
           }
         },
         "meta" : {
-          "globalKey" : "c03f89c3"
+          "globalKey" : "f6e8a03"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "24e4fd0d"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0273000,
               "unit" : {
                 "currency" : {
                   "value" : "KRW"
                 }
               },
-              "value" : 0.0273000,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "KRW"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 26415000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "KRW"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "77baa493"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000.00,
               "unit" : {
                 "currency" : {
-                  "value" : "KRW"
+                  "value" : "USD"
                 }
-              },
-              "value" : 26415000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "f1b09fde"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d05"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 25000000.00
+            "meta" : {
+              "globalKey" : "828026c7"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "32f46b8a"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e530c"
-      },
-      "value" : "1994-12-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "54930084UKLVMY22DS16"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "335bf1d6"
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
+        }
+      } ],
+      "name" : {
+        "value" : "Party B"
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "1106890c"
+    }
+  },
+  "meta" : {
+    "globalKey" : "1106890c"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex30-swap-comp-avg-relative-date-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex30-swap-comp-avg-relative-date-uti.json
index ba55ce8bc6..af09d4cfad 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex30-swap-comp-avg-relative-date-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex30-swap-comp-avg-relative-date-uti.json
@@ -1,70 +1,37 @@
 {
-  "meta" : {
-    "globalKey" : "455ce099"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "455ce099"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
-      },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "1031234567",
         "meta" : {
-          "globalKey" : "121d7965"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
       },
-      "name" : {
-        "value" : "Party B"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "96ca312b"
+      },
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2005-07-31",
+      "meta" : {
+        "globalKey" : "3ea9df",
+        "externalKey" : "tradeDate"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "InterestRate:IRSwap:FixedFloat"
@@ -78,64 +45,57 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "notionalSchedule_0_0",
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "notionalSchedule_0_0"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : false,
                   "initialPayment" : false,
+                  "finalPayment" : false,
                   "intermediatePayment" : false,
                   "meta" : {
                     "globalKey" : "12be35"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "USNY"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "27e4e9"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
-                      "globalKey" : "212500d8"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d7a"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "2"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "externalKey" : "effectiveDate_0_0",
-                      "globalKey" : "6b62cee7"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "6b62cee7"
+                        "globalKey" : "6e59002b"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -144,12 +104,12 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "tradeDate",
-                        "globalReference" : "3ea9df"
+                        "globalReference" : "3ea9df",
+                        "externalReference" : "tradeDate"
                       },
                       "relativeDateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USCH"
@@ -160,28 +120,24 @@
                             "globalKey" : "4fc7170"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "9885c501"
                         }
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "6e59002b",
+                      "externalKey" : "effectiveDate_0_0"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "calculationPeriodDates_0_0",
-                    "globalKey" : "4da34954"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "externalKey" : "terminationDate_0_0",
-                      "globalKey" : "349ff61b"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 3,
+                      "period" : "Y",
                       "meta" : {
-                        "globalKey" : "349ff61b"
+                        "globalKey" : "f2f14007"
                       },
-                      "period" : "Y",
-                      "periodMultiplier" : 3,
+                      "businessDayConvention" : "FOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -192,12 +148,70 @@
                           "globalKey" : "42f910b"
                         }
                       },
-                      "businessDayConvention" : "FOLLOWING",
                       "dateRelativeTo" : {
-                        "externalReference" : "effectiveDate_0_0",
-                        "globalReference" : "6b62cee7"
+                        "globalReference" : "6e59002b",
+                        "externalReference" : "effectiveDate_0_0"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "f2f14007",
+                      "externalKey" : "terminationDate_0_0"
+                    }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "27e4e9"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "212500d8"
                     }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "2b8c"
+                    },
+                    "rollConvention" : "2"
+                  },
+                  "meta" : {
+                    "globalKey" : "b4bf30f2",
+                    "externalKey" : "calculationPeriodDates_0_0"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "42f910b"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "97b8e49c"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "9e5a4d0f"
                   }
                 },
                 "cashflowRepresentation" : {
@@ -205,185 +219,127 @@
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "2006-02-06",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2006-02-06",
                       "adjustedStartDate" : "2005-08-04",
+                      "adjustedEndDate" : "2006-02-06",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_0_1",
-                        "globalKey" : "3c99e488"
+                        "globalKey" : "29c6dee4",
+                        "externalKey" : "calculationPeriod_0_0_1"
                       },
                       "calculationPeriodNumberOfDays" : 182,
-                      "fixedRate" : 0.0003,
-                      "notionalAmount" : 100000000
+                      "notionalAmount" : 100000000,
+                      "fixedRate" : 0.0003
                     } ],
                     "meta" : {
-                      "externalKey" : "paymentCalculationPeriod_0_0_1",
-                      "globalKey" : "8f97988e"
+                      "globalKey" : "7cc492ea",
+                      "externalKey" : "paymentCalculationPeriod_0_0_1"
                     }
                   }, {
                     "adjustedPaymentDate" : "2006-08-04",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2006-08-04",
                       "adjustedStartDate" : "2006-02-06",
+                      "adjustedEndDate" : "2006-08-04",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_0_2",
-                        "globalKey" : "54963a40"
+                        "globalKey" : "86296b24",
+                        "externalKey" : "calculationPeriod_0_0_2"
                       },
                       "calculationPeriodNumberOfDays" : 178,
-                      "fixedRate" : 0.0003,
-                      "notionalAmount" : 100000000
+                      "notionalAmount" : 100000000,
+                      "fixedRate" : 0.0003
                     } ],
                     "meta" : {
-                      "externalKey" : "paymentCalculationPeriod_0_0_2",
-                      "globalKey" : "97205944"
+                      "globalKey" : "c8b38a28",
+                      "externalKey" : "paymentCalculationPeriod_0_0_2"
                     }
                   }, {
                     "adjustedPaymentDate" : "2007-02-05",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2007-02-05",
                       "adjustedStartDate" : "2006-08-04",
+                      "adjustedEndDate" : "2007-02-05",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_0_3",
-                        "globalKey" : "b0eac946"
+                        "globalKey" : "9e2566c4",
+                        "externalKey" : "calculationPeriod_0_0_3"
                       },
                       "calculationPeriodNumberOfDays" : 181,
-                      "fixedRate" : 0.0003,
-                      "notionalAmount" : 100000000
+                      "notionalAmount" : 100000000,
+                      "fixedRate" : 0.0003
                     } ],
                     "meta" : {
-                      "externalKey" : "paymentCalculationPeriod_0_0_3",
-                      "globalKey" : "dc4a0b"
+                      "globalKey" : "ee16e789",
+                      "externalKey" : "paymentCalculationPeriod_0_0_3"
                     }
                   }, {
                     "adjustedPaymentDate" : "2007-08-06",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2007-08-06",
                       "adjustedStartDate" : "2007-02-05",
+                      "adjustedEndDate" : "2007-08-06",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_0_4",
-                        "globalKey" : "c9110026"
+                        "globalKey" : "fa7b47a4",
+                        "externalKey" : "calculationPeriod_0_0_4"
                       },
                       "calculationPeriodNumberOfDays" : 181,
-                      "fixedRate" : 0.0003,
-                      "notionalAmount" : 100000000
+                      "notionalAmount" : 100000000,
+                      "fixedRate" : 0.0003
                     } ],
                     "meta" : {
-                      "externalKey" : "paymentCalculationPeriod_0_0_4",
-                      "globalKey" : "a7419dac"
+                      "globalKey" : "d8abe52a",
+                      "externalKey" : "paymentCalculationPeriod_0_0_4"
                     }
                   } ]
                 },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
                 "meta" : {
-                  "globalKey" : "2f0c5d2b"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "637fde97"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "42f910b"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "97b8e49c"
-                    }
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "cfea472b"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "notionalSchedule_0_1",
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "notionalSchedule_0_1"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : false,
                   "initialPayment" : false,
+                  "finalPayment" : false,
                   "intermediatePayment" : false,
                   "meta" : {
                     "globalKey" : "12be35"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "42f910b"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "97b8e49c"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "25c8a2"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "NONE"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "externalKey" : "effectiveDate_0_1",
-                      "globalKey" : "6a95ee82"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "6a95ee82"
+                        "globalKey" : "6d8c1fc6"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -392,12 +348,12 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "tradeDate",
-                        "globalReference" : "3ea9df"
+                        "globalReference" : "3ea9df",
+                        "externalReference" : "tradeDate"
                       },
                       "relativeDateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -408,28 +364,24 @@
                             "globalKey" : "42f910b"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b8e49c"
                         }
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "6d8c1fc6",
+                      "externalKey" : "effectiveDate_0_1"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "calculationPeriodDates_0_1",
-                    "globalKey" : "1e24283d"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "externalKey" : "terminationDate_0_1",
-                      "globalKey" : "92beadfd"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 2,
+                      "period" : "Y",
                       "meta" : {
-                        "globalKey" : "92beadfd"
+                        "globalKey" : "f10af5cb"
                       },
-                      "period" : "Y",
-                      "periodMultiplier" : 2,
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -440,519 +392,567 @@
                           "globalKey" : "42f910b"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "dateRelativeTo" : {
-                        "externalReference" : "effectiveDate_0_1",
-                        "globalReference" : "6a95ee82"
+                        "globalReference" : "6d8c1fc6",
+                        "externalReference" : "effectiveDate_0_1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "f10af5cb",
+                      "externalKey" : "terminationDate_0_1"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "42f910b"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "97b8e49c"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "24bbce"
+                    },
+                    "rollConvention" : "NONE"
+                  },
+                  "meta" : {
+                    "globalKey" : "c1af8139",
+                    "externalKey" : "calculationPeriodDates_0_1"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "42f910b"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "97b8e49c"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "9e5a4d0f"
+                  }
+                },
+                "resetDates" : {
+                  "calculationPeriodDatesReference" : {
+                    "globalReference" : "c1af8139",
+                    "externalReference" : "calculationPeriodDates_0_1"
+                  },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
+                  "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "51d89779"
+                    },
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
+                      }
+                    },
+                    "dateRelativeTo" : {
+                      "globalReference" : "dea1e10d",
+                      "externalReference" : "resetDates_0_1"
+                    }
+                  },
+                  "resetFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "365c4b6f"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "dea1e10d",
+                    "externalKey" : "resetDates_0_1"
                   }
                 },
+                "compoundingMethod" : "Straight",
                 "cashflowRepresentation" : {
                   "cashflowsMatchParameters" : false,
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "2006-02-06",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2005-11-04",
                       "adjustedStartDate" : "2005-08-04",
+                      "adjustedEndDate" : "2005-11-04",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_1_1",
-                        "globalKey" : "20d2dbb0"
+                        "globalKey" : "9cc08530",
+                        "externalKey" : "calculationPeriod_0_1_1"
                       },
                       "calculationPeriodNumberOfDays" : 92,
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2005-08-02",
+                          "observationWeight" : 32,
                           "meta" : {
                             "globalKey" : "796965e"
-                          },
-                          "observationWeight" : 32
+                          }
                         }, {
                           "adjustedFixingDate" : "2005-09-01",
+                          "observationWeight" : 29,
                           "meta" : {
                             "globalKey" : "7969dfc"
-                          },
-                          "observationWeight" : 29
+                          }
                         }, {
                           "adjustedFixingDate" : "2005-09-30",
+                          "observationWeight" : 31,
                           "meta" : {
                             "globalKey" : "796a181"
-                          },
-                          "observationWeight" : 31
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     }, {
-                      "adjustedEndDate" : "2006-02-06",
                       "adjustedStartDate" : "2005-11-04",
+                      "adjustedEndDate" : "2006-02-06",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_1_2",
-                        "globalKey" : "d969aeae"
+                        "globalKey" : "a8d23bf2",
+                        "externalKey" : "calculationPeriod_0_1_2"
                       },
                       "calculationPeriodNumberOfDays" : 94,
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2005-11-02",
+                          "observationWeight" : 31,
                           "meta" : {
                             "globalKey" : "796ad9d"
-                          },
-                          "observationWeight" : 31
+                          }
                         }, {
                           "adjustedFixingDate" : "2005-12-01",
+                          "observationWeight" : 30,
                           "meta" : {
                             "globalKey" : "796b53d"
-                          },
-                          "observationWeight" : 30
+                          }
                         }, {
                           "adjustedFixingDate" : "2005-12-30",
+                          "observationWeight" : 33,
                           "meta" : {
                             "globalKey" : "796b8c3"
-                          },
-                          "observationWeight" : 33
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     } ],
                     "meta" : {
-                      "externalKey" : "paymentCalculationPeriod_0_1_1",
-                      "globalKey" : "18bdd864"
+                      "globalKey" : "482d6f28",
+                      "externalKey" : "paymentCalculationPeriod_0_1_1"
                     }
                   }, {
                     "adjustedPaymentDate" : "2006-08-04",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2006-05-04",
                       "adjustedStartDate" : "2006-02-06",
+                      "adjustedEndDate" : "2006-05-04",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_1_3",
-                        "globalKey" : "66e6d0d0"
+                        "globalKey" : "c98a008c",
+                        "externalKey" : "calculationPeriod_0_1_3"
                       },
                       "calculationPeriodNumberOfDays" : 87,
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2006-02-02",
+                          "observationWeight" : 28,
                           "meta" : {
                             "globalKey" : "7975fda"
-                          },
-                          "observationWeight" : 28
+                          }
                         }, {
                           "adjustedFixingDate" : "2006-03-02",
+                          "observationWeight" : 29,
                           "meta" : {
                             "globalKey" : "797679b"
-                          },
-                          "observationWeight" : 29
+                          }
                         }, {
                           "adjustedFixingDate" : "2006-03-31",
+                          "observationWeight" : 30,
                           "meta" : {
                             "globalKey" : "7976b1f"
-                          },
-                          "observationWeight" : 30
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     }, {
-                      "adjustedEndDate" : "2006-08-04",
                       "adjustedStartDate" : "2006-05-04",
+                      "adjustedEndDate" : "2006-08-04",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_1_4",
-                        "globalKey" : "4126d5f0"
+                        "globalKey" : "bd147f70",
+                        "externalKey" : "calculationPeriod_0_1_4"
                       },
                       "calculationPeriodNumberOfDays" : 92,
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2006-05-02",
+                          "observationWeight" : 32,
                           "meta" : {
                             "globalKey" : "797771e"
-                          },
-                          "observationWeight" : 32
+                          }
                         }, {
                           "adjustedFixingDate" : "2006-06-01",
+                          "observationWeight" : 29,
                           "meta" : {
                             "globalKey" : "7977ebc"
-                          },
-                          "observationWeight" : 29
+                          }
                         }, {
                           "adjustedFixingDate" : "2006-06-30",
+                          "observationWeight" : 31,
                           "meta" : {
                             "globalKey" : "7978241"
-                          },
-                          "observationWeight" : 31
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     } ],
                     "meta" : {
-                      "externalKey" : "paymentCalculationPeriod_0_1_3",
-                      "globalKey" : "94c64dc4"
+                      "globalKey" : "dfbaee00",
+                      "externalKey" : "paymentCalculationPeriod_0_1_3"
                     }
                   }, {
                     "adjustedPaymentDate" : "2007-02-05",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2006-11-06",
                       "adjustedStartDate" : "2006-08-04",
+                      "adjustedEndDate" : "2006-11-06",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_1_5",
-                        "globalKey" : "a4be1dac"
+                        "globalKey" : "39f640f0",
+                        "externalKey" : "calculationPeriod_0_1_5"
                       },
                       "calculationPeriodNumberOfDays" : 94,
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2006-08-02",
+                          "observationWeight" : 31,
                           "meta" : {
                             "globalKey" : "7978e5d"
-                          },
-                          "observationWeight" : 31
+                          }
                         }, {
                           "adjustedFixingDate" : "2006-08-31",
+                          "observationWeight" : 30,
                           "meta" : {
                             "globalKey" : "79791df"
-                          },
-                          "observationWeight" : 30
+                          }
                         }, {
                           "adjustedFixingDate" : "2006-10-02",
+                          "observationWeight" : 33,
                           "meta" : {
                             "globalKey" : "7979ddf"
-                          },
-                          "observationWeight" : 33
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     }, {
-                      "adjustedEndDate" : "2007-02-05",
                       "adjustedStartDate" : "2006-11-06",
+                      "adjustedEndDate" : "2007-02-05",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_1_6",
-                        "globalKey" : "6e2d5d90"
+                        "globalKey" : "17a6342e",
+                        "externalKey" : "calculationPeriod_0_1_6"
                       },
                       "calculationPeriodNumberOfDays" : 91,
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2006-11-02",
+                          "observationWeight" : 28,
                           "meta" : {
                             "globalKey" : "797a59a"
-                          },
-                          "observationWeight" : 28
+                          }
                         }, {
                           "adjustedFixingDate" : "2006-11-30",
+                          "observationWeight" : 31,
                           "meta" : {
                             "globalKey" : "797a901"
-                          },
-                          "observationWeight" : 31
+                          }
                         }, {
                           "adjustedFixingDate" : "2007-01-02",
+                          "observationWeight" : 32,
                           "meta" : {
                             "globalKey" : "798501e"
-                          },
-                          "observationWeight" : 32
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     } ],
                     "meta" : {
-                      "externalKey" : "paymentCalculationPeriod_0_1_5",
-                      "globalKey" : "d57ce001"
+                      "globalKey" : "6ffcd2e3",
+                      "externalKey" : "paymentCalculationPeriod_0_1_5"
                     }
                   }, {
                     "adjustedPaymentDate" : "2007-08-06",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2007-05-04",
                       "adjustedStartDate" : "2007-02-05",
+                      "adjustedEndDate" : "2007-05-04",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_1_7",
-                        "globalKey" : "2f4a12ae"
+                        "globalKey" : "9e927f4c",
+                        "externalKey" : "calculationPeriod_0_1_7"
                       },
                       "calculationPeriodNumberOfDays" : 88,
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2007-02-01",
+                          "observationWeight" : 28,
                           "meta" : {
                             "globalKey" : "79857bb"
-                          },
-                          "observationWeight" : 28
+                          }
                         }, {
                           "adjustedFixingDate" : "2007-03-01",
+                          "observationWeight" : 30,
                           "meta" : {
                             "globalKey" : "7985f7d"
-                          },
-                          "observationWeight" : 30
+                          }
                         }, {
                           "adjustedFixingDate" : "2007-04-02",
+                          "observationWeight" : 30,
                           "meta" : {
                             "globalKey" : "798675c"
-                          },
-                          "observationWeight" : 30
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     }, {
-                      "adjustedEndDate" : "2007-08-06",
                       "adjustedStartDate" : "2007-05-04",
+                      "adjustedEndDate" : "2007-08-06",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_1_8",
-                        "globalKey" : "c50d8c36"
+                        "globalKey" : "5a45af7a",
+                        "externalKey" : "calculationPeriod_0_1_8"
                       },
                       "calculationPeriodNumberOfDays" : 94,
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2007-05-02",
+                          "observationWeight" : 31,
                           "meta" : {
                             "globalKey" : "7986f1d"
-                          },
-                          "observationWeight" : 31
+                          }
                         }, {
                           "adjustedFixingDate" : "2007-05-21",
+                          "observationWeight" : 30,
                           "meta" : {
                             "globalKey" : "7987169"
-                          },
-                          "observationWeight" : 30
+                          }
                         }, {
                           "adjustedFixingDate" : "2007-07-02",
+                          "observationWeight" : 33,
                           "meta" : {
                             "globalKey" : "7987e9f"
-                          },
-                          "observationWeight" : 33
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     } ],
                     "meta" : {
-                      "externalKey" : "paymentCalculationPeriod_0_1_7",
-                      "globalKey" : "a2441ea"
+                      "globalKey" : "b6e3654c",
+                      "externalKey" : "paymentCalculationPeriod_0_1_7"
                     }
                   } ]
                 },
-                "compoundingMethod" : "STRAIGHT",
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
                 "meta" : {
-                  "globalKey" : "fd8fd851"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "637fde97"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "42f910b"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "97b8e49c"
-                    }
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
-                  }
-                },
-                "resetDates" : {
-                  "calculationPeriodDatesReference" : {
-                    "externalReference" : "calculationPeriodDates_0_1",
-                    "globalReference" : "1e24283d"
-                  },
-                  "fixingDates" : {
-                    "meta" : {
-                      "globalKey" : "74fcacc5"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
-                      }
-                    },
-                    "businessDayConvention" : "NONE",
-                    "dateRelativeTo" : {
-                      "externalReference" : "resetDates_0_1",
-                      "globalReference" : "4ef88f5b"
-                    }
-                  },
-                  "meta" : {
-                    "externalKey" : "resetDates_0_1",
-                    "globalKey" : "4ef88f5b"
-                  },
-                  "resetDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "365c4b6f"
-                    }
-                  },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "globalKey" : "776bec6f"
                 }
               } ],
               "meta" : {
-                "globalKey" : "69df2046"
+                "globalKey" : "f46b0a64"
               }
             }
           },
           "meta" : {
-            "globalKey" : "927370ec"
+            "globalKey" : "1cff5b0a"
           }
         },
         "meta" : {
-          "globalKey" : "927370ec"
+          "globalKey" : "1cff5b0a"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "12a0e31f"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0003,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0003,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "417b80c1"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "b31c328d"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d08"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "8280320a"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "5332145f"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "tradeDate",
-        "globalKey" : "3ea9df"
-      },
-      "value" : "2005-07-31"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/nsa/cftc"
-        },
-        "value" : "1031234567"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "efa39ceb"
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
+        }
+      } ],
+      "name" : {
+        "value" : "Party B"
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "65143dbd"
+    }
+  },
+  "meta" : {
+    "globalKey" : "65143dbd"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex31-non-deliverable-settlement-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex31-non-deliverable-settlement-swap.json
index 5818cdd7c1..2d83c33118 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex31-non-deliverable-settlement-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex31-non-deliverable-settlement-swap.json
@@ -1,61 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "3c1b888e"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "3c1b888e"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "4e41782e"
-      },
-      "name" : {
-        "value" : "Party A"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "8b7071c",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "E2000098N10184",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "76095221801"
-        },
-        "meta" : {
-          "globalKey" : "be6c5af5"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "f9ea7c0d"
+        "globalKey" : "3e06abe1"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "f9ea7c0d",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "00680112001"
-        },
-        "meta" : {
-          "globalKey" : "f9ea7c0d"
+            "scheme" : "http://www.barclays.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9591fab6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "1994-12-12",
+      "meta" : {
+        "globalKey" : "3e530c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "4e41782e"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "f9ea7c0d"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -66,77 +50,84 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "E2000098notional-0-LTAA0200000096.1",
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "E2000098notional-0-LTAA0200000096.1"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : true,
                   "initialPayment" : false,
+                  "finalPayment" : true,
                   "intermediatePayment" : false,
-                  "meta" : {
-                    "externalKey" : "PrincipalExchanges",
-                    "globalKey" : "37d866f0"
-                  },
                   "principalPaymentSchedule" : {
                     "initialPrincipalPayment" : {
-                      "meta" : {
-                        "globalKey" : "3df6cdc1"
+                      "principalPaymentDate" : {
+                        "unadjustedDate" : "2007-12-16",
+                        "meta" : {
+                          "globalKey" : "3ebb10"
+                        }
                       },
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "principalAmount" : {
+                        "value" : 26415000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 26415000000.00,
                         "meta" : {
                           "globalKey" : "96e17152"
                         }
                       },
-                      "principalPaymentDate" : {
-                        "meta" : {
-                          "globalKey" : "3ebb10"
-                        },
-                        "unadjustedDate" : "2007-12-16"
+                      "meta" : {
+                        "globalKey" : "78e9b601"
                       }
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "42bd12fc",
+                    "externalKey" : "PrincipalExchanges"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "765135f9"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
+                  "meta" : {
+                    "globalKey" : "226239bd"
+                  },
                   "cashSettlementTerms" : [ {
-                    "meta" : {
-                      "globalKey" : "28999d13"
+                    "valuationMethod" : {
+                      "valuationSource" : {
+                        "settlementRateOption" : {
+                          "settlementRateOption" : {
+                            "value" : "KRW.KFTC18/KRW02"
+                          }
+                        }
+                      }
                     },
                     "valuationDate" : {
                       "fxFixingDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "35d317c0"
+                          "globalKey" : "786cca04"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -147,57 +138,46 @@
                             "globalKey" : "4f5ffd5"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "dateRelativeToPaymentDates" : {
                           "paymentDatesReference" : [ {
-                            "externalReference" : "PaymentDatesID",
-                            "globalReference" : "9756838d"
+                            "globalReference" : "9f20bbd9",
+                            "externalReference" : "PaymentDatesID"
                           }, {
-                            "externalReference" : "PrincipalExchanges",
-                            "globalReference" : "37d866f0"
+                            "globalReference" : "42bd12fc",
+                            "externalReference" : "PrincipalExchanges"
                           } ]
                         }
                       }
                     },
-                    "valuationMethod" : {
-                      "valuationSource" : {
-                        "settlementRateOption" : {
-                          "settlementRateOption" : {
-                            "value" : "KRW.KFTC18/KRW02"
-                          }
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "d4aaa0d7"
                     }
                   } ]
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "4f5ffd5"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "987f5366"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c8b"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "16"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2004-12-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -208,27 +188,23 @@
                             "globalKey" : "4f5ffd5"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "987f5366"
                         }
                       },
                       "meta" : {
                         "globalKey" : "54261e56"
-                      },
-                      "unadjustedDate" : "2004-12-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "54261e56"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "E2000098N10184",
-                    "globalKey" : "a6ce8b9d"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2007-12-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -239,37 +215,20 @@
                             "globalKey" : "4f5ffd5"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "987f5366"
                         }
                       },
                       "meta" : {
                         "globalKey" : "705b0656"
-                      },
-                      "unadjustedDate" : "2007-12-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "705b0656"
                     }
-                  }
-                },
-                "cashflowRepresentation" : {
-                  "cashflowsMatchParameters" : false
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "6cee277"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "PaymentDatesID",
-                    "globalKey" : "9756838d"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -280,79 +239,113 @@
                         "globalKey" : "4f5ffd5"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "987f5366"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "18a9d"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "16"
+                  },
+                  "meta" : {
+                    "globalKey" : "acf4d657",
+                    "externalKey" : "E2000098N10184"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "4f5ffd5"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "987f5366"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "9f20bbd9",
+                    "externalKey" : "PaymentDatesID"
                   }
+                },
+                "cashflowRepresentation" : {
+                  "cashflowsMatchParameters" : false
+                },
+                "meta" : {
+                  "globalKey" : "d4852e23"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "E2000098notional-1-LTAA0200000096.1",
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "E2000098notional-1-LTAA0200000096.1"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "4f5ffd5"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "987f5366"
-                    }
-                  },
-                  "calculationPeriodFrequency" : {
                     "meta" : {
-                      "globalKey" : "28c8b"
+                      "globalKey" : "c8507cd0"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "16"
-                  },
+                    "rateTreatment" : "MoneyMarketYield",
+                    "initialRate" : {
+                      "value" : 0.01650000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "perUnitOf" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "priceType" : "InterestRate"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2004-12-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -363,27 +356,23 @@
                             "globalKey" : "4f5ffd5"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "987f5366"
                         }
                       },
                       "meta" : {
                         "globalKey" : "54261e56"
-                      },
-                      "unadjustedDate" : "2004-12-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "54261e56"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "E2000098N10AC8",
-                    "globalKey" : "a6ce8b9d"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2007-12-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -394,33 +383,20 @@
                             "globalKey" : "4f5ffd5"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "987f5366"
                         }
                       },
                       "meta" : {
                         "globalKey" : "705b0656"
-                      },
-                      "unadjustedDate" : "2007-12-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "705b0656"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "6b0e65da"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "9756838d"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -431,59 +407,66 @@
                         "globalKey" : "4f5ffd5"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "987f5366"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "18a9d"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "16"
+                  },
+                  "meta" : {
+                    "globalKey" : "acf4d657",
+                    "externalKey" : "E2000098N10AC8"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "c8507cd0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "4f5ffd5"
                       }
                     },
-                    "rateTreatment" : "MONEY_MARKET_YIELD",
-                    "initialRate" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 0.01650000,
-                      "perUnitOf" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "priceType" : "INTEREST_RATE"
+                    "meta" : {
+                      "globalKey" : "987f5366"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "9f20bbd9"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "E2000098N10AC8",
-                    "globalReference" : "a6ce8b9d"
+                    "globalReference" : "acf4d657",
+                    "externalReference" : "E2000098N10AC8"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "21186cd0"
+                      "globalKey" : "fdf45784"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -492,17 +475,20 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "E2000098N10DDE",
-                      "globalReference" : "cd3b0b7f"
+                      "globalReference" : "c6b0d3b1",
+                      "externalReference" : "E2000098N10DDE"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "E2000098N10DDE",
-                    "globalKey" : "cd3b0b7f"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -511,163 +497,177 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "c6b0d3b1",
+                    "externalKey" : "E2000098N10DDE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c24897d2"
                 }
               } ],
               "meta" : {
-                "globalKey" : "c66f2ed1"
+                "globalKey" : "1b4dbe75"
               }
             }
           },
           "meta" : {
-            "globalKey" : "c66f2ed1"
+            "globalKey" : "1b4dbe75"
           }
         },
         "meta" : {
-          "globalKey" : "c66f2ed1"
+          "globalKey" : "1b4dbe75"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "24e4fd0d"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0273000,
               "unit" : {
                 "currency" : {
                   "value" : "KRW"
                 }
               },
-              "value" : 0.0273000,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "KRW"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 26415000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "KRW"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "77baa493"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000.00,
               "unit" : {
                 "currency" : {
-                  "value" : "KRW"
+                  "value" : "USD"
                 }
-              },
-              "value" : 26415000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "f1b09fde"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d05"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 25000000.00
+            "meta" : {
+              "globalKey" : "828026c7"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "32f46b8a"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "8b7071c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "f9ea7c0d",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e530c"
-      },
-      "value" : "1994-12-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "76095221801",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "E2000098N10184"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "be6c5af5"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "4e41782e"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "7ae32cd7"
+        "globalKey" : "8b7071c",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "00680112001",
           "meta" : {
-            "scheme" : "http://www.barclays.com/swaps/trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "f9ea7c0d"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "f9ea7c0d"
-      },
       "meta" : {
-        "globalKey" : "1b2141ce"
+        "globalKey" : "f9ea7c0d",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "3705d0d0"
+    }
+  },
+  "meta" : {
+    "globalKey" : "3705d0d0"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex32-zero-coupon-swap-account-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex32-zero-coupon-swap-account-versioned.json
index 59509c54ac..faadd18e4b 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex32-zero-coupon-swap-account-versioned.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex32-zero-coupon-swap-account-versioned.json
@@ -1,92 +1,47 @@
 {
-  "meta" : {
-    "globalKey" : "5bb5326b"
-  },
   "trade" : {
-    "account" : [ {
-      "accountBeneficiary" : {
-        "externalReference" : "party1",
-        "globalReference" : "929f1d6c"
-      },
-      "accountName" : {
-        "value" : "PRIMARY_ACCOUNT"
-      },
-      "accountNumber" : {
-        "value" : "PRIM_450"
-      },
-      "meta" : {
-        "externalKey" : "primaryAct1",
-        "globalKey" : "b222fdf1"
-      }
-    }, {
-      "accountBeneficiary" : {
-        "externalReference" : "party2",
-        "globalReference" : "312ceee"
-      },
-      "accountName" : {
-        "value" : "CROSS_ACCOUNT"
-      },
-      "accountNumber" : {
-        "value" : "CROSS_560"
-      },
-      "meta" : {
-        "externalKey" : "crossAct1",
-        "globalKey" : "3070a28a"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "5bb5326b"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "929f1d6c"
-      },
-      "name" : {
-        "value" : "Party A"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "ac4054da",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "E2000098N10184",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "12345"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         },
-        "meta" : {
-          "globalKey" : "2ca0033"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "312ceee"
+        "globalKey" : "c2617618"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "312ceee",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "FRG56R1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "67890"
+            "scheme" : "http://www.barclays.com/swaps/trade-id"
+          }
         },
-        "meta" : {
-          "globalKey" : "312ceee"
-        }
-      } ]
+        "version" : 1
+      } ],
+      "meta" : {
+        "globalKey" : "87c1d405"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2005-02-20",
+      "meta" : {
+        "globalKey" : "3ea894"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "929f1d6c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "312ceee"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -97,46 +52,44 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365c4b6f"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "25e2ab"
-                    },
-                    "period" : "T",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "NONE"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30E/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2005-02-22",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -145,23 +98,23 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365c4b6f"
                         }
                       },
                       "meta" : {
                         "globalKey" : "5afd9099"
-                      },
-                      "unadjustedDate" : "2005-02-22"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "5afd9099"
                     }
                   },
-                  "firstPeriodStartDate" : {
+                  "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2035-02-22",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -170,27 +123,37 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365c4b6f"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "5793df5b"
-                      },
-                      "unadjustedDate" : "2005-02-20"
+                        "globalKey" : "e612a099"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "5793df5b"
+                      "globalKey" : "e612a099"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "N10434",
-                    "globalKey" : "86636427"
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "365c4b6f"
+                    }
                   },
-                  "terminationDate" : {
+                  "firstPeriodStartDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2005-02-20",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -199,33 +162,42 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365c4b6f"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "e612a099"
-                      },
-                      "unadjustedDate" : "2035-02-22"
+                        "globalKey" : "5793df5b"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "e612a099"
+                      "globalKey" : "5793df5b"
                     }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
+                    "meta" : {
+                      "globalKey" : "24b525"
+                    },
+                    "rollConvention" : "NONE"
+                  },
+                  "meta" : {
+                    "globalKey" : "c9bfadfd",
+                    "externalKey" : "N10434"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "30E/360"
-                },
-                "meta" : {
-                  "globalKey" : "415e4c2b"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "965ab238"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
+                    "meta" : {
+                      "globalKey" : "73"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -234,68 +206,55 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "a2d"
-                    },
-                    "period" : "T",
-                    "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "9285f8b6"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                "meta" : {
+                  "globalKey" : "becff26b"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessDayConvention" : "NONE",
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "24a738"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c49"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "22"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2005-02-22",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -304,44 +263,23 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365c4b6f"
                         }
                       },
                       "meta" : {
                         "globalKey" : "5afd9099"
-                      },
-                      "unadjustedDate" : "2005-02-22"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "5afd9099"
                     }
                   },
-                  "firstPeriodStartDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "NONE",
-                        "meta" : {
-                          "globalKey" : "24a738"
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "eb5b7acc"
-                      },
-                      "unadjustedDate" : "2005-02-20"
-                    },
-                    "meta" : {
-                      "globalKey" : "eb5b7acc"
-                    }
-                  },
-                  "meta" : {
-                    "externalKey" : "N10277",
-                    "globalKey" : "c185128b"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2035-02-22",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -350,34 +288,65 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365c4b6f"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e612a099"
-                      },
-                      "unadjustedDate" : "2035-02-22"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e612a099"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
+                    "meta" : {
+                      "globalKey" : "24a738"
+                    }
+                  },
+                  "firstPeriodStartDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2005-02-20",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "NONE",
+                        "meta" : {
+                          "globalKey" : "24a738"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "eb5b7acc"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "eb5b7acc"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f75"
+                    },
+                    "rollConvention" : "22"
+                  },
+                  "meta" : {
+                    "globalKey" : "1ee97097",
+                    "externalKey" : "N10277"
                   }
                 },
-                "compoundingMethod" : "FLAT",
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "19e8dd13"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "965ab238"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
+                    "meta" : {
+                      "globalKey" : "73"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -386,44 +355,27 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "a2d"
-                    },
-                    "period" : "T",
-                    "periodMultiplier" : 1
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "9285f8b6"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "N10277",
-                    "globalReference" : "c185128b"
+                    "globalReference" : "1ee97097",
+                    "externalReference" : "N10277"
                   },
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "131ae8a2"
+                      "globalKey" : "eff6d356"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -432,17 +384,20 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "cdba576e"
+                      "globalReference" : "c7301fa0",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "cdba576e"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -451,164 +406,209 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "c7301fa0",
+                    "externalKey" : "resetDates"
                   }
+                },
+                "compoundingMethod" : "Flat",
+                "meta" : {
+                  "globalKey" : "ea33567b"
                 }
               } ],
               "meta" : {
-                "globalKey" : "4b9443be"
+                "globalKey" : "a8414366"
               }
             }
           },
           "meta" : {
-            "globalKey" : "4b9443be"
+            "globalKey" : "a8414366"
           }
         },
         "meta" : {
-          "globalKey" : "4b9443be"
+          "globalKey" : "a8414366"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "467212c2"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.03,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "value" : 0.03,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "87d0457e"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 100000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "98c6c05"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "e4650ab1"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "GBP-LIBOR-ISDA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 100000
+            "meta" : {
+              "globalKey" : "a83b4981"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "28baa5d7"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "ac4054da",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "312ceee",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea894"
-      },
-      "value" : "2005-02-20"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "E2000098N10184"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "2ca0033"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "929f1d6c"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "7af14458"
+        "globalKey" : "ac4054da",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "67890",
           "meta" : {
-            "scheme" : "http://www.barclays.com/swaps/trade-id"
-          },
-          "value" : "FRG56R1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "312ceee"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "312ceee"
+      "meta" : {
+        "globalKey" : "312ceee",
+        "externalKey" : "party2"
+      }
+    } ],
+    "account" : [ {
+      "accountNumber" : {
+        "value" : "PRIM_450"
+      },
+      "accountName" : {
+        "value" : "PRIMARY_ACCOUNT"
+      },
+      "accountBeneficiary" : {
+        "globalReference" : "ac4054da",
+        "externalReference" : "party1"
       },
       "meta" : {
-        "globalKey" : "34cb9fc5"
+        "globalKey" : "7695b071",
+        "externalKey" : "primaryAct1"
       }
-    } ]
+    }, {
+      "accountNumber" : {
+        "value" : "CROSS_560"
+      },
+      "accountName" : {
+        "value" : "CROSS_ACCOUNT"
+      },
+      "accountBeneficiary" : {
+        "globalReference" : "312ceee",
+        "externalReference" : "party2"
+      },
+      "meta" : {
+        "globalKey" : "dc8b808a",
+        "externalKey" : "crossAct1"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "d84705a3"
+    }
+  },
+  "meta" : {
+    "globalKey" : "d84705a3"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex33-BRL-CDI-swap-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex33-BRL-CDI-swap-versioned.json
index 0d3a9c533b..b6a514348e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex33-BRL-CDI-swap-versioned.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex33-BRL-CDI-swap-versioned.json
@@ -1,73 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "926a50cd"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "926a50cd"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "86c4f0f6"
-      },
-      "name" : {
-        "value" : "Delta Bank Ltd"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "1e2d2b76",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "987654321-0",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "DELTA123"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "64106d76"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "d75a8c34"
-      },
-      "name" : {
-        "value" : "Metro Bank Ltd"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "METRO123"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "188bf475"
-        }
-      } ]
+        "globalKey" : "c53307f4"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2012-06-29",
+      "meta" : {
+        "globalKey" : "3ee19d"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "86c4f0f6"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "86c4f0f6"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "d75a8c34"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -75,62 +32,63 @@
             "productQualifier" : "InterestRate_IRSwap_FixedFloat_ZeroCoupon"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    }
+                  },
                   "futureValueNotional" : {
-                    "calculationPeriodNumberOfDays" : 122,
-                    "currency" : {
-                      "value" : "BRL"
-                    },
                     "quantity" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
                     },
+                    "currency" : {
+                      "value" : "BRL"
+                    },
+                    "calculationPeriodNumberOfDays" : 122,
                     "valueDate" : "2013-03-26"
                   },
                   "meta" : {
                     "globalKey" : "ec60919c"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
-                    }
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "95a01cb7"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
+                  "meta" : {
+                    "globalKey" : "7fe8b009"
+                  },
                   "cashSettlementTerms" : [ {
-                    "meta" : {
-                      "globalKey" : "fd2b8251"
+                    "valuationMethod" : {
+                      "valuationSource" : {
+                        "settlementRateOption" : {
+                          "settlementRateOption" : {
+                            "value" : "BRL.PTAX/BRL09"
+                          }
+                        }
+                      }
                     },
                     "valuationDate" : {
                       "fxFixingDate" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
                         "meta" : {
-                          "externalKey" : "fixedLegFxFixingDates",
-                          "globalKey" : "788dd8b3"
+                          "globalKey" : "1483817f",
+                          "externalKey" : "fixedLegFxFixingDates"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "BRBD"
@@ -141,43 +99,41 @@
                             "globalKey" : "3f03a97"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeToCalculationPeriodDates" : {
                           "calculationPeriodDatesReference" : [ {
-                            "externalReference" : "fixedLegTerminationDate",
-                            "globalReference" : "efeee7e7"
+                            "globalReference" : "efeee7e7",
+                            "externalReference" : "fixedLegTerminationDate"
                           } ]
                         }
                       }
                     },
-                    "valuationMethod" : {
-                      "valuationSource" : {
-                        "settlementRateOption" : {
-                          "settlementRateOption" : {
-                            "value" : "BRL.PTAX/BRL09"
-                          }
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "e77415a3"
                     }
                   } ]
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessDayConvention" : "NONE",
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "24a738"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "25e2ab"
-                    },
-                    "period" : "T",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "NONE"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "CAL/252"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2012-09-26",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -186,26 +142,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ec345b12"
-                      },
-                      "unadjustedDate" : "2012-09-26"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec345b12"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedLegCalcPeriodDates",
-                    "globalKey" : "ee4ecbf6"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
-                      "adjustedDate" : {
-                        "meta" : {
-                          "globalKey" : "3ee8da"
-                        },
-                        "value" : "2013-03-26"
-                      },
+                      "unadjustedDate" : "2013-03-26",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "BRBD"
@@ -214,34 +161,63 @@
                             "globalKey" : "1f3c92"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211c5881"
                         }
                       },
+                      "adjustedDate" : {
+                        "value" : "2013-03-26",
+                        "meta" : {
+                          "globalKey" : "3ee8da"
+                        }
+                      },
                       "meta" : {
                         "globalKey" : "efeee7e7"
-                      },
-                      "unadjustedDate" : "2013-03-26"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "fixedLegTerminationDate",
-                      "globalKey" : "efeee7e7"
+                      "globalKey" : "efeee7e7",
+                      "externalKey" : "fixedLegTerminationDate"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
+                    "meta" : {
+                      "globalKey" : "24a738"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
+                    "meta" : {
+                      "globalKey" : "24b525"
+                    },
+                    "rollConvention" : "NONE"
+                  },
+                  "meta" : {
+                    "globalKey" : "94beb296",
+                    "externalKey" : "fixedLegCalcPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "CAL/252"
-                },
-                "meta" : {
-                  "globalKey" : "d784e9f4"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "84c5dd9e"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
+                    "meta" : {
+                      "globalKey" : "73"
+                    }
+                  },
+                  "payRelativeTo" : "ValuationDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 1,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4abbbd"
+                    },
+                    "dayType" : "Business"
                   },
-                  "payRelativeTo" : "VALUATION_DATE",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -250,78 +226,60 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
                       "globalKey" : "212500d8"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf23"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 1,
-                    "dayType" : "BUSINESS"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "a2d"
-                    },
-                    "period" : "T",
-                    "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "94f40174"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                "meta" : {
+                  "globalKey" : "5c4eb33c"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "5d3e77e5"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
+                  "meta" : {
+                    "globalKey" : "6b0d901b"
+                  },
                   "cashSettlementTerms" : [ {
-                    "meta" : {
-                      "globalKey" : "c4c9dd7f"
+                    "valuationMethod" : {
+                      "valuationSource" : {
+                        "settlementRateOption" : {
+                          "settlementRateOption" : {
+                            "value" : "BRL.PTAX/BRL09"
+                          }
+                        }
+                      }
                     },
                     "valuationDate" : {
                       "fxFixingDate" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
                         "meta" : {
-                          "externalKey" : "floatingLegFxFixingDates",
-                          "globalKey" : "63b2b8c5"
+                          "globalKey" : "ffa86191",
+                          "externalKey" : "floatingLegFxFixingDates"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "BRBD"
@@ -332,51 +290,53 @@
                             "globalKey" : "3f03a97"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeToCalculationPeriodDates" : {
                           "calculationPeriodDatesReference" : [ {
-                            "externalReference" : "floatingLegTerminationDate",
-                            "globalReference" : "efeee7e7"
+                            "globalReference" : "efeee7e7",
+                            "externalReference" : "floatingLegTerminationDate"
                           } ]
                         }
                       }
                     },
-                    "valuationMethod" : {
-                      "valuationSource" : {
-                        "settlementRateOption" : {
-                          "settlementRateOption" : {
-                            "value" : "BRL.PTAX/BRL09"
-                          }
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "d298f5b5"
                     }
                   } ]
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "BRBD"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "1f3c92"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
-                      "globalKey" : "211c5881"
+                      "globalKey" : "bd55286d"
+                    },
+                    "initialRate" : {
+                      "value" : 0.10432,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "BRL"
+                        }
+                      },
+                      "perUnitOf" : {
+                        "currency" : {
+                          "value" : "BRL"
+                        }
+                      },
+                      "priceType" : "InterestRate"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "25e2ab"
-                    },
-                    "period" : "T",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "NONE"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "CAL/252"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2012-09-26",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -385,20 +345,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ec345b12"
-                      },
-                      "unadjustedDate" : "2012-09-26"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec345b12"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingLegCalcPeriodDates",
-                    "globalKey" : "e528b5cd"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-03-26",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "BRBD"
@@ -407,102 +364,94 @@
                             "globalKey" : "1f3c92"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211c5881"
                         }
                       },
                       "meta" : {
                         "globalKey" : "efeee7e7"
-                      },
-                      "unadjustedDate" : "2013-03-26"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "floatingLegTerminationDate",
-                      "globalKey" : "efeee7e7"
+                      "globalKey" : "efeee7e7",
+                      "externalKey" : "floatingLegTerminationDate"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "CAL/252"
-                },
-                "meta" : {
-                  "globalKey" : "2302e5c8"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "84c5dd9e"
                   },
-                  "payRelativeTo" : "VALUATION_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
-                        "value" : "USNY"
+                        "value" : "BRBD"
                       } ],
                       "meta" : {
-                        "globalKey" : "27e4e9"
+                        "globalKey" : "1f3c92"
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
-                      "globalKey" : "212500d8"
+                      "globalKey" : "211c5881"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf23"
-                    },
-                    "period" : "D",
+                  "calculationPeriodFrequency" : {
                     "periodMultiplier" : 1,
-                    "dayType" : "BUSINESS"
-                  },
-                  "paymentFrequency" : {
+                    "period" : "T",
                     "meta" : {
-                      "globalKey" : "a2d"
+                      "globalKey" : "24b525"
                     },
-                    "period" : "T",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "NONE"
+                  },
+                  "meta" : {
+                    "globalKey" : "1187dc4d",
+                    "externalKey" : "floatingLegCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
                     "meta" : {
-                      "globalKey" : "bd55286d"
+                      "globalKey" : "73"
+                    }
+                  },
+                  "payRelativeTo" : "ValuationDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 1,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4abbbd"
                     },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "27e4e9"
                       }
                     },
-                    "initialRate" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "BRL"
-                        }
-                      },
-                      "value" : 0.10432,
-                      "perUnitOf" : {
-                        "currency" : {
-                          "value" : "BRL"
-                        }
-                      },
-                      "priceType" : "INTEREST_RATE"
+                    "meta" : {
+                      "globalKey" : "212500d8"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "94f40174"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingLegCalcPeriodDates",
-                    "globalReference" : "e528b5cd"
+                    "globalReference" : "1187dc4d",
+                    "externalReference" : "floatingLegCalcPeriodDates"
                   },
                   "fixingDates" : {
+                    "periodMultiplier" : -1,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "9dd243bd"
+                      "globalKey" : "a7117093"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -1,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "BRBD"
@@ -511,17 +460,20 @@
                         "globalKey" : "1f3c92"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "floatingLegResetDates",
-                      "globalReference" : "1ced4f70"
+                      "globalReference" : "ef2f9828",
+                      "externalReference" : "floatingLegResetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingLegResetDates",
-                    "globalKey" : "1ced4f70"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
+                    "meta" : {
+                      "globalKey" : "73"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "BRBD"
@@ -530,155 +482,203 @@
                         "globalKey" : "1f3c92"
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
                       "globalKey" : "211c5881"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "a2d"
-                    },
-                    "period" : "T",
-                    "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "ef2f9828",
+                    "externalKey" : "floatingLegResetDates"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "f4df9bf8"
                 }
               } ],
               "meta" : {
-                "globalKey" : "bfc2b2bc"
+                "globalKey" : "b64ea034"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "50124d8f"
+            "globalKey" : "19f8a187"
           }
         },
         "meta" : {
-          "globalKey" : "50124d8f"
+          "globalKey" : "19f8a187"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "168adaad"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0876,
               "unit" : {
                 "currency" : {
                   "value" : "BRL"
                 }
               },
-              "value" : 0.0876,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "BRL"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000.0,
+              "unit" : {
+                "currency" : {
+                  "value" : "BRL"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 104149148.42,
               "unit" : {
                 "currency" : {
                   "value" : "BRL"
                 }
-              },
-              "value" : 100000000.0
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "bad07af3"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "BRL"
                 }
-              },
-              "value" : 104149148.42
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-3"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d3e0f246"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "33a3d745"
-            },
             "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "BRL-CDI"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "rateOption-1"
                 } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "BRL-CDI"
-                }
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-3"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "BRL"
-                }
-              },
-              "value" : 100000000.0
+            "meta" : {
+              "globalKey" : "40d7115b"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "7c30e9d0"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "1e2d2b76",
+          "externalReference" : "partyA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "276fa74",
+          "externalReference" : "partyB"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "1e2d2b76",
+          "externalReference" : "partyA"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee19d"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "DELTA123",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "64106d76"
+        }
+      } ],
+      "name" : {
+        "value" : "Delta Bank Ltd"
       },
-      "value" : "2012-06-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "1e2d2b76",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "METRO123",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "987654321-0"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
         },
-        "version" : 1
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "188bf475"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "86c4f0f6"
+      "name" : {
+        "value" : "Metro Bank Ltd"
       },
       "meta" : {
-        "globalKey" : "c1421b34"
+        "globalKey" : "276fa74",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "283ecdb3"
+    }
+  },
+  "meta" : {
+    "globalKey" : "283ecdb3"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex34-MXN-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex34-MXN-swap.json
index 140c97aafe..9fa52e6143 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex34-MXN-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex34-MXN-swap.json
@@ -1,66 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "f570b348"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "f570b348"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "deb0126c"
-      },
-      "name" : {
-        "value" : "Buyside"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "2eb692c",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "xyz1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
+            "scheme" : "buyside-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "47033baa"
-      },
-      "name" : {
-        "value" : "Sellside"
+        "globalKey" : "36aee370"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "7a8bb3ea",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "abc1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "sellside-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "4d7c7218"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2010-12-12",
+      "meta" : {
+        "globalKey" : "3ed30c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "47033baa"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "deb0126c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -71,45 +50,40 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "MXMC"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "245481"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365f5852"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "25a9e0"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 28,
-                    "rollConvention" : "NONE"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2010-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -118,20 +92,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ebfaeec6"
-                      },
-                      "unadjustedDate" : "2010-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ebfaeec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "735f56d8"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2015-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "MXMC"
@@ -140,33 +111,20 @@
                             "globalKey" : "245481"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365f5852"
                         }
                       },
                       "meta" : {
                         "globalKey" : "15291604"
-                      },
-                      "unadjustedDate" : "2015-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "15291604"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "5bf6f5ff"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "f95354a0"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "MXMC"
@@ -175,44 +133,64 @@
                         "globalKey" : "245481"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365f5852"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 28,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "858"
+                      "globalKey" : "251890"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 28
+                    "rollConvention" : "NONE"
+                  },
+                  "meta" : {
+                    "globalKey" : "85c51c58",
+                    "externalKey" : "floatingCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 28,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "3a8"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "MXMC"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "245481"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365f5852"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "b83bb84"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "735f56d8"
+                    "globalReference" : "85c51c58",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -1,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "866f75a4"
+                      "globalKey" : "8faea27a"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -1,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "MXMC"
@@ -221,17 +199,20 @@
                         "globalKey" : "245481"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "3e8dc626"
+                      "globalReference" : "5f4623e0",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "3e8dc626"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 28,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "3a8"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "MXMC"
@@ -240,61 +221,56 @@
                         "globalKey" : "245481"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365f5852"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "858"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 28
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "5f4623e0",
+                    "externalKey" : "resetDates"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "fac23b5d"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "MXMC"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "245481"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365f5852"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "25a9e0"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 28,
-                    "rollConvention" : "NONE"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30E/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2010-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -303,20 +279,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ebfaeec6"
-                      },
-                      "unadjustedDate" : "2010-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ebfaeec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "735f56d8"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2015-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "MXMC"
@@ -325,33 +298,20 @@
                             "globalKey" : "245481"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365f5852"
                         }
                       },
                       "meta" : {
                         "globalKey" : "15291604"
-                      },
-                      "unadjustedDate" : "2015-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "15291604"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30E/360"
-                },
-                "meta" : {
-                  "globalKey" : "2cc69532"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "f95354a0"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "MXMC"
@@ -360,177 +320,217 @@
                         "globalKey" : "245481"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365f5852"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 28,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "858"
+                      "globalKey" : "251890"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 28
+                    "rollConvention" : "NONE"
+                  },
+                  "meta" : {
+                    "globalKey" : "85c51c58",
+                    "externalKey" : "fixedCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 28,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "3a8"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "MXMC"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "245481"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365f5852"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "b83bb84"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "a6826b06"
                 }
               } ],
               "meta" : {
-                "globalKey" : "30689c71"
+                "globalKey" : "6c102223"
               }
             }
           },
           "meta" : {
-            "globalKey" : "30689c71"
+            "globalKey" : "6c102223"
           }
         },
         "meta" : {
-          "globalKey" : "30689c71"
+          "globalKey" : "6c102223"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "70b2044a"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "e9177bbe"
+          "quantity" : [ {
+            "value" : {
+              "value" : 50000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "MXN"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "MXN-TIIE-Banxico"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "858"
-                  },
+                  "periodMultiplier" : 28,
                   "period" : "D",
-                  "periodMultiplier" : 28
+                  "meta" : {
+                    "globalKey" : "3a8"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "MXN"
-                }
-              },
-              "value" : 50000000.00
+            "meta" : {
+              "globalKey" : "39d76ab2"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "c3c8089b"
           },
+          "meta" : {
+            "globalKey" : "d3c627a"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
                   "value" : "MXN"
                 }
               },
-              "value" : 0.06,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "MXN"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "MXN"
                 }
-              },
-              "value" : 50000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "b5390ac5"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "7a8bb3ea",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "2eb692c",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ed30c"
-      },
-      "value" : "2010-12-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "buyside-trade-id"
-          },
-          "value" : "xyz1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "deb0126c"
+      "name" : {
+        "value" : "Buyside"
       },
       "meta" : {
-        "globalKey" : "ea5bbca6"
+        "globalKey" : "2eb692c",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "sellside-trade-id"
-          },
-          "value" : "abc1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "47033baa"
+      "name" : {
+        "value" : "Sellside"
       },
       "meta" : {
-        "globalKey" : "824b68b0"
+        "globalKey" : "7a8bb3ea",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "7a9f492a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "7a9f492a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex35-inverse-floater-inverse-vs-floating.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex35-inverse-floater-inverse-vs-floating.json
index 12b86ff9a7..1aa93d81b5 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex35-inverse-floater-inverse-vs-floating.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex35-inverse-floater-inverse-vs-floating.json
@@ -1,58 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "e7f2c898"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "e7f2c898"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123456",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "ebf08478"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "654321",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "f4a3eab1"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-04-29",
+      "meta" : {
+        "globalKey" : "3ec91d"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,46 +50,56 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters0",
-                        "globalReference" : "27e4e9"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e1"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-2"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "985d6cb2"
-                    }
-                  },
-                  "calculationPeriodFrequency" : {
                     "meta" : {
-                      "globalKey" : "28c66"
+                      "globalKey" : "0"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "30"
-                  },
+                    "floatingRateMultiplierSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-08-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -111,204 +108,188 @@
                       },
                       "meta" : {
                         "globalKey" : "ebd961d6"
-                      },
-                      "unadjustedDate" : "2009-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ebd961d6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates0",
-                    "globalKey" : "64a1741a"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2011-08-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters0",
-                            "globalKey" : "27e4e9"
+                            "globalKey" : "27e4e9",
+                            "externalKey" : "accrualBusinessCenters0"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "3662e8ba"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e08db15c"
-                      },
-                      "unadjustedDate" : "2011-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e08db15c"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "bb40814f"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "98150c36"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "USNY"
-                      } ],
+                      "businessCentersReference" : {
+                        "globalReference" : "27e4e9",
+                        "externalReference" : "accrualBusinessCenters0"
+                      },
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters0",
-                        "globalKey" : "27e4e9"
+                        "globalKey" : "622268e1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "3662e8ba"
+                      "globalKey" : "985d6cb2"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "17f92"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "d72b1e52",
+                    "externalKey" : "CalcPeriodDates0"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-2"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "27e4e9",
+                        "externalKey" : "paymentBusinessCenters0"
                       }
                     },
-                    "floatingRateMultiplierSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "3662e8ba"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f067202a"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "CalcPeriodDates0",
-                    "globalReference" : "64a1741a"
+                    "globalReference" : "d72b1e52",
+                    "externalReference" : "CalcPeriodDates0"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2fdb52a6"
+                      "globalKey" : "cb73d5a"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
                       } ],
                       "meta" : {
-                        "externalKey" : "resetBusinessCenters0",
-                        "globalKey" : "21479e"
+                        "globalKey" : "21479e",
+                        "externalKey" : "resetBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates0",
-                      "globalReference" : "2d64ffde"
+                      "globalReference" : "eae8c8b6",
+                      "externalReference" : "resetDates0"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates0",
-                    "globalKey" : "2d64ffde"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "resetBusinessCenters0",
-                        "globalReference" : "21479e"
+                        "globalReference" : "21479e",
+                        "externalReference" : "resetBusinessCenters0"
                       },
                       "meta" : {
                         "globalKey" : "35a06081"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "6bdb6452"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "eae8c8b6",
+                    "externalKey" : "resetDates0"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "d1ec6213"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters1",
-                        "globalReference" : "27e4e9"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e2"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "985d6cb3"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28cc3"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-08-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -317,337 +298,356 @@
                       },
                       "meta" : {
                         "globalKey" : "ebd961d6"
-                      },
-                      "unadjustedDate" : "2009-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ebd961d6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates1",
-                    "globalKey" : "36c594fc"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2011-08-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters1",
-                            "globalKey" : "27e4e9"
+                            "globalKey" : "27e4e9",
+                            "externalKey" : "accrualBusinessCenters1"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "3662e8ba"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e08db15c"
-                      },
-                      "unadjustedDate" : "2011-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e08db15c"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "27e4e9",
+                        "externalReference" : "accrualBusinessCenters1"
+                      },
+                      "meta" : {
+                        "globalKey" : "622268e2"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "985d6cb3"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18ad5"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "d7394116",
+                    "externalKey" : "CalcPeriodDates1"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "8153ef4b"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "98150c39"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
                       } ],
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters1",
-                        "globalKey" : "27e4e9"
+                        "globalKey" : "27e4e9",
+                        "externalKey" : "paymentBusinessCenters1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "3662e8ba"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "8f19d1ed"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "CalcPeriodDates1",
-                    "globalReference" : "36c594fc"
+                    "globalReference" : "d7394116",
+                    "externalReference" : "CalcPeriodDates1"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "48afc932"
+                      "globalKey" : "258bb3e6"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
                       } ],
                       "meta" : {
-                        "externalKey" : "resetBusinessCenters1",
-                        "globalKey" : "27e4e9"
+                        "globalKey" : "27e4e9",
+                        "externalKey" : "resetBusinessCenters1"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates1",
-                      "globalReference" : "a07b008d"
+                      "globalReference" : "fcb106c7",
+                      "externalReference" : "resetDates1"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates1",
-                    "globalKey" : "a07b008d"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "resetBusinessCenters1",
-                        "globalReference" : "27e4e9"
+                        "globalReference" : "27e4e9",
+                        "externalReference" : "resetBusinessCenters1"
                       },
                       "meta" : {
                         "globalKey" : "35a06082"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "6bdb6453"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "fcb106c7",
+                    "externalKey" : "resetDates1"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "4fff7eff"
                 }
               } ],
               "meta" : {
-                "globalKey" : "40f7801c"
+                "globalKey" : "7542268c"
               }
             }
           },
           "meta" : {
-            "globalKey" : "40f7801c"
+            "globalKey" : "7542268c"
           }
         },
         "meta" : {
-          "globalKey" : "40f7801c"
+          "globalKey" : "7542268c"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "ad53944d"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d05"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-2"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 3
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0325,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0325,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          }, {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : -1.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : -1.0,
-              "arithmeticOperator" : "MULTIPLY",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Multiply"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-2"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "b31c328d"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d08"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-2"
+                } ]
               }
+            },
+            "meta" : {
+              "globalKey" : "828026c7"
             }
           },
+          "meta" : {
+            "globalKey" : "d403b1f"
+          }
+        }, {
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
               },
-              "value" : 100000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "8280320a"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "5332145f"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec91d"
-      },
-      "value" : "2009-04-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123456"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "55b93bae"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "654321"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "fd771f09"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "5879edee"
+    }
+  },
+  "meta" : {
+    "globalKey" : "5879edee"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex36-amer-swaption-pred-clearing.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex36-amer-swaption-pred-clearing.json
index 2a9cda30db..e3194f8f83 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex36-amer-swaption-pred-clearing.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-ex36-amer-swaption-pred-clearing.json
@@ -1,91 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "5319c98"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "5f6b641"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "957b3c47"
+      }
     }, {
-      "meta" : {
-        "externalKey" : "clearing-svc",
-        "globalKey" : "b2687a98"
-      },
-      "name" : {
-        "value" : "ClearItAll Corp"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300IB5Q45JGNPND58"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e213e7d7"
+            "scheme" : "http://www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "957bb0a6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-08-30",
+      "meta" : {
+        "globalKey" : "3e821e"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "clearing-svc",
-          "globalReference" : "b2687a98"
-        } ],
-        "role" : "PREDETERMINED_CLEARING_ORGANIZATION_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -93,17 +47,11 @@
             "productQualifier" : "InterestRate_Option_Swaption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "dfd23439"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
                   "meta" : {
@@ -111,33 +59,24 @@
                   },
                   "physicalSettlementTerms" : {
                     "clearedPhysicalSettlement" : true,
+                    "predeterminedClearingOrganizationParty" : "PredeterminedClearingOrganizationParty",
                     "meta" : {
                       "globalKey" : "5d273b4a"
-                    },
-                    "predeterminedClearingOrganizationParty" : "PREDETERMINED_CLEARING_ORGANIZATION_PARTY"
+                    }
                   }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "exerciseNotice" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "exerciseNoticeGiver" : "SELLER"
-                      }
-                    }
-                  },
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2000-08-30",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
@@ -148,29 +87,23 @@
                                 "globalKey" : "4158421"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da3b6050"
                             }
                           },
                           "meta" : {
                             "globalKey" : "3d69e072"
-                          },
-                          "unadjustedDate" : "2000-08-30"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "3d69e072"
                         }
                       },
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "EUTA"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2002-08-30",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
@@ -181,47 +114,27 @@
                                 "globalKey" : "4158421"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da3b6050"
                             }
                           },
                           "meta" : {
                             "globalKey" : "5037d072"
-                          },
-                          "unadjustedDate" : "2002-08-30"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "5037d072"
                         }
                       },
-                      "expirationTime" : {
-                        "businessCenter" : {
-                          "value" : "EUTA"
-                        },
-                        "hourMinuteTime" : "11:00:00"
-                      },
-                      "latestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "EUTA"
-                        },
-                        "hourMinuteTime" : "11:00:00"
-                      },
-                      "meta" : {
-                        "externalKey" : "americanExercise0",
-                        "globalKey" : "9b4d2749"
-                      },
                       "relevantUnderlyingDate" : {
-                        "meta" : {
-                          "globalKey" : "d4ef3003"
-                        },
                         "relativeDates" : {
+                          "periodMultiplier" : 2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "d4ef3003"
+                            "globalKey" : "6ce8443f"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -232,19 +145,51 @@
                               "globalKey" : "4158421"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "americanExercise0",
-                            "globalReference" : "9b4d2749"
+                            "globalReference" : "77fb1671",
+                            "externalReference" : "americanExercise0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "6ce8443f"
+                        }
+                      },
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "EUTA"
+                        }
+                      },
+                      "latestExerciseTime" : {
+                        "hourMinuteTime" : "11:00:00",
+                        "businessCenter" : {
+                          "value" : "EUTA"
                         }
+                      },
+                      "expirationTime" : {
+                        "hourMinuteTime" : "11:00:00",
+                        "businessCenter" : {
+                          "value" : "EUTA"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "77fb1671",
+                        "externalKey" : "americanExercise0"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "exerciseNotice" : {
+                        "exerciseNoticeGiver" : "Seller",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      }
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "dfd23439"
-                },
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -255,46 +200,42 @@
                       "payout" : {
                         "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters0",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e1"
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb2"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "2b934"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "30/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -303,135 +244,133 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates0",
-                              "globalKey" : "d530b040"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters0",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters0"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters0"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e1"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb2"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "17984"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6a5a890",
+                              "externalKey" : "CalcPeriodDates0"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "30/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "6e2bf001"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64aef4"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "78"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "ac8"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1
+                            "meta" : {
+                              "globalKey" : "9b0d9350"
                             }
                           },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "86242c95"
                           }
                         }, {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters1",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e2"
+                          "rateSpecification" : {
+                            "floatingRate" : {
+                              "rateOption" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "rateOption-1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb3"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "28cc3"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -440,327 +379,384 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates1",
-                              "globalKey" : "c8353f30"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters1",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters1"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters1"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e2"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb3"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "18ad5"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6b3d162",
+                              "externalKey" : "CalcPeriodDates1"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "9ec5a1dd"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64ad85"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters1",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            }
-                          },
-                          "rateSpecification" : {
-                            "floatingRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateOption" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "rateOption-1"
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "8f129421"
                             }
                           },
                           "resetDates" : {
                             "calculationPeriodDatesReference" : {
-                              "externalReference" : "CalcPeriodDates1",
-                              "globalReference" : "c8353f30"
+                              "globalReference" : "d6b3d162",
+                              "externalReference" : "CalcPeriodDates1"
                             },
+                            "resetRelativeTo" : "CalculationPeriodStartDate",
                             "fixingDates" : {
+                              "periodMultiplier" : -2,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "2d80ce65"
+                                "globalKey" : "a5cb919"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : -2,
-                              "dayType" : "BUSINESS",
+                              "dayType" : "Business",
+                              "businessDayConvention" : "NONE",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "fixingBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "fixingBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "NONE",
                               "dateRelativeTo" : {
-                                "externalReference" : "resetDates0",
-                                "globalReference" : "3522cca9"
+                                "globalReference" : "dbaefb1",
+                                "externalReference" : "resetDates0"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "resetDates0",
-                              "globalKey" : "3522cca9"
+                            "resetFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
                             "resetDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "paymentBusinessCenters1",
-                                  "globalReference" : "20a71d"
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "paymentBusinessCenters1"
                                 },
                                 "meta" : {
                                   "globalKey" : "e30c2739"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "19472b0a"
                               }
                             },
-                            "resetFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            },
-                            "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                            "meta" : {
+                              "globalKey" : "dbaefb1",
+                              "externalKey" : "resetDates0"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ad0fb833"
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "893cb5bc"
+                          "globalKey" : "2d8d4cfe"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "893cb5bc"
+                      "globalKey" : "2d8d4cfe"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "893cb5bc"
+                    "globalKey" : "2d8d4cfe"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "beaffc79"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "beaffc79"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "b4ecaea3"
+            "globalKey" : "1eeeab23"
           }
         },
         "meta" : {
-          "globalKey" : "b4ecaea3"
+          "globalKey" : "1eeeab23"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7f30bbe5"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.05,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.05,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "66e6c0bb"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "65d139a0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Telerate"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "4820adb2"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "PredeterminedClearingOrganizationParty",
+        "partyReference" : [ {
+          "globalReference" : "fff6958",
+          "externalReference" : "clearing-svc"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e821e"
-      },
-      "value" : "2000-08-30"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c7753bbd"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300IB5Q45JGNPND58",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e213e7d7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
+      "name" : {
+        "value" : "ClearItAll Corp"
       },
       "meta" : {
-        "globalKey" : "c7753bbe"
+        "globalKey" : "fff6958",
+        "externalKey" : "clearing-svc"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "82dd6177"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "5ac63039"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        }
-      },
       "quantity" : {
+        "value" : 100000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         },
-        "value" : 100000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2000-08-30",
         "dateAdjustments" : {
+          "businessDayConvention" : "FOLLOWING",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "EUTA"
@@ -769,16 +765,20 @@
               "globalKey" : "20a71d"
             }
           },
-          "businessDayConvention" : "FOLLOWING",
           "meta" : {
             "globalKey" : "211dc30c"
           }
-        },
-        "unadjustedDate" : "2000-08-30"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "dc25c051"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "e948bf3a"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-initial-fee.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-initial-fee.json
index 993ede3dd5..ed83a2e0ad 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-initial-fee.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-initial-fee.json
@@ -1,58 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "ea38d669"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "cb18c801"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59557"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59557",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "IRS858TH30",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "Party 1"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         },
-        "meta" : {
-          "globalKey" : "33f59557"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59558"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external"
-          },
-          "value" : "Party 2"
-        },
-        "meta" : {
-          "globalKey" : "33f59558"
-        }
-      } ]
+        "globalKey" : "debddbee"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2018-02-20",
+      "meta" : {
+        "globalKey" : "3f1094"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59557"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59558"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,46 +35,44 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365c4b6f"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "25e2ab"
-                    },
-                    "period" : "T",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "NONE"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30E/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-02-22",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -111,23 +81,23 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365c4b6f"
                         }
                       },
                       "meta" : {
                         "globalKey" : "d2fe2899"
-                      },
-                      "unadjustedDate" : "2018-02-22"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "d2fe2899"
                     }
                   },
-                  "firstPeriodStartDate" : {
+                  "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2020-02-22",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -136,27 +106,37 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365c4b6f"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "cf94775b"
-                      },
-                      "unadjustedDate" : "2018-02-20"
+                        "globalKey" : "20881899"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "cf94775b"
+                      "globalKey" : "20881899"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "N10434",
-                    "globalKey" : "2e920c27"
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "365c4b6f"
+                    }
                   },
-                  "terminationDate" : {
+                  "firstPeriodStartDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-02-20",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -165,33 +145,42 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365c4b6f"
                         }
                       },
                       "meta" : {
-                        "globalKey" : "20881899"
-                      },
-                      "unadjustedDate" : "2020-02-22"
+                        "globalKey" : "cf94775b"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "20881899"
+                      "globalKey" : "cf94775b"
                     }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
+                    "meta" : {
+                      "globalKey" : "24b525"
+                    },
+                    "rollConvention" : "NONE"
+                  },
+                  "meta" : {
+                    "globalKey" : "f13835fd",
+                    "externalKey" : "N10434"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "30E/360"
-                },
-                "meta" : {
-                  "globalKey" : "310aa42b"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "965ab238"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
+                    "meta" : {
+                      "globalKey" : "73"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -200,68 +189,55 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "a2d"
-                    },
-                    "period" : "T",
-                    "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "9285f8b6"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                "meta" : {
+                  "globalKey" : "6f3e7a6b"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessDayConvention" : "NONE",
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "24a738"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c49"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "22"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-02-22",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -270,44 +246,23 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365c4b6f"
                         }
                       },
                       "meta" : {
                         "globalKey" : "d2fe2899"
-                      },
-                      "unadjustedDate" : "2018-02-22"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "d2fe2899"
                     }
                   },
-                  "firstPeriodStartDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "NONE",
-                        "meta" : {
-                          "globalKey" : "24a738"
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "ece1e2cc"
-                      },
-                      "unadjustedDate" : "2018-02-20"
-                    },
-                    "meta" : {
-                      "globalKey" : "ece1e2cc"
-                    }
-                  },
-                  "meta" : {
-                    "externalKey" : "N10277",
-                    "globalKey" : "1c4f5a8b"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2020-02-22",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -316,34 +271,65 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365c4b6f"
                         }
                       },
                       "meta" : {
                         "globalKey" : "20881899"
-                      },
-                      "unadjustedDate" : "2020-02-22"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "20881899"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
+                    "meta" : {
+                      "globalKey" : "24a738"
+                    }
+                  },
+                  "firstPeriodStartDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2018-02-20",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "NONE",
+                        "meta" : {
+                          "globalKey" : "24a738"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "ece1e2cc"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "ece1e2cc"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f75"
+                    },
+                    "rollConvention" : "22"
+                  },
+                  "meta" : {
+                    "globalKey" : "a633c897",
+                    "externalKey" : "N10277"
                   }
                 },
-                "compoundingMethod" : "FLAT",
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "c2b99513"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "965ab238"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
+                    "meta" : {
+                      "globalKey" : "73"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -352,44 +338,27 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "a2d"
-                    },
-                    "period" : "T",
-                    "periodMultiplier" : 1
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "9285f8b6"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "N10277",
-                    "globalReference" : "1c4f5a8b"
+                    "globalReference" : "a633c897",
+                    "externalReference" : "N10277"
                   },
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "131ae8a2"
+                      "globalKey" : "eff6d356"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -398,17 +367,20 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "cdba576e"
+                      "globalReference" : "c7301fa0",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "cdba576e"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -417,174 +389,198 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "c7301fa0",
+                    "externalKey" : "resetDates"
                   }
+                },
+                "compoundingMethod" : "Flat",
+                "meta" : {
+                  "globalKey" : "8f9dfe7b"
                 }
               } ],
               "meta" : {
-                "globalKey" : "d76553be"
+                "globalKey" : "fb567366"
               }
             }
           },
           "meta" : {
-            "globalKey" : "d76553be"
+            "globalKey" : "fb567366"
           }
         },
         "meta" : {
-          "globalKey" : "d76553be"
+          "globalKey" : "fb567366"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "467212c2"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.03,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "value" : 0.03,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "87d0457e"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 100000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d1e8e568"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "e4650aae"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "GBP-LIBOR-ISDA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 100000
+            "meta" : {
+              "globalKey" : "a83b3e3e"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "28ba9a94"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59557",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59558",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party 1",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59557"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3f1094"
-      },
-      "value" : "2018-02-20"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59557",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 2",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "IRS858TH30"
+            "scheme" : "http://www.fpml.org/coding-scheme/external"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "33f59558"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59557"
-      },
       "meta" : {
-        "globalKey" : "f1cb8cae"
+        "globalKey" : "33f59558",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "a3bb68c1"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "55fee3ca"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59557"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59558"
-        }
-      },
       "quantity" : {
+        "value" : 200.00,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59557",
+          "externalReference" : "party1"
         },
-        "value" : 200.00
+        "receiverPartyReference" : {
+          "globalReference" : "33f59558",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2018-02-22",
         "dateAdjustments" : {
+          "businessDayConvention" : "MODFOLLOWING",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "GBLO"
@@ -593,16 +589,20 @@
               "globalKey" : "21479e"
             }
           },
-          "businessDayConvention" : "MODFOLLOWING",
           "meta" : {
             "globalKey" : "365c4b6f"
           }
-        },
-        "unadjustedDate" : "2018-02-22"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "9cf906a4"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "eac05083"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-xccy-CNH-USD-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-xccy-CNH-USD-uti.json
index 79edbf0650..7e40d4c61c 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-xccy-CNH-USD-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-xccy-CNH-USD-uti.json
@@ -1,66 +1,32 @@
 {
-  "meta" : {
-    "globalKey" : "e2c8321b"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "e2c8321b"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
-      },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "121d7965"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
       },
-      "name" : {
-        "value" : "Party B"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "3eac3060"
+      },
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "1994-12-12",
+      "meta" : {
+        "globalKey" : "3e530c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -71,118 +37,112 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : true,
                   "initialPayment" : true,
+                  "finalPayment" : true,
                   "intermediatePayment" : false,
-                  "meta" : {
-                    "globalKey" : "6322b3d"
-                  },
                   "principalPaymentSchedule" : {
-                    "finalPrincipalPayment" : {
-                      "meta" : {
-                        "globalKey" : "c7da3afa"
+                    "initialPrincipalPayment" : {
+                      "principalPaymentDate" : {
+                        "adjustedDate" : {
+                          "value" : "1994-12-14",
+                          "meta" : {
+                            "globalKey" : "3e530e"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
                       },
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "principalAmount" : {
+                        "value" : 10000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 10000000.00,
                         "meta" : {
                           "globalKey" : "d467e427"
                         }
                       },
+                      "meta" : {
+                        "globalKey" : "c606e068"
+                      }
+                    },
+                    "finalPrincipalPayment" : {
                       "principalPaymentDate" : {
                         "adjustedDate" : {
+                          "value" : "1999-12-14",
                           "meta" : {
                             "globalKey" : "3e7b0e"
-                          },
-                          "value" : "1999-12-14"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "0"
                         }
-                      }
-                    },
-                    "initialPrincipalPayment" : {
-                      "meta" : {
-                        "globalKey" : "fad52c98"
                       },
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "principalAmount" : {
+                        "value" : 10000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 10000000.00,
                         "meta" : {
                           "globalKey" : "d467e427"
                         }
                       },
-                      "principalPaymentDate" : {
-                        "adjustedDate" : {
-                          "meta" : {
-                            "globalKey" : "3e530e"
-                          },
-                          "value" : "1994-12-14"
-                        },
-                        "meta" : {
-                          "globalKey" : "0"
-                        }
+                      "meta" : {
+                        "globalKey" : "92d57dc6"
                       }
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "36d9b059"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "814e2ae6"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c89"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -191,20 +151,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "79667919"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -214,23 +171,130 @@
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "814e2ae6"
+                            "globalKey" : "814e2ae6",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "57d0de37"
                         }
                       },
                       "meta" : {
                         "globalKey" : "62b0f2e9"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "62b0f2e9"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "814e2ae6",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18a9b"
+                    },
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "72249099",
+                    "externalKey" : "floatingCalcPeriodDates"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "814e2ae6",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "7a04f180"
+                  }
+                },
+                "resetDates" : {
+                  "calculationPeriodDatesReference" : {
+                    "globalReference" : "72249099",
+                    "externalReference" : "floatingCalcPeriodDates"
+                  },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
+                  "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "eff6d356"
+                    },
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
+                      }
+                    },
+                    "dateRelativeTo" : {
+                      "globalReference" : "a5aeeeb8",
+                      "externalReference" : "resetDates"
+                    }
+                  },
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "814e2ae6",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "a5aeeeb8",
+                    "externalKey" : "resetDates"
                   }
                 },
                 "cashflowRepresentation" : {
@@ -238,440 +302,338 @@
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "1995-06-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1995-06-14",
                       "adjustedStartDate" : "1994-12-14",
+                      "adjustedEndDate" : "1995-06-14",
                       "meta" : {
-                        "globalKey" : "aca6a894"
+                        "globalKey" : "eba58b94"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1994-12-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78c0e75"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "97719422"
+                      "globalKey" : "d6707722"
                     }
                   }, {
                     "adjustedPaymentDate" : "1995-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1995-12-14",
                       "adjustedStartDate" : "1995-06-14",
+                      "adjustedEndDate" : "1995-12-14",
                       "meta" : {
-                        "globalKey" : "1d805d14"
+                        "globalKey" : "536c6a14"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1995-06-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78cd7f5"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "6ef1ca22"
+                      "globalKey" : "a4ddd722"
                     }
                   }, {
                     "adjustedPaymentDate" : "1996-06-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1996-06-14",
                       "adjustedStartDate" : "1995-12-14",
+                      "adjustedEndDate" : "1996-06-14",
                       "meta" : {
-                        "globalKey" : "8546a094"
+                        "globalKey" : "c4458394"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1995-12-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78d0675"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "93899422"
+                      "globalKey" : "d2887722"
                     }
                   }, {
                     "adjustedPaymentDate" : "1996-12-16",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1996-12-16",
                       "adjustedStartDate" : "1996-06-14",
+                      "adjustedEndDate" : "1996-12-16",
                       "meta" : {
-                        "globalKey" : "5feccb96"
+                        "globalKey" : "2f761352"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1996-06-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78dcff5"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "fd5f1ea6"
+                      "globalKey" : "cce86662"
                     }
                   }, {
                     "adjustedPaymentDate" : "1997-06-16",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1997-06-16",
                       "adjustedStartDate" : "1996-12-16",
+                      "adjustedEndDate" : "1997-06-16",
                       "meta" : {
-                        "globalKey" : "cb1cc054"
+                        "globalKey" : "a1ba354"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1996-12-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78dfe75"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "256099e4"
+                      "globalKey" : "645f7ce4"
                     }
                   }, {
                     "adjustedPaymentDate" : "1997-12-15",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1997-12-15",
                       "adjustedStartDate" : "1997-06-16",
+                      "adjustedEndDate" : "1997-12-15",
                       "meta" : {
-                        "globalKey" : "7103993"
+                        "globalKey" : "702da935"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1997-06-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78ec7f5"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "33b625a2"
+                      "globalKey" : "9cd39544"
                     }
                   }, {
                     "adjustedPaymentDate" : "1998-06-15",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1998-06-15",
                       "adjustedStartDate" : "1997-12-15",
+                      "adjustedEndDate" : "1998-06-15",
                       "meta" : {
-                        "globalKey" : "6d21a455"
+                        "globalKey" : "ac208755"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1997-12-11",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78ef656"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "569916e4"
+                      "globalKey" : "9597f9e4"
                     }
                   }, {
                     "adjustedPaymentDate" : "1998-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1998-12-14",
                       "adjustedStartDate" : "1998-06-15",
+                      "adjustedEndDate" : "1998-12-14",
                       "meta" : {
-                        "globalKey" : "a9151d94"
+                        "globalKey" : "12328d36"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1998-06-11",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78fbfd6"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "64eea2a2"
+                      "globalKey" : "ce0c1244"
                     }
                   }, {
                     "adjustedPaymentDate" : "1999-06-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1999-06-14",
                       "adjustedStartDate" : "1998-12-14",
+                      "adjustedEndDate" : "1999-06-14",
                       "meta" : {
-                        "globalKey" : "f268856"
+                        "globalKey" : "4e256b56"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1998-12-10",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78fee37"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "87d193e4"
+                      "globalKey" : "c6d076e4"
                     }
                   }, {
                     "adjustedPaymentDate" : "1999-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1999-12-14",
                       "adjustedStartDate" : "1999-06-14",
+                      "adjustedEndDate" : "1999-12-14",
                       "meta" : {
-                        "globalKey" : "80003cd6"
+                        "globalKey" : "b5ec49d6"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1999-06-10",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "790b7b7"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "5f51c9e4"
+                      "globalKey" : "953dd6e4"
                     }
                   } ]
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
                 "meta" : {
-                  "globalKey" : "5c6f2ada"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa45fc6"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "814e2ae6"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
-                  }
-                },
-                "resetDates" : {
-                  "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "79667919"
-                  },
-                  "fixingDates" : {
-                    "meta" : {
-                      "globalKey" : "131ae8a2"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
-                      }
-                    },
-                    "businessDayConvention" : "NONE",
-                    "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "dbde664a"
-                    }
-                  },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "dbde664a"
-                  },
-                  "resetDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "814e2ae6"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "globalKey" : "530a32a6"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : true,
                   "initialPayment" : true,
+                  "finalPayment" : true,
                   "intermediatePayment" : false,
-                  "meta" : {
-                    "globalKey" : "671cc90f"
-                  },
                   "principalPaymentSchedule" : {
-                    "finalPrincipalPayment" : {
-                      "meta" : {
-                        "globalKey" : "e72015e1"
+                    "initialPrincipalPayment" : {
+                      "principalPaymentDate" : {
+                        "adjustedDate" : {
+                          "value" : "1994-12-14",
+                          "meta" : {
+                            "globalKey" : "3e530e"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
                       },
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "principalAmount" : {
+                        "value" : 1000000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "CNH"
                           }
                         },
-                        "value" : 1000000000.00,
                         "meta" : {
                           "globalKey" : "57e62dbe"
                         }
                       },
+                      "meta" : {
+                        "globalKey" : "1653c75d"
+                      }
+                    },
+                    "finalPrincipalPayment" : {
                       "principalPaymentDate" : {
                         "adjustedDate" : {
+                          "value" : "1999-12-14",
                           "meta" : {
                             "globalKey" : "3e7b0e"
-                          },
-                          "value" : "1999-12-14"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "0"
                         }
-                      }
-                    },
-                    "initialPrincipalPayment" : {
-                      "meta" : {
-                        "globalKey" : "b4252443"
                       },
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "principalAmount" : {
+                        "value" : 1000000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "CNH"
                           }
                         },
-                        "value" : 1000000000.00,
                         "meta" : {
                           "globalKey" : "57e62dbe"
                         }
                       },
-                      "principalPaymentDate" : {
-                        "adjustedDate" : {
-                          "meta" : {
-                            "globalKey" : "3e530e"
-                          },
-                          "value" : "1994-12-14"
-                        },
-                        "meta" : {
-                          "globalKey" : "0"
-                        }
+                      "meta" : {
+                        "globalKey" : "498529ff"
                       }
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "464dd547"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "814e2ae6"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b8fa"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30E/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -680,42 +642,92 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "faa5b75e"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "814e2ae6"
+                            "globalReference" : "814e2ae6",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "93c845ff"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "93c845ff"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "814e2ae6",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "1794a"
+                    },
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "9249d1f2",
+                    "externalKey" : "fixedCalcPeriodDates"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "814e2ae6",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "85fff0af"
                   }
                 },
                 "cashflowRepresentation" : {
@@ -723,254 +735,242 @@
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "1995-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1995-12-14",
                       "adjustedStartDate" : "1994-12-14",
+                      "adjustedEndDate" : "1995-12-14",
                       "meta" : {
-                        "globalKey" : "8e0084db"
+                        "globalKey" : "1354d305"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 1000000000.00
+                      "notionalAmount" : 1000000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "6566e28d"
+                      "globalKey" : "eabb30b7"
                     }
                   }, {
                     "adjustedPaymentDate" : "1996-12-16",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1996-12-16",
                       "adjustedStartDate" : "1995-12-14",
+                      "adjustedEndDate" : "1996-12-16",
                       "meta" : {
-                        "globalKey" : "91c26d99"
+                        "globalKey" : "1715da87"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 1000000000.00
+                      "notionalAmount" : 1000000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "13577489"
+                      "globalKey" : "98aae177"
                     }
                   }, {
                     "adjustedPaymentDate" : "1997-12-15",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1997-12-15",
                       "adjustedStartDate" : "1996-12-16",
+                      "adjustedEndDate" : "1997-12-15",
                       "meta" : {
-                        "globalKey" : "958300bc"
+                        "globalKey" : "1ad7bf84"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 1000000000.00
+                      "notionalAmount" : 1000000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "bc28270d"
+                      "globalKey" : "417ce5d5"
                     }
                   }, {
                     "adjustedPaymentDate" : "1998-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1998-12-14",
                       "adjustedStartDate" : "1997-12-15",
+                      "adjustedEndDate" : "1998-12-14",
                       "meta" : {
-                        "globalKey" : "9943889c"
+                        "globalKey" : "1e984764"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 1000000000.00
+                      "notionalAmount" : 1000000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "64f8ce4e"
+                      "globalKey" : "ea4d8d16"
                     }
                   }, {
                     "adjustedPaymentDate" : "1999-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1999-12-14",
                       "adjustedStartDate" : "1998-12-14",
+                      "adjustedEndDate" : "1999-12-14",
                       "meta" : {
-                        "globalKey" : "9d0484db"
+                        "globalKey" : "2258d305"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 1000000000.00
+                      "notionalAmount" : 1000000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "f7ec28d"
+                      "globalKey" : "94d310b7"
                     }
                   } ]
                 },
-                "dayCountFraction" : {
-                  "value" : "30E/360"
-                },
                 "meta" : {
-                  "globalKey" : "45ab4415"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa46135"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "814e2ae6"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "514fe771"
                 }
               } ],
               "meta" : {
-                "globalKey" : "91593cef"
+                "globalKey" : "ca23cc17"
               }
             }
           },
           "meta" : {
-            "globalKey" : "91593cef"
+            "globalKey" : "ca23cc17"
           }
         },
         "meta" : {
-          "globalKey" : "91593cef"
+          "globalKey" : "ca23cc17"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "cf003e1f"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d08"
+          "quantity" : [ {
+            "value" : {
+              "value" : 10000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 10000000.00
+            "meta" : {
+              "globalKey" : "8280320a"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "dcefd49d"
           },
+          "meta" : {
+            "globalKey" : "a0325171"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
                   "value" : "CNH"
                 }
               },
-              "value" : 0.06,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "CNH"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 1000000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "CNH"
                 }
-              },
-              "value" : 1000000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "c10abf03"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e530c"
-      },
-      "value" : "1994-12-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "54930084UKLVMY22DS16"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "335bf1d6"
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
+        }
+      } ],
+      "name" : {
+        "value" : "Party B"
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "86067b4f"
+    }
+  },
+  "meta" : {
+    "globalKey" : "86067b4f"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-xccy-fixed-swap-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-xccy-fixed-swap-uti.json
index 0ed3545030..ea8869e399 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-xccy-fixed-swap-uti.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/ird-xccy-fixed-swap-uti.json
@@ -1,66 +1,32 @@
 {
-  "meta" : {
-    "globalKey" : "11256680"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "11256680"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "7cec034c"
-      },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "54930084UKLVMY22DS16"
-        },
-        "identifierType" : "LEI",
+    "tradeIdentifier" : [ {
+      "issuer" : {
+        "value" : "54930084UKLVMY22DS16",
         "meta" : {
-          "globalKey" : "121d7965"
+          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "490e5f44"
       },
-      "name" : {
-        "value" : "Party B"
-      },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "UITD7895394",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "48750084UKLVTR22DS78"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "de31bddc"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "3eac3060"
+      },
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2006-01-09",
+      "meta" : {
+        "globalKey" : "3eb049"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "490e5f44"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "7cec034c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -71,58 +37,51 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "notionalScheduleJPY",
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "notionalScheduleJPY"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : true,
                   "initialPayment" : true,
+                  "finalPayment" : true,
                   "intermediatePayment" : true,
                   "meta" : {
                     "globalKey" : "12a6ef"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "JPTO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "81e56a96"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "58681de7"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c86"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "11"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-01-11",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -131,20 +90,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eb7870c3"
-                      },
-                      "unadjustedDate" : "2006-01-11"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eb7870c3"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDatesJPY",
-                    "globalKey" : "30a986f2"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2011-01-11",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -157,33 +113,20 @@
                             "globalKey" : "81e56a96"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "58681de7"
                         }
                       },
                       "meta" : {
                         "globalKey" : "46e069fc"
-                      },
-                      "unadjustedDate" : "2011-01-11"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "46e069fc"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "a7e26236"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "e8a5aeec"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -196,88 +139,104 @@
                         "globalKey" : "81e56a96"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "58681de7"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "18a98"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "11"
+                  },
+                  "meta" : {
+                    "globalKey" : "a55eed20",
+                    "externalKey" : "fixedCalcPeriodDatesJPY"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "JPTO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "81e56a96"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "58681de7"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "3c51359a"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "836f0e8e"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "notionalScheduleUSD",
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "notionalScheduleUSD"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : true,
                   "initialPayment" : true,
+                  "finalPayment" : true,
                   "intermediatePayment" : true,
                   "meta" : {
                     "globalKey" : "12a6ef"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "JPTO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "81e56a96"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "58681de7"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c86"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "11"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-01-11",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -286,20 +245,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eb7870c3"
-                      },
-                      "unadjustedDate" : "2006-01-11"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eb7870c3"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDatesUSD",
-                    "globalKey" : "30a986f2"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2011-01-11",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -312,33 +268,20 @@
                             "globalKey" : "81e56a96"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "58681de7"
                         }
                       },
                       "meta" : {
                         "globalKey" : "46e069fc"
-                      },
-                      "unadjustedDate" : "2011-01-11"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "46e069fc"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "cc401858"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "e8a5aeec"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -351,161 +294,218 @@
                         "globalKey" : "81e56a96"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "58681de7"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "18a98"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "11"
+                  },
+                  "meta" : {
+                    "globalKey" : "a55eed20",
+                    "externalKey" : "fixedCalcPeriodDatesUSD"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "JPTO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "81e56a96"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "58681de7"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "3c51359a"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "a7ccc4b0"
                 }
               } ],
               "meta" : {
-                "globalKey" : "945d2b0e"
+                "globalKey" : "6885e5be"
               }
             }
           },
           "meta" : {
-            "globalKey" : "945d2b0e"
+            "globalKey" : "6885e5be"
           }
         },
         "meta" : {
-          "globalKey" : "945d2b0e"
+          "globalKey" : "6885e5be"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "d2aa436"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.001,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "value" : 0.001,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 1000000000,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
-              },
-              "value" : 1000000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "b47bfa5e"
-          },
-          "price" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "9829e28a"
+          }
+        }, {
+          "price" : [ {
             "value" : {
+              "value" : 0.02,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.02,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-2"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "db035162"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4caf4c44",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "349a498c",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb049"
-      },
-      "value" : "2006-01-09"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "54930084UKLVMY22DS16",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/uti"
-          },
-          "value" : "UITD7895394"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "121d7965"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-        },
-        "value" : "54930084UKLVMY22DS16"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "335bf1d6"
+        "globalKey" : "349a498c",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "48750084UKLVTR22DS78",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "de31bddc"
+        }
+      } ],
+      "name" : {
+        "value" : "Party B"
       },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+      "meta" : {
+        "globalKey" : "4caf4c44",
+        "externalKey" : "party2"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "b7ed31de"
+    }
+  },
+  "meta" : {
+    "globalKey" : "b7ed31de"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/swap-with-other-party-payment.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/swap-with-other-party-payment.json
index ac650b1ca8..df0b1eea8c 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/swap-with-other-party-payment.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/swap-with-other-party-payment.json
@@ -1,87 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "4613f0dd"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "895575ec"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "a82d45fc"
-      },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "PARTYAUS33"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "3d5ebc15"
-        }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "ca05a501"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "ca05a501",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "SW2000",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "BARCGB2L"
+            "scheme" : "http://www.barclays.com/swaps/trade-id"
+          }
         },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "ca05a501"
-        }
-      } ]
-    }, {
+        "version" : 1
+      } ],
       "meta" : {
-        "externalKey" : "party3",
-        "globalKey" : "7ade9dd5"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
-          },
-          "value" : "Broker"
-        },
-        "identifierType" : "BIC",
-        "meta" : {
-          "globalKey" : "7ade9dd5"
-        }
-      } ]
-    } ],
-    "partyRole" : [ {
-      "partyReference" : {
-        "externalReference" : "party3",
-        "globalReference" : "7ade9dd5"
-      },
-      "role" : "ARRANGING_BROKER"
+        "globalKey" : "ac670cef"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "1994-12-12",
+      "meta" : {
+        "globalKey" : "3e530c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "a82d45fc"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ca05a501"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -92,46 +35,40 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c89"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -140,103 +77,108 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "3e2554c0"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "DEFR"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "1ff50d"
+                            "globalKey" : "1ff50d",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365af8de"
                         }
                       },
                       "meta" : {
                         "globalKey" : "a8d53690"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "a8d53690"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "97763931"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa45fc6"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "18a9b"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "a26405d2",
+                    "externalKey" : "floatingCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "7a04f180"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "3e2554c0"
+                    "globalReference" : "a26405d2",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "131ae8a2"
+                      "globalKey" : "eff6d356"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -245,82 +187,79 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "dbde664a"
+                      "globalReference" : "a5aeeeb8",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "dbde664a"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "a5aeeeb8",
+                    "externalKey" : "resetDates"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "2e03d8ab"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b8fa"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30E/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -329,269 +268,330 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "faa5b75e"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "1ff50d"
+                            "globalReference" : "1ff50d",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "93c845ff"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "93c845ff"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30E/360"
-                },
-                "meta" : {
-                  "globalKey" : "f8158737"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa46135"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "1794a"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "9249d1f2",
+                    "externalKey" : "fixedCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "85fff0af"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "9c789d4b"
                 }
               } ],
               "meta" : {
-                "globalKey" : "4f3ab328"
+                "globalKey" : "eee37036"
               }
             }
           },
           "meta" : {
-            "globalKey" : "4f3ab328"
+            "globalKey" : "eee37036"
           }
         },
         "meta" : {
-          "globalKey" : "4f3ab328"
+          "globalKey" : "eee37036"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3ce21b9b"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "53c66a4c"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-LIBOR-BBA"
-                },
-                "indexTenor" : {
+          "quantity" : [ {
+            "value" : {
+              "value" : 50000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR",
                   "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                  }
                 }
               }
-            }
-          },
-          "quantity" : [ {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                    "globalKey" : "107"
+                  }
                 }
               },
-              "value" : 50000000.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2505dd46"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "4882fcbc"
           },
+          "meta" : {
+            "globalKey" : "c0d07bed"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "value" : 0.06,
               "perUnitOf" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000.00,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
-              },
-              "value" : 50000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "c7dc9ac4"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "9495a03c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "ca05a501",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e530c"
-      },
-      "value" : "1994-12-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "PARTYAUS33",
           "meta" : {
-            "scheme" : "http://www.barclays.com/swaps/trade-id"
-          },
-          "value" : "SW2000"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
         },
-        "version" : 1
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "3d5ebc15"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "ca05a501"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "c506462f"
+        "globalKey" : "9495a03c",
+        "externalKey" : "party1"
       }
-    } ]
-  },
-  "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "a7297c49"
-    },
-    "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "a82d45fc"
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "BARCGB2L",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
         },
-        "receiverPartyReference" : {
-          "externalReference" : "party3",
-          "globalReference" : "7ade9dd5"
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "ca05a501"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "ca05a501",
+        "externalKey" : "party2"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Broker",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso9362"
+          }
+        },
+        "identifierType" : "BIC",
+        "meta" : {
+          "globalKey" : "7ade9dd5"
         }
+      } ],
+      "meta" : {
+        "globalKey" : "7ade9dd5",
+        "externalKey" : "party3"
+      }
+    } ],
+    "partyRole" : [ {
+      "partyReference" : {
+        "globalReference" : "7ade9dd5",
+        "externalReference" : "party3"
       },
+      "role" : "ArrangingBroker"
+    } ],
+    "meta" : {
+      "globalKey" : "62a79e0"
+    }
+  },
+  "transferHistory" : [ {
+    "transfer" : {
       "quantity" : {
+        "value" : 2500.40,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "9495a03c",
+          "externalReference" : "party1"
         },
-        "value" : 2500.40
+        "receiverPartyReference" : {
+          "globalReference" : "7ade9dd5",
+          "externalReference" : "party3"
+        }
       },
       "settlementDate" : {
         "adjustedDate" : {
+          "value" : "1994-12-14",
           "meta" : {
             "globalKey" : "3e530e"
-          },
-          "value" : "1994-12-14"
+          }
         }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "ebec4333"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "de02cd53"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex01-repo-fixed-rate.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex01-repo-fixed-rate.json
index 35d1876ecd..7811e963b8 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex01-repo-fixed-rate.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex01-repo-fixed-rate.json
@@ -1,77 +1,83 @@
 {
-  "meta" : {
-    "globalKey" : "328d385a"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "328d385a"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59557"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59557",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party19235",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 1"
-        },
-        "meta" : {
-          "globalKey" : "33f59557"
+            "scheme" : "http://www.party1.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59558"
+        "globalKey" : "9dae69db"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59558",
+        "externalReference" : "Party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party22000",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 2"
-        },
-        "meta" : {
-          "globalKey" : "33f59558"
+            "scheme" : "http://www.party2.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9db9bf3e"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2013-10-29",
+      "meta" : {
+        "globalKey" : "3eea9d"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59557"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59558"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-10-29",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -80,18 +86,15 @@
                       },
                       "meta" : {
                         "globalKey" : "ec535e95"
-                      },
-                      "unadjustedDate" : "2013-10-29"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec535e95"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "21ad6787"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-11-04",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -100,72 +103,29 @@
                       },
                       "meta" : {
                         "globalKey" : "ec53f0fc"
-                      },
-                      "unadjustedDate" : "2013-11-04"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec53f0fc"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "21ad6787"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
                 "meta" : {
-                  "globalKey" : "965f0f1f"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "c84f9bcd"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "62a30c68"
-              },
               "securityPayout" : [ {
-                "initialMargin" : {
-                  "margin" : [ {
-                    "haircut" : -0.04762
-                  } ],
-                  "marginType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "5edb1da7"
-                },
-                "repoDuration" : "TERM",
                 "securityLeg" : [ {
                   "buyerSeller" : {
-                    "buyer" : "PARTY_1",
-                    "seller" : "PARTY_2"
-                  },
-                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                  "meta" : {
-                    "globalKey" : "24119d6"
-                  },
-                  "settlementAmount" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 1292748.30,
-                    "meta" : {
-                      "globalKey" : "59b83060"
-                    }
+                    "buyer" : "Party1",
+                    "seller" : "Party2"
                   },
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-10-29",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -174,36 +134,35 @@
                       },
                       "meta" : {
                         "globalKey" : "ec535e95"
-                      },
-                      "unadjustedDate" : "2013-10-29"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec535e95"
                     }
-                  }
-                }, {
-                  "buyerSeller" : {
-                    "buyer" : "PARTY_2",
-                    "seller" : "PARTY_1"
-                  },
-                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                  "meta" : {
-                    "externalKey" : "forwardLeg",
-                    "globalKey" : "5c3ebcc4"
                   },
                   "settlementAmount" : {
+                    "value" : 1292748.30,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 1292586.71,
                     "meta" : {
-                      "globalKey" : "eaa544d7"
+                      "globalKey" : "59b83060"
                     }
                   },
+                  "deliveryMethod" : "DeliveryVersusPayment",
+                  "meta" : {
+                    "globalKey" : "1f48568c"
+                  }
+                }, {
+                  "buyerSeller" : {
+                    "buyer" : "Party2",
+                    "seller" : "Party1"
+                  },
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-11-04",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -212,34 +171,56 @@
                       },
                       "meta" : {
                         "globalKey" : "ec53f0fc"
-                      },
-                      "unadjustedDate" : "2013-11-04"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec53f0fc"
                     }
+                  },
+                  "settlementAmount" : {
+                    "value" : 1292586.71,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "eaa544d7"
+                    }
+                  },
+                  "deliveryMethod" : "DeliveryVersusPayment",
+                  "meta" : {
+                    "globalKey" : "f650339a",
+                    "externalKey" : "forwardLeg"
                   }
                 } ],
+                "initialMargin" : {
+                  "marginType" : "Cash",
+                  "margin" : [ {
+                    "haircut" : -0.04762
+                  } ]
+                },
+                "repoDuration" : "Term",
                 "securityValuation" : [ {
                   "securityValuationModel" : {
                     "bondValuationModel" : {
-                      "bondPriceAndYieldModel" : {
-                        "cleanOrDirtyPrice" : {
-                          "cleanPrice" : {
-                            "cleanPrice" : 112.334750
-                          }
-                        }
-                      },
                       "nominalAmount" : {
+                        "value" : 1096000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1096000,
                         "meta" : {
                           "globalKey" : "2d3b15b2"
                         }
+                      },
+                      "bondPriceAndYieldModel" : {
+                        "cleanOrDirtyPrice" : {
+                          "cleanPrice" : {
+                            "cleanPrice" : 112.334750
+                          }
+                        }
                       }
                     }
                   },
@@ -251,127 +232,146 @@
                       }
                     } ]
                   }
-                } ]
-              } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "d56c1f6f"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "8d6beb42"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "62a30c68"
+            "globalKey" : "8d6beb42"
           }
         },
         "meta" : {
-          "globalKey" : "62a30c68"
+          "globalKey" : "8d6beb42"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "2055a57c"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "8145c30a"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "XS"
-                },
-                "meta" : {
-                  "globalKey" : "8145c30a"
-                },
-                "source" : "ISIN"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : -0.75,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : -0.75,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 1292748.30,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "XS",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
+                  }
+                },
+                "source" : "ISIN",
+                "meta" : {
+                  "globalKey" : "8145c30a"
+                }
               },
-              "value" : 1292748.30
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "a7729e36"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "cd865d28"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59557",
+          "externalReference" : "Party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59558",
+          "externalReference" : "Party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eea9d"
-      },
-      "value" : "2013-10-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 1",
           "meta" : {
-            "scheme" : "http://www.party1.com/swaps/trade-id"
-          },
-          "value" : "Party19235"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59557"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59557"
-      },
       "meta" : {
-        "globalKey" : "f58e9891"
+        "globalKey" : "33f59557",
+        "externalKey" : "Party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 2",
           "meta" : {
-            "scheme" : "http://www.party2.com/swaps/trade-id"
-          },
-          "value" : "Party22000"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59558"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party2",
-        "globalReference" : "33f59558"
-      },
       "meta" : {
-        "globalKey" : "1e654896"
+        "globalKey" : "33f59558",
+        "externalKey" : "Party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "2ceb9d06"
+    }
+  },
+  "meta" : {
+    "globalKey" : "2ceb9d06"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex02-repo-open-fixed-rate.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex02-repo-open-fixed-rate.json
index 7c89991515..1145a1c46e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex02-repo-open-fixed-rate.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex02-repo-open-fixed-rate.json
@@ -1,77 +1,83 @@
 {
-  "meta" : {
-    "globalKey" : "4bc64acc"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "4bc64acc"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59557"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59557",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party19235",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 1"
-        },
-        "meta" : {
-          "globalKey" : "33f59557"
+            "scheme" : "http://www.party1.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59558"
+        "globalKey" : "9dae69db"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59558",
+        "externalReference" : "Party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party22000",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 2"
-        },
-        "meta" : {
-          "globalKey" : "33f59558"
+            "scheme" : "http://www.party2.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9db9bf3e"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-11-19",
+      "meta" : {
+        "globalKey" : "3ef2d3"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59557"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59558"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/ACT.ICMA"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2014-11-03",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -80,8 +86,7 @@
                       },
                       "meta" : {
                         "globalKey" : "ec71f53b"
-                      },
-                      "unadjustedDate" : "2014-11-03"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec71f53b"
@@ -91,63 +96,19 @@
                     "globalKey" : "ec71f53b"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/ACT.ICMA"
-                },
                 "meta" : {
-                  "globalKey" : "327d9d9d"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "ff080c43"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "8b7c4fd4"
-              },
               "securityPayout" : [ {
-                "initialMargin" : {
-                  "margin" : [ {
-                    "marginRatio" : 1.25
-                  } ],
-                  "marginType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "66c17a91"
-                },
                 "securityLeg" : [ {
                   "buyerSeller" : {
-                    "buyer" : "PARTY_1",
-                    "seller" : "PARTY_2"
-                  },
-                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                  "meta" : {
-                    "globalKey" : "36407c5d"
-                  },
-                  "settlementAmount" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 782855.55,
-                    "meta" : {
-                      "globalKey" : "254dbbdf"
-                    }
+                    "buyer" : "Party1",
+                    "seller" : "Party2"
                   },
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2014-11-03",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -156,36 +117,56 @@
                       },
                       "meta" : {
                         "globalKey" : "ec71f53b"
-                      },
-                      "unadjustedDate" : "2014-11-03"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec71f53b"
                     }
+                  },
+                  "settlementAmount" : {
+                    "value" : 782855.55,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "254dbbdf"
+                    }
+                  },
+                  "deliveryMethod" : "DeliveryVersusPayment",
+                  "meta" : {
+                    "globalKey" : "5fb18325"
                   }
                 } ],
+                "initialMargin" : {
+                  "marginType" : "Cash",
+                  "margin" : [ {
+                    "marginRatio" : 1.25
+                  } ]
+                },
                 "securityValuation" : [ {
                   "securityValuationModel" : {
                     "bondValuationModel" : {
-                      "bondPriceAndYieldModel" : {
-                        "cleanOrDirtyPrice" : {
-                          "cleanPrice" : {
-                            "accruals" : 9.250000,
-                            "cleanPrice" : 97.8569437
-                          },
-                          "dirtyPrice" : 107.1069437
-                        }
-                      },
                       "nominalAmount" : {
+                        "value" : 1000000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
+                      },
+                      "bondPriceAndYieldModel" : {
+                        "cleanOrDirtyPrice" : {
+                          "cleanPrice" : {
+                            "cleanPrice" : 97.8569437,
+                            "accruals" : 9.250000
+                          },
+                          "dirtyPrice" : 107.1069437
+                        }
                       }
                     }
                   },
@@ -197,132 +178,151 @@
                       }
                     } ]
                   }
-                } ]
-              } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "d92c1543"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "a0544a20"
+              }
             },
             "terminationProvision" : {
               "cancelableProvision" : {
-                "callingParty" : "AS_DEFINED_IN_MASTER_AGREEMENT"
+                "callingParty" : "AsDefinedInMasterAgreement"
               }
             }
           },
           "meta" : {
-            "globalKey" : "d76c0df0"
+            "globalKey" : "70fc6024"
           }
         },
         "meta" : {
-          "globalKey" : "d76c0df0"
+          "globalKey" : "70fc6024"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "291ea776"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "99578ad3"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "JKL Corp Bond"
-                },
-                "meta" : {
-                  "globalKey" : "99578ad3"
-                },
-                "source" : "ISIN"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.85,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.85,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 782855.55,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "JKL Corp Bond",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
+                  }
+                },
+                "source" : "ISIN",
+                "meta" : {
+                  "globalKey" : "99578ad3"
+                }
               },
-              "value" : 782855.55
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "9199cf8d"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "bd3cc7f0"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59557",
+          "externalReference" : "Party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59558",
+          "externalReference" : "Party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef2d3"
-      },
-      "value" : "2014-11-19"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 1",
           "meta" : {
-            "scheme" : "http://www.party1.com/swaps/trade-id"
-          },
-          "value" : "Party19235"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59557"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59557"
-      },
       "meta" : {
-        "globalKey" : "f58e9891"
+        "globalKey" : "33f59557",
+        "externalKey" : "Party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 2",
           "meta" : {
-            "scheme" : "http://www.party2.com/swaps/trade-id"
-          },
-          "value" : "Party22000"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59558"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party2",
-        "globalReference" : "33f59558"
-      },
       "meta" : {
-        "globalKey" : "1e654896"
+        "globalKey" : "33f59558",
+        "externalKey" : "Party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "6266e3ac"
+    }
+  },
+  "meta" : {
+    "globalKey" : "6266e3ac"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex03-repo-fixed-rate.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex03-repo-fixed-rate.json
index a893086332..4ee26819b9 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex03-repo-fixed-rate.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex03-repo-fixed-rate.json
@@ -1,77 +1,83 @@
 {
-  "meta" : {
-    "globalKey" : "cdd17441"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "cdd17441"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59557"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59557",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party19235",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 1"
-        },
-        "meta" : {
-          "globalKey" : "33f59557"
+            "scheme" : "http://www.party1.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59558"
+        "globalKey" : "9dae69db"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59558",
+        "externalReference" : "Party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party22000",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 2"
-        },
-        "meta" : {
-          "globalKey" : "33f59558"
+            "scheme" : "http://www.party2.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9db9bf3e"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2013-11-03",
+      "meta" : {
+        "globalKey" : "3eeac3"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59557"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59558"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-11-03",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -80,18 +86,15 @@
                       },
                       "meta" : {
                         "globalKey" : "ec53ed3b"
-                      },
-                      "unadjustedDate" : "2013-11-03"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec53ed3b"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "8d1a2727"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-11-10",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -100,72 +103,29 @@
                       },
                       "meta" : {
                         "globalKey" : "ec540782"
-                      },
-                      "unadjustedDate" : "2013-11-10"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec540782"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "8d1a2727"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
                 "meta" : {
-                  "globalKey" : "6d19137f"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "33bc5b6d"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "a6d9d6b3"
-              },
               "securityPayout" : [ {
-                "initialMargin" : {
-                  "margin" : [ {
-                    "marginRatio" : 1.176471
-                  } ],
-                  "marginType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "e5110974"
-                },
-                "repoDuration" : "TERM",
                 "securityLeg" : [ {
                   "buyerSeller" : {
-                    "buyer" : "PARTY_1",
-                    "seller" : "PARTY_2"
-                  },
-                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                  "meta" : {
-                    "globalKey" : "9e927c8e"
-                  },
-                  "settlementAmount" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 8336850.21,
-                    "meta" : {
-                      "globalKey" : "1333990e"
-                    }
+                    "buyer" : "Party1",
+                    "seller" : "Party2"
                   },
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-11-03",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -174,26 +134,35 @@
                       },
                       "meta" : {
                         "globalKey" : "ec53ed3b"
-                      },
-                      "unadjustedDate" : "2013-11-03"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec53ed3b"
                     }
+                  },
+                  "settlementAmount" : {
+                    "value" : 8336850.21,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "1333990e"
+                    }
+                  },
+                  "deliveryMethod" : "DeliveryVersusPayment",
+                  "meta" : {
+                    "globalKey" : "44306854"
                   }
                 }, {
                   "buyerSeller" : {
-                    "buyer" : "PARTY_2",
-                    "seller" : "PARTY_1"
-                  },
-                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                  "meta" : {
-                    "externalKey" : "forwardLeg",
-                    "globalKey" : "88139509"
+                    "buyer" : "Party2",
+                    "seller" : "Party1"
                   },
-                  "settlementCurrency" : "USD",
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-11-10",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -202,35 +171,47 @@
                       },
                       "meta" : {
                         "globalKey" : "ec540782"
-                      },
-                      "unadjustedDate" : "2013-11-10"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec540782"
                     }
+                  },
+                  "settlementCurrency" : "USD",
+                  "deliveryMethod" : "DeliveryVersusPayment",
+                  "meta" : {
+                    "globalKey" : "f5b9a33d",
+                    "externalKey" : "forwardLeg"
                   }
                 } ],
+                "initialMargin" : {
+                  "marginType" : "Cash",
+                  "margin" : [ {
+                    "marginRatio" : 1.176471
+                  } ]
+                },
+                "repoDuration" : "Term",
                 "securityValuation" : [ {
                   "securityValuationModel" : {
                     "bondValuationModel" : {
-                      "bondPriceAndYieldModel" : {
-                        "cleanOrDirtyPrice" : {
-                          "cleanPrice" : {
-                            "accruals" : 5.375000,
-                            "cleanPrice" : 108.9784722
-                          }
-                        }
-                      },
                       "nominalAmount" : {
+                        "value" : 9000000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 9000000,
                         "meta" : {
                           "globalKey" : "eb36a74d"
                         }
+                      },
+                      "bondPriceAndYieldModel" : {
+                        "cleanOrDirtyPrice" : {
+                          "cleanPrice" : {
+                            "cleanPrice" : 108.9784722,
+                            "accruals" : 5.375000
+                          }
+                        }
                       }
                     }
                   },
@@ -242,127 +223,146 @@
                       }
                     } ]
                   }
-                } ]
-              } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "43b204a8"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "bf096955"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "a6d9d6b3"
+            "globalKey" : "bf096955"
           }
         },
         "meta" : {
-          "globalKey" : "a6d9d6b3"
+          "globalKey" : "bf096955"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a318f3b0"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "8146ea9f"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "OPQ"
-                },
-                "meta" : {
-                  "globalKey" : "8146ea9f"
-                },
-                "source" : "ISIN"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.80,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.80,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 8336850.21,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "OPQ",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
+                  }
+                },
+                "source" : "ISIN",
+                "meta" : {
+                  "globalKey" : "8146ea9f"
+                }
               },
-              "value" : 8336850.21
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "a7966941"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "ea8db12"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59557",
+          "externalReference" : "Party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59558",
+          "externalReference" : "Party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eeac3"
-      },
-      "value" : "2013-11-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 1",
           "meta" : {
-            "scheme" : "http://www.party1.com/swaps/trade-id"
-          },
-          "value" : "Party19235"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59557"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59557"
-      },
       "meta" : {
-        "globalKey" : "f58e9891"
+        "globalKey" : "33f59557",
+        "externalKey" : "Party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 2",
           "meta" : {
-            "scheme" : "http://www.party2.com/swaps/trade-id"
-          },
-          "value" : "Party22000"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59558"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party2",
-        "globalReference" : "33f59558"
-      },
       "meta" : {
-        "globalKey" : "1e654896"
+        "globalKey" : "33f59558",
+        "externalKey" : "Party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "f3c39e63"
+    }
+  },
+  "meta" : {
+    "globalKey" : "f3c39e63"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex04-repo-floating-rate.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex04-repo-floating-rate.json
index 6d515b27cf..050937bccb 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex04-repo-floating-rate.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex04-repo-floating-rate.json
@@ -1,77 +1,89 @@
 {
-  "meta" : {
-    "globalKey" : "61eb0d"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "61eb0d"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59557"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59557",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party19235",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 1"
-        },
-        "meta" : {
-          "globalKey" : "33f59557"
+            "scheme" : "http://www.party1.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59558"
+        "globalKey" : "9dae69db"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59558",
+        "externalReference" : "Party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party22000",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 2"
-        },
-        "meta" : {
-          "globalKey" : "33f59558"
+            "scheme" : "http://www.party2.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9db9bf3e"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-11-19",
+      "meta" : {
+        "globalKey" : "3ef2d3"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59557"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59558"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2012-11-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -80,18 +92,15 @@
                       },
                       "meta" : {
                         "globalKey" : "ec363f53"
-                      },
-                      "unadjustedDate" : "2012-11-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec363f53"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "40c731a0"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-02-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -100,78 +109,29 @@
                       },
                       "meta" : {
                         "globalKey" : "ec4bd513"
-                      },
-                      "unadjustedDate" : "2013-02-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec4bd513"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "40c731a0"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
                 "meta" : {
-                  "globalKey" : "b80e3d80"
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "62b17cc0"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "62410f3a"
-              },
               "securityPayout" : [ {
-                "initialMargin" : {
-                  "margin" : [ {
-                    "marginRatio" : 1.2152
-                  } ],
-                  "marginType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "687911ba"
-                },
-                "repoDuration" : "TERM",
                 "securityLeg" : [ {
                   "buyerSeller" : {
-                    "buyer" : "PARTY_1",
-                    "seller" : "PARTY_2"
-                  },
-                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                  "meta" : {
-                    "globalKey" : "de62bc82"
-                  },
-                  "settlementAmount" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 4000000,
-                    "meta" : {
-                      "globalKey" : "25c771b2"
-                    }
+                    "buyer" : "Party1",
+                    "seller" : "Party2"
                   },
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2012-11-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -180,26 +140,35 @@
                       },
                       "meta" : {
                         "globalKey" : "ec363f53"
-                      },
-                      "unadjustedDate" : "2012-11-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec363f53"
                     }
+                  },
+                  "settlementAmount" : {
+                    "value" : 4000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "25c771b2"
+                    }
+                  },
+                  "deliveryMethod" : "DeliveryVersusPayment",
+                  "meta" : {
+                    "globalKey" : "a797de0"
                   }
                 }, {
                   "buyerSeller" : {
-                    "buyer" : "PARTY_2",
-                    "seller" : "PARTY_1"
-                  },
-                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                  "meta" : {
-                    "externalKey" : "forwardLeg",
-                    "globalKey" : "880b629a"
+                    "buyer" : "Party2",
+                    "seller" : "Party1"
                   },
-                  "settlementCurrency" : "USD",
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-02-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -208,32 +177,44 @@
                       },
                       "meta" : {
                         "globalKey" : "ec4bd513"
-                      },
-                      "unadjustedDate" : "2013-02-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec4bd513"
                     }
+                  },
+                  "settlementCurrency" : "USD",
+                  "deliveryMethod" : "DeliveryVersusPayment",
+                  "meta" : {
+                    "globalKey" : "f5b170ce",
+                    "externalKey" : "forwardLeg"
                   }
                 } ],
+                "initialMargin" : {
+                  "marginType" : "Cash",
+                  "margin" : [ {
+                    "marginRatio" : 1.2152
+                  } ]
+                },
+                "repoDuration" : "Term",
                 "securityValuation" : [ {
                   "securityValuationModel" : {
                     "bondValuationModel" : {
-                      "bondPriceAndYieldModel" : {
-                        "cleanOrDirtyPrice" : {
-                          "dirtyPrice" : 1.00886
-                        }
-                      },
                       "nominalAmount" : {
+                        "value" : 150000000,
                         "unit" : {
                           "currency" : {
                             "value" : "RUB"
                           }
                         },
-                        "value" : 150000000,
                         "meta" : {
                           "globalKey" : "a0fb4b53"
                         }
+                      },
+                      "bondPriceAndYieldModel" : {
+                        "cleanOrDirtyPrice" : {
+                          "dirtyPrice" : 1.00886
+                        }
                       }
                     }
                   },
@@ -245,148 +226,167 @@
                       }
                     } ]
                   }
-                } ]
-              } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "629f2300"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "16987fc0"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "62410f3a"
+            "globalKey" : "16987fc0"
           }
         },
         "meta" : {
-          "globalKey" : "62410f3a"
+          "globalKey" : "16987fc0"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "b870fd8d"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "7587ac42"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "KLM"
-                },
-                "meta" : {
-                  "globalKey" : "8146db1b"
-                },
-                "source" : "ISIN"
-              }
-            } ],
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-LIBOR-BBA-Bloomberg"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 1
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0050,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0050,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 4000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA-Bloomberg"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 1,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "KLM",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
+                  }
+                },
+                "source" : "ISIN",
+                "meta" : {
+                  "globalKey" : "8146db1b"
                 }
               },
-              "value" : 4000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "83bf2026"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "4eb0cb0d"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59557",
+          "externalReference" : "Party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59558",
+          "externalReference" : "Party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef2d3"
-      },
-      "value" : "2014-11-19"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 1",
           "meta" : {
-            "scheme" : "http://www.party1.com/swaps/trade-id"
-          },
-          "value" : "Party19235"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59557"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59557"
-      },
       "meta" : {
-        "globalKey" : "f58e9891"
+        "globalKey" : "33f59557",
+        "externalKey" : "Party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 2",
           "meta" : {
-            "scheme" : "http://www.party2.com/swaps/trade-id"
-          },
-          "value" : "Party22000"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59558"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party2",
-        "globalReference" : "33f59558"
-      },
       "meta" : {
-        "globalKey" : "1e654896"
+        "globalKey" : "33f59558",
+        "externalKey" : "Party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "6ec7aaad"
+    }
+  },
+  "meta" : {
+    "globalKey" : "6ec7aaad"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex05-repo-fixed-rate.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex05-repo-fixed-rate.json
index c5c5aa3750..1127ba96cf 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex05-repo-fixed-rate.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex05-repo-fixed-rate.json
@@ -1,77 +1,83 @@
 {
-  "meta" : {
-    "globalKey" : "54a08f12"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "54a08f12"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59557"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59557",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party19235",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 1"
-        },
-        "meta" : {
-          "globalKey" : "33f59557"
+            "scheme" : "http://www.party1.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59558"
+        "globalKey" : "9dae69db"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59558",
+        "externalReference" : "Party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party22000",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 2"
-        },
-        "meta" : {
-          "globalKey" : "33f59558"
+            "scheme" : "http://www.party2.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9db9bf3e"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-11-20",
+      "meta" : {
+        "globalKey" : "3ef2d4"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59557"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59558"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/ACT.ICMA"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2014-11-20",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -80,18 +86,15 @@
                       },
                       "meta" : {
                         "globalKey" : "ec72350c"
-                      },
-                      "unadjustedDate" : "2014-11-20"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec72350c"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "7c9361c7"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2014-11-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -100,72 +103,29 @@
                       },
                       "meta" : {
                         "globalKey" : "ec724f53"
-                      },
-                      "unadjustedDate" : "2014-11-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec724f53"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "7c9361c7"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/ACT.ICMA"
-                },
                 "meta" : {
-                  "globalKey" : "c9462891"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "e4da6fbf"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "3a28302f"
-              },
               "securityPayout" : [ {
-                "initialMargin" : {
-                  "margin" : [ {
-                    "haircut" : 0.12
-                  } ],
-                  "marginType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "13a240a0"
-                },
-                "repoDuration" : "TERM",
                 "securityLeg" : [ {
                   "buyerSeller" : {
-                    "buyer" : "PARTY_1",
-                    "seller" : "PARTY_2"
-                  },
-                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                  "meta" : {
-                    "globalKey" : "44c32960"
-                  },
-                  "settlementAmount" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "RUB"
-                      }
-                    },
-                    "value" : 444176424.53,
-                    "meta" : {
-                      "globalKey" : "a04576d"
-                    }
+                    "buyer" : "Party1",
+                    "seller" : "Party2"
                   },
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2014-11-20",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -174,36 +134,35 @@
                       },
                       "meta" : {
                         "globalKey" : "ec72350c"
-                      },
-                      "unadjustedDate" : "2014-11-20"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec72350c"
                     }
-                  }
-                }, {
-                  "buyerSeller" : {
-                    "buyer" : "PARTY_2",
-                    "seller" : "PARTY_1"
-                  },
-                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                  "meta" : {
-                    "externalKey" : "forwardLeg",
-                    "globalKey" : "70366d4b"
                   },
                   "settlementAmount" : {
+                    "value" : 444176424.53,
                     "unit" : {
                       "currency" : {
                         "value" : "RUB"
                       }
                     },
-                    "value" : 445117713.45,
                     "meta" : {
-                      "globalKey" : "8f6d54a7"
+                      "globalKey" : "a04576d"
                     }
                   },
+                  "deliveryMethod" : "DeliveryVersusPayment",
+                  "meta" : {
+                    "globalKey" : "2a5c1982"
+                  }
+                }, {
+                  "buyerSeller" : {
+                    "buyer" : "Party2",
+                    "seller" : "Party1"
+                  },
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2014-11-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -212,34 +171,56 @@
                       },
                       "meta" : {
                         "globalKey" : "ec724f53"
-                      },
-                      "unadjustedDate" : "2014-11-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec724f53"
                     }
+                  },
+                  "settlementAmount" : {
+                    "value" : 445117713.45,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "RUB"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "8f6d54a7"
+                    }
+                  },
+                  "deliveryMethod" : "DeliveryVersusPayment",
+                  "meta" : {
+                    "globalKey" : "f9ba4373",
+                    "externalKey" : "forwardLeg"
                   }
                 } ],
+                "initialMargin" : {
+                  "marginType" : "Cash",
+                  "margin" : [ {
+                    "haircut" : 0.12
+                  } ]
+                },
+                "repoDuration" : "Term",
                 "securityValuation" : [ {
                   "securityValuationModel" : {
                     "bondValuationModel" : {
-                      "bondPriceAndYieldModel" : {
-                        "cleanOrDirtyPrice" : {
-                          "cleanPrice" : {
-                            "cleanPrice" : 97.22
-                          }
-                        }
-                      },
                       "nominalAmount" : {
+                        "value" : 10500000,
                         "unit" : {
                           "currency" : {
                             "value" : "CHF"
                           }
                         },
-                        "value" : 10500000,
                         "meta" : {
                           "globalKey" : "b9bdca47"
                         }
+                      },
+                      "bondPriceAndYieldModel" : {
+                        "cleanOrDirtyPrice" : {
+                          "cleanPrice" : {
+                            "cleanPrice" : 97.22
+                          }
+                        }
                       }
                     }
                   },
@@ -251,127 +232,146 @@
                       }
                     } ]
                   }
-                } ]
-              } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "90788876"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "7f78ea97"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "3a28302f"
+            "globalKey" : "7f78ea97"
           }
         },
         "meta" : {
-          "globalKey" : "3a28302f"
+          "globalKey" : "7f78ea97"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "6591985b"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "8145c074"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "CH"
-                },
-                "meta" : {
-                  "globalKey" : "8145c074"
-                },
-                "source" : "ISIN"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.1105,
               "unit" : {
                 "currency" : {
                   "value" : "RUB"
                 }
               },
-              "value" : 0.1105,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "RUB"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 444176424.53,
               "unit" : {
                 "currency" : {
                   "value" : "RUB"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "CH",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
+                  }
+                },
+                "source" : "ISIN",
+                "meta" : {
+                  "globalKey" : "8145c074"
+                }
               },
-              "value" : 444176424.53
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "a7724e0c"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "b7ee03f3"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59557",
+          "externalReference" : "Party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59558",
+          "externalReference" : "Party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef2d4"
-      },
-      "value" : "2014-11-20"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 1",
           "meta" : {
-            "scheme" : "http://www.party1.com/swaps/trade-id"
-          },
-          "value" : "Party19235"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59557"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59557"
-      },
       "meta" : {
-        "globalKey" : "f58e9891"
+        "globalKey" : "33f59557",
+        "externalKey" : "Party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 2",
           "meta" : {
-            "scheme" : "http://www.party2.com/swaps/trade-id"
-          },
-          "value" : "Party22000"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59558"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party2",
-        "globalReference" : "33f59558"
-      },
       "meta" : {
-        "globalKey" : "1e654896"
+        "globalKey" : "33f59558",
+        "externalKey" : "Party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "79e2eb5c"
+    }
+  },
+  "meta" : {
+    "globalKey" : "79e2eb5c"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex06-repo-fixed-rate.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex06-repo-fixed-rate.json
index 7ad8d4b13e..686b710077 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex06-repo-fixed-rate.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/repo/repo-ex06-repo-fixed-rate.json
@@ -1,77 +1,83 @@
 {
-  "meta" : {
-    "globalKey" : "faf869c4"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "faf869c4"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59557"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59557",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party19235",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 1"
-        },
-        "meta" : {
-          "globalKey" : "33f59557"
+            "scheme" : "http://www.party1.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59558"
+        "globalKey" : "9dae69db"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59558",
+        "externalReference" : "Party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party22000",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 2"
-        },
-        "meta" : {
-          "globalKey" : "33f59558"
+            "scheme" : "http://www.party2.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9db9bf3e"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-11-19",
+      "meta" : {
+        "globalKey" : "3ef2d3"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59557"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59558"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2014-11-19",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -80,18 +86,15 @@
                       },
                       "meta" : {
                         "globalKey" : "ec72314b"
-                      },
-                      "unadjustedDate" : "2014-11-19"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec72314b"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "14b23127"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2014-11-26",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -100,72 +103,29 @@
                       },
                       "meta" : {
                         "globalKey" : "ec724b92"
-                      },
-                      "unadjustedDate" : "2014-11-26"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec724b92"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "14b23127"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
                 "meta" : {
-                  "globalKey" : "d088da59"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "369c7c47"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "92851c43"
-              },
               "securityPayout" : [ {
-                "initialMargin" : {
-                  "margin" : [ {
-                    "haircut" : 0.12
-                  } ],
-                  "marginType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "a69bf57c"
-                },
-                "repoDuration" : "TERM",
                 "securityLeg" : [ {
                   "buyerSeller" : {
-                    "buyer" : "PARTY_1",
-                    "seller" : "PARTY_2"
-                  },
-                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                  "meta" : {
-                    "globalKey" : "b57b5ba8"
-                  },
-                  "settlementAmount" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "RUB"
-                      }
-                    },
-                    "value" : 120079973.70,
-                    "meta" : {
-                      "globalKey" : "8482bfc4"
-                    }
+                    "buyer" : "Party1",
+                    "seller" : "Party2"
                   },
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2014-11-19",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -174,36 +134,35 @@
                       },
                       "meta" : {
                         "globalKey" : "ec72314b"
-                      },
-                      "unadjustedDate" : "2014-11-19"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec72314b"
                     }
-                  }
-                }, {
-                  "buyerSeller" : {
-                    "buyer" : "PARTY_2",
-                    "seller" : "PARTY_1"
-                  },
-                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                  "meta" : {
-                    "externalKey" : "forwardLeg",
-                    "globalKey" : "a92d3ccc"
                   },
                   "settlementAmount" : {
+                    "value" : 120079973.70,
                     "unit" : {
                       "currency" : {
                         "value" : "RUB"
                       }
                     },
-                    "value" : 120320934.26,
                     "meta" : {
-                      "globalKey" : "38ec0025"
+                      "globalKey" : "8482bfc4"
                     }
                   },
+                  "deliveryMethod" : "DeliveryVersusPayment",
+                  "meta" : {
+                    "globalKey" : "3cf954fa"
+                  }
+                }, {
+                  "buyerSeller" : {
+                    "buyer" : "Party2",
+                    "seller" : "Party1"
+                  },
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2014-11-26",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -212,34 +171,56 @@
                       },
                       "meta" : {
                         "globalKey" : "ec724b92"
-                      },
-                      "unadjustedDate" : "2014-11-26"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec724b92"
                     }
+                  },
+                  "settlementAmount" : {
+                    "value" : 120320934.26,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "RUB"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "38ec0025"
+                    }
+                  },
+                  "deliveryMethod" : "DeliveryVersusPayment",
+                  "meta" : {
+                    "globalKey" : "3b57c212",
+                    "externalKey" : "forwardLeg"
                   }
                 } ],
+                "initialMargin" : {
+                  "marginType" : "Cash",
+                  "margin" : [ {
+                    "haircut" : 0.12
+                  } ]
+                },
+                "repoDuration" : "Term",
                 "securityValuation" : [ {
                   "securityValuationModel" : {
                     "bondValuationModel" : {
-                      "bondPriceAndYieldModel" : {
-                        "cleanOrDirtyPrice" : {
-                          "cleanPrice" : {
-                            "cleanPrice" : 96.981
-                          }
-                        }
-                      },
                       "nominalAmount" : {
+                        "value" : 3000000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 3000000,
                         "meta" : {
                           "globalKey" : "317e0093"
                         }
+                      },
+                      "bondPriceAndYieldModel" : {
+                        "cleanOrDirtyPrice" : {
+                          "cleanPrice" : {
+                            "cleanPrice" : 96.981
+                          }
+                        }
                       }
                     }
                   },
@@ -251,127 +232,146 @@
                       }
                     } ]
                   }
-                } ]
-              } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "98c85502"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "90306b9b"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "92851c43"
+            "globalKey" : "90306b9b"
           }
         },
         "meta" : {
-          "globalKey" : "92851c43"
+          "globalKey" : "90306b9b"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "fd2246a1"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "8145c30a"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "XS"
-                },
-                "meta" : {
-                  "globalKey" : "8145c30a"
-                },
-                "source" : "ISIN"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.1032,
               "unit" : {
                 "currency" : {
                   "value" : "RUB"
                 }
               },
-              "value" : 0.1032,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "RUB"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 120079973.70,
               "unit" : {
                 "currency" : {
                   "value" : "RUB"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "XS",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
+                  }
+                },
+                "source" : "ISIN",
+                "meta" : {
+                  "globalKey" : "8145c30a"
+                }
               },
-              "value" : 120079973.70
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "a7729e36"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "9606094d"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59557",
+          "externalReference" : "Party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59558",
+          "externalReference" : "Party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef2d3"
-      },
-      "value" : "2014-11-19"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 1",
           "meta" : {
-            "scheme" : "http://www.party1.com/swaps/trade-id"
-          },
-          "value" : "Party19235"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59557"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59557"
-      },
       "meta" : {
-        "globalKey" : "f58e9891"
+        "globalKey" : "33f59557",
+        "externalKey" : "Party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 2",
           "meta" : {
-            "scheme" : "http://www.party2.com/swaps/trade-id"
-          },
-          "value" : "Party22000"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59558"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party2",
-        "globalReference" : "33f59558"
-      },
       "meta" : {
-        "globalKey" : "1e654896"
+        "globalKey" : "33f59558",
+        "externalKey" : "Party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "44bc8132"
+    }
+  },
+  "meta" : {
+    "globalKey" : "44bc8132"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex01-variance-swap-index.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex01-variance-swap-index.json
index 1b0edca0c4..94b356274c 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex01-variance-swap-index.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex01-variance-swap-index.json
@@ -1,101 +1,46 @@
 {
-  "meta" : {
-    "globalKey" : "4aa5d0f6"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "6234",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/coding-scheme/trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
       "meta" : {
-        "globalKey" : "92c7c587"
+        "globalKey" : "9593cc32"
       }
-    },
-    "meta" : {
-      "globalKey" : "4aa5d0f6"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "6569",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/coding-scheme/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "95944c36"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-09-24",
+      "meta" : {
+        "globalKey" : "3e8a58",
+        "externalKey" : "d989"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -103,71 +48,51 @@
             "productQualifier" : "EquitySwap_ParameterReturnVariance_Index"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "e22dfd7c"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Cash",
                   "meta" : {
                     "globalKey" : "1f7333"
-                  },
-                  "settlementType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "e22dfd7c"
+                  }
                 },
-                "returnTerms" : {
-                  "varianceReturnTerms" : {
-                    "valuationTerms" : {
-                      "futuresPriceValuation" : true
-                    },
-                    "exchangeTradedContractNearest" : {
-                      "meta" : {
-                        "globalKey" : "39b040fa"
-                      },
-                      "productIdentifier" : [ {
-                        "meta" : {
-                          "location" : [ {
-                            "scope" : "DOCUMENT",
-                            "value" : "productIdentifier-3"
-                          } ]
-                        },
-                        "value" : {
-                          "identifier" : {
-                            "meta" : {
-                              "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                            },
-                            "value" : ".SP500"
-                          },
+                "valuationDates" : {
+                  "valuationDatesFinal" : {
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2004-07-21",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
-                            "globalKey" : "39b040fa"
-                          },
-                          "source" : "OTHER"
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "25690940"
                         }
-                      } ]
+                      },
+                      "meta" : {
+                        "globalKey" : "25690940",
+                        "externalKey" : "FinalValuationDate"
+                      }
                     },
-                    "varianceStrikePrice" : {
-                      "value" : 950,
-                      "priceType" : "VARIANCE"
+                    "meta" : {
+                      "globalKey" : "25690940"
                     }
                   }
                 },
@@ -189,146 +114,221 @@
                     "globalKey" : "0"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "meta" : {
-                      "globalKey" : "25690940"
+                "returnTerms" : {
+                  "varianceReturnTerms" : {
+                    "valuationTerms" : {
+                      "futuresPriceValuation" : true
                     },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                    "varianceStrikePrice" : {
+                      "value" : 950,
+                      "priceType" : "Variance"
+                    },
+                    "exchangeTradedContractNearest" : {
+                      "productIdentifier" : [ {
+                        "value" : {
+                          "identifier" : {
+                            "value" : ".SP500",
+                            "meta" : {
+                              "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
+                            }
+                          },
+                          "source" : "Other",
                           "meta" : {
-                            "globalKey" : "3a4b88ab"
+                            "globalKey" : "39b040fa"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "25690940"
-                        },
-                        "unadjustedDate" : "2004-07-21"
-                      },
+                          "location" : [ {
+                            "scope" : "DOCUMENT",
+                            "value" : "productIdentifier-3"
+                          } ]
+                        }
+                      } ],
                       "meta" : {
-                        "externalKey" : "FinalValuationDate",
-                        "globalKey" : "25690940"
+                        "globalKey" : "fc57de46"
                       }
                     }
                   }
+                },
+                "meta" : {
+                  "globalKey" : "222eb1c6"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "222eb1c6"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "27f7752"
+            "globalKey" : "9d954130"
           }
         },
         "meta" : {
-          "globalKey" : "27f7752"
+          "globalKey" : "9d954130"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "1b78084f"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "9f85b2d5"
+          "quantity" : [ {
+            "value" : {
+              "value" : 350000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : ".SP500",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : ".SP500"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "39b040fa"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "SP 500 Index"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "6a72678f"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
                 }
               },
-              "value" : 350000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "5130a7cb"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "f20ea58f"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "d989",
-        "globalKey" : "3e8a58"
-      },
-      "value" : "2001-09-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/coding-scheme/trade-id"
-          },
-          "value" : "6234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "23a97ce8"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/coding-scheme/trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "6569"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "23d5334e"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "6998e03a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "6998e03a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex02-variance-swap-single-stock.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex02-variance-swap-single-stock.json
index aaf3d19311..f1c4794b32 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex02-variance-swap-single-stock.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex02-variance-swap-single-stock.json
@@ -1,101 +1,46 @@
 {
-  "meta" : {
-    "globalKey" : "dd4c3c12"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "6234",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/coding-scheme/trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
       "meta" : {
-        "globalKey" : "92c7c587"
+        "globalKey" : "9593cc32"
       }
-    },
-    "meta" : {
-      "globalKey" : "dd4c3c12"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "6569",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/coding-scheme/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "95944c36"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-09-24",
+      "meta" : {
+        "globalKey" : "3e8a58",
+        "externalKey" : "d989"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -103,82 +48,55 @@
             "productQualifier" : "EquitySwap_ParameterReturnVariance_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "766dc8f0"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Cash",
                   "meta" : {
                     "globalKey" : "1f7333"
-                  },
-                  "settlementType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "766dc8f0"
+                  }
                 },
-                "returnTerms" : {
-                  "varianceReturnTerms" : {
-                    "dividendApplicability" : {
-                      "additionalDividends" : false,
-                      "optionsExchangeDividends" : true
-                    },
-                    "valuationTerms" : {
-                      "optionsPriceValuation" : true
-                    },
-                    "exchangeTradedContractNearest" : {
-                      "meta" : {
-                        "globalKey" : "e6908e56"
-                      },
-                      "productIdentifier" : [ {
-                        "meta" : {
-                          "location" : [ {
-                            "scope" : "DOCUMENT",
-                            "value" : "productIdentifier-3"
-                          } ]
-                        },
-                        "value" : {
-                          "identifier" : {
-                            "meta" : {
-                              "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                            },
-                            "value" : ".IBM"
-                          },
+                "valuationDates" : {
+                  "valuationDatesFinal" : {
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2004-07-21",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
-                            "globalKey" : "e6908e56"
-                          },
-                          "source" : "OTHER"
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "25690940"
                         }
-                      } ]
+                      },
+                      "meta" : {
+                        "globalKey" : "25690940",
+                        "externalKey" : "FinalValuationDate"
+                      }
                     },
-                    "varianceStrikePrice" : {
-                      "value" : 85.00,
-                      "priceType" : "VARIANCE"
+                    "meta" : {
+                      "globalKey" : "25690940"
                     }
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -191,149 +109,231 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "meta" : {
-                      "globalKey" : "25690940"
+                "returnTerms" : {
+                  "varianceReturnTerms" : {
+                    "valuationTerms" : {
+                      "optionsPriceValuation" : true
                     },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                    "dividendApplicability" : {
+                      "optionsExchangeDividends" : true,
+                      "additionalDividends" : false
+                    },
+                    "varianceStrikePrice" : {
+                      "value" : 85.00,
+                      "priceType" : "Variance"
+                    },
+                    "exchangeTradedContractNearest" : {
+                      "productIdentifier" : [ {
+                        "value" : {
+                          "identifier" : {
+                            "value" : ".IBM",
+                            "meta" : {
+                              "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
+                            }
+                          },
+                          "source" : "Other",
                           "meta" : {
-                            "globalKey" : "3a4b88ab"
+                            "globalKey" : "e6908e56"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "25690940"
-                        },
-                        "unadjustedDate" : "2004-07-21"
-                      },
+                          "location" : [ {
+                            "scope" : "DOCUMENT",
+                            "value" : "productIdentifier-3"
+                          } ]
+                        }
+                      } ],
                       "meta" : {
-                        "externalKey" : "FinalValuationDate",
-                        "globalKey" : "25690940"
+                        "globalKey" : "eb813c6a"
                       }
                     }
                   }
+                },
+                "meta" : {
+                  "globalKey" : "758f7216"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "758f7216"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "bb2267c6"
+            "globalKey" : "9bc72d80"
           }
         },
         "meta" : {
-          "globalKey" : "bb2267c6"
+          "globalKey" : "9bc72d80"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a3ea2b77"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "32434cad"
+          "quantity" : [ {
+            "value" : {
+              "value" : 350000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "IBM",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : "IBM"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "e67ba544"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "IBM ordinary shares"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "40364771"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
                 }
               },
-              "value" : 350000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "162648f3"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "b70446b7"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "d989",
-        "globalKey" : "3e8a58"
-      },
-      "value" : "2001-09-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/coding-scheme/trade-id"
-          },
-          "value" : "6234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "23a97ce8"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/coding-scheme/trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "6569"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "23d5334e"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "1c1f79b2"
+    }
+  },
+  "meta" : {
+    "globalKey" : "1c1f79b2"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex03-conditional-variance-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex03-conditional-variance-swap.json
index 82e8fcac5c..5a8990f5de 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex03-conditional-variance-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex03-conditional-variance-swap.json
@@ -1,58 +1,46 @@
 {
-  "meta" : {
-    "globalKey" : "c7fb597e"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "c7fb597e"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "6234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/coding-scheme/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "9593cc32"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "6569",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/coding-scheme/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "95944c36"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2007-01-05",
+      "meta" : {
+        "globalKey" : "3eb845",
+        "externalKey" : "d989"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -61,94 +49,54 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "956694d"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Cash",
                   "meta" : {
                     "globalKey" : "1f7333"
-                  },
-                  "settlementType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "956694d"
+                  }
                 },
-                "returnTerms" : {
-                  "varianceReturnTerms" : {
-                    "dividendApplicability" : {
-                      "additionalDividends" : false,
-                      "optionsExchangeDividends" : true
-                    },
-                    "valuationTerms" : {
-                      "optionsPriceValuation" : true
-                    },
-                    "exchangeTradedContractNearest" : {
-                      "meta" : {
-                        "globalKey" : "e6908e56"
-                      },
-                      "productIdentifier" : [ {
-                        "meta" : {
-                          "location" : [ {
-                            "scope" : "DOCUMENT",
-                            "value" : "productIdentifier-3"
-                          } ]
-                        },
-                        "value" : {
-                          "identifier" : {
-                            "meta" : {
-                              "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                            },
-                            "value" : ".IBM"
-                          },
+                "valuationDates" : {
+                  "valuationDatesFinal" : {
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2004-07-21",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
-                            "globalKey" : "e6908e56"
-                          },
-                          "source" : "OTHER"
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "25690940"
                         }
-                      } ]
-                    },
-                    "varianceCapFloor" : {
-                      "boundedVariance" : {
-                        "daysInRangeAdjustment" : true,
-                        "lowerBarrier" : 94.00,
-                        "realisedVarianceMethod" : "PREVIOUS",
-                        "upperBarrier" : 101.00
+                      },
+                      "meta" : {
+                        "globalKey" : "25690940",
+                        "externalKey" : "FinalValuationDate"
                       }
                     },
-                    "varianceStrikePrice" : {
-                      "value" : 18.135,
-                      "priceType" : "VARIANCE"
-                    },
-                    "vegaNotionalAmount" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 50000
+                    "meta" : {
+                      "globalKey" : "25690940"
                     }
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -161,149 +109,201 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "meta" : {
-                      "globalKey" : "25690940"
+                "returnTerms" : {
+                  "varianceReturnTerms" : {
+                    "valuationTerms" : {
+                      "optionsPriceValuation" : true
                     },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                    "dividendApplicability" : {
+                      "optionsExchangeDividends" : true,
+                      "additionalDividends" : false
+                    },
+                    "varianceStrikePrice" : {
+                      "value" : 18.135,
+                      "priceType" : "Variance"
+                    },
+                    "varianceCapFloor" : {
+                      "boundedVariance" : {
+                        "realisedVarianceMethod" : "Previous",
+                        "daysInRangeAdjustment" : true,
+                        "upperBarrier" : 101.00,
+                        "lowerBarrier" : 94.00
+                      }
+                    },
+                    "vegaNotionalAmount" : {
+                      "value" : 50000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      }
+                    },
+                    "exchangeTradedContractNearest" : {
+                      "productIdentifier" : [ {
+                        "value" : {
+                          "identifier" : {
+                            "value" : ".IBM",
+                            "meta" : {
+                              "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
+                            }
+                          },
+                          "source" : "Other",
                           "meta" : {
-                            "globalKey" : "3a4b88ab"
+                            "globalKey" : "e6908e56"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "25690940"
-                        },
-                        "unadjustedDate" : "2004-07-21"
-                      },
+                          "location" : [ {
+                            "scope" : "DOCUMENT",
+                            "value" : "productIdentifier-3"
+                          } ]
+                        }
+                      } ],
                       "meta" : {
-                        "externalKey" : "FinalValuationDate",
-                        "globalKey" : "25690940"
+                        "globalKey" : "eb813c6a"
                       }
                     }
                   }
+                },
+                "meta" : {
+                  "globalKey" : "fb5dc3bf"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "fb5dc3bf"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "956694d"
+            "globalKey" : "fb5dc3bf"
           }
         },
         "meta" : {
-          "globalKey" : "956694d"
+          "globalKey" : "fb5dc3bf"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "8f9abf0c"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "32434cad"
+          "quantity" : [ {
+            "value" : {
+              "value" : 1388.889,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "IBM",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : "IBM"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "e67ba544"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "IBM ordinary shares"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "40364771"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
                 }
               },
-              "value" : 1388.889
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "162648f3"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "b96c718c"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "d989",
-        "globalKey" : "3eb845"
-      },
-      "value" : "2007-01-05"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/coding-scheme/trade-id"
-          },
-          "value" : "6234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "23a97ce8"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/coding-scheme/trade-id"
-          },
-          "value" : "6569"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "23d5334e"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "73e0ead2"
+    }
+  },
+  "meta" : {
+    "globalKey" : "73e0ead2"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex04-dispersion-variance-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex04-dispersion-variance-swap.json
index a0fd9d2664..820abb36f6 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex04-dispersion-variance-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex04-dispersion-variance-swap.json
@@ -1,94 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "649bc8c5"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2002-03-15",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "d3c973e8"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "75d60ac"
-      }
-    },
-    "meta" : {
-      "globalKey" : "649bc8c5"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "74597c1f"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "74597c1f",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "280234089",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "BAQ892"
-        },
-        "meta" : {
-          "globalKey" : "74597c1f"
+            "scheme" : "http://www.xyz.com/coding-scheme/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "76d32c17"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "COP902"
-        },
-        "meta" : {
-          "globalKey" : "76d32c17"
-        }
-      } ]
+        "globalKey" : "877e757d"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-06-28",
+      "meta" : {
+        "globalKey" : "3e819c",
+        "externalKey" : "td"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "74597c1f"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "74597c1f"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "74597c1f"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "76d32c17"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -96,19 +32,14 @@
             "productQualifier" : "EquitySwap_ParameterReturnDispersion"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
-              "meta" : {
-                "globalKey" : "a848c5eb"
-              },
               "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
                 "meta" : {
-                  "globalKey" : "a848c5eb"
+                  "globalKey" : "1da097f3"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
+                "businessDayConvention" : "MODFOLLOWING",
                 "businessCenters" : {
                   "businessCenter" : [ {
                     "value" : "GBLO"
@@ -117,84 +48,73 @@
                     "globalKey" : "21479e"
                   }
                 },
-                "businessDayConvention" : "MODFOLLOWING",
                 "dateRelativeTo" : {
-                  "externalReference" : "osd",
-                  "globalReference" : "a5eca11a"
+                  "globalReference" : "1b447322",
+                  "externalReference" : "osd"
                 }
+              },
+              "meta" : {
+                "globalKey" : "1da097f3"
               }
             },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : false,
-              "indexAdjustmentEvents" : {
-                "indexCancellation" : "CALCULATION_AGENT_ADJUSTMENT",
-                "indexDisruption" : "CALCULATION_AGENT_ADJUSTMENT",
-                "indexModification" : "RELATED_EXCHANGE"
-              },
-              "mergerEvents" : {
-                "shareForCombined" : "CALCULATION_AGENT",
-                "shareForOther" : "CALCULATION_AGENT",
-                "shareForShare" : "CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "1da06ae7"
+                },
+                "businessDayConvention" : "MODFOLLOWING",
+                "businessCenters" : {
+                  "businessCenter" : [ {
+                    "value" : "GBLO"
+                  } ],
+                  "meta" : {
+                    "globalKey" : "21479e"
+                  }
+                },
+                "dateRelativeTo" : {
+                  "globalReference" : "7a08418",
+                  "externalReference" : "csd"
+                }
               },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
+              "meta" : {
+                "globalKey" : "1da06ae7"
               }
             },
             "payout" : {
-              "meta" : {
-                "globalKey" : "64435bb6"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "6b479971"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "externalKey" : "csd",
-                          "globalKey" : "793790dc"
+                          "globalKey" : "7a08418",
+                          "externalKey" : "csd"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CALENDAR",
+                        "dayType" : "Calendar",
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -203,36 +123,32 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "vd",
-                          "globalReference" : "a4838f25"
+                          "globalReference" : "a4838f25",
+                          "externalReference" : "vd"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "793790dc"
+                      "globalKey" : "7a08418"
                     }
                   },
-                  "settlementType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "62a9960"
+                  "meta" : {
+                    "globalKey" : "f9b08cad"
+                  }
                 },
                 "observationTerms" : {
                   "observationDates" : {
                     "periodicSchedule" : {
                       "startDate" : {
-                        "meta" : {
-                          "globalKey" : "a5eca11a"
-                        },
                         "relativeDate" : {
+                          "periodMultiplier" : 0,
+                          "period" : "D",
                           "meta" : {
-                            "externalKey" : "osd",
-                            "globalKey" : "a5eca11a"
+                            "globalKey" : "1b447322",
+                            "externalKey" : "osd"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 0,
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -241,49 +157,25 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "dateRelativeTo" : {
-                            "externalReference" : "td",
-                            "globalReference" : "3e819c"
+                            "globalReference" : "3e819c",
+                            "externalReference" : "td"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "1b447322"
                         }
                       }
                     }
                   }
                 },
-                "returnTerms" : {
-                  "varianceReturnTerms" : {
-                    "initialLevel" : 0.80,
-                    "valuationTerms" : {
-                      "futuresPriceValuation" : true
-                    },
-                    "varianceStrikePrice" : {
-                      "value" : 0.30,
-                      "priceType" : "VARIANCE"
-                    }
-                  }
-                },
-                "underlier" : {
-                  "index" : {
-                    "productIdentifier" : [ {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-1"
-                      }
-                    } ]
-                  },
-                  "meta" : {
-                    "globalKey" : "0"
-                  }
-                },
                 "valuationDates" : {
                   "valuationDatesFinal" : {
-                    "meta" : {
-                      "globalKey" : "76601cfd"
-                    },
                     "valuationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2008-10-10",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -292,59 +184,70 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365c4b6f"
                           }
                         },
                         "meta" : {
-                          "externalKey" : "vd",
-                          "globalKey" : "a4838f25"
-                        },
-                        "unadjustedDate" : "2008-10-10"
+                          "globalKey" : "a4838f25",
+                          "externalKey" : "vd"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "a4838f25"
                       }
                     },
-                    "valuationTimeType" : "CLOSE"
+                    "valuationTimeType" : "Close",
+                    "meta" : {
+                      "globalKey" : "76601cfd"
+                    }
                   }
-                }
-              }, {
-                "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
                 },
-                "priceQuantity" : {
+                "underlier" : {
+                  "index" : {
+                    "productIdentifier" : [ {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-1"
+                      }
+                    } ]
+                  },
                   "meta" : {
                     "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
-                    }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "43a08a9e"
-                },
                 "returnTerms" : {
                   "varianceReturnTerms" : {
-                    "dividendApplicability" : {
-                      "allDividends" : true
+                    "valuationTerms" : {
+                      "futuresPriceValuation" : true
                     },
                     "initialLevel" : 0.80,
                     "varianceStrikePrice" : {
-                      "value" : 0.35,
-                      "priceType" : "VARIANCE"
+                      "value" : 0.30,
+                      "priceType" : "Variance"
                     }
                   }
                 },
-                "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
+                "meta" : {
+                  "globalKey" : "c7cc31da"
+                }
+              }, {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    }
                   },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
+                },
+                "underlier" : {
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -357,28 +260,12 @@
                         "value" : "productIdentifier-3"
                       }
                     } ],
-                    "securityType" : "EQUITY"
-                  }
-                }
-              }, {
-                "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
+                    "securityType" : "Equity"
                   },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-3"
-                    }
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "2a9e44b4"
-                },
                 "returnTerms" : {
                   "varianceReturnTerms" : {
                     "dividendApplicability" : {
@@ -386,260 +273,373 @@
                     },
                     "initialLevel" : 0.80,
                     "varianceStrikePrice" : {
-                      "value" : 0.40,
-                      "priceType" : "VARIANCE"
+                      "value" : 0.35,
+                      "priceType" : "Variance"
                     }
                   }
                 },
-                "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
-                  "security" : {
-                    "productIdentifier" : [ {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-5"
-                      }
-                    }, {
+                "meta" : {
+                  "globalKey" : "92d2fee"
+                }
+              }, {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-3"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
+                },
+                "underlier" : {
+                  "security" : {
+                    "productIdentifier" : [ {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-5"
+                      }
+                    }, {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "productIdentifier-4"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "meta" : {
-                "globalKey" : "a84898df"
-              },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "a84898df"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessCenters" : {
-                  "businessCenter" : [ {
-                    "value" : "GBLO"
-                  } ],
-                  "meta" : {
-                    "globalKey" : "21479e"
+                "returnTerms" : {
+                  "varianceReturnTerms" : {
+                    "dividendApplicability" : {
+                      "allDividends" : true
+                    },
+                    "initialLevel" : 0.80,
+                    "varianceStrikePrice" : {
+                      "value" : 0.40,
+                      "priceType" : "Variance"
+                    }
                   }
                 },
-                "businessDayConvention" : "MODFOLLOWING",
-                "dateRelativeTo" : {
-                  "externalReference" : "csd",
-                  "globalReference" : "793790dc"
+                "meta" : {
+                  "globalKey" : "6899d98"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "d26fcc44"
               }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "CalculationAgent",
+                "shareForOther" : "CalculationAgent",
+                "shareForCombined" : "CalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : false,
+              "indexAdjustmentEvents" : {
+                "indexModification" : "RelatedExchange",
+                "indexCancellation" : "CalculationAgentAdjustment",
+                "indexDisruption" : "CalculationAgentAdjustment"
+              },
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "1417bdd3"
+            "globalKey" : "68240ec7"
           }
         },
         "meta" : {
-          "globalKey" : "1417bdd3"
+          "globalKey" : "68240ec7"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "d73c6565"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "7bd743ac"
+          "quantity" : [ {
+            "value" : {
+              "value" : 1000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "STOXX50E",
                   "meta" : {
                     "scheme" : "http://www.dowjones.com/coding-scheme/instrument-id"
-                  },
-                  "value" : "STOXX50E"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "7bd743ac"
-                },
-                "source" : "OTHER"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "ff1131d4"
+            }
           },
+          "meta" : {
+            "globalKey" : "22bcf365"
+          }
+        }, {
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 1000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 1000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "268ecaf"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "191ffba2"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "AH.AS",
                   "meta" : {
                     "scheme" : "uri:ticker"
-                  },
-                  "value" : "AH.AS"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "ea2ff249"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-3"
+                  "value" : "productIdentifier-2"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "Ahold"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "8c96e84b"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-3"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "adf789e"
+            }
           },
+          "meta" : {
+            "globalKey" : "b5e096f"
+          }
+        }, {
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
             "value" : {
+              "value" : 1000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 1000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-3"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2c60de16"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "f5d1c01b"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-5"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "RDSA.AS",
                   "meta" : {
                     "scheme" : "uri:ticker"
-                  },
-                  "value" : "RDSA.AS"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "50f2efd0"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-4"
+                  "value" : "productIdentifier-5"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "Royal Dutch Shell A"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "46574deb"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-3"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
                 }
               },
-              "value" : 1000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-4"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "c4664345"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "c4e4d416"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "74597c1f",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "76d32c17",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "74597c1f",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "74597c1f",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "BAQ892",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "74597c1f"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "td",
-        "globalKey" : "3e819c"
-      },
-      "value" : "2000-06-28"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "74597c1f",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "COP902",
           "meta" : {
-            "scheme" : "http://www.xyz.com/coding-scheme/trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "76d32c17"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "76d32c17",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2002-03-15",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "280234089"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "d3c973e8"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "74597c1f"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "458eff73"
+        "globalKey" : "75d60ac"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "263320b7"
+    }
+  },
+  "meta" : {
+    "globalKey" : "263320b7"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex05-dispersion-variance-swap-transaction-supplement.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex05-dispersion-variance-swap-transaction-supplement.json
index 28ac414c1c..4f261b7679 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex05-dispersion-variance-swap-transaction-supplement.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex05-dispersion-variance-swap-transaction-supplement.json
@@ -1,80 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "cc14c312"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "c3590edd"
-      }
-    },
-    "meta" : {
-      "globalKey" : "cc14c312"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "74597c1f"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "74597c1f",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "280234089",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "BAQ892"
-        },
-        "meta" : {
-          "globalKey" : "74597c1f"
+            "scheme" : "http://www.xyz.com/coding-scheme/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "76d32c17"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "COP902"
-        },
-        "meta" : {
-          "globalKey" : "76d32c17"
-        }
-      } ]
+        "globalKey" : "877e757d"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-06-28",
+      "meta" : {
+        "globalKey" : "3e819c",
+        "externalKey" : "td"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "74597c1f"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "76d32c17"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -83,15 +33,13 @@
           } ],
           "economicTerms" : {
             "effectiveDate" : {
-              "meta" : {
-                "globalKey" : "a848c5eb"
-              },
               "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
                 "meta" : {
-                  "globalKey" : "a848c5eb"
+                  "globalKey" : "1da097f3"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
+                "businessDayConvention" : "MODFOLLOWING",
                 "businessCenters" : {
                   "businessCenter" : [ {
                     "value" : "GBLO"
@@ -100,54 +48,48 @@
                     "globalKey" : "21479e"
                   }
                 },
-                "businessDayConvention" : "MODFOLLOWING",
                 "dateRelativeTo" : {
-                  "externalReference" : "osd",
-                  "globalReference" : "a5eca11a"
+                  "globalReference" : "1b447322",
+                  "externalReference" : "osd"
                 }
+              },
+              "meta" : {
+                "globalKey" : "1da097f3"
               }
             },
             "payout" : {
-              "meta" : {
-                "globalKey" : "ddc1639d"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "48eae291"
-                  },
                   "quantitySchedule" : {
                     "value" : {
+                      "value" : 1000000,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
-                      },
-                      "value" : 1000000
+                      }
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "48eae291"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "811a6f6e"
-                },
                 "observationTerms" : {
                   "observationDates" : {
                     "periodicSchedule" : {
                       "startDate" : {
-                        "meta" : {
-                          "globalKey" : "a5eca11a"
-                        },
                         "relativeDate" : {
+                          "periodMultiplier" : 0,
+                          "period" : "D",
                           "meta" : {
-                            "externalKey" : "osd",
-                            "globalKey" : "a5eca11a"
+                            "globalKey" : "1b447322",
+                            "externalKey" : "osd"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 0,
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -156,57 +98,25 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "dateRelativeTo" : {
-                            "externalReference" : "td",
-                            "globalReference" : "3e819c"
+                            "globalReference" : "3e819c",
+                            "externalReference" : "td"
                           }
-                        }
-                      }
-                    }
-                  }
-                },
-                "returnTerms" : {
-                  "varianceReturnTerms" : {
-                    "initialLevel" : 0.80,
-                    "valuationTerms" : {
-                      "futuresPriceValuation" : true
-                    },
-                    "varianceStrikePrice" : {
-                      "value" : 0.30,
-                      "priceType" : "VARIANCE"
-                    }
-                  }
-                },
-                "underlier" : {
-                  "index" : {
-                    "productIdentifier" : [ {
-                      "value" : {
-                        "identifier" : {
-                          "meta" : {
-                            "scheme" : "http://www.dowjones.com/coding-scheme/instrument-id"
-                          },
-                          "value" : "STOXX50E"
                         },
                         "meta" : {
-                          "globalKey" : "7bd743ac"
-                        },
-                        "source" : "OTHER"
+                          "globalKey" : "1b447322"
+                        }
                       }
-                    } ]
-                  },
-                  "meta" : {
-                    "globalKey" : "7bd743ac"
+                    }
                   }
                 },
                 "valuationDates" : {
                   "valuationDatesFinal" : {
-                    "meta" : {
-                      "globalKey" : "76601cfd"
-                    },
                     "valuationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2008-10-10",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -215,193 +125,283 @@
                               "globalKey" : "21479e"
                             }
                           },
-                          "businessDayConvention" : "MODFOLLOWING",
                           "meta" : {
                             "globalKey" : "365c4b6f"
                           }
                         },
                         "meta" : {
-                          "externalKey" : "vd",
-                          "globalKey" : "a4838f25"
-                        },
-                        "unadjustedDate" : "2008-10-10"
+                          "globalKey" : "a4838f25",
+                          "externalKey" : "vd"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "a4838f25"
                       }
                     },
-                    "valuationTimeType" : "CLOSE"
+                    "valuationTimeType" : "Close",
+                    "meta" : {
+                      "globalKey" : "76601cfd"
+                    }
+                  }
+                },
+                "underlier" : {
+                  "index" : {
+                    "productIdentifier" : [ {
+                      "value" : {
+                        "identifier" : {
+                          "value" : "STOXX50E",
+                          "meta" : {
+                            "scheme" : "http://www.dowjones.com/coding-scheme/instrument-id"
+                          }
+                        },
+                        "source" : "Other",
+                        "meta" : {
+                          "globalKey" : "7bd743ac"
+                        }
+                      }
+                    } ]
+                  },
+                  "meta" : {
+                    "globalKey" : "7bd743ac"
+                  }
+                },
+                "returnTerms" : {
+                  "varianceReturnTerms" : {
+                    "valuationTerms" : {
+                      "futuresPriceValuation" : true
+                    },
+                    "initialLevel" : 0.80,
+                    "varianceStrikePrice" : {
+                      "value" : 0.30,
+                      "priceType" : "Variance"
+                    }
                   }
+                },
+                "meta" : {
+                  "globalKey" : "9150b974"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "48eae291"
-                  },
                   "quantitySchedule" : {
                     "value" : {
+                      "value" : 1000000,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
-                      },
-                      "value" : 1000000
-                    }
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "b7f2a119"
-                },
-                "returnTerms" : {
-                  "varianceReturnTerms" : {
-                    "dividendApplicability" : {
-                      "allDividends" : true
-                    },
-                    "initialLevel" : 0.80,
-                    "varianceStrikePrice" : {
-                      "value" : 0.35,
-                      "priceType" : "VARIANCE"
+                      }
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "48eae291"
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "d2ac731"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "value" : {
                         "identifier" : {
+                          "value" : "AH.AS",
                           "meta" : {
                             "scheme" : "uri:ticker"
-                          },
-                          "value" : "AH.AS"
+                          }
                         },
+                        "source" : "Other",
                         "meta" : {
                           "globalKey" : "ea2ff249"
-                        },
-                        "source" : "OTHER"
+                        }
                       }
                     }, {
                       "value" : {
                         "identifier" : {
                           "value" : "Ahold"
                         },
+                        "source" : "Name",
                         "meta" : {
                           "globalKey" : "8c96e84b"
-                        },
-                        "source" : "NAME"
+                        }
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "d2ac731"
+                  }
+                },
+                "returnTerms" : {
+                  "varianceReturnTerms" : {
+                    "dividendApplicability" : {
+                      "allDividends" : true
+                    },
+                    "initialLevel" : 0.80,
+                    "varianceStrikePrice" : {
+                      "value" : 0.35,
+                      "priceType" : "Variance"
+                    }
                   }
+                },
+                "meta" : {
+                  "globalKey" : "72eb2869"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "48eae291"
-                  },
                   "quantitySchedule" : {
                     "value" : {
+                      "value" : 1000000,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
-                      },
-                      "value" : 1000000
-                    }
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "5d74e4e8"
-                },
-                "returnTerms" : {
-                  "varianceReturnTerms" : {
-                    "dividendApplicability" : {
-                      "allDividends" : true
-                    },
-                    "initialLevel" : 0.80,
-                    "varianceStrikePrice" : {
-                      "value" : 0.40,
-                      "priceType" : "VARIANCE"
+                      }
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "48eae291"
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "ae68746a"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "value" : {
                         "identifier" : {
+                          "value" : "RDSA.AS",
                           "meta" : {
                             "scheme" : "uri:ticker"
-                          },
-                          "value" : "RDSA.AS"
+                          }
                         },
+                        "source" : "Other",
                         "meta" : {
                           "globalKey" : "50f2efd0"
-                        },
-                        "source" : "OTHER"
+                        }
                       }
                     }, {
                       "value" : {
                         "identifier" : {
                           "value" : "Royal Dutch Shell A"
                         },
+                        "source" : "Name",
                         "meta" : {
                           "globalKey" : "46574deb"
-                        },
-                        "source" : "NAME"
+                        }
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "ae68746a"
+                  }
+                },
+                "returnTerms" : {
+                  "varianceReturnTerms" : {
+                    "dividendApplicability" : {
+                      "allDividends" : true
+                    },
+                    "initialLevel" : 0.80,
+                    "varianceStrikePrice" : {
+                      "value" : 0.40,
+                      "priceType" : "Variance"
+                    }
                   }
+                },
+                "meta" : {
+                  "globalKey" : "c6c4fa4c"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "5529eb37"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "4f3e0bd2"
+            "globalKey" : "b8d29464"
           }
         },
         "meta" : {
-          "globalKey" : "4f3e0bd2"
+          "globalKey" : "b8d29464"
         }
-      }
-    },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "td",
-        "globalKey" : "3e819c"
       },
-      "value" : "2000-06-28"
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "74597c1f",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "76d32c17",
+          "externalReference" : "party2"
+        }
+      } ]
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BAQ892",
           "meta" : {
-            "scheme" : "http://www.xyz.com/coding-scheme/trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "74597c1f"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "74597c1f",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "COP902",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "76d32c17"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "76d32c17",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "280234089"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "74597c1f"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "458eff73"
+        "globalKey" : "c3590edd"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "a8edb89e"
+    }
+  },
+  "meta" : {
+    "globalKey" : "a8edb89e"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex06-variance-option-transaction-supplement.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex06-variance-option-transaction-supplement.json
index df71a6f6ce..a9cac25d5e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex06-variance-option-transaction-supplement.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex06-variance-option-transaction-supplement.json
@@ -1,86 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "8fe490ce"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2009-01-07",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationAnnexType" : {
-              "value" : "ISDA_2007_VARIANCE_OPTION_EUROPEAN"
-            },
-            "masterConfirmationType" : {
-              "value" : "ISDA_2007_VARIANCE_SWAP_EUROPEAN_REV_1"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "d53e12f6",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "166555",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "e15177bd"
         }
       } ],
       "meta" : {
-        "globalKey" : "e15177bd"
+        "globalKey" : "ec318949"
       }
-    },
-    "meta" : {
-      "globalKey" : "c3eec9dd"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "a9725448"
-      },
-      "name" : {
-        "value" : "SwapsWire Ltd (LE)"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "ABC1"
-        },
-        "meta" : {
-          "globalKey" : "1e8c2f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "3e4ef71f"
-      },
-      "name" : {
-        "value" : "Rusty"
+      "issuerReference" : {
+        "globalReference" : "7766c429",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "166555",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "ABC6"
-        },
-        "meta" : {
-          "globalKey" : "1e8c34"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ec31fda8"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-01-27",
+      "meta" : {
+        "globalKey" : "3ec85b"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "a9725448"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "3e4ef71f"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -89,47 +48,40 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "7c1f4e08"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "76108548"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "GBP"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "76108548"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2015-03-20",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "26af9c7f"
-                          },
-                          "unadjustedDate" : "2015-03-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "26af9c7f"
@@ -140,12 +92,13 @@
                         "globalKey" : "e4555d13"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
+                    }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "7c1f4e08"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -154,71 +107,65 @@
                     } ],
                     "economicTerms" : {
                       "payout" : {
-                        "meta" : {
-                          "globalKey" : "95a489dc"
-                        },
                         "performancePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
                           "settlementTerms" : {
-                            "meta" : {
-                              "globalKey" : "18e87542"
-                            },
+                            "settlementType" : "Cash",
                             "settlementCurrency" : {
                               "value" : "GBP"
                             },
                             "settlementDate" : {
                               "adjustableOrRelativeDate" : {
                                 "relativeDate" : {
+                                  "periodMultiplier" : 2,
+                                  "period" : "D",
                                   "meta" : {
-                                    "globalKey" : "e08b898a"
+                                    "globalKey" : "738dbfce"
                                   },
-                                  "period" : "D",
-                                  "periodMultiplier" : 2,
-                                  "dayType" : "CURRENCY_BUSINESS",
-                                  "businessDayConvention" : "NOT_APPLICABLE",
+                                  "dayType" : "CurrencyBusiness",
+                                  "businessDayConvention" : "NotApplicable",
                                   "dateRelativeTo" : {
                                     "externalReference" : "valuationDate"
                                   }
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "e08b898a"
+                                "globalKey" : "738dbfce"
                               }
                             },
-                            "settlementType" : "CASH"
-                          },
-                          "meta" : {
-                            "globalKey" : "95a489dc"
+                            "meta" : {
+                              "globalKey" : "abeaab86"
+                            }
                           },
                           "observationTerms" : {
                             "observationDates" : {
                               "periodicSchedule" : {
                                 "startDate" : {
                                   "adjustableDate" : {
+                                    "unadjustedDate" : "2009-01-27",
                                     "dateAdjustments" : {
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "meta" : {
                                         "globalKey" : "3a4b88ab"
                                       }
                                     },
                                     "meta" : {
                                       "globalKey" : "25f9a646"
-                                    },
-                                    "unadjustedDate" : "2009-01-27"
+                                    }
                                   },
                                   "meta" : {
                                     "globalKey" : "25f9a646"
@@ -227,26 +174,27 @@
                               }
                             }
                           },
-                          "returnTerms" : {
-                            "varianceReturnTerms" : {
-                              "expectedN" : 542,
-                              "valuationTerms" : {
-                                "futuresPriceValuation" : true
-                              },
-                              "varianceCapFloor" : {
-                                "varianceCap" : false
-                              },
-                              "varianceStrikePrice" : {
-                                "value" : 225,
-                                "priceType" : "VARIANCE"
-                              },
-                              "vegaNotionalAmount" : {
-                                "unit" : {
-                                  "currency" : {
-                                    "value" : "GBP"
+                          "valuationDates" : {
+                            "valuationDatesFinal" : {
+                              "valuationDate" : {
+                                "adjustableDate" : {
+                                  "unadjustedDate" : "2011-03-18",
+                                  "dateAdjustments" : {
+                                    "businessDayConvention" : "NotApplicable",
+                                    "meta" : {
+                                      "globalKey" : "3a4b88ab"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "263774fd"
                                   }
                                 },
-                                "value" : 1000000
+                                "meta" : {
+                                  "globalKey" : "263774fd"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "263774fd"
                               }
                             }
                           },
@@ -268,192 +216,244 @@
                               "globalKey" : "0"
                             }
                           },
-                          "valuationDates" : {
-                            "valuationDatesFinal" : {
-                              "meta" : {
-                                "globalKey" : "263774fd"
+                          "returnTerms" : {
+                            "varianceReturnTerms" : {
+                              "valuationTerms" : {
+                                "futuresPriceValuation" : true
                               },
-                              "valuationDate" : {
-                                "adjustableDate" : {
-                                  "dateAdjustments" : {
-                                    "businessDayConvention" : "NOT_APPLICABLE",
-                                    "meta" : {
-                                      "globalKey" : "3a4b88ab"
-                                    }
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "263774fd"
-                                  },
-                                  "unadjustedDate" : "2011-03-18"
-                                },
-                                "meta" : {
-                                  "globalKey" : "263774fd"
+                              "expectedN" : 542,
+                              "varianceStrikePrice" : {
+                                "value" : 225,
+                                "priceType" : "Variance"
+                              },
+                              "varianceCapFloor" : {
+                                "varianceCap" : false
+                              },
+                              "vegaNotionalAmount" : {
+                                "value" : 1000000,
+                                "unit" : {
+                                  "currency" : {
+                                    "value" : "GBP"
+                                  }
                                 }
                               }
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "6266e250"
                           }
-                        } ]
+                        } ],
+                        "meta" : {
+                          "globalKey" : "6266e250"
+                        }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "95a489dc"
+                      "globalKey" : "6266e250"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "95a489dc"
+                    "globalKey" : "6266e250"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "cfc4aef6"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "cfc4aef6"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "7c1f4e08"
+            "globalKey" : "cfc4aef6"
           }
         },
         "meta" : {
-          "globalKey" : "7c1f4e08"
+          "globalKey" : "cfc4aef6"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "60eb526"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "9248da94"
+          "quantity" : [ {
+            "value" : {
+              "value" : 33333.33,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : ".FTSE",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/spec/2003/instrument-id-Reuters-RIC-1-0"
-                  },
-                  "value" : ".FTSE"
+                  }
                 },
+                "source" : "RIC",
                 "meta" : {
                   "globalKey" : "74f02ba"
-                },
-                "source" : "RIC"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "FTSE 100 INDEX"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "b921390e"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
                 }
               },
-              "value" : 33333.33
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "b6d277ec"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "b41ee8a6"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "d53e12f6",
+          "externalReference" : "partyA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "7766c429",
+          "externalReference" : "partyB"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec85b"
-      },
-      "value" : "2009-01-27"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABC1",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "166555"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "1e8c2f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "a9725448"
+      "name" : {
+        "value" : "SwapsWire Ltd (LE)"
       },
       "meta" : {
-        "globalKey" : "2e7ec65f"
+        "globalKey" : "d53e12f6",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABC6",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "166555"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "1e8c34"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "3e4ef71f"
+      "name" : {
+        "value" : "Rusty"
       },
       "meta" : {
-        "globalKey" : "2e7ec660"
+        "globalKey" : "7766c429",
+        "externalKey" : "partyB"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2009-01-07",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2007VarianceSwapEuropeanRev1"
+            },
+            "masterConfirmationAnnexType" : {
+              "value" : "ISDA2007VarianceOptionEuropean"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "e3aea1bd"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "e3aea1bd"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "ddc0658f"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "589fa431"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "a9725448"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "3e4ef71f"
-        }
-      },
       "quantity" : {
+        "value" : 1500000,
         "unit" : {
           "currency" : {
             "value" : "GBP"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "d53e12f6",
+          "externalReference" : "partyA"
         },
-        "value" : 1500000
+        "receiverPartyReference" : {
+          "globalReference" : "7766c429",
+          "externalReference" : "partyB"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2009-01-29",
         "dateAdjustments" : {
-          "businessDayConvention" : "NOT_APPLICABLE",
+          "businessDayConvention" : "NotApplicable",
           "meta" : {
             "globalKey" : "3a4b88ab"
           }
-        },
-        "unadjustedDate" : "2009-01-29"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "ebb16fcd"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "f42f2f9c"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex07-variance-option-transaction-supplement-pred-clearing.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex07-variance-option-transaction-supplement-pred-clearing.json
index cca06d5ce9..24f4fc8c52 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex07-variance-option-transaction-supplement-pred-clearing.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex07-variance-option-transaction-supplement-pred-clearing.json
@@ -1,113 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "7afc4e6b"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2009-01-07",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationAnnexType" : {
-              "value" : "ISDA_2007_VARIANCE_OPTION_EUROPEAN"
-            },
-            "masterConfirmationType" : {
-              "value" : "ISDA_2007_VARIANCE_SWAP_EUROPEAN_REV_1"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "d53e12f6",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "166555",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "e15177bd"
         }
       } ],
       "meta" : {
-        "globalKey" : "e15177bd"
+        "globalKey" : "ec318949"
       }
-    },
-    "meta" : {
-      "globalKey" : "8672a4ba"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "a9725448"
-      },
-      "name" : {
-        "value" : "SwapsWire Ltd (LE)"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "ABC1"
-        },
-        "meta" : {
-          "globalKey" : "1e8c2f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "3e4ef71f"
-      },
-      "name" : {
-        "value" : "Rusty"
+      "issuerReference" : {
+        "globalReference" : "7766c429",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "166555",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "ABC6"
-        },
-        "meta" : {
-          "globalKey" : "1e8c34"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "clearing-svc",
-        "globalKey" : "b2687a98"
-      },
-      "name" : {
-        "value" : "ClearItAll Corp"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300IB5Q45JGNPND58"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e213e7d7"
-        }
-      } ]
+        "globalKey" : "ec31fda8"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-01-27",
+      "meta" : {
+        "globalKey" : "3ec85b"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "clearing-svc",
-          "globalReference" : "b2687a98"
-        } ],
-        "role" : "PREDETERMINED_CLEARING_ORGANIZATION_PARTY"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "a9725448"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "3e4ef71f"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -116,54 +48,47 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "8371ad24"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "a9ad5102"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "GBP"
                   },
-                  "settlementType" : "CASH",
+                  "meta" : {
+                    "globalKey" : "a9ad5102"
+                  },
                   "physicalSettlementTerms" : {
                     "clearedPhysicalSettlement" : true,
+                    "predeterminedClearingOrganizationParty" : "PredeterminedClearingOrganizationParty",
                     "meta" : {
                       "globalKey" : "5d273b4a"
-                    },
-                    "predeterminedClearingOrganizationParty" : "PREDETERMINED_CLEARING_ORGANIZATION_PARTY"
+                    }
                   }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2015-03-20",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "26af9c7f"
-                          },
-                          "unadjustedDate" : "2015-03-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "26af9c7f"
@@ -174,12 +99,13 @@
                         "globalKey" : "e4555d13"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
+                    }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "8371ad24"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -188,71 +114,65 @@
                     } ],
                     "economicTerms" : {
                       "payout" : {
-                        "meta" : {
-                          "globalKey" : "95a489dc"
-                        },
                         "performancePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
                           "settlementTerms" : {
-                            "meta" : {
-                              "globalKey" : "18e87542"
-                            },
+                            "settlementType" : "Cash",
                             "settlementCurrency" : {
                               "value" : "GBP"
                             },
                             "settlementDate" : {
                               "adjustableOrRelativeDate" : {
                                 "relativeDate" : {
+                                  "periodMultiplier" : 2,
+                                  "period" : "D",
                                   "meta" : {
-                                    "globalKey" : "e08b898a"
+                                    "globalKey" : "738dbfce"
                                   },
-                                  "period" : "D",
-                                  "periodMultiplier" : 2,
-                                  "dayType" : "CURRENCY_BUSINESS",
-                                  "businessDayConvention" : "NOT_APPLICABLE",
+                                  "dayType" : "CurrencyBusiness",
+                                  "businessDayConvention" : "NotApplicable",
                                   "dateRelativeTo" : {
                                     "externalReference" : "valuationDate"
                                   }
                                 }
                               },
                               "meta" : {
-                                "globalKey" : "e08b898a"
+                                "globalKey" : "738dbfce"
                               }
                             },
-                            "settlementType" : "CASH"
-                          },
-                          "meta" : {
-                            "globalKey" : "95a489dc"
+                            "meta" : {
+                              "globalKey" : "abeaab86"
+                            }
                           },
                           "observationTerms" : {
                             "observationDates" : {
                               "periodicSchedule" : {
                                 "startDate" : {
                                   "adjustableDate" : {
+                                    "unadjustedDate" : "2009-01-27",
                                     "dateAdjustments" : {
-                                      "businessDayConvention" : "NOT_APPLICABLE",
+                                      "businessDayConvention" : "NotApplicable",
                                       "meta" : {
                                         "globalKey" : "3a4b88ab"
                                       }
                                     },
                                     "meta" : {
                                       "globalKey" : "25f9a646"
-                                    },
-                                    "unadjustedDate" : "2009-01-27"
+                                    }
                                   },
                                   "meta" : {
                                     "globalKey" : "25f9a646"
@@ -261,26 +181,27 @@
                               }
                             }
                           },
-                          "returnTerms" : {
-                            "varianceReturnTerms" : {
-                              "expectedN" : 542,
-                              "valuationTerms" : {
-                                "futuresPriceValuation" : true
-                              },
-                              "varianceCapFloor" : {
-                                "varianceCap" : false
-                              },
-                              "varianceStrikePrice" : {
-                                "value" : 225,
-                                "priceType" : "VARIANCE"
-                              },
-                              "vegaNotionalAmount" : {
-                                "unit" : {
-                                  "currency" : {
-                                    "value" : "GBP"
+                          "valuationDates" : {
+                            "valuationDatesFinal" : {
+                              "valuationDate" : {
+                                "adjustableDate" : {
+                                  "unadjustedDate" : "2011-03-18",
+                                  "dateAdjustments" : {
+                                    "businessDayConvention" : "NotApplicable",
+                                    "meta" : {
+                                      "globalKey" : "3a4b88ab"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "263774fd"
                                   }
                                 },
-                                "value" : 1000000
+                                "meta" : {
+                                  "globalKey" : "263774fd"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "263774fd"
                               }
                             }
                           },
@@ -302,192 +223,271 @@
                               "globalKey" : "0"
                             }
                           },
-                          "valuationDates" : {
-                            "valuationDatesFinal" : {
-                              "meta" : {
-                                "globalKey" : "263774fd"
+                          "returnTerms" : {
+                            "varianceReturnTerms" : {
+                              "valuationTerms" : {
+                                "futuresPriceValuation" : true
                               },
-                              "valuationDate" : {
-                                "adjustableDate" : {
-                                  "dateAdjustments" : {
-                                    "businessDayConvention" : "NOT_APPLICABLE",
-                                    "meta" : {
-                                      "globalKey" : "3a4b88ab"
-                                    }
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "263774fd"
-                                  },
-                                  "unadjustedDate" : "2011-03-18"
-                                },
-                                "meta" : {
-                                  "globalKey" : "263774fd"
+                              "expectedN" : 542,
+                              "varianceStrikePrice" : {
+                                "value" : 225,
+                                "priceType" : "Variance"
+                              },
+                              "varianceCapFloor" : {
+                                "varianceCap" : false
+                              },
+                              "vegaNotionalAmount" : {
+                                "value" : 1000000,
+                                "unit" : {
+                                  "currency" : {
+                                    "value" : "GBP"
+                                  }
                                 }
                               }
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "6266e250"
                           }
-                        } ]
+                        } ],
+                        "meta" : {
+                          "globalKey" : "6266e250"
+                        }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "95a489dc"
+                      "globalKey" : "6266e250"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "95a489dc"
+                    "globalKey" : "6266e250"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "d7170e12"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "d7170e12"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "8371ad24"
+            "globalKey" : "d7170e12"
           }
         },
         "meta" : {
-          "globalKey" : "8371ad24"
+          "globalKey" : "d7170e12"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "60eb526"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "9248da94"
+          "quantity" : [ {
+            "value" : {
+              "value" : 33333.33,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : ".FTSE",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/spec/2003/instrument-id-Reuters-RIC-1-0"
-                  },
-                  "value" : ".FTSE"
+                  }
                 },
+                "source" : "RIC",
                 "meta" : {
                   "globalKey" : "74f02ba"
-                },
-                "source" : "RIC"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "FTSE 100 INDEX"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "b921390e"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
                 }
               },
-              "value" : 33333.33
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "b6d277ec"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "b41ee8a6"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "d53e12f6",
+          "externalReference" : "partyA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "7766c429",
+          "externalReference" : "partyB"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "PredeterminedClearingOrganizationParty",
+        "partyReference" : [ {
+          "globalReference" : "fff6958",
+          "externalReference" : "clearing-svc"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec85b"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "ABC1",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "1e8c2f"
+        }
+      } ],
+      "name" : {
+        "value" : "SwapsWire Ltd (LE)"
       },
-      "value" : "2009-01-27"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "d53e12f6",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABC6",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "166555"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "1e8c34"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "a9725448"
+      "name" : {
+        "value" : "Rusty"
       },
       "meta" : {
-        "globalKey" : "2e7ec65f"
+        "globalKey" : "7766c429",
+        "externalKey" : "partyB"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300IB5Q45JGNPND58",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "166555"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e213e7d7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "3e4ef71f"
+      "name" : {
+        "value" : "ClearItAll Corp"
       },
       "meta" : {
-        "globalKey" : "2e7ec660"
+        "globalKey" : "fff6958",
+        "externalKey" : "clearing-svc"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2009-01-07",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2007VarianceSwapEuropeanRev1"
+            },
+            "masterConfirmationAnnexType" : {
+              "value" : "ISDA2007VarianceOptionEuropean"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "e3aea1bd"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "e3aea1bd"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "9c37892e"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "589fa431"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "a9725448"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "3e4ef71f"
-        }
-      },
       "quantity" : {
+        "value" : 1500000,
         "unit" : {
           "currency" : {
             "value" : "GBP"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "d53e12f6",
+          "externalReference" : "partyA"
         },
-        "value" : 1500000
+        "receiverPartyReference" : {
+          "globalReference" : "7766c429",
+          "externalReference" : "partyB"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2009-01-29",
         "dateAdjustments" : {
-          "businessDayConvention" : "NOT_APPLICABLE",
+          "businessDayConvention" : "NotApplicable",
           "meta" : {
             "globalKey" : "3a4b88ab"
           }
-        },
-        "unadjustedDate" : "2009-01-29"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "ebb16fcd"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "ab16497b"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/volatility-swaps/eqvls-ex01-volatility-swap-index-matrix.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/volatility-swaps/eqvls-ex01-volatility-swap-index-matrix.json
index ad3456782a..bf57b28cb6 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/volatility-swaps/eqvls-ex01-volatility-swap-index-matrix.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/volatility-swaps/eqvls-ex01-volatility-swap-index-matrix.json
@@ -1,109 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "ae2d3527"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2003-10-01",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "meta" : {
-                "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
-              },
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "e14bf9a6"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA_2011_EQUITY"
-            } ],
-            "contractualMatrix" : [ {
-              "matrixTerm" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/equity-matrix-transaction-type"
-                },
-                "value" : "IVS_1_OPEN_MARKETS"
-              },
-              "matrixType" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/matrix-type"
-                },
-                "value" : "EQUITY_DERIVATIVES_MATRIX"
-              }
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "6403855",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "ea1d8c74"
         }
       } ],
       "meta" : {
-        "globalKey" : "e7d22e9a"
+        "globalKey" : "19836e0c"
       }
-    },
-    "meta" : {
-      "globalKey" : "ae2d3527"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "6403855",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "1983e26b"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2015-03-30",
+      "meta" : {
+        "globalKey" : "3ef8de"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -112,51 +48,45 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "402fb4b1"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "112d5"
-                  },
                   "settlementCurrency" : {
                     "value" : "GBP"
+                  },
+                  "meta" : {
+                    "globalKey" : "112d5"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "402fb4b1"
-                },
                 "observationTerms" : {
                   "observationDates" : {
                     "periodicSchedule" : {
                       "startDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2015-03-30",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "26afc209"
-                          },
-                          "unadjustedDate" : "2015-03-30"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "26afc209"
@@ -165,17 +95,27 @@
                     }
                   }
                 },
-                "returnTerms" : {
-                  "volatilityReturnTerms" : {
-                    "expectedN" : 5,
-                    "volatilityCapFloor" : {
-                      "applicable" : true,
-                      "totalVolatilityCap" : 897,
-                      "volatilityCapFactor" : 3.0
+                "valuationDates" : {
+                  "valuationDatesFinal" : {
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2015-04-07",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "26b05bf2"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "26b05bf2"
+                      }
                     },
-                    "volatilityStrikePrice" : {
-                      "value" : 299.00,
-                      "priceType" : "VOLATILITY"
+                    "meta" : {
+                      "globalKey" : "26b05bf2"
                     }
                   }
                 },
@@ -192,128 +132,188 @@
                     "globalKey" : "0"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "meta" : {
-                      "globalKey" : "26b05bf2"
+                "returnTerms" : {
+                  "volatilityReturnTerms" : {
+                    "expectedN" : 5,
+                    "volatilityStrikePrice" : {
+                      "value" : 299.00,
+                      "priceType" : "Volatility"
                     },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "26b05bf2"
-                        },
-                        "unadjustedDate" : "2015-04-07"
-                      },
-                      "meta" : {
-                        "globalKey" : "26b05bf2"
-                      }
+                    "volatilityCapFloor" : {
+                      "applicable" : true,
+                      "totalVolatilityCap" : 897,
+                      "volatilityCapFactor" : 3.0
                     }
                   }
+                },
+                "meta" : {
+                  "globalKey" : "9877fe4d"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "9877fe4d"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "402fb4b1"
+            "globalKey" : "9877fe4d"
           }
         },
         "meta" : {
-          "globalKey" : "402fb4b1"
+          "globalKey" : "9877fe4d"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a27a9a1c"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "74f02ba"
+          "quantity" : [ {
+            "value" : {
+              "value" : 1000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : ".FTSE",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/spec/2003/instrument-id-Reuters-RIC-1-0"
-                  },
-                  "value" : ".FTSE"
+                  }
                 },
+                "source" : "RIC",
                 "meta" : {
                   "globalKey" : "74f02ba"
-                },
-                "source" : "RIC"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
                 }
               },
-              "value" : 1000.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "e2915486"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "34c6209c"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef8de"
-      },
-      "value" : "2015-03-30"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "6403855"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "6a381042"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "6403855"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "6a381043"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2003-10-01",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster",
+              "meta" : {
+                "scheme" : "http://dtcc.com/coding-scheme/master-agreement-type"
+              }
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "e14bf9a6"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2011Equity",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ],
+            "contractualMatrix" : [ {
+              "matrixType" : {
+                "value" : "EquityDerivativesMatrix",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/matrix-type"
+                }
+              },
+              "matrixTerm" : {
+                "value" : "IVS1OpenMarkets",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/equity-matrix-transaction-type"
+                }
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "fbd76734"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "f98c095a"
+      }
+    },
+    "meta" : {
+      "globalKey" : "81aa3e2f"
+    }
+  },
+  "meta" : {
+    "globalKey" : "81aa3e2f"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/volatility-swaps/eqvls-ex02-volatility-swap-index-mca.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/volatility-swaps/eqvls-ex02-volatility-swap-index-mca.json
index 5d909ec51c..3b50184f27 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/volatility-swaps/eqvls-ex02-volatility-swap-index-mca.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/volatility-swaps/eqvls-ex02-volatility-swap-index-mca.json
@@ -1,95 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "8399dd24"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2010-01-01",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/master-confirmation-type"
-              },
-              "value" : "ISDA_2013_VOLATILITY_SWAP_EUROPEAN"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "b8def219"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "6403855",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "2092c901"
         }
       } ],
       "meta" : {
-        "globalKey" : "61e43e88"
+        "globalKey" : "19836e0c"
       }
-    },
-    "meta" : {
-      "globalKey" : "8399dd24"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "6403855",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "1983e26b"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2015-03-30",
+      "meta" : {
+        "globalKey" : "3ef8de"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -98,51 +48,45 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "aedfc200"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "112d5"
-                  },
                   "settlementCurrency" : {
                     "value" : "GBP"
+                  },
+                  "meta" : {
+                    "globalKey" : "112d5"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "aedfc200"
-                },
                 "observationTerms" : {
                   "observationDates" : {
                     "periodicSchedule" : {
                       "startDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2015-03-30",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "26afc209"
-                          },
-                          "unadjustedDate" : "2015-03-30"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "26afc209"
@@ -151,20 +95,27 @@
                     }
                   }
                 },
-                "returnTerms" : {
-                  "volatilityReturnTerms" : {
-                    "expectedN" : 5,
-                    "valuationTerms" : {
-                      "futuresPriceValuation" : true
-                    },
-                    "volatilityCapFloor" : {
-                      "applicable" : true,
-                      "totalVolatilityCap" : 897,
-                      "volatilityCapFactor" : 3.0
+                "valuationDates" : {
+                  "valuationDatesFinal" : {
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2015-04-07",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "26b05bf2"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "26b05bf2"
+                      }
                     },
-                    "volatilityStrikePrice" : {
-                      "value" : 299.00,
-                      "priceType" : "VOLATILITY"
+                    "meta" : {
+                      "globalKey" : "26b05bf2"
                     }
                   }
                 },
@@ -181,128 +132,177 @@
                     "globalKey" : "0"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "meta" : {
-                      "globalKey" : "26b05bf2"
+                "returnTerms" : {
+                  "volatilityReturnTerms" : {
+                    "valuationTerms" : {
+                      "futuresPriceValuation" : true
                     },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "26b05bf2"
-                        },
-                        "unadjustedDate" : "2015-04-07"
-                      },
-                      "meta" : {
-                        "globalKey" : "26b05bf2"
-                      }
+                    "expectedN" : 5,
+                    "volatilityStrikePrice" : {
+                      "value" : 299.00,
+                      "priceType" : "Volatility"
+                    },
+                    "volatilityCapFloor" : {
+                      "applicable" : true,
+                      "totalVolatilityCap" : 897,
+                      "volatilityCapFactor" : 3.0
                     }
                   }
+                },
+                "meta" : {
+                  "globalKey" : "f026971e"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "f026971e"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "aedfc200"
+            "globalKey" : "f026971e"
           }
         },
         "meta" : {
-          "globalKey" : "aedfc200"
+          "globalKey" : "f026971e"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a27a9a1c"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "74f02ba"
+          "quantity" : [ {
+            "value" : {
+              "value" : 1000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : ".FTSE",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/spec/2003/instrument-id-Reuters-RIC-1-0"
-                  },
-                  "value" : ".FTSE"
+                  }
                 },
+                "source" : "RIC",
                 "meta" : {
                   "globalKey" : "74f02ba"
-                },
-                "source" : "RIC"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
                 }
               },
-              "value" : 1000.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "e2915486"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "34c6209c"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef8de"
-      },
-      "value" : "2015-03-30"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "6403855"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "6a381042"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "6403855"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "6a381043"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2010-01-01",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2013VolatilitySwapEuropean",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/master-confirmation-type"
+              }
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "b8def219"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2002Equity",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "2092c901"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "61e43e88"
+      }
+    },
+    "meta" : {
+      "globalKey" : "f2f33fe4"
+    }
+  },
+  "meta" : {
+    "globalKey" : "f2f33fe4"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/incomplete-products/equity/eqs-ex04-zero-strike-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/incomplete-products/equity/eqs-ex04-zero-strike-long-form.json
index 10e0ca9aae..b0885608fb 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/incomplete-products/equity/eqs-ex04-zero-strike-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/incomplete-products/equity/eqs-ex04-zero-strike-long-form.json
@@ -1,112 +1,50 @@
 {
-  "meta" : {
-    "globalKey" : "693850c6"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/eqs-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
       "meta" : {
-        "globalKey" : "92c7c587"
+        "globalKey" : "95918657"
       }
-    },
-    "meta" : {
-      "globalKey" : "693850c6"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "5678",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/eqs-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9593dbb6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-10-17",
+      "meta" : {
+        "globalKey" : "3e9291",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleName"
@@ -114,170 +52,123 @@
             }
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-10-24",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "252fd543"
-                },
-                "unadjustedDate" : "2002-10-24"
+                }
               },
               "meta" : {
-                "externalKey" : "EffectiveDate",
-                "globalKey" : "252fd543"
+                "globalKey" : "252fd543",
+                "externalKey" : "EffectiveDate"
               }
             },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "edf02740"
+                },
+                "businessDayConvention" : "NotApplicable",
+                "dateRelativeTo" : {
+                  "globalReference" : "55830660",
+                  "externalReference" : "FinalEquityPaymentDate"
+                }
               },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
+              "meta" : {
+                "globalKey" : "edf02740",
+                "externalKey" : "TerminationDate"
               }
             },
             "payout" : {
-              "meta" : {
-                "globalKey" : "9fb10ae3"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "4d5"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : false
+                  "reset" : false,
+                  "meta" : {
+                    "globalKey" : "4d5"
+                  }
                 },
-                "fxFeature" : [ {
-                  "composite" : {
-                    "determinationMethod" : "CALCULATION_AGENT"
-                  },
-                  "referenceCurrency" : {
-                    "meta" : {
-                      "externalKey" : "ReferenceCurrency",
-                      "globalKey" : "14966"
+                "valuationDates" : {
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2004-10-17",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "256bcafc"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "256bcafc",
+                        "externalKey" : "FinalValuationDate"
+                      }
                     },
-                    "value" : "USD"
+                    "meta" : {
+                      "globalKey" : "97374c7e"
+                    }
                   }
-                } ],
-                "meta" : {
-                  "globalKey" : "9fb10ae3"
                 },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "EquityPaymentDate",
-                    "globalKey" : "41f04cbe"
-                  },
                   "paymentDateSchedule" : {
                     "finalPaymentDate" : {
-                      "meta" : {
-                        "externalKey" : "FinalEquityPaymentDate",
-                        "globalKey" : "41f04cbe"
-                      },
                       "relativeDate" : {
+                        "periodMultiplier" : 5,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "41f04cbe"
+                          "globalKey" : "55830660"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 5,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "PrimaryBusinessCenter",
-                            "globalKey" : "27e4e9"
+                            "globalKey" : "27e4e9",
+                            "externalKey" : "PrimaryBusinessCenter"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "FinalValuationDate",
-                          "globalReference" : "256bcafc"
-                        }
-                      }
-                    }
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendCurrency" : {
-                      "currencyReference" : {
-                        "externalReference" : "ReferenceCurrency",
-                        "globalReference" : "14966"
-                      }
-                    },
-                    "dividendEntitlement" : "EX_DATE",
-                    "dividendPayoutRatio" : [ {
-                      "totalRatio" : 1
-                    } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "EQUITY_PAYMENT_DATE"
-                        }
-                      },
-                      "endDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "FinalValuationDate",
-                          "globalReference" : "256bcafc"
+                          "globalReference" : "256bcafc",
+                          "externalReference" : "FinalValuationDate"
                         }
                       },
-                      "startDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "TradeDate",
-                          "globalReference" : "3e9291"
-                        }
+                      "meta" : {
+                        "globalKey" : "55830660",
+                        "externalKey" : "FinalEquityPaymentDate"
                       }
-                    } ],
-                    "dividendReinvestment" : false,
-                    "excessDividendAmount" : "PAID_AMOUNT"
+                    }
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                  "meta" : {
+                    "globalKey" : "55830660",
+                    "externalKey" : "EquityPaymentDate"
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -290,201 +181,310 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
+                "fxFeature" : [ {
+                  "referenceCurrency" : {
+                    "value" : "USD",
                     "meta" : {
-                      "globalKey" : "97374c7e"
+                      "globalKey" : "14966",
+                      "externalKey" : "ReferenceCurrency"
+                    }
+                  },
+                  "composite" : {
+                    "determinationMethod" : "CalculationAgent"
+                  }
+                } ],
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
+                  },
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 1
+                    } ],
+                    "dividendReinvestment" : false,
+                    "dividendEntitlement" : "ExDate",
+                    "excessDividendAmount" : "PaidAmount",
+                    "dividendCurrency" : {
+                      "currencyReference" : {
+                        "globalReference" : "14966",
+                        "externalReference" : "ReferenceCurrency"
+                      }
                     },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "256bcafc"
-                        },
-                        "unadjustedDate" : "2004-10-17"
+                    "dividendPeriod" : [ {
+                      "startDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "3e9291",
+                          "externalReference" : "TradeDate"
+                        }
                       },
-                      "meta" : {
-                        "externalKey" : "FinalValuationDate",
-                        "globalKey" : "256bcafc"
+                      "endDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "256bcafc",
+                          "externalReference" : "FinalValuationDate"
+                        }
+                      },
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "EquityPaymentDate"
+                        }
                       }
-                    }
+                    } ]
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "meta" : {
-                "externalKey" : "TerminationDate",
-                "globalKey" : "f18f7c48"
-              },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "f18f7c48"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NOT_APPLICABLE",
-                "dateRelativeTo" : {
-                  "externalReference" : "FinalEquityPaymentDate",
-                  "globalReference" : "41f04cbe"
+                "meta" : {
+                  "globalKey" : "fc63351"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "fc63351"
               }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "2170e702"
+            "globalKey" : "ec30b14a"
           }
         },
         "meta" : {
-          "globalKey" : "2170e702"
+          "globalKey" : "ec30b14a"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "8a4d676f"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "31ccbb3c"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.abc.com/instrumentId"
-                  },
-                  "value" : "ZEE.NS"
-                },
-                "meta" : {
-                  "globalKey" : "83fb1ca9"
-                },
-                "source" : "OTHER"
-              }
-            }, {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "value" : "ZEE"
-                },
-                "meta" : {
-                  "globalKey" : "88d35645"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 1.8036,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 1.8036,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
+              "priceType" : "AssetPrice"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 31000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 31000
             }
           }, {
+            "value" : {
+              "value" : 55911.60,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "ZEE.NS",
+                  "meta" : {
+                    "scheme" : "http://www.abc.com/instrumentId"
+                  }
+                },
+                "source" : "Other",
+                "meta" : {
+                  "globalKey" : "83fb1ca9"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
+              }
+            }, {
+              "value" : {
+                "identifier" : {
+                  "value" : "ZEE"
+                },
+                "source" : "Name",
+                "meta" : {
+                  "globalKey" : "88d35645"
                 }
               },
-              "value" : 55911.60
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "7caac44"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "dfc20b2f"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e9291"
-      },
-      "value" : "2002-10-17"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/eqs-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/eqs-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "5678"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "222ee2ce"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "81610bec"
+    }
+  },
+  "meta" : {
+    "globalKey" : "81610bec"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/commodity/com-ex1-gas-swap-daily-delivery-prices-last.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/commodity/com-ex1-gas-swap-daily-delivery-prices-last.json
index 34eb55ea35..d1ef39b9b4 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/commodity/com-ex1-gas-swap-daily-delivery-prices-last.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/commodity/com-ex1-gas-swap-daily-delivery-prices-last.json
@@ -1,96 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "2fd3899b"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "a977e59e"
         }
       } ],
       "meta" : {
-        "globalKey" : "fb7fd677"
+        "globalKey" : "9598cc47"
       }
-    },
-    "meta" : {
-      "globalKey" : "2fd3899b"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.PartyB.com/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-06-01",
+      "meta" : {
+        "globalKey" : "3eb181"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -100,70 +49,104 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2006-07-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25a4ce2c"
-                },
-                "unadjustedDate" : "2006-07-01"
+                }
               },
               "meta" : {
                 "globalKey" : "25a4ce2c"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-07-31",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "25a53eca"
+                }
+              },
+              "meta" : {
+                "globalKey" : "25a53eca"
+              }
+            },
             "payout" : {
               "commodityPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
+                },
+                "pricingDates" : {
+                  "parametricDates" : {
+                    "dayType" : "Business",
+                    "dayDistribution" : "Last",
+                    "businessCenters" : {
+                      "commodityBusinessCalendar" : [ {
+                        "value" : "NYMEX-NATURAL-GAS"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "acc66859"
+                      }
+                    }
+                  }
                 },
                 "calculationPeriodDates" : {
                   "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
                     "meta" : {
-                      "externalKey" : "floatingLegCalculationPeriods",
-                      "globalKey" : "12601"
+                      "globalKey" : "11e9",
+                      "externalKey" : "floatingLegCalculationPeriods"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 1,
                     "balanceOfFirstPeriod" : false
                   },
                   "meta" : {
-                    "globalKey" : "12601"
+                    "globalKey" : "11e9"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "528b7cbe"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "6b379f36"
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
+                    },
+                    "dayType" : "Business"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -172,32 +155,12 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "meta" : {
                       "globalKey" : "a98752b1"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf9f"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
-                  }
-                },
-                "pricingDates" : {
-                  "parametricDates" : {
-                    "businessCenters" : {
-                      "commodityBusinessCalendar" : [ {
-                        "value" : "NYMEX-NATURAL-GAS"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "acc66859"
-                      }
-                    },
-                    "dayDistribution" : "LAST",
-                    "dayType" : "BUSINESS"
+                  "meta" : {
+                    "globalKey" : "ff6175f6"
                   }
                 },
                 "underlier" : {
@@ -210,41 +173,39 @@
                   "meta" : {
                     "globalKey" : "0"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "202d7348"
                 }
               } ],
               "fixedPricePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "fixedPrice" : {
-                  "price" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "price-1"
-                    }
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "e17aca77"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "6b379f36"
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
+                    },
+                    "dayType" : "Business"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -253,231 +214,270 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "meta" : {
                       "globalKey" : "a98752b1"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf9f"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "241ca179"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
                   "meta" : {
-                    "globalKey" : "3a4b88ab"
+                    "globalKey" : "ff6175f6"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "25a53eca"
+                "fixedPrice" : {
+                  "price" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "price-1"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2006-07-31"
-              },
+                "meta" : {
+                  "globalKey" : "6310740b"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "25a53eca"
+                "globalKey" : "d41ef9c3"
               }
             }
           },
           "meta" : {
-            "globalKey" : "3c13fb1d"
+            "globalKey" : "2efb24e5"
           }
         },
         "meta" : {
-          "globalKey" : "3c13fb1d"
+          "globalKey" : "2efb24e5"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "22f7394d"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 6.295,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 6.295,
-              "cashPrice" : {
-                "cashPriceType" : "FEE"
-              },
               "perUnitOf" : {
                 "capacityUnit" : "USMMBTU"
               },
-              "priceType" : "CASH_PRICE"
+              "priceType" : "CashPrice",
+              "cashPrice" : {
+                "cashPriceType" : "Fee"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 2500.0,
+              "unit" : {
+                "capacityUnit" : "USMMBTU"
+              },
+              "frequency" : {
+                "periodMultiplier" : 1,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "63"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
+            }
+          }, {
+            "value" : {
+              "value" : 77500.0,
+              "unit" : {
+                "capacityUnit" : "USMMBTU"
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-3"
+              } ]
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "70ac5839"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 2500.0,
               "unit" : {
                 "capacityUnit" : "USMMBTU"
               },
-              "value" : 2500.0,
               "frequency" : {
-                "meta" : {
-                  "globalKey" : "83d"
-                },
+                "periodMultiplier" : 1,
                 "period" : "D",
-                "periodMultiplier" : 1
+                "meta" : {
+                  "globalKey" : "63"
+                }
               }
-            }
-          }, {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-3"
+                "value" : "quantity-4"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 77500.0,
               "unit" : {
                 "capacityUnit" : "USMMBTU"
-              },
-              "value" : 77500.0
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "ed57726c"
-          },
+          } ],
           "observable" : {
             "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-1"
-                } ]
-              },
               "value" : {
                 "productIdentifier" : [ {
                   "value" : {
                     "identifier" : {
+                      "value" : "NATURAL GAS-HENRY HUB-NYMEX",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/commodity-reference-price-1-0"
-                      },
-                      "value" : "NATURAL GAS-HENRY HUB-NYMEX"
+                      }
                     },
+                    "source" : "ISDACRP",
                     "meta" : {
                       "globalKey" : "8ac8d504"
-                    },
-                    "source" : "ISDACRP"
+                    }
                   }
                 } ],
+                "priceQuoteType" : "Settlement",
                 "deliveryDateReference" : {
                   "deliveryNearby" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 1,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
                   }
-                },
-                "priceQuoteType" : "SETTLEMENT"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-1"
+                } ]
               }
             },
             "meta" : {
-              "globalKey" : "dd976f79"
+              "globalKey" : "d5556b8f"
             }
           },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-4"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "USMMBTU"
-              },
-              "value" : 2500.0,
-              "frequency" : {
-                "meta" : {
-                  "globalKey" : "83d"
-                },
-                "period" : "D",
-                "periodMultiplier" : 1
-              }
-            }
-          }, {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "USMMBTU"
-              },
-              "value" : 77500.0
-            }
-          } ]
+          "meta" : {
+            "globalKey" : "d84be710"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb181"
-      },
-      "value" : "2006-06-01"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "a977e59e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fb7fd677"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "cc9674c5"
+    }
+  },
+  "meta" : {
+    "globalKey" : "cc9674c5"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/commodity/com-ex5-gas-v-electricity-spark-spread.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/commodity/com-ex5-gas-v-electricity-spark-spread.json
index a0099304cf..66ce153167 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/commodity/com-ex5-gas-v-electricity-spark-spread.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/commodity/com-ex5-gas-v-electricity-spark-spread.json
@@ -1,96 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "40537266"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.PartyA.com/com-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "a977e59e"
         }
       } ],
       "meta" : {
-        "globalKey" : "fb7fd677"
+        "globalKey" : "9598cc47"
       }
-    },
-    "meta" : {
-      "globalKey" : "40537266"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.PartyB.com/com-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2008-06-11",
+      "meta" : {
+        "globalKey" : "3ec18b"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -100,59 +49,62 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2008-07-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25e0de2c"
-                },
-                "unadjustedDate" : "2008-07-01"
+                }
               },
               "meta" : {
                 "globalKey" : "25e0de2c"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2008-07-31",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "25e14eca"
+                }
+              },
+              "meta" : {
+                "globalKey" : "25e14eca"
+              }
+            },
             "payout" : {
               "commodityPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "externalKey" : "floatingLeg1CalculationPeriods",
-                      "globalKey" : "12601"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1,
-                    "balanceOfFirstPeriod" : false
-                  },
                   "meta" : {
-                    "globalKey" : "12601"
+                    "globalKey" : "7610bbd9"
                   }
                 },
                 "commodityPriceReturnTerms" : {
@@ -165,31 +117,10 @@
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "283bb41e"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "fc3af724"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessDayConvention" : "NOT_APPLICABLE",
-                    "meta" : {
-                      "globalKey" : "3a4b88ab"
-                    }
-                  },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf9f"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
-                  }
-                },
                 "pricingDates" : {
                   "parametricDates" : {
+                    "dayType" : "Business",
+                    "dayDistribution" : "Last",
                     "businessCenters" : {
                       "commodityBusinessCalendar" : [ {
                         "value" : "NYMEX-NATURAL-GAS"
@@ -197,9 +128,41 @@
                       "meta" : {
                         "globalKey" : "acc66859"
                       }
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "11e9",
+                      "externalKey" : "floatingLeg1CalculationPeriods"
                     },
-                    "dayDistribution" : "LAST",
-                    "dayType" : "BUSINESS"
+                    "balanceOfFirstPeriod" : false
+                  },
+                  "meta" : {
+                    "globalKey" : "11e9"
+                  }
+                },
+                "paymentDates" : {
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
+                    },
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "NotApplicable",
+                    "meta" : {
+                      "globalKey" : "3a4b88ab"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "2c4cb386"
                   }
                 },
                 "underlier" : {
@@ -212,67 +175,67 @@
                   "meta" : {
                     "globalKey" : "0"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "324c917c"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "averagingFeature" : {
                   "averagingMethod" : {
-                    "calculationMethod" : "ARITHMETIC",
-                    "isWeighted" : false
+                    "isWeighted" : false,
+                    "calculationMethod" : "Arithmetic"
                   }
                 },
                 "commodityPriceReturnTerms" : {
                   "conversionFactor" : 0.4913
                 },
-                "meta" : {
-                  "globalKey" : "12ccdca8"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "fc3af724"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessDayConvention" : "NOT_APPLICABLE",
-                    "meta" : {
-                      "globalKey" : "3a4b88ab"
-                    }
-                  },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf9f"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
-                  }
-                },
                 "pricingDates" : {
                   "parametricDates" : {
+                    "dayType" : "Calendar",
+                    "dayDistribution" : "All",
                     "businessCenters" : {
                       "commodityBusinessCalendar" : [ {
-                        "value" : "DOW_JONES_POWER"
+                        "value" : "DowJonesPower"
                       } ],
                       "meta" : {
                         "globalKey" : "e1cbae2a"
                       }
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
                     },
-                    "dayDistribution" : "ALL",
-                    "dayType" : "CALENDAR"
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "NotApplicable",
+                    "meta" : {
+                      "globalKey" : "3a4b88ab"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "2c4cb386"
                   }
                 },
                 "underlier" : {
@@ -285,246 +248,283 @@
                   "meta" : {
                     "globalKey" : "0"
                   }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "ce8f8746"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
-                  "meta" : {
-                    "globalKey" : "3a4b88ab"
-                  }
                 },
                 "meta" : {
-                  "globalKey" : "25e14eca"
-                },
-                "unadjustedDate" : "2008-07-31"
-              },
+                  "globalKey" : "e6788d6e"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "25e14eca"
+                "globalKey" : "3f85fbea"
               }
             }
           },
           "meta" : {
-            "globalKey" : "fcb7aa98"
+            "globalKey" : "fbf53708"
           }
         },
         "meta" : {
-          "globalKey" : "fcb7aa98"
+          "globalKey" : "fbf53708"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "48be9c16"
-          },
-          "observable" : {
-            "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-1"
-                } ]
-              },
-              "value" : {
-                "productIdentifier" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/commodity-reference-price"
-                      },
-                      "value" : "NATURAL GAS-HENRY HUB-NYMEX"
-                    },
-                    "meta" : {
-                      "globalKey" : "8ac8d504"
-                    },
-                    "source" : "ISDACRP"
-                  }
-                } ],
-                "deliveryDateReference" : {
-                  "deliveryNearby" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1
-                  }
-                },
-                "priceQuoteType" : "SETTLEMENT"
-              }
-            },
-            "meta" : {
-              "globalKey" : "dd976f79"
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : -1.45,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : -1.45,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "capacityUnit" : "USMMBTU"
               },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "AssetPrice",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 15000.0,
               "unit" : {
                 "capacityUnit" : "USMMBTU"
               },
-              "value" : 15000.0,
               "frequency" : {
-                "meta" : {
-                  "globalKey" : "83d"
-                },
+                "periodMultiplier" : 1,
                 "period" : "D",
-                "periodMultiplier" : 1
+                "meta" : {
+                  "globalKey" : "63"
+                }
               }
-            }
-          }, {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-3"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 465000.0,
               "unit" : {
                 "capacityUnit" : "USMMBTU"
-              },
-              "value" : 465000.0
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-3"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "9bf0936d"
-          },
+          } ],
           "observable" : {
             "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-2"
-                } ]
-              },
               "value" : {
                 "productIdentifier" : [ {
                   "value" : {
                     "identifier" : {
+                      "value" : "NATURAL GAS-HENRY HUB-NYMEX",
                       "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/commodity-reference-price-1-0"
-                      },
-                      "value" : "ELECTRICITY-MID-COLUMBIA FIRM (ON-PEAK)-DOW JONES POWER"
+                        "scheme" : "http://www.fpml.org/coding-scheme/commodity-reference-price"
+                      }
                     },
+                    "source" : "ISDACRP",
                     "meta" : {
-                      "globalKey" : "7dbe4bf4"
-                    },
-                    "source" : "ISDACRP"
+                      "globalKey" : "8ac8d504"
+                    }
                   }
                 } ],
-                "priceQuoteType" : "MEAN_OF_HIGH_AND_LOW"
+                "priceQuoteType" : "Settlement",
+                "deliveryDateReference" : {
+                  "deliveryNearby" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-1"
+                } ]
               }
             },
             "meta" : {
-              "globalKey" : "1d611a89"
+              "globalKey" : "d5556b8f"
             }
           },
+          "meta" : {
+            "globalKey" : "fe1a6766"
+          }
+        }, {
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-4"
-              } ]
-            },
             "value" : {
+              "value" : 15000.0,
               "unit" : {
                 "capacityUnit" : "USMMBTU"
               },
-              "value" : 15000.0,
               "frequency" : {
-                "meta" : {
-                  "globalKey" : "83d"
-                },
+                "periodMultiplier" : 1,
                 "period" : "D",
-                "periodMultiplier" : 1
+                "meta" : {
+                  "globalKey" : "63"
+                }
               }
-            }
-          }, {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-4"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 465000.0,
               "unit" : {
                 "capacityUnit" : "USMMBTU"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "commodity" : {
+              "value" : {
+                "productIdentifier" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "ELECTRICITY-MID-COLUMBIA FIRM (ON-PEAK)-DOW JONES POWER",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/commodity-reference-price-1-0"
+                      }
+                    },
+                    "source" : "ISDACRP",
+                    "meta" : {
+                      "globalKey" : "7dbe4bf4"
+                    }
+                  }
+                } ],
+                "priceQuoteType" : "MeanOfHighAndLow"
               },
-              "value" : 465000.0
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-2"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "8ec23697"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "f17b87e7"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec18b"
-      },
-      "value" : "2008-06-11"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/com-trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/com-trade-id"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "a977e59e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fb7fd677"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "f5f5216c"
+    }
+  },
+  "meta" : {
+    "globalKey" : "f5f5216c"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/commodity/com-ex8-oil-call-option-strip.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/commodity/com-ex8-oil-call-option-strip.json
index 2e6dbfb606..d93e46511d 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/commodity/com-ex8-oil-call-option-strip.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/commodity/com-ex8-oil-call-option-strip.json
@@ -1,96 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "a96abbc"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2005_COMMODITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "687239fc",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1234",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "a977e59e"
         }
       } ],
       "meta" : {
-        "globalKey" : "fb7fd677"
+        "globalKey" : "9598cc47"
       }
-    },
-    "meta" : {
-      "globalKey" : "80adf080"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "d42113fc"
-      },
-      "name" : {
-        "value" : "Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300KFSLY4U7N3LL12"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3f3e27a0"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "6e437d45"
-      },
-      "name" : {
-        "value" : "Energy Co."
+      "issuerReference" : {
+        "globalReference" : "a2492785",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "2345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300AJRHKBLY9GM262"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "c803429b"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9599b8e6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2008-02-05",
+      "meta" : {
+        "globalKey" : "3ec085"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -100,117 +49,115 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2008-08-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25e1ce6c"
-                },
-                "unadjustedDate" : "2008-08-01"
+                }
               },
               "meta" : {
                 "globalKey" : "25e1ce6c"
               }
             },
             "payout" : {
-              "meta" : {
-                "globalKey" : "b2fff585"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "80e4d980"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 5,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "5f4eeb79"
+                          "globalKey" : "5f333497"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 5,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
                         "businessDayConvention" : "NONE"
                       }
                     },
                     "meta" : {
-                      "globalKey" : "5f4eeb79"
+                      "globalKey" : "5f333497"
                     }
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "80c9229e"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2008-08-30",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "25e23b49"
-                          },
-                          "unadjustedDate" : "2008-08-30"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "25e23b49"
                         }
                       }, {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2008-09-30",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "25e32b89"
-                          },
-                          "unadjustedDate" : "2008-09-30"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "25e32b89"
                         }
                       }, {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2008-10-31",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "25e41f8a"
-                          },
-                          "unadjustedDate" : "2008-10-31"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "25e41f8a"
@@ -223,230 +170,283 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 1120,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1120,
                       "perUnitOf" : {
                         "capacityUnit" : "MT"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "b2fff585"
+                "underlier" : {
+                  "commodity" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "commodity-1"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
                 },
                 "observationTerms" : {
                   "calculationPeriodDates" : {
                     "calculationPeriodFrequency" : {
+                      "periodMultiplier" : 1,
+                      "period" : "M",
                       "meta" : {
-                        "externalKey" : "CalculationPeriods",
-                        "globalKey" : "12601"
+                        "globalKey" : "11e9",
+                        "externalKey" : "CalculationPeriods"
                       },
-                      "period" : "M",
-                      "periodMultiplier" : 1,
                       "balanceOfFirstPeriod" : false
                     },
                     "meta" : {
-                      "globalKey" : "12601"
+                      "globalKey" : "11e9"
                     }
                   },
                   "observationDates" : {
                     "parametricDates" : {
-                      "dayDistribution" : "ALL",
-                      "dayType" : "BUSINESS"
+                      "dayType" : "Business",
+                      "dayDistribution" : "All"
                     }
                   }
                 },
-                "optionType" : "CALL",
-                "underlier" : {
-                  "commodity" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "commodity-1"
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "0"
-                  }
+                "meta" : {
+                  "globalKey" : "6254d82d"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "6254d82d"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "c3bf3399"
+            "globalKey" : "73141641"
           }
         },
         "meta" : {
-          "globalKey" : "c3bf3399"
+          "globalKey" : "73141641"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "21eb470"
-          },
+          "quantity" : [ {
+            "value" : {
+              "value" : 10000,
+              "unit" : {
+                "capacityUnit" : "MT"
+              },
+              "frequency" : {
+                "periodMultiplier" : 1,
+                "period" : "C",
+                "meta" : {
+                  "globalKey" : "62"
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          }, {
+            "value" : {
+              "value" : 30000,
+              "unit" : {
+                "capacityUnit" : "MT"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
           "observable" : {
             "commodity" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "commodity-1"
-                } ]
-              },
               "value" : {
                 "productIdentifier" : [ {
                   "value" : {
                     "identifier" : {
+                      "value" : "GAS OIL-IPE",
                       "meta" : {
                         "scheme" : "http://www.partyA.com/instrumentId/commodity-reference-price"
-                      },
-                      "value" : "GAS OIL-IPE"
+                      }
                     },
+                    "source" : "ISDACRP",
                     "meta" : {
                       "globalKey" : "a9ba09b6"
-                    },
-                    "source" : "ISDACRP"
+                    }
                   }
                 } ],
+                "priceQuoteType" : "Settlement",
                 "deliveryDateReference" : {
-                  "deliveryDateRollConvention" : {
+                  "deliveryNearby" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "83d"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 1
+                      "globalKey" : "6c"
+                    }
                   },
-                  "deliveryNearby" : {
+                  "deliveryDateRollConvention" : {
+                    "periodMultiplier" : 1,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "954"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1
+                      "globalKey" : "63"
+                    }
                   }
-                },
-                "priceQuoteType" : "SETTLEMENT"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "commodity-1"
+                } ]
               }
             },
             "meta" : {
-              "globalKey" : "7548ca64"
+              "globalKey" : "c5a9b59c"
             }
           },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "MT"
-              },
-              "value" : 10000,
-              "frequency" : {
-                "meta" : {
-                  "globalKey" : "81e"
-                },
-                "period" : "C",
-                "periodMultiplier" : 1
-              }
-            }
-          }, {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "capacityUnit" : "MT"
-              },
-              "value" : 30000
-            }
-          } ]
+          "meta" : {
+            "globalKey" : "22a0172c"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec085"
-      },
-      "value" : "2008-02-05"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300KFSLY4U7N3LL12",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3f3e27a0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "d42113fc"
+      "name" : {
+        "value" : "Bank"
       },
       "meta" : {
-        "globalKey" : "1b2141dd"
+        "globalKey" : "687239fc",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300AJRHKBLY9GM262",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "2345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "c803429b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "6e437d45"
+      "name" : {
+        "value" : "Energy Co."
       },
       "meta" : {
-        "globalKey" : "1ce4aa1e"
+        "globalKey" : "a2492785",
+        "externalKey" : "partyB"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2005Commodity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "a977e59e"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "fb7fd677"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "9abb4108"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "ea53db3c"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "d42113fc"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "6e437d45"
-        }
-      },
       "quantity" : {
+        "value" : 400000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "687239fc",
+          "externalReference" : "partyA"
         },
-        "value" : 400000
+        "receiverPartyReference" : {
+          "globalReference" : "a2492785",
+          "externalReference" : "partyB"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2008-02-07",
         "dateAdjustments" : {
-          "businessDayConvention" : "NOT_APPLICABLE",
+          "businessDayConvention" : "NotApplicable",
           "meta" : {
             "globalKey" : "3a4b88ab"
           }
-        },
-        "unadjustedDate" : "2008-02-07"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "dd23b6"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "32fd32be"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex01-long-asia-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex01-long-asia-corp-fixreg.json
index 23e1a0dc85..3ef1bf26e6 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex01-long-asia-corp-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex01-long-asia-corp-fixreg.json
@@ -1,113 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "37c4b603"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_1999_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_SUCCESSOR_AND_CREDIT_EVENTS"
-              }
-            }, {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_1999_CREDIT_CONVERTIBLE_EXCHANGEABLE_ACCRETING_OBLIGATIONS"
-              }
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "37209",
+          "meta" : {
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "91a1d99b"
         }
       } ],
       "meta" : {
-        "globalKey" : "e82472ec"
+        "globalKey" : "9862eeec"
       }
-    },
-    "meta" : {
-      "globalKey" : "37c4b603"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "37209",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9863634b"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-04",
+      "meta" : {
+        "globalKey" : "3e9304"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -115,13 +47,54 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "GBLO"
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2002-12-05",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb0a8cfd"
+                }
               },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
+              "meta" : {
+                "globalKey" : "eb0a8cfd"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-12-05",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "MODFOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    }, {
+                      "value" : "JPTO"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "81e56a96"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "58681de7"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "28faf882"
+                }
+              },
+              "meta" : {
+                "globalKey" : "28faf882"
+              }
             },
             "dateAdjustments" : {
+              "businessDayConvention" : "MODFOLLOWING",
               "businessCenters" : {
                 "businessCenter" : [ {
                   "value" : "GBLO"
@@ -134,84 +107,130 @@
                   "globalKey" : "81e56a96"
                 }
               },
-              "businessDayConvention" : "MODFOLLOWING",
               "meta" : {
                 "globalKey" : "58681de7"
               }
             },
-            "effectiveDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
+            "payout" : {
+              "interestRatePayout" : [ {
+                "payerReceiver" : {
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "eb0a8cfd"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2002-12-05"
-              },
-              "meta" : {
-                "globalKey" : "eb0a8cfd"
-              }
-            },
-            "payout" : {
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204c"
+                    },
+                    "rollConvention" : "5"
+                  },
+                  "meta" : {
+                    "globalKey" : "204c"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-03-05",
+                  "meta" : {
+                    "globalKey" : "7473f5c5"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c3ce76f8"
+                }
+              } ],
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "45e0d7b2"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "JPY"
                   },
-                  "settlementType" : "PHYSICAL",
+                  "meta" : {
+                    "globalKey" : "5f4774ca"
+                  },
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
+                      "category" : "BondOrLoan",
+                      "notSubordinated" : true,
+                      "specifiedCurrency" : {
+                        "applicable" : true
+                      },
+                      "notContingent" : true,
                       "assignableLoan" : {
                         "applicable" : true
                       },
-                      "category" : "BOND_OR_LOAN",
                       "consentRequiredLoan" : {
                         "applicable" : true
                       },
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
-                      },
-                      "notBearer" : true,
-                      "notContingent" : true,
-                      "notSubordinated" : true,
-                      "specifiedCurrency" : {
-                        "applicable" : true
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
                       },
-                      "transferable" : true
+                      "notBearer" : true
                     },
                     "escrow" : true,
                     "meta" : {
-                      "globalKey" : "237559c8"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 30
+                      "globalKey" : "3cdbf6e0"
                     }
                   }
                 },
@@ -219,325 +238,306 @@
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "004CC9",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/entity-id-RED"
-                        },
-                        "value" : "004CC9"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "e414546d"
-                      },
                       "name" : {
                         "value" : "ACOM CO., LTD."
+                      },
+                      "meta" : {
+                        "globalKey" : "e414546d",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "e414546d"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "JP310860A032",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN"
-                              },
-                              "value" : "JP310860A032"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "b94feaa3"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "e414546d",
+                        "externalReference" : "referenceEntity"
                       }
                     } ],
                     "referencePrice" : {
+                      "value" : 1.0,
                       "unit" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "value" : 1.0,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "53ce487a"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
-                    "defaultRequirement" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "JPY"
-                        }
-                      },
-                      "value" : 1000000000.0,
-                      "meta" : {
-                        "globalKey" : "57e64854"
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "paymentRequirement" : {
+                        "value" : 100000000.0,
                         "unit" : {
                           "currency" : {
                             "value" : "JPY"
                           }
                         },
-                        "value" : 100000000.0,
                         "meta" : {
                           "globalKey" : "b883af02"
                         }
                       }
                     },
-                    "meta" : {
-                      "globalKey" : "28728bbd"
-                    },
                     "restructuring" : {
                       "applicable" : true,
                       "restructuringType" : {
                         "value" : "R"
                       }
+                    },
+                    "defaultRequirement" : {
+                      "value" : 1000000000.0,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "JPY"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "57e64854"
+                      }
+                    },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "8f38683"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "53d2889d"
-                  },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY",
+                    "category" : "BorrowedMoney",
                     "notSubordinated" : true
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d20"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "5"
                   },
                   "meta" : {
-                    "globalKey" : "12d20"
+                    "globalKey" : "15515017"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "a52eef0e"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-05",
-                  "meta" : {
-                    "globalKey" : "7473fe71"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "62eeb6b0"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "bee3688"
+                "globalKey" : "2543ecb8"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    }, {
-                      "value" : "JPTO"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "81e56a96"
-                    }
-                  },
-                  "businessDayConvention" : "MODFOLLOWING",
-                  "meta" : {
-                    "globalKey" : "58681de7"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "28faf882"
-                },
-                "unadjustedDate" : "2007-12-05"
-              },
-              "meta" : {
-                "globalKey" : "28faf882"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "GBLO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "a4c80788"
+            "globalKey" : "fed21d88"
           }
         },
         "meta" : {
-          "globalKey" : "a4c80788"
+          "globalKey" : "fed21d88"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a7b31de6"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.007,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "value" : 0.007,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 500000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
-              },
-              "value" : 500000000.0
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d74a447e"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "4eb09eda"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 500000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
-              },
-              "value" : 500000000.0
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "11fe4b42"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9304"
-      },
-      "value" : "2002-12-04"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37209"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "af3ad922"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id-1-0"
-          },
-          "value" : "37209"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "af3ad923"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA1999Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditSuccessorAndCreditEvents"
+              }
+            }, {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA1999CreditConvertibleExchangeableAccretingObligations"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "91a1d99b"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "e82472ec"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "7fab373f"
+    }
+  },
+  "meta" : {
+    "globalKey" : "7fab373f"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex02-2003-short-asia-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex02-2003-short-asia-corp-fixreg.json
index 11396a433b..cc86f35b74 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex02-2003-short-asia-corp-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex02-2003-short-asia-corp-fixreg.json
@@ -1,85 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "a736d6f5"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2003-06-06",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_2003_CREDIT_JAPAN"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "xyz1234",
+          "meta" : {
+            "scheme" : "http://www.xyzbank.com/cd-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "d7d4c772"
         }
       } ],
       "meta" : {
-        "globalKey" : "d7d4c772"
+        "globalKey" : "36aee370"
       }
-    },
-    "meta" : {
-      "globalKey" : "a736d6f5"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "abc1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.abcbank.com/cd-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "4d7c7218"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-04",
+      "meta" : {
+        "globalKey" : "3e9304"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -87,37 +47,104 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "JPTO"
-              }
-            },
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-12-05",
                 "meta" : {
                   "globalKey" : "3e9305"
-                },
-                "unadjustedDate" : "2002-12-05"
+                }
               },
               "meta" : {
                 "globalKey" : "3e9305"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-12-05",
+                "meta" : {
+                  "globalKey" : "3ebb05"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ebb05"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204c"
+                    },
+                    "rollConvention" : "5"
+                  },
+                  "meta" : {
+                    "globalKey" : "204c"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
+                  "firstPaymentDate" : "2003-03-05",
+                  "meta" : {
+                    "globalKey" : "7473f5c5"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "e35a61d8"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "generalTerms" : {
@@ -126,229 +153,202 @@
                       "entityId" : [ {
                         "value" : "008FAQ"
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "7abf9ebb"
-                      },
                       "name" : {
                         "value" : "Aiful Corporation"
+                      },
+                      "meta" : {
+                        "globalKey" : "7abf9ebb",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "7abf9ebb"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "JP310504B117",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN"
-                              },
-                              "value" : "JP310504B117"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "1098fb11"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "7abf9ebb",
+                        "externalReference" : "referenceEntity"
                       }
                     } ]
                   }
                 },
-                "meta" : {
-                  "globalKey" : "c50735f"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "meta" : {
-                      "globalKey" : "4cf"
-                    },
                     "restructuring" : {
                       "applicable" : true
+                    },
+                    "meta" : {
+                      "globalKey" : "4cf"
                     }
                   },
                   "meta" : {
                     "globalKey" : "4cf"
                   }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d20"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "5"
-                  },
-                  "meta" : {
-                    "globalKey" : "12d20"
-                  }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "178ae9ee"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-05",
-                  "meta" : {
-                    "globalKey" : "7473fe71"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "d69246bb"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "8bfee38d"
+                "globalKey" : "f12b8a93"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ebb05"
-                },
-                "unadjustedDate" : "2007-12-05"
-              },
-              "meta" : {
-                "globalKey" : "3ebb05"
+            "calculationAgent" : {
+              "calculationAgentBusinessCenter" : {
+                "value" : "JPTO"
               }
             }
           },
           "meta" : {
-            "globalKey" : "585fbd7c"
+            "globalKey" : "b06430ae"
           }
         },
         "meta" : {
-          "globalKey" : "585fbd7c"
+          "globalKey" : "b06430ae"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "74ab6b98"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.007,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "value" : 0.007,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d74a447e"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "20c20768"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 500000000,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
-              },
-              "value" : 500000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "11fe4b42"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9304"
-      },
-      "value" : "2002-12-04"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.xyzbank.com/cd-trade-id"
-          },
-          "value" : "xyz1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "ea5bbca6"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.abcbank.com/cd-trade-id"
-          },
-          "value" : "abc1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "824b68b0"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2003-06-06",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2003CreditJapan"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "d7d4c772"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "d7d4c772"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "1c417d23"
+    }
+  },
+  "meta" : {
+    "globalKey" : "1c417d23"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex16-short-us-corp-fixreg-recovery-factor.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex16-short-us-corp-fixreg-recovery-factor.json
index 2179668698..0cfbb688f6 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex16-short-us-corp-fixreg-recovery-factor.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex16-short-us-corp-fixreg-recovery-factor.json
@@ -1,85 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "5574164d"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2001-01-04",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_1999_CREDIT"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "xyz1234",
+          "meta" : {
+            "scheme" : "http://www.xyzbank.com/cd-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "4933bf66"
         }
       } ],
       "meta" : {
-        "globalKey" : "4933bf66"
+        "globalKey" : "36aee370"
       }
-    },
-    "meta" : {
-      "globalKey" : "5574164d"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "abc1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.abcbank.com/cd-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "4d7c7218"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-03",
+      "meta" : {
+        "globalKey" : "3e9303"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -89,279 +49,319 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-12-04",
                 "meta" : {
                   "globalKey" : "3e9304"
-                },
-                "unadjustedDate" : "2002-12-04"
+                }
               },
               "meta" : {
                 "globalKey" : "3e9304"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-09-06",
+                "meta" : {
+                  "globalKey" : "3eba46"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3eba46"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204d"
+                    },
+                    "rollConvention" : "6"
                   },
+                  "meta" : {
+                    "globalKey" : "204d"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-03-06",
+                  "meta" : {
+                    "globalKey" : "74746a24"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "e50faed6"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Cash",
                   "meta" : {
                     "globalKey" : "76102c6b"
                   },
-                  "settlementType" : "CASH",
                   "cashSettlementTerms" : [ {
+                    "recoveryFactor" : 0.60,
                     "meta" : {
                       "globalKey" : "b9f8"
-                    },
-                    "recoveryFactor" : 0.60
+                    }
                   } ]
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "8G836J",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/entity-id-RED"
-                        },
-                        "value" : "8G836J"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "92cc27"
-                      },
                       "name" : {
                         "value" : "Tenet Healthcare Corporation"
+                      },
+                      "meta" : {
+                        "globalKey" : "92cc27",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "92cc27"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "88033GAT7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-CUSIP"
-                              },
-                              "value" : "88033GAT7"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "db5db955"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "92cc27",
+                        "externalReference" : "referenceEntity"
                       }
                     } ]
                   }
                 },
-                "meta" : {
-                  "globalKey" : "661c8331"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "meta" : {
-                      "globalKey" : "4741344"
-                    },
                     "restructuring" : {
                       "applicable" : true,
                       "restructuringType" : {
-                        "value" : "MOD_R"
+                        "value" : "ModR"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "4741344"
                     }
                   },
                   "meta" : {
                     "globalKey" : "4741344"
                   }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d21"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "6"
-                  },
-                  "meta" : {
-                    "globalKey" : "12d21"
-                  }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "e0b59430"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-06",
-                  "meta" : {
-                    "globalKey" : "747472d0"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "1690908d"
                 }
-              } ],
-              "meta" : {
-                "globalKey" : "5740d21"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3eba46"
-                },
-                "unadjustedDate" : "2007-09-06"
               },
               "meta" : {
-                "globalKey" : "3eba46"
+                "globalKey" : "d3bf6763"
               }
             }
           },
           "meta" : {
-            "globalKey" : "54463589"
+            "globalKey" : "d8284b61"
           }
         },
         "meta" : {
-          "globalKey" : "54463589"
+          "globalKey" : "d8284b61"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "1f273178"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.01,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c5befd88"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9303"
-      },
-      "value" : "2002-12-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.xyzbank.com/cd-trade-id"
-          },
-          "value" : "xyz1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "ea5bbca6"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.abcbank.com/cd-trade-id"
-          },
-          "value" : "abc1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "824b68b0"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2001-01-04",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA1999Credit"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "4933bf66"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "4933bf66"
+      }
+    },
+    "meta" : {
+      "globalKey" : "9a964901"
+    }
+  },
+  "meta" : {
+    "globalKey" : "9a964901"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-indamt-ex01-short-us-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-indamt-ex01-short-us-corp-fixreg.json
index 56d4e4e2d4..34caeef734 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-indamt-ex01-short-us-corp-fixreg.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-indamt-ex01-short-us-corp-fixreg.json
@@ -1,111 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "f042a00f"
-  },
   "trade" : {
-    "collateral" : {
-      "independentAmount" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "paymentDetail" : [ {
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "xyz1234",
           "meta" : {
-            "globalKey" : "b30a47c0"
-          },
-          "paymentRule" : {
-            "percentageRule" : {
-              "notionalAmountReference" : {
-                "externalReference" : "notional",
-                "globalReference" : "0"
-              },
-              "paymentPercent" : 0.02
-            }
-          }
-        } ]
-      }
-    },
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2003-06-06",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_2003_CREDIT_NORTH_AMERICAN"
-            }
+            "scheme" : "http://www.xyzbank.com/cd-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "24983006"
         }
       } ],
       "meta" : {
-        "globalKey" : "24983006"
+        "globalKey" : "36aee370"
       }
-    },
-    "meta" : {
-      "globalKey" : "f042a00f"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "abc1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.abcbank.com/cd-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "4d7c7218"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-12-03",
+      "meta" : {
+        "globalKey" : "3e9303"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -115,269 +49,335 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-12-04",
                 "meta" : {
                   "globalKey" : "3e9304"
-                },
-                "unadjustedDate" : "2002-12-04"
+                }
               },
               "meta" : {
                 "globalKey" : "3e9304"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2007-09-06",
+                "meta" : {
+                  "globalKey" : "3eba46"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3eba46"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "externalKey" : "notional",
-                    "globalKey" : "0"
+                    "globalKey" : "0",
+                    "externalKey" : "notional"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "204d"
+                    },
+                    "rollConvention" : "6"
                   },
+                  "meta" : {
+                    "globalKey" : "204d"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2003-03-06",
+                  "meta" : {
+                    "globalKey" : "74746a24"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "e50faed6"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "notional"
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "8G836J",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/external/entity-id-RED"
-                        },
-                        "value" : "8G836J"
+                        }
                       } ],
-                      "meta" : {
-                        "externalKey" : "referenceEntity",
-                        "globalKey" : "92cc27"
-                      },
                       "name" : {
                         "value" : "Tenet Healthcare Corporation"
+                      },
+                      "meta" : {
+                        "globalKey" : "92cc27",
+                        "externalKey" : "referenceEntity"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligorReference" : {
-                        "externalReference" : "referenceEntity",
-                        "globalReference" : "92cc27"
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "88033GAT7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-CUSIP"
-                              },
-                              "value" : "88033GAT7"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "db5db955"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligorReference" : {
+                        "globalReference" : "92cc27",
+                        "externalReference" : "referenceEntity"
                       }
                     } ]
                   }
                 },
-                "meta" : {
-                  "globalKey" : "a9bf607c"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "meta" : {
-                      "globalKey" : "4741344"
-                    },
                     "restructuring" : {
                       "applicable" : true,
                       "restructuringType" : {
-                        "value" : "MOD_R"
+                        "value" : "ModR"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "4741344"
                     }
                   },
                   "meta" : {
                     "globalKey" : "4741344"
                   }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "notional",
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d21"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "6"
-                  },
-                  "meta" : {
-                    "globalKey" : "12d21"
-                  }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "e0b59430"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2003-03-06",
-                  "meta" : {
-                    "globalKey" : "747472d0"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "5a336dd8"
                 }
-              } ],
-              "meta" : {
-                "globalKey" : "bbe44dac"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3eba46"
-                },
-                "unadjustedDate" : "2007-09-06"
               },
               "meta" : {
-                "globalKey" : "3eba46"
+                "globalKey" : "f8db1fae"
               }
             }
           },
           "meta" : {
-            "globalKey" : "5229c71e"
+            "globalKey" : "58e1b2ac"
           }
         },
         "meta" : {
-          "globalKey" : "5229c71e"
+          "globalKey" : "58e1b2ac"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "1f273178"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.01,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c5befd88"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9303"
-      },
-      "value" : "2002-12-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.xyzbank.com/cd-trade-id"
-          },
-          "value" : "xyz1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "ea5bbca6"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.abcbank.com/cd-trade-id"
-          },
-          "value" : "abc1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "824b68b0"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2003-06-06",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2003CreditNorthAmerican"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "24983006"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "24983006"
       }
-    } ]
+    },
+    "collateral" : {
+      "independentAmount" : {
+        "payerPartyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        },
+        "receiverPartyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        },
+        "paymentDetail" : [ {
+          "paymentRule" : {
+            "percentageRule" : {
+              "paymentPercent" : 0.02,
+              "notionalAmountReference" : {
+                "globalReference" : "0",
+                "externalReference" : "notional"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "b30a47c0"
+          }
+        } ]
+      }
+    },
+    "meta" : {
+      "globalKey" : "73e3cb0d"
+    }
+  },
+  "meta" : {
+    "globalKey" : "73e3cb0d"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-swaption-1.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-swaption-1.json
index d2e9a23406..332e3f10d9 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-swaption-1.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-swaption-1.json
@@ -1,99 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "1725dd06"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "1997-11-05",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "95729254"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2003_CREDIT"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "521d2d0f"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "99e5143b"
-      }
-    },
-    "meta" : {
-      "globalKey" : "d6f059cf"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Trade123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "5c8ba463"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-12-05",
+      "meta" : {
+        "globalKey" : "3eb305",
+        "externalKey" : "TRADEDATE"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -101,55 +32,52 @@
             "productQualifier" : "CreditDefaultSwaption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "98dbfb4d"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "0",
+                    "externalReference" : "NOTIONAL"
+                  },
                   "meta" : {
                     "globalKey" : "8d28d340"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "NOTIONAL",
-                    "globalReference" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "f3b1d0d7"
-                  },
-                  "settlementType" : "PHYSICAL"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
-                "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "fallbackExercise" : false
+                "optionType" : "Call",
+                "feature" : {
+                  "knock" : {
+                    "knockOut" : {
+                      "trigger" : {
+                        "creditEventsReference" : {
+                          "globalReference" : "1333467d",
+                          "externalReference" : "CREDITEVENT"
+                        }
+                      }
                     }
-                  },
+                  }
+                },
+                "exerciseTerms" : {
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2007-03-05",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -160,54 +88,48 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da556d3a"
                             }
                           },
                           "meta" : {
                             "globalKey" : "80df3cd5"
-                          },
-                          "unadjustedDate" : "2007-03-05"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "80df3cd5"
                         }
                       } ],
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      },
                       "expirationTime" : {
+                        "hourMinuteTime" : "16:00:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "16:00:00"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "ab29442b"
+                        "globalKey" : "991d57eb"
                       }
                     }
                   },
                   "strike" : {
                     "strikeReference" : {
-                      "externalReference" : "SPREAD",
-                      "globalReference" : "0"
-                    }
-                  }
-                },
-                "feature" : {
-                  "knock" : {
-                    "knockOut" : {
-                      "trigger" : {
-                        "creditEventsReference" : {
-                          "externalReference" : "CREDITEVENT",
-                          "globalReference" : "acc58dfd"
-                        }
-                      }
+                      "globalReference" : "0",
+                      "externalReference" : "SPREAD"
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "fallbackExercise" : false
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "98dbfb4d"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -217,6 +139,7 @@
                     "economicTerms" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-03-06",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -225,386 +148,458 @@
                           },
                           "meta" : {
                             "globalKey" : "eb7a3e7e"
-                          },
-                          "unadjustedDate" : "2006-03-06"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eb7a3e7e"
                         }
                       },
+                      "terminationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2012-03-21",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ec2ea6cd"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "ec2ea6cd"
+                        }
+                      },
                       "payout" : {
-                        "creditDefaultPayout" : {
+                        "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
+                            "quantitySchedule" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "quantity-1"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "NOTIONAL",
                               "globalKey" : "0"
+                            }
+                          },
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "0",
+                                "externalKey" : "SPREAD"
+                              }
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "17f73"
+                              },
+                              "rollConvention" : "20"
                             },
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            }
+                          },
+                          "paymentDates" : {
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "aa"
+                              }
+                            },
+                            "firstPaymentDate" : "2007-03-20",
+                            "lastRegularPaymentDate" : "2012-03-20",
+                            "meta" : {
+                              "globalKey" : "7303ae2a"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "c031f99c"
+                          }
+                        } ],
+                        "creditDefaultPayout" : {
+                          "payerReceiver" : {
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
+                          },
+                          "priceQuantity" : {
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0",
+                              "externalKey" : "NOTIONAL"
                             }
                           },
                           "settlementTerms" : {
+                            "settlementType" : "Physical",
                             "meta" : {
-                              "globalKey" : "91ae6106"
+                              "globalKey" : "1a8bef8a"
                             },
-                            "settlementType" : "PHYSICAL",
                             "physicalSettlementTerms" : {
+                              "physicalSettlementPeriod" : {
+                                "maximumBusinessDays" : 30
+                              },
                               "deliverableObligations" : {
                                 "accruedInterest" : false,
-                                "category" : "BOND"
+                                "category" : "Bond"
                               },
                               "escrow" : true,
                               "meta" : {
-                                "globalKey" : "abed81bd"
-                              },
-                              "physicalSettlementPeriod" : {
-                                "maximumBusinessDays" : 30
+                                "globalKey" : "34cb1041"
                               }
                             }
                           },
                           "generalTerms" : {
                             "referenceInformation" : {
-                              "allGuarantees" : true,
                               "referenceEntity" : {
-                                "meta" : {
-                                  "globalKey" : "4573090"
-                                },
                                 "name" : {
                                   "value" : "Entity3"
+                                },
+                                "meta" : {
+                                  "globalKey" : "4573090"
                                 }
                               },
                               "referenceObligation" : [ {
-                                "primaryObligor" : {
-                                  "meta" : {
-                                    "globalKey" : "4573090"
-                                  },
-                                  "name" : {
-                                    "value" : "Entity3"
-                                  }
-                                },
                                 "security" : {
                                   "productIdentifier" : [ {
                                     "value" : {
                                       "identifier" : {
+                                        "value" : "ExampleCUSIP2",
                                         "meta" : {
                                           "scheme" : "CUSIP"
-                                        },
-                                        "value" : "ExampleCUSIP2"
+                                        }
                                       },
+                                      "source" : "CUSIP",
                                       "meta" : {
                                         "globalKey" : "c772c8fc"
-                                      },
-                                      "source" : "CUSIP"
+                                      }
                                     }
                                   } ],
-                                  "securityType" : "DEBT"
+                                  "securityType" : "Debt"
+                                },
+                                "primaryObligor" : {
+                                  "name" : {
+                                    "value" : "Entity3"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "4573090"
+                                  }
                                 }
                               } ],
+                              "allGuarantees" : true,
                               "referencePrice" : {
+                                "value" : 1.0000000000,
                                 "unit" : {
                                   "currency" : {
                                     "value" : "USD"
                                   }
                                 },
-                                "value" : 1.0000000000,
                                 "perUnitOf" : {
                                   "currency" : {
                                     "value" : "USD"
                                   }
                                 },
-                                "priceType" : "ASSET_PRICE"
+                                "priceType" : "AssetPrice"
                               }
                             }
                           },
-                          "meta" : {
-                            "globalKey" : "a4f0ea20"
-                          },
                           "protectionTerms" : [ {
                             "creditEvents" : {
-                              "creditEventNotice" : {
-                                "notifyingParty" : [ "PARTY_1", "PARTY_2" ],
-                                "publiclyAvailableInformation" : {
-                                  "publicSource" : [ "Standard Public Sources" ],
-                                  "specifiedNumber" : 2
-                                }
-                              },
-                              "defaultRequirement" : {
-                                "unit" : {
-                                  "currency" : {
-                                    "value" : "USD"
-                                  }
-                                },
-                                "value" : 1000000,
-                                "meta" : {
-                                  "globalKey" : "48eb1e55"
-                                }
-                              },
                               "failureToPay" : {
                                 "applicable" : true,
                                 "paymentRequirement" : {
+                                  "value" : 1000000,
                                   "unit" : {
                                     "currency" : {
                                       "value" : "USD"
                                     }
                                   },
-                                  "value" : 1000000,
                                   "meta" : {
                                     "globalKey" : "48eb1e55"
                                   }
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "CREDITEVENT",
-                                "globalKey" : "acc58dfd"
-                              },
                               "restructuring" : {
                                 "applicable" : true
+                              },
+                              "defaultRequirement" : {
+                                "value" : 1000000,
+                                "unit" : {
+                                  "currency" : {
+                                    "value" : "USD"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "48eb1e55"
+                                }
+                              },
+                              "creditEventNotice" : {
+                                "notifyingParty" : [ "Party1", "Party2" ],
+                                "publiclyAvailableInformation" : {
+                                  "publicSource" : [ "Standard Public Sources" ],
+                                  "specifiedNumber" : 2
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "1333467d",
+                                "externalKey" : "CREDITEVENT"
                               }
                             },
-                            "meta" : {
-                              "globalKey" : "91b93580"
-                            },
                             "obligations" : {
-                              "category" : "BOND"
-                            }
-                          } ]
-                        },
-                        "interestRatePayout" : [ {
-                          "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
-                          },
-                          "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "quantitySchedule" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "quantity-1"
-                              }
-                            }
-                          },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "28c47"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 3,
-                              "rollConvention" : "20"
+                              "category" : "Bond"
                             },
                             "meta" : {
-                              "globalKey" : "28c47"
+                              "globalKey" : "139ace00"
                             }
-                          },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
+                          } ],
                           "meta" : {
-                            "globalKey" : "e205902"
-                          },
-                          "paymentDates" : {
-                            "firstPaymentDate" : "2007-03-20",
-                            "lastRegularPaymentDate" : "2012-03-20",
-                            "meta" : {
-                              "globalKey" : "7303b6d6"
-                            },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "956"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 3
-                            }
-                          },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "externalKey" : "SPREAD",
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
-                              }
-                            }
+                            "globalKey" : "7f60c0d2"
                           }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "ec7d02e2"
-                        }
-                      },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "ec2ea6cd"
-                          },
-                          "unadjustedDate" : "2012-03-21"
                         },
                         "meta" : {
-                          "globalKey" : "ec2ea6cd"
+                          "globalKey" : "d3f7da6e"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "a523b3ed"
+                      "globalKey" : "64f8643d"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "a523b3ed"
+                    "globalKey" : "64f8643d"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "79baa295"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "79baa295"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "45e1a623"
+            "globalKey" : "41e83a3f"
           }
         },
         "meta" : {
-          "globalKey" : "45e1a623"
+          "globalKey" : "41e83a3f"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "f3a3e2c9"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0186,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0186,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "80d87657"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "Party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TRADEDATE",
-        "globalKey" : "3eb305"
-      },
-      "value" : "2006-12-05"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "Party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "Party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "1997-11-05",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "Trade123"
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "95729254"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2003Credit"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "521d2d0f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "72075119"
+        "globalKey" : "99e5143b"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "4c7d39e3"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "5f80e035"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 300000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "Party2"
         },
-        "value" : 300000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
+        }
       },
       "settlementDate" : {
         "relativeDate" : {
+          "periodMultiplier" : 3,
+          "period" : "D",
           "meta" : {
-            "globalKey" : "c47305b0"
+            "globalKey" : "fd075b8e"
           },
-          "period" : "D",
-          "periodMultiplier" : 3,
-          "dayType" : "BUSINESS",
+          "dayType" : "Business",
+          "businessDayConvention" : "NONE",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "USNY"
@@ -615,16 +610,21 @@
               "globalKey" : "4f5ffd5"
             }
           },
-          "businessDayConvention" : "NONE",
           "dateRelativeTo" : {
-            "externalReference" : "TRADEDATE",
-            "globalReference" : "3eb305"
+            "globalReference" : "3eb305",
+            "externalReference" : "TRADEDATE"
           }
         }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "93e45f7"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "ea9ef634"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-swaption-2.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-swaption-2.json
index 8ca3245fed..92b2ffb8f9 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-swaption-2.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-swaption-2.json
@@ -1,99 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "6f4c7d72"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "1997-11-05",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "95729254"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2003_CREDIT"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "521d2d0f"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "99e5143b"
-      }
-    },
-    "meta" : {
-      "globalKey" : "6395f6d7"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Trade234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "5c8ba844"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-06-27",
+      "meta" : {
+        "globalKey" : "3eb19b",
+        "externalKey" : "TRADEDATE"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -101,55 +32,52 @@
             "productQualifier" : "CreditDefaultSwaption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "bcf9a984"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "0",
+                    "externalReference" : "NOTIONAL"
+                  },
                   "meta" : {
                     "globalKey" : "8d28d340"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "NOTIONAL",
-                    "globalReference" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "f3b1d0d7"
-                  },
-                  "settlementType" : "PHYSICAL"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
-                "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "fallbackExercise" : false
+                "optionType" : "Put",
+                "feature" : {
+                  "knock" : {
+                    "knockOut" : {
+                      "trigger" : {
+                        "creditEventsReference" : {
+                          "globalReference" : "ae8d548",
+                          "externalReference" : "CREDITEVENT"
+                        }
+                      }
                     }
-                  },
+                  }
+                },
+                "exerciseTerms" : {
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "USNY"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-09-20",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -160,54 +88,48 @@
                                 "globalKey" : "42f910b"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da556d3a"
                             }
                           },
                           "meta" : {
                             "globalKey" : "5f6d3466"
-                          },
-                          "unadjustedDate" : "2006-09-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "5f6d3466"
                         }
                       } ],
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "USNY"
+                        }
+                      },
                       "expirationTime" : {
+                        "hourMinuteTime" : "11:00:00",
                         "businessCenter" : {
                           "value" : "USNY"
-                        },
-                        "hourMinuteTime" : "11:00:00"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "25cd1f3"
+                        "globalKey" : "579df6f3"
                       }
                     }
                   },
                   "strike" : {
                     "strikeReference" : {
-                      "externalReference" : "SPREAD",
-                      "globalReference" : "0"
-                    }
-                  }
-                },
-                "feature" : {
-                  "knock" : {
-                    "knockOut" : {
-                      "trigger" : {
-                        "creditEventsReference" : {
-                          "externalReference" : "CREDITEVENT",
-                          "globalReference" : "987dca68"
-                        }
-                      }
+                      "globalReference" : "0",
+                      "externalReference" : "SPREAD"
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "fallbackExercise" : false
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "bcf9a984"
-                },
-                "optionType" : "PUT",
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -215,24 +137,26 @@
                       "productQualifier" : "CreditDefaultSwap_SingleName"
                     } ],
                     "economicTerms" : {
-                      "dateAdjustments" : {
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "GBLO"
-                          }, {
-                            "value" : "USNY"
-                          } ],
+                      "effectiveDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2006-09-21",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
                           "meta" : {
-                            "globalKey" : "42f910b"
+                            "globalKey" : "eb80184d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
-                          "globalKey" : "da556d3a"
+                          "globalKey" : "eb80184d"
                         }
                       },
-                      "effectiveDate" : {
+                      "terminationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2011-09-21",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -240,419 +164,490 @@
                             }
                           },
                           "meta" : {
-                            "globalKey" : "eb80184d"
-                          },
-                          "unadjustedDate" : "2006-09-21"
+                            "globalKey" : "ec16404d"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "eb80184d"
+                          "globalKey" : "ec16404d"
+                        }
+                      },
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "GBLO"
+                          }, {
+                            "value" : "USNY"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "42f910b"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "da556d3a"
                         }
                       },
                       "payout" : {
-                        "creditDefaultPayout" : {
+                        "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "priceQuantity" : {
+                            "quantitySchedule" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "quantity-1"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "NOTIONAL",
                               "globalKey" : "0"
+                            }
+                          },
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "0",
+                                "externalKey" : "SPREAD"
+                              }
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "17f73"
+                              },
+                              "rollConvention" : "20"
                             },
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            }
+                          },
+                          "paymentDates" : {
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "aa"
+                              }
+                            },
+                            "firstPaymentDate" : "2006-12-20",
+                            "lastRegularPaymentDate" : "2011-09-20",
+                            "meta" : {
+                              "globalKey" : "1f081eea"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "754ee9fe"
+                          }
+                        } ],
+                        "creditDefaultPayout" : {
+                          "payerReceiver" : {
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
+                          },
+                          "priceQuantity" : {
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0",
+                              "externalKey" : "NOTIONAL"
                             }
                           },
                           "settlementTerms" : {
+                            "settlementType" : "Physical",
                             "meta" : {
-                              "globalKey" : "8240bda3"
+                              "globalKey" : "8933e791"
                             },
-                            "settlementType" : "PHYSICAL",
                             "physicalSettlementTerms" : {
+                              "physicalSettlementPeriod" : {
+                                "maximumBusinessDays" : 30
+                              },
                               "deliverableObligations" : {
                                 "accruedInterest" : false,
+                                "category" : "BondOrLoan",
+                                "notSubordinated" : true,
+                                "specifiedCurrency" : {
+                                  "applicable" : true,
+                                  "currency" : {
+                                    "value" : "USD"
+                                  }
+                                },
+                                "notContingent" : true,
                                 "assignableLoan" : {
                                   "applicable" : true
                                 },
-                                "category" : "BOND_OR_LOAN",
                                 "consentRequiredLoan" : {
                                   "applicable" : true
                                 },
-                                "excluded" : "true",
+                                "transferable" : true,
                                 "maximumMaturity" : {
-                                  "meta" : {
-                                    "globalKey" : "ae5"
-                                  },
+                                  "periodMultiplier" : 30,
                                   "period" : "Y",
-                                  "periodMultiplier" : 30
-                                },
-                                "notBearer" : true,
-                                "notContingent" : true,
-                                "notSubordinated" : true,
-                                "othReferenceEntityObligations" : "true",
-                                "specifiedCurrency" : {
-                                  "applicable" : true,
-                                  "currency" : {
-                                    "value" : "USD"
+                                  "meta" : {
+                                    "globalKey" : "3fb"
                                   }
                                 },
-                                "transferable" : true
+                                "notBearer" : true,
+                                "excluded" : "true",
+                                "othReferenceEntityObligations" : "true"
                               },
                               "escrow" : true,
                               "meta" : {
-                                "globalKey" : "e6e41cc"
-                              },
-                              "physicalSettlementPeriod" : {
-                                "maximumBusinessDays" : 30
+                                "globalKey" : "15616bba"
                               }
                             }
                           },
                           "generalTerms" : {
                             "referenceInformation" : {
-                              "allGuarantees" : false,
                               "referenceEntity" : {
-                                "meta" : {
-                                  "globalKey" : "457308e"
-                                },
                                 "name" : {
                                   "value" : "Entity1"
+                                },
+                                "meta" : {
+                                  "globalKey" : "457308e"
                                 }
                               },
                               "referenceObligation" : [ {
-                                "primaryObligor" : {
-                                  "meta" : {
-                                    "globalKey" : "457308e"
-                                  },
-                                  "name" : {
-                                    "value" : "Entity1"
-                                  }
-                                },
                                 "security" : {
                                   "productIdentifier" : [ {
                                     "value" : {
                                       "identifier" : {
+                                        "value" : "ExampleCUSIP1",
                                         "meta" : {
                                           "scheme" : "CUSIP"
-                                        },
-                                        "value" : "ExampleCUSIP1"
+                                        }
                                       },
+                                      "source" : "CUSIP",
                                       "meta" : {
                                         "globalKey" : "c772c8fb"
-                                      },
-                                      "source" : "CUSIP"
+                                      }
                                     }
                                   } ],
-                                  "securityType" : "DEBT"
-                                }
-                              } ],
-                              "referencePrice" : {
-                                "unit" : {
-                                  "currency" : {
-                                    "value" : "USD"
-                                  }
+                                  "securityType" : "Debt"
                                 },
-                                "value" : 1.0000000000,
-                                "perUnitOf" : {
-                                  "currency" : {
-                                    "value" : "USD"
+                                "primaryObligor" : {
+                                  "name" : {
+                                    "value" : "Entity1"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "457308e"
                                   }
-                                },
-                                "priceType" : "ASSET_PRICE"
-                              }
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "4a77ffcf"
-                          },
-                          "protectionTerms" : [ {
-                            "creditEvents" : {
-                              "bankruptcy" : true,
-                              "creditEventNotice" : {
-                                "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                                "publiclyAvailableInformation" : {
-                                  "publicSource" : [ "Standard Public Sources" ],
-                                  "specifiedNumber" : 2
                                 }
-                              },
-                              "defaultRequirement" : {
+                              } ],
+                              "allGuarantees" : false,
+                              "referencePrice" : {
+                                "value" : 1.0000000000,
                                 "unit" : {
                                   "currency" : {
                                     "value" : "USD"
                                   }
                                 },
-                                "value" : 10000000,
-                                "meta" : {
-                                  "globalKey" : "d467e427"
-                                }
-                              },
+                                "perUnitOf" : {
+                                  "currency" : {
+                                    "value" : "USD"
+                                  }
+                                },
+                                "priceType" : "AssetPrice"
+                              }
+                            }
+                          },
+                          "protectionTerms" : [ {
+                            "creditEvents" : {
+                              "bankruptcy" : true,
                               "failureToPay" : {
                                 "applicable" : true,
                                 "paymentRequirement" : {
+                                  "value" : 1000000,
                                   "unit" : {
                                     "currency" : {
                                       "value" : "USD"
                                     }
                                   },
-                                  "value" : 1000000,
                                   "meta" : {
                                     "globalKey" : "48eb1e55"
                                   }
                                 }
                               },
-                              "meta" : {
-                                "externalKey" : "CREDITEVENT",
-                                "globalKey" : "987dca68"
-                              },
                               "restructuring" : {
                                 "applicable" : true,
-                                "multipleHolderObligation" : true,
                                 "restructuringType" : {
-                                  "value" : "MOD_R"
+                                  "value" : "ModR"
+                                },
+                                "multipleHolderObligation" : true
+                              },
+                              "defaultRequirement" : {
+                                "value" : 10000000,
+                                "unit" : {
+                                  "currency" : {
+                                    "value" : "USD"
+                                  }
+                                },
+                                "meta" : {
+                                  "globalKey" : "d467e427"
                                 }
+                              },
+                              "creditEventNotice" : {
+                                "notifyingParty" : [ "Party2", "Party1" ],
+                                "publiclyAvailableInformation" : {
+                                  "publicSource" : [ "Standard Public Sources" ],
+                                  "specifiedNumber" : 2
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "ae8d548",
+                                "externalKey" : "CREDITEVENT"
                               }
                             },
-                            "meta" : {
-                              "globalKey" : "12f298dd"
-                            },
                             "obligations" : {
-                              "category" : "BORROWED_MONEY",
+                              "category" : "BorrowedMoney",
                               "excluded" : "true",
                               "othReferenceEntityObligations" : "true"
-                            }
-                          } ]
-                        },
-                        "interestRatePayout" : [ {
-                          "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
-                          },
-                          "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "quantitySchedule" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "quantity-1"
-                              }
-                            }
-                          },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "28c47"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 3,
-                              "rollConvention" : "20"
                             },
                             "meta" : {
-                              "globalKey" : "28c47"
+                              "globalKey" : "f11d33bd"
                             }
-                          },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
+                          } ],
                           "meta" : {
-                            "globalKey" : "eff5afe4"
-                          },
-                          "paymentDates" : {
-                            "firstPaymentDate" : "2006-12-20",
-                            "lastRegularPaymentDate" : "2011-09-20",
-                            "meta" : {
-                              "globalKey" : "1f082796"
-                            },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "956"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 3
-                            }
-                          },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "externalKey" : "SPREAD",
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
-                              }
-                            }
+                            "globalKey" : "e8426d31"
                           }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "a0e4f775"
-                        }
-                      },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "ec16404d"
-                          },
-                          "unadjustedDate" : "2011-09-21"
                         },
                         "meta" : {
-                          "globalKey" : "ec16404d"
+                          "globalKey" : "49661573"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "d3f1568b"
+                      "globalKey" : "8b502e99"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "d3f1568b"
+                    "globalKey" : "8b502e99"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "a12019ca"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "a12019ca"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "a2d139da"
+            "globalKey" : "25ccb834"
           }
         },
         "meta" : {
-          "globalKey" : "a2d139da"
+          "globalKey" : "25ccb834"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "92a37f9f"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.085,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.085,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d467e427"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c1cc7441"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "b894a0b9"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "Party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TRADEDATE",
-        "globalKey" : "3eb19b"
-      },
-      "value" : "2006-06-27"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "Party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "Party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "1997-11-05",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "Trade234"
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "95729254"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2003Credit"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "521d2d0f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "7215e0ba"
+        "globalKey" : "99e5143b"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "b62f6b5b"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "4b5f02a9"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59568"
-        }
-      },
       "quantity" : {
+        "value" : 65000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
         },
-        "value" : 65000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "Party2"
+        }
       },
       "settlementDate" : {
         "relativeDate" : {
+          "periodMultiplier" : 3,
+          "period" : "D",
           "meta" : {
-            "globalKey" : "c47305b0"
+            "globalKey" : "fd075b8e"
           },
-          "period" : "D",
-          "periodMultiplier" : 3,
-          "dayType" : "BUSINESS",
+          "dayType" : "Business",
+          "businessDayConvention" : "NONE",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "USNY"
@@ -663,16 +658,21 @@
               "globalKey" : "4f5ffd5"
             }
           },
-          "businessDayConvention" : "NONE",
           "dateRelativeTo" : {
-            "externalReference" : "TRADEDATE",
-            "globalReference" : "3eb19b"
+            "globalReference" : "3eb19b",
+            "externalReference" : "TRADEDATE"
           }
         }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "aecf3c03"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "8ba28fc8"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdindex-ex01-cdx.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdindex-ex01-cdx.json
index 19c483b355..148817c4e5 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdindex-ex01-cdx.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdindex-ex01-cdx.json
@@ -1,85 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "2e3e4c37"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2004-10-18",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "DJ.CDX.NA"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "e58a03ff",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "CDX1234",
+          "meta" : {
+            "scheme" : "http://www.newbank.com/trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "ae7fb3d4"
         }
       } ],
       "meta" : {
-        "globalKey" : "ae7fb3d4"
+        "globalKey" : "e6b4a6ee"
       }
-    },
-    "meta" : {
-      "globalKey" : "b3d18505"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "a0936c7f"
-      },
-      "name" : {
-        "value" : "New Bank, New York"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "HPFHU0OQ28E4N0NFVK49"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "eb844200"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "9518becf"
-      },
-      "name" : {
-        "value" : "Massive Bank, New York"
+      "issuerReference" : {
+        "globalReference" : "4ce0bf4f",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234A6",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900O1WT2BXINL9612"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "f5817694"
+            "scheme" : "http://www.massivebank.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ebf0fa4b"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2005-01-24",
+      "meta" : {
+        "globalKey" : "3ea858"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "a0936c7f"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "9518becf"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -89,226 +49,266 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2004-03-23",
                 "meta" : {
                   "globalKey" : "3ea0d7"
-                },
-                "unadjustedDate" : "2004-03-23"
+                }
               },
               "meta" : {
                 "globalKey" : "3ea0d7"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-03-20",
+                "meta" : {
+                  "globalKey" : "3ec8d4"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ec8d4"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "generalTerms" : {
-                  "indexReferenceInformation" : {
-                    "indexName" : {
-                      "value" : "Dow Jones CDX NA IG.2"
-                    },
-                    "indexAnnexDate" : "2004-07-06",
-                    "indexAnnexSource" : {
-                      "value" : "PUBLISHER"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
                     },
-                    "indexSeries" : 2,
                     "meta" : {
-                      "globalKey" : "92a91d81"
+                      "globalKey" : "0"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "c762cfa0"
+                  "globalKey" : "5a5ff79f"
                 }
-              },
-              "interestRatePayout" : [ {
+              } ],
+              "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "5a5ff79f"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
+                "generalTerms" : {
+                  "indexReferenceInformation" : {
+                    "indexName" : {
+                      "value" : "Dow Jones CDX NA IG.2"
                     },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
+                    "indexSeries" : 2,
+                    "indexAnnexDate" : "2004-07-06",
+                    "indexAnnexSource" : {
+                      "value" : "Publisher"
+                    },
+                    "meta" : {
+                      "globalKey" : "53b8689"
                     }
                   }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "a049273f"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ec8d4"
                 },
-                "unadjustedDate" : "2009-03-20"
+                "meta" : {
+                  "globalKey" : "39f538a8"
+                }
               },
               "meta" : {
-                "globalKey" : "3ec8d4"
+                "globalKey" : "383edb69"
               }
             }
           },
           "meta" : {
-            "globalKey" : "2427143e"
+            "globalKey" : "9c4bc46"
           }
         },
         "meta" : {
-          "globalKey" : "2427143e"
+          "globalKey" : "9c4bc46"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "56a5905f"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0060,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0060,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "7e0c7b81"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e58a03ff",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4ce0bf4f",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea858"
-      },
-      "value" : "2005-01-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "HPFHU0OQ28E4N0NFVK49",
           "meta" : {
-            "scheme" : "http://www.newbank.com/trade-id"
-          },
-          "value" : "CDX1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "eb844200"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "a0936c7f"
+      "name" : {
+        "value" : "New Bank, New York"
       },
       "meta" : {
-        "globalKey" : "affe98a4"
+        "globalKey" : "e58a03ff",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900O1WT2BXINL9612",
           "meta" : {
-            "scheme" : "http://www.massivebank.com/trade-id"
-          },
-          "value" : "1234A6"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "f5817694"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "9518becf"
+      "name" : {
+        "value" : "Massive Bank, New York"
       },
       "meta" : {
-        "globalKey" : "55beb023"
+        "globalKey" : "4ce0bf4f",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2004-10-18",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "DJ.CDX.NA"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "ae7fb3d4"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "ae7fb3d4"
+      }
+    },
+    "meta" : {
+      "globalKey" : "5afd403d"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "3cb073f2"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "a0936c7f"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "9518becf"
-        }
-      },
       "quantity" : {
+        "value" : 16000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "e58a03ff",
+          "externalReference" : "party1"
         },
-        "value" : 16000
+        "receiverPartyReference" : {
+          "globalReference" : "4ce0bf4f",
+          "externalReference" : "party2"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "309a8bea"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "50b01d67"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdindex-ex02-iTraxx.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdindex-ex02-iTraxx.json
index eb02ec77bb..f44c0d729e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdindex-ex02-iTraxx.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdindex-ex02-iTraxx.json
@@ -1,83 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "f6ac10d0"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2004-10-11",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "DJ.iTraxx.Europe"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "20c13e66",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "ITRAXX1234",
+          "meta" : {
+            "scheme" : "http://www.newbank.com/trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "d51e174"
         }
       } ],
       "meta" : {
-        "globalKey" : "d51e174"
+        "globalKey" : "348f2a71"
       }
-    },
-    "meta" : {
-      "globalKey" : "38c6c661"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "c576f3c8"
-      },
-      "name" : {
-        "value" : "New Bank, New York"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-person-id"
-          },
-          "value" : "549300X5I608U02HAI25"
-        },
-        "meta" : {
-          "globalKey" : "5444ea27"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "85c6fec"
-      },
-      "name" : {
-        "value" : "Massive Bank, New York"
+      "issuerReference" : {
+        "globalReference" : "c1910382",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234B6",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-person-id"
-          },
-          "value" : "VMPORTIB1LEXNX832U55"
-        },
-        "meta" : {
-          "globalKey" : "55cb2b87"
+            "scheme" : "http://www.massivebank.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ebf0fa6a"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2004-11-03",
+      "meta" : {
+        "globalKey" : "3ea2c3"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "85c6fec"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "c576f3c8"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -85,21 +47,32 @@
             "productQualifier" : "CreditDefaultSwap_Index"
           } ],
           "economicTerms" : {
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2010-03-20",
+                "meta" : {
+                  "globalKey" : "3ed0d4"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ed0d4"
+              }
+            },
             "payout" : {
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "generalTerms" : {
@@ -107,141 +80,168 @@
                     "indexName" : {
                       "value" : "Dow Jones iTraxx Europe Consumers Series 2 Version 1"
                     },
+                    "indexSeries" : 2,
+                    "indexAnnexVersion" : 1,
                     "excludedReferenceEntity" : [ {
                       "referenceEntity" : {
-                        "meta" : {
-                          "globalKey" : "43886e95"
-                        },
                         "name" : {
                           "value" : "TESCO PLC"
+                        },
+                        "meta" : {
+                          "globalKey" : "43886e95"
                         }
                       }
                     } ],
-                    "indexAnnexVersion" : 1,
-                    "indexSeries" : 2,
                     "meta" : {
-                      "globalKey" : "ac767880"
+                      "globalKey" : "ae1d399e"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "998c1edf"
+                  "globalKey" : "9b32dffd"
                 }
               },
               "meta" : {
-                "globalKey" : "998c1edf"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ed0d4"
-                },
-                "unadjustedDate" : "2010-03-20"
-              },
-              "meta" : {
-                "globalKey" : "3ed0d4"
+                "globalKey" : "9b32dffd"
               }
             }
           },
           "meta" : {
-            "globalKey" : "793b5195"
+            "globalKey" : "307d88d1"
           }
         },
         "meta" : {
-          "globalKey" : "793b5195"
+          "globalKey" : "307d88d1"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "c1910382",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "20c13e66",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea2c3"
-      },
-      "value" : "2004-11-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300X5I608U02HAI25",
           "meta" : {
-            "scheme" : "http://www.newbank.com/trade-id"
-          },
-          "value" : "ITRAXX1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-person-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "5444ea27"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "c576f3c8"
+      "name" : {
+        "value" : "New Bank, New York"
       },
       "meta" : {
-        "globalKey" : "f1464767"
+        "globalKey" : "20c13e66",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "VMPORTIB1LEXNX832U55",
           "meta" : {
-            "scheme" : "http://www.massivebank.com/trade-id"
-          },
-          "value" : "1234B6"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-person-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "55cb2b87"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "85c6fec"
+      "name" : {
+        "value" : "Massive Bank, New York"
       },
       "meta" : {
-        "globalKey" : "55bf2482"
+        "globalKey" : "c1910382",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2004-10-11",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "DJ.iTraxx.Europe"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "d51e174"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "d51e174"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "eae6a6d5"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "d014882f"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "c576f3c8"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "85c6fec"
-        }
-      },
       "quantity" : {
+        "value" : 17000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "20c13e66",
+          "externalReference" : "party1"
         },
-        "value" : 17000
+        "receiverPartyReference" : {
+          "globalReference" : "c1910382",
+          "externalReference" : "party2"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "a4ba95cd"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "8f9623e2"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdindex-ex03-iTraxx-contractual-supplement.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdindex-ex03-iTraxx-contractual-supplement.json
index c472c07a21..311f898fdf 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdindex-ex03-iTraxx-contractual-supplement.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdindex-ex03-iTraxx-contractual-supplement.json
@@ -1,135 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "53af5554"
-  },
   "trade" : {
-    "account" : [ {
-      "accountNumber" : {
-        "meta" : {
-          "scheme" : "http://www.partyA/accountId"
-        },
-        "value" : "12345PartyA"
-      },
-      "meta" : {
-        "externalKey" : "accountParty1",
-        "globalKey" : "31d4eab9"
-      },
-      "servicingParty" : {
-        "externalReference" : "party1",
-        "globalReference" : "6050007b"
-      }
-    }, {
-      "accountNumber" : {
-        "meta" : {
-          "scheme" : "http://partyB/accountId"
-        },
-        "value" : "67899PartyB"
-      },
-      "meta" : {
-        "externalKey" : "accountParty2",
-        "globalKey" : "ffd4b93f"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "41a0254c",
+        "externalReference" : "party2"
       },
-      "servicingParty" : {
-        "externalReference" : "party2",
-        "globalReference" : "a8f1da4c"
-      }
-    } ],
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2000-01-01",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "17d39ad0"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/contractual-supplement"
-                },
-                "value" : "I_TRAXX_EUROPE_DEALER"
-              },
-              "publicationDate" : "2005-09-19"
-            } ]
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "ITRAXX1234",
+          "meta" : {
+            "scheme" : "http://www.partyB.com/trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "848aea2c"
         }
       } ],
       "meta" : {
-        "globalKey" : "654a855c"
+        "globalKey" : "348f9ed0"
       }
-    },
-    "meta" : {
-      "globalKey" : "f271cda5"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "6050007b"
-      },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900O1WT2BXINL9612"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "f5817694"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "a8f1da4c"
-      },
-      "name" : {
-        "value" : "Party B"
+      "issuerReference" : {
+        "globalReference" : "cef3b6fb",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234B6",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300P7IVTDP12DEA19"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "3e1538e4"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ebf0860b"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2005-11-03",
+      "meta" : {
+        "globalKey" : "3eaac3"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "6050007b"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "a8f1da4c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -137,21 +47,32 @@
             "productQualifier" : "CreditDefaultSwap_Index"
           } ],
           "economicTerms" : {
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2010-03-20",
+                "meta" : {
+                  "globalKey" : "3ed0d4"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ed0d4"
+              }
+            },
             "payout" : {
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "generalTerms" : {
@@ -159,145 +80,224 @@
                     "indexName" : {
                       "value" : "Dow Jones iTraxx Europe Consumers Series 2 Version 1"
                     },
+                    "indexSeries" : 2,
+                    "indexAnnexVersion" : 1,
+                    "indexAnnexDate" : "2005-11-01",
+                    "indexAnnexSource" : {
+                      "value" : "Publisher"
+                    },
                     "excludedReferenceEntity" : [ {
                       "referenceEntity" : {
-                        "meta" : {
-                          "globalKey" : "43886e95"
-                        },
                         "name" : {
                           "value" : "TESCO PLC"
+                        },
+                        "meta" : {
+                          "globalKey" : "43886e95"
                         }
                       }
                     } ],
-                    "indexAnnexDate" : "2005-11-01",
-                    "indexAnnexSource" : {
-                      "value" : "PUBLISHER"
-                    },
-                    "indexAnnexVersion" : 1,
-                    "indexSeries" : 2,
                     "meta" : {
-                      "globalKey" : "d58c2dc9"
+                      "globalKey" : "aba314c9"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "9ff7f70a"
+                  "globalKey" : "760ede0a"
                 }
               },
               "meta" : {
-                "globalKey" : "9ff7f70a"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ed0d4"
-                },
-                "unadjustedDate" : "2010-03-20"
-              },
-              "meta" : {
-                "globalKey" : "3ed0d4"
+                "globalKey" : "760ede0a"
               }
             }
           },
           "meta" : {
-            "globalKey" : "b934058a"
+            "globalKey" : "b14394b6"
           }
         },
         "meta" : {
-          "globalKey" : "b934058a"
+          "globalKey" : "b14394b6"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "2ebb90bf"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8b68721"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "cef3b6fb",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "41a0254c",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eaac3"
-      },
-      "value" : "2005-11-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900O1WT2BXINL9612",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "ITRAXX1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "f5817694"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "a8f1da4c"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "f1464768"
+        "globalKey" : "cef3b6fb",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300P7IVTDP12DEA19",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "3e1538e4"
+        }
+      } ],
+      "name" : {
+        "value" : "Party B"
+      },
+      "meta" : {
+        "globalKey" : "41a0254c",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2000-01-01",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234B6"
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "17d39ad0"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "iTraxxEuropeDealer",
+                "meta" : {
+                  "scheme" : "http://www.fpml.org/coding-scheme/contractual-supplement"
+                }
+              },
+              "publicationDate" : "2005-09-19"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "848aea2c"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "6050007b"
+      "meta" : {
+        "globalKey" : "654a855c"
+      }
+    },
+    "account" : [ {
+      "accountNumber" : {
+        "value" : "12345PartyA",
+        "meta" : {
+          "scheme" : "http://www.partyA/accountId"
+        }
+      },
+      "servicingParty" : {
+        "globalReference" : "cef3b6fb",
+        "externalReference" : "party1"
+      },
+      "meta" : {
+        "globalKey" : "31d4eab9",
+        "externalKey" : "accountParty1"
+      }
+    }, {
+      "accountNumber" : {
+        "value" : "67899PartyB",
+        "meta" : {
+          "scheme" : "http://partyB/accountId"
+        }
+      },
+      "servicingParty" : {
+        "globalReference" : "41a0254c",
+        "externalReference" : "party2"
       },
       "meta" : {
-        "globalKey" : "55bf2481"
+        "globalKey" : "ffd4b93f",
+        "externalKey" : "accountParty2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "2ea8d4bb"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "5c7ccc6f"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "a8f1da4c"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "6050007b"
-        }
-      },
       "quantity" : {
+        "value" : 17000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "41a0254c",
+          "externalReference" : "party2"
         },
-        "value" : 17000
+        "receiverPartyReference" : {
+          "globalReference" : "cef3b6fb",
+          "externalReference" : "party1"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "a4c8a98d"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "64b51b08"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdindex-ex04-iBoxx.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdindex-ex04-iBoxx.json
index bdc7a17a41..72d84c145d 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdindex-ex04-iBoxx.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdindex-ex04-iBoxx.json
@@ -1,97 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "8f9b3efa"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2004-10-18",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION"
-          }
-        },
-        "meta" : {
-          "globalKey" : "842d2b20"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
-              },
-              "value" : "ISDA2006"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "e58a03ff",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "CDX1234",
+          "meta" : {
+            "scheme" : "http://www.newbank.com/trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "6b413360"
         }
       } ],
       "meta" : {
-        "globalKey" : "1231fc40"
+        "globalKey" : "e6b4a6ee"
       }
-    },
-    "meta" : {
-      "globalKey" : "19a73908"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "a0936c7f"
-      },
-      "name" : {
-        "value" : "New Bank, New York"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "HPFHU0OQ28E4N0NFVK49"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "eb844200"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "9518becf"
-      },
-      "name" : {
-        "value" : "Massive Bank, New York"
+      "issuerReference" : {
+        "globalReference" : "4ce0bf4f",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234A6",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900O1WT2BXINL9612"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "f5817694"
+            "scheme" : "http://www.massivebank.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ebf0fa4b"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2005-01-24",
+      "meta" : {
+        "globalKey" : "3ea858"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "a0936c7f"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "9518becf"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -101,76 +49,45 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2014-03-23",
                 "meta" : {
                   "globalKey" : "3ef0d7"
-                },
-                "unadjustedDate" : "2014-03-23"
+                }
               },
               "meta" : {
                 "globalKey" : "3ef0d7"
               }
             },
-            "payout" : {
-              "creditDefaultPayout" : {
-                "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
-                    }
-                  }
-                },
-                "generalTerms" : {
-                  "indexReferenceInformation" : {
-                    "indexId" : [ {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
-                      },
-                      "value" : "DE0006301161"
-                    } ],
-                    "indexName" : {
-                      "value" : "iBoxx EUR Corporates"
-                    },
-                    "meta" : {
-                      "globalKey" : "3f94f315"
-                    }
-                  }
-                },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2019-03-20",
                 "meta" : {
-                  "globalKey" : "1902a0f4"
+                  "globalKey" : "3f18d4"
                 }
               },
+              "meta" : {
+                "globalKey" : "3f18d4"
+              }
+            },
+            "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "2c4ccb73"
-                },
                 "rateSpecification" : {
                   "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "174d4182"
-                    },
                     "rateOption" : {
                       "address" : {
                         "scope" : "DOCUMENT",
@@ -185,221 +102,304 @@
                         }
                       }
                     },
+                    "meta" : {
+                      "globalKey" : "174d4182"
+                    },
                     "initialRate" : {
+                      "value" : 0.025,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.025,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
                     }
                   }
                 },
                 "resetDates" : {
+                  "initialFixingDate" : {
+                    "initialFixingDate" : "2014-03-23"
+                  },
                   "finalFixingDate" : {
+                    "unadjustedDate" : "2019-03-20",
                     "dateAdjustments" : {
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "meta" : {
                         "globalKey" : "3a4b88ab"
                       }
                     },
                     "meta" : {
                       "globalKey" : "2727bc7f"
-                    },
-                    "unadjustedDate" : "2019-03-20"
-                  },
-                  "initialFixingDate" : {
-                    "initialFixingDate" : "2014-03-23"
+                    }
                   },
                   "meta" : {
-                    "globalKey" : "fc698996"
+                    "globalKey" : "1a4469d6"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "4a27abb3"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "d78d067"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3f18d4"
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
+                },
+                "generalTerms" : {
+                  "indexReferenceInformation" : {
+                    "indexName" : {
+                      "value" : "iBoxx EUR Corporates"
+                    },
+                    "indexId" : [ {
+                      "value" : "DE0006301161",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "8b0e5955"
+                    }
+                  }
                 },
-                "unadjustedDate" : "2019-03-20"
+                "meta" : {
+                  "globalKey" : "647c0734"
+                }
               },
               "meta" : {
-                "globalKey" : "3f18d4"
+                "globalKey" : "16a21da1"
               }
             }
           },
           "meta" : {
-            "globalKey" : "507b7656"
+            "globalKey" : "b828b7be"
           }
         },
         "meta" : {
-          "globalKey" : "507b7656"
+          "globalKey" : "b828b7be"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "8be2eb38"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "b67ad2b1"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
-                  },
-                  "value" : "USD-LIBOR-BBA"
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.02,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.02,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 1000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 1000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
             },
+            "meta" : {
+              "globalKey" : "18df836f"
+            }
+          },
+          "meta" : {
+            "globalKey" : "bd6e2aee"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e58a03ff",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4ce0bf4f",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea858"
-      },
-      "value" : "2005-01-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "HPFHU0OQ28E4N0NFVK49",
           "meta" : {
-            "scheme" : "http://www.newbank.com/trade-id"
-          },
-          "value" : "CDX1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "eb844200"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "a0936c7f"
+      "name" : {
+        "value" : "New Bank, New York"
       },
       "meta" : {
-        "globalKey" : "affe98a4"
+        "globalKey" : "e58a03ff",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900O1WT2BXINL9612",
           "meta" : {
-            "scheme" : "http://www.massivebank.com/trade-id"
-          },
-          "value" : "1234A6"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "f5817694"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "9518becf"
+      "name" : {
+        "value" : "Massive Bank, New York"
       },
       "meta" : {
-        "globalKey" : "55beb023"
+        "globalKey" : "4ce0bf4f",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2004-10-18",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation"
+          }
+        },
+        "meta" : {
+          "globalKey" : "842d2b20"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/contractual-definitions"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "1231fc40"
+      }
+    },
+    "meta" : {
+      "globalKey" : "3e0b3ae4"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "3cb073f2"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "a0936c7f"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "9518becf"
-        }
-      },
       "quantity" : {
+        "value" : 16000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "e58a03ff",
+          "externalReference" : "party1"
         },
-        "value" : 16000
+        "receiverPartyReference" : {
+          "globalReference" : "4ce0bf4f",
+          "externalReference" : "party2"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "309a8bea"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "3ce2e7ce"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdindex-ex05-SP.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdindex-ex05-SP.json
index 086e015f6c..423f8edb20 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdindex-ex05-SP.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdindex-ex05-SP.json
@@ -1,99 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "948a713c"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "meta" : {
-                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
-              },
-              "value" : "ISDA_MASTER"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualTermsSupplement" : [ {
-              "publicationDate" : "2010-09-19"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "e58a03ff",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "CDX1234",
+          "meta" : {
+            "scheme" : "http://www.newbank.com/trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "2df00d48"
         }
       } ],
       "meta" : {
-        "globalKey" : "7ff7fe21"
+        "globalKey" : "e6b4a6ee"
       }
-    },
-    "meta" : {
-      "globalKey" : "61ae5ff1"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "a0936c7f"
-      },
-      "name" : {
-        "value" : "New Bank, New York"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "HPFHU0OQ28E4N0NFVK49"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "eb844200"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "9518becf"
-      },
-      "name" : {
-        "value" : "Massive Bank, New York"
+      "issuerReference" : {
+        "globalReference" : "4ce0bf4f",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234A6",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900O1WT2BXINL9612"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "f5817694"
+            "scheme" : "http://www.massivebank.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ebf0fa4b"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2005-01-24",
+      "meta" : {
+        "globalKey" : "3ea858"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "9518becf"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "a0936c7f"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -103,93 +49,58 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2014-05-20",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "269374ff"
-                },
-                "unadjustedDate" : "2014-05-20"
+                }
               },
               "meta" : {
                 "globalKey" : "269374ff"
               }
             },
-            "payout" : {
-              "creditDefaultPayout" : {
-                "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
-                },
-                "priceQuantity" : {
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2015-05-20",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
-                    "externalKey" : "calculationAmount",
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "generalTerms" : {
-                  "additionalTerm" : [ {
-                    "meta" : {
-                      "scheme" : "http://derivserv.dtcc.com/coding-scheme/additional-term"
-                    },
-                    "value" : "Y"
-                  } ],
-                  "indexReferenceInformation" : {
-                    "indexId" : [ {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/standard-and-poors"
-                      },
-                      "value" : "7FC48VAA0"
-                    } ],
-                    "indexName" : {
-                      "meta" : {
-                        "scheme" : "http://www.fpml.org/coding-scheme/external/standard-and-poors"
-                      },
-                      "value" : "S&P/ISDA U.S. 150 Credit Spread Index Series 1"
-                    },
-                    "meta" : {
-                      "globalKey" : "57a76907"
-                    }
+                    "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "24406a6d"
+                  "globalKey" : "26b17cff"
                 }
               },
+              "meta" : {
+                "globalKey" : "26b17cff"
+              }
+            },
+            "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "calculationAmount",
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "calculationAmount"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "5a5ff79f"
-                },
                 "rateSpecification" : {
                   "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
                     "rateSchedule" : {
                       "price" : {
                         "address" : {
@@ -197,168 +108,257 @@
                           "value" : "price-1"
                         }
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   }
+                },
+                "meta" : {
+                  "globalKey" : "5a5ff79f"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "b5b9a50c"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "globalKey" : "3a4b88ab"
+                    "globalKey" : "0",
+                    "externalKey" : "calculationAmount"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "26b17cff"
+                "generalTerms" : {
+                  "indexReferenceInformation" : {
+                    "indexName" : {
+                      "value" : "S&P/ISDA U.S. 150 Credit Spread Index Series 1",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/standard-and-poors"
+                      }
+                    },
+                    "indexId" : [ {
+                      "value" : "7FC48VAA0",
+                      "meta" : {
+                        "scheme" : "http://www.fpml.org/coding-scheme/external/standard-and-poors"
+                      }
+                    } ],
+                    "meta" : {
+                      "globalKey" : "5dd0ec47"
+                    }
+                  },
+                  "additionalTerm" : [ {
+                    "value" : "Y",
+                    "meta" : {
+                      "scheme" : "http://derivserv.dtcc.com/coding-scheme/additional-term"
+                    }
+                  } ]
                 },
-                "unadjustedDate" : "2015-05-20"
+                "meta" : {
+                  "globalKey" : "6200a8ff"
+                }
               },
               "meta" : {
-                "globalKey" : "26b17cff"
+                "globalKey" : "604a4bc0"
               }
             }
           },
           "meta" : {
-            "globalKey" : "adcb8314"
+            "globalKey" : "d6f8d320"
           }
         },
         "meta" : {
-          "globalKey" : "adcb8314"
+          "globalKey" : "d6f8d320"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "63df2e7c"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0085,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/ext/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
               },
-              "value" : 0.0085,
               "perUnitOf" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/ext/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "1806a104"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/ext/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4ce0bf4f",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "e58a03ff",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea858"
-      },
-      "value" : "2005-01-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "HPFHU0OQ28E4N0NFVK49",
           "meta" : {
-            "scheme" : "http://www.newbank.com/trade-id"
-          },
-          "value" : "CDX1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "eb844200"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "a0936c7f"
+      "name" : {
+        "value" : "New Bank, New York"
       },
       "meta" : {
-        "globalKey" : "affe98a4"
+        "globalKey" : "e58a03ff",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900O1WT2BXINL9612",
           "meta" : {
-            "scheme" : "http://www.massivebank.com/trade-id"
-          },
-          "value" : "1234A6"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "f5817694"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "9518becf"
+      "name" : {
+        "value" : "Massive Bank, New York"
       },
       "meta" : {
-        "globalKey" : "55beb023"
+        "globalKey" : "4ce0bf4f",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster",
+              "meta" : {
+                "scheme" : "http://www.fpml.org/coding-scheme/master-agreement-type"
+              }
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualTermsSupplement" : [ {
+              "publicationDate" : "2010-09-19"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "2df00d48"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "7ff7fe21"
+      }
+    },
+    "meta" : {
+      "globalKey" : "21888fa5"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "b75f4b0b"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "a0936c7f"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "9518becf"
-        }
-      },
       "quantity" : {
+        "value" : 20000,
         "unit" : {
           "currency" : {
+            "value" : "USD",
             "meta" : {
               "scheme" : "http://www.fpml.org/ext/iso4217"
-            },
-            "value" : "USD"
+            }
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "e58a03ff",
+          "externalReference" : "party1"
         },
-        "value" : 20000
+        "receiverPartyReference" : {
+          "globalReference" : "4ce0bf4f",
+          "externalReference" : "party2"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "3f433c71"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "8d910756"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-ELCDS-ReferenceObligation.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-ELCDS-ReferenceObligation.json
index 6954f838dc..2c3b634e2f 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-ELCDS-ReferenceObligation.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-ELCDS-ReferenceObligation.json
@@ -1,126 +1,29 @@
 {
-  "meta" : {
-    "globalKey" : "4c488950"
-  },
   "trade" : {
-    "collateral" : {
-      "independentAmount" : {
-        "payerPartyReference" : {
-          "externalReference" : "DTCCPty2",
-          "globalReference" : "8e102e2c"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "DTCCPty1",
-          "globalReference" : "8e102e2b"
-        },
-        "paymentDetail" : [ {
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "8e102e2b",
+        "externalReference" : "DTCCPty1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "TW9236",
           "meta" : {
-            "globalKey" : "a7568501"
-          },
-          "paymentRule" : {
-            "percentageRule" : {
-              "notionalAmountReference" : {
-                "externalReference" : "calculationAmount",
-                "globalReference" : "0"
-              },
-              "paymentPercent" : 0.02
-            }
-          }
-        } ]
-      }
-    },
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2007-12-12",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "33d1515b"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "STANDARD_LCDS"
-              },
-              "publicationDate" : "2007-12-12"
-            } ]
+            "scheme" : "TradeRefNbr"
           }
-        },
-        "meta" : {
-          "globalKey" : "b6826249"
         }
       } ],
       "meta" : {
-        "globalKey" : "f1cee48e"
+        "globalKey" : "9b902fd3"
       }
-    },
-    "meta" : {
-      "globalKey" : "4c488950"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "DTCCPty1",
-        "globalKey" : "8e102e2b"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "DTCC"
-          },
-          "value" : "Party1"
-        },
-        "meta" : {
-          "globalKey" : "8e102e2b"
-        }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "DTCCPty2",
-        "globalKey" : "8e102e2c"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "DTCC"
-          },
-          "value" : "Party2"
-        },
-        "meta" : {
-          "globalKey" : "8e102e2c"
-        }
-      } ]
     } ],
+    "tradeDate" : {
+      "value" : "2007-10-31",
+      "meta" : {
+        "globalKey" : "3eba9f"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "DTCCPty1",
-          "globalReference" : "8e102e2b"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "DTCCPty1",
-          "globalReference" : "8e102e2b"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "DTCCPty2",
-          "globalReference" : "8e102e2c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -128,58 +31,134 @@
             "productQualifier" : "CreditDefaultSwap_Loan"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2007-11-01",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25c6972c"
-                },
-                "unadjustedDate" : "2007-11-01"
+                }
               },
               "meta" : {
                 "globalKey" : "25c6972c"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2010-06-17",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "261c39fc"
+                }
+              },
+              "meta" : {
+                "globalKey" : "261c39fc"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
-                    "externalKey" : "calculationAmount",
-                    "globalKey" : "0"
+                    "globalKey" : "0",
+                    "externalKey" : "calculationAmount"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f78"
+                    },
+                    "rollConvention" : "25"
                   },
+                  "meta" : {
+                    "globalKey" : "17f78"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2007-12-20",
+                  "meta" : {
+                    "globalKey" : "840c7d16"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "330a257d"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "calculationAmount"
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
                     "referenceEntity" : {
                       "entityId" : [ {
+                        "value" : "BLMBERGID",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/spec/2003/entity-id-Bloomberg"
-                        },
-                        "value" : "BLMBERGID"
+                        }
                       } ],
-                      "meta" : {
-                        "globalKey" : "5fb7a8be"
-                      },
                       "name" : {
                         "value" : "CompanyDEF"
+                      },
+                      "meta" : {
+                        "globalKey" : "5fb7a8be"
                       }
                     },
                     "referenceObligation" : [ {
@@ -187,265 +166,286 @@
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "64352VNC1",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-CUSIP"
-                              },
-                              "value" : "64352VNC1"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "b56573a0"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
+                              "value" : "ISIN00000000",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-ISIN"
-                              },
-                              "value" : "ISIN00000000"
+                              }
                             },
+                            "source" : "ISIN",
                             "meta" : {
                               "globalKey" : "88e600de"
-                            },
-                            "source" : "ISIN"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
+                              "value" : "BLMBERGID",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-Bloomberg"
-                              },
-                              "value" : "BLMBERGID"
+                              }
                             },
+                            "source" : "BBGID",
                             "meta" : {
                               "globalKey" : "86561eb8"
-                            },
-                            "source" : "BBGID"
+                            }
                           }
                         } ],
                         "borrower" : [ {
-                          "meta" : {
-                            "globalKey" : "238916a4"
-                          },
                           "name" : {
                             "value" : "BorrowerName1"
+                          },
+                          "meta" : {
+                            "globalKey" : "238916a4"
                           }
                         }, {
-                          "meta" : {
-                            "globalKey" : "238916a5"
-                          },
                           "name" : {
                             "value" : "BorrowerName2"
+                          },
+                          "meta" : {
+                            "globalKey" : "238916a5"
                           }
                         } ],
-                        "creditAgreementDate" : "2005-11-04",
                         "facilityType" : {
+                          "value" : "RevolvingLoan",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/facility-type"
-                          },
-                          "value" : "RevolvingLoan"
-                        }
+                          }
+                        },
+                        "creditAgreementDate" : "2005-11-04"
                       }
                     } ],
                     "securedList" : false
                   }
                 },
-                "meta" : {
-                  "globalKey" : "ccfa90f9"
-                },
                 "protectionTerms" : [ {
-                  "meta" : {
-                    "globalKey" : "80d42974"
-                  },
                   "obligations" : {
-                    "cashSettlementOnly" : true,
-                    "category" : "LOAN",
-                    "continuity" : true,
-                    "deliveryOfCommitments" : true,
+                    "category" : "Loan",
+                    "fullFaithAndCreditObLiability" : true,
                     "designatedPriority" : {
+                      "value" : "FirstLienLoan",
                       "meta" : {
                         "scheme" : "http://www.fpml.org/coding-scheme/lien"
-                      },
-                      "value" : "FirstLienLoan"
-                    },
-                    "fullFaithAndCreditObLiability" : true
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "calculationAmount",
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c4c"
+                      }
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "25"
+                    "cashSettlementOnly" : true,
+                    "deliveryOfCommitments" : true,
+                    "continuity" : true
                   },
                   "meta" : {
-                    "globalKey" : "28c4c"
+                    "globalKey" : "153c5056"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "4e6b4829"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2007-12-20",
-                  "meta" : {
-                    "globalKey" : "840c85c2"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "6162b7db"
                 }
-              } ],
-              "meta" : {
-                "globalKey" : "729aece2"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
-                  "meta" : {
-                    "globalKey" : "3a4b88ab"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "261c39fc"
-                },
-                "unadjustedDate" : "2010-06-17"
               },
               "meta" : {
-                "globalKey" : "261c39fc"
+                "globalKey" : "41df0f58"
               }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "b2f108dc"
+            "globalKey" : "43d835f2"
           }
         },
         "meta" : {
-          "globalKey" : "b2f108dc"
+          "globalKey" : "43d835f2"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "b34678c3"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.013,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
               },
-              "value" : 0.013,
               "perUnitOf" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d467e427"
-          },
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "b5889f9d"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
-              },
-              "value" : 10000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "b894a0b9"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "8e102e2b",
+          "externalReference" : "DTCCPty1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "8e102e2c",
+          "externalReference" : "DTCCPty2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "8e102e2b",
+          "externalReference" : "DTCCPty1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party1",
+          "meta" : {
+            "scheme" : "DTCC"
+          }
+        },
+        "meta" : {
+          "globalKey" : "8e102e2b"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3eba9f"
-      },
-      "value" : "2007-10-31"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "8e102e2b",
+        "externalKey" : "DTCCPty1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party2",
           "meta" : {
-            "scheme" : "TradeRefNbr"
+            "scheme" : "DTCC"
+          }
+        },
+        "meta" : {
+          "globalKey" : "8e102e2c"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "8e102e2c",
+        "externalKey" : "DTCCPty2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2007-12-12",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "TW9236"
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "33d1515b"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "StandardLCDS"
+              },
+              "publicationDate" : "2007-12-12"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "b6826249"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "DTCCPty1",
-        "globalReference" : "8e102e2b"
-      },
       "meta" : {
-        "globalKey" : "ddc3fd6b"
+        "globalKey" : "f1cee48e"
       }
-    } ]
+    },
+    "collateral" : {
+      "independentAmount" : {
+        "payerPartyReference" : {
+          "globalReference" : "8e102e2c",
+          "externalReference" : "DTCCPty2"
+        },
+        "receiverPartyReference" : {
+          "globalReference" : "8e102e2b",
+          "externalReference" : "DTCCPty1"
+        },
+        "paymentDetail" : [ {
+          "paymentRule" : {
+            "percentageRule" : {
+              "paymentPercent" : 0.02,
+              "notionalAmountReference" : {
+                "globalReference" : "0",
+                "externalReference" : "calculationAmount"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "a7568501"
+          }
+        } ]
+      }
+    },
+    "meta" : {
+      "globalKey" : "a7749c52"
+    }
+  },
+  "meta" : {
+    "globalKey" : "a7749c52"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-basket-tranche.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-basket-tranche.json
index 3b5b7a63c6..4cc907de0e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-basket-tranche.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-basket-tranche.json
@@ -1,89 +1,29 @@
 {
-  "meta" : {
-    "globalKey" : "bd277a40"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "955bda07"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "955bda07"
-      }
-    },
-    "meta" : {
-      "globalKey" : "bd277a40"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "c2eb8824"
-      },
-      "name" : {
-        "value" : "Morgan Stanley Captial Services"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "c6a2653c",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DJITRAXXUSDMS5Y",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "I7331LVCZKQKX5T7XV54"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "ed2a322e"
+            "scheme" : "http://www.barclaysglobal.com/partners/schema/v1-1/schemes/tradeID"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "139798fc"
-      },
-      "name" : {
-        "value" : "Barclays Global Investors"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "213800H14XVWOV87OI72"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "28e409fd"
-        }
-      } ]
+        "globalKey" : "ce5186a4"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2004-01-24",
+      "meta" : {
+        "globalKey" : "3ea058"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "c2eb8824"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "139798fc"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -93,6 +33,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2004-03-23",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -101,140 +42,194 @@
                 },
                 "meta" : {
                   "globalKey" : "eb3e6e4f"
-                },
-                "unadjustedDate" : "2004-03-23"
+                }
               },
               "meta" : {
                 "globalKey" : "eb3e6e4f"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-03-20",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ebd48b0c"
+                }
+              },
+              "meta" : {
+                "globalKey" : "ebd48b0c"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
-                  },
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/ACT.ISDA"
+                },
+                "meta" : {
+                  "globalKey" : "28d6c3e0"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "generalTerms" : {
                   "basketReferenceInformation" : {
-                    "basketId" : [ {
-                      "meta" : {
-                        "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
-                      },
-                      "value" : "BASKET089"
-                    } ],
                     "basketName" : {
+                      "value" : "CDS Basket Sample",
                       "meta" : {
                         "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
-                      },
-                      "value" : "CDS Basket Sample"
+                      }
                     },
+                    "basketId" : [ {
+                      "value" : "BASKET089",
+                      "meta" : {
+                        "scheme" : "http://www.barclaysglobal.com/partners/coding-scheme/indexId"
+                      }
+                    } ],
                     "referencePool" : {
                       "referencePoolItem" : [ {
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "008HA7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/coding-scheme/external/entity-id-RED"
-                              },
-                              "value" : "008HA7"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "agriumEntity",
-                              "globalKey" : "6b99b4c1"
-                            },
                             "name" : {
                               "value" : "Agrium Inc."
+                            },
+                            "meta" : {
+                              "globalKey" : "6b99b4c1",
+                              "externalKey" : "agriumEntity"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "agriumEntity",
-                              "globalReference" : "6b99b4c1"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "008916AB4",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-CUSIP"
-                                    },
-                                    "value" : "008916AB4"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "ab7bdc95"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "6b99b4c1",
+                              "externalReference" : "agriumEntity"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
                         }
                       }, {
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "8G836J",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/coding-scheme/external/entity-id-RED"
-                              },
-                              "value" : "8G836J"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "tenetEntity",
-                              "globalKey" : "92cc27"
-                            },
                             "name" : {
                               "value" : "Tenet Healthcare Corporation"
+                            },
+                            "meta" : {
+                              "globalKey" : "92cc27",
+                              "externalKey" : "tenetEntity"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "tenetEntity",
-                              "globalReference" : "92cc27"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "88033GAT7",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-CUSIP"
-                                    },
-                                    "value" : "88033GAT7"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "db5db955"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "92cc27",
+                              "externalReference" : "tenetEntity"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
                         }
                       } ]
@@ -245,211 +240,216 @@
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "8793f193"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "gracePeriodExtension" : {
                         "applicable" : true,
                         "gracePeriod" : {
-                          "meta" : {
-                            "globalKey" : "83c"
-                          },
+                          "periodMultiplier" : 0,
                           "period" : "D",
-                          "periodMultiplier" : 0
+                          "meta" : {
+                            "globalKey" : "44"
+                          }
                         }
                       },
                       "paymentRequirement" : {
+                        "value" : 1000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "GBP"
                           }
                         },
-                        "value" : 1000000.00,
                         "meta" : {
                           "globalKey" : "48eae7c4"
                         }
                       }
                     },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "d7154083"
+                      "globalKey" : "f8d2401"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "969cb413"
-                  },
                   "obligations" : {
-                    "category" : "BOND_OR_LOAN"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
+                    "category" : "BondOrLoan"
                   },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/ACT.ISDA"
-                },
-                "meta" : {
-                  "globalKey" : "e55fc83e"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "1ccd1e11"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "90a9b011"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "ebd48b0c"
-                },
-                "unadjustedDate" : "2009-03-20"
+                  "globalKey" : "aed6dbbf"
+                }
               },
               "meta" : {
-                "globalKey" : "ebd48b0c"
+                "globalKey" : "925adf9f"
               }
             }
           },
           "meta" : {
-            "globalKey" : "aac09ea"
+            "globalKey" : "5ccda762"
           }
         },
         "meta" : {
-          "globalKey" : "aac09ea"
+          "globalKey" : "5ccda762"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3a43e344"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0060,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0060,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e38853c"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "3cfd1fa4",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "c6a2653c",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea058"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "I7331LVCZKQKX5T7XV54",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "ed2a322e"
+        }
+      } ],
+      "name" : {
+        "value" : "Morgan Stanley Captial Services"
       },
-      "value" : "2004-01-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "3cfd1fa4",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "213800H14XVWOV87OI72",
           "meta" : {
-            "scheme" : "http://www.barclaysglobal.com/partners/schema/v1-1/schemes/tradeID"
-          },
-          "value" : "DJITRAXXUSDMS5Y"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "28e409fd"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "139798fc"
+      "name" : {
+        "value" : "Barclays Global Investors"
       },
       "meta" : {
-        "globalKey" : "222d8a3c"
+        "globalKey" : "c6a2653c",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "955bda07"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "955bda07"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "64fabe28"
+    }
+  },
+  "meta" : {
+    "globalKey" : "64fabe28"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-basket.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-basket.json
index 6a91c61020..5525c624e3 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-basket.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-basket.json
@@ -1,89 +1,29 @@
 {
-  "meta" : {
-    "globalKey" : "455bc958"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "955bda07"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "955bda07"
-      }
-    },
-    "meta" : {
-      "globalKey" : "455bc958"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "fce386ae"
-      },
-      "name" : {
-        "value" : "Morgan Stanley Capital Services"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "c6a2653c",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DJITRAXXUSDMS5Y",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "I7331LVCZKQKX5T7XV54"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "ed2a322e"
+            "scheme" : "http://www.barclaysglobal.com/partners/schema/v1-1/schemes/tradeID"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "139798fc"
-      },
-      "name" : {
-        "value" : "Barclays Global Investors"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "213800H14XVWOV87OI72"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "28e409fd"
-        }
-      } ]
+        "globalKey" : "ce5186a4"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2004-01-24",
+      "meta" : {
+        "globalKey" : "3ea058"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "fce386ae"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "139798fc"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -93,6 +33,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2004-03-23",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -101,88 +42,141 @@
                 },
                 "meta" : {
                   "globalKey" : "eb3e6e4f"
-                },
-                "unadjustedDate" : "2004-03-23"
+                }
               },
               "meta" : {
                 "globalKey" : "eb3e6e4f"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-03-20",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "ebd48b0c"
+                }
+              },
+              "meta" : {
+                "globalKey" : "ebd48b0c"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
-                  },
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/ACT.ISDA"
+                },
+                "meta" : {
+                  "globalKey" : "28d6c3e0"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "7610bbd9"
+                  }
                 },
                 "generalTerms" : {
                   "basketReferenceInformation" : {
-                    "nthToDefault" : 1,
                     "referencePool" : {
                       "referencePoolItem" : [ {
                         "constituentWeight" : {
                           "basketPercentage" : 0.60
                         },
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "008HA7",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/coding-scheme/external/entity-id-RED"
-                              },
-                              "value" : "008HA7"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "agriumEntity",
-                              "globalKey" : "6b99b4c1"
-                            },
                             "name" : {
                               "value" : "Agrium Inc."
+                            },
+                            "meta" : {
+                              "globalKey" : "6b99b4c1",
+                              "externalKey" : "agriumEntity"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "agriumEntity",
-                              "globalReference" : "6b99b4c1"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "008916AB4",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-CUSIP"
-                                    },
-                                    "value" : "008916AB4"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "ab7bdc95"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "6b99b4c1",
+                              "externalReference" : "agriumEntity"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
                         }
                       }, {
@@ -190,257 +184,263 @@
                           "basketPercentage" : 0.40
                         },
                         "referencePair" : {
-                          "entityType" : {
-                            "value" : "NORTH_AMERICAN_INVESTMENT_GRADE"
-                          },
                           "referenceEntity" : {
                             "entityId" : [ {
+                              "value" : "8G836J",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/coding-scheme/external/entity-id-RED"
-                              },
-                              "value" : "8G836J"
+                              }
                             } ],
-                            "meta" : {
-                              "externalKey" : "tenetEntity",
-                              "globalKey" : "92cc27"
-                            },
                             "name" : {
                               "value" : "Tenet Healthcare Corporation"
+                            },
+                            "meta" : {
+                              "globalKey" : "92cc27",
+                              "externalKey" : "tenetEntity"
                             }
                           },
                           "referenceObligation" : {
-                            "primaryObligorReference" : {
-                              "externalReference" : "tenetEntity",
-                              "globalReference" : "92cc27"
-                            },
                             "security" : {
                               "productIdentifier" : [ {
                                 "value" : {
                                   "identifier" : {
+                                    "value" : "88033GAT7",
                                     "meta" : {
                                       "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-CUSIP"
-                                    },
-                                    "value" : "88033GAT7"
+                                    }
                                   },
+                                  "source" : "CUSIP",
                                   "meta" : {
                                     "globalKey" : "db5db955"
-                                  },
-                                  "source" : "CUSIP"
+                                  }
                                 }
                               } ],
-                              "securityType" : "DEBT"
+                              "securityType" : "Debt"
+                            },
+                            "primaryObligorReference" : {
+                              "globalReference" : "92cc27",
+                              "externalReference" : "tenetEntity"
                             }
+                          },
+                          "entityType" : {
+                            "value" : "NorthAmericanInvestmentGrade"
                           }
                         }
                       } ]
-                    }
+                    },
+                    "nthToDefault" : 1
                   }
                 },
-                "meta" : {
-                  "globalKey" : "ae1b0af1"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "specifiedNumber" : 2,
-                        "standardPublicSources" : true
-                      }
-                    },
                     "failureToPay" : {
                       "applicable" : true,
                       "gracePeriodExtension" : {
                         "applicable" : true,
                         "gracePeriod" : {
-                          "meta" : {
-                            "globalKey" : "83c"
-                          },
+                          "periodMultiplier" : 0,
                           "period" : "D",
-                          "periodMultiplier" : 0
+                          "meta" : {
+                            "globalKey" : "44"
+                          }
                         }
                       },
                       "paymentRequirement" : {
+                        "value" : 1000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "GBP"
                           }
                         },
-                        "value" : 1000000.00,
                         "meta" : {
                           "globalKey" : "48eae7c4"
                         }
                       }
                     },
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "standardPublicSources" : true,
+                        "specifiedNumber" : 2
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "d7154083"
+                      "globalKey" : "f8d2401"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "969cb413"
-                  },
                   "obligations" : {
-                    "category" : "BOND_OR_LOAN"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
+                    "category" : "BondOrLoan"
                   },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/ACT.ISDA"
-                },
-                "meta" : {
-                  "globalKey" : "e55fc83e"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "80299ef"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
                   "meta" : {
-                    "globalKey" : "24a738"
+                    "globalKey" : "90a9b011"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "ebd48b0c"
-                },
-                "unadjustedDate" : "2009-03-20"
+                  "globalKey" : "2d0c4241"
+                }
               },
               "meta" : {
-                "globalKey" : "ebd48b0c"
+                "globalKey" : "df7fbe21"
               }
             }
           },
           "meta" : {
-            "globalKey" : "1a67908c"
+            "globalKey" : "8779aa4"
           }
         },
         "meta" : {
-          "globalKey" : "1a67908c"
+          "globalKey" : "8779aa4"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3a43e344"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0060,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0060,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e38853c"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "51fdf32e",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "c6a2653c",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea058"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "I7331LVCZKQKX5T7XV54",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "ed2a322e"
+        }
+      } ],
+      "name" : {
+        "value" : "Morgan Stanley Capital Services"
       },
-      "value" : "2004-01-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "51fdf32e",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "213800H14XVWOV87OI72",
           "meta" : {
-            "scheme" : "http://www.barclaysglobal.com/partners/schema/v1-1/schemes/tradeID"
-          },
-          "value" : "DJITRAXXUSDMS5Y"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "28e409fd"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "139798fc"
+      "name" : {
+        "value" : "Barclays Global Investors"
       },
       "meta" : {
-        "globalKey" : "222d8a3c"
+        "globalKey" : "c6a2653c",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "955bda07"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "955bda07"
+      }
+    },
+    "meta" : {
+      "globalKey" : "e6c858f4"
+    }
+  },
+  "meta" : {
+    "globalKey" : "e6c858f4"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-index-tranche.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-index-tranche.json
index aa1e65d3cc..f1cd206f9a 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-index-tranche.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-index-tranche.json
@@ -1,83 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "b95d8254"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2004-10-11",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "DJ.iTraxx.Europe"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "20c13e66",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "ITRAXX1234",
+          "meta" : {
+            "scheme" : "http://www.newbank.com/trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "d51e174"
         }
       } ],
       "meta" : {
-        "globalKey" : "d51e174"
+        "globalKey" : "348f2a71"
       }
-    },
-    "meta" : {
-      "globalKey" : "2b9b6ee5"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "c576f3c8"
-      },
-      "name" : {
-        "value" : "New Bank, New York"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-person-id"
-          },
-          "value" : "549300X5I608U02HAI25"
-        },
-        "meta" : {
-          "globalKey" : "5444ea27"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "85c6fec"
-      },
-      "name" : {
-        "value" : "Massive Bank, New York"
+      "issuerReference" : {
+        "globalReference" : "c1910382",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234B6",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-person-id"
-          },
-          "value" : "VMPORTIB1LEXNX832U55"
-        },
-        "meta" : {
-          "globalKey" : "55cb2b87"
+            "scheme" : "http://www.massivebank.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ebf0fa6a"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2004-11-03",
+      "meta" : {
+        "globalKey" : "3ea2c3"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "85c6fec"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "c576f3c8"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -85,21 +47,32 @@
             "productQualifier" : "CreditDefaultSwap_IndexTranche"
           } ],
           "economicTerms" : {
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2010-03-20",
+                "meta" : {
+                  "globalKey" : "3ed0d4"
+                }
+              },
+              "meta" : {
+                "globalKey" : "3ed0d4"
+              }
+            },
             "payout" : {
               "creditDefaultPayout" : {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "generalTerms" : {
@@ -107,140 +80,167 @@
                     "indexName" : {
                       "value" : "Dow Jones iTraxx Europe Consumers Series 2 Version 1"
                     },
-                    "indexAnnexVersion" : 1,
                     "indexSeries" : 2,
-                    "meta" : {
-                      "globalKey" : "c458fec4"
+                    "indexAnnexVersion" : 1,
+                    "tranche" : {
+                      "attachmentPoint" : 0.03,
+                      "exhaustionPoint" : 0.07
                     },
                     "settledEntityMatrix" : {
                       "matrixSource" : {
-                        "value" : "NOT_APPLICABLE"
+                        "value" : "NotApplicable"
                       }
                     },
-                    "tranche" : {
-                      "attachmentPoint" : 0.03,
-                      "exhaustionPoint" : 0.07
+                    "meta" : {
+                      "globalKey" : "df8f82d0"
                     }
                   }
                 },
                 "meta" : {
-                  "globalKey" : "c29e8963"
+                  "globalKey" : "ddd50d6f"
                 }
               },
               "meta" : {
-                "globalKey" : "c29e8963"
-              }
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "meta" : {
-                  "globalKey" : "3ed0d4"
-                },
-                "unadjustedDate" : "2010-03-20"
-              },
-              "meta" : {
-                "globalKey" : "3ed0d4"
+                "globalKey" : "ddd50d6f"
               }
             }
           },
           "meta" : {
-            "globalKey" : "f54a891"
+            "globalKey" : "4b18d143"
           }
         },
         "meta" : {
-          "globalKey" : "f54a891"
+          "globalKey" : "4b18d143"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "2ebbcc83"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 25000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 25000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a8bdc3dd"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "c1910382",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "20c13e66",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ea2c3"
-      },
-      "value" : "2004-11-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300X5I608U02HAI25",
           "meta" : {
-            "scheme" : "http://www.newbank.com/trade-id"
-          },
-          "value" : "ITRAXX1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-person-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "5444ea27"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "c576f3c8"
+      "name" : {
+        "value" : "New Bank, New York"
       },
       "meta" : {
-        "globalKey" : "f1464767"
+        "globalKey" : "20c13e66",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "VMPORTIB1LEXNX832U55",
           "meta" : {
-            "scheme" : "http://www.massivebank.com/trade-id"
-          },
-          "value" : "1234B6"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-person-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "55cb2b87"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "85c6fec"
+      "name" : {
+        "value" : "Massive Bank, New York"
       },
       "meta" : {
-        "globalKey" : "55bf2482"
+        "globalKey" : "c1910382",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2004-10-11",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "DJ.iTraxx.Europe"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "d51e174"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "d51e174"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "8587bb63"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "d014882f"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "c576f3c8"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "85c6fec"
-        }
-      },
       "quantity" : {
+        "value" : 17000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "20c13e66",
+          "externalReference" : "party1"
         },
-        "value" : 17000
+        "receiverPartyReference" : {
+          "globalReference" : "c1910382",
+          "externalReference" : "party2"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "a4ba95cd"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "787927f0"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-loan-ReferenceObligation.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-loan-ReferenceObligation.json
index 51158a0e44..8a239e0cd2 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-loan-ReferenceObligation.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-loan-ReferenceObligation.json
@@ -1,109 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "14201e93"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "109257",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/"
           }
-        },
-        "meta" : {
-          "globalKey" : "955bda07"
         }
       } ],
       "meta" : {
-        "globalKey" : "8afb2a56"
+        "globalKey" : "ebd7082f"
       }
-    },
-    "meta" : {
-      "globalKey" : "14201e93"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234567",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.partyB.com/"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "dc5b8a8"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-10-26",
+      "meta" : {
+        "globalKey" : "3eb29a"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -111,30 +47,26 @@
             "productQualifier" : "CreditDefaultSwap_Loan"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-10-27",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
                 "meta" : {
-                  "globalKey" : "42f910b"
+                  "globalKey" : "eb811f13"
                 }
               },
-              "businessDayConvention" : "FOLLOWING",
               "meta" : {
-                "globalKey" : "da556d3a"
+                "globalKey" : "eb811f13"
               }
             },
-            "effectiveDate" : {
+            "terminationDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2010-06-27",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -142,74 +74,153 @@
                   }
                 },
                 "meta" : {
-                  "globalKey" : "eb811f13"
-                },
-                "unadjustedDate" : "2006-10-27"
+                  "globalKey" : "ebf57e13"
+                }
               },
               "meta" : {
-                "globalKey" : "eb811f13"
+                "globalKey" : "ebf57e13"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da556d3a"
               }
             },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f73"
+                    },
+                    "rollConvention" : "20"
+                  },
+                  "meta" : {
+                    "globalKey" : "17f73"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
+                  "firstPaymentDate" : "2006-12-20",
+                  "lastRegularPaymentDate" : "2010-06-20",
+                  "meta" : {
+                    "globalKey" : "1b0ddfaa"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "7154aabe"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
-                    "globalKey" : "9e09e9e0"
+                    "globalKey" : "2cbcd158"
                   },
-                  "settlementType" : "PHYSICAL",
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "maximumBusinessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
-                      "category" : "LOAN",
+                      "category" : "Loan",
+                      "notSubordinated" : true,
+                      "notContingent" : true,
                       "consentRequiredLoan" : {
                         "applicable" : true
                       },
-                      "excluded" : "true",
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
                       },
                       "notBearer" : true,
-                      "notContingent" : true,
-                      "notSubordinated" : true,
-                      "othReferenceEntityObligations" : "true",
-                      "transferable" : true
+                      "excluded" : "true",
+                      "othReferenceEntityObligations" : "true"
                     },
                     "meta" : {
-                      "globalKey" : "3b5cd1d7"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "maximumBusinessDays" : 30
+                      "globalKey" : "ca0fb94f"
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
-                    "allGuarantees" : false,
                     "referenceEntity" : {
-                      "meta" : {
-                        "globalKey" : "444aeec5"
-                      },
                       "name" : {
                         "value" : "CompanyABC"
+                      },
+                      "meta" : {
+                        "globalKey" : "444aeec5"
                       }
                     },
                     "referenceObligation" : [ {
@@ -217,309 +228,298 @@
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "23490234",
                               "meta" : {
                                 "scheme" : "http://www.partyA.com/coding-scheme/instrument-id"
-                              },
-                              "value" : "23490234"
+                              }
                             },
+                            "source" : "Other",
                             "meta" : {
                               "globalKey" : "1648ec59"
-                            },
-                            "source" : "OTHER"
+                            }
                           }
                         } ],
-                        "creditAgreementDate" : "2005-11-04",
-                        "facilityType" : {
-                          "value" : "RevolvingLoan"
-                        },
                         "lien" : {
                           "value" : "FirstLienLoan"
                         },
+                        "facilityType" : {
+                          "value" : "RevolvingLoan"
+                        },
+                        "creditAgreementDate" : "2005-11-04",
                         "tranche" : {
                           "value" : "LN190325"
                         }
                       },
                       "primaryObligor" : {
-                        "meta" : {
-                          "globalKey" : "444aeec5"
-                        },
                         "name" : {
                           "value" : "CompanyABC"
+                        },
+                        "meta" : {
+                          "globalKey" : "444aeec5"
                         }
                       }
                     } ],
+                    "allGuarantees" : false,
                     "referencePrice" : {
+                      "value" : 1.0000000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.0000000000,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     },
                     "securedList" : false
                   }
                 },
-                "meta" : {
-                  "globalKey" : "47e7820e"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "publicSource" : [ "Standard Public Sources" ],
-                        "specifiedNumber" : 2
+                    "failureToPay" : {
+                      "applicable" : true,
+                      "paymentRequirement" : {
+                        "value" : 1000000,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "USD"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "48eb1e55"
+                        }
                       }
                     },
                     "defaultRequirement" : {
+                      "value" : 10000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 10000000,
                       "meta" : {
                         "globalKey" : "d467e427"
                       }
                     },
-                    "failureToPay" : {
-                      "applicable" : true,
-                      "paymentRequirement" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "USD"
-                          }
-                        },
-                        "value" : 1000000,
-                        "meta" : {
-                          "globalKey" : "48eb1e55"
-                        }
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "publicSource" : [ "Standard Public Sources" ],
+                        "specifiedNumber" : 2
                       }
                     },
                     "meta" : {
-                      "globalKey" : "6df875cd"
+                      "globalKey" : "a02353af"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "29e129d1"
-                  },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY",
+                    "category" : "BorrowedMoney",
+                    "notSubordinated" : true,
+                    "excluded" : "true",
+                    "othReferenceEntityObligations" : "true",
                     "designatedPriority" : {
                       "value" : "FirstLienLoan"
-                    },
-                    "excluded" : "true",
-                    "notSubordinated" : true,
-                    "othReferenceEntityObligations" : "true"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
                     }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c47"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "20"
                   },
                   "meta" : {
-                    "globalKey" : "28c47"
+                    "globalKey" : "c245b351"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "116f3724"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2006-12-20",
-                  "lastRegularPaymentDate" : "2010-06-20",
-                  "meta" : {
-                    "globalKey" : "1b0de856"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "4a484c96"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "d3fd29d6"
+                "globalKey" : "19615498"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "ebf57e13"
-                },
-                "unadjustedDate" : "2010-06-27"
-              },
-              "meta" : {
-                "globalKey" : "ebf57e13"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "4ce45ee9"
+            "globalKey" : "9420de51"
           }
         },
         "meta" : {
-          "globalKey" : "4ce45ee9"
+          "globalKey" : "9420de51"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "b3ef9a04"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.013,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.013,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d467e427"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "ca03a67c"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "b894a0b9"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb29a"
-      },
-      "value" : "2006-10-26"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.partyA.com/"
-          },
-          "value" : "109257"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "f60dada5"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.partyB.com/"
-          },
-          "value" : "1234567"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "555d4b40"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "955bda07"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "8afb2a56"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "c627f9cb"
+    }
+  },
+  "meta" : {
+    "globalKey" : "c627f9cb"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-loan-SecuredList.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-loan-SecuredList.json
index f733c0709c..5c423a7a83 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-loan-SecuredList.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-loan-SecuredList.json
@@ -1,109 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "ee2f3ecb"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "109257",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/"
           }
-        },
-        "meta" : {
-          "globalKey" : "955bda07"
         }
       } ],
       "meta" : {
-        "globalKey" : "8afb2a56"
+        "globalKey" : "ebd7082f"
       }
-    },
-    "meta" : {
-      "globalKey" : "ee2f3ecb"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234567",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.partyB.com/"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "dc5b8a8"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-12-01",
+      "meta" : {
+        "globalKey" : "3eb301"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -111,30 +47,26 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-12-02",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
                 "meta" : {
-                  "globalKey" : "42f910b"
+                  "globalKey" : "eb82a1ba"
                 }
               },
-              "businessDayConvention" : "FOLLOWING",
               "meta" : {
-                "globalKey" : "da556d3a"
+                "globalKey" : "eb82a1ba"
               }
             },
-            "effectiveDate" : {
+            "terminationDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2010-03-21",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -142,349 +74,417 @@
                   }
                 },
                 "meta" : {
-                  "globalKey" : "eb82a1ba"
-                },
-                "unadjustedDate" : "2006-12-02"
+                  "globalKey" : "ebf296cd"
+                }
               },
               "meta" : {
-                "globalKey" : "eb82a1ba"
+                "globalKey" : "ebf296cd"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da556d3a"
               }
             },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f73"
+                    },
+                    "rollConvention" : "20"
                   },
+                  "meta" : {
+                    "globalKey" : "17f73"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "firstPaymentDate" : "2007-03-20",
+                  "lastRegularPaymentDate" : "2010-03-20",
+                  "meta" : {
+                    "globalKey" : "6bbdbe2a"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c204893e"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
-                    "globalKey" : "9e09e9e0"
+                    "globalKey" : "2cbcd158"
                   },
-                  "settlementType" : "PHYSICAL",
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "maximumBusinessDays" : 30
+                    },
                     "deliverableObligations" : {
                       "accruedInterest" : false,
-                      "category" : "LOAN",
+                      "category" : "Loan",
+                      "notSubordinated" : true,
+                      "notContingent" : true,
                       "consentRequiredLoan" : {
                         "applicable" : true
                       },
-                      "excluded" : "true",
+                      "transferable" : true,
                       "maximumMaturity" : {
-                        "meta" : {
-                          "globalKey" : "ae5"
-                        },
+                        "periodMultiplier" : 30,
                         "period" : "Y",
-                        "periodMultiplier" : 30
+                        "meta" : {
+                          "globalKey" : "3fb"
+                        }
                       },
                       "notBearer" : true,
-                      "notContingent" : true,
-                      "notSubordinated" : true,
-                      "othReferenceEntityObligations" : "true",
-                      "transferable" : true
+                      "excluded" : "true",
+                      "othReferenceEntityObligations" : "true"
                     },
                     "meta" : {
-                      "globalKey" : "3b5cd1d7"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "maximumBusinessDays" : 30
+                      "globalKey" : "ca0fb94f"
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
-                    "allGuarantees" : false,
-                    "noReferenceObligation" : true,
                     "referenceEntity" : {
-                      "meta" : {
-                        "globalKey" : "444afa68"
-                      },
                       "name" : {
                         "value" : "CompanyDEF"
+                      },
+                      "meta" : {
+                        "globalKey" : "444afa68"
                       }
                     },
+                    "noReferenceObligation" : true,
+                    "allGuarantees" : false,
                     "referencePrice" : {
+                      "value" : 1.0000000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 1.0000000000,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     },
                     "securedList" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "a75b0232"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "bankruptcy" : true,
-                    "creditEventNotice" : {
-                      "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                      "publiclyAvailableInformation" : {
-                        "publicSource" : [ "Standard Public Sources" ],
-                        "specifiedNumber" : 2
+                    "failureToPay" : {
+                      "applicable" : true,
+                      "paymentRequirement" : {
+                        "value" : 500000,
+                        "unit" : {
+                          "currency" : {
+                            "value" : "USD"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "6c32a26b"
+                        }
                       }
                     },
                     "defaultRequirement" : {
+                      "value" : 5000000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 5000000,
                       "meta" : {
                         "globalKey" : "1a10e2d1"
                       }
                     },
-                    "failureToPay" : {
-                      "applicable" : true,
-                      "paymentRequirement" : {
-                        "unit" : {
-                          "currency" : {
-                            "value" : "USD"
-                          }
-                        },
-                        "value" : 500000,
-                        "meta" : {
-                          "globalKey" : "6c32a26b"
-                        }
+                    "creditEventNotice" : {
+                      "notifyingParty" : [ "Party2", "Party1" ],
+                      "publiclyAvailableInformation" : {
+                        "publicSource" : [ "Standard Public Sources" ],
+                        "specifiedNumber" : 2
                       }
                     },
                     "meta" : {
-                      "globalKey" : "84a507f9"
+                      "globalKey" : "b45b5d03"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "c0000e25"
-                  },
                   "obligations" : {
-                    "category" : "BORROWED_MONEY",
+                    "category" : "BorrowedMoney",
+                    "notSubordinated" : true,
+                    "excluded" : "true",
+                    "othReferenceEntityObligations" : "true",
                     "designatedPriority" : {
                       "value" : "FirstLienLoan"
-                    },
-                    "excluded" : "true",
-                    "notSubordinated" : true,
-                    "othReferenceEntityObligations" : "true"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
                     }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c47"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "20"
                   },
                   "meta" : {
-                    "globalKey" : "28c47"
+                    "globalKey" : "ff84437d"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "b384c8a4"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2007-03-20",
-                  "lastRegularPaymentDate" : "2010-03-20",
-                  "meta" : {
-                    "globalKey" : "6bbdc6d6"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "2f18b946"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "149d79b2"
+                "globalKey" : "9a136c8"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "ebf296cd"
-                },
-                "unadjustedDate" : "2010-03-21"
-              },
-              "meta" : {
-                "globalKey" : "ebf296cd"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "6db077ee"
+            "globalKey" : "6bbf54b4"
           }
         },
         "meta" : {
-          "globalKey" : "6db077ee"
+          "globalKey" : "6bbf54b4"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "5a207dbd"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0115,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0115,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "1a10e2d1"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "e9ef39e3"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "280b774f"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb301"
-      },
-      "value" : "2006-12-01"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.partyA.com/"
-          },
-          "value" : "109257"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "f60dada5"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.partyB.com/"
-          },
-          "value" : "1234567"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "555d4b40"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "955bda07"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "8afb2a56"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "4c55563b"
+    }
+  },
+  "meta" : {
+    "globalKey" : "4c55563b"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-mortgage-CMBS.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-mortgage-CMBS.json
index e412296a36..8831199b4f 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-mortgage-CMBS.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-mortgage-CMBS.json
@@ -1,109 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "dcf4eaea"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "109257",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/"
           }
-        },
-        "meta" : {
-          "globalKey" : "955bda07"
         }
       } ],
       "meta" : {
-        "globalKey" : "8afb2a56"
+        "globalKey" : "ebd7082f"
       }
-    },
-    "meta" : {
-      "globalKey" : "dcf4eaea"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234567",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.partyB.com/"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "dc5b8a8"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-11-14",
+      "meta" : {
+        "globalKey" : "3eb2ce"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -111,31 +47,11 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
-                "meta" : {
-                  "globalKey" : "42f910b"
-                }
-              },
-              "businessDayConvention" : "FOLLOWING",
-              "meta" : {
-                "globalKey" : "da556d3a"
-              }
-            },
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2006-11-17",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "GBLO"
@@ -146,339 +62,423 @@
                       "globalKey" : "42f910b"
                     }
                   },
-                  "businessDayConvention" : "FOLLOWING",
                   "meta" : {
                     "globalKey" : "da556d3a"
                   }
                 },
                 "meta" : {
                   "globalKey" : "18601d49"
-                },
-                "unadjustedDate" : "2006-11-17"
+                }
               },
               "meta" : {
                 "globalKey" : "18601d49"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2046-07-12",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "f02f5604"
+                }
+              },
+              "meta" : {
+                "globalKey" : "f02f5604"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da556d3a"
+              }
+            },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "177f6"
+                    },
+                    "rollConvention" : "25"
                   },
+                  "meta" : {
+                    "globalKey" : "177f6"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "firstPaymentDate" : "2006-12-27",
+                  "lastRegularPaymentDate" : "2046-04-27",
+                  "meta" : {
+                    "globalKey" : "9e24630c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "d4617863"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "32319a6b"
                   },
-                  "settlementType" : "PHYSICAL",
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 5
+                    },
                     "escrow" : true,
                     "meta" : {
                       "globalKey" : "120d14"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 5
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
-                    "allGuarantees" : false,
                     "referenceEntity" : {
-                      "meta" : {
-                        "globalKey" : "65eff19"
-                      },
                       "name" : {
                         "value" : "MERRILL LYNCH/COUNTRYWIDE COMM, 2006-3"
+                      },
+                      "meta" : {
+                        "globalKey" : "65eff19"
                       }
                     },
                     "referenceObligation" : [ {
-                      "primaryObligor" : {
-                        "meta" : {
-                          "globalKey" : "65eff19"
-                        },
-                        "name" : {
-                          "value" : "MERRILL LYNCH/COUNTRYWIDE COMM, 2006-3"
-                        }
-                      },
                       "security" : {
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "60687VAQ8",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-CUSIP"
-                              },
-                              "value" : "60687VAQ8"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "b9f84235"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
+                              "value" : "MLCFC 2006-3",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-Bloomberg-1-0"
-                              },
-                              "value" : "MLCFC 2006-3"
+                              }
                             },
+                            "source" : "BBGID",
                             "meta" : {
                               "globalKey" : "3b0c170b"
-                            },
-                            "source" : "BBGID"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
+                      },
+                      "primaryObligor" : {
+                        "name" : {
+                          "value" : "MERRILL LYNCH/COUNTRYWIDE COMM, 2006-3"
+                        },
+                        "meta" : {
+                          "globalKey" : "65eff19"
+                        }
                       }
-                    } ]
+                    } ],
+                    "allGuarantees" : false
                   }
                 },
-                "meta" : {
-                  "globalKey" : "2c14f072"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
                     "failureToPayPrincipal" : true,
+                    "writedown" : true,
                     "meta" : {
                       "globalKey" : "99e0"
-                    },
-                    "writedown" : true
+                    }
                   },
                   "floatingAmountEvents" : {
-                    "additionalFixedPayments" : {
-                      "interestShortfallReimbursement" : true,
-                      "principalShortfallReimbursement" : true,
-                      "writedownReimbursement" : true
-                    },
                     "failureToPayPrincipal" : true,
-                    "floatingAmountProvisions" : {
-                      "wacCapInterestProvision" : true
-                    },
                     "interestShortfall" : {
+                      "interestShortfallCap" : "Fixed",
                       "compounding" : true,
-                      "interestShortfallCap" : "FIXED",
                       "rateSource" : {
                         "value" : "USD-LIBOR-BBA"
                       }
                     },
-                    "writedown" : true
-                  },
-                  "meta" : {
-                    "globalKey" : "b58a4098"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c0e"
+                    "writedown" : true,
+                    "floatingAmountProvisions" : {
+                      "wacCapInterestProvision" : true
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "25"
+                    "additionalFixedPayments" : {
+                      "interestShortfallReimbursement" : true,
+                      "principalShortfallReimbursement" : true,
+                      "writedownReimbursement" : true
+                    }
                   },
                   "meta" : {
-                    "globalKey" : "28c0e"
+                    "globalKey" : "35a9172a"
                   }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "33dfd49f"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2006-12-27",
-                  "lastRegularPaymentDate" : "2046-04-27",
-                  "meta" : {
-                    "globalKey" : "9e246bf4"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "9ab5b97e"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "62cdff6d"
+                "globalKey" : "7d4f43b"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "f02f5604"
-                },
-                "unadjustedDate" : "2046-07-12"
-              },
-              "meta" : {
-                "globalKey" : "f02f5604"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "ec5315c7"
+            "globalKey" : "39bad5ef"
           }
         },
         "meta" : {
-          "globalKey" : "ec5315c7"
+          "globalKey" : "39bad5ef"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a3617a4e"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.050,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.050,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 15000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 15000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "99d719c2"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c8cdcf72"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 15000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 15000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a10c1e7e"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb2ce"
-      },
-      "value" : "2006-11-14"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.partyA.com/"
-          },
-          "value" : "109257"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "f60dada5"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.partyB.com/"
-          },
-          "value" : "1234567"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "555d4b40"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "955bda07"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "8afb2a56"
+      }
+    },
+    "meta" : {
+      "globalKey" : "355d1e90"
+    }
+  },
+  "meta" : {
+    "globalKey" : "355d1e90"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-mortgage-RMBS.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-mortgage-RMBS.json
index 68ff1b5fbd..e971dc6650 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-mortgage-RMBS.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-mortgage-RMBS.json
@@ -1,109 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "fa3b9570"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "32000f4f"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2003_CREDIT"
-            } ],
-            "contractualTermsSupplement" : [ {
-              "contractualTermsSupplementType" : {
-                "value" : "ISDA_2003_CREDIT_MAY_2003"
-              }
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "45f2c112",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "109257",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/"
           }
-        },
-        "meta" : {
-          "globalKey" : "955bda07"
         }
       } ],
       "meta" : {
-        "globalKey" : "8afb2a56"
+        "globalKey" : "ebd7082f"
       }
-    },
-    "meta" : {
-      "globalKey" : "fa3b9570"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1cdd0752"
-      },
-      "name" : {
-        "value" : "XYZ Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "254900BIAQJIUV6DLE92"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b507782f"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "c546aadb"
-      },
-      "name" : {
-        "value" : "ABC Bank"
+      "issuerReference" : {
+        "globalReference" : "a700639b",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234567",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.partyB.com/"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "dc5b8a8"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-10-05",
+      "meta" : {
+        "globalKey" : "3eb285"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "c546aadb"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1cdd0752"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -111,31 +47,38 @@
             "productQualifier" : "CreditDefaultSwap_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "dateAdjustments" : {
-              "businessCenters" : {
-                "businessCenter" : [ {
-                  "value" : "GBLO"
-                }, {
-                  "value" : "USNY"
-                } ],
+            "effectiveDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-10-11",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "GBLO"
+                    }, {
+                      "value" : "USNY"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "42f910b"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "da556d3a"
+                  }
+                },
                 "meta" : {
-                  "globalKey" : "42f910b"
+                  "globalKey" : "b0cdd84f"
                 }
               },
-              "businessDayConvention" : "FOLLOWING",
               "meta" : {
-                "globalKey" : "da556d3a"
+                "globalKey" : "b0cdd84f"
               }
             },
-            "effectiveDate" : {
+            "terminationDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2035-09-25",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "GBLO"
@@ -146,60 +89,136 @@
                       "globalKey" : "42f910b"
                     }
                   },
-                  "businessDayConvention" : "FOLLOWING",
                   "meta" : {
                     "globalKey" : "da556d3a"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "b0cdd84f"
-                },
-                "unadjustedDate" : "2006-10-11"
+                  "globalKey" : "777d2cc1"
+                }
               },
               "meta" : {
-                "globalKey" : "b0cdd84f"
+                "globalKey" : "777d2cc1"
+              }
+            },
+            "dateAdjustments" : {
+              "businessDayConvention" : "FOLLOWING",
+              "businessCenters" : {
+                "businessCenter" : [ {
+                  "value" : "GBLO"
+                }, {
+                  "value" : "USNY"
+                } ],
+                "meta" : {
+                  "globalKey" : "42f910b"
+                }
+              },
+              "meta" : {
+                "globalKey" : "da556d3a"
               }
             },
             "payout" : {
-              "creditDefaultPayout" : {
+              "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-1"
+                    }
+                  },
                   "meta" : {
                     "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "calculationPeriodDates" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "177d3"
+                    },
+                    "rollConvention" : "11"
+                  },
+                  "meta" : {
+                    "globalKey" : "177d3"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
                   },
+                  "firstPaymentDate" : "2006-11-01",
+                  "lastRegularPaymentDate" : "2035-06-01",
+                  "meta" : {
+                    "globalKey" : "715dd58c"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "3e124220"
+                }
+              } ],
+              "creditDefaultPayout" : {
+                "payerReceiver" : {
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "priceQuantity" : {
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "32319a6b"
                   },
-                  "settlementType" : "PHYSICAL",
                   "physicalSettlementTerms" : {
+                    "physicalSettlementPeriod" : {
+                      "businessDays" : 5
+                    },
                     "escrow" : true,
                     "meta" : {
                       "globalKey" : "120d14"
-                    },
-                    "physicalSettlementPeriod" : {
-                      "businessDays" : 5
                     }
                   }
                 },
                 "generalTerms" : {
                   "referenceInformation" : {
                     "referenceEntity" : {
-                      "meta" : {
-                        "globalKey" : "5df00e1c"
-                      },
                       "name" : {
                         "value" : "New Century Home Equity Loan Trust 2005-4"
+                      },
+                      "meta" : {
+                        "globalKey" : "5df00e1c"
                       }
                     },
                     "referenceObligation" : [ {
@@ -207,277 +226,258 @@
                         "productIdentifier" : [ {
                           "value" : {
                             "identifier" : {
+                              "value" : "64352VNC1",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-CUSIP"
-                              },
-                              "value" : "64352VNC1"
+                              }
                             },
+                            "source" : "CUSIP",
                             "meta" : {
                               "globalKey" : "b56573a0"
-                            },
-                            "source" : "CUSIP"
+                            }
                           }
                         }, {
                           "value" : {
                             "identifier" : {
+                              "value" : "NCHET 2005-4",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/spec/2002/instrument-id-Bloomberg-1-0"
-                              },
-                              "value" : "NCHET 2005-4"
+                              }
                             },
+                            "source" : "BBGID",
                             "meta" : {
                               "globalKey" : "1dd2314a"
-                            },
-                            "source" : "BBGID"
+                            }
                           }
                         } ],
-                        "securityType" : "DEBT"
+                        "securityType" : "Debt"
                       }
                     } ]
                   }
                 },
-                "meta" : {
-                  "globalKey" : "c8d3fe2a"
-                },
                 "protectionTerms" : [ {
                   "creditEvents" : {
-                    "distressedRatingsDowngrade" : true,
                     "failureToPayPrincipal" : true,
+                    "distressedRatingsDowngrade" : true,
+                    "writedown" : true,
                     "meta" : {
                       "globalKey" : "12a6ef"
-                    },
-                    "writedown" : true
+                    }
                   },
                   "floatingAmountEvents" : {
-                    "additionalFixedPayments" : {
-                      "interestShortfallReimbursement" : true,
-                      "principalShortfallReimbursement" : true,
-                      "writedownReimbursement" : true
-                    },
                     "failureToPayPrincipal" : true,
-                    "floatingAmountProvisions" : {
-                      "stepUpProvision" : true
-                    },
                     "interestShortfall" : {
+                      "interestShortfallCap" : "Fixed",
                       "compounding" : false,
-                      "interestShortfallCap" : "FIXED",
                       "rateSource" : {
                         "value" : "USD-LIBOR-BBA"
                       }
                     },
-                    "writedown" : true
-                  },
-                  "meta" : {
-                    "globalKey" : "965f81a1"
-                  }
-                } ]
-              },
-              "interestRatePayout" : [ {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-1"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28beb"
+                    "writedown" : true,
+                    "floatingAmountProvisions" : {
+                      "stepUpProvision" : true
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "11"
+                    "additionalFixedPayments" : {
+                      "interestShortfallReimbursement" : true,
+                      "principalShortfallReimbursement" : true,
+                      "writedownReimbursement" : true
+                    }
                   },
                   "meta" : {
-                    "globalKey" : "28beb"
+                    "globalKey" : "901637ff"
                   }
-                },
+                } ],
                 "meta" : {
-                  "globalKey" : "8edc2882"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2006-11-01",
-                  "lastRegularPaymentDate" : "2035-06-01",
-                  "meta" : {
-                    "globalKey" : "715dde74"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "c28ab488"
                 }
-              } ],
+              },
               "meta" : {
-                "globalKey" : "a689618"
+                "globalKey" : "3f8436a8"
               }
             },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "GBLO"
-                    }, {
-                      "value" : "USNY"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "42f910b"
-                    }
-                  },
-                  "businessDayConvention" : "FOLLOWING",
-                  "meta" : {
-                    "globalKey" : "da556d3a"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "777d2cc1"
-                },
-                "unadjustedDate" : "2035-09-25"
-              },
-              "meta" : {
-                "globalKey" : "777d2cc1"
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "5504f06f"
+            "globalKey" : "d52688e5"
           }
         },
         "meta" : {
-          "globalKey" : "5504f06f"
+          "globalKey" : "d52688e5"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a3617a4e"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.050,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.050,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 15000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 15000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "99d719c2"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "c8cdcf72"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 15000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 15000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a10c1e7e"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a700639b",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "45f2c112",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eb285"
-      },
-      "value" : "2006-10-05"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "254900BIAQJIUV6DLE92",
           "meta" : {
-            "scheme" : "http://www.partyA.com/"
-          },
-          "value" : "109257"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b507782f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1cdd0752"
+      "name" : {
+        "value" : "XYZ Bank"
       },
       "meta" : {
-        "globalKey" : "f60dada5"
+        "globalKey" : "45f2c112",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.partyB.com/"
-          },
-          "value" : "1234567"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "c546aadb"
+      "name" : {
+        "value" : "ABC Bank"
       },
       "meta" : {
-        "globalKey" : "555d4b40"
+        "globalKey" : "a700639b",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          },
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "32000f4f"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2003Credit"
+            } ],
+            "contractualTermsSupplement" : [ {
+              "contractualTermsSupplementType" : {
+                "value" : "ISDA2003CreditMay2003"
+              }
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "955bda07"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "8afb2a56"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "4de0b9bc"
+    }
+  },
+  "meta" : {
+    "globalKey" : "4de0b9bc"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdx-index-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdx-index-option.json
index 76f9e982a3..6c4d05ad03 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdx-index-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cdx-index-option.json
@@ -1,105 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "fdc0aa2"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "1997-11-05",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 1992
-        },
-        "meta" : {
-          "globalKey" : "95729254"
-        }
-      }, {
-        "agreementDate" : "2004-09-20",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "DJ.CDX.NA"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "44b33d52"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2003_CREDIT"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "521d2d0f"
-        }
-      } ],
-      "meta" : {
-        "globalKey" : "c96c85a9"
-      }
-    },
-    "meta" : {
-      "globalKey" : "e65a3a25"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Trade234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/coding-scheme/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "5c8ba844"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-01-16",
+      "meta" : {
+        "globalKey" : "3eb050",
+        "externalKey" : "TRADEDATE"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -108,106 +33,100 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "a9c55c44"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "0",
+                    "externalReference" : "NOTIONAL"
+                  },
                   "meta" : {
                     "globalKey" : "8d28d340"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "NOTIONAL",
-                    "globalReference" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "f3b1d0d7"
-                  },
-                  "settlementType" : "PHYSICAL"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Payer",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "fallbackExercise" : false
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "USNY"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-08-20",
                           "dateAdjustments" : {
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "meta" : {
                               "globalKey" : "3a4b88ab"
                             }
                           },
                           "meta" : {
                             "globalKey" : "25a605bf"
-                          },
-                          "unadjustedDate" : "2006-08-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "25a605bf"
                         }
                       } ],
-                      "expirationTime" : {
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
                         "businessCenter" : {
                           "value" : "USNY"
-                        },
-                        "hourMinuteTime" : "11:00:00"
+                        }
                       },
-                      "meta" : {
-                        "globalKey" : "e0e28f54"
+                      "expirationTime" : {
+                        "hourMinuteTime" : "11:00:00",
+                        "businessCenter" : {
+                          "value" : "USNY"
+                        }
                       },
                       "partialExercise" : {
-                        "integralMultipleAmount" : 1,
-                        "minimumNotionalAmount" : 1,
                         "notionaReference" : {
-                          "externalReference" : "NOTIONAL",
-                          "globalReference" : "0"
-                        }
+                          "globalReference" : "0",
+                          "externalReference" : "NOTIONAL"
+                        },
+                        "integralMultipleAmount" : 1,
+                        "minimumNotionalAmount" : 1
+                      },
+                      "meta" : {
+                        "globalKey" : "83132194"
                       }
                     }
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 0.0225,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.0225,
-                      "arithmeticOperator" : "ADD",
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate",
+                      "arithmeticOperator" : "Add"
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "fallbackExercise" : false
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "a9c55c44"
-                },
-                "optionType" : "PAYER",
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -217,274 +136,350 @@
                     "economicTerms" : {
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-03-21",
                           "meta" : {
                             "globalKey" : "3eb0d5"
-                          },
-                          "unadjustedDate" : "2006-03-21"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "3eb0d5"
                         }
                       },
+                      "terminationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2011-06-20",
+                          "meta" : {
+                            "globalKey" : "3ed994"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "3ed994"
+                        }
+                      },
                       "payout" : {
-                        "creditDefaultPayout" : {
+                        "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "externalKey" : "NOTIONAL",
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
-                                "value" : "quantity-2"
+                                "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "generalTerms" : {
-                            "indexReferenceInformation" : {
-                              "indexName" : {
-                                "value" : "Dow Jones CDX NA IG.2"
-                              },
-                              "indexAnnexDate" : "2005-07-06",
-                              "indexAnnexSource" : {
-                                "value" : "PUBLISHER"
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
+                                }
                               },
-                              "indexSeries" : 2,
                               "meta" : {
-                                "globalKey" : "964c1581"
+                                "globalKey" : "0"
                               }
                             }
                           },
-                          "meta" : {
-                            "globalKey" : "6ba10942"
-                          }
-                        },
-                        "interestRatePayout" : [ {
-                          "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
-                          },
-                          "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "quantitySchedule" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "quantity-1"
-                              }
-                            }
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
                           },
                           "calculationPeriodDates" : {
                             "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
                               "meta" : {
-                                "globalKey" : "28c47"
+                                "globalKey" : "17f73"
                               },
-                              "period" : "M",
-                              "periodMultiplier" : 3,
                               "rollConvention" : "20"
                             },
                             "meta" : {
-                              "globalKey" : "28c47"
+                              "globalKey" : "17f73"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "bbc10042"
-                          },
                           "paymentDates" : {
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "aa"
+                              }
+                            },
                             "firstPaymentDate" : "2006-06-20",
                             "lastRegularPaymentDate" : "2011-03-20",
                             "meta" : {
-                              "globalKey" : "9365796"
+                              "globalKey" : "9364eea"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "56649a5c"
+                          }
+                        } ],
+                        "creditDefaultPayout" : {
+                          "payerReceiver" : {
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
+                          },
+                          "priceQuantity" : {
+                            "quantitySchedule" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "quantity-2"
+                              }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "956"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 3
+                            "meta" : {
+                              "globalKey" : "0",
+                              "externalKey" : "NOTIONAL"
                             }
                           },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
+                          "generalTerms" : {
+                            "indexReferenceInformation" : {
+                              "indexName" : {
+                                "value" : "Dow Jones CDX NA IG.2"
                               },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
+                              "indexSeries" : 2,
+                              "indexAnnexDate" : "2005-07-06",
+                              "indexAnnexSource" : {
+                                "value" : "Publisher"
+                              },
+                              "meta" : {
+                                "globalKey" : "5598e89"
                               }
                             }
-                          }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "f0c9b440"
-                        }
-                      },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "meta" : {
-                            "globalKey" : "3ed994"
                           },
-                          "unadjustedDate" : "2011-06-20"
+                          "meta" : {
+                            "globalKey" : "daae824a"
+                          }
                         },
                         "meta" : {
-                          "globalKey" : "3ed994"
+                          "globalKey" : "9dc89d6e"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "8a4e2669"
+                      "globalKey" : "d9a8246f"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "8a4e2669"
+                    "globalKey" : "d9a8246f"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "528d9dfa"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "528d9dfa"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "a9c55c44"
+            "globalKey" : "528d9dfa"
           }
         },
         "meta" : {
-          "globalKey" : "a9c55c44"
+          "globalKey" : "528d9dfa"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "22a6e28e"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.019,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.019,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 50000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "27faaf2b"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "32356f32"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 50000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "d75b3635"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "Party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
+        }
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TRADEDATE",
-        "globalKey" : "3eb050"
-      },
-      "value" : "2006-01-16"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "Party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/coding-scheme/trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "Party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "1997-11-05",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "Trade234"
+          "vintage" : 1992
+        },
+        "meta" : {
+          "globalKey" : "95729254"
+        }
+      }, {
+        "agreementDate" : "2004-09-20",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "DJ.CDX.NA"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "44b33d52"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2003Credit"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "521d2d0f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "7215e0ba"
+        "globalKey" : "c96c85a9"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "3fd7a88b"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "f49473e7"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 45000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "Party2"
         },
-        "value" : 45000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
+        }
       },
       "settlementDate" : {
         "relativeDate" : {
+          "periodMultiplier" : 3,
+          "period" : "D",
           "meta" : {
-            "globalKey" : "c47305b0"
+            "globalKey" : "fd075b8e"
           },
-          "period" : "D",
-          "periodMultiplier" : 3,
-          "dayType" : "BUSINESS",
+          "dayType" : "Business",
+          "businessDayConvention" : "NONE",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "USNY"
@@ -495,16 +490,21 @@
               "globalKey" : "4f5ffd5"
             }
           },
-          "businessDayConvention" : "NONE",
           "dateRelativeTo" : {
-            "externalReference" : "TRADEDATE",
-            "globalReference" : "3eb050"
+            "globalReference" : "3eb050",
+            "externalReference" : "TRADEDATE"
           }
         }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "b02d3185"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "304b8a1a"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/itraxx-index-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/itraxx-index-option.json
index ef670b8223..6ca8d516c5 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/itraxx-index-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/itraxx-index-option.json
@@ -1,65 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "2b0b0ee3"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "a1f959d2"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Trade234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/coding-scheme/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "5c8ba844"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-01-16",
+      "meta" : {
+        "globalKey" : "3eb050",
+        "externalKey" : "TRADEDATE"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -67,55 +32,40 @@
             "productQualifier" : "CreditDefaultSwaption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "1ea5dc35"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "0",
+                    "externalReference" : "NOTIONAL"
+                  },
                   "meta" : {
                     "globalKey" : "8d28d340"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "NOTIONAL",
-                    "globalReference" : "0"
                   }
                 },
                 "settlementTerms" : {
+                  "settlementType" : "Physical",
                   "meta" : {
                     "globalKey" : "f3b1d0d7"
-                  },
-                  "settlementType" : "PHYSICAL"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Receiver",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "fallbackExercise" : false
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-12-20",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -124,53 +74,59 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "211e638d"
                             }
                           },
                           "meta" : {
                             "globalKey" : "2d387cf9"
-                          },
-                          "unadjustedDate" : "2006-12-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "2d387cf9"
                         }
                       } ],
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      },
                       "expirationTime" : {
+                        "hourMinuteTime" : "16:00:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "16:00:00"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "40b9738f"
+                        "globalKey" : "d1d6340f"
                       }
                     }
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 0.004,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "value" : 0.004,
-                      "arithmeticOperator" : "ADD",
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate",
+                      "arithmeticOperator" : "Add"
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "fallbackExercise" : false
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "1ea5dc35"
-                },
-                "optionType" : "RECEIVER",
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -178,14 +134,9 @@
                       "productQualifier" : "CreditDefaultSwap_Index"
                     } ],
                     "economicTerms" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "NONE",
-                        "meta" : {
-                          "globalKey" : "24a738"
-                        }
-                      },
                       "effectiveDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-03-20",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -194,67 +145,154 @@
                           },
                           "meta" : {
                             "globalKey" : "eb7a730c"
-                          },
-                          "unadjustedDate" : "2006-03-20"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eb7a730c"
                         }
                       },
+                      "terminationDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2011-06-20",
+                          "dateAdjustments" : {
+                            "businessDayConvention" : "NONE",
+                            "meta" : {
+                              "globalKey" : "24a738"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ec136bcc"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "ec136bcc"
+                        }
+                      },
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "NONE",
+                        "meta" : {
+                          "globalKey" : "24a738"
+                        }
+                      },
                       "payout" : {
-                        "creditDefaultPayout" : {
+                        "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "priceQuantity" : {
+                            "quantitySchedule" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "quantity-1"
+                              }
+                            },
                             "meta" : {
-                              "externalKey" : "NOTIONAL",
                               "globalKey" : "0"
+                            }
+                          },
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "0"
+                              }
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "17f73"
+                              },
+                              "rollConvention" : "20"
                             },
+                            "meta" : {
+                              "globalKey" : "17f73"
+                            }
+                          },
+                          "paymentDates" : {
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 3,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "aa"
+                              }
+                            },
+                            "firstPaymentDate" : "2007-03-20",
+                            "lastRegularPaymentDate" : "2011-03-20",
+                            "meta" : {
+                              "globalKey" : "6f60b62a"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "c5a7813e"
+                          }
+                        } ],
+                        "creditDefaultPayout" : {
+                          "payerReceiver" : {
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
+                          },
+                          "priceQuantity" : {
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0",
+                              "externalKey" : "NOTIONAL"
                             }
                           },
                           "settlementTerms" : {
-                            "meta" : {
-                              "globalKey" : "a817b2b6"
-                            },
+                            "settlementType" : "Physical",
                             "settlementCurrency" : {
                               "value" : "USD"
                             },
-                            "settlementType" : "PHYSICAL",
+                            "meta" : {
+                              "globalKey" : "338d24c"
+                            },
                             "physicalSettlementTerms" : {
+                              "physicalSettlementPeriod" : {
+                                "maximumBusinessDays" : 30
+                              },
                               "deliverableObligations" : {
                                 "accruedInterest" : false,
+                                "category" : "BondOrLoan",
+                                "notSubordinated" : true,
+                                "notContingent" : true,
                                 "assignableLoan" : {
                                   "applicable" : true
                                 },
-                                "category" : "BOND_OR_LOAN",
                                 "consentRequiredLoan" : {
                                   "applicable" : true
                                 },
+                                "transferable" : true,
                                 "maximumMaturity" : {
-                                  "meta" : {
-                                    "globalKey" : "ae5"
-                                  },
+                                  "periodMultiplier" : 30,
                                   "period" : "Y",
-                                  "periodMultiplier" : 30
+                                  "meta" : {
+                                    "globalKey" : "3fb"
+                                  }
                                 },
-                                "notBearer" : true,
-                                "notContingent" : true,
-                                "notSubordinated" : true,
-                                "transferable" : true
+                                "notBearer" : true
                               },
                               "escrow" : true,
                               "meta" : {
-                                "globalKey" : "b173b779"
-                              },
-                              "physicalSettlementPeriod" : {
-                                "maximumBusinessDays" : 30
+                                "globalKey" : "c94d70f"
                               }
                             }
                           },
@@ -263,304 +301,266 @@
                               "indexName" : {
                                 "value" : "Dow Jones iTraxx Europe Consumers Series 2 Version 1"
                               },
+                              "indexSeries" : 2,
+                              "indexAnnexVersion" : 1,
+                              "indexAnnexDate" : "2006-11-01",
+                              "indexAnnexSource" : {
+                                "value" : "Publisher"
+                              },
                               "excludedReferenceEntity" : [ {
                                 "referenceEntity" : {
-                                  "meta" : {
-                                    "globalKey" : "43886e95"
-                                  },
                                   "name" : {
                                     "value" : "TESCO PLC"
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "43886e95"
                                   }
                                 }
                               } ],
-                              "indexAnnexDate" : "2006-11-01",
-                              "indexAnnexSource" : {
-                                "value" : "PUBLISHER"
-                              },
-                              "indexAnnexVersion" : 1,
-                              "indexSeries" : 2,
                               "meta" : {
-                                "globalKey" : "f90435c9"
+                                "globalKey" : "dd7d1cc9"
                               }
                             }
                           },
-                          "meta" : {
-                            "globalKey" : "2f8ebc7a"
-                          },
                           "protectionTerms" : [ {
                             "creditEvents" : {
                               "bankruptcy" : true,
-                              "creditEventNotice" : {
-                                "notifyingParty" : [ "PARTY_2", "PARTY_1" ],
-                                "publiclyAvailableInformation" : {
-                                  "publicSource" : [ "Standard" ],
-                                  "specifiedNumber" : 2
-                                }
-                              },
                               "failureToPay" : {
                                 "applicable" : true,
                                 "paymentRequirement" : {
+                                  "value" : 1000000,
                                   "unit" : {
                                     "currency" : {
                                       "value" : "USD"
                                     }
                                   },
-                                  "value" : 1000000,
                                   "meta" : {
                                     "globalKey" : "48eb1e55"
                                   }
                                 }
                               },
+                              "creditEventNotice" : {
+                                "notifyingParty" : [ "Party2", "Party1" ],
+                                "publiclyAvailableInformation" : {
+                                  "publicSource" : [ "Standard" ],
+                                  "specifiedNumber" : 2
+                                }
+                              },
                               "meta" : {
-                                "globalKey" : "469a7a71"
+                                "globalKey" : "a7a0f33d"
                               }
                             },
-                            "meta" : {
-                              "globalKey" : "80eddc26"
-                            },
                             "obligations" : {
-                              "category" : "BORROWED_MONEY"
-                            }
-                          } ]
-                        },
-                        "interestRatePayout" : [ {
-                          "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
-                          },
-                          "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "quantitySchedule" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "quantity-1"
-                              }
-                            }
-                          },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "28c47"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 3,
-                              "rollConvention" : "20"
+                              "category" : "BorrowedMoney"
                             },
                             "meta" : {
-                              "globalKey" : "28c47"
+                              "globalKey" : "ba3951f2"
                             }
-                          },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
+                          } ],
                           "meta" : {
-                            "globalKey" : "e55ed0a4"
-                          },
-                          "paymentDates" : {
-                            "firstPaymentDate" : "2007-03-20",
-                            "lastRegularPaymentDate" : "2011-03-20",
-                            "meta" : {
-                              "globalKey" : "6f60bed6"
-                            },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "956"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 3
-                            }
-                          },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
-                              }
-                            }
+                            "globalKey" : "247c6f0"
                           }
-                        } ],
-                        "meta" : {
-                          "globalKey" : "eb58846a"
-                        }
-                      },
-                      "terminationDate" : {
-                        "adjustableDate" : {
-                          "dateAdjustments" : {
-                            "businessDayConvention" : "NONE",
-                            "meta" : {
-                              "globalKey" : "24a738"
-                            }
-                          },
-                          "meta" : {
-                            "globalKey" : "ec136bcc"
-                          },
-                          "unadjustedDate" : "2011-06-20"
                         },
                         "meta" : {
-                          "globalKey" : "ec136bcc"
+                          "globalKey" : "c1639eae"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "939774e"
+                      "globalKey" : "8e068626"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "939774e"
+                    "globalKey" : "8e068626"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "b7150a9d"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "b7150a9d"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "31ae620b"
+            "globalKey" : "9248c047"
           }
         },
         "meta" : {
-          "globalKey" : "31ae620b"
+          "globalKey" : "9248c047"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "bda0c0bc"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.004,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.004,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 250000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 250000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "a8acbff5"
-          },
-          "quantity" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "f67756c4"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 250000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 250000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "6ceb3eab"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "Party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TRADEDATE",
-        "globalKey" : "3eb050"
-      },
-      "value" : "2006-01-16"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "Party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/coding-scheme/trade-id"
-          },
-          "value" : "Trade234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "7215e0ba"
+        "globalKey" : "33f59568",
+        "externalKey" : "Party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "3585b5e0"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "1edabe91"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 600000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "Party2"
         },
-        "value" : 600000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
+        }
       },
       "settlementDate" : {
         "relativeDate" : {
+          "periodMultiplier" : 3,
+          "period" : "D",
           "meta" : {
-            "globalKey" : "9a256129"
+            "globalKey" : "2ece588b"
           },
-          "period" : "D",
-          "periodMultiplier" : 3,
-          "dayType" : "BUSINESS",
+          "dayType" : "Business",
           "businessDayConvention" : "NONE",
           "dateRelativeTo" : {
-            "externalReference" : "TRADEDATE",
-            "globalReference" : "3eb050"
+            "globalReference" : "3eb050",
+            "externalReference" : "TRADEDATE"
           }
         }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "4ae1e1f1"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "5b67efd1"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.json
index c94f9bb580..a9509cf4ad 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.json
@@ -1,109 +1,34 @@
 {
-  "meta" : {
-    "globalKey" : "8ac99cdc"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "2092c901"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "6234330c"
-      }
-    },
-    "meta" : {
-      "globalKey" : "80f92be8"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "95918657"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-07-13",
+      "meta" : {
+        "globalKey" : "3e89cd",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Option:PriceReturnBasicPerformance:SingleName"
@@ -114,81 +39,43 @@
             "productQualifier" : "EquityOption_PriceReturnBasicPerformance_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
-              },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              }
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "1f6affff"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "4790ef7b"
-                  },
+                  "settlementType" : "Election",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "ELECTION"
+                  "meta" : {
+                    "globalKey" : "4790ef7b"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-07-13",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -197,8 +84,7 @@
                           },
                           "meta" : {
                             "globalKey" : "eae7f1c5"
-                          },
-                          "unadjustedDate" : "2001-07-13"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eae7f1c5"
@@ -206,6 +92,7 @@
                       },
                       "expirationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2005-09-27",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -214,53 +101,50 @@
                           },
                           "meta" : {
                             "globalKey" : "eb6226d3"
-                          },
-                          "unadjustedDate" : "2005-09-27"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eb6226d3"
                         }
                       },
-                      "expirationTimeType" : "CLOSE",
                       "latestExerciseTime" : {
+                        "hourMinuteTime" : "17:15:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "17:15:00"
-                      },
-                      "meta" : {
-                        "globalKey" : "260f119e"
+                        }
                       },
+                      "expirationTimeType" : "Close",
                       "multipleExercise" : {
                         "integralMultipleAmount" : 1,
                         "minimumNumberOfOptions" : 1,
                         "maximumNumberOfOptions" : 150000
+                      },
+                      "meta" : {
+                        "globalKey" : "260f119e"
                       }
                     }
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 32.00,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "value" : 32.00,
                       "perUnitOf" : {
-                        "financialUnit" : "SHARE"
+                        "financialUnit" : "Share"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
+                    }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "1f6affff"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -273,149 +157,265 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "9876f5ef"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "9876f5ef"
+              }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "b94c9d1"
+            "globalKey" : "b1dc3b51"
           }
         },
         "meta" : {
-          "globalKey" : "b94c9d1"
+          "globalKey" : "b1dc3b51"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "23fc586c"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "87c27b06"
+          "quantity" : [ {
+            "value" : {
+              "value" : 150000,
+              "unit" : {
+                "financialUnit" : "Contract"
+              },
+              "multiplier" : {
+                "value" : 1.00,
+                "unit" : {
+                  "financialUnit" : "Share"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "STM-FP",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : "STM-FP"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "78e02f1b"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "STMicroelectronics N.V. ordinary shares"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "12ca7141"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "CONTRACT"
+                }
               },
-              "value" : 150000,
-              "multiplier" : {
-                "unit" : {
-                  "financialUnit" : "SHARE"
-                },
-                "value" : 1.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "708ce5ba"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "10bcc820"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e89cd"
-      },
-      "value" : "2001-07-13"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "2092c901"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "1b2141cd"
+        "globalKey" : "6234330c"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "5c52b112"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "f53c9af4"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 405000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "value" : 405000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-07-17",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-07-17"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "805c5fcc"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "6fbfb05e"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqd-ex04-european-call-index-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqd-ex04-european-call-index-long-form.json
index fd8a1592ee..94ac35cbdd 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqd-ex04-european-call-index-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqd-ex04-european-call-index-long-form.json
@@ -1,109 +1,33 @@
 {
-  "meta" : {
-    "globalKey" : "853af91c"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            } ]
-          }
-        },
-        "meta" : {
-          "globalKey" : "6b41335a"
-        }
-      } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
-      "meta" : {
-        "globalKey" : "baf16b25"
-      }
-    },
-    "meta" : {
-      "globalKey" : "c51819da"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyB.com/eqd-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "9591fab6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-09-04",
+      "meta" : {
+        "globalKey" : "3e8a44"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Option:PriceReturnBasicPerformance:SingleIndex"
@@ -114,68 +38,37 @@
             "productQualifier" : "EquityOption_PriceReturnBasicPerformance_Index"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "indexAdjustmentEvents" : {
-                "indexCancellation" : "CANCELLATION_AND_PAYMENT",
-                "indexDisruption" : "CALCULATION_AGENT_ADJUSTMENT",
-                "indexModification" : "CALCULATION_AGENT_ADJUSTMENT"
-              },
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "indexDisclaimer" : true,
-                "nonReliance" : true
-              }
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "c9d386b6"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "a55e2c43"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "CHF"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "994a10b7"
+                          "globalKey" : "2c4c46fb"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
                         "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
                           "externalReference" : "valuation"
@@ -183,25 +76,24 @@
                       }
                     },
                     "meta" : {
-                      "globalKey" : "994a10b7"
+                      "globalKey" : "2c4c46fb"
                     }
                   },
-                  "settlementType" : "CASH"
+                  "meta" : {
+                    "globalKey" : "38606287"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "isApplicable" : true
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2004-12-19",
                           "dateAdjustments" : {
                             "businessDayConvention" : "NONE",
                             "meta" : {
@@ -210,8 +102,7 @@
                           },
                           "meta" : {
                             "globalKey" : "eb46d18b"
-                          },
-                          "unadjustedDate" : "2004-12-19"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "eb46d18b"
@@ -225,23 +116,24 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 8700,
                       "unit" : {
                         "currency" : {
                           "value" : "CHF"
                         }
                       },
-                      "value" : 8700,
                       "perUnitOf" : {
-                        "financialUnit" : "INDEX_UNIT"
+                        "financialUnit" : "IndexUnit"
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
+                    }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "isApplicable" : true
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "c9d386b6"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
                   "index" : {
                     "productIdentifier" : [ {
@@ -259,146 +151,254 @@
                   "meta" : {
                     "globalKey" : "0"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "5a4ea8dc"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "5a4ea8dc"
+              }
+            },
+            "extraordinaryEvents" : {
+              "indexAdjustmentEvents" : {
+                "indexModification" : "CalculationAgentAdjustment",
+                "indexCancellation" : "CancellationAndPayment",
+                "indexDisruption" : "CalculationAgentAdjustment"
+              },
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "indexDisclaimer" : true,
+                "additionalAcknowledgements" : true
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "18d34d8d"
+            "globalKey" : "7505acf5"
           }
         },
         "meta" : {
-          "globalKey" : "18d34d8d"
+          "globalKey" : "7505acf5"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "8b69ee51"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "cf29f49a"
+          "quantity" : [ {
+            "value" : {
+              "value" : 2500,
+              "unit" : {
+                "financialUnit" : "Contract"
+              },
+              "multiplier" : {
+                "value" : 1.00,
+                "unit" : {
+                  "financialUnit" : "IndexUnit"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : ".SSMI",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/schemes/4.1/instrumentId"
-                  },
-                  "value" : ".SSMI"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "e929c01a"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "Swiss Market Index"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "97ddb474"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "CONTRACT"
+                }
               },
-              "value" : 2500,
-              "multiplier" : {
-                "unit" : {
-                  "financialUnit" : "INDEX_UNIT"
-                },
-                "value" : 1.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "16149ea6"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "ae56649d"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3e8a44"
-      },
-      "value" : "2001-09-04"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyB.com/eqd-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "1234"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "6b41335a"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "1b2141ce"
+        "globalKey" : "baf16b25"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "eeff9c6"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "f7fe1c2"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 300000,
         "unit" : {
           "currency" : {
             "value" : "CHF"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         },
-        "value" : 300000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-09-06",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-09-06"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "8b9b3488"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "27a688ce"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex01-single-underlyer-execution-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex01-single-underlyer-execution-long-form.json
index 9f8fe5d481..85882a6fba 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex01-single-underlyer-execution-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex01-single-underlyer-execution-long-form.json
@@ -1,118 +1,50 @@
 {
-  "meta" : {
-    "globalKey" : "50a0c404"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "6234",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/eqs-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
       "meta" : {
-        "globalKey" : "92c7c587"
+        "globalKey" : "9593cc32"
       }
-    },
-    "meta" : {
-      "globalKey" : "50a0c404"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "6569",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/eqs-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "95944c36"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-09-24",
+      "meta" : {
+        "globalKey" : "3e8a58",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "EXECUTION",
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "EXTRAORDINARY_DIVIDENDS_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleName"
@@ -123,313 +55,305 @@
             "productQualifier" : "EquitySwap_TotalReturnBasicPerformance_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
-              "meta" : {
-                "externalKey" : "EffectiveDate",
-                "globalKey" : "6a2df5e0"
-              },
               "relativeDate" : {
+                "periodMultiplier" : 3,
+                "period" : "D",
                 "meta" : {
-                  "globalKey" : "6a2df5e0"
+                  "globalKey" : "fed6ed42"
                 },
-                "period" : "D",
-                "periodMultiplier" : 3,
-                "dayType" : "EXCHANGE_BUSINESS",
-                "businessDayConvention" : "NOT_APPLICABLE",
+                "dayType" : "ExchangeBusiness",
+                "businessDayConvention" : "NotApplicable",
                 "dateRelativeTo" : {
-                  "externalReference" : "TradeDate",
-                  "globalReference" : "3e8a58"
+                  "globalReference" : "3e8a58",
+                  "externalReference" : "TradeDate"
                 }
+              },
+              "meta" : {
+                "globalKey" : "fed6ed42",
+                "externalKey" : "EffectiveDate"
               }
             },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "edf02740"
+                },
+                "businessDayConvention" : "NotApplicable",
+                "dateRelativeTo" : {
+                  "globalReference" : "bb917ef4",
+                  "externalReference" : "FinalEquityPaymentDate"
+                }
               },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
+              "meta" : {
+                "globalKey" : "edf02740",
+                "externalKey" : "TerminationDate"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "607b91fd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "EquityNotionalAmount",
-                    "globalReference" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "EquityNotionalAmount"
+                  },
+                  "meta" : {
+                    "globalKey" : "607b91fd"
+                  }
+                },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "globalKey" : "6a2df5e0"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 3,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "6a2df5e0"
+                        "globalKey" : "fed6ed42"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 3,
-                      "dayType" : "EXCHANGE_BUSINESS",
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "dayType" : "ExchangeBusiness",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "TradeDate",
-                        "globalReference" : "3e8a58"
+                        "globalReference" : "3e8a58",
+                        "externalReference" : "TradeDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "fed6ed42"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "InterestLegPeriodDates",
-                    "globalKey" : "8fbb2a68"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "globalKey" : "f18f7c48"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "f18f7c48"
+                        "globalKey" : "edf02740"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "FinalEquityPaymentDate",
-                        "globalReference" : "ad48d812"
+                        "globalReference" : "bb917ef4",
+                        "externalReference" : "FinalEquityPaymentDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "edf02740"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f0f22bbe",
+                    "externalKey" : "InterestLegPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "f5120739"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "9b9d36de"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "9b9d36de"
-                      },
                       "relativeDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "9b9d36de"
+                          "globalKey" : "97fde1d6"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "dateRelativeTo" : {
-                          "externalReference" : "EquityPaymentDate",
-                          "globalReference" : "48d79a64"
+                          "globalReference" : "56b8bd08",
+                          "externalReference" : "EquityPaymentDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "97fde1d6"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97fde1d6"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "InterestLegPeriodDates",
-                    "globalReference" : "8fbb2a68"
+                    "globalReference" : "f0f22bbe",
+                    "externalReference" : "InterestLegPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "9e9ada33"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "92fd2d87"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "daf6cbc2"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "EquityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "EquityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "4841e309"
-                },
-                "paymentDates" : {
                   "meta" : {
-                    "externalKey" : "EquityPaymentDate",
-                    "globalKey" : "48d79a64"
-                  },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "externalKey" : "FinalEquityPaymentDate",
-                        "globalKey" : "ad48d812"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "ad48d812"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessCentersReference" : {
-                          "externalReference" : "PrimaryBusinessCenter",
-                          "globalReference" : "27e4e9"
+                    "globalKey" : "7610bbd9"
+                  }
+                },
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "adjustableDates" : {
+                        "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ],
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
                         },
-                        "businessDayConvention" : "FOLLOWING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "FinalValuationDate",
-                          "globalReference" : "252ee503"
+                        "meta" : {
+                          "globalKey" : "e80e5233"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "e80e5233",
+                        "externalKey" : "InterimValuationDate"
                       }
                     },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "externalKey" : "InterimEquityPaymentDate",
-                        "globalKey" : "2519d1b6"
-                      },
+                    "valuationTimeType" : "Close",
+                    "meta" : {
+                      "globalKey" : "374dddc6"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2002-09-24",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "252ee503"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "252ee503",
+                        "externalKey" : "FinalValuationDate"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "96fa6685"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
                       "relativeDates" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "2519d1b6"
+                          "globalKey" : "dfe60714"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "PrimaryBusinessCenter",
-                            "globalKey" : "27e4e9"
+                            "globalKey" : "27e4e9",
+                            "externalKey" : "PrimaryBusinessCenter"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "InterimValuationDate",
-                          "globalReference" : "e80e5233"
+                          "globalReference" : "e80e5233",
+                          "externalReference" : "InterimValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "dfe60714",
+                        "externalKey" : "InterimEquityPaymentDate"
                       }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendCurrency" : {
-                      "determinationMethod" : "DIVIDEND_CURRENCY"
-                    },
-                    "dividendEntitlement" : "EX_DATE",
-                    "dividendPayoutRatio" : [ {
-                      "totalRatio" : 1
                     } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "EQUITY_PAYMENT_DATE"
-                        }
-                      },
-                      "endDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "TerminationDate",
-                          "globalReference" : "f18f7c48"
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "bb917ef4"
+                        },
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "PrimaryBusinessCenter"
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "252ee503",
+                          "externalReference" : "FinalValuationDate"
                         }
                       },
-                      "startDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "TradeDate",
-                          "globalReference" : "3e8a58"
-                        }
+                      "meta" : {
+                        "globalKey" : "bb917ef4",
+                        "externalKey" : "FinalEquityPaymentDate"
                       }
-                    } ],
-                    "dividendReinvestment" : false,
-                    "excessDividendAmount" : "RECORD_AMOUNT",
-                    "extraordinaryDividendsParty" : "EXTRAORDINARY_DIVIDENDS_PARTY"
+                    }
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                  "meta" : {
+                    "globalKey" : "56b8bd08",
+                    "externalKey" : "EquityPaymentDate"
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -442,278 +366,354 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
-                    "meta" : {
-                      "globalKey" : "96fa6685"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "252ee503"
-                        },
-                        "unadjustedDate" : "2002-09-24"
-                      },
-                      "meta" : {
-                        "externalKey" : "FinalValuationDate",
-                        "globalKey" : "252ee503"
-                      }
-                    }
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
                   },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "374dddc6"
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 1
+                    } ],
+                    "dividendReinvestment" : false,
+                    "dividendEntitlement" : "ExDate",
+                    "extraordinaryDividendsParty" : "ExtraordinaryDividendsParty",
+                    "excessDividendAmount" : "RecordAmount",
+                    "dividendCurrency" : {
+                      "determinationMethod" : "DividendCurrency"
                     },
-                    "valuationDates" : {
-                      "adjustableDates" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "e80e5233"
-                        },
-                        "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ]
+                    "dividendPeriod" : [ {
+                      "startDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "3e8a58",
+                          "externalReference" : "TradeDate"
+                        }
                       },
-                      "meta" : {
-                        "externalKey" : "InterimValuationDate",
-                        "globalKey" : "e80e5233"
+                      "endDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "edf02740",
+                          "externalReference" : "TerminationDate"
+                        }
+                      },
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "EquityPaymentDate"
+                        }
                       }
-                    },
-                    "valuationTimeType" : "CLOSE"
+                    } ]
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "meta" : {
-                "externalKey" : "TerminationDate",
-                "globalKey" : "f18f7c48"
-              },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "f18f7c48"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NOT_APPLICABLE",
-                "dateRelativeTo" : {
-                  "externalReference" : "FinalEquityPaymentDate",
-                  "globalReference" : "ad48d812"
+                "meta" : {
+                  "globalKey" : "8595f65f"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "dd006266"
               }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "e8c8379a"
+            "globalKey" : "ece94628"
           }
         },
         "meta" : {
-          "globalKey" : "e8c8379a"
+          "globalKey" : "ece94628"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "417e440b"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "26bb033f"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.abc.com/instrumentId"
-                  },
-                  "value" : "SHPGY.O"
-                },
-                "meta" : {
-                  "globalKey" : "8c85a05e"
-                },
-                "source" : "OTHER"
-              }
-            }, {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
-                },
-                "meta" : {
-                  "globalKey" : "5518dd"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 37.44,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 37.44,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "AssetPrice"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 760400,
               "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 760400
-            }
-          }, {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 28469376,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 28469376
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "7dd9ec3"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d03"
-            },
-            "rateOption" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "SHPGY.O",
+                  "meta" : {
+                    "scheme" : "http://www.abc.com/instrumentId"
+                  }
+                },
+                "source" : "Other",
+                "meta" : {
+                  "globalKey" : "8c85a05e"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-LIBOR-BBA"
+                "identifier" : {
+                  "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
                 },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 1
+                "source" : "Name",
+                "meta" : {
+                  "globalKey" : "5518dd"
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "b0a564a1"
             }
           },
+          "meta" : {
+            "globalKey" : "b4fad14b"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
             "value" : {
+              "value" : 0.0020,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0020,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
             }
-          } ]
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 1,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "82801f45"
+            }
+          },
+          "meta" : {
+            "globalKey" : "95c8caad"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e8a58"
-      },
-      "value" : "2001-09-24"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "ExtraordinaryDividendsParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      } ],
+      "adjustment" : "Execution"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/eqs-trade-id"
-          },
-          "value" : "6234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "23a97ce8"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/eqs-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "6569"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "23d5334e"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "215e4a0a"
+    }
+  },
+  "meta" : {
+    "globalKey" : "215e4a0a"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex05-single-stock-plus-fee-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex05-single-stock-plus-fee-long-form.json
index df9a43c13c..2820d5c74e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex05-single-stock-plus-fee-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex05-single-stock-plus-fee-long-form.json
@@ -1,128 +1,50 @@
 {
-  "meta" : {
-    "globalKey" : "1348cd99"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1934",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/eqs-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
       "meta" : {
-        "globalKey" : "92c7c587"
+        "globalKey" : "9591a09e"
       }
-    },
-    "meta" : {
-      "globalKey" : "33a507b3"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "5978",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/eqs-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party3",
-        "globalKey" : "33f59569"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party C"
-        },
-        "meta" : {
-          "globalKey" : "33f59569"
-        }
-      } ]
+        "globalKey" : "9593e6f9"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-09-10",
+      "meta" : {
+        "globalKey" : "3e924a",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleName"
@@ -133,208 +55,210 @@
             "productQualifier" : "EquitySwap_TotalReturnBasicPerformance_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2002-09-12",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "252eb7f7"
-                },
-                "unadjustedDate" : "2002-09-12"
+                }
               },
               "meta" : {
-                "externalKey" : "EffectiveDate",
-                "globalKey" : "252eb7f7"
+                "globalKey" : "252eb7f7",
+                "externalKey" : "EffectiveDate"
               }
             },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "edf02740"
+                },
+                "businessDayConvention" : "NotApplicable",
+                "dateRelativeTo" : {
+                  "globalReference" : "23cbca9b",
+                  "externalReference" : "FinalEquityPaymentDate"
+                }
               },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
+              "meta" : {
+                "globalKey" : "edf02740",
+                "externalKey" : "TerminationDate"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
+                },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
                 },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "globalKey" : "d174da04"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "d174da04"
+                        "globalKey" : "cdd584fc"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "EffectiveDate",
-                        "globalReference" : "252eb7f7"
+                        "globalReference" : "252eb7f7",
+                        "externalReference" : "EffectiveDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "cdd584fc"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "InterestLegPeriodDates",
-                    "globalKey" : "b55615c4"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "globalKey" : "f18f7c48"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "f18f7c48"
+                        "globalKey" : "edf02740"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "FinalEquityPaymentDate",
-                        "globalReference" : "8bd2b65f"
+                        "globalReference" : "23cbca9b",
+                        "externalReference" : "FinalEquityPaymentDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "edf02740"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "33464ec4",
+                    "externalKey" : "InterestLegPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "76358c47"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "78629cd1"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "78629cd1"
-                      },
                       "relativeDates" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "78629cd1"
+                          "globalKey" : "53b05215"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCentersReference" : {
-                          "externalReference" : "PrimaryBusinessCenter",
-                          "globalReference" : "4fc3867"
+                          "globalReference" : "4fc3867",
+                          "externalReference" : "PrimaryBusinessCenter"
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "FinalValuationDate",
-                          "globalReference" : "b9c8415a"
+                          "globalReference" : "b9c8415a",
+                          "externalReference" : "FinalValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "53b05215"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "53b05215"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "InterestLegPeriodDates",
-                    "globalReference" : "b55615c4"
+                    "globalReference" : "33464ec4",
+                    "externalReference" : "InterestLegPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "9e9ada33"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "93d8150b"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "b3686461"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "reset" : false,
                   "meta" : {
                     "globalKey" : "4d5"
-                  },
-                  "reset" : false
+                  }
                 },
-                "fxFeature" : [ {
-                  "composite" : {
-                    "determinationMethod" : "CALCULATION_AGENT"
-                  },
-                  "referenceCurrency" : {
+                "valuationDates" : {
+                  "valuationDatesInitial" : {
+                    "determinationMethod" : "CalculationAgent",
                     "meta" : {
-                      "externalKey" : "ReferenceCurrency",
-                      "globalKey" : "14966"
+                      "globalKey" : "b70ebdcf"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "CalculationAgent",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2004-03-12",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCentersReference" : {
+                              "globalReference" : "4fc3867",
+                              "externalReference" : "PrimaryBusinessCenter"
+                            },
+                            "meta" : {
+                              "globalKey" : "bec926b7"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "dfc642a6"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "b9c8415a"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "b9c8415a",
+                        "externalKey" : "FinalValuationDate"
+                      }
                     },
-                    "value" : "USD"
+                    "meta" : {
+                      "globalKey" : "ec1fc029"
+                    }
                   }
-                } ],
-                "meta" : {
-                  "globalKey" : "f84d549a"
                 },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "EquityPaymentDate",
-                    "globalKey" : "8bd2b65f"
-                  },
                   "paymentDateSchedule" : {
                     "finalPaymentDate" : {
-                      "meta" : {
-                        "externalKey" : "FinalEquityPaymentDate",
-                        "globalKey" : "8bd2b65f"
-                      },
                       "relativeDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "8bd2b65f"
+                          "globalKey" : "23cbca9b"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -342,63 +266,32 @@
                             "value" : "TWTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "PrimaryBusinessCenter",
-                            "globalKey" : "4fc3867"
+                            "globalKey" : "4fc3867",
+                            "externalKey" : "PrimaryBusinessCenter"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "FinalValuationDate",
-                          "globalReference" : "b9c8415a"
+                          "globalReference" : "b9c8415a",
+                          "externalReference" : "FinalValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "23cbca9b",
+                        "externalKey" : "FinalEquityPaymentDate"
                       }
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "23cbca9b",
+                    "externalKey" : "EquityPaymentDate"
                   }
                 },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendCurrency" : {
-                      "currencyReference" : {
-                        "externalReference" : "ReferenceCurrency",
-                        "globalReference" : "14966"
-                      }
-                    },
-                    "dividendEntitlement" : "EX_DATE",
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "EX_DATE"
-                        }
-                      },
-                      "endDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "FinalValuationDate",
-                          "globalReference" : "b9c8415a"
-                        }
-                      },
-                      "startDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "TradeDate",
-                          "globalReference" : "3e924a"
-                        }
-                      }
-                    } ],
-                    "dividendReinvestment" : false,
-                    "excessDividendAmount" : "PAID_AMOUNT"
-                  },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
-                  }
-                },
-                "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
-                  "security" : {
-                    "productIdentifier" : [ {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-1"
+                "underlier" : {
+                  "security" : {
+                    "productIdentifier" : [ {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-1"
                       }
                     }, {
                       "address" : {
@@ -406,247 +299,354 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "CALCULATION_AGENT",
+                "fxFeature" : [ {
+                  "referenceCurrency" : {
+                    "value" : "USD",
                     "meta" : {
-                      "globalKey" : "ec1fc029"
+                      "globalKey" : "14966",
+                      "externalKey" : "ReferenceCurrency"
+                    }
+                  },
+                  "composite" : {
+                    "determinationMethod" : "CalculationAgent"
+                  }
+                } ],
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
+                  },
+                  "dividendReturnTerms" : {
+                    "dividendReinvestment" : false,
+                    "dividendEntitlement" : "ExDate",
+                    "excessDividendAmount" : "PaidAmount",
+                    "dividendCurrency" : {
+                      "currencyReference" : {
+                        "globalReference" : "14966",
+                        "externalReference" : "ReferenceCurrency"
+                      }
                     },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessCenters" : {
-                            "businessCentersReference" : {
-                              "externalReference" : "PrimaryBusinessCenter",
-                              "globalReference" : "4fc3867"
-                            },
-                            "meta" : {
-                              "globalKey" : "bec926b7"
-                            }
-                          },
-                          "businessDayConvention" : "FOLLOWING",
-                          "meta" : {
-                            "globalKey" : "dfc642a6"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "b9c8415a"
-                        },
-                        "unadjustedDate" : "2004-03-12"
+                    "dividendPeriod" : [ {
+                      "startDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "3e924a",
+                          "externalReference" : "TradeDate"
+                        }
                       },
-                      "meta" : {
-                        "externalKey" : "FinalValuationDate",
-                        "globalKey" : "b9c8415a"
+                      "endDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "b9c8415a",
+                          "externalReference" : "FinalValuationDate"
+                        }
+                      },
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "ExDate"
+                        }
                       }
-                    }
-                  },
-                  "valuationDatesInitial" : {
-                    "determinationMethod" : "CALCULATION_AGENT",
-                    "meta" : {
-                      "globalKey" : "b70ebdcf"
-                    }
+                    } ]
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "meta" : {
-                "externalKey" : "TerminationDate",
-                "globalKey" : "f18f7c48"
-              },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "f18f7c48"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NOT_APPLICABLE",
-                "dateRelativeTo" : {
-                  "externalReference" : "FinalEquityPaymentDate",
-                  "globalReference" : "8bd2b65f"
+                "meta" : {
+                  "globalKey" : "4929eb06"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "723a6591"
               }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "6c67ad10"
+            "globalKey" : "c987f7d6"
           }
         },
         "meta" : {
-          "globalKey" : "6c67ad10"
+          "globalKey" : "c987f7d6"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "60af6e29"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "7df02426"
+          "quantity" : [ {
+            "value" : {
+              "value" : 18388000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "2881.TW",
                   "meta" : {
                     "scheme" : "http://www.abc.com/instrumentId"
-                  },
-                  "value" : "2881.TW"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "9e2da202"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "Fubon Financial Holdings Co., Ltd."
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "d37ed4e8"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
-            } ]
-          },
-          "quantity" : [ {
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 18388000
+              "globalKey" : "4014609a"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "5f0c6d08"
           },
+          "meta" : {
+            "globalKey" : "6724bddd"
+          }
+        }, {
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d08"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
+            },
+            "meta" : {
+              "globalKey" : "8280320a"
             }
+          },
+          "meta" : {
+            "globalKey" : "8280320a"
           }
         } ]
-      } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e924a"
-      },
-      "value" : "2002-09-10"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyA.com/eqs-trade-id"
-          },
-          "value" : "1934"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "1b83e654"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party C",
           "meta" : {
-            "scheme" : "http://www.partyB.com/eqs-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59569"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59569",
+        "externalKey" : "party3"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "5978"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "22592951"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "21a2317b"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "28152ca6"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party3",
-          "globalReference" : "33f59569"
-        }
-      },
       "quantity" : {
+        "value" : 1000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         },
-        "value" : 1000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59569",
+          "externalReference" : "party3"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2002-09-30",
         "dateAdjustments" : {
-          "businessDayConvention" : "NOT_APPLICABLE",
+          "businessDayConvention" : "NotApplicable",
           "meta" : {
             "globalKey" : "3a4b88ab"
           }
-        },
-        "unadjustedDate" : "2002-09-30"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "4583b5e8"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "70389ea3"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex06-single-index-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex06-single-index-long-form.json
index 813fd86882..98a5c14d06 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex06-single-index-long-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex06-single-index-long-form.json
@@ -1,112 +1,50 @@
 {
-  "meta" : {
-    "globalKey" : "e7f16c81"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1734",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/eqs-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
       "meta" : {
-        "globalKey" : "92c7c587"
+        "globalKey" : "9591991c"
       }
-    },
-    "meta" : {
-      "globalKey" : "e7f16c81"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "5648",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/eqs-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9593db59"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-07-19",
+      "meta" : {
+        "globalKey" : "3e91d3",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleIndex"
@@ -117,249 +55,256 @@
             "productQualifier" : "EquitySwap_PriceReturnBasicPerformance_Index"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
-              "meta" : {
-                "externalKey" : "EffectiveDate",
-                "globalKey" : "6a2df5e0"
-              },
               "relativeDate" : {
+                "periodMultiplier" : 3,
+                "period" : "D",
                 "meta" : {
-                  "globalKey" : "6a2df5e0"
+                  "globalKey" : "fed6ed42"
                 },
-                "period" : "D",
-                "periodMultiplier" : 3,
-                "dayType" : "EXCHANGE_BUSINESS",
-                "businessDayConvention" : "NOT_APPLICABLE",
+                "dayType" : "ExchangeBusiness",
+                "businessDayConvention" : "NotApplicable",
                 "dateRelativeTo" : {
-                  "externalReference" : "TradeDate",
-                  "globalReference" : "3e91d3"
+                  "globalReference" : "3e91d3",
+                  "externalReference" : "TradeDate"
                 }
+              },
+              "meta" : {
+                "globalKey" : "fed6ed42",
+                "externalKey" : "EffectiveDate"
               }
             },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "indexAdjustmentEvents" : {
-                "indexCancellation" : "CANCELLATION_AND_PAYMENT",
-                "indexDisruption" : "CALCULATION_AGENT_ADJUSTMENT",
-                "indexModification" : "CALCULATION_AGENT_ADJUSTMENT"
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "edf02740"
+                },
+                "businessDayConvention" : "NotApplicable",
+                "dateRelativeTo" : {
+                  "globalReference" : "bb917ef4",
+                  "externalReference" : "FinalEquityPaymentDate"
+                }
               },
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "indexDisclaimer" : true,
-                "nonReliance" : true
+              "meta" : {
+                "globalKey" : "edf02740",
+                "externalKey" : "TerminationDate"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "607b91fd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "EquityNotionalAmount",
-                    "globalReference" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "EquityNotionalAmount"
+                  },
+                  "meta" : {
+                    "globalKey" : "607b91fd"
+                  }
+                },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "globalKey" : "6a2df5e0"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 3,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "6a2df5e0"
+                        "globalKey" : "fed6ed42"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 3,
-                      "dayType" : "EXCHANGE_BUSINESS",
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "dayType" : "ExchangeBusiness",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "TradeDate",
-                        "globalReference" : "3e91d3"
+                        "globalReference" : "3e91d3",
+                        "externalReference" : "TradeDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "fed6ed42"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "InterestLegPeriodDates",
-                    "globalKey" : "8fbb2a68"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "globalKey" : "f18f7c48"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "f18f7c48"
+                        "globalKey" : "edf02740"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "FinalEquityPaymentDate",
-                        "globalReference" : "ad48d812"
+                        "globalReference" : "bb917ef4",
+                        "externalReference" : "FinalEquityPaymentDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "edf02740"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f0f22bbe",
+                    "externalKey" : "InterestLegPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "f5120739"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "9b9d36de"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "9b9d36de"
-                      },
                       "relativeDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "9b9d36de"
+                          "globalKey" : "97fde1d6"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "dateRelativeTo" : {
-                          "externalReference" : "EquityPaymentDate",
-                          "globalReference" : "fe9d6c44"
+                          "globalReference" : "94f84ae8",
+                          "externalReference" : "EquityPaymentDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "97fde1d6"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97fde1d6"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "InterestLegPeriodDates",
-                    "globalReference" : "8fbb2a68"
+                    "globalReference" : "f0f22bbe",
+                    "externalReference" : "InterestLegPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "9e9ada33"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "92fd2d87"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "7052978"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "EquityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "EquityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "76108015"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "EUR"
                   },
-                  "settlementType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "3b5f4b7f"
-                },
-                "paymentDates" : {
                   "meta" : {
-                    "externalKey" : "EquityPaymentDate",
-                    "globalKey" : "fe9d6c44"
-                  },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "externalKey" : "FinalEquityPaymentDate",
-                        "globalKey" : "ad48d812"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "ad48d812"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessCentersReference" : {
-                          "externalReference" : "PrimaryBusinessCenter",
-                          "globalReference" : "41619c9"
+                    "globalKey" : "76108015"
+                  }
+                },
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "adjustableDates" : {
+                        "unadjustedDate" : [ "2002-10-21", "2004-01-20", "2004-04-22" ],
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
                         },
-                        "businessDayConvention" : "FOLLOWING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "FinalValuationDate",
-                          "globalReference" : "25690940"
+                        "meta" : {
+                          "globalKey" : "60230b82"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "60230b82",
+                        "externalKey" : "InterimValuationDate"
                       }
                     },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "externalKey" : "InterimEquityPaymentDate",
-                        "globalKey" : "d32f1716"
-                      },
-                      "relativeDates" : {
-                        "meta" : {
-                          "globalKey" : "d32f1716"
-                        },
-                        "period" : "D",
+                    "valuationTimeType" : "Close",
+                    "meta" : {
+                      "globalKey" : "abc4da15"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2004-07-21",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "25690940"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "25690940",
+                        "externalKey" : "FinalValuationDate"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "97348ac2"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
+                      "relativeDates" : {
                         "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "bc36cf4"
+                        },
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -367,22 +312,47 @@
                             "value" : "HKHK"
                           } ],
                           "meta" : {
-                            "externalKey" : "PrimaryBusinessCenter",
-                            "globalKey" : "41619c9"
+                            "globalKey" : "41619c9",
+                            "externalKey" : "PrimaryBusinessCenter"
                           }
                         },
+                        "dateRelativeTo" : {
+                          "globalReference" : "60230b82",
+                          "externalReference" : "InterimValuationDate"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "bc36cf4",
+                        "externalKey" : "InterimEquityPaymentDate"
+                      }
+                    } ],
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "bb917ef4"
+                        },
+                        "dayType" : "CurrencyBusiness",
                         "businessDayConvention" : "FOLLOWING",
+                        "businessCentersReference" : {
+                          "globalReference" : "41619c9",
+                          "externalReference" : "PrimaryBusinessCenter"
+                        },
                         "dateRelativeTo" : {
-                          "externalReference" : "InterimValuationDate",
-                          "globalReference" : "60230b82"
+                          "globalReference" : "25690940",
+                          "externalReference" : "FinalValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "bb917ef4",
+                        "externalKey" : "FinalEquityPaymentDate"
                       }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "priceReturnTerms" : {
-                    "returnType" : "PRICE"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "94f84ae8",
+                    "externalKey" : "EquityPaymentDate"
                   }
                 },
                 "underlier" : {
@@ -403,262 +373,292 @@
                     "globalKey" : "0"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
-                    "meta" : {
-                      "globalKey" : "97348ac2"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "25690940"
-                        },
-                        "unadjustedDate" : "2004-07-21"
-                      },
-                      "meta" : {
-                        "externalKey" : "FinalValuationDate",
-                        "globalKey" : "25690940"
-                      }
-                    }
-                  },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "abc4da15"
-                    },
-                    "valuationDates" : {
-                      "adjustableDates" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "60230b82"
-                        },
-                        "unadjustedDate" : [ "2002-10-21", "2004-01-20", "2004-04-22" ]
-                      },
-                      "meta" : {
-                        "externalKey" : "InterimValuationDate",
-                        "globalKey" : "60230b82"
-                      }
-                    },
-                    "valuationTimeType" : "CLOSE"
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Price"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "71da68d1"
                 }
-              } ]
-            },
-            "terminationDate" : {
+              } ],
               "meta" : {
-                "externalKey" : "TerminationDate",
-                "globalKey" : "f18f7c48"
+                "globalKey" : "a3744f98"
+              }
+            },
+            "extraordinaryEvents" : {
+              "indexAdjustmentEvents" : {
+                "indexModification" : "CalculationAgentAdjustment",
+                "indexCancellation" : "CancellationAndPayment",
+                "indexDisruption" : "CalculationAgentAdjustment"
               },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "f18f7c48"
-                },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NOT_APPLICABLE",
-                "dateRelativeTo" : {
-                  "externalReference" : "FinalEquityPaymentDate",
-                  "globalReference" : "ad48d812"
-                }
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "indexDisclaimer" : true,
+                "additionalAcknowledgements" : true
               }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "a001589b"
+            "globalKey" : "a9a425a7"
           }
         },
         "meta" : {
-          "globalKey" : "a001589b"
+          "globalKey" : "a9a425a7"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "97d7155c"
-          },
-          "observable" : {
+          "price" : [ {
+            "value" : {
+              "value" : 5591987.41,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              },
+              "perUnitOf" : {
+                "financialUnit" : "Share"
+              },
+              "priceType" : "AssetPrice"
+            },
             "meta" : {
-              "globalKey" : "2a77a29d"
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 5591987.41,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : ".FCHI",
                   "meta" : {
                     "scheme" : "http://www.example.com/instrumentId"
-                  },
-                  "value" : ".FCHI"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "e9239a9c"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "France CAC 40 Index"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "136fbb9"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
-            } ]
+            } ],
+            "meta" : {
+              "globalKey" : "247cb103"
+            }
           },
+          "meta" : {
+            "globalKey" : "adf9eb9c"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0050,
               "unit" : {
                 "currency" : {
-                  "value" : "EUR"
+                  "value" : "USD"
                 }
               },
-              "value" : 5591987.41,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "currency" : {
+                  "value" : "USD"
+                }
               },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-2"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 5591987.41
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "66d6e451"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e0e"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Telerate"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 0.0050,
-              "arithmeticOperator" : "ADD",
-              "perUnitOf" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "priceType" : "INTEREST_RATE"
+            "meta" : {
+              "globalKey" : "2bba16de"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "a801e789"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e91d3"
-      },
-      "value" : "2002-07-19"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/eqs-trade-id"
-          },
-          "value" : "1734"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "1b67b752"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/eqs-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "5648"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "222d85b1"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "6c093b63"
+    }
+  },
+  "meta" : {
+    "globalKey" : "6c093b63"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex09-compounding-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex09-compounding-swap.json
index f73f1e4cbe..b963b579e1 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex09-compounding-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex09-compounding-swap.json
@@ -1,104 +1,29 @@
 {
-  "meta" : {
-    "globalKey" : "fc959e48"
-  },
   "trade" : {
-    "collateral" : {
-      "independentAmount" : {
-        "payerPartyReference" : {
-          "externalReference" : "BankA",
-          "globalReference" : "3cfd165"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "BankB",
-          "globalReference" : "3cfd166"
-        },
-        "paymentDetail" : [ {
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "3cfd166",
+        "externalReference" : "BankB"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "TRADEABC",
           "meta" : {
-            "globalKey" : "a93dc25d"
-          },
-          "paymentRule" : {
-            "percentageRule" : {
-              "notionalAmountReference" : {
-                "externalReference" : "equityNotionalAmount",
-                "globalReference" : "4cf"
-              },
-              "paymentPercent" : 0.02
-            }
-          }
-        } ]
-      }
-    },
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2002-06-20",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "EQUITY_AMERICAS"
-            }
+            "scheme" : "TradeRefNbr"
           }
-        },
-        "meta" : {
-          "globalKey" : "d2d845bd"
         }
       } ],
       "meta" : {
-        "globalKey" : "d2d845bd"
+        "globalKey" : "f6c3958"
       }
-    },
-    "meta" : {
-      "globalKey" : "fc959e48"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "BankB",
-        "globalKey" : "3cfd166"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "DTCC"
-          },
-          "value" : "BankB"
-        },
-        "meta" : {
-          "globalKey" : "3cfd166"
-        }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "BankA",
-        "globalKey" : "3cfd165"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "DTCC"
-          },
-          "value" : "BankA"
-        },
-        "meta" : {
-          "globalKey" : "3cfd165"
-        }
-      } ]
     } ],
+    "tradeDate" : {
+      "value" : "2008-01-01",
+      "meta" : {
+        "globalKey" : "3ec041"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "BankA",
-          "globalReference" : "3cfd165"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "BankB",
-          "globalReference" : "3cfd166"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -108,6 +33,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2008-01-01",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -116,218 +42,255 @@
                 },
                 "meta" : {
                   "globalKey" : "ebb45b39"
+                }
+              },
+              "meta" : {
+                "globalKey" : "ebb45b39",
+                "externalKey" : "equityEffectiveDate"
+              }
+            },
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "ea96b216"
                 },
-                "unadjustedDate" : "2008-01-01"
+                "businessDayConvention" : "NONE",
+                "dateRelativeTo" : {
+                  "globalReference" : "7e0a5d94",
+                  "externalReference" : "finalCashSettlementPaymentDate"
+                }
               },
               "meta" : {
-                "externalKey" : "equityEffectiveDate",
-                "globalKey" : "ebb45b39"
+                "globalKey" : "ea96b216"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "54b65ddd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "equityNotionalAmount",
-                    "globalReference" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "equityNotionalAmount"
+                  },
+                  "meta" : {
+                    "globalKey" : "54b65ddd"
                   }
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0",
+                      "externalKey" : "floatingRateCalculation"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "globalKey" : "49d4d2ac"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "49d4d2ac"
+                        "globalKey" : "46357da4"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
                       "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "equityEffectiveDate",
-                        "globalReference" : "ebb45b39"
+                        "globalReference" : "ebb45b39",
+                        "externalReference" : "equityEffectiveDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "46357da4"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalculationPeriodDates",
-                    "globalKey" : "2ffb1af2"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "globalKey" : "ee36071e"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "ee36071e"
+                        "globalKey" : "ea96b216"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
                       "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "finalCashSettlementPaymentDate",
-                        "globalReference" : "e9616632"
+                        "globalReference" : "7e0a5d94",
+                        "externalReference" : "finalCashSettlementPaymentDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "ea96b216"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "adeb53f2",
+                    "externalKey" : "floatingCalculationPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "ba63673e"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "25f944ac"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
                       "adjustableDates" : {
+                        "unadjustedDate" : [ "2009-01-01" ],
                         "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
                             "globalKey" : "3a4b88ab"
                           }
                         },
                         "meta" : {
                           "globalKey" : "25f944ac"
-                        },
-                        "unadjustedDate" : [ "2009-01-01" ]
+                        }
                       },
                       "meta" : {
                         "globalKey" : "25f944ac"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "externalKey" : "floatingRateCalculation",
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "25f944ac"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalculationPeriodDates",
-                    "globalReference" : "2ffb1af2"
+                    "globalReference" : "adeb53f2",
+                    "externalReference" : "floatingCalculationPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "c446e854"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c831edf2"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "bd66f61"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "equityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "equityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "14966"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
+                  },
+                  "meta" : {
+                    "globalKey" : "14966"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "23caf5a3"
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "adjustableDates" : {
+                        "unadjustedDate" : [ "2009-01-01" ],
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "25f944ac"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "25f944ac"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "f85ffd21",
+                      "externalKey" : "equityValuationDates"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "ValuationTime",
+                    "meta" : {
+                      "globalKey" : "524b126b"
+                    }
+                  }
                 },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "CashSettlementPaymentDate",
-                    "globalKey" : "1b5a7a64"
-                  },
                   "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "externalKey" : "finalCashSettlementPaymentDate",
-                        "globalKey" : "e9616632"
-                      },
-                      "relativeDate" : {
+                    "interimPaymentDates" : [ {
+                      "relativeDates" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "e9616632"
+                          "globalKey" : "7e0a5d94"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
                         "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "equityValuationDates",
-                          "globalReference" : "f85ffd21"
+                          "globalReference" : "f85ffd21",
+                          "externalReference" : "equityValuationDates"
                         }
-                      }
-                    },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "e9616632"
                       },
-                      "relativeDates" : {
+                      "meta" : {
+                        "globalKey" : "7e0a5d94"
+                      }
+                    } ],
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "e9616632"
+                          "globalKey" : "7e0a5d94"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
                         "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "equityValuationDates",
-                          "globalReference" : "f85ffd21"
+                          "globalReference" : "f85ffd21",
+                          "externalReference" : "equityValuationDates"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "7e0a5d94",
+                        "externalKey" : "finalCashSettlementPaymentDate"
                       }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "priceReturnTerms" : {
-                    "returnType" : "PRICE"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "e5f7e728",
+                    "externalKey" : "CashSettlementPaymentDate"
                   }
                 },
                 "underlier" : {
@@ -343,219 +306,256 @@
                     "globalKey" : "0"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "524b126b"
-                    }
-                  },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "externalKey" : "equityValuationDates",
-                      "globalKey" : "f85ffd21"
-                    },
-                    "valuationDates" : {
-                      "adjustableDates" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "25f944ac"
-                        },
-                        "unadjustedDate" : [ "2009-01-01" ]
-                      },
-                      "meta" : {
-                        "globalKey" : "25f944ac"
-                      }
-                    }
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Price"
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "meta" : {
-                "globalKey" : "ee36071e"
-              },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "ee36071e"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NONE",
-                "dateRelativeTo" : {
-                  "externalReference" : "finalCashSettlementPaymentDate",
-                  "globalReference" : "e9616632"
+                "meta" : {
+                  "globalKey" : "9591ebd"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "4fad7e2f"
               }
             },
             "terminationProvision" : {
               "earlyTerminationProvision" : {
-                "meta" : {
-                  "globalKey" : "4d5"
-                },
                 "optionalEarlyTermination" : {
                   "mutualEarlyTermination" : false
+                },
+                "meta" : {
+                  "globalKey" : "4d5"
                 }
               }
             }
           },
           "meta" : {
-            "globalKey" : "dac9aab"
+            "globalKey" : "a16a8ee7"
           }
         },
         "meta" : {
-          "globalKey" : "dac9aab"
+          "globalKey" : "a16a8ee7"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "9b07a418"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "4bbdc99"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.abc.com/instrument-id-Reuters-RIC-1-0"
-                  },
-                  "value" : ".SPX"
-                },
-                "meta" : {
-                  "globalKey" : "4bbdc99"
-                },
-                "source" : "RIC"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 100,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 100,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "AssetPrice"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 1000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 1000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "a0a1dcce"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d03"
-            },
-            "rateOption" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : ".SPX",
+                  "meta" : {
+                    "scheme" : "http://www.abc.com/instrument-id-Reuters-RIC-1-0"
+                  }
+                },
+                "source" : "RIC",
+                "meta" : {
+                  "globalKey" : "4bbdc99"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 1
-                }
               }
+            } ],
+            "meta" : {
+              "globalKey" : "92bfb687"
             }
           },
+          "meta" : {
+            "globalKey" : "e2577118"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.01,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 1,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "82801f45"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "d2ab36f8"
+          }
         } ]
-      } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "3cfd165",
+          "externalReference" : "BankA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "3cfd166",
+          "externalReference" : "BankB"
+        }
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "BankB",
+          "meta" : {
+            "scheme" : "DTCC"
+          }
+        },
+        "meta" : {
+          "globalKey" : "3cfd166"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3ec041"
-      },
-      "value" : "2008-01-01"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "3cfd166",
+        "externalKey" : "BankB"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BankA",
           "meta" : {
-            "scheme" : "TradeRefNbr"
-          },
-          "value" : "TRADEABC"
+            "scheme" : "DTCC"
+          }
+        },
+        "meta" : {
+          "globalKey" : "3cfd165"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "3cfd165",
+        "externalKey" : "BankA"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2002-06-20",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "EquityAmericas"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "d2d845bd"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "BankB",
-        "globalReference" : "3cfd166"
-      },
       "meta" : {
-        "globalKey" : "9099f664"
+        "globalKey" : "d2d845bd"
       }
-    } ]
+    },
+    "collateral" : {
+      "independentAmount" : {
+        "payerPartyReference" : {
+          "globalReference" : "3cfd165",
+          "externalReference" : "BankA"
+        },
+        "receiverPartyReference" : {
+          "globalReference" : "3cfd166",
+          "externalReference" : "BankB"
+        },
+        "paymentDetail" : [ {
+          "paymentRule" : {
+            "percentageRule" : {
+              "paymentPercent" : 0.02,
+              "notionalAmountReference" : {
+                "globalReference" : "4cf",
+                "externalReference" : "equityNotionalAmount"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "a93dc25d"
+          }
+        } ]
+      }
+    },
+    "meta" : {
+      "globalKey" : "ee98bba2"
+    }
+  },
+  "meta" : {
+    "globalKey" : "ee98bba2"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex10-short-form-interestLeg-driving-schedule-dates.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex10-short-form-interestLeg-driving-schedule-dates.json
index d2b2346981..1e07c438e3 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex10-short-form-interestLeg-driving-schedule-dates.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex10-short-form-interestLeg-driving-schedule-dates.json
@@ -1,65 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "52bf25b0"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "52bf25b0"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "92ad50c7"
-      },
-      "name" : {
-        "value" : "SWL"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "72ad7ed7",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "124897",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "ABC1"
-        },
-        "meta" : {
-          "globalKey" : "1e8c2f"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "90c3bd21"
-      },
-      "name" : {
-        "value" : "RST"
+        "globalKey" : "ebf10858"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "72ad8d67",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "124897",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "ABC6"
-        },
-        "meta" : {
-          "globalKey" : "1e8c34"
+            "scheme" : "http://www.swapswire.com/spec/2001/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ebf17cb7"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2008-06-02",
+      "meta" : {
+        "globalKey" : "3ec182"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "92ad50c7"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "90c3bd21"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -69,46 +49,81 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2008-06-02",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "25dff1ad"
-                },
-                "unadjustedDate" : "2008-06-02"
+                }
               },
               "meta" : {
                 "globalKey" : "25dff1ad"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2008-06-04",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "25dff92f"
+                }
+              },
+              "meta" : {
+                "globalKey" : "25dff92f"
+              }
+            },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "54b65ddd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "equityNotionalAmount",
-                    "globalReference" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "equityNotionalAmount"
+                  },
+                  "meta" : {
+                    "globalKey" : "54b65ddd"
+                  }
+                },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2008-06-04",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -117,27 +132,23 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e56d3bea"
-                      },
-                      "unadjustedDate" : "2008-06-04"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "e56d3bea"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "interestCalcPeriodDates",
-                    "globalKey" : "c1e5d4"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-06-04",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -146,63 +157,32 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "8c3233ea"
-                      },
-                      "unadjustedDate" : "2009-06-04"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "8c3233ea"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "c1e5d4",
+                    "externalKey" : "interestCalcPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "8babeed0"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "interestLegPaymentDates",
-                    "globalKey" : "ada4adb9"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "ada4adb9"
-                      },
                       "periodicDates" : {
-                        "periodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "EUTA"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "20a71d"
-                            }
-                          },
-                          "businessDayConvention" : "MODFOLLOWING",
-                          "meta" : {
-                            "globalKey" : "365baaee"
-                          }
-                        },
-                        "periodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12ce1"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "4"
-                        },
                         "startDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2008-06-04",
                             "dateAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
@@ -211,102 +191,158 @@
                                   "globalKey" : "20a71d"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
                             "meta" : {
                               "globalKey" : "e56d3bea"
-                            },
-                            "unadjustedDate" : "2008-06-04"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "e56d3bea"
                           }
+                        },
+                        "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "18c9"
+                          },
+                          "rollConvention" : "4"
+                        },
+                        "periodDatesAdjustments" : {
+                          "businessDayConvention" : "MODFOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "EUTA"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "20a71d"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "365baaee"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "9f0f331b"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "9f0f331b",
+                    "externalKey" : "interestLegPaymentDates"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "interestCalcPeriodDates",
-                    "globalReference" : "c1e5d4"
-                  },
-                  "meta" : {
-                    "globalKey" : "8325fc0f"
+                    "globalReference" : "c1e5d4",
+                    "externalReference" : "interestCalcPeriodDates"
                   },
                   "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 1,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "8325f327"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "e0f9bfca"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "51706dc"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "equityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "equityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "10da2"
-                  },
                   "settlementCurrency" : {
                     "value" : "EUR"
+                  },
+                  "meta" : {
+                    "globalKey" : "10da2"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "4dc5c80c"
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "relativeDates" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "3c7152e0"
+                        },
+                        "businessDayConvention" : "PRECEDING",
+                        "dateRelativeTo" : {
+                          "globalReference" : "9f0f331b",
+                          "externalReference" : "interestLegPaymentDates"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3c7152e0",
+                        "externalKey" : "interimValuationDate"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "100bc215"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2009-06-02",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "25fdf9ad"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "25fdf9ad",
+                        "externalKey" : "finalValuationDate"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "97c97b2f"
+                    }
+                  }
                 },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "99224396"
-                  },
                   "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "globalKey" : "815a0f35"
-                      },
-                      "relativeDate" : {
+                    "interimPaymentDates" : [ {
+                      "relativeDates" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "815a0f35"
+                          "globalKey" : "24ad6927"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -315,24 +351,24 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "finalValuationDate",
-                          "globalReference" : "25fdf9ad"
+                          "globalReference" : "3c7152e0",
+                          "externalReference" : "interimValuationDate"
                         }
-                      }
-                    },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "964475eb"
                       },
-                      "relativeDates" : {
+                      "meta" : {
+                        "globalKey" : "24ad6927"
+                      }
+                    } ],
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "964475eb"
+                          "globalKey" : "fc30271"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -341,24 +377,21 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "interimValuationDate",
-                          "globalReference" : "402bee2c"
+                          "globalReference" : "25fdf9ad",
+                          "externalReference" : "finalValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "fc30271"
                       }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "priceReturnTerms" : {
-                    "returnType" : "PRICE"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "35da2aea"
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -376,258 +409,225 @@
                         "value" : "productIdentifier-3"
                       }
                     } ],
-                    "securityType" : "EQUITY"
-                  }
-                },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
-                    "meta" : {
-                      "globalKey" : "97c97b2f"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "25fdf9ad"
-                        },
-                        "unadjustedDate" : "2009-06-02"
-                      },
-                      "meta" : {
-                        "externalKey" : "finalValuationDate",
-                        "globalKey" : "25fdf9ad"
-                      }
-                    }
+                    "securityType" : "Equity"
                   },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "13c65d61"
-                    },
-                    "valuationDates" : {
-                      "meta" : {
-                        "externalKey" : "interimValuationDate",
-                        "globalKey" : "402bee2c"
-                      },
-                      "relativeDates" : {
-                        "meta" : {
-                          "globalKey" : "402bee2c"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "businessDayConvention" : "PRECEDING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "interestLegPaymentDates",
-                          "globalReference" : "ada4adb9"
-                        }
-                      }
-                    }
-                  }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
                   "meta" : {
-                    "globalKey" : "3a4b88ab"
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "25dff92f"
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Price"
+                  }
                 },
-                "unadjustedDate" : "2008-06-04"
-              },
+                "meta" : {
+                  "globalKey" : "ba8b1074"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "25dff92f"
+                "globalKey" : "760aea3e"
               }
             }
           },
           "meta" : {
-            "globalKey" : "3cf30446"
+            "globalKey" : "d0f359e0"
           }
         },
         "meta" : {
-          "globalKey" : "3cf30446"
+          "globalKey" : "d0f359e0"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "affa401e"
-          },
           "observable" : {
-            "meta" : {
-              "globalKey" : "affa401e"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Reuters"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
+                  "periodMultiplier" : 1,
                   "period" : "M",
-                  "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
+            },
+            "meta" : {
+              "globalKey" : "4f4caf8a"
             }
+          },
+          "meta" : {
+            "globalKey" : "4f4caf8a"
           }
         }, {
-          "meta" : {
-            "globalKey" : "a57eb844"
-          },
-          "observable" : {
+          "price" : [ {
+            "value" : {
+              "value" : 10.0,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              },
+              "perUnitOf" : {
+                "financialUnit" : "Share"
+              },
+              "priceType" : "AssetPrice"
+            },
             "meta" : {
-              "globalKey" : "bc9178cb"
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 300000.0,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "PHGe.AS",
                   "meta" : {
                     "scheme" : "http://www.abc.com/instrument-id-Reuters-RIC-1-0"
-                  },
-                  "value" : "PHGe.AS"
+                  }
                 },
+                "source" : "RIC",
                 "meta" : {
                   "globalKey" : "b8c4616"
-                },
-                "source" : "RIC"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
+                  "value" : "NL0000009322",
                   "meta" : {
                     "scheme" : "http://www.abc.com/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "NL0000009322"
+                  }
                 },
+                "source" : "ISIN",
                 "meta" : {
                   "globalKey" : "61f06d27"
-                },
-                "source" : "ISIN"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-3"
+                  "value" : "productIdentifier-2"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "PHILIPS BUY BACK ORD"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "c4a4a2fc"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
                 }
               },
-              "value" : 10.0,
-              "perUnitOf" : {
-                "financialUnit" : "SHARE"
-              },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-3"
+                } ]
+              }
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 300000.0
+              "globalKey" : "d59da095"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "b935d4c4"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec182"
-      },
-      "value" : "2008-06-02"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "72ad7ed7",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "72ad8d67",
+          "externalReference" : "party2"
+        }
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABC1",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id"
-          },
-          "value" : "124897"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "1e8c2f"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "92ad50c7"
+      "name" : {
+        "value" : "SWL"
       },
       "meta" : {
-        "globalKey" : "57a8478e"
+        "globalKey" : "72ad7ed7",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "ABC6",
           "meta" : {
-            "scheme" : "http://www.swapswire.com/spec/2001/trade-id"
-          },
-          "value" : "124897"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "1e8c34"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "90c3bd21"
+      "name" : {
+        "value" : "RST"
       },
       "meta" : {
-        "globalKey" : "57a8478f"
+        "globalKey" : "72ad8d67",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "c1a0c624"
+    }
+  },
+  "meta" : {
+    "globalKey" : "c1a0c624"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex11-on-european-single-stock-underlyer-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex11-on-european-single-stock-underlyer-short-form.json
index 705030c339..452fb6686e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex11-on-european-single-stock-underlyer-short-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex11-on-european-single-stock-underlyer-short-form.json
@@ -1,104 +1,50 @@
 {
-  "meta" : {
-    "globalKey" : "4b110a05"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2007-09-24",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_2007_EQUITY_EUROPEAN"
-            }
-          }
-        },
-        "meta" : {
-          "globalKey" : "62998f41"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "6234",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/eqs-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "2092c901"
         }
       } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
       "meta" : {
-        "globalKey" : "9ea9c924"
+        "globalKey" : "9593cc32"
       }
-    },
-    "meta" : {
-      "globalKey" : "4b110a05"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "6569",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/eqs-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "95944c36"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2007-09-24",
+      "meta" : {
+        "globalKey" : "3eba58",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "EXECUTION",
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleName"
@@ -109,266 +55,304 @@
             "productQualifier" : "EquitySwap_TotalReturnBasicPerformance_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
-              "meta" : {
-                "externalKey" : "EffectiveDate",
-                "globalKey" : "6a2df5e0"
-              },
               "relativeDate" : {
+                "periodMultiplier" : 3,
+                "period" : "D",
                 "meta" : {
-                  "globalKey" : "6a2df5e0"
+                  "globalKey" : "fed6ed42"
                 },
+                "dayType" : "ExchangeBusiness",
+                "businessDayConvention" : "NotApplicable",
+                "dateRelativeTo" : {
+                  "globalReference" : "3eba58",
+                  "externalReference" : "TradeDate"
+                }
+              },
+              "meta" : {
+                "globalKey" : "fed6ed42",
+                "externalKey" : "EffectiveDate"
+              }
+            },
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
                 "period" : "D",
-                "periodMultiplier" : 3,
-                "dayType" : "EXCHANGE_BUSINESS",
-                "businessDayConvention" : "NOT_APPLICABLE",
+                "meta" : {
+                  "globalKey" : "edf02740"
+                },
+                "businessDayConvention" : "NotApplicable",
                 "dateRelativeTo" : {
-                  "externalReference" : "TradeDate",
-                  "globalReference" : "3eba58"
+                  "globalReference" : "bb917ef4",
+                  "externalReference" : "FinalEquityPaymentDate"
                 }
+              },
+              "meta" : {
+                "globalKey" : "edf02740",
+                "externalKey" : "TerminationDate"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "607b91fd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "EquityNotionalAmount",
-                    "globalReference" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "EquityNotionalAmount"
+                  },
+                  "meta" : {
+                    "globalKey" : "607b91fd"
+                  }
+                },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "globalKey" : "6a2df5e0"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 3,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "6a2df5e0"
+                        "globalKey" : "fed6ed42"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 3,
-                      "dayType" : "EXCHANGE_BUSINESS",
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "dayType" : "ExchangeBusiness",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "TradeDate",
-                        "globalReference" : "3eba58"
+                        "globalReference" : "3eba58",
+                        "externalReference" : "TradeDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "fed6ed42"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "InterestLegPeriodDates",
-                    "globalKey" : "8fbb2a68"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "globalKey" : "f18f7c48"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "f18f7c48"
+                        "globalKey" : "edf02740"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "FinalEquityPaymentDate",
-                        "globalReference" : "ad48d812"
+                        "globalReference" : "bb917ef4",
+                        "externalReference" : "FinalEquityPaymentDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "edf02740"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f0f22bbe",
+                    "externalKey" : "InterestLegPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "f5120739"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "9b9d36de"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "9b9d36de"
-                      },
                       "relativeDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "9b9d36de"
+                          "globalKey" : "97fde1d6"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "dateRelativeTo" : {
-                          "externalReference" : "EquityPaymentDate",
-                          "globalReference" : "2da89f98"
+                          "globalReference" : "e03bd13c",
+                          "externalReference" : "EquityPaymentDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "97fde1d6"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97fde1d6"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "InterestLegPeriodDates",
-                    "globalReference" : "8fbb2a68"
+                    "globalReference" : "f0f22bbe",
+                    "externalReference" : "InterestLegPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "9e9ada33"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "92fd2d87"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "e900d1ac"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "EquityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "EquityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "10da2"
-                  },
                   "settlementCurrency" : {
                     "value" : "EUR"
+                  },
+                  "meta" : {
+                    "globalKey" : "10da2"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "bfdb80c5"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "EquityPaymentDate",
-                    "globalKey" : "2da89f98"
-                  },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "externalKey" : "FinalEquityPaymentDate",
-                        "globalKey" : "ad48d812"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "ad48d812"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessCentersReference" : {
-                          "externalReference" : "PrimaryBusinessCenter",
-                          "globalReference" : "20a71d"
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "adjustableDates" : {
+                        "unadjustedDate" : [ "2007-10-12", "2007-11-13", "2007-12-12", "2008-01-14", "2008-02-12", "2008-03-12", "2008-04-12", "2008-05-13", "2008-06-12", "2008-07-12", "2008-08-12" ],
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
                         },
-                        "businessDayConvention" : "FOLLOWING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "FinalValuationDate",
-                          "globalReference" : "25e31503"
+                        "meta" : {
+                          "globalKey" : "4ae48233"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "4ae48233",
+                        "externalKey" : "InterimValuationDate"
                       }
                     },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "externalKey" : "InterimEquityPaymentDate",
-                        "globalKey" : "9ead6ea"
-                      },
-                      "relativeDates" : {
-                        "meta" : {
-                          "globalKey" : "9ead6ea"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "EUTA"
-                          } ],
+                    "valuationTimeType" : "Close",
+                    "meta" : {
+                      "globalKey" : "9a240dc6"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2008-09-24",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
-                            "externalKey" : "PrimaryBusinessCenter",
-                            "globalKey" : "20a71d"
+                            "globalKey" : "3a4b88ab"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "InterimValuationDate",
-                          "globalReference" : "4ae48233"
+                        "meta" : {
+                          "globalKey" : "25e31503"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "25e31503",
+                        "externalKey" : "FinalValuationDate"
                       }
-                    } ]
+                    },
+                    "meta" : {
+                      "globalKey" : "97ae9685"
+                    }
                   }
                 },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendPayoutRatio" : [ {
-                      "cashRatio" : 0.01,
-                      "totalRatio" : 1
-                    } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "EQUITY_PAYMENT_DATE"
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
+                      "relativeDates" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "c4b70c48"
+                        },
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "EUTA"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "20a71d",
+                            "externalKey" : "PrimaryBusinessCenter"
+                          }
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "4ae48233",
+                          "externalReference" : "InterimValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "c4b70c48",
+                        "externalKey" : "InterimEquityPaymentDate"
                       }
                     } ],
-                    "firstOrSecondPeriod" : "FIRST_PERIOD"
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "bb917ef4"
+                        },
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
+                        "businessCentersReference" : {
+                          "globalReference" : "20a71d",
+                          "externalReference" : "PrimaryBusinessCenter"
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "25e31503",
+                          "externalReference" : "FinalValuationDate"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "bb917ef4",
+                        "externalKey" : "FinalEquityPaymentDate"
+                      }
+                    }
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                  "meta" : {
+                    "globalKey" : "e03bd13c",
+                    "externalKey" : "EquityPaymentDate"
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -381,278 +365,294 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
-                    "meta" : {
-                      "globalKey" : "97ae9685"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "25e31503"
-                        },
-                        "unadjustedDate" : "2008-09-24"
-                      },
-                      "meta" : {
-                        "externalKey" : "FinalValuationDate",
-                        "globalKey" : "25e31503"
-                      }
-                    }
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
                   },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "9a240dc6"
-                    },
-                    "valuationDates" : {
-                      "adjustableDates" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "4ae48233"
-                        },
-                        "unadjustedDate" : [ "2007-10-12", "2007-11-13", "2007-12-12", "2008-01-14", "2008-02-12", "2008-03-12", "2008-04-12", "2008-05-13", "2008-06-12", "2008-07-12", "2008-08-12" ]
-                      },
-                      "meta" : {
-                        "externalKey" : "InterimValuationDate",
-                        "globalKey" : "4ae48233"
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 1,
+                      "cashRatio" : 0.01
+                    } ],
+                    "firstOrSecondPeriod" : "FirstPeriod",
+                    "dividendPeriod" : [ {
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "EquityPaymentDate"
+                        }
                       }
-                    },
-                    "valuationTimeType" : "CLOSE"
+                    } ]
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "meta" : {
-                "externalKey" : "TerminationDate",
-                "globalKey" : "f18f7c48"
-              },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "f18f7c48"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NOT_APPLICABLE",
-                "dateRelativeTo" : {
-                  "externalReference" : "FinalEquityPaymentDate",
-                  "globalReference" : "ad48d812"
+                "meta" : {
+                  "globalKey" : "538bee17"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "28cc070"
               }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "c667a152"
+            "globalKey" : "ca5d4848"
           }
         },
         "meta" : {
-          "globalKey" : "c667a152"
+          "globalKey" : "ca5d4848"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "1292f651"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "19405131"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.abc.com/instrumentId"
-                  },
-                  "value" : "NOK1V.HE"
-                },
-                "meta" : {
-                  "globalKey" : "62f843cc"
-                },
-                "source" : "OTHER"
-              }
-            }, {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "value" : "Nokya Oyj"
-                },
-                "meta" : {
-                  "globalKey" : "b06a157d"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 37.44,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 37.44,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "AssetPrice"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 760400,
               "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 760400
-            }
-          }, {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 28469376,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 28469376
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d0a0cfcc"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e0c"
-            },
-            "rateOption" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "NOK1V.HE",
+                  "meta" : {
+                    "scheme" : "http://www.abc.com/instrumentId"
+                  }
+                },
+                "source" : "Other",
+                "meta" : {
+                  "globalKey" : "62f843cc"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EURIBOR-Telerate"
+                "identifier" : {
+                  "value" : "Nokya Oyj"
                 },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 1
+                "source" : "Name",
+                "meta" : {
+                  "globalKey" : "b06a157d"
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "ec9d4ef"
             }
           },
+          "meta" : {
+            "globalKey" : "d44a011"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
             "value" : {
+              "value" : 0.0020,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.0020,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EURIBOR-Telerate"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 1,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2bba0f5c"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "38e72044"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3eba58"
-      },
-      "value" : "2007-09-24"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      } ],
+      "adjustment" : "Execution"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/eqs-trade-id"
-          },
-          "value" : "6234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "23a97ce8"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/eqs-trade-id"
-          },
-          "value" : "6569"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2007-09-24",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2007EquityEuropean"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "62998f41"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "2092c901"
+        }
+      } ],
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "23d5334e"
+        "globalKey" : "9ea9c924"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "d3d1f751"
+    }
+  },
+  "meta" : {
+    "globalKey" : "d3d1f751"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex12-on-european-index-underlyer-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex12-on-european-index-underlyer-short-form.json
index 43d1e61713..6b577dc726 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex12-on-european-index-underlyer-short-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex12-on-european-index-underlyer-short-form.json
@@ -1,84 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "fcfa1970"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2009-01-01",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationType" : {
-              "value" : "ISDA_2007_EQUITY_EUROPEAN"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "4666b900",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1147071",
+          "meta" : {
+            "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
           }
-        },
-        "meta" : {
-          "globalKey" : "1f32caf8"
         }
       } ],
       "meta" : {
-        "globalKey" : "1f32caf8"
+        "globalKey" : "c27138c"
       }
-    },
-    "meta" : {
-      "globalKey" : "fcfa1970"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "f5d99210"
-      },
-      "name" : {
-        "value" : "Party 1234 Ltd"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "PARTY1234"
-        },
-        "meta" : {
-          "globalKey" : "3ba25808"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "b2a7210"
-      },
-      "name" : {
-        "value" : "Party 5678 Ltd"
+      "issuerReference" : {
+        "globalReference" : "c79dbb00",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1147071",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "PARTY5678"
-        },
-        "meta" : {
-          "globalKey" : "3ba43908"
+            "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "c2787eb"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-01-19",
+      "meta" : {
+        "globalKey" : "3ec853"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "f5d99210"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "b2a7210"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -88,7 +49,9 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-01-19",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "DEFR"
@@ -97,40 +60,89 @@
                       "globalKey" : "1ff50d"
                     }
                   },
-                  "businessDayConvention" : "FOLLOWING",
                   "meta" : {
                     "globalKey" : "211d10fc"
                   }
                 },
                 "meta" : {
                   "globalKey" : "6e7d8489"
+                }
+              },
+              "meta" : {
+                "globalKey" : "6e7d8489",
+                "externalKey" : "equityEffectiveDate"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-03-19",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "DEFR"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "1ff50d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "211d10fc"
+                  }
                 },
-                "unadjustedDate" : "2009-01-19"
+                "meta" : {
+                  "globalKey" : "48e9d409"
+                }
               },
               "meta" : {
-                "externalKey" : "equityEffectiveDate",
-                "globalKey" : "6e7d8489"
+                "globalKey" : "48e9d409"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "equityNotionalAmount"
+                  },
                   "meta" : {
                     "globalKey" : "54b65ddd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "equityNotionalAmount",
-                    "globalReference" : "4cf"
                   }
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-01-21",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -139,28 +151,24 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "71e7e7d7"
-                      },
-                      "unadjustedDate" : "2009-01-21"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "interestEffectiveDate",
-                      "globalKey" : "71e7e7d7"
+                      "globalKey" : "71e7e7d7",
+                      "externalKey" : "interestEffectiveDate"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "interestCalcPeriodDates",
-                    "globalKey" : "3048096c"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-03-23",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -169,132 +177,108 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "4fbde895"
-                      },
-                      "unadjustedDate" : "2009-03-23"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "interestTerminationDate",
-                      "globalKey" : "4fbde895"
+                      "globalKey" : "4fbde895",
+                      "externalKey" : "interestTerminationDate"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "3048096c",
+                    "externalKey" : "interestCalcPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "8eb3683c"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "interestLegPaymentDates",
-                    "globalKey" : "b6b78bb2"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "b6b78bb2"
-                      },
                       "periodicDates" : {
-                        "endDate" : {
-                          "meta" : {
-                            "globalKey" : "97eae877"
-                          },
+                        "startDate" : {
                           "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "97eae877"
+                              "globalKey" : "df205212"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "dateRelativeTo" : {
-                              "externalReference" : "interestTerminationDate",
-                              "globalReference" : "4fbde895"
+                              "globalReference" : "71e7e7d7",
+                              "externalReference" : "interestEffectiveDate"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "df205212"
                           }
                         },
-                        "periodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "EUTA"
-                            } ],
+                        "endDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "20a71d"
+                              "globalKey" : "944b936f"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "4fbde895",
+                              "externalReference" : "interestTerminationDate"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
-                            "globalKey" : "211dc30c"
+                            "globalKey" : "944b936f"
                           }
                         },
                         "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "28bf3"
+                            "globalKey" : "177db"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
                           "rollConvention" : "19"
                         },
-                        "startDate" : {
-                          "meta" : {
-                            "globalKey" : "e2bfa71a"
-                          },
-                          "relativeDate" : {
+                        "periodDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "EUTA"
+                            } ],
                             "meta" : {
-                              "globalKey" : "e2bfa71a"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "interestEffectiveDate",
-                              "globalReference" : "71e7e7d7"
+                              "globalKey" : "20a71d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "211dc30c"
                           }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "5c33c394"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "5c33c394",
+                    "externalKey" : "interestLegPaymentDates"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "interestCalcPeriodDates",
-                    "globalReference" : "3048096c"
+                    "globalReference" : "3048096c",
+                    "externalReference" : "interestCalcPeriodDates"
                   },
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "36741a11"
+                      "globalKey" : "135004c5"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "CURRENCY_BUSINESS",
+                    "dayType" : "CurrencyBusiness",
+                    "businessDayConvention" : "PRECEDING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -303,99 +287,169 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "PRECEDING",
                     "dateRelativeTo" : {
-                      "externalReference" : "interestLegPaymentDates",
-                      "globalReference" : "b6b78bb2"
+                      "globalReference" : "5c33c394",
+                      "externalReference" : "interestLegPaymentDates"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "5dd36e9e"
-                  },
                   "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 1,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "f9c90e82"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "d7b4424e"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "a0be6872"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "equityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "equityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "10da2"
-                  },
                   "settlementCurrency" : {
                     "value" : "EUR"
+                  },
+                  "meta" : {
+                    "globalKey" : "10da2"
                   }
                 },
-                "meta" : {
-                  "externalKey" : "returnLeg",
-                  "globalKey" : "8d30d436"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "99224396"
-                  },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "globalKey" : "815a0f35"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "815a0f35"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "EUTA"
-                          } ],
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "periodicDates" : {
+                        "startDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "9229ce57"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "6e7d8489",
+                              "externalReference" : "equityEffectiveDate"
+                            }
+                          },
                           "meta" : {
-                            "globalKey" : "20a71d"
+                            "globalKey" : "9229ce57"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "finalValuationDate",
-                          "globalReference" : "48e9d409"
+                        "endDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "b635d2a0"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "48e9d409",
+                              "externalReference" : "finalValuationDate"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "b635d2a0"
+                          }
+                        },
+                        "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "177db"
+                          },
+                          "rollConvention" : "19"
+                        },
+                        "periodDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "DEFR"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "1ff50d"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "211d10fc"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "1cc8abb8",
+                        "externalKey" : "interimValuationDate"
                       }
                     },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "964475eb"
+                    "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                    "meta" : {
+                      "globalKey" : "105dba0f"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2009-03-19",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "DEFR"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "1ff50d"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "211d10fc"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "48e9d409"
+                        }
                       },
+                      "meta" : {
+                        "globalKey" : "48e9d409",
+                        "externalKey" : "finalValuationDate"
+                      }
+                    },
+                    "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                    "meta" : {
+                      "globalKey" : "1e864b5f"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
                       "relativeDates" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "964475eb"
+                          "globalKey" : "24ad6927"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -404,33 +458,44 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "interimValuationDate",
-                          "globalReference" : "b5ba6138"
+                          "globalReference" : "1cc8abb8",
+                          "externalReference" : "interimValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "24ad6927"
                       }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendPayoutRatio" : [ {
-                      "cashRatio" : 1,
-                      "nonCashRatio" : 1,
-                      "totalRatio" : 1
                     } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "CASH_SETTLEMENT_PAYMENT_DATE"
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "fc30271"
+                        },
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "EUTA"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "20a71d"
+                          }
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "48e9d409",
+                          "externalReference" : "finalValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "fc30271"
                       }
-                    } ],
-                    "firstOrSecondPeriod" : "SECOND_PERIOD"
+                    }
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                  "meta" : {
+                    "globalKey" : "35da2aea"
                   }
                 },
                 "underlier" : {
@@ -451,336 +516,271 @@
                     "globalKey" : "0"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
-                    "meta" : {
-                      "globalKey" : "1e864b5f"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "DEFR"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "1ff50d"
-                            }
-                          },
-                          "businessDayConvention" : "FOLLOWING",
-                          "meta" : {
-                            "globalKey" : "211d10fc"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "48e9d409"
-                        },
-                        "unadjustedDate" : "2009-03-19"
-                      },
-                      "meta" : {
-                        "externalKey" : "finalValuationDate",
-                        "globalKey" : "48e9d409"
-                      }
-                    },
-                    "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
                   },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "a94f6f8f"
-                    },
-                    "valuationDates" : {
-                      "meta" : {
-                        "externalKey" : "interimValuationDate",
-                        "globalKey" : "b5ba6138"
-                      },
-                      "periodicDates" : {
-                        "endDate" : {
-                          "meta" : {
-                            "globalKey" : "b9d527a8"
-                          },
-                          "relativeDate" : {
-                            "meta" : {
-                              "globalKey" : "b9d527a8"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "finalValuationDate",
-                              "globalReference" : "48e9d409"
-                            }
-                          }
-                        },
-                        "periodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "DEFR"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "1ff50d"
-                            }
-                          },
-                          "businessDayConvention" : "FOLLOWING",
-                          "meta" : {
-                            "globalKey" : "211d10fc"
-                          }
-                        },
-                        "periodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "28bf3"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "19"
-                        },
-                        "startDate" : {
-                          "meta" : {
-                            "globalKey" : "95c9235f"
-                          },
-                          "relativeDate" : {
-                            "meta" : {
-                              "globalKey" : "95c9235f"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "equityEffectiveDate",
-                              "globalReference" : "6e7d8489"
-                            }
-                          }
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 1,
+                      "cashRatio" : 1,
+                      "nonCashRatio" : 1
+                    } ],
+                    "firstOrSecondPeriod" : "SecondPeriod",
+                    "dividendPeriod" : [ {
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "CashSettlementPaymentDate"
                         }
                       }
-                    },
-                    "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
-                  }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "DEFR"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "1ff50d"
-                    }
-                  },
-                  "businessDayConvention" : "FOLLOWING",
-                  "meta" : {
-                    "globalKey" : "211d10fc"
+                    } ]
                   }
                 },
                 "meta" : {
-                  "globalKey" : "48e9d409"
-                },
-                "unadjustedDate" : "2009-03-19"
-              },
+                  "globalKey" : "18839304",
+                  "externalKey" : "returnLeg"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "48e9d409"
+                "globalKey" : "755fdb52"
               }
             }
           },
           "meta" : {
-            "globalKey" : "2bf9a412"
+            "globalKey" : "eaf5f600"
           }
         },
         "meta" : {
-          "globalKey" : "2bf9a412"
+          "globalKey" : "eaf5f600"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a822a61e"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "affa401e"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EURIBOR-Reuters"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 1
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0001234,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.0001234,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "c3f90ce8"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "9cba2463"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
+            "rateOption" : {
               "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/instrument-id"
-                  },
-                  "value" : ".GDAXI"
-                },
-                "meta" : {
-                  "globalKey" : "3901e477"
+                "floatingRateIndex" : {
+                  "value" : "EUR-EURIBOR-Reuters"
                 },
-                "source" : "OTHER"
-              }
-            }, {
+                "indexTenor" : {
+                  "periodMultiplier" : 1,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "rateOption-1"
                 } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "value" : "GERMAN SE XETRA DAX INDEX"
-                },
-                "meta" : {
-                  "globalKey" : "811cd67a"
-                },
-                "source" : "NAME"
               }
-            } ]
+            },
+            "meta" : {
+              "globalKey" : "4f4caf8a"
+            }
           },
+          "meta" : {
+            "globalKey" : "79106fb2"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
             "value" : {
+              "value" : 100,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 100,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
+              "priceType" : "AssetPrice"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000,
+              "unit" : {
+                "financialUnit" : "IndexUnit"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "INDEX_UNIT"
-              },
-              "value" : 100000
             }
           }, {
+            "value" : {
+              "value" : 10000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : ".GDAXI",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/instrument-id"
+                  }
+                },
+                "source" : "Other",
+                "meta" : {
+                  "globalKey" : "3901e477"
                 }
               },
-              "value" : 10000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
+              }
+            }, {
+              "value" : {
+                "identifier" : {
+                  "value" : "GERMAN SE XETRA DAX INDEX"
+                },
+                "source" : "Name",
+                "meta" : {
+                  "globalKey" : "811cd67a"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "fa8a67fd"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "9e17d168"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ec853"
-      },
-      "value" : "2009-01-19"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4666b900",
+          "externalReference" : "partyA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "c79dbb00",
+          "externalReference" : "partyB"
+        }
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "PARTY1234",
           "meta" : {
-            "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
-          },
-          "value" : "1147071"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "3ba25808"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "f5d99210"
+      "name" : {
+        "value" : "Party 1234 Ltd"
       },
       "meta" : {
-        "globalKey" : "273acbe2"
+        "globalKey" : "4666b900",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "PARTY5678",
           "meta" : {
-            "scheme" : "http://www.tradeIdScheme.com/tradeIdScheme"
-          },
-          "value" : "1147071"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "3ba43908"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "b2a7210"
+      "name" : {
+        "value" : "Party 5678 Ltd"
       },
       "meta" : {
-        "globalKey" : "273acbe3"
+        "globalKey" : "c79dbb00",
+        "externalKey" : "partyB"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2009-01-01",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2007EquityEuropean"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "1f32caf8"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "1f32caf8"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "9d019ed0"
+    }
+  },
+  "meta" : {
+    "globalKey" : "9d019ed0"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex13-pan-asia-interdealer-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex13-pan-asia-interdealer-share-swap-short-form.json
index 3a77483443..f4c467f492 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex13-pan-asia-interdealer-share-swap-short-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex13-pan-asia-interdealer-share-swap-short-form.json
@@ -1,107 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "8184d21"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2009-09-01",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationAnnexType" : {
-              "value" : "ISDA_2009_SHARE_SWAP_PAN_ASIA"
-            },
-            "masterConfirmationType" : {
-              "value" : "ISDA_2009_EQUITY_PAN_ASIA"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "657a51cd",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "299442",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "345df4f"
         }
       } ],
       "meta" : {
-        "globalKey" : "345df4f"
+        "globalKey" : "ee0abbb5"
       }
-    },
-    "meta" : {
-      "globalKey" : "8184d21"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "df32ec33"
-      },
-      "name" : {
-        "value" : "A.N.Example"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "PartyABIC1"
-        },
-        "meta" : {
-          "globalKey" : "91a7b390"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "1649c7b3"
-      },
-      "name" : {
-        "value" : "A.N.Other.Example"
+      "issuerReference" : {
+        "globalReference" : "af987d91",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "299442",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "PartyBBIC2"
-        },
-        "meta" : {
-          "globalKey" : "91b5cb12"
+            "scheme" : "http://www.partyB.com/trade-id-1-0"
+          }
         }
-      } ]
-    } ],
-    "partyRole" : [ {
-      "partyReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "1649c7b3"
-      },
-      "role" : "DETERMINING_PARTY"
-    }, {
-      "partyReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "1649c7b3"
-      },
-      "role" : "HEDGING_PARTY"
+      } ],
+      "meta" : {
+        "globalKey" : "ee0b3014"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-09-01",
+      "meta" : {
+        "globalKey" : "3eca41"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "1649c7b3"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "1649c7b3"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "df32ec33"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -109,12 +47,11 @@
             "productQualifier" : "EquitySwap_TotalReturnBasicPerformance_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-09-01",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "KRSE"
@@ -123,40 +60,89 @@
                       "globalKey" : "2355f9"
                     }
                   },
-                  "businessDayConvention" : "FOLLOWING",
                   "meta" : {
                     "globalKey" : "212071e8"
                   }
                 },
                 "meta" : {
                   "globalKey" : "b97ae847"
+                }
+              },
+              "meta" : {
+                "globalKey" : "b97ae847",
+                "externalKey" : "equityEffectiveDate"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2010-03-02",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "KRSE"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "2355f9"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "212071e8"
+                  }
                 },
-                "unadjustedDate" : "2009-09-01"
+                "meta" : {
+                  "globalKey" : "d2afca66"
+                }
               },
               "meta" : {
-                "externalKey" : "equityEffectiveDate",
-                "globalKey" : "b97ae847"
+                "globalKey" : "d2afca66"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "0",
+                    "externalReference" : "equityNotionalAmount"
+                  },
                   "meta" : {
                     "globalKey" : "54b65ddd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "equityNotionalAmount",
-                    "globalReference" : "0"
                   }
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-09-03",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -165,28 +151,24 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "212500d8"
                         }
                       },
                       "meta" : {
                         "globalKey" : "bce92875"
-                      },
-                      "unadjustedDate" : "2009-09-03"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "interestEffectiveDate",
-                      "globalKey" : "bce92875"
+                      "globalKey" : "bce92875",
+                      "externalKey" : "interestEffectiveDate"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "interestCalcPeriodDates",
-                    "globalKey" : "ea5ee09"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2010-03-04",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -195,132 +177,108 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "212500d8"
                         }
                       },
                       "meta" : {
                         "globalKey" : "d61e0a94"
-                      },
-                      "unadjustedDate" : "2010-03-04"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "interestTerminationDate",
-                      "globalKey" : "d61e0a94"
+                      "globalKey" : "d61e0a94",
+                      "externalKey" : "interestTerminationDate"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "ea5ee09",
+                    "externalKey" : "interestCalcPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "488058ef"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "interestLegPaymentDates",
-                    "globalKey" : "7049871b"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "7049871b"
-                      },
                       "periodicDates" : {
-                        "endDate" : {
-                          "meta" : {
-                            "globalKey" : "97eae877"
-                          },
+                        "startDate" : {
                           "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "97eae877"
+                              "globalKey" : "df205212"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "dateRelativeTo" : {
-                              "externalReference" : "interestTerminationDate",
-                              "globalReference" : "d61e0a94"
+                              "globalReference" : "bce92875",
+                              "externalReference" : "interestEffectiveDate"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "df205212"
                           }
                         },
-                        "periodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "USNY"
-                            } ],
+                        "endDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "27e4e9"
+                              "globalKey" : "944b936f"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "d61e0a94",
+                              "externalReference" : "interestTerminationDate"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
-                            "globalKey" : "212500d8"
+                            "globalKey" : "944b936f"
                           }
                         },
                         "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "12cde"
+                            "globalKey" : "18c6"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
                           "rollConvention" : "1"
                         },
-                        "startDate" : {
-                          "meta" : {
-                            "globalKey" : "e2bfa71a"
-                          },
-                          "relativeDate" : {
+                        "periodDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "USNY"
+                            } ],
                             "meta" : {
-                              "globalKey" : "e2bfa71a"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "interestEffectiveDate",
-                              "globalReference" : "bce92875"
+                              "globalKey" : "27e4e9"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "212500d8"
                           }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "43633b55"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "43633b55",
+                    "externalKey" : "interestLegPaymentDates"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "interestCalcPeriodDates",
-                    "globalReference" : "ea5ee09"
+                    "globalReference" : "ea5ee09",
+                    "externalReference" : "interestCalcPeriodDates"
                   },
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "38ce9e52"
+                      "globalKey" : "15aa8906"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "CURRENCY_BUSINESS",
+                    "dayType" : "CurrencyBusiness",
+                    "businessDayConvention" : "PRECEDING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -329,101 +287,168 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "PRECEDING",
                     "dateRelativeTo" : {
-                      "externalReference" : "interestLegPaymentDates",
-                      "globalReference" : "7049871b"
+                      "globalReference" : "43633b55",
+                      "externalReference" : "interestLegPaymentDates"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "4157f6bd"
-                  },
                   "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 1,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "dd4d96a1"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "ed02db71"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "e689dc2a"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "equityNotionalAmount",
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "equityNotionalAmount"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "14966"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
+                  },
+                  "meta" : {
+                    "globalKey" : "14966"
                   }
                 },
-                "fxFeature" : [ {
-                  "crossCurrency" : {
-                    "fixingTime" : {
-                      "businessCenter" : {
-                        "value" : "KRSE"
-                      },
-                      "hourMinuteTime" : "14:45:00"
-                    },
-                    "fxSpotRateSource" : {
-                      "primarySource" : {
-                        "sourcePage" : {
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "AsSpecifiedInMasterConfirmation",
+                    "valuationDates" : {
+                      "periodicDates" : {
+                        "startDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "9229ce57"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "b97ae847",
+                              "externalReference" : "equityEffectiveDate"
+                            }
+                          },
                           "meta" : {
-                            "scheme" : "http://www.example.com/rate-source-page-1-0"
+                            "globalKey" : "9229ce57"
+                          }
+                        },
+                        "endDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "b635d2a0"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "d2afca66",
+                              "externalReference" : "finalValuationDate"
+                            }
                           },
-                          "value" : "KRW="
+                          "meta" : {
+                            "globalKey" : "b635d2a0"
+                          }
                         },
-                        "sourceProvider" : {
-                          "value" : "REUTERS"
+                        "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "18c6"
+                          },
+                          "rollConvention" : "1"
+                        },
+                        "periodDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "KRSE"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "2355f9"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "212071e8"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "3f44699",
+                        "externalKey" : "interimValuationDate"
                       }
+                    },
+                    "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                    "meta" : {
+                      "globalKey" : "2343bc19"
                     }
                   },
-                  "referenceCurrency" : {
-                    "meta" : {
-                      "globalKey" : "123d0"
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2010-03-02",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "KRSE"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "2355f9"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "212071e8"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "d2afca66"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "d2afca66",
+                        "externalKey" : "finalValuationDate"
+                      }
                     },
-                    "value" : "KRW"
+                    "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                    "meta" : {
+                      "globalKey" : "a84c41bc"
+                    }
                   }
-                } ],
-                "meta" : {
-                  "externalKey" : "returnLeg",
-                  "globalKey" : "b0576fb"
                 },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "d71cc16"
-                  },
                   "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "globalKey" : "9c890a01"
-                      },
-                      "relativeDate" : {
+                    "interimPaymentDates" : [ {
+                      "relativeDates" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "9c890a01"
+                          "globalKey" : "3fdc63f3"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -432,24 +457,24 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "finalValuationDate",
-                          "globalReference" : "d2afca66"
+                          "globalReference" : "3f44699",
+                          "externalReference" : "interimValuationDate"
                         }
-                      }
-                    },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "b17370b7"
                       },
-                      "relativeDates" : {
+                      "meta" : {
+                        "globalKey" : "3fdc63f3"
+                      }
+                    } ],
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "b17370b7"
+                          "globalKey" : "2af1fd3d"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -458,37 +483,21 @@
                             "globalKey" : "27e4e9"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "interimValuationDate",
-                          "globalReference" : "19a10581"
-                        }
-                      }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendPayoutRatio" : [ {
-                      "totalRatio" : 1
-                    } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "SHARE_PAYMENT"
+                          "globalReference" : "d2afca66",
+                          "externalReference" : "finalValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "2af1fd3d"
                       }
-                    } ],
-                    "firstOrSecondPeriod" : "SECOND_PERIOD"
+                    }
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                  "meta" : {
+                    "globalKey" : "aa29b36a"
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -506,358 +515,349 @@
                         "value" : "productIdentifier-3"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
+                "fxFeature" : [ {
+                  "referenceCurrency" : {
+                    "value" : "KRW",
                     "meta" : {
-                      "globalKey" : "a84c41bc"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "KRSE"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "2355f9"
-                            }
-                          },
-                          "businessDayConvention" : "FOLLOWING",
-                          "meta" : {
-                            "globalKey" : "212071e8"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "d2afca66"
-                        },
-                        "unadjustedDate" : "2010-03-02"
-                      },
-                      "meta" : {
-                        "externalKey" : "finalValuationDate",
-                        "globalKey" : "d2afca66"
-                      }
-                    },
-                    "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
+                      "globalKey" : "123d0"
+                    }
                   },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION",
-                    "meta" : {
-                      "globalKey" : "38f07b01"
-                    },
-                    "valuationDates" : {
-                      "meta" : {
-                        "externalKey" : "interimValuationDate",
-                        "globalKey" : "19a10581"
-                      },
-                      "periodicDates" : {
-                        "endDate" : {
-                          "meta" : {
-                            "globalKey" : "b9d527a8"
-                          },
-                          "relativeDate" : {
-                            "meta" : {
-                              "globalKey" : "b9d527a8"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "finalValuationDate",
-                              "globalReference" : "d2afca66"
-                            }
-                          }
-                        },
-                        "periodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "KRSE"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "2355f9"
-                            }
-                          },
-                          "businessDayConvention" : "FOLLOWING",
-                          "meta" : {
-                            "globalKey" : "212071e8"
-                          }
-                        },
-                        "periodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12cde"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "1"
+                  "crossCurrency" : {
+                    "fxSpotRateSource" : {
+                      "primarySource" : {
+                        "sourceProvider" : {
+                          "value" : "Reuters"
                         },
-                        "startDate" : {
+                        "sourcePage" : {
+                          "value" : "KRW=",
                           "meta" : {
-                            "globalKey" : "95c9235f"
-                          },
-                          "relativeDate" : {
-                            "meta" : {
-                              "globalKey" : "95c9235f"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "equityEffectiveDate",
-                              "globalReference" : "b97ae847"
-                            }
+                            "scheme" : "http://www.example.com/rate-source-page-1-0"
                           }
                         }
                       }
                     },
-                    "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
-                  }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "KRSE"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "2355f9"
+                    "fixingTime" : {
+                      "hourMinuteTime" : "14:45:00",
+                      "businessCenter" : {
+                        "value" : "KRSE"
+                      }
                     }
+                  }
+                } ],
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
                   },
-                  "businessDayConvention" : "FOLLOWING",
-                  "meta" : {
-                    "globalKey" : "212071e8"
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 1
+                    } ],
+                    "firstOrSecondPeriod" : "SecondPeriod",
+                    "dividendPeriod" : [ {
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "SharePayment"
+                        }
+                      }
+                    } ]
                   }
                 },
                 "meta" : {
-                  "globalKey" : "d2afca66"
-                },
-                "unadjustedDate" : "2010-03-02"
-              },
+                  "globalKey" : "2286722f",
+                  "externalKey" : "returnLeg"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "d2afca66"
+                "globalKey" : "1ced2960"
               }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "436fd1bf"
+            "globalKey" : "270323bd"
           }
         },
         "meta" : {
-          "globalKey" : "436fd1bf"
+          "globalKey" : "270323bd"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "c31177f"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d03"
+          "price" : [ {
+            "value" : {
+              "value" : 0,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              },
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
+                  "periodMultiplier" : 1,
                   "period" : "M",
-                  "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
+            },
+            "meta" : {
+              "globalKey" : "82801f45"
             }
           },
+          "meta" : {
+            "globalKey" : "1a198869"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 5,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
+                "financialUnit" : "Share"
+              },
+              "priceType" : "AssetPrice"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 60000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          }, {
+            "value" : {
+              "value" : 300000,
+              "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "priceType" : "INTEREST_RATE"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "55a119ae"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "c962ce8"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "005430.KS",
                   "meta" : {
                     "scheme" : "http://www.example.com/instrument-id-Reuters-RIC-1-0"
-                  },
-                  "value" : "005430.KS"
+                  }
                 },
+                "source" : "RIC",
                 "meta" : {
                   "globalKey" : "9afe6746"
-                },
-                "source" : "RIC"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
+                  "value" : "KR7005430004",
                   "meta" : {
                     "scheme" : "http://www.example.com/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "KR7005430004"
+                  }
                 },
+                "source" : "ISIN",
                 "meta" : {
                   "globalKey" : "85b273d7"
-                },
-                "source" : "ISIN"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-3"
+                  "value" : "productIdentifier-2"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "KOREA AIR SVC ORDINARY"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "f6e44a99"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
                 }
               },
-              "value" : 5,
-              "perUnitOf" : {
-                "financialUnit" : "SHARE"
-              },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 60000
-            }
-          }, {
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-3"
+                } ]
+              }
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 300000
+              "globalKey" : "862f7018"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "c73b14ae"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eca41"
-      },
-      "value" : "2009-09-01"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "af987d91",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "657a51cd",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "af987d91",
+          "externalReference" : "party2"
+        } ]
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "PartyABIC1",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id-1-0"
-          },
-          "value" : "299442"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "91a7b390"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "df32ec33"
+      "name" : {
+        "value" : "A.N.Example"
       },
       "meta" : {
-        "globalKey" : "3a2297ab"
+        "globalKey" : "657a51cd",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "PartyBBIC2",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id-1-0"
-          },
-          "value" : "299442"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "91b5cb12"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "1649c7b3"
+      "name" : {
+        "value" : "A.N.Other.Example"
+      },
+      "meta" : {
+        "globalKey" : "af987d91",
+        "externalKey" : "party2"
+      }
+    } ],
+    "partyRole" : [ {
+      "partyReference" : {
+        "globalReference" : "af987d91",
+        "externalReference" : "party2"
+      },
+      "role" : "DeterminingParty"
+    }, {
+      "partyReference" : {
+        "globalReference" : "af987d91",
+        "externalReference" : "party2"
       },
+      "role" : "HedgingParty"
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2009-09-01",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2009EquityPanAsia"
+            },
+            "masterConfirmationAnnexType" : {
+              "value" : "ISDA2009ShareSwapPanAsia"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "fc5033cf"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3a2297ac"
+        "globalKey" : "fc5033cf"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "d25ab7ab"
+    }
+  },
+  "meta" : {
+    "globalKey" : "d25ab7ab"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex14-european-interdealer-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex14-european-interdealer-share-swap-short-form.json
index 6a22c7458a..21abe0d873 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex14-european-interdealer-share-swap-short-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex14-european-interdealer-share-swap-short-form.json
@@ -1,94 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "dde3e9cc"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2009-09-01",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationAnnexType" : {
-              "value" : "ISDA_2009_EQUITY_EUROPEAN_INTERDEALER_SS"
-            },
-            "masterConfirmationType" : {
-              "value" : "ISDA_2009_EQUITY_EUROPEAN_INTERDEALER"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "2f1783b5",
+        "externalReference" : "partyA"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1558488",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/trade-id-1-0"
           }
-        },
-        "meta" : {
-          "globalKey" : "81f44b30"
         }
       } ],
       "meta" : {
-        "globalKey" : "81f44b30"
+        "globalKey" : "13091112"
       }
-    },
-    "meta" : {
-      "globalKey" : "dde3e9cc"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "988417b5"
-      },
-      "name" : {
-        "value" : "AAA Bank This is a test for agent language"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "SWAP1234"
-        },
-        "meta" : {
-          "globalKey" : "1ba91055"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "b879ae2e"
-      },
-      "name" : {
-        "value" : "Mega Bank Ltd"
+      "issuerReference" : {
+        "globalReference" : "60beee7a",
+        "externalReference" : "partyB"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1558488",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "MEGA1234"
-        },
-        "meta" : {
-          "globalKey" : "fd9b8bb4"
+            "scheme" : "http://www.partyB.com/trade-id-1-0"
+          }
         }
-      } ]
-    } ],
-    "partyRole" : [ {
-      "partyReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "b879ae2e"
-      },
-      "role" : "HEDGING_PARTY"
+      } ],
+      "meta" : {
+        "globalKey" : "13098571"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-09-09",
+      "meta" : {
+        "globalKey" : "3eca49"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "b879ae2e"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "988417b5"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -98,7 +49,9 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-09-09",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "DEFR"
@@ -107,40 +60,81 @@
                       "globalKey" : "1ff50d"
                     }
                   },
-                  "businessDayConvention" : "FOLLOWING",
                   "meta" : {
                     "globalKey" : "211d10fc"
                   }
                 },
                 "meta" : {
                   "globalKey" : "c71e4c53"
+                }
+              },
+              "meta" : {
+                "globalKey" : "c71e4c53",
+                "externalKey" : "equityEffectiveDate"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-12-09",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "DEFR"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "1ff50d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "211d10fc"
+                  }
                 },
-                "unadjustedDate" : "2009-09-09"
+                "meta" : {
+                  "globalKey" : "ec0c393"
+                }
               },
               "meta" : {
-                "externalKey" : "equityEffectiveDate",
-                "globalKey" : "c71e4c53"
+                "globalKey" : "ec0c393"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "equityNotionalAmount"
+                  },
                   "meta" : {
                     "globalKey" : "54b65ddd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "equityNotionalAmount",
-                    "globalReference" : "4cf"
                   }
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-09-11",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -149,28 +143,24 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "ca88afa1"
-                      },
-                      "unadjustedDate" : "2009-09-11"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "interestEffectiveDate",
-                      "globalKey" : "ca88afa1"
+                      "globalKey" : "ca88afa1",
+                      "externalKey" : "interestEffectiveDate"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "interestCalcPeriodDates",
-                    "globalKey" : "db9ea582"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-12-11",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -179,124 +169,108 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "122b26e1"
-                      },
-                      "unadjustedDate" : "2009-12-11"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "interestTerminationDate",
-                      "globalKey" : "122b26e1"
+                      "globalKey" : "122b26e1",
+                      "externalKey" : "interestTerminationDate"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "db9ea582",
+                    "externalKey" : "interestCalcPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "f555dcd7"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "interestLegPaymentDates",
-                    "globalKey" : "b3c2835f"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "b3c2835f"
-                      },
                       "periodicDates" : {
-                        "endDate" : {
-                          "meta" : {
-                            "globalKey" : "97eae877"
-                          },
+                        "startDate" : {
                           "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "97eae877"
+                              "globalKey" : "df205212"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "dateRelativeTo" : {
-                              "externalReference" : "interestTerminationDate",
-                              "globalReference" : "122b26e1"
+                              "globalReference" : "ca88afa1",
+                              "externalReference" : "interestEffectiveDate"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "df205212"
                           }
                         },
-                        "periodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "EUTA"
-                            } ],
+                        "endDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "20a71d"
+                              "globalKey" : "944b936f"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "122b26e1",
+                              "externalReference" : "interestTerminationDate"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
-                            "globalKey" : "211dc30c"
+                            "globalKey" : "944b936f"
                           }
                         },
                         "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "12ce6"
+                            "globalKey" : "18ce"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
                           "rollConvention" : "9"
                         },
-                        "startDate" : {
-                          "meta" : {
-                            "globalKey" : "e2bfa71a"
-                          },
-                          "relativeDate" : {
+                        "periodDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "EUTA"
+                            } ],
                             "meta" : {
-                              "globalKey" : "e2bfa71a"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "interestEffectiveDate",
-                              "globalReference" : "ca88afa1"
+                              "globalKey" : "20a71d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "211dc30c"
                           }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "5102c281"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "5102c281",
+                    "externalKey" : "interestLegPaymentDates"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "interestCalcPeriodDates",
-                    "globalReference" : "db9ea582"
+                    "globalReference" : "db9ea582",
+                    "externalReference" : "interestCalcPeriodDates"
                   },
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "36741a11"
+                      "globalKey" : "135004c5"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "CURRENCY_BUSINESS",
+                    "dayType" : "CurrencyBusiness",
+                    "businessDayConvention" : "PRECEDING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -305,73 +279,169 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "PRECEDING",
                     "dateRelativeTo" : {
-                      "externalReference" : "interestLegPaymentDates",
-                      "globalReference" : "b3c2835f"
+                      "globalReference" : "5102c281",
+                      "externalReference" : "interestLegPaymentDates"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "5dd36e9e"
-                  },
                   "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 1,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "f9c90e82"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "bbe4385d"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "2595ad1"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "equityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "equityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "10da2"
-                  },
                   "settlementCurrency" : {
                     "value" : "EUR"
+                  },
+                  "meta" : {
+                    "globalKey" : "10da2"
                   }
                 },
-                "meta" : {
-                  "externalKey" : "returnLeg",
-                  "globalKey" : "458c883a"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "99224396"
-                  },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "globalKey" : "815a0f35"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "815a0f35"
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "periodicDates" : {
+                        "startDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "9229ce57"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "c71e4c53",
+                              "externalReference" : "equityEffectiveDate"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "9229ce57"
+                          }
                         },
-                        "period" : "D",
+                        "endDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "b635d2a0"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "ec0c393",
+                              "externalReference" : "finalValuationDate"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "b635d2a0"
+                          }
+                        },
+                        "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "18ce"
+                          },
+                          "rollConvention" : "9"
+                        },
+                        "periodDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "DEFR"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "1ff50d"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "211d10fc"
+                          }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "1197aaa5",
+                        "externalKey" : "interimValuationDate"
+                      }
+                    },
+                    "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                    "meta" : {
+                      "globalKey" : "52cb8fc"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2009-12-09",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "DEFR"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "1ff50d"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "211d10fc"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "ec0c393"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "ec0c393",
+                        "externalKey" : "finalValuationDate"
+                      }
+                    },
+                    "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                    "meta" : {
+                      "globalKey" : "e45d3ae9"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
+                      "relativeDates" : {
                         "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "24ad6927"
+                        },
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -380,24 +450,24 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "finalValuationDate",
-                          "globalReference" : "ec0c393"
+                          "globalReference" : "1197aaa5",
+                          "externalReference" : "interimValuationDate"
                         }
-                      }
-                    },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "964475eb"
                       },
-                      "relativeDates" : {
+                      "meta" : {
+                        "globalKey" : "24ad6927"
+                      }
+                    } ],
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "964475eb"
+                          "globalKey" : "fc30271"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -406,46 +476,21 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "interimValuationDate",
-                          "globalReference" : "b2c558e5"
-                        }
-                      }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendComposition" : "EQUITY_AMOUNT_RECEIVER_ELECTION",
-                    "dividendCurrency" : {
-                      "currencyReference" : {
-                        "externalReference" : "equityIssuerPaymentCurrency"
-                      }
-                    },
-                    "dividendPayoutRatio" : [ {
-                      "cashRatio" : 1,
-                      "nonCashRatio" : 1,
-                      "totalRatio" : 1
-                    } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "CASH_SETTLEMENT_PAYMENT_DATE"
+                          "globalReference" : "ec0c393",
+                          "externalReference" : "finalValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "fc30271"
                       }
-                    } ],
-                    "firstOrSecondPeriod" : "SECOND_PERIOD",
-                    "nonCashDividendTreatment" : "POTENTIAL_ADJUSTMENT_EVENT"
+                    }
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                  "meta" : {
+                    "globalKey" : "35da2aea"
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -463,335 +508,290 @@
                         "value" : "productIdentifier-3"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
-                    "meta" : {
-                      "globalKey" : "e45d3ae9"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "DEFR"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "1ff50d"
-                            }
-                          },
-                          "businessDayConvention" : "FOLLOWING",
-                          "meta" : {
-                            "globalKey" : "211d10fc"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "ec0c393"
-                        },
-                        "unadjustedDate" : "2009-12-09"
-                      },
-                      "meta" : {
-                        "externalKey" : "finalValuationDate",
-                        "globalKey" : "ec0c393"
-                      }
-                    },
-                    "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
                   },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "a65a673c"
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 1,
+                      "cashRatio" : 1,
+                      "nonCashRatio" : 1
+                    } ],
+                    "firstOrSecondPeriod" : "SecondPeriod",
+                    "dividendCurrency" : {
+                      "currencyReference" : {
+                        "externalReference" : "equityIssuerPaymentCurrency"
+                      }
                     },
-                    "valuationDates" : {
-                      "meta" : {
-                        "externalKey" : "interimValuationDate",
-                        "globalKey" : "b2c558e5"
-                      },
-                      "periodicDates" : {
-                        "endDate" : {
-                          "meta" : {
-                            "globalKey" : "b9d527a8"
-                          },
-                          "relativeDate" : {
-                            "meta" : {
-                              "globalKey" : "b9d527a8"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "finalValuationDate",
-                              "globalReference" : "ec0c393"
-                            }
-                          }
-                        },
-                        "periodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "DEFR"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "1ff50d"
-                            }
-                          },
-                          "businessDayConvention" : "FOLLOWING",
-                          "meta" : {
-                            "globalKey" : "211d10fc"
-                          }
-                        },
-                        "periodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12ce6"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "9"
-                        },
-                        "startDate" : {
-                          "meta" : {
-                            "globalKey" : "95c9235f"
-                          },
-                          "relativeDate" : {
-                            "meta" : {
-                              "globalKey" : "95c9235f"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "equityEffectiveDate",
-                              "globalReference" : "c71e4c53"
-                            }
-                          }
+                    "nonCashDividendTreatment" : "PotentialAdjustmentEvent",
+                    "dividendComposition" : "EquityAmountReceiverElection",
+                    "dividendPeriod" : [ {
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "CashSettlementPaymentDate"
                         }
                       }
-                    },
-                    "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
-                  }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "DEFR"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "1ff50d"
-                    }
-                  },
-                  "businessDayConvention" : "FOLLOWING",
-                  "meta" : {
-                    "globalKey" : "211d10fc"
+                    } ]
                   }
                 },
                 "meta" : {
-                  "globalKey" : "ec0c393"
-                },
-                "unadjustedDate" : "2009-12-09"
-              },
+                  "globalKey" : "3fb46c90",
+                  "externalKey" : "returnLeg"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "ec0c393"
+                "globalKey" : "f42bfc2d"
               }
             }
           },
           "meta" : {
-            "globalKey" : "588e4077"
+            "globalKey" : "8277cc93"
           }
         },
         "meta" : {
-          "globalKey" : "588e4077"
+          "globalKey" : "8277cc93"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "affa401e"
-          },
           "observable" : {
-            "meta" : {
-              "globalKey" : "affa401e"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Reuters"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
+                  "periodMultiplier" : 1,
                   "period" : "M",
-                  "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
+            },
+            "meta" : {
+              "globalKey" : "4f4caf8a"
             }
+          },
+          "meta" : {
+            "globalKey" : "4f4caf8a"
           }
         }, {
-          "meta" : {
-            "globalKey" : "b93f6441"
-          },
-          "observable" : {
+          "price" : [ {
+            "value" : {
+              "value" : 10,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              },
+              "perUnitOf" : {
+                "financialUnit" : "Share"
+              },
+              "priceType" : "AssetPrice"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 100000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
-              "globalKey" : "ed6378f8"
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          }, {
+            "value" : {
+              "value" : 1000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "BMWG.DE",
                   "meta" : {
                     "scheme" : "http://www.example.com/instrument-id-Reuters-RIC-1-0"
-                  },
-                  "value" : "BMWG.DE"
+                  }
                 },
+                "source" : "RIC",
                 "meta" : {
                   "globalKey" : "305118e0"
-                },
-                "source" : "RIC"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
+                  "value" : "DE0005190003",
                   "meta" : {
                     "scheme" : "http://www.example.com/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "DE0005190003"
+                  }
                 },
+                "source" : "ISIN",
                 "meta" : {
                   "globalKey" : "d6dc5c0"
-                },
-                "source" : "ISIN"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-3"
+                  "value" : "productIdentifier-2"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "BMW ORD"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "b46c25d8"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
                 }
               },
-              "value" : 10,
-              "perUnitOf" : {
-                "financialUnit" : "SHARE"
-              },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 100000
-            }
-          }, {
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-3"
+                } ]
+              }
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 1000000
+              "globalKey" : "bf0ba608"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "fc5fc3c1"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eca49"
-      },
-      "value" : "2009-09-09"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "60beee7a",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "2f1783b5",
+          "externalReference" : "partyA"
+        }
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "SWAP1234",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id-1-0"
-          },
-          "value" : "1558488"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "1ba91055"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "988417b5"
+      "name" : {
+        "value" : "AAA Bank This is a test for agent language"
       },
       "meta" : {
-        "globalKey" : "fd937fe8"
+        "globalKey" : "2f1783b5",
+        "externalKey" : "partyA"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "MEGA1234",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id-1-0"
-          },
-          "value" : "1558488"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "fd9b8bb4"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyB",
-        "globalReference" : "b879ae2e"
+      "name" : {
+        "value" : "Mega Bank Ltd"
+      },
+      "meta" : {
+        "globalKey" : "60beee7a",
+        "externalKey" : "partyB"
+      }
+    } ],
+    "partyRole" : [ {
+      "partyReference" : {
+        "globalReference" : "60beee7a",
+        "externalReference" : "partyB"
       },
+      "role" : "HedgingParty"
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2009-09-01",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2009EquityEuropeanInterdealer"
+            },
+            "masterConfirmationAnnexType" : {
+              "value" : "ISDA2009EquityEuropeanInterdealerSS"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "3e010f70"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "fd937fe9"
+        "globalKey" : "3e010f70"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "92a325bc"
+    }
+  },
+  "meta" : {
+    "globalKey" : "92a325bc"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex15-forward-starting-pre-european-interdealer-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex15-forward-starting-pre-european-interdealer-share-swap-short-form.json
index 397c8e591c..5a8acedd1a 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex15-forward-starting-pre-european-interdealer-share-swap-short-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex15-forward-starting-pre-european-interdealer-share-swap-short-form.json
@@ -1,94 +1,47 @@
 {
-  "meta" : {
-    "globalKey" : "438d9b0"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2009-09-01",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationAnnexType" : {
-              "value" : "ISDA_2009_EQUITY_EUROPEAN_INTERDEALER_SS"
-            },
-            "masterConfirmationType" : {
-              "value" : "ISDA_2009_EQUITY_EUROPEAN_INTERDEALER"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "4c54b2a2",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1558488",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/trade-id-1-0"
           }
         },
-        "meta" : {
-          "globalKey" : "81f44b30"
-        }
+        "version" : 1
       } ],
       "meta" : {
-        "globalKey" : "81f44b30"
+        "globalKey" : "975c9559"
       }
-    },
-    "meta" : {
-      "globalKey" : "438d9b0"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "f952948c"
-      },
-      "name" : {
-        "value" : "AAA Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "eed3b7e2"
-      },
-      "name" : {
-        "value" : "Mega Bank Ltd"
+      "issuerReference" : {
+        "globalReference" : "68bd5b2e",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "8848551",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
+            "scheme" : "http://www.partyB.com/trade-id-1-0"
+          }
         },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
-    } ],
-    "partyRole" : [ {
-      "partyReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "eed3b7e2"
-      },
-      "role" : "HEDGING_PARTY"
+        "version" : 1
+      } ],
+      "meta" : {
+        "globalKey" : "ec6c15a"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-09-09",
+      "meta" : {
+        "globalKey" : "3eca49"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "eed3b7e2"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "f952948c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -98,7 +51,9 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-10-09",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "DEFR"
@@ -107,40 +62,89 @@
                       "globalKey" : "1ff50d"
                     }
                   },
-                  "businessDayConvention" : "FOLLOWING",
                   "meta" : {
                     "globalKey" : "211d10fc"
                   }
                 },
                 "meta" : {
                   "globalKey" : "34547413"
+                }
+              },
+              "meta" : {
+                "globalKey" : "34547413",
+                "externalKey" : "equityEffectiveDate"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-12-09",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "DEFR"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "1ff50d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "211d10fc"
+                  }
                 },
-                "unadjustedDate" : "2009-10-09"
+                "meta" : {
+                  "globalKey" : "ec0c393"
+                }
               },
               "meta" : {
-                "externalKey" : "equityEffectiveDate",
-                "globalKey" : "34547413"
+                "globalKey" : "ec0c393"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "equityNotionalAmount"
+                  },
                   "meta" : {
                     "globalKey" : "54b65ddd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "equityNotionalAmount",
-                    "globalReference" : "4cf"
                   }
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-10-13",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -149,28 +153,24 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "3b28889f"
-                      },
-                      "unadjustedDate" : "2009-10-13"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "interestEffectiveDate",
-                      "globalKey" : "3b28889f"
+                      "globalKey" : "3b28889f",
+                      "externalKey" : "interestEffectiveDate"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "interestCalcPeriodDates",
-                    "globalKey" : "16cca080"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-12-11",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -179,132 +179,108 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "122b26e1"
-                      },
-                      "unadjustedDate" : "2009-12-11"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "interestTerminationDate",
-                      "globalKey" : "122b26e1"
+                      "globalKey" : "122b26e1",
+                      "externalKey" : "interestTerminationDate"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "16cca080",
+                    "externalKey" : "interestCalcPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "eeb78e83"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "interestLegPaymentDates",
-                    "globalKey" : "b3c2835f"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "b3c2835f"
-                      },
                       "periodicDates" : {
-                        "endDate" : {
-                          "meta" : {
-                            "globalKey" : "97eae877"
-                          },
+                        "startDate" : {
                           "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "97eae877"
+                              "globalKey" : "df205212"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "dateRelativeTo" : {
-                              "externalReference" : "interestTerminationDate",
-                              "globalReference" : "122b26e1"
+                              "globalReference" : "3b28889f",
+                              "externalReference" : "interestEffectiveDate"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "df205212"
                           }
                         },
-                        "periodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "EUTA"
-                            } ],
+                        "endDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "20a71d"
+                              "globalKey" : "944b936f"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "122b26e1",
+                              "externalReference" : "interestTerminationDate"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
-                            "globalKey" : "211dc30c"
+                            "globalKey" : "944b936f"
                           }
                         },
                         "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "12ce6"
+                            "globalKey" : "18ce"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
                           "rollConvention" : "9"
                         },
-                        "startDate" : {
-                          "meta" : {
-                            "globalKey" : "e2bfa71a"
-                          },
-                          "relativeDate" : {
+                        "periodDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "EUTA"
+                            } ],
                             "meta" : {
-                              "globalKey" : "e2bfa71a"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "interestEffectiveDate",
-                              "globalReference" : "3b28889f"
+                              "globalKey" : "20a71d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "211dc30c"
                           }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "5102c281"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "5102c281",
+                    "externalKey" : "interestLegPaymentDates"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "interestCalcPeriodDates",
-                    "globalReference" : "16cca080"
+                    "globalReference" : "16cca080",
+                    "externalReference" : "interestCalcPeriodDates"
                   },
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "36741a11"
+                      "globalKey" : "135004c5"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "CURRENCY_BUSINESS",
+                    "dayType" : "CurrencyBusiness",
+                    "businessDayConvention" : "PRECEDING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -313,67 +289,169 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "PRECEDING",
                     "dateRelativeTo" : {
-                      "externalReference" : "interestLegPaymentDates",
-                      "globalReference" : "b3c2835f"
+                      "globalReference" : "5102c281",
+                      "externalReference" : "interestLegPaymentDates"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "5dd36e9e"
-                  },
                   "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 1,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "f9c90e82"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "3a50ba7"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "8643e569"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
+                  "reset" : true,
                   "meta" : {
-                    "externalKey" : "equityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
-                  "reset" : true
+                    "globalKey" : "4cf",
+                    "externalKey" : "equityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "10da2"
-                  },
                   "settlementCurrency" : {
                     "value" : "EUR"
+                  },
+                  "meta" : {
+                    "globalKey" : "10da2"
                   }
                 },
-                "meta" : {
-                  "externalKey" : "returnLeg",
-                  "globalKey" : "7493ec4c"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "99224396"
+                "valuationDates" : {
+                  "valuationDatesInitial" : {
+                    "determinationMethod" : "AgreedInitialPrice",
+                    "meta" : {
+                      "globalKey" : "643bb87"
+                    }
                   },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "periodicDates" : {
+                        "startDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "9229ce57"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "34547413",
+                              "externalReference" : "equityEffectiveDate"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "9229ce57"
+                          }
+                        },
+                        "endDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "b635d2a0"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "ec0c393",
+                              "externalReference" : "finalValuationDate"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "b635d2a0"
+                          }
+                        },
+                        "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "18ce"
+                          },
+                          "rollConvention" : "9"
+                        },
+                        "periodDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "DEFR"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "1ff50d"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "211d10fc"
+                          }
+                        }
+                      },
                       "meta" : {
-                        "globalKey" : "815a0f35"
+                        "globalKey" : "1197aaa5",
+                        "externalKey" : "interimValuationDate"
+                      }
+                    },
+                    "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                    "meta" : {
+                      "globalKey" : "52cb8fc"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2009-12-09",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "DEFR"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "1ff50d"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "211d10fc"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "ec0c393"
+                        }
                       },
-                      "relativeDate" : {
+                      "meta" : {
+                        "globalKey" : "ec0c393",
+                        "externalKey" : "finalValuationDate"
+                      }
+                    },
+                    "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                    "meta" : {
+                      "globalKey" : "e45d3ae9"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
+                      "relativeDates" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "815a0f35"
+                          "globalKey" : "24ad6927"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -382,24 +460,24 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "finalValuationDate",
-                          "globalReference" : "ec0c393"
+                          "globalReference" : "1197aaa5",
+                          "externalReference" : "interimValuationDate"
                         }
-                      }
-                    },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "964475eb"
                       },
-                      "relativeDates" : {
+                      "meta" : {
+                        "globalKey" : "24ad6927"
+                      }
+                    } ],
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "964475eb"
+                          "globalKey" : "fc30271"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -408,44 +486,21 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "interimValuationDate",
-                          "globalReference" : "b2c558e5"
-                        }
-                      }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendComposition" : "EQUITY_AMOUNT_RECEIVER_ELECTION",
-                    "dividendCurrency" : {
-                      "determinationMethod" : "ISSUER_PAYMENT_CURRENCY"
-                    },
-                    "dividendPayoutRatio" : [ {
-                      "cashRatio" : 1,
-                      "nonCashRatio" : 1,
-                      "totalRatio" : 1
-                    } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "CASH_SETTLEMENT_PAYMENT_DATE"
+                          "globalReference" : "ec0c393",
+                          "externalReference" : "finalValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "fc30271"
                       }
-                    } ],
-                    "firstOrSecondPeriod" : "SECOND_PERIOD",
-                    "nonCashDividendTreatment" : "POTENTIAL_ADJUSTMENT_EVENT"
+                    }
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                  "meta" : {
+                    "globalKey" : "35da2aea"
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -463,321 +518,266 @@
                         "value" : "productIdentifier-3"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
-                    "meta" : {
-                      "globalKey" : "e45d3ae9"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "DEFR"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "1ff50d"
-                            }
-                          },
-                          "businessDayConvention" : "FOLLOWING",
-                          "meta" : {
-                            "globalKey" : "211d10fc"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "ec0c393"
-                        },
-                        "unadjustedDate" : "2009-12-09"
-                      },
-                      "meta" : {
-                        "externalKey" : "finalValuationDate",
-                        "globalKey" : "ec0c393"
-                      }
-                    },
-                    "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
-                  },
-                  "valuationDatesInitial" : {
-                    "determinationMethod" : "AGREED_INITIAL_PRICE",
-                    "meta" : {
-                      "globalKey" : "643bb87"
-                    }
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
                   },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "a65a673c"
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 1,
+                      "cashRatio" : 1,
+                      "nonCashRatio" : 1
+                    } ],
+                    "firstOrSecondPeriod" : "SecondPeriod",
+                    "dividendCurrency" : {
+                      "determinationMethod" : "IssuerPaymentCurrency"
                     },
-                    "valuationDates" : {
-                      "meta" : {
-                        "externalKey" : "interimValuationDate",
-                        "globalKey" : "b2c558e5"
-                      },
-                      "periodicDates" : {
-                        "endDate" : {
-                          "meta" : {
-                            "globalKey" : "b9d527a8"
-                          },
-                          "relativeDate" : {
-                            "meta" : {
-                              "globalKey" : "b9d527a8"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "finalValuationDate",
-                              "globalReference" : "ec0c393"
-                            }
-                          }
-                        },
-                        "periodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "DEFR"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "1ff50d"
-                            }
-                          },
-                          "businessDayConvention" : "FOLLOWING",
-                          "meta" : {
-                            "globalKey" : "211d10fc"
-                          }
-                        },
-                        "periodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12ce6"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "9"
-                        },
-                        "startDate" : {
-                          "meta" : {
-                            "globalKey" : "95c9235f"
-                          },
-                          "relativeDate" : {
-                            "meta" : {
-                              "globalKey" : "95c9235f"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "equityEffectiveDate",
-                              "globalReference" : "34547413"
-                            }
-                          }
+                    "nonCashDividendTreatment" : "PotentialAdjustmentEvent",
+                    "dividendComposition" : "EquityAmountReceiverElection",
+                    "dividendPeriod" : [ {
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "CashSettlementPaymentDate"
                         }
                       }
-                    },
-                    "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
-                  }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "DEFR"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "1ff50d"
-                    }
-                  },
-                  "businessDayConvention" : "FOLLOWING",
-                  "meta" : {
-                    "globalKey" : "211d10fc"
+                    } ]
                   }
                 },
                 "meta" : {
-                  "globalKey" : "ec0c393"
-                },
-                "unadjustedDate" : "2009-12-09"
-              },
+                  "globalKey" : "c1260534",
+                  "externalKey" : "returnLeg"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "ec0c393"
+                "globalKey" : "3920fcad"
               }
             }
           },
           "meta" : {
-            "globalKey" : "dbfe20f"
+            "globalKey" : "585df353"
           }
         },
         "meta" : {
-          "globalKey" : "dbfe20f"
+          "globalKey" : "585df353"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "55b1ca42"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "affa401e"
+          "price" : [ {
+            "value" : {
+              "value" : 0,
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Reuters"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
+                  "periodMultiplier" : 1,
                   "period" : "M",
-                  "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
+            },
+            "meta" : {
+              "globalKey" : "4f4caf8a"
             }
           },
-          "price" : [ {
+          "meta" : {
+            "globalKey" : "30213f06"
+          }
+        }, {
+          "quantity" : [ {
+            "value" : {
+              "value" : 100000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-1"
+                "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "value" : 0,
-              "arithmeticOperator" : "ADD",
-              "priceType" : "INTEREST_RATE"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "688e7596"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "ed6378f8"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "BMWG.DE",
                   "meta" : {
                     "scheme" : "http://www.example.com/instrument-id-Reuters-RIC-1-0"
-                  },
-                  "value" : "BMWG.DE"
+                  }
                 },
+                "source" : "RIC",
                 "meta" : {
                   "globalKey" : "305118e0"
-                },
-                "source" : "RIC"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
+                  "value" : "DE0005190003",
                   "meta" : {
                     "scheme" : "http://www.example.com/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "DE0005190003"
+                  }
                 },
+                "source" : "ISIN",
                 "meta" : {
                   "globalKey" : "d6dc5c0"
-                },
-                "source" : "ISIN"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-3"
+                  "value" : "productIdentifier-2"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "BMW ORD"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "b46c25d8"
-                },
-                "source" : "NAME"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-3"
+                } ]
               }
-            } ]
-          },
-          "quantity" : [ {
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 100000
+              "globalKey" : "bf0ba608"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "f067c1a6"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eca49"
-      },
-      "value" : "2009-09-09"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "68bd5b2e",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4c54b2a2",
+          "externalReference" : "party1"
+        }
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id-1-0"
-          },
-          "value" : "1558488"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "f952948c"
+      "name" : {
+        "value" : "AAA Bank"
       },
       "meta" : {
-        "globalKey" : "fda19759"
+        "globalKey" : "4c54b2a2",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id-1-0"
-          },
-          "value" : "8848551"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "eed3b7e2"
+      "name" : {
+        "value" : "Mega Bank Ltd"
+      },
+      "meta" : {
+        "globalKey" : "68bd5b2e",
+        "externalKey" : "party2"
+      }
+    } ],
+    "partyRole" : [ {
+      "partyReference" : {
+        "globalReference" : "68bd5b2e",
+        "externalReference" : "party2"
       },
+      "role" : "HedgingParty"
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2009-09-01",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2009EquityEuropeanInterdealer"
+            },
+            "masterConfirmationAnnexType" : {
+              "value" : "ISDA2009EquityEuropeanInterdealerSS"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "3e010f70"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "e4a8bda"
+        "globalKey" : "3e010f70"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "195ae3ae"
+    }
+  },
+  "meta" : {
+    "globalKey" : "195ae3ae"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex16-forward-starting-post-european-interdealer-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex16-forward-starting-post-european-interdealer-share-swap-short-form.json
index e91e818e61..9cf172bd2a 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex16-forward-starting-post-european-interdealer-share-swap-short-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex16-forward-starting-post-european-interdealer-share-swap-short-form.json
@@ -1,94 +1,47 @@
 {
-  "meta" : {
-    "globalKey" : "a9fcaa07"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2009-09-01",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationAnnexType" : {
-              "value" : "ISDA_2009_EQUITY_EUROPEAN_INTERDEALER_SS"
-            },
-            "masterConfirmationType" : {
-              "value" : "ISDA_2009_EQUITY_EUROPEAN_INTERDEALER"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "4c54b2a2",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1558488",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/trade-id-1-0"
           }
         },
-        "meta" : {
-          "globalKey" : "81f44b30"
-        }
+        "version" : 2
       } ],
       "meta" : {
-        "globalKey" : "81f44b30"
+        "globalKey" : "975c991a"
       }
-    },
-    "meta" : {
-      "globalKey" : "a9fcaa07"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "f952948c"
-      },
-      "name" : {
-        "value" : "AAA Bank"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "eed3b7e2"
-      },
-      "name" : {
-        "value" : "Mega Bank Ltd"
+      "issuerReference" : {
+        "globalReference" : "68bd5b2e",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "8848551",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
+            "scheme" : "http://www.partyB.com/trade-id-1-0"
+          }
         },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
-    } ],
-    "partyRole" : [ {
-      "partyReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "eed3b7e2"
-      },
-      "role" : "HEDGING_PARTY"
+        "version" : 2
+      } ],
+      "meta" : {
+        "globalKey" : "ec6c51b"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-09-09",
+      "meta" : {
+        "globalKey" : "3eca49"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "eed3b7e2"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "f952948c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -98,7 +51,9 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-10-09",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "DEFR"
@@ -107,40 +62,89 @@
                       "globalKey" : "1ff50d"
                     }
                   },
-                  "businessDayConvention" : "FOLLOWING",
                   "meta" : {
                     "globalKey" : "211d10fc"
                   }
                 },
                 "meta" : {
                   "globalKey" : "34547413"
+                }
+              },
+              "meta" : {
+                "globalKey" : "34547413",
+                "externalKey" : "equityEffectiveDate"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2009-12-09",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
+                  "businessCenters" : {
+                    "businessCenter" : [ {
+                      "value" : "DEFR"
+                    } ],
+                    "meta" : {
+                      "globalKey" : "1ff50d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "211d10fc"
+                  }
                 },
-                "unadjustedDate" : "2009-10-09"
+                "meta" : {
+                  "globalKey" : "ec0c393"
+                }
               },
               "meta" : {
-                "externalKey" : "equityEffectiveDate",
-                "globalKey" : "34547413"
+                "globalKey" : "ec0c393"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "equityNotionalAmount"
+                  },
                   "meta" : {
                     "globalKey" : "54b65ddd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "equityNotionalAmount",
-                    "globalReference" : "4cf"
                   }
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-10-13",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -149,28 +153,24 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "3b28889f"
-                      },
-                      "unadjustedDate" : "2009-10-13"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "interestEffectiveDate",
-                      "globalKey" : "3b28889f"
+                      "globalKey" : "3b28889f",
+                      "externalKey" : "interestEffectiveDate"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "interestCalcPeriodDates",
-                    "globalKey" : "16cca080"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-12-11",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -179,132 +179,108 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "122b26e1"
-                      },
-                      "unadjustedDate" : "2009-12-11"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "interestTerminationDate",
-                      "globalKey" : "122b26e1"
+                      "globalKey" : "122b26e1",
+                      "externalKey" : "interestTerminationDate"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "16cca080",
+                    "externalKey" : "interestCalcPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "eeb78e83"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "interestLegPaymentDates",
-                    "globalKey" : "b3c2835f"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "b3c2835f"
-                      },
                       "periodicDates" : {
-                        "endDate" : {
-                          "meta" : {
-                            "globalKey" : "97eae877"
-                          },
+                        "startDate" : {
                           "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "97eae877"
+                              "globalKey" : "df205212"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
+                            "businessDayConvention" : "NotApplicable",
                             "dateRelativeTo" : {
-                              "externalReference" : "interestTerminationDate",
-                              "globalReference" : "122b26e1"
+                              "globalReference" : "3b28889f",
+                              "externalReference" : "interestEffectiveDate"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "df205212"
                           }
                         },
-                        "periodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "EUTA"
-                            } ],
+                        "endDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "20a71d"
+                              "globalKey" : "944b936f"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "122b26e1",
+                              "externalReference" : "interestTerminationDate"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
-                            "globalKey" : "211dc30c"
+                            "globalKey" : "944b936f"
                           }
                         },
                         "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
                           "meta" : {
-                            "globalKey" : "12ce6"
+                            "globalKey" : "18ce"
                           },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
                           "rollConvention" : "9"
                         },
-                        "startDate" : {
-                          "meta" : {
-                            "globalKey" : "e2bfa71a"
-                          },
-                          "relativeDate" : {
+                        "periodDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "EUTA"
+                            } ],
                             "meta" : {
-                              "globalKey" : "e2bfa71a"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "interestEffectiveDate",
-                              "globalReference" : "3b28889f"
+                              "globalKey" : "20a71d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "211dc30c"
                           }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "5102c281"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "5102c281",
+                    "externalKey" : "interestLegPaymentDates"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "interestCalcPeriodDates",
-                    "globalReference" : "16cca080"
+                    "globalReference" : "16cca080",
+                    "externalReference" : "interestCalcPeriodDates"
                   },
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "36741a11"
+                      "globalKey" : "135004c5"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "CURRENCY_BUSINESS",
+                    "dayType" : "CurrencyBusiness",
+                    "businessDayConvention" : "PRECEDING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -313,73 +289,175 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "PRECEDING",
                     "dateRelativeTo" : {
-                      "externalReference" : "interestLegPaymentDates",
-                      "globalReference" : "b3c2835f"
+                      "globalReference" : "5102c281",
+                      "externalReference" : "interestLegPaymentDates"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "5dd36e9e"
-                  },
                   "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
+                    "periodMultiplier" : 1,
                     "period" : "M",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "f9c90e82"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "3a50ba7"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "8643e569"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "equityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "equityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "10da2"
-                  },
                   "settlementCurrency" : {
                     "value" : "EUR"
+                  },
+                  "meta" : {
+                    "globalKey" : "10da2"
                   }
                 },
-                "meta" : {
-                  "externalKey" : "returnLeg",
-                  "globalKey" : "7493ec4c"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "99224396"
+                "valuationDates" : {
+                  "valuationDatesInitial" : {
+                    "determinationMethod" : "AgreedInitialPrice",
+                    "meta" : {
+                      "globalKey" : "643bb87"
+                    }
                   },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "periodicDates" : {
+                        "startDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "9229ce57"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "34547413",
+                              "externalReference" : "equityEffectiveDate"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "9229ce57"
+                          }
+                        },
+                        "endDate" : {
+                          "relativeDate" : {
+                            "periodMultiplier" : 0,
+                            "period" : "D",
+                            "meta" : {
+                              "globalKey" : "b635d2a0"
+                            },
+                            "businessDayConvention" : "NotApplicable",
+                            "dateRelativeTo" : {
+                              "globalReference" : "ec0c393",
+                              "externalReference" : "finalValuationDate"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "b635d2a0"
+                          }
+                        },
+                        "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "18ce"
+                          },
+                          "rollConvention" : "9"
+                        },
+                        "periodDatesAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "DEFR"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "1ff50d"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "211d10fc"
+                          }
+                        }
+                      },
                       "meta" : {
-                        "globalKey" : "815a0f35"
+                        "globalKey" : "1197aaa5",
+                        "externalKey" : "interimValuationDate"
+                      }
+                    },
+                    "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                    "meta" : {
+                      "globalKey" : "52cb8fc"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2009-12-09",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "DEFR"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "1ff50d"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "211d10fc"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "ec0c393"
+                        }
                       },
-                      "relativeDate" : {
+                      "meta" : {
+                        "globalKey" : "ec0c393",
+                        "externalKey" : "finalValuationDate"
+                      }
+                    },
+                    "valuationTimeType" : "AsSpecifiedInMasterConfirmation",
+                    "meta" : {
+                      "globalKey" : "e45d3ae9"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
+                      "relativeDates" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "815a0f35"
+                          "globalKey" : "24ad6927"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -388,24 +466,24 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "finalValuationDate",
-                          "globalReference" : "ec0c393"
+                          "globalReference" : "1197aaa5",
+                          "externalReference" : "interimValuationDate"
                         }
-                      }
-                    },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "964475eb"
                       },
-                      "relativeDates" : {
+                      "meta" : {
+                        "globalKey" : "24ad6927"
+                      }
+                    } ],
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "964475eb"
+                          "globalKey" : "fc30271"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "CURRENCY_BUSINESS",
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -414,44 +492,21 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "interimValuationDate",
-                          "globalReference" : "b2c558e5"
-                        }
-                      }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendComposition" : "EQUITY_AMOUNT_RECEIVER_ELECTION",
-                    "dividendCurrency" : {
-                      "determinationMethod" : "ISSUER_PAYMENT_CURRENCY"
-                    },
-                    "dividendPayoutRatio" : [ {
-                      "cashRatio" : 1,
-                      "nonCashRatio" : 1,
-                      "totalRatio" : 1
-                    } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "CASH_SETTLEMENT_PAYMENT_DATE"
+                          "globalReference" : "ec0c393",
+                          "externalReference" : "finalValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "fc30271"
                       }
-                    } ],
-                    "firstOrSecondPeriod" : "SECOND_PERIOD",
-                    "nonCashDividendTreatment" : "POTENTIAL_ADJUSTMENT_EVENT"
+                    }
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                  "meta" : {
+                    "globalKey" : "35da2aea"
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -469,366 +524,311 @@
                         "value" : "productIdentifier-3"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
-                    "meta" : {
-                      "globalKey" : "e45d3ae9"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "DEFR"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "1ff50d"
-                            }
-                          },
-                          "businessDayConvention" : "FOLLOWING",
-                          "meta" : {
-                            "globalKey" : "211d10fc"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "ec0c393"
-                        },
-                        "unadjustedDate" : "2009-12-09"
-                      },
-                      "meta" : {
-                        "externalKey" : "finalValuationDate",
-                        "globalKey" : "ec0c393"
-                      }
-                    },
-                    "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
-                  },
-                  "valuationDatesInitial" : {
-                    "determinationMethod" : "AGREED_INITIAL_PRICE",
-                    "meta" : {
-                      "globalKey" : "643bb87"
-                    }
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
                   },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "a65a673c"
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 1,
+                      "cashRatio" : 1,
+                      "nonCashRatio" : 1
+                    } ],
+                    "firstOrSecondPeriod" : "SecondPeriod",
+                    "dividendCurrency" : {
+                      "determinationMethod" : "IssuerPaymentCurrency"
                     },
-                    "valuationDates" : {
-                      "meta" : {
-                        "externalKey" : "interimValuationDate",
-                        "globalKey" : "b2c558e5"
-                      },
-                      "periodicDates" : {
-                        "endDate" : {
-                          "meta" : {
-                            "globalKey" : "b9d527a8"
-                          },
-                          "relativeDate" : {
-                            "meta" : {
-                              "globalKey" : "b9d527a8"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "finalValuationDate",
-                              "globalReference" : "ec0c393"
-                            }
-                          }
-                        },
-                        "periodDatesAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "DEFR"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "1ff50d"
-                            }
-                          },
-                          "businessDayConvention" : "FOLLOWING",
-                          "meta" : {
-                            "globalKey" : "211d10fc"
-                          }
-                        },
-                        "periodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "12ce6"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "9"
-                        },
-                        "startDate" : {
-                          "meta" : {
-                            "globalKey" : "95c9235f"
-                          },
-                          "relativeDate" : {
-                            "meta" : {
-                              "globalKey" : "95c9235f"
-                            },
-                            "period" : "D",
-                            "periodMultiplier" : 0,
-                            "businessDayConvention" : "NOT_APPLICABLE",
-                            "dateRelativeTo" : {
-                              "externalReference" : "equityEffectiveDate",
-                              "globalReference" : "34547413"
-                            }
-                          }
+                    "nonCashDividendTreatment" : "PotentialAdjustmentEvent",
+                    "dividendComposition" : "EquityAmountReceiverElection",
+                    "dividendPeriod" : [ {
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "CashSettlementPaymentDate"
                         }
                       }
-                    },
-                    "valuationTimeType" : "AS_SPECIFIED_IN_MASTER_CONFIRMATION"
-                  }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessCenters" : {
-                    "businessCenter" : [ {
-                      "value" : "DEFR"
-                    } ],
-                    "meta" : {
-                      "globalKey" : "1ff50d"
-                    }
-                  },
-                  "businessDayConvention" : "FOLLOWING",
-                  "meta" : {
-                    "globalKey" : "211d10fc"
+                    } ]
                   }
                 },
                 "meta" : {
-                  "globalKey" : "ec0c393"
-                },
-                "unadjustedDate" : "2009-12-09"
-              },
+                  "globalKey" : "c1260534",
+                  "externalKey" : "returnLeg"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "ec0c393"
+                "globalKey" : "3920fcad"
               }
             }
           },
           "meta" : {
-            "globalKey" : "dbfe20f"
+            "globalKey" : "585df353"
           }
         },
         "meta" : {
-          "globalKey" : "dbfe20f"
+          "globalKey" : "585df353"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "8b695f9a"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "affa401e"
+          "price" : [ {
+            "value" : {
+              "value" : 0,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              },
+              "perUnitOf" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              },
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Reuters"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
+                  "periodMultiplier" : 1,
                   "period" : "M",
-                  "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
+            },
+            "meta" : {
+              "globalKey" : "4f4caf8a"
             }
           },
+          "meta" : {
+            "globalKey" : "e0ca7e2e"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 10,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
+                "financialUnit" : "Share"
+              },
+              "priceType" : "AssetPrice"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
+            }
+          } ],
+          "quantity" : [ {
+            "value" : {
+              "value" : 100000,
+              "unit" : {
+                "financialUnit" : "Share"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          }, {
+            "value" : {
+              "value" : 1000000,
+              "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "priceType" : "INTEREST_RATE"
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "b93f6441"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "ed6378f8"
-            },
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "BMWG.DE",
                   "meta" : {
                     "scheme" : "http://www.example.com/instrument-id-Reuters-RIC-1-0"
-                  },
-                  "value" : "BMWG.DE"
+                  }
                 },
+                "source" : "RIC",
                 "meta" : {
                   "globalKey" : "305118e0"
-                },
-                "source" : "RIC"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
+                  "value" : "DE0005190003",
                   "meta" : {
                     "scheme" : "http://www.example.com/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "DE0005190003"
+                  }
                 },
+                "source" : "ISIN",
                 "meta" : {
                   "globalKey" : "d6dc5c0"
-                },
-                "source" : "ISIN"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-3"
+                  "value" : "productIdentifier-2"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
                   "value" : "BMW ORD"
                 },
+                "source" : "Name",
                 "meta" : {
                   "globalKey" : "b46c25d8"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
-          "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
                 }
               },
-              "value" : 10,
-              "perUnitOf" : {
-                "financialUnit" : "SHARE"
-              },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 100000
-            }
-          }, {
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-3"
+                } ]
+              }
+            } ],
             "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 1000000
+              "globalKey" : "bf0ba608"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "fc5fc3c1"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eca49"
-      },
-      "value" : "2009-09-09"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "68bd5b2e",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4c54b2a2",
+          "externalReference" : "party1"
+        }
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id-1-0"
-          },
-          "value" : "1558488"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
         },
-        "version" : 2
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "f952948c"
+      "name" : {
+        "value" : "AAA Bank"
       },
       "meta" : {
-        "globalKey" : "fdafaeda"
+        "globalKey" : "4c54b2a2",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id-1-0"
-          },
-          "value" : "8848551"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
         },
-        "version" : 2
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "eed3b7e2"
+      "name" : {
+        "value" : "Mega Bank Ltd"
       },
       "meta" : {
-        "globalKey" : "e58a35b"
+        "globalKey" : "68bd5b2e",
+        "externalKey" : "party2"
+      }
+    } ],
+    "partyRole" : [ {
+      "partyReference" : {
+        "globalReference" : "68bd5b2e",
+        "externalReference" : "party2"
+      },
+      "role" : "HedgingParty"
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2009-09-01",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2009EquityEuropeanInterdealer"
+            },
+            "masterConfirmationAnnexType" : {
+              "value" : "ISDA2009EquityEuropeanInterdealerSS"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "3e010f70"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "3e010f70"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "83fe00e1"
+    }
+  },
+  "meta" : {
+    "globalKey" : "83fe00e1"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex17-cfd.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex17-cfd.json
index 0f912b74f3..d4cc0c3682 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex17-cfd.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex17-cfd.json
@@ -1,87 +1,56 @@
 {
-  "meta" : {
-    "globalKey" : "b9c7c721"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "46e37105",
+        "externalReference" : "PRIMARY"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "CFD123456789",
+          "meta" : {
+            "scheme" : "http://www.primarybank.com/trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
         }
       } ],
       "meta" : {
-        "globalKey" : "c4592b87"
+        "globalKey" : "ff26c7f2"
       }
-    },
-    "meta" : {
-      "globalKey" : "b9c7c721"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "PRIMARY",
-        "globalKey" : "46e37105"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "0987654321"
-        },
-        "meta" : {
-          "globalKey" : "46e37105"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "CROSS",
-        "globalKey" : "858ff69b"
+      "issuerReference" : {
+        "globalReference" : "858ff69b",
+        "externalReference" : "CROSS"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "CFD123456789",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "1234567890"
-        },
-        "meta" : {
-          "globalKey" : "858ff69b"
+            "scheme" : "http://www.crossbank.com/tradeId"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "db6f30f4"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-09-30",
+      "meta" : {
+        "globalKey" : "3eca5e",
+        "externalKey" : "TradeDate__CFD123456789"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "CROSS",
-          "globalReference" : "858ff69b"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "PRIMARY",
-          "globalReference" : "46e37105"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "EQCFD",
                 "meta" : {
                   "scheme" : "http://www.primarybank.com/productType"
-                },
-                "value" : "EQCFD"
+                }
               }
             }
           }, {
@@ -91,93 +60,128 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-10-07",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "2601cd72"
+                }
+              },
+              "meta" : {
+                "globalKey" : "2601cd72",
+                "externalKey" : "EffectiveDate__CFD123456789"
+              }
+            },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2019-10-01",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
                 },
-                "unadjustedDate" : "2009-10-07"
+                "meta" : {
+                  "globalKey" : "272e06ec"
+                }
               },
               "meta" : {
-                "externalKey" : "EffectiveDate__CFD123456789",
-                "globalKey" : "2601cd72"
+                "globalKey" : "272e06ec",
+                "externalKey" : "TerminationDate__CFD123456789"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2009-10-07",
                       "dateAdjustments" : {
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "meta" : {
                           "globalKey" : "3a4b88ab"
                         }
                       },
                       "meta" : {
                         "globalKey" : "2601cd72"
-                      },
-                      "unadjustedDate" : "2009-10-07"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "2601cd72"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "InterestLegPeriodDates-1",
-                    "globalKey" : "2dccd0ba"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2019-10-01",
                       "dateAdjustments" : {
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "meta" : {
                           "globalKey" : "3a4b88ab"
                         }
                       },
                       "meta" : {
                         "globalKey" : "272e06ec"
-                      },
-                      "unadjustedDate" : "2019-10-01"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "272e06ec"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "2dccd0ba",
+                    "externalKey" : "InterestLegPeriodDates-1"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "727b9f11"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "aa64376b"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
                       "adjustableDates" : {
+                        "unadjustedDate" : [ "2019-10-01" ],
                         "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "NYSE"
@@ -186,103 +190,95 @@
                               "globalKey" : "24cd5d"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "2121e94c"
                           }
                         },
                         "meta" : {
                           "globalKey" : "aa64376b"
-                        },
-                        "unadjustedDate" : [ "2019-10-01" ]
+                        }
                       },
                       "meta" : {
                         "globalKey" : "aa64376b"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "aa64376b"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "InterestLegPeriodDates-1",
-                    "globalReference" : "2dccd0ba"
+                    "globalReference" : "2dccd0ba",
+                    "externalReference" : "InterestLegPeriodDates-1"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "b20fcfd7"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "b07270fb"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "1000a4d7"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "4d5"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : false
+                  "reset" : false,
+                  "meta" : {
+                    "globalKey" : "4d5"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "14966"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
+                  },
+                  "meta" : {
+                    "globalKey" : "14966"
                   }
                 },
-                "fxFeature" : [ {
-                  "referenceCurrency" : {
-                    "meta" : {
-                      "externalKey" : "ReferenceCurrency",
-                      "globalKey" : "14966"
+                "valuationDates" : {
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2019-10-01",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "272e06ec"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "272e06ec",
+                        "externalKey" : "FinalValuationDate__CFD123456789"
+                      }
                     },
-                    "value" : "USD"
+                    "meta" : {
+                      "globalKey" : "98f9886e"
+                    }
                   }
-                } ],
-                "meta" : {
-                  "externalKey" : "EQ__CFD123456789",
-                  "globalKey" : "7fe0bc46"
                 },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "aa64376b"
-                  },
                   "paymentDateSchedule" : {
                     "finalPaymentDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2019-10-01",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "NYSE"
@@ -291,306 +287,310 @@
                               "globalKey" : "24cd5d"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "2121e94c"
                           }
                         },
                         "meta" : {
                           "globalKey" : "aa64376b"
-                        },
-                        "unadjustedDate" : "2019-10-01"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "aa64376b"
                       }
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "aa64376b"
+                  }
+                },
+                "underlier" : {
+                  "security" : {
+                    "productIdentifier" : [ {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-1"
+                      }
+                    } ],
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
+                "fxFeature" : [ {
+                  "referenceCurrency" : {
+                    "value" : "USD",
+                    "meta" : {
+                      "globalKey" : "14966",
+                      "externalKey" : "ReferenceCurrency"
+                    }
+                  }
+                } ],
                 "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
+                  },
                   "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 1.0
+                    } ],
+                    "dividendReinvestment" : false,
+                    "dividendEntitlement" : "ExDate",
                     "dividendCurrency" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "dividendEntitlement" : "EX_DATE",
-                    "dividendPayoutRatio" : [ {
-                      "totalRatio" : 1.0
-                    } ],
                     "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "AD_HOC_DATE"
+                      "startDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "3eca5e",
+                          "externalReference" : "TradeDate__CFD123456789"
                         }
                       },
                       "endDate" : {
                         "dividendDate" : {
-                          "externalReference" : "FinalValuationDate__CFD123456789",
-                          "globalReference" : "272e06ec"
+                          "globalReference" : "272e06ec",
+                          "externalReference" : "FinalValuationDate__CFD123456789"
                         }
                       },
-                      "startDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "TradeDate__CFD123456789",
-                          "globalReference" : "3eca5e"
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "AdHocDate"
                         }
                       }
-                    } ],
-                    "dividendReinvestment" : false
-                  },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
-                  }
-                },
-                "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
-                  "security" : {
-                    "productIdentifier" : [ {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-1"
-                      }
-                    } ],
-                    "securityType" : "EQUITY"
-                  }
-                },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
-                    "meta" : {
-                      "globalKey" : "98f9886e"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "272e06ec"
-                        },
-                        "unadjustedDate" : "2019-10-01"
-                      },
-                      "meta" : {
-                        "externalKey" : "FinalValuationDate__CFD123456789",
-                        "globalKey" : "272e06ec"
-                      }
-                    }
-                  }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
-                  "meta" : {
-                    "globalKey" : "3a4b88ab"
+                    } ]
                   }
                 },
                 "meta" : {
-                  "globalKey" : "272e06ec"
-                },
-                "unadjustedDate" : "2019-10-01"
-              },
+                  "globalKey" : "172312d4",
+                  "externalKey" : "EQ__CFD123456789"
+                }
+              } ],
               "meta" : {
-                "externalKey" : "TerminationDate__CFD123456789",
-                "globalKey" : "272e06ec"
+                "globalKey" : "f8c98c4f"
               }
             }
           },
           "meta" : {
-            "globalKey" : "59908efe"
+            "globalKey" : "8079edc4"
           }
         },
         "meta" : {
-          "globalKey" : "59908efe"
+          "globalKey" : "8079edc4"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "2bda2cf2"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "9a79305"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "RIC"
-                  },
-                  "value" : "XYZ.N"
-                },
-                "meta" : {
-                  "globalKey" : "9a79305"
-                },
-                "source" : "RIC"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 80.000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 80.000000,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "AssetPrice"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 48000,
               "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 48000
-            }
-          }, {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 3840000.000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 3840000.000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "5520294c"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d03"
-            },
-            "rateOption" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "XYZ.N",
+                  "meta" : {
+                    "scheme" : "RIC"
+                  }
+                },
+                "source" : "RIC",
+                "meta" : {
+                  "globalKey" : "9a79305"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 1
-                }
               }
+            } ],
+            "meta" : {
+              "globalKey" : "2b4acd9b"
             }
           },
+          "meta" : {
+            "globalKey" : "e9d29c32"
+          }
+        }, {
           "price" : [ {
+            "value" : {
+              "value" : 125.0,
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "price-2"
               } ]
-            },
-            "value" : {
-              "value" : 125.0,
-              "arithmeticOperator" : "ADD",
-              "priceType" : "INTEREST_RATE"
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 3840000.000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-3"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 1,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
                 }
               },
-              "value" : 3840000.000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "82801f45"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "8adb831c"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate__CFD123456789",
-        "globalKey" : "3eca5e"
-      },
-      "value" : "2009-09-30"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "858ff69b",
+          "externalReference" : "CROSS"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "46e37105",
+          "externalReference" : "PRIMARY"
+        }
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "0987654321",
           "meta" : {
-            "scheme" : "http://www.primarybank.com/trade-id"
-          },
-          "value" : "CFD123456789"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "46e37105"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "PRIMARY",
-        "globalReference" : "46e37105"
-      },
       "meta" : {
-        "globalKey" : "a486e9f6"
+        "globalKey" : "46e37105",
+        "externalKey" : "PRIMARY"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "1234567890",
           "meta" : {
-            "scheme" : "http://www.crossbank.com/tradeId"
-          },
-          "value" : "CFD123456789"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "858ff69b"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "CROSS",
-        "globalReference" : "858ff69b"
-      },
       "meta" : {
-        "globalKey" : "9054f034"
+        "globalKey" : "858ff69b",
+        "externalKey" : "CROSS"
       }
-    } ]
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c4592b87"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "c4592b87"
+      }
+    },
+    "meta" : {
+      "globalKey" : "850d6123"
+    }
+  },
+  "meta" : {
+    "globalKey" : "850d6123"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex18-pan-asia-interdealer-index-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex18-pan-asia-interdealer-index-swap-short-form.json
index 0d802a4246..b2600ea703 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex18-pan-asia-interdealer-index-swap-short-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex18-pan-asia-interdealer-index-swap-short-form.json
@@ -1,126 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "19bb7f81"
-  },
   "trade" : {
-    "collateral" : {
-      "independentAmount" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ed3bb042"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ed3b3be4"
-        },
-        "paymentDetail" : [ {
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "d04eb552",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "TW9236",
           "meta" : {
-            "globalKey" : "a93dc25d"
-          },
-          "paymentRule" : {
-            "percentageRule" : {
-              "notionalAmountReference" : {
-                "externalReference" : "equityNotionalAmount",
-                "globalReference" : "4cf"
-              },
-              "paymentPercent" : 0.02
-            }
-          }
-        } ]
-      }
-    },
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2009-07-20",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationAnnexType" : {
-              "value" : "ISDA_2009_SHARE_SWAP_PAN_ASIA"
-            },
-            "masterConfirmationType" : {
-              "value" : "ISDA_2009_EQUITY_PAN_ASIA"
-            }
+            "scheme" : "http://www.partyA.com/tradeRefNbr"
           }
-        },
-        "meta" : {
-          "globalKey" : "c865c45c"
         }
       } ],
       "meta" : {
-        "globalKey" : "c865c45c"
+        "globalKey" : "29b63a54"
       }
-    },
-    "meta" : {
-      "globalKey" : "19bb7f81"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "ed3b3be4"
-      },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "DTCC"
-          },
-          "value" : "DTCC00006441"
-        },
-        "meta" : {
-          "globalKey" : "5d661eab"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "ed3bb042"
-      },
-      "name" : {
-        "value" : "Party B"
+      "issuerReference" : {
+        "globalReference" : "d04eb192",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "299442",
           "meta" : {
-            "scheme" : "DTCC"
-          },
-          "value" : "DTCC00006440"
-        },
-        "meta" : {
-          "globalKey" : "5d661eaa"
+            "scheme" : "http://www.partyB.com/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ee0b3014"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2009-09-10",
+      "meta" : {
+        "globalKey" : "3eca4a"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "ed3bb042"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "ed3bb042"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ed3bb042"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ed3b3be4"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -128,11 +47,9 @@
             "productQualifier" : "EquitySwap_TotalReturnBasicPerformance_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2009-10-12",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -141,87 +58,115 @@
                 },
                 "meta" : {
                   "globalKey" : "ebdafec4"
-                },
-                "unadjustedDate" : "2009-10-12"
+                }
               },
               "meta" : {
-                "externalKey" : "equityEffectiveDate",
-                "globalKey" : "ebdafec4"
+                "globalKey" : "ebdafec4",
+                "externalKey" : "equityEffectiveDate"
               }
             },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "ea96b216"
+                },
+                "businessDayConvention" : "NONE",
+                "dateRelativeTo" : {
+                  "globalReference" : "7e0a5d94",
+                  "externalReference" : "finalCashSettlementPaymentDate"
+                }
+              },
+              "meta" : {
+                "globalKey" : "ea96b216"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "equityNotionalAmount"
+                  },
                   "meta" : {
                     "globalKey" : "54b65ddd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "equityNotionalAmount",
-                    "globalReference" : "4cf"
                   }
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0",
+                      "externalKey" : "floatingRateCalculation"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "globalKey" : "49d4d2ac"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "49d4d2ac"
+                        "globalKey" : "46357da4"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
                       "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "equityEffectiveDate",
-                        "globalReference" : "ebdafec4"
+                        "globalReference" : "ebdafec4",
+                        "externalReference" : "equityEffectiveDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "46357da4"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalculationPeriodDates",
-                    "globalKey" : "2ffb1af2"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "globalKey" : "ee36071e"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "ee36071e"
+                        "globalKey" : "ea96b216"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
                       "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "finalCashSettlementPaymentDate",
-                        "globalReference" : "e9616632"
+                        "globalReference" : "7e0a5d94",
+                        "externalReference" : "finalCashSettlementPaymentDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "ea96b216"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "adeb53f2",
+                    "externalKey" : "floatingCalculationPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "f969a374"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "3122c5b6"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
                       "adjustableDates" : {
+                        "unadjustedDate" : [ "2009-10-12", "2009-11-13", "2009-12-12", "2010-01-14", "2010-02-12", "2010-03-12", "2010-04-12", "2010-05-13", "2010-06-02", "2010-07-12", "2010-08-12" ],
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -230,197 +175,106 @@
                         },
                         "meta" : {
                           "globalKey" : "3122c5b6"
-                        },
-                        "unadjustedDate" : [ "2009-10-12", "2009-11-13", "2009-12-12", "2010-01-14", "2010-02-12", "2010-03-12", "2010-04-12", "2010-05-13", "2010-06-02", "2010-07-12", "2010-08-12" ]
+                        }
                       },
                       "meta" : {
                         "globalKey" : "3122c5b6"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "externalKey" : "floatingRateCalculation",
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3122c5b6"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalculationPeriodDates",
-                    "globalReference" : "2ffb1af2"
+                    "globalReference" : "adeb53f2",
+                    "externalReference" : "floatingCalculationPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "c446e854"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c775537c"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "3bfe4fc2"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "equityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "equityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "14966"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "be1b004e"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "CashSettlementPaymentDate",
-                    "globalKey" : "1b5a7a64"
-                  },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "externalKey" : "finalCashSettlementPaymentDate",
-                        "globalKey" : "e9616632"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "e9616632"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "equityValuationDates",
-                          "globalReference" : "f3658729"
-                        }
-                      }
-                    },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "e9616632"
-                      },
-                      "relativeDates" : {
-                        "meta" : {
-                          "globalKey" : "e9616632"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "equityValuationDates",
-                          "globalReference" : "f3658729"
-                        }
-                      }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendCurrency" : {
-                      "determinationMethod" : "HEDGE_EXECUTION"
-                    },
-                    "dividendPayoutRatio" : [ {
-                      "cashRatio" : 2.5,
-                      "nonCashRatio" : 2.5,
-                      "totalRatio" : 0.85
-                    } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "DIVIDEND_VALUATION_DATE"
-                        }
-                      }
-                    } ]
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
-                  }
-                },
-                "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
-                  "security" : {
-                    "productIdentifier" : [ {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-1"
-                      }
-                    } ],
-                    "securityType" : "EQUITY"
+                  "meta" : {
+                    "globalKey" : "14966"
                   }
                 },
                 "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "524b126b"
-                    }
-                  },
                   "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "externalKey" : "equityValuationDates",
-                      "globalKey" : "f3658729"
-                    },
+                    "determinationMethod" : "ValuationTime",
                     "valuationDates" : {
-                      "meta" : {
-                        "globalKey" : "395e21f4"
-                      },
                       "periodicDates" : {
+                        "startDate" : {
+                          "adjustableDate" : {
+                            "unadjustedDate" : "2009-10-12",
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NotApplicable",
+                              "meta" : {
+                                "globalKey" : "3a4b88ab"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "2601e037"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "2601e037"
+                          }
+                        },
                         "endDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2010-08-12",
                             "dateAdjustments" : {
-                              "businessDayConvention" : "NOT_APPLICABLE",
+                              "businessDayConvention" : "NotApplicable",
                               "meta" : {
                                 "globalKey" : "3a4b88ab"
                               }
                             },
                             "meta" : {
                               "globalKey" : "261e07b7"
-                            },
-                            "unadjustedDate" : "2010-08-12"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "261e07b7"
                           }
                         },
+                        "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "17810"
+                          },
+                          "rollConvention" : "30"
+                        },
                         "periodDatesAdjustments" : {
+                          "businessDayConvention" : "PRECEDING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "USNY"
@@ -428,266 +282,412 @@
                               "value" : "GBLO"
                             } ],
                             "meta" : {
-                              "externalKey" : "businessCenters",
-                              "globalKey" : "4f5ffd5"
+                              "globalKey" : "4f5ffd5",
+                              "externalKey" : "businessCenters"
                             }
                           },
-                          "businessDayConvention" : "PRECEDING",
                           "meta" : {
                             "globalKey" : "7b765912"
                           }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "84d61122"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3edd7657",
+                      "externalKey" : "equityValuationDates"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "ValuationTime",
+                    "meta" : {
+                      "globalKey" : "524b126b"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
+                      "relativeDates" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "7e0a5d94"
                         },
-                        "periodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "28c28"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "30"
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "NONE",
+                        "dateRelativeTo" : {
+                          "globalReference" : "3edd7657",
+                          "externalReference" : "equityValuationDates"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "7e0a5d94"
+                      }
+                    } ],
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "7e0a5d94"
                         },
-                        "startDate" : {
-                          "adjustableDate" : {
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NOT_APPLICABLE",
-                              "meta" : {
-                                "globalKey" : "3a4b88ab"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "2601e037"
-                            },
-                            "unadjustedDate" : "2009-10-12"
-                          },
-                          "meta" : {
-                            "globalKey" : "2601e037"
-                          }
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "NONE",
+                        "dateRelativeTo" : {
+                          "globalReference" : "3edd7657",
+                          "externalReference" : "equityValuationDates"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "7e0a5d94",
+                        "externalKey" : "finalCashSettlementPaymentDate"
                       }
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e5f7e728",
+                    "externalKey" : "CashSettlementPaymentDate"
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "meta" : {
-                "globalKey" : "ee36071e"
-              },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "ee36071e"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NONE",
-                "dateRelativeTo" : {
-                  "externalReference" : "finalCashSettlementPaymentDate",
-                  "globalReference" : "e9616632"
+                "underlier" : {
+                  "security" : {
+                    "productIdentifier" : [ {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-1"
+                      }
+                    } ],
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
+                  }
+                },
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
+                  },
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 0.85,
+                      "cashRatio" : 2.5,
+                      "nonCashRatio" : 2.5
+                    } ],
+                    "dividendCurrency" : {
+                      "determinationMethod" : "HedgeExecution"
+                    },
+                    "dividendPeriod" : [ {
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "DividendValuationDate"
+                        }
+                      }
+                    } ]
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "2b58b3f4"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "cb76eb70"
               }
             },
             "terminationProvision" : {
               "earlyTerminationProvision" : {
-                "meta" : {
-                  "globalKey" : "4cf"
-                },
                 "optionalEarlyTermination" : {
                   "mutualEarlyTermination" : true
+                },
+                "meta" : {
+                  "globalKey" : "4cf"
                 }
               }
+            },
+            "extraordinaryEvents" : {
+              "additionalDisruptionEvents" : {
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "7f7dec4e"
+            "globalKey" : "9938435a"
           }
         },
         "meta" : {
-          "globalKey" : "7f7dec4e"
+          "globalKey" : "9938435a"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "42842d0a"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "8c98d20"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.example.com/instrument-id-Reuters-RIC-1-0"
-                  },
-                  "value" : "IBM.N"
-                },
-                "meta" : {
-                  "globalKey" : "8c98d20"
-                },
-                "source" : "RIC"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 37.44,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
               },
-              "value" : 37.44,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "AssetPrice"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 760400,
               "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 760400
-            }
-          }, {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 28469376,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
-              },
-              "value" : 28469376
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "4930fd53"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d08"
-            },
-            "rateOption" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "IBM.N",
+                  "meta" : {
+                    "scheme" : "http://www.example.com/instrument-id-Reuters-RIC-1-0"
+                  }
+                },
+                "source" : "RIC",
+                "meta" : {
+                  "globalKey" : "8c98d20"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
               }
+            } ],
+            "meta" : {
+              "globalKey" : "106816e0"
             }
           },
+          "meta" : {
+            "globalKey" : "a9cecb0a"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
               },
-              "value" : 0.01,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+                  }
+                }
+              },
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "8280320a"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "d2ab49bd"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eca4a"
-      },
-      "value" : "2009-09-10"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "d04eb192",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "d04eb552",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "d04eb192",
+          "externalReference" : "party2"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "d04eb192",
+          "externalReference" : "party2"
+        } ]
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "DTCC00006441",
           "meta" : {
-            "scheme" : "http://www.partyA.com/tradeRefNbr"
-          },
-          "value" : "TW9236"
+            "scheme" : "DTCC"
+          }
+        },
+        "meta" : {
+          "globalKey" : "5d661eab"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "ed3b3be4"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "38e8ea8a"
+        "globalKey" : "d04eb552",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "DTCC00006440",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id-1-0"
-          },
-          "value" : "299442"
+            "scheme" : "DTCC"
+          }
+        },
+        "meta" : {
+          "globalKey" : "5d661eaa"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "ed3bb042"
+      "name" : {
+        "value" : "Party B"
       },
       "meta" : {
-        "globalKey" : "3a2297ac"
+        "globalKey" : "d04eb192",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2009-07-20",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2009EquityPanAsia"
+            },
+            "masterConfirmationAnnexType" : {
+              "value" : "ISDA2009ShareSwapPanAsia"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "c17018dc"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "c17018dc"
+      }
+    },
+    "collateral" : {
+      "independentAmount" : {
+        "payerPartyReference" : {
+          "globalReference" : "d04eb192",
+          "externalReference" : "party2"
+        },
+        "receiverPartyReference" : {
+          "globalReference" : "d04eb552",
+          "externalReference" : "party1"
+        },
+        "paymentDetail" : [ {
+          "paymentRule" : {
+            "percentageRule" : {
+              "paymentPercent" : 0.02,
+              "notionalAmountReference" : {
+                "globalReference" : "4cf",
+                "externalReference" : "equityNotionalAmount"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "a93dc25d"
+          }
+        } ]
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "77ba948d"
+    }
+  },
+  "meta" : {
+    "globalKey" : "77ba948d"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex19-european-interdealer-fair-value-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex19-european-interdealer-fair-value-share-swap-short-form.json
index f5b0483aec..ddcf5b5ffb 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex19-european-interdealer-fair-value-share-swap-short-form.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex19-european-interdealer-fair-value-share-swap-short-form.json
@@ -1,117 +1,49 @@
 {
-  "meta" : {
-    "globalKey" : "f6265e7d"
-  },
   "trade" : {
-    "collateral" : {
-      "independentAmount" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ed3bb042"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ed3b3be4"
-        },
-        "paymentDetail" : [ {
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "d04eb552",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "TW9236",
           "meta" : {
-            "globalKey" : "a93dc25d"
-          },
-          "paymentRule" : {
-            "percentageRule" : {
-              "notionalAmountReference" : {
-                "externalReference" : "equityNotionalAmount",
-                "globalReference" : "4cf"
-              },
-              "paymentPercent" : 0.02
-            }
-          }
-        } ]
-      }
-    },
-    "contractDetails" : {
-      "documentation" : [ {
-        "agreementDate" : "2009-07-20",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_CONFIRMATION",
-            "masterConfirmationAnnexType" : {
-              "value" : "ISDA_2010_FAIR_VALUE_SHARE_SWAP_EUROPEAN_INTERDEALER"
-            },
-            "masterConfirmationType" : {
-              "value" : "ISDA_2009_EQUITY_EUROPEAN_INTERDEALER"
-            }
+            "scheme" : "http://www.partyA.com/tradeRefNbr"
           }
-        },
-        "meta" : {
-          "globalKey" : "4dc1e52f"
         }
       } ],
       "meta" : {
-        "globalKey" : "4dc1e52f"
+        "globalKey" : "29b63a54"
       }
-    },
-    "meta" : {
-      "globalKey" : "f6265e7d"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "ed3b3be4"
-      },
-      "name" : {
-        "value" : "Party A"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "DTCC"
-          },
-          "value" : "DTCC00006441"
-        },
-        "meta" : {
-          "globalKey" : "5d661eab"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "ed3bb042"
-      },
-      "name" : {
-        "value" : "Party B"
+      "issuerReference" : {
+        "globalReference" : "d04eb192",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "299442",
           "meta" : {
-            "scheme" : "DTCC"
-          },
-          "value" : "DTCC00006440"
-        },
-        "meta" : {
-          "globalKey" : "5d661eaa"
+            "scheme" : "http://www.partyB.com/trade-id-1-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ee0b3014"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2010-09-10",
+      "meta" : {
+        "globalKey" : "3ed24a"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ed3bb042"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ed3b3be4"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleName"
@@ -124,6 +56,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2010-10-12",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -132,85 +65,118 @@
                 },
                 "meta" : {
                   "globalKey" : "ebf906c4"
+                }
+              },
+              "meta" : {
+                "globalKey" : "ebf906c4",
+                "externalKey" : "equityEffectiveDate"
+              }
+            },
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "ea96b216"
                 },
-                "unadjustedDate" : "2010-10-12"
+                "businessDayConvention" : "NONE",
+                "dateRelativeTo" : {
+                  "globalReference" : "7e0a5d94",
+                  "externalReference" : "finalCashSettlementPaymentDate"
+                }
               },
               "meta" : {
-                "externalKey" : "equityEffectiveDate",
-                "globalKey" : "ebf906c4"
+                "globalKey" : "ea96b216"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "equityNotionalAmount"
+                  },
                   "meta" : {
                     "globalKey" : "54b65ddd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "equityNotionalAmount",
-                    "globalReference" : "4cf"
+                  }
+                },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0",
+                      "externalKey" : "floatingRateCalculation"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/day-count-fraction"
                   }
                 },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "globalKey" : "49d4d2ac"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "49d4d2ac"
+                        "globalKey" : "46357da4"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
                       "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "equityEffectiveDate",
-                        "globalReference" : "ebf906c4"
+                        "globalReference" : "ebf906c4",
+                        "externalReference" : "equityEffectiveDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "46357da4"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalculationPeriodDates",
-                    "globalKey" : "2ffb1af2"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "globalKey" : "ee36071e"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "ee36071e"
+                        "globalKey" : "ea96b216"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
                       "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "finalCashSettlementPaymentDate",
-                        "globalReference" : "e9616632"
+                        "globalReference" : "7e0a5d94",
+                        "externalReference" : "finalCashSettlementPaymentDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "ea96b216"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/day-count-fraction"
                   },
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "a8379b74"
+                  "meta" : {
+                    "globalKey" : "adeb53f2",
+                    "externalKey" : "floatingCalculationPeriodDates"
+                  }
                 },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "c19bcdb6"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
                       "adjustableDates" : {
+                        "unadjustedDate" : [ "2010-10-12", "2010-11-13", "2010-12-12", "2011-01-14", "2011-02-12", "2011-03-12", "2011-04-12", "2011-05-13", "2011-06-02", "2011-07-12", "2011-08-12" ],
                         "dateAdjustments" : {
                           "businessDayConvention" : "NONE",
                           "meta" : {
@@ -219,466 +185,500 @@
                         },
                         "meta" : {
                           "globalKey" : "c19bcdb6"
-                        },
-                        "unadjustedDate" : [ "2010-10-12", "2010-11-13", "2010-12-12", "2011-01-14", "2011-02-12", "2011-03-12", "2011-04-12", "2011-05-13", "2011-06-02", "2011-07-12", "2011-08-12" ]
+                        }
                       },
                       "meta" : {
                         "globalKey" : "c19bcdb6"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "externalKey" : "floatingRateCalculation",
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "c19bcdb6"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalculationPeriodDates",
-                    "globalReference" : "2ffb1af2"
+                    "globalReference" : "adeb53f2",
+                    "externalReference" : "floatingCalculationPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "c446e854"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "e42a5b7c"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "f95f2dd5"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "equityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "equityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "14966"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "c1d00c61"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "CashSettlementPaymentDate",
-                    "globalKey" : "1b5a7a64"
-                  },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "externalKey" : "finalCashSettlementPaymentDate",
-                        "globalKey" : "e9616632"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "e9616632"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "equityValuationDates",
-                          "globalReference" : "46919729"
-                        }
-                      }
-                    },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "e9616632"
-                      },
-                      "relativeDates" : {
-                        "meta" : {
-                          "globalKey" : "e9616632"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "equityValuationDates",
-                          "globalReference" : "46919729"
-                        }
-                      }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendCurrency" : {
-                      "determinationMethod" : "SETTLEMENT_CURRENCY"
-                    },
-                    "dividendPayoutRatio" : [ {
-                      "cashRatio" : 2.5,
-                      "nonCashRatio" : 2.5,
-                      "totalRatio" : 0.85
-                    } ]
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
-                  }
-                },
-                "underlier" : {
                   "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
-                  "security" : {
-                    "productIdentifier" : [ {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-1"
-                      }
-                    } ],
-                    "securityType" : "EQUITY"
+                    "globalKey" : "14966"
                   }
                 },
                 "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "524b126b"
-                    }
-                  },
                   "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "externalKey" : "equityValuationDates",
-                      "globalKey" : "46919729"
-                    },
+                    "determinationMethod" : "ValuationTime",
                     "valuationDates" : {
-                      "meta" : {
-                        "globalKey" : "8c8a31f4"
-                      },
                       "periodicDates" : {
+                        "startDate" : {
+                          "adjustableDate" : {
+                            "unadjustedDate" : "2010-10-12",
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NotApplicable",
+                              "meta" : {
+                                "globalKey" : "3a4b88ab"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "261fe837"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "261fe837"
+                          }
+                        },
                         "endDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2011-08-12",
                             "dateAdjustments" : {
-                              "businessDayConvention" : "NOT_APPLICABLE",
+                              "businessDayConvention" : "NotApplicable",
                               "meta" : {
                                 "globalKey" : "3a4b88ab"
                               }
                             },
                             "meta" : {
                               "globalKey" : "263c0fb7"
-                            },
-                            "unadjustedDate" : "2011-08-12"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "263c0fb7"
                           }
                         },
+                        "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "17810"
+                          },
+                          "rollConvention" : "30"
+                        },
                         "periodDatesAdjustments" : {
+                          "businessDayConvention" : "PRECEDING",
                           "businessCenters" : {
                             "businessCenter" : [ {
+                              "value" : "USNY",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/coding-scheme/business-center"
-                              },
-                              "value" : "USNY"
+                              }
                             }, {
+                              "value" : "GBLO",
                               "meta" : {
                                 "scheme" : "http://www.fpml.org/coding-scheme/business-center"
-                              },
-                              "value" : "GBLO"
+                              }
                             } ],
                             "meta" : {
-                              "externalKey" : "businessCenters",
-                              "globalKey" : "4f5ffd5"
+                              "globalKey" : "4f5ffd5",
+                              "externalKey" : "businessCenters"
                             }
                           },
-                          "businessDayConvention" : "PRECEDING",
                           "meta" : {
                             "globalKey" : "7b765912"
                           }
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "c6311122"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "80387657",
+                      "externalKey" : "equityValuationDates"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "ValuationTime",
+                    "meta" : {
+                      "globalKey" : "524b126b"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
+                      "relativeDates" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "7e0a5d94"
                         },
-                        "periodFrequency" : {
-                          "meta" : {
-                            "globalKey" : "28c28"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "30"
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "NONE",
+                        "dateRelativeTo" : {
+                          "globalReference" : "80387657",
+                          "externalReference" : "equityValuationDates"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "7e0a5d94"
+                      }
+                    } ],
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "7e0a5d94"
                         },
-                        "startDate" : {
-                          "adjustableDate" : {
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NOT_APPLICABLE",
-                              "meta" : {
-                                "globalKey" : "3a4b88ab"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "261fe837"
-                            },
-                            "unadjustedDate" : "2010-10-12"
-                          },
-                          "meta" : {
-                            "globalKey" : "261fe837"
-                          }
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "NONE",
+                        "dateRelativeTo" : {
+                          "globalReference" : "80387657",
+                          "externalReference" : "equityValuationDates"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "7e0a5d94",
+                        "externalKey" : "finalCashSettlementPaymentDate"
+                      }
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "e5f7e728",
+                    "externalKey" : "CashSettlementPaymentDate"
+                  }
+                },
+                "underlier" : {
+                  "security" : {
+                    "productIdentifier" : [ {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-1"
                       }
+                    } ],
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
+                  }
+                },
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
+                  },
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 0.85,
+                      "cashRatio" : 2.5,
+                      "nonCashRatio" : 2.5
+                    } ],
+                    "dividendCurrency" : {
+                      "determinationMethod" : "SettlementCurrency"
                     }
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "meta" : {
-                "globalKey" : "ee36071e"
-              },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "ee36071e"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NONE",
-                "dateRelativeTo" : {
-                  "externalReference" : "finalCashSettlementPaymentDate",
-                  "globalReference" : "e9616632"
+                "meta" : {
+                  "globalKey" : "dccfc381"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "2d7e20fd"
               }
             },
             "terminationProvision" : {
               "earlyTerminationProvision" : {
-                "meta" : {
-                  "globalKey" : "4cf"
-                },
                 "optionalEarlyTermination" : {
                   "mutualEarlyTermination" : true
+                },
+                "meta" : {
+                  "globalKey" : "4cf"
                 }
               }
             }
           },
           "meta" : {
-            "globalKey" : "eb658050"
+            "globalKey" : "9591824e"
           }
         },
         "meta" : {
-          "globalKey" : "eb658050"
+          "globalKey" : "9591824e"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "42842d0a"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "8c98d20"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.example.com/instrument-id-Reuters-RIC-1-0"
-                  },
-                  "value" : "IBM.N"
-                },
-                "meta" : {
-                  "globalKey" : "8c98d20"
-                },
-                "source" : "RIC"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 37.44,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
               },
-              "value" : 37.44,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "AssetPrice"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 760400,
               "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 760400
-            }
-          }, {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 28469376,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
-              },
-              "value" : 28469376
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "4930fd53"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d08"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
+            "productIdentifier" : [ {
               "value" : {
-                "floatingRateIndex" : {
+                "identifier" : {
+                  "value" : "IBM.N",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
-                  },
-                  "value" : "USD-LIBOR-BBA"
+                    "scheme" : "http://www.example.com/instrument-id-Reuters-RIC-1-0"
+                  }
                 },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
+                "source" : "RIC",
+                "meta" : {
+                  "globalKey" : "8c98d20"
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "106816e0"
             }
           },
+          "meta" : {
+            "globalKey" : "a9cecb0a"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
               },
-              "value" : 0.01,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
+                  "value" : "USD",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "USD"
+                  }
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
             }
-          } ]
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/floating-rate-index"
+                  }
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "8280320a"
+            }
+          },
+          "meta" : {
+            "globalKey" : "d2ab49bd"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ed24a"
-      },
-      "value" : "2010-09-10"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "d04eb192",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "d04eb552",
+          "externalReference" : "party1"
+        }
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "DTCC00006441",
           "meta" : {
-            "scheme" : "http://www.partyA.com/tradeRefNbr"
-          },
-          "value" : "TW9236"
+            "scheme" : "DTCC"
+          }
+        },
+        "meta" : {
+          "globalKey" : "5d661eab"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "ed3b3be4"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "38e8ea8a"
+        "globalKey" : "d04eb552",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "DTCC00006440",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id-1-0"
-          },
-          "value" : "299442"
+            "scheme" : "DTCC"
+          }
+        },
+        "meta" : {
+          "globalKey" : "5d661eaa"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "ed3bb042"
+      "name" : {
+        "value" : "Party B"
       },
       "meta" : {
-        "globalKey" : "3a2297ac"
+        "globalKey" : "d04eb192",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "agreementDate" : "2009-07-20",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterConfirmation",
+            "masterConfirmationType" : {
+              "value" : "ISDA2009EquityEuropeanInterdealer"
+            },
+            "masterConfirmationAnnexType" : {
+              "value" : "ISDA2010FairValueShareSwapEuropeanInterdealer"
+            }
+          }
+        },
+        "meta" : {
+          "globalKey" : "a73b3def"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "a73b3def"
+      }
+    },
+    "collateral" : {
+      "independentAmount" : {
+        "payerPartyReference" : {
+          "globalReference" : "d04eb192",
+          "externalReference" : "party2"
+        },
+        "receiverPartyReference" : {
+          "globalReference" : "d04eb552",
+          "externalReference" : "party1"
+        },
+        "paymentDetail" : [ {
+          "paymentRule" : {
+            "percentageRule" : {
+              "paymentPercent" : 0.02,
+              "notionalAmountReference" : {
+                "globalReference" : "4cf",
+                "externalReference" : "equityNotionalAmount"
+              }
+            }
+          },
+          "meta" : {
+            "globalKey" : "a93dc25d"
+          }
+        } ]
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "b94fa407"
+    }
+  },
+  "meta" : {
+    "globalKey" : "b94fa407"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/trs-ex02-single-equity.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/trs-ex02-single-equity.json
index fc7fc08958..fae4634495 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/trs-ex02-single-equity.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/trs-ex02-single-equity.json
@@ -1,136 +1,56 @@
 {
-  "meta" : {
-    "externalKey" : "trs-eq1-trade",
-    "globalKey" : "c4e54859"
-  },
   "trade" : {
-    "collateral" : {
-      "independentAmount" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "770069bd"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1fd0ecfd"
-        },
-        "paymentDetail" : [ {
-          "meta" : {
-            "globalKey" : "2491af2"
-          },
-          "paymentAmount" : {
-            "unit" : {
-              "currency" : {
-                "value" : "USD"
-              }
-            },
-            "value" : 1000,
-            "meta" : {
-              "globalKey" : "74b578a7"
-            }
-          },
-          "paymentDate" : {
-            "adjustableDate" : {
-              "dateAdjustments" : {
-                "businessDayConvention" : "NONE",
-                "meta" : {
-                  "globalKey" : "24a738"
-                }
-              },
-              "meta" : {
-                "globalKey" : "eb5a4339"
-              },
-              "unadjustedDate" : "2005-01-01"
-            },
-            "meta" : {
-              "globalKey" : "eb5a4339"
-            }
-          }
-        } ]
-      }
-    },
-    "meta" : {
-      "globalKey" : "c4e54859"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "1fd0ecfd"
-      },
-      "name" : {
-        "value" : "ABCD Securities Inc."
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "63f6d8bd",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "TRS-01",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "QGPGHQ1ENZOOLJRFTH41"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "f54dfc9"
+            "scheme" : "http://www.abc.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "770069bd"
-      },
-      "name" : {
-        "value" : "HedgeCo Capital L.L.C."
+        "globalKey" : "297b834e"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "51e656fd",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "total-ret-swap-01",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "J6W9XJWVE853A9CVRQ85"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e4c8d6a7"
+            "scheme" : "http://www.hedgeco.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "eb1954ba"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2004-10-10",
+      "meta" : {
+        "globalKey" : "3ea28a",
+        "externalKey" : "trs-eq1-TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "EXECUTION",
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1fd0ecfd"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "1fd0ecfd"
-        } ],
-        "role" : "EXTRAORDINARY_DIVIDENDS_PARTY"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "770069bd"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "1fd0ecfd"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "TotalReturnSwap",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-type-simple"
-                },
-                "value" : "TotalReturnSwap"
+                }
               }
             }
           }, {
@@ -140,6 +60,7 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2004-10-12",
                 "dateAdjustments" : {
                   "businessDayConvention" : "NONE",
                   "meta" : {
@@ -148,63 +69,76 @@
                 },
                 "meta" : {
                   "globalKey" : "eb44d6c4"
-                },
-                "unadjustedDate" : "2004-10-12"
+                }
               },
               "meta" : {
-                "externalKey" : "trs-eq1-EffectiveDate",
-                "globalKey" : "eb44d6c4"
+                "globalKey" : "eb44d6c4",
+                "externalKey" : "trs-eq1-EffectiveDate"
               }
             },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2006-10-12",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NONE",
+                  "meta" : {
+                    "globalKey" : "24a738"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eb80e6c4"
+                }
               },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
+              "meta" : {
+                "globalKey" : "eb80e6c4",
+                "externalKey" : "trs-eq1-TerminationDate"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2004-10-12",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -213,19 +147,15 @@
                       },
                       "meta" : {
                         "globalKey" : "eb44d6c4"
-                      },
-                      "unadjustedDate" : "2004-10-12"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eb44d6c4"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "trs-eq1-InterestLegPeriodDates",
-                    "globalKey" : "e60b9a80"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2004-10-12",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -234,28 +164,24 @@
                       },
                       "meta" : {
                         "globalKey" : "eb44d6c4"
-                      },
-                      "unadjustedDate" : "2004-10-12"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eb44d6c4"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "e60b9a80",
+                    "externalKey" : "trs-eq1-InterestLegPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "c635cece"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "f937d1c4"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
                       "adjustableDates" : {
+                        "unadjustedDate" : [ "2004-10-12", "2005-10-12", "2006-10-12" ],
                         "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -266,124 +192,121 @@
                               "globalKey" : "4158421"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "da3b6050"
                           }
                         },
                         "meta" : {
                           "globalKey" : "f937d1c4"
-                        },
-                        "unadjustedDate" : [ "2004-10-12", "2005-10-12", "2006-10-12" ]
+                        }
                       },
                       "meta" : {
                         "globalKey" : "f937d1c4"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "f937d1c4"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "trs-eq1-InterestLegPeriodDates",
-                    "globalReference" : "e60b9a80"
+                    "globalReference" : "e60b9a80",
+                    "externalReference" : "trs-eq1-InterestLegPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "eea6b313"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "66ebf9d6"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "c0b20f84"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "trs-eq1-EquityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "trs-eq1-EquityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "14966"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
+                  },
+                  "meta" : {
+                    "globalKey" : "14966"
                   }
                 },
-                "meta" : {
-                  "externalKey" : "trs-eq1-equityLeg",
-                  "globalKey" : "30678192"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "trs-eq1-EquityPaymentDate",
-                    "globalKey" : "cd084ac4"
-                  },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "adjustableDate" : {
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "adjustableDates" : {
+                        "unadjustedDate" : [ "2004-10-12", "2004-11-13", "2004-12-12", "2005-01-14", "2005-02-12", "2005-03-12", "2005-04-12", "2005-05-13", "2005-06-12", "2005-07-12", "2005-08-12" ],
                         "dateAdjustments" : {
-                          "businessCenters" : {
-                            "businessCenter" : [ {
-                              "value" : "EUTA"
-                            }, {
-                              "value" : "GBLO"
-                            } ],
-                            "meta" : {
-                              "globalKey" : "4158421"
-                            }
-                          },
-                          "businessDayConvention" : "FOLLOWING",
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
-                            "globalKey" : "da3b6050"
+                            "globalKey" : "3a4b88ab"
                           }
                         },
                         "meta" : {
-                          "globalKey" : "e8575202"
-                        },
-                        "unadjustedDate" : "2006-10-14"
+                          "globalKey" : "99796a33"
+                        }
                       },
                       "meta" : {
-                        "externalKey" : "trs-eq1-FinalEquityPaymentDate",
-                        "globalKey" : "e8575202"
+                        "globalKey" : "99796a33",
+                        "externalKey" : "trs-eq1-InterimValuationDate"
                       }
                     },
-                    "interimPaymentDates" : [ {
-                      "adjustableDates" : {
+                    "valuationTimeType" : "Close",
+                    "meta" : {
+                      "globalKey" : "e8b8f5c6"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2005-09-24",
                         "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "2588fd03"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "2588fd03",
+                        "externalKey" : "trs-eq1-FinalValuationDate"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "97547e85"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
+                      "adjustableDates" : {
+                        "unadjustedDate" : [ "2004-10-14", "2005-10-14", "2006-10-14" ],
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -394,64 +317,54 @@
                               "globalKey" : "4158421"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "da3b6050"
                           }
                         },
                         "meta" : {
                           "globalKey" : "da15ebc2"
-                        },
-                        "unadjustedDate" : [ "2004-10-14", "2005-10-14", "2006-10-14" ]
+                        }
                       },
                       "meta" : {
-                        "externalKey" : "trs-eq1-InterimEquityPaymentDate",
-                        "globalKey" : "da15ebc2"
+                        "globalKey" : "da15ebc2",
+                        "externalKey" : "trs-eq1-InterimEquityPaymentDate"
                       }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendAmountType" : "RECORD_AMOUNT",
-                    "dividendCurrency" : {
-                      "determinationMethod" : "DIVIDEND_CURRENCY"
-                    },
-                    "dividendEntitlement" : "EX_DATE",
-                    "dividendPayoutRatio" : [ {
-                      "totalRatio" : 0.85
                     } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "EQUITY_PAYMENT_DATE"
-                        }
-                      },
-                      "endDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "trs-eq1-TerminationDate",
-                          "globalReference" : "eb80e6c4"
+                    "finalPaymentDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2006-10-14",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
+                          "businessCenters" : {
+                            "businessCenter" : [ {
+                              "value" : "EUTA"
+                            }, {
+                              "value" : "GBLO"
+                            } ],
+                            "meta" : {
+                              "globalKey" : "4158421"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "da3b6050"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "e8575202"
                         }
                       },
-                      "startDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "trs-eq1-TradeDate",
-                          "globalReference" : "3ea28a"
-                        }
+                      "meta" : {
+                        "globalKey" : "e8575202",
+                        "externalKey" : "trs-eq1-FinalEquityPaymentDate"
                       }
-                    } ],
-                    "dividendReinvestment" : false,
-                    "excessDividendAmount" : "RECORD_AMOUNT",
-                    "extraordinaryDividendsParty" : "EXTRAORDINARY_DIVIDENDS_PARTY"
+                    }
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                  "meta" : {
+                    "globalKey" : "b192f344",
+                    "externalKey" : "trs-eq1-EquityPaymentDate"
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -464,284 +377,371 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
-                    "meta" : {
-                      "globalKey" : "97547e85"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "2588fd03"
-                        },
-                        "unadjustedDate" : "2005-09-24"
-                      },
-                      "meta" : {
-                        "externalKey" : "trs-eq1-FinalValuationDate",
-                        "globalKey" : "2588fd03"
-                      }
-                    }
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
                   },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "e8b8f5c6"
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 0.85
+                    } ],
+                    "dividendReinvestment" : false,
+                    "dividendEntitlement" : "ExDate",
+                    "dividendAmountType" : "RecordAmount",
+                    "extraordinaryDividendsParty" : "ExtraordinaryDividendsParty",
+                    "excessDividendAmount" : "RecordAmount",
+                    "dividendCurrency" : {
+                      "determinationMethod" : "DividendCurrency"
                     },
-                    "valuationDates" : {
-                      "adjustableDates" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "99796a33"
-                        },
-                        "unadjustedDate" : [ "2004-10-12", "2004-11-13", "2004-12-12", "2005-01-14", "2005-02-12", "2005-03-12", "2005-04-12", "2005-05-13", "2005-06-12", "2005-07-12", "2005-08-12" ]
+                    "dividendPeriod" : [ {
+                      "startDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "3ea28a",
+                          "externalReference" : "trs-eq1-TradeDate"
+                        }
                       },
-                      "meta" : {
-                        "externalKey" : "trs-eq1-InterimValuationDate",
-                        "globalKey" : "99796a33"
+                      "endDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "eb80e6c4",
+                          "externalReference" : "trs-eq1-TerminationDate"
+                        }
+                      },
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "EquityPaymentDate"
+                        }
                       }
-                    },
-                    "valuationTimeType" : "CLOSE"
-                  }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NONE",
-                  "meta" : {
-                    "globalKey" : "24a738"
+                    } ]
                   }
                 },
                 "meta" : {
-                  "globalKey" : "eb80e6c4"
-                },
-                "unadjustedDate" : "2006-10-12"
-              },
+                  "globalKey" : "4e810460",
+                  "externalKey" : "trs-eq1-equityLeg"
+                }
+              } ],
               "meta" : {
-                "externalKey" : "trs-eq1-TerminationDate",
-                "globalKey" : "eb80e6c4"
+                "globalKey" : "df105c4a"
               }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
             }
           },
           "meta" : {
-            "globalKey" : "7a2712b1"
+            "globalKey" : "81470987"
           }
         },
         "meta" : {
-          "globalKey" : "7a2712b1"
+          "globalKey" : "81470987"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "ba98e23"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5fc33427"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-CUSIP"
-                  },
-                  "value" : "SHPGY.O"
-                },
-                "meta" : {
-                  "globalKey" : "140c7e76"
-                },
-                "source" : "CUSIP"
-              }
-            }, {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
-                },
-                "meta" : {
-                  "globalKey" : "5518dd"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 37.44,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 37.44,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "AssetPrice"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 760400,
               "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 760400
-            }
-          }, {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 28469376,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 28469376
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "bd42f96b"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d03"
-            },
-            "rateOption" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "SHPGY.O",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-CUSIP"
+                  }
+                },
+                "source" : "CUSIP",
+                "meta" : {
+                  "globalKey" : "140c7e76"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-LIBOR-BBA"
+                "identifier" : {
+                  "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
                 },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 1
+                "source" : "Name",
+                "meta" : {
+                  "globalKey" : "5518dd"
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "98a350b9"
             }
           },
+          "meta" : {
+            "globalKey" : "9cf8bd63"
+          }
+        }, {
           "price" : [ {
+            "value" : {
+              "value" : 0.0020,
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "price-2"
               } ]
-            },
-            "value" : {
-              "value" : 0.0020,
-              "arithmeticOperator" : "ADD",
-              "priceType" : "INTEREST_RATE"
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 19785157.16,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-3"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 1,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
                 }
               },
-              "value" : 19785157.16
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "82801f45"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "896bf87b"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "trs-eq1-TradeDate",
-        "globalKey" : "3ea28a"
-      },
-      "value" : "2004-10-10"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "51e656fd",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "63f6d8bd",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "63f6d8bd",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "ExtraordinaryDividendsParty",
+        "partyReference" : [ {
+          "globalReference" : "63f6d8bd",
+          "externalReference" : "party1"
+        } ]
+      } ],
+      "adjustment" : "Execution"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "QGPGHQ1ENZOOLJRFTH41",
           "meta" : {
-            "scheme" : "http://www.abc.com/swaps/trade-id"
-          },
-          "value" : "TRS-01"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "f54dfc9"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "1fd0ecfd"
+      "name" : {
+        "value" : "ABCD Securities Inc."
       },
       "meta" : {
-        "globalKey" : "5c7fdd04"
+        "globalKey" : "63f6d8bd",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "J6W9XJWVE853A9CVRQ85",
           "meta" : {
-            "scheme" : "http://www.hedgeco.com/swaps/trade-id"
-          },
-          "value" : "total-ret-swap-01"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e4c8d6a7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "770069bd"
+      "name" : {
+        "value" : "HedgeCo Capital L.L.C."
       },
       "meta" : {
-        "globalKey" : "2c3a2ad2"
+        "globalKey" : "51e656fd",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "collateral" : {
+      "independentAmount" : {
+        "payerPartyReference" : {
+          "globalReference" : "51e656fd",
+          "externalReference" : "party2"
+        },
+        "receiverPartyReference" : {
+          "globalReference" : "63f6d8bd",
+          "externalReference" : "party1"
+        },
+        "paymentDetail" : [ {
+          "paymentDate" : {
+            "adjustableDate" : {
+              "unadjustedDate" : "2005-01-01",
+              "dateAdjustments" : {
+                "businessDayConvention" : "NONE",
+                "meta" : {
+                  "globalKey" : "24a738"
+                }
+              },
+              "meta" : {
+                "globalKey" : "eb5a4339"
+              }
+            },
+            "meta" : {
+              "globalKey" : "eb5a4339"
+            }
+          },
+          "paymentAmount" : {
+            "value" : 1000,
+            "unit" : {
+              "currency" : {
+                "value" : "USD"
+              }
+            },
+            "meta" : {
+              "globalKey" : "74b578a7"
+            }
+          },
+          "meta" : {
+            "globalKey" : "4791510e"
+          }
+        } ]
+      }
+    },
+    "meta" : {
+      "globalKey" : "1db7ae61"
+    }
+  },
+  "meta" : {
+    "globalKey" : "1db7ae61",
+    "externalKey" : "trs-eq1-trade"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/trs-ex03-single-stock-execution-swap-with-fixing-and-dividend-payment-dates.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/trs-ex03-single-stock-execution-swap-with-fixing-and-dividend-payment-dates.json
index c738c22235..2a3fdcde05 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/trs-ex03-single-stock-execution-swap-with-fixing-and-dividend-payment-dates.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/trs-ex03-single-stock-execution-swap-with-fixing-and-dividend-payment-dates.json
@@ -1,118 +1,50 @@
 {
-  "meta" : {
-    "globalKey" : "49c8df49"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
-          },
-          "vintage" : 2002
-        },
-        "meta" : {
-          "globalKey" : "328cfa59"
-        }
-      }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2000"
-            }, {
-              "value" : "ISDA_2002_EQUITY"
-            } ]
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "6234",
+          "meta" : {
+            "scheme" : "http://www.partyA.com/eqs-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "governingLaw" : {
-        "value" : "GBEN"
-      },
       "meta" : {
-        "globalKey" : "92c7c587"
+        "globalKey" : "9593cc32"
       }
-    },
-    "meta" : {
-      "globalKey" : "49c8df49"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
-        }
-      } ]
     }, {
-      "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "6569",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/eqs-trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "95944c36"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-09-24",
+      "meta" : {
+        "globalKey" : "3e8a58",
+        "externalKey" : "TradeDate"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "EXECUTION",
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "DISRUPTION_EVENTS_DETERMINING_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "EXTRAORDINARY_DIVIDENDS_PARTY"
-      }, {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleName"
@@ -123,308 +55,300 @@
             "productQualifier" : "EquitySwap_TotalReturnBasicPerformance_SingleName"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "effectiveDate" : {
-              "meta" : {
-                "externalKey" : "EffectiveDate",
-                "globalKey" : "6a2df5e0"
-              },
               "relativeDate" : {
+                "periodMultiplier" : 3,
+                "period" : "D",
                 "meta" : {
-                  "globalKey" : "6a2df5e0"
+                  "globalKey" : "fed6ed42"
                 },
-                "period" : "D",
-                "periodMultiplier" : 3,
-                "dayType" : "EXCHANGE_BUSINESS",
-                "businessDayConvention" : "NOT_APPLICABLE",
+                "dayType" : "ExchangeBusiness",
+                "businessDayConvention" : "NotApplicable",
                 "dateRelativeTo" : {
-                  "externalReference" : "TradeDate",
-                  "globalReference" : "3e8a58"
+                  "globalReference" : "3e8a58",
+                  "externalReference" : "TradeDate"
                 }
+              },
+              "meta" : {
+                "globalKey" : "fed6ed42",
+                "externalKey" : "EffectiveDate"
               }
             },
-            "extraordinaryEvents" : {
-              "additionalDisruptionEvents" : {
-                "changeInLaw" : true,
-                "determiningParty" : "DISRUPTION_EVENTS_DETERMINING_PARTY",
-                "failureToDeliver" : true,
-                "hedgingDisruption" : true,
-                "increasedCostOfHedging" : false,
-                "increasedCostOfStockBorrow" : false,
-                "insolvencyFiling" : false,
-                "lossOfStockBorrow" : true
-              },
-              "compositionOfCombinedConsideration" : true,
-              "mergerEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
-              },
-              "nationalizationOrInsolvency" : "CANCELLATION_AND_PAYMENT",
-              "representations" : {
-                "additionalAcknowledgements" : true,
-                "agreementsRegardingHedging" : true,
-                "nonReliance" : true
+            "terminationDate" : {
+              "relativeDate" : {
+                "periodMultiplier" : 0,
+                "period" : "D",
+                "meta" : {
+                  "globalKey" : "edf02740"
+                },
+                "businessDayConvention" : "NotApplicable",
+                "dateRelativeTo" : {
+                  "globalReference" : "bb917ef4",
+                  "externalReference" : "FinalEquityPaymentDate"
+                }
               },
-              "tenderOfferEvents" : {
-                "shareForCombined" : "MODIFIED_CALCULATION_AGENT",
-                "shareForOther" : "MODIFIED_CALCULATION_AGENT",
-                "shareForShare" : "MODIFIED_CALCULATION_AGENT"
+              "meta" : {
+                "globalKey" : "edf02740",
+                "externalKey" : "TerminationDate"
               }
             },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "4cf",
+                    "externalReference" : "EquityNotionalAmount"
+                  },
                   "meta" : {
                     "globalKey" : "607b91fd"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "EquityNotionalAmount",
-                    "globalReference" : "4cf"
                   }
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "globalKey" : "6a2df5e0"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 3,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "6a2df5e0"
+                        "globalKey" : "fed6ed42"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 3,
-                      "dayType" : "EXCHANGE_BUSINESS",
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "dayType" : "ExchangeBusiness",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "TradeDate",
-                        "globalReference" : "3e8a58"
+                        "globalReference" : "3e8a58",
+                        "externalReference" : "TradeDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "fed6ed42"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "InterestLegPeriodDates",
-                    "globalKey" : "8fbb2a68"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "globalKey" : "f18f7c48"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "f18f7c48"
+                        "globalKey" : "edf02740"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "FinalEquityPaymentDate",
-                        "globalReference" : "ad48d812"
+                        "globalReference" : "bb917ef4",
+                        "externalReference" : "FinalEquityPaymentDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "edf02740"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f0f22bbe",
+                    "externalKey" : "InterestLegPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "f5120739"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "InterestLegPaymentDates",
-                    "globalKey" : "9b9d36de"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "9b9d36de"
-                      },
                       "relativeDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "9b9d36de"
+                          "globalKey" : "97fde1d6"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "dateRelativeTo" : {
-                          "externalReference" : "EquityPaymentDate",
-                          "globalReference" : "48d79a64"
+                          "globalReference" : "56b8bd08",
+                          "externalReference" : "EquityPaymentDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "97fde1d6"
                       }
                     } ]
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
-                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "97fde1d6",
+                    "externalKey" : "InterestLegPaymentDates"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "InterestLegPeriodDates",
-                    "globalReference" : "8fbb2a68"
+                    "globalReference" : "f0f22bbe",
+                    "externalReference" : "InterestLegPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "9e9ada33"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "92fd2d87"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "ffde871d"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "EquityNotionalAmount",
-                    "globalKey" : "4cf"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
                   },
-                  "reset" : true
+                  "reset" : true,
+                  "meta" : {
+                    "globalKey" : "4cf",
+                    "externalKey" : "EquityNotionalAmount"
+                  }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "7610bbd9"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
-                  "settlementType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "6d299e64"
-                },
-                "paymentDates" : {
                   "meta" : {
-                    "externalKey" : "EquityPaymentDate",
-                    "globalKey" : "48d79a64"
-                  },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "externalKey" : "FinalEquityPaymentDate",
-                        "globalKey" : "ad48d812"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "ad48d812"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessCentersReference" : {
-                          "externalReference" : "PrimaryBusinessCenter",
-                          "globalReference" : "27e4e9"
+                    "globalKey" : "7610bbd9"
+                  }
+                },
+                "valuationDates" : {
+                  "valuationDatesInterim" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDates" : {
+                      "adjustableDates" : {
+                        "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ],
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
                         },
-                        "businessDayConvention" : "FOLLOWING",
-                        "dateRelativeTo" : {
-                          "externalReference" : "FinalValuationDate",
-                          "globalReference" : "252ee503"
+                        "meta" : {
+                          "globalKey" : "e80e5233"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "e80e5233",
+                        "externalKey" : "InterimValuationDate"
                       }
                     },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "externalKey" : "InterimEquityPaymentDate",
-                        "globalKey" : "2519d1b6"
-                      },
-                      "relativeDates" : {
-                        "meta" : {
-                          "globalKey" : "2519d1b6"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "CURRENCY_BUSINESS",
-                        "businessCenters" : {
+                    "valuationTimeType" : "Close",
+                    "meta" : {
+                      "globalKey" : "374dddc6"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "HedgeExecution",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2002-09-24",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
+                          "meta" : {
+                            "globalKey" : "3a4b88ab"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "252ee503"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "252ee503",
+                        "externalKey" : "FinalValuationDate"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "96fa6685"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
+                      "relativeDates" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "dfe60714"
+                        },
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
+                        "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "PrimaryBusinessCenter",
-                            "globalKey" : "27e4e9"
+                            "globalKey" : "27e4e9",
+                            "externalKey" : "PrimaryBusinessCenter"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "dateRelativeTo" : {
-                          "externalReference" : "InterimValuationDate",
-                          "globalReference" : "e80e5233"
+                          "globalReference" : "e80e5233",
+                          "externalReference" : "InterimValuationDate"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "dfe60714",
+                        "externalKey" : "InterimEquityPaymentDate"
                       }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "dividendReturnTerms" : {
-                    "dividendCurrency" : {
-                      "determinationMethod" : "DIVIDEND_CURRENCY"
-                    },
-                    "dividendEntitlement" : "EX_DATE",
-                    "dividendPayoutRatio" : [ {
-                      "totalRatio" : 1
                     } ],
-                    "dividendPeriod" : [ {
-                      "dividendPaymentDate" : {
-                        "dividendDateReference" : {
-                          "dateReference" : "SHARE_PAYMENT"
-                        }
-                      },
-                      "endDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "TerminationDate",
-                          "globalReference" : "f18f7c48"
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "bb917ef4"
+                        },
+                        "dayType" : "CurrencyBusiness",
+                        "businessDayConvention" : "FOLLOWING",
+                        "businessCentersReference" : {
+                          "globalReference" : "27e4e9",
+                          "externalReference" : "PrimaryBusinessCenter"
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "252ee503",
+                          "externalReference" : "FinalValuationDate"
                         }
                       },
-                      "startDate" : {
-                        "dividendDate" : {
-                          "externalReference" : "TradeDate",
-                          "globalReference" : "3e8a58"
-                        }
+                      "meta" : {
+                        "globalKey" : "bb917ef4",
+                        "externalKey" : "FinalEquityPaymentDate"
                       }
-                    } ],
-                    "dividendReinvestment" : false,
-                    "excessDividendAmount" : "RECORD_AMOUNT",
-                    "extraordinaryDividendsParty" : "EXTRAORDINARY_DIVIDENDS_PARTY"
+                    }
                   },
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
+                  "meta" : {
+                    "globalKey" : "56b8bd08",
+                    "externalKey" : "EquityPaymentDate"
                   }
                 },
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "7a5b92c5"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -437,278 +361,354 @@
                         "value" : "productIdentifier-2"
                       }
                     } ],
-                    "securityType" : "EQUITY"
+                    "securityType" : "Equity"
+                  },
+                  "meta" : {
+                    "globalKey" : "7a5b92c5"
                   }
                 },
-                "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "HEDGE_EXECUTION",
-                    "meta" : {
-                      "globalKey" : "96fa6685"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "252ee503"
-                        },
-                        "unadjustedDate" : "2002-09-24"
-                      },
-                      "meta" : {
-                        "externalKey" : "FinalValuationDate",
-                        "globalKey" : "252ee503"
-                      }
-                    }
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
                   },
-                  "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "374dddc6"
+                  "dividendReturnTerms" : {
+                    "dividendPayoutRatio" : [ {
+                      "totalRatio" : 1
+                    } ],
+                    "dividendReinvestment" : false,
+                    "dividendEntitlement" : "ExDate",
+                    "extraordinaryDividendsParty" : "ExtraordinaryDividendsParty",
+                    "excessDividendAmount" : "RecordAmount",
+                    "dividendCurrency" : {
+                      "determinationMethod" : "DividendCurrency"
                     },
-                    "valuationDates" : {
-                      "adjustableDates" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "e80e5233"
-                        },
-                        "unadjustedDate" : [ "2001-10-12", "2001-11-13", "2001-12-12", "2002-01-14", "2002-02-12", "2002-03-12", "2002-04-12", "2002-05-13", "2002-06-12", "2002-07-12", "2002-08-12" ]
+                    "dividendPeriod" : [ {
+                      "startDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "3e8a58",
+                          "externalReference" : "TradeDate"
+                        }
                       },
-                      "meta" : {
-                        "externalKey" : "InterimValuationDate",
-                        "globalKey" : "e80e5233"
+                      "endDate" : {
+                        "dividendDate" : {
+                          "globalReference" : "edf02740",
+                          "externalReference" : "TerminationDate"
+                        }
+                      },
+                      "dividendPaymentDate" : {
+                        "dividendDateReference" : {
+                          "dateReference" : "SharePayment"
+                        }
                       }
-                    },
-                    "valuationTimeType" : "CLOSE"
+                    } ]
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "meta" : {
-                "externalKey" : "TerminationDate",
-                "globalKey" : "f18f7c48"
-              },
-              "relativeDate" : {
-                "meta" : {
-                  "globalKey" : "f18f7c48"
                 },
-                "period" : "D",
-                "periodMultiplier" : 0,
-                "businessDayConvention" : "NOT_APPLICABLE",
-                "dateRelativeTo" : {
-                  "externalReference" : "FinalEquityPaymentDate",
-                  "globalReference" : "ad48d812"
+                "meta" : {
+                  "globalKey" : "e17fa224"
                 }
+              } ],
+              "meta" : {
+                "globalKey" : "38ea0e2b"
               }
+            },
+            "extraordinaryEvents" : {
+              "mergerEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "tenderOfferEvents" : {
+                "shareForShare" : "ModifiedCalculationAgent",
+                "shareForOther" : "ModifiedCalculationAgent",
+                "shareForCombined" : "ModifiedCalculationAgent"
+              },
+              "compositionOfCombinedConsideration" : true,
+              "additionalDisruptionEvents" : {
+                "changeInLaw" : true,
+                "failureToDeliver" : true,
+                "insolvencyFiling" : false,
+                "hedgingDisruption" : true,
+                "increasedCostOfHedging" : false,
+                "lossOfStockBorrow" : true,
+                "increasedCostOfStockBorrow" : false,
+                "determiningParty" : "DisruptionEventsDeterminingParty"
+              },
+              "representations" : {
+                "nonReliance" : true,
+                "agreementsRegardingHedging" : true,
+                "additionalAcknowledgements" : true
+              },
+              "nationalizationOrInsolvency" : "CancellationAndPayment"
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "2ad30fdf"
+            "globalKey" : "92515ad"
           }
         },
         "meta" : {
-          "globalKey" : "2ad30fdf"
+          "globalKey" : "92515ad"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "417e440b"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "26bb033f"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/schemes/4-1/instrumentId"
-                  },
-                  "value" : "SHPGY.O"
-                },
-                "meta" : {
-                  "globalKey" : "8c85a05e"
-                },
-                "source" : "OTHER"
-              }
-            }, {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
-                },
-                "meta" : {
-                  "globalKey" : "5518dd"
-                },
-                "source" : "NAME"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 37.44,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 37.44,
               "perUnitOf" : {
-                "financialUnit" : "SHARE"
+                "financialUnit" : "Share"
               },
-              "priceType" : "ASSET_PRICE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "AssetPrice"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 760400,
               "unit" : {
-                "financialUnit" : "SHARE"
-              },
-              "value" : 760400
-            }
-          }, {
+                "financialUnit" : "Share"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 28469376,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 28469376
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "7dd9ec3"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d03"
-            },
-            "rateOption" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "SHPGY.O",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/schemes/4-1/instrumentId"
+                  }
+                },
+                "source" : "Other",
+                "meta" : {
+                  "globalKey" : "8c85a05e"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-LIBOR-BBA"
+                "identifier" : {
+                  "value" : "Shire Pharmeceuticals Group - American Depositary Receipts"
                 },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 1
+                "source" : "Name",
+                "meta" : {
+                  "globalKey" : "5518dd"
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "b0a564a1"
             }
           },
+          "meta" : {
+            "globalKey" : "b4fad14b"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
             "value" : {
+              "value" : 0.0020,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0020,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 1,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "82801f45"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "95c8caad"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "TradeDate",
-        "globalKey" : "3e8a58"
-      },
-      "value" : "2001-09-24"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "DisruptionEventsDeterminingParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "ExtraordinaryDividendsParty",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      }, {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        } ]
+      } ],
+      "adjustment" : "Execution"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/eqs-trade-id"
-          },
-          "value" : "6234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "23a97ce8"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/eqs-trade-id"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
           },
-          "value" : "6569"
+          "vintage" : 2002
+        },
+        "meta" : {
+          "globalKey" : "328cfa59"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2000"
+            }, {
+              "value" : "ISDA2002Equity"
+            } ]
+          }
+        },
+        "meta" : {
+          "globalKey" : "ed9ef3fc"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
+      "governingLaw" : {
+        "value" : "GBEN"
       },
       "meta" : {
-        "globalKey" : "23d5334e"
+        "globalKey" : "92c7c587"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "72b93b4f"
+    }
+  },
+  "meta" : {
+    "globalKey" : "72b93b4f"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/trs-ex04-index-ios.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/trs-ex04-index-ios.json
index 334b4f2512..84d9b86724 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/trs-ex04-index-ios.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/trs-ex04-index-ios.json
@@ -1,72 +1,49 @@
 {
-  "meta" : {
-    "externalKey" : "trs-ex4-trade",
-    "globalKey" : "f4a752e6"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "f4a752e6"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "54527a4c"
-      },
-      "name" : {
-        "value" : "ABCD Fund"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "4939658c",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "TRS-01",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "QGPGHQ1ENZOOLJRFTH41"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "f54dfc9"
+            "scheme" : "http://www.abc.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "770069bd"
-      },
-      "name" : {
-        "value" : "HedgeCo Capital L.L.C."
+        "globalKey" : "297b834e"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "51e656fd",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "total-ret-swap-01",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "J6W9XJWVE853A9CVRQ85"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e4c8d6a7"
+            "scheme" : "http://www.hedgeco.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "eb1954ba"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2011-03-23",
+      "meta" : {
+        "globalKey" : "3ed8d7"
+      }
+    },
     "tradableProduct" : {
-      "adjustment" : "STANDARD",
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "770069bd"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "54527a4c"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "Equity:Swap:PriceReturnBasicPerformance:SingleIndex"
@@ -79,464 +56,487 @@
           "economicTerms" : {
             "effectiveDate" : {
               "adjustableDate" : {
+                "unadjustedDate" : "2010-05-12",
                 "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                  "businessDayConvention" : "NotApplicable",
                   "meta" : {
                     "globalKey" : "3a4b88ab"
                   }
                 },
                 "meta" : {
                   "globalKey" : "261b36f7"
-                },
-                "unadjustedDate" : "2010-05-12"
+                }
               },
               "meta" : {
                 "globalKey" : "261b36f7"
               }
             },
+            "terminationDate" : {
+              "adjustableDate" : {
+                "unadjustedDate" : "2038-01-12",
+                "dateAdjustments" : {
+                  "businessDayConvention" : "NotApplicable",
+                  "meta" : {
+                    "globalKey" : "3a4b88ab"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "296055f7"
+                }
+              },
+              "meta" : {
+                "globalKey" : "296055f7"
+              }
+            },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
+                  "quantityReference" : {
+                    "globalReference" : "0",
+                    "externalReference" : "returnNotional"
+                  },
                   "meta" : {
                     "globalKey" : "17f35490"
-                  },
-                  "quantityReference" : {
-                    "externalReference" : "returnNotional",
-                    "globalReference" : "0"
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "globalKey" : "7794f09a"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "7794f09a"
+                        "globalKey" : "73f59b92"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "initialValuationDate",
-                        "globalReference" : "261b36f7"
+                        "globalReference" : "261b36f7",
+                        "externalReference" : "initialValuationDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "73f59b92"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "interestCalculationDates",
-                    "globalKey" : "eb4735ce"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "globalKey" : "b9d527a8"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 0,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "b9d527a8"
+                        "globalKey" : "b635d2a0"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 0,
-                      "businessDayConvention" : "NOT_APPLICABLE",
+                      "businessDayConvention" : "NotApplicable",
                       "dateRelativeTo" : {
-                        "externalReference" : "finalValuationDate",
-                        "globalReference" : "296055f7"
+                        "globalReference" : "296055f7",
+                        "externalReference" : "finalValuationDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "b635d2a0"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "69376ece",
+                    "externalKey" : "interestCalculationDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "2fbce0ac"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "785dc99e"
-                  },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "785dc99e"
-                      },
                       "relativeDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "785dc99e"
+                          "globalKey" : "74be7496"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessDayConvention" : "NOT_APPLICABLE",
+                        "businessDayConvention" : "NotApplicable",
                         "dateRelativeTo" : {
-                          "externalReference" : "returnPaymentDates",
-                          "globalReference" : "d2189e1"
+                          "globalReference" : "6d1b00ab",
+                          "externalReference" : "returnPaymentDates"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "74be7496"
                       }
                     } ]
+                  },
+                  "meta" : {
+                    "globalKey" : "74be7496"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "interimValuationDates",
-                    "globalReference" : "cd78cd69"
+                    "globalReference" : "dd77575f",
+                    "externalReference" : "interimValuationDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "meta" : {
                     "globalKey" : "a7c92a17"
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "980e10b8"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "ed4e549c"
-              },
               "performancePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "returnNotional",
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "5b3509f0"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "returnPaymentDates",
-                    "globalKey" : "d2189e1"
-                  },
-                  "paymentDateSchedule" : {
-                    "finalPaymentDate" : {
-                      "meta" : {
-                        "globalKey" : "33ef8035"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "33ef8035"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "BUSINESS",
-                        "businessCentersReference" : {
-                          "externalReference" : "returnBusinessCenter"
-                        },
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "finalValuationDate",
-                          "globalReference" : "296055f7"
-                        }
-                      }
-                    },
-                    "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "51f9cd36"
-                      },
-                      "relativeDates" : {
-                        "meta" : {
-                          "globalKey" : "51f9cd36"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 3,
-                        "dayType" : "BUSINESS",
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "USNY"
-                          } ],
-                          "meta" : {
-                            "globalKey" : "27e4e9"
-                          }
-                        },
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "interimValuationDates",
-                          "globalReference" : "cd78cd69"
-                        }
-                      }
-                    } ]
-                  }
-                },
-                "returnTerms" : {
-                  "priceReturnTerms" : {
-                    "returnType" : "TOTAL"
-                  }
-                },
-                "underlier" : {
-                  "index" : {
-                    "productIdentifier" : [ {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-1"
-                      }
-                    }, {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "productIdentifier-2"
-                      }
-                    } ]
                   },
                   "meta" : {
-                    "globalKey" : "0"
+                    "globalKey" : "0",
+                    "externalKey" : "returnNotional"
                   }
                 },
                 "valuationDates" : {
-                  "valuationDatesFinal" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "fbc70e6c"
-                    },
-                    "valuationDate" : {
-                      "adjustableDate" : {
-                        "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
-                          "meta" : {
-                            "globalKey" : "3a4b88ab"
-                          }
-                        },
-                        "meta" : {
-                          "globalKey" : "296055f7"
-                        },
-                        "unadjustedDate" : "2038-01-12"
-                      },
-                      "meta" : {
-                        "externalKey" : "finalValuationDate",
-                        "globalKey" : "296055f7"
-                      }
-                    }
-                  },
                   "valuationDatesInitial" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "f881ef6c"
-                    },
+                    "determinationMethod" : "ValuationTime",
                     "valuationDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2010-05-12",
                         "dateAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
                             "globalKey" : "3a4b88ab"
                           }
                         },
                         "meta" : {
                           "globalKey" : "261b36f7"
-                        },
-                        "unadjustedDate" : "2010-05-12"
+                        }
                       },
                       "meta" : {
-                        "externalKey" : "initialValuationDate",
-                        "globalKey" : "261b36f7"
+                        "globalKey" : "261b36f7",
+                        "externalKey" : "initialValuationDate"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "f881ef6c"
                     }
                   },
                   "valuationDatesInterim" : {
-                    "determinationMethod" : "VALUATION_TIME",
-                    "meta" : {
-                      "globalKey" : "341a3b14"
-                    },
+                    "determinationMethod" : "ValuationTime",
                     "valuationDates" : {
-                      "meta" : {
-                        "externalKey" : "interimValuationDates",
-                        "globalKey" : "cd78cd69"
-                      },
                       "periodicDates" : {
+                        "startDate" : {
+                          "adjustableDate" : {
+                            "unadjustedDate" : "2010-06-12",
+                            "dateAdjustments" : {
+                              "businessDayConvention" : "NotApplicable",
+                              "meta" : {
+                                "globalKey" : "3a4b88ab"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "261c2737"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "261c2737"
+                          }
+                        },
                         "endDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2037-12-12",
                             "dateAdjustments" : {
-                              "businessDayConvention" : "NOT_APPLICABLE",
+                              "businessDayConvention" : "NotApplicable",
                               "meta" : {
                                 "globalKey" : "3a4b88ab"
                               }
                             },
                             "meta" : {
                               "globalKey" : "294ca0b7"
-                            },
-                            "unadjustedDate" : "2037-12-12"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "294ca0b7"
                           }
                         },
+                        "periodFrequency" : {
+                          "periodMultiplier" : 1,
+                          "period" : "M",
+                          "meta" : {
+                            "globalKey" : "177d4"
+                          },
+                          "rollConvention" : "12"
+                        },
                         "periodDatesAdjustments" : {
-                          "businessDayConvention" : "NOT_APPLICABLE",
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
                             "globalKey" : "3a4b88ab"
                           }
-                        },
-                        "periodFrequency" : {
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "dd77575f",
+                        "externalKey" : "interimValuationDates"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "4418c50a"
+                    }
+                  },
+                  "valuationDatesFinal" : {
+                    "determinationMethod" : "ValuationTime",
+                    "valuationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2038-01-12",
+                        "dateAdjustments" : {
+                          "businessDayConvention" : "NotApplicable",
                           "meta" : {
-                            "globalKey" : "28bec"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 1,
-                          "rollConvention" : "12"
+                            "globalKey" : "3a4b88ab"
+                          }
                         },
-                        "startDate" : {
-                          "adjustableDate" : {
-                            "dateAdjustments" : {
-                              "businessDayConvention" : "NOT_APPLICABLE",
-                              "meta" : {
-                                "globalKey" : "3a4b88ab"
-                              }
-                            },
-                            "meta" : {
-                              "globalKey" : "261c2737"
-                            },
-                            "unadjustedDate" : "2010-06-12"
-                          },
+                        "meta" : {
+                          "globalKey" : "296055f7"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "296055f7",
+                        "externalKey" : "finalValuationDate"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "fbc70e6c"
+                    }
+                  }
+                },
+                "paymentDates" : {
+                  "paymentDateSchedule" : {
+                    "interimPaymentDates" : [ {
+                      "relativeDates" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "cc60294"
+                        },
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "USNY"
+                          } ],
                           "meta" : {
-                            "globalKey" : "261c2737"
+                            "globalKey" : "27e4e9"
                           }
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "dd77575f",
+                          "externalReference" : "interimValuationDates"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "cc60294"
+                      }
+                    } ],
+                    "finalPaymentDate" : {
+                      "relativeDate" : {
+                        "periodMultiplier" : 3,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "42382717"
+                        },
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
+                        "businessCentersReference" : {
+                          "externalReference" : "returnBusinessCenter"
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "296055f7",
+                          "externalReference" : "finalValuationDate"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "42382717"
                       }
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "6d1b00ab",
+                    "externalKey" : "returnPaymentDates"
                   }
-                }
-              } ]
-            },
-            "terminationDate" : {
-              "adjustableDate" : {
-                "dateAdjustments" : {
-                  "businessDayConvention" : "NOT_APPLICABLE",
+                },
+                "underlier" : {
+                  "index" : {
+                    "productIdentifier" : [ {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-1"
+                      }
+                    }, {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "productIdentifier-2"
+                      }
+                    } ]
+                  },
                   "meta" : {
-                    "globalKey" : "3a4b88ab"
+                    "globalKey" : "0"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "296055f7"
+                "returnTerms" : {
+                  "priceReturnTerms" : {
+                    "returnType" : "Total"
+                  }
                 },
-                "unadjustedDate" : "2038-01-12"
-              },
+                "meta" : {
+                  "globalKey" : "8d04a6ae"
+                }
+              } ],
               "meta" : {
-                "globalKey" : "296055f7"
+                "globalKey" : "89a9db66"
               }
             }
           },
           "meta" : {
-            "globalKey" : "cdd3a69b"
+            "globalKey" : "32c5b85d"
           }
         },
         "meta" : {
-          "globalKey" : "cdd3a69b"
+          "globalKey" : "32c5b85d"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "bad340f7"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5ee780b1"
+          "quantity" : [ {
+            "value" : {
+              "value" : 31000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
               "value" : {
                 "identifier" : {
+                  "value" : "IOS.FN30.650.67",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/entity-name-RED"
-                  },
-                  "value" : "IOS.FN30.650.67"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "f92d7bd6"
-                },
-                "source" : "OTHER"
-              }
-            }, {
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-2"
+                  "value" : "productIdentifier-1"
                 } ]
-              },
+              }
+            }, {
               "value" : {
                 "identifier" : {
+                  "value" : "4A845HAA3",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-RED-pair"
-                  },
-                  "value" : "4A845HAA3"
+                  }
                 },
+                "source" : "Other",
                 "meta" : {
                   "globalKey" : "52b306c7"
-                },
-                "source" : "OTHER"
-              }
-            } ]
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
                 }
               },
-              "value" : 31000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-2"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "7e08956f"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "31a0d237"
+          }
         } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ed8d7"
-      },
-      "value" : "2011-03-23"
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "51e656fd",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "4939658c",
+          "externalReference" : "party1"
+        }
+      } ],
+      "adjustment" : "Standard"
     },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "QGPGHQ1ENZOOLJRFTH41",
           "meta" : {
-            "scheme" : "http://www.abc.com/swaps/trade-id"
-          },
-          "value" : "TRS-01"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "f54dfc9"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "54527a4c"
+      "name" : {
+        "value" : "ABCD Fund"
       },
       "meta" : {
-        "globalKey" : "5c7fdd04"
+        "globalKey" : "4939658c",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "J6W9XJWVE853A9CVRQ85",
           "meta" : {
-            "scheme" : "http://www.hedgeco.com/swaps/trade-id"
-          },
-          "value" : "total-ret-swap-01"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e4c8d6a7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "770069bd"
+      "name" : {
+        "value" : "HedgeCo Capital L.L.C."
       },
       "meta" : {
-        "globalKey" : "2c3a2ad2"
+        "globalKey" : "51e656fd",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "e9b48186"
+    }
+  },
+  "meta" : {
+    "globalKey" : "e9b48186",
+    "externalKey" : "trs-ex4-trade"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex01-fx-spot.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex01-fx-spot.json
index 897b8f70e6..8332691f8f 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex01-fx-spot.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex01-fx-spot.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "b5fc967f"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "b5fc967f"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "ff8d4b3e"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "ff8d4b3e",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "CITI123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5493000SCC07UI6DB380"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "ff8d4b3e"
+            "scheme" : "http://www.citi.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "695e25ab"
+        "globalKey" : "ef0f690c"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "695e25ab",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "BARC987",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "529900DTJ5A7S5UCBB52"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "695e25ab"
+            "scheme" : "http://www.barclays.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ac6412bc"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-10-23",
+      "meta" : {
+        "globalKey" : "3e8a97"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "695e25ab"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ff8d4b3e"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,35 +50,32 @@
             "payout" : {
               "forwardPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e8a99"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2001-10-25",
                     "meta" : {
                       "globalKey" : "3e8a99"
-                    },
-                    "valueDate" : "2001-10-25"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e8a99"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "81954c1b"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -102,18 +84,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -124,6 +106,9 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "81954c1b"
                 }
               } ],
               "meta" : {
@@ -141,103 +126,118 @@
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "879662ff"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 1.48,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 1.48,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 10000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 14800000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 14800000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "6b35fce1"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "695e25ab",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "ff8d4b3e",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8a97"
-      },
-      "value" : "2001-10-23"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "5493000SCC07UI6DB380",
           "meta" : {
-            "scheme" : "http://www.citi.com/fx/trade-id"
-          },
-          "value" : "CITI123"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "ff8d4b3e"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "ff8d4b3e"
-      },
       "meta" : {
-        "globalKey" : "cb14b42"
+        "globalKey" : "ff8d4b3e",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "529900DTJ5A7S5UCBB52",
           "meta" : {
-            "scheme" : "http://www.barclays.com/fx/trade-id"
-          },
-          "value" : "BARC987"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "695e25ab"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "695e25ab"
-      },
       "meta" : {
-        "globalKey" : "c5cd7054"
+        "globalKey" : "695e25ab",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "43f9b6bf"
+    }
+  },
+  "meta" : {
+    "globalKey" : "43f9b6bf"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex02-spot-cross-w-side-rates.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex02-spot-cross-w-side-rates.json
index 676a82d691..f96ea651a6 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex02-spot-cross-w-side-rates.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex02-spot-cross-w-side-rates.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "3775f4d1"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "3775f4d1"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "618c3061"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "618c3061",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "PARTYA345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.partyA.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "d502ec04"
+        "globalKey" : "d1241fee"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "d502ec04",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "CSFB9842",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "391200ZGI3FROE0WYF22"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "d502ec04"
+            "scheme" : "http://www.csfb.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "673ef37d"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-10-23",
+      "meta" : {
+        "globalKey" : "3e8a97"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "d502ec04"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "618c3061"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,56 +50,32 @@
             "payout" : {
               "forwardPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e8a99"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2001-10-25",
                     "meta" : {
                       "globalKey" : "3e8a99"
-                    },
-                    "valueDate" : "2001-10-25"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e8a99"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "9cf3fd80"
-                },
                 "underlier" : {
                   "foreignExchange" : {
-                    "exchangeRate" : {
-                      "crossRate" : [ {
-                        "currency1" : {
-                          "value" : "GBP"
-                        },
-                        "currency2" : {
-                          "value" : "USD"
-                        },
-                        "quoteBasis" : "CURRENCY_2_PER_CURRENCY_1",
-                        "rate" : 1.4800
-                      }, {
-                        "currency1" : {
-                          "value" : "USD"
-                        },
-                        "currency2" : {
-                          "value" : "EUR"
-                        },
-                        "quoteBasis" : "CURRENCY_1_PER_CURRENCY_2",
-                        "rate" : 0.9325
-                      } ]
-                    },
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -123,142 +84,181 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
                         "globalKey" : "b14144c1"
                       }
+                    },
+                    "exchangeRate" : {
+                      "crossRate" : [ {
+                        "currency1" : {
+                          "value" : "GBP"
+                        },
+                        "currency2" : {
+                          "value" : "USD"
+                        },
+                        "quoteBasis" : "Currency2PerCurrency1",
+                        "rate" : 1.4800
+                      }, {
+                        "currency1" : {
+                          "value" : "USD"
+                        },
+                        "currency2" : {
+                          "value" : "EUR"
+                        },
+                        "quoteBasis" : "Currency1PerCurrency2",
+                        "rate" : 0.9325
+                      } ]
                     }
                   },
                   "meta" : {
-                    "globalKey" : "390b5fb9"
+                    "globalKey" : "6f57a635"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "d34043fc"
                 }
               } ],
               "meta" : {
-                "globalKey" : "9cf3fd80"
+                "globalKey" : "d34043fc"
               }
             }
           },
           "meta" : {
-            "globalKey" : "9cf3fd80"
+            "globalKey" : "d34043fc"
           }
         },
         "meta" : {
-          "globalKey" : "9cf3fd80"
+          "globalKey" : "d34043fc"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "dce56ae5"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.630068,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.630068,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 10000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 6300680,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 6300680
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "bfc7f1bb"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "d502ec04",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "618c3061",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8a97"
-      },
-      "value" : "2001-10-23"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.partyA.com/fx/trade-id"
-          },
-          "value" : "PARTYA345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "618c3061"
-      },
       "meta" : {
-        "globalKey" : "bc73d1a4"
+        "globalKey" : "618c3061",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "391200ZGI3FROE0WYF22",
           "meta" : {
-            "scheme" : "http://www.csfb.com/fx/trade-id"
-          },
-          "value" : "CSFB9842"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "d502ec04"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "d502ec04"
-      },
       "meta" : {
-        "globalKey" : "357324d5"
+        "globalKey" : "d502ec04",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "e22def35"
+    }
+  },
+  "meta" : {
+    "globalKey" : "e22def35"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex03-fx-fwd.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex03-fx-fwd.json
index 489cfbeb54..342000d18b 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex03-fx-fwd.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex03-fx-fwd.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "cb068fe4"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "cb068fe4"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "cff0a7d6"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "cff0a7d6",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "ABN1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFXS5XCH7N0Y05NIXW11"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cff0a7d6"
+            "scheme" : "http://www.abn-amro.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "e05045d7"
+        "globalKey" : "78f19424"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "e05045d7",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DB5678",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "213800QILIUD4ROSUO03"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e05045d7"
+            "scheme" : "http://www.db.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "d3f7534"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-11-19",
+      "meta" : {
+        "globalKey" : "3e8ad3"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "cff0a7d6"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,35 +50,32 @@
             "payout" : {
               "forwardPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e8b15"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2001-12-21",
                     "meta" : {
                       "globalKey" : "3e8b15"
-                    },
-                    "valueDate" : "2001-12-21"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e8b15"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "90c7297"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -102,18 +84,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -124,6 +106,9 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "90c7297"
                 }
               } ],
               "meta" : {
@@ -141,109 +126,124 @@
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "1cc815e8"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.9175,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.9175,
-              "composite" : {
-                "arithmeticOperator" : "ADD",
-                "baseValue" : 0.9130,
-                "operand" : 0.0045,
-                "operandType" : "FORWARD_POINT"
-              },
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate",
+              "composite" : {
+                "baseValue" : 0.9130,
+                "operand" : 0.0045,
+                "arithmeticOperator" : "Add",
+                "operandType" : "ForwardPoint"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 10000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 9175000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 9175000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "2ab23d92"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "cff0a7d6",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8ad3"
-      },
-      "value" : "2001-11-19"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFXS5XCH7N0Y05NIXW11",
           "meta" : {
-            "scheme" : "http://www.abn-amro.com/fx/trade-id"
-          },
-          "value" : "ABN1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cff0a7d6"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "cff0a7d6"
-      },
       "meta" : {
-        "globalKey" : "a6b5105a"
+        "globalKey" : "cff0a7d6",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "213800QILIUD4ROSUO03",
           "meta" : {
-            "scheme" : "http://www.db.com/fx/trade-id"
-          },
-          "value" : "DB5678"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e05045d7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "e05045d7"
-      },
       "meta" : {
-        "globalKey" : "5d5a14cc"
+        "globalKey" : "e05045d7",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "31e6fa46"
+    }
+  },
+  "meta" : {
+    "globalKey" : "31e6fa46"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex04-fx-fwd-w-settlement.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex04-fx-fwd-w-settlement.json
index f82578f8c4..d36de5076c 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex04-fx-fwd-w-settlement.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex04-fx-fwd-w-settlement.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "e292a24f"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "e292a24f"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "ff8d4b3e"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "ff8d4b3e",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "FWD123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5493000SCC07UI6DB380"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "ff8d4b3e"
+            "scheme" : "http://www.citi.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "1006f88d"
+        "globalKey" : "11d75dd4"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "1006f88d",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "FXD2002987",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFM8T61CT2L1QCEMIK50"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "1006f88d"
+            "scheme" : "http://www.ubsw.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9a8224ba"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-11-12",
+      "meta" : {
+        "globalKey" : "3e8acc"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "1006f88d"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ff8d4b3e"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,35 +50,32 @@
             "payout" : {
               "forwardPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e9101"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2002-04-01",
                     "meta" : {
                       "globalKey" : "3e9101"
-                    },
-                    "valueDate" : "2002-04-01"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e9101"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "78f6f683"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -102,18 +84,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -124,6 +106,9 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "78f6f683"
                 }
               } ],
               "meta" : {
@@ -141,103 +126,118 @@
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "b6d6c79f"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 1.4643,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 1.4643,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 10000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 14643000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 14643000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "24022c41"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "1006f88d",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "ff8d4b3e",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8acc"
-      },
-      "value" : "2001-11-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "5493000SCC07UI6DB380",
           "meta" : {
-            "scheme" : "http://www.citi.com/fx/trade-id"
-          },
-          "value" : "FWD123"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "ff8d4b3e"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "ff8d4b3e"
-      },
       "meta" : {
-        "globalKey" : "9d4f2e0a"
+        "globalKey" : "ff8d4b3e",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFM8T61CT2L1QCEMIK50",
           "meta" : {
-            "scheme" : "http://www.ubsw.com/fx/trade-id"
-          },
-          "value" : "FXD2002987"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "1006f88d"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "1006f88d"
-      },
       "meta" : {
-        "globalKey" : "a4aefad2"
+        "globalKey" : "1006f88d",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "c70b344f"
+    }
+  },
+  "meta" : {
+    "globalKey" : "c70b344f"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex05-fx-fwd-w-ssi.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex05-fx-fwd-w-ssi.json
index 489cfbeb54..342000d18b 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex05-fx-fwd-w-ssi.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex05-fx-fwd-w-ssi.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "cb068fe4"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "cb068fe4"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "cff0a7d6"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "cff0a7d6",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "ABN1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFXS5XCH7N0Y05NIXW11"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cff0a7d6"
+            "scheme" : "http://www.abn-amro.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "e05045d7"
+        "globalKey" : "78f19424"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "e05045d7",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DB5678",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "213800QILIUD4ROSUO03"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e05045d7"
+            "scheme" : "http://www.db.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "d3f7534"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-11-19",
+      "meta" : {
+        "globalKey" : "3e8ad3"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "cff0a7d6"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,35 +50,32 @@
             "payout" : {
               "forwardPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e8b15"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2001-12-21",
                     "meta" : {
                       "globalKey" : "3e8b15"
-                    },
-                    "valueDate" : "2001-12-21"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e8b15"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "90c7297"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -102,18 +84,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -124,6 +106,9 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "90c7297"
                 }
               } ],
               "meta" : {
@@ -141,109 +126,124 @@
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "1cc815e8"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.9175,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.9175,
-              "composite" : {
-                "arithmeticOperator" : "ADD",
-                "baseValue" : 0.9130,
-                "operand" : 0.0045,
-                "operandType" : "FORWARD_POINT"
-              },
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate",
+              "composite" : {
+                "baseValue" : 0.9130,
+                "operand" : 0.0045,
+                "arithmeticOperator" : "Add",
+                "operandType" : "ForwardPoint"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 10000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 9175000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 9175000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "2ab23d92"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "cff0a7d6",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8ad3"
-      },
-      "value" : "2001-11-19"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFXS5XCH7N0Y05NIXW11",
           "meta" : {
-            "scheme" : "http://www.abn-amro.com/fx/trade-id"
-          },
-          "value" : "ABN1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cff0a7d6"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "cff0a7d6"
-      },
       "meta" : {
-        "globalKey" : "a6b5105a"
+        "globalKey" : "cff0a7d6",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "213800QILIUD4ROSUO03",
           "meta" : {
-            "scheme" : "http://www.db.com/fx/trade-id"
-          },
-          "value" : "DB5678"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e05045d7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "e05045d7"
-      },
       "meta" : {
-        "globalKey" : "5d5a14cc"
+        "globalKey" : "e05045d7",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "31e6fa46"
+    }
+  },
+  "meta" : {
+    "globalKey" : "31e6fa46"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex06-fx-fwd-w-splits.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex06-fx-fwd-w-splits.json
index 34bfb6e456..32f1b39610 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex06-fx-fwd-w-splits.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex06-fx-fwd-w-splits.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "fef8f6b9"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "fef8f6b9"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "e05045d7"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "e05045d7",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "FX048VS",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "213800QILIUD4ROSUO03"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e05045d7"
+            "scheme" : "http://www.db.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "cff0a7d6"
+        "globalKey" : "a55610f4"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "cff0a7d6",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "USABC023",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFXS5XCH7N0Y05NIXW11"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cff0a7d6"
+            "scheme" : "http://www.abn.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ac904d81"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-11-12",
+      "meta" : {
+        "globalKey" : "3e8acc"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "e05045d7"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "cff0a7d6"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,35 +50,32 @@
             "payout" : {
               "forwardPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e908e"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2002-02-14",
                     "meta" : {
                       "globalKey" : "3e908e"
-                    },
-                    "valueDate" : "2002-02-14"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e908e"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "541b0a90"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -102,18 +84,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -124,6 +106,9 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "541b0a90"
                 }
               } ],
               "meta" : {
@@ -141,103 +126,118 @@
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "8d74754f"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 1.1072,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 1.1072,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 13000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 13000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 14393600,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 14393600
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "211a3491"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "cff0a7d6",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8acc"
-      },
-      "value" : "2001-11-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "213800QILIUD4ROSUO03",
           "meta" : {
-            "scheme" : "http://www.db.com/fx/trade-id"
-          },
-          "value" : "FX048VS"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e05045d7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "e05045d7"
-      },
       "meta" : {
-        "globalKey" : "4bed992a"
+        "globalKey" : "e05045d7",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFXS5XCH7N0Y05NIXW11",
           "meta" : {
-            "scheme" : "http://www.abn.com/fx/trade-id"
-          },
-          "value" : "USABC023"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cff0a7d6"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "cff0a7d6"
-      },
       "meta" : {
-        "globalKey" : "6bd60dd9"
+        "globalKey" : "cff0a7d6",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "e3dce81d"
+    }
+  },
+  "meta" : {
+    "globalKey" : "e3dce81d"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex07-non-deliverable-forward.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex07-non-deliverable-forward.json
index d28bdd50a1..717b0c647c 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex07-non-deliverable-forward.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex07-non-deliverable-forward.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "c0ad9da3"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "c0ad9da3"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "618c3061"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "618c3061",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "PARTYA345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.partyA.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "d502ec04"
+        "globalKey" : "d1241fee"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "d502ec04",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "CSFB9842",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "391200ZGI3FROE0WYF22"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "d502ec04"
+            "scheme" : "http://www.csfb.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "673ef37d"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-01-09",
+      "meta" : {
+        "globalKey" : "3e9049"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "d502ec04"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "618c3061"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,22 +50,39 @@
             "payout" : {
               "forwardPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "ca3b0270"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
                   "settlementDate" : {
+                    "valueDate" : "2002-04-11",
                     "meta" : {
                       "globalKey" : "3e910b"
-                    },
-                    "valueDate" : "2002-04-11"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "90021356"
                   },
-                  "settlementType" : "CASH",
                   "cashSettlementTerms" : [ {
-                    "meta" : {
-                      "globalKey" : "8ebf28cc"
+                    "valuationMethod" : {
+                      "valuationSource" : {
+                        "quotedCurrencyPair" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "currencyPair-1"
+                          }
+                        },
+                        "informationSource" : {
+                          "primarySource" : {
+                            "sourceProvider" : {
+                              "value" : "Reuters"
+                            },
+                            "sourcePage" : {
+                              "value" : "RBIB"
+                            }
+                          }
+                        }
+                      }
                     },
                     "valuationDate" : {
                       "fxFixingDate" : {
@@ -89,10 +91,10 @@
                         },
                         "fxFixingDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2002-04-09",
                             "meta" : {
                               "globalKey" : "3e9109"
-                            },
-                            "unadjustedDate" : "2002-04-09"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "3e9109"
@@ -100,53 +102,33 @@
                         }
                       }
                     },
-                    "valuationMethod" : {
-                      "valuationSource" : {
-                        "informationSource" : {
-                          "primarySource" : {
-                            "sourcePage" : {
-                              "value" : "RBIB"
-                            },
-                            "sourceProvider" : {
-                              "value" : "REUTERS"
-                            }
-                          }
-                        },
-                        "quotedCurrencyPair" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "currencyPair-1"
-                          }
-                        }
-                      }
-                    },
                     "valuationTime" : {
+                      "hourMinuteTime" : "14:30:00",
                       "businessCenter" : {
                         "value" : "INMU"
-                      },
-                      "hourMinuteTime" : "14:30:00"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "548639b2"
                     }
                   } ]
                 },
-                "meta" : {
-                  "globalKey" : "69a1b972"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -155,18 +137,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -177,148 +159,166 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "3708a158"
                 }
               } ],
               "meta" : {
-                "globalKey" : "69a1b972"
+                "globalKey" : "3708a158"
               }
             }
           },
           "meta" : {
-            "globalKey" : "69a1b972"
+            "globalKey" : "3708a158"
           }
         },
         "meta" : {
-          "globalKey" : "69a1b972"
+          "globalKey" : "3708a158"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "c1c8ede9"
-          },
-          "observable" : {
-            "currencyPair" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "currencyPair-1"
-                } ]
-              },
-              "value" : {
-                "currency1" : {
-                  "value" : "USD"
-                },
-                "currency2" : {
-                  "value" : "INR"
-                },
-                "quoteBasis" : "CURRENCY_2_PER_CURRENCY_1"
-              }
-            },
-            "meta" : {
-              "globalKey" : "bf219d3"
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 43.40,
               "unit" : {
                 "currency" : {
                   "value" : "INR"
                 }
               },
-              "value" : 43.40,
-              "composite" : {
-                "arithmeticOperator" : "ADD",
-                "baseValue" : 43.35,
-                "operand" : 0.05,
-                "operandType" : "FORWARD_POINT"
-              },
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate",
+              "composite" : {
+                "baseValue" : 43.35,
+                "operand" : 0.05,
+                "arithmeticOperator" : "Add",
+                "operandType" : "ForwardPoint"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 10000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 434000000,
               "unit" : {
                 "currency" : {
                   "value" : "INR"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "currencyPair" : {
+              "value" : {
+                "currency1" : {
+                  "value" : "USD"
+                },
+                "currency2" : {
+                  "value" : "INR"
+                },
+                "quoteBasis" : "Currency2PerCurrency1"
               },
-              "value" : 434000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "currencyPair-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "7251208d"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "871a4e21"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "d502ec04",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "618c3061",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9049"
-      },
-      "value" : "2002-01-09"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.partyA.com/fx/trade-id"
-          },
-          "value" : "PARTYA345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "618c3061"
-      },
       "meta" : {
-        "globalKey" : "bc73d1a4"
+        "globalKey" : "618c3061",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "391200ZGI3FROE0WYF22",
           "meta" : {
-            "scheme" : "http://www.csfb.com/fx/trade-id"
-          },
-          "value" : "CSFB9842"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "d502ec04"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "d502ec04"
-      },
       "meta" : {
-        "globalKey" : "357324d5"
+        "globalKey" : "d502ec04",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "3a3a6dbf"
+    }
+  },
+  "meta" : {
+    "globalKey" : "3a3a6dbf"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex08-fx-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex08-fx-swap.json
index bdfdca624c..2df95161c9 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex08-fx-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex08-fx-swap.json
@@ -1,70 +1,55 @@
 {
-  "meta" : {
-    "globalKey" : "72038680"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "72038680"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "618c3061"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "618c3061",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "PARTYAUS33",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "e05045d7"
+        "globalKey" : "cf15004e"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "e05045d7",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DEUTDEFF",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "213800QILIUD4ROSUO03"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e05045d7"
+            "scheme" : "http://www.db.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "5246e55"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-01-23",
+      "meta" : {
+        "globalKey" : "3e9057"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "618c3061"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "FxSwap",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-type-simple"
-                },
-                "value" : "FxSwap"
+                }
               }
             }
           }, {
@@ -75,35 +60,32 @@
             "payout" : {
               "forwardPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e9059"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2002-01-25",
                     "meta" : {
                       "globalKey" : "3e9059"
-                    },
-                    "valueDate" : "2002-01-25"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e9059"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "f2fab1db"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -112,18 +94,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -134,38 +116,38 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "f2fab1db"
                 }
               }, {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e9099"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2002-02-25",
                     "meta" : {
                       "globalKey" : "3e9099"
-                    },
-                    "valueDate" : "2002-02-25"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e9099"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "c6b74017"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-4"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -174,18 +156,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-3"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -196,6 +178,9 @@
                   "meta" : {
                     "globalKey" : "f381ccfe"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "c6b74017"
                 }
               } ],
               "meta" : {
@@ -213,160 +198,175 @@
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "879662ff"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 1.48,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 1.48,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 10000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 14800000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 14800000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "2fc7841f"
-          },
-          "price" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "6b35fce1"
+          }
+        }, {
+          "price" : [ {
             "value" : {
+              "value" : 1.5,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 1.5,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-4"
+                "value" : "price-2"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 10000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-3"
+                "value" : "quantity-4"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 15000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 15000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-3"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "c928ffc1"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "618c3061",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9057"
-      },
-      "value" : "2002-01-23"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "PARTYAUS33"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "618c3061"
-      },
       "meta" : {
-        "globalKey" : "1ae1a04"
+        "globalKey" : "618c3061",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "213800QILIUD4ROSUO03",
           "meta" : {
-            "scheme" : "http://www.db.com/swaps/trade-id"
-          },
-          "value" : "DEUTDEFF"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e05045d7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "e05045d7"
-      },
       "meta" : {
-        "globalKey" : "efe549ad"
+        "globalKey" : "e05045d7",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "a80b13a0"
+    }
+  },
+  "meta" : {
+    "globalKey" : "a80b13a0"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex09-euro-opt.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex09-euro-opt.json
index 06c3548b15..0e11201d71 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex09-euro-opt.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex09-euro-opt.json
@@ -1,76 +1,55 @@
 {
-  "meta" : {
-    "globalKey" : "c9a1f59a"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "acc2cbec"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "cc5aba48"
-      },
-      "name" : {
-        "value" : "Party A"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "63373188",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "IBFXO-0123456789",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-2-0"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "ccc85952"
-      },
-      "name" : {
-        "value" : "ABN Amro"
+        "globalKey" : "bcd03f83"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "20e9d9d2",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "IBFXO-0123456789",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFXS5XCH7N0Y05NIXW11"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cff0a7d6"
+            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-2-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "bcd0b3e2"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2002-01-04",
+      "meta" : {
+        "globalKey" : "3e9044"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "cc5aba48"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ccc85952"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "Delta-Put-FX-Option",
                 "meta" : {
                   "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/product-type-1-0"
-                },
-                "value" : "Delta-Put-FX-Option"
+                }
               }
             }
           }, {
@@ -79,28 +58,25 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "cd06d732"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e9186"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2002-06-06",
                     "meta" : {
                       "globalKey" : "3e9186"
-                    },
-                    "valueDate" : "2002-06-06"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e9186"
                   }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
                   "optionStyle" : {
@@ -108,10 +84,10 @@
                       "expirationDate" : [ {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2002-06-04",
                             "meta" : {
                               "globalKey" : "3e9184"
-                            },
-                            "value" : "2002-06-04"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -122,10 +98,10 @@
                         }
                       } ],
                       "expirationTime" : {
+                        "hourMinuteTime" : "14:00:00",
                         "businessCenter" : {
                           "value" : "USNY"
-                        },
-                        "hourMinuteTime" : "14:00:00"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "87bcb53f"
@@ -134,40 +110,37 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 0.4920,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.4920,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "AUD"
                         }
                       },
-                      "priceType" : "EXCHANGE_RATE"
+                      "priceType" : "ExchangeRate"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "cd06d732"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -176,18 +149,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -198,8 +171,14 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "cd06d732"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "cd06d732"
+              }
             }
           },
           "meta" : {
@@ -212,118 +191,139 @@
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3b8ff95e"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
             "value" : {
+              "value" : 75000000,
               "unit" : {
                 "currency" : {
                   "value" : "AUD"
                 }
-              },
-              "value" : 75000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 36900000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 36900000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "366f3262"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "63373188",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "20e9d9d2",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e9044"
-      },
-      "value" : "2002-01-04"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-2-0"
-          },
-          "value" : "IBFXO-0123456789"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "cc5aba48"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "6d965ff9"
+        "globalKey" : "63373188",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFXS5XCH7N0Y05NIXW11",
           "meta" : {
-            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-2-0"
-          },
-          "value" : "IBFXO-0123456789"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cff0a7d6"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "ccc85952"
+      "name" : {
+        "value" : "ABN Amro"
       },
       "meta" : {
-        "globalKey" : "6d965ffa"
+        "globalKey" : "20e9d9d2",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "bbfb6d64"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "54c9ccae"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "cc5aba48"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ccc85952"
-        }
-      },
       "quantity" : {
+        "value" : 36900,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "63373188",
+          "externalReference" : "party1"
         },
-        "value" : 36900
+        "receiverPartyReference" : {
+          "globalReference" : "20e9d9d2",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-12-06",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-12-06"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "fdca569c"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "b332b300"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex10-amer-opt.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex10-amer-opt.json
index 7c71fcd0ad..19567418d0 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex10-amer-opt.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex10-amer-opt.json
@@ -1,76 +1,55 @@
 {
-  "meta" : {
-    "globalKey" : "e955730f"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "7b572ca1"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "9afed11c"
-      },
-      "name" : {
-        "value" : "PARTYA"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "bb7fd25c",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123456789",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://partyA.com/trades"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "ccc85952"
-      },
-      "name" : {
-        "value" : "ABN Amro"
+        "globalKey" : "262c8e4a"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "20e9d9d2",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "ABN1789",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFXS5XCH7N0Y05NIXW11"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cff0a7d6"
+            "scheme" : "http://adnamro.com/trade-ids"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "78f21be8"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-12-04",
+      "meta" : {
+        "globalKey" : "3e8b04"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "9afed11c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ccc85952"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
+                "value" : "FxOption",
                 "meta" : {
                   "scheme" : "http://www.fpml.org/coding-scheme/product-type-simple"
-                },
-                "value" : "FxOption"
+                }
               }
             }
           }, {
@@ -79,35 +58,34 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "4d820386"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e9186"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2002-06-06",
                     "meta" : {
                       "globalKey" : "3e9186"
-                    },
-                    "valueDate" : "2002-06-06"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e9186"
                   }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-12-04",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "USNY"
@@ -116,15 +94,13 @@
                                 "globalKey" : "27e4e9"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "212500d8"
                             }
                           },
                           "meta" : {
                             "globalKey" : "d018b854"
-                          },
-                          "unadjustedDate" : "2001-12-04"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "d018b854"
@@ -133,10 +109,10 @@
                       "expirationDate" : {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2002-06-04",
                             "meta" : {
                               "globalKey" : "3e9184"
-                            },
-                            "value" : "2002-06-04"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -147,10 +123,10 @@
                         }
                       },
                       "expirationTime" : {
+                        "hourMinuteTime" : "14:00:00",
                         "businessCenter" : {
                           "value" : "USNY"
-                        },
-                        "hourMinuteTime" : "14:00:00"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "bbf6de93"
@@ -159,40 +135,37 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 0.4920,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.4920,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "AUD"
                         }
                       },
-                      "priceType" : "EXCHANGE_RATE"
+                      "priceType" : "ExchangeRate"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "4d820386"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -201,18 +174,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -223,8 +196,14 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "4d820386"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "4d820386"
+              }
             }
           },
           "meta" : {
@@ -237,118 +216,139 @@
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3b8ff95e"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
             "value" : {
+              "value" : 75000000,
               "unit" : {
                 "currency" : {
                   "value" : "AUD"
                 }
-              },
-              "value" : 75000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 36900000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 36900000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "366f3262"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "bb7fd25c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "20e9d9d2",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8b04"
-      },
-      "value" : "2001-12-04"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://partyA.com/trades"
-          },
-          "value" : "123456789"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "9afed11c"
+      "name" : {
+        "value" : "PARTYA"
       },
       "meta" : {
-        "globalKey" : "f11a1900"
+        "globalKey" : "bb7fd25c",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFXS5XCH7N0Y05NIXW11",
           "meta" : {
-            "scheme" : "http://adnamro.com/trade-ids"
-          },
-          "value" : "ABN1789"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cff0a7d6"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "ccc85952"
+      "name" : {
+        "value" : "ABN Amro"
       },
       "meta" : {
-        "globalKey" : "a6fdde80"
+        "globalKey" : "20e9d9d2",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "206c523"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "54c9ccae"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "9afed11c"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ccc85952"
-        }
-      },
       "quantity" : {
+        "value" : 36900,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "bb7fd25c",
+          "externalReference" : "party1"
         },
-        "value" : 36900
+        "receiverPartyReference" : {
+          "globalReference" : "20e9d9d2",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-12-06",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-12-06"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "fdca569c"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "5d538ff"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex11-non-deliverable-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex11-non-deliverable-option.json
index 81955b73ec..815b292f25 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex11-non-deliverable-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex11-non-deliverable-option.json
@@ -1,70 +1,49 @@
 {
-  "meta" : {
-    "globalKey" : "66382d29"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "3e8a49be"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "9afed11c"
-      },
-      "name" : {
-        "value" : "PARTYA"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "bb7fd25c",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "IBFXO-0123456789",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-2-0"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "ccc85952"
-      },
-      "name" : {
-        "value" : "ABN Amro"
+        "globalKey" : "bcd03f83"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "20e9d9d2",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "IBFXO-0123456789",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFXS5XCH7N0Y05NIXW11"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cff0a7d6"
+            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-2-0"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "bcd0b3e2"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-01-15",
+      "meta" : {
+        "globalKey" : "3e884f"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "9afed11c"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ccc85952"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "ForeignExchange:NDO"
@@ -76,30 +55,44 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "224a465c"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "f1100698"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
                   "settlementDate" : {
+                    "valueDate" : "2001-04-11",
                     "meta" : {
                       "globalKey" : "3e890b"
-                    },
-                    "valueDate" : "2001-04-11"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "6a218948"
                   },
                   "cashSettlementTerms" : [ {
-                    "meta" : {
-                      "globalKey" : "a73aefe7"
+                    "valuationMethod" : {
+                      "valuationSource" : {
+                        "quotedCurrencyPair" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "currencyPair-1"
+                          }
+                        },
+                        "informationSource" : {
+                          "primarySource" : {
+                            "sourceProvider" : {
+                              "value" : "Reuters"
+                            },
+                            "sourcePage" : {
+                              "value" : "VEB01"
+                            }
+                          }
+                        }
+                      }
                     },
                     "valuationDate" : {
                       "fxFixingDate" : {
@@ -108,10 +101,10 @@
                         },
                         "fxFixingDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2001-04-09",
                             "meta" : {
                               "globalKey" : "3e8909"
-                            },
-                            "unadjustedDate" : "2001-04-09"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "3e8909"
@@ -119,37 +112,20 @@
                         }
                       }
                     },
-                    "valuationMethod" : {
-                      "valuationSource" : {
-                        "informationSource" : {
-                          "primarySource" : {
-                            "sourcePage" : {
-                              "value" : "VEB01"
-                            },
-                            "sourceProvider" : {
-                              "value" : "REUTERS"
-                            }
-                          }
-                        },
-                        "quotedCurrencyPair" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "currencyPair-1"
-                          }
-                        }
-                      }
-                    },
                     "valuationTime" : {
+                      "hourMinuteTime" : "17:00:00",
                       "businessCenter" : {
                         "value" : "VECA"
-                      },
-                      "hourMinuteTime" : "17:00:00"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "204c7297"
                     }
                   } ]
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
                   "optionStyle" : {
@@ -157,10 +133,10 @@
                       "expirationDate" : [ {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2001-04-09",
                             "meta" : {
                               "globalKey" : "3e8909"
-                            },
-                            "value" : "2001-04-09"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -171,10 +147,10 @@
                         }
                       } ],
                       "expirationTime" : {
+                        "hourMinuteTime" : "10:00:00",
                         "businessCenter" : {
                           "value" : "USNY"
-                        },
-                        "hourMinuteTime" : "10:00:00"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "f3490a66"
@@ -183,40 +159,37 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 1.15,
                       "unit" : {
                         "currency" : {
                           "value" : "VEB"
                         }
                       },
-                      "value" : 1.15,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "EXCHANGE_RATE"
+                      "priceType" : "ExchangeRate"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "224a465c"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -225,18 +198,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -247,154 +220,181 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "dd7f1d0c"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "dd7f1d0c"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "69539036"
+            "globalKey" : "248866e6"
           }
         },
         "meta" : {
-          "globalKey" : "69539036"
+          "globalKey" : "248866e6"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "21691ec7"
-          },
-          "observable" : {
-            "currencyPair" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "currencyPair-1"
-                } ]
-              },
-              "value" : {
-                "currency1" : {
+          "quantity" : [ {
+            "value" : {
+              "value" : 17250000,
+              "unit" : {
+                "currency" : {
                   "value" : "VEB"
-                },
-                "currency2" : {
-                  "value" : "USD"
-                },
-                "quoteBasis" : "CURRENCY_1_PER_CURRENCY_2"
+                }
               }
             },
-            "meta" : {
-              "globalKey" : "24663b5b"
-            }
-          },
-          "quantity" : [ {
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 15000000,
               "unit" : {
                 "currency" : {
-                  "value" : "VEB"
+                  "value" : "USD"
                 }
-              },
-              "value" : 17250000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
+            }
+          } ],
+          "observable" : {
+            "currencyPair" : {
+              "value" : {
+                "currency1" : {
+                  "value" : "VEB"
+                },
+                "currency2" : {
                   "value" : "USD"
-                }
+                },
+                "quoteBasis" : "Currency1PerCurrency2"
               },
-              "value" : 15000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "currencyPair-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "68613005"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "33f327b1"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "bb7fd25c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "20e9d9d2",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e884f"
-      },
-      "value" : "2001-01-15"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-2-0"
-          },
-          "value" : "IBFXO-0123456789"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "9afed11c"
+      "name" : {
+        "value" : "PARTYA"
       },
       "meta" : {
-        "globalKey" : "6d965ff9"
+        "globalKey" : "bb7fd25c",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFXS5XCH7N0Y05NIXW11",
           "meta" : {
-            "scheme" : "http://www.markets.Reuters.com/rss/spec/2001/trade-id-2-0"
-          },
-          "value" : "IBFXO-0123456789"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cff0a7d6"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "ccc85952"
+      "name" : {
+        "value" : "ABN Amro"
       },
       "meta" : {
-        "globalKey" : "6d965ffa"
+        "globalKey" : "20e9d9d2",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "308dada"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "bbd996eb"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "9afed11c"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "ccc85952"
-        }
-      },
       "quantity" : {
+        "value" : 372750,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "bb7fd25c",
+          "externalReference" : "party1"
         },
-        "value" : 372750
+        "receiverPartyReference" : {
+          "globalReference" : "20e9d9d2",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-01-17",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-01-17"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "e7ca0335"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "73279b8f"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex12-fx-barrier-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex12-fx-barrier-option.json
index 08331161d1..80e9332f44 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex12-fx-barrier-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex12-fx-barrier-option.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "e9cb9a"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "6bd4f765"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "618c3061"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "618c3061",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "PARTYAUS33",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "e05045d7"
+        "globalKey" : "cf15004e"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "e05045d7",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DEUTDEFF",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "213800QILIUD4ROSUO03"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e05045d7"
+            "scheme" : "http://www.db.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "5246e55"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-08-16",
+      "meta" : {
+        "globalKey" : "3e8a10"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "618c3061"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,28 +48,25 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "35667840"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e9088"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2002-02-08",
                     "meta" : {
                       "globalKey" : "3e9088"
-                    },
-                    "valueDate" : "2002-02-08"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e9088"
                   }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
                   "optionStyle" : {
@@ -92,10 +74,10 @@
                       "expirationDate" : [ {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2002-02-06",
                             "meta" : {
                               "globalKey" : "3e9086"
-                            },
-                            "value" : "2002-02-06"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -106,10 +88,10 @@
                         }
                       } ],
                       "expirationTime" : {
+                        "hourMinuteTime" : "10:00:00",
                         "businessCenter" : {
                           "value" : "USNY"
-                        },
-                        "hourMinuteTime" : "10:00:00"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "f3490a66"
@@ -118,43 +100,40 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 0.9,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.9,
-                      "composite" : {
-                        "baseValue" : 0.8935
-                      },
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "priceType" : "EXCHANGE_RATE"
+                      "priceType" : "ExchangeRate",
+                      "composite" : {
+                        "baseValue" : 0.8935
+                      }
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "35667840"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -163,18 +142,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -185,132 +164,153 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "958be4a2"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "958be4a2"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "35667840"
+            "globalKey" : "958be4a2"
           }
         },
         "meta" : {
-          "globalKey" : "35667840"
+          "globalKey" : "958be4a2"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "b81d9e84"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
             "value" : {
+              "value" : 4500000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 4500000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 5000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 5000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "4b9631fc"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "618c3061",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8a10"
-      },
-      "value" : "2001-08-16"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "PARTYAUS33"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "618c3061"
-      },
       "meta" : {
-        "globalKey" : "1ae1a04"
+        "globalKey" : "618c3061",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "213800QILIUD4ROSUO03",
           "meta" : {
-            "scheme" : "http://www.db.com/swaps/trade-id"
-          },
-          "value" : "DEUTDEFF"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e05045d7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "e05045d7"
-      },
       "meta" : {
-        "globalKey" : "efe549ad"
+        "globalKey" : "e05045d7",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "d9ed9d1d"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "d98c0375"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "618c3061"
-        }
-      },
       "quantity" : {
+        "value" : 45000,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
         },
-        "value" : 45000
+        "receiverPartyReference" : {
+          "globalReference" : "618c3061",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-11-06",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-11-06"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "8cc25bb5"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "6fafcb92"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex20-avg-rate-option-parametric.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex20-avg-rate-option-parametric.json
index f4c9d657dd..4d36614444 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex20-avg-rate-option-parametric.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex20-avg-rate-option-parametric.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "201b3f50"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "14aadbc1"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "618c3061"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "618c3061",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "PA-12345",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.partyA.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "e05045d7"
+        "globalKey" : "c9e1a36c"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "e05045d7",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DB-98765",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "213800QILIUD4ROSUO03"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e05045d7"
+            "scheme" : "http://www.db.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "20adbe1c"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-08-16",
+      "meta" : {
+        "globalKey" : "3e8a10"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "618c3061"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,28 +48,25 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "d03e3150"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3e8b04"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2001-12-04",
                     "meta" : {
                       "globalKey" : "3e8b04"
-                    },
-                    "valueDate" : "2001-12-04"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3e8b04"
                   }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
                   "optionStyle" : {
@@ -92,10 +74,10 @@
                       "expirationDate" : [ {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2001-11-30",
                             "meta" : {
                               "globalKey" : "3e8ade"
-                            },
-                            "value" : "2001-11-30"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -106,10 +88,10 @@
                         }
                       } ],
                       "expirationTime" : {
+                        "hourMinuteTime" : "12:30:00",
                         "businessCenter" : {
                           "value" : "MXMC"
-                        },
-                        "hourMinuteTime" : "12:30:00"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "300dc62e"
@@ -118,92 +100,37 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 9.82,
                       "unit" : {
                         "currency" : {
                           "value" : "MXN"
                         }
                       },
-                      "value" : 9.82,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "EXCHANGE_RATE"
-                    }
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "d03e3150"
-                },
-                "observationTerms" : {
-                  "informationSource" : {
-                    "primarySource" : {
-                      "sourcePage" : {
-                        "value" : "BNBX"
-                      },
-                      "sourceProvider" : {
-                        "value" : "REUTERS"
-                      }
-                    }
-                  },
-                  "observationDates" : {
-                    "periodicSchedule" : {
-                      "endDate" : {
-                        "adjustableDate" : {
-                          "meta" : {
-                            "globalKey" : "3e8ade"
-                          },
-                          "unadjustedDate" : "2001-11-30"
-                        },
-                        "meta" : {
-                          "globalKey" : "3e8ade"
-                        }
-                      },
-                      "periodFrequency" : {
-                        "meta" : {
-                          "globalKey" : "25e2ab"
-                        },
-                        "period" : "T",
-                        "periodMultiplier" : 1,
-                        "rollConvention" : "NONE"
-                      },
-                      "startDate" : {
-                        "adjustableDate" : {
-                          "meta" : {
-                            "globalKey" : "3e8ac1"
-                          },
-                          "unadjustedDate" : "2001-11-01"
-                        },
-                        "meta" : {
-                          "globalKey" : "3e8ac1"
-                        }
-                      }
+                      "priceType" : "ExchangeRate"
                     }
-                  },
-                  "pricingTime" : {
-                    "businessCenter" : {
-                      "value" : "MXMC"
-                    },
-                    "hourMinuteTime" : "18:00:00"
                   }
                 },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -212,18 +139,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -234,132 +161,205 @@
                   "meta" : {
                     "globalKey" : "c086df02"
                   }
+                },
+                "observationTerms" : {
+                  "pricingTime" : {
+                    "hourMinuteTime" : "18:00:00",
+                    "businessCenter" : {
+                      "value" : "MXMC"
+                    }
+                  },
+                  "informationSource" : {
+                    "primarySource" : {
+                      "sourceProvider" : {
+                        "value" : "Reuters"
+                      },
+                      "sourcePage" : {
+                        "value" : "BNBX"
+                      }
+                    }
+                  },
+                  "observationDates" : {
+                    "periodicSchedule" : {
+                      "startDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2001-11-01",
+                          "meta" : {
+                            "globalKey" : "3e8ac1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "3e8ac1"
+                        }
+                      },
+                      "endDate" : {
+                        "adjustableDate" : {
+                          "unadjustedDate" : "2001-11-30",
+                          "meta" : {
+                            "globalKey" : "3e8ade"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "3e8ade"
+                        }
+                      },
+                      "periodFrequency" : {
+                        "periodMultiplier" : 1,
+                        "period" : "T",
+                        "meta" : {
+                          "globalKey" : "24b525"
+                        },
+                        "rollConvention" : "NONE"
+                      }
+                    }
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "25242416"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "25242416"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "d03e3150"
+            "globalKey" : "25242416"
           }
         },
         "meta" : {
-          "globalKey" : "d03e3150"
+          "globalKey" : "25242416"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "4cd5bb17"
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
-            },
             "value" : {
+              "value" : 5750000,
               "unit" : {
                 "currency" : {
                   "value" : "MXN"
                 }
-              },
-              "value" : 5750000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 585539.71,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 585539.71
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "4de1a7c9"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "618c3061",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8a10"
-      },
-      "value" : "2001-08-16"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.partyA.com/fx/trade-id"
-          },
-          "value" : "PA-12345"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "618c3061"
-      },
       "meta" : {
-        "globalKey" : "7bde6da2"
+        "globalKey" : "618c3061",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "213800QILIUD4ROSUO03",
           "meta" : {
-            "scheme" : "http://www.db.com/fx/trade-id"
-          },
-          "value" : "DB-98765"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e05045d7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "e05045d7"
-      },
       "meta" : {
-        "globalKey" : "4e59c3b4"
+        "globalKey" : "e05045d7",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "1a38d4e7"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "52dd71cf"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "618c3061"
-        }
-      },
       "quantity" : {
+        "value" : 1750,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
         },
-        "value" : 1750
+        "receiverPartyReference" : {
+          "globalReference" : "618c3061",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2001-08-18",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2001-08-18"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "4674d8b3"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "f05ee1da"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex22-avg-rate-option-specific.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex22-avg-rate-option-specific.json
index 4cb0d3ca6c..37c027deeb 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex22-avg-rate-option-specific.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex22-avg-rate-option-specific.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "d3b88b69"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "ce21e41a"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "38cb9fc3"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "38cb9fc3",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "CH-23948",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "7H6GLXDRUGQFU57RNE97"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "38cb9fc3"
+            "scheme" : "http://www.chase.com/fx/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "e05045d7"
+        "globalKey" : "f5cc9d49"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "e05045d7",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "DB-89080",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "213800QILIUD4ROSUO03"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e05045d7"
+            "scheme" : "http://www.db.com/fx/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "20a000ec"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2010-08-16",
+      "meta" : {
+        "globalKey" : "3ed210"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "38cb9fc3"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,28 +48,25 @@
           } ],
           "economicTerms" : {
             "payout" : {
-              "meta" : {
-                "globalKey" : "a3f92825"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "3ed304"
-                  },
                   "settlementDate" : {
+                    "valueDate" : "2010-12-04",
                     "meta" : {
                       "globalKey" : "3ed304"
-                    },
-                    "valueDate" : "2010-12-04"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "3ed304"
                   }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
                   "optionStyle" : {
@@ -92,10 +74,10 @@
                       "expirationDate" : [ {
                         "adjustableDate" : {
                           "adjustedDate" : {
+                            "value" : "2010-11-30",
                             "meta" : {
                               "globalKey" : "3ed2de"
-                            },
-                            "value" : "2010-11-30"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "0"
@@ -106,10 +88,10 @@
                         }
                       } ],
                       "expirationTime" : {
+                        "hourMinuteTime" : "12:30:00",
                         "businessCenter" : {
                           "value" : "MXMC"
-                        },
-                        "hourMinuteTime" : "12:30:00"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "300dc62e"
@@ -118,32 +100,82 @@
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 12.40,
                       "unit" : {
                         "currency" : {
                           "value" : "MXN"
                         }
                       },
-                      "value" : 12.40,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "EXCHANGE_RATE"
+                      "priceType" : "ExchangeRate"
                     }
                   }
                 },
-                "meta" : {
-                  "globalKey" : "a3f92825"
+                "underlier" : {
+                  "foreignExchange" : {
+                    "exchangedCurrency1" : {
+                      "payerReceiver" : {
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
+                      },
+                      "priceQuantity" : {
+                        "quantitySchedule" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "quantity-2"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "b141411f"
+                      }
+                    },
+                    "exchangedCurrency2" : {
+                      "payerReceiver" : {
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
+                      },
+                      "priceQuantity" : {
+                        "quantitySchedule" : {
+                          "address" : {
+                            "scope" : "DOCUMENT",
+                            "value" : "quantity-1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "b14144c1"
+                      }
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "c086df02"
+                  }
                 },
                 "observationTerms" : {
+                  "pricingTime" : {
+                    "hourMinuteTime" : "18:00:00",
+                    "businessCenter" : {
+                      "value" : "MXMC"
+                    }
+                  },
                   "informationSource" : {
                     "primarySource" : {
+                      "sourceProvider" : {
+                        "value" : "Reuters"
+                      },
                       "sourcePage" : {
                         "value" : "BNBX"
-                      },
-                      "sourceProvider" : {
-                        "value" : "REUTERS"
                       }
                     }
                   },
@@ -151,340 +183,308 @@
                     "observationSchedule" : {
                       "observationDate" : [ {
                         "adjustedDate" : "2010-11-01",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b8590"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-02",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b85af"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-03",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b85ce"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-04",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b85ed"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-05",
+                        "weight" : 3,
                         "meta" : {
                           "globalKey" : "79b860e"
-                        },
-                        "weight" : 3
+                        }
                       }, {
                         "adjustedDate" : "2010-11-08",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b8669"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-09",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b8688"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-10",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b86a7"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-11",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b86c6"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-12",
+                        "weight" : 3,
                         "meta" : {
                           "globalKey" : "79b86e7"
-                        },
-                        "weight" : 3
+                        }
                       }, {
                         "adjustedDate" : "2010-11-15",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b8742"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-16",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b8761"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-17",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b8780"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-18",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b879f"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-19",
+                        "weight" : 3,
                         "meta" : {
                           "globalKey" : "79b87c0"
-                        },
-                        "weight" : 3
+                        }
                       }, {
                         "adjustedDate" : "2010-11-22",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b881b"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-23",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b883a"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-24",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b8859"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-25",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b8878"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-26",
+                        "weight" : 3,
                         "meta" : {
                           "globalKey" : "79b8899"
-                        },
-                        "weight" : 3
+                        }
                       }, {
                         "adjustedDate" : "2010-11-29",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b88f4"
-                        },
-                        "weight" : 1
+                        }
                       }, {
                         "adjustedDate" : "2010-11-30",
+                        "weight" : 1,
                         "meta" : {
                           "globalKey" : "79b8913"
-                        },
-                        "weight" : 1
+                        }
                       } ]
                     }
-                  },
-                  "pricingTime" : {
-                    "businessCenter" : {
-                      "value" : "MXMC"
-                    },
-                    "hourMinuteTime" : "18:00:00"
                   }
                 },
-                "underlier" : {
-                  "foreignExchange" : {
-                    "exchangedCurrency1" : {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
-                      },
-                      "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "quantitySchedule" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "quantity-2"
-                          }
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "b141411f"
-                      }
-                    },
-                    "exchangedCurrency2" : {
-                      "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
-                      },
-                      "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
-                        "quantitySchedule" : {
-                          "address" : {
-                            "scope" : "DOCUMENT",
-                            "value" : "quantity-1"
-                          }
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "b14144c1"
-                      }
-                    }
-                  },
-                  "meta" : {
-                    "globalKey" : "c086df02"
-                  }
+                "meta" : {
+                  "globalKey" : "4ae0ab61"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "4ae0ab61"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "a3f92825"
+            "globalKey" : "4ae0ab61"
           }
         },
         "meta" : {
-          "globalKey" : "a3f92825"
+          "globalKey" : "4ae0ab61"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "43d0bd20"
-          },
-          "observable" : {
-            "currencyPair" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "currencyPair-1"
-                } ]
-              },
-              "value" : {
-                "currency1" : {
+          "quantity" : [ {
+            "value" : {
+              "value" : 5750000,
+              "unit" : {
+                "currency" : {
                   "value" : "MXN"
-                },
-                "currency2" : {
-                  "value" : "USD"
-                },
-                "quoteBasis" : "CURRENCY_1_PER_CURRENCY_2"
+                }
               }
             },
-            "meta" : {
-              "globalKey" : "23f037eb"
-            }
-          },
-          "quantity" : [ {
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 463709.68,
               "unit" : {
                 "currency" : {
-                  "value" : "MXN"
+                  "value" : "USD"
                 }
-              },
-              "value" : 5750000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
+            }
+          } ],
+          "observable" : {
+            "currencyPair" : {
+              "value" : {
+                "currency1" : {
+                  "value" : "MXN"
+                },
+                "currency2" : {
                   "value" : "USD"
-                }
+                },
+                "quoteBasis" : "Currency1PerCurrency2"
               },
-              "value" : 463709.68
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "currencyPair-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "5a16c575"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "81a3b3aa"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "38cb9fc3",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ed210"
-      },
-      "value" : "2010-08-16"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "7H6GLXDRUGQFU57RNE97",
           "meta" : {
-            "scheme" : "http://www.chase.com/fx/trade-id"
-          },
-          "value" : "CH-23948"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "38cb9fc3"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "38cb9fc3"
-      },
       "meta" : {
-        "globalKey" : "58f2643f"
+        "globalKey" : "38cb9fc3",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "213800QILIUD4ROSUO03",
           "meta" : {
-            "scheme" : "http://www.db.com/fx/trade-id"
-          },
-          "value" : "DB-89080"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e05045d7"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "e05045d7"
-      },
       "meta" : {
-        "globalKey" : "1ac69284"
+        "globalKey" : "e05045d7",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "7fe08ac6"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "4979b9cf"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "e05045d7"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "38cb9fc3"
-        }
-      },
       "quantity" : {
+        "value" : 1750,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "e05045d7",
+          "externalReference" : "party2"
         },
-        "value" : 1750
+        "receiverPartyReference" : {
+          "globalReference" : "38cb9fc3",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2010-08-18",
         "dateAdjustments" : {
           "businessDayConvention" : "NONE",
           "meta" : {
             "globalKey" : "24a738"
           }
-        },
-        "unadjustedDate" : "2010-08-18"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "3d1120b3"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "6f6ac5f9"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex28-non-deliverable-w-disruption.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex28-non-deliverable-w-disruption.json
index 410bbbdb33..0899b91d28 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex28-non-deliverable-w-disruption.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/fx/fx-ex28-non-deliverable-w-disruption.json
@@ -1,58 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "9a53abdf"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "9a53abdf"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "d26b18a8"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "d26b18a8",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "12345678",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "HSBCGB01"
-        },
-        "meta" : {
-          "globalKey" : "d26b18a8"
+            "scheme" : "urn:hsbc:trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "733fed68"
+        "globalKey" : "26887e99"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "733fed68",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "AZ5678901",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "BNPPGB01"
-        },
-        "meta" : {
-          "globalKey" : "733fed68"
+            "scheme" : "run:bnpp/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "12f63b93"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2013-04-01",
+      "meta" : {
+        "globalKey" : "3ee901"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "733fed68"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "d26b18a8"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,22 +50,28 @@
             "payout" : {
               "forwardPayout" : [ {
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "63a40815"
-                  },
+                  "settlementType" : "Cash",
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
                   "settlementDate" : {
+                    "valueDate" : "2013-10-01",
                     "meta" : {
                       "globalKey" : "3eea81"
-                    },
-                    "valueDate" : "2013-10-01"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "78df60d7"
                   },
-                  "settlementType" : "CASH",
                   "cashSettlementTerms" : [ {
-                    "meta" : {
-                      "globalKey" : "9a6d21ef"
+                    "valuationMethod" : {
+                      "valuationSource" : {
+                        "settlementRateOption" : {
+                          "settlementRateOption" : {
+                            "value" : "BRL.PTAX/BRL09"
+                          }
+                        }
+                      }
                     },
                     "valuationDate" : {
                       "fxFixingDate" : {
@@ -87,6 +80,7 @@
                         },
                         "fxFixingDate" : {
                           "adjustableDate" : {
+                            "unadjustedDate" : "2013-09-29",
                             "dateAdjustments" : {
                               "businessDayConvention" : "NONE",
                               "meta" : {
@@ -95,8 +89,7 @@
                             },
                             "meta" : {
                               "globalKey" : "ec526e55"
-                            },
-                            "unadjustedDate" : "2013-09-29"
+                            }
                           },
                           "meta" : {
                             "globalKey" : "ec526e55"
@@ -104,36 +97,27 @@
                         }
                       }
                     },
-                    "valuationMethod" : {
-                      "valuationSource" : {
-                        "settlementRateOption" : {
-                          "settlementRateOption" : {
-                            "value" : "BRL.PTAX/BRL09"
-                          }
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "afa87ab1"
                     }
                   } ]
                 },
-                "meta" : {
-                  "globalKey" : "fedbde62"
-                },
                 "underlier" : {
                   "foreignExchange" : {
                     "exchangedCurrency1" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-2"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -142,18 +126,18 @@
                     },
                     "exchangedCurrency2" : {
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "priceQuantity" : {
-                        "meta" : {
-                          "globalKey" : "0"
-                        },
                         "quantitySchedule" : {
                           "address" : {
                             "scope" : "DOCUMENT",
                             "value" : "quantity-1"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
                         }
                       },
                       "meta" : {
@@ -161,136 +145,152 @@
                       }
                     },
                     "tenorPeriod" : {
-                      "meta" : {
-                        "globalKey" : "959"
-                      },
+                      "periodMultiplier" : 6,
                       "period" : "M",
-                      "periodMultiplier" : 6
+                      "meta" : {
+                        "globalKey" : "107"
+                      }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "8f19b317"
+                    "globalKey" : "8f19aac5"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "810fa10e"
                 }
               } ],
               "meta" : {
-                "globalKey" : "fedbde62"
+                "globalKey" : "810fa10e"
               }
             }
           },
           "meta" : {
-            "globalKey" : "fedbde62"
+            "globalKey" : "810fa10e"
           }
         },
         "meta" : {
-          "globalKey" : "fedbde62"
+          "globalKey" : "810fa10e"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "ce6b2c41"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.7690,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.7690,
-              "composite" : {
-                "arithmeticOperator" : "ADD",
-                "baseValue" : 0.7645,
-                "operand" : 0.0045,
-                "operandType" : "FORWARD_POINT"
-              },
               "perUnitOf" : {
                 "currency" : {
                   "value" : "BRL"
                 }
               },
-              "priceType" : "EXCHANGE_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "ExchangeRate",
+              "composite" : {
+                "baseValue" : 0.7645,
+                "operand" : 0.0045,
+                "arithmeticOperator" : "Add",
+                "operandType" : "ForwardPoint"
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 3000000,
               "unit" : {
                 "currency" : {
                   "value" : "BRL"
                 }
-              },
-              "value" : 3000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 2307000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 2307000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "1143e58d"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "733fed68",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "d26b18a8",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee901"
-      },
-      "value" : "2013-04-01"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "HSBCGB01",
           "meta" : {
-            "scheme" : "urn:hsbc:trade-id"
-          },
-          "value" : "12345678"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "d26b18a8"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "d26b18a8"
-      },
       "meta" : {
-        "globalKey" : "4a3b318f"
+        "globalKey" : "d26b18a8",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BNPPGB01",
           "meta" : {
-            "scheme" : "run:bnpp/trade-id"
-          },
-          "value" : "AZ5678901"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "733fed68"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "733fed68"
-      },
       "meta" : {
-        "globalKey" : "d078bf6b"
+        "globalKey" : "733fed68",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "f86fd835"
+    }
+  },
+  "meta" : {
+    "globalKey" : "f86fd835"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/bond-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/bond-option.json
index 8f81d11978..377a402c43 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/bond-option.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/bond-option.json
@@ -1,65 +1,30 @@
 {
-  "meta" : {
-    "globalKey" : "c8ac0249"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "cc4aa816"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Trade234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/coding-scheme/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "5c8ba844"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2006-05-10",
+      "meta" : {
+        "globalKey" : "3eb14a",
+        "externalKey" : "TRADEDATE"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -67,39 +32,33 @@
             "productQualifier" : "InterestRate_Option_DebtOption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "a9049674"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "35f85f44"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "JPY"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
+                      "unadjustedDate" : "2006-06-22",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "JPTO"
@@ -108,48 +67,32 @@
                             "globalKey" : "22da41"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211ff630"
                         }
-                      },
-                      "unadjustedDate" : "2006-06-22"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "a15ed25a"
                     }
                   },
-                  "settlementType" : "PHYSICAL"
+                  "meta" : {
+                    "globalKey" : "35f85f44"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "limitedRightToConfirm" : false,
-                    "manualExercise" : {
-                      "exerciseNotice" : {
-                        "businessCenter" : {
-                          "value" : "JPTO"
-                        },
-                        "exerciseNoticeGiver" : "BUYER"
-                      }
-                    },
-                    "splitTicket" : false
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "JPTO"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2006-06-19",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "JPTO"
@@ -158,56 +101,66 @@
                                 "globalKey" : "22da41"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "211ff630"
                             }
                           },
                           "meta" : {
                             "globalKey" : "9c40487d"
-                          },
-                          "unadjustedDate" : "2006-06-19"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "9c40487d"
                         }
                       } ],
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "JPTO"
+                        }
+                      },
                       "expirationTime" : {
+                        "hourMinuteTime" : "14:30:00",
                         "businessCenter" : {
                           "value" : "JPTO"
-                        },
-                        "hourMinuteTime" : "14:30:00"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "4e21c36f"
+                        "globalKey" : "d363f4ef"
                       }
                     }
                   },
                   "strike" : {
                     "strikePrice" : {
+                      "value" : 99.7,
                       "unit" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "value" : 99.7,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "JPY"
                         }
                       },
-                      "priceType" : "ASSET_PRICE"
+                      "priceType" : "AssetPrice"
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "exerciseNotice" : {
+                        "exerciseNoticeGiver" : "Buyer",
+                        "businessCenter" : {
+                          "value" : "JPTO"
+                        }
+                      }
+                    },
+                    "followUpConfirmation" : true,
+                    "limitedRightToConfirm" : false,
+                    "splitTicket" : false
                   }
                 },
-                "meta" : {
-                  "globalKey" : "a9049674"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "1ff493"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -215,140 +168,183 @@
                         "value" : "productIdentifier-1"
                       }
                     } ],
-                    "securityType" : "DEBT"
+                    "securityType" : "Debt"
+                  },
+                  "meta" : {
+                    "globalKey" : "1ff493"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "9eb735d8"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "9eb735d8"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "6f89384a"
+            "globalKey" : "1a0d08c2"
           }
         },
         "meta" : {
-          "globalKey" : "6f89384a"
+          "globalKey" : "1a0d08c2"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "bfb5991c"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "c772c8fb"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "CUSIP"
-                  },
-                  "value" : "ExampleCUSIP1"
-                },
-                "meta" : {
-                  "globalKey" : "c772c8fb"
-                },
-                "source" : "CUSIP"
-              }
-            } ]
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 10000000000,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
-              },
-              "value" : 10000000000
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "quantity-1"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 1,
               "unit" : {
-                "financialUnit" : "CONTRACT"
+                "financialUnit" : "Contract"
               },
-              "value" : 1,
               "multiplier" : {
+                "value" : 10000000000,
                 "unit" : {
                   "currency" : {
                     "value" : "JPY"
                   }
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "ExampleCUSIP1",
+                  "meta" : {
+                    "scheme" : "CUSIP"
+                  }
                 },
-                "value" : 10000000000
+                "source" : "CUSIP",
+                "meta" : {
+                  "globalKey" : "c772c8fb"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "26e65665"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "7aeade46"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "Party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "TRADEDATE",
-        "globalKey" : "3eb14a"
-      },
-      "value" : "2006-05-10"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "Party1"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/coding-scheme/trade-id"
-          },
-          "value" : "Trade234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "7215e0ba"
+        "globalKey" : "33f59568",
+        "externalKey" : "Party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "e0f2aca0"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "d0bfa09f"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59567"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59568"
-        }
-      },
       "quantity" : {
+        "value" : 25000000,
         "unit" : {
           "currency" : {
             "value" : "JPY"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "Party1"
         },
-        "value" : 25000000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "Party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2006-05-15",
         "dateAdjustments" : {
+          "businessDayConvention" : "FOLLOWING",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "JPTO"
@@ -357,16 +353,20 @@
               "globalKey" : "22da41"
             }
           },
-          "businessDayConvention" : "FOLLOWING",
           "meta" : {
             "globalKey" : "211ff630"
           }
-        },
-        "unadjustedDate" : "2006-05-15"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "211d2771"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "98629ed1"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/cb-option-2.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/cb-option-2.json
index ab42cf73da..0deb3b11ea 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/cb-option-2.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/cb-option-2.json
@@ -1,65 +1,29 @@
 {
-  "meta" : {
-    "globalKey" : "14e5f0ca"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "14e5f0ca"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "PartyA",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "PartyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Bond1",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.PartyA.com/eqd-trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "PartyB",
-        "globalKey" : "33f59568"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
-        }
-      } ]
+        "globalKey" : "10ca1193"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2004-12-24",
+      "meta" : {
+        "globalKey" : "3ea318"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "PartyA",
-          "globalReference" : "33f59567"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "PartyB",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "PartyA",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -67,45 +31,38 @@
             "productQualifier" : "InterestRate_Option_DebtOption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "ffc3f85f"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "a4f95ea9"
-                  },
+                  "settlementType" : "Physical",
                   "settlementCurrency" : {
                     "value" : "JPY"
                   },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 8,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "6446a93f"
+                          "globalKey" : "bfe34747"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 8,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -116,42 +73,33 @@
                             "globalKey" : "42a8663"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "EXERCISE",
-                          "globalReference" : "709ae601"
+                          "globalReference" : "2da32bc1",
+                          "externalReference" : "EXERCISE"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "6446a93f"
+                      "globalKey" : "bfe34747"
                     }
                   },
-                  "settlementType" : "PHYSICAL"
+                  "meta" : {
+                    "globalKey" : "95fcb1"
+                  }
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Call",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "limitedRightToConfirm" : false,
-                    "manualExercise" : {
-                      "exerciseNotice" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "exerciseNoticeGiver" : "SELLER"
-                      }
-                    },
-                    "splitTicket" : true
-                  },
                   "optionStyle" : {
                     "americanExercise" : {
                       "commencementDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2004-12-29",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -162,29 +110,23 @@
                                 "globalKey" : "42a8663"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da506292"
                             }
                           },
                           "meta" : {
                             "globalKey" : "dc6674d5"
-                          },
-                          "unadjustedDate" : "2004-12-29"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "dc6674d5"
                         }
                       },
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2009-06-01",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -195,34 +137,38 @@
                                 "globalKey" : "42a8663"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da506292"
                             }
                           },
                           "meta" : {
                             "globalKey" : "dd0515f1"
-                          },
-                          "unadjustedDate" : "2009-06-01"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "dd0515f1"
                         }
                       },
-                      "expirationTime" : {
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "16:00:00"
+                        }
                       },
-                      "meta" : {
-                        "externalKey" : "EXERCISE",
-                        "globalKey" : "709ae601"
+                      "expirationTime" : {
+                        "hourMinuteTime" : "16:00:00",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
                       },
                       "multipleExercise" : {
                         "integralMultipleAmount" : 1,
                         "minimumNumberOfOptions" : 20,
                         "maximumNumberOfOptions" : 200
+                      },
+                      "meta" : {
+                        "globalKey" : "2da32bc1",
+                        "externalKey" : "EXERCISE"
                       }
                     }
                   },
@@ -231,25 +177,31 @@
                       "swapUnwindValue" : {
                         "floatingRateIndex" : "JPY-LIBOR-BBA",
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
+                          "periodMultiplier" : 6,
                           "period" : "M",
-                          "periodMultiplier" : 6
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         },
                         "spread" : 27
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "exerciseNotice" : {
+                        "exerciseNoticeGiver" : "Seller",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      }
+                    },
+                    "followUpConfirmation" : true,
+                    "limitedRightToConfirm" : false,
+                    "splitTicket" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "ffc3f85f"
-                },
-                "optionType" : "CALL",
                 "underlier" : {
-                  "meta" : {
-                    "globalKey" : "1ff493"
-                  },
                   "security" : {
                     "productIdentifier" : [ {
                       "address" : {
@@ -257,97 +209,145 @@
                         "value" : "productIdentifier-1"
                       }
                     } ],
-                    "securityType" : "DEBT"
+                    "securityType" : "Debt"
+                  },
+                  "meta" : {
+                    "globalKey" : "1ff493"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "691e3ccb"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "691e3ccb"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "168b5335"
+            "globalKey" : "e6ce1ef5"
           }
         },
         "meta" : {
-          "globalKey" : "168b5335"
+          "globalKey" : "e6ce1ef5"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "35e03288"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "847bd748"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "ISIN"
-                  },
-                  "value" : "ExampleISIN2"
-                },
-                "meta" : {
-                  "globalKey" : "847bd748"
-                },
-                "source" : "ISIN"
-              }
-            } ]
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 200,
               "unit" : {
-                "financialUnit" : "CONTRACT"
+                "financialUnit" : "Contract"
               },
-              "value" : 200,
               "multiplier" : {
+                "value" : 10000000,
                 "unit" : {
                   "currency" : {
                     "value" : "JPY"
                   }
+                }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "ExampleISIN2",
+                  "meta" : {
+                    "scheme" : "ISIN"
+                  }
                 },
-                "value" : 10000000
+                "source" : "ISIN",
+                "meta" : {
+                  "globalKey" : "847bd748"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
               }
+            } ],
+            "meta" : {
+              "globalKey" : "aff11b8"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "76b52888"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "PartyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "PartyA"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59567",
+          "externalReference" : "PartyA"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "Party A",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "3ea318"
-      },
-      "value" : "2004-12-24"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+        "globalKey" : "33f59567",
+        "externalKey" : "PartyA"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.PartyA.com/eqd-trade-id"
-          },
-          "value" : "Bond1"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "PartyA",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "f511a869"
+        "globalKey" : "33f59568",
+        "externalKey" : "PartyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "d6cb94d0"
+    }
+  },
+  "meta" : {
+    "globalKey" : "d6cb94d0"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex01-vanilla-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex01-vanilla-swap.json
index 43c5c33724..ee103d0f9c 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex01-vanilla-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex01-vanilla-swap.json
@@ -1,63 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "a488b6c3"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "a488b6c3"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "cc5aba48"
-      },
-      "name" : {
-        "value" : "Party A"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "63373188",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "TW9235",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "695e25ab"
+        "globalKey" : "29b63a53"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "695e25ab",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "SW2000",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "529900DTJ5A7S5UCBB52"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "695e25ab"
+            "scheme" : "http://www.barclays.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "27fe9f96"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "1994-12-12",
+      "meta" : {
+        "globalKey" : "3e530c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "cc5aba48"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "695e25ab"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -68,46 +50,40 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c89"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -116,103 +92,108 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "3e2554c0"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "DEFR"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "1ff50d"
+                            "globalKey" : "1ff50d",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365af8de"
                         }
                       },
                       "meta" : {
                         "globalKey" : "a8d53690"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "a8d53690"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "97763931"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa45fc6"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "18a9b"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "a26405d2",
+                    "externalKey" : "floatingCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "7a04f180"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "3e2554c0"
+                    "globalReference" : "a26405d2",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "131ae8a2"
+                      "globalKey" : "eff6d356"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -221,82 +202,79 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "dbde664a"
+                      "globalReference" : "a5aeeeb8",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "dbde664a"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "a5aeeeb8",
+                    "externalKey" : "resetDates"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "2e03d8ab"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b8fa"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30E/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -305,248 +283,270 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "faa5b75e"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "1ff50d"
+                            "globalReference" : "1ff50d",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "93c845ff"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "93c845ff"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30E/360"
-                },
-                "meta" : {
-                  "globalKey" : "f8158737"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa46135"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "ac8"
+                      "globalKey" : "1794a"
                     },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "9249d1f2",
+                    "externalKey" : "fixedCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "85fff0af"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "9c789d4b"
                 }
               } ],
               "meta" : {
-                "globalKey" : "4f3ab328"
+                "globalKey" : "eee37036"
               }
             }
           },
           "meta" : {
-            "globalKey" : "4f3ab328"
+            "globalKey" : "eee37036"
           }
         },
         "meta" : {
-          "globalKey" : "4f3ab328"
+          "globalKey" : "eee37036"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "3ce21b9b"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "53c66a4c"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-LIBOR-BBA"
-                },
-                "indexTenor" : {
+          "quantity" : [ {
+            "value" : {
+              "value" : 50000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR",
                   "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                  }
                 }
               }
-            }
-          },
-          "quantity" : [ {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                    "globalKey" : "107"
+                  }
                 }
               },
-              "value" : 50000000.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2505dd46"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "4882fcbc"
           },
+          "meta" : {
+            "globalKey" : "c0d07bed"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "value" : 0.06,
               "perUnitOf" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000.00,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
-              },
-              "value" : 50000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "c7dc9ac4"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "63373188",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "695e25ab",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e530c"
-      },
-      "value" : "1994-12-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "TW9235"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "cc5aba48"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "38e8e6c9"
+        "globalKey" : "63373188",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "529900DTJ5A7S5UCBB52",
           "meta" : {
-            "scheme" : "http://www.barclays.com/swaps/trade-id"
-          },
-          "value" : "SW2000"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "695e25ab"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "695e25ab"
-      },
       "meta" : {
-        "globalKey" : "c4f82eae"
+        "globalKey" : "695e25ab",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "b30da6cd"
+    }
+  },
+  "meta" : {
+    "globalKey" : "b30da6cd"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex02-stub-amort-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex02-stub-amort-swap.json
index ac64dbdc57..882413bc49 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex02-stub-amort-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex02-stub-amort-swap.json
@@ -1,63 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "e08e204f"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "e08e204f"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "cc5aba48"
-      },
-      "name" : {
-        "value" : "Party A"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "63373188",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "TW9235",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "695e25ab"
+        "globalKey" : "29b63a53"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "695e25ab",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "SW2000",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "529900DTJ5A7S5UCBB52"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "695e25ab"
+            "scheme" : "http://www.barclays.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "27fe9f96"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "1994-12-12",
+      "meta" : {
+        "globalKey" : "3e530c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "cc5aba48"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "695e25ab"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -68,46 +50,40 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c89"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1995-01-16",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -116,43 +92,148 @@
                       },
                       "meta" : {
                         "globalKey" : "ea2e2b88"
-                      },
-                      "unadjustedDate" : "1995-01-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea2e2b88"
                     }
                   },
-                  "firstRegularPeriodStartDate" : "1995-06-14",
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "9c21ca90"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "DEFR"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "1ff50d"
+                            "globalKey" : "1ff50d",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365af8de"
                         }
                       },
                       "meta" : {
                         "globalKey" : "a8d53690"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "a8d53690"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "firstRegularPeriodStartDate" : "1995-06-14",
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18a9b"
+                    },
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "6d5c05e",
+                    "externalKey" : "floatingCalcPeriodDates"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "firstPaymentDate" : "1995-06-14",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "e89777b2"
+                  }
+                },
+                "resetDates" : {
+                  "calculationPeriodDatesReference" : {
+                    "globalReference" : "6d5c05e",
+                    "externalReference" : "floatingCalcPeriodDates"
+                  },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
+                  "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "eff6d356"
+                    },
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
+                      }
+                    },
+                    "dateRelativeTo" : {
+                      "globalReference" : "a5aeeeb8",
+                      "externalReference" : "resetDates"
+                    }
+                  },
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "a5aeeeb8",
+                    "externalKey" : "resetDates"
                   }
                 },
                 "cashflowRepresentation" : {
@@ -160,396 +241,293 @@
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "1995-06-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1995-06-14",
                       "adjustedStartDate" : "1995-01-16",
+                      "adjustedEndDate" : "1995-06-14",
                       "meta" : {
-                        "globalKey" : "c448d4ce"
+                        "globalKey" : "2cf04f92"
                       },
+                      "notionalAmount" : 50000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1995-01-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78cb135"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 50000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "af13c05c"
+                      "globalKey" : "17bb3b20"
                     }
                   }, {
                     "adjustedPaymentDate" : "1995-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1995-12-14",
                       "adjustedStartDate" : "1995-06-14",
+                      "adjustedEndDate" : "1995-12-14",
                       "meta" : {
-                        "globalKey" : "3c46f290"
+                        "globalKey" : "7232ff90"
                       },
+                      "notionalAmount" : 50000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1995-06-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78cd7f5"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 50000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "8db85f9e"
+                      "globalKey" : "c3a46c9e"
                     }
                   }, {
                     "adjustedPaymentDate" : "1996-06-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1996-06-14",
                       "adjustedStartDate" : "1995-12-14",
+                      "adjustedEndDate" : "1996-06-14",
                       "meta" : {
-                        "globalKey" : "9c5b90b1"
+                        "globalKey" : "db5a73b1"
                       },
+                      "notionalAmount" : 40000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1995-12-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78d0675"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 40000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "aa9e843f"
+                      "globalKey" : "e99d673f"
                     }
                   }, {
                     "adjustedPaymentDate" : "1996-12-16",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1996-12-16",
                       "adjustedStartDate" : "1996-06-14",
+                      "adjustedEndDate" : "1996-12-16",
                       "meta" : {
-                        "globalKey" : "7701bbb3"
+                        "globalKey" : "468b036f"
                       },
+                      "notionalAmount" : 40000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1996-06-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78dcff5"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 40000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "14740ec3"
+                      "globalKey" : "e3fd567f"
                     }
                   }, {
                     "adjustedPaymentDate" : "1997-06-16",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1997-06-16",
                       "adjustedStartDate" : "1996-12-16",
+                      "adjustedEndDate" : "1997-06-16",
                       "meta" : {
-                        "globalKey" : "da800b12"
+                        "globalKey" : "197eee12"
                       },
+                      "notionalAmount" : 30000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1996-12-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78dfe75"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 30000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "34c3e4a2"
+                      "globalKey" : "73c2c7a2"
                     }
                   }, {
                     "adjustedPaymentDate" : "1997-12-15",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1997-12-15",
                       "adjustedStartDate" : "1997-06-16",
+                      "adjustedEndDate" : "1997-12-15",
                       "meta" : {
-                        "globalKey" : "16738451"
+                        "globalKey" : "7f90f3f3"
                       },
+                      "notionalAmount" : 30000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1997-06-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78ec7f5"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 30000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "43197060"
+                      "globalKey" : "ac36e002"
                     }
                   }, {
                     "adjustedPaymentDate" : "1998-06-15",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1998-06-15",
                       "adjustedStartDate" : "1997-12-15",
+                      "adjustedEndDate" : "1998-06-15",
                       "meta" : {
-                        "globalKey" : "74d349b4"
+                        "globalKey" : "b3d22cb4"
                       },
+                      "notionalAmount" : 20000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1997-12-11",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78ef656"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 20000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "5e4abc43"
+                      "globalKey" : "9d499f43"
                     }
                   }, {
                     "adjustedPaymentDate" : "1998-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1998-12-14",
                       "adjustedStartDate" : "1998-06-15",
+                      "adjustedEndDate" : "1998-12-14",
                       "meta" : {
-                        "globalKey" : "b0c6c2f3"
+                        "globalKey" : "19e43295"
                       },
+                      "notionalAmount" : 20000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1998-06-11",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78fbfd6"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 20000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "6ca04801"
+                      "globalKey" : "d5bdb7a3"
                     }
                   }, {
                     "adjustedPaymentDate" : "1999-06-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1999-06-14",
                       "adjustedStartDate" : "1998-12-14",
+                      "adjustedEndDate" : "1999-06-14",
                       "meta" : {
-                        "globalKey" : "f268856"
+                        "globalKey" : "4e256b56"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1998-12-10",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78fee37"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "87d193e4"
+                      "globalKey" : "c6d076e4"
                     }
                   }, {
                     "adjustedPaymentDate" : "1999-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1999-12-14",
                       "adjustedStartDate" : "1999-06-14",
+                      "adjustedEndDate" : "1999-12-14",
                       "meta" : {
-                        "globalKey" : "80003cd6"
+                        "globalKey" : "b5ec49d6"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1999-06-10",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "790b7b7"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "5f51c9e4"
+                      "globalKey" : "953dd6e4"
                     }
                   } ]
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "8e9e1c0e"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "1995-06-14",
-                  "meta" : {
-                    "globalKey" : "be36e5f8"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
-                  }
-                },
-                "resetDates" : {
-                  "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "9c21ca90"
-                  },
-                  "fixingDates" : {
-                    "meta" : {
-                      "globalKey" : "131ae8a2"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
-                      }
-                    },
-                    "businessDayConvention" : "NONE",
-                    "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "dbde664a"
-                    }
-                  },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "dbde664a"
-                  },
-                  "resetDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
-                },
                 "stubPeriod" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "9c21ca90"
+                    "globalReference" : "6d5c05e",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
                   "initialStub" : {
                     "floatingRate" : [ {
                       "floatingRateIndex" : "EUR-LIBOR-BBA",
                       "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "957"
-                        },
+                        "periodMultiplier" : 4,
                         "period" : "M",
-                        "periodMultiplier" : 4
+                        "meta" : {
+                          "globalKey" : "c9"
+                        }
                       }
                     }, {
                       "floatingRateIndex" : "EUR-LIBOR-BBA",
                       "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "958"
-                        },
+                        "periodMultiplier" : 5,
                         "period" : "M",
-                        "periodMultiplier" : 5
+                        "meta" : {
+                          "globalKey" : "e8"
+                        }
                       }
                     } ]
                   }
+                },
+                "meta" : {
+                  "globalKey" : "6a276c68"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b8fa"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30E/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1995-01-16",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -558,43 +536,94 @@
                       },
                       "meta" : {
                         "globalKey" : "ea2e2b88"
-                      },
-                      "unadjustedDate" : "1995-01-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea2e2b88"
                     }
                   },
-                  "firstRegularPeriodStartDate" : "1995-12-14",
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "a3080eae"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "1ff50d"
+                            "globalReference" : "1ff50d",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "93c845ff"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "93c845ff"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "firstRegularPeriodStartDate" : "1995-12-14",
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "1794a"
+                    },
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "41216dfe",
+                    "externalKey" : "fixedCalcPeriodDates"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
+                  },
+                  "firstPaymentDate" : "1995-12-14",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "1ff50d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "62bc2561"
                   }
                 },
                 "cashflowRepresentation" : {
@@ -602,330 +631,301 @@
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "1995-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1995-12-14",
                       "adjustedStartDate" : "1995-01-16",
+                      "adjustedEndDate" : "1995-12-14",
                       "meta" : {
-                        "globalKey" : "696aad9"
+                        "globalKey" : "ad836cc7"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 50000000.00
+                      "notionalAmount" : 50000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "ddfd088b"
+                      "globalKey" : "84e9ca79"
                     }
                   }, {
                     "adjustedPaymentDate" : "1996-12-16",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1996-12-16",
                       "adjustedStartDate" : "1995-12-14",
+                      "adjustedEndDate" : "1996-12-16",
                       "meta" : {
-                        "globalKey" : "a263a9f6"
+                        "globalKey" : "1a9c29ca"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 40000000.00
+                      "notionalAmount" : 40000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "23f8b0e6"
+                      "globalKey" : "9c3130ba"
                     }
                   }, {
                     "adjustedPaymentDate" : "1997-12-15",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1997-12-15",
                       "adjustedStartDate" : "1996-12-16",
+                      "adjustedEndDate" : "1997-12-15",
                       "meta" : {
-                        "globalKey" : "3e43103a"
+                        "globalKey" : "8a199fc6"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 30000000.00
+                      "notionalAmount" : 30000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "64e8368b"
+                      "globalKey" : "b0bec617"
                     }
                   }, {
                     "adjustedPaymentDate" : "1998-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1998-12-14",
                       "adjustedStartDate" : "1997-12-15",
+                      "adjustedEndDate" : "1998-12-14",
                       "meta" : {
-                        "globalKey" : "da226b3b"
+                        "globalKey" : "f995b8a5"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 20000000.00
+                      "notionalAmount" : 20000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "a5d7b0ed"
+                      "globalKey" : "c54afe57"
                     }
                   }, {
                     "adjustedPaymentDate" : "1999-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1999-12-14",
                       "adjustedStartDate" : "1998-12-14",
+                      "adjustedEndDate" : "1999-12-14",
                       "meta" : {
-                        "globalKey" : "76023a9b"
+                        "globalKey" : "6911d545"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 10000000.00
+                      "notionalAmount" : 10000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "e87c784d"
+                      "globalKey" : "db8c12f7"
                     }
                   } ]
                 },
-                "dayCountFraction" : {
-                  "value" : "30E/360"
-                },
                 "meta" : {
-                  "globalKey" : "7e082468"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "1995-12-14",
-                  "meta" : {
-                    "globalKey" : "2c6095e7"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "1ff50d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "c93056fc"
                 }
               } ],
               "meta" : {
-                "globalKey" : "2479561a"
+                "globalKey" : "9ac18794"
               }
             }
           },
           "meta" : {
-            "globalKey" : "2479561a"
+            "globalKey" : "9ac18794"
           }
         },
         "meta" : {
-          "globalKey" : "2479561a"
+          "globalKey" : "9ac18794"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "ce4c2099"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "53c66a4c"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
-              }
-            }
-          },
           "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
-            },
             "value" : {
+              "value" : 50000000.00,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "value" : 50000000.00,
               "datedValue" : [ {
                 "date" : "1995-12-14",
+                "value" : 40000000.00,
                 "meta" : {
                   "globalKey" : "6118d22e"
-                },
-                "value" : 40000000.00
+                }
               }, {
                 "date" : "1996-12-14",
+                "value" : 30000000.00,
                 "meta" : {
                   "globalKey" : "f9389d4f"
-                },
-                "value" : 30000000.00
+                }
               }, {
                 "date" : "1997-12-14",
+                "value" : 20000000.00,
                 "meta" : {
                   "globalKey" : "91586870"
-                },
-                "value" : 20000000.00
+                }
               }, {
                 "date" : "1998-12-14",
+                "value" : 10000000.00,
                 "meta" : {
                   "globalKey" : "29783391"
-                },
-                "value" : 10000000.00
+                }
               } ]
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "5187583a"
-          },
-          "price" : [ {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-1"
+                "value" : "quantity-1"
               } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
             },
+            "meta" : {
+              "globalKey" : "2505dd46"
+            }
+          },
+          "meta" : {
+            "globalKey" : "1b0c096b"
+          }
+        }, {
+          "price" : [ {
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "value" : 0.06,
               "perUnitOf" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 50000000.00,
               "unit" : {
                 "currency" : {
+                  "value" : "EUR",
                   "meta" : {
                     "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                  },
-                  "value" : "EUR"
+                  }
                 }
               },
-              "value" : 50000000.00,
               "datedValue" : [ {
                 "date" : "1995-12-14",
+                "value" : 40000000.00,
                 "meta" : {
                   "globalKey" : "6118d22e"
-                },
-                "value" : 40000000.00
+                }
               }, {
                 "date" : "1996-12-14",
+                "value" : 30000000.00,
                 "meta" : {
                   "globalKey" : "f9389d4f"
-                },
-                "value" : 30000000.00
+                }
               }, {
                 "date" : "1997-12-14",
+                "value" : 20000000.00,
                 "meta" : {
                   "globalKey" : "91586870"
-                },
-                "value" : 20000000.00
+                }
               }, {
                 "date" : "1998-12-14",
+                "value" : 10000000.00,
                 "meta" : {
                   "globalKey" : "29783391"
-                },
-                "value" : 10000000.00
+                }
+              } ]
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
               } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "df63af06"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "63373188",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "695e25ab",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e530c"
-      },
-      "value" : "1994-12-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "TW9235"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "cc5aba48"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "38e8e6c9"
+        "globalKey" : "63373188",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "529900DTJ5A7S5UCBB52",
           "meta" : {
-            "scheme" : "http://www.barclays.com/swaps/trade-id"
-          },
-          "value" : "SW2000"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "695e25ab"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "695e25ab"
-      },
       "meta" : {
-        "globalKey" : "c4f82eae"
+        "globalKey" : "695e25ab",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "869f3695"
+    }
+  },
+  "meta" : {
+    "globalKey" : "869f3695"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex03-compound-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex03-compound-swap.json
index f4b056e314..c7b876aa5d 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex03-compound-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex03-compound-swap.json
@@ -1,59 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "cdb0b715"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "cdb0b715"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56323",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "4fbfe65e"
+        "globalKey" : "987ead88"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "4fbfe65e",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56990",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300TJF420N3F01V87"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "4fbfe65e"
+            "scheme" : "http://www.msdw/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "987f3943"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-04-25",
+      "meta" : {
+        "globalKey" : "3e8119"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "4fbfe65e"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -64,46 +50,44 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "calculationPeriodFrequency" : {
                     "meta" : {
-                      "globalKey" : "28c4e"
+                      "globalKey" : "5c38cb89"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "27"
-                  },
+                    "finalRateRounding" : {
+                      "roundingDirection" : "Nearest",
+                      "precision" : 7
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2000-04-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -112,20 +96,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eac74d93"
-                      },
-                      "unadjustedDate" : "2000-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eac74d93"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "21daa179"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2002-04-27",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -133,381 +114,440 @@
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "42f910b"
+                            "globalKey" : "42f910b",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b8e49c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "f4e4ef21"
-                      },
-                      "unadjustedDate" : "2002-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "f4e4ef21"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f7a"
+                    },
+                    "rollConvention" : "27"
+                  },
+                  "meta" : {
+                    "globalKey" : "c239cad3",
+                    "externalKey" : "floatingCalcPeriodDates"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
+                    },
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "f571e5df"
+                  }
+                },
+                "resetDates" : {
+                  "calculationPeriodDatesReference" : {
+                    "globalReference" : "c239cad3",
+                    "externalReference" : "floatingCalcPeriodDates"
+                  },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
+                  "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "eff6d356"
+                    },
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
+                      }
+                    },
+                    "dateRelativeTo" : {
+                      "globalReference" : "6fc3cf5",
+                      "externalReference" : "resetDates"
+                    }
+                  },
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "6fc3cf5",
+                    "externalKey" : "resetDates"
                   }
                 },
+                "compoundingMethod" : "Flat",
                 "cashflowRepresentation" : {
                   "cashflowsMatchParameters" : true,
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "2000-11-03",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2000-07-27",
                       "adjustedStartDate" : "2000-04-27",
+                      "adjustedEndDate" : "2000-07-27",
                       "meta" : {
-                        "globalKey" : "c3ac6219"
+                        "globalKey" : "5ea26899"
                       },
+                      "notionalAmount" : 100000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2000-04-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "791a208"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000.00
+                      }
                     }, {
-                      "adjustedEndDate" : "2000-10-27",
                       "adjustedStartDate" : "2000-07-27",
+                      "adjustedEndDate" : "2000-10-27",
                       "meta" : {
-                        "globalKey" : "b7fb6159"
+                        "globalKey" : "52f167d9"
                       },
+                      "notionalAmount" : 100000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2000-07-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "791b948"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "8b58bde3"
+                      "globalKey" : "a23c6de3"
                     }
                   }, {
                     "adjustedPaymentDate" : "2001-05-04",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2001-01-29",
                       "adjustedStartDate" : "2000-10-27",
+                      "adjustedEndDate" : "2001-01-29",
                       "meta" : {
-                        "globalKey" : "953f1c1b"
+                        "globalKey" : "d2e53357"
                       },
+                      "notionalAmount" : 100000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2000-10-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "791d088"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000.00
+                      }
                     }, {
-                      "adjustedEndDate" : "2001-04-27",
                       "adjustedStartDate" : "2001-01-29",
+                      "adjustedEndDate" : "2001-04-27",
                       "meta" : {
-                        "globalKey" : "ab670c17"
+                        "globalKey" : "acbfd7db"
                       },
+                      "notionalAmount" : 100000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2001-01-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "79282c8"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "301bace0"
+                      "globalKey" : "dd05e8"
                     }
                   }, {
                     "adjustedPaymentDate" : "2001-11-05",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2001-07-27",
                       "adjustedStartDate" : "2001-04-27",
+                      "adjustedEndDate" : "2001-07-27",
                       "meta" : {
-                        "globalKey" : "9c4c5a19"
+                        "globalKey" : "37426099"
                       },
+                      "notionalAmount" : 100000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2001-04-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "7929a08"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000.00
+                      }
                     }, {
-                      "adjustedEndDate" : "2001-10-29",
                       "adjustedStartDate" : "2001-07-27",
+                      "adjustedEndDate" : "2001-10-29",
                       "meta" : {
-                        "globalKey" : "fa67cfdb"
+                        "globalKey" : "2efb1117"
                       },
+                      "notionalAmount" : 100000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2001-07-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "792b148"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "e801f867"
+                      "globalKey" : "9882e323"
                     }
                   }, {
                     "adjustedPaymentDate" : "2002-05-06",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2002-01-29",
                       "adjustedStartDate" : "2001-10-29",
+                      "adjustedEndDate" : "2002-01-29",
                       "meta" : {
-                        "globalKey" : "7148c559"
+                        "globalKey" : "1551a1d9"
                       },
+                      "notionalAmount" : 100000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2001-10-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "792c888"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000.00
+                      }
                     }, {
-                      "adjustedEndDate" : "2002-04-29",
                       "adjustedStartDate" : "2002-01-29",
+                      "adjustedEndDate" : "2002-04-29",
                       "meta" : {
-                        "globalKey" : "edd37a99"
+                        "globalKey" : "88c98119"
                       },
+                      "notionalAmount" : 100000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2002-01-25",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "7937ac8"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "69caf466"
+                      "globalKey" : "badf0e66"
                     }
                   } ]
                 },
-                "compoundingMethod" : "FLAT",
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
                 "meta" : {
-                  "globalKey" : "17a48acd"
+                  "globalKey" : "65578d2f"
+                }
+              }, {
+                "payerReceiver" : {
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "dd339947"
+                "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf9f"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "979ebd17"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "finalRateRounding" : {
-                      "precision" : 7,
-                      "roundingDirection" : "NEAREST"
+                    "meta" : {
+                      "globalKey" : "0"
                     }
                   }
                 },
-                "resetDates" : {
-                  "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "21daa179"
-                  },
-                  "fixingDates" : {
-                    "meta" : {
-                      "globalKey" : "131ae8a2"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
+                  "effectiveDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2000-04-27",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "NONE",
+                        "meta" : {
+                          "globalKey" : "24a738"
+                        }
+                      },
                       "meta" : {
-                        "globalKey" : "21479e"
+                        "globalKey" : "eac74d93"
                       }
                     },
-                    "businessDayConvention" : "NONE",
-                    "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "dbde6647"
+                    "meta" : {
+                      "globalKey" : "eac74d93"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "dbde6647"
-                  },
-                  "resetDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
+                  "terminationDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2002-04-27",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
+                        "businessCenters" : {
+                          "businessCentersReference" : {
+                            "globalReference" : "42f910b",
+                            "externalReference" : "primaryBusinessCenters"
+                          },
+                          "meta" : {
+                            "globalKey" : "eb13047c"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "214e084d"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "eb13047c"
+                        "globalKey" : "3494f012"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "3494f012"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
-                }
-              }, {
-                "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
-                },
-                "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
-                    }
-                  }
-                },
-                "calculationPeriodDates" : {
                   "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
                   "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "28cab"
+                      "globalKey" : "18abd"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
                     "rollConvention" : "27"
                   },
-                  "effectiveDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "NONE",
-                        "meta" : {
-                          "globalKey" : "24a738"
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "eac74d93"
-                      },
-                      "unadjustedDate" : "2000-04-27"
-                    },
+                  "meta" : {
+                    "globalKey" : "d54cd385",
+                    "externalKey" : "fixedCalcPeriodDates"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "eac74d93"
+                      "globalKey" : "107"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "7115972d"
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 5,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4acac1"
+                    },
+                    "dayType" : "Business"
                   },
-                  "terminationDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessCenters" : {
-                          "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "42f910b"
-                          },
-                          "meta" : {
-                            "globalKey" : "eb13047c"
-                          }
-                        },
-                        "businessDayConvention" : "MODFOLLOWING",
-                        "meta" : {
-                          "globalKey" : "214e084d"
-                        }
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
-                        "globalKey" : "3494f012"
-                      },
-                      "unadjustedDate" : "2002-04-27"
+                        "globalKey" : "eb13047c"
+                      }
                     },
                     "meta" : {
-                      "globalKey" : "3494f012"
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f571e5df"
                   }
                 },
                 "cashflowRepresentation" : {
@@ -515,261 +555,221 @@
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "2000-11-03",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2000-10-27",
                       "adjustedStartDate" : "2000-04-27",
+                      "adjustedEndDate" : "2000-10-27",
                       "meta" : {
-                        "globalKey" : "ac8b1251"
+                        "globalKey" : "f1cc728f"
                       },
-                      "fixedRate" : 0.0585,
-                      "notionalAmount" : 100000000.00
+                      "notionalAmount" : 100000000.00,
+                      "fixedRate" : 0.0585
                     } ],
                     "meta" : {
-                      "globalKey" : "45ced16e"
+                      "globalKey" : "8b1031ac"
                     }
                   }, {
                     "adjustedPaymentDate" : "2001-05-04",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2001-04-27",
                       "adjustedStartDate" : "2000-10-27",
+                      "adjustedEndDate" : "2001-04-27",
                       "meta" : {
-                        "globalKey" : "af851d51"
+                        "globalKey" : "f293678f"
                       },
-                      "fixedRate" : 0.0585,
-                      "notionalAmount" : 100000000.00
+                      "notionalAmount" : 100000000.00,
+                      "fixedRate" : 0.0585
                     } ],
                     "meta" : {
-                      "globalKey" : "61fdbe8d"
+                      "globalKey" : "a50c08cb"
                     }
                   }, {
                     "adjustedPaymentDate" : "2001-11-05",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2001-10-29",
                       "adjustedStartDate" : "2001-04-27",
+                      "adjustedEndDate" : "2001-10-29",
                       "meta" : {
-                        "globalKey" : "b04cfb0f"
+                        "globalKey" : "f58d7a11"
                       },
-                      "fixedRate" : 0.0585,
-                      "notionalAmount" : 100000000.00
+                      "notionalAmount" : 100000000.00,
+                      "fixedRate" : 0.0585
                     } ],
                     "meta" : {
-                      "globalKey" : "f3bf636a"
+                      "globalKey" : "38ffe26c"
                     }
                   }, {
                     "adjustedPaymentDate" : "2002-05-06",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2002-04-29",
                       "adjustedStartDate" : "2001-10-29",
+                      "adjustedEndDate" : "2002-04-29",
                       "meta" : {
-                        "globalKey" : "b3470d91"
+                        "globalKey" : "f65557cf"
                       },
-                      "fixedRate" : 0.0585,
-                      "notionalAmount" : 100000000.00
+                      "notionalAmount" : 100000000.00,
+                      "fixedRate" : 0.0585
                     } ],
                     "meta" : {
-                      "globalKey" : "fee580b"
+                      "globalKey" : "52fca249"
                     }
                   } ]
                 },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
                 "meta" : {
-                  "globalKey" : "a8a4c4c4"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "dd339947"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf9f"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 5,
-                    "dayType" : "BUSINESS"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "721ab9b6"
                 }
               } ],
               "meta" : {
-                "globalKey" : "3fd59c11"
+                "globalKey" : "36880065"
               }
             }
           },
           "meta" : {
-            "globalKey" : "3fd59c11"
+            "globalKey" : "36880065"
           }
         },
         "meta" : {
-          "globalKey" : "3fd59c11"
+          "globalKey" : "36880065"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7b78abf0"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d05"
+          "quantity" : [ {
+            "value" : {
+              "value" : 100000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 100000000.00
+            "meta" : {
+              "globalKey" : "828026c7"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "6637fc9e"
           },
+          "meta" : {
+            "globalKey" : "5332091c"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0585,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0585,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 100000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "60c79722"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4fbfe65e",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8119"
-      },
-      "value" : "2000-04-25"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "56323"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "176160be"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300TJF420N3F01V87",
           "meta" : {
-            "scheme" : "http://www.msdw/swaps/trade-id"
-          },
-          "value" : "56990"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "4fbfe65e"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "4fbfe65e"
-      },
       "meta" : {
-        "globalKey" : "17b9111b"
+        "globalKey" : "4fbfe65e",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "9e43e267"
+    }
+  },
+  "meta" : {
+    "globalKey" : "9e43e267"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex04-arrears-stepup-fee-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex04-arrears-stepup-fee-swap.json
index e64b223429..92d1807ad9 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex04-arrears-stepup-fee-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex04-arrears-stepup-fee-swap.json
@@ -1,59 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "e4602843"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "4bd3899a"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56323",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "4fbfe65e"
+        "globalKey" : "987ead88"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "4fbfe65e",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "56990",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300TJF420N3F01V87"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "4fbfe65e"
+            "scheme" : "http://www.msdw/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "987f3943"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-04-25",
+      "meta" : {
+        "globalKey" : "3e8119"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "4fbfe65e"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -64,46 +50,40 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c4e"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "27"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2000-04-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -112,20 +92,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eac74d93"
-                      },
-                      "unadjustedDate" : "2000-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eac74d93"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "21daa179"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2002-04-27",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -133,84 +110,92 @@
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "42f910b"
+                            "globalKey" : "42f910b",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b8e49c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "f4e4ef21"
-                      },
-                      "unadjustedDate" : "2002-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "f4e4ef21"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "d47ecdcb"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa45fc3"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "17f7a"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "rollConvention" : "27"
+                  },
+                  "meta" : {
+                    "globalKey" : "c239cad3",
+                    "externalKey" : "floatingCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "db523fbd"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "21daa179"
+                    "globalReference" : "c239cad3",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodEndDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "131ae8a2"
+                      "globalKey" : "eff6d356"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -219,73 +204,79 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "a02299ee"
+                      "globalReference" : "cb40709c",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "a02299ee"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                  "meta" : {
+                    "globalKey" : "cb40709c",
+                    "externalKey" : "resetDates"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "eef309cd"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessDayConvention" : "NONE",
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "24a738"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28cab"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "27"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2000-04-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -294,289 +285,298 @@
                       },
                       "meta" : {
                         "globalKey" : "eac74d93"
-                      },
-                      "unadjustedDate" : "2000-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eac74d93"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "d4794ba2"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2002-04-27",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "42f910b"
+                            "globalReference" : "42f910b",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "3494f012"
-                      },
-                      "unadjustedDate" : "2002-04-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "3494f012"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
+                    "meta" : {
+                      "globalKey" : "24a738"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18abd"
+                    },
+                    "rollConvention" : "27"
+                  },
+                  "meta" : {
+                    "globalKey" : "225b80da",
+                    "externalKey" : "fixedCalcPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "722df40d"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa45fc6"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "42f910b"
+                        "globalReference" : "42f910b",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "7a04f180"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                "meta" : {
+                  "globalKey" : "5b9d5263"
                 }
               } ],
               "meta" : {
-                "globalKey" : "ba9087e2"
+                "globalKey" : "21bc0bf6"
               }
             }
           },
           "meta" : {
-            "globalKey" : "ba9087e2"
+            "globalKey" : "21bc0bf6"
           }
         },
         "meta" : {
-          "globalKey" : "ba9087e2"
+          "globalKey" : "21bc0bf6"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7b78abf0"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d05"
+          "quantity" : [ {
+            "value" : {
+              "value" : 100000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 100000000.00
+            "meta" : {
+              "globalKey" : "828026c7"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "7adea1b0"
           },
+          "meta" : {
+            "globalKey" : "5332091c"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.06,
               "datedValue" : [ {
                 "date" : "2001-04-27",
+                "value" : 0.065,
                 "meta" : {
                   "globalKey" : "a4ca676"
-                },
-                "value" : 0.065
+                }
               } ],
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 100000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "e0f59450"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "4fbfe65e",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8119"
-      },
-      "value" : "2000-04-25"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "56323"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "176160be"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300TJF420N3F01V87",
           "meta" : {
-            "scheme" : "http://www.msdw/swaps/trade-id"
-          },
-          "value" : "56990"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "4fbfe65e"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "4fbfe65e"
-      },
       "meta" : {
-        "globalKey" : "17b9111b"
+        "globalKey" : "4fbfe65e",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "61641356"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "101cd9d"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "4fbfe65e"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        }
-      },
       "quantity" : {
+        "value" : 15000.00,
         "unit" : {
           "currency" : {
             "value" : "USD"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "4fbfe65e",
+          "externalReference" : "party2"
         },
-        "value" : 15000.00
+        "receiverPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2000-04-27",
         "dateAdjustments" : {
+          "businessDayConvention" : "MODFOLLOWING",
           "businessCenters" : {
             "businessCentersReference" : {
-              "externalReference" : "primaryBusinessCenters",
-              "globalReference" : "42f910b"
+              "globalReference" : "42f910b",
+              "externalReference" : "primaryBusinessCenters"
             },
             "meta" : {
               "globalKey" : "eb13047c"
             }
           },
-          "businessDayConvention" : "MODFOLLOWING",
           "meta" : {
             "globalKey" : "214e084d"
           }
-        },
-        "unadjustedDate" : "2000-04-27"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "UPFRONT"
+        "priceTransfer" : "Upfront"
       }
+    },
+    "meta" : {
+      "globalKey" : "8095f783"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "c37875ed"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex05-long-stub-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex05-long-stub-swap.json
index 4b9e1e1065..51c79b7841 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex05-long-stub-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex05-long-stub-swap.json
@@ -1,63 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "6b54e1ef"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "6b54e1ef"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "cc5aba48"
-      },
-      "name" : {
-        "value" : "Party A"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "63373188",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "921934",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "1006f88d"
+        "globalKey" : "f9967337"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "1006f88d",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "204334",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFM8T61CT2L1QCEMIK50"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "1006f88d"
+            "scheme" : "http://www.ubsw.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "ed8a12d2"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-04-03",
+      "meta" : {
+        "globalKey" : "3e8103"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "cc5aba48"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "1006f88d"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -68,46 +50,48 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "20a71d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
-                      "globalKey" : "c10206b"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d7d"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "5"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2000-04-05",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -116,131 +100,128 @@
                       },
                       "meta" : {
                         "globalKey" : "eac6fafd"
-                      },
-                      "unadjustedDate" : "2000-04-05"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eac6fafd"
                     }
                   },
-                  "firstPeriodStartDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "NONE",
-                        "meta" : {
-                          "globalKey" : "24a738"
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "eac60abd"
-                      },
-                      "unadjustedDate" : "2000-03-05"
-                    },
-                    "meta" : {
-                      "globalKey" : "eac60abd"
-                    }
-                  },
-                  "firstRegularPeriodStartDate" : "2000-10-05",
-                  "lastRegularPeriodEndDate" : "2004-10-05",
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "dc5b058f"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2005-01-05",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "20a71d"
+                            "globalKey" : "20a71d",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211dc30c"
                         }
                       },
                       "meta" : {
                         "globalKey" : "bb867de7"
-                      },
-                      "unadjustedDate" : "2005-01-05"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "bb867de7"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "dff3d312"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2000-10-05",
-                  "meta" : {
-                    "globalKey" : "fbb46e03"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
                       "globalKey" : "c10206b"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
+                  "firstPeriodStartDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2000-03-05",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "NONE",
+                        "meta" : {
+                          "globalKey" : "24a738"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "eac60abd"
+                      }
                     },
+                    "meta" : {
+                      "globalKey" : "eac60abd"
+                    }
+                  },
+                  "firstRegularPeriodStartDate" : "2000-10-05",
+                  "lastRegularPeriodEndDate" : "2004-10-05",
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
                     "period" : "M",
-                    "periodMultiplier" : 6
+                    "meta" : {
+                      "globalKey" : "2b8f"
+                    },
+                    "rollConvention" : "5"
+                  },
+                  "meta" : {
+                    "globalKey" : "fc57005",
+                    "externalKey" : "floatingCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "firstPaymentDate" : "2000-10-05",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "20a71d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
                     },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "c10206b"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "ffe28cb9"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "dc5b058f"
+                    "globalReference" : "fc57005",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "10c06461"
+                      "globalKey" : "ed9c4f15"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -249,103 +230,100 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "f5dc3e2b"
+                      "globalReference" : "997a5395",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "f5dc3e2b"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
                       "globalKey" : "c10206b"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "997a5395",
+                    "externalKey" : "resetDates"
+                  }
                 },
                 "stubPeriod" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "dc5b058f"
+                    "globalReference" : "fc57005",
+                    "externalReference" : "floatingCalcPeriodDates"
+                  },
+                  "initialStub" : {
+                    "stubRate" : 0.05125
                   },
                   "finalStub" : {
                     "floatingRate" : [ {
                       "floatingRateIndex" : "EUR-EURIBOR-Telerate",
                       "indexTenor" : {
-                        "meta" : {
-                          "globalKey" : "956"
-                        },
+                        "periodMultiplier" : 3,
                         "period" : "M",
-                        "periodMultiplier" : 3
+                        "meta" : {
+                          "globalKey" : "aa"
+                        }
                       }
                     } ]
-                  },
-                  "initialStub" : {
-                    "stubRate" : 0.05125
                   }
+                },
+                "meta" : {
+                  "globalKey" : "280c6b54"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "20a71d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
-                      "globalKey" : "c10206b"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "159ee"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "5"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2000-04-05",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -354,279 +332,301 @@
                       },
                       "meta" : {
                         "globalKey" : "eac6fafd"
-                      },
-                      "unadjustedDate" : "2000-04-05"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eac6fafd"
                     }
                   },
-                  "firstPeriodStartDate" : {
-                    "adjustableDate" : {
-                      "dateAdjustments" : {
-                        "businessDayConvention" : "NONE",
-                        "meta" : {
-                          "globalKey" : "24a738"
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "eac60abd"
-                      },
-                      "unadjustedDate" : "2000-03-05"
-                    },
-                    "meta" : {
-                      "globalKey" : "eac60abd"
-                    }
-                  },
-                  "firstRegularPeriodStartDate" : "2000-10-05",
-                  "lastRegularPeriodEndDate" : "2004-10-05",
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "d84fb51f"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2005-01-05",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "20a71d"
+                            "globalReference" : "20a71d",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "c10206b"
                         }
                       },
                       "meta" : {
                         "globalKey" : "a678db46"
-                      },
-                      "unadjustedDate" : "2005-01-05"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "a678db46"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "e1e3b658"
-                },
-                "paymentDates" : {
-                  "firstPaymentDate" : "2000-10-05",
-                  "meta" : {
-                    "globalKey" : "fbb46f72"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
                       "globalKey" : "c10206b"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
+                  "firstPeriodStartDate" : {
+                    "adjustableDate" : {
+                      "unadjustedDate" : "2000-03-05",
+                      "dateAdjustments" : {
+                        "businessDayConvention" : "NONE",
+                        "meta" : {
+                          "globalKey" : "24a738"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "eac60abd"
+                      }
                     },
+                    "meta" : {
+                      "globalKey" : "eac60abd"
+                    }
+                  },
+                  "firstRegularPeriodStartDate" : "2000-10-05",
+                  "lastRegularPeriodEndDate" : "2004-10-05",
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
                     "period" : "Y",
-                    "periodMultiplier" : 1
+                    "meta" : {
+                      "globalKey" : "1a3e"
+                    },
+                    "rollConvention" : "5"
+                  },
+                  "meta" : {
+                    "globalKey" : "f93d69d3",
+                    "externalKey" : "fixedCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
+                      "globalKey" : "78"
+                    }
+                  },
+                  "firstPaymentDate" : "2000-10-05",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "20a71d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "c10206b"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "bdd8be8"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "4efba80c"
                 }
               } ],
               "meta" : {
-                "globalKey" : "a864e0ea"
+                "globalKey" : "2b1d1660"
               }
             }
           },
           "meta" : {
-            "globalKey" : "a864e0ea"
+            "globalKey" : "2b1d1660"
           }
         },
         "meta" : {
-          "globalKey" : "a864e0ea"
+          "globalKey" : "2b1d1660"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "d1e27334"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EURIBOR-Telerate"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.001,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.001,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 75000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 75000000.00
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "389ebddb"
-          },
-          "price" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-2"
+                "value" : "quantity-1"
               } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EURIBOR-Telerate"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
             },
+            "meta" : {
+              "globalKey" : "2bba2221"
+            }
+          },
+          "meta" : {
+            "globalKey" : "d218229e"
+          }
+        }, {
+          "price" : [ {
             "value" : {
+              "value" : 0.0525,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.0525,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-2"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 75000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 75000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "db38fd85"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "63373188",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "1006f88d",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8103"
-      },
-      "value" : "2000-04-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "921934"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "cc5aba48"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "919e76ad"
+        "globalKey" : "63373188",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFM8T61CT2L1QCEMIK50",
           "meta" : {
-            "scheme" : "http://www.ubsw.com/swaps/trade-id"
-          },
-          "value" : "204334"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "1006f88d"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "1006f88d"
-      },
       "meta" : {
-        "globalKey" : "5573c2ea"
+        "globalKey" : "1006f88d",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "dc09a21f"
+    }
+  },
+  "meta" : {
+    "globalKey" : "dc09a21f"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex06-xccy-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex06-xccy-swap.json
index 60458f79b5..38c4f3b6eb 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex06-xccy-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex06-xccy-swap.json
@@ -1,63 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "776a74c1"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "776a74c1"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "cc5aba48"
-      },
-      "name" : {
-        "value" : "Party A"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "63373188",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "TW9235",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300VBWWV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "618c3061"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "695e25ab"
+        "globalKey" : "29b63a53"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "695e25ab",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "SW2000",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "529900DTJ5A7S5UCBB52"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "695e25ab"
+            "scheme" : "http://www.barclays.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "27fe9f96"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "1994-12-12",
+      "meta" : {
+        "globalKey" : "3e530c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "cc5aba48"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "695e25ab"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -68,118 +50,112 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : true,
                   "initialPayment" : true,
+                  "finalPayment" : true,
                   "intermediatePayment" : false,
-                  "meta" : {
-                    "globalKey" : "6322b3d"
-                  },
                   "principalPaymentSchedule" : {
-                    "finalPrincipalPayment" : {
-                      "meta" : {
-                        "globalKey" : "c7da3afa"
+                    "initialPrincipalPayment" : {
+                      "principalPaymentDate" : {
+                        "adjustedDate" : {
+                          "value" : "1994-12-14",
+                          "meta" : {
+                            "globalKey" : "3e530e"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
                       },
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "principalAmount" : {
+                        "value" : 10000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 10000000.00,
                         "meta" : {
                           "globalKey" : "d467e427"
                         }
                       },
+                      "meta" : {
+                        "globalKey" : "c606e068"
+                      }
+                    },
+                    "finalPrincipalPayment" : {
                       "principalPaymentDate" : {
                         "adjustedDate" : {
+                          "value" : "1999-12-14",
                           "meta" : {
                             "globalKey" : "3e7b0e"
-                          },
-                          "value" : "1999-12-14"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "0"
                         }
-                      }
-                    },
-                    "initialPrincipalPayment" : {
-                      "meta" : {
-                        "globalKey" : "fad52c98"
                       },
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "principalAmount" : {
+                        "value" : 10000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 10000000.00,
                         "meta" : {
                           "globalKey" : "d467e427"
                         }
                       },
-                      "principalPaymentDate" : {
-                        "adjustedDate" : {
-                          "meta" : {
-                            "globalKey" : "3e530e"
-                          },
-                          "value" : "1994-12-14"
-                        },
-                        "meta" : {
-                          "globalKey" : "0"
-                        }
+                      "meta" : {
+                        "globalKey" : "92d57dc6"
                       }
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "36d9b059"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "814e2ae6"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c89"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -188,20 +164,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "79667919"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -211,23 +184,130 @@
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "814e2ae6"
+                            "globalKey" : "814e2ae6",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "57d0de37"
                         }
                       },
                       "meta" : {
                         "globalKey" : "62b0f2e9"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "62b0f2e9"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "814e2ae6",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18a9b"
+                    },
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "72249099",
+                    "externalKey" : "floatingCalcPeriodDates"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "814e2ae6",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "7a04f180"
+                  }
+                },
+                "resetDates" : {
+                  "calculationPeriodDatesReference" : {
+                    "globalReference" : "72249099",
+                    "externalReference" : "floatingCalcPeriodDates"
+                  },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
+                  "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "eff6d356"
+                    },
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
+                      }
+                    },
+                    "dateRelativeTo" : {
+                      "globalReference" : "a5aeeeb8",
+                      "externalReference" : "resetDates"
+                    }
+                  },
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "814e2ae6",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "a5aeeeb8",
+                    "externalKey" : "resetDates"
                   }
                 },
                 "cashflowRepresentation" : {
@@ -235,440 +315,338 @@
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "1995-06-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1995-06-14",
                       "adjustedStartDate" : "1994-12-14",
+                      "adjustedEndDate" : "1995-06-14",
                       "meta" : {
-                        "globalKey" : "aca6a894"
+                        "globalKey" : "eba58b94"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1994-12-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78c0e75"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "97719422"
+                      "globalKey" : "d6707722"
                     }
                   }, {
                     "adjustedPaymentDate" : "1995-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1995-12-14",
                       "adjustedStartDate" : "1995-06-14",
+                      "adjustedEndDate" : "1995-12-14",
                       "meta" : {
-                        "globalKey" : "1d805d14"
+                        "globalKey" : "536c6a14"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1995-06-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78cd7f5"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "6ef1ca22"
+                      "globalKey" : "a4ddd722"
                     }
                   }, {
                     "adjustedPaymentDate" : "1996-06-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1996-06-14",
                       "adjustedStartDate" : "1995-12-14",
+                      "adjustedEndDate" : "1996-06-14",
                       "meta" : {
-                        "globalKey" : "8546a094"
+                        "globalKey" : "c4458394"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1995-12-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78d0675"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "93899422"
+                      "globalKey" : "d2887722"
                     }
                   }, {
                     "adjustedPaymentDate" : "1996-12-16",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1996-12-16",
                       "adjustedStartDate" : "1996-06-14",
+                      "adjustedEndDate" : "1996-12-16",
                       "meta" : {
-                        "globalKey" : "5feccb96"
+                        "globalKey" : "2f761352"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1996-06-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78dcff5"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "fd5f1ea6"
+                      "globalKey" : "cce86662"
                     }
                   }, {
                     "adjustedPaymentDate" : "1997-06-16",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1997-06-16",
                       "adjustedStartDate" : "1996-12-16",
+                      "adjustedEndDate" : "1997-06-16",
                       "meta" : {
-                        "globalKey" : "cb1cc054"
+                        "globalKey" : "a1ba354"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1996-12-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78dfe75"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "256099e4"
+                      "globalKey" : "645f7ce4"
                     }
                   }, {
                     "adjustedPaymentDate" : "1997-12-15",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1997-12-15",
                       "adjustedStartDate" : "1997-06-16",
+                      "adjustedEndDate" : "1997-12-15",
                       "meta" : {
-                        "globalKey" : "7103993"
+                        "globalKey" : "702da935"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1997-06-12",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78ec7f5"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "33b625a2"
+                      "globalKey" : "9cd39544"
                     }
                   }, {
                     "adjustedPaymentDate" : "1998-06-15",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1998-06-15",
                       "adjustedStartDate" : "1997-12-15",
+                      "adjustedEndDate" : "1998-06-15",
                       "meta" : {
-                        "globalKey" : "6d21a455"
+                        "globalKey" : "ac208755"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1997-12-11",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78ef656"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "569916e4"
+                      "globalKey" : "9597f9e4"
                     }
                   }, {
                     "adjustedPaymentDate" : "1998-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1998-12-14",
                       "adjustedStartDate" : "1998-06-15",
+                      "adjustedEndDate" : "1998-12-14",
                       "meta" : {
-                        "globalKey" : "a9151d94"
+                        "globalKey" : "12328d36"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1998-06-11",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78fbfd6"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "64eea2a2"
+                      "globalKey" : "ce0c1244"
                     }
                   }, {
                     "adjustedPaymentDate" : "1999-06-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1999-06-14",
                       "adjustedStartDate" : "1998-12-14",
+                      "adjustedEndDate" : "1999-06-14",
                       "meta" : {
-                        "globalKey" : "f268856"
+                        "globalKey" : "4e256b56"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1998-12-10",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "78fee37"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "87d193e4"
+                      "globalKey" : "c6d076e4"
                     }
                   }, {
                     "adjustedPaymentDate" : "1999-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1999-12-14",
                       "adjustedStartDate" : "1999-06-14",
+                      "adjustedEndDate" : "1999-12-14",
                       "meta" : {
-                        "globalKey" : "80003cd6"
+                        "globalKey" : "b5ec49d6"
                       },
+                      "notionalAmount" : 10000000.00,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "1999-06-10",
+                          "observationWeight" : 1,
                           "meta" : {
                             "globalKey" : "790b7b7"
-                          },
-                          "observationWeight" : 1
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 10000000.00
+                      }
                     } ],
                     "meta" : {
-                      "globalKey" : "5f51c9e4"
+                      "globalKey" : "953dd6e4"
                     }
                   } ]
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
                 "meta" : {
-                  "globalKey" : "5c6f2ada"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa45fc6"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "814e2ae6"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
-                  }
-                },
-                "resetDates" : {
-                  "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "79667919"
-                  },
-                  "fixingDates" : {
-                    "meta" : {
-                      "globalKey" : "131ae8a2"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
-                      }
-                    },
-                    "businessDayConvention" : "NONE",
-                    "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "dbde664a"
-                    }
-                  },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "dbde664a"
-                  },
-                  "resetDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "814e2ae6"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "globalKey" : "530a32a6"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : true,
                   "initialPayment" : true,
+                  "finalPayment" : true,
                   "intermediatePayment" : false,
-                  "meta" : {
-                    "globalKey" : "f4028ce3"
-                  },
                   "principalPaymentSchedule" : {
-                    "finalPrincipalPayment" : {
-                      "meta" : {
-                        "globalKey" : "e7234e0b"
+                    "initialPrincipalPayment" : {
+                      "principalPaymentDate" : {
+                        "adjustedDate" : {
+                          "value" : "1994-12-14",
+                          "meta" : {
+                            "globalKey" : "3e530e"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "0"
+                        }
                       },
                       "payerReceiver" : {
-                        "payer" : "PARTY_2",
-                        "receiver" : "PARTY_1"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "principalAmount" : {
+                        "value" : 1000000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "JPY"
                           }
                         },
-                        "value" : 1000000000.00,
                         "meta" : {
                           "globalKey" : "57e64854"
                         }
                       },
+                      "meta" : {
+                        "globalKey" : "1653e1f3"
+                      }
+                    },
+                    "finalPrincipalPayment" : {
                       "principalPaymentDate" : {
                         "adjustedDate" : {
+                          "value" : "1999-12-14",
                           "meta" : {
                             "globalKey" : "3e7b0e"
-                          },
-                          "value" : "1999-12-14"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "0"
                         }
-                      }
-                    },
-                    "initialPrincipalPayment" : {
-                      "meta" : {
-                        "globalKey" : "b4285c6d"
                       },
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party2",
+                        "receiver" : "Party1"
                       },
                       "principalAmount" : {
+                        "value" : 1000000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "JPY"
                           }
                         },
-                        "value" : 1000000000.00,
                         "meta" : {
                           "globalKey" : "57e64854"
                         }
                       },
-                      "principalPaymentDate" : {
-                        "adjustedDate" : {
-                          "meta" : {
-                            "globalKey" : "3e530e"
-                          },
-                          "value" : "1994-12-14"
-                        },
-                        "meta" : {
-                          "globalKey" : "0"
-                        }
+                      "meta" : {
+                        "globalKey" : "49854495"
                       }
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "be7646f3"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "814e2ae6"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "2b8fa"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "14"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30E/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1994-12-14",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -677,42 +655,92 @@
                       },
                       "meta" : {
                         "globalKey" : "ea1a6ec6"
-                      },
-                      "unadjustedDate" : "1994-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ea1a6ec6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "faa5b75e"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "1999-12-14",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "814e2ae6"
+                            "globalReference" : "814e2ae6",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "93c845ff"
-                      },
-                      "unadjustedDate" : "1999-12-14"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "93c845ff"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "814e2ae6",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "1794a"
+                    },
+                    "rollConvention" : "14"
+                  },
+                  "meta" : {
+                    "globalKey" : "9249d1f2",
+                    "externalKey" : "fixedCalcPeriodDates"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "Y",
+                    "meta" : {
+                      "globalKey" : "78"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "814e2ae6",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "85fff0af"
                   }
                 },
                 "cashflowRepresentation" : {
@@ -720,267 +748,239 @@
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "1995-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1995-12-14",
                       "adjustedStartDate" : "1994-12-14",
+                      "adjustedEndDate" : "1995-12-14",
                       "meta" : {
-                        "globalKey" : "8e0084db"
+                        "globalKey" : "1354d305"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 1000000000.00
+                      "notionalAmount" : 1000000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "6566e28d"
+                      "globalKey" : "eabb30b7"
                     }
                   }, {
                     "adjustedPaymentDate" : "1996-12-16",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1996-12-16",
                       "adjustedStartDate" : "1995-12-14",
+                      "adjustedEndDate" : "1996-12-16",
                       "meta" : {
-                        "globalKey" : "91c26d99"
+                        "globalKey" : "1715da87"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 1000000000.00
+                      "notionalAmount" : 1000000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "13577489"
+                      "globalKey" : "98aae177"
                     }
                   }, {
                     "adjustedPaymentDate" : "1997-12-15",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1997-12-15",
                       "adjustedStartDate" : "1996-12-16",
+                      "adjustedEndDate" : "1997-12-15",
                       "meta" : {
-                        "globalKey" : "958300bc"
+                        "globalKey" : "1ad7bf84"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 1000000000.00
+                      "notionalAmount" : 1000000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "bc28270d"
+                      "globalKey" : "417ce5d5"
                     }
                   }, {
                     "adjustedPaymentDate" : "1998-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1998-12-14",
                       "adjustedStartDate" : "1997-12-15",
+                      "adjustedEndDate" : "1998-12-14",
                       "meta" : {
-                        "globalKey" : "9943889c"
+                        "globalKey" : "1e984764"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 1000000000.00
+                      "notionalAmount" : 1000000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "64f8ce4e"
+                      "globalKey" : "ea4d8d16"
                     }
                   }, {
                     "adjustedPaymentDate" : "1999-12-14",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "1999-12-14",
                       "adjustedStartDate" : "1998-12-14",
+                      "adjustedEndDate" : "1999-12-14",
                       "meta" : {
-                        "globalKey" : "9d0484db"
+                        "globalKey" : "2258d305"
                       },
-                      "fixedRate" : 0.06,
-                      "notionalAmount" : 1000000000.00
+                      "notionalAmount" : 1000000000.00,
+                      "fixedRate" : 0.06
                     } ],
                     "meta" : {
-                      "globalKey" : "f7ec28d"
+                      "globalKey" : "94d310b7"
                     }
                   } ]
                 },
-                "dayCountFraction" : {
-                  "value" : "30E/360"
-                },
                 "meta" : {
-                  "globalKey" : "326733c1"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa46135"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "814e2ae6"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "214e084d"
-                    }
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "ac8"
-                    },
-                    "period" : "Y",
-                    "periodMultiplier" : 1
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "92c15245"
                 }
               } ],
               "meta" : {
-                "globalKey" : "7e152c9b"
+                "globalKey" : "b9536eb"
               }
             }
           },
           "meta" : {
-            "globalKey" : "7e152c9b"
+            "globalKey" : "b9536eb"
           }
         },
         "meta" : {
-          "globalKey" : "7e152c9b"
+          "globalKey" : "b9536eb"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "cf003e1f"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d08"
+          "quantity" : [ {
+            "value" : {
+              "value" : 10000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
             },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-1"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 10000000.00
+            "meta" : {
+              "globalKey" : "8280320a"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "26516b87"
           },
+          "meta" : {
+            "globalKey" : "a0325171"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "value" : 0.06,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 1000000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
-              },
-              "value" : 1000000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "a3dc0559"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "63373188",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "695e25ab",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e530c"
-      },
-      "value" : "1994-12-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "549300VBWWV6BYQOWM67",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "TW9235"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "618c3061"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "cc5aba48"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "38e8e6c9"
+        "globalKey" : "63373188",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "529900DTJ5A7S5UCBB52",
           "meta" : {
-            "scheme" : "http://www.barclays.com/swaps/trade-id"
-          },
-          "value" : "SW2000"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "695e25ab"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "695e25ab"
-      },
       "meta" : {
-        "globalKey" : "c4f82eae"
+        "globalKey" : "695e25ab",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "be17f577"
+    }
+  },
+  "meta" : {
+    "globalKey" : "be17f577"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex07-ois-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex07-ois-swap.json
index d43c395e6e..a861eed922 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex07-ois-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex07-ois-swap.json
@@ -1,66 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "6f13e7ae"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "6f13e7ae"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "ff8d4b3e"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "ff8d4b3e",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "TRN12000",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "5493000SCC07UI6DB380"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "ff8d4b3e"
+            "scheme" : "http://www.citibank.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "9e39312a"
+        "globalKey" : "250026f4"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "9e39312a",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "TRN13000",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "MCMCUS33"
-        },
-        "meta" : {
-          "globalKey" : "9e39312a"
+            "scheme" : "http://www.mizuhocap.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "25010fb2"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-01-25",
+      "meta" : {
+        "globalKey" : "3e8859"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party1",
-          "globalReference" : "ff8d4b3e"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "ff8d4b3e"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "9e39312a"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -68,52 +47,43 @@
             "productQualifier" : "InterestRate_IRSwap_FixedFloat_OIS"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "20a71d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "25e2ab"
-                    },
-                    "period" : "T",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "NONE"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-01-29",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -122,110 +92,115 @@
                       },
                       "meta" : {
                         "globalKey" : "eae28c55"
-                      },
-                      "unadjustedDate" : "2001-01-29"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae28c55"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "9919b9ce"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-04-29",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "primaryBusinessCenters",
-                            "globalKey" : "20a71d"
+                            "globalKey" : "20a71d",
+                            "externalKey" : "primaryBusinessCenters"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "a6474bf1"
-                      },
-                      "unadjustedDate" : "2001-04-29"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "a6474bf1"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "886a9443"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "dcfb3c17"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf23"
-                    },
-                    "period" : "D",
+                  "calculationPeriodFrequency" : {
                     "periodMultiplier" : 1,
-                    "dayType" : "BUSINESS"
-                  },
-                  "paymentFrequency" : {
+                    "period" : "T",
                     "meta" : {
-                      "globalKey" : "a2d"
+                      "globalKey" : "24b525"
                     },
-                    "period" : "T",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "NONE"
+                  },
+                  "meta" : {
+                    "globalKey" : "37c36a6c",
+                    "externalKey" : "floatingCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
                     "meta" : {
-                      "globalKey" : "0"
+                      "globalKey" : "73"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 1,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4abbbd"
                     },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "20a71d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "1b77cc77"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "9919b9ce"
+                    "globalReference" : "37c36a6c",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodEndDate",
                   "fixingDates" : {
+                    "periodMultiplier" : 0,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "23728acc"
+                      "globalKey" : "98ca5cd4"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 0,
+                    "businessDayConvention" : "PRECEDING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -234,82 +209,79 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "PRECEDING",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates",
-                      "globalReference" : "b44a57c9"
+                      "globalReference" : "d5a6f6cb",
+                      "externalReference" : "resetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates",
-                    "globalKey" : "b44a57c9"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
+                    "meta" : {
+                      "globalKey" : "73"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "a2d"
-                    },
-                    "period" : "T",
-                    "periodMultiplier" : 1
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_END_DATE"
+                  "meta" : {
+                    "globalKey" : "d5a6f6cb",
+                    "externalKey" : "resetDates"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c4dd9e87"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "20a71d"
-                      },
-                      "meta" : {
-                        "globalKey" : "eb13047c"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "214e084d"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "25e2ab"
-                    },
-                    "period" : "T",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "NONE"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-01-29",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -318,229 +290,257 @@
                       },
                       "meta" : {
                         "globalKey" : "eae28c55"
-                      },
-                      "unadjustedDate" : "2001-01-29"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae28c55"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "840c172d"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-04-29",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCentersReference" : {
-                            "externalReference" : "primaryBusinessCenters",
-                            "globalReference" : "20a71d"
+                            "globalReference" : "20a71d",
+                            "externalReference" : "primaryBusinessCenters"
                           },
                           "meta" : {
                             "globalKey" : "eb13047c"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "214e084d"
                         }
                       },
                       "meta" : {
                         "globalKey" : "9139a950"
-                      },
-                      "unadjustedDate" : "2001-04-29"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "9139a950"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "239597a"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4fa4609a"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "primaryBusinessCenters",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "primaryBusinessCenters"
                       },
                       "meta" : {
                         "globalKey" : "eb13047c"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "214e084d"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
                     "meta" : {
-                      "globalKey" : "a2d"
+                      "globalKey" : "24b525"
                     },
-                    "period" : "T",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "NONE"
+                  },
+                  "meta" : {
+                    "globalKey" : "d26aa7ed",
+                    "externalKey" : "fixedCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "73"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "20a71d",
+                        "externalReference" : "primaryBusinessCenters"
+                      },
+                      "meta" : {
+                        "globalKey" : "eb13047c"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "214e084d"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "7d77b594"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "a422f862"
                 }
               } ],
               "meta" : {
-                "globalKey" : "3a4ae9fd"
+                "globalKey" : "4c9c7e29"
               }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "8fb047d3"
+            "globalKey" : "e3c180d3"
           }
         },
         "meta" : {
-          "globalKey" : "8fb047d3"
+          "globalKey" : "e3c180d3"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "f2809620"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "23c05191"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EONIA-OIS-COMPOUND"
+          "quantity" : [ {
+            "value" : {
+              "value" : 100000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
                 }
               }
-            }
-          },
-          "quantity" : [ {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EONIA-OIS-COMPOUND"
                 }
               },
-              "value" : 100000000.00
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "5449e08f"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "27beb430"
           },
+          "meta" : {
+            "globalKey" : "9894669e"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.051,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.051,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 100000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "d017d1d0"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "ff8d4b3e",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "9e39312a",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "ff8d4b3e",
+          "externalReference" : "party1"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8859"
-      },
-      "value" : "2001-01-25"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "5493000SCC07UI6DB380",
           "meta" : {
-            "scheme" : "http://www.citibank.com/swaps/trade-id"
-          },
-          "value" : "TRN12000"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "ff8d4b3e"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "ff8d4b3e"
-      },
       "meta" : {
-        "globalKey" : "896a2f2a"
+        "globalKey" : "ff8d4b3e",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "MCMCUS33",
           "meta" : {
-            "scheme" : "http://www.mizuhocap.com/swaps/trade-id"
-          },
-          "value" : "TRN13000"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "9e39312a"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "9e39312a"
-      },
       "meta" : {
-        "globalKey" : "8b1f07ca"
+        "globalKey" : "9e39312a",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "e5e42c92"
+    }
+  },
+  "meta" : {
+    "globalKey" : "e5e42c92"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex08-fra.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex08-fra.json
index 82e5b2e9be..bdf29f5177 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex08-fra.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex08-fra.json
@@ -1,60 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "cc6bc912"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "cc6bc912"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "e1284e85"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "e1284e85",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "MB87623",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "TR24TWEY5RVRQV65HD49"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "e1284e85"
+            "scheme" : "http://www.hsbc.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "cff0a7d6"
+        "globalKey" : "f2891f38"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "cff0a7d6",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "AA9876",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BFXS5XCH7N0Y05NIXW11"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "cff0a7d6"
+            "scheme" : "http://www.abnamro.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "814acd2"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "1991-05-14",
+      "meta" : {
+        "globalKey" : "3e394e"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "e1284e85"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "cff0a7d6"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -65,48 +50,63 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
                       "adjustedDate" : {
+                        "value" : "1991-07-17",
                         "meta" : {
                           "globalKey" : "3e39d1"
-                        },
-                        "value" : "1991-07-17"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "0"
                       }
                     },
                     "meta" : {
-                      "externalKey" : "resetDate",
-                      "globalKey" : "0"
+                      "globalKey" : "0",
+                      "externalKey" : "resetDate"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
                       "adjustedDate" : {
+                        "value" : "1992-01-17",
                         "meta" : {
                           "globalKey" : "3e4051"
-                        },
-                        "value" : "1992-01-17"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "0"
@@ -115,19 +115,15 @@
                     "meta" : {
                       "globalKey" : "0"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "discountingMethod" : {
-                  "discountingType" : "FRA"
-                },
-                "meta" : {
-                  "globalKey" : "4af42838"
-                },
                 "paymentDate" : {
+                  "unadjustedDate" : "1991-07-17",
                   "dateAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "CHZU"
@@ -136,75 +132,77 @@
                         "globalKey" : "1f8e60"
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
                       "globalKey" : "211caa4f"
                     }
                   },
                   "meta" : {
                     "globalKey" : "407eeb1e"
-                  },
-                  "unadjustedDate" : "1991-07-17"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
                   }
+                },
+                "discountingMethod" : {
+                  "discountingType" : "FRA"
+                },
+                "meta" : {
+                  "globalKey" : "1d9421f4"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
                       "adjustedDate" : {
+                        "value" : "1991-07-17",
                         "meta" : {
                           "globalKey" : "3e39d1"
-                        },
-                        "value" : "1991-07-17"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "0"
                       }
                     },
                     "meta" : {
-                      "externalKey" : "resetDate",
-                      "globalKey" : "0"
+                      "globalKey" : "0",
+                      "externalKey" : "resetDate"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
                       "adjustedDate" : {
+                        "value" : "1992-01-17",
                         "meta" : {
                           "globalKey" : "3e4051"
-                        },
-                        "value" : "1992-01-17"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "0"
@@ -213,19 +211,15 @@
                     "meta" : {
                       "globalKey" : "0"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "discountingMethod" : {
-                  "discountingType" : "FRA"
-                },
-                "meta" : {
-                  "globalKey" : "dc55f19f"
-                },
                 "paymentDate" : {
+                  "unadjustedDate" : "1991-07-17",
                   "dateAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "CHZU"
@@ -234,37 +228,23 @@
                         "globalKey" : "1f8e60"
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
                       "globalKey" : "211caa4f"
                     }
                   },
                   "meta" : {
                     "globalKey" : "407eeb1e"
-                  },
-                  "unadjustedDate" : "1991-07-17"
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
                   }
                 },
                 "resetDates" : {
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "f12537c9"
+                      "globalKey" : "ce01227d"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -273,159 +253,179 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDate",
-                      "globalReference" : "0"
+                      "globalReference" : "0",
+                      "externalReference" : "resetDate"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "f12537c9"
+                    "globalKey" : "ce01227d"
                   }
+                },
+                "discountingMethod" : {
+                  "discountingType" : "FRA"
+                },
+                "meta" : {
+                  "globalKey" : "44b30fd3"
                 }
               } ],
               "meta" : {
-                "globalKey" : "1579b067"
+                "globalKey" : "842dfc5f"
               }
             }
           },
           "meta" : {
-            "globalKey" : "1579b067"
+            "globalKey" : "842dfc5f"
           }
         },
         "meta" : {
-          "globalKey" : "1579b067"
+          "globalKey" : "842dfc5f"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "103bf473"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.04,
               "unit" : {
                 "currency" : {
                   "value" : "CHF"
                 }
               },
-              "value" : 0.04,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "CHF"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 25000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "CHF"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "f74299ed"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000.00,
               "unit" : {
                 "currency" : {
                   "value" : "CHF"
                 }
-              },
-              "value" : 25000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "434a0131"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "6a18d5cd"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "CHF-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "CHF"
-                }
-              },
-              "value" : 25000000.00
+            "meta" : {
+              "globalKey" : "d900e1e5"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "9965fc03"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "e1284e85",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "cff0a7d6",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e394e"
-      },
-      "value" : "1991-05-14"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "TR24TWEY5RVRQV65HD49",
           "meta" : {
-            "scheme" : "http://www.hsbc.com/swaps/trade-id"
-          },
-          "value" : "MB87623"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "e1284e85"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "e1284e85"
-      },
       "meta" : {
-        "globalKey" : "1896266e"
+        "globalKey" : "e1284e85",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "BFXS5XCH7N0Y05NIXW11",
           "meta" : {
-            "scheme" : "http://www.abnamro.com/swaps/trade-id"
-          },
-          "value" : "AA9876"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "cff0a7d6"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "cff0a7d6"
-      },
       "meta" : {
-        "globalKey" : "f7bfdcea"
+        "globalKey" : "cff0a7d6",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "661fc808"
+    }
+  },
+  "meta" : {
+    "globalKey" : "661fc808"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex09-euro-swaption-explicit.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex09-euro-swaption-explicit.json
index 97f31e4a53..2ff7d7a789 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex09-euro-swaption-explicit.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex09-euro-swaption-explicit.json
@@ -1,65 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "7e7a7717"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "4ea36a62"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "957b3c47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "957bb0a6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-08-30",
+      "meta" : {
+        "globalKey" : "3e821e"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -67,45 +47,24 @@
             "productQualifier" : "InterestRate_Option_Swaption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "bdf2ac17"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "exerciseNotice" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "exerciseNoticeGiver" : "SELLER"
-                      }
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "BEBR"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-08-28",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
@@ -116,35 +75,47 @@
                                 "globalKey" : "4158421"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da3b6050"
                             }
                           },
                           "meta" : {
                             "globalKey" : "770e7eb4"
-                          },
-                          "unadjustedDate" : "2001-08-28"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "770e7eb4"
                         }
                       } ],
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "BEBR"
+                        }
+                      },
                       "expirationTime" : {
+                        "hourMinuteTime" : "11:00:00",
                         "businessCenter" : {
                           "value" : "BEBR"
-                        },
-                        "hourMinuteTime" : "11:00:00"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "70973195"
+                        "globalKey" : "83fbdc15"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "exerciseNotice" : {
+                        "exerciseNoticeGiver" : "Seller",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      }
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "bdf2ac17"
-                },
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -155,46 +126,42 @@
                       "payout" : {
                         "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters0",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e1"
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb2"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "2b934"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "30/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -203,135 +170,133 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates0",
-                              "globalKey" : "d530b040"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters0",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters0"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters0"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e1"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb2"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "17984"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6a5a890",
+                              "externalKey" : "CalcPeriodDates0"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "30/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "6e2bf001"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64aef4"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "78"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "ac8"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1
+                            "meta" : {
+                              "globalKey" : "9b0d9350"
                             }
                           },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "86242c95"
                           }
                         }, {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters1",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e2"
+                          "rateSpecification" : {
+                            "floatingRate" : {
+                              "rateOption" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "rateOption-1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb3"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "28cc3"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -340,327 +305,358 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates1",
-                              "globalKey" : "c8353f30"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters1",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters1"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters1"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e2"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb3"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "18ad5"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6b3d162",
+                              "externalKey" : "CalcPeriodDates1"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "9ec5a1dd"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64ad85"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters1",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            }
-                          },
-                          "rateSpecification" : {
-                            "floatingRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateOption" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "rateOption-1"
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "8f129421"
                             }
                           },
                           "resetDates" : {
                             "calculationPeriodDatesReference" : {
-                              "externalReference" : "CalcPeriodDates1",
-                              "globalReference" : "c8353f30"
+                              "globalReference" : "d6b3d162",
+                              "externalReference" : "CalcPeriodDates1"
                             },
+                            "resetRelativeTo" : "CalculationPeriodStartDate",
                             "fixingDates" : {
+                              "periodMultiplier" : -2,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "2d80ce65"
+                                "globalKey" : "a5cb919"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : -2,
-                              "dayType" : "BUSINESS",
+                              "dayType" : "Business",
+                              "businessDayConvention" : "NONE",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "fixingBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "fixingBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "NONE",
                               "dateRelativeTo" : {
-                                "externalReference" : "resetDates0",
-                                "globalReference" : "3522cca9"
+                                "globalReference" : "dbaefb1",
+                                "externalReference" : "resetDates0"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "resetDates0",
-                              "globalKey" : "3522cca9"
+                            "resetFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
                             "resetDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "paymentBusinessCenters1",
-                                  "globalReference" : "20a71d"
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "paymentBusinessCenters1"
                                 },
                                 "meta" : {
                                   "globalKey" : "e30c2739"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "19472b0a"
                               }
                             },
-                            "resetFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            },
-                            "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                            "meta" : {
+                              "globalKey" : "dbaefb1",
+                              "externalKey" : "resetDates0"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ad0fb833"
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "893cb5bc"
+                          "globalKey" : "2d8d4cfe"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "893cb5bc"
+                      "globalKey" : "2d8d4cfe"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "893cb5bc"
+                    "globalKey" : "2d8d4cfe"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "a68544e3"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "a68544e3"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "6af856ed"
+            "globalKey" : "6693810d"
           }
         },
         "meta" : {
-          "globalKey" : "6af856ed"
+          "globalKey" : "6693810d"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7f30bbe5"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.05,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.05,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "66e6c0bb"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "65d139a0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Telerate"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "4820adb2"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e821e"
-      },
-      "value" : "2000-08-30"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c7753bbd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c7753bbe"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "13006d78"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "5ac63039"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        }
-      },
       "quantity" : {
+        "value" : 100000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         },
-        "value" : 100000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2000-08-30",
         "dateAdjustments" : {
+          "businessDayConvention" : "FOLLOWING",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "EUTA"
@@ -669,16 +665,20 @@
               "globalKey" : "20a71d"
             }
           },
-          "businessDayConvention" : "FOLLOWING",
           "meta" : {
             "globalKey" : "211dc30c"
           }
-        },
-        "unadjustedDate" : "2000-08-30"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "dc25c051"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "a84aedd9"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex10-euro-swaption-relative.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex10-euro-swaption-relative.json
index e76735ec3f..5da86d8554 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex10-euro-swaption-relative.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex10-euro-swaption-relative.json
@@ -1,65 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "29b2c0d7"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "b3d888a2"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "957b3c47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "957bb0a6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-08-30",
+      "meta" : {
+        "globalKey" : "3e821e"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -67,45 +47,24 @@
             "productQualifier" : "InterestRate_Option_Swaption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "66603c51"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "exerciseNotice" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "exerciseNoticeGiver" : "SELLER"
-                      }
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "BEBR"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-08-28",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
@@ -116,41 +75,27 @@
                                 "globalKey" : "4158421"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da3b6050"
                             }
                           },
                           "meta" : {
                             "globalKey" : "770e7eb4"
-                          },
-                          "unadjustedDate" : "2001-08-28"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "770e7eb4"
                         }
                       } ],
-                      "expirationTime" : {
-                        "businessCenter" : {
-                          "value" : "BEBR"
-                        },
-                        "hourMinuteTime" : "11:00:00"
-                      },
-                      "meta" : {
-                        "externalKey" : "europeanExercise0",
-                        "globalKey" : "9cfb157b"
-                      },
                       "relevantUnderlyingDate" : {
-                        "meta" : {
-                          "globalKey" : "6e5a630"
-                        },
                         "relativeDates" : {
+                          "periodMultiplier" : 2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "6e5a630"
+                            "globalKey" : "954e996c"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : 2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "EUTA"
@@ -159,19 +104,45 @@
                               "globalKey" : "20a71d"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "europeanExercise0",
-                            "globalReference" : "9cfb157b"
+                            "globalReference" : "4e313b99",
+                            "externalReference" : "europeanExercise0"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "954e996c"
+                        }
+                      },
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "BEBR"
                         }
+                      },
+                      "expirationTime" : {
+                        "hourMinuteTime" : "11:00:00",
+                        "businessCenter" : {
+                          "value" : "BEBR"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "4e313b99",
+                        "externalKey" : "europeanExercise0"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "exerciseNotice" : {
+                        "exerciseNoticeGiver" : "Seller",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      }
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "66603c51"
-                },
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -182,46 +153,42 @@
                       "payout" : {
                         "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters0",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e1"
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb2"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "2b934"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "30/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -230,135 +197,133 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates0",
-                              "globalKey" : "d530b040"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters0",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters0"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters0"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e1"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb2"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "17984"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6a5a890",
+                              "externalKey" : "CalcPeriodDates0"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "30/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "6e2bf001"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64aef4"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "78"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "ac8"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1
+                            "meta" : {
+                              "globalKey" : "9b0d9350"
                             }
                           },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "86242c95"
                           }
                         }, {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters1",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e2"
+                          "rateSpecification" : {
+                            "floatingRate" : {
+                              "rateOption" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "rateOption-1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb3"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "28cc3"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -367,327 +332,358 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates1",
-                              "globalKey" : "c8353f30"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters1",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters1"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters1"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e2"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb3"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "18ad5"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6b3d162",
+                              "externalKey" : "CalcPeriodDates1"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "9ec5a1dd"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64ad85"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters1",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            }
-                          },
-                          "rateSpecification" : {
-                            "floatingRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateOption" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "rateOption-1"
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "8f129421"
                             }
                           },
                           "resetDates" : {
                             "calculationPeriodDatesReference" : {
-                              "externalReference" : "CalcPeriodDates1",
-                              "globalReference" : "c8353f30"
+                              "globalReference" : "d6b3d162",
+                              "externalReference" : "CalcPeriodDates1"
                             },
+                            "resetRelativeTo" : "CalculationPeriodStartDate",
                             "fixingDates" : {
+                              "periodMultiplier" : -2,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "2d80ce65"
+                                "globalKey" : "a5cb919"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : -2,
-                              "dayType" : "BUSINESS",
+                              "dayType" : "Business",
+                              "businessDayConvention" : "NONE",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "fixingBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "fixingBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "NONE",
                               "dateRelativeTo" : {
-                                "externalReference" : "resetDates0",
-                                "globalReference" : "3522cca9"
+                                "globalReference" : "dbaefb1",
+                                "externalReference" : "resetDates0"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "resetDates0",
-                              "globalKey" : "3522cca9"
+                            "resetFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
                             "resetDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "paymentBusinessCenters1",
-                                  "globalReference" : "20a71d"
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "paymentBusinessCenters1"
                                 },
                                 "meta" : {
                                   "globalKey" : "e30c2739"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "19472b0a"
                               }
                             },
-                            "resetFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            },
-                            "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                            "meta" : {
+                              "globalKey" : "dbaefb1",
+                              "externalKey" : "resetDates0"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ad0fb833"
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "893cb5bc"
+                          "globalKey" : "2d8d4cfe"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "893cb5bc"
+                      "globalKey" : "2d8d4cfe"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "893cb5bc"
+                    "globalKey" : "2d8d4cfe"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "7bdd602b"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "7bdd602b"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "3a8c8fbb"
+            "globalKey" : "4651ea55"
           }
         },
         "meta" : {
-          "globalKey" : "3a8c8fbb"
+          "globalKey" : "4651ea55"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7f30bbe5"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.05,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.05,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "66e6c0bb"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "65d139a0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Telerate"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "4820adb2"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e821e"
-      },
-      "value" : "2000-08-30"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c7753bbd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c7753bbe"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "7fb281d2"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "5ac63039"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        }
-      },
       "quantity" : {
+        "value" : 100000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         },
-        "value" : 100000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2000-08-30",
         "dateAdjustments" : {
+          "businessDayConvention" : "FOLLOWING",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "EUTA"
@@ -696,16 +692,20 @@
               "globalKey" : "20a71d"
             }
           },
-          "businessDayConvention" : "FOLLOWING",
           "meta" : {
             "globalKey" : "211dc30c"
           }
-        },
-        "unadjustedDate" : "2000-08-30"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "dc25c051"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "3c70f5bf"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex11-euro-swaption-partial-auto-ex.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex11-euro-swaption-partial-auto-ex.json
index 48bbd39f39..3e9ba797a5 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex11-euro-swaption-partial-auto-ex.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex11-euro-swaption-partial-auto-ex.json
@@ -1,65 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "5851d128"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "1e7cc7b1"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "957b3c47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "957bb0a6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-08-30",
+      "meta" : {
+        "globalKey" : "3e821e"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -67,40 +47,24 @@
             "productQualifier" : "InterestRate_Option_Swaption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "35d68628"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "automaticExercise" : {
-                      "thresholdRate" : 0.0002
-                    },
-                    "followUpConfirmation" : true
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-08-28",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
@@ -111,43 +75,50 @@
                                 "globalKey" : "4158421"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da3b6050"
                             }
                           },
                           "meta" : {
                             "globalKey" : "770e7eb4"
-                          },
-                          "unadjustedDate" : "2001-08-28"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "770e7eb4"
                         }
                       } ],
-                      "expirationTime" : {
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "11:00:00"
+                        }
                       },
-                      "meta" : {
-                        "globalKey" : "b1df3e41"
+                      "expirationTime" : {
+                        "hourMinuteTime" : "11:00:00",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
                       },
                       "partialExercise" : {
-                        "integralMultipleAmount" : 10000000,
-                        "minimumNotionalAmount" : 50000000,
                         "notionaReference" : {
-                          "externalReference" : "notional0",
-                          "globalReference" : "0"
-                        }
+                          "globalReference" : "0",
+                          "externalReference" : "notional0"
+                        },
+                        "integralMultipleAmount" : 10000000,
+                        "minimumNotionalAmount" : 50000000
+                      },
+                      "meta" : {
+                        "globalKey" : "ee531a01"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "automaticExercise" : {
+                      "thresholdRate" : 0.0002
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "35d68628"
-                },
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -158,47 +129,43 @@
                       "payout" : {
                         "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "externalKey" : "notional0",
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0",
+                              "externalKey" : "notional0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters0",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e1"
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb2"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "2b934"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "30/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -207,136 +174,134 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates0",
-                              "globalKey" : "d530b040"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters0",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters0"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters0"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e1"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb2"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "17984"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6a5a890",
+                              "externalKey" : "CalcPeriodDates0"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "30/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "6e2bf001"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64aef4"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "78"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "ac8"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1
+                            "meta" : {
+                              "globalKey" : "9b0d9350"
                             }
                           },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "86242c95"
                           }
                         }, {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "externalKey" : "notional1",
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0",
+                              "externalKey" : "notional1"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters1",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e2"
+                          "rateSpecification" : {
+                            "floatingRate" : {
+                              "rateOption" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "rateOption-1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb3"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "28cc3"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -345,327 +310,358 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates1",
-                              "globalKey" : "c8353f30"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters1",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters1"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters1"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e2"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb3"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "18ad5"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6b3d162",
+                              "externalKey" : "CalcPeriodDates1"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "9ec5a1dd"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64ad85"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters1",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            }
-                          },
-                          "rateSpecification" : {
-                            "floatingRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateOption" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "rateOption-1"
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "8f129421"
                             }
                           },
                           "resetDates" : {
                             "calculationPeriodDatesReference" : {
-                              "externalReference" : "CalcPeriodDates1",
-                              "globalReference" : "c8353f30"
+                              "globalReference" : "d6b3d162",
+                              "externalReference" : "CalcPeriodDates1"
                             },
+                            "resetRelativeTo" : "CalculationPeriodStartDate",
                             "fixingDates" : {
+                              "periodMultiplier" : -2,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "2d80ce65"
+                                "globalKey" : "a5cb919"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : -2,
-                              "dayType" : "BUSINESS",
+                              "dayType" : "Business",
+                              "businessDayConvention" : "NONE",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "fixingBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "fixingBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "NONE",
                               "dateRelativeTo" : {
-                                "externalReference" : "resetDates0",
-                                "globalReference" : "3522cca9"
+                                "globalReference" : "dbaefb1",
+                                "externalReference" : "resetDates0"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "resetDates0",
-                              "globalKey" : "3522cca9"
+                            "resetFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
                             "resetDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "paymentBusinessCenters1",
-                                  "globalReference" : "20a71d"
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "paymentBusinessCenters1"
                                 },
                                 "meta" : {
                                   "globalKey" : "e30c2739"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "19472b0a"
                               }
                             },
-                            "resetFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            },
-                            "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                            "meta" : {
+                              "globalKey" : "dbaefb1",
+                              "externalKey" : "resetDates0"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ad0fb833"
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "893cb5bc"
+                          "globalKey" : "2d8d4cfe"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "893cb5bc"
+                      "globalKey" : "2d8d4cfe"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "893cb5bc"
+                    "globalKey" : "2d8d4cfe"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "7e0f452c"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "7e0f452c"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "b81cd37e"
+            "globalKey" : "839e9316"
           }
         },
         "meta" : {
-          "globalKey" : "b81cd37e"
+          "globalKey" : "839e9316"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7f30bbe5"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.05,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.05,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "66e6c0bb"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "65d139a0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Telerate"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "4820adb2"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e821e"
-      },
-      "value" : "2000-08-30"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c7753bbd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c7753bbe"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "d163a7cf"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "5ac63039"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        }
-      },
       "quantity" : {
+        "value" : 100000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         },
-        "value" : 100000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2000-08-30",
         "dateAdjustments" : {
+          "businessDayConvention" : "FOLLOWING",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "EUTA"
@@ -674,16 +670,20 @@
               "globalKey" : "20a71d"
             }
           },
-          "businessDayConvention" : "FOLLOWING",
           "meta" : {
             "globalKey" : "211dc30c"
           }
-        },
-        "unadjustedDate" : "2000-08-30"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "dc25c051"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "d9825fe2"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex12-euro-swaption-straddle-cash.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex12-euro-swaption-straddle-cash.json
index 7717fa8de9..dbf9d41420 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex12-euro-swaption-straddle-cash.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex12-euro-swaption-straddle-cash.json
@@ -1,65 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "fef337e7"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "efc9c792"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "957b3c47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "957bb0a6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2000-08-30",
+      "meta" : {
+        "globalKey" : "3e821e"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -67,31 +47,23 @@
             "productQualifier" : "InterestRate_Option_Swaption"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
-              "meta" : {
-                "globalKey" : "71c61427"
-              },
               "optionPayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "74ea67a"
-                  },
                   "settlementDate" : {
                     "adjustableOrRelativeDate" : {
                       "relativeDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "6e5a630"
+                          "globalKey" : "954e996c"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -100,39 +72,22 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "europeanExercise0",
-                          "globalReference" : "1795a9eb"
+                          "globalReference" : "fd97762b",
+                          "externalReference" : "europeanExercise0"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "6e5a630"
+                      "globalKey" : "954e996c"
                     }
                   },
+                  "meta" : {
+                    "globalKey" : "940abbfa"
+                  },
                   "cashSettlementTerms" : [ {
-                    "cashSettlementMethod" : "PAR_YIELD_CURVE_UNADJUSTED_METHOD",
-                    "meta" : {
-                      "externalKey" : "cashSettlement0",
-                      "globalKey" : "d909f84a"
-                    },
-                    "valuationDate" : {
-                      "valuationDate" : {
-                        "meta" : {
-                          "globalKey" : "7e857845"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "europeanExercise0",
-                          "globalReference" : "1795a9eb"
-                        }
-                      }
-                    },
+                    "cashSettlementMethod" : "ParYieldCurveUnadjustedMethod",
                     "valuationMethod" : {
-                      "quotationMethod" : "MID",
                       "valuationSource" : {
                         "informationSource" : {
                           "primarySource" : {
@@ -141,43 +96,48 @@
                             }
                           }
                         }
+                      },
+                      "quotationMethod" : "Mid"
+                    },
+                    "valuationDate" : {
+                      "valuationDate" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "7ae6233d"
+                        },
+                        "businessDayConvention" : "NONE",
+                        "dateRelativeTo" : {
+                          "globalReference" : "fd97762b",
+                          "externalReference" : "europeanExercise0"
+                        }
                       }
                     },
                     "valuationTime" : {
+                      "hourMinuteTime" : "11:00:00",
                       "businessCenter" : {
                         "value" : "BEBR"
-                      },
-                      "hourMinuteTime" : "11:00:00"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "f67b108e",
+                      "externalKey" : "cashSettlement0"
                     }
                   } ]
                 },
                 "buyerSeller" : {
-                  "buyer" : "PARTY_1",
-                  "seller" : "PARTY_2"
+                  "buyer" : "Party1",
+                  "seller" : "Party2"
                 },
+                "optionType" : "Straddle",
                 "exerciseTerms" : {
-                  "exerciseProcedure" : {
-                    "followUpConfirmation" : true,
-                    "manualExercise" : {
-                      "exerciseNotice" : {
-                        "businessCenter" : {
-                          "value" : "BEBR"
-                        },
-                        "exerciseNoticeGiver" : "BUYER"
-                      }
-                    }
-                  },
                   "optionStyle" : {
                     "europeanExercise" : {
-                      "earliestExerciseTime" : {
-                        "businessCenter" : {
-                          "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "09:00:00"
-                      },
                       "expirationDate" : [ {
                         "adjustableDate" : {
+                          "unadjustedDate" : "2001-08-28",
                           "dateAdjustments" : {
+                            "businessDayConvention" : "FOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
@@ -188,37 +148,48 @@
                                 "globalKey" : "4158421"
                               }
                             },
-                            "businessDayConvention" : "FOLLOWING",
                             "meta" : {
                               "globalKey" : "da3b6050"
                             }
                           },
                           "meta" : {
                             "globalKey" : "770e7eb4"
-                          },
-                          "unadjustedDate" : "2001-08-28"
+                          }
                         },
                         "meta" : {
                           "globalKey" : "770e7eb4"
                         }
                       } ],
+                      "earliestExerciseTime" : {
+                        "hourMinuteTime" : "09:00:00",
+                        "businessCenter" : {
+                          "value" : "GBLO"
+                        }
+                      },
                       "expirationTime" : {
+                        "hourMinuteTime" : "11:00:00",
                         "businessCenter" : {
                           "value" : "GBLO"
-                        },
-                        "hourMinuteTime" : "11:00:00"
+                        }
                       },
                       "meta" : {
-                        "externalKey" : "europeanExercise0",
-                        "globalKey" : "1795a9eb"
+                        "globalKey" : "fd97762b",
+                        "externalKey" : "europeanExercise0"
                       }
                     }
+                  },
+                  "exerciseProcedure" : {
+                    "manualExercise" : {
+                      "exerciseNotice" : {
+                        "exerciseNoticeGiver" : "Buyer",
+                        "businessCenter" : {
+                          "value" : "BEBR"
+                        }
+                      }
+                    },
+                    "followUpConfirmation" : true
                   }
                 },
-                "meta" : {
-                  "globalKey" : "71c61427"
-                },
-                "optionType" : "STRADDLE",
                 "underlier" : {
                   "contractualProduct" : {
                     "productTaxonomy" : [ {
@@ -229,46 +200,42 @@
                       "payout" : {
                         "interestRatePayout" : [ {
                           "payerReceiver" : {
-                            "payer" : "PARTY_1",
-                            "receiver" : "PARTY_2"
+                            "payer" : "Party1",
+                            "receiver" : "Party2"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-1"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters0",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e1"
+                          "rateSpecification" : {
+                            "fixedRate" : {
+                              "rateSchedule" : {
+                                "price" : {
+                                  "address" : {
+                                    "scope" : "DOCUMENT",
+                                    "value" : "price-1"
+                                  }
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb2"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "2b934"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "30/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -277,135 +244,133 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates0",
-                              "globalKey" : "d530b040"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters0",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters0"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters0"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e1"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb2"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "17984"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6a5a890",
+                              "externalKey" : "CalcPeriodDates0"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "30/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "6e2bf001"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64aef4"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 1,
+                              "period" : "Y",
+                              "meta" : {
+                                "globalKey" : "78"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "ac8"
-                              },
-                              "period" : "Y",
-                              "periodMultiplier" : 1
+                            "meta" : {
+                              "globalKey" : "9b0d9350"
                             }
                           },
-                          "rateSpecification" : {
-                            "fixedRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateSchedule" : {
-                                "price" : {
-                                  "address" : {
-                                    "scope" : "DOCUMENT",
-                                    "value" : "price-1"
-                                  }
-                                }
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "86242c95"
                           }
                         }, {
                           "payerReceiver" : {
-                            "payer" : "PARTY_2",
-                            "receiver" : "PARTY_1"
+                            "payer" : "Party2",
+                            "receiver" : "Party1"
                           },
                           "priceQuantity" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
                             "quantitySchedule" : {
                               "address" : {
                                 "scope" : "DOCUMENT",
                                 "value" : "quantity-2"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "0"
                             }
                           },
-                          "calculationPeriodDates" : {
-                            "calculationPeriodDatesAdjustments" : {
-                              "businessCenters" : {
-                                "businessCentersReference" : {
-                                  "externalReference" : "accrualBusinessCenters1",
-                                  "globalReference" : "20a71d"
-                                },
-                                "meta" : {
-                                  "globalKey" : "622268e2"
+                          "rateSpecification" : {
+                            "floatingRate" : {
+                              "rateOption" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "rateOption-1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
-                                "globalKey" : "985d6cb3"
+                                "globalKey" : "0"
                               }
-                            },
-                            "calculationPeriodFrequency" : {
-                              "meta" : {
-                                "globalKey" : "28cc3"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6,
-                              "rollConvention" : "30"
-                            },
+                            }
+                          },
+                          "dayCountFraction" : {
+                            "value" : "ACT/360"
+                          },
+                          "calculationPeriodDates" : {
                             "effectiveDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2001-08-30",
                                 "dateAdjustments" : {
                                   "businessDayConvention" : "NONE",
                                   "meta" : {
@@ -414,327 +379,358 @@
                                 },
                                 "meta" : {
                                   "globalKey" : "eae921d6"
-                                },
-                                "unadjustedDate" : "2001-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "eae921d6"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "CalcPeriodDates1",
-                              "globalKey" : "c8353f30"
-                            },
                             "terminationDate" : {
                               "adjustableDate" : {
+                                "unadjustedDate" : "2006-08-30",
                                 "dateAdjustments" : {
+                                  "businessDayConvention" : "MODFOLLOWING",
                                   "businessCenters" : {
                                     "businessCenter" : [ {
                                       "value" : "EUTA"
                                     } ],
                                     "meta" : {
-                                      "externalKey" : "accrualBusinessCenters1",
-                                      "globalKey" : "20a71d"
+                                      "globalKey" : "20a71d",
+                                      "externalKey" : "accrualBusinessCenters1"
                                     }
                                   },
-                                  "businessDayConvention" : "MODFOLLOWING",
                                   "meta" : {
                                     "globalKey" : "365baaee"
                                   }
                                 },
                                 "meta" : {
                                   "globalKey" : "9ead9b90"
-                                },
-                                "unadjustedDate" : "2006-08-30"
+                                }
                               },
                               "meta" : {
                                 "globalKey" : "9ead9b90"
                               }
+                            },
+                            "calculationPeriodDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
+                              "businessCenters" : {
+                                "businessCentersReference" : {
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "accrualBusinessCenters1"
+                                },
+                                "meta" : {
+                                  "globalKey" : "622268e2"
+                                }
+                              },
+                              "meta" : {
+                                "globalKey" : "985d6cb3"
+                              }
+                            },
+                            "calculationPeriodFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "18ad5"
+                              },
+                              "rollConvention" : "30"
+                            },
+                            "meta" : {
+                              "globalKey" : "d6b3d162",
+                              "externalKey" : "CalcPeriodDates1"
                             }
                           },
-                          "dayCountFraction" : {
-                            "value" : "ACT/360"
-                          },
-                          "meta" : {
-                            "globalKey" : "9ec5a1dd"
-                          },
                           "paymentDates" : {
-                            "meta" : {
-                              "globalKey" : "4d64ad85"
+                            "paymentFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
-                            "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                            "payRelativeTo" : "CalculationPeriodEndDate",
                             "paymentDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "paymentBusinessCenters1",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "paymentBusinessCenters1"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "365baaee"
                               }
                             },
-                            "paymentFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            }
-                          },
-                          "rateSpecification" : {
-                            "floatingRate" : {
-                              "meta" : {
-                                "globalKey" : "0"
-                              },
-                              "rateOption" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "rateOption-1"
-                                }
-                              }
+                            "meta" : {
+                              "globalKey" : "8f129421"
                             }
                           },
                           "resetDates" : {
                             "calculationPeriodDatesReference" : {
-                              "externalReference" : "CalcPeriodDates1",
-                              "globalReference" : "c8353f30"
+                              "globalReference" : "d6b3d162",
+                              "externalReference" : "CalcPeriodDates1"
                             },
+                            "resetRelativeTo" : "CalculationPeriodStartDate",
                             "fixingDates" : {
+                              "periodMultiplier" : -2,
+                              "period" : "D",
                               "meta" : {
-                                "globalKey" : "2d80ce65"
+                                "globalKey" : "a5cb919"
                               },
-                              "period" : "D",
-                              "periodMultiplier" : -2,
-                              "dayType" : "BUSINESS",
+                              "dayType" : "Business",
+                              "businessDayConvention" : "NONE",
                               "businessCenters" : {
                                 "businessCenter" : [ {
                                   "value" : "EUTA"
                                 } ],
                                 "meta" : {
-                                  "externalKey" : "fixingBusinessCenters0",
-                                  "globalKey" : "20a71d"
+                                  "globalKey" : "20a71d",
+                                  "externalKey" : "fixingBusinessCenters0"
                                 }
                               },
-                              "businessDayConvention" : "NONE",
                               "dateRelativeTo" : {
-                                "externalReference" : "resetDates0",
-                                "globalReference" : "3522cca9"
+                                "globalReference" : "dbaefb1",
+                                "externalReference" : "resetDates0"
                               }
                             },
-                            "meta" : {
-                              "externalKey" : "resetDates0",
-                              "globalKey" : "3522cca9"
+                            "resetFrequency" : {
+                              "periodMultiplier" : 6,
+                              "period" : "M",
+                              "meta" : {
+                                "globalKey" : "107"
+                              }
                             },
                             "resetDatesAdjustments" : {
+                              "businessDayConvention" : "MODFOLLOWING",
                               "businessCenters" : {
                                 "businessCentersReference" : {
-                                  "externalReference" : "paymentBusinessCenters1",
-                                  "globalReference" : "20a71d"
+                                  "globalReference" : "20a71d",
+                                  "externalReference" : "paymentBusinessCenters1"
                                 },
                                 "meta" : {
                                   "globalKey" : "e30c2739"
                                 }
                               },
-                              "businessDayConvention" : "MODFOLLOWING",
                               "meta" : {
                                 "globalKey" : "19472b0a"
                               }
                             },
-                            "resetFrequency" : {
-                              "meta" : {
-                                "globalKey" : "959"
-                              },
-                              "period" : "M",
-                              "periodMultiplier" : 6
-                            },
-                            "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                            "meta" : {
+                              "globalKey" : "dbaefb1",
+                              "externalKey" : "resetDates0"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "ad0fb833"
                           }
                         } ],
                         "meta" : {
-                          "globalKey" : "893cb5bc"
+                          "globalKey" : "2d8d4cfe"
                         }
                       }
                     },
                     "meta" : {
-                      "globalKey" : "893cb5bc"
+                      "globalKey" : "2d8d4cfe"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "893cb5bc"
+                    "globalKey" : "2d8d4cfe"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "395cbd9f"
                 }
-              } ]
+              } ],
+              "meta" : {
+                "globalKey" : "395cbd9f"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "8611897d"
+            "globalKey" : "a16fbac9"
           }
         },
         "meta" : {
-          "globalKey" : "8611897d"
+          "globalKey" : "a16fbac9"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7f30bbe5"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.05,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.05,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "66e6c0bb"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "65d139a0"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "EUR-EURIBOR-Telerate"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "4820adb2"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e821e"
-      },
-      "value" : "2000-08-30"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c7753bbd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c7753bbe"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "372acf7c"
+    }
   },
   "transferHistory" : [ {
-    "meta" : {
-      "globalKey" : "5ac63039"
-    },
     "transfer" : {
-      "payerReceiver" : {
-        "payerPartyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "receiverPartyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        }
-      },
       "quantity" : {
+        "value" : 100000,
         "unit" : {
           "currency" : {
             "value" : "EUR"
           }
+        }
+      },
+      "payerReceiver" : {
+        "payerPartyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
         },
-        "value" : 100000
+        "receiverPartyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       },
       "settlementDate" : {
+        "unadjustedDate" : "2000-08-30",
         "dateAdjustments" : {
+          "businessDayConvention" : "FOLLOWING",
           "businessCenters" : {
             "businessCenter" : [ {
               "value" : "EUTA"
@@ -743,16 +739,20 @@
               "globalKey" : "20a71d"
             }
           },
-          "businessDayConvention" : "FOLLOWING",
           "meta" : {
             "globalKey" : "211dc30c"
           }
-        },
-        "unadjustedDate" : "2000-08-30"
+        }
       },
       "transferExpression" : {
-        "priceTransfer" : "PREMIUM"
+        "priceTransfer" : "Premium"
       }
+    },
+    "meta" : {
+      "globalKey" : "dc25c051"
     }
-  } ]
+  } ],
+  "meta" : {
+    "globalKey" : "ede8b655"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex22-cap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex22-cap.json
index e036d0c90f..346b530e92 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex22-cap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex22-cap.json
@@ -1,58 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "a0cbd3f5"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "a0cbd3f5"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "957b3c47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "957bb0a6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-04-29",
+      "meta" : {
+        "globalKey" : "3e891d"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,46 +50,50 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters0",
-                        "globalReference" : "428533f"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e1"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
+                    "capRateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      },
+                      "buyer" : "Receiver",
+                      "seller" : "Payer"
+                    },
                     "meta" : {
-                      "globalKey" : "985d6cb2"
+                      "globalKey" : "d44f9f26"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28cc3"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-06-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -111,20 +102,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eae74156"
-                      },
-                      "unadjustedDate" : "2001-06-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae74156"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates0",
-                    "globalKey" : "ffbbac33"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-06-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -132,37 +120,61 @@
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters0",
-                            "globalKey" : "428533f"
+                            "globalKey" : "428533f",
+                            "externalKey" : "accrualBusinessCenters0"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b1a6d0"
                         }
                       },
                       "meta" : {
                         "globalKey" : "42b38772"
-                      },
-                      "unadjustedDate" : "2006-06-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "42b38772"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "428533f",
+                        "externalReference" : "accrualBusinessCenters0"
+                      },
+                      "meta" : {
+                        "globalKey" : "622268e1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "985d6cb2"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18ad5"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "e5232a3f",
+                    "externalKey" : "CalcPeriodDates0"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "130ed72f"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "18cf7fe3"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -170,250 +182,238 @@
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters0",
-                        "globalKey" : "428533f"
+                        "globalKey" : "428533f",
+                        "externalKey" : "paymentBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "97b1a6d0"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "capRateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      },
-                      "buyer" : "RECEIVER",
-                      "seller" : "PAYER"
-                    },
-                    "meta" : {
-                      "globalKey" : "d44f9f26"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "9e530f43"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "CalcPeriodDates0",
-                    "globalReference" : "ffbbac33"
+                    "globalReference" : "e5232a3f",
+                    "externalReference" : "CalcPeriodDates0"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2d80ce65"
+                      "globalKey" : "a5cb919"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "resetBusinessCenters0",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "20a71d",
+                        "externalKey" : "resetBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates0",
-                      "globalReference" : "366e4ca0"
+                      "globalReference" : "92a4c738",
+                      "externalReference" : "resetDates0"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates0",
-                    "globalKey" : "366e4ca0"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "resetBusinessCenters0",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "resetBusinessCenters0"
                       },
                       "meta" : {
                         "globalKey" : "35a06081"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "6bdb6452"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "92a4c738",
+                    "externalKey" : "resetDates0"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "169d67d3"
                 }
               } ],
               "meta" : {
-                "globalKey" : "130ed72f"
+                "globalKey" : "169d67d3"
               }
             }
           },
           "meta" : {
-            "globalKey" : "130ed72f"
+            "globalKey" : "169d67d3"
           }
         },
         "meta" : {
-          "globalKey" : "130ed72f"
+          "globalKey" : "169d67d3"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a79dc826"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EURIBOR-Telerate"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.06,
               "datedValue" : [ {
                 "date" : "2002-06-30",
+                "value" : 0.0625,
                 "meta" : {
                   "globalKey" : "5c1b1be9"
-                },
-                "value" : 0.0625
+                }
               }, {
                 "date" : "2003-06-30",
+                "value" : 0.065,
                 "meta" : {
                   "globalKey" : "a4ea653"
-                },
-                "value" : 0.065
+                }
               }, {
                 "date" : "2004-06-30",
+                "value" : 0.0675,
                 "meta" : {
                   "globalKey" : "5c1d0c84"
-                },
-                "value" : 0.0675
+                }
               }, {
                 "date" : "2005-06-30",
+                "value" : 0.07,
                 "meta" : {
                   "globalKey" : "7ad0ea7"
-                },
-                "value" : 0.07
+                }
               } ],
-              "arithmeticOperator" : "MIN",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Min"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EURIBOR-Telerate"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
+                }
               },
-              "value" : 100000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "be72bfd2"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e891d"
-      },
-      "value" : "2001-04-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c7753bbd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c7753bbe"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "761204e7"
+    }
+  },
+  "meta" : {
+    "globalKey" : "761204e7"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex23-floor.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex23-floor.json
index e43b4e854a..f3e222c88e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex23-floor.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex23-floor.json
@@ -1,58 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "5113eca1"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "5113eca1"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "957b3c47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "957bb0a6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-04-29",
+      "meta" : {
+        "globalKey" : "3e891d"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,46 +50,50 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters0",
-                        "globalReference" : "428533f"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e1"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
+                    "floorRateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      },
+                      "buyer" : "Receiver",
+                      "seller" : "Payer"
+                    },
                     "meta" : {
-                      "globalKey" : "985d6cb2"
+                      "globalKey" : "d44f9f26"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28cc3"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-06-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -111,20 +102,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eae74156"
-                      },
-                      "unadjustedDate" : "2001-06-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae74156"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates0",
-                    "globalKey" : "ffbbac33"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-06-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -132,37 +120,61 @@
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters0",
-                            "globalKey" : "428533f"
+                            "globalKey" : "428533f",
+                            "externalKey" : "accrualBusinessCenters0"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b1a6d0"
                         }
                       },
                       "meta" : {
                         "globalKey" : "42b38772"
-                      },
-                      "unadjustedDate" : "2006-06-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "42b38772"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "428533f",
+                        "externalReference" : "accrualBusinessCenters0"
+                      },
+                      "meta" : {
+                        "globalKey" : "622268e1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "985d6cb2"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18ad5"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "e5232a3f",
+                    "externalKey" : "CalcPeriodDates0"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "130ed72f"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "18cf7fe3"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -170,250 +182,238 @@
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters0",
-                        "globalKey" : "428533f"
+                        "globalKey" : "428533f",
+                        "externalKey" : "paymentBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "97b1a6d0"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "floorRateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      },
-                      "buyer" : "RECEIVER",
-                      "seller" : "PAYER"
-                    },
-                    "meta" : {
-                      "globalKey" : "d44f9f26"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "9e530f43"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "CalcPeriodDates0",
-                    "globalReference" : "ffbbac33"
+                    "globalReference" : "e5232a3f",
+                    "externalReference" : "CalcPeriodDates0"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2d80ce65"
+                      "globalKey" : "a5cb919"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "resetBusinessCenters0",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "20a71d",
+                        "externalKey" : "resetBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates0",
-                      "globalReference" : "366e4ca0"
+                      "globalReference" : "92a4c738",
+                      "externalReference" : "resetDates0"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates0",
-                    "globalKey" : "366e4ca0"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "resetBusinessCenters0",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "resetBusinessCenters0"
                       },
                       "meta" : {
                         "globalKey" : "35a06081"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "6bdb6452"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "92a4c738",
+                    "externalKey" : "resetDates0"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "169d67d3"
                 }
               } ],
               "meta" : {
-                "globalKey" : "130ed72f"
+                "globalKey" : "169d67d3"
               }
             }
           },
           "meta" : {
-            "globalKey" : "130ed72f"
+            "globalKey" : "169d67d3"
           }
         },
         "meta" : {
-          "globalKey" : "130ed72f"
+          "globalKey" : "169d67d3"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "7e2482d2"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EURIBOR-Telerate"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.04,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.04,
               "datedValue" : [ {
                 "date" : "2002-06-30",
+                "value" : 0.0425,
                 "meta" : {
                   "globalKey" : "5c1b1467"
-                },
-                "value" : 0.0425
+                }
               }, {
                 "date" : "2003-06-30",
+                "value" : 0.045,
                 "meta" : {
                   "globalKey" : "a4ea615"
-                },
-                "value" : 0.045
+                }
               }, {
                 "date" : "2004-06-30",
+                "value" : 0.0475,
                 "meta" : {
                   "globalKey" : "5c1d0502"
-                },
-                "value" : 0.0475
+                }
               }, {
                 "date" : "2005-06-30",
+                "value" : 0.05,
                 "meta" : {
                   "globalKey" : "7ad0ea5"
-                },
-                "value" : 0.05
+                }
               } ],
-              "arithmeticOperator" : "MAX",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Max"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EURIBOR-Telerate"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
+                }
               },
-              "value" : 100000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "33205562"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e891d"
-      },
-      "value" : "2001-04-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c7753bbd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c7753bbe"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "2e827a77"
+    }
+  },
+  "meta" : {
+    "globalKey" : "2e827a77"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex24-collar.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex24-collar.json
index 75ba2578eb..e37f43a3d4 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex24-collar.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex24-collar.json
@@ -1,58 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "3bff7537"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "3bff7537"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "957b3c47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "957bb0a6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-04-29",
+      "meta" : {
+        "globalKey" : "3e891d"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,46 +50,60 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters0",
-                        "globalReference" : "428533f"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e1"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
+                    "capRateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      },
+                      "buyer" : "Receiver",
+                      "seller" : "Payer"
+                    },
+                    "floorRateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      },
+                      "buyer" : "Payer",
+                      "seller" : "Receiver"
+                    },
                     "meta" : {
-                      "globalKey" : "985d6cb2"
+                      "globalKey" : "685c4c74"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28cc3"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-06-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -111,20 +112,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eae74156"
-                      },
-                      "unadjustedDate" : "2001-06-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae74156"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates0",
-                    "globalKey" : "ffbbac33"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-06-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -132,37 +130,61 @@
                             "value" : "EUTA"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters0",
-                            "globalKey" : "428533f"
+                            "globalKey" : "428533f",
+                            "externalKey" : "accrualBusinessCenters0"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b1a6d0"
                         }
                       },
                       "meta" : {
                         "globalKey" : "42b38772"
-                      },
-                      "unadjustedDate" : "2006-06-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "42b38772"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "428533f",
+                        "externalReference" : "accrualBusinessCenters0"
+                      },
+                      "meta" : {
+                        "globalKey" : "622268e1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "985d6cb2"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18ad5"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "e5232a3f",
+                    "externalKey" : "CalcPeriodDates0"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "14aba98b"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "18cf7fe3"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -170,307 +192,285 @@
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters0",
-                        "globalKey" : "428533f"
+                        "globalKey" : "428533f",
+                        "externalKey" : "paymentBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "97b1a6d0"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "capRateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      },
-                      "buyer" : "RECEIVER",
-                      "seller" : "PAYER"
-                    },
-                    "floorRateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      },
-                      "buyer" : "PAYER",
-                      "seller" : "RECEIVER"
-                    },
-                    "meta" : {
-                      "globalKey" : "685c4c74"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "9e530f43"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "CalcPeriodDates0",
-                    "globalReference" : "ffbbac33"
+                    "globalReference" : "e5232a3f",
+                    "externalReference" : "CalcPeriodDates0"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2d80ce65"
+                      "globalKey" : "a5cb919"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
                       } ],
                       "meta" : {
-                        "externalKey" : "resetBusinessCenters0",
-                        "globalKey" : "20a71d"
+                        "globalKey" : "20a71d",
+                        "externalKey" : "resetBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates0",
-                      "globalReference" : "366e4ca0"
+                      "globalReference" : "92a4c738",
+                      "externalReference" : "resetDates0"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates0",
-                    "globalKey" : "366e4ca0"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "resetBusinessCenters0",
-                        "globalReference" : "20a71d"
+                        "globalReference" : "20a71d",
+                        "externalReference" : "resetBusinessCenters0"
                       },
                       "meta" : {
                         "globalKey" : "35a06081"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "6bdb6452"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "92a4c738",
+                    "externalKey" : "resetDates0"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "53bdf227"
                 }
               } ],
               "meta" : {
-                "globalKey" : "14aba98b"
+                "globalKey" : "53bdf227"
               }
             }
           },
           "meta" : {
-            "globalKey" : "14aba98b"
+            "globalKey" : "53bdf227"
           }
         },
         "meta" : {
-          "globalKey" : "14aba98b"
+          "globalKey" : "53bdf227"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "d9dfe38c"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "bf589e11"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EURIBOR-Telerate"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 6
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
             "value" : {
+              "value" : 0.06,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.06,
               "datedValue" : [ {
                 "date" : "2002-06-30",
+                "value" : 0.0625,
                 "meta" : {
                   "globalKey" : "5c1b1be9"
-                },
-                "value" : 0.0625
+                }
               }, {
                 "date" : "2003-06-30",
+                "value" : 0.065,
                 "meta" : {
                   "globalKey" : "a4ea653"
-                },
-                "value" : 0.065
+                }
               }, {
                 "date" : "2004-06-30",
+                "value" : 0.0675,
                 "meta" : {
                   "globalKey" : "5c1d0c84"
-                },
-                "value" : 0.0675
+                }
               }, {
                 "date" : "2005-06-30",
+                "value" : 0.07,
                 "meta" : {
                   "globalKey" : "7ad0ea7"
-                },
-                "value" : 0.07
+                }
               } ],
-              "arithmeticOperator" : "MIN",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          }, {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Min"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-1"
+                "value" : "price-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 0.04,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.04,
               "datedValue" : [ {
                 "date" : "2002-06-30",
+                "value" : 0.0425,
                 "meta" : {
                   "globalKey" : "5c1b1467"
-                },
-                "value" : 0.0425
+                }
               }, {
                 "date" : "2003-06-30",
+                "value" : 0.045,
                 "meta" : {
                   "globalKey" : "a4ea615"
-                },
-                "value" : 0.045
+                }
               }, {
                 "date" : "2004-06-30",
+                "value" : 0.0475,
                 "meta" : {
                   "globalKey" : "5c1d0502"
-                },
-                "value" : 0.0475
+                }
               }, {
                 "date" : "2005-06-30",
+                "value" : 0.05,
                 "meta" : {
                   "globalKey" : "7ad0ea5"
-                },
-                "value" : 0.05
+                }
               } ],
-              "arithmeticOperator" : "MAX",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Max"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EURIBOR-Telerate"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 6,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
+                }
               },
-              "value" : 100000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "2bba2221"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "5ccbdf42"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e891d"
-      },
-      "value" : "2001-04-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c7753bbd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c7753bbe"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "af849cab"
+    }
+  },
+  "meta" : {
+    "globalKey" : "af849cab"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex25-fxnotional-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex25-fxnotional-swap.json
index d111028d07..0461a9dead 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex25-fxnotional-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex25-fxnotional-swap.json
@@ -1,58 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "5d171800"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "5d171800"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "957b3c47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "957bb0a6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-01-09",
+      "meta" : {
+        "globalKey" : "3e8849"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,58 +50,51 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "notionalScheduleJPY",
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "notionalScheduleJPY"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : true,
                   "initialPayment" : true,
+                  "finalPayment" : true,
                   "intermediatePayment" : true,
                   "meta" : {
                     "globalKey" : "12a6ef"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "JPTO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "81e56a96"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "58681de7"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c86"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "11"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-01-11",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -123,20 +103,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eb7870c3"
-                      },
-                      "unadjustedDate" : "2006-01-11"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eb7870c3"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates",
-                    "globalKey" : "30a986f2"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2011-01-11",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -149,33 +126,20 @@
                             "globalKey" : "81e56a96"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "58681de7"
                         }
                       },
                       "meta" : {
                         "globalKey" : "46e069fc"
-                      },
-                      "unadjustedDate" : "2011-01-11"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "46e069fc"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "a7e26236"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "e8a5aeec"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -188,68 +152,80 @@
                         "globalKey" : "81e56a96"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "58681de7"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "18a98"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "11"
+                  },
+                  "meta" : {
+                    "globalKey" : "a55eed20",
+                    "externalKey" : "fixedCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "JPTO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "81e56a96"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "58681de7"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "3c51359a"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "836f0e8e"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "98907a10"
+                  "quantityReference" : {
+                    "globalReference" : "0",
+                    "externalReference" : "notionalScheduleJPY"
                   },
                   "quantityMultiplier" : {
                     "fxLinkedNotionalSchedule" : {
-                      "fixingTime" : {
-                        "businessCenter" : {
-                          "value" : "JPTO"
-                        },
-                        "hourMinuteTime" : "17:00:00"
-                      },
-                      "fxSpotRateSource" : {
-                        "primarySource" : {
-                          "sourceProvider" : {
-                            "value" : "BANK_OF_JAPAN"
-                          }
-                        }
-                      },
                       "varyingNotionalCurrency" : {
                         "value" : "USD"
                       },
                       "varyingNotionalFixingDates" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "da0eae22"
+                          "globalKey" : "ef9abbd6"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -260,68 +236,70 @@
                             "globalKey" : "4f79278"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "floatingResetDates",
-                          "globalReference" : "58bd1f13"
+                          "globalReference" : "d2280a35",
+                          "externalReference" : "floatingResetDates"
+                        }
+                      },
+                      "fxSpotRateSource" : {
+                        "primarySource" : {
+                          "sourceProvider" : {
+                            "value" : "BankOfJapan"
+                          }
+                        }
+                      },
+                      "fixingTime" : {
+                        "hourMinuteTime" : "17:00:00",
+                        "businessCenter" : {
+                          "value" : "JPTO"
                         }
                       },
                       "varyingNotionalInterimExchangePaymentDates" : {
+                        "periodMultiplier" : 0,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "6713b2c1"
+                          "globalKey" : "63745db9"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 0,
                         "businessDayConvention" : "NONE",
                         "dateRelativeTo" : {
-                          "externalReference" : "floatingPaymentDates",
-                          "globalReference" : "e8a5aee9"
+                          "globalReference" : "7da31d57",
+                          "externalReference" : "floatingPaymentDates"
                         }
                       }
                     }
                   },
-                  "quantityReference" : {
-                    "externalReference" : "notionalScheduleJPY",
-                    "globalReference" : "0"
+                  "meta" : {
+                    "globalKey" : "905d4f7c"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : true,
                   "initialPayment" : true,
+                  "finalPayment" : true,
                   "intermediatePayment" : true,
                   "meta" : {
                     "globalKey" : "12a6ef"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "JPTO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "81e56a96"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "58681de7"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c29"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "11"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-01-11",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -330,20 +308,17 @@
                       },
                       "meta" : {
                         "globalKey" : "eb7870c3"
-                      },
-                      "unadjustedDate" : "2006-01-11"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eb7870c3"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates",
-                    "globalKey" : "c7aa61af"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2011-01-11",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -356,34 +331,20 @@
                             "globalKey" : "81e56a96"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "58681de7"
                         }
                       },
                       "meta" : {
                         "globalKey" : "46e069fc"
-                      },
-                      "unadjustedDate" : "2011-01-11"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "46e069fc"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "e898554b"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "floatingPaymentDates",
-                    "globalKey" : "e8a5aee9"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -396,44 +357,69 @@
                         "globalKey" : "81e56a96"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "58681de7"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "17f55"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "rollConvention" : "11"
+                  },
+                  "meta" : {
+                    "globalKey" : "a55ee1dd",
+                    "externalKey" : "floatingCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "JPTO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "81e56a96"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "58681de7"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "7da31d57",
+                    "externalKey" : "floatingPaymentDates"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates",
-                    "globalReference" : "c7aa61af"
+                    "globalReference" : "a55ee1dd",
+                    "externalReference" : "floatingCalcPeriodDates"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "20aefd48"
+                      "globalKey" : "fd8ae7fc"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -442,17 +428,20 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "floatingResetDates",
-                      "globalReference" : "58bd1f13"
+                      "globalReference" : "d2280a35",
+                      "externalReference" : "floatingResetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingResetDates",
-                    "globalKey" : "58bd1f13"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -465,162 +454,173 @@
                         "globalKey" : "81e56a96"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "58681de7"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "d2280a35",
+                    "externalKey" : "floatingResetDates"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "b98f609d"
                 }
               } ],
               "meta" : {
-                "globalKey" : "9b49f355"
+                "globalKey" : "f3e8a34f"
               }
             }
           },
           "meta" : {
-            "globalKey" : "9b49f355"
+            "globalKey" : "f3e8a34f"
           }
         },
         "meta" : {
-          "globalKey" : "9b49f355"
+          "globalKey" : "f3e8a34f"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "65085842"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.01,
               "unit" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "value" : 0.01,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "JPY"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 1000000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "JPY"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "3c02affe"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
               "unit" : {
                 "currency" : {
-                  "value" : "JPY"
+                  "value" : "USD"
                 }
-              },
-              "value" : 1000000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "f5c71eab"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d05"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              }
+            "meta" : {
+              "globalKey" : "828026c7"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "bf5968ad"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e8849"
-      },
-      "value" : "2001-01-09"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c7753bbd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c7753bbe"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "7c87865e"
+    }
+  },
+  "meta" : {
+    "globalKey" : "7c87865e"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex27-inverse-floater.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex27-inverse-floater.json
index 17813340d7..439f305166 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex27-inverse-floater.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex27-inverse-floater.json
@@ -1,58 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "8b1987da"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "8b1987da"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "33f59567"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59567",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party A"
-        },
-        "meta" : {
-          "globalKey" : "33f59567"
+            "scheme" : "http://www.partyA.com/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "33f59568"
+        "globalKey" : "957b3c47"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59568",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "123",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party B"
-        },
-        "meta" : {
-          "globalKey" : "33f59568"
+            "scheme" : "http://www.partyB.com/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "957bb0a6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2001-04-29",
+      "meta" : {
+        "globalKey" : "3e891d"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "33f59567"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "33f59568"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -63,46 +50,56 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters0",
-                        "globalReference" : "27e4e9"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e1"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "985d6cb2"
-                    }
-                  },
-                  "calculationPeriodFrequency" : {
                     "meta" : {
-                      "globalKey" : "28c66"
+                      "globalKey" : "0"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "30"
-                  },
+                    "floatingRateMultiplierSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-08-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -111,204 +108,190 @@
                       },
                       "meta" : {
                         "globalKey" : "eae921d6"
-                      },
-                      "unadjustedDate" : "2001-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae921d6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates0",
-                    "globalKey" : "f6185c1a"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-08-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters0",
-                            "globalKey" : "27e4e9"
+                            "globalKey" : "27e4e9",
+                            "externalKey" : "accrualBusinessCenters0"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "3662e8ba"
                         }
                       },
                       "meta" : {
                         "globalKey" : "9eb4d95c"
-                      },
-                      "unadjustedDate" : "2006-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "9eb4d95c"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "6449694f"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "98150c36"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "USNY"
-                      } ],
+                      "businessCentersReference" : {
+                        "globalReference" : "27e4e9",
+                        "externalReference" : "accrualBusinessCenters0"
+                      },
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters0",
-                        "globalKey" : "27e4e9"
+                        "globalKey" : "622268e1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "3662e8ba"
+                      "globalKey" : "985d6cb2"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "956"
+                      "globalKey" : "17f92"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 3
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "18f93652",
+                    "externalKey" : "CalcPeriodDates0"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "aa"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "27e4e9",
+                        "externalKey" : "paymentBusinessCenters0"
                       }
                     },
-                    "floatingRateMultiplierSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "3662e8ba"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "f067202a"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "CalcPeriodDates0",
-                    "globalReference" : "f6185c1a"
+                    "globalReference" : "18f93652",
+                    "externalReference" : "CalcPeriodDates0"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "2fdb52a6"
+                      "globalKey" : "cb73d5a"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
                       } ],
                       "meta" : {
-                        "externalKey" : "resetBusinessCenters0",
-                        "globalKey" : "21479e"
+                        "globalKey" : "21479e",
+                        "externalKey" : "resetBusinessCenters0"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates0",
-                      "globalReference" : "2d64ffde"
+                      "globalReference" : "eae8c8b6",
+                      "externalReference" : "resetDates0"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates0",
-                    "globalKey" : "2d64ffde"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCentersReference" : {
-                        "externalReference" : "resetBusinessCenters0",
-                        "globalReference" : "21479e"
+                        "globalReference" : "21479e",
+                        "externalReference" : "resetBusinessCenters0"
                       },
                       "meta" : {
                         "globalKey" : "35a06081"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "6bdb6452"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "eae8c8b6",
+                    "externalKey" : "resetDates0"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "955a7a13"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCentersReference" : {
-                        "externalReference" : "accrualBusinessCenters1",
-                        "globalReference" : "27e4e9"
-                      },
-                      "meta" : {
-                        "globalKey" : "622268e2"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-3"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "985d6cb3"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28cc3"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2001-08-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -317,281 +300,298 @@
                       },
                       "meta" : {
                         "globalKey" : "eae921d6"
-                      },
-                      "unadjustedDate" : "2001-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "eae921d6"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "CalcPeriodDates1",
-                    "globalKey" : "c83c7cfc"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2006-08-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
                           } ],
                           "meta" : {
-                            "externalKey" : "accrualBusinessCenters1",
-                            "globalKey" : "27e4e9"
+                            "globalKey" : "27e4e9",
+                            "externalKey" : "accrualBusinessCenters1"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "3662e8ba"
                         }
                       },
                       "meta" : {
                         "globalKey" : "9eb4d95c"
-                      },
-                      "unadjustedDate" : "2006-08-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "9eb4d95c"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCentersReference" : {
+                        "globalReference" : "27e4e9",
+                        "externalReference" : "accrualBusinessCenters1"
+                      },
+                      "meta" : {
+                        "globalKey" : "622268e2"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "985d6cb3"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "18ad5"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "19075916",
+                    "externalKey" : "CalcPeriodDates1"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
-                "meta" : {
-                  "globalKey" : "5ee5ae82"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "98150c39"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
                       } ],
                       "meta" : {
-                        "externalKey" : "paymentBusinessCenters1",
-                        "globalKey" : "27e4e9"
+                        "globalKey" : "27e4e9",
+                        "externalKey" : "paymentBusinessCenters1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "3662e8ba"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "8f19d1ed"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-3"
-                        }
-                      }
-                    }
-                  }
+                "meta" : {
+                  "globalKey" : "576de65a"
                 }
               } ],
               "meta" : {
-                "globalKey" : "ed8d0511"
+                "globalKey" : "ceeb18ad"
               }
             }
           },
           "meta" : {
-            "globalKey" : "ed8d0511"
+            "globalKey" : "ceeb18ad"
           }
         },
         "meta" : {
-          "globalKey" : "ed8d0511"
+          "globalKey" : "ceeb18ad"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "75b65278"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d05"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-LIBOR-BBA"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 3
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.085,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.085,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          }, {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : -1.0,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : -1.0,
-              "arithmeticOperator" : "MULTIPLY",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Multiply"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-2"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 100000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "f077fc91"
-          },
-          "price" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-3"
+                "value" : "quantity-1"
               } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 3,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
             },
+            "meta" : {
+              "globalKey" : "828026c7"
+            }
+          },
+          "meta" : {
+            "globalKey" : "2377f8a"
+          }
+        }, {
+          "price" : [ {
             "value" : {
+              "value" : 0.045,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.045,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-3"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "1e87958f"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59567",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59568",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e891d"
-      },
-      "value" : "2001-04-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party A",
           "meta" : {
-            "scheme" : "http://www.partyA.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59567"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "33f59567"
-      },
       "meta" : {
-        "globalKey" : "c7753bbd"
+        "globalKey" : "33f59567",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party B",
           "meta" : {
-            "scheme" : "http://www.partyB.com/trade-id"
-          },
-          "value" : "123"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59568"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "33f59568"
-      },
       "meta" : {
-        "globalKey" : "c7753bbe"
+        "globalKey" : "33f59568",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "6e6301f0"
+    }
+  },
+  "meta" : {
+    "globalKey" : "6e6301f0"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex29-non-deliverable-settlement-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex29-non-deliverable-settlement-swap.json
index 5818cdd7c1..2d83c33118 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex29-non-deliverable-settlement-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex29-non-deliverable-settlement-swap.json
@@ -1,61 +1,45 @@
 {
-  "meta" : {
-    "globalKey" : "3c1b888e"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "3c1b888e"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "4e41782e"
-      },
-      "name" : {
-        "value" : "Party A"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "8b7071c",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "E2000098N10184",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "76095221801"
-        },
-        "meta" : {
-          "globalKey" : "be6c5af5"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "f9ea7c0d"
+        "globalKey" : "3e06abe1"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "f9ea7c0d",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "00680112001"
-        },
-        "meta" : {
-          "globalKey" : "f9ea7c0d"
+            "scheme" : "http://www.barclays.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9591fab6"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "1994-12-12",
+      "meta" : {
+        "globalKey" : "3e530c"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "4e41782e"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "f9ea7c0d"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -66,77 +50,84 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "E2000098notional-0-LTAA0200000096.1",
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "E2000098notional-0-LTAA0200000096.1"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : true,
                   "initialPayment" : false,
+                  "finalPayment" : true,
                   "intermediatePayment" : false,
-                  "meta" : {
-                    "externalKey" : "PrincipalExchanges",
-                    "globalKey" : "37d866f0"
-                  },
                   "principalPaymentSchedule" : {
                     "initialPrincipalPayment" : {
-                      "meta" : {
-                        "globalKey" : "3df6cdc1"
+                      "principalPaymentDate" : {
+                        "unadjustedDate" : "2007-12-16",
+                        "meta" : {
+                          "globalKey" : "3ebb10"
+                        }
                       },
                       "payerReceiver" : {
-                        "payer" : "PARTY_1",
-                        "receiver" : "PARTY_2"
+                        "payer" : "Party1",
+                        "receiver" : "Party2"
                       },
                       "principalAmount" : {
+                        "value" : 26415000000.00,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 26415000000.00,
                         "meta" : {
                           "globalKey" : "96e17152"
                         }
                       },
-                      "principalPaymentDate" : {
-                        "meta" : {
-                          "globalKey" : "3ebb10"
-                        },
-                        "unadjustedDate" : "2007-12-16"
+                      "meta" : {
+                        "globalKey" : "78e9b601"
                       }
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "42bd12fc",
+                    "externalKey" : "PrincipalExchanges"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "765135f9"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
+                  "meta" : {
+                    "globalKey" : "226239bd"
+                  },
                   "cashSettlementTerms" : [ {
-                    "meta" : {
-                      "globalKey" : "28999d13"
+                    "valuationMethod" : {
+                      "valuationSource" : {
+                        "settlementRateOption" : {
+                          "settlementRateOption" : {
+                            "value" : "KRW.KFTC18/KRW02"
+                          }
+                        }
+                      }
                     },
                     "valuationDate" : {
                       "fxFixingDate" : {
+                        "periodMultiplier" : 2,
+                        "period" : "D",
                         "meta" : {
-                          "globalKey" : "35d317c0"
+                          "globalKey" : "786cca04"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : 2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -147,57 +138,46 @@
                             "globalKey" : "4f5ffd5"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "dateRelativeToPaymentDates" : {
                           "paymentDatesReference" : [ {
-                            "externalReference" : "PaymentDatesID",
-                            "globalReference" : "9756838d"
+                            "globalReference" : "9f20bbd9",
+                            "externalReference" : "PaymentDatesID"
                           }, {
-                            "externalReference" : "PrincipalExchanges",
-                            "globalReference" : "37d866f0"
+                            "globalReference" : "42bd12fc",
+                            "externalReference" : "PrincipalExchanges"
                           } ]
                         }
                       }
                     },
-                    "valuationMethod" : {
-                      "valuationSource" : {
-                        "settlementRateOption" : {
-                          "settlementRateOption" : {
-                            "value" : "KRW.KFTC18/KRW02"
-                          }
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "d4aaa0d7"
                     }
                   } ]
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "4f5ffd5"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "987f5366"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c8b"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "16"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2004-12-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -208,27 +188,23 @@
                             "globalKey" : "4f5ffd5"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "987f5366"
                         }
                       },
                       "meta" : {
                         "globalKey" : "54261e56"
-                      },
-                      "unadjustedDate" : "2004-12-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "54261e56"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "E2000098N10184",
-                    "globalKey" : "a6ce8b9d"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2007-12-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -239,37 +215,20 @@
                             "globalKey" : "4f5ffd5"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "987f5366"
                         }
                       },
                       "meta" : {
                         "globalKey" : "705b0656"
-                      },
-                      "unadjustedDate" : "2007-12-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "705b0656"
                     }
-                  }
-                },
-                "cashflowRepresentation" : {
-                  "cashflowsMatchParameters" : false
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "6cee277"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "PaymentDatesID",
-                    "globalKey" : "9756838d"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -280,79 +239,113 @@
                         "globalKey" : "4f5ffd5"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "987f5366"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "18a9d"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "16"
+                  },
+                  "meta" : {
+                    "globalKey" : "acf4d657",
+                    "externalKey" : "E2000098N10184"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "4f5ffd5"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "987f5366"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "9f20bbd9",
+                    "externalKey" : "PaymentDatesID"
                   }
+                },
+                "cashflowRepresentation" : {
+                  "cashflowsMatchParameters" : false
+                },
+                "meta" : {
+                  "globalKey" : "d4852e23"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "E2000098notional-1-LTAA0200000096.1",
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "E2000098notional-1-LTAA0200000096.1"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "USNY"
-                      }, {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "4f5ffd5"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "987f5366"
-                    }
-                  },
-                  "calculationPeriodFrequency" : {
                     "meta" : {
-                      "globalKey" : "28c8b"
+                      "globalKey" : "c8507cd0"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "16"
-                  },
+                    "rateTreatment" : "MoneyMarketYield",
+                    "initialRate" : {
+                      "value" : 0.01650000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "perUnitOf" : {
+                        "currency" : {
+                          "value" : "USD"
+                        }
+                      },
+                      "priceType" : "InterestRate"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2004-12-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -363,27 +356,23 @@
                             "globalKey" : "4f5ffd5"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "987f5366"
                         }
                       },
                       "meta" : {
                         "globalKey" : "54261e56"
-                      },
-                      "unadjustedDate" : "2004-12-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "54261e56"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "E2000098N10AC8",
-                    "globalKey" : "a6ce8b9d"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2007-12-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "USNY"
@@ -394,33 +383,20 @@
                             "globalKey" : "4f5ffd5"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "987f5366"
                         }
                       },
                       "meta" : {
                         "globalKey" : "705b0656"
-                      },
-                      "unadjustedDate" : "2007-12-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "705b0656"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "6b0e65da"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "9756838d"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -431,59 +407,66 @@
                         "globalKey" : "4f5ffd5"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "987f5366"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "959"
+                      "globalKey" : "18a9d"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 6
+                    "rollConvention" : "16"
+                  },
+                  "meta" : {
+                    "globalKey" : "acf4d657",
+                    "externalKey" : "E2000098N10AC8"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "c8507cd0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "USNY"
+                      }, {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "4f5ffd5"
                       }
                     },
-                    "rateTreatment" : "MONEY_MARKET_YIELD",
-                    "initialRate" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "value" : 0.01650000,
-                      "perUnitOf" : {
-                        "currency" : {
-                          "value" : "USD"
-                        }
-                      },
-                      "priceType" : "INTEREST_RATE"
+                    "meta" : {
+                      "globalKey" : "987f5366"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "9f20bbd9"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "E2000098N10AC8",
-                    "globalReference" : "a6ce8b9d"
+                    "globalReference" : "acf4d657",
+                    "externalReference" : "E2000098N10AC8"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "21186cd0"
+                      "globalKey" : "fdf45784"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -492,17 +475,20 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "E2000098N10DDE",
-                      "globalReference" : "cd3b0b7f"
+                      "globalReference" : "c6b0d3b1",
+                      "externalReference" : "E2000098N10DDE"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "E2000098N10DDE",
-                    "globalKey" : "cd3b0b7f"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -511,163 +497,177 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "c6b0d3b1",
+                    "externalKey" : "E2000098N10DDE"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "c24897d2"
                 }
               } ],
               "meta" : {
-                "globalKey" : "c66f2ed1"
+                "globalKey" : "1b4dbe75"
               }
             }
           },
           "meta" : {
-            "globalKey" : "c66f2ed1"
+            "globalKey" : "1b4dbe75"
           }
         },
         "meta" : {
-          "globalKey" : "c66f2ed1"
+          "globalKey" : "1b4dbe75"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "24e4fd0d"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0273000,
               "unit" : {
                 "currency" : {
                   "value" : "KRW"
                 }
               },
-              "value" : 0.0273000,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "KRW"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 26415000000.00,
+              "unit" : {
+                "currency" : {
+                  "value" : "KRW"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "77baa493"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 25000000.00,
               "unit" : {
                 "currency" : {
-                  "value" : "KRW"
+                  "value" : "USD"
                 }
-              },
-              "value" : 26415000000.00
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "f1b09fde"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d05"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 25000000.00
+            "meta" : {
+              "globalKey" : "828026c7"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "32f46b8a"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "8b7071c",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "f9ea7c0d",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3e530c"
-      },
-      "value" : "1994-12-12"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "76095221801",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "E2000098N10184"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "be6c5af5"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "4e41782e"
+      "name" : {
+        "value" : "Party A"
       },
       "meta" : {
-        "globalKey" : "7ae32cd7"
+        "globalKey" : "8b7071c",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "00680112001",
           "meta" : {
-            "scheme" : "http://www.barclays.com/swaps/trade-id"
-          },
-          "value" : "1234"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "f9ea7c0d"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "f9ea7c0d"
-      },
       "meta" : {
-        "globalKey" : "1b2141ce"
+        "globalKey" : "f9ea7c0d",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "3705d0d0"
+    }
+  },
+  "meta" : {
+    "globalKey" : "3705d0d0"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex30-swap-comp-avg-relative-date.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex30-swap-comp-avg-relative-date.json
index 640ef733c3..2f3168ba2d 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex30-swap-comp-avg-relative-date.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex30-swap-comp-avg-relative-date.json
@@ -1,65 +1,50 @@
 {
-  "meta" : {
-    "globalKey" : "8c617c40"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "8c617c40"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "c79a29e4"
-      },
-      "name" : {
-        "value" : "MarketProducts"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "a4c148a4",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "martin",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "0103"
-        },
-        "meta" : {
-          "globalKey" : "168fc4"
+            "scheme" : "http://xml.morganstanley.com/fid/ird/msTradeIdScheme/swapName"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "3a74b3c0"
+        "globalKey" : "55073490"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "3a74b3c0",
+        "externalReference" : "party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "1234567",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "0617mpm24"
-        },
-        "meta" : {
-          "globalKey" : "3a74b3c0"
+            "scheme" : "http://xml.morganstanley.com/fid/ird/counterpartyTradeIdScheme"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "dc5b8a8"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2005-07-31",
+      "meta" : {
+        "globalKey" : "3ea9df",
+        "externalKey" : "tradeDate"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "c79a29e4"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "3a74b3c0"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "InterestRate:IRSwap:FixedFloat"
@@ -73,66 +58,57 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "notionalSchedule_0_0",
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "notionalSchedule_0_0"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : false,
                   "initialPayment" : false,
+                  "finalPayment" : false,
                   "intermediatePayment" : false,
                   "meta" : {
                     "globalKey" : "12be35"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "42f910b"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "97b8e49c"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "12d7a"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6,
-                    "rollConvention" : "2"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "30/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "externalKey" : "effectiveDate_0_0",
-                      "globalKey" : "6a95ee82"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "6a95ee82"
+                        "globalKey" : "6d8c1fc6"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -141,12 +117,12 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "tradeDate",
-                        "globalReference" : "3ea9df"
+                        "globalReference" : "3ea9df",
+                        "externalReference" : "tradeDate"
                       },
                       "relativeDateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -157,28 +133,24 @@
                             "globalKey" : "42f910b"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b8e49c"
                         }
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "6d8c1fc6",
+                      "externalKey" : "effectiveDate_0_0"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "calculationPeriodDates_0_0",
-                    "globalKey" : "bf618314"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "externalKey" : "terminationDate_0_0",
-                      "globalKey" : "92beadfc"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 2,
+                      "period" : "Y",
                       "meta" : {
-                        "globalKey" : "92beadfc"
+                        "globalKey" : "f10af5ca"
                       },
-                      "period" : "Y",
-                      "periodMultiplier" : 2,
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -189,12 +161,72 @@
                           "globalKey" : "42f910b"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "dateRelativeTo" : {
-                        "externalReference" : "effectiveDate_0_0",
-                        "globalReference" : "6a95ee82"
+                        "globalReference" : "6d8c1fc6",
+                        "externalReference" : "effectiveDate_0_0"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "f10af5ca",
+                      "externalKey" : "terminationDate_0_0"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "42f910b"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "97b8e49c"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "2b8c"
+                    },
+                    "rollConvention" : "2"
+                  },
+                  "meta" : {
+                    "globalKey" : "b9d94b98",
+                    "externalKey" : "calculationPeriodDates_0_0"
+                  }
+                },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "42f910b"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "97b8e49c"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "9e5a4d0f"
                   }
                 },
                 "cashflowRepresentation" : {
@@ -202,185 +234,127 @@
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "2006-02-06",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2006-02-06",
                       "adjustedStartDate" : "2005-08-04",
+                      "adjustedEndDate" : "2006-02-06",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_0_1",
-                        "globalKey" : "3c99e488"
+                        "globalKey" : "29c6dee4",
+                        "externalKey" : "calculationPeriod_0_0_1"
                       },
                       "calculationPeriodNumberOfDays" : 182,
-                      "fixedRate" : 0.0003,
-                      "notionalAmount" : 100000000
+                      "notionalAmount" : 100000000,
+                      "fixedRate" : 0.0003
                     } ],
                     "meta" : {
-                      "externalKey" : "paymentCalculationPeriod_0_0_1",
-                      "globalKey" : "8f97988e"
+                      "globalKey" : "7cc492ea",
+                      "externalKey" : "paymentCalculationPeriod_0_0_1"
                     }
                   }, {
                     "adjustedPaymentDate" : "2006-08-04",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2006-08-04",
                       "adjustedStartDate" : "2006-02-06",
+                      "adjustedEndDate" : "2006-08-04",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_0_2",
-                        "globalKey" : "54963a40"
+                        "globalKey" : "86296b24",
+                        "externalKey" : "calculationPeriod_0_0_2"
                       },
                       "calculationPeriodNumberOfDays" : 178,
-                      "fixedRate" : 0.0003,
-                      "notionalAmount" : 100000000
+                      "notionalAmount" : 100000000,
+                      "fixedRate" : 0.0003
                     } ],
                     "meta" : {
-                      "externalKey" : "paymentCalculationPeriod_0_0_2",
-                      "globalKey" : "97205944"
+                      "globalKey" : "c8b38a28",
+                      "externalKey" : "paymentCalculationPeriod_0_0_2"
                     }
                   }, {
                     "adjustedPaymentDate" : "2007-02-05",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2007-02-05",
                       "adjustedStartDate" : "2006-08-04",
+                      "adjustedEndDate" : "2007-02-05",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_0_3",
-                        "globalKey" : "b0eac946"
+                        "globalKey" : "9e2566c4",
+                        "externalKey" : "calculationPeriod_0_0_3"
                       },
                       "calculationPeriodNumberOfDays" : 181,
-                      "fixedRate" : 0.0003,
-                      "notionalAmount" : 100000000
+                      "notionalAmount" : 100000000,
+                      "fixedRate" : 0.0003
                     } ],
                     "meta" : {
-                      "externalKey" : "paymentCalculationPeriod_0_0_3",
-                      "globalKey" : "dc4a0b"
+                      "globalKey" : "ee16e789",
+                      "externalKey" : "paymentCalculationPeriod_0_0_3"
                     }
                   }, {
                     "adjustedPaymentDate" : "2007-08-06",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2007-08-06",
                       "adjustedStartDate" : "2007-02-05",
+                      "adjustedEndDate" : "2007-08-06",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_0_4",
-                        "globalKey" : "c9110026"
+                        "globalKey" : "fa7b47a4",
+                        "externalKey" : "calculationPeriod_0_0_4"
                       },
                       "calculationPeriodNumberOfDays" : 181,
-                      "fixedRate" : 0.0003,
-                      "notionalAmount" : 100000000
+                      "notionalAmount" : 100000000,
+                      "fixedRate" : 0.0003
                     } ],
                     "meta" : {
-                      "externalKey" : "paymentCalculationPeriod_0_0_4",
-                      "globalKey" : "a7419dac"
+                      "globalKey" : "d8abe52a",
+                      "externalKey" : "paymentCalculationPeriod_0_0_4"
                     }
                   } ]
                 },
-                "dayCountFraction" : {
-                  "value" : "30/360"
-                },
                 "meta" : {
-                  "globalKey" : "e36f106b"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "637fde97"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "42f910b"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "97b8e49c"
-                    }
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "517b61d1"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "externalKey" : "notionalSchedule_0_1",
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0",
+                    "externalKey" : "notionalSchedule_0_1"
                   }
                 },
                 "principalPayment" : {
-                  "finalPayment" : false,
                   "initialPayment" : false,
+                  "finalPayment" : false,
                   "intermediatePayment" : false,
                   "meta" : {
                     "globalKey" : "12be35"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "42f910b"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "97b8e49c"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "25c8a2"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "NONE"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
-                    "meta" : {
-                      "externalKey" : "effectiveDate_0_1",
-                      "globalKey" : "6a95ee82"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 2,
+                      "period" : "D",
                       "meta" : {
-                        "globalKey" : "6a95ee82"
+                        "globalKey" : "6d8c1fc6"
                       },
-                      "period" : "D",
-                      "periodMultiplier" : 2,
-                      "dayType" : "BUSINESS",
+                      "dayType" : "Business",
+                      "businessDayConvention" : "NONE",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -389,12 +363,12 @@
                           "globalKey" : "21479e"
                         }
                       },
-                      "businessDayConvention" : "NONE",
                       "dateRelativeTo" : {
-                        "externalReference" : "tradeDate",
-                        "globalReference" : "3ea9df"
+                        "globalReference" : "3ea9df",
+                        "externalReference" : "tradeDate"
                       },
                       "relativeDateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -405,28 +379,24 @@
                             "globalKey" : "42f910b"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "97b8e49c"
                         }
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "6d8c1fc6",
+                      "externalKey" : "effectiveDate_0_1"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "calculationPeriodDates_0_1",
-                    "globalKey" : "1e24283d"
-                  },
                   "terminationDate" : {
-                    "meta" : {
-                      "externalKey" : "terminationDate_0_1",
-                      "globalKey" : "92beadfd"
-                    },
                     "relativeDate" : {
+                      "periodMultiplier" : 2,
+                      "period" : "Y",
                       "meta" : {
-                        "globalKey" : "92beadfd"
+                        "globalKey" : "f10af5cb"
                       },
-                      "period" : "Y",
-                      "periodMultiplier" : 2,
+                      "businessDayConvention" : "MODFOLLOWING",
                       "businessCenters" : {
                         "businessCenter" : [ {
                           "value" : "GBLO"
@@ -437,532 +407,562 @@
                           "globalKey" : "42f910b"
                         }
                       },
-                      "businessDayConvention" : "MODFOLLOWING",
                       "dateRelativeTo" : {
-                        "externalReference" : "effectiveDate_0_1",
-                        "globalReference" : "6a95ee82"
+                        "globalReference" : "6d8c1fc6",
+                        "externalReference" : "effectiveDate_0_1"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "f10af5cb",
+                      "externalKey" : "terminationDate_0_1"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "42f910b"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "97b8e49c"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "24bbce"
+                    },
+                    "rollConvention" : "NONE"
+                  },
+                  "meta" : {
+                    "globalKey" : "c1af8139",
+                    "externalKey" : "calculationPeriodDates_0_1"
                   }
                 },
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "107"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      }, {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "42f910b"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "97b8e49c"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "9e5a4d0f"
+                  }
+                },
+                "resetDates" : {
+                  "calculationPeriodDatesReference" : {
+                    "globalReference" : "c1af8139",
+                    "externalReference" : "calculationPeriodDates_0_1"
+                  },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
+                  "fixingDates" : {
+                    "periodMultiplier" : -2,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "51d89779"
+                    },
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
+                      }
+                    },
+                    "dateRelativeTo" : {
+                      "globalReference" : "dea1e10d",
+                      "externalReference" : "resetDates_0_1"
+                    }
+                  },
+                  "resetFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "365c4b6f"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "dea1e10d",
+                    "externalKey" : "resetDates_0_1"
+                  }
+                },
+                "compoundingMethod" : "Straight",
                 "cashflowRepresentation" : {
                   "cashflowsMatchParameters" : false,
                   "paymentCalculationPeriod" : [ {
                     "adjustedPaymentDate" : "2006-02-06",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2005-11-04",
                       "adjustedStartDate" : "2005-08-04",
+                      "adjustedEndDate" : "2005-11-04",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_1_1",
-                        "globalKey" : "20d2dbb0"
+                        "globalKey" : "9cc08530",
+                        "externalKey" : "calculationPeriod_0_1_1"
                       },
                       "calculationPeriodNumberOfDays" : 92,
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2005-08-02",
+                          "observationWeight" : 32,
                           "meta" : {
                             "globalKey" : "796965e"
-                          },
-                          "observationWeight" : 32
+                          }
                         }, {
                           "adjustedFixingDate" : "2005-09-01",
+                          "observationWeight" : 29,
                           "meta" : {
                             "globalKey" : "7969dfc"
-                          },
-                          "observationWeight" : 29
+                          }
                         }, {
                           "adjustedFixingDate" : "2005-09-30",
+                          "observationWeight" : 31,
                           "meta" : {
                             "globalKey" : "796a181"
-                          },
-                          "observationWeight" : 31
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     }, {
-                      "adjustedEndDate" : "2006-02-06",
                       "adjustedStartDate" : "2005-11-04",
+                      "adjustedEndDate" : "2006-02-06",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_1_2",
-                        "globalKey" : "d969aeae"
+                        "globalKey" : "a8d23bf2",
+                        "externalKey" : "calculationPeriod_0_1_2"
                       },
                       "calculationPeriodNumberOfDays" : 94,
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2005-11-02",
+                          "observationWeight" : 31,
                           "meta" : {
                             "globalKey" : "796ad9d"
-                          },
-                          "observationWeight" : 31
+                          }
                         }, {
                           "adjustedFixingDate" : "2005-12-01",
+                          "observationWeight" : 30,
                           "meta" : {
                             "globalKey" : "796b53d"
-                          },
-                          "observationWeight" : 30
+                          }
                         }, {
                           "adjustedFixingDate" : "2005-12-30",
+                          "observationWeight" : 33,
                           "meta" : {
                             "globalKey" : "796b8c3"
-                          },
-                          "observationWeight" : 33
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     } ],
                     "meta" : {
-                      "externalKey" : "paymentCalculationPeriod_0_1_1",
-                      "globalKey" : "18bdd864"
+                      "globalKey" : "482d6f28",
+                      "externalKey" : "paymentCalculationPeriod_0_1_1"
                     }
                   }, {
                     "adjustedPaymentDate" : "2006-08-04",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2006-05-04",
                       "adjustedStartDate" : "2006-02-06",
+                      "adjustedEndDate" : "2006-05-04",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_1_3",
-                        "globalKey" : "66e6d0d0"
+                        "globalKey" : "c98a008c",
+                        "externalKey" : "calculationPeriod_0_1_3"
                       },
                       "calculationPeriodNumberOfDays" : 87,
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2006-02-02",
+                          "observationWeight" : 28,
                           "meta" : {
                             "globalKey" : "7975fda"
-                          },
-                          "observationWeight" : 28
+                          }
                         }, {
                           "adjustedFixingDate" : "2006-03-02",
+                          "observationWeight" : 29,
                           "meta" : {
                             "globalKey" : "797679b"
-                          },
-                          "observationWeight" : 29
+                          }
                         }, {
                           "adjustedFixingDate" : "2006-03-31",
+                          "observationWeight" : 30,
                           "meta" : {
                             "globalKey" : "7976b1f"
-                          },
-                          "observationWeight" : 30
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     }, {
-                      "adjustedEndDate" : "2006-08-04",
                       "adjustedStartDate" : "2006-05-04",
+                      "adjustedEndDate" : "2006-08-04",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_1_4",
-                        "globalKey" : "4126d5f0"
+                        "globalKey" : "bd147f70",
+                        "externalKey" : "calculationPeriod_0_1_4"
                       },
                       "calculationPeriodNumberOfDays" : 92,
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2006-05-02",
+                          "observationWeight" : 32,
                           "meta" : {
                             "globalKey" : "797771e"
-                          },
-                          "observationWeight" : 32
+                          }
                         }, {
                           "adjustedFixingDate" : "2006-06-01",
+                          "observationWeight" : 29,
                           "meta" : {
                             "globalKey" : "7977ebc"
-                          },
-                          "observationWeight" : 29
+                          }
                         }, {
                           "adjustedFixingDate" : "2006-06-30",
+                          "observationWeight" : 31,
                           "meta" : {
                             "globalKey" : "7978241"
-                          },
-                          "observationWeight" : 31
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     } ],
                     "meta" : {
-                      "externalKey" : "paymentCalculationPeriod_0_1_3",
-                      "globalKey" : "94c64dc4"
+                      "globalKey" : "dfbaee00",
+                      "externalKey" : "paymentCalculationPeriod_0_1_3"
                     }
                   }, {
                     "adjustedPaymentDate" : "2007-02-05",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2006-11-06",
                       "adjustedStartDate" : "2006-08-04",
+                      "adjustedEndDate" : "2006-11-06",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_1_5",
-                        "globalKey" : "a4be1dac"
+                        "globalKey" : "39f640f0",
+                        "externalKey" : "calculationPeriod_0_1_5"
                       },
                       "calculationPeriodNumberOfDays" : 94,
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2006-08-02",
+                          "observationWeight" : 31,
                           "meta" : {
                             "globalKey" : "7978e5d"
-                          },
-                          "observationWeight" : 31
+                          }
                         }, {
                           "adjustedFixingDate" : "2006-08-31",
+                          "observationWeight" : 30,
                           "meta" : {
                             "globalKey" : "79791df"
-                          },
-                          "observationWeight" : 30
+                          }
                         }, {
                           "adjustedFixingDate" : "2006-10-02",
+                          "observationWeight" : 33,
                           "meta" : {
                             "globalKey" : "7979ddf"
-                          },
-                          "observationWeight" : 33
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     }, {
-                      "adjustedEndDate" : "2007-02-05",
                       "adjustedStartDate" : "2006-11-06",
+                      "adjustedEndDate" : "2007-02-05",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_1_6",
-                        "globalKey" : "6e2d5d90"
+                        "globalKey" : "17a6342e",
+                        "externalKey" : "calculationPeriod_0_1_6"
                       },
                       "calculationPeriodNumberOfDays" : 91,
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2006-11-02",
+                          "observationWeight" : 28,
                           "meta" : {
                             "globalKey" : "797a59a"
-                          },
-                          "observationWeight" : 28
+                          }
                         }, {
                           "adjustedFixingDate" : "2006-11-30",
+                          "observationWeight" : 31,
                           "meta" : {
                             "globalKey" : "797a901"
-                          },
-                          "observationWeight" : 31
+                          }
                         }, {
                           "adjustedFixingDate" : "2007-01-02",
+                          "observationWeight" : 32,
                           "meta" : {
                             "globalKey" : "798501e"
-                          },
-                          "observationWeight" : 32
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     } ],
                     "meta" : {
-                      "externalKey" : "paymentCalculationPeriod_0_1_5",
-                      "globalKey" : "d57ce001"
+                      "globalKey" : "6ffcd2e3",
+                      "externalKey" : "paymentCalculationPeriod_0_1_5"
                     }
                   }, {
                     "adjustedPaymentDate" : "2007-08-06",
                     "calculationPeriod" : [ {
-                      "adjustedEndDate" : "2007-05-04",
                       "adjustedStartDate" : "2007-02-05",
+                      "adjustedEndDate" : "2007-05-04",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_1_7",
-                        "globalKey" : "2f4a12ae"
+                        "globalKey" : "9e927f4c",
+                        "externalKey" : "calculationPeriod_0_1_7"
                       },
                       "calculationPeriodNumberOfDays" : 88,
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2007-02-01",
+                          "observationWeight" : 28,
                           "meta" : {
                             "globalKey" : "79857bb"
-                          },
-                          "observationWeight" : 28
+                          }
                         }, {
                           "adjustedFixingDate" : "2007-03-01",
+                          "observationWeight" : 30,
                           "meta" : {
                             "globalKey" : "7985f7d"
-                          },
-                          "observationWeight" : 30
+                          }
                         }, {
                           "adjustedFixingDate" : "2007-04-02",
+                          "observationWeight" : 30,
                           "meta" : {
                             "globalKey" : "798675c"
-                          },
-                          "observationWeight" : 30
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     }, {
-                      "adjustedEndDate" : "2007-08-06",
                       "adjustedStartDate" : "2007-05-04",
+                      "adjustedEndDate" : "2007-08-06",
                       "meta" : {
-                        "externalKey" : "calculationPeriod_0_1_8",
-                        "globalKey" : "c50d8c36"
+                        "globalKey" : "5a45af7a",
+                        "externalKey" : "calculationPeriod_0_1_8"
                       },
                       "calculationPeriodNumberOfDays" : 94,
+                      "notionalAmount" : 100000000,
                       "floatingRateDefinition" : {
                         "rateObservation" : [ {
                           "adjustedFixingDate" : "2007-05-02",
+                          "observationWeight" : 31,
                           "meta" : {
                             "globalKey" : "7986f1d"
-                          },
-                          "observationWeight" : 31
+                          }
                         }, {
                           "adjustedFixingDate" : "2007-05-21",
+                          "observationWeight" : 30,
                           "meta" : {
                             "globalKey" : "7987169"
-                          },
-                          "observationWeight" : 30
+                          }
                         }, {
                           "adjustedFixingDate" : "2007-07-02",
+                          "observationWeight" : 33,
                           "meta" : {
                             "globalKey" : "7987e9f"
-                          },
-                          "observationWeight" : 33
+                          }
                         } ]
-                      },
-                      "notionalAmount" : 100000000
+                      }
                     } ],
                     "meta" : {
-                      "externalKey" : "paymentCalculationPeriod_0_1_7",
-                      "globalKey" : "a2441ea"
+                      "globalKey" : "b6e3654c",
+                      "externalKey" : "paymentCalculationPeriod_0_1_7"
                     }
                   } ]
                 },
-                "compoundingMethod" : "STRAIGHT",
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
                 "meta" : {
-                  "globalKey" : "fd8fd851"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "637fde97"
-                  },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      }, {
-                        "value" : "USNY"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "42f910b"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "97b8e49c"
-                    }
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "959"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 6
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
-                  }
-                },
-                "resetDates" : {
-                  "calculationPeriodDatesReference" : {
-                    "externalReference" : "calculationPeriodDates_0_1",
-                    "globalReference" : "1e24283d"
-                  },
-                  "fixingDates" : {
-                    "meta" : {
-                      "globalKey" : "74fcacc5"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : -2,
-                    "dayType" : "BUSINESS",
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
-                      }
-                    },
-                    "businessDayConvention" : "NONE",
-                    "dateRelativeTo" : {
-                      "externalReference" : "resetDates_0_1",
-                      "globalReference" : "4ef88f5b"
-                    }
-                  },
-                  "meta" : {
-                    "externalKey" : "resetDates_0_1",
-                    "globalKey" : "4ef88f5b"
-                  },
-                  "resetDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
-                      }
-                    },
-                    "businessDayConvention" : "MODFOLLOWING",
-                    "meta" : {
-                      "globalKey" : "365c4b6f"
-                    }
-                  },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "954"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "globalKey" : "776bec6f"
                 }
               } ],
               "meta" : {
-                "globalKey" : "4f146506"
+                "globalKey" : "8fd707fe"
               }
             }
           },
           "meta" : {
-            "globalKey" : "a3d7242c"
+            "globalKey" : "e499c724"
           }
         },
         "meta" : {
-          "globalKey" : "a3d7242c"
+          "globalKey" : "e499c724"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "12a0e31f"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0003,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0003,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "417b80c1"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
-              },
-              "value" : 100000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "b31c328d"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "5f0c6d08"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "USD-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "959"
-                  },
+                  "periodMultiplier" : 6,
                   "period" : "M",
-                  "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "107"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
-                }
-              },
-              "value" : 100000000
+            "meta" : {
+              "globalKey" : "8280320a"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "5332145f"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "a4c148a4",
+          "externalReference" : "party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "3a74b3c0",
+          "externalReference" : "party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "externalKey" : "tradeDate",
-        "globalKey" : "3ea9df"
-      },
-      "value" : "2005-07-31"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "0103",
           "meta" : {
-            "scheme" : "http://xml.morganstanley.com/fid/ird/msTradeIdScheme/swapName"
-          },
-          "value" : "martin"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "168fc4"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "c79a29e4"
+      "name" : {
+        "value" : "MarketProducts"
       },
       "meta" : {
-        "globalKey" : "d3e445c6"
+        "globalKey" : "a4c148a4",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "0617mpm24",
           "meta" : {
-            "scheme" : "http://xml.morganstanley.com/fid/ird/counterpartyTradeIdScheme"
-          },
-          "value" : "1234567"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "3a74b3c0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party2",
-        "globalReference" : "3a74b3c0"
-      },
       "meta" : {
-        "globalKey" : "555d4b40"
+        "globalKey" : "3a74b3c0",
+        "externalKey" : "party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "b094bd62"
+    }
+  },
+  "meta" : {
+    "globalKey" : "b094bd62"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex32-zero-coupon-swap-normal-rate.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex32-zero-coupon-swap-normal-rate.json
index d97bf6a8c4..3e6fc9a1ab 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex32-zero-coupon-swap-normal-rate.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex32-zero-coupon-swap-normal-rate.json
@@ -1,155 +1,120 @@
 {
-  "meta" : {
-    "globalKey" : "9ce673d0"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "ISDA_MASTER"
-            }
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "5b6941a5",
+        "externalReference" : "tradeSource"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "1-2",
+          "meta" : {
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "c4592b87"
         }
       }, {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CONFIRMATION",
-            "contractualDefinitionsType" : [ {
-              "value" : "ISDA2006"
-            } ]
+        "identifier" : {
+          "value" : "11111111",
+          "meta" : {
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/alpha-trade-id"
           }
-        },
-        "meta" : {
-          "globalKey" : "6b413360"
         }
       } ],
       "meta" : {
-        "globalKey" : "bd492439"
+        "globalKey" : "80748ff5"
       }
-    },
-    "meta" : {
-      "globalKey" : "9ce673d0"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "party1",
-        "globalKey" : "8251773a"
+    }, {
+      "issuerReference" : {
+        "globalReference" : "8251773a",
+        "externalReference" : "party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "abc123",
           "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/murex-portfolio-id"
-          },
-          "value" : "XXX_H_XXX"
-        },
-        "meta" : {
-          "globalKey" : "8251773a"
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "party2",
-        "globalKey" : "2e47ffb0"
+        "globalKey" : "409350a5"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "2e47ffb0",
+        "externalReference" : "clearingDCO"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "LCH00000000001",
           "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/murex-counterparty-id"
-          },
-          "value" : "LCHLGB2L"
-        },
-        "meta" : {
-          "globalKey" : "2e47ffb0"
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/trade-id"
+          }
         }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "clearingDCO",
-        "globalKey" : "2e47ffb0"
-      },
-      "partyId" : [ {
+      }, {
         "identifier" : {
+          "value" : "STM",
           "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
-          },
-          "value" : "LCHLGB2L"
-        },
-        "meta" : {
-          "globalKey" : "2e47ffb0"
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/trade-classification"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "clearingBroker1",
-        "globalKey" : "15558"
+        "globalKey" : "5683d2c7"
+      }
+    }, {
+      "issuer" : {
+        "value" : "1010000051",
+        "meta" : {
+          "scheme" : "USINamespace"
+        }
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "XX11111111XXX1111111111111111111",
           "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
-          },
-          "value" : "XXX"
-        },
-        "meta" : {
-          "globalKey" : "15558"
+            "scheme" : "USI"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "tradeSource",
-        "globalKey" : "5b6941a5"
+        "globalKey" : "765a215f"
+      }
+    }, {
+      "issuer" : {
+        "value" : "1010000051",
+        "meta" : {
+          "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
+        }
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "XX11111111XXX1111111111111111111",
           "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
-          },
-          "value" : "SWAPSWIRE"
-        },
-        "meta" : {
-          "globalKey" : "5b6941a5"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+          }
         }
-      } ]
-    } ],
-    "partyRole" : [ {
-      "ownershipPartyReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "8251773a"
-      },
-      "partyReference" : {
-        "externalReference" : "clearingBroker1",
-        "globalReference" : "15558"
+      } ],
+      "meta" : {
+        "globalKey" : "6d78b379"
       },
-      "role" : "TRADE_SOURCE"
+      "identifierType" : "UniqueTransactionIdentifier"
     } ],
+    "tradeDate" : {
+      "value" : "2010-07-06",
+      "meta" : {
+        "globalKey" : "3ed1c6"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "party2",
-          "globalReference" : "2e47ffb0"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "party1",
-          "globalReference" : "8251773a"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
             "primaryAssetClass" : {
-              "value" : "INTEREST_RATE"
+              "value" : "InterestRate"
             }
           }, {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "InterestRate:IRSwap:FixedFloat"
@@ -163,79 +128,67 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365c4b6f"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "25e2ab"
-                    },
-                    "period" : "T",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "NONE"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
-                      "adjustedDate" : {
-                        "meta" : {
-                          "globalKey" : "40119e"
-                        },
-                        "value" : "2051-06-30"
-                      },
+                      "unadjustedDate" : "2051-06-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
                           "globalKey" : "24a738"
                         }
                       },
+                      "adjustedDate" : {
+                        "value" : "2051-06-30",
+                        "meta" : {
+                          "globalKey" : "40119e"
+                        }
+                      },
                       "meta" : {
                         "globalKey" : "f0a6c956"
-                      },
-                      "unadjustedDate" : "2051-06-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "f0a6c956"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedCalcPeriodDates1",
-                    "globalKey" : "6bf9b38d"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
-                      "adjustedDate" : {
-                        "meta" : {
-                          "globalKey" : "40299c"
-                        },
-                        "value" : "2052-06-28"
-                      },
+                      "unadjustedDate" : "2052-06-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -244,34 +197,26 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365c4b6f"
                         }
                       },
+                      "adjustedDate" : {
+                        "value" : "2052-06-28",
+                        "meta" : {
+                          "globalKey" : "40299c"
+                        }
+                      },
                       "meta" : {
                         "globalKey" : "626b7491"
-                      },
-                      "unadjustedDate" : "2052-06-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "626b7491"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "f8175040"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates1",
-                    "globalKey" : "965ab238"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -280,109 +225,115 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "paymentFrequency" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
                     "meta" : {
-                      "globalKey" : "a2d"
+                      "globalKey" : "24b525"
                     },
-                    "period" : "T",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "NONE"
+                  },
+                  "meta" : {
+                    "globalKey" : "ddf61d0d",
+                    "externalKey" : "fixedCalcPeriodDates1"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
                     "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                      "globalKey" : "73"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365c4b6f"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "9285f8b6",
+                    "externalKey" : "paymentDates1"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "39127728"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "GBLO"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "21479e"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365c4b6f"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28c66"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3,
-                    "rollConvention" : "30"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
-                      "adjustedDate" : {
-                        "meta" : {
-                          "globalKey" : "40119e"
-                        },
-                        "value" : "2051-06-30"
-                      },
+                      "unadjustedDate" : "2051-06-30",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
                           "globalKey" : "24a738"
                         }
                       },
+                      "adjustedDate" : {
+                        "value" : "2051-06-30",
+                        "meta" : {
+                          "globalKey" : "40119e"
+                        }
+                      },
                       "meta" : {
                         "globalKey" : "f0a6c956"
-                      },
-                      "unadjustedDate" : "2051-06-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "f0a6c956"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingCalcPeriodDates2",
-                    "globalKey" : "78b9f1b2"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
-                      "adjustedDate" : {
-                        "meta" : {
-                          "globalKey" : "40299c"
-                        },
-                        "value" : "2052-06-28"
-                      },
+                      "unadjustedDate" : "2052-06-30",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "GBLO"
@@ -391,35 +342,62 @@
                             "globalKey" : "21479e"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365c4b6f"
                         }
                       },
+                      "adjustedDate" : {
+                        "value" : "2052-06-28",
+                        "meta" : {
+                          "globalKey" : "40299c"
+                        }
+                      },
                       "meta" : {
                         "globalKey" : "626b7491"
-                      },
-                      "unadjustedDate" : "2052-06-30"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "626b7491"
                     }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "GBLO"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "21479e"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "365c4b6f"
+                    }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "17f92"
+                    },
+                    "rollConvention" : "30"
+                  },
+                  "meta" : {
+                    "globalKey" : "ddd2e77a",
+                    "externalKey" : "floatingCalcPeriodDates2"
                   }
                 },
-                "compoundingMethod" : "FLAT",
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
-                "meta" : {
-                  "globalKey" : "598ef112"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "externalKey" : "paymentDates2",
-                    "globalKey" : "965ab238"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
+                    "meta" : {
+                      "globalKey" : "73"
+                    }
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                  "payRelativeTo" : "CalculationPeriodEndDate",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -428,44 +406,29 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "a2d"
-                    },
-                    "period" : "T",
-                    "periodMultiplier" : 1
-                  }
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    }
+                  "meta" : {
+                    "globalKey" : "9285f8b6",
+                    "externalKey" : "paymentDates2"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingCalcPeriodDates2",
-                    "globalReference" : "78b9f1b2"
+                    "globalReference" : "ddd2e77a",
+                    "externalReference" : "floatingCalcPeriodDates2"
                   },
+                  "resetRelativeTo" : "CalculationPeriodStartDate",
                   "fixingDates" : {
+                    "periodMultiplier" : 0,
+                    "period" : "D",
                     "meta" : {
-                      "externalKey" : "fixingDates2",
-                      "globalKey" : "428d7913"
+                      "globalKey" : "b7e54b1b",
+                      "externalKey" : "fixingDates2"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 0,
+                    "businessDayConvention" : "PRECEDING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -474,17 +437,20 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "PRECEDING",
                     "dateRelativeTo" : {
-                      "externalReference" : "resetDates2",
-                      "globalReference" : "615d589e"
+                      "globalReference" : "aeec7424",
+                      "externalReference" : "resetDates2"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "resetDates2",
-                    "globalKey" : "615d589e"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 3,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "aa"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "GBLO"
@@ -493,230 +459,264 @@
                         "globalKey" : "21479e"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
                       "globalKey" : "365c4b6f"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "956"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 3
-                  },
-                  "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                  "meta" : {
+                    "globalKey" : "aeec7424",
+                    "externalKey" : "resetDates2"
+                  }
+                },
+                "compoundingMethod" : "Flat",
+                "meta" : {
+                  "globalKey" : "37b97b46"
                 }
               } ],
               "meta" : {
-                "globalKey" : "a40e98d2"
+                "globalKey" : "fc5cbf1e"
               }
             }
           },
           "meta" : {
-            "globalKey" : "fa5bec37"
+            "globalKey" : "52aa1283"
           }
         },
         "meta" : {
-          "globalKey" : "fa5bec37"
+          "globalKey" : "52aa1283"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "eb8c5850"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.040610,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "value" : 0.040610,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "GBP"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 9000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "GBP"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "85feb1b0"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 9000000,
               "unit" : {
                 "currency" : {
                   "value" : "GBP"
                 }
-              },
-              "value" : 9000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "47bf0006"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "a7e5aff6"
-            },
             "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
               "value" : {
                 "floatingRateIndex" : {
                   "value" : "GBP-LIBOR-BBA"
                 },
                 "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "956"
-                  },
+                  "periodMultiplier" : 3,
                   "period" : "M",
-                  "periodMultiplier" : 3
+                  "meta" : {
+                    "globalKey" : "aa"
+                  }
                 }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-2"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "GBP"
-                }
-              },
-              "value" : 9000000
+            "meta" : {
+              "globalKey" : "54cf41f6"
             }
-          } ]
-        } ]
-      } ]
-    },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ed1c6"
-      },
-      "value" : "2010-07-06"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/trade-id"
           },
-          "value" : "1-2"
+          "meta" : {
+            "globalKey" : "9aacf7b2"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "2e47ffb0",
+          "externalReference" : "party2"
         }
       }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "8251773a",
+          "externalReference" : "party1"
+        }
+      } ]
+    },
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "XXX_H_XXX",
           "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/alpha-trade-id"
-          },
-          "value" : "11111111"
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/murex-portfolio-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "8251773a"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "tradeSource",
-        "globalReference" : "5b6941a5"
-      },
       "meta" : {
-        "globalKey" : "605975b5"
+        "globalKey" : "8251773a",
+        "externalKey" : "party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "LCHLGB2L",
           "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/trade-id"
-          },
-          "value" : "abc123"
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/murex-counterparty-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "2e47ffb0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "party1",
-        "globalReference" : "8251773a"
-      },
       "meta" : {
-        "globalKey" : "cd9b09b"
+        "globalKey" : "2e47ffb0",
+        "externalKey" : "party2"
       }
     }, {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/trade-id"
-          },
-          "value" : "LCH00000000001"
-        }
-      }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "LCHLGB2L",
           "meta" : {
-            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/trade-classification"
-          },
-          "value" : "STM"
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "2e47ffb0"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "clearingDCO",
-        "globalReference" : "2e47ffb0"
-      },
       "meta" : {
-        "globalKey" : "50478807"
+        "globalKey" : "2e47ffb0",
+        "externalKey" : "clearingDCO"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "XXX",
           "meta" : {
-            "scheme" : "USI"
-          },
-          "value" : "XX11111111XXX1111111111111111111"
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "15558"
         }
       } ],
-      "issuer" : {
-        "meta" : {
-          "scheme" : "USINamespace"
-        },
-        "value" : "1010000051"
-      },
       "meta" : {
-        "globalKey" : "d2eee93"
+        "globalKey" : "15558",
+        "externalKey" : "clearingBroker1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "SWAPSWIRE",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-          },
-          "value" : "XX11111111XXX1111111111111111111"
+            "scheme" : "http://www.lchclearnet.com/clearlink/coding-scheme/party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "5b6941a5"
         }
       } ],
-      "issuer" : {
+      "meta" : {
+        "globalKey" : "5b6941a5",
+        "externalKey" : "tradeSource"
+      }
+    } ],
+    "partyRole" : [ {
+      "partyReference" : {
+        "globalReference" : "15558",
+        "externalReference" : "clearingBroker1"
+      },
+      "role" : "TradeSource",
+      "ownershipPartyReference" : {
+        "globalReference" : "8251773a",
+        "externalReference" : "party1"
+      }
+    } ],
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "ISDAMaster"
+            }
+          }
+        },
         "meta" : {
-          "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
+          "globalKey" : "c4592b87"
+        }
+      }, {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Confirmation",
+            "contractualDefinitionsType" : [ {
+              "value" : "ISDA2006"
+            } ]
+          }
         },
-        "value" : "1010000051"
-      },
+        "meta" : {
+          "globalKey" : "6b413360"
+        }
+      } ],
       "meta" : {
-        "globalKey" : "b13d8cc5"
-      },
-      "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-    } ]
+        "globalKey" : "bd492439"
+      }
+    },
+    "meta" : {
+      "globalKey" : "20173210"
+    }
+  },
+  "meta" : {
+    "globalKey" : "20173210"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex33-BRL-CDI-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex33-BRL-CDI-swap.json
index d1d389f709..aeaa94b8ef 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex33-BRL-CDI-swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex33-BRL-CDI-swap.json
@@ -1,71 +1,29 @@
 {
-  "meta" : {
-    "globalKey" : "68d1d535"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "68d1d535"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "9b39401a"
-      },
-      "name" : {
-        "value" : "Delta Bank Ltd"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "fa8ff89a",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "987654321-0",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "DELTA123"
-        },
-        "meta" : {
-          "globalKey" : "604c339a"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "3bf7aefa"
-      },
-      "name" : {
-        "value" : "Metro Bank Ltd"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "METRO123"
-        },
-        "meta" : {
-          "globalKey" : "14c7ba99"
-        }
-      } ]
+        "globalKey" : "3ffe0b9d"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2012-06-29",
+      "meta" : {
+        "globalKey" : "3ee19d"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "9b39401a"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "9b39401a"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "3bf7aefa"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -73,62 +31,63 @@
             "productQualifier" : "InterestRate_IRSwap_FixedFloat_ZeroCoupon"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentBusinessCenter" : {
-                "value" : "USNY"
-              },
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
+                  "quantitySchedule" : {
+                    "address" : {
+                      "scope" : "DOCUMENT",
+                      "value" : "quantity-2"
+                    }
+                  },
                   "futureValueNotional" : {
-                    "calculationPeriodNumberOfDays" : 122,
-                    "currency" : {
-                      "value" : "BRL"
-                    },
                     "quantity" : {
                       "address" : {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       }
                     },
+                    "currency" : {
+                      "value" : "BRL"
+                    },
+                    "calculationPeriodNumberOfDays" : 122,
                     "valueDate" : "2013-03-26"
                   },
                   "meta" : {
                     "globalKey" : "ec60919c"
-                  },
-                  "quantitySchedule" : {
-                    "address" : {
-                      "scope" : "DOCUMENT",
-                      "value" : "quantity-2"
-                    }
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "95a01cb7"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
+                  "meta" : {
+                    "globalKey" : "7fe8b009"
+                  },
                   "cashSettlementTerms" : [ {
-                    "meta" : {
-                      "globalKey" : "fd2b8251"
+                    "valuationMethod" : {
+                      "valuationSource" : {
+                        "settlementRateOption" : {
+                          "settlementRateOption" : {
+                            "value" : "BRL.PTAX/BRL09"
+                          }
+                        }
+                      }
                     },
                     "valuationDate" : {
                       "fxFixingDate" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
                         "meta" : {
-                          "externalKey" : "fixedLegFxFixingDates",
-                          "globalKey" : "788dd8b3"
+                          "globalKey" : "1483817f",
+                          "externalKey" : "fixedLegFxFixingDates"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "BRBD"
@@ -139,43 +98,41 @@
                             "globalKey" : "3f03a97"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeToCalculationPeriodDates" : {
                           "calculationPeriodDatesReference" : [ {
-                            "externalReference" : "fixedLegTerminationDate",
-                            "globalReference" : "efeee7e7"
+                            "globalReference" : "efeee7e7",
+                            "externalReference" : "fixedLegTerminationDate"
                           } ]
                         }
                       }
                     },
-                    "valuationMethod" : {
-                      "valuationSource" : {
-                        "settlementRateOption" : {
-                          "settlementRateOption" : {
-                            "value" : "BRL.PTAX/BRL09"
-                          }
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "e77415a3"
                     }
                   } ]
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessDayConvention" : "NONE",
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
                     "meta" : {
-                      "globalKey" : "24a738"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "25e2ab"
-                    },
-                    "period" : "T",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "NONE"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "CAL/252"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2012-09-26",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -184,20 +141,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ec345b12"
-                      },
-                      "unadjustedDate" : "2012-09-26"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec345b12"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "fixedLegCalcPeriodDates",
-                    "globalKey" : "ee4ecbf6"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-03-26",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "BRBD"
@@ -206,34 +160,57 @@
                             "globalKey" : "1f3c92"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211c5881"
                         }
                       },
                       "meta" : {
                         "globalKey" : "efeee7e7"
-                      },
-                      "unadjustedDate" : "2013-03-26"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "fixedLegTerminationDate",
-                      "globalKey" : "efeee7e7"
+                      "globalKey" : "efeee7e7",
+                      "externalKey" : "fixedLegTerminationDate"
+                    }
+                  },
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
+                    "meta" : {
+                      "globalKey" : "24a738"
                     }
+                  },
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
+                    "meta" : {
+                      "globalKey" : "24b525"
+                    },
+                    "rollConvention" : "NONE"
+                  },
+                  "meta" : {
+                    "globalKey" : "94beb296",
+                    "externalKey" : "fixedLegCalcPeriodDates"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "CAL/252"
-                },
-                "meta" : {
-                  "globalKey" : "d784e9f4"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "84c5dd9e"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
+                    "meta" : {
+                      "globalKey" : "73"
+                    }
+                  },
+                  "payRelativeTo" : "ValuationDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 1,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4abbbd"
+                    },
+                    "dayType" : "Business"
                   },
-                  "payRelativeTo" : "VALUATION_DATE",
                   "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "USNY"
@@ -242,78 +219,60 @@
                         "globalKey" : "27e4e9"
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
                       "globalKey" : "212500d8"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf23"
-                    },
-                    "period" : "D",
-                    "periodMultiplier" : 1,
-                    "dayType" : "BUSINESS"
-                  },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "a2d"
-                    },
-                    "period" : "T",
-                    "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "94f40174"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                "meta" : {
+                  "globalKey" : "5c4eb33c"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-3"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
-                  "meta" : {
-                    "globalKey" : "5d3e77e5"
-                  },
                   "settlementCurrency" : {
                     "value" : "USD"
                   },
+                  "meta" : {
+                    "globalKey" : "6b0d901b"
+                  },
                   "cashSettlementTerms" : [ {
-                    "meta" : {
-                      "globalKey" : "c4c9dd7f"
+                    "valuationMethod" : {
+                      "valuationSource" : {
+                        "settlementRateOption" : {
+                          "settlementRateOption" : {
+                            "value" : "BRL.PTAX/BRL09"
+                          }
+                        }
+                      }
                     },
                     "valuationDate" : {
                       "fxFixingDate" : {
+                        "periodMultiplier" : -2,
+                        "period" : "D",
                         "meta" : {
-                          "externalKey" : "floatingLegFxFixingDates",
-                          "globalKey" : "63b2b8c5"
+                          "globalKey" : "ffa86191",
+                          "externalKey" : "floatingLegFxFixingDates"
                         },
-                        "period" : "D",
-                        "periodMultiplier" : -2,
-                        "dayType" : "BUSINESS",
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "BRBD"
@@ -324,51 +283,53 @@
                             "globalKey" : "3f03a97"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "dateRelativeToCalculationPeriodDates" : {
                           "calculationPeriodDatesReference" : [ {
-                            "externalReference" : "floatingLegTerminationDate",
-                            "globalReference" : "efeee7e7"
+                            "globalReference" : "efeee7e7",
+                            "externalReference" : "floatingLegTerminationDate"
                           } ]
                         }
                       }
                     },
-                    "valuationMethod" : {
-                      "valuationSource" : {
-                        "settlementRateOption" : {
-                          "settlementRateOption" : {
-                            "value" : "BRL.PTAX/BRL09"
-                          }
-                        }
-                      }
+                    "meta" : {
+                      "globalKey" : "d298f5b5"
                     }
                   } ]
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "bd55286d"
+                    },
+                    "initialRate" : {
+                      "value" : 0.10432,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "BRL"
+                        }
+                      },
+                      "perUnitOf" : {
+                        "currency" : {
+                          "value" : "BRL"
+                        }
+                      },
+                      "priceType" : "InterestRate"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "CAL/252"
+                },
                 "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "BRBD"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "1f3c92"
-                      }
-                    },
-                    "businessDayConvention" : "FOLLOWING",
-                    "meta" : {
-                      "globalKey" : "211c5881"
-                    }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "25e2ab"
-                    },
-                    "period" : "T",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "NONE"
-                  },
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2012-09-26",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -377,20 +338,17 @@
                       },
                       "meta" : {
                         "globalKey" : "ec345b12"
-                      },
-                      "unadjustedDate" : "2012-09-26"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec345b12"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingLegCalcPeriodDates",
-                    "globalKey" : "e528b5cd"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-03-26",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "FOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "BRBD"
@@ -399,103 +357,94 @@
                             "globalKey" : "1f3c92"
                           }
                         },
-                        "businessDayConvention" : "FOLLOWING",
                         "meta" : {
                           "globalKey" : "211c5881"
                         }
                       },
                       "meta" : {
                         "globalKey" : "efeee7e7"
-                      },
-                      "unadjustedDate" : "2013-03-26"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "floatingLegTerminationDate",
-                      "globalKey" : "efeee7e7"
+                      "globalKey" : "efeee7e7",
+                      "externalKey" : "floatingLegTerminationDate"
                     }
-                  }
-                },
-                "compoundingMethod" : "FLAT",
-                "dayCountFraction" : {
-                  "value" : "CAL/252"
-                },
-                "meta" : {
-                  "globalKey" : "981668b7"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "84c5dd9e"
                   },
-                  "payRelativeTo" : "VALUATION_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
-                        "value" : "USNY"
+                        "value" : "BRBD"
                       } ],
                       "meta" : {
-                        "globalKey" : "27e4e9"
+                        "globalKey" : "1f3c92"
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
-                      "globalKey" : "212500d8"
+                      "globalKey" : "211c5881"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf23"
-                    },
-                    "period" : "D",
+                  "calculationPeriodFrequency" : {
                     "periodMultiplier" : 1,
-                    "dayType" : "BUSINESS"
-                  },
-                  "paymentFrequency" : {
+                    "period" : "T",
                     "meta" : {
-                      "globalKey" : "a2d"
+                      "globalKey" : "24b525"
                     },
-                    "period" : "T",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "NONE"
+                  },
+                  "meta" : {
+                    "globalKey" : "1187dc4d",
+                    "externalKey" : "floatingLegCalcPeriodDates"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
                     "meta" : {
-                      "globalKey" : "bd55286d"
+                      "globalKey" : "73"
+                    }
+                  },
+                  "payRelativeTo" : "ValuationDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 1,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4abbbd"
                     },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "USNY"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "27e4e9"
                       }
                     },
-                    "initialRate" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "BRL"
-                        }
-                      },
-                      "value" : 0.10432,
-                      "perUnitOf" : {
-                        "currency" : {
-                          "value" : "BRL"
-                        }
-                      },
-                      "priceType" : "INTEREST_RATE"
+                    "meta" : {
+                      "globalKey" : "212500d8"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "94f40174"
                   }
                 },
                 "resetDates" : {
                   "calculationPeriodDatesReference" : {
-                    "externalReference" : "floatingLegCalcPeriodDates",
-                    "globalReference" : "e528b5cd"
+                    "globalReference" : "1187dc4d",
+                    "externalReference" : "floatingLegCalcPeriodDates"
                   },
                   "fixingDates" : {
+                    "periodMultiplier" : -1,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "9dd243bd"
+                      "globalKey" : "a7117093"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : -1,
-                    "dayType" : "BUSINESS",
+                    "dayType" : "Business",
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "BRBD"
@@ -504,17 +453,20 @@
                         "globalKey" : "1f3c92"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "dateRelativeTo" : {
-                      "externalReference" : "floatingLegResetDates",
-                      "globalReference" : "1ced4f70"
+                      "globalReference" : "ef2f9828",
+                      "externalReference" : "floatingLegResetDates"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "floatingLegResetDates",
-                    "globalKey" : "1ced4f70"
+                  "resetFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "T",
+                    "meta" : {
+                      "globalKey" : "73"
+                    }
                   },
                   "resetDatesAdjustments" : {
+                    "businessDayConvention" : "FOLLOWING",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "BRBD"
@@ -523,154 +475,202 @@
                         "globalKey" : "1f3c92"
                       }
                     },
-                    "businessDayConvention" : "FOLLOWING",
                     "meta" : {
                       "globalKey" : "211c5881"
                     }
                   },
-                  "resetFrequency" : {
-                    "meta" : {
-                      "globalKey" : "a2d"
-                    },
-                    "period" : "T",
-                    "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "ef2f9828",
+                    "externalKey" : "floatingLegResetDates"
                   }
+                },
+                "compoundingMethod" : "Flat",
+                "meta" : {
+                  "globalKey" : "4ae4e213"
                 }
               } ],
               "meta" : {
-                "globalKey" : "93503a43"
+                "globalKey" : "b7566557"
+              }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent",
+              "calculationAgentBusinessCenter" : {
+                "value" : "USNY"
               }
             }
           },
           "meta" : {
-            "globalKey" : "cf3f9d0"
+            "globalKey" : "19831d2a"
           }
         },
         "meta" : {
-          "globalKey" : "cf3f9d0"
+          "globalKey" : "19831d2a"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "168adaad"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0876,
               "unit" : {
                 "currency" : {
                   "value" : "BRL"
                 }
               },
-              "value" : 0.0876,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "BRL"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 100000000.0,
+              "unit" : {
+                "currency" : {
+                  "value" : "BRL"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-2"
               } ]
-            },
+            }
+          }, {
             "value" : {
+              "value" : 104149148.42,
               "unit" : {
                 "currency" : {
                   "value" : "BRL"
                 }
-              },
-              "value" : 100000000.0
-            }
-          }, {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
+            }
+          } ],
+          "meta" : {
+            "globalKey" : "bad07af3"
+          }
+        }, {
+          "quantity" : [ {
             "value" : {
+              "value" : 100000000.0,
               "unit" : {
                 "currency" : {
                   "value" : "BRL"
                 }
-              },
-              "value" : 104149148.42
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-3"
+              } ]
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "d3e0f246"
-          },
+          } ],
           "observable" : {
-            "meta" : {
-              "globalKey" : "33a3d745"
-            },
             "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "BRL-CDI"
+                }
+              },
               "meta" : {
                 "location" : [ {
                   "scope" : "DOCUMENT",
                   "value" : "rateOption-1"
                 } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "BRL-CDI"
-                }
               }
-            }
-          },
-          "quantity" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "quantity-3"
-              } ]
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "BRL"
-                }
-              },
-              "value" : 100000000.0
+            "meta" : {
+              "globalKey" : "40d7115b"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "7c30e9d0"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "fa8ff89a",
+          "externalReference" : "partyA"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "ded9c798",
+          "externalReference" : "partyB"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "fa8ff89a",
+          "externalReference" : "partyA"
         } ]
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ee19d"
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "DELTA123",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "604c339a"
+        }
+      } ],
+      "name" : {
+        "value" : "Delta Bank Ltd"
       },
-      "value" : "2012-06-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "fa8ff89a",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "METRO123",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "987654321-0"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "14c7ba99"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "9b39401a"
+      "name" : {
+        "value" : "Metro Bank Ltd"
       },
       "meta" : {
-        "globalKey" : "c13403b3"
+        "globalKey" : "ded9c798",
+        "externalKey" : "partyB"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "28e1b9d5"
+    }
+  },
+  "meta" : {
+    "globalKey" : "28e1b9d5"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex40-rfr-avg-swap-obs-period-shift.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex40-rfr-avg-swap-obs-period-shift.json
index b57744e4cc..3898ccc516 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex40-rfr-avg-swap-obs-period-shift.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex40-rfr-avg-swap-obs-period-shift.json
@@ -1,97 +1,33 @@
 {
-  "meta" : {
-    "globalKey" : "e57188e8"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "e57188e8"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "3433a6af"
-      },
-      "name" : {
-        "value" : "A BANK(\"ABANK\")"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300ABANKV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b04445c0"
-        }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "f759761d"
-      },
-      "name" : {
-        "value" : "SELL SECURITIES CO LTD (\"Counterparty\")"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "f735062f",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "FpML-test-7",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "529900CPTY57S5UCBB52"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "971c8d6e"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "dco",
-        "globalKey" : "7021c4b9"
-      },
-      "name" : {
-        "value" : "ABC CENTRAL PARTY CLEARING SVC LTD"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "123456QQQQ57S5UCBB11"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "d73feaa5"
-        }
-      } ]
+        "globalKey" : "b3cab005"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2018-11-15",
+      "meta" : {
+        "globalKey" : "3f12cf"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "3433a6af"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "f759761d"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "3433a6af"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "InterestRate::VanillaSwap"
@@ -102,52 +38,71 @@
             "productQualifier" : "InterestRate_IRSwap_FixedFloat"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "meta" : {
-                      "globalKey" : "a98014e5"
-                    }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28bf0"
+                      "globalKey" : "a227531d"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "16"
-                  },
+                    "calculationParameters" : {
+                      "calculationMethod" : "Averaging",
+                      "observationShiftCalculation" : {
+                        "offsetDays" : 5,
+                        "calculationBase" : "Standard",
+                        "additionalBusinessDays" : {
+                          "businessCenter" : [ {
+                            "value" : "GBLO"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "21479e"
+                          }
+                        }
+                      },
+                      "applicableBusinessDays" : {
+                        "businessCenter" : [ {
+                          "value" : "EUTA"
+                        } ],
+                        "meta" : {
+                          "globalKey" : "20a71d"
+                        }
+                      },
+                      "observationParameters" : {
+                        "observationCapRate" : 0.02
+                      }
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-11-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -156,27 +111,23 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "meta" : {
                           "globalKey" : "a98014e5"
                         }
                       },
                       "meta" : {
                         "globalKey" : "12cc4415"
-                      },
-                      "unadjustedDate" : "2018-11-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "12cc4415"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "calculationPeriodDates-64209468-677",
-                    "globalKey" : "77b46d88"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2023-11-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -185,34 +136,21 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e180b21e"
-                      },
-                      "unadjustedDate" : "2023-11-16"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "terminationDate-64209468-678",
-                      "globalKey" : "e180b21e"
+                      "globalKey" : "e180b21e",
+                      "externalKey" : "terminationDate-64209468-678"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "5026c1d5"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4250917d"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -221,108 +159,101 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "a98014e5"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf23"
-                    },
-                    "period" : "D",
+                  "calculationPeriodFrequency" : {
                     "periodMultiplier" : 1,
-                    "dayType" : "BUSINESS"
-                  },
-                  "paymentFrequency" : {
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "954"
+                      "globalKey" : "177d8"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "16"
+                  },
+                  "meta" : {
+                    "globalKey" : "ce712a6a",
+                    "externalKey" : "calculationPeriodDates-64209468-677"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 1,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "d624cc99"
+                      "globalKey" : "ea4abbbd"
                     },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
                       }
                     },
-                    "calculationParameters" : {
-                      "applicableBusinessDays" : {
-                        "businessCenter" : [ {
-                          "value" : "EUTA"
-                        } ],
-                        "meta" : {
-                          "globalKey" : "20a71d"
-                        }
-                      },
-                      "calculationMethod" : "AVERAGING",
-                      "observationParameters" : {
-                        "observationCapRate" : 0.02
-                      },
-                      "observationShiftCalculation" : {
-                        "additionalBusinessDays" : {
-                          "businessCenter" : [ {
-                            "value" : "GBLO"
-                          } ],
-                          "meta" : {
-                            "globalKey" : "21479e"
-                          }
-                        },
-                        "calculationBase" : "STANDARD",
-                        "offsetDays" : 5
-                      }
+                    "meta" : {
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "8283573f"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "b7dcd3a7"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "meta" : {
-                      "globalKey" : "a98014e5"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28bf0"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "16"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-11-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -331,27 +262,23 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "meta" : {
                           "globalKey" : "a98014e5"
                         }
                       },
                       "meta" : {
                         "globalKey" : "12cc4415"
-                      },
-                      "unadjustedDate" : "2018-11-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "12cc4415"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "calculationPeriodDates-64209468-681",
-                    "globalKey" : "77b46d88"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2023-11-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -360,34 +287,21 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e180b21e"
-                      },
-                      "unadjustedDate" : "2023-11-16"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "terminationDate-64209468-682",
-                      "globalKey" : "e180b21e"
+                      "globalKey" : "e180b21e",
+                      "externalKey" : "terminationDate-64209468-682"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "b8b6ada"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4250917d"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -396,162 +310,248 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "a98014e5"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf23"
-                    },
-                    "period" : "D",
+                  "calculationPeriodFrequency" : {
                     "periodMultiplier" : 1,
-                    "dayType" : "BUSINESS"
-                  },
-                  "paymentFrequency" : {
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "954"
+                      "globalKey" : "177d8"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "16"
+                  },
+                  "meta" : {
+                    "globalKey" : "ce712a6a",
+                    "externalKey" : "calculationPeriodDates-64209468-681"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 1,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4abbbd"
                     },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "8283573f"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "6ecf09e8"
                 }
               } ],
               "meta" : {
-                "globalKey" : "5c8a01a5"
+                "globalKey" : "d409f521"
               }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "c30084f"
+            "globalKey" : "63cde01f"
           }
         },
         "meta" : {
-          "globalKey" : "c30084f"
+          "globalKey" : "63cde01f"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "f3f7dbb5"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "da18264f"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EONIA-AVERAGE"
+          "quantity" : [ {
+            "value" : {
+              "value" : 3672000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "EUR"
                 }
               }
-            }
-          },
-          "quantity" : [ {
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
-            },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "EUR"
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EONIA-AVERAGE"
                 }
               },
-              "value" : 3672000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "68eca391"
             }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "bf271529"
           },
+          "meta" : {
+            "globalKey" : "d819b22d"
+          }
+        }, {
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.002,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.002,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 3672000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 3672000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "25bb8ff7"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "eae1821d",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "f735062f",
+          "externalReference" : "partyA"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "f735062f",
+          "externalReference" : "partyA"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300ABANKV6BYQOWM67",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b04445c0"
+        }
+      } ],
+      "name" : {
+        "value" : "A BANK(\"ABANK\")"
+      },
       "meta" : {
-        "globalKey" : "3f12cf"
+        "globalKey" : "f735062f",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "529900CPTY57S5UCBB52",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "971c8d6e"
+        }
+      } ],
+      "name" : {
+        "value" : "SELL SECURITIES CO LTD (\"Counterparty\")"
       },
-      "value" : "2018-11-15"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "eae1821d",
+        "externalKey" : "partyB"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "123456QQQQ57S5UCBB11",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "FpML-test-7"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "d73feaa5"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "3433a6af"
+      "name" : {
+        "value" : "ABC CENTRAL PARTY CLEARING SVC LTD"
       },
       "meta" : {
-        "globalKey" : "74692e1b"
+        "globalKey" : "ab59d979",
+        "externalKey" : "dco"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "c2e7f158"
+    }
+  },
+  "meta" : {
+    "globalKey" : "c2e7f158"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex46-rfr-compound-swap-lookback-oet-mmviq.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex46-rfr-compound-swap-lookback-oet-mmviq.json
index 8c9208424b..16d9c8536e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex46-rfr-compound-swap-lookback-oet-mmviq.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex46-rfr-compound-swap-lookback-oet-mmviq.json
@@ -1,97 +1,33 @@
 {
-  "meta" : {
-    "globalKey" : "6c23f105"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "6c23f105"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "3433a6af"
-      },
-      "name" : {
-        "value" : "A BANK(\"ABANK\")"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300ABANKV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b04445c0"
-        }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "f759761d"
-      },
-      "name" : {
-        "value" : "SELL SECURITIES CO LTD (\"Counterparty\")"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "f735062f",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "FpML-test-7",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "529900CPTY57S5UCBB52"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "971c8d6e"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "dco",
-        "globalKey" : "7021c4b9"
-      },
-      "name" : {
-        "value" : "ABC CENTRAL PARTY CLEARING SVC LTD"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "123456QQQQ57S5UCBB11"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "d73feaa5"
-        }
-      } ]
+        "globalKey" : "b3cab005"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2018-11-15",
+      "meta" : {
+        "globalKey" : "3f12cf"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "3433a6af"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "f759761d"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "3433a6af"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "InterestRate::VanillaSwap"
@@ -102,52 +38,70 @@
             "productQualifier" : "InterestRate_IRSwap_FixedFloat"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "NONE",
-                    "meta" : {
-                      "globalKey" : "a98014e5"
-                    }
-                  },
-                  "calculationPeriodFrequency" : {
                     "meta" : {
-                      "globalKey" : "28bf0"
+                      "globalKey" : "364d7961"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "16"
-                  },
+                    "calculationParameters" : {
+                      "calculationMethod" : "Compounding",
+                      "lookbackCalculation" : {
+                        "offsetDays" : 5
+                      },
+                      "applicableBusinessDays" : {
+                        "businessCenter" : [ {
+                          "value" : "EUTA"
+                        } ],
+                        "meta" : {
+                          "globalKey" : "20a71d"
+                        }
+                      },
+                      "observationParameters" : {
+                        "observationCapRate" : 0.02
+                      }
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-11-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -156,27 +110,23 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "meta" : {
                           "globalKey" : "a98014e5"
                         }
                       },
                       "meta" : {
                         "globalKey" : "12cc4415"
-                      },
-                      "unadjustedDate" : "2018-11-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "12cc4415"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "calculationPeriodDates-64209468-677",
-                    "globalKey" : "77b46d88"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2023-11-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -185,34 +135,21 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e180b21e"
-                      },
-                      "unadjustedDate" : "2023-11-16"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "terminationDate-64209468-678",
-                      "globalKey" : "e180b21e"
+                      "globalKey" : "e180b21e",
+                      "externalKey" : "terminationDate-64209468-678"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "e218420f"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4250917d"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -221,107 +158,101 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "a98014e5"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf23"
-                    },
-                    "period" : "D",
+                  "calculationPeriodFrequency" : {
                     "periodMultiplier" : 1,
-                    "dayType" : "BUSINESS"
-                  },
-                  "paymentFrequency" : {
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "954"
+                      "globalKey" : "177d8"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "16"
+                  },
+                  "meta" : {
+                    "globalKey" : "ce712a6a",
+                    "externalKey" : "calculationPeriodDates-64209468-677"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "d63fcdcb"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 1,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4abbbd"
                     },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
                       }
                     },
-                    "calculationParameters" : {
-                      "applicableBusinessDays" : {
-                        "businessCenter" : [ {
-                          "value" : "EUTA"
-                        } ],
-                        "meta" : {
-                          "globalKey" : "20a71d"
-                        }
-                      },
-                      "calculationMethod" : "COMPOUNDING",
-                      "lookbackCalculation" : {
-                        "offsetDays" : 5
-                      },
-                      "observationParameters" : {
-                        "observationCapRate" : 0.02
-                      }
+                    "meta" : {
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "8283573f"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "c83e0d09"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "meta" : {
-                      "globalKey" : "a98014e5"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28bf0"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "16"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-11-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -330,27 +261,23 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "meta" : {
                           "globalKey" : "a98014e5"
                         }
                       },
                       "meta" : {
                         "globalKey" : "12cc4415"
-                      },
-                      "unadjustedDate" : "2018-11-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "12cc4415"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "calculationPeriodDates-64209468-681",
-                    "globalKey" : "77b46d88"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2023-11-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -359,34 +286,21 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e180b21e"
-                      },
-                      "unadjustedDate" : "2023-11-16"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "terminationDate-64209468-682",
-                      "globalKey" : "e180b21e"
+                      "globalKey" : "e180b21e",
+                      "externalKey" : "terminationDate-64209468-682"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "b8b6ada"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4250917d"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -395,63 +309,129 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "a98014e5"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf23"
-                    },
-                    "period" : "D",
+                  "calculationPeriodFrequency" : {
                     "periodMultiplier" : 1,
-                    "dayType" : "BUSINESS"
-                  },
-                  "paymentFrequency" : {
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "954"
+                      "globalKey" : "177d8"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "16"
+                  },
+                  "meta" : {
+                    "globalKey" : "ce712a6a",
+                    "externalKey" : "calculationPeriodDates-64209468-681"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "0"
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 1,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4abbbd"
                     },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "8283573f"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "6ecf09e8"
                 }
               } ],
               "meta" : {
-                "globalKey" : "e23824ab"
+                "globalKey" : "feb773ff"
               }
             },
             "terminationProvision" : {
               "earlyTerminationProvision" : {
-                "meta" : {
-                  "globalKey" : "936a4459"
-                },
                 "optionalEarlyTermination" : {
+                  "europeanExercise" : {
+                    "expirationDate" : [ {
+                      "relativeDate" : {
+                        "periodMultiplier" : -5,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "ff947ba6"
+                        },
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "EUTA"
+                          }, {
+                            "value" : "GBLO"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "4158421"
+                          }
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "46e3a790",
+                          "externalReference" : "cashSettlementPayment0"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "ff947ba6"
+                      }
+                    } ],
+                    "earliestExerciseTime" : {
+                      "hourMinuteTime" : "09:00:00",
+                      "businessCenter" : {
+                        "value" : "BEBR"
+                      }
+                    },
+                    "expirationTime" : {
+                      "hourMinuteTime" : "11:00:00",
+                      "businessCenter" : {
+                        "value" : "BEBR"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "3d76c707"
+                    }
+                  },
+                  "exerciseNotice" : [ {
+                    "businessCenter" : {
+                      "value" : "GBLO"
+                    }
+                  } ],
+                  "followUpConfirmation" : true,
                   "calculationAgent" : {
-                    "calculationAgentPartyEnum" : "NON_EXERCISING_PARTY"
+                    "calculationAgentPartyEnum" : "NonExercisingParty"
                   },
                   "cashSettlement" : {
-                    "meta" : {
-                      "globalKey" : "58e28083"
-                    },
                     "settlementDate" : {
                       "adjustableDates" : {
+                        "unadjustedDate" : [ "2001-08-30" ],
                         "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -462,34 +442,45 @@
                               "globalKey" : "428533f"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "da4e2f6e"
                           }
                         },
                         "meta" : {
                           "globalKey" : "46e3a790"
-                        },
-                        "unadjustedDate" : [ "2001-08-30" ]
+                        }
                       },
                       "meta" : {
-                        "externalKey" : "cashSettlementPayment0",
-                        "globalKey" : "46e3a790"
+                        "globalKey" : "46e3a790",
+                        "externalKey" : "cashSettlementPayment0"
                       }
                     },
+                    "meta" : {
+                      "globalKey" : "58a065a9"
+                    },
                     "cashSettlementTerms" : [ {
-                      "cashSettlementMethod" : "MID_MARKET_INDICATIVE_QUOTATIONS",
-                      "meta" : {
-                        "globalKey" : "4426213"
+                      "cashSettlementMethod" : "MidMarketIndicativeQuotations",
+                      "valuationMethod" : {
+                        "cashCollateralValuationMethod" : {
+                          "applicableCsa" : "NoCSA",
+                          "cashCollateralCurrency" : "EUR",
+                          "cashCollateralInterestRate" : {
+                            "value" : "EuroSTR"
+                          },
+                          "agreedDiscountRate" : {
+                            "value" : "EuroSTR"
+                          }
+                        }
                       },
                       "valuationDate" : {
                         "valuationDate" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "ef5205d3"
+                            "globalKey" : "4de1387"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -500,225 +491,234 @@
                               "globalKey" : "428533f"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "cashSettlementPayment0",
-                            "globalReference" : "46e3a790"
-                          }
-                        }
-                      },
-                      "valuationMethod" : {
-                        "cashCollateralValuationMethod" : {
-                          "agreedDiscountRate" : {
-                            "value" : "EuroSTR"
-                          },
-                          "applicableCsa" : "NoCSA",
-                          "cashCollateralCurrency" : "EUR",
-                          "cashCollateralInterestRate" : {
-                            "value" : "EuroSTR"
+                            "globalReference" : "46e3a790",
+                            "externalReference" : "cashSettlementPayment0"
                           }
                         }
                       },
                       "valuationTime" : {
+                        "hourMinuteTime" : "11:00:00",
                         "businessCenter" : {
                           "value" : "BEBR"
-                        },
-                        "hourMinuteTime" : "11:00:00"
-                      }
-                    } ]
-                  },
-                  "europeanExercise" : {
-                    "earliestExerciseTime" : {
-                      "businessCenter" : {
-                        "value" : "BEBR"
+                        }
                       },
-                      "hourMinuteTime" : "09:00:00"
-                    },
-                    "expirationDate" : [ {
                       "meta" : {
-                        "globalKey" : "cbda32d8"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "cbda32d8"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : -5,
-                        "dayType" : "BUSINESS",
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "EUTA"
-                          }, {
-                            "value" : "GBLO"
-                          } ],
-                          "meta" : {
-                            "globalKey" : "4158421"
-                          }
-                        },
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "cashSettlementPayment0",
-                          "globalReference" : "46e3a790"
-                        }
+                        "globalKey" : "4004739"
                       }
-                    } ],
-                    "expirationTime" : {
-                      "businessCenter" : {
-                        "value" : "BEBR"
-                      },
-                      "hourMinuteTime" : "11:00:00"
-                    },
-                    "meta" : {
-                      "globalKey" : "fb596365"
-                    }
-                  },
-                  "exerciseNotice" : [ {
-                    "businessCenter" : {
-                      "value" : "GBLO"
-                    }
-                  } ],
-                  "followUpConfirmation" : true
+                    } ]
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "f213565f"
                 }
               }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "4531deb8"
+            "globalKey" : "c34a5bfe"
           }
         },
         "meta" : {
-          "globalKey" : "4531deb8"
+          "globalKey" : "c34a5bfe"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "cf20a269"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "c029c1f"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EONIA"
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 3672000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 3672000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "bf271529"
-          },
-          "price" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-2"
+                "value" : "quantity-1"
               } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EONIA"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
             },
+            "meta" : {
+              "globalKey" : "7450e7c1"
+            }
+          },
+          "meta" : {
+            "globalKey" : "ce6bd301"
+          }
+        }, {
+          "price" : [ {
             "value" : {
+              "value" : 0.002,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.002,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-2"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 3672000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 3672000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "25bb8ff7"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "eae1821d",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "f735062f",
+          "externalReference" : "partyA"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "f735062f",
+          "externalReference" : "partyA"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300ABANKV6BYQOWM67",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b04445c0"
+        }
+      } ],
+      "name" : {
+        "value" : "A BANK(\"ABANK\")"
+      },
       "meta" : {
-        "globalKey" : "3f12cf"
+        "globalKey" : "f735062f",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "529900CPTY57S5UCBB52",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "971c8d6e"
+        }
+      } ],
+      "name" : {
+        "value" : "SELL SECURITIES CO LTD (\"Counterparty\")"
       },
-      "value" : "2018-11-15"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "eae1821d",
+        "externalKey" : "partyB"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "123456QQQQ57S5UCBB11",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "FpML-test-7"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "d73feaa5"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "3433a6af"
+      "name" : {
+        "value" : "ABC CENTRAL PARTY CLEARING SVC LTD"
       },
       "meta" : {
-        "globalKey" : "74692e1b"
+        "globalKey" : "ab59d979",
+        "externalKey" : "dco"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "7707d85"
+    }
+  },
+  "meta" : {
+    "globalKey" : "7707d85"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex47-rfr-compound-swap-lookback-oet-rvfq.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex47-rfr-compound-swap-lookback-oet-rvfq.json
index dd1ff5c3b0..0122acad5d 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex47-rfr-compound-swap-lookback-oet-rvfq.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/ird-ex47-rfr-compound-swap-lookback-oet-rvfq.json
@@ -1,97 +1,33 @@
 {
-  "meta" : {
-    "globalKey" : "a0451e4f"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "a0451e4f"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "partyA",
-        "globalKey" : "3433a6af"
-      },
-      "name" : {
-        "value" : "A BANK(\"ABANK\")"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "549300ABANKV6BYQOWM67"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "b04445c0"
-        }
-      } ]
-    }, {
-      "meta" : {
-        "externalKey" : "partyB",
-        "globalKey" : "f759761d"
-      },
-      "name" : {
-        "value" : "SELL SECURITIES CO LTD (\"Counterparty\")"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "f735062f",
+        "externalReference" : "partyA"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "FpML-test-7",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "529900CPTY57S5UCBB52"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "971c8d6e"
+            "scheme" : "http://www.partyA.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "dco",
-        "globalKey" : "7021c4b9"
-      },
-      "name" : {
-        "value" : "ABC CENTRAL PARTY CLEARING SVC LTD"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "123456QQQQ57S5UCBB11"
-        },
-        "identifierType" : "LEI",
-        "meta" : {
-          "globalKey" : "d73feaa5"
-        }
-      } ]
+        "globalKey" : "b3cab005"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2018-11-15",
+      "meta" : {
+        "globalKey" : "3f12cf"
+      }
+    },
     "tradableProduct" : {
-      "ancillaryParty" : [ {
-        "partyReference" : [ {
-          "externalReference" : "partyA",
-          "globalReference" : "3433a6af"
-        } ],
-        "role" : "CALCULATION_AGENT_INDEPENDENT"
-      } ],
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "partyB",
-          "globalReference" : "f759761d"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "partyA",
-          "globalReference" : "3433a6af"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
-            "source" : "OTHER",
+            "source" : "Other",
             "value" : {
               "name" : {
                 "value" : "InterestRate::VanillaSwap"
@@ -102,52 +38,70 @@
             "productQualifier" : "InterestRate_IRSwap_FixedFloat"
           } ],
           "economicTerms" : {
-            "calculationAgent" : {
-              "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-            },
             "payout" : {
               "interestRatePayout" : [ {
                 "payerReceiver" : {
-                  "payer" : "PARTY_1",
-                  "receiver" : "PARTY_2"
+                  "payer" : "Party1",
+                  "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
                       }
                     },
-                    "businessDayConvention" : "NONE",
-                    "meta" : {
-                      "globalKey" : "a98014e5"
-                    }
-                  },
-                  "calculationPeriodFrequency" : {
                     "meta" : {
-                      "globalKey" : "28bf0"
+                      "globalKey" : "364d7961"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "16"
-                  },
+                    "calculationParameters" : {
+                      "calculationMethod" : "Compounding",
+                      "lookbackCalculation" : {
+                        "offsetDays" : 5
+                      },
+                      "applicableBusinessDays" : {
+                        "businessCenter" : [ {
+                          "value" : "EUTA"
+                        } ],
+                        "meta" : {
+                          "globalKey" : "20a71d"
+                        }
+                      },
+                      "observationParameters" : {
+                        "observationCapRate" : 0.02
+                      }
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-11-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -156,27 +110,23 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "meta" : {
                           "globalKey" : "a98014e5"
                         }
                       },
                       "meta" : {
                         "globalKey" : "12cc4415"
-                      },
-                      "unadjustedDate" : "2018-11-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "12cc4415"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "calculationPeriodDates-64209468-677",
-                    "globalKey" : "77b46d88"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2023-11-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -185,34 +135,21 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e180b21e"
-                      },
-                      "unadjustedDate" : "2023-11-16"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "terminationDate-64209468-678",
-                      "globalKey" : "e180b21e"
+                      "globalKey" : "e180b21e",
+                      "externalKey" : "terminationDate-64209468-678"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "e218420f"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4250917d"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -221,107 +158,101 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "a98014e5"
                     }
                   },
-                  "paymentDaysOffset" : {
-                    "meta" : {
-                      "globalKey" : "ea4baf23"
-                    },
-                    "period" : "D",
+                  "calculationPeriodFrequency" : {
                     "periodMultiplier" : 1,
-                    "dayType" : "BUSINESS"
-                  },
-                  "paymentFrequency" : {
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "954"
+                      "globalKey" : "177d8"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 1
+                    "rollConvention" : "16"
+                  },
+                  "meta" : {
+                    "globalKey" : "ce712a6a",
+                    "externalKey" : "calculationPeriodDates-64209468-677"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
+                "paymentDates" : {
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "d63fcdcb"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 1,
+                    "period" : "D",
+                    "meta" : {
+                      "globalKey" : "ea4abbbd"
                     },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
                       }
                     },
-                    "calculationParameters" : {
-                      "applicableBusinessDays" : {
-                        "businessCenter" : [ {
-                          "value" : "EUTA"
-                        } ],
-                        "meta" : {
-                          "globalKey" : "20a71d"
-                        }
-                      },
-                      "calculationMethod" : "COMPOUNDING",
-                      "lookbackCalculation" : {
-                        "offsetDays" : 5
-                      },
-                      "observationParameters" : {
-                        "observationCapRate" : 0.02
-                      }
+                    "meta" : {
+                      "globalKey" : "365baaee"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "8283573f"
                   }
+                },
+                "meta" : {
+                  "globalKey" : "c83e0d09"
                 }
               }, {
                 "payerReceiver" : {
-                  "payer" : "PARTY_2",
-                  "receiver" : "PARTY_1"
+                  "payer" : "Party2",
+                  "receiver" : "Party1"
                 },
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
-                "calculationPeriodDates" : {
-                  "calculationPeriodDatesAdjustments" : {
-                    "businessCenters" : {
-                      "businessCenter" : [ {
-                        "value" : "EUTA"
-                      } ],
-                      "meta" : {
-                        "globalKey" : "20a71d"
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
                       }
                     },
-                    "businessDayConvention" : "NONE",
                     "meta" : {
-                      "globalKey" : "a98014e5"
+                      "globalKey" : "0"
                     }
-                  },
-                  "calculationPeriodFrequency" : {
-                    "meta" : {
-                      "globalKey" : "28bf0"
-                    },
-                    "period" : "M",
-                    "periodMultiplier" : 1,
-                    "rollConvention" : "16"
-                  },
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
+                "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2018-11-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "NONE",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -330,27 +261,23 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "NONE",
                         "meta" : {
                           "globalKey" : "a98014e5"
                         }
                       },
                       "meta" : {
                         "globalKey" : "12cc4415"
-                      },
-                      "unadjustedDate" : "2018-11-16"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "12cc4415"
                     }
                   },
-                  "meta" : {
-                    "externalKey" : "calculationPeriodDates-64209468-681",
-                    "globalKey" : "77b46d88"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2023-11-16",
                       "dateAdjustments" : {
+                        "businessDayConvention" : "MODFOLLOWING",
                         "businessCenters" : {
                           "businessCenter" : [ {
                             "value" : "EUTA"
@@ -359,34 +286,21 @@
                             "globalKey" : "20a71d"
                           }
                         },
-                        "businessDayConvention" : "MODFOLLOWING",
                         "meta" : {
                           "globalKey" : "365baaee"
                         }
                       },
                       "meta" : {
                         "globalKey" : "e180b21e"
-                      },
-                      "unadjustedDate" : "2023-11-16"
+                      }
                     },
                     "meta" : {
-                      "externalKey" : "terminationDate-64209468-682",
-                      "globalKey" : "e180b21e"
+                      "globalKey" : "e180b21e",
+                      "externalKey" : "terminationDate-64209468-682"
                     }
-                  }
-                },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
-                "meta" : {
-                  "globalKey" : "b8b6ada"
-                },
-                "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "4250917d"
                   },
-                  "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                  "paymentDatesAdjustments" : {
+                  "calculationPeriodDatesAdjustments" : {
+                    "businessDayConvention" : "NONE",
                     "businessCenters" : {
                       "businessCenter" : [ {
                         "value" : "EUTA"
@@ -395,63 +309,129 @@
                         "globalKey" : "20a71d"
                       }
                     },
-                    "businessDayConvention" : "MODFOLLOWING",
                     "meta" : {
-                      "globalKey" : "365baaee"
+                      "globalKey" : "a98014e5"
                     }
                   },
-                  "paymentDaysOffset" : {
+                  "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
                     "meta" : {
-                      "globalKey" : "ea4baf23"
+                      "globalKey" : "177d8"
                     },
-                    "period" : "D",
-                    "periodMultiplier" : 1,
-                    "dayType" : "BUSINESS"
+                    "rollConvention" : "16"
                   },
+                  "meta" : {
+                    "globalKey" : "ce712a6a",
+                    "externalKey" : "calculationPeriodDates-64209468-681"
+                  }
+                },
+                "paymentDates" : {
                   "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "period" : "M",
+                    "meta" : {
+                      "globalKey" : "6c"
+                    }
+                  },
+                  "payRelativeTo" : "CalculationPeriodEndDate",
+                  "paymentDaysOffset" : {
+                    "periodMultiplier" : 1,
+                    "period" : "D",
                     "meta" : {
-                      "globalKey" : "954"
+                      "globalKey" : "ea4abbbd"
                     },
-                    "period" : "M",
-                    "periodMultiplier" : 1
+                    "dayType" : "Business"
+                  },
+                  "paymentDatesAdjustments" : {
+                    "businessDayConvention" : "MODFOLLOWING",
+                    "businessCenters" : {
+                      "businessCenter" : [ {
+                        "value" : "EUTA"
+                      } ],
+                      "meta" : {
+                        "globalKey" : "20a71d"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "365baaee"
+                    }
+                  },
+                  "meta" : {
+                    "globalKey" : "8283573f"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
+                "meta" : {
+                  "globalKey" : "6ecf09e8"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "feb773ff"
+              }
+            },
+            "terminationProvision" : {
+              "earlyTerminationProvision" : {
+                "optionalEarlyTermination" : {
+                  "europeanExercise" : {
+                    "expirationDate" : [ {
+                      "relativeDate" : {
+                        "periodMultiplier" : -5,
+                        "period" : "D",
+                        "meta" : {
+                          "globalKey" : "ff947ba6"
+                        },
+                        "dayType" : "Business",
+                        "businessDayConvention" : "NONE",
+                        "businessCenters" : {
+                          "businessCenter" : [ {
+                            "value" : "EUTA"
+                          }, {
+                            "value" : "GBLO"
+                          } ],
+                          "meta" : {
+                            "globalKey" : "4158421"
+                          }
+                        },
+                        "dateRelativeTo" : {
+                          "globalReference" : "46e3a790",
+                          "externalReference" : "cashSettlementPayment0"
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "ff947ba6"
+                      }
+                    } ],
+                    "earliestExerciseTime" : {
+                      "hourMinuteTime" : "09:00:00",
+                      "businessCenter" : {
+                        "value" : "BEBR"
+                      }
+                    },
+                    "expirationTime" : {
+                      "hourMinuteTime" : "11:00:00",
+                      "businessCenter" : {
+                        "value" : "BEBR"
                       }
+                    },
+                    "meta" : {
+                      "globalKey" : "3d76c707"
                     }
-                  }
-                }
-              } ],
-              "meta" : {
-                "globalKey" : "e23824ab"
-              }
-            },
-            "terminationProvision" : {
-              "earlyTerminationProvision" : {
-                "meta" : {
-                  "globalKey" : "35a8f3c1"
-                },
-                "optionalEarlyTermination" : {
+                  },
+                  "exerciseNotice" : [ {
+                    "businessCenter" : {
+                      "value" : "GBLO"
+                    }
+                  } ],
+                  "followUpConfirmation" : true,
                   "calculationAgent" : {
-                    "calculationAgentPartyEnum" : "NON_EXERCISING_PARTY"
+                    "calculationAgentPartyEnum" : "NonExercisingParty"
                   },
                   "cashSettlement" : {
-                    "meta" : {
-                      "globalKey" : "bd39fd75"
-                    },
                     "settlementDate" : {
                       "adjustableDates" : {
+                        "unadjustedDate" : [ "2001-08-30" ],
                         "dateAdjustments" : {
+                          "businessDayConvention" : "FOLLOWING",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -462,34 +442,40 @@
                               "globalKey" : "428533f"
                             }
                           },
-                          "businessDayConvention" : "FOLLOWING",
                           "meta" : {
                             "globalKey" : "da4e2f6e"
                           }
                         },
                         "meta" : {
                           "globalKey" : "46e3a790"
-                        },
-                        "unadjustedDate" : [ "2001-08-30" ]
+                        }
                       },
                       "meta" : {
-                        "externalKey" : "cashSettlementPayment0",
-                        "globalKey" : "46e3a790"
+                        "globalKey" : "46e3a790",
+                        "externalKey" : "cashSettlementPayment0"
                       }
                     },
+                    "meta" : {
+                      "globalKey" : "3f7ca5ab"
+                    },
                     "cashSettlementTerms" : [ {
-                      "cashSettlementMethod" : "REPLACEMENT_VALUE_FIRM_QUOTATIONS",
-                      "meta" : {
-                        "globalKey" : "51f005e5"
+                      "cashSettlementMethod" : "ReplacementValueFirmQuotations",
+                      "valuationMethod" : {
+                        "cashCollateralValuationMethod" : {
+                          "cashCollateralCurrency" : "EUR",
+                          "protectedParty" : [ "Both" ],
+                          "prescribedDocumentationAdjustment" : true
+                        }
                       },
                       "valuationDate" : {
                         "valuationDate" : {
+                          "periodMultiplier" : -2,
+                          "period" : "D",
                           "meta" : {
-                            "globalKey" : "ef5205d3"
+                            "globalKey" : "4de1387"
                           },
-                          "period" : "D",
-                          "periodMultiplier" : -2,
-                          "dayType" : "BUSINESS",
+                          "dayType" : "Business",
+                          "businessDayConvention" : "NONE",
                           "businessCenters" : {
                             "businessCenter" : [ {
                               "value" : "GBLO"
@@ -500,220 +486,234 @@
                               "globalKey" : "428533f"
                             }
                           },
-                          "businessDayConvention" : "NONE",
                           "dateRelativeTo" : {
-                            "externalReference" : "cashSettlementPayment0",
-                            "globalReference" : "46e3a790"
+                            "globalReference" : "46e3a790",
+                            "externalReference" : "cashSettlementPayment0"
                           }
                         }
                       },
-                      "valuationMethod" : {
-                        "cashCollateralValuationMethod" : {
-                          "cashCollateralCurrency" : "EUR",
-                          "prescribedDocumentationAdjustment" : true,
-                          "protectedParty" : [ "BOTH" ]
-                        }
-                      },
                       "valuationTime" : {
+                        "hourMinuteTime" : "11:00:00",
                         "businessCenter" : {
                           "value" : "BEBR"
-                        },
-                        "hourMinuteTime" : "11:00:00"
-                      }
-                    } ]
-                  },
-                  "europeanExercise" : {
-                    "earliestExerciseTime" : {
-                      "businessCenter" : {
-                        "value" : "BEBR"
+                        }
                       },
-                      "hourMinuteTime" : "09:00:00"
-                    },
-                    "expirationDate" : [ {
                       "meta" : {
-                        "globalKey" : "cbda32d8"
-                      },
-                      "relativeDate" : {
-                        "meta" : {
-                          "globalKey" : "cbda32d8"
-                        },
-                        "period" : "D",
-                        "periodMultiplier" : -5,
-                        "dayType" : "BUSINESS",
-                        "businessCenters" : {
-                          "businessCenter" : [ {
-                            "value" : "EUTA"
-                          }, {
-                            "value" : "GBLO"
-                          } ],
-                          "meta" : {
-                            "globalKey" : "4158421"
-                          }
-                        },
-                        "businessDayConvention" : "NONE",
-                        "dateRelativeTo" : {
-                          "externalReference" : "cashSettlementPayment0",
-                          "globalReference" : "46e3a790"
-                        }
+                        "globalKey" : "d432ae1b"
                       }
-                    } ],
-                    "expirationTime" : {
-                      "businessCenter" : {
-                        "value" : "BEBR"
-                      },
-                      "hourMinuteTime" : "11:00:00"
-                    },
-                    "meta" : {
-                      "globalKey" : "fb596365"
-                    }
-                  },
-                  "exerciseNotice" : [ {
-                    "businessCenter" : {
-                      "value" : "GBLO"
-                    }
-                  } ],
-                  "followUpConfirmation" : true
+                    } ]
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "1a3060b5"
                 }
               }
+            },
+            "calculationAgent" : {
+              "calculationAgentParty" : "CalculationAgentIndependent"
             }
           },
           "meta" : {
-            "globalKey" : "cfa38dc2"
+            "globalKey" : "5186940a"
           }
         },
         "meta" : {
-          "globalKey" : "cfa38dc2"
+          "globalKey" : "5186940a"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "cf20a269"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "c029c1f"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-EONIA"
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 3672000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 3672000000
-            }
-          } ]
-        }, {
-          "meta" : {
-            "globalKey" : "bf271529"
-          },
-          "price" : [ {
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "price-2"
+                "value" : "quantity-1"
               } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-EONIA"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
             },
+            "meta" : {
+              "globalKey" : "7450e7c1"
+            }
+          },
+          "meta" : {
+            "globalKey" : "ce6bd301"
+          }
+        }, {
+          "price" : [ {
             "value" : {
+              "value" : 0.002,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.002,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-2"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 3672000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 3672000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "25bb8ff7"
+          }
+        } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "eae1821d",
+          "externalReference" : "partyB"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "f735062f",
+          "externalReference" : "partyA"
+        }
+      } ],
+      "ancillaryParty" : [ {
+        "role" : "CalculationAgentIndependent",
+        "partyReference" : [ {
+          "globalReference" : "f735062f",
+          "externalReference" : "partyA"
         } ]
       } ]
     },
-    "tradeDate" : {
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "549300ABANKV6BYQOWM67",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "b04445c0"
+        }
+      } ],
+      "name" : {
+        "value" : "A BANK(\"ABANK\")"
+      },
       "meta" : {
-        "globalKey" : "3f12cf"
+        "globalKey" : "f735062f",
+        "externalKey" : "partyA"
+      }
+    }, {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "529900CPTY57S5UCBB52",
+          "meta" : {
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "971c8d6e"
+        }
+      } ],
+      "name" : {
+        "value" : "SELL SECURITIES CO LTD (\"Counterparty\")"
       },
-      "value" : "2018-11-15"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+      "meta" : {
+        "globalKey" : "eae1821d",
+        "externalKey" : "partyB"
+      }
+    }, {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "123456QQQQ57S5UCBB11",
           "meta" : {
-            "scheme" : "http://www.partyA.com/swaps/trade-id"
-          },
-          "value" : "FpML-test-7"
+            "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+          }
+        },
+        "identifierType" : "LEI",
+        "meta" : {
+          "globalKey" : "d73feaa5"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "partyA",
-        "globalReference" : "3433a6af"
+      "name" : {
+        "value" : "ABC CENTRAL PARTY CLEARING SVC LTD"
       },
       "meta" : {
-        "globalKey" : "74692e1b"
+        "globalKey" : "ab59d979",
+        "externalKey" : "dco"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "859ab9a3"
+    }
+  },
+  "meta" : {
+    "globalKey" : "859ab9a3"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex01-repo-fixed-rate.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex01-repo-fixed-rate.json
index 7d3e337eaa..b1cc7c4ff9 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex01-repo-fixed-rate.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex01-repo-fixed-rate.json
@@ -1,77 +1,83 @@
 {
-  "meta" : {
-    "globalKey" : "420dcf9a"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "420dcf9a"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59557"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59557",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party19235",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 1"
-        },
-        "meta" : {
-          "globalKey" : "33f59557"
+            "scheme" : "http://www.party1.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59558"
+        "globalKey" : "9dae69db"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59558",
+        "externalReference" : "Party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party22000",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 2"
-        },
-        "meta" : {
-          "globalKey" : "33f59558"
+            "scheme" : "http://www.party2.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9db9bf3e"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2013-10-29",
+      "meta" : {
+        "globalKey" : "3eea9d"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59557"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59558"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-10-29",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -80,18 +86,15 @@
                       },
                       "meta" : {
                         "globalKey" : "ec535e95"
-                      },
-                      "unadjustedDate" : "2013-10-29"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec535e95"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "21ad6787"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-11-04",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -100,72 +103,29 @@
                       },
                       "meta" : {
                         "globalKey" : "ec53f0fc"
-                      },
-                      "unadjustedDate" : "2013-11-04"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec53f0fc"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "21ad6787"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
                 "meta" : {
-                  "globalKey" : "965f0f1f"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "c84f9bcd"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "62a30c68"
-              },
               "securityPayout" : [ {
-                "initialMargin" : {
-                  "margin" : [ {
-                    "haircut" : -0.04762
-                  } ],
-                  "marginType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "5edb1da7"
-                },
-                "repoDuration" : "TERM",
                 "securityLeg" : [ {
                   "buyerSeller" : {
-                    "buyer" : "PARTY_1",
-                    "seller" : "PARTY_2"
-                  },
-                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                  "meta" : {
-                    "globalKey" : "24119d6"
-                  },
-                  "settlementAmount" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 1292748.30,
-                    "meta" : {
-                      "globalKey" : "59b83060"
-                    }
+                    "buyer" : "Party1",
+                    "seller" : "Party2"
                   },
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-10-29",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -174,36 +134,35 @@
                       },
                       "meta" : {
                         "globalKey" : "ec535e95"
-                      },
-                      "unadjustedDate" : "2013-10-29"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec535e95"
                     }
-                  }
-                }, {
-                  "buyerSeller" : {
-                    "buyer" : "PARTY_2",
-                    "seller" : "PARTY_1"
-                  },
-                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                  "meta" : {
-                    "externalKey" : "forwardLeg",
-                    "globalKey" : "5c3ebcc4"
                   },
                   "settlementAmount" : {
+                    "value" : 1292748.30,
                     "unit" : {
                       "currency" : {
                         "value" : "USD"
                       }
                     },
-                    "value" : 1292586.71,
                     "meta" : {
-                      "globalKey" : "eaa544d7"
+                      "globalKey" : "59b83060"
                     }
                   },
+                  "deliveryMethod" : "DeliveryVersusPayment",
+                  "meta" : {
+                    "globalKey" : "1f48568c"
+                  }
+                }, {
+                  "buyerSeller" : {
+                    "buyer" : "Party2",
+                    "seller" : "Party1"
+                  },
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-11-04",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -212,34 +171,56 @@
                       },
                       "meta" : {
                         "globalKey" : "ec53f0fc"
-                      },
-                      "unadjustedDate" : "2013-11-04"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec53f0fc"
                     }
+                  },
+                  "settlementAmount" : {
+                    "value" : 1292586.71,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "eaa544d7"
+                    }
+                  },
+                  "deliveryMethod" : "DeliveryVersusPayment",
+                  "meta" : {
+                    "globalKey" : "f650339a",
+                    "externalKey" : "forwardLeg"
                   }
                 } ],
+                "initialMargin" : {
+                  "marginType" : "Cash",
+                  "margin" : [ {
+                    "haircut" : -0.04762
+                  } ]
+                },
+                "repoDuration" : "Term",
                 "securityValuation" : [ {
                   "securityValuationModel" : {
                     "bondValuationModel" : {
-                      "bondPriceAndYieldModel" : {
-                        "cleanOrDirtyPrice" : {
-                          "cleanPrice" : {
-                            "cleanPrice" : 112.334750
-                          }
-                        }
-                      },
                       "nominalAmount" : {
+                        "value" : 1096000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1096000,
                         "meta" : {
                           "globalKey" : "2d3b15b2"
                         }
+                      },
+                      "bondPriceAndYieldModel" : {
+                        "cleanOrDirtyPrice" : {
+                          "cleanPrice" : {
+                            "cleanPrice" : 112.334750
+                          }
+                        }
                       }
                     }
                   },
@@ -251,127 +232,146 @@
                       }
                     } ]
                   }
-                } ]
-              } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "d56c1f6f"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "8d6beb42"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "62a30c68"
+            "globalKey" : "8d6beb42"
           }
         },
         "meta" : {
-          "globalKey" : "62a30c68"
+          "globalKey" : "8d6beb42"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "348f1cbc"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "8145c30a"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "XS"
-                },
-                "meta" : {
-                  "globalKey" : "8145c30a"
-                },
-                "source" : "ISIN"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : -0.0075,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : -0.0075,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 1292748.30,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "XS",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
+                  }
+                },
+                "source" : "ISIN",
+                "meta" : {
+                  "globalKey" : "8145c30a"
+                }
               },
-              "value" : 1292748.30
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "a7729e36"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "79749468"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59557",
+          "externalReference" : "Party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59558",
+          "externalReference" : "Party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eea9d"
-      },
-      "value" : "2013-10-29"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 1",
           "meta" : {
-            "scheme" : "http://www.party1.com/swaps/trade-id"
-          },
-          "value" : "Party19235"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59557"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59557"
-      },
       "meta" : {
-        "globalKey" : "f58e9891"
+        "globalKey" : "33f59557",
+        "externalKey" : "Party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 2",
           "meta" : {
-            "scheme" : "http://www.party2.com/swaps/trade-id"
-          },
-          "value" : "Party22000"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59558"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party2",
-        "globalReference" : "33f59558"
-      },
       "meta" : {
-        "globalKey" : "1e654896"
+        "globalKey" : "33f59558",
+        "externalKey" : "Party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "e6035446"
+    }
+  },
+  "meta" : {
+    "globalKey" : "e6035446"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex02-repo-open-fixed-rate.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex02-repo-open-fixed-rate.json
index 7c89991515..1145a1c46e 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex02-repo-open-fixed-rate.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex02-repo-open-fixed-rate.json
@@ -1,77 +1,83 @@
 {
-  "meta" : {
-    "globalKey" : "4bc64acc"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "4bc64acc"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59557"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59557",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party19235",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 1"
-        },
-        "meta" : {
-          "globalKey" : "33f59557"
+            "scheme" : "http://www.party1.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59558"
+        "globalKey" : "9dae69db"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59558",
+        "externalReference" : "Party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party22000",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 2"
-        },
-        "meta" : {
-          "globalKey" : "33f59558"
+            "scheme" : "http://www.party2.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9db9bf3e"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-11-19",
+      "meta" : {
+        "globalKey" : "3ef2d3"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59557"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59558"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/ACT.ICMA"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2014-11-03",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -80,8 +86,7 @@
                       },
                       "meta" : {
                         "globalKey" : "ec71f53b"
-                      },
-                      "unadjustedDate" : "2014-11-03"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec71f53b"
@@ -91,63 +96,19 @@
                     "globalKey" : "ec71f53b"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/ACT.ICMA"
-                },
                 "meta" : {
-                  "globalKey" : "327d9d9d"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "ff080c43"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "8b7c4fd4"
-              },
               "securityPayout" : [ {
-                "initialMargin" : {
-                  "margin" : [ {
-                    "marginRatio" : 1.25
-                  } ],
-                  "marginType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "66c17a91"
-                },
                 "securityLeg" : [ {
                   "buyerSeller" : {
-                    "buyer" : "PARTY_1",
-                    "seller" : "PARTY_2"
-                  },
-                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                  "meta" : {
-                    "globalKey" : "36407c5d"
-                  },
-                  "settlementAmount" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 782855.55,
-                    "meta" : {
-                      "globalKey" : "254dbbdf"
-                    }
+                    "buyer" : "Party1",
+                    "seller" : "Party2"
                   },
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2014-11-03",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -156,36 +117,56 @@
                       },
                       "meta" : {
                         "globalKey" : "ec71f53b"
-                      },
-                      "unadjustedDate" : "2014-11-03"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec71f53b"
                     }
+                  },
+                  "settlementAmount" : {
+                    "value" : 782855.55,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "254dbbdf"
+                    }
+                  },
+                  "deliveryMethod" : "DeliveryVersusPayment",
+                  "meta" : {
+                    "globalKey" : "5fb18325"
                   }
                 } ],
+                "initialMargin" : {
+                  "marginType" : "Cash",
+                  "margin" : [ {
+                    "marginRatio" : 1.25
+                  } ]
+                },
                 "securityValuation" : [ {
                   "securityValuationModel" : {
                     "bondValuationModel" : {
-                      "bondPriceAndYieldModel" : {
-                        "cleanOrDirtyPrice" : {
-                          "cleanPrice" : {
-                            "accruals" : 9.250000,
-                            "cleanPrice" : 97.8569437
-                          },
-                          "dirtyPrice" : 107.1069437
-                        }
-                      },
                       "nominalAmount" : {
+                        "value" : 1000000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 1000000,
                         "meta" : {
                           "globalKey" : "48eb1e55"
                         }
+                      },
+                      "bondPriceAndYieldModel" : {
+                        "cleanOrDirtyPrice" : {
+                          "cleanPrice" : {
+                            "cleanPrice" : 97.8569437,
+                            "accruals" : 9.250000
+                          },
+                          "dirtyPrice" : 107.1069437
+                        }
                       }
                     }
                   },
@@ -197,132 +178,151 @@
                       }
                     } ]
                   }
-                } ]
-              } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "d92c1543"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "a0544a20"
+              }
             },
             "terminationProvision" : {
               "cancelableProvision" : {
-                "callingParty" : "AS_DEFINED_IN_MASTER_AGREEMENT"
+                "callingParty" : "AsDefinedInMasterAgreement"
               }
             }
           },
           "meta" : {
-            "globalKey" : "d76c0df0"
+            "globalKey" : "70fc6024"
           }
         },
         "meta" : {
-          "globalKey" : "d76c0df0"
+          "globalKey" : "70fc6024"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "291ea776"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "99578ad3"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "JKL Corp Bond"
-                },
-                "meta" : {
-                  "globalKey" : "99578ad3"
-                },
-                "source" : "ISIN"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.85,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.85,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 782855.55,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "JKL Corp Bond",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
+                  }
+                },
+                "source" : "ISIN",
+                "meta" : {
+                  "globalKey" : "99578ad3"
+                }
               },
-              "value" : 782855.55
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "9199cf8d"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "bd3cc7f0"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59557",
+          "externalReference" : "Party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59558",
+          "externalReference" : "Party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef2d3"
-      },
-      "value" : "2014-11-19"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 1",
           "meta" : {
-            "scheme" : "http://www.party1.com/swaps/trade-id"
-          },
-          "value" : "Party19235"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59557"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59557"
-      },
       "meta" : {
-        "globalKey" : "f58e9891"
+        "globalKey" : "33f59557",
+        "externalKey" : "Party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 2",
           "meta" : {
-            "scheme" : "http://www.party2.com/swaps/trade-id"
-          },
-          "value" : "Party22000"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59558"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party2",
-        "globalReference" : "33f59558"
-      },
       "meta" : {
-        "globalKey" : "1e654896"
+        "globalKey" : "33f59558",
+        "externalKey" : "Party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "6266e3ac"
+    }
+  },
+  "meta" : {
+    "globalKey" : "6266e3ac"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex03-repo-fixed-rate.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex03-repo-fixed-rate.json
index a893086332..4ee26819b9 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex03-repo-fixed-rate.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex03-repo-fixed-rate.json
@@ -1,77 +1,83 @@
 {
-  "meta" : {
-    "globalKey" : "cdd17441"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "cdd17441"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59557"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59557",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party19235",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 1"
-        },
-        "meta" : {
-          "globalKey" : "33f59557"
+            "scheme" : "http://www.party1.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59558"
+        "globalKey" : "9dae69db"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59558",
+        "externalReference" : "Party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party22000",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 2"
-        },
-        "meta" : {
-          "globalKey" : "33f59558"
+            "scheme" : "http://www.party2.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9db9bf3e"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2013-11-03",
+      "meta" : {
+        "globalKey" : "3eeac3"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59557"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59558"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/365.FIXED"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-11-03",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -80,18 +86,15 @@
                       },
                       "meta" : {
                         "globalKey" : "ec53ed3b"
-                      },
-                      "unadjustedDate" : "2013-11-03"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec53ed3b"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "8d1a2727"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-11-10",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -100,72 +103,29 @@
                       },
                       "meta" : {
                         "globalKey" : "ec540782"
-                      },
-                      "unadjustedDate" : "2013-11-10"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec540782"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "8d1a2727"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/365.FIXED"
-                },
                 "meta" : {
-                  "globalKey" : "6d19137f"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "33bc5b6d"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "a6d9d6b3"
-              },
               "securityPayout" : [ {
-                "initialMargin" : {
-                  "margin" : [ {
-                    "marginRatio" : 1.176471
-                  } ],
-                  "marginType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "e5110974"
-                },
-                "repoDuration" : "TERM",
                 "securityLeg" : [ {
                   "buyerSeller" : {
-                    "buyer" : "PARTY_1",
-                    "seller" : "PARTY_2"
-                  },
-                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                  "meta" : {
-                    "globalKey" : "9e927c8e"
-                  },
-                  "settlementAmount" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 8336850.21,
-                    "meta" : {
-                      "globalKey" : "1333990e"
-                    }
+                    "buyer" : "Party1",
+                    "seller" : "Party2"
                   },
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-11-03",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -174,26 +134,35 @@
                       },
                       "meta" : {
                         "globalKey" : "ec53ed3b"
-                      },
-                      "unadjustedDate" : "2013-11-03"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec53ed3b"
                     }
+                  },
+                  "settlementAmount" : {
+                    "value" : 8336850.21,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "1333990e"
+                    }
+                  },
+                  "deliveryMethod" : "DeliveryVersusPayment",
+                  "meta" : {
+                    "globalKey" : "44306854"
                   }
                 }, {
                   "buyerSeller" : {
-                    "buyer" : "PARTY_2",
-                    "seller" : "PARTY_1"
-                  },
-                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                  "meta" : {
-                    "externalKey" : "forwardLeg",
-                    "globalKey" : "88139509"
+                    "buyer" : "Party2",
+                    "seller" : "Party1"
                   },
-                  "settlementCurrency" : "USD",
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-11-10",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -202,35 +171,47 @@
                       },
                       "meta" : {
                         "globalKey" : "ec540782"
-                      },
-                      "unadjustedDate" : "2013-11-10"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec540782"
                     }
+                  },
+                  "settlementCurrency" : "USD",
+                  "deliveryMethod" : "DeliveryVersusPayment",
+                  "meta" : {
+                    "globalKey" : "f5b9a33d",
+                    "externalKey" : "forwardLeg"
                   }
                 } ],
+                "initialMargin" : {
+                  "marginType" : "Cash",
+                  "margin" : [ {
+                    "marginRatio" : 1.176471
+                  } ]
+                },
+                "repoDuration" : "Term",
                 "securityValuation" : [ {
                   "securityValuationModel" : {
                     "bondValuationModel" : {
-                      "bondPriceAndYieldModel" : {
-                        "cleanOrDirtyPrice" : {
-                          "cleanPrice" : {
-                            "accruals" : 5.375000,
-                            "cleanPrice" : 108.9784722
-                          }
-                        }
-                      },
                       "nominalAmount" : {
+                        "value" : 9000000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 9000000,
                         "meta" : {
                           "globalKey" : "eb36a74d"
                         }
+                      },
+                      "bondPriceAndYieldModel" : {
+                        "cleanOrDirtyPrice" : {
+                          "cleanPrice" : {
+                            "cleanPrice" : 108.9784722,
+                            "accruals" : 5.375000
+                          }
+                        }
                       }
                     }
                   },
@@ -242,127 +223,146 @@
                       }
                     } ]
                   }
-                } ]
-              } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "43b204a8"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "bf096955"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "a6d9d6b3"
+            "globalKey" : "bf096955"
           }
         },
         "meta" : {
-          "globalKey" : "a6d9d6b3"
+          "globalKey" : "bf096955"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "a318f3b0"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "8146ea9f"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "OPQ"
-                },
-                "meta" : {
-                  "globalKey" : "8146ea9f"
-                },
-                "source" : "ISIN"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.80,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.80,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 8336850.21,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "OPQ",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
+                  }
+                },
+                "source" : "ISIN",
+                "meta" : {
+                  "globalKey" : "8146ea9f"
+                }
               },
-              "value" : 8336850.21
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "a7966941"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "ea8db12"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59557",
+          "externalReference" : "Party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59558",
+          "externalReference" : "Party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3eeac3"
-      },
-      "value" : "2013-11-03"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 1",
           "meta" : {
-            "scheme" : "http://www.party1.com/swaps/trade-id"
-          },
-          "value" : "Party19235"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59557"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59557"
-      },
       "meta" : {
-        "globalKey" : "f58e9891"
+        "globalKey" : "33f59557",
+        "externalKey" : "Party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 2",
           "meta" : {
-            "scheme" : "http://www.party2.com/swaps/trade-id"
-          },
-          "value" : "Party22000"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59558"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party2",
-        "globalReference" : "33f59558"
-      },
       "meta" : {
-        "globalKey" : "1e654896"
+        "globalKey" : "33f59558",
+        "externalKey" : "Party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "f3c39e63"
+    }
+  },
+  "meta" : {
+    "globalKey" : "f3c39e63"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex04-repo-floating-rate.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex04-repo-floating-rate.json
index 6d515b27cf..050937bccb 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex04-repo-floating-rate.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex04-repo-floating-rate.json
@@ -1,77 +1,89 @@
 {
-  "meta" : {
-    "globalKey" : "61eb0d"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "61eb0d"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59557"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59557",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party19235",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 1"
-        },
-        "meta" : {
-          "globalKey" : "33f59557"
+            "scheme" : "http://www.party1.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59558"
+        "globalKey" : "9dae69db"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59558",
+        "externalReference" : "Party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party22000",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 2"
-        },
-        "meta" : {
-          "globalKey" : "33f59558"
+            "scheme" : "http://www.party2.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9db9bf3e"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-11-19",
+      "meta" : {
+        "globalKey" : "3ef2d3"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59557"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59558"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "rateOption" : {
+                      "address" : {
+                        "scope" : "DOCUMENT",
+                        "value" : "rateOption-1"
+                      }
+                    },
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2012-11-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -80,18 +92,15 @@
                       },
                       "meta" : {
                         "globalKey" : "ec363f53"
-                      },
-                      "unadjustedDate" : "2012-11-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec363f53"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "40c731a0"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-02-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -100,78 +109,29 @@
                       },
                       "meta" : {
                         "globalKey" : "ec4bd513"
-                      },
-                      "unadjustedDate" : "2013-02-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec4bd513"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "40c731a0"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
                 "meta" : {
-                  "globalKey" : "b80e3d80"
-                },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateOption" : {
-                      "address" : {
-                        "scope" : "DOCUMENT",
-                        "value" : "rateOption-1"
-                      }
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "62b17cc0"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "62410f3a"
-              },
               "securityPayout" : [ {
-                "initialMargin" : {
-                  "margin" : [ {
-                    "marginRatio" : 1.2152
-                  } ],
-                  "marginType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "687911ba"
-                },
-                "repoDuration" : "TERM",
                 "securityLeg" : [ {
                   "buyerSeller" : {
-                    "buyer" : "PARTY_1",
-                    "seller" : "PARTY_2"
-                  },
-                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                  "meta" : {
-                    "globalKey" : "de62bc82"
-                  },
-                  "settlementAmount" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "USD"
-                      }
-                    },
-                    "value" : 4000000,
-                    "meta" : {
-                      "globalKey" : "25c771b2"
-                    }
+                    "buyer" : "Party1",
+                    "seller" : "Party2"
                   },
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2012-11-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -180,26 +140,35 @@
                       },
                       "meta" : {
                         "globalKey" : "ec363f53"
-                      },
-                      "unadjustedDate" : "2012-11-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec363f53"
                     }
+                  },
+                  "settlementAmount" : {
+                    "value" : 4000000,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "USD"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "25c771b2"
+                    }
+                  },
+                  "deliveryMethod" : "DeliveryVersusPayment",
+                  "meta" : {
+                    "globalKey" : "a797de0"
                   }
                 }, {
                   "buyerSeller" : {
-                    "buyer" : "PARTY_2",
-                    "seller" : "PARTY_1"
-                  },
-                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                  "meta" : {
-                    "externalKey" : "forwardLeg",
-                    "globalKey" : "880b629a"
+                    "buyer" : "Party2",
+                    "seller" : "Party1"
                   },
-                  "settlementCurrency" : "USD",
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2013-02-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -208,32 +177,44 @@
                       },
                       "meta" : {
                         "globalKey" : "ec4bd513"
-                      },
-                      "unadjustedDate" : "2013-02-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec4bd513"
                     }
+                  },
+                  "settlementCurrency" : "USD",
+                  "deliveryMethod" : "DeliveryVersusPayment",
+                  "meta" : {
+                    "globalKey" : "f5b170ce",
+                    "externalKey" : "forwardLeg"
                   }
                 } ],
+                "initialMargin" : {
+                  "marginType" : "Cash",
+                  "margin" : [ {
+                    "marginRatio" : 1.2152
+                  } ]
+                },
+                "repoDuration" : "Term",
                 "securityValuation" : [ {
                   "securityValuationModel" : {
                     "bondValuationModel" : {
-                      "bondPriceAndYieldModel" : {
-                        "cleanOrDirtyPrice" : {
-                          "dirtyPrice" : 1.00886
-                        }
-                      },
                       "nominalAmount" : {
+                        "value" : 150000000,
                         "unit" : {
                           "currency" : {
                             "value" : "RUB"
                           }
                         },
-                        "value" : 150000000,
                         "meta" : {
                           "globalKey" : "a0fb4b53"
                         }
+                      },
+                      "bondPriceAndYieldModel" : {
+                        "cleanOrDirtyPrice" : {
+                          "dirtyPrice" : 1.00886
+                        }
                       }
                     }
                   },
@@ -245,148 +226,167 @@
                       }
                     } ]
                   }
-                } ]
-              } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "629f2300"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "16987fc0"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "62410f3a"
+            "globalKey" : "16987fc0"
           }
         },
         "meta" : {
-          "globalKey" : "62410f3a"
+          "globalKey" : "16987fc0"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "b870fd8d"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "7587ac42"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "KLM"
-                },
-                "meta" : {
-                  "globalKey" : "8146db1b"
-                },
-                "source" : "ISIN"
-              }
-            } ],
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "USD-LIBOR-BBA-Bloomberg"
-                },
-                "indexTenor" : {
-                  "meta" : {
-                    "globalKey" : "954"
-                  },
-                  "period" : "M",
-                  "periodMultiplier" : 1
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.0050,
               "unit" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "value" : 0.0050,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "USD"
                 }
               },
-              "priceType" : "INTEREST_RATE"
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "price-1"
+              } ]
             }
           } ],
           "quantity" : [ {
+            "value" : {
+              "value" : 4000000,
+              "unit" : {
+                "currency" : {
+                  "value" : "USD"
+                }
+              }
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
                 "value" : "quantity-1"
               } ]
+            }
+          } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "USD-LIBOR-BBA-Bloomberg"
+                },
+                "indexTenor" : {
+                  "periodMultiplier" : 1,
+                  "period" : "M",
+                  "meta" : {
+                    "globalKey" : "6c"
+                  }
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
             },
-            "value" : {
-              "unit" : {
-                "currency" : {
-                  "value" : "USD"
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "KLM",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
+                  }
+                },
+                "source" : "ISIN",
+                "meta" : {
+                  "globalKey" : "8146db1b"
                 }
               },
-              "value" : 4000000
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "83bf2026"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "4eb0cb0d"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59557",
+          "externalReference" : "Party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59558",
+          "externalReference" : "Party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef2d3"
-      },
-      "value" : "2014-11-19"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 1",
           "meta" : {
-            "scheme" : "http://www.party1.com/swaps/trade-id"
-          },
-          "value" : "Party19235"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59557"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59557"
-      },
       "meta" : {
-        "globalKey" : "f58e9891"
+        "globalKey" : "33f59557",
+        "externalKey" : "Party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 2",
           "meta" : {
-            "scheme" : "http://www.party2.com/swaps/trade-id"
-          },
-          "value" : "Party22000"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59558"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party2",
-        "globalReference" : "33f59558"
-      },
       "meta" : {
-        "globalKey" : "1e654896"
+        "globalKey" : "33f59558",
+        "externalKey" : "Party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "6ec7aaad"
+    }
+  },
+  "meta" : {
+    "globalKey" : "6ec7aaad"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex05-repo-fixed-rate.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex05-repo-fixed-rate.json
index c5c5aa3750..1127ba96cf 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex05-repo-fixed-rate.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex05-repo-fixed-rate.json
@@ -1,77 +1,83 @@
 {
-  "meta" : {
-    "globalKey" : "54a08f12"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "54a08f12"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59557"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59557",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party19235",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 1"
-        },
-        "meta" : {
-          "globalKey" : "33f59557"
+            "scheme" : "http://www.party1.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59558"
+        "globalKey" : "9dae69db"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59558",
+        "externalReference" : "Party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party22000",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 2"
-        },
-        "meta" : {
-          "globalKey" : "33f59558"
+            "scheme" : "http://www.party2.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9db9bf3e"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-11-20",
+      "meta" : {
+        "globalKey" : "3ef2d4"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59557"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59558"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/ACT.ICMA"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2014-11-20",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -80,18 +86,15 @@
                       },
                       "meta" : {
                         "globalKey" : "ec72350c"
-                      },
-                      "unadjustedDate" : "2014-11-20"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec72350c"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "7c9361c7"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2014-11-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -100,72 +103,29 @@
                       },
                       "meta" : {
                         "globalKey" : "ec724f53"
-                      },
-                      "unadjustedDate" : "2014-11-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec724f53"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "7c9361c7"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/ACT.ICMA"
-                },
                 "meta" : {
-                  "globalKey" : "c9462891"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "e4da6fbf"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "3a28302f"
-              },
               "securityPayout" : [ {
-                "initialMargin" : {
-                  "margin" : [ {
-                    "haircut" : 0.12
-                  } ],
-                  "marginType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "13a240a0"
-                },
-                "repoDuration" : "TERM",
                 "securityLeg" : [ {
                   "buyerSeller" : {
-                    "buyer" : "PARTY_1",
-                    "seller" : "PARTY_2"
-                  },
-                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                  "meta" : {
-                    "globalKey" : "44c32960"
-                  },
-                  "settlementAmount" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "RUB"
-                      }
-                    },
-                    "value" : 444176424.53,
-                    "meta" : {
-                      "globalKey" : "a04576d"
-                    }
+                    "buyer" : "Party1",
+                    "seller" : "Party2"
                   },
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2014-11-20",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -174,36 +134,35 @@
                       },
                       "meta" : {
                         "globalKey" : "ec72350c"
-                      },
-                      "unadjustedDate" : "2014-11-20"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec72350c"
                     }
-                  }
-                }, {
-                  "buyerSeller" : {
-                    "buyer" : "PARTY_2",
-                    "seller" : "PARTY_1"
-                  },
-                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                  "meta" : {
-                    "externalKey" : "forwardLeg",
-                    "globalKey" : "70366d4b"
                   },
                   "settlementAmount" : {
+                    "value" : 444176424.53,
                     "unit" : {
                       "currency" : {
                         "value" : "RUB"
                       }
                     },
-                    "value" : 445117713.45,
                     "meta" : {
-                      "globalKey" : "8f6d54a7"
+                      "globalKey" : "a04576d"
                     }
                   },
+                  "deliveryMethod" : "DeliveryVersusPayment",
+                  "meta" : {
+                    "globalKey" : "2a5c1982"
+                  }
+                }, {
+                  "buyerSeller" : {
+                    "buyer" : "Party2",
+                    "seller" : "Party1"
+                  },
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2014-11-27",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -212,34 +171,56 @@
                       },
                       "meta" : {
                         "globalKey" : "ec724f53"
-                      },
-                      "unadjustedDate" : "2014-11-27"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec724f53"
                     }
+                  },
+                  "settlementAmount" : {
+                    "value" : 445117713.45,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "RUB"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "8f6d54a7"
+                    }
+                  },
+                  "deliveryMethod" : "DeliveryVersusPayment",
+                  "meta" : {
+                    "globalKey" : "f9ba4373",
+                    "externalKey" : "forwardLeg"
                   }
                 } ],
+                "initialMargin" : {
+                  "marginType" : "Cash",
+                  "margin" : [ {
+                    "haircut" : 0.12
+                  } ]
+                },
+                "repoDuration" : "Term",
                 "securityValuation" : [ {
                   "securityValuationModel" : {
                     "bondValuationModel" : {
-                      "bondPriceAndYieldModel" : {
-                        "cleanOrDirtyPrice" : {
-                          "cleanPrice" : {
-                            "cleanPrice" : 97.22
-                          }
-                        }
-                      },
                       "nominalAmount" : {
+                        "value" : 10500000,
                         "unit" : {
                           "currency" : {
                             "value" : "CHF"
                           }
                         },
-                        "value" : 10500000,
                         "meta" : {
                           "globalKey" : "b9bdca47"
                         }
+                      },
+                      "bondPriceAndYieldModel" : {
+                        "cleanOrDirtyPrice" : {
+                          "cleanPrice" : {
+                            "cleanPrice" : 97.22
+                          }
+                        }
                       }
                     }
                   },
@@ -251,127 +232,146 @@
                       }
                     } ]
                   }
-                } ]
-              } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "90788876"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "7f78ea97"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "3a28302f"
+            "globalKey" : "7f78ea97"
           }
         },
         "meta" : {
-          "globalKey" : "3a28302f"
+          "globalKey" : "7f78ea97"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "6591985b"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "8145c074"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "CH"
-                },
-                "meta" : {
-                  "globalKey" : "8145c074"
-                },
-                "source" : "ISIN"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.1105,
               "unit" : {
                 "currency" : {
                   "value" : "RUB"
                 }
               },
-              "value" : 0.1105,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "RUB"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 444176424.53,
               "unit" : {
                 "currency" : {
                   "value" : "RUB"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "CH",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
+                  }
+                },
+                "source" : "ISIN",
+                "meta" : {
+                  "globalKey" : "8145c074"
+                }
               },
-              "value" : 444176424.53
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "a7724e0c"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "b7ee03f3"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59557",
+          "externalReference" : "Party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59558",
+          "externalReference" : "Party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef2d4"
-      },
-      "value" : "2014-11-20"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 1",
           "meta" : {
-            "scheme" : "http://www.party1.com/swaps/trade-id"
-          },
-          "value" : "Party19235"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59557"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59557"
-      },
       "meta" : {
-        "globalKey" : "f58e9891"
+        "globalKey" : "33f59557",
+        "externalKey" : "Party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 2",
           "meta" : {
-            "scheme" : "http://www.party2.com/swaps/trade-id"
-          },
-          "value" : "Party22000"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59558"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party2",
-        "globalReference" : "33f59558"
-      },
       "meta" : {
-        "globalKey" : "1e654896"
+        "globalKey" : "33f59558",
+        "externalKey" : "Party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "79e2eb5c"
+    }
+  },
+  "meta" : {
+    "globalKey" : "79e2eb5c"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex06-repo-fixed-rate.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex06-repo-fixed-rate.json
index 7ad8d4b13e..686b710077 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex06-repo-fixed-rate.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/repo-ex06-repo-fixed-rate.json
@@ -1,77 +1,83 @@
 {
-  "meta" : {
-    "globalKey" : "faf869c4"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "faf869c4"
-    },
-    "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "33f59557"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "33f59557",
+        "externalReference" : "Party1"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party19235",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 1"
-        },
-        "meta" : {
-          "globalKey" : "33f59557"
+            "scheme" : "http://www.party1.com/swaps/trade-id"
+          }
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "33f59558"
+        "globalKey" : "9dae69db"
+      }
+    }, {
+      "issuerReference" : {
+        "globalReference" : "33f59558",
+        "externalReference" : "Party2"
       },
-      "partyId" : [ {
+      "assignedIdentifier" : [ {
         "identifier" : {
+          "value" : "Party22000",
           "meta" : {
-            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
-          },
-          "value" : "Party 2"
-        },
-        "meta" : {
-          "globalKey" : "33f59558"
+            "scheme" : "http://www.party2.com/swaps/trade-id"
+          }
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "9db9bf3e"
+      }
     } ],
+    "tradeDate" : {
+      "value" : "2014-11-19",
+      "meta" : {
+        "globalKey" : "3ef2d3"
+      }
+    },
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "externalReference" : "Party1",
-          "globalReference" : "33f59557"
-        },
-        "role" : "PARTY_1"
-      }, {
-        "partyReference" : {
-          "externalReference" : "Party2",
-          "globalReference" : "33f59558"
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "economicTerms" : {
             "payout" : {
               "interestRatePayout" : [ {
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
+                  }
+                },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
                   }
                 },
+                "dayCountFraction" : {
+                  "value" : "ACT/360"
+                },
                 "calculationPeriodDates" : {
                   "effectiveDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2014-11-19",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -80,18 +86,15 @@
                       },
                       "meta" : {
                         "globalKey" : "ec72314b"
-                      },
-                      "unadjustedDate" : "2014-11-19"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec72314b"
                     }
                   },
-                  "meta" : {
-                    "globalKey" : "14b23127"
-                  },
                   "terminationDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2014-11-26",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -100,72 +103,29 @@
                       },
                       "meta" : {
                         "globalKey" : "ec724b92"
-                      },
-                      "unadjustedDate" : "2014-11-26"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec724b92"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "14b23127"
                   }
                 },
-                "dayCountFraction" : {
-                  "value" : "ACT/360"
-                },
                 "meta" : {
-                  "globalKey" : "d088da59"
-                },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                  "globalKey" : "369c7c47"
                 }
               } ],
-              "meta" : {
-                "globalKey" : "92851c43"
-              },
               "securityPayout" : [ {
-                "initialMargin" : {
-                  "margin" : [ {
-                    "haircut" : 0.12
-                  } ],
-                  "marginType" : "CASH"
-                },
-                "meta" : {
-                  "globalKey" : "a69bf57c"
-                },
-                "repoDuration" : "TERM",
                 "securityLeg" : [ {
                   "buyerSeller" : {
-                    "buyer" : "PARTY_1",
-                    "seller" : "PARTY_2"
-                  },
-                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                  "meta" : {
-                    "globalKey" : "b57b5ba8"
-                  },
-                  "settlementAmount" : {
-                    "unit" : {
-                      "currency" : {
-                        "value" : "RUB"
-                      }
-                    },
-                    "value" : 120079973.70,
-                    "meta" : {
-                      "globalKey" : "8482bfc4"
-                    }
+                    "buyer" : "Party1",
+                    "seller" : "Party2"
                   },
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2014-11-19",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -174,36 +134,35 @@
                       },
                       "meta" : {
                         "globalKey" : "ec72314b"
-                      },
-                      "unadjustedDate" : "2014-11-19"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec72314b"
                     }
-                  }
-                }, {
-                  "buyerSeller" : {
-                    "buyer" : "PARTY_2",
-                    "seller" : "PARTY_1"
-                  },
-                  "deliveryMethod" : "DELIVERY_VERSUS_PAYMENT",
-                  "meta" : {
-                    "externalKey" : "forwardLeg",
-                    "globalKey" : "a92d3ccc"
                   },
                   "settlementAmount" : {
+                    "value" : 120079973.70,
                     "unit" : {
                       "currency" : {
                         "value" : "RUB"
                       }
                     },
-                    "value" : 120320934.26,
                     "meta" : {
-                      "globalKey" : "38ec0025"
+                      "globalKey" : "8482bfc4"
                     }
                   },
+                  "deliveryMethod" : "DeliveryVersusPayment",
+                  "meta" : {
+                    "globalKey" : "3cf954fa"
+                  }
+                }, {
+                  "buyerSeller" : {
+                    "buyer" : "Party2",
+                    "seller" : "Party1"
+                  },
                   "settlementDate" : {
                     "adjustableDate" : {
+                      "unadjustedDate" : "2014-11-26",
                       "dateAdjustments" : {
                         "businessDayConvention" : "NONE",
                         "meta" : {
@@ -212,34 +171,56 @@
                       },
                       "meta" : {
                         "globalKey" : "ec724b92"
-                      },
-                      "unadjustedDate" : "2014-11-26"
+                      }
                     },
                     "meta" : {
                       "globalKey" : "ec724b92"
                     }
+                  },
+                  "settlementAmount" : {
+                    "value" : 120320934.26,
+                    "unit" : {
+                      "currency" : {
+                        "value" : "RUB"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "38ec0025"
+                    }
+                  },
+                  "deliveryMethod" : "DeliveryVersusPayment",
+                  "meta" : {
+                    "globalKey" : "3b57c212",
+                    "externalKey" : "forwardLeg"
                   }
                 } ],
+                "initialMargin" : {
+                  "marginType" : "Cash",
+                  "margin" : [ {
+                    "haircut" : 0.12
+                  } ]
+                },
+                "repoDuration" : "Term",
                 "securityValuation" : [ {
                   "securityValuationModel" : {
                     "bondValuationModel" : {
-                      "bondPriceAndYieldModel" : {
-                        "cleanOrDirtyPrice" : {
-                          "cleanPrice" : {
-                            "cleanPrice" : 96.981
-                          }
-                        }
-                      },
                       "nominalAmount" : {
+                        "value" : 3000000,
                         "unit" : {
                           "currency" : {
                             "value" : "USD"
                           }
                         },
-                        "value" : 3000000,
                         "meta" : {
                           "globalKey" : "317e0093"
                         }
+                      },
+                      "bondPriceAndYieldModel" : {
+                        "cleanOrDirtyPrice" : {
+                          "cleanPrice" : {
+                            "cleanPrice" : 96.981
+                          }
+                        }
                       }
                     }
                   },
@@ -251,127 +232,146 @@
                       }
                     } ]
                   }
-                } ]
-              } ]
+                } ],
+                "meta" : {
+                  "globalKey" : "98c85502"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "90306b9b"
+              }
             }
           },
           "meta" : {
-            "globalKey" : "92851c43"
+            "globalKey" : "90306b9b"
           }
         },
         "meta" : {
-          "globalKey" : "92851c43"
+          "globalKey" : "90306b9b"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "fd2246a1"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "8145c30a"
-            },
-            "productIdentifier" : [ {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "productIdentifier-1"
-                } ]
-              },
-              "value" : {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
-                  },
-                  "value" : "XS"
-                },
-                "meta" : {
-                  "globalKey" : "8145c30a"
-                },
-                "source" : "ISIN"
-              }
-            } ]
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.1032,
               "unit" : {
                 "currency" : {
                   "value" : "RUB"
                 }
               },
-              "value" : 0.1032,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "RUB"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 120079973.70,
               "unit" : {
                 "currency" : {
                   "value" : "RUB"
                 }
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
+            }
+          } ],
+          "observable" : {
+            "productIdentifier" : [ {
+              "value" : {
+                "identifier" : {
+                  "value" : "XS",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/instrument-id-ISIN-1-0"
+                  }
+                },
+                "source" : "ISIN",
+                "meta" : {
+                  "globalKey" : "8145c30a"
+                }
               },
-              "value" : 120079973.70
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "productIdentifier-1"
+                } ]
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "a7729e36"
             }
-          } ]
+          },
+          "meta" : {
+            "globalKey" : "9606094d"
+          }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party1",
+        "partyReference" : {
+          "globalReference" : "33f59557",
+          "externalReference" : "Party1"
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "globalReference" : "33f59558",
+          "externalReference" : "Party2"
+        }
       } ]
     },
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3ef2d3"
-      },
-      "value" : "2014-11-19"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
+    "party" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 1",
           "meta" : {
-            "scheme" : "http://www.party1.com/swaps/trade-id"
-          },
-          "value" : "Party19235"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59557"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "33f59557"
-      },
       "meta" : {
-        "globalKey" : "f58e9891"
+        "globalKey" : "33f59557",
+        "externalKey" : "Party1"
       }
     }, {
-      "assignedIdentifier" : [ {
+      "partyId" : [ {
         "identifier" : {
+          "value" : "Party 2",
           "meta" : {
-            "scheme" : "http://www.party2.com/swaps/trade-id"
-          },
-          "value" : "Party22000"
+            "scheme" : "http://www.fpml.org/coding-scheme/dummy-party-id"
+          }
+        },
+        "meta" : {
+          "globalKey" : "33f59558"
         }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party2",
-        "globalReference" : "33f59558"
-      },
       "meta" : {
-        "globalKey" : "1e654896"
+        "globalKey" : "33f59558",
+        "externalKey" : "Party2"
       }
-    } ]
+    } ],
+    "meta" : {
+      "globalKey" : "44bc8132"
+    }
+  },
+  "meta" : {
+    "globalKey" : "44bc8132"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/sbl-ex01-term-egrn-cash.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/sbl-ex01-term-egrn-cash.json
index dbee75af2e..b17ed7c3e0 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/sbl-ex01-term-egrn-cash.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/sbl-ex01-term-egrn-cash.json
@@ -1,159 +1,159 @@
 {
-  "meta" : {
-    "globalKey" : "cb0c640f"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "GMSLA"
-            }
-          },
-          "vintage" : 2010
-        },
-        "meta" : {
-          "globalKey" : "a319da49"
-        }
-      }, {
-        "agreementDate" : "2019-02-07",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CREDIT_SUPPORT_AGREEMENT"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "68dff0f1",
+        "externalReference" : "Party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "942800839",
+          "meta" : {
+            "scheme" : "http://www.abc.com/coding-scheme/trade-id"
           }
         },
-        "meta" : {
-          "globalKey" : "a6f53bad"
-        }
+        "version" : 1
       } ],
       "meta" : {
-        "globalKey" : "1996c976"
+        "globalKey" : "64e30109"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2019-02-07",
+      "meta" : {
+        "globalKey" : "3f1887"
       }
-    },
-    "meta" : {
-      "globalKey" : "cb0c640f"
     },
     "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "68dff0f1"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "12345",
           "meta" : {
             "scheme" : "www.abc.com"
-          },
-          "value" : "12345"
+          }
         },
         "meta" : {
           "globalKey" : "2ca0033"
         }
       } ],
       "person" : [ {
-        "meta" : {
-          "externalKey" : "Person1",
-          "globalKey" : "910e0084"
-        },
         "personId" : [ {
           "value" : {
             "identifier" : {
+              "value" : "12345678",
               "meta" : {
                 "scheme" : "www.abc.com"
-              },
-              "value" : "12345678"
+              }
             },
             "meta" : {
               "globalKey" : "910e0084"
             }
           }
-        } ]
-      } ]
-    }, {
+        } ],
+        "meta" : {
+          "globalKey" : "910e0084",
+          "externalKey" : "Person1"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "56760663"
-      },
+        "globalKey" : "68dff0f1",
+        "externalKey" : "Party1"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "123456",
           "meta" : {
             "scheme" : "www.abc.com"
-          },
-          "value" : "123456"
+          }
         },
         "meta" : {
           "globalKey" : "56760663"
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "Triparty",
-        "globalKey" : "187102"
-      },
+        "globalKey" : "56760663",
+        "externalKey" : "Party2"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "4567",
           "meta" : {
             "scheme" : "www.abc.com"
-          },
-          "value" : "4567"
+          }
         },
         "meta" : {
           "globalKey" : "187102"
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "BondIssuer",
-        "globalKey" : "aa6ed529"
-      },
+        "globalKey" : "187102",
+        "externalKey" : "Triparty"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "LEI-BONDISSUER",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "LEI-BONDISSUER"
+          }
         },
         "identifierType" : "LEI",
         "meta" : {
           "globalKey" : "aa6ed529"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "aa6ed529",
+        "externalKey" : "BondIssuer"
+      }
     } ],
     "partyRole" : [ {
-      "ownershipPartyReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "68dff0f1"
-      },
       "partyReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "68dff0f1"
+        "globalReference" : "68dff0f1",
+        "externalReference" : "Party1"
       },
-      "role" : "REPORTING_PARTY"
+      "role" : "ReportingParty",
+      "ownershipPartyReference" : {
+        "globalReference" : "68dff0f1",
+        "externalReference" : "Party1"
+      }
     } ],
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3f1887"
-      },
-      "value" : "2019-02-07"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.abc.com/coding-scheme/trade-id"
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "GMSLA"
+            }
           },
-          "value" : "942800839"
+          "vintage" : 2010
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "a319da49"
+        }
+      }, {
+        "agreementDate" : "2019-02-07",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "CreditSupportAgreement"
+          }
+        },
+        "meta" : {
+          "globalKey" : "a6f53bad"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "68dff0f1"
-      },
       "meta" : {
-        "globalKey" : "42d56f09"
+        "globalKey" : "1996c976"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "8aff4c89"
+    }
+  },
+  "meta" : {
+    "globalKey" : "8aff4c89"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/sbl-ex02-term-fx-rate-non-cash.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/sbl-ex02-term-fx-rate-non-cash.json
index de814c9aaa..7604796fb3 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/sbl-ex02-term-fx-rate-non-cash.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/repo/sbl-ex02-term-fx-rate-non-cash.json
@@ -1,63 +1,36 @@
 {
-  "meta" : {
-    "globalKey" : "db4a493c"
-  },
   "trade" : {
-    "contractDetails" : {
-      "documentation" : [ {
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "MASTER_AGREEMENT",
-            "masterAgreementType" : {
-              "value" : "GMSLA"
-            }
-          },
-          "vintage" : 2010
-        },
-        "meta" : {
-          "globalKey" : "a319da49"
-        }
-      }, {
-        "agreementDate" : "2019-02-07",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "CREDIT_SUPPORT_AGREEMENT"
+    "tradeIdentifier" : [ {
+      "issuerReference" : {
+        "globalReference" : "b0c41186",
+        "externalReference" : "Party1"
+      },
+      "assignedIdentifier" : [ {
+        "identifier" : {
+          "value" : "9999999",
+          "meta" : {
+            "scheme" : "http://www.abc.com/coding-scheme/trade-id"
           }
         },
-        "meta" : {
-          "globalKey" : "a6f53bad"
-        }
-      }, {
-        "agreementDate" : "2019-02-07",
-        "legalAgreementIdentification" : {
-          "agreementName" : {
-            "agreementType" : "OTHER",
-            "otherAgreement" : "GeneralClearingAgreement"
-          },
-          "vintage" : 2018
-        },
-        "meta" : {
-          "globalKey" : "4c2a5af4"
-        }
+        "version" : 1
       } ],
       "meta" : {
-        "globalKey" : "83e5b3ea"
+        "globalKey" : "bc6c9345"
+      }
+    } ],
+    "tradeDate" : {
+      "value" : "2019-02-07",
+      "meta" : {
+        "globalKey" : "3f1887"
       }
-    },
-    "meta" : {
-      "globalKey" : "db4a493c"
     },
     "party" : [ {
-      "meta" : {
-        "externalKey" : "Party1",
-        "globalKey" : "b0c41186"
-      },
       "partyId" : [ {
         "identifier" : {
+          "value" : "PARTY1-LEI",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "PARTY1-LEI"
+          }
         },
         "identifierType" : "LEI",
         "meta" : {
@@ -65,93 +38,120 @@
         }
       } ],
       "person" : [ {
-        "meta" : {
-          "externalKey" : "Person1",
-          "globalKey" : "910e0084"
-        },
         "personId" : [ {
           "value" : {
             "identifier" : {
+              "value" : "12345678",
               "meta" : {
                 "scheme" : "www.abc.com"
-              },
-              "value" : "12345678"
+              }
             },
             "meta" : {
               "globalKey" : "910e0084"
             }
           }
-        } ]
-      } ]
-    }, {
+        } ],
+        "meta" : {
+          "globalKey" : "910e0084",
+          "externalKey" : "Person1"
+        }
+      } ],
       "meta" : {
-        "externalKey" : "Party2",
-        "globalKey" : "3d0444bf"
-      },
+        "globalKey" : "b0c41186",
+        "externalKey" : "Party1"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "PARTY2-LEI",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "PARTY2-LEI"
+          }
         },
         "identifierType" : "LEI",
         "meta" : {
           "globalKey" : "3d0444bf"
         }
-      } ]
-    }, {
+      } ],
       "meta" : {
-        "externalKey" : "BondIssuer",
-        "globalKey" : "32b841cf"
-      },
+        "globalKey" : "3d0444bf",
+        "externalKey" : "Party2"
+      }
+    }, {
       "partyId" : [ {
         "identifier" : {
+          "value" : "BONDISSUER-LEI",
           "meta" : {
             "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-          },
-          "value" : "BONDISSUER-LEI"
+          }
         },
         "identifierType" : "LEI",
         "meta" : {
           "globalKey" : "32b841cf"
         }
-      } ]
+      } ],
+      "meta" : {
+        "globalKey" : "32b841cf",
+        "externalKey" : "BondIssuer"
+      }
     } ],
     "partyRole" : [ {
-      "ownershipPartyReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "b0c41186"
-      },
       "partyReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "b0c41186"
+        "globalReference" : "b0c41186",
+        "externalReference" : "Party1"
       },
-      "role" : "REPORTING_PARTY"
+      "role" : "ReportingParty",
+      "ownershipPartyReference" : {
+        "globalReference" : "b0c41186",
+        "externalReference" : "Party1"
+      }
     } ],
-    "tradeDate" : {
-      "meta" : {
-        "globalKey" : "3f1887"
-      },
-      "value" : "2019-02-07"
-    },
-    "tradeIdentifier" : [ {
-      "assignedIdentifier" : [ {
-        "identifier" : {
-          "meta" : {
-            "scheme" : "http://www.abc.com/coding-scheme/trade-id"
+    "contractDetails" : {
+      "documentation" : [ {
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "MasterAgreement",
+            "masterAgreementType" : {
+              "value" : "GMSLA"
+            }
           },
-          "value" : "9999999"
+          "vintage" : 2010
         },
-        "version" : 1
+        "meta" : {
+          "globalKey" : "a319da49"
+        }
+      }, {
+        "agreementDate" : "2019-02-07",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "CreditSupportAgreement"
+          }
+        },
+        "meta" : {
+          "globalKey" : "a6f53bad"
+        }
+      }, {
+        "agreementDate" : "2019-02-07",
+        "legalAgreementIdentification" : {
+          "agreementName" : {
+            "agreementType" : "Other",
+            "otherAgreement" : "GeneralClearingAgreement"
+          },
+          "vintage" : 2018
+        },
+        "meta" : {
+          "globalKey" : "4c2a5af4"
+        }
       } ],
-      "issuerReference" : {
-        "externalReference" : "Party1",
-        "globalReference" : "b0c41186"
-      },
       "meta" : {
-        "globalKey" : "de436245"
+        "globalKey" : "83e5b3ea"
       }
-    } ]
+    },
+    "meta" : {
+      "globalKey" : "1858b3ae"
+    }
+  },
+  "meta" : {
+    "globalKey" : "1858b3ae"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-01-Submission-1.json b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-01-Submission-1.json
index eab777cd39..a927d702fa 100644
--- a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-01-Submission-1.json
+++ b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-01-Submission-1.json
@@ -1,187 +1,51 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "SEF123"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "918f217e"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.sef.com/msg_id"
-      },
-      "value" : "SEF123"
-    },
-    "sentBy" : {
-      "value" : "SEFCORP"
-    },
-    "sentTo" : [ {
-      "value" : "SDR01"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "8f1d44ee"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "8f84382e"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "8f84382e"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "d5d99dff"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI1RPT0001"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "b8962566"
-                }
-              } ],
-              "person" : [ {
-                "firstName" : "jjone",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "b793baa7"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "jjones"
-                    },
-                    "meta" : {
-                      "globalKey" : "baeb8c0d"
-                    }
-                  }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "ee963b6"
-              },
-              "name" : {
-                "value" : "Bank Y"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI2CP0002"
-                },
-                "identifierType" : "LEI",
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "LEI1RPT0001",
                 "meta" : {
-                  "globalKey" : "eb8edea1"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
               },
-              "name" : {
-                "value" : "Up&Atem"
-              },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "LEI1RPT0001AAAA",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
-                }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "d5d99dff"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing-svc",
-                "globalReference" : "611719a0"
+                "globalKey" : "7a433778"
               },
-              "role" : "CLEARING_ORGANIZATION"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2018-04-01",
+              "meta" : {
+                "globalKey" : "3f1101"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "d5d99dff"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "ee963b6"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
                     "primaryAssetClass" : {
-                      "value" : "INTEREST_RATE"
+                      "value" : "InterestRate"
                     }
                   }, {
                     "source" : "ISDA",
                     "value" : {
                       "name" : {
+                        "value" : "InterestRate:IRSwap:FixedFloat",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                        },
-                        "value" : "InterestRate:IRSwap:FixedFloat"
+                        }
                       }
                     }
                   }, {
@@ -192,46 +56,40 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "eb13047c"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "214e084d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d23"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "8"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-03",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -240,103 +98,108 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3837b"
-                              },
-                              "unadjustedDate" : "2018-04-03"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "c7a104bd"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2026-02-08",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "primaryBusinessCenters",
-                                    "globalKey" : "27e4e9"
+                                    "globalKey" : "27e4e9",
+                                    "externalKey" : "primaryBusinessCenters"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "3662e8ba"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "f148ad32"
-                              },
-                              "unadjustedDate" : "2026-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "f148ad32"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "715e1cad"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4fa45fc3"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "956"
+                              "globalKey" : "204f"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                            "rollConvention" : "8"
+                          },
+                          "meta" : {
+                            "globalKey" : "c513c70f",
+                            "externalKey" : "floatingCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "eb13047c"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "214e084d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "db523fbd"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "c7a104bd"
+                            "globalReference" : "c513c70f",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "2fdb52a7"
+                              "globalKey" : "cb73d5b"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -345,82 +208,79 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "resetDates1",
-                              "globalReference" : "73eafb4c"
+                              "globalReference" : "9f08d1fa",
+                              "externalReference" : "resetDates1"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "resetDates1",
-                            "globalKey" : "73eafb4c"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "meta" : {
+                            "globalKey" : "9f08d1fa",
+                            "externalKey" : "resetDates1"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "f3419ba7"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "eb13047c"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "214e084d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d80"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "8"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30E/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-03",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -429,247 +289,387 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3837b"
-                              },
-                              "unadjustedDate" : "2018-04-03"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "c01e6313"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2026-02-08",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "primaryBusinessCenters",
-                                    "globalReference" : "27e4e9"
+                                    "globalReference" : "27e4e9",
+                                    "externalReference" : "primaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "eb13047c"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "214e084d"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "dc33ccc5"
-                              },
-                              "unadjustedDate" : "2026-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "dc33ccc5"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "30E/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "7e4c86b1"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4fa45fc6"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "959"
+                              "globalKey" : "2b92"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 6
+                            "rollConvention" : "8"
+                          },
+                          "meta" : {
+                            "globalKey" : "1d67881f",
+                            "externalKey" : "fixedCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "eb13047c"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "214e084d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "7a04f180"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "5ea34009"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "6f7f7b1e"
+                        "globalKey" : "dc625af0"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "5ac194ba"
+                    "globalKey" : "c7a4748c"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "5ac194ba"
+                  "globalKey" : "c7a4748c"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "e4dda770"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-LIBOR-BBA"
-                        },
-                        "indexTenor" : {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 10000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD",
                           "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                          }
                         }
                       }
-                    }
-                  },
-                  "quantity" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-LIBOR-BBA"
+                        },
+                        "indexTenor" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                            "globalKey" : "aa"
+                          }
                         }
                       },
-                      "value" : 10000.00
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "8532effc"
                   },
+                  "meta" : {
+                    "globalKey" : "fd32a49c"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0253,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "value" : 0.0253,
                       "perUnitOf" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 10000.00,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
-                      },
-                      "value" : 10000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "212b0f84"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "3f62c17f",
+                  "externalReference" : "party1"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "b97c11f6",
+                  "externalReference" : "party2"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1101"
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "LEI1RPT0001",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "b8962566"
+                }
+              } ],
+              "name" : {
+                "value" : "Bank X"
               },
-              "value" : "2018-04-01"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+              "businessUnit" : [ {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "jjones"
+                    },
+                    "meta" : {
+                      "globalKey" : "baeb8c0d"
+                    }
+                  }
+                } ],
+                "firstName" : "jjone",
+                "meta" : {
+                  "globalKey" : "b793baa7",
+                  "externalKey" : "trader"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "3f62c17f",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "LEI2CP0002",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "LEI1RPT0001AAAA"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "eb8edea1"
                 }
               } ],
-              "issuer" : {
+              "name" : {
+                "value" : "Bank Y"
+              },
+              "meta" : {
+                "globalKey" : "b97c11f6",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "8ffabe4b"
+                }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
+              },
+              "meta" : {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "LEI1RPT0001"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
               },
               "meta" : {
-                "globalKey" : "3cbc7fcc"
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "f6a6cc60",
+                "externalReference" : "clearing-svc"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
+              "role" : "ClearingOrganization",
+              "ownershipPartyReference" : {
+                "globalReference" : "3f62c17f",
+                "externalReference" : "party1"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "a2e63ef8"
+            }
+          },
+          "meta" : {
+            "globalKey" : "a2e63ef8"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "SEF123",
+      "meta" : {
+        "scheme" : "http://www.sef.com/msg_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "SEFCORP"
+    },
+    "sentTo" : [ {
+      "value" : "SDR01"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-04-01T14:15:36Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-04-01T14:15:36Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "SEF123"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "918f217e"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "85f69c4c"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-02-Submission-1.json b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-02-Submission-1.json
index 2fa1262d46..edd44ad39e 100644
--- a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-02-Submission-1.json
+++ b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-02-Submission-1.json
@@ -1,187 +1,51 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "SEF123"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "918f217e"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.sef.com/msg_id"
-      },
-      "value" : "SEF123"
-    },
-    "sentBy" : {
-      "value" : "SEFCORP"
-    },
-    "sentTo" : [ {
-      "value" : "SDR01"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "6ea2e2ed"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "ee74182f"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "ee74182f"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "d5d99dff"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI1RPT0001"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "b8962566"
-                }
-              } ],
-              "person" : [ {
-                "firstName" : "jjone",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "b793baa7"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "jjones"
-                    },
-                    "meta" : {
-                      "globalKey" : "baeb8c0d"
-                    }
-                  }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "ee963b6"
-              },
-              "name" : {
-                "value" : "Bank Y"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI2CP0002"
-                },
-                "identifierType" : "LEI",
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "LEI1RPT0001",
                 "meta" : {
-                  "globalKey" : "eb8edea1"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
               },
-              "name" : {
-                "value" : "Up&Atem"
-              },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "LEI1RPT0001BBBB",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
-                }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "d5d99dff"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing-svc",
-                "globalReference" : "611719a0"
+                "globalKey" : "7a51c738"
               },
-              "role" : "CLEARING_ORGANIZATION"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2018-04-01",
+              "meta" : {
+                "globalKey" : "3f1101"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "d5d99dff"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "ee963b6"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
                     "primaryAssetClass" : {
-                      "value" : "INTEREST_RATE"
+                      "value" : "InterestRate"
                     }
                   }, {
                     "source" : "ISDA",
                     "value" : {
                       "name" : {
+                        "value" : "InterestRate:IRSwap:FixedFloat",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                        },
-                        "value" : "InterestRate:IRSwap:FixedFloat"
+                        }
                       }
                     }
                   }, {
@@ -192,46 +56,40 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "eb13047c"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "214e084d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d23"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "8"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-03",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -240,103 +98,108 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3837b"
-                              },
-                              "unadjustedDate" : "2018-04-03"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "c7a104bd"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2026-02-08",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "primaryBusinessCenters",
-                                    "globalKey" : "27e4e9"
+                                    "globalKey" : "27e4e9",
+                                    "externalKey" : "primaryBusinessCenters"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "3662e8ba"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "f148ad32"
-                              },
-                              "unadjustedDate" : "2026-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "f148ad32"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "5a28bae"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4fa45fc3"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "956"
+                              "globalKey" : "204f"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                            "rollConvention" : "8"
+                          },
+                          "meta" : {
+                            "globalKey" : "c513c70f",
+                            "externalKey" : "floatingCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "eb13047c"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "214e084d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "db523fbd"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "c7a104bd"
+                            "globalReference" : "c513c70f",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "2fdb52a8"
+                              "globalKey" : "cb73d5c"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -345,82 +208,79 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "resetDates2",
-                              "globalReference" : "82f6a4d"
+                              "globalReference" : "334d40fb",
+                              "externalReference" : "resetDates2"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "resetDates2",
-                            "globalKey" : "82f6a4d"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "meta" : {
+                            "globalKey" : "334d40fb",
+                            "externalKey" : "resetDates2"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "87860aa8"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "eb13047c"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "214e084d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d80"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "8"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30E/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-03",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -429,247 +289,387 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3837b"
-                              },
-                              "unadjustedDate" : "2018-04-03"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "c01e6313"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2026-02-08",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "primaryBusinessCenters",
-                                    "globalReference" : "27e4e9"
+                                    "globalReference" : "27e4e9",
+                                    "externalReference" : "primaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "eb13047c"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "214e084d"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "dc33ccc5"
-                              },
-                              "unadjustedDate" : "2026-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "dc33ccc5"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "30E/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "7e4c86b1"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4fa45fc6"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "959"
+                              "globalKey" : "2b92"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 6
+                            "rollConvention" : "8"
+                          },
+                          "meta" : {
+                            "globalKey" : "1d67881f",
+                            "externalKey" : "fixedCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "eb13047c"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "214e084d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "7a04f180"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "5ea34009"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "b30a98df"
+                        "globalKey" : "1fed78b1"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "9e4cb27b"
+                    "globalKey" : "b2f924d"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "9e4cb27b"
+                  "globalKey" : "b2f924d"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "e4dda770"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-LIBOR-BBA"
-                        },
-                        "indexTenor" : {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 10000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD",
                           "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                          }
                         }
                       }
-                    }
-                  },
-                  "quantity" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-LIBOR-BBA"
+                        },
+                        "indexTenor" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                            "globalKey" : "aa"
+                          }
                         }
                       },
-                      "value" : 10000.00
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "8532effc"
                   },
+                  "meta" : {
+                    "globalKey" : "fd32a49c"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0253,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "value" : 0.0253,
                       "perUnitOf" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 10000.00,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
-                      },
-                      "value" : 10000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "212b0f84"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "3f62c17f",
+                  "externalReference" : "party1"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "b97c11f6",
+                  "externalReference" : "party2"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1101"
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "LEI1RPT0001",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "b8962566"
+                }
+              } ],
+              "name" : {
+                "value" : "Bank X"
               },
-              "value" : "2018-04-01"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+              "businessUnit" : [ {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "jjones"
+                    },
+                    "meta" : {
+                      "globalKey" : "baeb8c0d"
+                    }
+                  }
+                } ],
+                "firstName" : "jjone",
+                "meta" : {
+                  "globalKey" : "b793baa7",
+                  "externalKey" : "trader"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "3f62c17f",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "LEI2CP0002",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "LEI1RPT0001BBBB"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "eb8edea1"
                 }
               } ],
-              "issuer" : {
+              "name" : {
+                "value" : "Bank Y"
+              },
+              "meta" : {
+                "globalKey" : "b97c11f6",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "8ffabe4b"
+                }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
+              },
+              "meta" : {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "LEI1RPT0001"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
               },
               "meta" : {
-                "globalKey" : "73661f8c"
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "f6a6cc60",
+                "externalReference" : "clearing-svc"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
+              "role" : "ClearingOrganization",
+              "ownershipPartyReference" : {
+                "globalReference" : "3f62c17f",
+                "externalReference" : "party1"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "b2faf179"
+            }
+          },
+          "meta" : {
+            "globalKey" : "b2faf179"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "SEF123",
+      "meta" : {
+        "scheme" : "http://www.sef.com/msg_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "SEFCORP"
+    },
+    "sentTo" : [ {
+      "value" : "SDR01"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-04-01T10:15:36Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-04-01T10:15:36Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "SEF123"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "918f217e"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "731b0fa9"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-03-Submission-1.json b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-03-Submission-1.json
index b644886d23..6495b0377f 100644
--- a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-03-Submission-1.json
+++ b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-03-Submission-1.json
@@ -1,187 +1,51 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "SEF123"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "918f217e"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.sef.com/msg_id"
-      },
-      "value" : "SEF123"
-    },
-    "sentBy" : {
-      "value" : "SEFCORP"
-    },
-    "sentTo" : [ {
-      "value" : "SDR01"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "3b0ff970"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "2b0f630"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "2b0f630"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "d5d99dff"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI1RPT0001"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "b8962566"
-                }
-              } ],
-              "person" : [ {
-                "firstName" : "jjone",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "b793baa7"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "jjones"
-                    },
-                    "meta" : {
-                      "globalKey" : "baeb8c0d"
-                    }
-                  }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "ee963b6"
-              },
-              "name" : {
-                "value" : "Bank Y"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI2CP0002"
-                },
-                "identifierType" : "LEI",
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "LEI1RPT0001",
                 "meta" : {
-                  "globalKey" : "eb8edea1"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
               },
-              "name" : {
-                "value" : "Up&Atem"
-              },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "LEI1RPT0001KKKK",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
-                }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "d5d99dff"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing-svc",
-                "globalReference" : "611719a0"
+                "globalKey" : "7ad4d4f8"
               },
-              "role" : "CLEARING_ORGANIZATION"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2018-04-01",
+              "meta" : {
+                "globalKey" : "3f1101"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "d5d99dff"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "ee963b6"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
                     "primaryAssetClass" : {
-                      "value" : "INTEREST_RATE"
+                      "value" : "InterestRate"
                     }
                   }, {
                     "source" : "ISDA",
                     "value" : {
                       "name" : {
+                        "value" : "InterestRate:IRSwap:FixedFloat",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                        },
-                        "value" : "InterestRate:IRSwap:FixedFloat"
+                        }
                       }
                     }
                   }, {
@@ -192,46 +56,40 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "eb13047c"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "214e084d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d23"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "8"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-03",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -240,103 +98,108 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3837b"
-                              },
-                              "unadjustedDate" : "2018-04-03"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "c7a104bd"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2026-02-08",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "primaryBusinessCenters",
-                                    "globalKey" : "27e4e9"
+                                    "globalKey" : "27e4e9",
+                                    "externalKey" : "primaryBusinessCenters"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "3662e8ba"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "f148ad32"
-                              },
-                              "unadjustedDate" : "2026-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "f148ad32"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "99e6faaf"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4fa45fc3"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "956"
+                              "globalKey" : "204f"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                            "rollConvention" : "8"
+                          },
+                          "meta" : {
+                            "globalKey" : "c513c70f",
+                            "externalKey" : "floatingCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "eb13047c"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "214e084d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "db523fbd"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "c7a104bd"
+                            "globalReference" : "c513c70f",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "2fdb52a9"
+                              "globalKey" : "cb73d5d"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -345,82 +208,79 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "resetDates3",
-                              "globalReference" : "9c73d94e"
+                              "globalReference" : "c791affc",
+                              "externalReference" : "resetDates3"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "resetDates3",
-                            "globalKey" : "9c73d94e"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "meta" : {
+                            "globalKey" : "c791affc",
+                            "externalKey" : "resetDates3"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "1bca79a9"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "eb13047c"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "214e084d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d80"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "8"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30E/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-03",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -429,247 +289,387 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3837b"
-                              },
-                              "unadjustedDate" : "2018-04-03"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "c01e6313"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2026-02-08",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "primaryBusinessCenters",
-                                    "globalReference" : "27e4e9"
+                                    "globalReference" : "27e4e9",
+                                    "externalReference" : "primaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "eb13047c"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "214e084d"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "dc33ccc5"
-                              },
-                              "unadjustedDate" : "2026-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "dc33ccc5"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "30E/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "7e4c86b1"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4fa45fc6"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "959"
+                              "globalKey" : "2b92"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 6
+                            "rollConvention" : "8"
+                          },
+                          "meta" : {
+                            "globalKey" : "1d67881f",
+                            "externalKey" : "fixedCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "eb13047c"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "214e084d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "7a04f180"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "5ea34009"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "f695b6a0"
+                        "globalKey" : "63789672"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "e1d7d03c"
+                    "globalKey" : "4ebab00e"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "e1d7d03c"
+                  "globalKey" : "4ebab00e"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "e4dda770"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-LIBOR-BBA"
-                        },
-                        "indexTenor" : {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 10000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD",
                           "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                          }
                         }
                       }
-                    }
-                  },
-                  "quantity" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-LIBOR-BBA"
+                        },
+                        "indexTenor" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                            "globalKey" : "aa"
+                          }
                         }
                       },
-                      "value" : 10000.00
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "8532effc"
                   },
+                  "meta" : {
+                    "globalKey" : "fd32a49c"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0253,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "value" : 0.0253,
                       "perUnitOf" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 10000.00,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
-                      },
-                      "value" : 10000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "212b0f84"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "3f62c17f",
+                  "externalReference" : "party1"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "b97c11f6",
+                  "externalReference" : "party2"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1101"
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "LEI1RPT0001",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "b8962566"
+                }
+              } ],
+              "name" : {
+                "value" : "Bank X"
               },
-              "value" : "2018-04-01"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+              "businessUnit" : [ {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "jjones"
+                    },
+                    "meta" : {
+                      "globalKey" : "baeb8c0d"
+                    }
+                  }
+                } ],
+                "firstName" : "jjone",
+                "meta" : {
+                  "globalKey" : "b793baa7",
+                  "externalKey" : "trader"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "3f62c17f",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "LEI2CP0002",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "LEI1RPT0001KKKK"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "eb8edea1"
                 }
               } ],
-              "issuer" : {
+              "name" : {
+                "value" : "Bank Y"
+              },
+              "meta" : {
+                "globalKey" : "b97c11f6",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "8ffabe4b"
+                }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
+              },
+              "meta" : {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "LEI1RPT0001"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
               },
               "meta" : {
-                "globalKey" : "5f5cbd4c"
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "f6a6cc60",
+                "externalReference" : "clearing-svc"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
+              "role" : "ClearingOrganization",
+              "ownershipPartyReference" : {
+                "globalReference" : "3f62c17f",
+                "externalReference" : "party1"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "edf821fa"
+            }
+          },
+          "meta" : {
+            "globalKey" : "edf821fa"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "SEF123",
+      "meta" : {
+        "scheme" : "http://www.sef.com/msg_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "SEFCORP"
+    },
+    "sentTo" : [ {
+      "value" : "SDR01"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-04-01T14:15:36Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-04-01T14:15:36Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "SEF123"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "918f217e"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "83aadd8a"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-04-Submission-1.json b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-04-Submission-1.json
index 679a531dc8..761869b6ac 100644
--- a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-04-Submission-1.json
+++ b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-04-Submission-1.json
@@ -1,187 +1,51 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "SEF123"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "918f217e"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.sef.com/msg_id"
-      },
-      "value" : "SEF123"
-    },
-    "sentBy" : {
-      "value" : "SEFCORP"
-    },
-    "sentTo" : [ {
-      "value" : "SDR01"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "9904c6f1"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "75aa3871"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "75aa3871"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "d5d99dff"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI1RPT0001"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "b8962566"
-                }
-              } ],
-              "person" : [ {
-                "firstName" : "jjone",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "b793baa7"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "jjones"
-                    },
-                    "meta" : {
-                      "globalKey" : "baeb8c0d"
-                    }
-                  }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "ee963b6"
-              },
-              "name" : {
-                "value" : "Bank Y"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI2CP0002"
-                },
-                "identifierType" : "LEI",
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "LEI1RPT0001",
                 "meta" : {
-                  "globalKey" : "eb8edea1"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
               },
-              "name" : {
-                "value" : "Up&Atem"
-              },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "LEI1RPT0001CCCC",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
-                }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "d5d99dff"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing-svc",
-                "globalReference" : "611719a0"
+                "globalKey" : "7a6056f8"
               },
-              "role" : "CLEARING_ORGANIZATION"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2018-04-01",
+              "meta" : {
+                "globalKey" : "3f1101"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "d5d99dff"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "ee963b6"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
                     "primaryAssetClass" : {
-                      "value" : "INTEREST_RATE"
+                      "value" : "InterestRate"
                     }
                   }, {
                     "source" : "ISDA",
                     "value" : {
                       "name" : {
+                        "value" : "InterestRate:IRSwap:FixedFloat",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                        },
-                        "value" : "InterestRate:IRSwap:FixedFloat"
+                        }
                       }
                     }
                   }, {
@@ -192,46 +56,40 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "eb13047c"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "214e084d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d23"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "8"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-03",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -240,103 +98,108 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3837b"
-                              },
-                              "unadjustedDate" : "2018-04-03"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "c7a104bd"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2026-02-08",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "primaryBusinessCenters",
-                                    "globalKey" : "27e4e9"
+                                    "globalKey" : "27e4e9",
+                                    "externalKey" : "primaryBusinessCenters"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "3662e8ba"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "f148ad32"
-                              },
-                              "unadjustedDate" : "2026-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "f148ad32"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "2e2b69b0"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4fa45fc3"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "956"
+                              "globalKey" : "204f"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                            "rollConvention" : "8"
+                          },
+                          "meta" : {
+                            "globalKey" : "c513c70f",
+                            "externalKey" : "floatingCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "eb13047c"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "214e084d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "db523fbd"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "c7a104bd"
+                            "globalReference" : "c513c70f",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "2fdb52aa"
+                              "globalKey" : "cb73d5e"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -345,82 +208,79 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "resetDates4",
-                              "globalReference" : "30b8484f"
+                              "globalReference" : "5bd61efd",
+                              "externalReference" : "resetDates4"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "resetDates4",
-                            "globalKey" : "30b8484f"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "meta" : {
+                            "globalKey" : "5bd61efd",
+                            "externalKey" : "resetDates4"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "b00ee8aa"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "eb13047c"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "214e084d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d80"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "8"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30E/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-03",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -429,247 +289,387 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3837b"
-                              },
-                              "unadjustedDate" : "2018-04-03"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "c01e6313"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2026-02-08",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "primaryBusinessCenters",
-                                    "globalReference" : "27e4e9"
+                                    "globalReference" : "27e4e9",
+                                    "externalReference" : "primaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "eb13047c"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "214e084d"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "dc33ccc5"
-                              },
-                              "unadjustedDate" : "2026-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "dc33ccc5"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "30E/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "7e4c86b1"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4fa45fc6"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "959"
+                              "globalKey" : "2b92"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 6
+                            "rollConvention" : "8"
+                          },
+                          "meta" : {
+                            "globalKey" : "1d67881f",
+                            "externalKey" : "fixedCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "eb13047c"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "214e084d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "7a04f180"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "5ea34009"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "3a20d461"
+                        "globalKey" : "a703b433"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "2562edfd"
+                    "globalKey" : "9245cdcf"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "2562edfd"
+                  "globalKey" : "9245cdcf"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "e4dda770"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-LIBOR-BBA"
-                        },
-                        "indexTenor" : {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 10000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD",
                           "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                          }
                         }
                       }
-                    }
-                  },
-                  "quantity" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-LIBOR-BBA"
+                        },
+                        "indexTenor" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                            "globalKey" : "aa"
+                          }
                         }
                       },
-                      "value" : 10000.00
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "8532effc"
                   },
+                  "meta" : {
+                    "globalKey" : "fd32a49c"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0253,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "value" : 0.0253,
                       "perUnitOf" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 10000.00,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
-                      },
-                      "value" : 10000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "212b0f84"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "3f62c17f",
+                  "externalReference" : "party1"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "b97c11f6",
+                  "externalReference" : "party2"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1101"
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "LEI1RPT0001",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "b8962566"
+                }
+              } ],
+              "name" : {
+                "value" : "Bank X"
               },
-              "value" : "2018-04-01"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+              "businessUnit" : [ {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "jjones"
+                    },
+                    "meta" : {
+                      "globalKey" : "baeb8c0d"
+                    }
+                  }
+                } ],
+                "firstName" : "jjone",
+                "meta" : {
+                  "globalKey" : "b793baa7",
+                  "externalKey" : "trader"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "3f62c17f",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "LEI2CP0002",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "LEI1RPT0001CCCC"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "eb8edea1"
                 }
               } ],
-              "issuer" : {
+              "name" : {
+                "value" : "Bank Y"
+              },
+              "meta" : {
+                "globalKey" : "b97c11f6",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "8ffabe4b"
+                }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
+              },
+              "meta" : {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "LEI1RPT0001"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
               },
               "meta" : {
-                "globalKey" : "aa0fbf4c"
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "f6a6cc60",
+                "externalReference" : "clearing-svc"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
+              "role" : "ClearingOrganization",
+              "ownershipPartyReference" : {
+                "globalReference" : "3f62c17f",
+                "externalReference" : "party1"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "8dc746bb"
+            }
+          },
+          "meta" : {
+            "globalKey" : "8dc746bb"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "SEF123",
+      "meta" : {
+        "scheme" : "http://www.sef.com/msg_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "SEFCORP"
+    },
+    "sentTo" : [ {
+      "value" : "SDR01"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-04-01T14:15:36Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-04-01T14:15:36Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "SEF123"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "918f217e"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "5183b2e9"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-05-Submission-1.json b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-05-Submission-1.json
index fa85009f71..37b3480732 100644
--- a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-05-Submission-1.json
+++ b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-05-Submission-1.json
@@ -1,187 +1,51 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "SEF123"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "918f217e"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.sef.com/msg_id"
-      },
-      "value" : "SEF123"
-    },
-    "sentBy" : {
-      "value" : "SEFCORP"
-    },
-    "sentTo" : [ {
-      "value" : "SDR01"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "8afa2902"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "d49a1872"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "d49a1872"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "d5d99dff"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI1RPT0001"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "b8962566"
-                }
-              } ],
-              "person" : [ {
-                "firstName" : "jjone",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "b793baa7"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "jjones"
-                    },
-                    "meta" : {
-                      "globalKey" : "baeb8c0d"
-                    }
-                  }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "ee963b6"
-              },
-              "name" : {
-                "value" : "Bank Y"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI2CP0002"
-                },
-                "identifierType" : "LEI",
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "LEI1RPT0001",
                 "meta" : {
-                  "globalKey" : "eb8edea1"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
               },
-              "name" : {
-                "value" : "Up&Atem"
-              },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "LEI1RPT0001DDDD",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
-                }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "d5d99dff"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing-svc",
-                "globalReference" : "611719a0"
+                "globalKey" : "7a6ee6b8"
               },
-              "role" : "CLEARING_ORGANIZATION"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2018-04-01",
+              "meta" : {
+                "globalKey" : "3f1101"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "d5d99dff"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "ee963b6"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
                     "primaryAssetClass" : {
-                      "value" : "INTEREST_RATE"
+                      "value" : "InterestRate"
                     }
                   }, {
                     "source" : "ISDA",
                     "value" : {
                       "name" : {
+                        "value" : "InterestRate:IRSwap:FixedFloat",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                        },
-                        "value" : "InterestRate:IRSwap:FixedFloat"
+                        }
                       }
                     }
                   }, {
@@ -192,46 +56,40 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "eb13047c"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "214e084d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d23"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "8"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-03",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -240,103 +98,108 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3837b"
-                              },
-                              "unadjustedDate" : "2018-04-03"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "c7a104bd"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2026-02-08",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "primaryBusinessCenters",
-                                    "globalKey" : "27e4e9"
+                                    "globalKey" : "27e4e9",
+                                    "externalKey" : "primaryBusinessCenters"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "3662e8ba"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "f148ad32"
-                              },
-                              "unadjustedDate" : "2026-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "f148ad32"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "c26fd8b1"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4fa45fc3"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "956"
+                              "globalKey" : "204f"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                            "rollConvention" : "8"
+                          },
+                          "meta" : {
+                            "globalKey" : "c513c70f",
+                            "externalKey" : "floatingCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "eb13047c"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "214e084d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "db523fbd"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "c7a104bd"
+                            "globalReference" : "c513c70f",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "2fdb52ab"
+                              "globalKey" : "cb73d5f"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -345,82 +208,79 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "resetDates5",
-                              "globalReference" : "c4fcb750"
+                              "globalReference" : "f01a8dfe",
+                              "externalReference" : "resetDates5"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "resetDates5",
-                            "globalKey" : "c4fcb750"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "meta" : {
+                            "globalKey" : "f01a8dfe",
+                            "externalKey" : "resetDates5"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "445357ab"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "eb13047c"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "214e084d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d80"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "8"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30E/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-03",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -429,247 +289,387 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3837b"
-                              },
-                              "unadjustedDate" : "2018-04-03"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "c01e6313"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2026-02-08",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "primaryBusinessCenters",
-                                    "globalReference" : "27e4e9"
+                                    "globalReference" : "27e4e9",
+                                    "externalReference" : "primaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "eb13047c"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "214e084d"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "dc33ccc5"
-                              },
-                              "unadjustedDate" : "2026-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "dc33ccc5"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "30E/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "7e4c86b1"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4fa45fc6"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "959"
+                              "globalKey" : "2b92"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 6
+                            "rollConvention" : "8"
+                          },
+                          "meta" : {
+                            "globalKey" : "1d67881f",
+                            "externalKey" : "fixedCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "eb13047c"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "214e084d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "7a04f180"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "5ea34009"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "7dabf222"
+                        "globalKey" : "ea8ed1f4"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "68ee0bbe"
+                    "globalKey" : "d5d0eb90"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "68ee0bbe"
+                  "globalKey" : "d5d0eb90"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "e4dda770"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-LIBOR-BBA"
-                        },
-                        "indexTenor" : {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 10000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD",
                           "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                          }
                         }
                       }
-                    }
-                  },
-                  "quantity" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-LIBOR-BBA"
+                        },
+                        "indexTenor" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                            "globalKey" : "aa"
+                          }
                         }
                       },
-                      "value" : 10000.00
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "8532effc"
                   },
+                  "meta" : {
+                    "globalKey" : "fd32a49c"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0253,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "value" : 0.0253,
                       "perUnitOf" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 10000.00,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
-                      },
-                      "value" : 10000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "212b0f84"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "3f62c17f",
+                  "externalReference" : "party1"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "b97c11f6",
+                  "externalReference" : "party2"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1101"
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "LEI1RPT0001",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "b8962566"
+                }
+              } ],
+              "name" : {
+                "value" : "Bank X"
               },
-              "value" : "2018-04-01"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+              "businessUnit" : [ {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "jjones"
+                    },
+                    "meta" : {
+                      "globalKey" : "baeb8c0d"
+                    }
+                  }
+                } ],
+                "firstName" : "jjone",
+                "meta" : {
+                  "globalKey" : "b793baa7",
+                  "externalKey" : "trader"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "3f62c17f",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "LEI2CP0002",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "LEI1RPT0001DDDD"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "eb8edea1"
                 }
               } ],
-              "issuer" : {
+              "name" : {
+                "value" : "Bank Y"
+              },
+              "meta" : {
+                "globalKey" : "b97c11f6",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "8ffabe4b"
+                }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
+              },
+              "meta" : {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "LEI1RPT0001"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
               },
               "meta" : {
-                "globalKey" : "e0b95f0c"
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "f6a6cc60",
+                "externalReference" : "clearing-svc"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
+              "role" : "ClearingOrganization",
+              "ownershipPartyReference" : {
+                "globalReference" : "3f62c17f",
+                "externalReference" : "party1"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "9ddbf93c"
+            }
+          },
+          "meta" : {
+            "globalKey" : "9ddbf93c"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "SEF123",
+      "meta" : {
+        "scheme" : "http://www.sef.com/msg_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "SEFCORP"
+    },
+    "sentTo" : [ {
+      "value" : "SDR01"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-04-01T12:10:10Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-04-01T12:10:10Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "SEF123"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "918f217e"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "4c939158"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-06-Submission-1.json b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-06-Submission-1.json
index 941c3ab0c4..86fdaecfb2 100644
--- a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-06-Submission-1.json
+++ b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-06-Submission-1.json
@@ -1,187 +1,51 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "SEF123"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "918f217e"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.sef.com/msg_id"
-      },
-      "value" : "SEF123"
-    },
-    "sentBy" : {
-      "value" : "SEFCORP"
-    },
-    "sentTo" : [ {
-      "value" : "SDR01"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "29928695"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "f4d98315"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "f4d98315"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "264baa99"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI1RPT001"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "d051b20c"
-                }
-              } ],
-              "person" : [ {
-                "firstName" : "jjone",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "b793baa7"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "jjones"
-                    },
-                    "meta" : {
-                      "globalKey" : "baeb8c0d"
-                    }
-                  }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "9a7a6ea8"
-              },
-              "name" : {
-                "value" : "Bank Y"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI2CP002"
-                },
-                "identifierType" : "LEI",
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "LEI1RPT001",
                 "meta" : {
-                  "globalKey" : "771fe993"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
               },
-              "name" : {
-                "value" : "Up&Atem"
-              },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "LEI1RPT001ALPHA",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "b1869788"
-              },
-              "name" : {
-                "value" : "ClearItAll"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI1DCO"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "328365bf"
-                }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "264baa99"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing-svc",
-                "globalReference" : "b1869788"
+                "globalKey" : "4b51b4b2"
               },
-              "role" : "CLEARING_ORGANIZATION"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2018-04-01",
+              "meta" : {
+                "globalKey" : "3f1101"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "264baa99"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "9a7a6ea8"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
                     "primaryAssetClass" : {
-                      "value" : "INTEREST_RATE"
+                      "value" : "InterestRate"
                     }
                   }, {
                     "source" : "ISDA",
                     "value" : {
                       "name" : {
+                        "value" : "InterestRate:IRSwap:FixedFloat",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                        },
-                        "value" : "InterestRate:IRSwap:FixedFloat"
+                        }
                       }
                     }
                   }, {
@@ -192,46 +56,40 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "eb13047c"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "214e084d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d23"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "8"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-03",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -240,103 +98,108 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3837b"
-                              },
-                              "unadjustedDate" : "2018-04-03"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "c7a104bd"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2026-02-08",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "primaryBusinessCenters",
-                                    "globalKey" : "27e4e9"
+                                    "globalKey" : "27e4e9",
+                                    "externalKey" : "primaryBusinessCenters"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "3662e8ba"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "f148ad32"
-                              },
-                              "unadjustedDate" : "2026-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "f148ad32"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "56b447b2"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4fa45fc3"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "956"
+                              "globalKey" : "204f"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                            "rollConvention" : "8"
+                          },
+                          "meta" : {
+                            "globalKey" : "c513c70f",
+                            "externalKey" : "floatingCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "eb13047c"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "214e084d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "db523fbd"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "c7a104bd"
+                            "globalReference" : "c513c70f",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "2fdb52ac"
+                              "globalKey" : "cb73d60"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -345,82 +208,79 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "resetDates6",
-                              "globalReference" : "59412651"
+                              "globalReference" : "845efcff",
+                              "externalReference" : "resetDates6"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "resetDates6",
-                            "globalKey" : "59412651"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "meta" : {
+                            "globalKey" : "845efcff",
+                            "externalKey" : "resetDates6"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "d897c6ac"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "eb13047c"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "214e084d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d80"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "8"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30E/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-03",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -429,247 +289,387 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3837b"
-                              },
-                              "unadjustedDate" : "2018-04-03"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "c01e6313"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2026-02-08",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "primaryBusinessCenters",
-                                    "globalReference" : "27e4e9"
+                                    "globalReference" : "27e4e9",
+                                    "externalReference" : "primaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "eb13047c"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "214e084d"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "dc33ccc5"
-                              },
-                              "unadjustedDate" : "2026-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "dc33ccc5"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "30E/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "7e4c86b1"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4fa45fc6"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "959"
+                              "globalKey" : "2b92"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 6
+                            "rollConvention" : "8"
+                          },
+                          "meta" : {
+                            "globalKey" : "1d67881f",
+                            "externalKey" : "fixedCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "eb13047c"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "214e084d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "7a04f180"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "5ea34009"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "c1370fe3"
+                        "globalKey" : "2e19efb5"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "ac79297f"
+                    "globalKey" : "195c0951"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "ac79297f"
+                  "globalKey" : "195c0951"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "e4dda770"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-LIBOR-BBA"
-                        },
-                        "indexTenor" : {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 10000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD",
                           "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                          }
                         }
                       }
-                    }
-                  },
-                  "quantity" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-LIBOR-BBA"
+                        },
+                        "indexTenor" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                            "globalKey" : "aa"
+                          }
                         }
                       },
-                      "value" : 10000.00
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "8532effc"
                   },
+                  "meta" : {
+                    "globalKey" : "fd32a49c"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0253,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "value" : 0.0253,
                       "perUnitOf" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 10000.00,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
-                      },
-                      "value" : 10000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "212b0f84"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "b868f119",
+                  "externalReference" : "party1"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "a4f62868",
+                  "externalReference" : "party2"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1101"
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "LEI1RPT001",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "d051b20c"
+                }
+              } ],
+              "name" : {
+                "value" : "Bank X"
               },
-              "value" : "2018-04-01"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+              "businessUnit" : [ {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "jjones"
+                    },
+                    "meta" : {
+                      "globalKey" : "baeb8c0d"
+                    }
+                  }
+                } ],
+                "firstName" : "jjone",
+                "meta" : {
+                  "globalKey" : "b793baa7",
+                  "externalKey" : "trader"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "b868f119",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "LEI2CP002",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "LEI1RPT001ALPHA"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "771fe993"
                 }
               } ],
-              "issuer" : {
+              "name" : {
+                "value" : "Bank Y"
+              },
+              "meta" : {
+                "globalKey" : "a4f62868",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "8ffabe4b"
+                }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
+              },
+              "meta" : {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "LEI1DCO",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "LEI1RPT001"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "328365bf"
+                }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
               },
               "meta" : {
-                "globalKey" : "8ea9a67a"
+                "globalKey" : "e92e7048",
+                "externalKey" : "clearing-svc"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "e92e7048",
+                "externalReference" : "clearing-svc"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
+              "role" : "ClearingOrganization",
+              "ownershipPartyReference" : {
+                "globalReference" : "b868f119",
+                "externalReference" : "party1"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "d7d77b6b"
+            }
+          },
+          "meta" : {
+            "globalKey" : "d7d77b6b"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "SEF123",
+      "meta" : {
+        "scheme" : "http://www.sef.com/msg_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "SEFCORP"
+    },
+    "sentTo" : [ {
+      "value" : "SDR01"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-04-01T14:15:36Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-04-01T14:15:36Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "SEF123"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "918f217e"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "2fad7439"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-07-Submission-1.json b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-07-Submission-1.json
index 9226644c50..6f130b9eb8 100644
--- a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-07-Submission-1.json
+++ b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-07-Submission-1.json
@@ -1,187 +1,51 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "SEF123"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "918f217e"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.sef.com/msg_id"
-      },
-      "value" : "SEF123"
-    },
-    "sentBy" : {
-      "value" : "SEFCORP"
-    },
-    "sentTo" : [ {
-      "value" : "SDR01"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "cb3c522a"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "de54e26a"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "de54e26a"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "d5d99dff"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI1RPT0001"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "b8962566"
-                }
-              } ],
-              "person" : [ {
-                "firstName" : "jjone",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "b793baa7"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "jjones"
-                    },
-                    "meta" : {
-                      "globalKey" : "baeb8c0d"
-                    }
-                  }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "ee963b6"
-              },
-              "name" : {
-                "value" : "Bank Y"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI2CP0002"
-                },
-                "identifierType" : "LEI",
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "LEI1RPT0001",
                 "meta" : {
-                  "globalKey" : "eb8edea1"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
               },
-              "name" : {
-                "value" : "Up&Atem"
-              },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "LEI1RPT0001EEE",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
-                }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "d5d99dff"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing-svc",
-                "globalReference" : "611719a0"
+                "globalKey" : "fe8f32df"
               },
-              "role" : "CLEARING_ORGANIZATION"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2018-04-01",
+              "meta" : {
+                "globalKey" : "3f1101"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "d5d99dff"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "ee963b6"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
                     "primaryAssetClass" : {
-                      "value" : "INTEREST_RATE"
+                      "value" : "InterestRate"
                     }
                   }, {
                     "source" : "ISDA",
                     "value" : {
                       "name" : {
+                        "value" : "InterestRate:IRSwap:FixedFloat",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                        },
-                        "value" : "InterestRate:IRSwap:FixedFloat"
+                        }
                       }
                     }
                   }, {
@@ -192,46 +56,40 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "eb13047c"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "214e084d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d23"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "8"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-03",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -240,103 +98,108 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3837b"
-                              },
-                              "unadjustedDate" : "2018-04-03"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "c7a104bd"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2026-02-08",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "primaryBusinessCenters",
-                                    "globalKey" : "27e4e9"
+                                    "globalKey" : "27e4e9",
+                                    "externalKey" : "primaryBusinessCenters"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "3662e8ba"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "f148ad32"
-                              },
-                              "unadjustedDate" : "2026-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "f148ad32"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "949ccf02"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4fa45fc3"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "956"
+                              "globalKey" : "204f"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                            "rollConvention" : "8"
+                          },
+                          "meta" : {
+                            "globalKey" : "c513c70f",
+                            "externalKey" : "floatingCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "eb13047c"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "214e084d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "db523fbd"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "c7a104bd"
+                            "globalReference" : "c513c70f",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "ab2829fc"
+                              "globalKey" : "880414b0"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -345,82 +208,79 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "resetDates71",
-                              "globalReference" : "9729ada1"
+                              "globalReference" : "c247844f",
+                              "externalReference" : "resetDates71"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "resetDates71",
-                            "globalKey" : "9729ada1"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "meta" : {
+                            "globalKey" : "c247844f",
+                            "externalKey" : "resetDates71"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "16804dfc"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "eb13047c"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "214e084d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d80"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "8"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30E/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-03",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -429,247 +289,387 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3837b"
-                              },
-                              "unadjustedDate" : "2018-04-03"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "c01e6313"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2026-02-08",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "primaryBusinessCenters",
-                                    "globalReference" : "27e4e9"
+                                    "globalReference" : "27e4e9",
+                                    "externalReference" : "primaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "eb13047c"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "214e084d"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "dc33ccc5"
-                              },
-                              "unadjustedDate" : "2026-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "dc33ccc5"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "30E/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "7e4c86b1"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4fa45fc6"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "959"
+                              "globalKey" : "2b92"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 6
+                            "rollConvention" : "8"
+                          },
+                          "meta" : {
+                            "globalKey" : "1d67881f",
+                            "externalKey" : "fixedCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "eb13047c"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "214e084d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "7a04f180"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "5ea34009"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "42f97333"
+                        "globalKey" : "afdc5305"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "2e3b8ccf"
+                    "globalKey" : "9b1e6ca1"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "2e3b8ccf"
+                  "globalKey" : "9b1e6ca1"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "e4dda770"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-LIBOR-BBA"
-                        },
-                        "indexTenor" : {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 10000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD",
                           "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                          }
                         }
                       }
-                    }
-                  },
-                  "quantity" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-LIBOR-BBA"
+                        },
+                        "indexTenor" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                            "globalKey" : "aa"
+                          }
                         }
                       },
-                      "value" : 10000.00
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "8532effc"
                   },
+                  "meta" : {
+                    "globalKey" : "fd32a49c"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0253,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "value" : 0.0253,
                       "perUnitOf" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 10000.00,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
-                      },
-                      "value" : 10000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "212b0f84"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "3f62c17f",
+                  "externalReference" : "party1"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "b97c11f6",
+                  "externalReference" : "party2"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1101"
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "LEI1RPT0001",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "b8962566"
+                }
+              } ],
+              "name" : {
+                "value" : "Bank X"
               },
-              "value" : "2018-04-01"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+              "businessUnit" : [ {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "jjones"
+                    },
+                    "meta" : {
+                      "globalKey" : "baeb8c0d"
+                    }
+                  }
+                } ],
+                "firstName" : "jjone",
+                "meta" : {
+                  "globalKey" : "b793baa7",
+                  "externalKey" : "trader"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "3f62c17f",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "LEI2CP0002",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "LEI1RPT0001EEE"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "eb8edea1"
                 }
               } ],
-              "issuer" : {
+              "name" : {
+                "value" : "Bank Y"
+              },
+              "meta" : {
+                "globalKey" : "b97c11f6",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "8ffabe4b"
+                }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
+              },
+              "meta" : {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "LEI1RPT0001"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
               },
               "meta" : {
-                "globalKey" : "ddf73d73"
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "f6a6cc60",
+                "externalReference" : "clearing-svc"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
+              "role" : "ClearingOrganization",
+              "ownershipPartyReference" : {
+                "globalReference" : "3f62c17f",
+                "externalReference" : "party1"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "9cd8574"
+            }
+          },
+          "meta" : {
+            "globalKey" : "9cd8574"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "SEF123",
+      "meta" : {
+        "scheme" : "http://www.sef.com/msg_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "SEFCORP"
+    },
+    "sentTo" : [ {
+      "value" : "SDR01"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-04-01T14:15:36Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-04-01T14:15:36Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "SEF123"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "918f217e"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "46d9d50"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-07-Submission-2.json b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-07-Submission-2.json
index 432a7c6cca..0caf460550 100644
--- a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-07-Submission-2.json
+++ b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-07-Submission-2.json
@@ -1,187 +1,51 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "SEF123"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "918f217e"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.sef.com/msg_id"
-      },
-      "value" : "SEF123"
-    },
-    "sentBy" : {
-      "value" : "SEFCORP"
-    },
-    "sentTo" : [ {
-      "value" : "SDR01"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "861e0138"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "3b686d7c"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "3b686d7c"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "d5d99dff"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI1RPT0001"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "b8962566"
-                }
-              } ],
-              "person" : [ {
-                "firstName" : "jjone",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "b793baa7"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "jjones"
-                    },
-                    "meta" : {
-                      "globalKey" : "baeb8c0d"
-                    }
-                  }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "ee963b6"
-              },
-              "name" : {
-                "value" : "Bank Y"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI2CP0002"
-                },
-                "identifierType" : "LEI",
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "LEI1RPT0001",
                 "meta" : {
-                  "globalKey" : "eb8edea1"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
               },
-              "name" : {
-                "value" : "Up&Atem"
-              },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "LEI1RPT0001FFF",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
-                }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "d5d99dff"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing-svc",
-                "globalReference" : "611719a0"
+                "globalKey" : "fe8fab1e"
               },
-              "role" : "CLEARING_ORGANIZATION"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2018-04-01",
+              "meta" : {
+                "globalKey" : "3f1101"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "d5d99dff"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "ee963b6"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
                     "primaryAssetClass" : {
-                      "value" : "INTEREST_RATE"
+                      "value" : "InterestRate"
                     }
                   }, {
                     "source" : "ISDA",
                     "value" : {
                       "name" : {
+                        "value" : "InterestRate:IRSwap:FixedFloat",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                        },
-                        "value" : "InterestRate:IRSwap:FixedFloat"
+                        }
                       }
                     }
                   }, {
@@ -192,46 +56,40 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "eb13047c"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "214e084d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d23"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "8"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-03",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -240,103 +98,108 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3837b"
-                              },
-                              "unadjustedDate" : "2018-04-03"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "c7a104bd"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2026-02-08",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "primaryBusinessCenters",
-                                    "globalKey" : "27e4e9"
+                                    "globalKey" : "27e4e9",
+                                    "externalKey" : "primaryBusinessCenters"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "3662e8ba"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "f148ad32"
-                              },
-                              "unadjustedDate" : "2026-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "f148ad32"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "28e13e03"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4fa45fc3"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "956"
+                              "globalKey" : "204f"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                            "rollConvention" : "8"
+                          },
+                          "meta" : {
+                            "globalKey" : "c513c70f",
+                            "externalKey" : "floatingCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "eb13047c"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "214e084d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "db523fbd"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "c7a104bd"
+                            "globalReference" : "c513c70f",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "ab2829fd"
+                              "globalKey" : "880414b1"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -345,82 +208,79 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "resetDates72",
-                              "globalReference" : "2b6e1ca2"
+                              "globalReference" : "568bf350",
+                              "externalReference" : "resetDates72"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "resetDates72",
-                            "globalKey" : "2b6e1ca2"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "meta" : {
+                            "globalKey" : "568bf350",
+                            "externalKey" : "resetDates72"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "aac4bcfd"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "eb13047c"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "214e084d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d80"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "8"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30E/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-03",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -429,247 +289,387 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3837b"
-                              },
-                              "unadjustedDate" : "2018-04-03"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "c01e6313"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2026-02-08",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "primaryBusinessCenters",
-                                    "globalReference" : "27e4e9"
+                                    "globalReference" : "27e4e9",
+                                    "externalReference" : "primaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "eb13047c"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "214e084d"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "dc33ccc5"
-                              },
-                              "unadjustedDate" : "2026-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "dc33ccc5"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "30E/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "7e4c86b1"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4fa45fc6"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "959"
+                              "globalKey" : "2b92"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 6
+                            "rollConvention" : "8"
+                          },
+                          "meta" : {
+                            "globalKey" : "1d67881f",
+                            "externalKey" : "fixedCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "eb13047c"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "214e084d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "7a04f180"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "5ea34009"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "868490f4"
+                        "globalKey" : "f36770c6"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "71c6aa90"
+                    "globalKey" : "dea98a62"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "71c6aa90"
+                  "globalKey" : "dea98a62"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "40297447"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-LIBOR-BBA"
-                        },
-                        "indexTenor" : {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 6000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD",
                           "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                          }
                         }
                       }
-                    }
-                  },
-                  "quantity" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-LIBOR-BBA"
+                        },
+                        "indexTenor" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                            "globalKey" : "aa"
+                          }
                         }
                       },
-                      "value" : 6000.00
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "e07ebcd3"
                   },
+                  "meta" : {
+                    "globalKey" : "414190b3"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0253,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "value" : 0.0253,
                       "perUnitOf" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 6000.00,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
-                      },
-                      "value" : 6000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "2f58dd8d"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "3f62c17f",
+                  "externalReference" : "party1"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "b97c11f6",
+                  "externalReference" : "party2"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1101"
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "LEI1RPT0001",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "b8962566"
+                }
+              } ],
+              "name" : {
+                "value" : "Bank X"
               },
-              "value" : "2018-04-01"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+              "businessUnit" : [ {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "jjones"
+                    },
+                    "meta" : {
+                      "globalKey" : "baeb8c0d"
+                    }
+                  }
+                } ],
+                "firstName" : "jjone",
+                "meta" : {
+                  "globalKey" : "b793baa7",
+                  "externalKey" : "trader"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "3f62c17f",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "LEI2CP0002",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "LEI1RPT0001FFF"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "eb8edea1"
                 }
               } ],
-              "issuer" : {
+              "name" : {
+                "value" : "Bank Y"
+              },
+              "meta" : {
+                "globalKey" : "b97c11f6",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "8ffabe4b"
+                }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
+              },
+              "meta" : {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "LEI1RPT0001"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
               },
               "meta" : {
-                "globalKey" : "dfbaa1f2"
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "f6a6cc60",
+                "externalReference" : "clearing-svc"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
+              "role" : "ClearingOrganization",
+              "ownershipPartyReference" : {
+                "globalReference" : "3f62c17f",
+                "externalReference" : "party1"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "ca04fc14"
+            }
+          },
+          "meta" : {
+            "globalKey" : "ca04fc14"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "SEF123",
+      "meta" : {
+        "scheme" : "http://www.sef.com/msg_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "SEFCORP"
+    },
+    "sentTo" : [ {
+      "value" : "SDR01"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-04-01T14:20:36Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-04-01T14:20:36Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "SEF123"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "918f217e"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "f13f562c"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-07-Submission-3.json b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-07-Submission-3.json
index bbbcd5042f..3a9c63fe6e 100644
--- a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-07-Submission-3.json
+++ b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-07-Submission-3.json
@@ -1,187 +1,51 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "SEF123"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "918f217e"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.sef.com/msg_id"
-      },
-      "value" : "SEF123"
-    },
-    "sentBy" : {
-      "value" : "SEFCORP"
-    },
-    "sentTo" : [ {
-      "value" : "SDR01"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "38be5696"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "fb6408be"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "fb6408be"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "d5d99dff"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI1RPT0001"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "b8962566"
-                }
-              } ],
-              "person" : [ {
-                "firstName" : "jjone",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "b793baa7"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "jjones"
-                    },
-                    "meta" : {
-                      "globalKey" : "baeb8c0d"
-                    }
-                  }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "ee963b6"
-              },
-              "name" : {
-                "value" : "Bank Y"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI2CP0002"
-                },
-                "identifierType" : "LEI",
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "LEI1RPT0001",
                 "meta" : {
-                  "globalKey" : "eb8edea1"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
               },
-              "name" : {
-                "value" : "Up&Atem"
-              },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "LEI1RPT0001GGG",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
-                }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "d5d99dff"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing-svc",
-                "globalReference" : "611719a0"
+                "globalKey" : "fe90235d"
               },
-              "role" : "CLEARING_ORGANIZATION"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2018-04-01",
+              "meta" : {
+                "globalKey" : "3f1101"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "d5d99dff"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "ee963b6"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
                     "primaryAssetClass" : {
-                      "value" : "INTEREST_RATE"
+                      "value" : "InterestRate"
                     }
                   }, {
                     "source" : "ISDA",
                     "value" : {
                       "name" : {
+                        "value" : "InterestRate:IRSwap:FixedFloat",
                         "meta" : {
                           "scheme" : "http://www.fpml.org/coding-scheme/product-taxonomy"
-                        },
-                        "value" : "InterestRate:IRSwap:FixedFloat"
+                        }
                       }
                     }
                   }, {
@@ -192,46 +56,40 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "eb13047c"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "214e084d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d23"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3,
-                            "rollConvention" : "8"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-03",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -240,103 +98,108 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3837b"
-                              },
-                              "unadjustedDate" : "2018-04-03"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "floatingCalcPeriodDates",
-                            "globalKey" : "c7a104bd"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2026-02-08",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "USNY"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "primaryBusinessCenters",
-                                    "globalKey" : "27e4e9"
+                                    "globalKey" : "27e4e9",
+                                    "externalKey" : "primaryBusinessCenters"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "3662e8ba"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "f148ad32"
-                              },
-                              "unadjustedDate" : "2026-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "f148ad32"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "bd25ad04"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4fa45fc3"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "956"
+                              "globalKey" : "204f"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 3
+                            "rollConvention" : "8"
+                          },
+                          "meta" : {
+                            "globalKey" : "c513c70f",
+                            "externalKey" : "floatingCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "floatingRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
+                              "globalKey" : "aa"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "eb13047c"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "214e084d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "db523fbd"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "floatingCalcPeriodDates",
-                            "globalReference" : "c7a104bd"
+                            "globalReference" : "c513c70f",
+                            "externalReference" : "floatingCalcPeriodDates"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "ab2829fe"
+                              "globalKey" : "880414b2"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "GBLO"
@@ -345,82 +208,79 @@
                                 "globalKey" : "21479e"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "resetDates73",
-                              "globalReference" : "bfb28ba3"
+                              "globalReference" : "ead06251",
+                              "externalReference" : "resetDates73"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "resetDates73",
-                            "globalKey" : "bfb28ba3"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 3,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "aa"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "956"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 3
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "meta" : {
+                            "globalKey" : "ead06251",
+                            "externalKey" : "resetDates73"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "3f092bfe"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
-                              },
-                              "meta" : {
-                                "globalKey" : "eb13047c"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "214e084d"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "12d80"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "8"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30E/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-03",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -429,247 +289,387 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3837b"
-                              },
-                              "unadjustedDate" : "2018-04-03"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "fixedCalcPeriodDates",
-                            "globalKey" : "c01e6313"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2026-02-08",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCentersReference" : {
-                                    "externalReference" : "primaryBusinessCenters",
-                                    "globalReference" : "27e4e9"
+                                    "globalReference" : "27e4e9",
+                                    "externalReference" : "primaryBusinessCenters"
                                   },
                                   "meta" : {
                                     "globalKey" : "eb13047c"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "214e084d"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "dc33ccc5"
-                              },
-                              "unadjustedDate" : "2026-02-08"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "dc33ccc5"
                             }
-                          }
-                        },
-                        "dayCountFraction" : {
-                          "value" : "30E/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "7e4c86b1"
-                        },
-                        "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4fa45fc6"
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                          "paymentDatesAdjustments" : {
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "primaryBusinessCenters",
-                                "globalReference" : "27e4e9"
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
                               },
                               "meta" : {
                                 "globalKey" : "eb13047c"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "214e084d"
                             }
                           },
-                          "paymentFrequency" : {
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "959"
+                              "globalKey" : "2b92"
                             },
-                            "period" : "M",
-                            "periodMultiplier" : 6
+                            "rollConvention" : "8"
+                          },
+                          "meta" : {
+                            "globalKey" : "1d67881f",
+                            "externalKey" : "fixedCalcPeriodDates"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
+                        "paymentDates" : {
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
                             "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
+                              "globalKey" : "107"
+                            }
+                          },
+                          "payRelativeTo" : "CalculationPeriodEndDate",
+                          "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "27e4e9",
+                                "externalReference" : "primaryBusinessCenters"
+                              },
+                              "meta" : {
+                                "globalKey" : "eb13047c"
                               }
+                            },
+                            "meta" : {
+                              "globalKey" : "214e084d"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "7a04f180"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "5ea34009"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "ca0faeb5"
+                        "globalKey" : "36f28e87"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "b551c851"
+                    "globalKey" : "2234a823"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "b551c851"
+                  "globalKey" : "2234a823"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "b433906"
-                  },
-                  "observable" : {
-                    "meta" : {
-                      "globalKey" : "5f0c6d05"
-                    },
-                    "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
-                      "value" : {
-                        "floatingRateIndex" : {
-                          "value" : "USD-LIBOR-BBA"
-                        },
-                        "indexTenor" : {
+                  "quantity" : [ {
+                    "value" : {
+                      "value" : 5000.00,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "USD",
                           "meta" : {
-                            "globalKey" : "956"
-                          },
-                          "period" : "M",
-                          "periodMultiplier" : 3
+                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
+                          }
                         }
                       }
-                    }
-                  },
-                  "quantity" : [ {
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
+                    }
+                  } ],
+                  "observable" : {
+                    "rateOption" : {
+                      "value" : {
+                        "floatingRateIndex" : {
+                          "value" : "USD-LIBOR-BBA"
+                        },
+                        "indexTenor" : {
+                          "periodMultiplier" : 3,
+                          "period" : "M",
                           "meta" : {
-                            "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                            "globalKey" : "aa"
+                          }
                         }
                       },
-                      "value" : 5000.00
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "828026c7"
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "ab988192"
                   },
+                  "meta" : {
+                    "globalKey" : "f097b2b2"
+                  }
+                }, {
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0253,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "value" : 0.0253,
                       "perUnitOf" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ],
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 5000.00,
                       "unit" : {
                         "currency" : {
+                          "value" : "USD",
                           "meta" : {
                             "scheme" : "http://www.fpml.org/coding-scheme/external/iso4217"
-                          },
-                          "value" : "USD"
+                          }
                         }
-                      },
-                      "value" : 5000.00
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "c777b0ae"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "3f62c17f",
+                  "externalReference" : "party1"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "b97c11f6",
+                  "externalReference" : "party2"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1101"
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "LEI1RPT0001",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "b8962566"
+                }
+              } ],
+              "name" : {
+                "value" : "Bank X"
               },
-              "value" : "2018-04-01"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+              "businessUnit" : [ {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "jjones"
+                    },
+                    "meta" : {
+                      "globalKey" : "baeb8c0d"
+                    }
+                  }
+                } ],
+                "firstName" : "jjone",
+                "meta" : {
+                  "globalKey" : "b793baa7",
+                  "externalKey" : "trader"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "3f62c17f",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "LEI2CP0002",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "LEI1RPT0001GGG"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "eb8edea1"
                 }
               } ],
-              "issuer" : {
+              "name" : {
+                "value" : "Bank Y"
+              },
+              "meta" : {
+                "globalKey" : "b97c11f6",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "8ffabe4b"
+                }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
+              },
+              "meta" : {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "LEI1RPT0001"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
               },
               "meta" : {
-                "globalKey" : "e17e0671"
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "f6a6cc60",
+                "externalReference" : "clearing-svc"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
+              "role" : "ClearingOrganization",
+              "ownershipPartyReference" : {
+                "globalReference" : "3f62c17f",
+                "externalReference" : "party1"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "7c6f41b4"
+            }
+          },
+          "meta" : {
+            "globalKey" : "7c6f41b4"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "SEF123",
+      "meta" : {
+        "scheme" : "http://www.sef.com/msg_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "SEFCORP"
+    },
+    "sentTo" : [ {
+      "value" : "SDR01"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-04-01T14:21:36Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-04-01T14:21:36Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "SEF123"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "918f217e"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "45638a28"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-08-Submission-1.json b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-08-Submission-1.json
index 46188595fa..826445ea88 100644
--- a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-08-Submission-1.json
+++ b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-08-Submission-1.json
@@ -1,160 +1,37 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "SEF123"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "918f217e"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.sef.com/msg_id"
-      },
-      "value" : "SEF123"
-    },
-    "sentBy" : {
-      "value" : "SEFCORP"
-    },
-    "sentTo" : [ {
-      "value" : "SDR01"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "382d384f"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "7a7e264f"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "f762a007"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "d5d99dff"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI1RPT0001"
-                },
-                "identifierType" : "LEI",
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "LEI1RPT0001",
                 "meta" : {
-                  "globalKey" : "b8962566"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ],
-              "person" : [ {
-                "firstName" : "jjone",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "b793baa7"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "jjones"
-                    },
-                    "meta" : {
-                      "globalKey" : "baeb8c0d"
-                    }
-                  }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "ee963b6"
               },
-              "name" : {
-                "value" : "Bank Y"
-              },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "LEI1RPT0001HHH",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI2CP0002"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "eb8edea1"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
+                "globalKey" : "fe909b9c"
               },
-              "name" : {
-                "value" : "Up&Atem"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
-                }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "d5d99dff"
-              },
-              "partyReference" : {
-                "externalReference" : "broker1",
-                "globalReference" : "ed0cc6d1"
-              },
-              "role" : "ARRANGING_BROKER"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2018-04-01",
+              "meta" : {
+                "globalKey" : "3f1101"
+              }
+            },
             "tradableProduct" : {
-              "ancillaryParty" : [ {
-                "partyReference" : [ {
-                  "externalReference" : "party2",
-                  "globalReference" : "ee963b6"
-                } ],
-                "role" : "CALCULATION_AGENT_INDEPENDENT"
-              } ],
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "d5d99dff"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "ee963b6"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -162,31 +39,23 @@
                     "productQualifier" : "InterestRate_Option_Swaption"
                   } ],
                   "economicTerms" : {
-                    "calculationAgent" : {
-                      "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-                    },
                     "payout" : {
-                      "meta" : {
-                        "globalKey" : "e009cd18"
-                      },
                       "optionPayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "settlementTerms" : {
-                          "meta" : {
-                            "globalKey" : "75041c4"
-                          },
                           "settlementDate" : {
                             "adjustableOrRelativeDate" : {
                               "relativeDate" : {
+                                "periodMultiplier" : 2,
+                                "period" : "D",
                                 "meta" : {
-                                  "globalKey" : "6e5a630"
+                                  "globalKey" : "954e996c"
                                 },
-                                "period" : "D",
-                                "periodMultiplier" : 2,
-                                "dayType" : "BUSINESS",
+                                "dayType" : "Business",
+                                "businessDayConvention" : "NONE",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "EUTA"
@@ -195,39 +64,22 @@
                                     "globalKey" : "20a71d"
                                   }
                                 },
-                                "businessDayConvention" : "NONE",
                                 "dateRelativeTo" : {
-                                  "externalReference" : "europeanExercise0",
-                                  "globalReference" : "3f30e6b8"
+                                  "globalReference" : "c04e26de",
+                                  "externalReference" : "europeanExercise0"
                                 }
                               }
                             },
                             "meta" : {
-                              "globalKey" : "6e5a630"
+                              "globalKey" : "954e996c"
                             }
                           },
+                          "meta" : {
+                            "globalKey" : "940c5744"
+                          },
                           "cashSettlementTerms" : [ {
-                            "cashSettlementMethod" : "PAR_YIELD_CURVE_UNADJUSTED_METHOD",
-                            "meta" : {
-                              "externalKey" : "cashSettlement0",
-                              "globalKey" : "d90b9394"
-                            },
-                            "valuationDate" : {
-                              "valuationDate" : {
-                                "meta" : {
-                                  "globalKey" : "7e857845"
-                                },
-                                "period" : "D",
-                                "periodMultiplier" : 0,
-                                "businessDayConvention" : "NONE",
-                                "dateRelativeTo" : {
-                                  "externalReference" : "europeanExercise0",
-                                  "globalReference" : "3f30e6b8"
-                                }
-                              }
-                            },
+                            "cashSettlementMethod" : "ParYieldCurveUnadjustedMethod",
                             "valuationMethod" : {
-                              "quotationMethod" : "MID",
                               "valuationSource" : {
                                 "informationSource" : {
                                   "primarySource" : {
@@ -236,72 +88,48 @@
                                     }
                                   }
                                 }
+                              },
+                              "quotationMethod" : "Mid"
+                            },
+                            "valuationDate" : {
+                              "valuationDate" : {
+                                "periodMultiplier" : 0,
+                                "period" : "D",
+                                "meta" : {
+                                  "globalKey" : "7ae6233d"
+                                },
+                                "businessDayConvention" : "NONE",
+                                "dateRelativeTo" : {
+                                  "globalReference" : "c04e26de",
+                                  "externalReference" : "europeanExercise0"
+                                }
                               }
                             },
                             "valuationTime" : {
+                              "hourMinuteTime" : "11:00:00",
                               "businessCenter" : {
                                 "value" : "EUTA"
-                              },
-                              "hourMinuteTime" : "11:00:00"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "f67cabd8",
+                              "externalKey" : "cashSettlement0"
                             }
                           } ]
                         },
                         "buyerSeller" : {
-                          "buyer" : "PARTY_1",
-                          "seller" : "PARTY_2"
+                          "buyer" : "Party1",
+                          "seller" : "Party2"
                         },
+                        "optionType" : "Straddle",
                         "exerciseTerms" : {
-                          "exerciseProcedure" : {
-                            "followUpConfirmation" : true,
-                            "manualExercise" : {
-                              "exerciseNotice" : {
-                                "businessCenter" : {
-                                  "value" : "BEBR"
-                                },
-                                "exerciseNoticeGiver" : "BUYER"
-                              }
-                            }
-                          },
                           "optionStyle" : {
                             "europeanExercise" : {
-                              "earliestExerciseTime" : {
-                                "businessCenter" : {
-                                  "value" : "GBLO"
-                                },
-                                "hourMinuteTime" : "09:00:00"
-                              },
-                              "exerciseFee" : {
-                                "payer" : "PARTY_1",
-                                "receiver" : "PARTY_2",
-                                "feeAmount" : 100000,
-                                "feePaymentDate" : {
-                                  "meta" : {
-                                    "globalKey" : "d2cddbaa"
-                                  },
-                                  "period" : "D",
-                                  "periodMultiplier" : 0,
-                                  "businessCenters" : {
-                                    "businessCenter" : [ {
-                                      "value" : "EUTA"
-                                    } ],
-                                    "meta" : {
-                                      "globalKey" : "20a71d"
-                                    }
-                                  },
-                                  "businessDayConvention" : "NONE",
-                                  "dateRelativeTo" : {
-                                    "externalReference" : "europeanExercise0",
-                                    "globalReference" : "3f30e6b8"
-                                  }
-                                },
-                                "notionalReference" : {
-                                  "externalReference" : "notional0",
-                                  "globalReference" : "0"
-                                }
-                              },
                               "expirationDate" : [ {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2019-04-01",
                                   "dateAdjustments" : {
+                                    "businessDayConvention" : "FOLLOWING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
@@ -312,37 +140,77 @@
                                         "globalKey" : "4158421"
                                       }
                                     },
-                                    "businessDayConvention" : "FOLLOWING",
                                     "meta" : {
                                       "globalKey" : "da3b6050"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "4a5f542f"
-                                  },
-                                  "unadjustedDate" : "2019-04-01"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "4a5f542f"
                                 }
                               } ],
+                              "earliestExerciseTime" : {
+                                "hourMinuteTime" : "09:00:00",
+                                "businessCenter" : {
+                                  "value" : "GBLO"
+                                }
+                              },
                               "expirationTime" : {
+                                "hourMinuteTime" : "11:00:00",
                                 "businessCenter" : {
                                   "value" : "GBLO"
+                                }
+                              },
+                              "exerciseFee" : {
+                                "payer" : "Party1",
+                                "receiver" : "Party2",
+                                "notionalReference" : {
+                                  "globalReference" : "0",
+                                  "externalReference" : "notional0"
                                 },
-                                "hourMinuteTime" : "11:00:00"
+                                "feeAmount" : 100000,
+                                "feePaymentDate" : {
+                                  "periodMultiplier" : 0,
+                                  "period" : "D",
+                                  "meta" : {
+                                    "globalKey" : "4825adb2"
+                                  },
+                                  "businessDayConvention" : "NONE",
+                                  "businessCenters" : {
+                                    "businessCenter" : [ {
+                                      "value" : "EUTA"
+                                    } ],
+                                    "meta" : {
+                                      "globalKey" : "20a71d"
+                                    }
+                                  },
+                                  "dateRelativeTo" : {
+                                    "globalReference" : "c04e26de",
+                                    "externalReference" : "europeanExercise0"
+                                  }
+                                }
                               },
                               "meta" : {
-                                "externalKey" : "europeanExercise0",
-                                "globalKey" : "3f30e6b8"
+                                "globalKey" : "c04e26de",
+                                "externalKey" : "europeanExercise0"
                               }
                             }
+                          },
+                          "exerciseProcedure" : {
+                            "manualExercise" : {
+                              "exerciseNotice" : {
+                                "exerciseNoticeGiver" : "Buyer",
+                                "businessCenter" : {
+                                  "value" : "BEBR"
+                                }
+                              }
+                            },
+                            "followUpConfirmation" : true
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "e009cd18"
-                        },
-                        "optionType" : "STRADDLE",
                         "underlier" : {
                           "contractualProduct" : {
                             "productTaxonomy" : [ {
@@ -353,47 +221,43 @@
                               "payout" : {
                                 "interestRatePayout" : [ {
                                   "payerReceiver" : {
-                                    "payer" : "PARTY_1",
-                                    "receiver" : "PARTY_2"
+                                    "payer" : "Party1",
+                                    "receiver" : "Party2"
                                   },
                                   "priceQuantity" : {
-                                    "meta" : {
-                                      "externalKey" : "notional0",
-                                      "globalKey" : "0"
-                                    },
                                     "quantitySchedule" : {
                                       "address" : {
                                         "scope" : "DOCUMENT",
                                         "value" : "quantity-1"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "0",
+                                      "externalKey" : "notional0"
                                     }
                                   },
-                                  "calculationPeriodDates" : {
-                                    "calculationPeriodDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "accrualBusinessCenters0",
-                                          "globalReference" : "20a71d"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "622268e1"
+                                  "rateSpecification" : {
+                                    "fixedRate" : {
+                                      "rateSchedule" : {
+                                        "price" : {
+                                          "address" : {
+                                            "scope" : "DOCUMENT",
+                                            "value" : "price-1"
+                                          }
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
-                                        "globalKey" : "985d6cb2"
+                                        "globalKey" : "0"
                                       }
-                                    },
-                                    "calculationPeriodFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "2b934"
-                                      },
-                                      "period" : "Y",
-                                      "periodMultiplier" : 1,
-                                      "rollConvention" : "30"
-                                    },
+                                    }
+                                  },
+                                  "dayCountFraction" : {
+                                    "value" : "30/360"
+                                  },
+                                  "calculationPeriodDates" : {
                                     "effectiveDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2019-04-03",
                                         "dateAdjustments" : {
                                           "businessDayConvention" : "NONE",
                                           "meta" : {
@@ -402,135 +266,133 @@
                                         },
                                         "meta" : {
                                           "globalKey" : "ed018b7b"
-                                        },
-                                        "unadjustedDate" : "2019-04-03"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "ed018b7b"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "CalcPeriodDates0",
-                                      "globalKey" : "b7d99d20"
-                                    },
                                     "terminationDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2024-04-03",
                                         "dateAdjustments" : {
+                                          "businessDayConvention" : "MODFOLLOWING",
                                           "businessCenters" : {
                                             "businessCenter" : [ {
                                               "value" : "EUTA"
                                             } ],
                                             "meta" : {
-                                              "externalKey" : "accrualBusinessCenters0",
-                                              "globalKey" : "20a71d"
+                                              "globalKey" : "20a71d",
+                                              "externalKey" : "accrualBusinessCenters0"
                                             }
                                           },
-                                          "businessDayConvention" : "MODFOLLOWING",
                                           "meta" : {
                                             "globalKey" : "365baaee"
                                           }
                                         },
                                         "meta" : {
                                           "globalKey" : "759b93cb"
-                                        },
-                                        "unadjustedDate" : "2024-04-03"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "759b93cb"
                                       }
+                                    },
+                                    "calculationPeriodDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "20a71d",
+                                          "externalReference" : "accrualBusinessCenters0"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "622268e1"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "985d6cb2"
+                                      }
+                                    },
+                                    "calculationPeriodFrequency" : {
+                                      "periodMultiplier" : 1,
+                                      "period" : "Y",
+                                      "meta" : {
+                                        "globalKey" : "17984"
+                                      },
+                                      "rollConvention" : "30"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "e58937b0",
+                                      "externalKey" : "CalcPeriodDates0"
                                     }
                                   },
-                                  "dayCountFraction" : {
-                                    "value" : "30/360"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "beafa721"
-                                  },
                                   "paymentDates" : {
-                                    "meta" : {
-                                      "globalKey" : "4d64aef4"
+                                    "paymentFrequency" : {
+                                      "periodMultiplier" : 1,
+                                      "period" : "Y",
+                                      "meta" : {
+                                        "globalKey" : "78"
+                                      }
                                     },
-                                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                                    "payRelativeTo" : "CalculationPeriodEndDate",
                                     "paymentDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
                                       "businessCenters" : {
                                         "businessCenter" : [ {
                                           "value" : "EUTA"
                                         } ],
                                         "meta" : {
-                                          "externalKey" : "paymentBusinessCenters0",
-                                          "globalKey" : "20a71d"
+                                          "globalKey" : "20a71d",
+                                          "externalKey" : "paymentBusinessCenters0"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
                                         "globalKey" : "365baaee"
                                       }
                                     },
-                                    "paymentFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "ac8"
-                                      },
-                                      "period" : "Y",
-                                      "periodMultiplier" : 1
+                                    "meta" : {
+                                      "globalKey" : "9b0d9350"
                                     }
                                   },
-                                  "rateSpecification" : {
-                                    "fixedRate" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
-                                      "rateSchedule" : {
-                                        "price" : {
-                                          "address" : {
-                                            "scope" : "DOCUMENT",
-                                            "value" : "price-1"
-                                          }
-                                        }
-                                      }
-                                    }
+                                  "meta" : {
+                                    "globalKey" : "f1b753b5"
                                   }
                                 }, {
                                   "payerReceiver" : {
-                                    "payer" : "PARTY_2",
-                                    "receiver" : "PARTY_1"
+                                    "payer" : "Party2",
+                                    "receiver" : "Party1"
                                   },
                                   "priceQuantity" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
                                     "quantitySchedule" : {
                                       "address" : {
                                         "scope" : "DOCUMENT",
                                         "value" : "quantity-2"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "0"
                                     }
                                   },
-                                  "calculationPeriodDates" : {
-                                    "calculationPeriodDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "accrualBusinessCenters1",
-                                          "globalReference" : "20a71d"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "622268e2"
+                                  "rateSpecification" : {
+                                    "floatingRate" : {
+                                      "rateOption" : {
+                                        "address" : {
+                                          "scope" : "DOCUMENT",
+                                          "value" : "rateOption-1"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
-                                        "globalKey" : "985d6cb3"
+                                        "globalKey" : "0"
                                       }
-                                    },
-                                    "calculationPeriodFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "28cc3"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6,
-                                      "rollConvention" : "30"
-                                    },
+                                    }
+                                  },
+                                  "dayCountFraction" : {
+                                    "value" : "ACT/360"
+                                  },
+                                  "calculationPeriodDates" : {
                                     "effectiveDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2019-04-03",
                                         "dateAdjustments" : {
                                           "businessDayConvention" : "NONE",
                                           "meta" : {
@@ -539,314 +401,421 @@
                                         },
                                         "meta" : {
                                           "globalKey" : "ed018b7b"
-                                        },
-                                        "unadjustedDate" : "2019-04-03"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "ed018b7b"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "CalcPeriodDates1",
-                                      "globalKey" : "aade2c10"
-                                    },
                                     "terminationDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2024-04-03",
                                         "dateAdjustments" : {
+                                          "businessDayConvention" : "MODFOLLOWING",
                                           "businessCenters" : {
                                             "businessCenter" : [ {
                                               "value" : "EUTA"
                                             } ],
                                             "meta" : {
-                                              "externalKey" : "accrualBusinessCenters1",
-                                              "globalKey" : "20a71d"
+                                              "globalKey" : "20a71d",
+                                              "externalKey" : "accrualBusinessCenters1"
                                             }
                                           },
-                                          "businessDayConvention" : "MODFOLLOWING",
                                           "meta" : {
                                             "globalKey" : "365baaee"
                                           }
                                         },
                                         "meta" : {
                                           "globalKey" : "759b93cb"
-                                        },
-                                        "unadjustedDate" : "2024-04-03"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "759b93cb"
                                       }
-                                    }
-                                  },
-                                  "dayCountFraction" : {
-                                    "value" : "ACT/360"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "37419ebd"
-                                  },
-                                  "paymentDates" : {
-                                    "meta" : {
-                                      "globalKey" : "4d64ad85"
                                     },
-                                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
-                                    "paymentDatesAdjustments" : {
+                                    "calculationPeriodDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
                                       "businessCenters" : {
-                                        "businessCenter" : [ {
-                                          "value" : "EUTA"
-                                        } ],
+                                        "businessCentersReference" : {
+                                          "globalReference" : "20a71d",
+                                          "externalReference" : "accrualBusinessCenters1"
+                                        },
                                         "meta" : {
-                                          "externalKey" : "paymentBusinessCenters1",
-                                          "globalKey" : "20a71d"
+                                          "globalKey" : "622268e2"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
-                                        "globalKey" : "365baaee"
+                                        "globalKey" : "985d6cb3"
                                       }
                                     },
-                                    "paymentFrequency" : {
+                                    "calculationPeriodFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
                                       "meta" : {
-                                        "globalKey" : "959"
+                                        "globalKey" : "18ad5"
                                       },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6
+                                      "rollConvention" : "30"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "e5976082",
+                                      "externalKey" : "CalcPeriodDates1"
                                     }
                                   },
-                                  "rateSpecification" : {
-                                    "floatingRate" : {
+                                  "paymentDates" : {
+                                    "paymentFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
                                       "meta" : {
-                                        "globalKey" : "0"
-                                      },
-                                      "rateOption" : {
-                                        "address" : {
-                                          "scope" : "DOCUMENT",
-                                          "value" : "rateOption-1"
+                                        "globalKey" : "107"
+                                      }
+                                    },
+                                    "payRelativeTo" : "CalculationPeriodEndDate",
+                                    "paymentDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCenter" : [ {
+                                          "value" : "EUTA"
+                                        } ],
+                                        "meta" : {
+                                          "globalKey" : "20a71d",
+                                          "externalKey" : "paymentBusinessCenters1"
                                         }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "365baaee"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "8f129421"
                                     }
                                   },
                                   "resetDates" : {
                                     "calculationPeriodDatesReference" : {
-                                      "externalReference" : "CalcPeriodDates1",
-                                      "globalReference" : "aade2c10"
+                                      "globalReference" : "e5976082",
+                                      "externalReference" : "CalcPeriodDates1"
                                     },
+                                    "resetRelativeTo" : "CalculationPeriodStartDate",
                                     "fixingDates" : {
+                                      "periodMultiplier" : -2,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "2d80ce65"
+                                        "globalKey" : "a5cb919"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : -2,
-                                      "dayType" : "BUSINESS",
+                                      "dayType" : "Business",
+                                      "businessDayConvention" : "NONE",
                                       "businessCenters" : {
                                         "businessCenter" : [ {
                                           "value" : "EUTA"
                                         } ],
                                         "meta" : {
-                                          "externalKey" : "fixingBusinessCenters0",
-                                          "globalKey" : "20a71d"
+                                          "globalKey" : "20a71d",
+                                          "externalKey" : "fixingBusinessCenters0"
                                         }
                                       },
-                                      "businessDayConvention" : "NONE",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "resetDates0",
-                                        "globalReference" : "3522cca9"
+                                        "globalReference" : "dbaefb1",
+                                        "externalReference" : "resetDates0"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "resetDates0",
-                                      "globalKey" : "3522cca9"
+                                    "resetFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "107"
+                                      }
                                     },
                                     "resetDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
                                       "businessCenters" : {
                                         "businessCentersReference" : {
-                                          "externalReference" : "paymentBusinessCenters1",
-                                          "globalReference" : "20a71d"
+                                          "globalReference" : "20a71d",
+                                          "externalReference" : "paymentBusinessCenters1"
                                         },
                                         "meta" : {
                                           "globalKey" : "e30c2739"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
                                         "globalKey" : "19472b0a"
                                       }
                                     },
-                                    "resetFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "959"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6
-                                    },
-                                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                                    "meta" : {
+                                      "globalKey" : "dbaefb1",
+                                      "externalKey" : "resetDates0"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "aceec753"
                                   }
                                 } ],
                                 "meta" : {
-                                  "globalKey" : "f2ba977c"
+                                  "globalKey" : "2f30d0fe"
                                 }
                               }
                             },
                             "meta" : {
-                              "globalKey" : "f2ba977c"
+                              "globalKey" : "2f30d0fe"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "f2ba977c"
+                            "globalKey" : "2f30d0fe"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "b865faa2"
                         }
-                      } ]
+                      } ],
+                      "meta" : {
+                        "globalKey" : "b865faa2"
+                      }
+                    },
+                    "calculationAgent" : {
+                      "calculationAgentParty" : "CalculationAgentIndependent"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "bdc64102"
+                    "globalKey" : "831dc30c"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "bdc64102"
+                  "globalKey" : "831dc30c"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "87486928"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.05,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "value" : 0.05,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 13000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "EUR"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "61c4bbd8"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 13000,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
-                      },
-                      "value" : 13000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "6de8e6e3"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "bf589e11"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "EUR-EURIBOR-Telerate"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
+                          "periodMultiplier" : 6,
                           "period" : "M",
-                          "periodMultiplier" : 6
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "EUR"
-                        }
-                      },
-                      "value" : 13000
+                    "meta" : {
+                      "globalKey" : "2bba2221"
                     }
-                  } ]
+                  },
+                  "meta" : {
+                    "globalKey" : "e41ee335"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "3f62c17f",
+                  "externalReference" : "party1"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "b97c11f6",
+                  "externalReference" : "party2"
+                }
+              } ],
+              "ancillaryParty" : [ {
+                "role" : "CalculationAgentIndependent",
+                "partyReference" : [ {
+                  "globalReference" : "b97c11f6",
+                  "externalReference" : "party2"
                 } ]
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1101"
-              },
-              "value" : "2018-04-01"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "LEI1RPT0001",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "LEI1RPT0001HHH"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "b8962566"
                 }
               } ],
-              "issuer" : {
+              "name" : {
+                "value" : "Bank X"
+              },
+              "businessUnit" : [ {
+                "name" : "NY Swaps Desk",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "jjones"
+                    },
+                    "meta" : {
+                      "globalKey" : "baeb8c0d"
+                    }
+                  }
+                } ],
+                "firstName" : "jjone",
+                "meta" : {
+                  "globalKey" : "b793baa7",
+                  "externalKey" : "trader"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "3f62c17f",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "LEI2CP0002",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "eb8edea1"
+                }
+              } ],
+              "name" : {
+                "value" : "Bank Y"
+              },
+              "meta" : {
+                "globalKey" : "b97c11f6",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "LEI1RPT0001"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "8ffabe4b"
+                }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
               },
               "meta" : {
-                "globalKey" : "e3416af0"
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "ce0b9311",
+                "externalReference" : "broker1"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
+              "role" : "ArrangingBroker",
+              "ownershipPartyReference" : {
+                "globalReference" : "3f62c17f",
+                "externalReference" : "party1"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "6f943555"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "5e54abf6"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "d5d99dff"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "ee963b6"
-                }
-              },
               "quantity" : {
+                "value" : 100000,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "3f62c17f",
+                  "externalReference" : "party1"
                 },
-                "value" : 100000
+                "receiverPartyReference" : {
+                  "globalReference" : "b97c11f6",
+                  "externalReference" : "party2"
+                }
               },
               "settlementDate" : {
+                "unadjustedDate" : "2018-04-01",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "EUTA"
@@ -855,28 +824,59 @@
                       "globalKey" : "20a71d"
                     }
                   },
-                  "businessDayConvention" : "FOLLOWING",
                   "meta" : {
                     "globalKey" : "211dc30c"
                   }
-                },
-                "unadjustedDate" : "2018-04-01"
+                }
               },
               "transferExpression" : {
-                "priceTransfer" : "PREMIUM"
+                "priceTransfer" : "Premium"
               }
+            },
+            "meta" : {
+              "globalKey" : "dfb43c0e"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "eaa1dd9"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "SEF123",
+      "meta" : {
+        "scheme" : "http://www.sef.com/msg_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "SEFCORP"
+    },
+    "sentTo" : [ {
+      "value" : "SDR01"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-04-01T14:15:36Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-04-01T14:15:36Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "SEF123"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "918f217e"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "df3e598b"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-09-Submission-1.json b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-09-Submission-1.json
index 53f2651990..3a91e573c0 100644
--- a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-09-Submission-1.json
+++ b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-09-Submission-1.json
@@ -1,160 +1,37 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "SEF123"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "918f217e"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.sef.com/msg_id"
-      },
-      "value" : "SEF123"
-    },
-    "sentBy" : {
-      "value" : "SEFCORP"
-    },
-    "sentTo" : [ {
-      "value" : "SDR01"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "ce12e07a"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "4d94fafb"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "5831fc19"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "d5d99dff"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI1RPT0001"
-                },
-                "identifierType" : "LEI",
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "LEI1RPT0001",
                 "meta" : {
-                  "globalKey" : "b8962566"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ],
-              "person" : [ {
-                "firstName" : "jjone",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "b793baa7"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "jjones"
-                    },
-                    "meta" : {
-                      "globalKey" : "baeb8c0d"
-                    }
-                  }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "ee963b6"
-              },
-              "name" : {
-                "value" : "Bank Y"
               },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "LEI1RPT0001IIII",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI2CP0002"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "eb8edea1"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
-              },
-              "name" : {
-                "value" : "Up&Atem"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
-                }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "d5d99dff"
-              },
-              "partyReference" : {
-                "externalReference" : "broker1",
-                "globalReference" : "ed0cc6d1"
+                "globalKey" : "7ab7b578"
               },
-              "role" : "ARRANGING_BROKER"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2018-05-01",
+              "meta" : {
+                "globalKey" : "3f1141"
+              }
+            },
             "tradableProduct" : {
-              "ancillaryParty" : [ {
-                "partyReference" : [ {
-                  "externalReference" : "party2",
-                  "globalReference" : "ee963b6"
-                } ],
-                "role" : "CALCULATION_AGENT_INDEPENDENT"
-              } ],
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "d5d99dff"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "ee963b6"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -162,17 +39,11 @@
                     "productQualifier" : "InterestRate_Option_Swaption"
                   } ],
                   "economicTerms" : {
-                    "calculationAgent" : {
-                      "calculationAgentParty" : "CALCULATION_AGENT_INDEPENDENT"
-                    },
                     "payout" : {
-                      "meta" : {
-                        "globalKey" : "903e7714"
-                      },
                       "optionPayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "settlementTerms" : {
                           "meta" : {
@@ -186,32 +57,17 @@
                           }
                         },
                         "buyerSeller" : {
-                          "buyer" : "PARTY_1",
-                          "seller" : "PARTY_2"
+                          "buyer" : "Party1",
+                          "seller" : "Party2"
                         },
                         "exerciseTerms" : {
-                          "exerciseProcedure" : {
-                            "followUpConfirmation" : true,
-                            "manualExercise" : {
-                              "exerciseNotice" : {
-                                "businessCenter" : {
-                                  "value" : "GBLO"
-                                },
-                                "exerciseNoticeGiver" : "SELLER"
-                              }
-                            }
-                          },
                           "optionStyle" : {
                             "europeanExercise" : {
-                              "earliestExerciseTime" : {
-                                "businessCenter" : {
-                                  "value" : "BEBR"
-                                },
-                                "hourMinuteTime" : "09:00:00"
-                              },
                               "expirationDate" : [ {
                                 "adjustableDate" : {
+                                  "unadjustedDate" : "2021-12-30",
                                   "dateAdjustments" : {
+                                    "businessDayConvention" : "FOLLOWING",
                                     "businessCenters" : {
                                       "businessCenter" : [ {
                                         "value" : "EUTA"
@@ -222,35 +78,47 @@
                                         "globalKey" : "4158421"
                                       }
                                     },
-                                    "businessDayConvention" : "FOLLOWING",
                                     "meta" : {
                                       "globalKey" : "da3b6050"
                                     }
                                   },
                                   "meta" : {
                                     "globalKey" : "e4091772"
-                                  },
-                                  "unadjustedDate" : "2021-12-30"
+                                  }
                                 },
                                 "meta" : {
                                   "globalKey" : "e4091772"
                                 }
                               } ],
+                              "earliestExerciseTime" : {
+                                "hourMinuteTime" : "09:00:00",
+                                "businessCenter" : {
+                                  "value" : "BEBR"
+                                }
+                              },
                               "expirationTime" : {
+                                "hourMinuteTime" : "11:00:00",
                                 "businessCenter" : {
                                   "value" : "BEBR"
-                                },
-                                "hourMinuteTime" : "11:00:00"
+                                }
                               },
                               "meta" : {
-                                "globalKey" : "38fb3b53"
+                                "globalKey" : "3a8d6d3"
                               }
                             }
+                          },
+                          "exerciseProcedure" : {
+                            "manualExercise" : {
+                              "exerciseNotice" : {
+                                "exerciseNoticeGiver" : "Seller",
+                                "businessCenter" : {
+                                  "value" : "GBLO"
+                                }
+                              }
+                            },
+                            "followUpConfirmation" : true
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "903e7714"
-                        },
                         "underlier" : {
                           "contractualProduct" : {
                             "productTaxonomy" : [ {
@@ -261,46 +129,42 @@
                               "payout" : {
                                 "interestRatePayout" : [ {
                                   "payerReceiver" : {
-                                    "payer" : "PARTY_1",
-                                    "receiver" : "PARTY_2"
+                                    "payer" : "Party1",
+                                    "receiver" : "Party2"
                                   },
                                   "priceQuantity" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
                                     "quantitySchedule" : {
                                       "address" : {
                                         "scope" : "DOCUMENT",
                                         "value" : "quantity-1"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "0"
                                     }
                                   },
-                                  "calculationPeriodDates" : {
-                                    "calculationPeriodDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "accrualBusinessCenters0",
-                                          "globalReference" : "20a71d"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "622268e1"
+                                  "rateSpecification" : {
+                                    "fixedRate" : {
+                                      "rateSchedule" : {
+                                        "price" : {
+                                          "address" : {
+                                            "scope" : "DOCUMENT",
+                                            "value" : "price-1"
+                                          }
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
-                                        "globalKey" : "985d6cb2"
+                                        "globalKey" : "0"
                                       }
-                                    },
-                                    "calculationPeriodFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "2b934"
-                                      },
-                                      "period" : "Y",
-                                      "periodMultiplier" : 1,
-                                      "rollConvention" : "30"
-                                    },
+                                    }
+                                  },
+                                  "dayCountFraction" : {
+                                    "value" : "30/360"
+                                  },
+                                  "calculationPeriodDates" : {
                                     "effectiveDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2019-04-03",
                                         "dateAdjustments" : {
                                           "businessDayConvention" : "NONE",
                                           "meta" : {
@@ -309,135 +173,133 @@
                                         },
                                         "meta" : {
                                           "globalKey" : "ed018b7b"
-                                        },
-                                        "unadjustedDate" : "2019-04-03"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "ed018b7b"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "CalcPeriodDates0",
-                                      "globalKey" : "5b4ecbe5"
-                                    },
                                     "terminationDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2021-12-30",
                                         "dateAdjustments" : {
+                                          "businessDayConvention" : "MODFOLLOWING",
                                           "businessCenters" : {
                                             "businessCenter" : [ {
                                               "value" : "EUTA"
                                             } ],
                                             "meta" : {
-                                              "externalKey" : "accrualBusinessCenters0",
-                                              "globalKey" : "20a71d"
+                                              "globalKey" : "20a71d",
+                                              "externalKey" : "accrualBusinessCenters0"
                                             }
                                           },
-                                          "businessDayConvention" : "MODFOLLOWING",
                                           "meta" : {
                                             "globalKey" : "365baaee"
                                           }
                                         },
                                         "meta" : {
                                           "globalKey" : "1910c290"
-                                        },
-                                        "unadjustedDate" : "2021-12-30"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "1910c290"
                                       }
+                                    },
+                                    "calculationPeriodDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "20a71d",
+                                          "externalReference" : "accrualBusinessCenters0"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "622268e1"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "985d6cb2"
+                                      }
+                                    },
+                                    "calculationPeriodFrequency" : {
+                                      "periodMultiplier" : 1,
+                                      "period" : "Y",
+                                      "meta" : {
+                                        "globalKey" : "17984"
+                                      },
+                                      "rollConvention" : "30"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "848bd68b",
+                                      "externalKey" : "CalcPeriodDates0"
                                     }
                                   },
-                                  "dayCountFraction" : {
-                                    "value" : "30/360"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "edb875bc"
-                                  },
                                   "paymentDates" : {
-                                    "meta" : {
-                                      "globalKey" : "4d64aef4"
+                                    "paymentFrequency" : {
+                                      "periodMultiplier" : 1,
+                                      "period" : "Y",
+                                      "meta" : {
+                                        "globalKey" : "78"
+                                      }
                                     },
-                                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                                    "payRelativeTo" : "CalculationPeriodEndDate",
                                     "paymentDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
                                       "businessCenters" : {
                                         "businessCenter" : [ {
                                           "value" : "EUTA"
                                         } ],
                                         "meta" : {
-                                          "externalKey" : "paymentBusinessCenters0",
-                                          "globalKey" : "20a71d"
+                                          "globalKey" : "20a71d",
+                                          "externalKey" : "paymentBusinessCenters0"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
                                         "globalKey" : "365baaee"
                                       }
                                     },
-                                    "paymentFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "ac8"
-                                      },
-                                      "period" : "Y",
-                                      "periodMultiplier" : 1
+                                    "meta" : {
+                                      "globalKey" : "9b0d9350"
                                     }
                                   },
-                                  "rateSpecification" : {
-                                    "fixedRate" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
-                                      "rateSchedule" : {
-                                        "price" : {
-                                          "address" : {
-                                            "scope" : "DOCUMENT",
-                                            "value" : "price-1"
-                                          }
-                                        }
-                                      }
-                                    }
+                                  "meta" : {
+                                    "globalKey" : "bc315cd0"
                                   }
                                 }, {
                                   "payerReceiver" : {
-                                    "payer" : "PARTY_2",
-                                    "receiver" : "PARTY_1"
+                                    "payer" : "Party2",
+                                    "receiver" : "Party1"
                                   },
                                   "priceQuantity" : {
-                                    "meta" : {
-                                      "globalKey" : "0"
-                                    },
                                     "quantitySchedule" : {
                                       "address" : {
                                         "scope" : "DOCUMENT",
                                         "value" : "quantity-2"
                                       }
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "0"
                                     }
                                   },
-                                  "calculationPeriodDates" : {
-                                    "calculationPeriodDatesAdjustments" : {
-                                      "businessCenters" : {
-                                        "businessCentersReference" : {
-                                          "externalReference" : "accrualBusinessCenters1",
-                                          "globalReference" : "20a71d"
-                                        },
-                                        "meta" : {
-                                          "globalKey" : "622268e2"
+                                  "rateSpecification" : {
+                                    "floatingRate" : {
+                                      "rateOption" : {
+                                        "address" : {
+                                          "scope" : "DOCUMENT",
+                                          "value" : "rateOption-1"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
-                                        "globalKey" : "985d6cb3"
+                                        "globalKey" : "0"
                                       }
-                                    },
-                                    "calculationPeriodFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "28cc3"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6,
-                                      "rollConvention" : "30"
-                                    },
+                                    }
+                                  },
+                                  "dayCountFraction" : {
+                                    "value" : "ACT/360"
+                                  },
+                                  "calculationPeriodDates" : {
                                     "effectiveDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2019-04-03",
                                         "dateAdjustments" : {
                                           "businessDayConvention" : "NONE",
                                           "meta" : {
@@ -446,314 +308,421 @@
                                         },
                                         "meta" : {
                                           "globalKey" : "ed018b7b"
-                                        },
-                                        "unadjustedDate" : "2019-04-03"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "ed018b7b"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "CalcPeriodDates1",
-                                      "globalKey" : "4e535ad5"
-                                    },
                                     "terminationDate" : {
                                       "adjustableDate" : {
+                                        "unadjustedDate" : "2021-12-30",
                                         "dateAdjustments" : {
+                                          "businessDayConvention" : "MODFOLLOWING",
                                           "businessCenters" : {
                                             "businessCenter" : [ {
                                               "value" : "EUTA"
                                             } ],
                                             "meta" : {
-                                              "externalKey" : "accrualBusinessCenters1",
-                                              "globalKey" : "20a71d"
+                                              "globalKey" : "20a71d",
+                                              "externalKey" : "accrualBusinessCenters1"
                                             }
                                           },
-                                          "businessDayConvention" : "MODFOLLOWING",
                                           "meta" : {
                                             "globalKey" : "365baaee"
                                           }
                                         },
                                         "meta" : {
                                           "globalKey" : "1910c290"
-                                        },
-                                        "unadjustedDate" : "2021-12-30"
+                                        }
                                       },
                                       "meta" : {
                                         "globalKey" : "1910c290"
                                       }
+                                    },
+                                    "calculationPeriodDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
+                                      "businessCenters" : {
+                                        "businessCentersReference" : {
+                                          "globalReference" : "20a71d",
+                                          "externalReference" : "accrualBusinessCenters1"
+                                        },
+                                        "meta" : {
+                                          "globalKey" : "622268e2"
+                                        }
+                                      },
+                                      "meta" : {
+                                        "globalKey" : "985d6cb3"
+                                      }
+                                    },
+                                    "calculationPeriodFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "18ad5"
+                                      },
+                                      "rollConvention" : "30"
+                                    },
+                                    "meta" : {
+                                      "globalKey" : "8499ff5d",
+                                      "externalKey" : "CalcPeriodDates1"
                                     }
                                   },
-                                  "dayCountFraction" : {
-                                    "value" : "ACT/360"
-                                  },
-                                  "meta" : {
-                                    "globalKey" : "4c5d8f02"
-                                  },
                                   "paymentDates" : {
-                                    "meta" : {
-                                      "globalKey" : "4d64ad85"
+                                    "paymentFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "107"
+                                      }
                                     },
-                                    "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                                    "payRelativeTo" : "CalculationPeriodEndDate",
                                     "paymentDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
                                       "businessCenters" : {
                                         "businessCenter" : [ {
                                           "value" : "EUTA"
                                         } ],
                                         "meta" : {
-                                          "externalKey" : "paymentBusinessCenters1",
-                                          "globalKey" : "20a71d"
+                                          "globalKey" : "20a71d",
+                                          "externalKey" : "paymentBusinessCenters1"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
                                         "globalKey" : "365baaee"
                                       }
                                     },
-                                    "paymentFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "959"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6
-                                    }
-                                  },
-                                  "rateSpecification" : {
-                                    "floatingRate" : {
-                                      "meta" : {
-                                        "globalKey" : "0"
-                                      },
-                                      "rateOption" : {
-                                        "address" : {
-                                          "scope" : "DOCUMENT",
-                                          "value" : "rateOption-1"
-                                        }
-                                      }
+                                    "meta" : {
+                                      "globalKey" : "8f129421"
                                     }
                                   },
                                   "resetDates" : {
                                     "calculationPeriodDatesReference" : {
-                                      "externalReference" : "CalcPeriodDates1",
-                                      "globalReference" : "4e535ad5"
+                                      "globalReference" : "8499ff5d",
+                                      "externalReference" : "CalcPeriodDates1"
                                     },
+                                    "resetRelativeTo" : "CalculationPeriodStartDate",
                                     "fixingDates" : {
+                                      "periodMultiplier" : -2,
+                                      "period" : "D",
                                       "meta" : {
-                                        "globalKey" : "2d80ce65"
+                                        "globalKey" : "a5cb919"
                                       },
-                                      "period" : "D",
-                                      "periodMultiplier" : -2,
-                                      "dayType" : "BUSINESS",
+                                      "dayType" : "Business",
+                                      "businessDayConvention" : "NONE",
                                       "businessCenters" : {
                                         "businessCenter" : [ {
                                           "value" : "EUTA"
                                         } ],
                                         "meta" : {
-                                          "externalKey" : "fixingBusinessCenters0",
-                                          "globalKey" : "20a71d"
+                                          "globalKey" : "20a71d",
+                                          "externalKey" : "fixingBusinessCenters0"
                                         }
                                       },
-                                      "businessDayConvention" : "NONE",
                                       "dateRelativeTo" : {
-                                        "externalReference" : "resetDates0",
-                                        "globalReference" : "3522cca9"
+                                        "globalReference" : "dbaefb1",
+                                        "externalReference" : "resetDates0"
                                       }
                                     },
-                                    "meta" : {
-                                      "externalKey" : "resetDates0",
-                                      "globalKey" : "3522cca9"
+                                    "resetFrequency" : {
+                                      "periodMultiplier" : 6,
+                                      "period" : "M",
+                                      "meta" : {
+                                        "globalKey" : "107"
+                                      }
                                     },
                                     "resetDatesAdjustments" : {
+                                      "businessDayConvention" : "MODFOLLOWING",
                                       "businessCenters" : {
                                         "businessCentersReference" : {
-                                          "externalReference" : "paymentBusinessCenters1",
-                                          "globalReference" : "20a71d"
+                                          "globalReference" : "20a71d",
+                                          "externalReference" : "paymentBusinessCenters1"
                                         },
                                         "meta" : {
                                           "globalKey" : "e30c2739"
                                         }
                                       },
-                                      "businessDayConvention" : "MODFOLLOWING",
                                       "meta" : {
                                         "globalKey" : "19472b0a"
                                       }
                                     },
-                                    "resetFrequency" : {
-                                      "meta" : {
-                                        "globalKey" : "959"
-                                      },
-                                      "period" : "M",
-                                      "periodMultiplier" : 6
-                                    },
-                                    "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                                    "meta" : {
+                                      "globalKey" : "dbaefb1",
+                                      "externalKey" : "resetDates0"
+                                    }
+                                  },
+                                  "meta" : {
+                                    "globalKey" : "91873a2e"
                                   }
                                 } ],
                                 "meta" : {
-                                  "globalKey" : "ada951c6"
+                                  "globalKey" : "9f6d835e"
                                 }
                               }
                             },
                             "meta" : {
-                              "globalKey" : "ada951c6"
+                              "globalKey" : "9f6d835e"
                             }
                           },
                           "meta" : {
-                            "globalKey" : "ada951c6"
+                            "globalKey" : "9f6d835e"
                           }
+                        },
+                        "meta" : {
+                          "globalKey" : "358c8ff2"
                         }
-                      } ]
+                      } ],
+                      "meta" : {
+                        "globalKey" : "358c8ff2"
+                      }
+                    },
+                    "calculationAgent" : {
+                      "calculationAgentParty" : "CalculationAgentIndependent"
                     }
                   },
                   "meta" : {
-                    "globalKey" : "56c1d47e"
+                    "globalKey" : "50f4445c"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "56c1d47e"
+                  "globalKey" : "50f4445c"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "25fb1aeb"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.05,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "value" : 0.05,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 16000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "EUR"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "99684275"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 16000,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
-                      },
-                      "value" : 16000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "c9b98a6"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "bf589e11"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "EUR-EURIBOR-Telerate"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
+                          "periodMultiplier" : 6,
                           "period" : "M",
-                          "periodMultiplier" : 6
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "EUR"
-                        }
-                      },
-                      "value" : 16000
+                    "meta" : {
+                      "globalKey" : "2bba2221"
                     }
-                  } ]
+                  },
+                  "meta" : {
+                    "globalKey" : "d61c7d38"
+                  }
+                } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "3f62c17f",
+                  "externalReference" : "party1"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "b97c11f6",
+                  "externalReference" : "party2"
+                }
+              } ],
+              "ancillaryParty" : [ {
+                "role" : "CalculationAgentIndependent",
+                "partyReference" : [ {
+                  "globalReference" : "b97c11f6",
+                  "externalReference" : "party2"
                 } ]
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1141"
-              },
-              "value" : "2018-05-01"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "LEI1RPT0001",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "LEI1RPT0001IIII"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "b8962566"
                 }
               } ],
-              "issuer" : {
+              "name" : {
+                "value" : "Bank X"
+              },
+              "businessUnit" : [ {
+                "name" : "NY Swaps Desk",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "jjones"
+                    },
+                    "meta" : {
+                      "globalKey" : "baeb8c0d"
+                    }
+                  }
+                } ],
+                "firstName" : "jjone",
+                "meta" : {
+                  "globalKey" : "b793baa7",
+                  "externalKey" : "trader"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "3f62c17f",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "LEI2CP0002",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "eb8edea1"
+                }
+              } ],
+              "name" : {
+                "value" : "Bank Y"
+              },
+              "meta" : {
+                "globalKey" : "b97c11f6",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "LEI1RPT0001"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "8ffabe4b"
+                }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
               },
               "meta" : {
-                "globalKey" : "f2097dcc"
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "ce0b9311",
+                "externalReference" : "broker1"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
+              "role" : "ArrangingBroker",
+              "ownershipPartyReference" : {
+                "globalReference" : "3f62c17f",
+                "externalReference" : "party1"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "11e74549"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "26623d74"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "d5d99dff"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "ee963b6"
-                }
-              },
               "quantity" : {
+                "value" : 100000,
                 "unit" : {
                   "currency" : {
                     "value" : "EUR"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "3f62c17f",
+                  "externalReference" : "party1"
                 },
-                "value" : 100000
+                "receiverPartyReference" : {
+                  "globalReference" : "b97c11f6",
+                  "externalReference" : "party2"
+                }
               },
               "settlementDate" : {
+                "unadjustedDate" : "2018-05-03",
                 "dateAdjustments" : {
+                  "businessDayConvention" : "FOLLOWING",
                   "businessCenters" : {
                     "businessCenter" : [ {
                       "value" : "EUTA"
@@ -762,28 +731,59 @@
                       "globalKey" : "20a71d"
                     }
                   },
-                  "businessDayConvention" : "FOLLOWING",
                   "meta" : {
                     "globalKey" : "211dc30c"
                   }
-                },
-                "unadjustedDate" : "2018-05-03"
+                }
               },
               "transferExpression" : {
-                "priceTransfer" : "PREMIUM"
+                "priceTransfer" : "Premium"
               }
+            },
+            "meta" : {
+              "globalKey" : "a7c1cd8c"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "3a9dfe3"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "SEF123",
+      "meta" : {
+        "scheme" : "http://www.sef.com/msg_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "SEFCORP"
+    },
+    "sentTo" : [ {
+      "value" : "SDR01"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-04-01T14:15:36Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-05-01T10:15:36Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "SEF123"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "918f217e"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "9e897c0"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-10-Submission-1.json b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-10-Submission-1.json
index 99b11a0025..3f6550b4f4 100644
--- a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-10-Submission-1.json
+++ b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-10-Submission-1.json
@@ -1,173 +1,37 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "SEF123"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "918f217e"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.sef.com/msg_id"
-      },
-      "value" : "SEF123"
-    },
-    "sentBy" : {
-      "value" : "SEFCORP"
-    },
-    "sentTo" : [ {
-      "value" : "SDR01"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "1f17c869"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "448bf121"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "448bf121"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "d5d99dff"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI1RPT0001"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "b8962566"
-                }
-              } ],
-              "person" : [ {
-                "firstName" : "jjone",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "b793baa7"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "jjones"
-                    },
-                    "meta" : {
-                      "globalKey" : "baeb8c0d"
-                    }
-                  }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "ee963b6"
-              },
-              "name" : {
-                "value" : "Bank Y"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI2CP0002"
-                },
-                "identifierType" : "LEI",
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "LEI1RPT0001",
                 "meta" : {
-                  "globalKey" : "eb8edea1"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
               },
-              "name" : {
-                "value" : "Up&Atem"
-              },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "LEI1RPT0001JJJJ",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
-              },
-              "name" : {
-                "value" : "ClearItAll"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
-                }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "d5d99dff"
+                "globalKey" : "7ac64538"
               },
-              "partyReference" : {
-                "externalReference" : "clearing-svc",
-                "globalReference" : "611719a0"
-              },
-              "role" : "CLEARING_ORGANIZATION"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2018-04-01",
+              "meta" : {
+                "globalKey" : "3f1101"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "d5d99dff"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "ee963b6"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -178,46 +42,42 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "accrualBusinessCenters0",
-                                "globalReference" : "20a71d"
-                              },
-                              "meta" : {
-                                "globalKey" : "622268e1"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "985d6cb2"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "2b934"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "30"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-03",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -226,135 +86,133 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3837b"
-                              },
-                              "unadjustedDate" : "2018-04-03"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "CalcPeriodDates0",
-                            "globalKey" : "c2b8fce5"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2026-08-30",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "EUTA"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "accrualBusinessCenters0",
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "20a71d",
+                                    "externalKey" : "accrualBusinessCenters0"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "365baaee"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "a610fb90"
-                              },
-                              "unadjustedDate" : "2026-08-30"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "a610fb90"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "20a71d",
+                                "externalReference" : "accrualBusinessCenters0"
+                              },
+                              "meta" : {
+                                "globalKey" : "622268e1"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "985d6cb2"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "17984"
+                            },
+                            "rollConvention" : "30"
+                          },
+                          "meta" : {
+                            "globalKey" : "e308c58b",
+                            "externalKey" : "CalcPeriodDates0"
                           }
                         },
-                        "dayCountFraction" : {
-                          "value" : "30/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "708624bc"
-                        },
                         "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4d64aef4"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                          "payRelativeTo" : "CalculationPeriodEndDate",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
                               } ],
                               "meta" : {
-                                "externalKey" : "paymentBusinessCenters0",
-                                "globalKey" : "20a71d"
+                                "globalKey" : "20a71d",
+                                "externalKey" : "paymentBusinessCenters0"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "365baaee"
                             }
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "9b0d9350"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                        "meta" : {
+                          "globalKey" : "b28f8bd0"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "accrualBusinessCenters1",
-                                "globalReference" : "20a71d"
-                              },
-                              "meta" : {
-                                "globalKey" : "622268e2"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "985d6cb3"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28cc3"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "30"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-03",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -363,165 +221,167 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3837b"
-                              },
-                              "unadjustedDate" : "2018-04-03"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "CalcPeriodDates1",
-                            "globalKey" : "b5bd8bd5"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2026-08-30",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "EUTA"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "accrualBusinessCenters1",
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "20a71d",
+                                    "externalKey" : "accrualBusinessCenters1"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "365baaee"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "a610fb90"
-                              },
-                              "unadjustedDate" : "2026-08-30"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "a610fb90"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "20a71d",
+                                "externalReference" : "accrualBusinessCenters1"
+                              },
+                              "meta" : {
+                                "globalKey" : "622268e2"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "985d6cb3"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "18ad5"
+                            },
+                            "rollConvention" : "30"
+                          },
+                          "meta" : {
+                            "globalKey" : "e316ee5d",
+                            "externalKey" : "CalcPeriodDates1"
                           }
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "e6434002"
-                        },
                         "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4d64ad85"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "107"
+                            }
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                          "payRelativeTo" : "CalculationPeriodEndDate",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
                               } ],
                               "meta" : {
-                                "externalKey" : "paymentBusinessCenters1",
-                                "globalKey" : "20a71d"
+                                "globalKey" : "20a71d",
+                                "externalKey" : "paymentBusinessCenters1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "365baaee"
                             }
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "959"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "8f129421"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "CalcPeriodDates1",
-                            "globalReference" : "b5bd8bd5"
+                            "globalReference" : "e316ee5d",
+                            "externalReference" : "CalcPeriodDates1"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "2d80ce65"
+                              "globalKey" : "a5cb919"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
                               } ],
                               "meta" : {
-                                "externalKey" : "fixingBusinessCenters0",
-                                "globalKey" : "20a71d"
+                                "globalKey" : "20a71d",
+                                "externalKey" : "fixingBusinessCenters0"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "resetDates0",
-                              "globalReference" : "3522cca9"
+                              "globalReference" : "dbaefb1",
+                              "externalReference" : "resetDates0"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "resetDates0",
-                            "globalKey" : "3522cca9"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "107"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "paymentBusinessCenters1",
-                                "globalReference" : "20a71d"
+                                "globalReference" : "20a71d",
+                                "externalReference" : "paymentBusinessCenters1"
                               },
                               "meta" : {
                                 "globalKey" : "e30c2739"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "19472b0a"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "959"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "meta" : {
+                            "globalKey" : "dbaefb1",
+                            "externalKey" : "resetDates0"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "6888292e"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "f0c773c6"
+                        "globalKey" : "fc06635e"
                       }
                     },
                     "terminationProvision" : {
                       "cancelableProvision" : {
-                        "buyer" : "PARTY_2",
-                        "seller" : "PARTY_1",
+                        "buyer" : "Party2",
+                        "seller" : "Party1",
                         "europeanExercise" : {
-                          "earliestExerciseTime" : {
-                            "businessCenter" : {
-                              "value" : "BEBR"
-                            },
-                            "hourMinuteTime" : "09:00:00"
-                          },
                           "expirationDate" : [ {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2026-08-15",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "FOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "GBLO"
@@ -532,32 +392,23 @@
                                     "globalKey" : "428533f"
                                   }
                                 },
-                                "businessDayConvention" : "FOLLOWING",
                                 "meta" : {
                                   "globalKey" : "da4e2f6e"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "1bc03e7f"
-                              },
-                              "unadjustedDate" : "2026-08-15"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "1bc03e7f"
                             }
                           } ],
-                          "expirationTime" : {
-                            "businessCenter" : {
-                              "value" : "BEBR"
-                            },
-                            "hourMinuteTime" : "11:00:00"
-                          },
-                          "meta" : {
-                            "globalKey" : "e66f478e"
-                          },
                           "relevantUnderlyingDate" : {
                             "adjustableDates" : {
+                              "unadjustedDate" : [ "2026-08-30" ],
                               "dateAdjustments" : {
+                                "businessDayConvention" : "FOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "EUTA"
@@ -566,19 +417,32 @@
                                     "globalKey" : "20a71d"
                                   }
                                 },
-                                "businessDayConvention" : "FOLLOWING",
                                 "meta" : {
                                   "globalKey" : "211dc30c"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "90d313ae"
-                              },
-                              "unadjustedDate" : [ "2026-08-30" ]
+                              }
                             },
                             "meta" : {
                               "globalKey" : "90d313ae"
                             }
+                          },
+                          "earliestExerciseTime" : {
+                            "hourMinuteTime" : "09:00:00",
+                            "businessCenter" : {
+                              "value" : "BEBR"
+                            }
+                          },
+                          "expirationTime" : {
+                            "hourMinuteTime" : "11:00:00",
+                            "businessCenter" : {
+                              "value" : "BEBR"
+                            }
+                          },
+                          "meta" : {
+                            "globalKey" : "b88a378e"
                           }
                         },
                         "exerciseNotice" : {
@@ -591,141 +455,277 @@
                     }
                   },
                   "meta" : {
-                    "globalKey" : "e76a15a"
+                    "globalKey" : "261dac2"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "e76a15a"
+                  "globalKey" : "261dac2"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "25fb1aeb"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.05,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "value" : 0.05,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 16000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "EUR"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "99684275"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 16000,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
-                      },
-                      "value" : 16000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "c9b98a6"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "bf589e11"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "EUR-EURIBOR-Telerate"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
+                          "periodMultiplier" : 6,
                           "period" : "M",
-                          "periodMultiplier" : 6
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "EUR"
-                        }
-                      },
-                      "value" : 16000
+                    "meta" : {
+                      "globalKey" : "2bba2221"
                     }
-                  } ]
+                  },
+                  "meta" : {
+                    "globalKey" : "d61c7d38"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "3f62c17f",
+                  "externalReference" : "party1"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "b97c11f6",
+                  "externalReference" : "party2"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1101"
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "LEI1RPT0001",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "b8962566"
+                }
+              } ],
+              "name" : {
+                "value" : "Bank X"
               },
-              "value" : "2018-04-01"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+              "businessUnit" : [ {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "jjones"
+                    },
+                    "meta" : {
+                      "globalKey" : "baeb8c0d"
+                    }
+                  }
+                } ],
+                "firstName" : "jjone",
+                "meta" : {
+                  "globalKey" : "b793baa7",
+                  "externalKey" : "trader"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "3f62c17f",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "LEI2CP0002",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "LEI1RPT0001JJJJ"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "eb8edea1"
                 }
               } ],
-              "issuer" : {
+              "name" : {
+                "value" : "Bank Y"
+              },
+              "meta" : {
+                "globalKey" : "b97c11f6",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "8ffabe4b"
+                }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
+              },
+              "meta" : {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "LEI1RPT0001"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
               },
               "meta" : {
-                "globalKey" : "28b31d8c"
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "f6a6cc60",
+                "externalReference" : "clearing-svc"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
+              "role" : "ClearingOrganization",
+              "ownershipPartyReference" : {
+                "globalReference" : "3f62c17f",
+                "externalReference" : "party1"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "f7fc29d1"
+            }
+          },
+          "meta" : {
+            "globalKey" : "f7fc29d1"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "SEF123",
+      "meta" : {
+        "scheme" : "http://www.sef.com/msg_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "SEFCORP"
+    },
+    "sentTo" : [ {
+      "value" : "SDR01"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-04-01T14:15:36Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-04-01T14:15:36Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "SEF123"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "918f217e"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "87152dcb"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-11-Submission-1.json b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-11-Submission-1.json
index ec8647a175..e1fc381bf6 100644
--- a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-11-Submission-1.json
+++ b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-11-Submission-1.json
@@ -1,156 +1,37 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "SEF123"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "918f217e"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.sef.com/msg_id"
-      },
-      "value" : "SEF123"
-    },
-    "sentBy" : {
-      "value" : "SEFCORP"
-    },
-    "sentTo" : [ {
-      "value" : "SDR01"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "5418ba5a"
-  },
-  "nextEvent" : {
-    "intent" : "ALLOCATION"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "eff469f2"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "eff469f2"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "d5d99dff"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI1RPT0001"
-                },
-                "identifierType" : "LEI",
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "LEI1RPT0001",
                 "meta" : {
-                  "globalKey" : "b8962566"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
                 }
-              } ],
-              "person" : [ {
-                "firstName" : "jjone",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "b793baa7"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "jjones"
-                    },
-                    "meta" : {
-                      "globalKey" : "baeb8c0d"
-                    }
-                  }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "ee963b6"
               },
-              "name" : {
-                "value" : "Bank Y"
-              },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "LEI1RPT001PREAA",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI2CP0002"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "eb8edea1"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
-              },
-              "name" : {
-                "value" : "Up&Atem"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
-                }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "d5d99dff"
-              },
-              "partyReference" : {
-                "externalReference" : "broker1",
-                "globalReference" : "ed0cc6d1"
+                "globalKey" : "e5010f07"
               },
-              "role" : "ARRANGING_BROKER"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2018-04-01",
+              "meta" : {
+                "globalKey" : "3f1101"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "d5d99dff"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "ee963b6"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -161,46 +42,42 @@
                     "payout" : {
                       "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "accrualBusinessCenters0",
-                                "globalReference" : "20a71d"
-                              },
-                              "meta" : {
-                                "globalKey" : "622268e1"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "985d6cb2"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "2b934"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1,
-                            "rollConvention" : "30"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "30/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-03",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -209,135 +86,133 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3837b"
-                              },
-                              "unadjustedDate" : "2018-04-03"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "CalcPeriodDates0",
-                            "globalKey" : "c2b8fce5"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2026-08-30",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "EUTA"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "accrualBusinessCenters0",
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "20a71d",
+                                    "externalKey" : "accrualBusinessCenters0"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "365baaee"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "a610fb90"
-                              },
-                              "unadjustedDate" : "2026-08-30"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "a610fb90"
                             }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "20a71d",
+                                "externalReference" : "accrualBusinessCenters0"
+                              },
+                              "meta" : {
+                                "globalKey" : "622268e1"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "985d6cb2"
+                            }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "17984"
+                            },
+                            "rollConvention" : "30"
+                          },
+                          "meta" : {
+                            "globalKey" : "e308c58b",
+                            "externalKey" : "CalcPeriodDates0"
                           }
                         },
-                        "dayCountFraction" : {
-                          "value" : "30/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "708624bc"
-                        },
                         "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4d64aef4"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 1,
+                            "period" : "Y",
+                            "meta" : {
+                              "globalKey" : "78"
+                            }
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                          "payRelativeTo" : "CalculationPeriodEndDate",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
                               } ],
                               "meta" : {
-                                "externalKey" : "paymentBusinessCenters0",
-                                "globalKey" : "20a71d"
+                                "globalKey" : "20a71d",
+                                "externalKey" : "paymentBusinessCenters0"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "365baaee"
                             }
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "ac8"
-                            },
-                            "period" : "Y",
-                            "periodMultiplier" : 1
+                          "meta" : {
+                            "globalKey" : "9b0d9350"
                           }
                         },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
-                            }
-                          }
+                        "meta" : {
+                          "globalKey" : "b28f8bd0"
                         }
                       }, {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-2"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "calculationPeriodDates" : {
-                          "calculationPeriodDatesAdjustments" : {
-                            "businessCenters" : {
-                              "businessCentersReference" : {
-                                "externalReference" : "accrualBusinessCenters1",
-                                "globalReference" : "20a71d"
-                              },
-                              "meta" : {
-                                "globalKey" : "622268e2"
+                        "rateSpecification" : {
+                          "floatingRate" : {
+                            "rateOption" : {
+                              "address" : {
+                                "scope" : "DOCUMENT",
+                                "value" : "rateOption-1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
-                              "globalKey" : "985d6cb3"
+                              "globalKey" : "0"
                             }
-                          },
-                          "calculationPeriodFrequency" : {
-                            "meta" : {
-                              "globalKey" : "28cc3"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6,
-                            "rollConvention" : "30"
-                          },
+                          }
+                        },
+                        "dayCountFraction" : {
+                          "value" : "ACT/360"
+                        },
+                        "calculationPeriodDates" : {
                           "effectiveDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2018-04-03",
                               "dateAdjustments" : {
                                 "businessDayConvention" : "NONE",
                                 "meta" : {
@@ -346,288 +221,413 @@
                               },
                               "meta" : {
                                 "globalKey" : "ece3837b"
-                              },
-                              "unadjustedDate" : "2018-04-03"
+                              }
                             },
                             "meta" : {
                               "globalKey" : "ece3837b"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "CalcPeriodDates1",
-                            "globalKey" : "b5bd8bd5"
-                          },
                           "terminationDate" : {
                             "adjustableDate" : {
+                              "unadjustedDate" : "2026-08-30",
                               "dateAdjustments" : {
+                                "businessDayConvention" : "MODFOLLOWING",
                                 "businessCenters" : {
                                   "businessCenter" : [ {
                                     "value" : "EUTA"
                                   } ],
                                   "meta" : {
-                                    "externalKey" : "accrualBusinessCenters1",
-                                    "globalKey" : "20a71d"
+                                    "globalKey" : "20a71d",
+                                    "externalKey" : "accrualBusinessCenters1"
                                   }
                                 },
-                                "businessDayConvention" : "MODFOLLOWING",
                                 "meta" : {
                                   "globalKey" : "365baaee"
                                 }
                               },
                               "meta" : {
                                 "globalKey" : "a610fb90"
+                              }
+                            },
+                            "meta" : {
+                              "globalKey" : "a610fb90"
+                            }
+                          },
+                          "calculationPeriodDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
+                            "businessCenters" : {
+                              "businessCentersReference" : {
+                                "globalReference" : "20a71d",
+                                "externalReference" : "accrualBusinessCenters1"
                               },
-                              "unadjustedDate" : "2026-08-30"
+                              "meta" : {
+                                "globalKey" : "622268e2"
+                              }
                             },
                             "meta" : {
-                              "globalKey" : "a610fb90"
+                              "globalKey" : "985d6cb3"
                             }
+                          },
+                          "calculationPeriodFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "18ad5"
+                            },
+                            "rollConvention" : "30"
+                          },
+                          "meta" : {
+                            "globalKey" : "e316ee5d",
+                            "externalKey" : "CalcPeriodDates1"
                           }
                         },
-                        "dayCountFraction" : {
-                          "value" : "ACT/360"
-                        },
-                        "meta" : {
-                          "globalKey" : "e6434002"
-                        },
                         "paymentDates" : {
-                          "meta" : {
-                            "globalKey" : "4d64ad85"
+                          "paymentFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "107"
+                            }
                           },
-                          "payRelativeTo" : "CALCULATION_PERIOD_END_DATE",
+                          "payRelativeTo" : "CalculationPeriodEndDate",
                           "paymentDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
                               } ],
                               "meta" : {
-                                "externalKey" : "paymentBusinessCenters1",
-                                "globalKey" : "20a71d"
+                                "globalKey" : "20a71d",
+                                "externalKey" : "paymentBusinessCenters1"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "365baaee"
                             }
                           },
-                          "paymentFrequency" : {
-                            "meta" : {
-                              "globalKey" : "959"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6
-                          }
-                        },
-                        "rateSpecification" : {
-                          "floatingRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
-                            },
-                            "rateOption" : {
-                              "address" : {
-                                "scope" : "DOCUMENT",
-                                "value" : "rateOption-1"
-                              }
-                            }
+                          "meta" : {
+                            "globalKey" : "8f129421"
                           }
                         },
                         "resetDates" : {
                           "calculationPeriodDatesReference" : {
-                            "externalReference" : "CalcPeriodDates1",
-                            "globalReference" : "b5bd8bd5"
+                            "globalReference" : "e316ee5d",
+                            "externalReference" : "CalcPeriodDates1"
                           },
+                          "resetRelativeTo" : "CalculationPeriodStartDate",
                           "fixingDates" : {
+                            "periodMultiplier" : -2,
+                            "period" : "D",
                             "meta" : {
-                              "globalKey" : "2d80ce65"
+                              "globalKey" : "a5cb919"
                             },
-                            "period" : "D",
-                            "periodMultiplier" : -2,
-                            "dayType" : "BUSINESS",
+                            "dayType" : "Business",
+                            "businessDayConvention" : "NONE",
                             "businessCenters" : {
                               "businessCenter" : [ {
                                 "value" : "EUTA"
                               } ],
                               "meta" : {
-                                "externalKey" : "fixingBusinessCenters0",
-                                "globalKey" : "20a71d"
+                                "globalKey" : "20a71d",
+                                "externalKey" : "fixingBusinessCenters0"
                               }
                             },
-                            "businessDayConvention" : "NONE",
                             "dateRelativeTo" : {
-                              "externalReference" : "resetDates0",
-                              "globalReference" : "3522cca9"
+                              "globalReference" : "dbaefb1",
+                              "externalReference" : "resetDates0"
                             }
                           },
-                          "meta" : {
-                            "externalKey" : "resetDates0",
-                            "globalKey" : "3522cca9"
+                          "resetFrequency" : {
+                            "periodMultiplier" : 6,
+                            "period" : "M",
+                            "meta" : {
+                              "globalKey" : "107"
+                            }
                           },
                           "resetDatesAdjustments" : {
+                            "businessDayConvention" : "MODFOLLOWING",
                             "businessCenters" : {
                               "businessCentersReference" : {
-                                "externalReference" : "paymentBusinessCenters1",
-                                "globalReference" : "20a71d"
+                                "globalReference" : "20a71d",
+                                "externalReference" : "paymentBusinessCenters1"
                               },
                               "meta" : {
                                 "globalKey" : "e30c2739"
                               }
                             },
-                            "businessDayConvention" : "MODFOLLOWING",
                             "meta" : {
                               "globalKey" : "19472b0a"
                             }
                           },
-                          "resetFrequency" : {
-                            "meta" : {
-                              "globalKey" : "959"
-                            },
-                            "period" : "M",
-                            "periodMultiplier" : 6
-                          },
-                          "resetRelativeTo" : "CALCULATION_PERIOD_START_DATE"
+                          "meta" : {
+                            "globalKey" : "dbaefb1",
+                            "externalKey" : "resetDates0"
+                          }
+                        },
+                        "meta" : {
+                          "globalKey" : "6888292e"
                         }
                       } ],
                       "meta" : {
-                        "globalKey" : "f0c773c6"
+                        "globalKey" : "fc06635e"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "f0c773c6"
+                    "globalKey" : "fc06635e"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "f0c773c6"
+                  "globalKey" : "fc06635e"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "e895b765"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.05,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "value" : 0.05,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "EUR"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
+                      "priceType" : "InterestRate"
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "price-1"
+                      } ]
                     }
                   } ],
                   "quantity" : [ {
+                    "value" : {
+                      "value" : 10000,
+                      "unit" : {
+                        "currency" : {
+                          "value" : "EUR"
+                        }
+                      }
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
                         "value" : "quantity-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "2a21353b"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 10000,
                       "unit" : {
                         "currency" : {
                           "value" : "EUR"
                         }
-                      },
-                      "value" : 10000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-2"
+                      } ]
                     }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "cf363520"
-                  },
+                  } ],
                   "observable" : {
-                    "meta" : {
-                      "globalKey" : "bf589e11"
-                    },
                     "rateOption" : {
-                      "meta" : {
-                        "location" : [ {
-                          "scope" : "DOCUMENT",
-                          "value" : "rateOption-1"
-                        } ]
-                      },
                       "value" : {
                         "floatingRateIndex" : {
                           "value" : "EUR-EURIBOR-Telerate"
                         },
                         "indexTenor" : {
-                          "meta" : {
-                            "globalKey" : "959"
-                          },
+                          "periodMultiplier" : 6,
                           "period" : "M",
-                          "periodMultiplier" : 6
+                          "meta" : {
+                            "globalKey" : "107"
+                          }
                         }
+                      },
+                      "meta" : {
+                        "location" : [ {
+                          "scope" : "DOCUMENT",
+                          "value" : "rateOption-1"
+                        } ]
                       }
-                    }
-                  },
-                  "quantity" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "quantity-2"
-                      } ]
                     },
-                    "value" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "EUR"
-                        }
-                      },
-                      "value" : 10000
+                    "meta" : {
+                      "globalKey" : "2bba2221"
                     }
-                  } ]
+                  },
+                  "meta" : {
+                    "globalKey" : "f2214932"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "3f62c17f",
+                  "externalReference" : "party1"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "b97c11f6",
+                  "externalReference" : "party2"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1101"
-              },
-              "value" : "2018-04-01"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+            "party" : [ {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "LEI1RPT0001",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "LEI1RPT001PREAA"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "b8962566"
                 }
               } ],
-              "issuer" : {
+              "name" : {
+                "value" : "Bank X"
+              },
+              "businessUnit" : [ {
+                "name" : "NY Swaps Desk",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/cftc/issuer-identifier"
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "jjones"
+                    },
+                    "meta" : {
+                      "globalKey" : "baeb8c0d"
+                    }
+                  }
+                } ],
+                "firstName" : "jjone",
+                "meta" : {
+                  "globalKey" : "b793baa7",
+                  "externalKey" : "trader"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "3f62c17f",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "LEI2CP0002",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "eb8edea1"
+                }
+              } ],
+              "name" : {
+                "value" : "Bank Y"
+              },
+              "meta" : {
+                "globalKey" : "b97c11f6",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "LEI1RPT0001"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "8ffabe4b"
+                }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
               },
               "meta" : {
-                "globalKey" : "ef62af9b"
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "ce0b9311",
+                "externalReference" : "broker1"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
+              "role" : "ArrangingBroker",
+              "ownershipPartyReference" : {
+                "globalReference" : "3f62c17f",
+                "externalReference" : "party1"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "1420d9a2"
+            }
+          },
+          "meta" : {
+            "globalKey" : "1420d9a2"
           }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "nextEvent" : {
+    "intent" : "Allocation"
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "SEF123",
+      "meta" : {
+        "scheme" : "http://www.sef.com/msg_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "SEFCORP"
+    },
+    "sentTo" : [ {
+      "value" : "SDR01"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-04-01T14:15:36Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-04-01T14:15:36Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "SEF123"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "918f217e"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "5d275ba"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-12-Submission-1.json b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-12-Submission-1.json
index dd9b8e4f3d..f1984be835 100644
--- a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-12-Submission-1.json
+++ b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-12-Submission-1.json
@@ -1,176 +1,55 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "SEF123"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "918f217e"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.sef.com/msg_id"
-      },
-      "value" : "SEF123"
-    },
-    "sentBy" : {
-      "value" : "SEFCORP"
-    },
-    "sentTo" : [ {
-      "value" : "SDR01"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "8161a351"
-  },
-  "nextEvent" : {
-    "intent" : "CLEARING"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "2004-10-18",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "DJ.CDX.NA"
+                }
+              }
+            },
+            "meta" : {
+              "globalKey" : "ae7fb3d4"
+            }
+          } ]
+        }
+      },
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "6780e880"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "34a5650e"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "d5d99dff"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI1RPT0001"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "b8962566"
-                }
-              } ],
-              "person" : [ {
-                "firstName" : "jjone",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "b793baa7"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "jjones"
-                    },
-                    "meta" : {
-                      "globalKey" : "baeb8c0d"
-                    }
-                  }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "ee963b6"
-              },
-              "name" : {
-                "value" : "Bank Y"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI2CP0002"
-                },
-                "identifierType" : "LEI",
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "LEI1RPT0001",
                 "meta" : {
-                  "globalKey" : "eb8edea1"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
               },
-              "name" : {
-                "value" : "Up&Atem"
-              },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "LEI1RPT0001LLL",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
+                "globalKey" : "fe927c98"
               },
-              "name" : {
-                "value" : "ClearItAll"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
-                }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "d5d99dff"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing-svc",
-                "globalReference" : "611719a0"
-              },
-              "role" : "CLEARING_ORGANIZATION"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2018-04-01",
+              "meta" : {
+                "globalKey" : "3f1101"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "d5d99dff"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "ee963b6"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -180,245 +59,366 @@
                   "economicTerms" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "meta" : {
                           "globalKey" : "3f1103"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "3f1103"
                       }
                     },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2029-03-20",
+                        "meta" : {
+                          "globalKey" : "3f68d4"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3f68d4"
+                      }
+                    },
                     "payout" : {
-                      "creditDefaultPayout" : {
+                      "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "generalTerms" : {
-                          "indexReferenceInformation" : {
-                            "indexName" : {
-                              "value" : "Dow Jones CDX NA IG.2"
-                            },
-                            "indexAnnexDate" : "2004-07-06",
-                            "indexAnnexSource" : {
-                              "value" : "PUBLISHER"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
                             },
-                            "indexFactor" : 1.0,
-                            "indexSeries" : 2,
                             "meta" : {
-                              "globalKey" : "2d3f1ad0"
-                            },
-                            "seniority" : "SENIOR_SEC"
+                              "globalKey" : "0"
+                            }
                           }
                         },
                         "meta" : {
-                          "globalKey" : "1a54c12f"
+                          "globalKey" : "5a5ff79f"
                         }
-                      },
-                      "interestRatePayout" : [ {
+                      } ],
+                      "creditDefaultPayout" : {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "5a5ff79f"
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
+                        "generalTerms" : {
+                          "indexReferenceInformation" : {
+                            "indexName" : {
+                              "value" : "Dow Jones CDX NA IG.2"
                             },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
+                            "indexSeries" : 2,
+                            "indexAnnexDate" : "2004-07-06",
+                            "indexAnnexSource" : {
+                              "value" : "Publisher"
+                            },
+                            "indexFactor" : 1.0,
+                            "seniority" : "SeniorSec",
+                            "meta" : {
+                              "globalKey" : "425a6e9a"
                             }
                           }
-                        }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "b0f419ce"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3f68d4"
                         },
-                        "unadjustedDate" : "2029-03-20"
+                        "meta" : {
+                          "globalKey" : "2f7014f9"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "3f68d4"
+                        "globalKey" : "c1dc0b7a"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "cad7b963"
+                    "globalKey" : "50b49d6b"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "cad7b963"
+                  "globalKey" : "50b49d6b"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "56a5905f"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0060,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.0060,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "89ca00f4"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "7e0c7b81"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 20000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 20000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "af761d8c"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "3f62c17f",
+                  "externalReference" : "party1"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "b97c11f6",
+                  "externalReference" : "party2"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1101"
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "LEI1RPT0001",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "b8962566"
+                }
+              } ],
+              "name" : {
+                "value" : "Bank X"
               },
-              "value" : "2018-04-01"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+              "businessUnit" : [ {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "jjones"
+                    },
+                    "meta" : {
+                      "globalKey" : "baeb8c0d"
+                    }
+                  }
+                } ],
+                "firstName" : "jjone",
+                "meta" : {
+                  "globalKey" : "b793baa7",
+                  "externalKey" : "trader"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "3f62c17f",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "LEI2CP0002",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "LEI1RPT0001LLL"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "eb8edea1"
                 }
               } ],
-              "issuer" : {
+              "name" : {
+                "value" : "Bank Y"
+              },
+              "meta" : {
+                "globalKey" : "b97c11f6",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
+                  "globalKey" : "8ffabe4b"
+                }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
+              },
+              "meta" : {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "LEI1RPT0001"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
               },
               "meta" : {
-                "globalKey" : "ea4efcec"
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "f6a6cc60",
+                "externalReference" : "clearing-svc"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
+              "role" : "ClearingOrganization",
+              "ownershipPartyReference" : {
+                "globalReference" : "3f62c17f",
+                "externalReference" : "party1"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "241ee04c"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "3cb073f2"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "d5d99dff"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "ee963b6"
-                }
-              },
               "quantity" : {
+                "value" : 16000,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "3f62c17f",
+                  "externalReference" : "party1"
                 },
-                "value" : 16000
+                "receiverPartyReference" : {
+                  "globalReference" : "b97c11f6",
+                  "externalReference" : "party2"
+                }
               },
               "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
-              }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "2004-10-18",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "DJ.CDX.NA"
-                }
+                "priceTransfer" : "Upfront"
               }
             },
             "meta" : {
-              "globalKey" : "ae7fb3d4"
+              "globalKey" : "309a8bea"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "7254f736"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "nextEvent" : {
+    "intent" : "Clearing"
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "SEF123",
+      "meta" : {
+        "scheme" : "http://www.sef.com/msg_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "SEFCORP"
+    },
+    "sentTo" : [ {
+      "value" : "SDR01"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-04-01T14:15:36Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-04-01T14:15:36Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "SEF123"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "918f217e"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "7806675d"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-12-Submission-2.json b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-12-Submission-2.json
index 7024f24058..520f0487fe 100644
--- a/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-12-Submission-2.json
+++ b/rosetta-source/src/main/resources/result-json-files/native-cdm-events/Example-12-Submission-2.json
@@ -1,176 +1,55 @@
 {
-  "action" : "NEW",
-  "eventIdentifier" : [ {
-    "assignedIdentifier" : [ {
-      "identifier" : {
-        "value" : "SEF123"
-      }
-    } ],
-    "meta" : {
-      "globalKey" : "918f217e"
-    }
-  } ],
-  "messageInformation" : {
-    "messageId" : {
-      "meta" : {
-        "scheme" : "http://www.sef.com/msg_id"
-      },
-      "value" : "SEF123"
-    },
-    "sentBy" : {
-      "value" : "SEFCORP"
-    },
-    "sentTo" : [ {
-      "value" : "SDR01"
-    } ]
-  },
-  "meta" : {
-    "globalKey" : "bc67125d"
-  },
-  "nextEvent" : {
-    "intent" : "CLEARING"
-  },
   "proposedEvent" : {
+    "intent" : "ContractFormation",
     "instruction" : [ {
+      "primitiveInstruction" : {
+        "contractFormation" : {
+          "legalAgreement" : [ {
+            "agreementDate" : "2004-10-18",
+            "legalAgreementIdentification" : {
+              "agreementName" : {
+                "agreementType" : "MasterConfirmation",
+                "masterConfirmationType" : {
+                  "value" : "DJ.CDX.NA"
+                }
+              }
+            },
+            "meta" : {
+              "globalKey" : "ae7fb3d4"
+            }
+          } ]
+        }
+      },
       "before" : {
         "value" : {
-          "meta" : {
-            "globalKey" : "3e975936"
-          },
           "trade" : {
-            "meta" : {
-              "globalKey" : "eb7bac44"
-            },
-            "party" : [ {
-              "businessUnit" : [ {
-                "meta" : {
-                  "externalKey" : "desk1",
-                  "globalKey" : "5c10b72e"
-                },
-                "name" : "NY Swaps Desk"
-              } ],
-              "meta" : {
-                "externalKey" : "party1",
-                "globalKey" : "d5d99dff"
-              },
-              "name" : {
-                "value" : "Bank X"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI1RPT0001"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "b8962566"
-                }
-              } ],
-              "person" : [ {
-                "firstName" : "jjone",
-                "meta" : {
-                  "externalKey" : "trader",
-                  "globalKey" : "b793baa7"
-                },
-                "personId" : [ {
-                  "value" : {
-                    "identifier" : {
-                      "value" : "jjones"
-                    },
-                    "meta" : {
-                      "globalKey" : "baeb8c0d"
-                    }
-                  }
-                } ]
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "party2",
-                "globalKey" : "ee963b6"
-              },
-              "name" : {
-                "value" : "Bank Y"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "LEI2CP0002"
-                },
-                "identifierType" : "LEI",
+            "tradeIdentifier" : [ {
+              "issuer" : {
+                "value" : "LEI1RPT0001",
                 "meta" : {
-                  "globalKey" : "eb8edea1"
+                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
                 }
-              } ]
-            }, {
-              "meta" : {
-                "externalKey" : "broker1",
-                "globalKey" : "ed0cc6d1"
               },
-              "name" : {
-                "value" : "Up&Atem"
-              },
-              "partyId" : [ {
+              "assignedIdentifier" : [ {
                 "identifier" : {
+                  "value" : "LEI1RPT0001MMM",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300OL8KL0WCQ34V31"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "8ffabe4b"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
+                  }
                 }
-              } ]
-            }, {
+              } ],
               "meta" : {
-                "externalKey" : "clearing-svc",
-                "globalKey" : "611719a0"
+                "globalKey" : "fe92f4d7"
               },
-              "name" : {
-                "value" : "ClearItAll"
-              },
-              "partyId" : [ {
-                "identifier" : {
-                  "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
-                  },
-                  "value" : "549300IB5Q45JGNPND58"
-                },
-                "identifierType" : "LEI",
-                "meta" : {
-                  "globalKey" : "e213e7d7"
-                }
-              } ]
-            } ],
-            "partyRole" : [ {
-              "ownershipPartyReference" : {
-                "externalReference" : "party1",
-                "globalReference" : "d5d99dff"
-              },
-              "partyReference" : {
-                "externalReference" : "clearing-svc",
-                "globalReference" : "611719a0"
-              },
-              "role" : "CLEARING_ORGANIZATION"
+              "identifierType" : "UniqueTransactionIdentifier"
             } ],
+            "tradeDate" : {
+              "value" : "2018-04-01",
+              "meta" : {
+                "globalKey" : "3f1101"
+              }
+            },
             "tradableProduct" : {
-              "counterparty" : [ {
-                "partyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "d5d99dff"
-                },
-                "role" : "PARTY_1"
-              }, {
-                "partyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "ee963b6"
-                },
-                "role" : "PARTY_2"
-              } ],
               "product" : {
                 "contractualProduct" : {
                   "productTaxonomy" : [ {
@@ -180,245 +59,366 @@
                   "economicTerms" : {
                     "effectiveDate" : {
                       "adjustableDate" : {
+                        "unadjustedDate" : "2018-04-03",
                         "meta" : {
                           "globalKey" : "3f1103"
-                        },
-                        "unadjustedDate" : "2018-04-03"
+                        }
                       },
                       "meta" : {
                         "globalKey" : "3f1103"
                       }
                     },
+                    "terminationDate" : {
+                      "adjustableDate" : {
+                        "unadjustedDate" : "2029-03-20",
+                        "meta" : {
+                          "globalKey" : "3f68d4"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "3f68d4"
+                      }
+                    },
                     "payout" : {
-                      "creditDefaultPayout" : {
+                      "interestRatePayout" : [ {
                         "payerReceiver" : {
-                          "payer" : "PARTY_1",
-                          "receiver" : "PARTY_2"
+                          "payer" : "Party2",
+                          "receiver" : "Party1"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "generalTerms" : {
-                          "indexReferenceInformation" : {
-                            "indexName" : {
-                              "value" : "Dow Jones CDX NA IG.2"
-                            },
-                            "indexAnnexDate" : "2004-07-06",
-                            "indexAnnexSource" : {
-                              "value" : "PUBLISHER"
+                        "rateSpecification" : {
+                          "fixedRate" : {
+                            "rateSchedule" : {
+                              "price" : {
+                                "address" : {
+                                  "scope" : "DOCUMENT",
+                                  "value" : "price-1"
+                                }
+                              }
                             },
-                            "indexFactor" : 1.0,
-                            "indexSeries" : 2,
                             "meta" : {
-                              "globalKey" : "2d3f1ad0"
-                            },
-                            "seniority" : "SENIOR_SEC"
+                              "globalKey" : "0"
+                            }
                           }
                         },
                         "meta" : {
-                          "globalKey" : "1a54c12f"
+                          "globalKey" : "5a5ff79f"
                         }
-                      },
-                      "interestRatePayout" : [ {
+                      } ],
+                      "creditDefaultPayout" : {
                         "payerReceiver" : {
-                          "payer" : "PARTY_2",
-                          "receiver" : "PARTY_1"
+                          "payer" : "Party1",
+                          "receiver" : "Party2"
                         },
                         "priceQuantity" : {
-                          "meta" : {
-                            "globalKey" : "0"
-                          },
                           "quantitySchedule" : {
                             "address" : {
                               "scope" : "DOCUMENT",
                               "value" : "quantity-1"
                             }
+                          },
+                          "meta" : {
+                            "globalKey" : "0"
                           }
                         },
-                        "meta" : {
-                          "globalKey" : "5a5ff79f"
-                        },
-                        "rateSpecification" : {
-                          "fixedRate" : {
-                            "meta" : {
-                              "globalKey" : "0"
+                        "generalTerms" : {
+                          "indexReferenceInformation" : {
+                            "indexName" : {
+                              "value" : "Dow Jones CDX NA IG.2"
                             },
-                            "rateSchedule" : {
-                              "price" : {
-                                "address" : {
-                                  "scope" : "DOCUMENT",
-                                  "value" : "price-1"
-                                }
-                              }
+                            "indexSeries" : 2,
+                            "indexAnnexDate" : "2004-07-06",
+                            "indexAnnexSource" : {
+                              "value" : "Publisher"
+                            },
+                            "indexFactor" : 1.0,
+                            "seniority" : "SeniorSec",
+                            "meta" : {
+                              "globalKey" : "425a6e9a"
                             }
                           }
-                        }
-                      } ],
-                      "meta" : {
-                        "globalKey" : "b0f419ce"
-                      }
-                    },
-                    "terminationDate" : {
-                      "adjustableDate" : {
-                        "meta" : {
-                          "globalKey" : "3f68d4"
                         },
-                        "unadjustedDate" : "2029-03-20"
+                        "meta" : {
+                          "globalKey" : "2f7014f9"
+                        }
                       },
                       "meta" : {
-                        "globalKey" : "3f68d4"
+                        "globalKey" : "c1dc0b7a"
                       }
                     }
                   },
                   "meta" : {
-                    "globalKey" : "cad7b963"
+                    "globalKey" : "50b49d6b"
                   }
                 },
                 "meta" : {
-                  "globalKey" : "cad7b963"
+                  "globalKey" : "50b49d6b"
                 }
               },
               "tradeLot" : [ {
                 "priceQuantity" : [ {
-                  "meta" : {
-                    "globalKey" : "56a5905f"
-                  },
                   "price" : [ {
-                    "meta" : {
-                      "location" : [ {
-                        "scope" : "DOCUMENT",
-                        "value" : "price-1"
-                      } ]
-                    },
                     "value" : {
+                      "value" : 0.0060,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "value" : 0.0060,
                       "perUnitOf" : {
                         "currency" : {
                           "value" : "USD"
                         }
                       },
-                      "priceType" : "INTEREST_RATE"
-                    }
-                  } ]
-                }, {
-                  "meta" : {
-                    "globalKey" : "c91aae1d"
-                  },
-                  "quantity" : [ {
+                      "priceType" : "InterestRate"
+                    },
                     "meta" : {
                       "location" : [ {
                         "scope" : "DOCUMENT",
-                        "value" : "quantity-1"
+                        "value" : "price-1"
                       } ]
-                    },
+                    }
+                  } ],
+                  "meta" : {
+                    "globalKey" : "7e0c7b81"
+                  }
+                }, {
+                  "quantity" : [ {
                     "value" : {
+                      "value" : 18000,
                       "unit" : {
                         "currency" : {
                           "value" : "USD"
                         }
-                      },
-                      "value" : 18000
+                      }
+                    },
+                    "meta" : {
+                      "location" : [ {
+                        "scope" : "DOCUMENT",
+                        "value" : "quantity-1"
+                      } ]
                     }
-                  } ]
+                  } ],
+                  "meta" : {
+                    "globalKey" : "5a3b1583"
+                  }
                 } ]
+              } ],
+              "counterparty" : [ {
+                "role" : "Party1",
+                "partyReference" : {
+                  "globalReference" : "3f62c17f",
+                  "externalReference" : "party1"
+                }
+              }, {
+                "role" : "Party2",
+                "partyReference" : {
+                  "globalReference" : "b97c11f6",
+                  "externalReference" : "party2"
+                }
               } ]
             },
-            "tradeDate" : {
-              "meta" : {
-                "globalKey" : "3f1101"
+            "party" : [ {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "LEI1RPT0001",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "b8962566"
+                }
+              } ],
+              "name" : {
+                "value" : "Bank X"
               },
-              "value" : "2018-04-01"
-            },
-            "tradeIdentifier" : [ {
-              "assignedIdentifier" : [ {
+              "businessUnit" : [ {
+                "name" : "NY Swaps Desk",
+                "meta" : {
+                  "globalKey" : "5c10b72e",
+                  "externalKey" : "desk1"
+                }
+              } ],
+              "person" : [ {
+                "personId" : [ {
+                  "value" : {
+                    "identifier" : {
+                      "value" : "jjones"
+                    },
+                    "meta" : {
+                      "globalKey" : "baeb8c0d"
+                    }
+                  }
+                } ],
+                "firstName" : "jjone",
+                "meta" : {
+                  "globalKey" : "b793baa7",
+                  "externalKey" : "trader"
+                }
+              } ],
+              "meta" : {
+                "globalKey" : "3f62c17f",
+                "externalKey" : "party1"
+              }
+            }, {
+              "partyId" : [ {
                 "identifier" : {
+                  "value" : "LEI2CP0002",
                   "meta" : {
-                    "scheme" : "http://www.fpml.org/coding-scheme/external/unique-transaction-identifier"
-                  },
-                  "value" : "LEI1RPT0001MMM"
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "eb8edea1"
                 }
               } ],
-              "issuer" : {
+              "name" : {
+                "value" : "Bank Y"
+              },
+              "meta" : {
+                "globalKey" : "b97c11f6",
+                "externalKey" : "party2"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300OL8KL0WCQ34V31",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
+                },
+                "identifierType" : "LEI",
                 "meta" : {
-                  "scheme" : "http://www.fpml.org/coding-scheme/external/issuer-identifier"
+                  "globalKey" : "8ffabe4b"
+                }
+              } ],
+              "name" : {
+                "value" : "Up&Atem"
+              },
+              "meta" : {
+                "globalKey" : "ce0b9311",
+                "externalKey" : "broker1"
+              }
+            }, {
+              "partyId" : [ {
+                "identifier" : {
+                  "value" : "549300IB5Q45JGNPND58",
+                  "meta" : {
+                    "scheme" : "http://www.fpml.org/coding-scheme/external/iso17442"
+                  }
                 },
-                "value" : "LEI1RPT0001"
+                "identifierType" : "LEI",
+                "meta" : {
+                  "globalKey" : "e213e7d7"
+                }
+              } ],
+              "name" : {
+                "value" : "ClearItAll"
               },
               "meta" : {
-                "globalKey" : "ec12616b"
+                "globalKey" : "f6a6cc60",
+                "externalKey" : "clearing-svc"
+              }
+            } ],
+            "partyRole" : [ {
+              "partyReference" : {
+                "globalReference" : "f6a6cc60",
+                "externalReference" : "clearing-svc"
               },
-              "identifierType" : "UNIQUE_TRANSACTION_IDENTIFIER"
-            } ]
+              "role" : "ClearingOrganization",
+              "ownershipPartyReference" : {
+                "globalReference" : "3f62c17f",
+                "externalReference" : "party1"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "8a82bc74"
+            }
           },
           "transferHistory" : [ {
-            "meta" : {
-              "globalKey" : "3cb073f2"
-            },
             "transfer" : {
-              "payerReceiver" : {
-                "payerPartyReference" : {
-                  "externalReference" : "party1",
-                  "globalReference" : "d5d99dff"
-                },
-                "receiverPartyReference" : {
-                  "externalReference" : "party2",
-                  "globalReference" : "ee963b6"
-                }
-              },
               "quantity" : {
+                "value" : 16000,
                 "unit" : {
                   "currency" : {
                     "value" : "USD"
                   }
+                }
+              },
+              "payerReceiver" : {
+                "payerPartyReference" : {
+                  "globalReference" : "3f62c17f",
+                  "externalReference" : "party1"
                 },
-                "value" : 16000
+                "receiverPartyReference" : {
+                  "globalReference" : "b97c11f6",
+                  "externalReference" : "party2"
+                }
               },
               "transferExpression" : {
-                "priceTransfer" : "UPFRONT"
-              }
-            }
-          } ]
-        }
-      },
-      "primitiveInstruction" : {
-        "contractFormation" : {
-          "legalAgreement" : [ {
-            "agreementDate" : "2004-10-18",
-            "legalAgreementIdentification" : {
-              "agreementName" : {
-                "agreementType" : "MASTER_CONFIRMATION",
-                "masterConfirmationType" : {
-                  "value" : "DJ.CDX.NA"
-                }
+                "priceTransfer" : "Upfront"
               }
             },
             "meta" : {
-              "globalKey" : "ae7fb3d4"
+              "globalKey" : "309a8bea"
             }
-          } ]
+          } ],
+          "meta" : {
+            "globalKey" : "9106d5e"
+          }
         }
       }
-    } ],
-    "intent" : "CONTRACT_FORMATION"
+    } ]
+  },
+  "nextEvent" : {
+    "intent" : "Clearing"
+  },
+  "messageInformation" : {
+    "messageId" : {
+      "value" : "SEF123",
+      "meta" : {
+        "scheme" : "http://www.sef.com/msg_id"
+      }
+    },
+    "sentBy" : {
+      "value" : "SEFCORP"
+    },
+    "sentTo" : [ {
+      "value" : "SDR01"
+    } ]
   },
   "timestamp" : [ {
     "dateTime" : "2018-04-01T15:01:30Z",
-    "qualification" : "EVENT_CREATION_DATE_TIME"
+    "qualification" : "eventCreationDateTime"
   }, {
     "dateTime" : "2018-04-01T15:01:30Z",
-    "qualification" : "EXECUTION_DATE_TIME"
-  } ]
+    "qualification" : "executionDateTime"
+  } ],
+  "eventIdentifier" : [ {
+    "assignedIdentifier" : [ {
+      "identifier" : {
+        "value" : "SEF123"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "918f217e"
+    }
+  } ],
+  "action" : "New",
+  "meta" : {
+    "globalKey" : "20e1c1b7"
+  }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/result-json-files/ore-1-0-39/Vanilla_IR_Swap.json b/rosetta-source/src/main/resources/result-json-files/ore-1-0-39/Vanilla_IR_Swap.json
index 998f4b6298..16d315919f 100644
--- a/rosetta-source/src/main/resources/result-json-files/ore-1-0-39/Vanilla_IR_Swap.json
+++ b/rosetta-source/src/main/resources/result-json-files/ore-1-0-39/Vanilla_IR_Swap.json
@@ -1,55 +1,6 @@
 {
-  "meta" : {
-    "globalKey" : "a8f6bd87"
-  },
   "trade" : {
-    "meta" : {
-      "globalKey" : "a8f6bd87"
-    },
-    "party" : [ {
-      "meta" : {
-        "globalKey" : "faea1aa4"
-      },
-      "partyId" : [ {
-        "identifier" : {
-          "value" : "001B456BCDEFGH67XY89"
-        },
-        "meta" : {
-          "globalKey" : "faea1aa4"
-        }
-      } ]
-    } ],
     "tradableProduct" : {
-      "counterparty" : [ {
-        "partyReference" : {
-          "value" : {
-            "meta" : {
-              "globalKey" : "faea1aa4"
-            },
-            "partyId" : [ {
-              "identifier" : {
-                "value" : "001B456BCDEFGH67XY89"
-              },
-              "meta" : {
-                "globalKey" : "faea1aa4"
-              }
-            } ]
-          }
-        },
-        "role" : "PARTY_2"
-      }, {
-        "partyReference" : {
-          "value" : {
-            "meta" : {
-              "globalKey" : "998"
-            },
-            "name" : {
-              "value" : "ME"
-            }
-          }
-        },
-        "role" : "PARTY_2"
-      } ],
       "product" : {
         "contractualProduct" : {
           "productTaxonomy" : [ {
@@ -60,36 +11,23 @@
             "payout" : {
               "interestRatePayout" : [ {
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-2"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
                   "meta" : {
-                    "globalKey" : "99f5a2e2"
+                    "globalKey" : "9390c5e6"
                   },
                   "cashSettlementTerms" : [ {
-                    "cashSettlementAmount" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "EUR"
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "10da2"
-                      }
-                    },
-                    "meta" : {
-                      "globalKey" : "99f5a2e2"
-                    },
                     "valuationMethod" : {
-                      "minimumQuotationAmount" : {
+                      "quotationAmount" : {
                         "unit" : {
                           "currency" : {
                             "value" : "EUR"
@@ -99,7 +37,7 @@
                           "globalKey" : "10da2"
                         }
                       },
-                      "quotationAmount" : {
+                      "minimumQuotationAmount" : {
                         "unit" : {
                           "currency" : {
                             "value" : "EUR"
@@ -109,96 +47,96 @@
                           "globalKey" : "10da2"
                         }
                       }
+                    },
+                    "cashSettlementAmount" : {
+                      "unit" : {
+                        "currency" : {
+                          "value" : "EUR"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "10da2"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "9390c5e6"
                     }
                   } ]
                 },
+                "rateSpecification" : {
+                  "fixedRate" : {
+                    "rateSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-1"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
                 "calculationPeriodDates" : {
                   "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 1,
                     "meta" : {
                       "globalKey" : "1"
-                    },
-                    "periodMultiplier" : 1
+                    }
                   },
                   "meta" : {
                     "globalKey" : "1"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "bf8ce1bf"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "3c2"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 1,
+                    "meta" : {
+                      "globalKey" : "1"
+                    }
                   },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "1"
-                      },
                       "periodicDates" : {
                         "periodFrequency" : {
+                          "periodMultiplier" : 1,
                           "meta" : {
                             "globalKey" : "1"
-                          },
-                          "periodMultiplier" : 1
+                          }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "1"
                       }
                     } ]
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "1"
-                    },
-                    "periodMultiplier" : 1
+                  "meta" : {
+                    "globalKey" : "1b4d8a0"
                   }
                 },
-                "rateSpecification" : {
-                  "fixedRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "rateSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-1"
-                        }
-                      }
-                    }
-                  }
+                "meta" : {
+                  "globalKey" : "416ec307"
                 }
               }, {
                 "priceQuantity" : {
-                  "meta" : {
-                    "globalKey" : "0"
-                  },
                   "quantitySchedule" : {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "quantity-1"
                     }
+                  },
+                  "meta" : {
+                    "globalKey" : "0"
                   }
                 },
                 "settlementTerms" : {
                   "meta" : {
-                    "globalKey" : "99f5a2e2"
+                    "globalKey" : "9390c5e6"
                   },
                   "cashSettlementTerms" : [ {
-                    "cashSettlementAmount" : {
-                      "unit" : {
-                        "currency" : {
-                          "value" : "EUR"
-                        }
-                      },
-                      "meta" : {
-                        "globalKey" : "10da2"
-                      }
-                    },
-                    "meta" : {
-                      "globalKey" : "99f5a2e2"
-                    },
                     "valuationMethod" : {
-                      "minimumQuotationAmount" : {
+                      "quotationAmount" : {
                         "unit" : {
                           "currency" : {
                             "value" : "EUR"
@@ -208,7 +146,7 @@
                           "globalKey" : "10da2"
                         }
                       },
-                      "quotationAmount" : {
+                      "minimumQuotationAmount" : {
                         "unit" : {
                           "currency" : {
                             "value" : "EUR"
@@ -218,141 +156,138 @@
                           "globalKey" : "10da2"
                         }
                       }
+                    },
+                    "cashSettlementAmount" : {
+                      "unit" : {
+                        "currency" : {
+                          "value" : "EUR"
+                        }
+                      },
+                      "meta" : {
+                        "globalKey" : "10da2"
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "9390c5e6"
                     }
                   } ]
                 },
+                "rateSpecification" : {
+                  "floatingRate" : {
+                    "spreadSchedule" : {
+                      "price" : {
+                        "address" : {
+                          "scope" : "DOCUMENT",
+                          "value" : "price-2"
+                        }
+                      }
+                    },
+                    "meta" : {
+                      "globalKey" : "0"
+                    }
+                  }
+                },
                 "calculationPeriodDates" : {
                   "calculationPeriodFrequency" : {
+                    "periodMultiplier" : 6,
                     "meta" : {
                       "globalKey" : "6"
-                    },
-                    "periodMultiplier" : 6
+                    }
                   },
                   "meta" : {
                     "globalKey" : "6"
                   }
                 },
-                "meta" : {
-                  "globalKey" : "ee8f9d90"
-                },
                 "paymentDates" : {
-                  "meta" : {
-                    "globalKey" : "168c"
+                  "paymentFrequency" : {
+                    "periodMultiplier" : 6,
+                    "meta" : {
+                      "globalKey" : "6"
+                    }
                   },
                   "paymentDateSchedule" : {
                     "interimPaymentDates" : [ {
-                      "meta" : {
-                        "globalKey" : "6"
-                      },
                       "periodicDates" : {
                         "periodFrequency" : {
+                          "periodMultiplier" : 6,
                           "meta" : {
                             "globalKey" : "6"
-                          },
-                          "periodMultiplier" : 6
+                          }
                         }
+                      },
+                      "meta" : {
+                        "globalKey" : "6"
                       }
                     } ]
                   },
-                  "paymentFrequency" : {
-                    "meta" : {
-                      "globalKey" : "6"
-                    },
-                    "periodMultiplier" : 6
+                  "meta" : {
+                    "globalKey" : "a3d13c0"
                   }
                 },
-                "rateSpecification" : {
-                  "floatingRate" : {
-                    "meta" : {
-                      "globalKey" : "0"
-                    },
-                    "spreadSchedule" : {
-                      "price" : {
-                        "address" : {
-                          "scope" : "DOCUMENT",
-                          "value" : "price-2"
-                        }
-                      }
-                    }
-                  }
+                "meta" : {
+                  "globalKey" : "2f4d292c"
                 }
               } ],
               "meta" : {
-                "globalKey" : "22ca270f"
+                "globalKey" : "9f2225f3"
               }
             }
           },
           "meta" : {
-            "globalKey" : "22ca270f"
+            "globalKey" : "9f2225f3"
           }
         },
         "meta" : {
-          "globalKey" : "22ca270f"
+          "globalKey" : "9f2225f3"
         }
       },
       "tradeLot" : [ {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "e46cce1d"
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-1"
-              } ]
-            },
             "value" : {
+              "value" : 0.021,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.021,
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-2"
+                "value" : "price-1"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000.000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 10000000.000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-2"
+              } ]
             }
           } ],
           "settlementTerms" : {
             "meta" : {
-              "globalKey" : "99f5a2e2"
+              "globalKey" : "9390c5e6"
             },
             "cashSettlementTerms" : [ {
-              "cashSettlementAmount" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "EUR"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "10da2"
-                }
-              },
-              "meta" : {
-                "globalKey" : "99f5a2e2"
-              },
               "valuationMethod" : {
-                "minimumQuotationAmount" : {
+                "quotationAmount" : {
                   "unit" : {
                     "currency" : {
                       "value" : "EUR"
@@ -362,7 +297,7 @@
                     "globalKey" : "10da2"
                   }
                 },
-                "quotationAmount" : {
+                "minimumQuotationAmount" : {
                   "unit" : {
                     "currency" : {
                       "value" : "EUR"
@@ -372,92 +307,92 @@
                     "globalKey" : "10da2"
                   }
                 }
+              },
+              "cashSettlementAmount" : {
+                "unit" : {
+                  "currency" : {
+                    "value" : "EUR"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "10da2"
+                }
+              },
+              "meta" : {
+                "globalKey" : "9390c5e6"
               }
             } ]
+          },
+          "meta" : {
+            "globalKey" : "97ff020b"
           }
         } ]
       }, {
         "priceQuantity" : [ {
-          "meta" : {
-            "globalKey" : "ba47e63d"
-          },
-          "observable" : {
-            "meta" : {
-              "globalKey" : "79b2cf22"
-            },
-            "rateOption" : {
-              "meta" : {
-                "location" : [ {
-                  "scope" : "DOCUMENT",
-                  "value" : "rateOption-1"
-                } ]
-              },
-              "value" : {
-                "floatingRateIndex" : {
-                  "value" : "EUR-6M EURIBOR SWAP-CME vs LCH-ICAP"
-                }
-              }
-            }
-          },
           "price" : [ {
-            "meta" : {
-              "location" : [ {
-                "scope" : "DOCUMENT",
-                "value" : "price-2"
-              } ]
-            },
             "value" : {
+              "value" : 0.000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "value" : 0.000000,
-              "arithmeticOperator" : "ADD",
               "perUnitOf" : {
                 "currency" : {
                   "value" : "EUR"
                 }
               },
-              "priceType" : "INTEREST_RATE"
-            }
-          } ],
-          "quantity" : [ {
+              "priceType" : "InterestRate",
+              "arithmeticOperator" : "Add"
+            },
             "meta" : {
               "location" : [ {
                 "scope" : "DOCUMENT",
-                "value" : "quantity-1"
+                "value" : "price-2"
               } ]
-            },
+            }
+          } ],
+          "quantity" : [ {
             "value" : {
+              "value" : 10000000.000000,
               "unit" : {
                 "currency" : {
                   "value" : "EUR"
                 }
-              },
-              "value" : 10000000.000000
+              }
+            },
+            "meta" : {
+              "location" : [ {
+                "scope" : "DOCUMENT",
+                "value" : "quantity-1"
+              } ]
             }
           } ],
+          "observable" : {
+            "rateOption" : {
+              "value" : {
+                "floatingRateIndex" : {
+                  "value" : "EUR-6M EURIBOR SWAP-CME vs LCH-ICAP"
+                }
+              },
+              "meta" : {
+                "location" : [ {
+                  "scope" : "DOCUMENT",
+                  "value" : "rateOption-1"
+                } ]
+              }
+            },
+            "meta" : {
+              "globalKey" : "bca7151e"
+            }
+          },
           "settlementTerms" : {
             "meta" : {
-              "globalKey" : "99f5a2e2"
+              "globalKey" : "9390c5e6"
             },
             "cashSettlementTerms" : [ {
-              "cashSettlementAmount" : {
-                "unit" : {
-                  "currency" : {
-                    "value" : "EUR"
-                  }
-                },
-                "meta" : {
-                  "globalKey" : "10da2"
-                }
-              },
-              "meta" : {
-                "globalKey" : "99f5a2e2"
-              },
               "valuationMethod" : {
-                "minimumQuotationAmount" : {
+                "quotationAmount" : {
                   "unit" : {
                     "currency" : {
                       "value" : "EUR"
@@ -467,7 +402,7 @@
                     "globalKey" : "10da2"
                   }
                 },
-                "quotationAmount" : {
+                "minimumQuotationAmount" : {
                   "unit" : {
                     "currency" : {
                       "value" : "EUR"
@@ -477,11 +412,76 @@
                     "globalKey" : "10da2"
                   }
                 }
+              },
+              "cashSettlementAmount" : {
+                "unit" : {
+                  "currency" : {
+                    "value" : "EUR"
+                  }
+                },
+                "meta" : {
+                  "globalKey" : "10da2"
+                }
+              },
+              "meta" : {
+                "globalKey" : "9390c5e6"
               }
             } ]
+          },
+          "meta" : {
+            "globalKey" : "4ecdc407"
           }
         } ]
+      } ],
+      "counterparty" : [ {
+        "role" : "Party2",
+        "partyReference" : {
+          "value" : {
+            "partyId" : [ {
+              "identifier" : {
+                "value" : "001B456BCDEFGH67XY89"
+              },
+              "meta" : {
+                "globalKey" : "faea1aa4"
+              }
+            } ],
+            "meta" : {
+              "globalKey" : "faea1aa4"
+            }
+          }
+        }
+      }, {
+        "role" : "Party2",
+        "partyReference" : {
+          "value" : {
+            "name" : {
+              "value" : "ME"
+            },
+            "meta" : {
+              "globalKey" : "998"
+            }
+          }
+        }
       } ]
+    },
+    "party" : [ {
+      "partyId" : [ {
+        "identifier" : {
+          "value" : "001B456BCDEFGH67XY89"
+        },
+        "meta" : {
+          "globalKey" : "faea1aa4"
+        }
+      } ],
+      "meta" : {
+        "globalKey" : "faea1aa4"
+      }
+    } ],
+    "meta" : {
+      "globalKey" : "18d24b21"
     }
+  },
+  "meta" : {
+    "globalKey" : "18d24b21"
   }
 }
\ No newline at end of file